@sideboard-ai/core 0.1.324 → 0.1.326

package/dist/{chunk-DF5BM5OY.js → chunk-GP3RLZ6A.js}

@@ -1,9 +1,16 @@
+import {
+  formatOptionalServicesDirectiveForTurn,
+  formatOptionalServicesReminderForTurn
+} from "./chunk-B244TJWC.js";
 import {
   extractPresentedPlan,
   isPresentPlanToolName,
   readPlanFile,
   writePlanFile
 } from "./chunk-PGPSIEMW.js";
+import {
+  issueActivityKind
+} from "./chunk-W3ZLE4PO.js";
 import {
   SIDEBOARD_THREAD_ID_ENV,
   adjustBrightsyTurnExit,
@@ -14,7 +21,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-JH5SMVM5.js";
+} from "./chunk-BBNWKL4I.js";
 import {
   applyWorktreePkgCacheEnv,
   askBlockStillWaiting,
@@ -52,7 +59,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-RR4WCGNB.js";
+} from "./chunk-46FECFZU.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -67,14 +74,10 @@ import {
   partsToAssistantText,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-QIC2JXHW.js";
+} from "./chunk-OOXRMTU6.js";
 import {
   titleFromPrompt
 } from "./chunk-7H655NEW.js";
-import {
-  formatOptionalServicesDirectiveForTurn,
-  formatOptionalServicesReminderForTurn
-} from "./chunk-INBUV7HY.js";
 import {
   SLACK_REPLY_FORMATTING,
   addWorkspace,
@@ -99,7 +102,7 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-JE3JLHMO.js";
+} from "./chunk-FWVUGLBG.js";
 import {
   addPrStackLayer,
   allocateTeamSlug,
@@ -150,7 +153,7 @@ import {
   resolveRepoRoot,
   switchWorktreeBranch,
   withRepoGitLock
-} from "./chunk-FUFNMUNR.js";
+} from "./chunk-KECHK3ZT.js";
 import {
   REVIEW_TAB_TITLE,
   agentNicknameFromWorktreePath,
@@ -178,7 +181,7 @@ import {
   worktreeNameFromPath,
   worktreeSlugForTicket,
   writeThread
-} from "./chunk-IFWGG2M2.js";
+} from "./chunk-ZSHS46V5.js";
 import {
   mcpServerIdForPermission,
   mcpServerPermissionUpdate
@@ -189,7 +192,7 @@ import {
 import {
   applyAgentRunnerHeapEnv,
   packagedMcpDir
-} from "./chunk-ZHGMRBSC.js";
+} from "./chunk-NURZOXGN.js";
 import {
   fallbackTurnFailDetail,
   formatAgentErrorContinuePrompt,
@@ -204,7 +207,7 @@ import {
   shouldRetryFailedAgentTurn,
   summarizeTurnStderr,
   turnFailChatText
-} from "./chunk-5XNT6BCG.js";
+} from "./chunk-OPXEJJBM.js";
 import {
   clearStaleIndexLocks,
   enrichPathWithNpmGlobalBin,
@@ -242,13 +245,14 @@ import {
   resolveNewThreadOptions,
   resolveOrchestratorDefaults,
   resolveViewerProfileForRepo,
+  subtractUsage,
   sumUsageList,
   updateAdvancedSettings,
   updateAppEnvironment,
   usageOnLimit,
   withTurnScopedCost,
   writeViewerContext
-} from "./chunk-EJ66LEKH.js";
+} from "./chunk-QPSKQP6E.js";
 import {
   normalizeThinkingEffort
 } from "./chunk-77WWLBCI.js";
@@ -325,9 +329,50 @@ import { randomUUID as randomUUID5 } from "crypto";
 import { existsSync as existsSync14 } from "fs";
 
 // src/agents/spawn.ts
+import { rmSync } from "fs";
 import { createInterface } from "readline";
 import { execa } from "execa";
 
+// src/orchestrator/agent-pid.ts
+import { execFileSync } from "child_process";
+function pidStartedAt(pid) {
+  if (!Number.isFinite(pid) || pid <= 0 || process.platform === "win32") return null;
+  try {
+    const out = execFileSync("ps", ["-o", "lstart=", "-p", String(pid)], {
+      encoding: "utf8",
+      timeout: 1e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+    return out || null;
+  } catch {
+    return null;
+  }
+}
+function isSameAgentProcess(pid, startedAt, alive) {
+  if (!alive) return false;
+  if (!startedAt) return true;
+  const now = pidStartedAt(pid);
+  if (!now) return true;
+  return now === startedAt;
+}
+function isPidAlive(pid) {
+  if (!Number.isFinite(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function waitForPidExit(pid, timeoutMs) {
+  const start = Date.now();
+  while (isPidAlive(pid)) {
+    if (Date.now() - start >= timeoutMs) return false;
+    await new Promise((r) => setTimeout(r, 80));
+  }
+  return true;
+}
+
 // src/agents/turn-trace.ts
 import { appendFileSync } from "fs";
 import { join } from "path";
@@ -473,9 +518,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-RHEO55B4.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-UIEXAG2B.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-K66RGNWK.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-3E6SIDTM.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -550,8 +595,13 @@ async function spawnAgentTurn(thread, input, onEvent) {
     cwd: cmd.cwd,
     env,
     reject: false,
+    // readline consumes both streams. The default buffer (100 MB) keeps a
+    // second copy and SIGTERMs the agent when a long stream-json turn exceeds it.
+    buffer: false,
     stdout: "pipe",
     stderr: "pipe",
+    // Own process group so Stop can signal MCP servers and shells the CLI spawned.
+    detached: process.platform !== "win32",
     // Claude stream-json turns write a user message to stdin; otherwise ignore
     // so Claude doesn't wait ~3s for an empty pipe.
     stdin: cmd.stdin != null ? "pipe" : "ignore"
@@ -565,50 +615,66 @@ async function spawnAgentTurn(thread, input, onEvent) {
   let assistantText = "";
   let parts = [];
   let usage = null;
+  const usageByMessageId = /* @__PURE__ */ new Map();
   const outbound = createAgentStreamCoalescer(onEvent);
   const consume = (stream, kind) => {
     if (!stream) return;
     const rl = createInterface({ input: stream, crlfDelay: Infinity });
     rl.on("line", (line) => {
-      if (kind === "stderr") {
-        outbound.push({ type: "stderr", data: line });
-        return;
-      }
-      let events = normalizeParseResult(adapter.parseEvent(line));
-      if (thread.agent === "brightsy" && kind === "stdout" && isBrightsyNdjsonLine(line)) {
-        const dumped = events.some(
-          (e) => e.type === "stdout" && isBrightsyNdjsonLine(e.data)
-        );
-        if (events.length === 0 || dumped) {
-          events = normalizeParseResult(parseBrightsyCliLine(line));
-        }
-      }
-      for (const event of events) {
-        let parsed = event;
-        if (parsed.type === "session_id") {
-          sessionId = parsed.data;
-          outbound.push(parsed);
-          continue;
+      try {
+        if (kind === "stderr") {
+          outbound.push({ type: "stderr", data: line });
+          return;
         }
-        if (parsed.type === "usage") {
-          const data = parsed.scope === "turn" ? withTurnScopedCost(parsed.data, thread.messages) : parsed.data;
-          usage = applyTurnUsage(usage, data, parsed.scope ?? "request");
-          outbound.push({ ...parsed, data });
-          continue;
+        let events = normalizeParseResult(adapter.parseEvent(line));
+        if (thread.agent === "brightsy" && kind === "stdout" && isBrightsyNdjsonLine(line)) {
+          const dumped = events.some(
+            (e) => e.type === "stdout" && isBrightsyNdjsonLine(e.data)
+          );
+          if (events.length === 0 || dumped) {
+            events = normalizeParseResult(parseBrightsyCliLine(line));
+          }
         }
-        if (parsed.type === "stdout") {
-          if (thread.agent === "brightsy" && isBrightsyNdjsonLine(parsed.data)) {
+        for (const event of events) {
+          let parsed = event;
+          if (parsed.type === "session_id") {
+            sessionId = parsed.data;
+            outbound.push(parsed);
             continue;
           }
-          const folded = foldDuplicateStdout(textSoFar(parts, parsed.parentId), parsed.data);
-          if (folded == null) continue;
-          if (folded !== parsed.data) parsed = { ...parsed, data: folded };
-        }
-        parts = applyAgentEvent(parts, parsed);
-        if (parsed.type === "stdout") {
-          assistantText = partsToAssistantText(parts);
+          if (parsed.type === "usage") {
+            const data = parsed.scope === "turn" ? withTurnScopedCost(parsed.data, thread.messages) : parsed.data;
+            let base = usage;
+            const messageId = parsed.messageId;
+            if (messageId && parsed.scope !== "turn") {
+              const prev = usageByMessageId.get(messageId);
+              if (prev) base = subtractUsage(base, prev);
+              usageByMessageId.set(messageId, data);
+            }
+            usage = applyTurnUsage(base, data, parsed.scope ?? "request");
+            outbound.push({ ...parsed, data });
+            continue;
+          }
+          if (parsed.type === "stdout") {
+            if (thread.agent === "brightsy" && isBrightsyNdjsonLine(parsed.data)) {
+              continue;
+            }
+            const folded = foldDuplicateStdout(textSoFar(parts, parsed.parentId), parsed.data);
+            if (folded == null) continue;
+            if (folded !== parsed.data) parsed = { ...parsed, data: folded };
+          }
+          parts = applyAgentEvent(parts, parsed);
+          if (parsed.type === "stdout") {
+            assistantText = partsToAssistantText(parts);
+          }
+          outbound.push(parsed);
         }
-        outbound.push(parsed);
+      } catch (err) {
+        const detail = err instanceof Error ? err.message : String(err);
+        outbound.push({
+          type: "stderr",
+          data: `sideboard: failed to parse agent output: ${detail}`
+        });
       }
     });
   };
@@ -622,14 +688,39 @@ async function spawnAgentTurn(thread, input, onEvent) {
     const exitCode = thread.agent === "brightsy" ? adjustBrightsyTurnExit(result.exitCode ?? null, text3) : result.exitCode ?? null;
     onEvent({ type: "exit", data: exitCode });
     return { exitCode, sessionId, assistantText: text3, parts: finalized, usage };
+  }).finally(() => {
+    for (const dir of cmd.cleanupDirs ?? []) {
+      try {
+        rmSync(dir, { recursive: true, force: true });
+      } catch {
+      }
+    }
   });
   return {
     pid: child.pid,
     kill: () => {
-      try {
-        child.kill("SIGTERM");
-      } catch {
-      }
+      const pid = child.pid;
+      const startedAt = typeof pid === "number" && pid > 0 ? pidStartedAt(pid) : null;
+      const signal = (sig) => {
+        if (sig === "SIGKILL" && typeof pid === "number" && pid > 0 && !isSameAgentProcess(pid, startedAt, isPidAlive(pid))) {
+          return;
+        }
+        if (pid && process.platform !== "win32") {
+          try {
+            process.kill(-pid, sig);
+            return;
+          } catch {
+          }
+        }
+        try {
+          child.kill(sig);
+        } catch {
+        }
+      };
+      signal("SIGTERM");
+      const timer = setTimeout(() => signal("SIGKILL"), 5e3);
+      timer.unref?.();
+      child.once("exit", () => clearTimeout(timer));
     },
     done
   };
@@ -1602,14 +1693,15 @@ function sessionGrants(item) {
   if (!dir) return void 0;
   return [{ type: "addDirectories", directories: [dir], destination: "session" }];
 }
-function directoryGrant(item) {
-  const stored = item.prompt;
-  const path = stored.path ?? "";
+function directoryGrantPath(path) {
   if (!path) return "";
   if (path.endsWith("/") || path.endsWith("\\")) return path;
   const dir = dirname(path);
   return dir && dir !== "." ? dir : path;
 }
+function directoryGrant(item) {
+  return directoryGrantPath(item.prompt.path ?? "");
+}
 function toAnswer(item, decision) {
   if (decision === "deny") {
     return denied("The user denied this action.");
@@ -1654,10 +1746,12 @@ function askToolPermission(ask) {
   if (!threadId || !toolName) return Promise.resolve(denied("Missing chat or tool."));
   const described = describeToolPermission({ ...ask, threadId, toolName });
   const mcpServerId = mcpServerIdForPermission(toolName, ask.mcpServer) ?? void 0;
+  const grantDir = described.path ? directoryGrantPath(described.path) : "";
+  const sessionNote = grantDir && described.path && grantDir !== described.path ? `Allow for this session applies to ${grantDir}, not only this file.` : "";
   const prompt = {
     id: randomUUID(),
     title: described.title,
-    detail: described.detail,
+    detail: [described.detail, sessionNote].filter(Boolean).join("\n"),
     path: described.path || void 0,
     // Claude hides "always allow" when the saved rule would be broader than
     // this call. For MCP that broader rule is what we want: the whole server.
@@ -3069,7 +3163,7 @@ async function createThread(input, _onSetupLine) {
   });
   await requireAgent(resolved.agent);
   if (input.cowboy) {
-    const { cowboyModeEnabled } = await import("./app-settings-XIF4EC4K.js");
+    const { cowboyModeEnabled } = await import("./app-settings-RXBH7KY4.js");
     if (!cowboyModeEnabled()) {
       throw new Error(
         "Cowboy mode is off. Enable it in Settings \u2192 Advanced."
@@ -3128,7 +3222,7 @@ async function createThread(input, _onSetupLine) {
   let sourceIsFork = false;
   if (!input.cowboy && sourceType === "branch" && (!sourceRef || sourceRef === "HEAD" || sourceRef === "default")) {
     if (isAbleTimeConnected() && getIssueSource() === "abletime") {
-      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-CU2UPMJF.js");
+      const { ensureAbleTimeTask, issueAttachmentForAbleTimeTask } = await import("./abletime-RDHYSZL2.js");
       const task = await ensureAbleTimeTask({
         title: title?.trim() || "Untitled work",
         description: input.prompt?.trim() || void 0
@@ -3239,7 +3333,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-LUSTCMDN.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-QO7GKBYT.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -3925,14 +4019,14 @@ function createQuotaFailoverChat(from, fallbackAgent, limitText, opts) {
 }
 
 // src/threads/adopt.ts
-import { execFileSync } from "child_process";
+import { execFileSync as execFileSync2 } from "child_process";
 import {
   copyFileSync,
   existsSync as existsSync7,
   mkdtempSync,
   readdirSync as readdirSync2,
   readFileSync as readFileSync5,
-  rmSync
+  rmSync as rmSync2
 } from "fs";
 import { tmpdir } from "os";
 import { join as join7 } from "path";
@@ -4022,7 +4116,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { addWorkspace: addWorkspace2 } = await import("./workspaces-42E6AGXD.js");
+  const { addWorkspace: addWorkspace2 } = await import("./workspaces-QONNLHNR.js");
   await addWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-INRDQFWV.js");
   await ensureWorktreeSideboardIgnored(input.worktreePath);
@@ -4119,7 +4213,7 @@ function listConductorWorkspaces() {
       db.close();
     }
   } finally {
-    rmSync(tmp, { recursive: true, force: true });
+    rmSync2(tmp, { recursive: true, force: true });
   }
 }
 function importConductorWorkspace(workspaceId) {
@@ -4192,7 +4286,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();
@@ -4215,7 +4309,7 @@ function importConductorWorkspace(workspaceId) {
       db.close();
     }
   } finally {
-    rmSync(tmp, { recursive: true, force: true });
+    rmSync2(tmp, { recursive: true, force: true });
   }
 }
 async function importConductorWorkspaceAsync(workspaceId) {
@@ -6604,78 +6698,6 @@ import { z as z2 } from "zod";
 
 // src/mcp/issue-list.ts
 import { z } from "zod";
-
-// src/integrations/issue-since.ts
-var ISSUE_SINCE_ERROR = "updatedSince must be an ISO datetime, YYYY-MM-DD, or relative time (yesterday, 2d, 3 hours ago)";
-var DATE_ONLY_RE = /^(\d{4})-(\d{2})-(\d{2})$/;
-var DATE_TIME_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/;
-var RELATIVE_RE = /^(\d+)\s*(hours?|hrs?|h|days?|d|weeks?|wks?|w)(?:\s+ago)?$/i;
-function startOfLocalDay(date) {
-  return new Date(date.getFullYear(), date.getMonth(), date.getDate());
-}
-function addLocalDays(date, days) {
-  return new Date(date.getFullYear(), date.getMonth(), date.getDate() + days);
-}
-function parseIssueSince(input, now = /* @__PURE__ */ new Date()) {
-  const raw = input.trim();
-  if (!raw) throw new Error(ISSUE_SINCE_ERROR);
-  const dateOnly = raw.match(DATE_ONLY_RE);
-  if (dateOnly) {
-    const year = Number(dateOnly[1]);
-    const month = Number(dateOnly[2]);
-    const day = Number(dateOnly[3]);
-    const local = new Date(year, month - 1, day);
-    if (local.getFullYear() !== year || local.getMonth() !== month - 1 || local.getDate() !== day) {
-      throw new Error(ISSUE_SINCE_ERROR);
-    }
-    return startOfLocalDay(local).toISOString();
-  }
-  if (DATE_TIME_RE.test(raw)) {
-    const ms = Date.parse(raw);
-    if (!Number.isFinite(ms)) throw new Error(ISSUE_SINCE_ERROR);
-    return new Date(ms).toISOString();
-  }
-  const lower = raw.toLowerCase();
-  if (lower === "today") return startOfLocalDay(now).toISOString();
-  if (lower === "yesterday") return addLocalDays(startOfLocalDay(now), -1).toISOString();
-  if (lower === "last week" || lower === "lastweek") {
-    return addLocalDays(startOfLocalDay(now), -7).toISOString();
-  }
-  const relative = lower.match(RELATIVE_RE);
-  if (relative) {
-    const n = Number(relative[1]);
-    if (!Number.isInteger(n) || n < 1) throw new Error(ISSUE_SINCE_ERROR);
-    const unit = relative[2];
-    if (unit.startsWith("h")) return new Date(now.getTime() - n * 36e5).toISOString();
-    if (unit.startsWith("w")) return addLocalDays(startOfLocalDay(now), -7 * n).toISOString();
-    return addLocalDays(startOfLocalDay(now), -n).toISOString();
-  }
-  throw new Error(ISSUE_SINCE_ERROR);
-}
-function formatGitHubSearchUpdatedSince(iso) {
-  return iso.replace(/\.\d{3}Z$/, "Z");
-}
-function issueMatchesUpdatedSince(issue, sinceIso) {
-  const ts = issue.updatedAt || issue.createdAt;
-  if (!ts) return false;
-  const value = Date.parse(ts);
-  const since = Date.parse(sinceIso);
-  return Number.isFinite(value) && Number.isFinite(since) && value >= since;
-}
-var ISSUE_COMMENT_PREVIEW_CHARS = 240;
-function previewIssueCommentBody(body) {
-  const flat = body.replace(/\s+/g, " ").trim();
-  if (flat.length <= ISSUE_COMMENT_PREVIEW_CHARS) return flat;
-  return `${flat.slice(0, ISSUE_COMMENT_PREVIEW_CHARS - 1).trimEnd()}\u2026`;
-}
-function issueActivityKind(issue, sinceIso) {
-  const created = issue.createdAt ? Date.parse(issue.createdAt) : Number.NaN;
-  const since = Date.parse(sinceIso);
-  if (Number.isFinite(created) && Number.isFinite(since) && created >= since) return "created";
-  return "updated";
-}
-
-// src/mcp/issue-list.ts
 var MCP_ISSUE_LIST_DEFAULT_LIMIT = 40;
 var MCP_ISSUE_LIST_MAX_LIMIT = 250;
 function clampMcpIssueLimit(limit) {
@@ -7489,7 +7511,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-7VTAUY24.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-7FVDBE7Y.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7635,23 +7657,6 @@ function armSchedules() {
 // src/orchestrator/orchestrator.ts
 var LIVE_TURN_SPAWN_GRACE_MS = 15e3;
 var RUN_SCRIPT_DESKTOP_ADOPT_MS = 2e4;
-function isPidAlive(pid) {
-  if (!Number.isFinite(pid) || pid <= 0) return false;
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function waitForPidExit(pid, timeoutMs) {
-  const start = Date.now();
-  while (isPidAlive(pid)) {
-    if (Date.now() - start >= timeoutMs) return false;
-    await new Promise((r) => setTimeout(r, 80));
-  }
-  return true;
-}
 function resolveOrchChildFollowUp(requested) {
   if (requested === "steer" || requested === "queue") return requested;
   return followUpBehavior();
@@ -7857,7 +7862,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("./app-settings-XIF4EC4K.js");
+      const { autoCleanupOrphansEnabled } = await import("./app-settings-RXBH7KY4.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -7878,7 +7883,7 @@ var Orchestrator = class {
       const pid = thread.agentPid;
       const deadPid = typeof pid === "number" && pid > 0 && !isPidAlive(pid) ? true : false;
       if (deadPid) {
-        updateThread(thread.id, { agentPid: null });
+        updateThread(thread.id, { agentPid: null, agentPidStartedAt: null });
       }
       if (thread.status === "queued" && thread.queue.length === 0) {
         if (!this.activeTurns.has(thread.id) && !this.startingTurns.has(thread.id)) {
@@ -8251,7 +8256,7 @@ var Orchestrator = class {
     }
     await setup;
     if (skipSetup) return;
-    const { autoRunAfterSetupEnabled } = await import("./app-settings-XIF4EC4K.js");
+    const { autoRunAfterSetupEnabled } = await import("./app-settings-RXBH7KY4.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -8431,19 +8436,26 @@ var Orchestrator = class {
         }
         const livePid = thread.agentPid;
         if (typeof livePid === "number" && livePid > 0 && isPidAlive(livePid)) {
-          const exited = await waitForPidExit(livePid, STALE_AGENT_PID_WAIT_MS);
-          if (!exited && isPidAlive(livePid)) {
+          if (!isSameAgentProcess(livePid, thread.agentPidStartedAt, true)) {
             try {
-              process.kill(livePid, "SIGKILL");
+              updateThread(threadId, { agentPid: null, agentPidStartedAt: null });
             } catch {
             }
-            await waitForPidExit(livePid, 400);
-            try {
-              updateThread(threadId, { agentPid: null });
-            } catch {
+          } else {
+            const exited = await waitForPidExit(livePid, STALE_AGENT_PID_WAIT_MS);
+            if (!exited && isPidAlive(livePid)) {
+              try {
+                process.kill(livePid, "SIGKILL");
+              } catch {
+              }
+              await waitForPidExit(livePid, 400);
+              try {
+                updateThread(threadId, { agentPid: null, agentPidStartedAt: null });
+              } catch {
+              }
             }
+            continue;
           }
-          continue;
         }
         const shifted = shiftQueuedItem(thread.queue, thread.queueAttachments);
         if (!shifted) break;
@@ -8618,7 +8630,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       }
       const adapter = getAdapter(thread.agent);
       const resolved = await adapter.resolveSessionId(thread.worktreePath, thread.sessionId);
-      if (resolved && resolved !== thread.sessionId) {
+      if (resolved !== thread.sessionId) {
         updateThread(threadId, { sessionId: resolved });
       }
       const fresh = this.requireThread(threadId);
@@ -8629,7 +8641,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       }
       const isBrightsy = fresh.agent === "brightsy";
       const isOrchestration = isOrchestratorThread(fresh);
-      const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-XIF4EC4K.js");
+      const { autoRenameBranchEnabled, getGithubGitAuthMode, gitBranchPrefixSetting } = await import("./app-settings-RXBH7KY4.js");
       const gitAuthMode = getGithubGitAuthMode();
       const worktreeDirective = isBrightsy || isOrchestration ? null : formatWorktreeDirective(fresh, {
         githubSlug: turnOrigin?.forge === "github" ? turnOrigin.slug : await withTimeout(resolveGithubRepoSlug(fresh.worktreePath), 8e3, "resolveGithubRepoSlug").catch(() => null),
@@ -8766,7 +8778,10 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       this.activeTurns.set(threadId, handle);
       this.startingTurns.delete(threadId);
       if (typeof handle.pid === "number" && handle.pid > 0) {
-        updateThread(threadId, { agentPid: handle.pid });
+        updateThread(threadId, {
+          agentPid: handle.pid,
+          agentPidStartedAt: pidStartedAt(handle.pid)
+        });
       }
       if (this.stoppedTurns.has(threadId)) {
         handle.kill();
@@ -8794,7 +8809,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       if (!this.stoppedTurns.has(threadId) && this.requireThread(threadId).agent === "cursor" && exitCode !== 0 && !assistantText && parts.length === 0) {
         const sessionId = result.sessionId || this.requireThread(threadId).sessionId || "";
         if (sessionId) {
-          const { recoverFinishedCursorRun } = await import("./cursor-recover-OWPQUHFH.js");
+          const { recoverFinishedCursorRun } = await import("./cursor-recover-BDIAZIE3.js");
           for (let i = 0; i < 8; i++) {
             const recovered = recoverFinishedCursorRun({
               agentId: sessionId,
@@ -8879,7 +8894,10 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
         );
         this.activeTurns.set(threadId, retryHandle);
         if (typeof retryHandle.pid === "number" && retryHandle.pid > 0) {
-          updateThread(threadId, { agentPid: retryHandle.pid });
+          updateThread(threadId, {
+            agentPid: retryHandle.pid,
+            agentPidStartedAt: pidStartedAt(retryHandle.pid)
+          });
         }
         this.processes.set(`${threadId}:agent`, {
           kind: "agent",
@@ -9028,7 +9046,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       this.runningCount = Math.max(0, this.runningCount - 1);
       clearTurnLive(threadId);
       try {
-        updateThread(threadId, { agentPid: null });
+        updateThread(threadId, { agentPid: null, agentPidStartedAt: null });
       } catch {
       }
     }
@@ -9066,9 +9084,16 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
     if (proc) proc.kill();
     const pid = thread.agentPid;
     if (typeof pid === "number" && pid > 0 && isPidAlive(pid)) {
-      try {
-        process.kill(pid, "SIGTERM");
-      } catch {
+      if (!isSameAgentProcess(pid, thread.agentPidStartedAt, true)) {
+        try {
+          updateThread(thread.id, { agentPid: null, agentPidStartedAt: null });
+        } catch {
+        }
+      } else {
+        try {
+          process.kill(pid, "SIGTERM");
+        } catch {
+        }
       }
     }
     const stopped = writeStoppedStatus(thread.id, resolveStopReason(opts)) ?? readThread(thread.id) ?? thread;
@@ -9956,7 +9981,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       if (Object.keys(patch).length === 0) continue;
       updateThread(t.id, patch);
     }
-    const { autoArchiveOnMergeEnabled } = await import("./app-settings-XIF4EC4K.js");
+    const { autoArchiveOnMergeEnabled } = await import("./app-settings-RXBH7KY4.js");
     const latest = this.requireThread(thread.id);
     if (!shouldAutoArchiveOnPrMerge({
       previousPrState: prevState || null,
@@ -10280,7 +10305,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
           await runArchiveScript(thread.repoPath, thread.worktreePath);
         } catch {
         }
-        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-XIF4EC4K.js");
+        const { deleteBranchOnPurgeEnabled } = await import("./app-settings-RXBH7KY4.js");
         const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
         await removeWorktree(thread.repoPath, thread.worktreePath, {
           deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -10418,7 +10443,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-ZDA2UJ7C.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-6GIONDQO.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -10428,7 +10453,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-JRSL4HQY.js");
+  const { updateThread: upd } = await import("./thread-store-IC4BQXDW.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal
@@ -10515,6 +10540,8 @@ export {
   pendingInjectedNotices,
   lastAgentReply,
   formatInjectedNoticesForTurn,
+  isPidAlive,
+  waitForPidExit,
   applyPromptCacheTtlEnv,
   spawnAgentTurn,
   AGENT_GIT_ACTIONS,
@@ -10636,10 +10663,6 @@ export {
   formatLongRunningReminder,
   formatArtifactDirective,
   formatUiReminder,
-  parseIssueSince,
-  formatGitHubSearchUpdatedSince,
-  issueMatchesUpdatedSince,
-  previewIssueCommentBody,
   clampMcpIssueLimit,
   applyIssueListWindow,
   mcpIssueUpdatedSinceSchema,
@@ -10648,8 +10671,6 @@ export {
   registerViewerContextTools,
   LIVE_TURN_SPAWN_GRACE_MS,
   RUN_SCRIPT_DESKTOP_ADOPT_MS,
-  isPidAlive,
-  waitForPidExit,
   resolveOrchChildFollowUp,
   LIGHT_RECONCILE_THROTTLE_MS,
   Orchestrator,