@sideboard-ai/core 0.1.60 → 0.1.62

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-2P2UK7E7.js";
+} from "./chunk-46KMKHSD.js";
 import {
   CLOUD_COORDINATOR_BUSY_REPLY,
   CLOUD_COORDINATOR_STOPPED_REPLY,
@@ -24,7 +24,7 @@ import {
   orchestratorSessionPoisonedByBuiltins,
   parseForceStopMessage,
   takenTeamSlugsForOrchestration
-} from "./chunk-MLAST5BB.js";
+} from "./chunk-DXTGDXO2.js";
 import {
   BRIGHTSY_MCP_ALLOWED_TOOLS,
   CLAUDE_MODEL_CATALOG,
@@ -70,7 +70,7 @@ import {
   resolveQuotaFallbackAgent,
   sanitizeMcpServerName,
   writeInjectedMcpConfig
-} from "./chunk-ZXDOI6IH.js";
+} from "./chunk-ZF5YJCXO.js";
 import {
   ORCHESTRATOR_AGENT_KINDS,
   assertOrchestratorCapableAgent,
@@ -118,11 +118,12 @@ import {
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd,
   formatWorkspaceInventory
-} from "./chunk-XWPKLRB3.js";
+} from "./chunk-27MAWNKY.js";
 import {
   HARNESS_ENV_KEYS,
   appSettingsPath,
   applyAppEnvironment,
+  autoArchiveOnMergeEnabled,
   autoCleanupOrphansEnabled,
   autoRenameBranchEnabled,
   autoRunAfterSetupEnabled,
@@ -157,7 +158,7 @@ import {
   updateClaudeSettings,
   updateDefaultsSettings,
   updateIntegrationsSettings
-} from "./chunk-75QR74KM.js";
+} from "./chunk-6CUJQKTJ.js";
 import {
   FAMOUS_SOCCER_TEAMS,
   addPrStackLayer,
@@ -220,7 +221,7 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-P7EQUFB6.js";
+} from "./chunk-UGXSSBFJ.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -240,7 +241,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-TSRXOSVD.js";
+} from "./chunk-FWJYLBO6.js";
 import {
   THINKING_EFFORTS,
   isThinkingEffort,
@@ -706,9 +707,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-TMMAVRVW.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("./global-workspace-LALWQWRJ.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-LNWHZ64D.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("./coordinator-prompt-N2R6FGZK.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -2978,7 +2979,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("./agents-B2723EOF.js");
+  const { getAdapter: getAdapter2 } = await import("./agents-QLSFIQAO.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -3022,6 +3023,8 @@ function worktreeBindingFrom(from) {
     parentThreadId: from.parentThreadId,
     prUrl: from.prUrl,
     prTitle: from.prTitle,
+    prState: from.prState,
+    skipAutoArchiveOnMerge: from.skipAutoArchiveOnMerge,
     stackId: from.stackId,
     stackLayer: from.stackLayer
   };
@@ -3519,7 +3522,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-3GO3EDQG.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-VCAIHVIE.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -3721,6 +3724,20 @@ async function importConductorWorkspaceAsync(workspaceId) {
 import { EventEmitter } from "events";
 import { existsSync as existsSync13 } from "fs";
 
+// src/git/pr-merge-archive.ts
+function normalizePrState(state) {
+  return (state ?? "").trim().toUpperCase();
+}
+function shouldAutoArchiveOnPrMerge(opts) {
+  if (!opts.autoArchiveEnabled) return false;
+  if (opts.isGlobal) return false;
+  if (opts.skipAutoArchiveOnMerge) return false;
+  if (opts.threadStatus === "archived") return false;
+  const next = normalizePrState(opts.nextPrState);
+  if (next !== "MERGED") return false;
+  return normalizePrState(opts.previousPrState) !== "MERGED";
+}
+
 // src/git/orphan-cleanup.ts
 import { existsSync as existsSync10, readdirSync as readdirSync4, statSync as statSync5 } from "fs";
 import { join as join8 } from "path";
@@ -4456,7 +4473,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled: autoCleanupOrphansEnabled2 } = await import("./app-settings-TBHTJWLQ.js");
+      const { autoCleanupOrphansEnabled: autoCleanupOrphansEnabled2 } = await import("./app-settings-HK4KAM4R.js");
       if (autoCleanupOrphansEnabled2() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -4613,7 +4630,7 @@ var Orchestrator = class {
   }
   async finishCreateThread(threadId, prompt) {
     await this.runSetupAfterCreate(threadId);
-    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await import("./app-settings-TBHTJWLQ.js");
+    const { autoRunAfterSetupEnabled: autoRunAfterSetupEnabled2 } = await import("./app-settings-HK4KAM4R.js");
     if (autoRunAfterSetupEnabled2()) {
       try {
         await this.startDev(threadId);
@@ -4884,7 +4901,7 @@ var Orchestrator = class {
     });
     const artifactDirective = isBrightsy ? null : formatArtifactDirective();
     const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-    const { autoRenameBranchEnabled: autoRenameBranchEnabled2 } = await import("./app-settings-TBHTJWLQ.js");
+    const { autoRenameBranchEnabled: autoRenameBranchEnabled2 } = await import("./app-settings-HK4KAM4R.js");
     const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled2() ? formatRenameBranchDirective(fresh, {
       customPrompt: settings?.prompts?.renameBranch
     }) : null;
@@ -5520,10 +5537,19 @@ var Orchestrator = class {
     this.assertNotGlobal(thread, "Merge PR");
     if (!selector) throw new Error("No pull request linked to this thread");
     const result = await mergePr(cwd, selector);
-    if (result.url && result.url !== thread.prUrl) {
-      updateThread(thread.id, { prUrl: result.url });
-    }
-    return result;
+    const state = normalizePrState(result.state) || "MERGED";
+    const metaLike = {
+      number: 0,
+      title: thread.prTitle ?? thread.title,
+      url: result.url || thread.prUrl || "",
+      state,
+      isDraft: false,
+      reviewDecision: null,
+      baseRefName: "",
+      headRefName: ""
+    };
+    await this.persistPrMetaAndMaybeArchive(thread, metaLike);
+    return { url: metaLike.url, state };
   }
   /** Resolve PR selector and optionally persist `prUrl` when found. */
   async withPrSelector(threadRef) {
@@ -5545,19 +5571,55 @@ var Orchestrator = class {
     if (!selector) return null;
     const meta = await getPrMeta(cwd, selector);
     if (meta) {
-      const patch = {};
-      if (meta.url && meta.url !== thread.prUrl) patch.prUrl = meta.url;
-      if (meta.title && meta.title !== thread.prTitle) patch.prTitle = meta.title;
-      if (Object.keys(patch).length > 0) {
-        updateThread(thread.id, patch);
-        const latest = this.requireThread(thread.id);
-        if (!latest.userSetTitle && meta.title && latest.title !== meta.title) {
-          updateThread(thread.id, { title: meta.title });
-        }
-      }
+      await this.persistPrMetaAndMaybeArchive(thread, meta);
     }
     return meta;
   }
+  /**
+   * Persist PR URL/title/state and Conductor-style auto-archive when the PR
+   * first becomes MERGED.
+   */
+  async persistPrMetaAndMaybeArchive(thread, meta) {
+    const prevState = normalizePrState(thread.prState);
+    const nextState = normalizePrState(meta.state);
+    const patch = {};
+    if (meta.url && meta.url !== thread.prUrl) patch.prUrl = meta.url;
+    if (meta.title && meta.title !== thread.prTitle) patch.prTitle = meta.title;
+    if (nextState && nextState !== prevState) patch.prState = nextState;
+    if (thread.skipAutoArchiveOnMerge && nextState && nextState !== "MERGED" && nextState !== "CLOSED") {
+      patch.skipAutoArchiveOnMerge = false;
+    }
+    if (Object.keys(patch).length > 0) {
+      updateThread(thread.id, patch);
+      const latest2 = this.requireThread(thread.id);
+      if (!latest2.userSetTitle && meta.title && latest2.title !== meta.title) {
+        updateThread(thread.id, { title: meta.title });
+      }
+    }
+    const { autoArchiveOnMergeEnabled: autoArchiveOnMergeEnabled2 } = await import("./app-settings-HK4KAM4R.js");
+    const latest = this.requireThread(thread.id);
+    if (!shouldAutoArchiveOnPrMerge({
+      previousPrState: prevState || null,
+      nextPrState: nextState,
+      threadStatus: latest.status,
+      skipAutoArchiveOnMerge: latest.skipAutoArchiveOnMerge,
+      autoArchiveEnabled: autoArchiveOnMergeEnabled2(),
+      isGlobal: isGlobalThread(latest)
+    })) {
+      return;
+    }
+    const siblings = threadsSharingWorktree(latest.worktreePath);
+    for (const t of siblings) {
+      const sibPatch = { prState: "MERGED" };
+      if (meta.url && meta.url !== t.prUrl) sibPatch.prUrl = meta.url;
+      if (meta.title && meta.title !== t.prTitle) sibPatch.prTitle = meta.title;
+      if (Object.keys(sibPatch).length > 0) updateThread(t.id, sibPatch);
+    }
+    for (const t of siblings) {
+      if (this.requireThread(t.id).status === "archived") continue;
+      await this.archive(t.id);
+    }
+  }
   async getPrStack(threadRef) {
     const thread = this.requireThread(threadRef);
     if (!thread.worktreePath?.trim()) return null;
@@ -5735,7 +5797,9 @@ var Orchestrator = class {
     const thread = this.requireThread(threadRef);
     this.stop(thread.id);
     if (isGlobalThread(thread)) {
-      return setStatus(thread.id, "archived");
+      const archived2 = setStatus(thread.id, "archived");
+      this.emit({ type: "status_changed", threadId: archived2.id, status: "archived" });
+      return archived2;
     }
     const siblings = threadsSharingWorktree(thread.worktreePath).filter((t) => t.id !== thread.id);
     if (siblings.length === 0) {
@@ -5753,9 +5817,10 @@ var Orchestrator = class {
       await removeWorktree(thread.repoPath, thread.worktreePath);
     }
     const archived = setStatus(thread.id, "archived");
+    this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
-        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-3GO3EDQG.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("./workspaces-VCAIHVIE.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -5776,7 +5841,7 @@ var Orchestrator = class {
         await runArchiveScript(thread.repoPath, thread.worktreePath);
       } catch {
       }
-      const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await import("./app-settings-TBHTJWLQ.js");
+      const { deleteBranchOnPurgeEnabled: deleteBranchOnPurgeEnabled2 } = await import("./app-settings-HK4KAM4R.js");
       const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled2();
       await removeWorktree(thread.repoPath, thread.worktreePath, {
         deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -5792,10 +5857,12 @@ var Orchestrator = class {
     if (isGlobalThread(thread)) {
       const { globalAgentCwd: globalAgentCwd2 } = await import("./paths-VPH3ITBK.js");
       updateThread(thread.id, { worktreePath: globalAgentCwd2() });
-      return setStatus(thread.id, "idle");
+      const restored2 = setStatus(thread.id, "idle");
+      this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
+      return restored2;
     }
     if (!existsSync13(thread.worktreePath)) {
-      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-GBLHEFHR.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("./worktree-MV4WRW6G.js");
       const { execa: execa6 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
@@ -5805,7 +5872,31 @@ var Orchestrator = class {
       void createThreadWorktree2;
       void slug;
     }
-    return setStatus(thread.id, "idle");
+    const restorePatch = {};
+    let alreadyMerged = normalizePrState(thread.prState) === "MERGED";
+    if (!alreadyMerged && thread.prUrl?.trim() && thread.worktreePath?.trim()) {
+      try {
+        const selector = resolvePrSelector(thread);
+        if (selector) {
+          const meta = await getPrMeta(thread.worktreePath, selector);
+          if (meta) {
+            const state = normalizePrState(meta.state);
+            if (meta.url && meta.url !== thread.prUrl) restorePatch.prUrl = meta.url;
+            if (meta.title && meta.title !== thread.prTitle) restorePatch.prTitle = meta.title;
+            if (state) restorePatch.prState = state;
+            if (state === "MERGED") alreadyMerged = true;
+          }
+        }
+      } catch {
+      }
+    }
+    if (alreadyMerged) restorePatch.skipAutoArchiveOnMerge = true;
+    if (Object.keys(restorePatch).length > 0) {
+      updateThread(thread.id, restorePatch);
+    }
+    const restored = setStatus(thread.id, "idle");
+    this.emit({ type: "status_changed", threadId: restored.id, status: restored.status });
+    return restored;
   }
   async attachCommand(threadRef) {
     const thread = this.requireThread(threadRef);
@@ -5880,7 +5971,7 @@ async function startOrchestration(opts) {
     sourceRef: "default",
     ...createOpts
   }).catch(async () => {
-    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-GBLHEFHR.js");
+    const { resolveDefaultBranch: resolveDefaultBranch2, resolveRepoRoot: resolveRepoRoot2 } = await import("./worktree-MV4WRW6G.js");
     const repo = await resolveRepoRoot2(repoPath);
     const def = await resolveDefaultBranch2(repo);
     return createThread({
@@ -5890,7 +5981,7 @@ async function startOrchestration(opts) {
       repoPath: repo
     });
   });
-  const { updateThread: upd } = await import("./thread-store-UJIGMI5J.js");
+  const { updateThread: upd } = await import("./thread-store-XTPFCJAI.js");
   const updated = upd(thread.id, {
     sourceType: "orchestration",
     sourceRef: goal
@@ -6036,7 +6127,7 @@ function withTimeout(promise, ms, label) {
 async function startMcpServer() {
   const orch = getOrchestrator();
   try {
-    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-TBHTJWLQ.js");
+    const { maxConcurrentAgents: maxConcurrentAgents2 } = await import("./app-settings-HK4KAM4R.js");
     orch.setMaxConcurrent(maxConcurrentAgents2());
   } catch {
   }
@@ -6247,7 +6338,7 @@ async function startMcpServer() {
       return { content: [{ type: "text", text: JSON.stringify(payload) }] };
     }
   );
-  const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-TBHTJWLQ.js");
+  const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults: resolveThreadDefaults2 } = await import("./app-settings-HK4KAM4R.js");
   const accountDefaults = resolveThreadDefaults2();
   const accountDefaultsHint = `Account defaults: agent=${accountDefaults.agent}, model=${accountDefaults.model?.trim() || "Auto"}, effort=${accountDefaults.effort}`;
   server.tool(
@@ -6286,7 +6377,7 @@ async function startMcpServer() {
         parent = null;
       }
       if (parentId) {
-        const children = orch.getThreads(true).filter((t) => t.parentThreadId === parentId);
+        const children = orch.getThreads(false).filter((t) => t.parentThreadId === parentId);
         if (children.length >= MAX_ORCH_THREADS) {
           return {
             content: [
@@ -7367,6 +7458,7 @@ export {
   attachmentsFromBuffers,
   attachmentsFromWorktreePaths,
   attachmentsGitignoreBody,
+  autoArchiveOnMergeEnabled,
   autoCleanupOrphansEnabled,
   autoRenameBranchEnabled,
   autoRunAfterSetupEnabled,

package/dist/mcp/run-stdio.cjs

@@ -486,6 +486,8 @@ function normalizeThread(raw) {
     agentPid: raw.agentPid ?? null,
     attachments: Array.isArray(raw.attachments) ? raw.attachments : [],
     prTitle: raw.prTitle ?? null,
+    prState: raw.prState ?? null,
+    skipAutoArchiveOnMerge: Boolean(raw.skipAutoArchiveOnMerge),
     stackId: raw.stackId ?? null,
     stackLayer: raw.stackLayer ?? null,
     userSetTitle: Boolean(raw.userSetTitle),
@@ -512,6 +514,8 @@ function createEmptyThread(partial) {
     activeRuns: partial.activeRuns ?? [],
     prUrl: partial.prUrl ?? null,
     prTitle: partial.prTitle ?? null,
+    prState: partial.prState ?? null,
+    skipAutoArchiveOnMerge: partial.skipAutoArchiveOnMerge ?? false,
     stackId: partial.stackId ?? null,
     stackLayer: partial.stackLayer ?? null,
     userSetTitle: partial.userSetTitle ?? false,
@@ -2987,6 +2991,7 @@ __export(app_settings_exports, {
   HARNESS_ENV_KEYS: () => HARNESS_ENV_KEYS,
   appSettingsPath: () => appSettingsPath,
   applyAppEnvironment: () => applyAppEnvironment,
+  autoArchiveOnMergeEnabled: () => autoArchiveOnMergeEnabled,
   autoCleanupOrphansEnabled: () => autoCleanupOrphansEnabled,
   autoRenameBranchEnabled: () => autoRenameBranchEnabled,
   autoRunAfterSetupEnabled: () => autoRunAfterSetupEnabled,
@@ -3104,6 +3109,9 @@ function normalizeAdvanced(raw) {
   if (typeof source.deleteBranchOnPurge === "boolean") {
     out.deleteBranchOnPurge = source.deleteBranchOnPurge;
   }
+  if (typeof source.autoArchiveOnMerge === "boolean") {
+    out.autoArchiveOnMerge = source.autoArchiveOnMerge;
+  }
   if (typeof source.maxConcurrent === "number" && Number.isFinite(source.maxConcurrent)) {
     out.maxConcurrent = Math.max(1, Math.min(32, Math.floor(source.maxConcurrent)));
   }
@@ -3364,6 +3372,9 @@ function updateAdvancedSettings(patch) {
   if (typeof patch.deleteBranchOnPurge === "boolean") {
     advanced.deleteBranchOnPurge = patch.deleteBranchOnPurge;
   }
+  if (typeof patch.autoArchiveOnMerge === "boolean") {
+    advanced.autoArchiveOnMerge = patch.autoArchiveOnMerge;
+  }
   if (typeof patch.maxConcurrent === "number" && Number.isFinite(patch.maxConcurrent)) {
     advanced.maxConcurrent = Math.max(1, Math.min(32, Math.floor(patch.maxConcurrent)));
   }
@@ -3405,6 +3416,9 @@ function caffeinateWhileCloudConnectEnabled(settings = loadAppSettings()) {
 function deleteBranchOnPurgeEnabled(settings = loadAppSettings()) {
   return Boolean(settings.advanced.deleteBranchOnPurge);
 }
+function autoArchiveOnMergeEnabled(settings = loadAppSettings()) {
+  return Boolean(settings.advanced.autoArchiveOnMerge);
+}
 function autoCleanupOrphansEnabled(settings = loadAppSettings()) {
   return Boolean(settings.advanced.autoCleanupOrphans);
 }
@@ -7187,6 +7201,20 @@ init_agents();
 init_worktree();
 init_stack();
 
+// src/git/pr-merge-archive.ts
+function normalizePrState(state) {
+  return (state ?? "").trim().toUpperCase();
+}
+function shouldAutoArchiveOnPrMerge(opts) {
+  if (!opts.autoArchiveEnabled) return false;
+  if (opts.isGlobal) return false;
+  if (opts.skipAutoArchiveOnMerge) return false;
+  if (opts.threadStatus === "archived") return false;
+  const next = normalizePrState(opts.nextPrState);
+  if (next !== "MERGED") return false;
+  return normalizePrState(opts.previousPrState) !== "MERGED";
+}
+
 // src/hook/conductor.ts
 var import_node_fs13 = require("fs");
 var import_node_net = require("net");
@@ -8226,6 +8254,8 @@ function worktreeBindingFrom(from) {
     parentThreadId: from.parentThreadId,
     prUrl: from.prUrl,
     prTitle: from.prTitle,
+    prState: from.prState,
+    skipAutoArchiveOnMerge: from.skipAutoArchiveOnMerge,
     stackId: from.stackId,
     stackLayer: from.stackLayer
   };
@@ -11751,10 +11781,19 @@ var Orchestrator = class {
     this.assertNotGlobal(thread, "Merge PR");
     if (!selector) throw new Error("No pull request linked to this thread");
     const result = await mergePr(cwd, selector);
-    if (result.url && result.url !== thread.prUrl) {
-      updateThread(thread.id, { prUrl: result.url });
-    }
-    return result;
+    const state = normalizePrState(result.state) || "MERGED";
+    const metaLike = {
+      number: 0,
+      title: thread.prTitle ?? thread.title,
+      url: result.url || thread.prUrl || "",
+      state,
+      isDraft: false,
+      reviewDecision: null,
+      baseRefName: "",
+      headRefName: ""
+    };
+    await this.persistPrMetaAndMaybeArchive(thread, metaLike);
+    return { url: metaLike.url, state };
   }
   /** Resolve PR selector and optionally persist `prUrl` when found. */
   async withPrSelector(threadRef) {
@@ -11776,19 +11815,55 @@ var Orchestrator = class {
     if (!selector) return null;
     const meta = await getPrMeta(cwd, selector);
     if (meta) {
-      const patch = {};
-      if (meta.url && meta.url !== thread.prUrl) patch.prUrl = meta.url;
-      if (meta.title && meta.title !== thread.prTitle) patch.prTitle = meta.title;
-      if (Object.keys(patch).length > 0) {
-        updateThread(thread.id, patch);
-        const latest = this.requireThread(thread.id);
-        if (!latest.userSetTitle && meta.title && latest.title !== meta.title) {
-          updateThread(thread.id, { title: meta.title });
-        }
-      }
+      await this.persistPrMetaAndMaybeArchive(thread, meta);
     }
     return meta;
   }
+  /**
+   * Persist PR URL/title/state and Conductor-style auto-archive when the PR
+   * first becomes MERGED.
+   */
+  async persistPrMetaAndMaybeArchive(thread, meta) {
+    const prevState = normalizePrState(thread.prState);
+    const nextState = normalizePrState(meta.state);
+    const patch = {};
+    if (meta.url && meta.url !== thread.prUrl) patch.prUrl = meta.url;
+    if (meta.title && meta.title !== thread.prTitle) patch.prTitle = meta.title;
+    if (nextState && nextState !== prevState) patch.prState = nextState;
+    if (thread.skipAutoArchiveOnMerge && nextState && nextState !== "MERGED" && nextState !== "CLOSED") {
+      patch.skipAutoArchiveOnMerge = false;
+    }
+    if (Object.keys(patch).length > 0) {
+      updateThread(thread.id, patch);
+      const latest2 = this.requireThread(thread.id);
+      if (!latest2.userSetTitle && meta.title && latest2.title !== meta.title) {
+        updateThread(thread.id, { title: meta.title });
+      }
+    }
+    const { autoArchiveOnMergeEnabled: autoArchiveOnMergeEnabled2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
+    const latest = this.requireThread(thread.id);
+    if (!shouldAutoArchiveOnPrMerge({
+      previousPrState: prevState || null,
+      nextPrState: nextState,
+      threadStatus: latest.status,
+      skipAutoArchiveOnMerge: latest.skipAutoArchiveOnMerge,
+      autoArchiveEnabled: autoArchiveOnMergeEnabled2(),
+      isGlobal: isGlobalThread(latest)
+    })) {
+      return;
+    }
+    const siblings = threadsSharingWorktree(latest.worktreePath);
+    for (const t of siblings) {
+      const sibPatch = { prState: "MERGED" };
+      if (meta.url && meta.url !== t.prUrl) sibPatch.prUrl = meta.url;
+      if (meta.title && meta.title !== t.prTitle) sibPatch.prTitle = meta.title;
+      if (Object.keys(sibPatch).length > 0) updateThread(t.id, sibPatch);
+    }
+    for (const t of siblings) {
+      if (this.requireThread(t.id).status === "archived") continue;
+      await this.archive(t.id);
+    }
+  }
   async getPrStack(threadRef) {
     const thread = this.requireThread(threadRef);
     if (!thread.worktreePath?.trim()) return null;
@@ -11966,7 +12041,9 @@ var Orchestrator = class {
     const thread = this.requireThread(threadRef);
     this.stop(thread.id);
     if (isGlobalThread(thread)) {
-      return setStatus(thread.id, "archived");
+      const archived2 = setStatus(thread.id, "archived");
+      this.emit({ type: "status_changed", threadId: archived2.id, status: "archived" });
+      return archived2;
     }
     const siblings = threadsSharingWorktree(thread.worktreePath).filter((t) => t.id !== thread.id);
     if (siblings.length === 0) {
@@ -11984,6 +12061,7 @@ var Orchestrator = class {
       await removeWorktree(thread.repoPath, thread.worktreePath);
     }
     const archived = setStatus(thread.id, "archived");
+    this.emit({ type: "status_changed", threadId: archived.id, status: "archived" });
     if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
       try {
         const { ensureWorkspace: ensureWorkspace2 } = await Promise.resolve().then(() => (init_workspaces(), workspaces_exports));
@@ -12023,7 +12101,9 @@ var Orchestrator = class {
     if (isGlobalThread(thread)) {
       const { globalAgentCwd: globalAgentCwd2 } = await Promise.resolve().then(() => (init_paths(), paths_exports));
       updateThread(thread.id, { worktreePath: globalAgentCwd2() });
-      return setStatus(thread.id, "idle");
+      const restored2 = setStatus(thread.id, "idle");
+      this.emit({ type: "status_changed", threadId: restored2.id, status: restored2.status });
+      return restored2;
     }
     if (!(0, import_node_fs28.existsSync)(thread.worktreePath)) {
       const { createThreadWorktree: createThreadWorktree2 } = await Promise.resolve().then(() => (init_worktree(), worktree_exports));
@@ -12036,7 +12116,31 @@ var Orchestrator = class {
       void createThreadWorktree2;
       void slug;
     }
-    return setStatus(thread.id, "idle");
+    const restorePatch = {};
+    let alreadyMerged = normalizePrState(thread.prState) === "MERGED";
+    if (!alreadyMerged && thread.prUrl?.trim() && thread.worktreePath?.trim()) {
+      try {
+        const selector = resolvePrSelector(thread);
+        if (selector) {
+          const meta = await getPrMeta(thread.worktreePath, selector);
+          if (meta) {
+            const state = normalizePrState(meta.state);
+            if (meta.url && meta.url !== thread.prUrl) restorePatch.prUrl = meta.url;
+            if (meta.title && meta.title !== thread.prTitle) restorePatch.prTitle = meta.title;
+            if (state) restorePatch.prState = state;
+            if (state === "MERGED") alreadyMerged = true;
+          }
+        }
+      } catch {
+      }
+    }
+    if (alreadyMerged) restorePatch.skipAutoArchiveOnMerge = true;
+    if (Object.keys(restorePatch).length > 0) {
+      updateThread(thread.id, restorePatch);
+    }
+    const restored = setStatus(thread.id, "idle");
+    this.emit({ type: "status_changed", threadId: restored.id, status: restored.status });
+    return restored;
   }
   async attachCommand(threadRef) {
     const thread = this.requireThread(threadRef);
@@ -12482,7 +12586,7 @@ async function startMcpServer() {
         parent = null;
       }
       if (parentId) {
-        const children = orch.getThreads(true).filter((t) => t.parentThreadId === parentId);
+        const children = orch.getThreads(false).filter((t) => t.parentThreadId === parentId);
         if (children.length >= MAX_ORCH_THREADS) {
           return {
             content: [