@sideboard-ai/core 0.1.56 → 0.1.57

package/dist/index.cjs

@@ -11640,6 +11640,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;
@@ -11686,12 +11687,36 @@ var Orchestrator = class {
       }
     } 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);
@@ -11873,7 +11898,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);
@@ -13222,7 +13252,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: maxConcurrentAgents2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
+    orch.setMaxConcurrent(maxConcurrentAgents2());
+  } catch {
+  }
+  await orch.reconcile(void 0, { reclaimStaleTurns: false, drainQueues: false });
   const server = new import_mcp.McpServer({
     name: "sideboard",
     version: "0.1.0"
@@ -13724,7 +13759,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/index.d.cts

@@ -2231,7 +2231,19 @@ declare class Orchestrator {
          * real app/CLI startup recovery.
          */
         reclaimStaleTurns?: boolean;
+        /**
+         * When false, skip draining persisted queues. MCP stdio boots must not
+         * steal the whole fleet into a short-lived process (desktop adopts instead).
+         * Default true for desktop/CLI.
+         */
+        drainQueues?: boolean;
     }): Promise<void>;
+    /**
+     * 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(): void;
     private clearQuotaResumeTimer;
     /** Schedule (or fire) auto-retry after a provider session/usage limit reset. */
     private scheduleQuotaResume;

package/dist/index.d.ts

@@ -2231,7 +2231,19 @@ declare class Orchestrator {
          * real app/CLI startup recovery.
          */
         reclaimStaleTurns?: boolean;
+        /**
+         * When false, skip draining persisted queues. MCP stdio boots must not
+         * steal the whole fleet into a short-lived process (desktop adopts instead).
+         * Default true for desktop/CLI.
+         */
+        drainQueues?: boolean;
     }): Promise<void>;
+    /**
+     * 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(): void;
     private clearQuotaResumeTimer;
     /** Schedule (or fire) auto-retry after a provider session/usage limit reset. */
     private scheduleQuotaResume;

package/dist/index.js

@@ -4401,6 +4401,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;
@@ -4447,12 +4448,36 @@ var Orchestrator = class {
       }
     } 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);
@@ -4634,7 +4659,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);
@@ -5971,7 +6001,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: maxConcurrentAgents2 } = await import("./app-settings-2LQNRTBE.js");
+    orch.setMaxConcurrent(maxConcurrentAgents2());
+  } catch {
+  }
+  await orch.reconcile(void 0, { reclaimStaleTurns: false, drainQueues: false });
   const server = new McpServer({
     name: "sideboard",
     version: "0.1.0"
@@ -6473,7 +6508,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/mcp/run-stdio.cjs

@@ -10548,6 +10548,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;
@@ -10594,12 +10595,36 @@ var Orchestrator = class {
       }
     } 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);
@@ -10781,7 +10806,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);
@@ -12083,7 +12113,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: maxConcurrentAgents2 } = await Promise.resolve().then(() => (init_app_settings(), app_settings_exports));
+    orch.setMaxConcurrent(maxConcurrentAgents2());
+  } catch {
+  }
+  await orch.reconcile(void 0, { reclaimStaleTurns: false, drainQueues: false });
   const server = new import_mcp.McpServer({
     name: "sideboard",
     version: "0.1.0"
@@ -12585,7 +12620,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/mcp/run-stdio.js

@@ -3894,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;
@@ -3940,12 +3941,36 @@ var Orchestrator = class {
       }
     } 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);
@@ -4127,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);
@@ -5415,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"
@@ -5917,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/package.json

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