@sideboard-ai/core 0.1.53 → 0.1.57

package/dist/mcp/run-stdio.js

@@ -16,29 +16,19 @@ import {
   pushTurnStderr,
   resolveQuotaFallbackAgent,
   summarizeTurnStderr
-} from "../chunk-BZST4HMJ.js";
+} from "../chunk-C3J4GDW4.js";
 import "../chunk-H6GGDLYS.js";
 import {
   addWorkspace,
   ensureWorkspace,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "../chunk-YDXQ72MD.js";
+} from "../chunk-V2DUTUNC.js";
 import {
   extractPresentedPlan,
   readPlanFile,
   writePlanFile
 } from "../chunk-N5PM7HGQ.js";
-import {
-  childEnvWithAppSettings,
-  getLinearApiKey,
-  isLinearConnected,
-  loadAppSettings,
-  orchestrationQuotaFallbackAgent,
-  orchestrationQuotaOnLimit,
-  resolveEffectiveIssueSource,
-  updateAdvancedSettings
-} from "../chunk-HBJSHRY2.js";
 import {
   GLOBAL_WORKSPACE_ID,
   healOrchestrationSoccerTitles,
@@ -47,7 +37,7 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "../chunk-YOWIYAVA.js";
+} from "../chunk-EBWEKG52.js";
 import {
   assertOrchestratorCapableAgent
 } from "../chunk-S2LL5HA4.js";
@@ -56,7 +46,7 @@ import {
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "../chunk-UEAHMGHW.js";
+} from "../chunk-DQJ5D42H.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -117,6 +107,17 @@ import {
   git,
   run
 } from "../chunk-ZNM4MAN4.js";
+import {
+  childEnvWithAppSettings,
+  getLinearApiKey,
+  isLinearConnected,
+  loadAppSettings,
+  orchestrationQuotaFallbackAgent,
+  orchestrationQuotaOnLimit,
+  resolveEffectiveIssueSource,
+  resolveNewThreadOptions,
+  updateAdvancedSettings
+} from "../chunk-C4BCC5X5.js";
 import "../chunk-KGZBYWZ3.js";
 import {
   loadRepoSettings,
@@ -311,9 +312,25 @@ function applyAgentEvent(parts, event) {
     ];
   }
   if (event.type === "tool_result") {
-    const next = parts.map((p) => {
-      if (p.type !== "tool" || p.id !== event.id) return p;
-      const fromResult = parseDiffStat(event.content);
+    const existing = parts.findIndex((p) => p.type === "tool" && p.id === event.id);
+    const fromResult = parseDiffStat(event.content);
+    if (existing < 0) {
+      return [
+        ...parts,
+        {
+          type: "tool",
+          id: event.id,
+          name: "tool",
+          description: "tool",
+          status: event.isError ? "error" : "done",
+          result: event.content,
+          ...fromResult.additions != null ? { additions: fromResult.additions } : {},
+          ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
+        }
+      ];
+    }
+    return parts.map((p, i) => {
+      if (i !== existing || p.type !== "tool") return p;
       return {
         ...p,
         status: event.isError ? "error" : "done",
@@ -322,7 +339,6 @@ function applyAgentEvent(parts, event) {
         ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
       };
     });
-    return next;
   }
   return parts;
 }
@@ -376,9 +392,9 @@ async function spawnAgentTurn(thread, input, onEvent) {
       `Cannot spawn ${thread.agent}: thread ${thread.id} has no worktreePath`
     );
   }
-  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-EV4G2WMQ.js");
+  const { isGlobalThread: isGlobalThread2 } = await import("../global-workspace-667XLBW6.js");
   if (isGlobalThread2(thread)) {
-    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-6FXVTSFN.js");
+    const { ensureGlobalCoordinatorCwd: ensureGlobalCoordinatorCwd2 } = await import("../coordinator-prompt-RBKUNRPR.js");
     ensureGlobalCoordinatorCwd2();
   }
   if (isOrchestratorThread(thread)) {
@@ -1103,7 +1119,13 @@ async function requireAgent(agent, opts) {
 
 // src/threads/create.ts
 async function createThread(input, _onSetupLine) {
-  await requireAgent(input.agent);
+  const resolved = resolveNewThreadOptions({
+    agent: input.agent,
+    model: input.model,
+    effort: input.effort,
+    fast: input.fast
+  });
+  await requireAgent(resolved.agent);
   const repoPath = await resolveRepoRoot(input.repoPath);
   if (!existsSync5(repoPath)) {
     throw new Error(`Repo not found: ${repoPath}`);
@@ -1146,11 +1168,11 @@ async function createThread(input, _onSetupLine) {
     branchName,
     worktreePath,
     repoPath,
-    agent: input.agent,
+    agent: resolved.agent,
     autonomy: input.autonomy ?? "default",
-    model: input.model ?? null,
-    effort: input.effort ?? "high",
-    fast: Boolean(input.fast),
+    model: resolved.model,
+    effort: resolved.effort,
+    fast: resolved.fast,
     planMode: Boolean(input.planMode),
     attachments: input.attachments ?? [],
     sourceIsFork,
@@ -1163,7 +1185,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("../agents-KP7UJEHJ.js");
+  const { getAdapter: getAdapter2 } = await import("../agents-AQFEFKBL.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2025,7 +2047,7 @@ async function adoptThread(input) {
     messages: input.messages ?? []
   });
   writeThread(thread);
-  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-3RQQZQRO.js");
+  const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-LYIDE2VR.js");
   await ensureWorkspace2(repoPath);
   return thread;
 }
@@ -3872,6 +3894,7 @@ var Orchestrator = class {
   }
   async reconcile(repoPath, opts) {
     const reclaimStaleTurns = opts?.reclaimStaleTurns === true;
+    const drainQueues = opts?.drainQueues !== false;
     healOrchestrationSoccerTitles();
     for (const thread of listThreads({ includeArchived: true })) {
       if (thread.status === "archived") continue;
@@ -3912,18 +3935,42 @@ var Orchestrator = class {
           orphans: orphans.map((o) => ({ path: o.path, repoPath: o.repoPath }))
         });
       }
-      const { autoCleanupOrphansEnabled } = await import("../app-settings-7XVDQJ7F.js");
+      const { autoCleanupOrphansEnabled } = await import("../app-settings-73DI4B6T.js");
       if (autoCleanupOrphansEnabled() && shouldRunWorktreeCleanup() && orphans.length > 0) {
         await cleanupOrphanWorktrees({ repoPaths });
       }
     } catch {
     }
+    if (drainQueues) {
+      this.adoptPersistedQueues();
+    }
+    this.schedulePendingQuotaResumes();
+  }
+  /**
+   * Adopt queues persisted by another process (MCP stdio / CLI) into this
+   * orchestrator's drain loops. Desktop calls this on thread-store changes so
+   * MCP-created review threads don't stay `queued` after the MCP child exits.
+   */
+  adoptPersistedQueues() {
     for (const thread of listThreads()) {
-      if (thread.queue.length > 0 && thread.status !== "stopped") {
+      if (thread.status === "stopped" || thread.status === "archived") continue;
+      const pid = thread.agentPid;
+      const deadPid = typeof pid === "number" && pid > 0 && !isPidAlive(pid) ? true : false;
+      if (deadPid) {
+        updateThread(thread.id, { agentPid: null });
+      }
+      if (thread.status === "queued" && thread.queue.length === 0) {
+        if (!this.activeTurns.has(thread.id) && !this.startingTurns.has(thread.id)) {
+          setStatus(thread.id, "idle");
+          this.emit({ type: "status_changed", threadId: thread.id, status: "idle" });
+        }
+        continue;
+      }
+      if (thread.queue.length > 0) {
+        this.haltDrain.delete(thread.id);
         void this.drainQueue(thread.id);
       }
     }
-    this.schedulePendingQuotaResumes();
   }
   clearQuotaResumeTimer(threadId) {
     const timer = this.quotaResumeTimers.get(threadId);
@@ -4045,7 +4092,7 @@ var Orchestrator = class {
   }
   async finishCreateThread(threadId, prompt) {
     await this.runSetupAfterCreate(threadId);
-    const { autoRunAfterSetupEnabled } = await import("../app-settings-7XVDQJ7F.js");
+    const { autoRunAfterSetupEnabled } = await import("../app-settings-73DI4B6T.js");
     if (autoRunAfterSetupEnabled()) {
       try {
         await this.startDev(threadId);
@@ -4077,7 +4124,7 @@ var Orchestrator = class {
     }
   }
   listWorkspaces() {
-    const fromThreads = listThreads({ includeArchived: false }).map((t) => t.repoPath);
+    const fromThreads = listThreads({ includeArchived: true }).map((t) => t.repoPath);
     return syncWorkspacesFromThreads(fromThreads);
   }
   async addWorkspace(repoPath) {
@@ -4105,7 +4152,12 @@ var Orchestrator = class {
       const current = this.requireThread(thread.id);
       const queue = [...current.queue, prompt];
       this.haltDrain.delete(thread.id);
-      updateThread(thread.id, { queue, status: "queued" });
+      const patch = { queue, status: "queued" };
+      const pid = current.agentPid;
+      if (typeof pid === "number" && pid > 0 && !isPidAlive(pid)) {
+        patch.agentPid = null;
+      }
+      updateThread(thread.id, patch);
       this.emit({ type: "queue_changed", threadId: thread.id, queue });
       this.emit({ type: "status_changed", threadId: thread.id, status: "queued" });
       void this.drainQueue(thread.id);
@@ -4311,7 +4363,7 @@ var Orchestrator = class {
     });
     const artifactDirective = isBrightsy ? null : formatArtifactDirective();
     const settings = loadWorkspaceSettings(fresh.worktreePath, fresh.repoPath);
-    const { autoRenameBranchEnabled } = await import("../app-settings-7XVDQJ7F.js");
+    const { autoRenameBranchEnabled } = await import("../app-settings-73DI4B6T.js");
     const renameBranchDirective = !isBrightsy && !isOrchestration && autoRenameBranchEnabled() ? formatRenameBranchDirective(fresh, {
       customPrompt: settings?.prompts?.renameBranch
     }) : null;
@@ -5177,7 +5229,15 @@ var Orchestrator = class {
       }
       await removeWorktree(thread.repoPath, thread.worktreePath);
     }
-    return setStatus(thread.id, "archived");
+    const archived = setStatus(thread.id, "archived");
+    if (thread.repoPath && !isGlobalRepoPath(thread.repoPath)) {
+      try {
+        const { ensureWorkspace: ensureWorkspace2 } = await import("../workspaces-LYIDE2VR.js");
+        await ensureWorkspace2(thread.repoPath);
+      } catch {
+      }
+    }
+    return archived;
   }
   async purge(threadRef, opts) {
     const thread = this.requireThread(threadRef);
@@ -5193,7 +5253,7 @@ var Orchestrator = class {
         await runArchiveScript(thread.repoPath, thread.worktreePath);
       } catch {
       }
-      const { deleteBranchOnPurgeEnabled } = await import("../app-settings-7XVDQJ7F.js");
+      const { deleteBranchOnPurgeEnabled } = await import("../app-settings-73DI4B6T.js");
       const deleteBranch = opts?.deleteBranch ?? deleteBranchOnPurgeEnabled();
       await removeWorktree(thread.repoPath, thread.worktreePath, {
         deleteBranch: deleteBranch ? thread.branchName : void 0
@@ -5385,7 +5445,12 @@ function mcpArchiveBlockedReason(thread) {
 var MAX_ORCH_THREADS = 5;
 async function startMcpServer() {
   const orch = getOrchestrator();
-  await orch.reconcile(void 0, { reclaimStaleTurns: false });
+  try {
+    const { maxConcurrentAgents } = await import("../app-settings-73DI4B6T.js");
+    orch.setMaxConcurrent(maxConcurrentAgents());
+  } catch {
+  }
+  await orch.reconcile(void 0, { reclaimStaleTurns: false, drainQueues: false });
   const server = new McpServer({
     name: "sideboard",
     version: "0.1.0"
@@ -5585,13 +5650,19 @@ async function startMcpServer() {
       return { content: [{ type: "text", text: JSON.stringify(payload) }] };
     }
   );
+  const { resolveNewThreadOptions: resolveNewThreadOptions2, resolveThreadDefaults } = await import("../app-settings-73DI4B6T.js");
+  const accountDefaults = resolveThreadDefaults();
+  const accountDefaultsHint = `Account defaults: agent=${accountDefaults.agent}, model=${accountDefaults.model?.trim() || "Auto"}, effort=${accountDefaults.effort}`;
   server.tool(
     "create_thread",
-    "Create a new worktree thread (chat) from branch, pr, or ticket. Pass repoPath from list_workspaces and parentThreadId when spawning from an orchestrator. Then use send_to_thread to chat.",
+    `Create a new worktree thread (chat) from branch, pr, or ticket. Pass repoPath from list_workspaces and parentThreadId when spawning from an orchestrator. Prefer omitting agent/model so Sideboard applies ${accountDefaultsHint}. Then use send_to_thread to chat.`,
     {
       sourceType: z.enum(["branch", "pr", "ticket"]),
       sourceRef: z.string(),
-      agent: z.enum(["claude", "codex", "opencode", "brightsy", "cursor"]),
+      agent: z.enum(["claude", "codex", "opencode", "brightsy", "cursor"]).optional().describe(`Omit to use Account default agent (${accountDefaults.agent})`),
+      model: z.string().nullable().optional().describe(
+        `Usually omit to use Account default model (${accountDefaults.model?.trim() || "Auto"}). Pass null only to force Auto / agent-default.`
+      ),
       repoPath: z.string(),
       title: z.string().optional(),
       parentThreadId: z.string().optional()
@@ -5611,10 +5682,17 @@ async function startMcpServer() {
           };
         }
       }
+      const opts = resolveNewThreadOptions2({
+        agent: args.agent,
+        model: args.model
+      });
       const thread = await orch.createThread({
         sourceType: args.sourceType,
         sourceRef: args.sourceRef,
-        agent: args.agent,
+        agent: opts.agent,
+        model: opts.model,
+        effort: opts.effort,
+        fast: opts.fast,
         repoPath: args.repoPath,
         title: args.title,
         parentThreadId: args.parentThreadId ?? null
@@ -5628,6 +5706,8 @@ async function startMcpServer() {
               title: thread.title,
               branchName: thread.branchName,
               worktreePath: thread.worktreePath,
+              agent: thread.agent,
+              model: thread.model,
               status: thread.status,
               link: `sideboard://thread/${thread.id}`
             })
@@ -5872,7 +5952,7 @@ async function startMcpServer() {
     async ({ ref, through_index, agent, model, title }) => {
       try {
         const source = orch.getThread(ref);
-        if (source) await orch.reconcile(source.repoPath);
+        if (source) await orch.reconcile(source.repoPath, { drainQueues: false });
         const thread = await orch.forkThreadWorktree({
           threadId: ref,
           throughIndex: through_index,

package/dist/{workspaces-AYTBR6KQ.js → workspaces-FPJJXXAE.js}

@@ -4,10 +4,11 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-GNML24AW.js";
-import "./chunk-XX5BB7NV.js";
+} from "./chunk-5DMYULLC.js";
+import "./chunk-S42XDFKF.js";
 import "./chunk-GI7E5733.js";
-import "./chunk-LRLKJM3O.js";
+import "./chunk-UA5NDAHL.js";
+import "./chunk-DIOF73S2.js";
 import "./chunk-DZFH2KLT.js";
 import "./chunk-FKOIHGKV.js";
 import "./chunk-TSRXOSVD.js";

package/dist/{workspaces-3RQQZQRO.js → workspaces-LYIDE2VR.js}

@@ -6,14 +6,15 @@ import {
   listWorkspaces,
   removeWorkspace,
   syncWorkspacesFromThreads
-} from "./chunk-YDXQ72MD.js";
-import "./chunk-YOWIYAVA.js";
+} from "./chunk-V2DUTUNC.js";
+import "./chunk-EBWEKG52.js";
 import "./chunk-S2LL5HA4.js";
-import "./chunk-UEAHMGHW.js";
+import "./chunk-DQJ5D42H.js";
 import "./chunk-XOU6HNQJ.js";
 import "./chunk-B3SJXYIJ.js";
 import "./chunk-HLEX5AQ6.js";
 import "./chunk-ZNM4MAN4.js";
+import "./chunk-C4BCC5X5.js";
 import "./chunk-KGZBYWZ3.js";
 import "./chunk-7MV3RXSC.js";
 export {

package/package.json

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