@sideboard-ai/core 0.1.225 → 0.1.226

package/dist/{chunk-5L66IONI.js → chunk-EGKSFWVZ.js}

@@ -418,7 +418,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-ZAJ2M4UW.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-OTEYZHTZ.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -1197,6 +1197,7 @@ import {
   readdirSync,
   readFileSync as readFileSync4
 } from "fs";
+import { execFileSync } from "child_process";
 import { createServer } from "net";
 import { basename, dirname as dirname2, join as join7 } from "path";
 import { execa as execa2 } from "execa";
@@ -2177,6 +2178,34 @@ function pipeLines(stream, onLine) {
   const rl = createInterface2({ input: stream });
   rl.on("line", onLine);
 }
+function killListenersOnPorts(ports) {
+  for (const port of ports) {
+    if (!Number.isFinite(port) || port <= 0) continue;
+    try {
+      if (process.platform === "win32") {
+        execFileSync(
+          "powershell",
+          [
+            "-NoProfile",
+            "-Command",
+            `Get-NetTCPConnection -LocalPort ${port} -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }`
+          ],
+          { stdio: "ignore" }
+        );
+      } else {
+        execFileSync(
+          "zsh",
+          [
+            "-lc",
+            `pids=$(lsof -tiTCP:${port} -sTCP:LISTEN 2>/dev/null); [ -n "$pids" ] && kill -TERM $pids 2>/dev/null; true`
+          ],
+          { stdio: "ignore" }
+        );
+      }
+    } catch {
+    }
+  }
+}
 function killScriptTree(child, ports = []) {
   const pid = child.pid;
   if (pid) {
@@ -2199,26 +2228,7 @@ function killScriptTree(child, ports = []) {
       }
     }
   }
-  for (const port of ports) {
-    if (!Number.isFinite(port) || port <= 0) continue;
-    if (process.platform === "win32") {
-      void execa2(
-        "powershell",
-        [
-          "-NoProfile",
-          "-Command",
-          `Get-NetTCPConnection -LocalPort ${port} -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }`
-        ],
-        { reject: false }
-      );
-    } else {
-      void execa2(
-        "zsh",
-        ["-lc", `pids=$(lsof -tiTCP:${port} -sTCP:LISTEN 2>/dev/null); [ -n "$pids" ] && kill -TERM $pids 2>/dev/null; true`],
-        { reject: false }
-      );
-    }
-  }
+  killListenersOnPorts(ports);
 }
 async function spawnWorkspaceScript(command, opts) {
   const loginEnv = await captureLoginEnv();
@@ -4385,7 +4395,7 @@ function createQuotaFailoverChat(from, fallbackAgent, limitText) {
 }
 
 // src/threads/adopt.ts
-import { execFileSync } from "child_process";
+import { execFileSync as execFileSync2 } from "child_process";
 import {
   copyFileSync as copyFileSync2,
   existsSync as existsSync12,
@@ -4649,7 +4659,7 @@ function importConductorWorkspace(workspaceId) {
       }
       let repoPath = worktreePath;
       try {
-        repoPath = execFileSync("git", ["rev-parse", "--show-toplevel"], {
+        repoPath = execFileSync2("git", ["rev-parse", "--show-toplevel"], {
           cwd: worktreePath,
           encoding: "utf8"
         }).trim();
@@ -6957,7 +6967,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-ZAJ2M4UW.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-OTEYZHTZ.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7094,6 +7104,16 @@ function writeLiveStatus(threadId, status, lastError) {
   if (!latest || latest.status === "archived") return latest;
   return setStatus(threadId, status, lastError);
 }
+function collectActiveRunPorts(runs) {
+  const ports = /* @__PURE__ */ new Set();
+  for (const run2 of runs) {
+    const list = run2.ports?.length ? run2.ports : run2.port != null ? [run2.port] : [];
+    for (const p of list) {
+      if (Number.isFinite(p) && p > 0) ports.add(p);
+    }
+  }
+  return [...ports];
+}
 var Orchestrator = class {
   events = new EventEmitter();
   processes = /* @__PURE__ */ new Map();
@@ -7235,6 +7255,9 @@ var Orchestrator = class {
         this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
       }
     }
+    if (reclaimStaleTurns) {
+      this.reapOrphanedRunScripts();
+    }
     const repoPaths = (repoPath ? [repoPath] : [...new Set(listThreads({ includeArchived: true }).map((t) => t.repoPath))]).filter((p) => !isGlobalRepoPath(p));
     await this.reconcileOrphans(repoPaths);
     try {
@@ -8453,13 +8476,30 @@ var Orchestrator = class {
         worktreeRunProcessKey(thread.worktreePath, scriptName),
         ...siblings.map((t) => `${t.id}:run:${scriptName}`)
       ];
+      let hadHandle2 = false;
       for (const key of keys) {
         const proc = this.processes.get(key);
-        if (proc) proc.kill();
+        if (proc) {
+          proc.kill();
+          hadHandle2 = true;
+        }
         this.processes.delete(key);
       }
+      const legacyKey = worktreeDevProcessKey(thread.worktreePath);
+      const legacy = this.processes.get(legacyKey);
+      if (legacy?.scriptName === scriptName || !legacy?.scriptName && scriptName === "dev") {
+        if (legacy && !hadHandle2) {
+          legacy.kill();
+          hadHandle2 = true;
+        }
+        this.processes.delete(legacyKey);
+      }
+      const run2 = shared.activeRuns.find((r) => r.scriptName === scriptName);
+      if (!hadHandle2 && run2) {
+        killListenersOnPorts(collectActiveRunPorts([run2]));
+      }
       const remaining = shared.activeRuns.filter((r) => r.scriptName !== scriptName);
-      const isPrimary = shared.devPort != null && shared.activeRuns.find((r) => r.scriptName === scriptName)?.port === shared.devPort;
+      const isPrimary = shared.devPort != null && run2?.port === shared.devPort;
       this.syncWorktreeRuns(
         thread.worktreePath,
         remaining,
@@ -8468,15 +8508,66 @@ var Orchestrator = class {
       this.emit({ type: "dev_server_stopped", threadId: thread.id, scriptName });
       return;
     }
+    let hadHandle = false;
     for (const [key, proc] of [...this.processes.entries()]) {
       if (isWorktreeRunProcessKey(key, thread.worktreePath) || siblings.some((t) => key.startsWith(`${t.id}:run:`) || key === `${t.id}:dev`)) {
         proc.kill();
+        hadHandle = true;
         this.processes.delete(key);
       }
     }
+    if (!hadHandle && shared.activeRuns.length > 0) {
+      killListenersOnPorts(collectActiveRunPorts(shared.activeRuns));
+    }
     this.syncWorktreeRuns(thread.worktreePath, [], null);
     this.emit({ type: "dev_server_stopped", threadId: thread.id });
   }
+  /**
+   * App quit: tear down every registered run/setup child and free persisted
+   * ports so the next launch is not blocked by orphans.
+   */
+  stopAllRunScripts() {
+    for (const [key, proc] of [...this.processes.entries()]) {
+      if (proc.kind !== "dev" && proc.kind !== "setup") continue;
+      try {
+        proc.kill();
+      } catch {
+      }
+      this.processes.delete(key);
+    }
+    this.reapOrphanedRunScripts({ force: true });
+  }
+  /**
+   * After restart (or force quit), in-memory handles are gone but `activeRuns`
+   * and OS listeners may remain. Kill by port and clear disk metadata.
+   * Skips worktrees that still have a live handle unless `force` (quit path).
+   */
+  reapOrphanedRunScripts(opts) {
+    const force = opts?.force === true;
+    const seen = /* @__PURE__ */ new Set();
+    for (const thread of listThreads({ includeArchived: true })) {
+      if (thread.status === "archived") continue;
+      if (isGlobalThread(thread)) continue;
+      const wt = normalizeWorktreePath(thread.worktreePath);
+      if (seen.has(wt)) continue;
+      seen.add(wt);
+      const siblings = threadsSharingWorktree(thread.worktreePath);
+      const shared = mergeWorktreeActiveRuns(siblings);
+      if (shared.activeRuns.length === 0 && shared.devPort == null) continue;
+      const hasLiveHandle = [...this.processes.keys()].some(
+        (k) => isWorktreeRunProcessKey(k, thread.worktreePath) || siblings.some((t) => k.startsWith(`${t.id}:run:`) || k === `${t.id}:dev`)
+      );
+      if (!force && hasLiveHandle) continue;
+      killListenersOnPorts(collectActiveRunPorts(shared.activeRuns));
+      if (shared.devPort != null) {
+        killListenersOnPorts([shared.devPort]);
+      }
+      this.syncWorktreeRuns(thread.worktreePath, [], null);
+      for (const sibling of siblings) {
+        this.emit({ type: "dev_server_stopped", threadId: sibling.id });
+      }
+    }
+  }
   syncWorktreeRuns(worktreePath, activeRuns, devPort) {
     for (const sibling of threadsSharingWorktree(worktreePath)) {
       updateThread(sibling.id, { activeRuns, devPort });

package/dist/{chunk-MPSXJ7WU.js → chunk-VQDYONM4.js}

@@ -482,7 +482,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-O3FNYIRE.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-IEU7U3RP.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -1202,6 +1202,7 @@ import {
   readdirSync,
   readFileSync as readFileSync4
 } from "fs";
+import { execFileSync } from "child_process";
 import { createServer } from "net";
 import { basename, dirname as dirname2, join as join7 } from "path";
 import { execa as execa2 } from "execa";
@@ -2235,6 +2236,34 @@ function pipeLines(stream, onLine) {
   const rl = createInterface2({ input: stream });
   rl.on("line", onLine);
 }
+function killListenersOnPorts(ports) {
+  for (const port of ports) {
+    if (!Number.isFinite(port) || port <= 0) continue;
+    try {
+      if (process.platform === "win32") {
+        execFileSync(
+          "powershell",
+          [
+            "-NoProfile",
+            "-Command",
+            `Get-NetTCPConnection -LocalPort ${port} -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }`
+          ],
+          { stdio: "ignore" }
+        );
+      } else {
+        execFileSync(
+          "zsh",
+          [
+            "-lc",
+            `pids=$(lsof -tiTCP:${port} -sTCP:LISTEN 2>/dev/null); [ -n "$pids" ] && kill -TERM $pids 2>/dev/null; true`
+          ],
+          { stdio: "ignore" }
+        );
+      }
+    } catch {
+    }
+  }
+}
 function killScriptTree(child, ports = []) {
   const pid = child.pid;
   if (pid) {
@@ -2257,26 +2286,7 @@ function killScriptTree(child, ports = []) {
       }
     }
   }
-  for (const port of ports) {
-    if (!Number.isFinite(port) || port <= 0) continue;
-    if (process.platform === "win32") {
-      void execa2(
-        "powershell",
-        [
-          "-NoProfile",
-          "-Command",
-          `Get-NetTCPConnection -LocalPort ${port} -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }`
-        ],
-        { reject: false }
-      );
-    } else {
-      void execa2(
-        "zsh",
-        ["-lc", `pids=$(lsof -tiTCP:${port} -sTCP:LISTEN 2>/dev/null); [ -n "$pids" ] && kill -TERM $pids 2>/dev/null; true`],
-        { reject: false }
-      );
-    }
-  }
+  killListenersOnPorts(ports);
 }
 async function spawnWorkspaceScript(command, opts) {
   const loginEnv = await captureLoginEnv();
@@ -4554,7 +4564,7 @@ function createQuotaFailoverChat(from, fallbackAgent, limitText) {
 }
 
 // src/threads/adopt.ts
-import { execFileSync } from "child_process";
+import { execFileSync as execFileSync2 } from "child_process";
 import {
   copyFileSync as copyFileSync2,
   existsSync as existsSync12,
@@ -4821,7 +4831,7 @@ function importConductorWorkspace(workspaceId) {
       }
       let repoPath = worktreePath;
       try {
-        repoPath = execFileSync("git", ["rev-parse", "--show-toplevel"], {
+        repoPath = execFileSync2("git", ["rev-parse", "--show-toplevel"], {
           cwd: worktreePath,
           encoding: "utf8"
         }).trim();
@@ -7332,7 +7342,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-O3FNYIRE.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-IEU7U3RP.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7469,6 +7479,16 @@ function writeLiveStatus(threadId, status, lastError) {
   if (!latest || latest.status === "archived") return latest;
   return setStatus(threadId, status, lastError);
 }
+function collectActiveRunPorts(runs) {
+  const ports = /* @__PURE__ */ new Set();
+  for (const run2 of runs) {
+    const list = run2.ports?.length ? run2.ports : run2.port != null ? [run2.port] : [];
+    for (const p of list) {
+      if (Number.isFinite(p) && p > 0) ports.add(p);
+    }
+  }
+  return [...ports];
+}
 var Orchestrator = class {
   events = new EventEmitter();
   processes = /* @__PURE__ */ new Map();
@@ -7610,6 +7630,9 @@ var Orchestrator = class {
         this.emit({ type: "status_changed", threadId: thread.id, status: "stopped" });
       }
     }
+    if (reclaimStaleTurns) {
+      this.reapOrphanedRunScripts();
+    }
     const repoPaths = (repoPath ? [repoPath] : [...new Set(listThreads({ includeArchived: true }).map((t) => t.repoPath))]).filter((p) => !isGlobalRepoPath(p));
     await this.reconcileOrphans(repoPaths);
     try {
@@ -8828,13 +8851,30 @@ var Orchestrator = class {
         worktreeRunProcessKey(thread.worktreePath, scriptName),
         ...siblings.map((t) => `${t.id}:run:${scriptName}`)
       ];
+      let hadHandle2 = false;
       for (const key of keys) {
         const proc = this.processes.get(key);
-        if (proc) proc.kill();
+        if (proc) {
+          proc.kill();
+          hadHandle2 = true;
+        }
         this.processes.delete(key);
       }
+      const legacyKey = worktreeDevProcessKey(thread.worktreePath);
+      const legacy = this.processes.get(legacyKey);
+      if (legacy?.scriptName === scriptName || !legacy?.scriptName && scriptName === "dev") {
+        if (legacy && !hadHandle2) {
+          legacy.kill();
+          hadHandle2 = true;
+        }
+        this.processes.delete(legacyKey);
+      }
+      const run2 = shared.activeRuns.find((r) => r.scriptName === scriptName);
+      if (!hadHandle2 && run2) {
+        killListenersOnPorts(collectActiveRunPorts([run2]));
+      }
       const remaining = shared.activeRuns.filter((r) => r.scriptName !== scriptName);
-      const isPrimary = shared.devPort != null && shared.activeRuns.find((r) => r.scriptName === scriptName)?.port === shared.devPort;
+      const isPrimary = shared.devPort != null && run2?.port === shared.devPort;
       this.syncWorktreeRuns(
         thread.worktreePath,
         remaining,
@@ -8843,15 +8883,66 @@ var Orchestrator = class {
       this.emit({ type: "dev_server_stopped", threadId: thread.id, scriptName });
       return;
     }
+    let hadHandle = false;
     for (const [key, proc] of [...this.processes.entries()]) {
       if (isWorktreeRunProcessKey(key, thread.worktreePath) || siblings.some((t) => key.startsWith(`${t.id}:run:`) || key === `${t.id}:dev`)) {
         proc.kill();
+        hadHandle = true;
         this.processes.delete(key);
       }
     }
+    if (!hadHandle && shared.activeRuns.length > 0) {
+      killListenersOnPorts(collectActiveRunPorts(shared.activeRuns));
+    }
     this.syncWorktreeRuns(thread.worktreePath, [], null);
     this.emit({ type: "dev_server_stopped", threadId: thread.id });
   }
+  /**
+   * App quit: tear down every registered run/setup child and free persisted
+   * ports so the next launch is not blocked by orphans.
+   */
+  stopAllRunScripts() {
+    for (const [key, proc] of [...this.processes.entries()]) {
+      if (proc.kind !== "dev" && proc.kind !== "setup") continue;
+      try {
+        proc.kill();
+      } catch {
+      }
+      this.processes.delete(key);
+    }
+    this.reapOrphanedRunScripts({ force: true });
+  }
+  /**
+   * After restart (or force quit), in-memory handles are gone but `activeRuns`
+   * and OS listeners may remain. Kill by port and clear disk metadata.
+   * Skips worktrees that still have a live handle unless `force` (quit path).
+   */
+  reapOrphanedRunScripts(opts) {
+    const force = opts?.force === true;
+    const seen = /* @__PURE__ */ new Set();
+    for (const thread of listThreads({ includeArchived: true })) {
+      if (thread.status === "archived") continue;
+      if (isGlobalThread(thread)) continue;
+      const wt = normalizeWorktreePath(thread.worktreePath);
+      if (seen.has(wt)) continue;
+      seen.add(wt);
+      const siblings = threadsSharingWorktree(thread.worktreePath);
+      const shared = mergeWorktreeActiveRuns(siblings);
+      if (shared.activeRuns.length === 0 && shared.devPort == null) continue;
+      const hasLiveHandle = [...this.processes.keys()].some(
+        (k) => isWorktreeRunProcessKey(k, thread.worktreePath) || siblings.some((t) => k.startsWith(`${t.id}:run:`) || k === `${t.id}:dev`)
+      );
+      if (!force && hasLiveHandle) continue;
+      killListenersOnPorts(collectActiveRunPorts(shared.activeRuns));
+      if (shared.devPort != null) {
+        killListenersOnPorts([shared.devPort]);
+      }
+      this.syncWorktreeRuns(thread.worktreePath, [], null);
+      for (const sibling of siblings) {
+        this.emit({ type: "dev_server_stopped", threadId: sibling.id });
+      }
+    }
+  }
   syncWorktreeRuns(worktreePath, activeRuns, devPort) {
     for (const sibling of threadsSharingWorktree(worktreePath)) {
       updateThread(sibling.id, { activeRuns, devPort });
@@ -9924,6 +10015,7 @@ export {
   copyConfiguredFiles,
   captureLoginEnv,
   buildWorkspaceScriptEnv,
+  killListenersOnPorts,
   runSetupScript,
   runConventionSetup,
   runWorkspaceSetup,