@rallycry/conveyor-agent 11.0.4 → 11.0.6

package/dist/{boot-SWUVT5B4.js → boot-7XH4FFLO.js}

@@ -1,6 +1,6 @@
 import {
   startWorkbenchServer
-} from "./chunk-UBDSLM44.js";
+} from "./chunk-D57S4UR5.js";
 import {
   TOMBSTONE_MESSAGE,
   isLegacyEntrypointLaunch
@@ -8,7 +8,7 @@ import {
 import {
   readAgentVersion
 } from "./chunk-XORJ6SII.js";
-import "./chunk-3F4ZZKCA.js";
+import "./chunk-W6VILPQE.js";
 import {
   GitPrepJob,
   defaultGit,

package/dist/{chunk-UBDSLM44.js → chunk-D57S4UR5.js}

@@ -1,6 +1,6 @@
 import {
   loadPtySpawn
-} from "./chunk-3F4ZZKCA.js";
+} from "./chunk-W6VILPQE.js";
 import {
   terminateProcessGroup
 } from "./chunk-W4LZ7R6Z.js";

package/dist/{chunk-HYPX6FEX.js → chunk-GUYMLASA.js}

@@ -9,6 +9,7 @@ import {
   buildPromptBytes,
   buildSpawnArgs,
   cleanTerminalOutput,
+  ensureSessionTarget,
   inheritedEnv,
   killPtyWithEscalation,
   needsRawReadyGate,
@@ -27,7 +28,7 @@ import {
   spawnOptionsFingerprint,
   transcriptSize,
   turnOptionsFrom
-} from "./chunk-3F4ZZKCA.js";
+} from "./chunk-W6VILPQE.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -56,7 +57,7 @@ import {
   statWorkspacePath,
   updateRemoteToken,
   verifyGitCredential
-} from "./chunk-SLUBOIYE.js";
+} from "./chunk-HFUVAHII.js";
 import {
   registerBootMilestoneSocketFallback,
   reportBootMilestone
@@ -4639,6 +4640,12 @@ var PtySession = class {
   // synthetic id so the card flips to answered.
   pendingSyntheticQuestionIds = [];
   questionResultRemap = /* @__PURE__ */ new Map();
+  // An AskUserQuestion questionnaire is parked on screen (PreToolUse hook
+  // fired, no PostToolUse envelope yet). While set the parked process must
+  // not be reused: feeding follow-up prompt bytes into the live dialog would
+  // type chat text into the questionnaire. Fail-safe — a stale flag only
+  // costs a teardown + respawn (`--resume` recovers the conversation).
+  questionnairePending = false;
   // Per-turn state: the prompt to feed and the per-turn options subset. Both
   // start from the constructor args (turn 1) and are replaced by beginTurn.
   turnPrompt;
@@ -4731,7 +4738,9 @@ var PtySession = class {
    */
   canReuse(resume, fingerprint) {
     const resumeMatches = resume === void 0 ? this.reportedOpenCodeId !== null : resume === this.sessionUuid;
-    return !this._toreDown && !this.exited && this.activeQueue === null && resumeMatches && fingerprint === this.spawnFingerprint;
+    return !this._toreDown && !this.exited && this.activeQueue === null && // A parked questionnaire owns the terminal — a fed prompt would type
+    // into the dialog. Force teardown + respawn instead.
+    !this.questionnairePending && resumeMatches && fingerprint === this.spawnFingerprint;
   }
   get hookSocketPath() {
     return this.socket ? this.socket.socketPath : null;
@@ -4806,6 +4815,7 @@ var PtySession = class {
     this.deliveredTexts = [];
     this.disarmSubmitNudge();
     this.disarmPlanDialogAutoAccept();
+    this.questionnairePending = false;
     this.closeSyntheticQuestionCards();
   }
   /**
@@ -5115,6 +5125,7 @@ var PtySession = class {
   async teardown() {
     if (this._toreDown) return;
     this._toreDown = true;
+    this.questionnairePending = false;
     this.disarmPlanDialogAutoAccept();
     this.disarmSubmitNudge();
     this.closeSyntheticQuestionCards();
@@ -5390,6 +5401,7 @@ var PtySession = class {
     if (this.pendingPlanApproval && progress.tool_name === "ExitPlanMode") {
       this.disarmPlanDialogAutoAccept();
     }
+    if (progress.tool_name === "AskUserQuestion") this.questionnairePending = false;
     if (this.pendingSubmitNudge) this.disarmSubmitNudge();
     this.pushEvent({
       type: "tool_progress",
@@ -5410,6 +5422,7 @@ var PtySession = class {
     if (request.tool_name === "AskUserQuestion") {
       this.disarmSubmitNudge();
       this.disarmPlanDialogAutoAccept();
+      this.questionnairePending = true;
       const questions = parseUserQuestions(request.tool_input);
       this.pushEvent({ type: "user_question", questions });
       this.emitSyntheticQuestionCard(questions);
@@ -5518,6 +5531,7 @@ var PtySession = class {
   async finalizeOnExit(exitCode) {
     this.coalescer?.flush();
     this.exited = true;
+    this.questionnairePending = false;
     if (this._toreDown) return;
     if (this.tailer) {
       this.tailer.close();
@@ -5720,13 +5734,19 @@ var PtyHarness = class _PtyHarness {
   }
   async *executeQuery(opts) {
     const want = opts.resume ?? opts.options.resume ?? this.parked?.reportedSessionId ?? void 0;
-    const fingerprint = this.fingerprintOf(opts.options);
+    const options = ensureSessionTarget(opts.options, want);
+    if (options !== opts.options) {
+      _PtyHarness.log.warn("spawn had no session target \u2014 minted one", {
+        sessionId: options.sessionId
+      });
+    }
+    const fingerprint = this.fingerprintOf(options);
     let session;
-    if (this.parked?.canReuse(want, fingerprint) && !await this.parkedHomeDied(opts.options)) {
+    if (this.parked?.canReuse(want, fingerprint) && !await this.parkedHomeDied(options)) {
       session = this.parked;
       this.parked = null;
       this.cancelEndedTimer();
-      await session.beginTurn(opts.prompt, opts.options);
+      await session.beginTurn(opts.prompt, options);
     } else {
       if (this.parked) {
         const stale = this.parked;
@@ -5734,10 +5754,10 @@ var PtyHarness = class _PtyHarness {
         this.cancelEndedTimer();
         await stale.teardown();
       }
-      session = await this.spawnSession(opts.prompt, opts.options, want);
+      session = await this.spawnSession(opts.prompt, options, want);
     }
     yield* this.drain(session);
-    yield* this.recoverFailedDelivery(session, opts.options, want);
+    yield* this.recoverFailedDelivery(session, options, want);
   }
   /**
    * Did the shared `~/.claude` mount die while this session sat parked?
@@ -6768,8 +6788,8 @@ function wrapBridgeWithDirectStream(inner, reporter, options = {}) {
 }
 
 // src/execution/query-executor.ts
-import { createHash as createHash2 } from "crypto";
-import { existsSync, readFileSync as readFileSync2, truncateSync } from "fs";
+import { createHash as createHash2, randomUUID as randomUUID2 } from "crypto";
+import { existsSync, readFileSync as readFileSync2, renameSync, truncateSync } from "fs";
 
 // src/execution/chat-instructions.ts
 function buildChatInstructions(context, scenario, newMessages) {
@@ -7678,11 +7698,8 @@ function tagContextIntro(runnerMode) {
   return `These docs match this task's tags. They auto-load when you edit matching files, and you can Read any of them the moment you need its detail \u2014 do NOT read them all up front.`;
 }
 function formatResolvedTags(resolved, subProject, mentioned, runnerMode) {
-  const parts = [
-    `
-## Reference Guides (load on demand)`,
-    tagContextIntro(runnerMode)
-  ];
+  const parts = [`
+## Reference Guides (load on demand)`, tagContextIntro(runnerMode)];
   for (const tag of resolved) {
     if (tag.entries.length === 0 && !tag.hasOverview) continue;
     const desc = tag.description ? ` \u2014 ${tag.description}` : "";
@@ -8122,7 +8139,10 @@ function buildRelaunchWithSession(mode, context, agentMode, isAuto) {
     parts.push(`You were relaunched but no new instructions have been given since your last run.`);
     if (agentMode === "auto" || agentMode === "building" || isAuto) {
       parts.push(
-        ...builderKickoff(context, `You are the Builder on this card \u2014 pick up where you left off.`)
+        ...builderKickoff(
+          context,
+          `You are the Builder on this card \u2014 pick up where you left off.`
+        )
       );
     } else {
       parts.push(
@@ -9405,7 +9425,9 @@ var driveListFilesContract = defineToolContract({
     fields: {
       folderId: f.optional(f.string({ desc: `Folder to list. ${ROOT_DEFAULT}` })),
       search: f.optional(f.string({ desc: "Only return names containing this text", max: 200 })),
-      limit: f.optional(f.number({ desc: "Max entries (default 100)", int: true, min: 1, max: 200 }))
+      limit: f.optional(
+        f.number({ desc: "Max entries (default 100)", int: true, min: 1, max: 200 })
+      )
     }
   },
   mcp: {
@@ -9414,7 +9436,9 @@ var driveListFilesContract = defineToolContract({
       projectId: mcpProjectId,
       folderId: f.optional(f.string({ desc: `Folder to list. ${ROOT_DEFAULT}` })),
       search: f.optional(f.string({ desc: "Only return names containing this text", max: 200 })),
-      limit: f.optional(f.number({ desc: "Max entries (default 100)", int: true, min: 1, max: 200 }))
+      limit: f.optional(
+        f.number({ desc: "Max entries (default 100)", int: true, min: 1, max: 200 })
+      )
     }
   }
 });
@@ -9517,7 +9541,12 @@ var listMeetingsContract = defineToolContract({
     description: `List this project's meetings, newest first \u2014 each with its title, date, source, status, participants, and a short summary preview. Start here when you are asked about "the meeting", "what did we decide", or "what came out of that call". ${SUMMARY_NOTE}`,
     fields: {
       limit: f.optional(
-        f.number({ desc: "How many to return (default 20, maximum 50).", int: true, min: 1, max: 50 })
+        f.number({
+          desc: "How many to return (default 20, maximum 50).",
+          int: true,
+          min: 1,
+          max: 50
+        })
       ),
       search: f.optional(
         f.string({ desc: "Case-insensitive match on the meeting title.", max: 200 })
@@ -9529,7 +9558,12 @@ var listMeetingsContract = defineToolContract({
     fields: {
       projectId: mcpProjectId,
       limit: f.optional(
-        f.number({ desc: "How many to return (default 20, maximum 50).", int: true, min: 1, max: 50 })
+        f.number({
+          desc: "How many to return (default 20, maximum 50).",
+          int: true,
+          min: 1,
+          max: 50
+        })
       ),
       search: f.optional(
         f.string({ desc: "Case-insensitive match on the meeting title.", max: 200 })
@@ -9583,9 +9617,7 @@ var SINCE_MINUTES = f.optional(
     max: 10080
   })
 );
-var START_TIME = f.optional(
-  f.string({ desc: "ISO 8601 lower bound (overrides sinceMinutes)" })
-);
+var START_TIME = f.optional(f.string({ desc: "ISO 8601 lower bound (overrides sinceMinutes)" }));
 var END_TIME = f.optional(f.string({ desc: "ISO 8601 upper bound (default now)" }));
 var LIMIT = f.optional(
   f.number({ desc: "Max entries per page (default 50)", int: true, min: 1, max: 200 })
@@ -9619,7 +9651,10 @@ var gcpFields = {
     })
   ),
   search: f.optional(
-    f.string({ desc: "Free-text search across all log fields (exact substring, not regex)", max: 256 })
+    f.string({
+      desc: "Free-text search across all log fields (exact substring, not regex)",
+      max: 256
+    })
   ),
   filter: f.optional(
     f.string({
@@ -11246,7 +11281,9 @@ var CONTEXT_PATH_SHAPE = z18.object({
   locator: z18.string().min(1).max(CONTEXT_LINK_LOCATOR_MAX).regex(/^[^\r\n]*$/, "Locator cannot contain line breaks").optional().describe(
     'Verified-link tether: text that must keep existing in the file. With locatorType "test" it must appear inside a real it/test/describe TITLE; with "code" anywhere in the file. Validated at write time against the checkout and re-checked by the periodic sweep \u2014 a rename/delete flags the link stale. Locators containing <> are placeholders and never checked.'
   ),
-  locatorType: z18.enum(["test", "code"]).optional().describe("How the locator must match \u2014 required iff locator is set; not valid on folder links")
+  locatorType: z18.enum(["test", "code"]).optional().describe(
+    "How the locator must match \u2014 required iff locator is set; not valid on folder links"
+  )
 }).refine((link) => link.locator === void 0 === (link.locatorType === void 0), {
   message: "locator and locatorType must be provided together"
 }).refine((link) => link.locator === void 0 || link.type !== "folder", {
@@ -11640,52 +11677,43 @@ function buildDriveCreateFileTool(connection, projectId) {
   );
 }
 function buildDriveUpdateFileTool(connection, projectId) {
-  return defineContractTool(
-    driveUpdateFileContract,
-    async ({ fileId, content, mimeType }) => {
-      try {
-        const file = await connection.call("updateProjectDriveFile", {
-          projectId,
-          fileId,
-          content,
-          mimeType
-        });
-        return textResult(`Updated "${file.name}" (${file.id})`);
-      } catch (error) {
-        return errText2("Failed to update the Google Drive file", error);
-      }
+  return defineContractTool(driveUpdateFileContract, async ({ fileId, content, mimeType }) => {
+    try {
+      const file = await connection.call("updateProjectDriveFile", {
+        projectId,
+        fileId,
+        content,
+        mimeType
+      });
+      return textResult(`Updated "${file.name}" (${file.id})`);
+    } catch (error) {
+      return errText2("Failed to update the Google Drive file", error);
     }
-  );
+  });
 }
 function buildDriveDeleteFileTool(connection, projectId) {
-  return defineContractTool(
-    driveDeleteFileContract,
-    async ({ fileId }) => {
-      try {
-        const result = await connection.call("deleteProjectDriveFile", { projectId, fileId });
-        return textResult(`Moved "${result.name}" (${result.id}) to the Google Drive trash`);
-      } catch (error) {
-        return errText2("Failed to delete the Google Drive file", error);
-      }
+  return defineContractTool(driveDeleteFileContract, async ({ fileId }) => {
+    try {
+      const result = await connection.call("deleteProjectDriveFile", { projectId, fileId });
+      return textResult(`Moved "${result.name}" (${result.id}) to the Google Drive trash`);
+    } catch (error) {
+      return errText2("Failed to delete the Google Drive file", error);
     }
-  );
+  });
 }
 function buildDriveCreateFolderTool(connection, projectId) {
-  return defineContractTool(
-    driveCreateFolderContract,
-    async ({ name, folderId }) => {
-      try {
-        const folder = await connection.call("createProjectDriveFolder", {
-          projectId,
-          name,
-          folderId
-        });
-        return textResult(`Created folder "${folder.name}" (${folder.id})`);
-      } catch (error) {
-        return errText2("Failed to create the Google Drive folder", error);
-      }
+  return defineContractTool(driveCreateFolderContract, async ({ name, folderId }) => {
+    try {
+      const folder = await connection.call("createProjectDriveFolder", {
+        projectId,
+        name,
+        folderId
+      });
+      return textResult(`Created folder "${folder.name}" (${folder.id})`);
+    } catch (error) {
+      return errText2("Failed to create the Google Drive folder", error);
     }
-  );
+  });
 }
 function buildDriveTools(connection, projectId) {
   return [
@@ -12524,16 +12552,22 @@ function questionTextFromEvent(event) {
 }
 async function armQuestionPending(host, state, event) {
   state.questionPending = true;
+  const questionText = questionTextFromEvent(event);
+  host.callbacks.onUserQuestion?.({
+    kind: "armed",
+    ...questionText === void 0 ? {} : { questionText }
+  });
   await host.connection.emitStatus(
     "waiting_for_input",
     AGENT_STATUS_REASON_USER_QUESTION,
-    questionTextFromEvent(event)
+    questionText
   );
   await host.callbacks.onStatusChange("waiting_for_input");
 }
 async function clearQuestionPending(host, state, options) {
   if (!state.questionPending) return;
   state.questionPending = false;
+  host.callbacks.onUserQuestion?.({ kind: options.emitRunning ? "answered" : "turn_ended" });
   if (options.emitRunning) {
     await host.connection.emitStatus("running");
     await host.callbacks.onStatusChange("running");
@@ -13681,6 +13715,29 @@ async function runInitialQuery(host, context, options, resume, promptDelivery) {
   }
   await trackAndRun(host, context, queryOptions, agentQuery);
 }
+function rotateSessionFile(cwd, sessionUuid) {
+  const path = sessionTranscriptPath(cwd, sessionUuid);
+  try {
+    if (!existsSync(path)) return true;
+    renameSync(path, `${path.replace(/\.jsonl$/, "")}.aborted-${Date.now()}.jsonl`);
+    return true;
+  } catch (error) {
+    logger5.warn("Could not rotate an aborted transcript aside", {
+      path,
+      error: error instanceof Error ? error.message : String(error)
+    });
+    return false;
+  }
+}
+function freshSessionOptions(host, context, options) {
+  const lineageUuid = taskIdToSessionUuid(
+    sessionLineageKey(context.taskId, host.agentMode, host.config.mode)
+  );
+  if (rotateSessionFile(host.config.workspaceDir, lineageUuid)) {
+    return { ...options, sessionId: lineageUuid };
+  }
+  return { ...options, sessionId: randomUUID2() };
+}
 async function buildRetryQuery(host, context, options, lastErrorWasImage) {
   if (lastErrorWasImage) {
     host.connection.postChatMessage(
@@ -13700,10 +13757,7 @@ async function buildRetryQuery(host, context, options, lastErrorWasImage) {
   );
   return host.harness.executeQuery({
     prompt: host.createInputStream(retryPrompt),
-    // Strip sessionId on retry — if the failing query partially created a
-    // session with that ID, passing it again would error. Let the SDK
-    // auto-generate on retry attempts.
-    options: { ...options, sessionId: void 0 },
+    options: freshSessionOptions(host, context, options),
     resume: void 0
   });
 }
@@ -13735,7 +13789,7 @@ async function handleAuthError(context, host, options) {
   );
   const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options, sessionId: void 0 },
+    options: freshSessionOptions(host, context, options),
     resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
@@ -13756,7 +13810,7 @@ async function handleStaleSession(context, host, options) {
   );
   const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options, sessionId: void 0 },
+    options: freshSessionOptions(host, context, options),
     resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
@@ -13856,7 +13910,7 @@ async function handleUsageCapRejection(context, host, options, rateLimitType, re
   );
   const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options, sessionId: void 0 },
+    options: freshSessionOptions(host, context, options),
     resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
@@ -14654,10 +14708,8 @@ var BackgroundWorkTracker = class {
     this.prune(now);
     if (this.deadlines.length === 0) return;
     this.deadlines.shift();
-    this.log(
-      `[conveyor-agent] background work finished; ${this.deadlines.length} outstanding
-`
-    );
+    this.log(`[conveyor-agent] background work finished; ${this.deadlines.length} outstanding
+`);
     this.onChange?.();
   }
   /** Is any non-expired background work outstanding? */
@@ -14707,6 +14759,15 @@ function findLiveChild(sources) {
 var AUTO_RUN_MODES = /* @__PURE__ */ new Set(["building", "auto", "review", "discovery", "chat"]);
 var CHILD_DEFER_RECHECK_MS = 60 * 1e3;
 var ORPHAN_WAKE_GRACE_MS = 3 * 60 * 1e3;
+var QUESTION_GRACE_MS = 10 * 6e4;
+var QUESTION_HOLD_SLACK_MS = 6e4;
+function resolveQuestionGraceMs() {
+  const raw = Number(process.env.CONVEYOR_QUESTION_GRACE_MS ?? "");
+  return Number.isFinite(raw) && raw > 0 ? raw : QUESTION_GRACE_MS;
+}
+var QUESTION_TYPING_RECENT_MS = 6e4;
+var QUESTION_TYPING_DEFER_MS = 2 * 6e4;
+var QUESTION_TIMEOUT_PROMPT = 'No one answered your clarifying questions within 10 minutes. Do this now: (1) Save your findings-so-far as the card plan (`update_task`). (2) Post the unanswered questions to chat with `post_to_chat` using `milestone: "blocked"`, stating the assumption you would make for each. (3) If you can safely proceed on your best-judgment answers, state the assumptions and continue; otherwise end your turn \u2014 answers posted in chat will be delivered when you resume.';
 var SessionRunner = class _SessionRunner {
   connection;
   mode;
@@ -14760,6 +14821,18 @@ var SessionRunner = class _SessionRunner {
   /** Guards the one-shot `agent_live` boot-milestone report — fired on the
    *  first harness event (createQueryBridge's onEvent hook). */
   agentLiveReported = false;
+  /** Epoch ms since a TUI questionnaire has been parked on a human with no
+   *  answer; null when none is pending. While set (and within the grace +
+   *  slack bound) `resolveLoopStatus` reports `waiting`, which reaches the API
+   *  as `active` and keeps the workspace activity clock fresh — the pod must
+   *  not be slept out from under an unanswered question. Deliberately KEPT
+   *  when the turn ends with the questionnaire still parked (the Shape-B
+   *  silent death this hold exists for). */
+  questionPendingSince = null;
+  /** Single-shot unref'd timer driving `handleQuestionGraceExpiry`. The
+   *  liveness hold above is bounded by timestamp arithmetic, so a lost timer
+   *  still expires the hold — it just skips the un-park injection. */
+  questionGraceTimer = null;
   constructor(config, callbacks, deps = {}) {
     this.config = config;
     this.callbacks = callbacks;
@@ -14886,8 +14959,10 @@ var SessionRunner = class _SessionRunner {
       if (this.backgroundWork.hasPending()) holding = "background work outstanding";
       else if (isHeavyGateActive()) holding = "a gate process is running";
     } catch (err) {
-      process.stderr.write(`[conveyor-agent] Background-work probe failed, not deferring: ${err}
-`);
+      process.stderr.write(
+        `[conveyor-agent] Background-work probe failed, not deferring: ${err}
+`
+      );
       return false;
     }
     if (!holding) {
@@ -15460,6 +15535,7 @@ var SessionRunner = class _SessionRunner {
   }
   /** Inject a message (from connection callback or external source) */
   injectMessage(msg) {
+    this.clearQuestionHold();
     if (this.inputResolver) {
       const resolve = this.inputResolver;
       this.inputResolver = null;
@@ -15667,6 +15743,7 @@ var SessionRunner = class _SessionRunner {
   }
   stop() {
     this.stopped = true;
+    this.clearQuestionHold();
     this.queryBridge?.stop();
     void this.queryBridge?.dispose().catch(() => {
     });
@@ -15761,7 +15838,8 @@ var SessionRunner = class _SessionRunner {
           void this.connection.sendHeartbeat();
         }
         return this.callbacks.onEvent(event);
-      }
+      },
+      onUserQuestion: (signal) => this.handleUserQuestionSignal(signal)
     });
     bridge.isParentTask = this.fullContext?.isParentTask ?? false;
     bridge.onBackgroundTaskDone = () => this.backgroundWork.noteCompletion();
@@ -15912,8 +15990,72 @@ ${outcome.failures.join("\n")}
    */
   resolveLoopStatus() {
     if (loopStatusForRunnerStatus(this._state) === "active") return "active";
+    if (this.questionPendingSince !== null && Date.now() - this.questionPendingSince < resolveQuestionGraceMs() + QUESTION_HOLD_SLACK_MS) {
+      return "waiting";
+    }
     return this.backgroundWork.hasPending() || isHeavyGateActive() ? "waiting" : "idle";
   }
+  // ── Question grace hold ────────────────────────────────────────────
+  /**
+   * Question-pending transitions from the event loop. `armed` starts the
+   * bounded liveness hold + the grace timer; `answered` clears both.
+   * `turn_ended` — the turn's result arrived with the questionnaire still
+   * parked — deliberately KEEPS them: that is the Shape-B silent death
+   * (idle heartbeats stop bumping the activity clock and the reconciler
+   * sleeps the pod minutes later) this hold exists to prevent.
+   */
+  handleUserQuestionSignal(signal) {
+    if (signal.kind === "armed") {
+      this.questionPendingSince = Date.now();
+      this.armQuestionGraceTimer(resolveQuestionGraceMs());
+      this.refreshLoopStatus();
+    } else if (signal.kind === "answered") {
+      this.clearQuestionHold();
+    }
+  }
+  armQuestionGraceTimer(delayMs) {
+    if (this.questionGraceTimer) clearTimeout(this.questionGraceTimer);
+    this.questionGraceTimer = setTimeout(() => this.handleQuestionGraceExpiry(), delayMs);
+    this.questionGraceTimer.unref();
+  }
+  clearQuestionHold() {
+    if (this.questionGraceTimer) {
+      clearTimeout(this.questionGraceTimer);
+      this.questionGraceTimer = null;
+    }
+    if (this.questionPendingSince === null) return;
+    this.questionPendingSince = null;
+    this.refreshLoopStatus();
+  }
+  /**
+   * The grace expired with the questionnaire still unanswered. Un-park the
+   * agent by injecting the timeout prompt as a superseding system message —
+   * the proven supersede path (mid-turn: queue + queryBridge.stop(), teardown
+   * kills the parked dialog and the respawn `--resume`s cleanly; idle: the
+   * inputResolver picks it up). Never synthetic keypresses: Enter would
+   * fabricate an answer and Esc handling is CLI-version-dependent.
+   *
+   * A human actively typing in the Connected-TUI defers the expiry — they may
+   * be mid-answer, and superseding would yank the dialog out from under them.
+   */
+  handleQuestionGraceExpiry() {
+    this.questionGraceTimer = null;
+    if (this.questionPendingSince === null || this.stopped) return;
+    const lastInput = this.connection.lastPtyInputAt;
+    if (lastInput !== null && Date.now() - lastInput < QUESTION_TYPING_RECENT_MS) {
+      this.questionPendingSince = Date.now();
+      this.armQuestionGraceTimer(QUESTION_TYPING_DEFER_MS);
+      return;
+    }
+    process.stderr.write(
+      "[conveyor-agent] Question grace expired with no answer \u2014 un-parking the agent\n"
+    );
+    this.injectMessage({
+      content: QUESTION_TIMEOUT_PROMPT,
+      userId: "system",
+      source: "question_timeout"
+    });
+  }
   /** Mirror the resolved status into the loop-lag buffer so the starvation-proof
    *  heartbeat worker reports it too. Returns what it wrote. */
   refreshLoopStatus() {
@@ -15942,6 +16084,7 @@ ${outcome.failures.join("\n")}
     process.stderr.write(`[conveyor-agent] Shutdown: reason=${finalState}
 `);
     this.connection.sendEvent({ type: "shutdown", reason: finalState });
+    this.clearQuestionHold();
     this.portDiscovery.stop();
     this.backgroundWork.clear();
     this.loopLag.stop();

package/dist/{chunk-SLUBOIYE.js → chunk-HFUVAHII.js}

@@ -287,6 +287,10 @@ var AgentConnection = class _AgentConnection {
   // PTY relay (S5 terminal). Single-slot callbacks, set per PtySession run.
   ptyInputCallback = null;
   ptyResizeCallback = null;
+  /** Epoch ms of the last relayed keystroke, or null before any input. The
+   *  question-grace expiry reads it to defer un-parking while a human is
+   *  actively typing into the Connected-TUI (they may be mid-answer). */
+  _lastPtyInputAt = null;
   constructor(config) {
     this.config = config;
   }
@@ -475,6 +479,7 @@ var AgentConnection = class _AgentConnection {
       });
       this.socket.on("pty:input", (data) => {
         if (data.sessionId && data.sessionId !== this.config.sessionId) return;
+        this._lastPtyInputAt = Date.now();
         this.ptyInputCallback?.(data.data);
       });
       this.socket.on("pty:resize", (data) => {
@@ -925,6 +930,10 @@ var AgentConnection = class _AgentConnection {
     }).catch(() => {
     });
   }
+  /** Epoch ms of the last relayed TUI keystroke, or null before any. */
+  get lastPtyInputAt() {
+    return this._lastPtyInputAt;
+  }
   /** Subscribe to relayed keystrokes. Returns an unsubscribe fn. */
   onPtyInput(handler) {
     this.ptyInputCallback = handler;

package/dist/{chunk-URYBO32C.js → chunk-UHMCBCQL.js}

@@ -5,7 +5,7 @@ import {
   readWorkspaceBytes,
   statWorkspacePath,
   workspacePathExists
-} from "./chunk-SLUBOIYE.js";
+} from "./chunk-HFUVAHII.js";
 import {
   reportBootMilestone
 } from "./chunk-GL2DIQEQ.js";

package/dist/{chunk-3F4ZZKCA.js → chunk-W6VILPQE.js}

@@ -4,6 +4,7 @@ import {
 } from "./chunk-W4LZ7R6Z.js";
 
 // src/harness/pty/pty-support.ts
+import { randomUUID } from "crypto";
 import { stat } from "fs/promises";
 import { tmpdir } from "os";
 
@@ -153,6 +154,10 @@ function resolvePlanDialogTiming() {
     windowMs: envMs("CONVEYOR_PTY_PLAN_DIALOG_WINDOW_MS", PLAN_DIALOG_WINDOW_MS)
   };
 }
+function ensureSessionTarget(options, want, mintId = randomUUID) {
+  if (want || options.sessionId) return options;
+  return { ...options, sessionId: mintId() };
+}
 function turnOptionsFrom(options) {
   return {
     canUseTool: options.canUseTool,
@@ -278,6 +283,7 @@ export {
   resolveSubmitNudgeTiming,
   resolveSubmitRedeliveryMaxAttempts,
   resolvePlanDialogTiming,
+  ensureSessionTarget,
   turnOptionsFrom,
   killPtyWithEscalation,
   loadPtySpawn,

package/dist/cli.js

@@ -7,7 +7,7 @@ import {
   WorkspaceCommandSupervisor,
   startWorkspaceCommandsAfterConnect,
   stopWorkspaceCommands
-} from "./chunk-URYBO32C.js";
+} from "./chunk-UHMCBCQL.js";
 import {
   DEFAULT_SONNET_MODEL,
   PtyHarness,
@@ -27,13 +27,13 @@ import {
   resolveTuiKindFromEnv,
   runUsageProbe,
   sampleKeyUsage
-} from "./chunk-HYPX6FEX.js";
+} from "./chunk-GUYMLASA.js";
 import "./chunk-XORJ6SII.js";
 import {
   inheritedEnv,
   resolvePtySpawn,
   sessionTempBase
-} from "./chunk-3F4ZZKCA.js";
+} from "./chunk-W6VILPQE.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -44,7 +44,7 @@ import {
   createServiceLogger,
   fetchBootstrap,
   loadConveyorConfig
-} from "./chunk-SLUBOIYE.js";
+} from "./chunk-HFUVAHII.js";
 import "./chunk-GL2DIQEQ.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-7P6QZHXZ.js";
@@ -1201,7 +1201,7 @@ function wireSpawnChildren(mode, connection, supervisors, logger7) {
 
 // src/cli.ts
 if (process.argv[2] === "boot") {
-  const { runBoot } = await import("./boot-SWUVT5B4.js");
+  const { runBoot } = await import("./boot-7XH4FFLO.js");
   process.exit(await runBoot(process.argv.slice(3)));
 }
 if (isLegacyEntrypointLaunch(process.env)) {
@@ -1303,7 +1303,7 @@ process.on("unhandledRejection", (reason) => {
   process.exit(1);
 });
 if (process.env.CONVEYOR_MODE === "workbench") {
-  const { startWorkbenchServer } = await import("./server-7XH7RYUX.js");
+  const { startWorkbenchServer } = await import("./server-2Z5V3IPA.js");
   const { oomWatchdogOptionsFromEnv } = await import("./oom-watchdog-PAC5OJJG.js");
   const { DEFAULT_WORKBENCH_PORT } = await import("./protocol-QBCYO4GI.js");
   const port = Number(process.env.CONVEYOR_WORKBENCH_PORT) || DEFAULT_WORKBENCH_PORT;
@@ -1454,7 +1454,7 @@ if (!RUNNER_MODES.includes(CONVEYOR_MODE)) {
   process.exit(1);
 }
 if (CONVEYOR_MODE === "serving") {
-  const { runServingSession } = await import("./serve-boot-B4BIZMNB.js");
+  const { runServingSession } = await import("./serve-boot-IFUIGFEH.js");
   exitContext.runnerMode = "serving";
   exitContext.sessionId = process.env.CONVEYOR_SESSION_ID ?? exitContext.sessionId;
   const outcome = await runServingSession({

package/dist/gate-cli.js

@@ -79,7 +79,9 @@ function runGate(argv, options = {}) {
 try {
   process.exitCode = await runGate(process.argv.slice(2));
 } catch (error) {
-  process.stderr.write(`conveyor-gate: ${error instanceof Error ? error.message : String(error)}
-`);
+  process.stderr.write(
+    `conveyor-gate: ${error instanceof Error ? error.message : String(error)}
+`
+  );
   process.exitCode = 2;
 }

package/dist/index.d.ts

@@ -131,6 +131,10 @@ declare class AgentConnection {
     private earlyProbeUsage;
     private ptyInputCallback;
     private ptyResizeCallback;
+    /** Epoch ms of the last relayed keystroke, or null before any input. The
+     *  question-grace expiry reads it to defer un-parking while a human is
+     *  actively typing into the Connected-TUI (they may be mid-answer). */
+    private _lastPtyInputAt;
     constructor(config: AgentConnectionConfig);
     get sessionId(): string;
     get connected(): boolean;
@@ -282,6 +286,8 @@ declare class AgentConnection {
      * just stays on the relay transport.
      */
     reportPtyStream(port: number | null): void;
+    /** Epoch ms of the last relayed TUI keystroke, or null before any. */
+    get lastPtyInputAt(): number | null;
     /** Subscribe to relayed keystrokes. Returns an unsubscribe fn. */
     onPtyInput(handler: (data: string) => void): () => void;
     /** Subscribe to relayed (reconciled) terminal resizes. Returns an unsubscribe fn. */
@@ -729,6 +735,18 @@ declare class SessionRunner {
     /** Guards the one-shot `agent_live` boot-milestone report — fired on the
      *  first harness event (createQueryBridge's onEvent hook). */
     private agentLiveReported;
+    /** Epoch ms since a TUI questionnaire has been parked on a human with no
+     *  answer; null when none is pending. While set (and within the grace +
+     *  slack bound) `resolveLoopStatus` reports `waiting`, which reaches the API
+     *  as `active` and keeps the workspace activity clock fresh — the pod must
+     *  not be slept out from under an unanswered question. Deliberately KEPT
+     *  when the turn ends with the questionnaire still parked (the Shape-B
+     *  silent death this hold exists for). */
+    private questionPendingSince;
+    /** Single-shot unref'd timer driving `handleQuestionGraceExpiry`. The
+     *  liveness hold above is bounded by timestamp arithmetic, so a lost timer
+     *  still expires the hold — it just skips the un-park injection. */
+    private questionGraceTimer;
     constructor(config: SessionRunnerConfig, callbacks: SessionRunnerCallbacks, deps?: SessionRunnerDependencies);
     get state(): AgentRunnerStatus;
     /**
@@ -1016,6 +1034,29 @@ declare class SessionRunner {
      * for why an unknown status still fails open to `active`.
      */
     private resolveLoopStatus;
+    /**
+     * Question-pending transitions from the event loop. `armed` starts the
+     * bounded liveness hold + the grace timer; `answered` clears both.
+     * `turn_ended` — the turn's result arrived with the questionnaire still
+     * parked — deliberately KEEPS them: that is the Shape-B silent death
+     * (idle heartbeats stop bumping the activity clock and the reconciler
+     * sleeps the pod minutes later) this hold exists to prevent.
+     */
+    private handleUserQuestionSignal;
+    private armQuestionGraceTimer;
+    private clearQuestionHold;
+    /**
+     * The grace expired with the questionnaire still unanswered. Un-park the
+     * agent by injecting the timeout prompt as a superseding system message —
+     * the proven supersede path (mid-turn: queue + queryBridge.stop(), teardown
+     * kills the parked dialog and the respawn `--resume`s cleanly; idle: the
+     * inputResolver picks it up). Never synthetic keypresses: Enter would
+     * fabricate an answer and Esc handling is CLI-version-dependent.
+     *
+     * A human actively typing in the Connected-TUI defers the expiry — they may
+     * be mid-answer, and superseding would yank the dialog out from under them.
+     */
+    private handleQuestionGraceExpiry;
     /** Mirror the resolved status into the loop-lag buffer so the starvation-proof
      *  heartbeat worker reports it too. Returns what it wrote. */
     private refreshLoopStatus;
@@ -1055,9 +1096,31 @@ interface AgentRunnerConfig {
      */
     packExecution?: _project_shared.PackExecution;
 }
+/**
+ * Question-pending transitions surfaced to the runner by the event loop
+ * (`applyQuestionTransitions` in execution/event-processor.ts):
+ *  - `armed` — the PTY hook observed an AskUserQuestion; a questionnaire is
+ *    parked on a human.
+ *  - `answered` — the questionnaire resolved (PostToolUse envelope, or a new
+ *    assistant record without the question block).
+ *  - `turn_ended` — the turn's `result` arrived while the questionnaire was
+ *    still parked. The dialog is still on screen with nobody answering — the
+ *    silent-death shape the question grace hold exists for — so the runner
+ *    must KEEP its pending hold rather than clear it.
+ */
+type UserQuestionSignal = {
+    kind: "armed";
+    questionText?: string;
+} | {
+    kind: "answered";
+} | {
+    kind: "turn_ended";
+};
 interface AgentRunnerCallbacks {
     onEvent: (event: Record<string, unknown>) => void | Promise<void>;
     onStatusChange: (status: string) => void | Promise<void>;
+    /** Optional — fired on question-pending transitions (see UserQuestionSignal). */
+    onUserQuestion?: (signal: UserQuestionSignal) => void;
 }
 
 interface GithubTokenFileSync {

package/dist/index.js

@@ -1,9 +1,9 @@
 import {
   SessionRunner,
   unshallowRepo
-} from "./chunk-HYPX6FEX.js";
+} from "./chunk-GUYMLASA.js";
 import "./chunk-XORJ6SII.js";
-import "./chunk-3F4ZZKCA.js";
+import "./chunk-W6VILPQE.js";
 import {
   AgentConnection,
   GIT_TIMEOUT_MS,
@@ -17,7 +17,7 @@ import {
   stageAndCommit,
   updateRemoteToken,
   workspacePathExists
-} from "./chunk-SLUBOIYE.js";
+} from "./chunk-HFUVAHII.js";
 import "./chunk-GL2DIQEQ.js";
 import {
   runAuthTokenCommand,

package/dist/{serve-boot-B4BIZMNB.js → serve-boot-IFUIGFEH.js}

@@ -1,6 +1,6 @@
 import {
   WorkspaceCommandSupervisor
-} from "./chunk-URYBO32C.js";
+} from "./chunk-UHMCBCQL.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -11,7 +11,7 @@ import {
   createServiceLogger,
   ensureOnTaskBranch,
   loadConveyorConfig
-} from "./chunk-SLUBOIYE.js";
+} from "./chunk-HFUVAHII.js";
 import "./chunk-GL2DIQEQ.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-IA45XHOA.js";

package/dist/{server-7XH7RYUX.js → server-2Z5V3IPA.js}

@@ -1,7 +1,7 @@
 import {
   startWorkbenchServer
-} from "./chunk-UBDSLM44.js";
-import "./chunk-3F4ZZKCA.js";
+} from "./chunk-D57S4UR5.js";
+import "./chunk-W6VILPQE.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-6Q6LQBWO.js";
 import "./chunk-6W6UZ4SJ.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-agent",
-  "version": "11.0.4",
+  "version": "11.0.6",
   "description": "Conveyor Agent Runner v10 - PTY harness for the task chat (SDK harness for audit/project-chat). Agent-as-User architecture with BaseService patterns. Works locally too.",
   "keywords": [
     "agent",