[Fix] The completion check skips every task delegated from a Session

apps/worker/src/sandbox-server/lib/harness.ts

@@ -78,6 +78,12 @@ export interface QueuedPromptMessageSnapshot {
   userName?: string;
   userImageUrl?: string;
   clientMessageId?: string;
+  /**
+   * Set on prompts the harness queues on its own (recovery and continuation
+   * nudges), so a reader of the transcript can tell them from a request a
+   * person or the platform sent.
+   */
+  source?: string;
   timestamp: number;
 }
 

apps/worker/src/sandbox-server/lib/harnesses/opencode-server/harness.ts

@@ -3900,6 +3900,7 @@ export class OpenCodeServerHarness
     const queuedId = this.prompts.enqueue({
       text: VISUAL_PROOF_TIMEOUT_RECOVERY_PROMPT,
       visibleInTranscript: false,
+      source: 'opencode-visual-proof-recovery',
     });
     this.prompts.prioritize(queuedId);
 
@@ -3936,6 +3937,7 @@ export class OpenCodeServerHarness
     this.prompts.enqueue({
       text: PLAN_EXIT_CONTINUATION_PROMPT,
       visibleInTranscript: false,
+      source: 'opencode-plan-exit-continuation',
     });
   }
 
@@ -4521,6 +4523,7 @@ export class OpenCodeServerHarness
     const queuedId = this.prompts.enqueue({
       text: recovery.promptText,
       visibleInTranscript: false,
+      source: 'opencode-provider-error-recovery',
     });
     this.prompts.prioritize(queuedId);
     this.providerErrorRecoveryQueuedPromptId = queuedId;
@@ -4582,6 +4585,7 @@ export class OpenCodeServerHarness
     const queuedId = this.prompts.enqueue({
       text: OPENCODE_RATE_LIMIT_RETRY_PROMPT_TEXT,
       visibleInTranscript: false,
+      source: 'opencode-rate-limit-retry',
     });
     this.prompts.prioritize(queuedId);
 
@@ -6041,6 +6045,7 @@ export class OpenCodeServerHarness
       userName: next.userName,
       userImageUrl: next.userImageUrl,
       clientMessageId: next.clientMessageId,
+      source: next.source,
     });
     await this.submitPrompt({
       text: next.text,
@@ -6051,6 +6056,7 @@ export class OpenCodeServerHarness
       userName: next.userName,
       userImageUrl: next.userImageUrl,
       clientMessageId: next.clientMessageId,
+      source: next.source,
     });
   }
 

apps/worker/src/sandbox-server/lib/harnesses/runtime-prompt-queue.ts

@@ -50,6 +50,7 @@ export class RuntimePromptQueue {
     userName?: string;
     userImageUrl?: string;
     clientMessageId?: string;
+    source?: string;
   }): string {
     // Hidden platform follow-ups reuse one clientMessageId per logical
     // notification (e.g. the PR re-review prompt for a run), so a newer
@@ -75,6 +76,7 @@ export class RuntimePromptQueue {
       userName: prompt.userName,
       userImageUrl: prompt.userImageUrl,
       clientMessageId: prompt.clientMessageId,
+      source: prompt.source,
       timestamp: Date.now(),
     };
 
@@ -247,6 +249,7 @@ export class RuntimePromptQueue {
       ...(message.clientMessageId
         ? { clientMessageId: message.clientMessageId }
         : {}),
+      ...(message.source ? { source: message.source } : {}),
       timestamp: message.timestamp,
     }));
     this.queuedMessageIdCounter = this.queuedMessages.reduce(

packages/cloud-agents/src/server/task-completion-gate.ts

@@ -1,5 +1,5 @@
 import { redactBrainText } from '@roomote/communication/redact-brain-text';
-import { and, asc, db, desc, eq, sql, taskMessages } from '@roomote/db/server';
+import { and, asc, db, desc, eq, taskMessages } from '@roomote/db/server';
 import {
   ACP_ENVELOPE_EVENT_TYPES,
   extractAcpMessageText,
@@ -144,7 +144,42 @@ function clip(text: string, maxChars: number): string {
  * What the person asked this task for: the opening prompt and the latest
  * follow-ups. Read from the transcript rather than taken from the sandbox so
  * the agent cannot restate its own request.
+ *
+ * The opening prompt counts whether or not it is visible: a task delegated
+ * from a Session gets its request as a hidden `<request>` prompt. Later
+ * hidden prompts never count. Those are the platform's and the harness's own
+ * notices (an environment-setup notice, a recovery or continuation nudge, a
+ * completion-check reminder), and reading one back as a follow-up would have
+ * the check judging its own instructions. A person's follow-up, from the web
+ * or a chat thread, is always visible.
  */
+const HARNESS_PROMPT_SOURCE_PREFIX = 'opencode-';
+
+type PromptRow = {
+  id: string;
+  contentBlocks: unknown;
+  payload: unknown;
+  metadata: unknown;
+};
+
+function asRecord(value: unknown): Record<string, unknown> | null {
+  return value && typeof value === 'object'
+    ? (value as Record<string, unknown>)
+    : null;
+}
+
+function isHiddenPrompt(row: PromptRow): boolean {
+  return asRecord(row.metadata)?.visibleInTranscript === false;
+}
+
+function isHarnessPrompt(row: PromptRow): boolean {
+  return [asRecord(row.payload)?.source, asRecord(row.metadata)?.source].some(
+    (source) =>
+      typeof source === 'string' &&
+      source.startsWith(HARNESS_PROMPT_SOURCE_PREFIX),
+  );
+}
+
 async function loadTaskRequests(
   taskId: string,
 ): Promise<{ request: string; followUps: string } | null> {
@@ -156,24 +191,34 @@ async function loadTaskRequests(
         id: taskMessages.id,
         contentBlocks: taskMessages.contentBlocks,
         payload: taskMessages.payload,
+        metadata: taskMessages.metadata,
       })
       .from(taskMessages)
       .where(
         and(
           eq(taskMessages.taskId, taskId),
           eq(taskMessages.eventType, ACP_ENVELOPE_EVENT_TYPES.UserPrompt),
-          sql`coalesce(${taskMessages.metadata} ->> 'visibleInTranscript', 'true') <> 'false'`,
         ),
       )
       .orderBy(direction(taskMessages.ts), direction(taskMessages.createdAt))
       .limit(PROMPT_SCAN_LIMIT);
-  const visiblePrompts = (rows: Awaited<ReturnType<typeof scan>>) =>
+  const requestPrompts = (
+    rows: PromptRow[],
+    options: { includeHidden: boolean },
+  ) =>
     rows.flatMap((row) => {
-      const payload =
-        row.payload && typeof row.payload === 'object'
-          ? (row.payload as Record<string, unknown>)
-          : null;
-      const raw = extractAcpMessageText(row.contentBlocks, payload)?.trim();
+      if (
+        isHarnessPrompt(row) ||
+        (!options.includeHidden && isHiddenPrompt(row))
+      ) {
+        return [];
+      }
+
+      const payload = asRecord(row.payload);
+      const raw = extractAcpMessageText(
+        row.contentBlocks as Parameters<typeof extractAcpMessageText>[0],
+        payload,
+      )?.trim();
       const text = raw
         ? normalizeTranscriptUserText(
             isSystemInjectedAcpPromptText(raw)
@@ -186,13 +231,13 @@ async function loadTaskRequests(
       return text ? [{ id: row.id, text }] : [];
     });
 
-  const [opening] = visiblePrompts(await scan(asc));
+  const [opening] = requestPrompts(await scan(asc), { includeHidden: true });
 
   if (!opening) {
     return null;
   }
 
-  const followUps = visiblePrompts(await scan(desc))
+  const followUps = requestPrompts(await scan(desc), { includeHidden: false })
     .filter((prompt) => prompt.id !== opening.id)
     .slice(0, FOLLOW_UP_LIMIT)
     .reverse();