@rallycry/conveyor-agent 9.0.1 → 9.0.3

package/dist/{chunk-JH7GUOGW.js → chunk-EYIGNRRW.js}

@@ -830,6 +830,7 @@ function createServiceLogger(service) {
 
 // src/runner/git-utils.ts
 import { execSync } from "child_process";
+import { realpathSync } from "fs";
 function syncWithBaseBranch(cwd, baseBranch) {
   if (!baseBranch) return true;
   try {
@@ -1057,7 +1058,18 @@ function restoreWipSnapshot(cwd, branch) {
       stdio: ["ignore", "pipe", "ignore"]
     }).toString().trim();
     const head = execSync("git rev-parse HEAD", { cwd, stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
-    if (parent !== head) return "stale";
+    if (parent !== head) {
+      try {
+        execSync(`git stash apply ${sha}`, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+        return "applied";
+      } catch {
+        try {
+          execSync("git reset --merge", { cwd, stdio: "ignore" });
+        } catch {
+        }
+        return "stale";
+      }
+    }
     execSync(`git stash apply ${sha}`, { cwd, stdio: ["ignore", "pipe", "pipe"] });
     return "applied";
   } catch {
@@ -1131,6 +1143,105 @@ async function pushToOrigin(cwd, refreshToken, skipVerify = false) {
     return false;
   }
 }
+function branchBackupRef(branch) {
+  return `conveyor-wip/branches/${branch}`;
+}
+function listWorktrees(cwd) {
+  try {
+    const out = execSync("git worktree list --porcelain", {
+      cwd,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).toString();
+    const result = [];
+    for (const entry of out.split("\n\n")) {
+      const lines = entry.trim().split("\n");
+      const wl = lines.find((l) => l.startsWith("worktree "));
+      if (!wl) continue;
+      const bl = lines.find((l) => l.startsWith("branch "));
+      result.push({
+        path: wl.slice("worktree ".length),
+        branch: bl ? bl.slice("branch refs/heads/".length) : null
+      });
+    }
+    return result;
+  } catch {
+    return [];
+  }
+}
+function listLocalBranches(cwd) {
+  try {
+    return execSync("git for-each-ref --format='%(refname:short)' refs/heads/", {
+      cwd,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).toString().split("\n").map((s) => s.trim()).filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+function branchUnpushedCount(cwd, branch) {
+  try {
+    const n = execSync(`git rev-list --count ${JSON.stringify(branch)} --not --remotes=origin`, {
+      cwd,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).toString().trim();
+    return Number.parseInt(n, 10) || 0;
+  } catch {
+    return 0;
+  }
+}
+function samePath(a, b) {
+  try {
+    return realpathSync(a) === realpathSync(b);
+  } catch {
+    return a === b;
+  }
+}
+async function flushAllPendingWork(cwd, opts) {
+  try {
+    const primary = await flushPendingChanges(cwd, opts);
+    await refreshRemoteToken(cwd, opts?.refreshToken);
+    const currentBranch = getCurrentBranch(cwd);
+    const worktreesSnapshotted = snapshotOtherWorktrees(cwd, opts?.wipMessage);
+    const branchesBackedUp = backupOtherBranches(cwd, currentBranch);
+    return {
+      hadWork: primary.hadWork || worktreesSnapshotted > 0 || branchesBackedUp > 0,
+      branchesBackedUp,
+      worktreesSnapshotted
+    };
+  } catch {
+    return { hadWork: false, branchesBackedUp: 0, worktreesSnapshotted: 0 };
+  }
+}
+function snapshotOtherWorktrees(cwd, wipMessage) {
+  let count = 0;
+  for (const wt of listWorktrees(cwd)) {
+    if (samePath(wt.path, cwd) || !wt.branch) continue;
+    try {
+      if (!hasUncommittedChanges(wt.path)) continue;
+      const sha = createWipSnapshot(wt.path, wipMessage ?? "WIP: conveyor-agent snapshot");
+      if (sha && tryPushRefspec(wt.path, `${sha}:refs/heads/${wipRefForBranch(wt.branch)}`, true)) {
+        wipRefPushed.add(wt.path);
+        count++;
+      }
+    } catch {
+    }
+  }
+  return count;
+}
+function backupOtherBranches(cwd, currentBranch) {
+  let count = 0;
+  for (const branch of listLocalBranches(cwd)) {
+    if (branch === currentBranch || branch.startsWith("conveyor-wip/")) continue;
+    try {
+      if (branchUnpushedCount(cwd, branch) === 0) continue;
+      if (tryPushRefspec(cwd, `refs/heads/${branch}:refs/heads/${branchBackupRef(branch)}`, true)) {
+        count++;
+      }
+    } catch {
+    }
+  }
+  return count;
+}
 
 // src/runner/plan-sync.ts
 import { readdirSync, statSync, readFileSync } from "fs";
@@ -2982,6 +3093,8 @@ function buildPromptBytes(text) {
 var SUBMIT_SETTLE_MS = 300;
 var SUBMIT_NUDGE_INTERVAL_MS = 2e3;
 var SUBMIT_NUDGE_MAX_PRESSES = 5;
+var SUBMIT_NUDGE_SLOW_INTERVAL_MS = 5e3;
+var SUBMIT_NUDGE_WINDOW_MS = 9e4;
 function sleep2(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
@@ -3230,18 +3343,28 @@ var PtySession = class {
    * Deliberate trade-off (same as the plan-dialog auto-accept below): a press
    * can accept the default of an unexpected startup dialog — in a headless
    * pod that unblocks the run rather than parking it forever.
+   *
+   * Two phases: SUBMIT_NUDGE_MAX_PRESSES fast presses for the swallowed-Enter
+   * race, then a slow cadence out to SUBMIT_NUDGE_WINDOW_MS for startup
+   * dialogs that render late on cold pods (the folder-trust dialog's default
+   * is the accept option, so one late Enter un-parks the run).
    */
   armSubmitNudge() {
     if (this.submitNudgeTimer) return;
     this.pendingSubmitNudge = true;
+    const startedAt = Date.now();
     let presses = 0;
     const press = () => {
-      if (this._toreDown || !this.pendingSubmitNudge || presses >= SUBMIT_NUDGE_MAX_PRESSES) {
+      if (this._toreDown || !this.pendingSubmitNudge || Date.now() - startedAt >= SUBMIT_NUDGE_WINDOW_MS) {
         this.disarmSubmitNudge();
         return;
       }
       presses++;
       this.writeStdin("\r");
+      if (presses === SUBMIT_NUDGE_MAX_PRESSES && this.submitNudgeTimer) {
+        clearInterval(this.submitNudgeTimer);
+        this.submitNudgeTimer = setInterval(press, SUBMIT_NUDGE_SLOW_INTERVAL_MS);
+      }
     };
     this.submitNudgeTimer = setInterval(press, SUBMIT_NUDGE_INTERVAL_MS);
   }
@@ -3467,6 +3590,18 @@ async function ensureClaudeOnboarding(env = process.env, trustCwd) {
     const contents = planClaudeJsonSeed(await readRaw(path), trustCwd);
     if (contents === null) return;
     await writeFile3(path, contents, "utf8");
+    const verify = await readRaw(path);
+    if (verify === contents) {
+      process.stderr.write(
+        `[conveyor-agent] claude onboarding seeded${trustCwd ? ` (trust: ${trustCwd})` : ""}
+`
+      );
+    } else {
+      process.stderr.write(
+        `[conveyor-agent] claude onboarding seed read-back MISMATCH at ${path}: wrote ${contents.length}B, read ${verify?.length ?? 0}B \u2014 CLI may see stale config and park at a startup dialog
+`
+      );
+    }
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     process.stderr.write(`[conveyor-agent] claude onboarding seed failed: ${message}
@@ -8217,7 +8352,7 @@ var SessionRunner = class _SessionRunner {
     if (this.periodicFlushInFlight || this.stopped) return;
     this.periodicFlushInFlight = true;
     try {
-      const result = await flushPendingChanges(this.config.workspaceDir, {
+      const result = await flushAllPendingWork(this.config.workspaceDir, {
         wipMessage: "WIP: periodic auto-commit",
         refreshToken: async () => {
           try {
@@ -8232,7 +8367,7 @@ var SessionRunner = class _SessionRunner {
       });
       if (result.hadWork) {
         process.stderr.write(
-          `[conveyor-agent] Periodic git flush: committed=${result.committed} pushed=${result.pushed}
+          `[conveyor-agent] Periodic git flush: branchesBackedUp=${result.branchesBackedUp} worktreesSnapshotted=${result.worktreesSnapshotted}
 `
         );
       }
@@ -8246,7 +8381,7 @@ var SessionRunner = class _SessionRunner {
    *  connection is still alive for token refresh. Never throws. */
   async flushGitOnShutdown() {
     try {
-      const result = await flushPendingChanges(this.config.workspaceDir, {
+      const result = await flushAllPendingWork(this.config.workspaceDir, {
         wipMessage: "WIP: auto-commit on conveyor-agent shutdown",
         refreshToken: async () => {
           try {
@@ -8261,7 +8396,7 @@ var SessionRunner = class _SessionRunner {
       });
       if (result.hadWork) {
         process.stderr.write(
-          `[conveyor-agent] Shutdown git flush: committed=${result.committed} pushed=${result.pushed}
+          `[conveyor-agent] Shutdown git flush: branchesBackedUp=${result.branchesBackedUp} worktreesSnapshotted=${result.worktreesSnapshotted}
 `
         );
       }
@@ -8758,4 +8893,4 @@ export {
   runStartCommand,
   unshallowRepo
 };
-//# sourceMappingURL=chunk-JH7GUOGW.js.map
+//# sourceMappingURL=chunk-EYIGNRRW.js.map