@sideboard-ai/core 0.1.62 → 0.1.67

package/dist/{chunk-2MCNURQV.js → chunk-K7LM4CLD.js}

@@ -6,20 +6,30 @@ import {
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens,
   loadBrightsyConfig
-} from "./chunk-JB2H7E7V.js";
+} from "./chunk-M5V4QIWF.js";
 import {
-  ensureAgentPath,
-  run
-} from "./chunk-RIWUU7FO.js";
+  isOrchestratorThread
+} from "./chunk-JWZNK3CQ.js";
+import {
+  enrichPathWithNpmGlobalBin,
+  isConductorBundledCli,
+  resolveCommandBinarySync,
+  run,
+  withExportedPath
+} from "./chunk-FGDJOJ2L.js";
 import {
   claudeChromeEnabled,
   loadAppSettings,
+  resolveAgentExecutable,
   resolveClaudeExecutable
-} from "./chunk-DDN3UF4R.js";
+} from "./chunk-BPOTVI5J.js";
 import {
   appDataDir
 } from "./chunk-7MV3RXSC.js";
 
+// src/agents/brightsy.ts
+import { existsSync } from "fs";
+
 // src/agents/brightsy-targets.ts
 function encodeBrightsyTarget(type, id, accountId) {
   if (accountId) return `team:${accountId}:${type}:${id}`;
@@ -176,6 +186,11 @@ function normalizeTurnInput(input) {
   if (typeof input === "string") return { prompt: input };
   return { prompt: input.prompt, cachedPrefix: input.cachedPrefix?.trim() || void 0 };
 }
+function dropCachedPrefixOnResume(input, sessionId) {
+  const turn = normalizeTurnInput(input);
+  if (sessionId) return { prompt: turn.prompt };
+  return turn;
+}
 function flattenTurnInput(input) {
   const { cachedPrefix, prompt } = normalizeTurnInput(input);
   if (!cachedPrefix) return prompt;
@@ -315,9 +330,13 @@ async function fetchTeamChatTargets(team) {
   };
 }
 async function listBrightsyChatTargetsViaCli() {
-  const listed = await run("brightsy", ["chat", "--list-targets", "--json"], {
-    reject: false
-  });
+  const listed = await run(
+    resolveAgentExecutable("brightsy"),
+    ["chat", "--list-targets", "--json"],
+    {
+      reject: false
+    }
+  );
   if (listed.exitCode !== 0 || !listed.stdout.trim()) {
     throw new Error(
       listed.stderr.trim() || "Failed to list Brightsy chat targets \u2014 is `brightsy` installed and logged in?"
@@ -404,18 +423,32 @@ async function syncCliForTarget(accountId) {
 var brightsyAdapter = {
   kind: "brightsy",
   async detect() {
-    const which = await run("which", ["brightsy"], { reject: false });
-    if (which.exitCode !== 0) {
-      return {
-        agent: "brightsy",
-        installed: false,
-        authenticated: false,
-        linearMcp: false,
-        warnings: [],
-        reason: "brightsy CLI not found on PATH \u2014 npm i -g @brightsy/cli"
-      };
+    const brightsy = resolveAgentExecutable("brightsy");
+    if (brightsy !== "brightsy") {
+      if (!existsSync(brightsy)) {
+        return {
+          agent: "brightsy",
+          installed: false,
+          authenticated: false,
+          linearMcp: false,
+          warnings: [],
+          reason: `Brightsy executable not found: ${brightsy}`
+        };
+      }
+    } else {
+      const which = await run("which", ["brightsy"], { reject: false });
+      if (which.exitCode !== 0) {
+        return {
+          agent: "brightsy",
+          installed: false,
+          authenticated: false,
+          linearMcp: false,
+          warnings: [],
+          reason: "brightsy CLI not found on PATH \u2014 npm i -g @brightsy/cli"
+        };
+      }
     }
-    const who = await run("brightsy", ["whoami"], { reject: false });
+    const who = await run(brightsy, ["whoami"], { reject: false });
     const authenticated = who.exitCode === 0 && /logged in as/i.test(who.stdout);
     return {
       agent: "brightsy",
@@ -440,7 +473,7 @@ var brightsyAdapter = {
       target.id
     ];
     return {
-      file: "brightsy",
+      file: resolveAgentExecutable("brightsy"),
       args,
       cwd: thread.worktreePath,
       // Piped stdin becomes the message body (avoids ARG_MAX for long seeds).
@@ -457,12 +490,16 @@ var brightsyAdapter = {
     const target = decodeBrightsyTarget(thread.model);
     await syncCliForTarget(target.accountId);
     const args = target.type === "model" ? ["chat", "--model", target.id] : ["chat", "--agent", target.id];
-    return { file: "brightsy", args, cwd: thread.worktreePath };
+    return {
+      file: resolveAgentExecutable("brightsy"),
+      args,
+      cwd: thread.worktreePath
+    };
   }
 };
 
 // src/agents/claude.ts
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 
 // src/agents/claude-mcp.ts
 function parseMcpList(text) {
@@ -499,12 +536,18 @@ function mcpAllowTools(servers) {
 }
 
 // src/agents/injected-mcp.ts
-import { existsSync, mkdtempSync, writeFileSync } from "fs";
+import { existsSync as existsSync2, mkdtempSync, writeFileSync } from "fs";
 import { createRequire } from "module";
 import { tmpdir } from "os";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 
+// src/mcp/profile.ts
+var SIDEBOARD_MCP_PROFILE_ENV = "SIDEBOARD_MCP_PROFILE";
+function sideboardMcpProfile(env = process.env) {
+  return env[SIDEBOARD_MCP_PROFILE_ENV]?.trim().toLowerCase() === "worktree" ? "worktree" : "orchestration";
+}
+
 // src/agents/node-launch.ts
 function isAsarPath(filePath) {
   return /\.asar([/\\]|$)/.test(filePath);
@@ -558,6 +601,39 @@ function isBrightsyConnected() {
     return false;
   }
 }
+var BRIGHTSY_WORD = /(?<![a-z0-9_-])brightsy(?![a-z0-9_-])/i;
+function promptMentionsBrightsy(text) {
+  return BRIGHTSY_WORD.test(text ?? "");
+}
+function isBrightsyMcpToolName(name) {
+  const n = name.toLowerCase();
+  return n === "brightsy" || n.startsWith("mcp__brightsy") || n.startsWith("brightsy_");
+}
+function toolInputUsesBrightsyDatasource(input) {
+  const ds = input?.datasource;
+  return typeof ds === "string" && ds.toLowerCase() === "brightsy";
+}
+function messageUsedBrightsyMcp(msg) {
+  if (msg.role === "user" && promptMentionsBrightsy(msg.text)) return true;
+  for (const part of msg.parts ?? []) {
+    if (part.type !== "tool") continue;
+    if (isBrightsyMcpToolName(part.name)) return true;
+    if (/present_(schema|files)$/i.test(part.name) && toolInputUsesBrightsyDatasource(part.input)) {
+      return true;
+    }
+  }
+  return false;
+}
+function threadRequestsBrightsyMcp(thread) {
+  return (thread?.messages ?? []).some(messageUsedBrightsyMcp);
+}
+function shouldInjectBrightsyMcp(thread, opts) {
+  if (!(opts?.connected ?? isBrightsyConnected())) return false;
+  if (opts?.orchestrator) return true;
+  const alwaysOn = opts?.alwaysOnWorktree ?? Boolean(loadAppSettings().brightsy?.injectWorktreeMcp);
+  if (alwaysOn) return true;
+  return threadRequestsBrightsyMcp(thread);
+}
 function mcpLaunch(cmd, name, env) {
   if (cmd === "brightsy-mcp") {
     return { name, command: "brightsy-mcp", ...env ? { env } : {} };
@@ -603,7 +679,7 @@ function corePackageDir() {
 }
 function findSideboardMcpJsEntry() {
   const override = process.env.SIDEBOARD_MCP_ENTRY?.trim() || process.env.SIDEBOARD_CLI?.trim();
-  if (override && existsSync(override)) return override;
+  if (override && existsSync2(override)) return override;
   let dir = corePackageDir();
   for (let i = 0; i < 10; i++) {
     const candidates = [
@@ -616,7 +692,7 @@ function findSideboardMcpJsEntry() {
       join(dir, "cli/dist/index.js")
     ];
     for (const p of candidates) {
-      if (existsSync(p)) return p;
+      if (existsSync2(p)) return p;
     }
     const parent = dirname(dir);
     if (parent === dir) break;
@@ -647,11 +723,13 @@ async function buildInjectedMcpServers(opts) {
   const servers = [];
   if (opts.includeSideboard) {
     const sideboard = await resolveSideboardMcpServer();
+    const orchId = opts.orchestratorThreadId?.trim();
+    const profile = orchId ? "orchestration" : "worktree";
     sideboard.env = {
       ...sideboard.env ?? {},
-      SIDEBOARD_APP_DATA: appDataDir()
+      SIDEBOARD_APP_DATA: appDataDir(),
+      [SIDEBOARD_MCP_PROFILE_ENV]: profile
     };
-    const orchId = opts.orchestratorThreadId?.trim();
     if (orchId) {
       sideboard.env.SIDEBOARD_ORCHESTRATOR_THREAD_ID = orchId;
     }
@@ -873,7 +951,7 @@ var claudeAdapter = {
   async detect() {
     const claude = resolveClaudeExecutable();
     if (claude !== "claude") {
-      if (!existsSync2(claude)) {
+      if (!existsSync3(claude)) {
         return {
           agent: "claude",
           installed: false,
@@ -912,9 +990,8 @@ var claudeAdapter = {
   },
   async buildTurn(thread, input) {
     const claude = resolveClaudeExecutable();
-    const turn = normalizeTurnInput(input);
     const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
-    const effective = sessionId ? { prompt: turn.prompt } : turn;
+    const effective = dropCachedPrefixOnResume(input, sessionId);
     const promptText = flattenTurnInput(effective);
     const useStdin = promptText.length > CLAUDE_PROMPT_ARG_MAX;
     if (process.env.SIDEBOARD_DEBUG_CLAUDE_TURN === "1") {
@@ -923,11 +1000,13 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread } = await import("./global-workspace-YOAUQCMA.js");
-    const isOrchestrator = isOrchestratorThread(thread);
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-YZ2NJVLL.js");
+    const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,
-      includeBrightsy: isBrightsyConnected(),
+      includeBrightsy: shouldInjectBrightsyMcp(thread, {
+        orchestrator: isOrchestrator
+      }),
       orchestratorThreadId: isOrchestrator ? thread.id : null
     });
     const injectedBrightsyNames = injectedServers.filter((s) => s.name === "brightsy" || s.name.startsWith("brightsy_")).map((s) => s.name);
@@ -1119,7 +1198,7 @@ function parseIssuesJson(raw) {
 }
 
 // src/agents/codex.ts
-import { existsSync as existsSync3, readFileSync, statSync } from "fs";
+import { existsSync as existsSync4, readFileSync, statSync } from "fs";
 import { homedir } from "os";
 import { join as join2 } from "path";
 var CODEX_PROMPT_ARG_MAX = 2e5;
@@ -1137,9 +1216,14 @@ async function listCodexModels() {
   if (cachedCodexModels && now - cachedCodexModels.at < CODEX_MODEL_CACHE_MS) {
     return cachedCodexModels.models;
   }
-  const which = await run("which", ["codex"], { reject: false });
-  if (which.exitCode !== 0) return FALLBACK_CODEX_MODELS;
-  const listed = await run("codex", ["debug", "models"], { reject: false });
+  const codex = resolveAgentExecutable("codex");
+  if (codex === "codex") {
+    const which = await run("which", ["codex"], { reject: false });
+    if (which.exitCode !== 0) return FALLBACK_CODEX_MODELS;
+  } else if (!existsSync4(codex)) {
+    return FALLBACK_CODEX_MODELS;
+  }
+  const listed = await run(codex, ["debug", "models"], { reject: false });
   if (listed.exitCode !== 0 || !listed.stdout.trim()) {
     return cachedCodexModels?.models ?? FALLBACK_CODEX_MODELS;
   }
@@ -1178,7 +1262,7 @@ function codexConfigHasNetworkAccess() {
     join2(homedir(), ".config", "codex", "config.toml")
   ];
   for (const path of candidates) {
-    if (!existsSync3(path)) continue;
+    if (!existsSync4(path)) continue;
     const text = readFileSync(path, "utf8");
     if (/network_access\s*=\s*true/.test(text)) return true;
   }
@@ -1212,7 +1296,7 @@ function asRecord(value) {
 }
 function codexLooksAuthenticated() {
   const authPath = join2(homedir(), ".codex", "auth.json");
-  if (!existsSync3(authPath)) return false;
+  if (!existsSync4(authPath)) return false;
   try {
     return statSync(authPath).size > 2;
   } catch {
@@ -1222,16 +1306,30 @@ function codexLooksAuthenticated() {
 var codexAdapter = {
   kind: "codex",
   async detect() {
-    const which = await run("which", ["codex"], { reject: false, timeoutMs: 3e3 });
-    if (which.exitCode !== 0) {
-      return {
-        agent: "codex",
-        installed: false,
-        authenticated: false,
-        linearMcp: false,
-        warnings: [],
-        reason: "codex CLI not found on PATH"
-      };
+    const codex = resolveAgentExecutable("codex");
+    if (codex !== "codex") {
+      if (!existsSync4(codex)) {
+        return {
+          agent: "codex",
+          installed: false,
+          authenticated: false,
+          linearMcp: false,
+          warnings: [],
+          reason: `Codex executable not found: ${codex}`
+        };
+      }
+    } else {
+      const which = await run("which", ["codex"], { reject: false, timeoutMs: 3e3 });
+      if (which.exitCode !== 0) {
+        return {
+          agent: "codex",
+          installed: false,
+          authenticated: false,
+          linearMcp: false,
+          warnings: [],
+          reason: "codex CLI not found on PATH"
+        };
+      }
     }
     const authenticated = codexLooksAuthenticated();
     const linearMcp = false;
@@ -1251,22 +1349,24 @@ var codexAdapter = {
     };
   },
   async buildTurn(thread, input) {
-    const prompt = flattenTurnInput(input);
     const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
+    const prompt = flattenTurnInput(dropCachedPrefixOnResume(input, sessionId));
     const useStdin = prompt.length > CODEX_PROMPT_ARG_MAX;
     const promptArg = useStdin ? "-" : prompt;
     if (process.env.SIDEBOARD_DEBUG_CODEX_TURN === "1") {
-      const { cachedPrefix } = normalizeTurnInput(input);
       console.error(
-        `[sideboard/codex] promptChars=${prompt.length} resumed=${Boolean(sessionId)} stdin=${useStdin} hasPrefix=${Boolean(cachedPrefix)}`
+        `[sideboard/codex] promptChars=${prompt.length} resumed=${Boolean(sessionId)} stdin=${useStdin} hasPrefix=${prompt.includes("Current request:")}`
       );
     }
     const mode = permissionMode(thread);
     const model = thread.model?.trim();
+    const isOrchestrator = isOrchestratorThread(thread);
     const injected = await buildInjectedMcpServers({
       includeSideboard: true,
-      includeBrightsy: isBrightsyConnected(),
-      orchestratorThreadId: thread.sourceType === "orchestration" ? thread.id : null
+      includeBrightsy: shouldInjectBrightsyMcp(thread, {
+        orchestrator: isOrchestrator
+      }),
+      orchestratorThreadId: isOrchestrator ? thread.id : null
     });
     const mcpOverrides = toCodexMcpConfigArgs(injected);
     const execOpts = [
@@ -1286,7 +1386,7 @@ var codexAdapter = {
     ];
     const args = sessionId ? ["exec", ...execOpts, "resume", sessionId, promptArg] : ["exec", ...execOpts, promptArg];
     return {
-      file: "codex",
+      file: resolveAgentExecutable("codex"),
       args,
       cwd: thread.worktreePath,
       stdin: useStdin ? `${prompt}
@@ -1382,16 +1482,17 @@ var codexAdapter = {
     return cached;
   },
   async buildAttach(thread) {
+    const codex = resolveAgentExecutable("codex");
     const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
     if (sessionId) {
       return {
-        file: "codex",
+        file: codex,
         args: ["exec", "--cd", thread.worktreePath, "resume", sessionId],
         cwd: thread.worktreePath
       };
     }
     return {
-      file: "codex",
+      file: codex,
       args: ["--cd", thread.worktreePath],
       cwd: thread.worktreePath
     };
@@ -1399,7 +1500,7 @@ var codexAdapter = {
   async listLinearIssues(_repoPath) {
     const prompt = "List my assigned Linear issues as JSON array only: id, identifier, title, url, labels.";
     const { stdout, exitCode } = await run(
-      "codex",
+      resolveAgentExecutable("codex"),
       [
         "exec",
         "--json",
@@ -1424,7 +1525,7 @@ var codexAdapter = {
 };
 
 // src/agents/cursor.ts
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 import { createRequire as createRequire2 } from "module";
 import { dirname as dirname2, join as join3 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -1668,7 +1769,7 @@ function cursorRunnerPath() {
     join3(root, "src", "agents", "cursor-runner.ts")
   ];
   for (const candidate of candidates) {
-    if (existsSync4(candidate)) return candidate;
+    if (existsSync5(candidate)) return candidate;
   }
   return candidates[0];
 }
@@ -1695,13 +1796,16 @@ var cursorAdapter = {
     };
   },
   async buildTurn(thread, input) {
-    const prompt = flattenTurnInput(input);
     const agentId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
+    const prompt = flattenTurnInput(dropCachedPrefixOnResume(input, agentId));
     const apiKey = resolveCursorApiKey() || void 0;
+    const isOrchestrator = isOrchestratorThread(thread);
     const injected = await buildInjectedMcpServers({
       includeSideboard: true,
-      includeBrightsy: isBrightsyConnected(),
-      orchestratorThreadId: thread.sourceType === "orchestration" ? thread.id : null
+      includeBrightsy: shouldInjectBrightsyMcp(thread, {
+        orchestrator: isOrchestrator
+      }),
+      orchestratorThreadId: isOrchestrator ? thread.id : null
     });
     const mcpServers = toCursorMcpServers(injected);
     const req = {
@@ -1747,6 +1851,7 @@ var cursorAdapter = {
 };
 
 // src/agents/opencode.ts
+import { existsSync as existsSync6 } from "fs";
 var FALLBACK_OPENCODE_MODELS = [
   { id: "opencode/big-pickle", displayName: "opencode \xB7 big-pickle" },
   {
@@ -1783,9 +1888,14 @@ async function listOpencodeModels() {
   if (cachedOpencodeModels && now - cachedOpencodeModels.at < OPENCODE_MODEL_CACHE_MS) {
     return cachedOpencodeModels.models;
   }
-  const which = await run("which", ["opencode"], { reject: false });
-  if (which.exitCode !== 0) return FALLBACK_OPENCODE_MODELS;
-  const listed = await run("opencode", ["models"], { reject: false });
+  const opencode = resolveAgentExecutable("opencode");
+  if (opencode === "opencode") {
+    const which = await run("which", ["opencode"], { reject: false });
+    if (which.exitCode !== 0) return FALLBACK_OPENCODE_MODELS;
+  } else if (!existsSync6(opencode)) {
+    return FALLBACK_OPENCODE_MODELS;
+  }
+  const listed = await run(opencode, ["models"], { reject: false });
   if (listed.exitCode !== 0 || !listed.stdout.trim()) {
     return cachedOpencodeModels?.models ?? FALLBACK_OPENCODE_MODELS;
   }
@@ -1815,20 +1925,34 @@ function usageFromOpencode(tokens) {
 var opencodeAdapter = {
   kind: "opencode",
   async detect() {
-    const which = await run("which", ["opencode"], { reject: false });
-    if (which.exitCode !== 0) {
-      return {
-        agent: "opencode",
-        installed: false,
-        authenticated: false,
-        linearMcp: false,
-        warnings: [],
-        reason: "opencode CLI not found on PATH"
-      };
+    const opencode = resolveAgentExecutable("opencode");
+    if (opencode !== "opencode") {
+      if (!existsSync6(opencode)) {
+        return {
+          agent: "opencode",
+          installed: false,
+          authenticated: false,
+          linearMcp: false,
+          warnings: [],
+          reason: `OpenCode executable not found: ${opencode}`
+        };
+      }
+    } else {
+      const which = await run("which", ["opencode"], { reject: false });
+      if (which.exitCode !== 0) {
+        return {
+          agent: "opencode",
+          installed: false,
+          authenticated: false,
+          linearMcp: false,
+          warnings: [],
+          reason: "opencode CLI not found on PATH"
+        };
+      }
     }
-    const auth = await run("opencode", ["auth", "list"], { reject: false });
+    const auth = await run(opencode, ["auth", "list"], { reject: false });
     const authenticated = auth.exitCode === 0 && auth.stdout.trim().length > 0;
-    const mcp = await run("opencode", ["mcp", "list"], { reject: false });
+    const mcp = await run(opencode, ["mcp", "list"], { reject: false });
     const linearMcp = /linear/i.test(mcp.stdout + mcp.stderr);
     return {
       agent: "opencode",
@@ -1840,8 +1964,8 @@ var opencodeAdapter = {
     };
   },
   async buildTurn(thread, input) {
-    const prompt = flattenTurnInput(input);
     const sessionId = await this.resolveSessionId(thread.worktreePath, thread.sessionId);
+    const prompt = flattenTurnInput(dropCachedPrefixOnResume(input, sessionId));
     const mode = permissionMode(thread);
     const model = thread.model?.trim();
     const args = [
@@ -1857,14 +1981,17 @@ var opencodeAdapter = {
     if (model) {
       args.push("--model", model);
     }
+    const isOrchestrator = isOrchestratorThread(thread);
     const injected = await buildInjectedMcpServers({
       includeSideboard: true,
-      includeBrightsy: isBrightsyConnected(),
-      orchestratorThreadId: thread.sourceType === "orchestration" ? thread.id : null
+      includeBrightsy: shouldInjectBrightsyMcp(thread, {
+        orchestrator: isOrchestrator
+      }),
+      orchestratorThreadId: isOrchestrator ? thread.id : null
     });
     const mcpContent = injected.length > 0 ? toOpencodeMcpConfigContent(injected) : null;
     return {
-      file: "opencode",
+      file: resolveAgentExecutable("opencode"),
       args,
       cwd: thread.worktreePath,
       // `opencode run` treats non-TTY stdin as the message body when no positional
@@ -1940,7 +2067,7 @@ var opencodeAdapter = {
   async resolveSessionId(worktreePath, cached) {
     const cachedId = cached?.trim() || null;
     const listed = await run(
-      "opencode",
+      resolveAgentExecutable("opencode"),
       ["session", "list", "--format", "json"],
       { cwd: worktreePath, reject: false }
     );
@@ -1971,7 +2098,7 @@ var opencodeAdapter = {
     const args = ["--dir", thread.worktreePath];
     if (sessionId) args.push("--session", sessionId);
     return {
-      file: "opencode",
+      file: resolveAgentExecutable("opencode"),
       args,
       cwd: thread.worktreePath,
       env: {
@@ -1982,7 +2109,7 @@ var opencodeAdapter = {
   async listLinearIssues(_repoPath) {
     const prompt = "List my assigned Linear issues as JSON array only: id, identifier, title, url, labels.";
     const { stdout, exitCode } = await run(
-      "opencode",
+      resolveAgentExecutable("opencode"),
       ["run", prompt, "--format", "json"],
       {
         reject: false,
@@ -2237,15 +2364,48 @@ var SETUP = {
     npmPackage: "@brightsy/cli"
   }
 };
+var CLI_BIN = {
+  claude: "claude",
+  codex: "codex",
+  opencode: "opencode",
+  brightsy: "brightsy"
+};
 function getAgentSetupInfo(agent) {
   return SETUP[agent];
 }
 function listAgentSetupInfo() {
   return Object.values(SETUP);
 }
-async function openInSystemTerminal(command) {
-  ensureAgentPath();
+var CLI_LOGIN_AGENTS = /* @__PURE__ */ new Set([
+  "claude",
+  "codex",
+  "opencode",
+  "brightsy"
+]);
+function resolveLoginCommand(agent) {
+  const info = getAgentSetupInfo(agent);
+  if (!info.loginCommand) return null;
+  if (!CLI_LOGIN_AGENTS.has(agent)) return info.loginCommand;
+  const exe = resolveAgentExecutable(agent);
+  return info.loginCommand.replace(/^\S+/, exe);
+}
+async function prepareTerminalCommand(command) {
+  enrichPathWithNpmGlobalBin();
   const trimmed = command.trim();
+  if (!trimmed) return trimmed;
+  if (/^(export\s+PATH=|PATH=)/.test(trimmed)) return trimmed;
+  const match = /^(\S+)(\s[\s\S]*)?$/.exec(trimmed);
+  const bin = match?.[1];
+  let whichPath = null;
+  if (bin && !bin.includes("/") && !bin.includes("\\")) {
+    const which = await run("which", [bin], { reject: false, timeoutMs: 3e3 });
+    whichPath = which.exitCode === 0 ? which.stdout.trim() : null;
+  }
+  const resolved = resolveCommandBinarySync(trimmed, whichPath);
+  return withExportedPath(resolved, process.env.PATH ?? "");
+}
+async function openInSystemTerminal(command) {
+  const trimmed = (await prepareTerminalCommand(command)).trim();
   if (!trimmed) throw new Error("Command is empty");
   if (process.platform === "darwin") {
     const escaped = trimmed.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
@@ -2286,6 +2446,11 @@ async function openInSystemTerminal(command) {
     `No terminal found to run: ${trimmed}. Install gnome-terminal (or similar), or run the command manually.`
   );
 }
+async function whichCli(bin) {
+  const which = await run("which", [bin], { reject: false, timeoutMs: 3e3 });
+  if (which.exitCode !== 0) return null;
+  return which.stdout.trim().split(/\r?\n/).find(Boolean) ?? null;
+}
 async function installAgent(agent) {
   const info = getAgentSetupInfo(agent);
   if (info.kind === "bundled-sdk" || info.kind === "api-key") {
@@ -2306,7 +2471,18 @@ async function installAgent(agent) {
       message: `Opened Terminal to run: ${info.installCommand}`
     };
   }
-  ensureAgentPath();
+  enrichPathWithNpmGlobalBin();
+  const cliBin = agent === "cursor" ? null : CLI_BIN[agent];
+  if (cliBin) {
+    const existing = await whichCli(cliBin);
+    if (existing) {
+      return {
+        ok: true,
+        command: existing,
+        message: isConductorBundledCli(existing) ? `Using Conductor\u2019s ${cliBin} at ${existing}. No extra install \u2014 Log in only if auth is missing.` : `Already on PATH: ${existing}`
+      };
+    }
+  }
   const result = await run("npm", ["install", "-g", info.npmPackage], { reject: false });
   const ok = result.exitCode === 0;
   if (!ok) {
@@ -2332,29 +2508,36 @@ async function installAgent(agent) {
       };
     }
   }
+  enrichPathWithNpmGlobalBin();
+  let binPath = null;
+  if (cliBin) {
+    binPath = await whichCli(cliBin);
+  }
   return {
     ok: true,
     command: info.installCommand,
     exitCode: 0,
     stdout: result.stdout,
     stderr: result.stderr,
-    message: `Installed ${info.npmPackage}`
+    message: binPath ? `Installed ${info.npmPackage} \u2192 ${binPath}` : `Installed ${info.npmPackage} (CLI not yet on PATH \u2014 Log in still exports Electron\u2019s PATH into Terminal)`
   };
 }
 async function loginAgent(agent) {
   const info = getAgentSetupInfo(agent);
-  if (!info.loginCommand) {
+  const loginCommand = resolveLoginCommand(agent);
+  if (!loginCommand) {
     return {
       ok: true,
       message: info.kind === "bundled-sdk" || info.kind === "api-key" ? info.summary : `No login command for ${agent}`
     };
   }
-  await openInSystemTerminal(info.loginCommand);
+  const prepared = await prepareTerminalCommand(loginCommand);
+  await openInSystemTerminal(prepared);
   return {
     ok: true,
     openedTerminal: true,
-    command: info.loginCommand,
-    message: `Opened Terminal to run: ${info.loginCommand}`
+    command: prepared,
+    message: `Opened Terminal to run: ${prepared}`
   };
 }
 
@@ -2386,6 +2569,7 @@ export {
   parseBrightsyCliLine,
   listBrightsyChatTargets,
   brightsyAdapter,
+  sideboardMcpProfile,
   PLAN_MODE_INSTRUCTION,
   permissionMode,
   claudeAdapter,
@@ -2406,6 +2590,8 @@ export {
   resolveQuotaFallbackAgent,
   getAgentSetupInfo,
   listAgentSetupInfo,
+  resolveLoginCommand,
+  prepareTerminalCommand,
   openInSystemTerminal,
   installAgent,
   loginAgent,