runcastle 1.0.22 → 1.0.23

package/bin/runcastle.js

@@ -2200,6 +2200,34 @@ function researchBranchName(slug, waypointSeq, unique) {
 function ticketBranchName(slug, ticketSeq, unique) {
   return `${TICKET_BRANCH_PREFIX}${tempBranchSlugSegment(slug)}/${ticketSeq}-${unique}`;
 }
+function burnWorktreePath(repoPath, branch) {
+  return join6(repoPath, ".sandcastle", "worktrees", branch.replace(/\//g, "-"));
+}
+async function cleanupBurnWorktree(repoPath, branch, opts = {}) {
+  const path = burnWorktreePath(repoPath, branch);
+  const attempts = Math.max(1, opts.attempts ?? 3);
+  const delayMs = opts.delayMs ?? 750;
+  const g = git(repoPath);
+  for (let attempt = 1;attempt <= attempts && existsSync7(path); attempt++) {
+    try {
+      await g.raw(["worktree", "remove", "--force", path]);
+    } catch {}
+    if (existsSync7(path) && attempt < attempts)
+      await sleep(delayMs);
+  }
+  if (existsSync7(path)) {
+    try {
+      rmSync(path, { recursive: true, force: true });
+    } catch {}
+  }
+  try {
+    await g.raw(["worktree", "prune"]);
+  } catch {}
+  return !existsSync7(path);
+}
+function sleep(ms) {
+  return new Promise((done) => setTimeout(done, ms));
+}
 async function branchCommitsAhead(repoPath, base, branch) {
   try {
     const out = await git(repoPath).raw(["rev-list", "--reverse", `${base}..${branch}`]);
@@ -3058,6 +3086,12 @@ ${blockedContent.trim()}` };
   }
   return { status: "failed", error: "agent made no commits" };
 }
+function isWorktreeTeardownError(err) {
+  const msg = err instanceof Error ? err.message : typeof err === "string" ? err : String(err);
+  if (!BURN_WORKTREE_PATH.test(msg))
+    return false;
+  return WORKTREE_REMOVAL_FAILURES.some((p) => p.test(msg));
+}
 function isMergeConflictError(err) {
   const msg = err instanceof Error ? err.message : typeof err === "string" ? err : "";
   return /conflict/i.test(msg) || /git branch -D/i.test(msg) || /automatic merge failed/i.test(msg);
@@ -3486,13 +3520,18 @@ async function realExecuteTicketRun(ctx, ticket, config2, token, model, land, en
     } catch (err) {
       if (ctx.signal.aborted)
         throw err;
-      return {
-        ok: false,
-        branch: await bestTip(),
-        error: ticketAbort.signal.aborted ? "stopped by user during conflict resolution" : errorHeadline(err instanceof Error ? err.message : String(err))
-      };
+      const tip = await bestTip();
+      const teardownOnly = !ticketAbort.signal.aborted && isWorktreeTeardownError(err) && tip === resolveBranch;
+      if (!teardownOnly) {
+        return {
+          ok: false,
+          branch: tip,
+          error: ticketAbort.signal.aborted ? "stopped by user during conflict resolution" : errorHeadline(err instanceof Error ? err.message : String(err))
+        };
+      }
+      await cleanupBurnWorktree(project.repoPath, resolveBranch);
     }
-    const blocked = readBlockedFile([result.preservedWorktreePath, project.repoPath]);
+    const blocked = readBlockedFile([result?.preservedWorktreePath, project.repoPath]);
     if (blocked !== undefined && blocked.trim().length > 0) {
       return {
         ok: false,
@@ -3627,6 +3666,18 @@ ${retryNotes}` : basePrompt,
             }
           };
         }
+        if (isWorktreeTeardownError(err)) {
+          const removed = await cleanupBurnWorktree(project.repoPath, tempBranch);
+          if (salvaged.length > 0) {
+            ctx.emitEvent({
+              type: "burn.worktree.teardown-failed",
+              message: `ticket ${ticket.seq}: agent finished but sandcastle could not remove its worktree (${errorHeadline(msg)})${removed ? " \u2014 cleaned up" : " \u2014 left on disk"}; landing the ${salvaged.length} commit(s) anyway`,
+              ticketId: ticket.id,
+              data: { branch: tempBranch, error: msg, cleanedUp: removed }
+            });
+            return await landChain(tempBranch, salvaged);
+          }
+        }
         if (isMergeConflictError(err)) {
           if (salvaged.length > 0) {
             preserveChain(tempBranch);
@@ -3728,7 +3779,7 @@ function readTokenFromEnvFile(path) {
   const token = fromFile && fromFile.length > 0 ? fromFile : process.env.CLAUDE_CODE_OAUTH_TOKEN;
   return token && token.length > 0 ? token : undefined;
 }
-var AUTH_MISSING_EVENT = "auth.missing", AUTH_MISSING_MESSAGE = "run `claude setup-token` and put CLAUDE_CODE_OAUTH_TOKEN in ~/.runcastle/.env", PACKAGE_MANAGERS, PM_CACHE_SANDBOX_PATHS, SANDBOX_WORKSPACE_PATH = "/home/agent/workspace", ISOLATED_REPO_PATH = "/home/agent/repo", FATAL_ERROR_PATTERNS, RETRYABLE_ERROR_PATTERNS, activeTicketAborts, SETUP_HOOK_TIMEOUT_MS, ticketBurner;
+var AUTH_MISSING_EVENT = "auth.missing", AUTH_MISSING_MESSAGE = "run `claude setup-token` and put CLAUDE_CODE_OAUTH_TOKEN in ~/.runcastle/.env", PACKAGE_MANAGERS, PM_CACHE_SANDBOX_PATHS, SANDBOX_WORKSPACE_PATH = "/home/agent/workspace", ISOLATED_REPO_PATH = "/home/agent/repo", BURN_WORKTREE_PATH, WORKTREE_REMOVAL_FAILURES, FATAL_ERROR_PATTERNS, RETRYABLE_ERROR_PATTERNS, activeTicketAborts, SETUP_HOOK_TIMEOUT_MS, ticketBurner;
 var init_ticket_burner = __esm(() => {
   init_src();
   init_config_load();
@@ -3742,6 +3793,14 @@ var init_ticket_burner = __esm(() => {
     yarn: "~/.cache/yarn",
     npm: "~/.npm"
   };
+  BURN_WORKTREE_PATH = /[\\/]\.sandcastle[\\/]worktrees[\\/]/i;
+  WORKTREE_REMOVAL_FAILURES = [
+    /failed to delete/i,
+    /directory not empty|enotempty/i,
+    /unable to (unlink|delete)/i,
+    /is not a working tree/i,
+    /resource busy|ebusy|eperm|eacces/i
+  ];
   FATAL_ERROR_PATTERNS = [
     /invalid (api key|x-api-key)/i,
     /authentication|unauthorized|permission denied/i,
@@ -3879,16 +3938,26 @@ async function realExecuteResearchRun(ctx, waypoint, config2, token, model) {
     logging: { type: "file", path: logFilePath, onAgentStreamEvent: throttle.onEvent }
   };
   let result;
+  let salvaged = [];
   try {
     result = await run2(runOptions);
   } catch (err) {
     throttle.flush();
     if (ctx.signal.aborted)
       throw err;
-    return { status: "failed", error: err instanceof Error ? err.message : String(err) };
+    const msg = err instanceof Error ? err.message : String(err);
+    salvaged = isWorktreeTeardownError(err) ? await branchCommitsAhead(project.repoPath, feature.branch, tempBranch) : [];
+    if (salvaged.length === 0)
+      return { status: "failed", error: msg };
+    const removed = await cleanupBurnWorktree(project.repoPath, tempBranch);
+    ctx.emitEvent({
+      type: "burn.worktree.teardown-failed",
+      message: `waypoint ${waypoint.seq}: agent finished but sandcastle could not remove its worktree (${errorHeadline2(msg)})${removed ? " \u2014 cleaned up" : " \u2014 left on disk"}; landing the ${salvaged.length} commit(s) anyway`,
+      data: { tempBranch, error: msg, cleanedUp: removed }
+    });
   }
   throttle.flush();
-  const outcome = interpretResearchResult(result, docRelPath);
+  const outcome = result ? interpretResearchResult(result, docRelPath) : { status: "done", commits: salvaged, docRelPath };
   if (outcome.status !== "done")
     return outcome;
   const merge = await mergeTempBranch(project.repoPath, feature.branch, tempBranch);

package/index.js

@@ -2199,6 +2199,34 @@ function researchBranchName(slug, waypointSeq, unique) {
 function ticketBranchName(slug, ticketSeq, unique) {
   return `${TICKET_BRANCH_PREFIX}${tempBranchSlugSegment(slug)}/${ticketSeq}-${unique}`;
 }
+function burnWorktreePath(repoPath, branch) {
+  return join6(repoPath, ".sandcastle", "worktrees", branch.replace(/\//g, "-"));
+}
+async function cleanupBurnWorktree(repoPath, branch, opts = {}) {
+  const path = burnWorktreePath(repoPath, branch);
+  const attempts = Math.max(1, opts.attempts ?? 3);
+  const delayMs = opts.delayMs ?? 750;
+  const g = git(repoPath);
+  for (let attempt = 1;attempt <= attempts && existsSync7(path); attempt++) {
+    try {
+      await g.raw(["worktree", "remove", "--force", path]);
+    } catch {}
+    if (existsSync7(path) && attempt < attempts)
+      await sleep(delayMs);
+  }
+  if (existsSync7(path)) {
+    try {
+      rmSync(path, { recursive: true, force: true });
+    } catch {}
+  }
+  try {
+    await g.raw(["worktree", "prune"]);
+  } catch {}
+  return !existsSync7(path);
+}
+function sleep(ms) {
+  return new Promise((done) => setTimeout(done, ms));
+}
 async function branchCommitsAhead(repoPath, base, branch) {
   try {
     const out = await git(repoPath).raw(["rev-list", "--reverse", `${base}..${branch}`]);
@@ -3057,6 +3085,12 @@ ${blockedContent.trim()}` };
   }
   return { status: "failed", error: "agent made no commits" };
 }
+function isWorktreeTeardownError(err) {
+  const msg = err instanceof Error ? err.message : typeof err === "string" ? err : String(err);
+  if (!BURN_WORKTREE_PATH.test(msg))
+    return false;
+  return WORKTREE_REMOVAL_FAILURES.some((p) => p.test(msg));
+}
 function isMergeConflictError(err) {
   const msg = err instanceof Error ? err.message : typeof err === "string" ? err : "";
   return /conflict/i.test(msg) || /git branch -D/i.test(msg) || /automatic merge failed/i.test(msg);
@@ -3485,13 +3519,18 @@ async function realExecuteTicketRun(ctx, ticket, config2, token, model, land, en
     } catch (err) {
       if (ctx.signal.aborted)
         throw err;
-      return {
-        ok: false,
-        branch: await bestTip(),
-        error: ticketAbort.signal.aborted ? "stopped by user during conflict resolution" : errorHeadline(err instanceof Error ? err.message : String(err))
-      };
+      const tip = await bestTip();
+      const teardownOnly = !ticketAbort.signal.aborted && isWorktreeTeardownError(err) && tip === resolveBranch;
+      if (!teardownOnly) {
+        return {
+          ok: false,
+          branch: tip,
+          error: ticketAbort.signal.aborted ? "stopped by user during conflict resolution" : errorHeadline(err instanceof Error ? err.message : String(err))
+        };
+      }
+      await cleanupBurnWorktree(project.repoPath, resolveBranch);
     }
-    const blocked = readBlockedFile([result.preservedWorktreePath, project.repoPath]);
+    const blocked = readBlockedFile([result?.preservedWorktreePath, project.repoPath]);
     if (blocked !== undefined && blocked.trim().length > 0) {
       return {
         ok: false,
@@ -3626,6 +3665,18 @@ ${retryNotes}` : basePrompt,
             }
           };
         }
+        if (isWorktreeTeardownError(err)) {
+          const removed = await cleanupBurnWorktree(project.repoPath, tempBranch);
+          if (salvaged.length > 0) {
+            ctx.emitEvent({
+              type: "burn.worktree.teardown-failed",
+              message: `ticket ${ticket.seq}: agent finished but sandcastle could not remove its worktree (${errorHeadline(msg)})${removed ? " \u2014 cleaned up" : " \u2014 left on disk"}; landing the ${salvaged.length} commit(s) anyway`,
+              ticketId: ticket.id,
+              data: { branch: tempBranch, error: msg, cleanedUp: removed }
+            });
+            return await landChain(tempBranch, salvaged);
+          }
+        }
         if (isMergeConflictError(err)) {
           if (salvaged.length > 0) {
             preserveChain(tempBranch);
@@ -3727,7 +3778,7 @@ function readTokenFromEnvFile(path) {
   const token = fromFile && fromFile.length > 0 ? fromFile : process.env.CLAUDE_CODE_OAUTH_TOKEN;
   return token && token.length > 0 ? token : undefined;
 }
-var AUTH_MISSING_EVENT = "auth.missing", AUTH_MISSING_MESSAGE = "run `claude setup-token` and put CLAUDE_CODE_OAUTH_TOKEN in ~/.runcastle/.env", PACKAGE_MANAGERS, PM_CACHE_SANDBOX_PATHS, SANDBOX_WORKSPACE_PATH = "/home/agent/workspace", ISOLATED_REPO_PATH = "/home/agent/repo", FATAL_ERROR_PATTERNS, RETRYABLE_ERROR_PATTERNS, activeTicketAborts, SETUP_HOOK_TIMEOUT_MS, ticketBurner;
+var AUTH_MISSING_EVENT = "auth.missing", AUTH_MISSING_MESSAGE = "run `claude setup-token` and put CLAUDE_CODE_OAUTH_TOKEN in ~/.runcastle/.env", PACKAGE_MANAGERS, PM_CACHE_SANDBOX_PATHS, SANDBOX_WORKSPACE_PATH = "/home/agent/workspace", ISOLATED_REPO_PATH = "/home/agent/repo", BURN_WORKTREE_PATH, WORKTREE_REMOVAL_FAILURES, FATAL_ERROR_PATTERNS, RETRYABLE_ERROR_PATTERNS, activeTicketAborts, SETUP_HOOK_TIMEOUT_MS, ticketBurner;
 var init_ticket_burner = __esm(() => {
   init_src();
   init_config_load();
@@ -3741,6 +3792,14 @@ var init_ticket_burner = __esm(() => {
     yarn: "~/.cache/yarn",
     npm: "~/.npm"
   };
+  BURN_WORKTREE_PATH = /[\\/]\.sandcastle[\\/]worktrees[\\/]/i;
+  WORKTREE_REMOVAL_FAILURES = [
+    /failed to delete/i,
+    /directory not empty|enotempty/i,
+    /unable to (unlink|delete)/i,
+    /is not a working tree/i,
+    /resource busy|ebusy|eperm|eacces/i
+  ];
   FATAL_ERROR_PATTERNS = [
     /invalid (api key|x-api-key)/i,
     /authentication|unauthorized|permission denied/i,
@@ -3878,16 +3937,26 @@ async function realExecuteResearchRun(ctx, waypoint, config2, token, model) {
     logging: { type: "file", path: logFilePath, onAgentStreamEvent: throttle.onEvent }
   };
   let result;
+  let salvaged = [];
   try {
     result = await run2(runOptions);
   } catch (err) {
     throttle.flush();
     if (ctx.signal.aborted)
       throw err;
-    return { status: "failed", error: err instanceof Error ? err.message : String(err) };
+    const msg = err instanceof Error ? err.message : String(err);
+    salvaged = isWorktreeTeardownError(err) ? await branchCommitsAhead(project.repoPath, feature.branch, tempBranch) : [];
+    if (salvaged.length === 0)
+      return { status: "failed", error: msg };
+    const removed = await cleanupBurnWorktree(project.repoPath, tempBranch);
+    ctx.emitEvent({
+      type: "burn.worktree.teardown-failed",
+      message: `waypoint ${waypoint.seq}: agent finished but sandcastle could not remove its worktree (${errorHeadline2(msg)})${removed ? " \u2014 cleaned up" : " \u2014 left on disk"}; landing the ${salvaged.length} commit(s) anyway`,
+      data: { tempBranch, error: msg, cleanedUp: removed }
+    });
   }
   throttle.flush();
-  const outcome = interpretResearchResult(result, docRelPath);
+  const outcome = result ? interpretResearchResult(result, docRelPath) : { status: "done", commits: salvaged, docRelPath };
   if (outcome.status !== "done")
     return outcome;
   const merge = await mergeTempBranch(project.repoPath, feature.branch, tempBranch);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runcastle",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "description": "Burn tickets into shipped features with Claude Code.",
   "license": "MIT",
   "type": "module",