@sideboard-ai/core 0.1.52 → 0.1.56

package/dist/{chunk-D3METLRW.js → chunk-7F454EE2.js}

@@ -10,12 +10,12 @@ import {
   formatUnknownDetail,
   looksLikeAgentFailureMessage,
   parseCursorRunnerLine
-} from "./chunk-J5JTEJ5O.js";
+} from "./chunk-3WJAUKIL.js";
 import {
   claudeChromeEnabled,
   loadAppSettings,
   resolveClaudeExecutable
-} from "./chunk-T5QQVXK3.js";
+} from "./chunk-DIOF73S2.js";
 import {
   ensureAgentPath,
   run
@@ -623,6 +623,7 @@ function toCodexMcpConfigArgs(servers) {
         args.push("-c", `${prefix}.env.${key}=${JSON.stringify(value)}`);
       }
     }
+    args.push("-c", `${prefix}.default_tools_approval_mode=${JSON.stringify("approve")}`);
   }
   return args;
 }
@@ -839,7 +840,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread } = await import("./global-workspace-MSX2K27Y.js");
+    const { isOrchestratorThread } = await import("./global-workspace-S7VLWPWG.js");
     const isOrchestrator = isOrchestratorThread(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1099,6 +1100,32 @@ function codexConfigHasNetworkAccess() {
   }
   return false;
 }
+function unwrapCodexMcpResult(result) {
+  if (result == null) return void 0;
+  if (typeof result === "string") return result;
+  if (typeof result !== "object") return String(result);
+  const rec = result;
+  if (Array.isArray(rec.content)) {
+    const texts = [];
+    for (const item of rec.content) {
+      if (!item || typeof item !== "object") continue;
+      const text = item.text;
+      if (typeof text === "string") texts.push(text);
+    }
+    if (texts.length) return texts.join("\n");
+  }
+  try {
+    return JSON.stringify(result);
+  } catch {
+    return String(result);
+  }
+}
+function asRecord(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return void 0;
+}
 var codexAdapter = {
   kind: "codex",
   async detect() {
@@ -1189,15 +1216,49 @@ var codexAdapter = {
       }
       if (typeof obj.item === "object" && obj.item !== null) {
         const item = obj.item;
-        if (item.type === "error") {
+        const itemType = item.type ?? item.item_type;
+        if (itemType === "error") {
           const detail = item.message?.trim() || extractJsonErrorMessage(obj) || "Codex item error";
           return { type: "stderr", data: detail };
         }
-        if (item.type === "agent_message" && item.text) {
+        if (itemType === "agent_message" && item.text) {
           return { type: "stdout", data: item.text };
         }
+        if (itemType === "mcp_tool_call" && item.id && item.server && item.tool) {
+          const name = `mcp__${item.server}__${item.tool}`;
+          const input = asRecord(item.arguments);
+          const events = [
+            { type: "tool_use", id: item.id, name, input }
+          ];
+          const finished = type === "item.completed" || item.status === "completed" || item.status === "failed";
+          if (finished) {
+            const errMsg = item.error && typeof item.error.message === "string" ? item.error.message : void 0;
+            events.push({
+              type: "tool_result",
+              id: item.id,
+              content: unwrapCodexMcpResult(item.result) ?? errMsg,
+              isError: item.status === "failed" || Boolean(errMsg)
+            });
+          }
+          return events.length === 1 ? events[0] : events;
+        }
+        if (itemType === "command_execution" && item.id) {
+          const input = item.command ? { command: item.command } : void 0;
+          const events = [
+            { type: "tool_use", id: item.id, name: "Bash", input }
+          ];
+          if (type === "item.completed" || item.status === "completed" || item.status === "failed") {
+            events.push({
+              type: "tool_result",
+              id: item.id,
+              content: item.aggregated_output,
+              isError: item.status === "failed"
+            });
+          }
+          return events.length === 1 ? events[0] : events;
+        }
         if (item.status === "failed") {
-          const detail = item.message?.trim() || extractJsonErrorMessage(item) || `Codex ${item.type ?? "item"} failed`;
+          const detail = item.message?.trim() || extractJsonErrorMessage(item) || `Codex ${itemType ?? "item"} failed`;
           return { type: "stderr", data: detail };
         }
       }
@@ -1571,17 +1632,31 @@ var opencodeAdapter = {
         return { type: "stderr", data: detail };
       }
       const sid = typeof obj.sessionID === "string" && obj.sessionID || typeof obj.sessionId === "string" && obj.sessionId || typeof obj.session_id === "string" && obj.session_id;
-      if (sid) return { type: "session_id", data: sid };
+      if (sid && (!obj.type || obj.type === "step_start" || obj.type === "session")) {
+        return { type: "session_id", data: sid };
+      }
       if (obj.type === "text") {
         const text = obj.part?.text ?? obj.text;
         if (text) return { type: "stdout", data: text };
       }
       if (obj.type === "tool_use") {
         const part = obj.part;
-        const id = part?.id ?? obj.id ?? `tool-${Date.now()}`;
-        const name = part?.name ?? part?.tool ?? obj.name ?? obj.tool ?? "tool";
-        const input = part?.input ?? obj.input;
-        return { type: "tool_use", id, name, input };
+        const id = part?.callID ?? part?.id ?? obj.id ?? `tool-${Date.now()}`;
+        const name = part?.tool ?? part?.name ?? obj.tool ?? obj.name ?? "tool";
+        const state = part?.state;
+        const input = (state?.input && typeof state.input === "object" ? state.input : void 0) ?? part?.input ?? obj.input;
+        const events = [{ type: "tool_use", id, name, input }];
+        const output = state?.output;
+        if (output != null || state?.status === "completed" || state?.status === "error") {
+          const content = typeof output === "string" ? output : output != null ? JSON.stringify(output) : formatUnknownDetail(state?.error) || void 0;
+          events.push({
+            type: "tool_result",
+            id,
+            content,
+            isError: state?.status === "error" || state?.status === "failed"
+          });
+        }
+        return events.length === 1 ? events[0] : events;
       }
       if (obj.type === "tool_result") {
         const part = obj.part;
@@ -1609,6 +1684,7 @@ var opencodeAdapter = {
     }
   },
   async resolveSessionId(worktreePath, cached) {
+    const cachedId = cached?.trim() || null;
     const listed = await run(
       "opencode",
       ["session", "list", "--format", "json"],
@@ -1620,15 +1696,21 @@ var opencodeAdapter = {
         if (Array.isArray(sessions) && sessions.length > 0) {
           const norm = (p) => p.replace(/\/+$/, "");
           const wt = norm(worktreePath);
-          const match = sessions.find(
+          const forWorktree = sessions.filter(
             (s) => s.directory && norm(s.directory) === wt || s.path && norm(s.path) === wt
           );
-          if (match?.id) return match.id;
+          if (cachedId && forWorktree.some((s) => s.id === cachedId)) {
+            return cachedId;
+          }
+          if (cachedId && sessions.some((s) => s.id === cachedId)) {
+            return cachedId;
+          }
+          return null;
         }
       } catch {
       }
     }
-    return cached;
+    return cachedId;
   },
   async buildAttach(thread) {
     const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);

package/dist/{chunk-6QTZVJ7A.js → chunk-C3J4GDW4.js}

@@ -7,15 +7,15 @@ import {
   ensureConnectedBrightsyTeamTokens,
   loadBrightsyConfig
 } from "./chunk-H6GGDLYS.js";
-import {
-  claudeChromeEnabled,
-  loadAppSettings,
-  resolveClaudeExecutable
-} from "./chunk-HBJSHRY2.js";
 import {
   ensureAgentPath,
   run
 } from "./chunk-ZNM4MAN4.js";
+import {
+  claudeChromeEnabled,
+  loadAppSettings,
+  resolveClaudeExecutable
+} from "./chunk-C4BCC5X5.js";
 
 // src/agents/brightsy-targets.ts
 function encodeBrightsyTarget(type, id, accountId) {
@@ -109,6 +109,11 @@ function summarizeTurnStderr(tail, maxChars = 500) {
   if (joined.length <= maxChars) return joined;
   return joined.slice(joined.length - maxChars);
 }
+function looksLikeInvalidAgentSession(text) {
+  const lower = text.trim().toLowerCase();
+  if (!lower) return false;
+  return /session not found/.test(lower) || /no conversation found/.test(lower) || /conversation .+ not found/.test(lower) || /thread .+ not found/.test(lower) || /unknown session/.test(lower) || /invalid session/.test(lower) || /session .+ (missing|expired|deleted|gone)/.test(lower) || /cannot resume/.test(lower) || /failed to (load|resume|open) session/.test(lower);
+}
 function looksLikeAgentFailureMessage(text) {
   const lower = text.trim().toLowerCase();
   if (!lower) return false;
@@ -688,6 +693,7 @@ function toCodexMcpConfigArgs(servers) {
         args.push("-c", `${prefix}.env.${key}=${JSON.stringify(value)}`);
       }
     }
+    args.push("-c", `${prefix}.default_tools_approval_mode=${JSON.stringify("approve")}`);
   }
   return args;
 }
@@ -901,7 +907,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread } = await import("./global-workspace-EV4G2WMQ.js");
+    const { isOrchestratorThread } = await import("./global-workspace-667XLBW6.js");
     const isOrchestrator = isOrchestratorThread(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
@@ -1161,6 +1167,32 @@ function codexConfigHasNetworkAccess() {
   }
   return false;
 }
+function unwrapCodexMcpResult(result) {
+  if (result == null) return void 0;
+  if (typeof result === "string") return result;
+  if (typeof result !== "object") return String(result);
+  const rec = result;
+  if (Array.isArray(rec.content)) {
+    const texts = [];
+    for (const item of rec.content) {
+      if (!item || typeof item !== "object") continue;
+      const text = item.text;
+      if (typeof text === "string") texts.push(text);
+    }
+    if (texts.length) return texts.join("\n");
+  }
+  try {
+    return JSON.stringify(result);
+  } catch {
+    return String(result);
+  }
+}
+function asRecord(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return void 0;
+}
 var codexAdapter = {
   kind: "codex",
   async detect() {
@@ -1251,15 +1283,49 @@ var codexAdapter = {
       }
       if (typeof obj.item === "object" && obj.item !== null) {
         const item = obj.item;
-        if (item.type === "error") {
+        const itemType = item.type ?? item.item_type;
+        if (itemType === "error") {
           const detail = item.message?.trim() || extractJsonErrorMessage(obj) || "Codex item error";
           return { type: "stderr", data: detail };
         }
-        if (item.type === "agent_message" && item.text) {
+        if (itemType === "agent_message" && item.text) {
           return { type: "stdout", data: item.text };
         }
+        if (itemType === "mcp_tool_call" && item.id && item.server && item.tool) {
+          const name = `mcp__${item.server}__${item.tool}`;
+          const input = asRecord(item.arguments);
+          const events = [
+            { type: "tool_use", id: item.id, name, input }
+          ];
+          const finished = type === "item.completed" || item.status === "completed" || item.status === "failed";
+          if (finished) {
+            const errMsg = item.error && typeof item.error.message === "string" ? item.error.message : void 0;
+            events.push({
+              type: "tool_result",
+              id: item.id,
+              content: unwrapCodexMcpResult(item.result) ?? errMsg,
+              isError: item.status === "failed" || Boolean(errMsg)
+            });
+          }
+          return events.length === 1 ? events[0] : events;
+        }
+        if (itemType === "command_execution" && item.id) {
+          const input = item.command ? { command: item.command } : void 0;
+          const events = [
+            { type: "tool_use", id: item.id, name: "Bash", input }
+          ];
+          if (type === "item.completed" || item.status === "completed" || item.status === "failed") {
+            events.push({
+              type: "tool_result",
+              id: item.id,
+              content: item.aggregated_output,
+              isError: item.status === "failed"
+            });
+          }
+          return events.length === 1 ? events[0] : events;
+        }
         if (item.status === "failed") {
-          const detail = item.message?.trim() || extractJsonErrorMessage(item) || `Codex ${item.type ?? "item"} failed`;
+          const detail = item.message?.trim() || extractJsonErrorMessage(item) || `Codex ${itemType ?? "item"} failed`;
           return { type: "stderr", data: detail };
         }
       }
@@ -1350,6 +1416,75 @@ function usageFromCursor(usage) {
     cacheWriteTokens: usage.cacheWriteTokens ? Number(usage.cacheWriteTokens) : void 0
   };
 }
+function asRecord2(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return void 0;
+}
+function normalizeCursorToolCall(name, args) {
+  const raw = asRecord2(args);
+  const toolName = typeof raw?.toolName === "string" && raw.toolName.trim() ? raw.toolName.trim() : null;
+  const looksLikeMcp = name === "mcp" || toolName != null && (typeof raw?.providerIdentifier === "string" || asRecord2(raw?.args) != null);
+  if (looksLikeMcp && toolName) {
+    const providerRaw = typeof raw.providerIdentifier === "string" && raw.providerIdentifier.trim() ? raw.providerIdentifier.trim() : "sideboard";
+    const provider = providerRaw.replace(/[^a-zA-Z0-9_-]/g, "_");
+    const nested = asRecord2(raw.args);
+    return {
+      name: `mcp__${provider}__${toolName}`,
+      input: nested ?? { toolName }
+    };
+  }
+  return { name, input: raw };
+}
+function unwrapCursorToolResult(result) {
+  if (result == null) return void 0;
+  if (typeof result === "string") return result;
+  const rec = asRecord2(result);
+  if (!rec) {
+    try {
+      return JSON.stringify(result);
+    } catch {
+      return String(result);
+    }
+  }
+  const collectTexts = (items) => {
+    const texts = [];
+    for (const item of items) {
+      const row = asRecord2(item);
+      if (!row) continue;
+      if (typeof row.text === "string") {
+        texts.push(row.text);
+        continue;
+      }
+      const nested = asRecord2(row.text);
+      if (typeof nested?.text === "string") texts.push(nested.text);
+    }
+    return texts;
+  };
+  const value = asRecord2(rec.value);
+  if (value && Array.isArray(value.content)) {
+    const texts = collectTexts(value.content);
+    if (texts.length) return texts.join("\n");
+  }
+  if (Array.isArray(rec.content)) {
+    const texts = collectTexts(rec.content);
+    if (texts.length) return texts.join("\n");
+  }
+  try {
+    return JSON.stringify(result);
+  } catch {
+    return String(result);
+  }
+}
+function cursorToolResultIsError(status, result) {
+  if (status === "error") return true;
+  const rec = asRecord2(result);
+  if (!rec) return false;
+  if (rec.status === "error") return true;
+  const value = asRecord2(rec.value);
+  return value?.isError === true;
+}
 function cursorSdkMessageToEvents(msg) {
   if (!msg?.type) return [];
   if (msg.type === "system" && msg.agent_id) {
@@ -1364,35 +1499,42 @@ function cursorSdkMessageToEvents(msg) {
       if (block?.type === "text" && block.text) {
         out.push({ type: "stdout", data: block.text });
       } else if (block?.type === "tool_use" && block.id && block.name) {
+        const normalized = normalizeCursorToolCall(block.name, block.input);
         out.push({
           type: "tool_use",
           id: block.id,
-          name: block.name,
-          input: block.input && typeof block.input === "object" ? block.input : void 0
+          name: normalized.name,
+          input: normalized.input
         });
       }
     }
     return out;
   }
   if (msg.type === "tool_call" && msg.call_id && msg.name) {
+    const normalized = normalizeCursorToolCall(msg.name, msg.args);
     if (msg.status === "running") {
       return [
         {
           type: "tool_use",
           id: msg.call_id,
-          name: msg.name,
-          input: msg.args && typeof msg.args === "object" ? msg.args : void 0
+          name: normalized.name,
+          input: normalized.input
         }
       ];
     }
     if (msg.status === "completed" || msg.status === "error") {
-      const content = typeof msg.result === "string" ? msg.result : msg.result != null ? JSON.stringify(msg.result) : void 0;
       return [
+        {
+          type: "tool_use",
+          id: msg.call_id,
+          name: normalized.name,
+          input: normalized.input
+        },
         {
           type: "tool_result",
           id: msg.call_id,
-          content,
-          isError: msg.status === "error"
+          content: unwrapCursorToolResult(msg.result),
+          isError: cursorToolResultIsError(msg.status, msg.result)
         }
       ];
     }
@@ -1728,17 +1870,31 @@ var opencodeAdapter = {
         return { type: "stderr", data: detail };
       }
       const sid = typeof obj.sessionID === "string" && obj.sessionID || typeof obj.sessionId === "string" && obj.sessionId || typeof obj.session_id === "string" && obj.session_id;
-      if (sid) return { type: "session_id", data: sid };
+      if (sid && (!obj.type || obj.type === "step_start" || obj.type === "session")) {
+        return { type: "session_id", data: sid };
+      }
       if (obj.type === "text") {
         const text = obj.part?.text ?? obj.text;
         if (text) return { type: "stdout", data: text };
       }
       if (obj.type === "tool_use") {
         const part = obj.part;
-        const id = part?.id ?? obj.id ?? `tool-${Date.now()}`;
-        const name = part?.name ?? part?.tool ?? obj.name ?? obj.tool ?? "tool";
-        const input = part?.input ?? obj.input;
-        return { type: "tool_use", id, name, input };
+        const id = part?.callID ?? part?.id ?? obj.id ?? `tool-${Date.now()}`;
+        const name = part?.tool ?? part?.name ?? obj.tool ?? obj.name ?? "tool";
+        const state = part?.state;
+        const input = (state?.input && typeof state.input === "object" ? state.input : void 0) ?? part?.input ?? obj.input;
+        const events = [{ type: "tool_use", id, name, input }];
+        const output = state?.output;
+        if (output != null || state?.status === "completed" || state?.status === "error") {
+          const content = typeof output === "string" ? output : output != null ? JSON.stringify(output) : formatUnknownDetail(state?.error) || void 0;
+          events.push({
+            type: "tool_result",
+            id,
+            content,
+            isError: state?.status === "error" || state?.status === "failed"
+          });
+        }
+        return events.length === 1 ? events[0] : events;
       }
       if (obj.type === "tool_result") {
         const part = obj.part;
@@ -1766,6 +1922,7 @@ var opencodeAdapter = {
     }
   },
   async resolveSessionId(worktreePath, cached) {
+    const cachedId = cached?.trim() || null;
     const listed = await run(
       "opencode",
       ["session", "list", "--format", "json"],
@@ -1777,15 +1934,21 @@ var opencodeAdapter = {
         if (Array.isArray(sessions) && sessions.length > 0) {
           const norm = (p) => p.replace(/\/+$/, "");
           const wt = norm(worktreePath);
-          const match = sessions.find(
+          const forWorktree = sessions.filter(
             (s) => s.directory && norm(s.directory) === wt || s.path && norm(s.path) === wt
           );
-          if (match?.id) return match.id;
+          if (cachedId && forWorktree.some((s) => s.id === cachedId)) {
+            return cachedId;
+          }
+          if (cachedId && sessions.some((s) => s.id === cachedId)) {
+            return cachedId;
+          }
+          return null;
         }
       } catch {
       }
     }
-    return cached;
+    return cachedId;
   },
   async buildAttach(thread) {
     const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
@@ -2197,6 +2360,7 @@ function allAdapters() {
 export {
   pushTurnStderr,
   summarizeTurnStderr,
+  looksLikeInvalidAgentSession,
   looksLikeAgentFailureMessage,
   fallbackTurnFailDetail,
   humanizeAgentFailDetail,

package/dist/{chunk-HBJSHRY2.js → chunk-C4BCC5X5.js}

@@ -323,6 +323,16 @@ function resolveThreadDefaults(settings = loadAppSettings()) {
     fast: getDefaultFast(settings)
   };
 }
+function resolveNewThreadOptions(overrides = {}, settings = loadAppSettings()) {
+  const defaults = resolveThreadDefaults(settings);
+  const effort = overrides.effort === void 0 || overrides.effort === null ? defaults.effort : normalizeThinkingEffort(overrides.effort) ?? defaults.effort;
+  return {
+    agent: overrides.agent ?? defaults.agent,
+    model: overrides.model === void 0 ? defaults.model : overrides.model?.trim() || null,
+    effort,
+    fast: overrides.fast === void 0 || overrides.fast === null ? defaults.fast : Boolean(overrides.fast)
+  };
+}
 function isLinearConnected(settings = loadAppSettings()) {
   return Boolean(settings.integrations.linearApiKey?.trim());
 }
@@ -342,7 +352,12 @@ function brightsyCloudConnectEnabled(settings = loadAppSettings()) {
   return Boolean(settings.brightsy.cloudConnectEnabled);
 }
 function brightsyCloudConnectAgent(settings = loadAppSettings()) {
-  return settings.brightsy.cloudConnectAgent ?? "claude";
+  const fallback = settings.brightsy.cloudConnectAgent && CLOUD_CONNECT_AGENTS.has(settings.brightsy.cloudConnectAgent) ? settings.brightsy.cloudConnectAgent : "claude";
+  const preferred = getDefaultAgent(settings);
+  if (CLOUD_CONNECT_AGENTS.has(preferred)) {
+    return preferred;
+  }
+  return fallback;
 }
 function updateAdvancedSettings(patch) {
   const current = loadAppSettings();
@@ -470,6 +485,7 @@ export {
   getDefaultEffort,
   getDefaultFast,
   resolveThreadDefaults,
+  resolveNewThreadOptions,
   isLinearConnected,
   getIssueSource,
   resolveEffectiveIssueSource,

package/dist/{chunk-T5QQVXK3.js → chunk-DIOF73S2.js}

@@ -321,6 +321,16 @@ function resolveThreadDefaults(settings = loadAppSettings()) {
     fast: getDefaultFast(settings)
   };
 }
+function resolveNewThreadOptions(overrides = {}, settings = loadAppSettings()) {
+  const defaults = resolveThreadDefaults(settings);
+  const effort = overrides.effort === void 0 || overrides.effort === null ? defaults.effort : normalizeThinkingEffort(overrides.effort) ?? defaults.effort;
+  return {
+    agent: overrides.agent ?? defaults.agent,
+    model: overrides.model === void 0 ? defaults.model : overrides.model?.trim() || null,
+    effort,
+    fast: overrides.fast === void 0 || overrides.fast === null ? defaults.fast : Boolean(overrides.fast)
+  };
+}
 function isLinearConnected(settings = loadAppSettings()) {
   return Boolean(settings.integrations.linearApiKey?.trim());
 }
@@ -340,7 +350,12 @@ function brightsyCloudConnectEnabled(settings = loadAppSettings()) {
   return Boolean(settings.brightsy.cloudConnectEnabled);
 }
 function brightsyCloudConnectAgent(settings = loadAppSettings()) {
-  return settings.brightsy.cloudConnectAgent ?? "claude";
+  const fallback = settings.brightsy.cloudConnectAgent && CLOUD_CONNECT_AGENTS.has(settings.brightsy.cloudConnectAgent) ? settings.brightsy.cloudConnectAgent : "claude";
+  const preferred = getDefaultAgent(settings);
+  if (CLOUD_CONNECT_AGENTS.has(preferred)) {
+    return preferred;
+  }
+  return fallback;
 }
 function updateAdvancedSettings(patch) {
   const current = loadAppSettings();
@@ -468,6 +483,7 @@ export {
   getDefaultEffort,
   getDefaultFast,
   resolveThreadDefaults,
+  resolveNewThreadOptions,
   isLinearConnected,
   getIssueSource,
   resolveEffectiveIssueSource,

package/dist/{chunk-UEAHMGHW.js → chunk-DQJ5D42H.js}

@@ -3,6 +3,9 @@
 import {
   resolveGithubRepoSlug
 } from "./chunk-XOU6HNQJ.js";
+import {
+  resolveThreadDefaults
+} from "./chunk-C4BCC5X5.js";
 import {
   globalAgentCwd,
   sideboardReposDir
@@ -45,12 +48,12 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   "- list_workspaces \u2014 registered repos (path + github slug when known)",
   "- list_branches / list_prs / list_issues \u2014 pass repoPath from list_workspaces (issues: Linear API or GitHub Issues)",
   "- get_pr_stack / open_pr_stack_layers / add_stack_layer / create_pr_stack \u2014 GitHub stacked PRs (`gh stack`); one worktree per layer",
-  "- list_models \u2014 only when you need a specific model (rare); otherwise leave model unset = Auto",
+  "- list_models \u2014 only when you need a specific model (rare); otherwise omit model so Account defaults apply",
   "- list_threads / get_thread \u2014 fleet status (what is going on)",
   "Workspaces:",
   "- add_workspace / remove_workspace \u2014 register or unregister a git repo",
   "Worktree threads (chats):",
-  "- create_thread \u2014 create a worktree + chat from branch | pr | ticket; pass repoPath + parentThreadId",
+  "- create_thread \u2014 create a worktree + chat from branch | pr | ticket; pass repoPath + parentThreadId; omit agent and model to use Sideboard Account defaults (Settings \u2192 Default agent, model & effort)",
   "- fork_worktree \u2014 fork a worktree chat into a NEW git worktree + chat (transcript attached); optional agent; leave model unset (Auto) unless you have a reason. Not for orchestration chats.",
   "- fork_chat \u2014 fork a worktree chat (same worktree tab) OR a Global orchestration chat (new orchestration tab); optional agent; leave model unset (Auto) unless you have a reason. Remote coordinators: use this to continue another orchestration chat on a different agent after session limits.",
   "- send_to_thread \u2014 queue a prompt (start/continue a chat turn); pass force_stop: true to interrupt mid-turn / clear stale queued prompts before replacing with a new request",
@@ -68,6 +71,11 @@ var COORDINATOR_TOOL_PLAYBOOK = [
   "Thread links in replies: when mentioning a chat/thread for the user, include a markdown link `[Title](sideboard://thread/<id>)` using the full id (or the link field from create_thread / list_threads). Sideboard renders these as clickable opens.",
   "Bash / Read / etc: allowed for (1) inspecting target worktrees / registered repo paths from MCP, and (2) greenfield setup under ~/sideboard/repos (git clone, gh repo create, git init+remote). Never git init/clone *inside* this synthetic home cwd \u2014 emptiness here is expected, not a bug."
 ].join("\n");
+function accountDefaultsPlaybookLine() {
+  const d = resolveThreadDefaults();
+  const model = d.model?.trim() || "Auto";
+  return `- Account defaults for create_thread (omit agent/model to use these): agent=${d.agent}, model=${model}, effort=${d.effort}`;
+}
 function coordinatorTurnReminder(opts) {
   const goal = opts.goal?.trim();
   return [
@@ -77,6 +85,7 @@ function coordinatorTurnReminder(opts) {
     "- Registered workspaces / child threads are the fleet you manage via Sideboard MCP.",
     `- Parent thread id (pass as parentThreadId when creating children): ${opts.parentId}`,
     goal ? `- Goal / title: ${goal}` : null,
+    accountDefaultsPlaybookLine(),
     `- For "what's going on": call list_threads (and list_workspaces if needed). Summarize fleet status \u2014 do not ls/git-status this synthetic home.`,
     "- Existing repo: create_thread on a repoPath \u2192 send_to_thread \u2192 wait_for_turn.",
     "- New repo: Bash (clone or gh repo create under ~/sideboard/repos/<name>) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 draft PR.",
@@ -99,9 +108,12 @@ function ensureGlobalCoordinatorCwd() {
     "",
     COORDINATOR_TOOL_PLAYBOOK,
     "",
+    accountDefaultsPlaybookLine(),
+    "",
     coordinatorGreenfieldPlaybook(reposDir),
     "",
     "When creating threads, pass `repoPath` from `list_workspaces` (or the path you just registered) and `parentThreadId` for children.",
+    "Omit `agent` / `model` on `create_thread` unless you have a reason to override Account defaults.",
     "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn.",
     "Typical flow (new app): Bash create/clone under repos dir \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 draft PR via worktree agent.",
     "Always ask worktree agents to open draft PRs (`send_to_thread` + `gh pr create --draft -R <origin>`); never open PRs from the orchestrator."
@@ -127,8 +139,10 @@ function coordinatorSystemPrompt(opts) {
     "You operate across ALL registered workspaces below.",
     "You have no project git home \u2014 this process cwd is synthetic and empty on purpose.",
     COORDINATOR_TOOL_PLAYBOOK,
+    accountDefaultsPlaybookLine(),
     coordinatorGreenfieldPlaybook(reposDir),
     "When creating threads, pass the correct repoPath for the target workspace and parentThreadId for children.",
+    "Omit agent/model on create_thread unless you need to override Account defaults.",
     "Typical flow (existing): list_workspaces \u2192 list_branches|list_prs|list_issues \u2192 create_thread \u2192 send_to_thread (implement) \u2192 wait_for_turn \u2192 send_to_thread (ask for `gh pr create --draft -R <origin-owner/name>` using the workspace github slug) \u2192 wait_for_turn. Never target upstream. Never open PRs from the orchestrator.",
     "Typical flow (new app): Bash under repos dir (clone or gh repo create) \u2192 add_workspace \u2192 create_thread \u2192 send_to_thread \u2192 wait_for_turn \u2192 draft PR via worktree agent.",
     `Goal: ${opts.goal}`,