@rallycry/conveyor-agent 6.0.5 → 6.0.7

package/dist/{chunk-PLSKXQTB.js → chunk-ANYHEBDY.js}

@@ -960,6 +960,7 @@ var RECONNECT_BASE_MS = 1e3;
 var RECONNECT_MAX_MS = 3e4;
 var TunnelClient = class _TunnelClient {
   static STABLE_MS = 3e4;
+  static MAX_RECONNECT_ATTEMPTS = 10;
   apiUrl;
   token;
   localPort;
@@ -968,6 +969,7 @@ var TunnelClient = class _TunnelClient {
   reconnectAttempts = 0;
   reconnectTimer = null;
   connectedAt = 0;
+  loggedNoWebSocket = false;
   constructor(apiUrl, token, localPort) {
     this.apiUrl = apiUrl;
     this.token = token;
@@ -975,6 +977,13 @@ var TunnelClient = class _TunnelClient {
   }
   connect() {
     if (this.stopped) return;
+    if (typeof WebSocket === "undefined") {
+      if (!this.loggedNoWebSocket) {
+        logger2.warn("WebSocket not available in this environment, tunnel disabled");
+        this.loggedNoWebSocket = true;
+      }
+      return;
+    }
     const wsUrl = this.apiUrl.replace(/^http/, "ws").replace(/\/$/, "");
     const url = `${wsUrl}/api/tunnel?token=${encodeURIComponent(this.token)}`;
     try {
@@ -990,7 +999,8 @@ var TunnelClient = class _TunnelClient {
       logger2.info("Tunnel connected", { port: this.localPort });
     });
     this.ws.addEventListener("close", (event) => {
-      logger2.info("Tunnel disconnected", { code: event.code, reason: event.reason });
+      const closeEvent = event;
+      logger2.info("Tunnel disconnected", { code: closeEvent.code, reason: closeEvent.reason });
       this.scheduleReconnect();
     });
     this.ws.addEventListener("error", (event) => {
@@ -998,7 +1008,8 @@ var TunnelClient = class _TunnelClient {
       logger2.warn("Tunnel error", { error: msg });
     });
     this.ws.addEventListener("message", (event) => {
-      this.handleMessage(event.data);
+      const messageEvent = event;
+      this.handleMessage(messageEvent.data);
     });
   }
   disconnect() {
@@ -1014,12 +1025,18 @@ var TunnelClient = class _TunnelClient {
   }
   scheduleReconnect() {
     if (this.stopped) return;
-    if (Date.now() - this.connectedAt >= _TunnelClient.STABLE_MS) {
+    if (this.connectedAt > 0 && Date.now() - this.connectedAt >= _TunnelClient.STABLE_MS) {
       this.reconnectAttempts = 0;
     }
+    if (this.reconnectAttempts >= _TunnelClient.MAX_RECONNECT_ATTEMPTS) {
+      logger2.warn("Tunnel gave up after max reconnect attempts", {
+        attempts: this.reconnectAttempts
+      });
+      return;
+    }
     const delay = Math.min(RECONNECT_BASE_MS * 2 ** this.reconnectAttempts, RECONNECT_MAX_MS);
     this.reconnectAttempts++;
-    logger2.info("Tunnel reconnecting", { delay, attempt: this.reconnectAttempts });
+    logger2.debug("Tunnel reconnecting", { delay, attempt: this.reconnectAttempts });
     this.reconnectTimer = setTimeout(() => this.connect(), delay);
   }
   // ---------------------------------------------------------------------------
@@ -1141,7 +1158,8 @@ var TunnelClient = class _TunnelClient {
         this.send(JSON.stringify({ type: "ws-open", id }));
       });
       localWs.addEventListener("message", (event) => {
-        const data = typeof event.data === "string" ? event.data : String(event.data);
+        const messageEvent = event;
+        const data = typeof messageEvent.data === "string" ? messageEvent.data : String(messageEvent.data);
         this.send(JSON.stringify({ type: "ws-data", id, data }));
       });
       localWs.addEventListener("close", () => {
@@ -1228,10 +1246,6 @@ async function processAssistantEvent(event, host, turnToolCalls) {
   if (turnTextParts.length > 0) {
     host.connection.postChatMessage(turnTextParts.join("\n\n"));
   }
-  if (turnToolCalls.length > 0) {
-    host.connection.sendEvent({ type: "turn_end", toolCalls: [...turnToolCalls] });
-    turnToolCalls.length = 0;
-  }
 }
 var API_ERROR_PATTERN = /API Error: [45]\d\d/;
 var IMAGE_ERROR_PATTERN = /Could not process image/i;
@@ -1473,6 +1487,17 @@ var API_ERROR_PATTERN2 = /API Error: [45]\d\d/;
 function stopTypingIfNeeded(host, isTyping) {
   if (isTyping) host.connection.sendTypingStop();
 }
+function flushPendingToolCalls(host, turnToolCalls) {
+  if (turnToolCalls.length === 0) return;
+  for (let i = 0; i < turnToolCalls.length; i++) {
+    if (i < host.pendingToolOutputs.length) {
+      turnToolCalls[i].output = host.pendingToolOutputs[i];
+    }
+  }
+  host.connection.sendEvent({ type: "turn_end", toolCalls: [...turnToolCalls] });
+  turnToolCalls.length = 0;
+  host.pendingToolOutputs.length = 0;
+}
 async function processSystemCase(event, host, context, state) {
   if (event.subtype === "init") {
     const stored = await handleSystemEvent(event, host, context, state.sessionIdStored);
@@ -1509,6 +1534,7 @@ async function processResultCase(event, host, context, startTime, state) {
   );
   if (info.stoppedTyping) state.isTyping = false;
   state.retriable = info.retriable;
+  if (!info.retriable) state.sawApiError = false;
   state.resultSummary = info.resultSummary;
   if (info.staleSession) state.staleSession = true;
   if (info.authError) state.authError = true;
@@ -1531,6 +1557,7 @@ async function processEvents(events, context, host) {
   };
   for await (const event of events) {
     if (host.isStopped()) break;
+    flushPendingToolCalls(host, state.turnToolCalls);
     const now = Date.now();
     if (now - lastStatusEmit >= STATUS_REEMIT_INTERVAL_MS) {
       host.connection.emitStatus("running");
@@ -1560,6 +1587,7 @@ async function processEvents(events, context, host) {
         break;
     }
   }
+  flushPendingToolCalls(host, state.turnToolCalls);
   stopTypingIfNeeded(host, state.isTyping);
   return {
     retriable: state.retriable || state.sawApiError,
@@ -1610,6 +1638,7 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
     `- "Open" \u2014 Ready to execute. Use start_child_cloud_build to fire it.`,
     `- "InProgress" \u2014 Currently being worked on by a Task Runner. Wait \u2014 it will move to ReviewPR when done.`,
     `- "ReviewPR" \u2014 Task Runner finished and opened a PR. Review and merge it.`,
+    `- "Hold" \u2014 PR exists but is on hold for team review. Do not merge \u2014 skip and move on.`,
     `- "ReviewDev" \u2014 PR was merged to dev. This child is complete. Move on.`,
     `- "Complete" \u2014 Fully done. Move on.`,
     ``,
@@ -1626,6 +1655,7 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
     `   - "InProgress": A Task Runner is actively working on this child. Do nothing \u2014 wait for it to finish.`,
     `   - "Open": This is the next child to execute. Fire it with start_child_cloud_build.`,
     `     - If it fails because the child is missing story points or an agent: notify the team in chat and go idle.`,
+    `   - "Hold": On hold \u2014 team must review before merge. Skip.`,
     `   - "ReviewDev" / "Complete": Already done. Skip.`,
     `   - "Planning": Not ready. If this is blocking progress, notify the team.`,
     ``,
@@ -1633,7 +1663,7 @@ function buildPackRunnerSystemPrompt(context, config, setupLog) {
     ``,
     `4. After firing a child build: report which task you fired to chat, then explicitly state you are going idle. The system will relaunch you when the child completes or changes status.`,
     ``,
-    `5. When ALL children are in "ReviewDev" or "Complete" (no "Open", "InProgress", or "ReviewPR" remaining): do a final review, summarize results in chat, and mark this parent task complete with force_update_task_status("Complete").`,
+    `5. When ALL children are in "ReviewDev", "Complete", or "Hold" (no "Open", "InProgress", or "ReviewPR" remaining): do a final review, summarize results in chat, and mark this parent task complete with force_update_task_status("Complete").`,
     ``,
     `## Important Rules`,
     `- Process children ONE at a time, in ordinal order.`,
@@ -2615,7 +2645,7 @@ function buildForceUpdateTaskStatusTool(connection) {
     "force_update_task_status",
     "EMERGENCY ONLY: Force-override a task's Kanban status. Status transitions happen automatically (building sets InProgress, PR creation sets ReviewPR, merge sets ReviewDev). Only use this if an automatic transition failed or a task is stuck in the wrong status. Omit task_id to update the current task, or provide a child task ID.",
     {
-      status: z.enum(["InProgress", "ReviewPR", "ReviewDev", "Complete"]).describe("The new status for the task"),
+      status: z.enum(["InProgress", "ReviewPR", "Hold", "ReviewDev", "Complete"]).describe("The new status for the task"),
       task_id: z.string().optional().describe("Child task ID to update. Omit to update the current task.")
     },
     async ({ status, task_id }) => {
@@ -3399,7 +3429,8 @@ async function injectTelemetry(cdpClient) {
       return { success: false, error: result.value };
     }
     try {
-      const parsed = JSON.parse(result.value);
+      let parsed = JSON.parse(result.value);
+      if (typeof parsed === "string") parsed = JSON.parse(parsed);
       return {
         success: parsed.success === true,
         patches: parsed.patches
@@ -4569,6 +4600,7 @@ function buildHooks(host) {
                 output,
                 isError: false
               });
+              host.pendingToolOutputs.push(output);
             }
             return await Promise.resolve({ continue: true });
           }
@@ -4930,7 +4962,6 @@ var CostTracker = class {
 
 // src/runner/plan-sync.ts
 import { readdirSync, statSync, readFileSync } from "fs";
-import { homedir } from "os";
 import { join as join3 } from "path";
 var PlanSync = class {
   planFileSnapshot = /* @__PURE__ */ new Map();
@@ -4945,7 +4976,7 @@ var PlanSync = class {
     this.workspaceDir = workspaceDir;
   }
   getPlanDirs() {
-    return [join3(homedir(), ".claude", "plans"), join3(this.workspaceDir, ".claude", "plans")];
+    return [join3(this.workspaceDir, ".claude", "plans")];
   }
   snapshotPlanFiles() {
     this.planFileSnapshot.clear();
@@ -5300,6 +5331,7 @@ function buildQueryHost(deps) {
     },
     sessionIds: deps.sessionIds,
     activeQuery: null,
+    pendingToolOutputs: [],
     isStopped: deps.isStopped,
     createInputStream: deps.createInputStream,
     snapshotPlanFiles: () => deps.planSync.snapshotPlanFiles(),
@@ -5443,6 +5475,10 @@ var AgentRunner = class {
     }
     this.taskContext._runnerSessionId = randomUUID2();
     if (this.taskContext.agentMode) this.agentMode = this.taskContext.agentMode;
+    const pastPlanning = this.taskContext.status !== "Planning" && this.taskContext.status !== "Unidentified";
+    if (this.agentMode === "auto" && pastPlanning) {
+      this.hasExitedPlanMode = true;
+    }
     this.logEffectiveSettings();
     if (process.env.CODESPACES === "true") unshallowRepo(this.config.workspaceDir);
     return true;
@@ -7308,4 +7344,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-PLSKXQTB.js.map
+//# sourceMappingURL=chunk-ANYHEBDY.js.map