@sideboard-ai/core 0.1.52 → 0.1.56

package/dist/mcp/run-stdio.js

@@ -10,34 +10,25 @@ import {
   isSessionQuotaLimit,
   listModelsForAgent,
   looksLikeAgentFailureMessage,
+  looksLikeInvalidAgentSession,
   parseBrightsyCliLine,
   parseSessionQuotaResetAt,
   pushTurnStderr,
   resolveQuotaFallbackAgent,
   summarizeTurnStderr
-} from "../chunk-6QTZVJ7A.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,
@@ -46,7 +37,7 @@ import {
   isGlobalThread,
   isOrchestratorThread,
   orchestratorSessionPoisonedByBuiltins
-} from "../chunk-YOWIYAVA.js";
+} from "../chunk-EBWEKG52.js";
 import {
   assertOrchestratorCapableAgent
 } from "../chunk-S2LL5HA4.js";
@@ -55,7 +46,7 @@ import {
   coordinatorTurnReminder,
   enrichWorkspacesWithGithub,
   ensureGlobalCoordinatorCwd
-} from "../chunk-UEAHMGHW.js";
+} from "../chunk-DQJ5D42H.js";
 import {
   addPrStackLayer,
   allocateTeamName,
@@ -116,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,
@@ -310,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",
@@ -321,7 +339,6 @@ function applyAgentEvent(parts, event) {
         ...fromResult.deletions != null ? { deletions: fromResult.deletions } : {}
       };
     });
-    return next;
   }
   return parts;
 }
@@ -375,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)) {
@@ -1102,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}`);
@@ -1145,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,
@@ -1162,7 +1185,7 @@ async function createThread(input, _onSetupLine) {
   return readThread(thread.id) ?? thread;
 }
 async function listLinearIssues(agent, repoPath) {
-  const { getAdapter: getAdapter2 } = await import("../agents-ON6RKKND.js");
+  const { getAdapter: getAdapter2 } = await import("../agents-AQFEFKBL.js");
   await requireAgent(agent, { requireLinear: true });
   const adapter = getAdapter2(agent);
   if (!adapter.listLinearIssues) {
@@ -2024,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;
 }
@@ -3911,7 +3934,7 @@ 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 });
       }
@@ -4037,21 +4060,30 @@ var Orchestrator = class {
     return findThreadByRef(idOrRef) ?? readThread(idOrRef);
   }
   async createThread(input) {
-    let thread = await createThread(input);
+    const thread = await createThread(input);
     this.emit({ type: "status_changed", threadId: thread.id, status: thread.status });
-    await this.runSetupAfterCreate(thread.id);
-    const { autoRunAfterSetupEnabled } = await import("../app-settings-7XVDQJ7F.js");
+    void this.finishCreateThread(thread.id, input.prompt?.trim() || void 0);
+    return thread;
+  }
+  async finishCreateThread(threadId, prompt) {
+    await this.runSetupAfterCreate(threadId);
+    const { autoRunAfterSetupEnabled } = await import("../app-settings-73DI4B6T.js");
     if (autoRunAfterSetupEnabled()) {
       try {
-        await this.startDev(thread.id);
+        await this.startDev(threadId);
       } catch {
       }
     }
-    const prompt = input.prompt?.trim();
     if (prompt) {
-      thread = await this.send(thread.id, prompt);
+      try {
+        await this.send(threadId, prompt);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        updateThread(threadId, {
+          lastError: `First prompt failed: ${message}`
+        });
+      }
     }
-    return thread;
   }
   /** Run workspace setup after a new worktree is created (no-op if none configured). */
   async runSetupAfterCreate(threadId) {
@@ -4067,7 +4099,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) {
@@ -4301,7 +4333,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;
@@ -4397,8 +4429,73 @@ var Orchestrator = class {
           }
         }
       }
-      const lastStderr = summarizeTurnStderr(stderrTail);
-      const detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
+      let lastStderr = summarizeTurnStderr(stderrTail);
+      let detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
+      if (exitCode !== 0 && !assistantText && parts.length === 0 && !this.stoppedTurns.has(threadId) && looksLikeInvalidAgentSession(detail) && this.requireThread(threadId).sessionId && this.requireThread(threadId).agent !== "cursor" && this.requireThread(threadId).agent !== "brightsy") {
+        updateThread(threadId, { sessionId: null });
+        pushTurnStderr(
+          stderrTail,
+          "Agent session missing \u2014 starting a fresh session"
+        );
+        this.emit({
+          type: "turn_output",
+          threadId,
+          event: {
+            type: "stderr",
+            data: "Agent session missing \u2014 starting a fresh session"
+          }
+        });
+        const retryThread = this.requireThread(threadId);
+        const prior = retryThread.messages.slice(0, -1);
+        const retrySeed = buildSessionSeed(prior);
+        const retryInstructions = retryThread.agent === "claude" ? null : formatAgentInstructions(
+          loadAgentInstructions(retryThread.worktreePath, retryThread.agent)
+        );
+        const retryPrefix = [
+          coordinatorDirective,
+          worktreeDirective,
+          artifactDirective,
+          renameBranchDirective,
+          retryInstructions,
+          retrySeed
+        ].filter(Boolean).join("\n\n---\n\n");
+        const retryHandle = await spawnAgentTurn(
+          retryThread,
+          { cachedPrefix: retryPrefix, prompt: agentPrompt },
+          (event) => {
+            this.emit({ type: "turn_output", threadId, event });
+            if (event.type === "session_id") {
+              updateThread(threadId, { sessionId: event.data });
+            }
+            if (event.type === "stderr" && typeof event.data === "string") {
+              pushTurnStderr(stderrTail, event.data);
+            }
+          }
+        );
+        this.activeTurns.set(threadId, retryHandle);
+        if (typeof retryHandle.pid === "number" && retryHandle.pid > 0) {
+          updateThread(threadId, { agentPid: retryHandle.pid });
+        }
+        this.processes.set(`${threadId}:agent`, {
+          kind: "agent",
+          pid: retryHandle.pid,
+          startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+          kill: retryHandle.kill
+        });
+        if (this.stoppedTurns.has(threadId)) {
+          retryHandle.kill();
+        }
+        const retryResult = await retryHandle.done;
+        if (retryResult.sessionId) {
+          updateThread(threadId, { sessionId: retryResult.sessionId });
+        }
+        assistantText = retryResult.assistantText.trim();
+        parts = retryResult.parts;
+        usage = retryResult.usage ?? void 0;
+        exitCode = retryResult.exitCode;
+        lastStderr = summarizeTurnStderr(stderrTail);
+        detail = lastStderr || (exitCode !== 0 ? fallbackTurnFailDetail(assistantText) : "");
+      }
       let chatText = assistantText;
       if (exitCode !== 0 && !chatText && looksLikeAgentFailureMessage(detail)) {
         chatText = humanizeAgentFailDetail(detail);
@@ -5102,7 +5199,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);
@@ -5118,7 +5223,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
@@ -5510,13 +5615,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()
@@ -5536,10 +5647,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
@@ -5553,6 +5671,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}`
             })

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.52",
+  "version": "0.1.56",
   "description": "Sideboard core — orchestration, agents, git worktrees, MCP server",
   "license": "Apache-2.0",
   "type": "module",