runcastle 1.2.1 → 1.2.3

package/bin/runcastle.js

@@ -914,6 +914,23 @@ var init_resolve_executable = __esm(() => {
   };
 });
 
+// src/pty/kill-tree.ts
+import { execFile } from "child_process";
+import { promisify } from "util";
+async function killProcessTree(pid) {
+  try {
+    if (process.platform === "win32") {
+      await execFileAsync("taskkill", ["/pid", String(pid), "/T", "/F"], { windowsHide: true });
+    } else {
+      process.kill(-pid, "SIGTERM");
+    }
+  } catch {}
+}
+var execFileAsync;
+var init_kill_tree = __esm(() => {
+  execFileAsync = promisify(execFile);
+});
+
 // src/pty/pty-sidecar.ts
 import { spawn } from "child_process";
 import { createRequire } from "module";
@@ -1095,6 +1112,9 @@ ${why.replace(/\n/g, `\r
         }
       }, 500);
     },
+    killTree() {
+      return killProcessTree(process.platform === "win32" ? child.pid ?? pid : pid);
+    },
     get pid() {
       return pid;
     },
@@ -1107,6 +1127,7 @@ var HOST_PATH;
 var init_pty_sidecar = __esm(() => {
   init_asset_paths();
   init_resolve_executable();
+  init_kill_tree();
   HOST_PATH = resolveAsset(ASSET_ENV.ptyHost, fileURLToPath(new URL("./pty-host.cjs", import.meta.url)));
 });
 
@@ -1193,6 +1214,9 @@ function createNativePtySession(cmd, args, opts) {
         proc.kill();
       } catch {}
     },
+    killTree() {
+      return killProcessTree(proc.pid);
+    },
     get pid() {
       return proc.pid;
     },
@@ -1204,6 +1228,7 @@ function createNativePtySession(cmd, args, opts) {
 var cached = null, BACKEND_LOGGED;
 var init_pty = __esm(() => {
   init_resolve_executable();
+  init_kill_tree();
   init_pty_sidecar();
   BACKEND_LOGGED = Symbol.for("runcastle.pty.backend.logged");
 });
@@ -1855,18 +1880,24 @@ function devPaneLive(paneId) {
   const entry = ptyRegistry().get(paneId);
   return !!entry && !entry.exited;
 }
-function stopDevPane(paneId) {
+function killTreeBounded(pty) {
+  return new Promise((resolve4) => {
+    const timer = setTimeout(resolve4, KILL_TREE_TIMEOUT_MS);
+    pty.killTree().catch(() => {}).then(() => {
+      clearTimeout(timer);
+      resolve4();
+    });
+  });
+}
+async function stopDevPane(paneId) {
   const reg = ptyRegistry();
   const entry = reg.get(paneId);
-  if (entry && !entry.exited && process.platform !== "win32") {
-    try {
-      process.kill(-entry.pty.pid, "SIGTERM");
-    } catch {}
-  }
+  if (entry && !entry.exited)
+    await killTreeBounded(entry.pty);
   reg.kill(paneId);
   reg.remove(paneId);
 }
-var DRIVE_PREFIX = "drive:", SNIFF_WINDOW = 8192;
+var DRIVE_PREFIX = "drive:", SNIFF_WINDOW = 8192, KILL_TREE_TIMEOUT_MS = 5000;
 var init_dev_pane = __esm(() => {
   init_events();
   init_registry();
@@ -2795,7 +2826,7 @@ async function testDrive(ctx, project, feature, action) {
     const detachedWorktree2 = testDriveState.detachedWorktree;
     const devPaneId = testDriveState.devPaneId;
     if (devPaneId)
-      stopDevPane(devPaneId);
+      await stopDevPane(devPaneId);
     const teardown = await runDriveHookStep(ctx, scope, project.repoPath, "teardown", project.driveStopCommand, driveEnvFor(ctx, project, { slug: feature.slug, branch }, scope).env);
     const carriedChanges = await dirtyPaths(g);
     await g.checkout(previousBranch2);
@@ -2935,7 +2966,7 @@ async function startDryRun(ctx, project) {
 async function stopDryRun(ctx, project, state) {
   const scope = { projectId: project.id };
   if (state.devPaneId)
-    stopDevPane(state.devPaneId);
+    await stopDevPane(state.devPaneId);
   const teardown = await runDriveHookStep(ctx, scope, project.repoPath, "teardown", project.driveStopCommand, state.env);
   state.observed.teardownOk = teardown?.result.ok;
   testDriveState = undefined;
@@ -3430,7 +3461,7 @@ function landProjectSession(ctx, session) {
       data: { sessionId: session.id, branch: PROJECT_BRANCH, ...data }
     });
   };
-  landProjectBranch(project).then((res) => {
+  const landing = landProjectBranch(project).then((res) => {
     if (!res)
       return;
     if (res.landed) {
@@ -3443,6 +3474,8 @@ function landProjectSession(ctx, session) {
   }).catch((e) => {
     report("project.land_failed", `could not land the project session's work onto ${project.mainBranch}: ${e instanceof Error ? e.message : String(e)} \u2014 ${kept}`, { error: e instanceof Error ? e.message : String(e) });
   });
+  inFlightLandings.add(landing);
+  landing.finally(() => inFlightLandings.delete(landing));
 }
 function markSessionEnded(ctx, id) {
   const existing = getSessionRow(ctx, id);
@@ -3471,7 +3504,7 @@ function mostRecentLiveSession(ctx) {
   const row = ctx.db.select().from(sessions).where(eq5(sessions.status, "live")).orderBy(desc3(sql2`rowid`)).limit(1).get();
   return row ? rowToSession(row) : null;
 }
-var KICKOFF_DELAY_MS = 1500, KICKOFF_SUBMIT_DELAY_MS = 350, KICKOFF_CONFIRM_MS = 12000, KICKOFF_MAX_ATTEMPTS = 3, CLEAR_INPUT = "\x15", SESSION_READY_TIMEOUT_MS = 25000, CONVERGE_KICKOFF_LINE, KICKOFF_LINES, RESUME_KICKOFF_PREFIX, pendingKickoffOverrides, deliveries, MATCH_PREFIX = 40, landedProjectSessions;
+var KICKOFF_DELAY_MS = 1500, KICKOFF_SUBMIT_DELAY_MS = 350, KICKOFF_CONFIRM_MS = 12000, KICKOFF_MAX_ATTEMPTS = 3, CLEAR_INPUT = "\x15", SESSION_READY_TIMEOUT_MS = 25000, CONVERGE_KICKOFF_LINE, KICKOFF_LINES, RESUME_KICKOFF_PREFIX, pendingKickoffOverrides, deliveries, MATCH_PREFIX = 40, landedProjectSessions, inFlightLandings;
 var init_sessions = __esm(() => {
   init_src();
   init_schema();
@@ -3494,6 +3527,7 @@ var init_sessions = __esm(() => {
   pendingKickoffOverrides = new Map;
   deliveries = new Map;
   landedProjectSessions = new Set;
+  inFlightLandings = new Set;
 });
 
 // src/launcher/reconcile.ts

package/index.js

@@ -913,6 +913,23 @@ var init_resolve_executable = __esm(() => {
   };
 });
 
+// src/pty/kill-tree.ts
+import { execFile } from "child_process";
+import { promisify } from "util";
+async function killProcessTree(pid) {
+  try {
+    if (process.platform === "win32") {
+      await execFileAsync("taskkill", ["/pid", String(pid), "/T", "/F"], { windowsHide: true });
+    } else {
+      process.kill(-pid, "SIGTERM");
+    }
+  } catch {}
+}
+var execFileAsync;
+var init_kill_tree = __esm(() => {
+  execFileAsync = promisify(execFile);
+});
+
 // src/pty/pty-sidecar.ts
 import { spawn } from "child_process";
 import { createRequire } from "module";
@@ -1094,6 +1111,9 @@ ${why.replace(/\n/g, `\r
         }
       }, 500);
     },
+    killTree() {
+      return killProcessTree(process.platform === "win32" ? child.pid ?? pid : pid);
+    },
     get pid() {
       return pid;
     },
@@ -1106,6 +1126,7 @@ var HOST_PATH;
 var init_pty_sidecar = __esm(() => {
   init_asset_paths();
   init_resolve_executable();
+  init_kill_tree();
   HOST_PATH = resolveAsset(ASSET_ENV.ptyHost, fileURLToPath(new URL("./pty-host.cjs", import.meta.url)));
 });
 
@@ -1192,6 +1213,9 @@ function createNativePtySession(cmd, args, opts) {
         proc.kill();
       } catch {}
     },
+    killTree() {
+      return killProcessTree(proc.pid);
+    },
     get pid() {
       return proc.pid;
     },
@@ -1203,6 +1227,7 @@ function createNativePtySession(cmd, args, opts) {
 var cached = null, BACKEND_LOGGED;
 var init_pty = __esm(() => {
   init_resolve_executable();
+  init_kill_tree();
   init_pty_sidecar();
   BACKEND_LOGGED = Symbol.for("runcastle.pty.backend.logged");
 });
@@ -1854,18 +1879,24 @@ function devPaneLive(paneId) {
   const entry = ptyRegistry().get(paneId);
   return !!entry && !entry.exited;
 }
-function stopDevPane(paneId) {
+function killTreeBounded(pty) {
+  return new Promise((resolve4) => {
+    const timer = setTimeout(resolve4, KILL_TREE_TIMEOUT_MS);
+    pty.killTree().catch(() => {}).then(() => {
+      clearTimeout(timer);
+      resolve4();
+    });
+  });
+}
+async function stopDevPane(paneId) {
   const reg = ptyRegistry();
   const entry = reg.get(paneId);
-  if (entry && !entry.exited && process.platform !== "win32") {
-    try {
-      process.kill(-entry.pty.pid, "SIGTERM");
-    } catch {}
-  }
+  if (entry && !entry.exited)
+    await killTreeBounded(entry.pty);
   reg.kill(paneId);
   reg.remove(paneId);
 }
-var DRIVE_PREFIX = "drive:", SNIFF_WINDOW = 8192;
+var DRIVE_PREFIX = "drive:", SNIFF_WINDOW = 8192, KILL_TREE_TIMEOUT_MS = 5000;
 var init_dev_pane = __esm(() => {
   init_events();
   init_registry();
@@ -2794,7 +2825,7 @@ async function testDrive(ctx, project, feature, action) {
     const detachedWorktree2 = testDriveState.detachedWorktree;
     const devPaneId = testDriveState.devPaneId;
     if (devPaneId)
-      stopDevPane(devPaneId);
+      await stopDevPane(devPaneId);
     const teardown = await runDriveHookStep(ctx, scope, project.repoPath, "teardown", project.driveStopCommand, driveEnvFor(ctx, project, { slug: feature.slug, branch }, scope).env);
     const carriedChanges = await dirtyPaths(g);
     await g.checkout(previousBranch2);
@@ -2934,7 +2965,7 @@ async function startDryRun(ctx, project) {
 async function stopDryRun(ctx, project, state) {
   const scope = { projectId: project.id };
   if (state.devPaneId)
-    stopDevPane(state.devPaneId);
+    await stopDevPane(state.devPaneId);
   const teardown = await runDriveHookStep(ctx, scope, project.repoPath, "teardown", project.driveStopCommand, state.env);
   state.observed.teardownOk = teardown?.result.ok;
   testDriveState = undefined;
@@ -3429,7 +3460,7 @@ function landProjectSession(ctx, session) {
       data: { sessionId: session.id, branch: PROJECT_BRANCH, ...data }
     });
   };
-  landProjectBranch(project).then((res) => {
+  const landing = landProjectBranch(project).then((res) => {
     if (!res)
       return;
     if (res.landed) {
@@ -3442,6 +3473,8 @@ function landProjectSession(ctx, session) {
   }).catch((e) => {
     report("project.land_failed", `could not land the project session's work onto ${project.mainBranch}: ${e instanceof Error ? e.message : String(e)} \u2014 ${kept}`, { error: e instanceof Error ? e.message : String(e) });
   });
+  inFlightLandings.add(landing);
+  landing.finally(() => inFlightLandings.delete(landing));
 }
 function markSessionEnded(ctx, id) {
   const existing = getSessionRow(ctx, id);
@@ -3470,7 +3503,7 @@ function mostRecentLiveSession(ctx) {
   const row = ctx.db.select().from(sessions).where(eq5(sessions.status, "live")).orderBy(desc3(sql2`rowid`)).limit(1).get();
   return row ? rowToSession(row) : null;
 }
-var KICKOFF_DELAY_MS = 1500, KICKOFF_SUBMIT_DELAY_MS = 350, KICKOFF_CONFIRM_MS = 12000, KICKOFF_MAX_ATTEMPTS = 3, CLEAR_INPUT = "\x15", SESSION_READY_TIMEOUT_MS = 25000, CONVERGE_KICKOFF_LINE, KICKOFF_LINES, RESUME_KICKOFF_PREFIX, pendingKickoffOverrides, deliveries, MATCH_PREFIX = 40, landedProjectSessions;
+var KICKOFF_DELAY_MS = 1500, KICKOFF_SUBMIT_DELAY_MS = 350, KICKOFF_CONFIRM_MS = 12000, KICKOFF_MAX_ATTEMPTS = 3, CLEAR_INPUT = "\x15", SESSION_READY_TIMEOUT_MS = 25000, CONVERGE_KICKOFF_LINE, KICKOFF_LINES, RESUME_KICKOFF_PREFIX, pendingKickoffOverrides, deliveries, MATCH_PREFIX = 40, landedProjectSessions, inFlightLandings;
 var init_sessions = __esm(() => {
   init_src();
   init_schema();
@@ -3493,6 +3526,7 @@ var init_sessions = __esm(() => {
   pendingKickoffOverrides = new Map;
   deliveries = new Map;
   landedProjectSessions = new Set;
+  inFlightLandings = new Set;
 });
 
 // src/launcher/reconcile.ts

package/package.json

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