@sideboard-ai/core 0.1.226 → 0.1.228

package/dist/{chunk-VQDYONM4.js → chunk-72XUASTH.js}

@@ -482,7 +482,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-IEU7U3RP.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-QUJORSTA.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -1148,6 +1148,12 @@ function samePrIdentity(a, b) {
   const rn = right.match(/\/pull\/(\d+)/i)?.[1];
   return Boolean(ln && rn && ln === rn);
 }
+function shouldStopRunOnPrRetarget(previousPrUrl, nextPrUrl) {
+  const prev = (previousPrUrl ?? "").trim();
+  const next = (nextPrUrl ?? "").trim();
+  if (!prev || !next) return false;
+  return !samePrIdentity(prev, next);
+}
 function shouldPersistFetchedPrMeta(opts) {
   const meta = opts.metaUrl?.trim() || "";
   if (!meta) return false;
@@ -2248,17 +2254,27 @@ function killListenersOnPorts(ports) {
             "-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" }
+          { stdio: "ignore", timeout: 3e3 }
         );
+        continue;
+      }
+      let raw = "";
+      try {
+        raw = execFileSync("lsof", [`-tiTCP:${port}`, "-sTCP:LISTEN"], {
+          encoding: "utf8",
+          stdio: ["ignore", "pipe", "ignore"],
+          timeout: 2e3
+        });
+      } catch {
+        continue;
+      }
+      for (const token of raw.trim().split(/\s+/)) {
+        const pid = Number(token);
+        if (!Number.isFinite(pid) || pid <= 0) continue;
+        try {
+          process.kill(pid, "SIGTERM");
+        } catch {
+        }
       }
     } catch {
     }
@@ -2421,61 +2437,103 @@ function getRunScript(worktreePath, repoPath, name) {
 function getRunMode(worktreePath, repoPath) {
   return loadWorkspaceSettings(worktreePath, repoPath)?.runMode ?? "concurrent";
 }
-async function allocatePort() {
+async function reservePort() {
   return new Promise((resolve, reject) => {
     const server = createServer();
+    let released = false;
+    const release = () => new Promise((res) => {
+      if (released) {
+        res();
+        return;
+      }
+      released = true;
+      server.close(() => res());
+    });
     server.listen(0, "127.0.0.1", () => {
       const addr = server.address();
       if (!addr || typeof addr === "string") {
-        server.close();
-        reject(new Error("Failed to allocate port"));
+        void release().then(() => reject(new Error("Failed to allocate port")));
         return;
       }
-      const port = addr.port;
-      server.close((err) => err ? reject(err) : resolve(port));
+      resolve({ port: addr.port, release });
     });
     server.on("error", reject);
   });
 }
-async function allocatePortRange(size = PORT_RANGE_SIZE) {
-  const base = await allocatePort();
-  const ports = [base];
-  for (let i = 1; i < size; i++) {
-    const candidate = base + i;
-    const free = await new Promise((resolve) => {
-      const server = createServer();
-      server.once("error", () => resolve(false));
-      server.listen(candidate, "127.0.0.1", () => {
-        server.close(() => resolve(true));
-      });
+async function allocatePort() {
+  const held = await reservePort();
+  await held.release();
+  return held.port;
+}
+async function tryReservePort(port) {
+  return new Promise((resolve) => {
+    const server = createServer();
+    let released = false;
+    const release = () => new Promise((res) => {
+      if (released) {
+        res();
+        return;
+      }
+      released = true;
+      server.close(() => res());
     });
-    if (free) {
-      ports.push(candidate);
-    } else {
-      ports.push(await allocatePort());
+    server.once("error", () => resolve(null));
+    server.listen(port, "127.0.0.1", () => {
+      resolve({ port, release });
+    });
+  });
+}
+async function reservePortRange(size = PORT_RANGE_SIZE) {
+  const held = [await reservePort()];
+  const base = held[0].port;
+  try {
+    for (let i = 1; i < size; i++) {
+      const candidate = base + i;
+      const next = await tryReservePort(candidate);
+      if (next) {
+        held.push(next);
+      } else {
+        held.push(await reservePort());
+      }
     }
+    return held;
+  } catch (err) {
+    await Promise.all(held.map((h) => h.release()));
+    throw err;
   }
+}
+async function allocatePortRange(size = PORT_RANGE_SIZE) {
+  const held = await reservePortRange(size);
+  const ports = held.map((h) => h.port);
+  await Promise.all(held.map((h) => h.release()));
   return ports;
 }
 async function startDevServer(repoPath, worktreePath, onLine, opts) {
   const script = getRunScript(worktreePath, repoPath, opts?.scriptName);
   if (!script) return null;
-  const ports = await allocatePortRange(PORT_RANGE_SIZE);
-  const handle = await spawnWorkspaceScript(script.command, {
-    worktreePath,
-    repoPath,
-    ports,
-    defaultBranch: opts?.defaultBranch,
-    onLine
-  });
-  return {
-    pid: handle.pid,
-    port: ports[0],
-    ports,
-    scriptName: script.name,
-    kill: handle.kill,
-    done: handle.done
-  };
+  const held = await reservePortRange(PORT_RANGE_SIZE);
+  const ports = held.map((h) => h.port);
+  try {
+    await Promise.all(held.map((h) => h.release()));
+    const handle = await spawnWorkspaceScript(script.command, {
+      worktreePath,
+      repoPath,
+      ports,
+      defaultBranch: opts?.defaultBranch,
+      onLine
+    });
+    return {
+      pid: handle.pid,
+      port: ports[0],
+      ports,
+      scriptName: script.name,
+      kill: handle.kill,
+      done: handle.done
+    };
+  } catch (err) {
+    await Promise.all(held.map((h) => h.release()));
+    throw err;
+  }
 }
 
 // src/store/setup-log.ts
@@ -7342,7 +7400,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-IEU7U3RP.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-QUJORSTA.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7523,6 +7581,8 @@ var Orchestrator = class {
   /** Auto-continues after a worktree turn ended while a detached job still runs. */
   jobContinueCount = /* @__PURE__ */ new Map();
   jobContinueNudged = /* @__PURE__ */ new Set();
+  /** In-flight startDev per worktree run key — agent MCP + UI Start must not double-spawn. */
+  startingDev = /* @__PURE__ */ new Map();
   maxConcurrent;
   runningCount = 0;
   constructor(opts) {
@@ -8740,9 +8800,20 @@ var Orchestrator = class {
         "No run script found for this worktree. Add [scripts.run.*] in the worktree\u2019s .sideboard/settings.toml or .conductor/settings.toml (or settings.local.toml on the main repo)."
       );
     }
+    const runKey = worktreeRunProcessKey(thread.worktreePath, resolvedName);
+    const inFlight = this.startingDev.get(runKey);
+    if (inFlight) return inFlight;
+    const start = this.startDevUnlocked(thread, resolvedName, scriptName, scripts, runKey);
+    this.startingDev.set(runKey, start);
+    try {
+      return await start;
+    } finally {
+      this.startingDev.delete(runKey);
+    }
+  }
+  async startDevUnlocked(thread, resolvedName, scriptName, scripts, runKey) {
     const siblings = threadsSharingWorktree(thread.worktreePath);
     const shared = mergeWorktreeActiveRuns(siblings);
-    const runKey = worktreeRunProcessKey(thread.worktreePath, resolvedName);
     const existing = this.processes.get(runKey) ?? siblings.map((t) => this.processes.get(`${t.id}:run:${resolvedName}`)).find(Boolean);
     const active = shared.activeRuns.find((r) => r.scriptName === resolvedName);
     if (existing && active) {
@@ -8754,6 +8825,14 @@ var Orchestrator = class {
         return { port: shared.devPort, scriptName: resolvedName, ports: [shared.devPort] };
       }
     }
+    if (active && !existing) {
+      killListenersOnPorts(collectActiveRunPorts([active]));
+      this.syncWorktreeRuns(
+        thread.worktreePath,
+        shared.activeRuns.filter((r) => r.scriptName !== resolvedName),
+        shared.devPort === active.port ? null : shared.devPort
+      );
+    }
     const mode = getRunMode(thread.worktreePath, thread.repoPath);
     if (mode === "nonconcurrent") {
       const here = normalizeWorktreePath(thread.worktreePath);
@@ -8802,6 +8881,7 @@ var Orchestrator = class {
         kill: handle.kill
       });
     }
+    const latestShared = mergeWorktreeActiveRuns(threadsSharingWorktree(thread.worktreePath));
     const run2 = {
       scriptName: resolvedName,
       port: handle.port,
@@ -8809,13 +8889,13 @@ var Orchestrator = class {
       startedAt
     };
     const nextRuns = [
-      ...shared.activeRuns.filter((r) => r.scriptName !== resolvedName),
+      ...latestShared.activeRuns.filter((r) => r.scriptName !== resolvedName),
       run2
     ];
     this.syncWorktreeRuns(
       thread.worktreePath,
       nextRuns,
-      isDefault ? handle.port : shared.devPort
+      isDefault ? handle.port : latestShared.devPort
     );
     this.emit({
       type: "dev_server_started",
@@ -9298,6 +9378,9 @@ var Orchestrator = class {
     this.assertNotGlobal(thread, "Land");
     const result = await confirmLand(thread, opts);
     if (result.prUrl) {
+      if (shouldStopRunOnPrRetarget(thread.prUrl, result.prUrl)) {
+        this.stopDev(thread.id);
+      }
       const patch = { prUrl: result.prUrl };
       try {
         const meta = await getPrMeta(thread.worktreePath, result.prUrl);
@@ -9407,6 +9490,9 @@ var Orchestrator = class {
   async persistPrMetaAndMaybeArchive(thread, meta) {
     const prevState = normalizePrState(thread.prState);
     const nextState = normalizePrState(meta.state);
+    if (shouldStopRunOnPrRetarget(thread.prUrl, meta.url)) {
+      this.stopDev(thread.id);
+    }
     const siblings = threadsSharingWorktree(thread.worktreePath);
     const targets = siblings.length > 0 ? siblings : [thread];
     for (const t of targets) {
@@ -9449,6 +9535,9 @@ var Orchestrator = class {
     if (current?.position != null && thread.stackLayer !== current.position) {
       patch.stackLayer = current.position;
     }
+    if (current?.prUrl && shouldStopRunOnPrRetarget(thread.prUrl, current.prUrl)) {
+      this.stopDev(thread.id);
+    }
     if (current?.prUrl && current.prUrl !== thread.prUrl) patch.prUrl = current.prUrl;
     if (current?.title && current.title !== thread.prTitle) patch.prTitle = current.title;
     if (current?.branchName && current.branchName !== thread.branchName) {
@@ -10024,7 +10113,9 @@ export {
   getDefaultRunScript,
   getRunScript,
   getRunMode,
+  reservePort,
   allocatePort,
+  reservePortRange,
   allocatePortRange,
   startDevServer,
   findOrphanWorktrees,

package/dist/{chunk-EGKSFWVZ.js → chunk-WHYJL7CP.js}

@@ -418,7 +418,7 @@ async function continueSourceThread(threadId, prompt) {
       await continueOnReply(threadId, prompt);
       return;
     }
-    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-OTEYZHTZ.js");
+    const { getOrchestrator: getOrchestrator2 } = await import("./orchestrator-6XEWQWSM.js");
     await getOrchestrator2().send(threadId, prompt);
   } catch {
   }
@@ -1143,6 +1143,12 @@ function samePrIdentity(a, b) {
   const rn = right.match(/\/pull\/(\d+)/i)?.[1];
   return Boolean(ln && rn && ln === rn);
 }
+function shouldStopRunOnPrRetarget(previousPrUrl, nextPrUrl) {
+  const prev = (previousPrUrl ?? "").trim();
+  const next = (nextPrUrl ?? "").trim();
+  if (!prev || !next) return false;
+  return !samePrIdentity(prev, next);
+}
 function shouldPersistFetchedPrMeta(opts) {
   const meta = opts.metaUrl?.trim() || "";
   if (!meta) return false;
@@ -2190,17 +2196,27 @@ function killListenersOnPorts(ports) {
             "-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" }
+          { stdio: "ignore", timeout: 3e3 }
         );
+        continue;
+      }
+      let raw = "";
+      try {
+        raw = execFileSync("lsof", [`-tiTCP:${port}`, "-sTCP:LISTEN"], {
+          encoding: "utf8",
+          stdio: ["ignore", "pipe", "ignore"],
+          timeout: 2e3
+        });
+      } catch {
+        continue;
+      }
+      for (const token of raw.trim().split(/\s+/)) {
+        const pid = Number(token);
+        if (!Number.isFinite(pid) || pid <= 0) continue;
+        try {
+          process.kill(pid, "SIGTERM");
+        } catch {
+        }
       }
     } catch {
     }
@@ -2363,61 +2379,92 @@ function getRunScript(worktreePath, repoPath, name) {
 function getRunMode(worktreePath, repoPath) {
   return loadWorkspaceSettings(worktreePath, repoPath)?.runMode ?? "concurrent";
 }
-async function allocatePort() {
+async function reservePort() {
   return new Promise((resolve, reject) => {
     const server = createServer();
+    let released = false;
+    const release = () => new Promise((res) => {
+      if (released) {
+        res();
+        return;
+      }
+      released = true;
+      server.close(() => res());
+    });
     server.listen(0, "127.0.0.1", () => {
       const addr = server.address();
       if (!addr || typeof addr === "string") {
-        server.close();
-        reject(new Error("Failed to allocate port"));
+        void release().then(() => reject(new Error("Failed to allocate port")));
         return;
       }
-      const port = addr.port;
-      server.close((err) => err ? reject(err) : resolve(port));
+      resolve({ port: addr.port, release });
     });
     server.on("error", reject);
   });
 }
-async function allocatePortRange(size = PORT_RANGE_SIZE) {
-  const base = await allocatePort();
-  const ports = [base];
-  for (let i = 1; i < size; i++) {
-    const candidate = base + i;
-    const free = await new Promise((resolve) => {
-      const server = createServer();
-      server.once("error", () => resolve(false));
-      server.listen(candidate, "127.0.0.1", () => {
-        server.close(() => resolve(true));
-      });
+async function tryReservePort(port) {
+  return new Promise((resolve) => {
+    const server = createServer();
+    let released = false;
+    const release = () => new Promise((res) => {
+      if (released) {
+        res();
+        return;
+      }
+      released = true;
+      server.close(() => res());
     });
-    if (free) {
-      ports.push(candidate);
-    } else {
-      ports.push(await allocatePort());
+    server.once("error", () => resolve(null));
+    server.listen(port, "127.0.0.1", () => {
+      resolve({ port, release });
+    });
+  });
+}
+async function reservePortRange(size = PORT_RANGE_SIZE) {
+  const held = [await reservePort()];
+  const base = held[0].port;
+  try {
+    for (let i = 1; i < size; i++) {
+      const candidate = base + i;
+      const next = await tryReservePort(candidate);
+      if (next) {
+        held.push(next);
+      } else {
+        held.push(await reservePort());
+      }
     }
+    return held;
+  } catch (err) {
+    await Promise.all(held.map((h) => h.release()));
+    throw err;
   }
-  return ports;
 }
 async function startDevServer(repoPath, worktreePath, onLine, opts) {
   const script = getRunScript(worktreePath, repoPath, opts?.scriptName);
   if (!script) return null;
-  const ports = await allocatePortRange(PORT_RANGE_SIZE);
-  const handle = await spawnWorkspaceScript(script.command, {
-    worktreePath,
-    repoPath,
-    ports,
-    defaultBranch: opts?.defaultBranch,
-    onLine
-  });
-  return {
-    pid: handle.pid,
-    port: ports[0],
-    ports,
-    scriptName: script.name,
-    kill: handle.kill,
-    done: handle.done
-  };
+  const held = await reservePortRange(PORT_RANGE_SIZE);
+  const ports = held.map((h) => h.port);
+  try {
+    await Promise.all(held.map((h) => h.release()));
+    const handle = await spawnWorkspaceScript(script.command, {
+      worktreePath,
+      repoPath,
+      ports,
+      defaultBranch: opts?.defaultBranch,
+      onLine
+    });
+    return {
+      pid: handle.pid,
+      port: ports[0],
+      ports,
+      scriptName: script.name,
+      kill: handle.kill,
+      done: handle.done
+    };
+  } catch (err) {
+    await Promise.all(held.map((h) => h.release()));
+    throw err;
+  }
 }
 
 // src/store/setup-log.ts
@@ -6967,7 +7014,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-OTEYZHTZ.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-6XEWQWSM.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7148,6 +7195,8 @@ var Orchestrator = class {
   /** Auto-continues after a worktree turn ended while a detached job still runs. */
   jobContinueCount = /* @__PURE__ */ new Map();
   jobContinueNudged = /* @__PURE__ */ new Set();
+  /** In-flight startDev per worktree run key — agent MCP + UI Start must not double-spawn. */
+  startingDev = /* @__PURE__ */ new Map();
   maxConcurrent;
   runningCount = 0;
   constructor(opts) {
@@ -8365,9 +8414,20 @@ var Orchestrator = class {
         "No run script found for this worktree. Add [scripts.run.*] in the worktree\u2019s .sideboard/settings.toml or .conductor/settings.toml (or settings.local.toml on the main repo)."
       );
     }
+    const runKey = worktreeRunProcessKey(thread.worktreePath, resolvedName);
+    const inFlight = this.startingDev.get(runKey);
+    if (inFlight) return inFlight;
+    const start = this.startDevUnlocked(thread, resolvedName, scriptName, scripts, runKey);
+    this.startingDev.set(runKey, start);
+    try {
+      return await start;
+    } finally {
+      this.startingDev.delete(runKey);
+    }
+  }
+  async startDevUnlocked(thread, resolvedName, scriptName, scripts, runKey) {
     const siblings = threadsSharingWorktree(thread.worktreePath);
     const shared = mergeWorktreeActiveRuns(siblings);
-    const runKey = worktreeRunProcessKey(thread.worktreePath, resolvedName);
     const existing = this.processes.get(runKey) ?? siblings.map((t) => this.processes.get(`${t.id}:run:${resolvedName}`)).find(Boolean);
     const active = shared.activeRuns.find((r) => r.scriptName === resolvedName);
     if (existing && active) {
@@ -8379,6 +8439,14 @@ var Orchestrator = class {
         return { port: shared.devPort, scriptName: resolvedName, ports: [shared.devPort] };
       }
     }
+    if (active && !existing) {
+      killListenersOnPorts(collectActiveRunPorts([active]));
+      this.syncWorktreeRuns(
+        thread.worktreePath,
+        shared.activeRuns.filter((r) => r.scriptName !== resolvedName),
+        shared.devPort === active.port ? null : shared.devPort
+      );
+    }
     const mode = getRunMode(thread.worktreePath, thread.repoPath);
     if (mode === "nonconcurrent") {
       const here = normalizeWorktreePath(thread.worktreePath);
@@ -8427,6 +8495,7 @@ var Orchestrator = class {
         kill: handle.kill
       });
     }
+    const latestShared = mergeWorktreeActiveRuns(threadsSharingWorktree(thread.worktreePath));
     const run2 = {
       scriptName: resolvedName,
       port: handle.port,
@@ -8434,13 +8503,13 @@ var Orchestrator = class {
       startedAt
     };
     const nextRuns = [
-      ...shared.activeRuns.filter((r) => r.scriptName !== resolvedName),
+      ...latestShared.activeRuns.filter((r) => r.scriptName !== resolvedName),
       run2
     ];
     this.syncWorktreeRuns(
       thread.worktreePath,
       nextRuns,
-      isDefault ? handle.port : shared.devPort
+      isDefault ? handle.port : latestShared.devPort
     );
     this.emit({
       type: "dev_server_started",
@@ -8923,6 +8992,9 @@ var Orchestrator = class {
     this.assertNotGlobal(thread, "Land");
     const result = await confirmLand(thread, opts);
     if (result.prUrl) {
+      if (shouldStopRunOnPrRetarget(thread.prUrl, result.prUrl)) {
+        this.stopDev(thread.id);
+      }
       const patch = { prUrl: result.prUrl };
       try {
         const meta = await getPrMeta(thread.worktreePath, result.prUrl);
@@ -9032,6 +9104,9 @@ var Orchestrator = class {
   async persistPrMetaAndMaybeArchive(thread, meta) {
     const prevState = normalizePrState(thread.prState);
     const nextState = normalizePrState(meta.state);
+    if (shouldStopRunOnPrRetarget(thread.prUrl, meta.url)) {
+      this.stopDev(thread.id);
+    }
     const siblings = threadsSharingWorktree(thread.worktreePath);
     const targets = siblings.length > 0 ? siblings : [thread];
     for (const t of targets) {
@@ -9074,6 +9149,9 @@ var Orchestrator = class {
     if (current?.position != null && thread.stackLayer !== current.position) {
       patch.stackLayer = current.position;
     }
+    if (current?.prUrl && shouldStopRunOnPrRetarget(thread.prUrl, current.prUrl)) {
+      this.stopDev(thread.id);
+    }
     if (current?.prUrl && current.prUrl !== thread.prUrl) patch.prUrl = current.prUrl;
     if (current?.title && current.title !== thread.prTitle) patch.prTitle = current.title;
     if (current?.branchName && current.branchName !== thread.branchName) {