@sideboard-ai/core 0.1.60 → 0.1.62

package/dist/mcp/run-stdio.js

@@ -15,14 +15,14 @@ import {
   pushTurnStderr,
   resolveQuotaFallbackAgent,
   summarizeTurnStderr
-} from "../chunk-MX7UH5AT.js";
+} from "../chunk-2MCNURQV.js";
 import "../chunk-JB2H7E7V.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "../chunk-QJBC4BRK.js";
+} from "../chunk-A6FOKNOU.js";
 import {
   extractPresentedPlan,
   readPlanFile,
@@ -36,7 +36,7 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "../chunk-CHGOMFTA.js";
+} from "../chunk-2FEA4LDA.js";
 import {
   assertOrchestratorCapableAgent
 } from "../chunk-S2LL5HA4.js";
@@ -45,7 +45,7 @@ import {
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "../chunk-NTYRBRE7.js";
+} from "../chunk-NVU7EC2E.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -82,7 +82,7 @@ import {
   takenSlugsFromThread,
   threadDisplayLabel,
   worktreeNameFromPath
-} from "../chunk-MFGGIRUA.js";
+} from "../chunk-3KKNTHUC.js";
 import {
   ATTACHMENTS_DIR,
   LEGACY_ATTACHMENTS_DIR,
@@ -99,7 +99,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "../chunk-HLEX5AQ6.js";
+} from "../chunk-7FD7COKE.js";
 import {
   ensureAgentPath,
   gh,
@@ -116,7 +116,7 @@ import {
   resolveEffectiveIssueSource,
   resolveNewThreadOptions,
   updateAdvancedSettings
-} from "../chunk-FGNBTFRD.js";
+} from "../chunk-DDN3UF4R.js";
 import "../chunk-KGZBYWZ3.js";
 import {
   loadRepoSettings,
@@ -391,9 +391,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-BHT4XUAA.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-YOAUQCMA.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-4P23VVFC.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-LKG3SHMI.js");
     ensureGlobalCoordinatorCwd2(
       isOrchestratorThread(thread) ? { orchestratorThreadId: thread.id } : void 0
     );
@@ -495,6 +495,20 @@ async function spawnAgentTurn(thread, input, onEvent) {
   };
 }
 
+// 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
 import {
   copyFileSync,
@@ -1194,7 +1208,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("../agents-EADRAAPG.js");
+  const { getAdapter: getAdapter2 } = await import("../agents-KF3J3C53.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -1512,6 +1526,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
   };
@@ -2056,7 +2072,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-GFPGDGCS.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-E75POJXP.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -3944,7 +3960,7 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("../app-settings-YBNZ4XSR.js");
+      const { autoCleanupOrphansEnabled } = await import("../app-settings-LTSFG7QJ.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
@@ -4101,7 +4117,7 @@ var Orchestrator = class {
   }
   async finishCreateThread(threadId, prompt) {
     await this.runSetupAfterCreate(threadId);
-    const { autoRunAfterSetupEnabled } = await import("../app-settings-YBNZ4XSR.js");
+    const { autoRunAfterSetupEnabled } = await import("../app-settings-LTSFG7QJ.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -4372,7 +4388,7 @@ var Orchestrator = class {
     });
     const artifactDirective = isBrightsy ? null : formatArtifactDirective();
     const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-    const { autoRenameBranchEnabled } = await import("../app-settings-YBNZ4XSR.js");
+    const { autoRenameBranchEnabled } = await import("../app-settings-LTSFG7QJ.js");
     const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled() ? formatRenameBranchDirective(fresh, {
       customPrompt: settings?.prompts?.renameBranch
     }) : null;
@@ -5008,10 +5024,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) {
@@ -5033,19 +5058,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 } = await import("../app-settings-LTSFG7QJ.js");
+    const latest = this.requireThread(thread.id);
+    if (!shouldAutoArchiveOnPrMerge({
+      previousPrState: prevState || null,
+      nextPrState: nextState,
+      threadStatus: latest.status,
+      skipAutoArchiveOnMerge: latest.skipAutoArchiveOnMerge,
+      autoArchiveEnabled: autoArchiveOnMergeEnabled(),
+      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;
@@ -5223,7 +5284,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) {
@@ -5241,9 +5304,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-GFPGDGCS.js");
+        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-E75POJXP.js");
         await ensureWorkspace2(thread.repoPath);
       } catch {
       }
@@ -5264,7 +5328,7 @@ var Orchestrator = class {
         await runArchiveScript(thread.repoPath, thread.worktreePath);
       } catch {
       }
-      const { deleteBranchOnPurgeEnabled } = await import("../app-settings-YBNZ4XSR.js");
+      const { deleteBranchOnPurgeEnabled } = await import("../app-settings-LTSFG7QJ.js");
       const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
       await removeWorktree(thread.repoPath, thread.worktreePath, {
         deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -5280,10 +5344,12 @@ var Orchestrator = class {
     if (isGlobalThread(thread)) {
       const { globalAgentCwd } = await import("../paths-2OFB7UJG.js");
       updateThread(thread.id, { worktreePath: globalAgentCwd() });
-      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-3L2G6PCM.js");
+      const { createThreadWorktree: createThreadWorktree2 } = await import("../worktree-LZEGVQSN.js");
       const { execa: execa6 } = await import("execa");
       const slug = thread.worktreePath.split("/").pop();
       const dest = thread.worktreePath;
@@ -5293,7 +5359,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);
@@ -5475,7 +5565,7 @@ function withTimeout(promise, ms, label) {
 async function startMcpServer() {
   const orch = getOrchestrator();
   try {
-    const { maxConcurrentAgents } = await import("../app-settings-YBNZ4XSR.js");
+    const { maxConcurrentAgents } = await import("../app-settings-LTSFG7QJ.js");
     orch.setMaxConcurrent(maxConcurrentAgents());
   } catch {
   }
@@ -5686,7 +5776,7 @@ async function startMcpServer() {
       return { content: [{ type: "text", text: JSON.stringify(payload) }] };
     }
   );
-  const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults } = await import("../app-settings-YBNZ4XSR.js");
+  const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults } = await import("../app-settings-LTSFG7QJ.js");
   const accountDefaults = resolveThreadDefaults();
   const accountDefaultsHint = `Account defaults: agent=${accountDefaults.agent}, model=${accountDefaults.model?.trim() || "Auto"}, effort=${accountDefaults.effort}`;
   server.tool(
@@ -5725,7 +5815,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: [

package/dist/{thread-store-GHOADGL2.js → thread-store-BUBR24YA.js}

@@ -13,7 +13,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-HLEX5AQ6.js";
+} from "./chunk-7FD7COKE.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";
 export {

package/dist/{thread-store-UJIGMI5J.js → thread-store-XTPFCJAI.js}

@@ -11,7 +11,7 @@ import {
   updateThread,
   withThreadLock,
   writeThread
-} from "./chunk-TSRXOSVD.js";
+} from "./chunk-FWJYLBO6.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";
 export {

package/dist/{workspaces-GFPGDGCS.js → workspaces-E75POJXP.js}

@@ -6,15 +6,15 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-QJBC4BRK.js";
-import "./chunk-CHGOMFTA.js";
+} from "./chunk-A6FOKNOU.js";
+import "./chunk-2FEA4LDA.js";
 import "./chunk-S2LL5HA4.js";
-import "./chunk-NTYRBRE7.js";
-import "./chunk-MFGGIRUA.js";
+import "./chunk-NVU7EC2E.js";
+import "./chunk-3KKNTHUC.js";
 import "./chunk-B3SJXYIJ.js";
-import "./chunk-HLEX5AQ6.js";
+import "./chunk-7FD7COKE.js";
 import "./chunk-RIWUU7FO.js";
-import "./chunk-FGNBTFRD.js";
+import "./chunk-DDN3UF4R.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";
 export {

package/dist/{workspaces-3GO3EDQG.js → workspaces-VCAIHVIE.js}

@@ -4,14 +4,14 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-2P2UK7E7.js";
-import "./chunk-MLAST5BB.js";
+} from "./chunk-46KMKHSD.js";
+import "./chunk-DXTGDXO2.js";
 import "./chunk-GI7E5733.js";
-import "./chunk-XWPKLRB3.js";
-import "./chunk-75QR74KM.js";
-import "./chunk-P7EQUFB6.js";
+import "./chunk-27MAWNKY.js";
+import "./chunk-6CUJQKTJ.js";
+import "./chunk-UGXSSBFJ.js";
 import "./chunk-FKOIHGKV.js";
-import "./chunk-TSRXOSVD.js";
+import "./chunk-FWJYLBO6.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";
 import "./chunk-73AT5K4A.js";

package/dist/{worktree-3L2G6PCM.js → worktree-LZEGVQSN.js}

@@ -45,9 +45,9 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-MFGGIRUA.js";
+} from "./chunk-3KKNTHUC.js";
 import "./chunk-B3SJXYIJ.js";
-import "./chunk-HLEX5AQ6.js";
+import "./chunk-7FD7COKE.js";
 import "./chunk-RIWUU7FO.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";

package/dist/{worktree-GBLHEFHR.js → worktree-MV4WRW6G.js}

@@ -43,9 +43,9 @@ import {
   worktreeDisplayLabel,
   worktreeDisplayLabelForGroup,
   worktreeNameFromPath
-} from "./chunk-P7EQUFB6.js";
+} from "./chunk-UGXSSBFJ.js";
 import "./chunk-FKOIHGKV.js";
-import "./chunk-TSRXOSVD.js";
+import "./chunk-FWJYLBO6.js";
 import "./chunk-77WWLBCI.js";
 import "./chunk-M37RITA6.js";
 import "./chunk-73AT5K4A.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideboard-ai/core",
-  "version": "0.1.60",
+  "version": "0.1.62",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",