@algosuite/vo-mcp 0.2.0-beta.44 → 0.2.0-beta.46

package/dist/runner-cli.js

@@ -7011,6 +7011,7 @@ async function openCodeTaskPrAsync(worktreeDir, files, {
   if (!Array.isArray(files) || files.length === 0) throw new Error("openCodeTaskPrAsync: no files to commit");
   let branch;
   let truncated = false;
+  let newCommit = null;
   if (alreadyCommitted) {
     branch = await resolveOrCreateBranchAsync(worktreeDir, branchPrefix, runCommand);
   } else {
@@ -7023,6 +7024,7 @@ async function openCodeTaskPrAsync(worktreeDir, files, {
     });
     branch = committed.branch;
     truncated = committed.truncated;
+    newCommit = committed.committed;
   }
   const prBranch = String(targetBranch || branch).trim() || branch;
   const overlap = await runOverlapGate(worktreeDir, files.filter((file) => !isAgentScratch(file)), {
@@ -7077,6 +7079,7 @@ async function openCodeTaskPrAsync(worktreeDir, files, {
       prNumber: existing.number,
       branch: prBranch,
       truncated,
+      newCommit,
       resumed: true,
       markedReady,
       overlapDraft,
@@ -7115,7 +7118,7 @@ async function openCodeTaskPrAsync(worktreeDir, files, {
     runCommand,
     onCleanupWarning
   });
-  return { prUrl, prNumber, branch: prBranch, truncated, overlapDraft, overlapBlockedBy, ...autoMerge, ...superseded };
+  return { prUrl, prNumber, branch: prBranch, truncated, newCommit, overlapDraft, overlapBlockedBy, ...autoMerge, ...superseded };
 }
 var sleep;
 var init_publish_async = __esm({
@@ -12866,7 +12869,7 @@ async function finalizePublishedPr({
     log: log2,
     patch: {
       status: "pr_opened",
-      message: `opened ${pr.prUrl}${overlapNote}`,
+      message: `opened ${pr.prUrl}${overlapNote}${pr.newCommit === false ? " (no new commits \u2014 the branch already held every change)" : ""}`,
       pr_url: pr.prUrl,
       pr_number: pr.prNumber,
       pr_branch: pr.branch,
@@ -13095,7 +13098,10 @@ async function readLedger(file, readFile5) {
 async function findPreservedRecovery(task, {
   clonesRoot: clonesRoot2 = process.env.VO_CODE_RUNNER_CLONES_ROOT || "",
   readFile: readFile5 = fsp13.readFile,
-  exists = fs13.existsSync
+  exists = fs13.existsSync,
+  alreadyPublished = preservedHeadAlreadyOnBranch,
+  log: log2 = () => {
+  }
 } = {}) {
   const resumedFrom = /^[0-9a-f-]{36}$/iu.test(String(task.resumed_from || "")) ? String(task.resumed_from).toLowerCase() : null;
   const originalTaskId = recoveryTaskId(task.prompt) ?? resumedFrom;
@@ -13106,11 +13112,41 @@ async function findPreservedRecovery(task, {
     const resolved = entries.some((entry) => RESOLVED_RECOVERY_TYPES.has(entry.type) && entry.taskId === originalTaskId);
     const preserved = [...entries].reverse().find((entry) => entry.taskId === originalTaskId && entry.worktreeDir);
     if (!resolved && preserved && exists(preserved.worktreeDir)) {
+      if (task.pr_branch && await alreadyPublished(preserved.worktreeDir, task.pr_branch)) {
+        log2(`recovery: preserved worktree of ${originalTaskId} is already on ${task.pr_branch}; running the agent instead`);
+        return null;
+      }
       return { originalTaskId, ledgerPath, preserved };
     }
   }
   return null;
 }
+async function preservedHeadAlreadyOnBranch(worktreeDir, prBranch, { runGit = defaultRunGit } = {}) {
+  try {
+    const dirty = (await runGit(["status", "--porcelain"], worktreeDir)).trim();
+    if (dirty.length > 0) return false;
+    const head = (await runGit(["rev-parse", "HEAD"], worktreeDir)).trim();
+    if (!/^[0-9a-f]{40}$/u.test(head)) return false;
+    let tip = "";
+    try {
+      tip = (await runGit(["rev-parse", `refs/remotes/origin/${prBranch}`], worktreeDir)).trim();
+    } catch {
+      tip = (await runGit(["ls-remote", "origin", `refs/heads/${prBranch}`], worktreeDir)).trim().split(/\s+/u)[0] || "";
+    }
+    if (!/^[0-9a-f]{40}$/u.test(tip)) return false;
+    if (head === tip) return true;
+    await runGit(["merge-base", "--is-ancestor", head, tip], worktreeDir);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function defaultRunGit(args, cwd) {
+  const { execFile: execFile2 } = await import("node:child_process");
+  return new Promise((resolve2, reject) => {
+    execFile2("git", args, { cwd, encoding: "utf8", timeout: 6e4 }, (err, stdout) => err ? reject(err) : resolve2(stdout));
+  });
+}
 async function recoverPreservedCodeTask({
   task,
   cfg,
@@ -13123,7 +13159,7 @@ async function recoverPreservedCodeTask({
   finalizePublished = finalizePublishedPr,
   track
 } = {}) {
-  const recovery = await find(task);
+  const recovery = await find(task, { log: log2 });
   if (!recovery) return null;
   const cwd = recovery.preserved.worktreeDir;
   const { files, alreadyCommitted } = await prepareScope(cwd);