@rallycry/conveyor-agent 8.4.1 → 8.5.0

package/dist/{chunk-B4QHEMMV.js → chunk-3T4SJEH6.js}

@@ -5,13 +5,14 @@ import {
   textResult
 } from "./chunk-FDWECEDJ.js";
 import {
+  configHomePlansDir,
   createHarness,
   createServiceLogger,
   defineTool,
   ensureClaudeCredentials,
   removeConveyorCredentials,
   sessionTranscriptPath
-} from "./chunk-VDH55LTT.js";
+} from "./chunk-63FTZOL5.js";
 
 // src/setup/bootstrap.ts
 var BOOTSTRAP_TIMEOUT_MS = 3e4;
@@ -227,7 +228,8 @@ var AgentConnection = class _AgentConnection {
           content: msg.content,
           userId: msg.userId,
           ...msg.source && { source: msg.source },
-          ...msg.files && { files: msg.files }
+          ...msg.files && { files: msg.files },
+          ...msg.delivery === "prefill" && { delivery: msg.delivery }
         };
         if (this.messageCallback) this.messageCallback(incoming);
         else this.earlyMessages.push(incoming);
@@ -1316,7 +1318,7 @@ var PlanSync = class {
     this.workspaceDir = workspaceDir;
   }
   getPlanDirs() {
-    return [join(this.workspaceDir, ".claude", "plans")];
+    return [join(this.workspaceDir, ".claude", "plans"), configHomePlansDir()];
   }
   snapshotPlanFiles() {
     this.planFileSnapshot.clear();
@@ -6259,7 +6261,11 @@ async function handleExitPlanMode(host, input) {
       await host.connection.postChatMessageAwait(
         "Planning complete \u2014 awaiting team approval. Icon and agent assignment will be set automatically."
       );
-      host.requestStop();
+      if (host.harnessKind === "pty") {
+        setTimeout(() => host.requestStop(), 250);
+      } else {
+        host.requestStop();
+      }
       return { behavior: "allow", updatedInput: input };
     }
     try {
@@ -6533,9 +6539,10 @@ function repairTornSessionFile(path2) {
 }
 function resolvePromptDelivery(inputs) {
   if (inputs.harnessKind !== "pty") return "submit";
-  if ((inputs.runnerMode ?? "task") !== "task") return "submit";
+  if (inputs.runnerMode === "code-review") return "submit";
   if (inputs.isFollowUp || inputs.hasExistingSession) return "submit";
   if (inputs.isAuto || inputs.agentMode === "auto") return "submit";
+  if (inputs.agentMode !== "discovery" && inputs.agentMode !== "help") return "submit";
   return "prefill";
 }
 function isReadOnlyMode(mode, hasExitedPlanMode) {
@@ -6572,6 +6579,14 @@ function buildQueryOptions(host, context) {
     permissionMode: needsCanUseTool ? "plan" : "bypassPermissions",
     allowDangerouslySkipPermissions: !needsCanUseTool,
     canUseTool: buildCanUseTool(host),
+    // The spawned CLI never sees `systemPrompt` (an SDK-only option) — deliver
+    // the same text via `--append-system-prompt`. PTY-only: the SDK harness
+    // already receives it through systemPrompt.append.
+    ...host.harnessKind === "pty" && systemPromptText ? { appendSystemPrompt: systemPromptText } : {},
+    // Auto mode pre-exit: after the ExitPlanMode hook allows the call, the
+    // CLI's plan dialog still renders — press Enter so the autonomous agent
+    // continues building in the same session (Conveyor validated in the hook).
+    planDialogAutoAccept: mode === "auto" && !host.hasExitedPlanMode,
     tools: { type: "preset", preset: "claude_code" },
     mcpServers: {
       conveyor: createConveyorMcpServer(host.harness, host.connection, host.config, context, mode)
@@ -6712,13 +6727,7 @@ async function runSdkQuery(host, context, followUpContent, promptDeliveryOverrid
   };
   const resume = hasExistingSession ? sessionUuid : void 0;
   if (followUpContent) {
-    const prompt = await buildFollowUpPrompt(host, context, followUpContent);
-    const agentQuery = host.harness.executeQuery({
-      prompt: typeof prompt === "string" ? prompt : host.createInputStream(prompt),
-      options: { ...options },
-      resume
-    });
-    await trackAndRun(host, context, options, agentQuery);
+    await runFollowUpQuery(host, context, options, resume, followUpContent);
   } else if (isDiscoveryLike && promptDelivery !== "prefill") {
     return;
   } else {
@@ -6728,6 +6737,42 @@ async function runSdkQuery(host, context, followUpContent, promptDeliveryOverrid
     await host.syncPlanFile();
   }
 }
+async function runFollowUpQuery(host, context, options, resume, followUpContent) {
+  if (options.promptDelivery === "prefill") {
+    await runPrefilledFollowUp(host, context, options, resume, followUpContent);
+    return;
+  }
+  const prompt = await buildFollowUpPrompt(host, context, followUpContent);
+  const agentQuery = host.harness.executeQuery({
+    prompt: typeof prompt === "string" ? prompt : host.createInputStream(prompt),
+    options: { ...options },
+    resume
+  });
+  await trackAndRun(host, context, options, agentQuery);
+}
+async function runPrefilledFollowUp(host, context, options, resume, followUpContent) {
+  const followUpText = typeof followUpContent === "string" ? followUpContent : followUpContent.filter((b) => b.type === "text").map((b) => b.text).join("\n");
+  const queryOptions = { ...options };
+  if (host.config.mode === "pm" && !resume) {
+    const initialPrompt = await buildInitialPrompt(
+      host.config.mode,
+      context,
+      host.isAuto,
+      host.agentMode
+    );
+    queryOptions.appendSystemPrompt = [queryOptions.appendSystemPrompt, initialPrompt].filter(Boolean).join("\n\n").slice(0, APPEND_SYSTEM_PROMPT_MAX_CHARS);
+  }
+  let agentQuery = host.harness.executeQuery({
+    prompt: followUpText,
+    options: queryOptions,
+    resume
+  });
+  agentQuery = notifyOnFirstEvent(agentQuery, async () => {
+    host.connection.emitStatus("running");
+    await host.callbacks.onStatusChange("running");
+  });
+  await trackAndRun(host, context, queryOptions, agentQuery);
+}
 async function trackAndRun(host, context, options, agentQuery) {
   if (host.harnessKind === "pty" && options.promptDelivery !== "prefill") {
     agentQuery = watchForParkedTui(agentQuery, host);
@@ -6739,6 +6784,14 @@ async function trackAndRun(host, context, options, agentQuery) {
     host.activeQuery = null;
   }
 }
+var APPEND_SYSTEM_PROMPT_MAX_CHARS = 96e3;
+function latestUserMessageText(context) {
+  for (let i = context.chatHistory.length - 1; i >= 0; i--) {
+    const msg = context.chatHistory[i];
+    if (msg.role === "user" && msg.content.trim()) return msg.content.trim();
+  }
+  return null;
+}
 async function runInitialQuery(host, context, options, resume, promptDelivery) {
   const initialPrompt = await buildInitialPrompt(
     host.config.mode,
@@ -6746,10 +6799,18 @@ async function runInitialQuery(host, context, options, resume, promptDelivery) {
     host.isAuto,
     host.agentMode
   );
-  const prompt = buildMultimodalPrompt(initialPrompt, context);
+  let prompt;
+  const queryOptions = { ...options };
+  const prefillMessage = promptDelivery === "prefill" ? latestUserMessageText(context) : null;
+  if (prefillMessage) {
+    prompt = prefillMessage;
+    queryOptions.appendSystemPrompt = [queryOptions.appendSystemPrompt, initialPrompt].filter(Boolean).join("\n\n").slice(0, APPEND_SYSTEM_PROMPT_MAX_CHARS);
+  } else {
+    prompt = buildMultimodalPrompt(initialPrompt, context);
+  }
   let agentQuery = host.harness.executeQuery({
     prompt: host.createInputStream(prompt),
-    options: { ...options },
+    options: queryOptions,
     resume
   });
   if (promptDelivery === "prefill") {
@@ -6758,7 +6819,7 @@ async function runInitialQuery(host, context, options, resume, promptDelivery) {
       await host.callbacks.onStatusChange("running");
     });
   }
-  await trackAndRun(host, context, options, agentQuery);
+  await trackAndRun(host, context, queryOptions, agentQuery);
 }
 async function buildRetryQuery(host, context, options, lastErrorWasImage) {
   if (lastErrorWasImage) {
@@ -7111,6 +7172,7 @@ var QueryBridge = class {
   runnerConfig;
   callbacks;
   harness;
+  /** Which harness drives this bridge ("pty" task chat vs "sdk" rollback). */
   harnessKind;
   costTracker;
   planSync;
@@ -7516,10 +7578,13 @@ var SessionRunner = class _SessionRunner {
     this.queryBridge = this.createQueryBridge();
     await this.seedCostTrackerFromServer();
     this.logInitialization();
-    const staleMessageCount = this.pendingMessages.length;
+    const staleBatch = [...this.pendingMessages];
     const didExecuteInitialQuery = await this.executeInitialMode();
-    if (staleMessageCount > 0 && didExecuteInitialQuery) {
-      this.pendingMessages.splice(0, staleMessageCount);
+    if (staleBatch.length > 0 && didExecuteInitialQuery) {
+      for (const stale of staleBatch) {
+        const idx = this.pendingMessages.indexOf(stale);
+        if (idx !== -1) this.pendingMessages.splice(idx, 1);
+      }
     }
     if (this.queryBridge?.isDiscoveryCompleted) {
       process.stderr.write(
@@ -7567,14 +7632,18 @@ var SessionRunner = class _SessionRunner {
           }
           break;
         }
-        await this.setState("running");
         this.interrupted = false;
         await this.callbacks.onEvent({
           type: "user_message",
           content: msg.content,
           userId: msg.userId
         });
-        await this.executeQuery(msg.content);
+        if (this.prefillEligible(msg)) {
+          await this.runPrefilledMessage(msg, this.mode.effectiveMode);
+        } else {
+          await this.setState("running");
+          await this.executeQuery(msg.content);
+        }
         if (this.queryBridge?.isDiscoveryCompleted) {
           process.stderr.write(
             "[conveyor-agent] Discovery completed \u2014 entering dormant idle (staying connected)\n"
@@ -7647,7 +7716,13 @@ var SessionRunner = class _SessionRunner {
   async executeInitialMode() {
     if (!this.taskContext || !this.fullContext) return false;
     const effectiveMode = this.mode.effectiveMode;
-    const delivery = this.pendingMessages.length > 0 ? "submit" : this.queryBridge?.initialPromptDelivery(this.fullContext) ?? "submit";
+    const intrinsicDelivery = this.queryBridge?.initialPromptDelivery(this.fullContext) ?? "submit";
+    const hinted = this.prepareInitialPendingMessages(intrinsicDelivery);
+    if (hinted) {
+      await this.runPrefilledMessage(hinted, effectiveMode);
+      return true;
+    }
+    const delivery = this.pendingMessages.length > 0 ? "submit" : intrinsicDelivery;
     const shouldRun = effectiveMode === "building" || effectiveMode === "auto" || effectiveMode === "review" || delivery === "prefill";
     if (!shouldRun) {
       await this.setState("idle");
@@ -7674,6 +7749,88 @@ var SessionRunner = class _SessionRunner {
     if (!this.stopped) await this.setState("idle");
     return true;
   }
+  // ── Prefill-delivery helpers ───────────────────────────────────────
+  /**
+   * Startup-queue preamble: the card's initial message reaches a fresh pod
+   * twice — inside the task context (chat history) AND as a queued pending
+   * message. When the intrinsic delivery is prefill (manual-mode fresh TUI)
+   * or a hinted message is queued (Refine), drop those context-duplicates so
+   * they don't force submit semantics — a genuinely-new live message still
+   * does. Returns the lone hinted message to park, if any.
+   */
+  prepareInitialPendingMessages(intrinsicDelivery) {
+    const hasHintedPending = this.pendingMessages.some((m) => m.delivery === "prefill");
+    if (this.pendingMessages.length > 0 && (intrinsicDelivery === "prefill" || hasHintedPending)) {
+      this.foldContextDuplicatePendingMessages();
+    }
+    return this.takePrefillHintedMessage();
+  }
+  /**
+   * Drop pending messages whose content is already present as a user message
+   * in the task-context chat history (the card's initial message is delivered
+   * both ways). Hinted (prefill) messages are kept — they are consumed by the
+   * dedicated prefill path.
+   */
+  foldContextDuplicatePendingMessages() {
+    const userContents = new Set(
+      (this.fullContext?.chatHistory ?? []).filter((m) => m.role === "user" && m.content.trim()).map((m) => m.content.trim())
+    );
+    const kept = this.pendingMessages.filter(
+      (m) => m.delivery === "prefill" || !m.content.trim() || !userContents.has(m.content.trim())
+    );
+    const dropped = this.pendingMessages.length - kept.length;
+    if (dropped > 0) {
+      this.pendingMessages.length = 0;
+      this.pendingMessages.push(...kept);
+      process.stderr.write(
+        `[conveyor-agent] Folded ${dropped} pending message(s) already present in chat context
+`
+      );
+    }
+  }
+  /**
+   * Honor a prefill hint only when it is unambiguous: PTY harness, a manual
+   * (human-facing) agent mode, no other message queued behind it, and not an
+   * automated-critical source. Everything else keeps submit semantics.
+   */
+  prefillEligible(msg) {
+    if (msg.delivery !== "prefill") return false;
+    if (this.pendingMessages.length > 0) return false;
+    if (this.queryBridge?.harnessKind !== "pty") return false;
+    if (msg.source && msg.source !== "mode_change" && msg.source !== "user") return false;
+    const m = this.mode.effectiveMode;
+    return m === "discovery" || m === "review" || m === "help";
+  }
+  /** Consume the sole pending message when it should park as a prefill. */
+  takePrefillHintedMessage() {
+    if (this.pendingMessages.length !== 1) return null;
+    const [first] = this.pendingMessages;
+    if (!first || first.delivery !== "prefill") return null;
+    this.pendingMessages.length = 0;
+    if (this.prefillEligible(first)) return first;
+    this.pendingMessages.push(first);
+    return null;
+  }
+  /**
+   * Park a message in the Connected-TUI input (prefill) and wait for the human
+   * to submit. Empty content prefills the mode's initial prompt instead (the
+   * latest user chat message — e.g. a Refine wake on a dormant agent). The
+   * caller restores the idle state afterwards.
+   */
+  async runPrefilledMessage(msg, effectiveMode) {
+    await this.setState("waiting_for_input");
+    await this.callbacks.onEvent({
+      type: "execute_mode",
+      mode: effectiveMode,
+      delivery: "prefill"
+    });
+    this.lifecycle.startIdleTimer();
+    try {
+      await this.executeQuery(msg.content.trim() ? msg.content : void 0, "prefill");
+    } finally {
+      this.lifecycle.cancelIdleTimer();
+    }
+  }
   // ── Message waiting ────────────────────────────────────────────────
   waitForMessage() {
     if (this.pendingMessages.length > 0) {
@@ -10111,7 +10268,7 @@ var ProjectRunner = class {
   async handleAuditTags(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTagAudit } = await import("./tag-audit-handler-SWVMCAJH.js");
+      const { handleTagAudit } = await import("./tag-audit-handler-PKYLDJHH.js");
       await handleTagAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = parseErrorMessage(error);
@@ -10134,7 +10291,7 @@ var ProjectRunner = class {
   async handleAuditTasks(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTaskAudit } = await import("./task-audit-handler-CZ2WWJFO.js");
+      const { handleTaskAudit } = await import("./task-audit-handler-WINYLZMU.js");
       await handleTaskAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = parseErrorMessage(error);
@@ -10275,4 +10432,4 @@ export {
   loadConveyorConfig,
   unshallowRepo
 };
-//# sourceMappingURL=chunk-B4QHEMMV.js.map
+//# sourceMappingURL=chunk-3T4SJEH6.js.map