@rallycry/conveyor-agent 11.0.34 → 11.0.36

package/dist/{chunk-VDK54VLS.js → chunk-B4YQABDZ.js}

@@ -383,8 +383,8 @@ var AgentConnection = class _AgentConnection {
   /** (Re)arm the recycle timer — called on every successful (re)connect. */
   scheduleSocketRecycle() {
     this.clearSocketRecycle();
-    const delay2 = _AgentConnection.SOCKET_RECYCLE_BASE_MS + Math.random() * _AgentConnection.SOCKET_RECYCLE_JITTER_MS;
-    this.armRecycleTimer(delay2);
+    const delay3 = _AgentConnection.SOCKET_RECYCLE_BASE_MS + Math.random() * _AgentConnection.SOCKET_RECYCLE_JITTER_MS;
+    this.armRecycleTimer(delay3);
   }
   clearSocketRecycle() {
     if (this.recycleTimer) {
@@ -392,11 +392,11 @@ var AgentConnection = class _AgentConnection {
       this.recycleTimer = null;
     }
   }
-  armRecycleTimer(delay2) {
+  armRecycleTimer(delay3) {
     this.recycleTimer = setTimeout(() => {
       this.recycleTimer = null;
       this.attemptSocketRecycle();
-    }, delay2);
+    }, delay3);
     this.recycleTimer.unref?.();
   }
   attemptSocketRecycle() {
@@ -4313,6 +4313,25 @@ async function verifyGitCredential(cwd) {
 // src/runner/git-utils.ts
 import { realpathSync } from "fs";
 
+// src/runner/git-fetch-retry.ts
+import { setTimeout as delay } from "timers/promises";
+async function fetchWithRetry(cwd, args) {
+  for (let attempt = 0; ; attempt++) {
+    try {
+      return await git(cwd, ["fetch", ...args]);
+    } catch (error) {
+      const detail = error;
+      const transient = detail.killed === true || /connection reset|could not resolve host|failed to connect|timed out|early EOF|HTTP\/2 stream|remote end hung up|TLS connection was non-properly terminated/i.test(
+        `${detail.message ?? ""}
+${detail.stderr ?? ""}`
+      );
+      if (!transient || attempt >= 2) throw error;
+      process.stderr.write("[conveyor-agent] Retrying git fetch after a transport failure\n");
+      await delay(1e3 * (attempt + 1));
+    }
+  }
+}
+
 // src/runner/force-fresh-cooldown.ts
 var FORCE_FRESH_COOLDOWN_MS = 30 * 60 * 1e3;
 var blockedUntil = 0;
@@ -4340,8 +4359,7 @@ async function ensureOnTaskBranch(cwd, taskBranch, baseBranch) {
     if (await getCurrentBranch(cwd) === taskBranch) return true;
     let existsOnOrigin = true;
     try {
-      await git(cwd, [
-        "fetch",
+      await fetchWithRetry(cwd, [
         "origin",
         `+refs/heads/${taskBranch}:refs/remotes/origin/${taskBranch}`
       ]);
@@ -4362,8 +4380,7 @@ async function ensureOnTaskBranch(cwd, taskBranch, baseBranch) {
       );
       return false;
     }
-    await git(cwd, [
-      "fetch",
+    await fetchWithRetry(cwd, [
       "origin",
       `+refs/heads/${baseBranch}:refs/remotes/origin/${baseBranch}`
     ]);
@@ -4524,7 +4541,7 @@ async function restoreWipSnapshot(cwd, branch) {
   if (!branch) return "none";
   const ref = wipRefForBranch(branch);
   try {
-    await git(cwd, ["fetch", "origin", `+refs/heads/${ref}:refs/remotes/origin/${ref}`]);
+    await fetchWithRetry(cwd, ["origin", `+refs/heads/${ref}:refs/remotes/origin/${ref}`]);
   } catch (err) {
     if (isMissingRefError(err)) return "none";
     wipRefPreserved.add(cwd);
@@ -4549,7 +4566,12 @@ async function restoreWipSnapshot(cwd, branch) {
         return "stale";
       }
     }
-    await git(cwd, ["stash", "apply", sha], GIT_SLOW_TIMEOUT_MS);
+    try {
+      await git(cwd, ["stash", "apply", sha], GIT_SLOW_TIMEOUT_MS);
+    } catch {
+      wipRefPreserved.add(cwd);
+      return "conflict";
+    }
     wipRefPushed.add(cwd);
     wipRefPreserved.delete(cwd);
     return "applied";
@@ -4916,11 +4938,11 @@ var Lifecycle = class {
    *  window every time it defers. */
   startIdleTimer(overrideMs) {
     this.clearIdleTimers();
-    const delay2 = Math.max(0, overrideMs ?? this.config.idleTimeoutMs);
+    const delay3 = Math.max(0, overrideMs ?? this.config.idleTimeoutMs);
     this.idleTimer = setTimeout(() => {
       this.idleTimer = null;
       this.callbacks.onIdleTimeout();
-    }, delay2);
+    }, delay3);
   }
   cancelIdleTimer() {
     this.clearIdleTimers();
@@ -4941,10 +4963,10 @@ var Lifecycle = class {
    *  deadline regardless of message volume. */
   startDormantTimer(overrideMs) {
     this.cancelDormantTimer();
-    const delay2 = Math.max(0, overrideMs ?? this.config.dormantTimeoutMs);
+    const delay3 = Math.max(0, overrideMs ?? this.config.dormantTimeoutMs);
     this.dormantTimer = setTimeout(() => {
       this.callbacks.onDormantTimeout();
-    }, delay2);
+    }, delay3);
   }
   cancelDormantTimer() {
     if (this.dormantTimer) {
@@ -4988,7 +5010,7 @@ function awaitGitReady(opts = {}) {
   opts.onLog?.("waiting for workspace git (workbench daemon)");
   return pollDaemon(clientFn, timeoutMs, pollMs, opts.onLog, opts.signal);
 }
-function delay(ms, signal) {
+function delay2(ms, signal) {
   if (!signal) {
     return new Promise((resolve) => {
       setTimeout(resolve, ms);
@@ -5047,7 +5069,7 @@ async function pollDaemon(clientFn, timeoutMs, pollMs, onLog, signal) {
       onLog?.(`workspace git not ready after ${timeoutMs}ms \u2014 giving up`);
       return "timeout";
     }
-    await delay(pollMs, signal);
+    await delay2(pollMs, signal);
   }
 }
 

package/dist/{chunk-IQP2LHB4.js → chunk-PLDR42JP.js}

@@ -97,7 +97,7 @@ import {
   statWorkspacePath,
   updateRemoteToken,
   verifyGitCredential
-} from "./chunk-VDK54VLS.js";
+} from "./chunk-B4YQABDZ.js";
 import {
   registerBootMilestoneSocketFallback,
   reportBootMilestone
@@ -6881,7 +6881,7 @@ function buildTaskAgentPreamble(context, workspaceDir, runtimeTui, agentMode) {
 Environment \u2014 already built${managedStack ? " and running" : ""}. These are the facts you would otherwise spend calls discovering:`,
     `- The repo is cloned at your working directory with \`${context.githubBranch}\` checked out, dependencies installed, database migrated, git configured${managedStack ? ", and the dev stack up" : ""}. Commit and push directly to this branch.`,
     ...stackLines,
-    `- Browser automation is the Playwright CLI (\`playwright\`, pinned 1.62.1), NOT an MCP server \u2014 there are no \`mcp__playwright__*\` tools here. Only the headless shell is baked, so a launch must name it AND disable the sandbox: \`chromium.launch({ channel: "chromium-headless-shell", args: ["--no-sandbox"] })\`. A bare \`chromium.launch()\` FAILS: since playwright 1.49 that resolves to the full browser, which is deliberately not installed (pods have no display and cannot run Chromium's sandbox). Screenshots land wherever you write them \u2014 move or delete them before committing.`,
+    `- Browser automation is the Playwright CLI (\`playwright\`, pinned 1.63.0), NOT an MCP server \u2014 there are no \`mcp__playwright__*\` tools here. Only the headless shell is baked, so a launch must name it AND disable the sandbox: \`chromium.launch({ channel: "chromium-headless-shell", args: ["--no-sandbox"] })\`. A bare \`chromium.launch()\` FAILS: since playwright 1.49 that resolves to the full browser, which is deliberately not installed (pods have no display and cannot run Chromium's sandbox). Screenshots land wherever you write them \u2014 move or delete them before committing.`,
     `- The clone is \`--single-branch\`, so a bare \`git fetch origin <branch>\` does NOT create \`origin/<branch>\`. To reference any other branch, use the explicit refspec: \`git fetch origin <branch>:refs/remotes/origin/<branch>\`.`,
     `- The shell cwd resets between Bash calls, and so does every shell variable. A var you export in one call is EMPTY in the next, which silently redirects output to \`/\` and loses it. Write literal absolute paths (\`git -C\`, \`bun run --cwd\`), and \`mkdir -p\` a directory in the SAME call as the redirect that writes to it.`,
     `- The \`gh\` CLI is available for READ-ONLY PR and CI state (\`gh pr view\`, \`gh pr checks\`, \`gh pr diff\`), one read at a time. ${ciWaitRule(agentMode)} Use the mcp__conveyor__* tools for anything that mutates a PR or card.`,
@@ -15380,14 +15380,18 @@ var SessionRunner = class _SessionRunner {
         this.fullContext.baseBranch ?? void 0
       );
       if (!ok) {
-        process.stderr.write("[conveyor-agent] WARNING: task-branch checkout failed\n");
+        const message = "Task branch checkout failed; workspace startup stopped. Resume to retry.";
+        process.stderr.write(`[conveyor-agent] ${message}
+`);
+        this.connection.sendEvent({ type: "error", message });
+        await this.callbacks.onEvent({ type: "error", message });
+        await prewarmInitial;
+        await this.shutdown("error");
+        return;
       }
-      if (ok) void reportBootMilestone({ key: "branch_ready" });
+      void reportBootMilestone({ key: "branch_ready" });
     }
     if (this.fullContext?.githubBranch) await this.refreshSkillsForCheckout();
-    if (!this.stopped) {
-      this.lifecycle.startGitFlush();
-    }
     if (this.fullContext?.githubBranch) {
       const restored = await restoreWipSnapshot(
         this.config.workspaceDir,
@@ -15397,7 +15401,16 @@ var SessionRunner = class _SessionRunner {
         process.stderr.write(`[conveyor-agent] WIP snapshot restore: ${restored}
 `);
       }
+      if (restored === "failed") {
+        const message = "Saved work could not be restored; workspace startup stopped. Resume to retry.";
+        this.connection.sendEvent({ type: "error", message });
+        await this.callbacks.onEvent({ type: "error", message });
+        await prewarmInitial;
+        await this.shutdown("error");
+        return;
+      }
     }
+    if (!this.stopped) this.lifecycle.startGitFlush();
     this.workspaceCommands?.notifyWorkspaceReady();
     if (this.fullContext?.isAuto && PRE_BUILD_TASK_STATUSES.has(this.taskContext.status) && this.mode.isBuildCapable && hasTaskPlan(this.fullContext.plan)) {
       void this.connection.triggerIdentification().catch(() => {

package/dist/{chunk-6WVCWKDN.js → chunk-WQC2YQT4.js}

@@ -8,7 +8,7 @@ import {
   readWorkspaceBytes,
   statWorkspacePath,
   workspacePathExists
-} from "./chunk-VDK54VLS.js";
+} from "./chunk-B4YQABDZ.js";
 import {
   reportBootMilestone
 } from "./chunk-Q4FQOJ7D.js";

package/dist/cli.js

@@ -7,7 +7,7 @@ import {
   WorkspaceCommandSupervisor,
   startWorkspaceCommandsAfterConnect,
   stopWorkspaceCommands
-} from "./chunk-6WVCWKDN.js";
+} from "./chunk-WQC2YQT4.js";
 import {
   PtyHarness,
   SessionRunner,
@@ -27,7 +27,7 @@ import {
   runUsageProbe,
   sampleKeyUsage,
   usesNativeUsageReporting
-} from "./chunk-IQP2LHB4.js";
+} from "./chunk-PLDR42JP.js";
 import "./chunk-37J5MMQT.js";
 import {
   inheritedEnv,
@@ -46,7 +46,7 @@ import {
   createServiceLogger,
   fetchBootstrap,
   loadConveyorConfig
-} from "./chunk-VDK54VLS.js";
+} from "./chunk-B4YQABDZ.js";
 import "./chunk-Q4FQOJ7D.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-372R6E4C.js";
@@ -1468,7 +1468,7 @@ if (!RUNNER_MODES.includes(CONVEYOR_MODE)) {
   process.exit(1);
 }
 if (CONVEYOR_MODE === "serving") {
-  const { runServingSession } = await import("./serve-boot-QOXREHJK.js");
+  const { runServingSession } = await import("./serve-boot-KXWMUVAG.js");
   exitContext.runnerMode = "serving";
   exitContext.sessionId = process.env.CONVEYOR_SESSION_ID ?? exitContext.sessionId;
   const outcome = await runServingSession({

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   SessionRunner,
   unshallowRepo
-} from "./chunk-IQP2LHB4.js";
+} from "./chunk-PLDR42JP.js";
 import "./chunk-37J5MMQT.js";
 import "./chunk-EKTPDG3G.js";
 import {
@@ -17,7 +17,7 @@ import {
   stageAndCommit,
   updateRemoteToken,
   workspacePathExists
-} from "./chunk-VDK54VLS.js";
+} from "./chunk-B4YQABDZ.js";
 import "./chunk-Q4FQOJ7D.js";
 import {
   runAuthTokenCommand,

package/dist/{serve-boot-QOXREHJK.js → serve-boot-KXWMUVAG.js}

@@ -1,6 +1,6 @@
 import {
   WorkspaceCommandSupervisor
-} from "./chunk-6WVCWKDN.js";
+} from "./chunk-WQC2YQT4.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -11,7 +11,7 @@ import {
   createServiceLogger,
   ensureOnTaskBranch,
   loadConveyorConfig
-} from "./chunk-VDK54VLS.js";
+} from "./chunk-B4YQABDZ.js";
 import "./chunk-Q4FQOJ7D.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-IA45XHOA.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-agent",
-  "version": "11.0.34",
+  "version": "11.0.36",
   "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",
@@ -38,17 +38,17 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.3.280",
-    "@modelcontextprotocol/sdk": "^1.30.0",
-    "node-pty": "^1.0.0",
-    "socket.io-client": "^4.8.3",
-    "tar": "^7.5.21",
-    "zod": "^4.0.0"
+    "@anthropic-ai/claude-agent-sdk": "^0.3.283",
+    "@modelcontextprotocol/sdk": "^1.30.1",
+    "node-pty": "^1.1.0",
+    "socket.io-client": "^4.8.4",
+    "tar": "^7.5.22",
+    "zod": "^4.6.5"
   },
   "devDependencies": {
     "@project/shared": "workspace:*",
-    "tsup": "^8.0.0",
-    "typescript": "^5.3.0",
-    "vitest": "^5.0.1"
+    "tsup": "^8.5.1",
+    "typescript": "~6.0.3",
+    "vitest": "^5.0.2"
   }
 }