@rallycry/conveyor-agent 8.8.0 → 8.9.0

package/dist/{chunk-KEBJAORX.js → chunk-6462GDLZ.js}

@@ -12,7 +12,7 @@ import {
   ensureClaudeCredentials,
   removeConveyorCredentials,
   sessionTranscriptPath
-} from "./chunk-6B545CHM.js";
+} from "./chunk-TN2YYT2V.js";
 
 // src/setup/bootstrap.ts
 var BOOTSTRAP_TIMEOUT_MS = 3e4;
@@ -1424,14 +1424,11 @@ var PlanSync = class {
   }
 };
 
-// src/execution/query-executor.ts
-import { createHash } from "crypto";
-import { existsSync, readFileSync as readFileSync2, truncateSync } from "fs";
-
 // ../shared/dist/index.js
 import { z } from "zod";
 import { z as z2 } from "zod";
 import { z as z3 } from "zod";
+var DEFAULT_SONNET_MODEL = "claude-sonnet-4-6";
 var MAX_FILE_SIZE_BYTES = 25 * 1024 * 1024;
 var EMBED_THRESHOLD_IMAGES = 5 * 1024 * 1024;
 var EMBED_THRESHOLD_TEXT = 2 * 1024 * 1024;
@@ -2220,6 +2217,10 @@ var TASK_CHAT_HISTORY_LIMIT = 20;
 var PM_CHAT_HISTORY_LIMIT = 40;
 var AGENT_CHAT_HISTORY_FETCH_LIMIT = Math.max(TASK_CHAT_HISTORY_LIMIT, PM_CHAT_HISTORY_LIMIT) + 10;
 
+// src/execution/query-executor.ts
+import { createHash } from "crypto";
+import { existsSync, readFileSync as readFileSync2, truncateSync } from "fs";
+
 // src/execution/pack-runner-prompt.ts
 function findLastAgentMessageIndex(history) {
   for (let i = history.length - 1; i >= 0; i--) {
@@ -7401,7 +7402,7 @@ var ExplorationTracker = class {
 // src/runner/query-bridge.ts
 var logger3 = createServiceLogger("QueryBridge");
 function resolveHarnessKind() {
-  return process.env.CONVEYOR_HARNESS === "sdk" ? "sdk" : "pty";
+  return process.env.CONVEYOR_FORCE_SDK_CARDS === "1" ? "sdk" : "pty";
 }
 function buildPtyBridge(connection) {
   return {
@@ -7430,7 +7431,8 @@ var QueryBridge = class {
   runnerConfig;
   callbacks;
   harness;
-  /** Which harness drives this bridge ("pty" task chat vs "sdk" rollback). */
+  /** Which harness drives this bridge ("pty" task chat; "sdk" only under the
+   *  CONVEYOR_FORCE_SDK_CARDS maintainer override). */
   harnessKind;
   costTracker;
   planSync;
@@ -7686,6 +7688,9 @@ function handlePullBranch(workDir, branch) {
 }
 
 // src/runner/session-runner.ts
+function isPostToChatTool(name) {
+  return typeof name === "string" && (name === "post_to_chat" || name.endsWith("__post_to_chat"));
+}
 var SessionRunner = class _SessionRunner {
   connection;
   mode;
@@ -7711,6 +7716,12 @@ var SessionRunner = class _SessionRunner {
   inputResolver = null;
   pendingMessages = [];
   prNudgeCount = 0;
+  /** Set when the agent posts a substantive message to the task chat (the
+   *  `post_to_chat` tool) during the current turn; reset at the start of every
+   *  query. Read by the stuck-detection: an auto agent that finished without a
+   *  PR but DID explain itself / ask for help in chat is waiting on a human,
+   *  not silently stuck, so it is left attached rather than nudged. */
+  agentSpokeThisTurn = false;
   /** Guards overlapping runs of the periodic git flush. */
   periodicFlushInFlight = false;
   constructor(config, callbacks) {
@@ -7851,7 +7862,7 @@ var SessionRunner = class _SessionRunner {
       this.queryBridge.isDiscoveryCompleted = false;
     }
     if (!this.stopped && this.pendingMessages.length === 0) {
-      await this.maybeSendPRNudge();
+      await this.maybeHandleStuckAuto();
     }
     if (!this.stopped) {
       process.stderr.write(
@@ -7924,7 +7935,7 @@ var SessionRunner = class _SessionRunner {
           continue;
         }
         if (!this.stopped && this.pendingMessages.length === 0) {
-          await this.maybeSendPRNudge();
+          await this.maybeHandleStuckAuto();
         }
         if (!this.stopped) await this.setState("idle");
       } else if (this._state === "error") {
@@ -8115,6 +8126,7 @@ var SessionRunner = class _SessionRunner {
   /** Run queryBridge.execute, swallowing abort errors from stop/softStop. */
   async executeQuery(followUpContent, promptDelivery) {
     if (!this.fullContext || !this.queryBridge) return;
+    this.agentSpokeThisTurn = false;
     try {
       await this.queryBridge.execute(this.fullContext, followUpContent, promptDelivery);
     } catch (err) {
@@ -8208,15 +8220,38 @@ var SessionRunner = class _SessionRunner {
       resolver(null);
     }
   }
-  // ── Auto-mode PR nudge ──────────────────────────────────────────────
-  static MAX_PR_NUDGES = 3;
-  needsPRNudge() {
+  // ── Auto-mode stuck detection & nudge ───────────────────────────────
+  static MAX_STUCK_NUDGES = 3;
+  /** The prompt delivered into the live TUI when an auto agent looks stuck. It
+   *  must offer BOTH escape routes so the agent never just goes idle. */
+  static STUCK_PROMPT = "You are in Auto mode, your task is still In Progress, and there is no open pull request. Do ONE of these right now: (1) open a pull request with the create_pull_request tool, OR (2) call post_to_chat to explain exactly where you are stuck and what you need from a human. Do not finish or go idle silently.";
+  /**
+   * An auto task is "stuck" when its last turn ended (the call sites run
+   * post-turn, so the TUI is no longer actively working), it has no open PR,
+   * AND the agent did not communicate in chat this turn. If the agent posted a
+   * message (explained itself / asked for help) it is waiting on a human, not
+   * silently stuck, so we leave it attached instead of nudging.
+   */
+  isAutoStuck() {
     if (!this.mode.isAuto || this.stopped) return false;
     if (this.queryBridge?.wasRateLimited) return false;
-    if (this.prNudgeCount > _SessionRunner.MAX_PR_NUDGES) return false;
+    if (this.prNudgeCount > _SessionRunner.MAX_STUCK_NUDGES) return false;
+    if (this.agentSpokeThisTurn) return false;
     if (!this.taskContext) return false;
     return this.taskContext.status === "InProgress" && !this.taskContext.githubPRUrl;
   }
+  /**
+   * Stop driving the agent and route the core loop into dormant idle —
+   * connected and attachable, but NOT running (so no tokens are spent while it
+   * waits). A human reply (chat or TUI keystroke after the next wake) resumes
+   * it. This replaces the old hard `stop()`: the auto agent must never kill its
+   * own session, so a person can always take over.
+   */
+  enterDormantForHumanTakeover(message) {
+    this.connection.postChatMessage(message);
+    this.completedThisTurn = true;
+    void this.connection.sendHeartbeat();
+  }
   async refreshTaskContext() {
     try {
       const ctx = await this.connection.call("getTaskContext", {
@@ -8239,28 +8274,32 @@ var SessionRunner = class _SessionRunner {
     } catch {
     }
   }
-  async maybeSendPRNudge() {
+  async maybeHandleStuckAuto() {
     await this.refreshTaskContext();
-    if (!this.needsPRNudge()) return;
-    while (!this.stopped && !this.interrupted && this.needsPRNudge()) {
+    if (!this.isAutoStuck()) return;
+    while (!this.stopped && !this.interrupted && this.isAutoStuck()) {
       this.prNudgeCount++;
-      if (this.prNudgeCount > _SessionRunner.MAX_PR_NUDGES) {
-        this.connection.postChatMessage(
-          `Auto-mode agent failed to open a PR after ${_SessionRunner.MAX_PR_NUDGES} nudges. Shutting down.`
+      if (this.prNudgeCount > _SessionRunner.MAX_STUCK_NUDGES) {
+        this.enterDormantForHumanTakeover(
+          `Auto-mode: I couldn't open a PR or get unstuck after ${_SessionRunner.MAX_STUCK_NUDGES} attempts. Staying connected \u2014 reply here or in the terminal and I'll keep working.`
         );
-        this.stop();
         return;
       }
-      const isFirst = this.prNudgeCount === 1;
-      const chatMsg = isFirst ? "Auto-nudge: Task is still In Progress with no PR. Prompting agent to continue..." : `Auto-nudge (attempt ${this.prNudgeCount}/${_SessionRunner.MAX_PR_NUDGES}): Task still has no PR. Prompting agent again...`;
-      const prompt = isFirst ? "You are in Auto mode and your task is still In Progress with no pull request. You MUST create a pull request before finishing. Use the create_pull_request tool now to open a PR for your changes. If you are blocked, explain what is preventing you from creating a PR." : `This is reminder ${this.prNudgeCount} of ${_SessionRunner.MAX_PR_NUDGES}. You MUST open a pull request using create_pull_request NOW or explain what is blocking you. Do NOT go idle \u2014 either create the PR or describe the specific blocker.`;
+      const attempt = this.prNudgeCount;
+      const chatMsg = attempt === 1 ? "Auto-nudge: still In Progress with no PR \u2014 prompting the agent to finish or explain where it's stuck..." : `Auto-nudge (attempt ${attempt}/${_SessionRunner.MAX_STUCK_NUDGES}): still no PR \u2014 prompting the agent again...`;
       this.connection.postChatMessage(chatMsg);
       await this.setState("running");
-      await this.callbacks.onEvent({ type: "pr_nudge", prompt });
+      await this.callbacks.onEvent({ type: "pr_nudge", prompt: _SessionRunner.STUCK_PROMPT });
       if (this.interrupted || this.stopped) return;
-      await this.executeQuery(prompt);
+      await this.executeQuery(_SessionRunner.STUCK_PROMPT);
       if (this.interrupted || this.stopped) return;
       await this.refreshTaskContext();
+      if (this.agentSpokeThisTurn && !this.taskContext?.githubPRUrl) {
+        this.enterDormantForHumanTakeover(
+          "Auto-mode: the agent posted an update and is waiting for input. Staying connected \u2014 reply here or in the terminal to continue."
+        );
+        return;
+      }
     }
   }
   // ── Context & bridge construction ────────────────────────────────
@@ -8304,7 +8343,7 @@ var SessionRunner = class _SessionRunner {
       conveyorApiUrl: this.config.connection.apiUrl,
       taskToken: this.config.connection.taskToken,
       taskId: this.fullContext?.taskId ?? "",
-      model: this.fullContext?.model ?? "claude-sonnet-4-20250514",
+      model: this.fullContext?.model ?? DEFAULT_SONNET_MODEL,
       instructions: this.fullContext?.agentInstructions ?? "",
       workspaceDir: this.config.workspaceDir,
       mode: this.config.runnerMode,
@@ -8323,6 +8362,10 @@ var SessionRunner = class _SessionRunner {
           return this.callbacks.onStatusChange(status);
         },
         onEvent: (event) => {
+          const evt = event;
+          if (evt.type === "tool_use" && isPostToChatTool(evt.tool)) {
+            this.agentSpokeThisTurn = true;
+          }
           if (event.type === "completed") {
             this.completedThisTurn = true;
             void this.connection.sendHeartbeat();
@@ -9661,7 +9704,7 @@ function buildProjectTools(connection, getRequestingUserId = () => void 0) {
 
 // src/runner/project-chat-handler.ts
 var logger6 = createServiceLogger("ProjectChat");
-var FALLBACK_MODEL = "claude-sonnet-4-20250514";
+var FALLBACK_MODEL = DEFAULT_SONNET_MODEL;
 function buildSystemPrompt2(projectDir, agentCtx) {
   const parts = [];
   if (agentCtx?.agentInstructions) {
@@ -10581,7 +10624,7 @@ var ProjectRunner = class {
   async handleAuditTags(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTagAudit } = await import("./tag-audit-handler-3IFB7YDV.js");
+      const { handleTagAudit } = await import("./tag-audit-handler-X3LEX63H.js");
       await handleTagAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = parseErrorMessage(error);
@@ -10604,7 +10647,7 @@ var ProjectRunner = class {
   async handleAuditTasks(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTaskAudit } = await import("./task-audit-handler-U5Q52YT2.js");
+      const { handleTaskAudit } = await import("./task-audit-handler-BRCXB5V6.js");
       await handleTaskAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = parseErrorMessage(error);
@@ -10745,4 +10788,4 @@ export {
   loadConveyorConfig,
   unshallowRepo
 };
-//# sourceMappingURL=chunk-KEBJAORX.js.map
+//# sourceMappingURL=chunk-6462GDLZ.js.map