@sideboard-ai/core 0.1.100 → 0.1.103

package/dist/index.cjs

@@ -455,6 +455,7 @@ __export(paths_exports, {
   sideboardReposDir: () => sideboardReposDir,
   sideboardWorkspacesDir: () => sideboardWorkspacesDir,
   threadFilePath: () => threadFilePath,
+  threadLivePath: () => threadLivePath,
   threadLockPath: () => threadLockPath,
   threadsDir: () => threadsDir,
   worktreesRoot: () => worktreesRoot
@@ -506,6 +507,9 @@ function worktreesRoot(repoPath) {
 function threadFilePath(id) {
   return (0, import_node_path5.join)(threadsDir(), `${id}.json`);
 }
+function threadLivePath(id) {
+  return (0, import_node_path5.join)(threadsDir(), `${id}.live.json`);
+}
 function threadLockPath(id) {
   return (0, import_node_path5.join)(locksDir(), `${id}.lock`);
 }
@@ -2039,8 +2043,11 @@ function writeThread(thread) {
 function idPath(id) {
   return id;
 }
+function isThreadRecordFile(name) {
+  return name.endsWith(".json") && !name.endsWith(".live.json");
+}
 function listThreads(opts) {
-  const files = (0, import_node_fs9.readdirSync)(threadsDir()).filter((f) => f.endsWith(".json"));
+  const files = (0, import_node_fs9.readdirSync)(threadsDir()).filter(isThreadRecordFile);
   const threads = files.map((f) => {
     try {
       return normalizeThread(
@@ -2049,7 +2056,9 @@ function listThreads(opts) {
     } catch {
       return null;
     }
-  }).filter((t) => t !== null).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
+  }).filter(
+    (t) => t !== null && typeof t.id === "string" && t.id.length > 0
+  ).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
   if (opts?.includeArchived) return threads;
   return threads.filter((t) => t.status !== "archived");
 }
@@ -2081,7 +2090,9 @@ function setStatus(id, status, lastError) {
 }
 function findThreadByRef(ref) {
   const all = listThreads({ includeArchived: true });
-  return all.find((t) => t.id === ref || t.id.startsWith(ref) || t.branchName === ref || t.title === ref) ?? null;
+  return all.find(
+    (t) => t.id === ref || t.id.startsWith(ref) || t.branchName === ref || t.title === ref
+  ) ?? null;
 }
 var import_node_crypto3, import_node_fs9, import_proper_lockfile;
 var init_thread_store = __esm({
@@ -2938,7 +2949,7 @@ var init_teams = __esm({
 
 // src/git/worktree-labels.ts
 function normalizeWorktreePath(worktreePath) {
-  const trimmed = worktreePath.replace(/\/+$/, "") || "/";
+  const trimmed = (worktreePath ?? "").replace(/\/+$/, "") || "/";
   const absolute = trimmed.startsWith("/");
   const parts = trimmed.split("/").filter((p) => p && p !== ".");
   const out = [];
@@ -3525,6 +3536,42 @@ var init_git_auth_mode = __esm({
   }
 });
 
+// src/util/enqueue-by-key.ts
+function enqueueByKey(key, fn) {
+  const prev = tails.get(key) ?? Promise.resolve();
+  const next = prev.then(fn, fn);
+  tails.set(
+    key,
+    next.then(
+      () => void 0,
+      () => void 0
+    )
+  );
+  return next;
+}
+var tails;
+var init_enqueue_by_key = __esm({
+  "src/util/enqueue-by-key.ts"() {
+    "use strict";
+    tails = /* @__PURE__ */ new Map();
+  }
+});
+
+// src/git/repo-git-lock.ts
+function repoLockKey(repoPath) {
+  const trimmed = repoPath.replace(/\/+$/, "");
+  return `git-worktree:${trimmed || "/"}`;
+}
+function withRepoGitLock(repoPath, fn) {
+  return enqueueByKey(repoLockKey(repoPath), fn);
+}
+var init_repo_git_lock = __esm({
+  "src/git/repo-git-lock.ts"() {
+    "use strict";
+    init_enqueue_by_key();
+  }
+});
+
 // src/git/pr-gates.ts
 function prIsInMergeQueue(gate) {
   if (gate.isInMergeQueue) return true;
@@ -4706,12 +4753,13 @@ async function createThreadWorktree(opts) {
       `Invalid git reference: ${opts.sourceRef} (and fetch did not resolve it)`
     );
   }
-  const add = await git(
-    ["worktree", "add", "-b", branchName, worktreePath, startPoint],
-    opts.repoPath,
-    { reject: false, timeoutMs: 6e4 }
-  );
-  if (add.exitCode !== 0) {
+  const added = await withRepoGitLock(opts.repoPath, async () => {
+    const add = await git(
+      ["worktree", "add", "-b", branchName, worktreePath, startPoint],
+      opts.repoPath,
+      { reject: false, timeoutMs: 6e4 }
+    );
+    if (add.exitCode === 0) return branchName;
     const err = `${add.stderr}
 ${add.stdout}`;
     if (/already used by worktree|already exists|checked out/i.test(err)) {
@@ -4722,17 +4770,14 @@ ${add.stdout}`;
           opts.repoPath,
           { reject: false, timeoutMs: 6e4 }
         );
-        if (retry.exitCode === 0) {
-          branchName = alt;
-          await ensureGhPreferOrigin(worktreePath);
-          return { branchName, worktreePath };
-        }
+        if (retry.exitCode === 0) return alt;
       }
     }
     throw new Error(
       `Failed to create worktree: ${add.stderr.trim() || add.stdout.trim() || `exit ${add.exitCode}`}`
     );
-  }
+  });
+  branchName = added;
   await ensureGhPreferOrigin(worktreePath);
   return { branchName, worktreePath };
 }
@@ -4756,12 +4801,13 @@ async function createExistingBranchWorktree(opts) {
     );
   }
   const startPoint = await resolveWorktreeStartPoint(opts.repoPath, branchName);
-  const add = await git(
-    ["worktree", "add", worktreePath, startPoint],
-    opts.repoPath,
-    { reject: false }
-  );
-  if (add.exitCode !== 0) {
+  await withRepoGitLock(opts.repoPath, async () => {
+    const add = await git(
+      ["worktree", "add", worktreePath, startPoint],
+      opts.repoPath,
+      { reject: false }
+    );
+    if (add.exitCode === 0) return;
     const retry = await git(
       ["worktree", "add", worktreePath, branchName],
       opts.repoPath,
@@ -4772,7 +4818,7 @@ async function createExistingBranchWorktree(opts) {
         `Failed to create worktree for ${branchName}: ${retry.stderr.trim() || add.stderr.trim() || retry.stdout.trim() || add.stdout.trim() || `exit ${add.exitCode}`}`
       );
     }
-  }
+  });
   const head = await git(["rev-parse", "--abbrev-ref", "HEAD"], worktreePath, {
     reject: false
   });
@@ -4783,12 +4829,14 @@ async function createExistingBranchWorktree(opts) {
   return { branchName, worktreePath };
 }
 async function removeWorktree(repoPath, worktreePath, opts) {
-  await git(["worktree", "remove", "--force", worktreePath], repoPath, {
-    reject: false
+  await withRepoGitLock(repoPath, async () => {
+    await git(["worktree", "remove", "--force", worktreePath], repoPath, {
+      reject: false
+    });
+    if (opts?.deleteBranch) {
+      await git(["branch", "-D", opts.deleteBranch], repoPath, { reject: false });
+    }
   });
-  if (opts?.deleteBranch) {
-    await git(["branch", "-D", opts.deleteBranch], repoPath, { reject: false });
-  }
 }
 async function listWorktrees(repoPath) {
   const { stdout } = await git(
@@ -5080,6 +5128,7 @@ var init_worktree = __esm({
     init_gh_errors();
     init_git_auth_mode();
     init_run();
+    init_repo_git_lock();
     init_app_settings();
     init_pr_gates();
     init_stack();
@@ -5124,7 +5173,7 @@ function coordinatorGreenfieldPlaybook(reposDir) {
     "- Examples:",
     `  - Clone: \`git clone <url> ${reposDir}/<name>\``,
     `  - New GitHub repo: \`gh repo create <owner>/<name> --private --clone -- ${reposDir}/<name>\` (or mkdir + git init + gh repo create + remote add + push)`,
-    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn \u2192 ask_git create-draft (or send_to_thread `gh pr create --draft -R <origin-owner/name>`).",
+    "- Then: add_workspace with that absolute path \u2192 create_thread (repoPath + parentThreadId) \u2192 send_to_thread (build) \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft (or send_to_thread `gh pr create --draft -R <origin-owner/name>`).",
     "- Always target the child worktree's **origin** (`github:` slug from list_workspaces / `git remote get-url origin` in that worktree). Never open PRs against `upstream`.",
     "- Do coding work in the child worktree thread, not by editing files in this home cwd."
   ].join("\n");
@@ -5147,8 +5196,8 @@ function coordinatorTurnReminder(opts) {
     goal ? `- Goal / title: ${goal}` : null,
     accountDefaultsPlaybookLine(),
     `- For "what's going on": call list_threads (and list_workspaces if needed). Summarize fleet status \u2014 do not ls/git-status this synthetic home.`,
-    "- Existing repo: create_thread on a repoPath \u2192 send_to_thread \u2192 wait_for_turn. If status is error, lastError/text is the failure \u2014 adapt (switch agent, tell the user). Commit/push/draft PR with ask_git on the child, then wait_for_turn \u2014 never git/gh from this cwd. Call ask_git merge only if the user explicitly asked to merge.",
-    "- New repo: Bash (clone or gh repo create under ~/sideboard/repos/<name>) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 ask_git create-draft.",
+    "- Existing repo: create_thread on a repoPath \u2192 send_to_thread \u2192 wait_for_turn. If stillRunning, the child is working (progress is tools/thinking) \u2014 wait_for_turn again; do not ping it. If status is error, lastError/text is the failure \u2014 adapt (switch agent, tell the user). Commit/push/draft PR with ask_git on the child, then wait_for_turn \u2014 never git/gh from this cwd. Call ask_git merge only if the user explicitly asked to merge.",
+    "- New repo: Bash (clone or gh repo create under ~/sideboard/repos/<name>) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft.",
     "- When naming threads for the user, link them as `[Title](sideboard://thread/<id>)`.",
     "- If they will wait on Slack or leave the Mac, call set_caffeinate enabled=true. When they say they are done / wrapping up / going to sleep, call set_caffeinate enabled=false. Closing this chat also turns it off."
   ].filter(Boolean).join("\n");
@@ -5201,8 +5250,8 @@ function ensureGlobalCoordinatorCwd(opts) {
     orchId ? `Pass parentThreadId="${orchId}" (or omit it). Never invent another parentThreadId.` : "Pass `parentThreadId` for children (this chat's id from the turn reminder).",
     "Omit `agent` / `model` on `create_thread` unless you have a reason to override Account defaults.",
     "Never pass `agent=codex` when you yourself are Codex \u2014 nested Codex deadlocks on shared ~/.codex locks. Omit agent (Account default) or use cursor/claude.",
-    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 ask_git create-draft \u2192 wait_for_turn. Merge only if the user explicitly asked (`ask_git` merge).",
-    "Typical flow (new app): Bash create/clone under repos dir \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 ask_git create-draft.",
+    "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft \u2192 wait_for_turn. Merge only if the user explicitly asked (`ask_git` merge).",
+    "Typical flow (new app): Bash create/clone under repos dir \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn (loop while stillRunning) \u2192 ask_git create-draft.",
     "Always ask worktree agents to commit, push, and open draft PRs (`ask_git` / `send_to_thread`). Tell them to merge only when the user explicitly asked. The worktree agent runs git/gh; never merge from this orchestration cwd."
   ].join("\n");
   try {
@@ -5270,7 +5319,7 @@ var init_coordinator_prompt = __esm({
       "- fork_worktree \u2014 fork a worktree chat into a NEW git worktree + chat (transcript attached); optional agent; leave model unset (Auto) unless you have a reason. Not for orchestration chats.",
       "- fork_chat \u2014 fork a worktree chat (same worktree tab) OR a Global orchestration chat (new orchestration tab); optional agent; leave model unset (Auto) unless you have a reason. Remote coordinators: use this to continue another orchestration chat on a different agent after session limits.",
       "- send_to_thread \u2014 queue a prompt (start/continue a chat turn); pass force_stop: true to interrupt mid-turn / clear stale queued prompts before replacing with a new request",
-      "- wait_for_turn / get_turn_result \u2014 wait for and read the agent reply. On status error, lastError (and text) is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success.",
+      "- wait_for_turn / get_turn_result \u2014 wait for and read the agent reply. wait_for_turn returns within ~45s even if the child is still working (MCP clients kill longer tool calls). If stillRunning is true, progress is a live snapshot of tools/thinking \u2014 call wait_for_turn again. Do not send \u201Care you stuck?\u201D or assume a hang while lastActivityAt is recent. On status error, lastError (and text) is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success.",
       "- stop_thread \u2014 force-stop: kill in-flight turn AND clear queued prompts (do not leave stale queue after an interrupt)",
       "- archive_thread / restore_thread \u2014 archive (tears down worktree when last tab) or restore",
       "Setup / run:",
@@ -5278,8 +5327,8 @@ var init_coordinator_prompt = __esm({
       "- list_run_scripts / run_dev_script / stop_dev_script \u2014 start/stop named run scripts",
       "Inspect / review / PRs:",
       "- get_diff \u2014 compact diff summary",
-      '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .sideboard/review.md when present, else local guidelines; sends "Review changes in this workspace."); then wait_for_turn / get_turn_result on the returned id',
-      "- ask_git \u2014 commit & push, open a draft PR, resolve conflicts, or merge. When the worktree is clean, Sideboard pushes / opens the PR itself. When dirty, it queues the worktree agent \u2014 then wait_for_turn. Prefer this over paraphrasing.",
+      '- request_review \u2014 open a Review chat tab on a worktree thread (attaches .sideboard/review.md when present, else local guidelines; sends "Review changes in this workspace."); then wait_for_turn (loop while stillRunning) / get_turn_result on the returned id',
+      "- ask_git \u2014 commit & push, open a draft PR, resolve conflicts, or merge. When the worktree is clean, Sideboard pushes / opens the PR itself. When dirty, it queues the worktree agent \u2014 then wait_for_turn (loop while stillRunning). Prefer this over paraphrasing.",
       '- Merge (`ask_git` action=merge / send_to_thread "Merge PR.") only when the user explicitly asked to merge that PR. Do not merge because the work looks done, CI is green, or a typical flow includes it.',
       '- Or send_to_thread with those exact phrases: "Commit and push.", "Commit, push, and open a draft PR.", "Merge the remote branch (main) into your branch and resolve conflicts. Then, commit and push your changes.", "Merge PR." (draft PRs: `gh pr create --draft -R <origin-owner/name>` using the workspace `github:` slug \u2014 never upstream). Never run git/gh from this orchestration cwd, and never merge the PR yourself.',
       "Process guides:",
@@ -9308,17 +9357,17 @@ __export(plan_file_exports, {
 });
 function ensureAttachmentsGitignore2(worktreePath) {
   const gitignoreAbs = (0, import_node_path37.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
-  if ((0, import_node_fs40.existsSync)(gitignoreAbs)) return;
-  (0, import_node_fs40.mkdirSync)((0, import_node_path37.dirname)(gitignoreAbs), { recursive: true });
-  (0, import_node_fs40.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
+  if ((0, import_node_fs41.existsSync)(gitignoreAbs)) return;
+  (0, import_node_fs41.mkdirSync)((0, import_node_path37.dirname)(gitignoreAbs), { recursive: true });
+  (0, import_node_fs41.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function planFileAbs(worktreePath) {
   return (0, import_node_path37.join)(worktreePath, PLAN_FILE_REL);
 }
 function readTextIfPresent2(abs) {
-  if (!(0, import_node_fs40.existsSync)(abs)) return null;
+  if (!(0, import_node_fs41.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs40.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs41.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
@@ -9330,16 +9379,16 @@ function readPlanFile(worktreePath) {
 function writePlanFile(worktreePath, content) {
   ensureAttachmentsGitignore2(worktreePath);
   const abs = planFileAbs(worktreePath);
-  (0, import_node_fs40.mkdirSync)((0, import_node_path37.dirname)(abs), { recursive: true });
+  (0, import_node_fs41.mkdirSync)((0, import_node_path37.dirname)(abs), { recursive: true });
   const body = content.trimEnd() + (content.endsWith("\n") ? "" : "\n");
-  (0, import_node_fs40.writeFileSync)(abs, body, "utf8");
+  (0, import_node_fs41.writeFileSync)(abs, body, "utf8");
   return PLAN_FILE_REL;
 }
-var import_node_fs40, import_node_path37;
+var import_node_fs41, import_node_path37;
 var init_plan_file = __esm({
   "src/plan/plan-file.ts"() {
     "use strict";
-    import_node_fs40 = require("fs");
+    import_node_fs41 = require("fs");
     import_node_path37 = require("path");
     init_workspace_scratch();
     init_plan_present();
@@ -9356,9 +9405,9 @@ function recoverFinishedCursorRun(opts) {
   const agentId = opts.agentId.trim();
   if (!agentId) return null;
   const runsPath = (0, import_node_path38.join)(appDataDir(), "cursor-sdk-store", "runs.ndjson");
-  if (!(0, import_node_fs41.existsSync)(runsPath)) return null;
+  if (!(0, import_node_fs42.existsSync)(runsPath)) return null;
   try {
-    const lines = (0, import_node_fs41.readFileSync)(runsPath, "utf8").split("\n");
+    const lines = (0, import_node_fs42.readFileSync)(runsPath, "utf8").split("\n");
     let best = null;
     for (const line of lines) {
       const trimmed = line.trim();
@@ -9384,11 +9433,11 @@ function recoverFinishedCursorRun(opts) {
     return null;
   }
 }
-var import_node_fs41, import_node_path38;
+var import_node_fs42, import_node_path38;
 var init_cursor_recover = __esm({
   "src/agents/cursor-recover.ts"() {
     "use strict";
-    import_node_fs41 = require("fs");
+    import_node_fs42 = require("fs");
     import_node_path38 = require("path");
     init_paths();
   }
@@ -9477,6 +9526,8 @@ __export(index_exports, {
   SLACK_LISTEN_TIMEOUT_REPLY: () => SLACK_LISTEN_TIMEOUT_REPLY,
   SLACK_OAUTH_CANCELLED: () => SLACK_OAUTH_CANCELLED,
   SLACK_OAUTH_REDIRECT: () => SLACK_OAUTH_REDIRECT,
+  SLACK_PROGRESS_DELAY_MS: () => SLACK_PROGRESS_DELAY_MS,
+  SLACK_PROGRESS_EDIT_MS: () => SLACK_PROGRESS_EDIT_MS,
   SLACK_REPLY_FORMATTING: () => SLACK_REPLY_FORMATTING,
   SLACK_SEEN_REACTION: () => SLACK_SEEN_REACTION,
   SlackOAuthCancelledError: () => SlackOAuthCancelledError,
@@ -9634,6 +9685,7 @@ __export(index_exports, {
   formatSlackInboundPrompt: () => formatSlackInboundPrompt,
   formatSlackRepliesForTurn: () => formatSlackRepliesForTurn,
   formatSlackSignedReply: () => formatSlackSignedReply,
+  formatSlackWorkingText: () => formatSlackWorkingText,
   formatTranscriptMarkdown: () => formatTranscriptMarkdown,
   formatUiReminder: () => formatUiReminder,
   formatWorkspaceInventory: () => formatWorkspaceInventory,
@@ -9929,6 +9981,7 @@ __export(index_exports, {
   thisProcessShouldDrainAgentQueues: () => thisProcessShouldDrainAgentQueues,
   threadDisplayLabel: () => threadDisplayLabel,
   threadFilePath: () => threadFilePath,
+  threadLivePath: () => threadLivePath,
   threadLockPath: () => threadLockPath,
   threadRequestsBrightsyMcp: () => threadRequestsBrightsyMcp,
   threadsDir: () => threadsDir,
@@ -9952,6 +10005,7 @@ __export(index_exports, {
   userClaudeMcpConfigPath: () => userClaudeMcpConfigPath,
   userCursorMcpConfigPath: () => userCursorMcpConfigPath,
   validateLinearApiKey: () => validateLinearApiKey,
+  waitForPidExit: () => waitForPidExit,
   warmGithubAgentAuth: () => warmGithubAgentAuth,
   withAgentInstructions: () => withAgentInstructions,
   withExportedPath: () => withExportedPath,
@@ -11022,7 +11076,7 @@ function createAgentStreamCoalescer(emit, opts) {
   const intervalMs = opts?.intervalMs ?? 32;
   let pending = null;
   let timer = null;
-  const flush = () => {
+  const flush2 = () => {
     if (timer) {
       clearTimeout(timer);
       timer = null;
@@ -11034,13 +11088,13 @@ function createAgentStreamCoalescer(emit, opts) {
   };
   const schedule = () => {
     if (timer) return;
-    timer = setTimeout(flush, intervalMs);
+    timer = setTimeout(flush2, intervalMs);
     timer.unref?.();
   };
   return {
     push(event) {
       if (!isTextEvent(event)) {
-        flush();
+        flush2();
         emit(event);
         return;
       }
@@ -11048,12 +11102,12 @@ function createAgentStreamCoalescer(emit, opts) {
       if (pending && pending.type === event.type) {
         pending.data += event.data;
       } else {
-        flush();
+        flush2();
         pending = { type: event.type, data: event.data };
       }
       schedule();
     },
-    flush
+    flush: flush2
   };
 }
 
@@ -12966,11 +13020,11 @@ function stageAbsolutePathsAsAttachments(worktreePath, absolutePaths) {
   }
   return out;
 }
-function stageBuffersAsAttachments(worktreePath, buffers) {
-  if (buffers.length === 0) return [];
+function stageBuffersAsAttachments(worktreePath, buffers2) {
+  if (buffers2.length === 0) return [];
   const dir = ensureAttachmentsDir(worktreePath);
   const out = [];
-  for (const item of buffers) {
+  for (const item of buffers2) {
     const originalName = (item.name || "file").replace(/[/\\]/g, "_") || "file";
     try {
       const buf = Buffer.from(item.dataBase64, "base64");
@@ -12990,8 +13044,8 @@ function stageBuffersAsAttachments(worktreePath, buffers) {
   }
   return out;
 }
-function attachmentsFromBuffers(buffers) {
-  return buffers.map((item) => {
+function attachmentsFromBuffers(buffers2) {
+  return buffers2.map((item) => {
     const name = (item.name || "file").replace(/[/\\]/g, "_") || "file";
     try {
       const buf = Buffer.from(item.dataBase64, "base64");
@@ -13648,8 +13702,11 @@ function worktreeBindingFrom(from) {
   };
 }
 function threadsSharingWorktree(worktreePath) {
+  if (!worktreePath) return [];
   const key = normalizeWorktreePath(worktreePath);
-  return listThreads({ includeArchived: true }).filter((t) => sameWorktreePath(t.worktreePath, key) && t.status !== "archived").sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+  return listThreads({ includeArchived: true }).filter(
+    (t) => Boolean(t.worktreePath) && sameWorktreePath(t.worktreePath, key) && t.status !== "archived"
+  ).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
 }
 function formatTranscriptMarkdown(title, messages) {
   const body = formatMessagesAsTranscript(messages, { tools: "full" });
@@ -14928,7 +14985,7 @@ async function refreshSlackReplyBadges(opts) {
 }
 
 // src/orchestrator/orchestrator.ts
-var import_node_fs42 = require("fs");
+var import_node_fs43 = require("fs");
 init_error_detail();
 init_agents();
 init_worktree();
@@ -15188,10 +15245,131 @@ async function cloneRepoIntoSideboard(opts) {
 // src/orchestrator/orchestrator.ts
 init_thread_store();
 init_orchestrator_capable();
+init_enqueue_by_key();
+init_run();
+init_repo_git_lock();
+
+// src/store/turn-live.ts
+var import_node_fs39 = require("fs");
+init_paths();
+var buffers = /* @__PURE__ */ new Map();
+var FLUSH_MS = 800;
+var MAX_PARTS = 80;
+function trimParts(parts) {
+  if (parts.length <= MAX_PARTS) return parts;
+  return parts.slice(-Math.floor(MAX_PARTS / 2));
+}
+function lastText(parts, type) {
+  for (let i = parts.length - 1; i >= 0; i--) {
+    const p = parts[i];
+    if (p.type === type && p.text.trim()) return p.text.trim();
+  }
+  return "";
+}
+function summarizeTurnLive(parts) {
+  const tools = parts.filter(
+    (p) => p.type === "tool"
+  );
+  const lastTool = tools[tools.length - 1];
+  const lastToolLabel = lastTool ? lastTool.description || toolDescription(lastTool.name, lastTool.input) || lastTool.name : void 0;
+  const running = lastTool?.status === "running";
+  const thinking = lastText(parts, "thinking");
+  const text3 = lastText(parts, "text");
+  const excerptRaw = thinking || text3;
+  const excerpt = excerptRaw.length > 280 ? `${excerptRaw.slice(-280)}` : excerptRaw || void 0;
+  let summary = "Working\u2026";
+  if (lastToolLabel) {
+    const verb = running ? lastToolLabel : `Finished ${lastToolLabel}`;
+    summary = tools.length > 1 ? `${verb} (${tools.length} tools)` : verb;
+  } else if (thinking) {
+    summary = "Thinking\u2026";
+  } else if (text3) {
+    summary = "Writing reply\u2026";
+  }
+  return {
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    summary,
+    lastTool: lastToolLabel,
+    toolCount: tools.length,
+    excerpt
+  };
+}
+function flush(threadId) {
+  const buf = buffers.get(threadId);
+  if (!buf) return;
+  if (buf.timer) {
+    clearTimeout(buf.timer);
+    buf.timer = null;
+  }
+  writeTurnLive(threadId, summarizeTurnLive(buf.parts));
+}
+function scheduleFlush(threadId) {
+  const buf = buffers.get(threadId);
+  if (!buf) return;
+  if (buf.timer) return;
+  buf.timer = setTimeout(() => {
+    const live = buffers.get(threadId);
+    if (live) live.timer = null;
+    flush(threadId);
+  }, FLUSH_MS);
+}
+function noteTurnLiveEvent(threadId, event) {
+  if (event.type === "session_id" || event.type === "usage" || event.type === "stderr") {
+    return;
+  }
+  const prev = buffers.get(threadId) ?? { parts: [], timer: null };
+  prev.parts = trimParts(applyAgentEvent(prev.parts, event));
+  buffers.set(threadId, prev);
+  if (event.type === "exit") {
+    flush(threadId);
+    const cur = buffers.get(threadId);
+    if (cur?.timer) clearTimeout(cur.timer);
+    buffers.delete(threadId);
+    return;
+  }
+  const immediate = event.type === "tool_use" || event.type === "tool_result";
+  if (immediate) flush(threadId);
+  else scheduleFlush(threadId);
+}
+function writeTurnLive(threadId, progress) {
+  const path2 = threadLivePath(threadId);
+  const tmp = `${path2}.${process.pid}.tmp`;
+  try {
+    (0, import_node_fs39.writeFileSync)(tmp, JSON.stringify(progress), "utf8");
+    (0, import_node_fs39.renameSync)(tmp, path2);
+  } catch {
+    try {
+      (0, import_node_fs39.unlinkSync)(tmp);
+    } catch {
+    }
+  }
+}
+function readTurnLive(threadId) {
+  const path2 = threadLivePath(threadId);
+  if (!(0, import_node_fs39.existsSync)(path2)) return null;
+  try {
+    const raw = JSON.parse((0, import_node_fs39.readFileSync)(path2, "utf8"));
+    if (!raw || typeof raw.summary !== "string") return null;
+    return raw;
+  } catch {
+    return null;
+  }
+}
+function clearTurnLive(threadId) {
+  const buf = buffers.get(threadId);
+  if (buf?.timer) clearTimeout(buf.timer);
+  buffers.delete(threadId);
+  const path2 = threadLivePath(threadId);
+  if (!(0, import_node_fs39.existsSync)(path2)) return;
+  try {
+    (0, import_node_fs39.unlinkSync)(path2);
+  } catch {
+  }
+}
 
 // src/review/request-review.ts
 var import_node_crypto8 = require("crypto");
-var import_node_fs39 = require("fs");
+var import_node_fs40 = require("fs");
 var import_node_path36 = require("path");
 init_global_workspace();
 init_thread_store();
@@ -15340,9 +15518,9 @@ function shouldRefreshReviewRequestTemplate(content) {
   return LEGACY_REVIEW_TEMPLATE_MARKERS.every((m) => trimmed.includes(m));
 }
 function readTextIfPresent(abs) {
-  if (!(0, import_node_fs39.existsSync)(abs)) return null;
+  if (!(0, import_node_fs40.existsSync)(abs)) return null;
   try {
-    const content = (0, import_node_fs39.readFileSync)(abs, "utf8");
+    const content = (0, import_node_fs40.readFileSync)(abs, "utf8");
     return content.trim() ? content : null;
   } catch {
     return null;
@@ -15350,9 +15528,9 @@ function readTextIfPresent(abs) {
 }
 function ensureAttachmentsGitignore(worktreePath) {
   const gitignoreAbs = (0, import_node_path36.join)(worktreePath, ATTACHMENTS_DIR, ".gitignore");
-  if ((0, import_node_fs39.existsSync)(gitignoreAbs)) return;
-  (0, import_node_fs39.mkdirSync)((0, import_node_path36.dirname)(gitignoreAbs), { recursive: true });
-  (0, import_node_fs39.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
+  if ((0, import_node_fs40.existsSync)(gitignoreAbs)) return;
+  (0, import_node_fs40.mkdirSync)((0, import_node_path36.dirname)(gitignoreAbs), { recursive: true });
+  (0, import_node_fs40.writeFileSync)(gitignoreAbs, attachmentsGitignoreBody(), "utf8");
 }
 function resolveReviewGuidelines(worktreePath) {
   const repoAbs = (0, import_node_path36.join)(worktreePath, REPO_REVIEW_PATH);
@@ -15386,8 +15564,8 @@ function resolveReviewGuidelines(worktreePath) {
     };
   }
   ensureAttachmentsGitignore(worktreePath);
-  (0, import_node_fs39.mkdirSync)((0, import_node_path36.dirname)(localAbs), { recursive: true });
-  (0, import_node_fs39.writeFileSync)(localAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
+  (0, import_node_fs40.mkdirSync)((0, import_node_path36.dirname)(localAbs), { recursive: true });
+  (0, import_node_fs40.writeFileSync)(localAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
   return {
     path: REVIEW_REQUEST_PATH,
     name: REVIEW_REQUEST_NAME,
@@ -15409,7 +15587,7 @@ function ensureReviewRequestFile(worktreePath) {
   const localAbs = (0, import_node_path36.join)(worktreePath, REVIEW_REQUEST_PATH);
   const localContent = readTextIfPresent(localAbs) ?? readTextIfPresent((0, import_node_path36.join)(worktreePath, LEGACY_REVIEW_REQUEST_PATH));
   if (localContent && !shouldRefreshReviewRequestTemplate(localContent)) {
-    const path2 = (0, import_node_fs39.existsSync)(localAbs) ? REVIEW_REQUEST_PATH : LEGACY_REVIEW_REQUEST_PATH;
+    const path2 = (0, import_node_fs40.existsSync)(localAbs) ? REVIEW_REQUEST_PATH : LEGACY_REVIEW_REQUEST_PATH;
     return {
       path: path2,
       name: REVIEW_REQUEST_NAME,
@@ -15417,8 +15595,8 @@ function ensureReviewRequestFile(worktreePath) {
       source: "local"
     };
   }
-  (0, import_node_fs39.mkdirSync)((0, import_node_path36.dirname)(repoAbs), { recursive: true });
-  (0, import_node_fs39.writeFileSync)(repoAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
+  (0, import_node_fs40.mkdirSync)((0, import_node_path36.dirname)(repoAbs), { recursive: true });
+  (0, import_node_fs40.writeFileSync)(repoAbs, REVIEW_REQUEST_TEMPLATE, "utf8");
   return {
     path: REPO_REVIEW_PATH,
     name: REPO_REVIEW_NAME,
@@ -15627,6 +15805,15 @@ function isPidAlive(pid) {
     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;
+}
+var STALE_AGENT_PID_WAIT_MS = 2500;
 function writeLiveStatus(threadId, status, lastError) {
   const latest = readThread(threadId);
   if (!latest || latest.status === "archived") return latest;
@@ -15704,7 +15891,7 @@ var Orchestrator = class {
         }
         continue;
       }
-      if (!(0, import_node_fs42.existsSync)(thread.worktreePath)) {
+      if (!(0, import_node_fs43.existsSync)(thread.worktreePath)) {
         setStatus(thread.id, "broken", "Worktree missing on disk");
         this.emit({ type: "status_changed", threadId: thread.id, status: "broken" });
         continue;
@@ -16025,14 +16212,10 @@ var Orchestrator = class {
     const inFlight = this.activeTurns.has(thread.id) || this.startingTurns.has(thread.id);
     const livePid = current.agentPid;
     const foreignLive = !inFlight && typeof livePid === "number" && livePid > 0 && isPidAlive(livePid);
-    if (inFlight) {
+    if (inFlight || foreignLive) {
       this.stop(thread.id, { clearQueue: false, continueQueue: true });
-    } else {
-      if (foreignLive) {
-        this.stop(thread.id, { clearQueue: false, continueQueue: true });
-      }
-      void this.drainQueue(thread.id);
     }
+    void this.drainQueue(thread.id);
     return this.requireThread(thread.id);
   }
   async drainQueue(threadId) {
@@ -16061,7 +16244,18 @@ var Orchestrator = class {
         }
         const livePid = thread.agentPid;
         if (typeof livePid === "number" && livePid > 0 && isPidAlive(livePid)) {
-          await new Promise((r) => setTimeout(r, 200));
+          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 });
+            } catch {
+            }
+          }
           continue;
         }
         const prompt = thread.queue[0];
@@ -16218,6 +16412,7 @@ var Orchestrator = class {
         { cachedPrefix, prompt: agentPrompt },
         (event) => {
           this.emit({ type: "turn_output", threadId, event });
+          noteTurnLiveEvent(threadId, event);
           if (event.type === "session_id") {
             updateThread(threadId, { sessionId: event.data });
           }
@@ -16422,6 +16617,7 @@ var Orchestrator = class {
       this.processes.delete(`${threadId}:agent`);
       this.stoppedTurns.delete(threadId);
       this.runningCount = Math.max(0, this.runningCount - 1);
+      clearTurnLive(threadId);
       try {
         updateThread(threadId, { agentPid: null });
       } catch {
@@ -16695,51 +16891,56 @@ var Orchestrator = class {
     }
     return created;
   }
-  async waitForTurn(threadRef, timeoutMs = 6e5) {
+  async waitForTurn(threadRef, timeoutMs = 6e5, opts) {
     const thread = this.requireThread(threadRef);
+    if (!["running", "queued"].includes(thread.status)) {
+      return thread;
+    }
     const start = Date.now();
     return new Promise((resolve, reject) => {
-      if (!["running", "queued"].includes(thread.status)) {
-        resolve(thread);
-        return;
-      }
+      let settled = false;
+      let timer;
+      const finish = (fn) => {
+        if (settled) return;
+        settled = true;
+        if (timer) clearInterval(timer);
+        off();
+        fn();
+      };
       const off = this.on((event) => {
         if (event.type === "turn_finished" && event.threadId === thread.id) {
-          off();
           const latest = readThread(thread.id);
           if (!latest) {
-            reject(new Error(`Thread not found: ${thread.id}`));
+            finish(() => reject(new Error(`Thread not found: ${thread.id}`)));
             return;
           }
-          resolve(latest);
+          finish(() => resolve(latest));
         }
         if (event.type === "error" && event.threadId === thread.id) {
-          off();
           const latest = readThread(thread.id);
           if (!latest) {
-            reject(new Error(`Thread not found: ${thread.id}`));
+            finish(() => reject(new Error(`Thread not found: ${thread.id}`)));
             return;
           }
-          resolve(latest);
+          finish(() => resolve(latest));
         }
       });
-      const timer = setInterval(() => {
-        if (Date.now() - start > timeoutMs) {
-          clearInterval(timer);
-          off();
-          reject(new Error("wait_for_turn timed out"));
-        }
+      timer = setInterval(() => {
         const current = readThread(thread.id);
         if (!current) {
-          clearInterval(timer);
-          off();
-          reject(new Error(`Thread not found: ${thread.id}`));
+          finish(() => reject(new Error(`Thread not found: ${thread.id}`)));
           return;
         }
         if (!["running", "queued"].includes(current.status)) {
-          clearInterval(timer);
-          off();
-          resolve(current);
+          finish(() => resolve(current));
+          return;
+        }
+        if (Date.now() - start > timeoutMs) {
+          if (opts?.resolveIfStillRunning) {
+            finish(() => resolve(current));
+          } else {
+            finish(() => reject(new Error("wait_for_turn timed out")));
+          }
         }
       }, 200);
     });
@@ -16749,11 +16950,16 @@ var Orchestrator = class {
     const lastAgent = [...thread.messages].reverse().find((m) => m.role === "agent");
     const lastError = thread.lastError ?? null;
     const text3 = (lastAgent?.text ?? "").trim() || (thread.status === "error" ? lastError ?? "" : "");
+    const stillRunning = thread.status === "running" || thread.status === "queued";
+    const live = stillRunning ? readTurnLive(thread.id) : null;
     return {
       text: text3,
       status: thread.status,
       sessionId: thread.sessionId,
-      lastError
+      lastError,
+      stillRunning,
+      progress: live?.summary ?? null,
+      lastActivityAt: live?.updatedAt ?? null
     };
   }
   assertNotGlobal(thread, action) {
@@ -17179,7 +17385,19 @@ var Orchestrator = class {
     const thread = this.requireThread(threadRef);
     return threadsSharingWorktree(thread.worktreePath);
   }
+  /**
+   * Last-tab teardown must see siblings already archived. Serialize per
+   * worktree so parallel archive/purge of sibling tabs still removes once.
+   */
+  enqueueWorktreeTeardown(thread, fn) {
+    const key = isGlobalThread(thread) ? `archive:global:${thread.id}` : `archive:wt:${normalizeWorktreePath(thread.worktreePath)}`;
+    return enqueueByKey(key, fn);
+  }
   async archive(threadRef) {
+    const thread = this.requireThread(threadRef);
+    return this.enqueueWorktreeTeardown(thread, () => this.archiveUnlocked(threadRef));
+  }
+  async archiveUnlocked(threadRef) {
     const thread = this.requireThread(threadRef);
     this.stop(thread.id);
     this.releaseOrchestratorCaffeinate(thread);
@@ -17215,6 +17433,10 @@ var Orchestrator = class {
     return archived;
   }
   async purge(threadRef, opts) {
+    const thread = this.requireThread(threadRef);
+    await this.enqueueWorktreeTeardown(thread, () => this.purgeUnlocked(threadRef, opts));
+  }
+  async purgeUnlocked(threadRef, opts) {
     const thread = this.requireThread(threadRef);
     this.stop(thread.id);
     this.releaseOrchestratorCaffeinate(thread);
@@ -17249,13 +17471,12 @@ var Orchestrator = class {
       this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
       return restored2;
     }
-    if (!(0, import_node_fs42.existsSync)(thread.worktreePath)) {
+    if (!(0, import_node_fs43.existsSync)(thread.worktreePath)) {
       const { createThreadWorktree: createThreadWorktree2 } = await Promise.resolve().then(() => (init_worktree(), worktree_exports));
-      const { execa: execa7 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
-      await execa7("git", ["worktree", "add", dest, thread.branchName], {
-        cwd: thread.repoPath
+      await withRepoGitLock(thread.repoPath, async () => {
+        await git(["worktree", "add", dest, thread.branchName], thread.repoPath);
       });
       void createThreadWorktree2;
       void slug;
@@ -17507,6 +17728,15 @@ function mcpArchiveBlockedReason(thread) {
 // src/mcp/server.ts
 init_profile();
 
+// src/mcp/wait-for-turn.ts
+var MCP_WAIT_FOR_TURN_MAX_MS = 45e3;
+function mcpWaitForTurnTimeoutMs(requested) {
+  const n = requested ?? MCP_WAIT_FOR_TURN_MAX_MS;
+  if (!Number.isFinite(n)) return MCP_WAIT_FOR_TURN_MAX_MS;
+  return Math.min(Math.max(1e3, Math.floor(n)), MCP_WAIT_FOR_TURN_MAX_MS);
+}
+var MCP_WAIT_STILL_RUNNING_HINT = "Child is still working. Call wait_for_turn again. Do not send a check-in prompt or assume a hang while progress is updating.";
+
 // src/mcp/slack-tools.ts
 var import_zod = require("zod");
 
@@ -18178,7 +18408,9 @@ async function startMcpServer() {
       const threads = orch.getThreads(true);
       const lines = threads.map((t) => {
         const repo = t.repoPath === GLOBAL_WORKSPACE_ID ? "Orchestration" : (0, import_node_path39.basename)(t.repoPath) || t.repoPath;
-        return `${t.id.slice(0, 8)}  ${t.status.padEnd(9)}  ${t.agent.padEnd(8)}  ${repo}  ${t.sourceType}:${t.sourceRef}  ${t.title}  sideboard://thread/${t.id}${t.devPort ? `  http://localhost:${t.devPort}` : ""}`;
+        const live = t.status === "running" || t.status === "queued" ? readTurnLive(t.id) : null;
+        const progress = live?.summary ? `  ${live.summary}` : "";
+        return `${t.id.slice(0, 8)}  ${t.status.padEnd(9)}  ${t.agent.padEnd(8)}  ${repo}  ${t.sourceType}:${t.sourceRef}  ${t.title}  sideboard://thread/${t.id}${t.devPort ? `  http://localhost:${t.devPort}` : ""}${progress}`;
       });
       return {
         content: [{ type: "text", text: lines.join("\n") || "(no threads)" }]
@@ -18187,13 +18419,14 @@ async function startMcpServer() {
   );
   server.tool(
     "get_thread",
-    "Get a compact thread summary by id/ref",
+    "Get a compact thread summary by id/ref. While running, includes progress (last tool/thinking) and lastActivityAt.",
     { ref: import_zod3.z.string() },
     async ({ ref }) => {
       const t = orch.getThread(ref);
       if (!t) {
         return { content: [{ type: "text", text: `Thread not found: ${ref}` }], isError: true };
       }
+      const live = t.status === "running" || t.status === "queued" ? readTurnLive(t.id) : null;
       const summary = {
         id: t.id,
         title: t.title,
@@ -18208,7 +18441,10 @@ async function startMcpServer() {
         messageCount: t.messages.length,
         devPort: t.devPort,
         prUrl: t.prUrl,
-        lastError: t.lastError ?? null
+        lastError: t.lastError ?? null,
+        stillRunning: t.status === "running" || t.status === "queued",
+        progress: live?.summary ?? null,
+        lastActivityAt: live?.updatedAt ?? null
       };
       return { content: [{ type: "text", text: JSON.stringify(summary, null, 2) }] };
     }
@@ -18534,13 +18770,15 @@ async function startMcpServer() {
     );
     server.tool(
       "wait_for_turn",
-      "Block until the thread finishes its current/queued turn (avoids polling). Use after send_to_thread or ask_git. Returns status, text, and lastError. If status is error, lastError/text is the failure \u2014 switch agent, tell the user, or retry; do not treat empty text as success.",
+      "Wait until the thread finishes its current/queued turn, or return early with a live progress snapshot. MCP clients often kill tools around 60s, so this returns within 45s even while the child is still working. If stillRunning is true, progress is tools/thinking \u2014 call wait_for_turn again. Do not send a check-in prompt or assume a hang. On status error, lastError/text is the failure.",
       {
         ref: import_zod3.z.string(),
         timeoutMs: import_zod3.z.number().optional()
       },
       async ({ ref, timeoutMs }) => {
-        const thread = await orch.waitForTurn(ref, timeoutMs ?? 6e5);
+        const thread = await orch.waitForTurn(ref, mcpWaitForTurnTimeoutMs(timeoutMs), {
+          resolveIfStillRunning: true
+        });
         const result = orch.getTurnResult(thread.id);
         return {
           content: [
@@ -18550,7 +18788,11 @@ async function startMcpServer() {
                 id: thread.id,
                 status: result.status,
                 text: result.text,
-                lastError: result.lastError
+                lastError: result.lastError,
+                stillRunning: result.stillRunning,
+                progress: result.progress,
+                lastActivityAt: result.lastActivityAt,
+                hint: result.stillRunning ? MCP_WAIT_STILL_RUNNING_HINT : void 0
               })
             }
           ]
@@ -18559,11 +18801,21 @@ async function startMcpServer() {
     );
     server.tool(
       "get_turn_result",
-      "Final assistant message (and lastError when the turn failed). Not the full transcript.",
+      "Assistant message when the turn finished, or live progress while stillRunning. Not the full transcript.",
       { ref: import_zod3.z.string() },
       async ({ ref }) => {
         const result = orch.getTurnResult(ref);
-        return { content: [{ type: "text", text: JSON.stringify(result) }] };
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                ...result,
+                hint: result.stillRunning ? MCP_WAIT_STILL_RUNNING_HINT : void 0
+              })
+            }
+          ]
+        };
       }
     );
     server.tool(
@@ -18680,7 +18932,7 @@ async function startMcpServer() {
     );
     server.tool(
       "request_review",
-      'Start a merge-readiness Review on a worktree agent thread (same as the desktop Review button). Opens a new Review chat tab, attaches .sideboard/review.md when present (else local Review request.md / stock template), and sends "Review changes in this workspace." Expect Approve / Approve with nits / Request changes / Needs more information. Pass a worktree thread ref \u2014 not the orchestrator. Then wait_for_turn / get_turn_result on the returned review tab id.',
+      'Start a merge-readiness Review on a worktree agent thread (same as the desktop Review button). Opens a new Review chat tab, attaches .sideboard/review.md when present (else local Review request.md / stock template), and sends "Review changes in this workspace." Expect Approve / Approve with nits / Request changes / Needs more information. Pass a worktree thread ref \u2014 not the orchestrator. Then wait_for_turn (loop while stillRunning) / get_turn_result on the returned review tab id.',
       { ref: import_zod3.z.string().describe("Worktree thread id/ref to review") },
       async ({ ref }) => {
         try {
@@ -18708,7 +18960,7 @@ async function startMcpServer() {
     );
     server.tool(
       "ask_git",
-      "Commit & push, open a draft PR, resolve conflicts, or merge \u2014 same actions as the desktop git buttons. When the worktree is clean, Sideboard pushes / opens the PR itself (HTTPS via `gh` if SSH is missing). When dirty, queues the worktree agent to commit; then wait_for_turn. Pass a worktree thread ref (not the orchestrator). action=merge only when the user explicitly asked to merge that PR. Do not run git or gh from the orchestration cwd.",
+      "Commit & push, open a draft PR, resolve conflicts, or merge \u2014 same actions as the desktop git buttons. When the worktree is clean, Sideboard pushes / opens the PR itself (HTTPS via `gh` if SSH is missing). When dirty, queues the worktree agent to commit; then wait_for_turn (loop while stillRunning). Pass a worktree thread ref (not the orchestrator). action=merge only when the user explicitly asked to merge that PR. Do not run git or gh from the orchestration cwd.",
       {
         ref: import_zod3.z.string().describe("Worktree thread id/ref"),
         action: import_zod3.z.enum(AGENT_GIT_ACTIONS).describe(
@@ -18759,7 +19011,7 @@ async function startMcpServer() {
     );
     server.tool(
       "fork_worktree",
-      "Fork a worktree agent chat into a NEW git worktree + chat (desktop \u201CFork to new workspace\u201D). Seeds a transcript (through through_index, default all). Optional agent override. Leave model unset for Auto (default) \u2014 only pass model when you have a reason. Not for the orchestrator. Then send_to_thread / wait_for_turn on the returned id.",
+      "Fork a worktree agent chat into a NEW git worktree + chat (desktop \u201CFork to new workspace\u201D). Seeds a transcript (through through_index, default all). Optional agent override. Leave model unset for Auto (default) \u2014 only pass model when you have a reason. Not for the orchestrator. Then send_to_thread / wait_for_turn (loop while stillRunning) on the returned id.",
       {
         ref: import_zod3.z.string().describe("Worktree thread id/ref to fork"),
         through_index: import_zod3.z.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
@@ -18804,7 +19056,7 @@ async function startMcpServer() {
     );
     server.tool(
       "fork_chat",
-      "Fork a chat into a NEW tab on the SAME workspace: worktree agent \u2192 same worktree tab; Global orchestration chat \u2192 new orchestration chat (same synthetic home). Seeds a transcript; optional agent override. Leave model unset for Auto unless you have a reason. Orchestration forks require an MCP-capable agent (claude, cursor, codex, opencode \u2014 not brightsy). Slack / Global orchestrators use this to continue an orchestration chat on another agent after session limits. Then send_to_thread / wait_for_turn on the returned id. Use fork_worktree only for worktree agents that need a new git worktree.",
+      "Fork a chat into a NEW tab on the SAME workspace: worktree agent \u2192 same worktree tab; Global orchestration chat \u2192 new orchestration chat (same synthetic home). Seeds a transcript; optional agent override. Leave model unset for Auto unless you have a reason. Orchestration forks require an MCP-capable agent (claude, cursor, codex, opencode \u2014 not brightsy). Slack / Global orchestrators use this to continue an orchestration chat on another agent after session limits. Then send_to_thread / wait_for_turn (loop while stillRunning) on the returned id. Use fork_worktree only for worktree agents that need a new git worktree.",
       {
         ref: import_zod3.z.string().describe("Thread id/ref to fork (worktree agent or orchestration chat)"),
         through_index: import_zod3.z.number().optional().describe("Inclusive message index to include in the transcript (default: all)"),
@@ -19487,7 +19739,7 @@ init_connected_teams();
 init_injected_mcp();
 
 // src/agents/user-mcp-config.ts
-var import_node_fs43 = require("fs");
+var import_node_fs44 = require("fs");
 var import_node_os12 = require("os");
 var import_node_path40 = require("path");
 init_paths();
@@ -19523,16 +19775,16 @@ function mergeSideboardIntoMcpServersJson(existing, sideboard) {
 }
 function writeMergedMcpServersJson(configPath, sideboard) {
   let existing = {};
-  if ((0, import_node_fs43.existsSync)(configPath)) {
+  if ((0, import_node_fs44.existsSync)(configPath)) {
     try {
-      existing = JSON.parse((0, import_node_fs43.readFileSync)(configPath, "utf8"));
+      existing = JSON.parse((0, import_node_fs44.readFileSync)(configPath, "utf8"));
     } catch {
       existing = {};
     }
   }
   const next = mergeSideboardIntoMcpServersJson(existing, sideboard);
-  (0, import_node_fs43.mkdirSync)((0, import_node_path40.dirname)(configPath), { recursive: true });
-  (0, import_node_fs43.writeFileSync)(configPath, `${JSON.stringify(next, null, 2)}
+  (0, import_node_fs44.mkdirSync)((0, import_node_path40.dirname)(configPath), { recursive: true });
+  (0, import_node_fs44.writeFileSync)(configPath, `${JSON.stringify(next, null, 2)}
 `);
 }
 function launchFromResolved(server) {
@@ -19550,7 +19802,7 @@ async function registerPackagedUserMcpClients() {
   const cursor = userCursorMcpConfigPath();
   writeMergedMcpServersJson(cursor, launch);
   const claude = userClaudeMcpConfigPath();
-  if ((0, import_node_fs43.existsSync)(claude)) {
+  if ((0, import_node_fs44.existsSync)(claude)) {
     writeMergedMcpServersJson(claude, launch);
     return { cursor, claude };
   }
@@ -20056,6 +20308,8 @@ function connectSession(ws, opts, log) {
 
 // src/slack/relay-protocol.ts
 var import_node_crypto11 = require("crypto");
+var SLACK_RELAY_PING_INTERVAL_MS = 2e4;
+var SLACK_RELAY_PONG_TIMEOUT_MS = 15e3;
 function slackRelaySessionKey(teamId, userId, deviceId) {
   return `${teamId.trim()}:${userId.trim()}:${deviceId.trim()}`;
 }
@@ -20241,10 +20495,21 @@ function connectSession2(ws, opts, log) {
     const allowedUsers = new Set(
       opts.workspaces.map((w) => `${w.teamId.trim()}:${w.userId.trim()}`)
     );
+    const pingMs = opts.pingIntervalMs ?? SLACK_RELAY_PING_INTERVAL_MS;
+    const pongMs = opts.pongTimeoutMs ?? SLACK_RELAY_PONG_TIMEOUT_MS;
+    let pingTimer = null;
+    let pongTimer = null;
+    const stopKeepalive = () => {
+      if (pingTimer) clearInterval(pingTimer);
+      if (pongTimer) clearTimeout(pongTimer);
+      pingTimer = null;
+      pongTimer = null;
+    };
     const finish = (err) => {
       if (settled) return;
       settled = true;
       pending.clear();
+      stopKeepalive();
       opts.signal?.removeEventListener("abort", onAbort);
       if (err) reject(err);
       else resolve();
@@ -20257,6 +20522,25 @@ function connectSession2(ws, opts, log) {
       finish();
     };
     opts.signal?.addEventListener("abort", onAbort, { once: true });
+    const armPongTimeout = () => {
+      if (pongTimer) clearTimeout(pongTimer);
+      pongTimer = setTimeout(() => {
+        log("relay error: ping timeout");
+        try {
+          ws.close();
+        } catch {
+        }
+        finish(new Error("relay ping timeout"));
+      }, pongMs);
+    };
+    const pingOnce = () => {
+      try {
+        send(ws, { type: "ping" });
+        armPongTimeout();
+      } catch (err) {
+        finish(err instanceof Error ? err : new Error("relay ping failed"));
+      }
+    };
     ws.addEventListener("open", () => {
       const label = opts.deviceLabel?.trim() || opts.deviceId.trim();
       log(`Relay connected \xB7 ${label}`);
@@ -20271,6 +20555,8 @@ function connectSession2(ws, opts, log) {
           userToken: wsInfo.userToken
         });
       }
+      pingOnce();
+      pingTimer = setInterval(pingOnce, pingMs);
     });
     ws.addEventListener("error", () => {
       finish(new Error("WebSocket error"));
@@ -20282,7 +20568,13 @@ function connectSession2(ws, opts, log) {
       const raw = typeof ev.data === "string" ? ev.data : String(ev.data ?? "");
       const msg = parseSlackRelayServerMessage(raw);
       if (!msg) return;
-      if (msg.type === "pong") return;
+      if (msg.type === "pong") {
+        if (pongTimer) {
+          clearTimeout(pongTimer);
+          pongTimer = null;
+        }
+        return;
+      }
       if (msg.type === "error") {
         log(`relay error: ${msg.message}`);
         return;
@@ -20405,6 +20697,13 @@ function slackReplyThreadTs(msg) {
   if (msg.kind === "mention") return msg.ts;
   return void 0;
 }
+var SLACK_PROGRESS_DELAY_MS = 2e4;
+var SLACK_PROGRESS_EDIT_MS = 15e3;
+function formatSlackWorkingText(summary) {
+  const line = (summary ?? "").trim();
+  if (!line || /^working/i.test(line)) return "Working\u2026";
+  return `Working\u2026 ${line}`;
+}
 var SLACK_SEEN_REACTION = "eyes";
 function writeTokenForTeam(teamId) {
   const workspaces = listSlackWorkspacesRaw();
@@ -20441,8 +20740,8 @@ async function ackSlackInboundSeen(msg, opts) {
     log(`react error: ${errMsg}${hint}`);
   }
 }
-async function postSlackText(target, text3, opts) {
-  const stub = {
+function replyStub(target) {
+  return {
     teamId: target.teamId,
     channelId: target.channelId,
     ts: target.threadTs ?? "",
@@ -20450,12 +20749,15 @@ async function postSlackText(target, text3, opts) {
     text: "",
     kind: "dm"
   };
+}
+async function postSlackText(target, text3, opts) {
   if (opts.postReply) {
-    await opts.postReply(stub, text3);
-    return;
+    const result = await opts.postReply(replyStub(target), text3);
+    const ts2 = result && typeof result === "object" && typeof result.ts === "string" ? result.ts.trim() : "";
+    return ts2 ? { ts: ts2 } : null;
   }
   const token = writeTokenForTeam(target.teamId);
-  await slackApi(
+  const json = await slackApi(
     token,
     "chat.postMessage",
     {
@@ -20465,18 +20767,163 @@ async function postSlackText(target, text3, opts) {
     },
     opts.fetchImpl
   );
+  const ts = json.ts?.trim();
+  return ts ? { ts } : null;
 }
-async function postSlackReply(msg, text3, opts) {
-  await postSlackText(
+async function updateSlackText(target, ts, text3, opts) {
+  if (opts.updateReply) {
+    await opts.updateReply(replyStub(target), ts, text3);
+    return;
+  }
+  const token = writeTokenForTeam(target.teamId);
+  await slackApi(
+    token,
+    "chat.update",
     {
-      teamId: msg.teamId,
-      channelId: msg.channelId,
-      threadTs: slackReplyThreadTs(msg)
+      channel: target.channelId,
+      ts,
+      text: text3
     },
-    signForThisMac(text3),
-    opts
+    opts.fetchImpl
+  );
+}
+async function deleteSlackText(target, ts, opts) {
+  if (opts.deleteReply) {
+    await opts.deleteReply(replyStub(target), ts);
+    return;
+  }
+  const token = writeTokenForTeam(target.teamId);
+  await slackApi(
+    token,
+    "chat.delete",
+    {
+      channel: target.channelId,
+      ts
+    },
+    opts.fetchImpl
   );
 }
+function replyTargetOf(msg) {
+  return {
+    teamId: msg.teamId,
+    channelId: msg.channelId,
+    threadTs: slackReplyThreadTs(msg)
+  };
+}
+async function postSlackReply(msg, text3, opts) {
+  await postSlackText(replyTargetOf(msg), signForThisMac(text3), opts);
+}
+function startSlackTurnProgress(msg, threadId, opts) {
+  const log = opts.onLog ?? (() => void 0);
+  const target = replyTargetOf(msg);
+  const delayMs = opts.progressDelayMs ?? SLACK_PROGRESS_DELAY_MS;
+  const editMs = opts.progressEditMs ?? SLACK_PROGRESS_EDIT_MS;
+  let stopped = false;
+  let postedTs = null;
+  let lastBody = null;
+  let chain = Promise.resolve();
+  let editTimer = null;
+  const run2 = (fn) => {
+    const next = chain.then(fn, fn);
+    chain = next.then(
+      () => void 0,
+      () => void 0
+    );
+    return next;
+  };
+  const stillLive = () => {
+    if (stopped || slackInboundSuperseded(opts)) return false;
+    const thread = readThread(threadId());
+    return Boolean(thread && (thread.status === "running" || thread.status === "queued"));
+  };
+  const postWorking = async () => {
+    if (!stillLive()) return;
+    const summary = readTurnLive(threadId())?.summary ?? "Working\u2026";
+    const body = formatSlackWorkingText(summary);
+    try {
+      const posted = await postSlackText(target, signForThisMac(body), opts);
+      postedTs = posted?.ts ?? postedTs;
+      lastBody = body;
+      if (postedTs && !stopped && !editTimer) {
+        editTimer = setInterval(() => {
+          void run2(editWorking);
+        }, editMs);
+      }
+    } catch (err) {
+      const errMsg = err instanceof Error ? err.message : String(err);
+      log(`progress post error: ${errMsg}`);
+    }
+  };
+  const editWorking = async () => {
+    if (!postedTs || !stillLive()) return;
+    const summary = readTurnLive(threadId())?.summary ?? "Working\u2026";
+    const body = formatSlackWorkingText(summary);
+    if (body === lastBody) return;
+    lastBody = body;
+    try {
+      await updateSlackText(target, postedTs, signForThisMac(body), opts);
+    } catch (err) {
+      const errMsg = err instanceof Error ? err.message : String(err);
+      log(`progress update error: ${errMsg}`);
+    }
+  };
+  const delayTimer = setTimeout(() => {
+    void run2(postWorking);
+  }, delayMs);
+  const stop = () => {
+    stopped = true;
+    clearTimeout(delayTimer);
+    if (editTimer) {
+      clearInterval(editTimer);
+      editTimer = null;
+    }
+  };
+  return {
+    stop,
+    discard: () => {
+      stop();
+      return run2(async () => {
+        if (!postedTs) return;
+        const ts = postedTs;
+        postedTs = null;
+        try {
+          await deleteSlackText(target, ts, opts);
+        } catch (err) {
+          const errMsg = err instanceof Error ? err.message : String(err);
+          log(`progress delete error: ${errMsg}`);
+        }
+      });
+    },
+    finishWith: (text3) => {
+      stop();
+      return run2(async () => {
+        const signed = signForThisMac(text3.trim());
+        if (!signed) {
+          if (!postedTs) return;
+          const ts = postedTs;
+          postedTs = null;
+          try {
+            await deleteSlackText(target, ts, opts);
+          } catch (err) {
+            const errMsg = err instanceof Error ? err.message : String(err);
+            log(`progress delete error: ${errMsg}`);
+          }
+          return;
+        }
+        if (postedTs) {
+          try {
+            await updateSlackText(target, postedTs, signed, opts);
+            return;
+          } catch (err) {
+            const errMsg = err instanceof Error ? err.message : String(err);
+            log(`progress update error: ${errMsg}`);
+          }
+        }
+        await postSlackText(target, signed, opts);
+      });
+    }
+  };
+}
 var lastRelayed = /* @__PURE__ */ new Map();
 function markRelayed(threadId, text3) {
   lastRelayed.set(threadId, `${threadId}:${text3}`);
@@ -20568,10 +21015,15 @@ async function handleSlackInbound(msg, opts) {
     });
   };
   bindReplyTarget(fresh.id);
+  const progress = startSlackTurnProgress(msg, () => fresh.id, opts);
   const runTurn = async (threadId) => {
     await orch.send(threadId, prompt);
     await orch.waitForTurn(threadId, 14 * 60 * 1e3);
   };
+  const dropProgress = async (reason) => {
+    log(reason);
+    await progress.discard();
+  };
   let reply;
   try {
     try {
@@ -20584,12 +21036,12 @@ async function handleSlackInbound(msg, opts) {
       await runTurn(fresh.id);
     }
     if (slackInboundSuperseded(opts)) {
-      log(`turn finished ${msg.ts} (superseded)`);
+      await dropProgress(`turn finished ${msg.ts} (superseded)`);
       return;
     }
     let after = readThread(fresh.id);
     if (after?.status === "stopped") {
-      log(`turn finished ${msg.ts} (interrupted, skip post)`);
+      await dropProgress(`turn finished ${msg.ts} (interrupted, skip post)`);
       return;
     }
     if (!after || after.status === "archived") {
@@ -20598,46 +21050,48 @@ async function handleSlackInbound(msg, opts) {
       bindReplyTarget(fresh.id);
       await runTurn(fresh.id);
       if (slackInboundSuperseded(opts)) {
-        log(`turn finished ${msg.ts} (superseded)`);
+        await dropProgress(`turn finished ${msg.ts} (superseded)`);
         return;
       }
       after = readThread(fresh.id);
       if (!after || after.status === "stopped" || after.status === "archived") {
-        log(`turn finished ${msg.ts} (interrupted, skip post)`);
+        await dropProgress(`turn finished ${msg.ts} (interrupted, skip post)`);
         return;
       }
     }
     reply = orch.getTurnResult(fresh.id).text.trim();
   } catch (err) {
     if (slackInboundSuperseded(opts)) {
-      log(`turn error ${msg.ts} (superseded)`);
+      await dropProgress(`turn error ${msg.ts} (superseded)`);
       return;
     }
     const errMsg = err instanceof Error ? err.message : String(err);
     if (slackCoordinatorGone(err)) {
-      log(`turn finished ${msg.ts} (thread gone, skip post)`);
+      await dropProgress(`turn finished ${msg.ts} (thread gone, skip post)`);
       return;
     }
     const timedOut = /timed out|timeout/i.test(errMsg);
     const errorReply = timedOut ? SLACK_LISTEN_TIMEOUT_REPLY : `Sideboard coordinator error: ${errMsg}`;
-    await postSlackReply(msg, errorReply, opts).catch((postErr) => {
+    try {
+      await progress.finishWith(errorReply);
+      log(`replied error ${msg.ts}: ${errMsg}`);
+    } catch (postErr) {
       const postMsg = postErr instanceof Error ? postErr.message : String(postErr);
       log(`post error: ${postMsg}`);
-    });
-    log(`replied error ${msg.ts}: ${errMsg}`);
+    }
     if (!timedOut) throw err;
     return;
   }
   if (!reply) {
-    log(`post error: no agent text to send for ${msg.ts}`);
+    await dropProgress(`post error: no agent text to send for ${msg.ts}`);
     return;
   }
   if (alreadyRelayed(fresh.id, reply)) {
-    log(`turn finished ${msg.ts} (already posted)`);
+    await dropProgress(`turn finished ${msg.ts} (already posted)`);
     return;
   }
   try {
-    await postSlackReply(msg, reply, opts);
+    await progress.finishWith(reply);
     markRelayed(fresh.id, reply);
     log(`replied ${msg.ts} (${reply.length} chars)`);
   } catch (err) {
@@ -20964,7 +21418,7 @@ var import_node_http3 = require("http");
 var import_ws3 = require("ws");
 
 // src/slack/relay-static.ts
-var import_node_fs44 = require("fs");
+var import_node_fs45 = require("fs");
 var import_promises = require("fs/promises");
 var import_node_path41 = __toESM(require("path"), 1);
 var TYPES = {
@@ -21023,7 +21477,7 @@ function sendFile(req, res, file, size) {
     res.end();
     return true;
   }
-  (0, import_node_fs44.createReadStream)(file).pipe(res);
+  (0, import_node_fs45.createReadStream)(file).pipe(res);
   return true;
 }
 async function tryServeStatic(req, res, root) {
@@ -21188,6 +21642,20 @@ async function startSlackRelayServer(opts) {
         }
       }
     };
+    const ping = setInterval(() => {
+      if (ws.readyState !== ws.OPEN) {
+        clearInterval(ping);
+        return;
+      }
+      try {
+        ws.ping();
+      } catch {
+        clearInterval(ping);
+      }
+    }, SLACK_RELAY_PING_INTERVAL_MS);
+    const stopPing = () => clearInterval(ping);
+    ws.on("close", stopPing);
+    ws.on("error", stopPing);
     log("desktop connected");
     ws.on("message", (data) => {
       const raw = typeof data === "string" ? data : data.toString("utf8");
@@ -21299,6 +21767,8 @@ async function startSlackRelayServer(opts) {
   SLACK_LISTEN_TIMEOUT_REPLY,
   SLACK_OAUTH_CANCELLED,
   SLACK_OAUTH_REDIRECT,
+  SLACK_PROGRESS_DELAY_MS,
+  SLACK_PROGRESS_EDIT_MS,
   SLACK_REPLY_FORMATTING,
   SLACK_SEEN_REACTION,
   SlackOAuthCancelledError,
@@ -21456,6 +21926,7 @@ async function startSlackRelayServer(opts) {
   formatSlackInboundPrompt,
   formatSlackRepliesForTurn,
   formatSlackSignedReply,
+  formatSlackWorkingText,
   formatTranscriptMarkdown,
   formatUiReminder,
   formatWorkspaceInventory,
@@ -21751,6 +22222,7 @@ async function startSlackRelayServer(opts) {
   thisProcessShouldDrainAgentQueues,
   threadDisplayLabel,
   threadFilePath,
+  threadLivePath,
   threadLockPath,
   threadRequestsBrightsyMcp,
   threadsDir,
@@ -21774,6 +22246,7 @@ async function startSlackRelayServer(opts) {
   userClaudeMcpConfigPath,
   userCursorMcpConfigPath,
   validateLinearApiKey,
+  waitForPidExit,
   warmGithubAgentAuth,
   withAgentInstructions,
   withExportedPath,