@sideboard-ai/core 0.1.297 → 0.1.299

package/dist/{chunk-W2A63ZOK.js → chunk-NF3WDI7F.js}

@@ -14,7 +14,7 @@ import {
   parseSessionQuotaResetAt,
   planModeTurnInstruction,
   resolveQuotaFallbackAgent
-} from "./chunk-6GTABVNG.js";
+} from "./chunk-EB7B4D2Z.js";
 import {
   REVIEW_TAB_TITLE,
   applyWorktreePkgCacheEnv,
@@ -53,7 +53,7 @@ import {
   worktreeDevProcessKey,
   worktreeRunProcessKey,
   worktreeSetupProcessKey
-} from "./chunk-67BWWLEB.js";
+} from "./chunk-MMIDAD6J.js";
 import {
   applyAgentEvent,
   clipAgentEventForPaint,
@@ -68,7 +68,7 @@ import {
   partsToAssistantText,
   stripBrightsyNdjsonNoise,
   toolDescription
-} from "./chunk-Q3DPZ4DE.js";
+} from "./chunk-F36QRDM4.js";
 import {
   titleFromPrompt
 } from "./chunk-7H655NEW.js";
@@ -100,12 +100,13 @@ import {
   stageAbsolutePathsAsAttachments,
   stageBuffersAsAttachments,
   syncWorkspacesFromThreads
-} from "./chunk-BGEECLKH.js";
+} from "./chunk-QB4UQA5L.js";
 import {
   addPrStackLayer,
   allocateTeamSlug,
   canonicalizeRepoPath,
   ciChecksFailed,
+  classifyPrMergeIssue,
   commitAll,
   connectedPrSelectors,
   createExistingBranchWorktree,
@@ -132,6 +133,7 @@ import {
   markPrReady,
   mergeAgentGitAuthEnv,
   mergePr,
+  mergeStateSuggestsCheckFailure,
   pushBranch,
   removeWorktree,
   resolveAgentGitAuthEnv,
@@ -142,7 +144,7 @@ import {
   resolveRepoRoot,
   switchWorktreeBranch,
   withRepoGitLock
-} from "./chunk-JWXJXEA3.js";
+} from "./chunk-G52HLBQR.js";
 import {
   agentNicknameFromWorktreePath,
   appendMessage,
@@ -166,7 +168,7 @@ import {
   worktreeNameFromPath,
   worktreeSlugForTicket,
   writeThread
-} from "./chunk-WZLV4WNS.js";
+} from "./chunk-K5EACGG2.js";
 import {
   createAgentStreamCoalescer
 } from "./chunk-AXQ4ZWHK.js";
@@ -451,9 +453,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-47G453ZU.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-I32EWKX3.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-ILHSVPOG.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-HKLVS26O.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -1607,6 +1609,23 @@ function denyPendingToolPermissions(threadId) {
   if (last) clearPrompt(threadId, last.id);
 }
 
+// src/threads/connected-orchestrator.ts
+function connectedOrchestrator(thread, find) {
+  if (isOrchestratorThread(thread)) return null;
+  const seen = /* @__PURE__ */ new Set();
+  let current = thread;
+  for (let hop = 0; hop < 6 && current; hop++) {
+    const parentId = current.parentThreadId?.trim();
+    if (!parentId || seen.has(parentId)) return null;
+    seen.add(parentId);
+    const parent = find(parentId);
+    if (!parent) return null;
+    if (isOrchestratorThread(parent)) return parent;
+    current = parent;
+  }
+  return null;
+}
+
 // src/orchestrator/notify-orchestrator.ts
 var MAX_NOTIFY_ORCHESTRATOR_MESSAGE_CHARS = 1500;
 var inputRequiredNotified = /* @__PURE__ */ new Set();
@@ -1659,22 +1678,25 @@ function resolveNotifyCallerThread(opts) {
   return running;
 }
 function skipReason(opts) {
-  if (!opts.child.parentThreadId) {
+  const parentId = opts.child.parentThreadId?.trim();
+  if (!parentId) {
     return "This chat has no orchestrator parent. notify_orchestrator is for worktree children of a Global chat.";
   }
-  if (!opts.parent) {
-    return "Parent orchestration chat was not found.";
-  }
-  if (opts.parent.status === "archived") {
+  if (opts.parent?.status === "archived") {
     return "Parent orchestration chat is archived.";
   }
+  if (!opts.parent) {
+    const immediate = readThread(parentId);
+    if (!immediate) return "Parent orchestration chat was not found.";
+    return "Parent is not a Global orchestration chat.";
+  }
   if (!isOrchestratorThread(opts.parent)) {
     return "Parent is not a Global orchestration chat.";
   }
   return "Cannot notify orchestrator.";
 }
 async function notifyOrchestrator(input) {
-  const parent = input.child.parentThreadId ? readThread(input.child.parentThreadId) : null;
+  const parent = connectedOrchestrator(input.child, (id) => readThread(id));
   if (!shouldNotifyOrchestrator({ child: input.child, parent })) {
     return { ok: false, error: skipReason({ child: input.child, parent }) };
   }
@@ -1981,20 +2003,7 @@ function threadCardBlockFields(group) {
   return block ? { blockedReason: block.reason, blockedSource: block.source } : null;
 }
 
-// src/board/home-board.ts
-var GLOBAL_WORKSPACE_ID = "__global__";
-function isHomeBoardThread(thread) {
-  if (thread.sourceType === "orchestration") return false;
-  if (thread.repoPath === GLOBAL_WORKSPACE_ID) return false;
-  return true;
-}
-var BOARD_COLUMN_DEFS = [
-  { id: "new", title: "New" },
-  { id: "draft", title: "Draft" },
-  { id: "review", title: "Review" },
-  { id: "done", title: "Merged" }
-];
-var HOME_BOARD_CACHE_TTL_MS = 15 * 60 * 1e3;
+// src/board/pr-state.ts
 function isOpenPrState(prUrl, prState) {
   if (!prUrl?.trim()) return false;
   const state = (prState ?? "OPEN").trim().toUpperCase();
@@ -2004,58 +2013,12 @@ function isMergedPrState(prUrl, prState) {
   if (!prUrl?.trim()) return false;
   return (prState ?? "").trim().toUpperCase() === "MERGED";
 }
-var DEFAULT_WORKTREE_SORT = "created";
-function groupCreatedAt(group) {
-  let min = group[0]?.createdAt ?? "";
-  for (const t of group) {
-    if (t.createdAt && t.createdAt < min) min = t.createdAt;
-  }
-  return min;
-}
-function groupUpdatedAt(group) {
-  let max = group[0]?.updatedAt ?? "";
-  for (const t of group) {
-    if (t.updatedAt && t.updatedAt > max) max = t.updatedAt;
-  }
-  return max;
-}
-function sortThreadsInWorktree(list) {
-  return [...list].sort((a, b) => {
-    const created = a.createdAt.localeCompare(b.createdAt);
-    if (created !== 0) return created;
-    return a.id.localeCompare(b.id);
-  });
-}
-function compareWorktreeGroups(a, b, mode, labelOf) {
-  if (mode === "name") {
-    const named = (labelOf?.(a) ?? a[0]?.id ?? "").localeCompare(
-      labelOf?.(b) ?? b[0]?.id ?? "",
-      void 0,
-      { sensitivity: "base" }
-    );
-    if (named !== 0) return named;
-  } else if (mode === "activity") {
-    const activity = groupUpdatedAt(b).localeCompare(groupUpdatedAt(a));
-    if (activity !== 0) return activity;
-  } else {
-    const created = groupCreatedAt(b).localeCompare(groupCreatedAt(a));
-    if (created !== 0) return created;
-  }
-  return (a[0]?.id ?? "").localeCompare(b[0]?.id ?? "");
-}
-function defaultWorktreeGroupLabel(group) {
-  return worktreeDisplayLabelForGroup(group);
-}
-function groupHomeBoardWorktrees(threads, sort = DEFAULT_WORKTREE_SORT, labelOf = defaultWorktreeGroupLabel) {
-  const map = /* @__PURE__ */ new Map();
-  for (const t of threads) {
-    const key = normalizeWorktreePath(t.worktreePath);
-    const list = map.get(key) ?? [];
-    list.push(t);
-    map.set(key, list);
-  }
-  return [...map.values()].map((list) => sortThreadsInWorktree(list)).sort((a, b) => compareWorktreeGroups(a, b, sort, labelOf));
+function isApprovedOpenPr(thread) {
+  if (!isOpenPrState(thread.prUrl, thread.prState) || thread.prIsDraft) return false;
+  return (thread.prReviewDecision ?? "").trim().toUpperCase() === "APPROVED";
 }
+
+// src/board/worktree-ownership.ts
 var DEFAULT_BOARD_OWNERSHIP = "all";
 function normalizeViewerLogin(login) {
   return (login ?? "").trim().toLowerCase();
@@ -2086,16 +2049,8 @@ function worktreeMatchesOwnership(group, filter, viewerLogin = "") {
   if (filter === "all") return true;
   return classifyWorktreeOwnership(group, viewerLogin) === filter;
 }
-function classifyWorktreeColumn(group) {
-  if (group.some((t) => isMergedPrState(t.prUrl, t.prState))) return "done";
-  if (group.some((t) => isOpenPrState(t.prUrl, t.prState) && !t.prIsDraft)) {
-    return "review";
-  }
-  if (group.some((t) => isOpenPrState(t.prUrl, t.prState) && t.prIsDraft)) {
-    return "draft";
-  }
-  return "new";
-}
+
+// src/board/worktree-list-badges.ts
 function labelsInclude(labels, name) {
   const want = name.trim().toLowerCase();
   if (!want) return false;
@@ -2134,34 +2089,169 @@ function groupPrLabels(group) {
   }
   return out;
 }
+function isClosedPrState(prUrl, prState) {
+  if (!prUrl?.trim()) return false;
+  return (prState ?? "").trim().toUpperCase() === "CLOSED";
+}
+function listBadge(id, title, conflict = false) {
+  return {
+    id,
+    label: id,
+    title: conflict ? `${title} \xB7 merge conflicts` : title,
+    mod: `is-${id}`,
+    ...conflict ? { conflict: true } : {}
+  };
+}
+function hasMergeConflict(thread) {
+  if (!isOpenPrState(thread.prUrl, thread.prState)) return false;
+  return classifyPrMergeIssue({
+    mergeable: thread.prMergeable ?? null,
+    mergeStateStatus: thread.prMergeStateStatus ?? null,
+    isInMergeQueue: thread.prIsInMergeQueue
+  }) === "conflicts";
+}
+function groupPrError(group) {
+  const open = group.filter(
+    (thread) => isOpenPrState(thread.prUrl, thread.prState) && !thread.prIsInMergeQueue
+  );
+  if (open.some(
+    (thread) => thread.prChecksFailed || mergeStateSuggestsCheckFailure({
+      mergeStateStatus: thread.prMergeStateStatus ?? null,
+      reviewDecision: thread.prReviewDecision ?? null
+    })
+  )) {
+    return { label: "failing", title: "Checks failing" };
+  }
+  if (open.some(
+    (thread) => !thread.prIsDraft && (thread.prReviewDecision ?? "").trim().toUpperCase() === "CHANGES_REQUESTED"
+  )) {
+    return { label: "changes", title: "Changes requested" };
+  }
+  return void 0;
+}
+function withPrError(badges, error, conflict) {
+  if (!error) return badges;
+  const [first] = badges;
+  if (!first) {
+    return [
+      {
+        id: "error",
+        label: error.label,
+        title: conflict ? `${error.title} \xB7 merge conflicts` : error.title,
+        mod: "is-error",
+        ...conflict ? { conflict: true } : {}
+      }
+    ];
+  }
+  return [{ ...first, error }];
+}
 function classifyWorktreeListBadges(group, viewerLogin = "", reviewLabel = "") {
   if (group.length === 0 || group.some((t) => t.cowboy)) return [];
+  if (group.some((t) => isMergedPrState(t.prUrl, t.prState))) {
+    return [listBadge("merged", "Merged")];
+  }
+  const conflict = group.some(hasMergeConflict);
+  const error = groupPrError(group);
+  const finish2 = (badges) => withPrError(badges, error, conflict);
+  if (group.some((t) => isApprovedOpenPr(t))) {
+    return finish2([listBadge("approved", "Approved, not merged", conflict)]);
+  }
   const open = group.filter((t) => isOpenPrState(t.prUrl, t.prState));
-  if (open.length === 0) return [];
+  if (open.length === 0) {
+    if (group.some((t) => isClosedPrState(t.prUrl, t.prState))) return [];
+    return finish2([listBadge("new", "No pull request")]);
+  }
   const ownership = classifyWorktreeOwnership(group, viewerLogin);
   if (ownership === "reviewing") {
-    return [
-      {
-        id: "review",
-        label: "review",
-        title: "Someone else's PR",
-        mod: "is-review"
-      }
-    ];
+    return finish2([listBadge("review", "Someone else's PR", conflict)]);
+  }
+  if (!normalizeViewerLogin(viewerLogin)) return finish2([]);
+  if (!open.some((t) => !t.prIsDraft)) {
+    return finish2([listBadge("draft", "Draft pull request", conflict)]);
   }
-  if (!normalizeViewerLogin(viewerLogin)) return [];
-  const draft = open.some((t) => t.prIsDraft);
   const readyLabel = reviewLabel.trim();
-  const inReview = readyLabel ? labelsInclude(groupPrLabels(group), readyLabel) : !draft;
-  if (!inReview) return [];
-  return [
-    {
-      id: "pending",
-      label: "pending",
-      title: "Waiting for review",
-      mod: "is-pending"
-    }
-  ];
+  const inReview = readyLabel ? labelsInclude(groupPrLabels(group), readyLabel) : true;
+  if (!inReview) return finish2([]);
+  return finish2([listBadge("pending", "Waiting for review", conflict)]);
+}
+
+// src/board/home-board.ts
+var GLOBAL_WORKSPACE_ID = "__global__";
+function isHomeBoardThread(thread) {
+  if (thread.sourceType === "orchestration") return false;
+  if (thread.repoPath === GLOBAL_WORKSPACE_ID) return false;
+  return true;
+}
+var BOARD_COLUMN_DEFS = [
+  { id: "new", title: "New" },
+  { id: "draft", title: "Draft" },
+  { id: "review", title: "Review" },
+  { id: "approved", title: "Approved" },
+  { id: "done", title: "Merged" }
+];
+var HOME_BOARD_CACHE_TTL_MS = 15 * 60 * 1e3;
+var DEFAULT_WORKTREE_SORT = "created";
+function groupCreatedAt(group) {
+  let min = group[0]?.createdAt ?? "";
+  for (const t of group) {
+    if (t.createdAt && t.createdAt < min) min = t.createdAt;
+  }
+  return min;
+}
+function groupUpdatedAt(group) {
+  let max = group[0]?.updatedAt ?? "";
+  for (const t of group) {
+    if (t.updatedAt && t.updatedAt > max) max = t.updatedAt;
+  }
+  return max;
+}
+function sortThreadsInWorktree(list) {
+  return [...list].sort((a, b) => {
+    const created = a.createdAt.localeCompare(b.createdAt);
+    if (created !== 0) return created;
+    return a.id.localeCompare(b.id);
+  });
+}
+function compareWorktreeGroups(a, b, mode, labelOf) {
+  if (mode === "name") {
+    const named = (labelOf?.(a) ?? a[0]?.id ?? "").localeCompare(
+      labelOf?.(b) ?? b[0]?.id ?? "",
+      void 0,
+      { sensitivity: "base" }
+    );
+    if (named !== 0) return named;
+  } else if (mode === "activity") {
+    const activity = groupUpdatedAt(b).localeCompare(groupUpdatedAt(a));
+    if (activity !== 0) return activity;
+  } else {
+    const created = groupCreatedAt(b).localeCompare(groupCreatedAt(a));
+    if (created !== 0) return created;
+  }
+  return (a[0]?.id ?? "").localeCompare(b[0]?.id ?? "");
+}
+function defaultWorktreeGroupLabel(group) {
+  return worktreeDisplayLabelForGroup(group);
+}
+function groupHomeBoardWorktrees(threads, sort = DEFAULT_WORKTREE_SORT, labelOf = defaultWorktreeGroupLabel) {
+  const map = /* @__PURE__ */ new Map();
+  for (const t of threads) {
+    const key = normalizeWorktreePath(t.worktreePath);
+    const list = map.get(key) ?? [];
+    list.push(t);
+    map.set(key, list);
+  }
+  return [...map.values()].map((list) => sortThreadsInWorktree(list)).sort((a, b) => compareWorktreeGroups(a, b, sort, labelOf));
+}
+function classifyWorktreeColumn(group) {
+  if (group.some((t) => isMergedPrState(t.prUrl, t.prState))) return "done";
+  if (group.some((t) => isApprovedOpenPr(t))) return "approved";
+  if (group.some((t) => isOpenPrState(t.prUrl, t.prState) && !t.prIsDraft)) {
+    return "review";
+  }
+  if (group.some((t) => isOpenPrState(t.prUrl, t.prState) && t.prIsDraft)) {
+    return "draft";
+  }
+  return "new";
 }
 function normalizeIssueKey(value) {
   return value.trim().toLowerCase().replace(/^#/, "");
@@ -2401,9 +2491,9 @@ var BOARD_PAGE_SIZE = 40;
 function tokenizeQuery(query) {
   return query.trim().toLowerCase().split(/\s+/).filter(Boolean);
 }
-function haystackMatches(haystack, tokens) {
+function haystackMatches(haystack2, tokens) {
   if (tokens.length === 0) return true;
-  const h = haystack.toLowerCase();
+  const h = haystack2.toLowerCase();
   return tokens.every((token) => h.includes(token));
 }
 function prAuthorLogin(pr) {
@@ -2471,6 +2561,7 @@ function emptyColumns() {
     new: [],
     draft: [],
     review: [],
+    approved: [],
     done: []
   };
 }
@@ -2482,6 +2573,7 @@ function emptyHidden() {
     new: 0,
     draft: 0,
     review: 0,
+    approved: 0,
     done: 0
   };
 }
@@ -2550,6 +2642,7 @@ function assembleHomeBoard(input) {
     new: 0,
     draft: 0,
     review: 0,
+    approved: 0,
     done: 0,
     tickets: 0,
     prs: 0,
@@ -2562,6 +2655,7 @@ function assembleHomeBoard(input) {
     new: [],
     draft: [],
     review: [],
+    approved: [],
     done: []
   };
   for (const group of groupHomeBoardWorktrees(live)) {
@@ -2596,7 +2690,7 @@ function assembleHomeBoard(input) {
   }
   return { columns, hidden, totals };
 }
-var HOME_BOARD_AGENT_HINT = "Home is a Kanban of workspaces (one card per checkout; sibling chats on a card are separate agents). Do not create a second workspace for a ticket, PR, or named branch that already has a live checkout \u2014 create_workspace / start_board_card return that checkout (alreadyStarted) and its chats. Add another agent with fork_chat. Creating from the default branch still opens a new isolated workspace. Columns are the path to merge: New (no PR) \u2192 Draft (draft PR) \u2192 Review (open PR) \u2192 Merged. ownership=mine is PRs you authored (or WIP with no PR); ownership=reviewing is someone else's PR (or a review-requested checkout). Viewer login comes from gh, not a setting. Archive removes the card to Settings \u2192 History. Queued/running are activity on the card, not columns. blockedReason means an agent on that card is waiting on a person (the question, plan approval, or a reported block) \u2014 read it and do not send_to_chat a check-in. Orchestration chats stay in the sidebar. Do not invent status.";
+var HOME_BOARD_AGENT_HINT = "Home is a Kanban of workspaces (one card per checkout; sibling chats on a card are separate agents). Do not create a second workspace for a ticket, PR, or named branch that already has a live checkout \u2014 create_workspace / start_board_card return that checkout (alreadyStarted) and its chats. Add another agent with fork_chat. Creating from the default branch still opens a new isolated workspace. Columns are the path to merge: New (no PR) \u2192 Draft (draft PR) \u2192 Review (open PR) \u2192 Approved (approved, not merged) \u2192 Merged. ownership=mine is PRs you authored (or WIP with no PR); ownership=reviewing is someone else's PR (or a review-requested checkout). Viewer login comes from gh, not a setting. Archive removes the card to Settings \u2192 History (list_archive to browse, restore_workspace to bring it back). Queued/running are activity on the card, not columns. blockedReason means an agent on that card is waiting on a person (the question, plan approval, or a reported block) \u2014 read it and do not send_to_chat a check-in. Orchestration chats stay in the sidebar. Do not invent status.";
 
 // src/threads/workspace-tags.ts
 function workspaceTagTargetRef(opts) {
@@ -2872,7 +2966,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-ICHYDSCD.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-IVKPCK56.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2904,6 +2998,271 @@ function shouldRemoveWorktreeOnTeardown(thread) {
   return !isCowboyThread(thread) && !isPrimaryCheckoutThread(thread);
 }
 
+// src/archive/fleet-archive.ts
+import { basename as basename2 } from "path";
+var DEFAULT_LIMIT = 40;
+var MAX_LIMIT = 250;
+function oneLine(value) {
+  return value.replace(/\s+/g, " ").trim();
+}
+function stampOf(thread) {
+  return thread.archivedAt?.trim() || thread.updatedAt || thread.createdAt || "";
+}
+function repoLabel(thread) {
+  if (isOrchestratorThread(thread)) return "Orchestration";
+  const path = thread.repoPath?.trim() ?? "";
+  return path && basename2(path) || path || "project";
+}
+function toAgent(thread, flags) {
+  const prUrl = thread.prUrl?.trim();
+  return {
+    id: thread.id,
+    title: thread.title?.trim() || "Untitled",
+    agent: thread.agent,
+    repo: repoLabel(thread),
+    branch: thread.branchName ?? "",
+    sourceType: thread.sourceType,
+    sourceRef: thread.sourceRef,
+    archivedAt: stampOf(thread),
+    ...prUrl ? { prUrl } : {},
+    ...flags?.workspaceLive ? { workspaceLive: true } : {},
+    ...flags?.workspaceArchived ? { workspaceArchived: true } : {}
+  };
+}
+function checkoutKey(thread) {
+  return thread.worktreePath?.trim() ? normalizeWorktreePath(thread.worktreePath) : "";
+}
+function liveCheckoutKeys(threads) {
+  const keys = /* @__PURE__ */ new Set();
+  for (const thread of threads) {
+    if (thread.status === "archived" || isOrchestratorThread(thread)) continue;
+    const key = checkoutKey(thread);
+    if (key) keys.add(key);
+  }
+  return keys;
+}
+function workspaceFrom(agents) {
+  const ordered = [...agents].sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+  const primary = ordered[0];
+  const rows = ordered.map((thread) => toAgent(thread));
+  const archivedAt = rows.reduce(
+    (latest, row) => row.archivedAt > latest ? row.archivedAt : latest,
+    ""
+  );
+  const prUrl = ordered.map((thread) => thread.prUrl?.trim()).find(Boolean);
+  return {
+    id: primary.id,
+    title: primary.title?.trim() || "Untitled",
+    repo: repoLabel(primary),
+    branch: primary.branchName ?? "",
+    sourceType: primary.sourceType,
+    sourceRef: primary.sourceRef,
+    archivedAt,
+    ...prUrl ? { prUrl } : {},
+    ...ordered.some((thread) => thread.cowboy) ? { cowboy: true } : {},
+    agents: rows
+  };
+}
+function haystack(parts) {
+  return parts.filter(Boolean).join(" ").toLowerCase();
+}
+function agentHay(agent) {
+  return haystack([
+    agent.id,
+    agent.title,
+    agent.agent,
+    agent.repo,
+    agent.branch,
+    agent.sourceType,
+    agent.sourceRef,
+    agent.prUrl
+  ]);
+}
+function workspaceMatches(workspace, query) {
+  if (!query) return true;
+  const own = haystack([
+    workspace.id,
+    workspace.title,
+    workspace.repo,
+    workspace.branch,
+    workspace.sourceType,
+    workspace.sourceRef,
+    workspace.prUrl
+  ]);
+  if (own.includes(query)) return true;
+  return workspace.agents.some((agent) => agentHay(agent).includes(query));
+}
+function clampLimit(limit) {
+  if (limit == null || !Number.isFinite(limit)) return DEFAULT_LIMIT;
+  return Math.min(MAX_LIMIT, Math.max(1, Math.floor(limit)));
+}
+function listFleetArchive(threads, opts) {
+  const query = opts?.query?.trim().toLowerCase() ?? "";
+  const kind = opts?.kind ?? "all";
+  const limit = clampLimit(opts?.limit);
+  const liveKeys = liveCheckoutKeys(threads);
+  const archived = threads.filter((thread) => thread.status === "archived");
+  const groups = /* @__PURE__ */ new Map();
+  const loose = [];
+  for (const thread of archived) {
+    const key = checkoutKey(thread);
+    if (!key || isOrchestratorThread(thread) || liveKeys.has(key)) {
+      loose.push(thread);
+      continue;
+    }
+    const group = groups.get(key) ?? [];
+    group.push(thread);
+    groups.set(key, group);
+  }
+  const rows = [];
+  if (kind !== "agent") {
+    for (const group of groups.values()) {
+      const workspace = workspaceFrom(group);
+      if (!workspaceMatches(workspace, query)) continue;
+      rows.push({ kind: "workspace", stamp: workspace.archivedAt, workspace });
+    }
+  }
+  if (kind !== "workspace") {
+    const pool = kind === "agent" ? archived : loose;
+    for (const thread of pool) {
+      const key = checkoutKey(thread);
+      const orchestration = isOrchestratorThread(thread);
+      const agent = toAgent(thread, {
+        workspaceLive: Boolean(key) && !orchestration && liveKeys.has(key),
+        workspaceArchived: Boolean(key) && !orchestration && !liveKeys.has(key)
+      });
+      if (query && !agentHay(agent).includes(query)) continue;
+      rows.push({ kind: "agent", stamp: agent.archivedAt, agent });
+    }
+  }
+  rows.sort((a, b) => {
+    if (a.stamp !== b.stamp) return a.stamp < b.stamp ? 1 : -1;
+    const idA = a.kind === "workspace" ? a.workspace.id : a.agent.id;
+    const idB = b.kind === "workspace" ? b.workspace.id : b.agent.id;
+    return idA.localeCompare(idB);
+  });
+  const page = rows.slice(0, limit);
+  return {
+    rows: page,
+    shown: page.length,
+    hidden: Math.max(0, rows.length - page.length),
+    total: rows.length,
+    query
+  };
+}
+function archivedAgentsOnCheckout(threads, worktreePath) {
+  const key = worktreePath.trim() ? normalizeWorktreePath(worktreePath) : "";
+  if (!key) return [];
+  return threads.filter(
+    (thread) => thread.status === "archived" && !isOrchestratorThread(thread) && Boolean(thread.worktreePath?.trim()) && normalizeWorktreePath(thread.worktreePath) === key
+  ).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+}
+function formatWorkspaceLine(workspace) {
+  const bits = [
+    workspace.id.slice(0, 8),
+    "workspace",
+    workspace.repo,
+    workspace.branch ? `branch:${workspace.branch}` : "",
+    workspace.sourceType && workspace.sourceRef ? `${workspace.sourceType}:${workspace.sourceRef}` : "",
+    `agents:${workspace.agents.length}`,
+    workspace.cowboy ? "cowboy" : "",
+    workspace.prUrl ?? "",
+    workspace.archivedAt ? `archived:${workspace.archivedAt}` : "",
+    oneLine(workspace.title)
+  ].filter(Boolean);
+  return bits.join("  ");
+}
+function formatAgentLine(agent) {
+  const bits = [
+    agent.id.slice(0, 8),
+    "agent",
+    agent.repo,
+    agent.agent,
+    agent.branch ? `branch:${agent.branch}` : "",
+    agent.sourceType && agent.sourceRef ? `${agent.sourceType}:${agent.sourceRef}` : "",
+    agent.workspaceLive ? "workspace-live" : "",
+    agent.workspaceArchived ? "workspace-archived" : "",
+    agent.prUrl ?? "",
+    agent.archivedAt ? `archived:${agent.archivedAt}` : "",
+    oneLine(agent.title),
+    `sideboard://chat/${agent.id}`
+  ].filter(Boolean);
+  return bits.join("  ");
+}
+function formatFleetArchive(view) {
+  if (view.total === 0) {
+    return view.query ? "(no archive matches)" : "(archive empty)";
+  }
+  const lines = [
+    `${view.shown} shown, ${view.hidden} hidden. restore_workspace <id> brings that checkout and every archived agent back. restore_chat <id> brings one agent back.`
+  ];
+  for (const row of view.rows) {
+    if (row.kind === "workspace") {
+      lines.push(formatWorkspaceLine(row.workspace));
+      for (const agent of row.workspace.agents) {
+        lines.push(
+          `  ${agent.id.slice(0, 8)}  ${agent.agent}  ${oneLine(agent.title)}  sideboard://chat/${agent.id}`
+        );
+      }
+      continue;
+    }
+    lines.push(formatAgentLine(row.agent));
+  }
+  return lines.join("\n");
+}
+
+// src/orchestrator/workspace-archive.ts
+function requireHostThread(host, ref) {
+  const thread = host.getThread(ref);
+  if (!thread) throw new Error(`Thread not found: ${ref}`);
+  return thread;
+}
+async function archiveWorkspaceAgents(host, threadRef) {
+  const thread = requireHostThread(host, threadRef);
+  if (isOrchestratorThread(thread)) {
+    throw new Error("Orchestration chats are agents, not workspaces. Use archive_chat.");
+  }
+  if (!thread.worktreePath?.trim()) {
+    throw new Error("Chat has no workspace checkout. Use archive_chat.");
+  }
+  const chats = threadsSharingWorktree(thread.worktreePath);
+  if (chats.length === 0) {
+    throw new Error(
+      "That workspace is already archived. Use list_archive, then restore_workspace to bring it back."
+    );
+  }
+  const archived = [];
+  for (const chat of chats) {
+    archived.push(await host.archive(chat.id));
+  }
+  return archived;
+}
+async function restoreWorkspaceAgents(host, threadRef) {
+  const thread = requireHostThread(host, threadRef);
+  if (isOrchestratorThread(thread)) {
+    throw new Error("Orchestration chats are agents, not workspaces. Use restore_chat.");
+  }
+  if (!thread.worktreePath?.trim()) {
+    throw new Error("Chat has no workspace checkout. Use restore_chat.");
+  }
+  const targets = archivedAgentsOnCheckout(
+    listThreads({ includeArchived: true }),
+    thread.worktreePath
+  );
+  const restored = [];
+  for (const chat of targets) {
+    const latest = readThread(chat.id);
+    if (!latest || latest.status !== "archived") continue;
+    restored.push(await host.restore(latest.id));
+  }
+  if (restored.length === 0) {
+    throw new Error(
+      "No archived agents on this workspace. list_archive shows what can be restored."
+    );
+  }
+  return restored;
+}
+
 // src/util/line-coalescer.ts
 function createLineCoalescer(onChunk, opts) {
   const delayMs = opts?.delayMs ?? 50;
@@ -3383,7 +3742,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { addWorkspace: addWorkspace2 } = await import("./workspaces-WGZPRQJX.js");
+  const { addWorkspace: addWorkspace2 } = await import("./workspaces-ATMIKXLK.js");
   await addWorkspace2(repoPath);
   const { ensureWorktreeSideboardIgnored } = await import("./worktree-exclude-RXZPTCNH.js");
   await ensureWorktreeSideboardIgnored(input.worktreePath);
@@ -5435,6 +5794,16 @@ function formatWorktreeDirective(thread, opts) {
   lines.push(formatProcessGuideDirective({ worktreePath: thread.worktreePath }));
   return lines.join("\n");
 }
+function formatConnectedOrchestratorReminder(parent) {
+  if (!parent) return null;
+  const title = parent.title?.trim() || "Orchestration";
+  const archived = parent.status === "archived" ? " This orchestrator is archived." : "";
+  return `Connected orchestrator: "${title}" (${parent.agent}, ${parent.status}). Open [${title}](sideboard://chat/${parent.id}). notify_orchestrator wakes that chat. You are not the orchestrator.${archived}`;
+}
+function connectedOrchestratorTurnReminder(thread, find) {
+  if (thread.agent === "brightsy" || isOrchestratorThread(thread)) return null;
+  return formatConnectedOrchestratorReminder(connectedOrchestrator(thread, find));
+}
 function formatWorktreeReminder() {
   return "Sideboard workspace: stay in this cwd for all file and git work. Push and open PRs against origin, never upstream. Do not edit the main repo checkout. If a goal is given (Greptile 5/5, CI green), watch-fix-push until it lands \u2014 do not watch after every push. Schedules: create_schedule (at / every / cron; chatId=self for this chat). set_workspace_tags updates labels on this workspace (omit ref).";
 }
@@ -6302,7 +6671,7 @@ function formatScheduledPrompt(name, prompt) {
 ${prompt}`;
 }
 async function defaultDeps() {
-  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-ZQU62CES.js");
+  const { getOrchestrator: getOrchestrator2, startOrchestration: startOrchestration2 } = await import("./orchestrator-ESLNXVOX.js");
   const orch = getOrchestrator2();
   return {
     findThread: (id) => findThreadByRef(id),
@@ -7374,6 +7743,7 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
       );
       const turnReminders = [
         worktreeReminder,
+        connectedOrchestratorTurnReminder(thread, (id) => readThread(id)),
         optionalServicesReminder,
         issueToolsReminder,
         reviewWriteGateReminder,
@@ -8971,14 +9341,16 @@ ${formatEnvReminder(projectNameForRepoPath(thread.repoPath || thread.worktreePat
     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);
   }
+  archiveWorkspace(threadRef) {
+    return archiveWorkspaceAgents(this, threadRef);
+  }
+  restoreWorkspace(threadRef) {
+    return restoreWorkspaceAgents(this, threadRef);
+  }
   async archive(threadRef) {
     const thread = this.requireThread(threadRef);
     return this.enqueueWorktreeTeardown(thread, () => this.archiveUnlocked(threadRef));
@@ -9174,7 +9546,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-3MF5J5XZ.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-RMYXBTJG.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return orch.createThread({
@@ -9184,7 +9556,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-SADLLKRE.js");
+  const { updateThread: upd } = await import("./thread-store-WXLXKDVN.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal
@@ -9204,14 +9576,14 @@ export {
   worktreeBoardStatus,
   visibleAgentBlock,
   worktreeAgentBlock,
+  reviewLabelForRepo,
+  classifyWorktreeListBadges,
   isHomeBoardThread,
   BOARD_COLUMN_DEFS,
   HOME_BOARD_CACHE_TTL_MS,
   DEFAULT_WORKTREE_SORT,
   groupHomeBoardWorktrees,
   classifyWorktreeColumn,
-  reviewLabelForRepo,
-  classifyWorktreeListBadges,
   dedupeBoardIssues,
   issueNeedsWorkspacePick,
   isAccountWideIssueSource,
@@ -9273,6 +9645,7 @@ export {
   shouldRunHistoryCleanup,
   applyThreadIntoMain,
   cloneRepoIntoSideboard,
+  connectedOrchestrator,
   formatAskUserNotifyMessage,
   formatNotifyOrchestratorPrompt,
   shouldNotifyOrchestrator,
@@ -9296,6 +9669,8 @@ export {
   isCowboyThread,
   isPrimaryCheckoutThread,
   shouldRemoveWorktreeOnTeardown,
+  listFleetArchive,
+  formatFleetArchive,
   readTurnLiveParts,
   readTurnLive,
   shouldStampSetupLastError,
@@ -9351,6 +9726,8 @@ export {
   localhostPreviewUrl,
   formatDevAccessHint,
   formatWorktreeDirective,
+  formatConnectedOrchestratorReminder,
+  connectedOrchestratorTurnReminder,
   formatWorktreeReminder,
   mentionsPrGoal,
   issueTicketFromThread,