claudish 10.6.2 → 10.6.3

package/dist/index.js

@@ -112,9 +112,25 @@ import { realpathSync } from "fs";
 function isPaneShellManagedKey(key) {
   return key.startsWith("MAGMUX_") || PANE_SHELL_MANAGED_KEYS.includes(key);
 }
-function isPaneChild(env = process.env) {
+function inMcpSession(env = process.env) {
   return env[ENV.CLAUDISH_PANE_CHILD] === "1";
 }
+function isPaneChild(env = process.env) {
+  return inMcpSession(env) && Boolean(env[ENV.CLAUDISH_PANE_CWD]);
+}
+function nestedLaunchRefusal(env = process.env) {
+  if (!inMcpSession(env) || isPaneChild(env))
+    return null;
+  return NESTED_SESSION_REFUSAL;
+}
+function assertNotNested(env = process.env) {
+  const reason = nestedLaunchRefusal(env);
+  if (reason === null)
+    return;
+  process.stderr.write(`claudish: nested session refused: ${reason}
+`);
+  process.exit(PANE_CHILD_REFUSED_EXIT);
+}
 function applyPaneEnvSnapshot(env) {
   const raw = env[ENV.CLAUDISH_PANE_ENV];
   if (raw === undefined)
@@ -207,14 +223,10 @@ function assertPaneChildInteractive(config, env = process.env) {
   if (reason !== null)
     refuse(reason);
 }
-var PANE_CHILD_REFUSED_EXIT = 64, PANE_MARKER_VARS, PANE_SHELL_MANAGED_KEYS, processCwdOps, bootNotes, bootstrapped = false;
+var PANE_CHILD_REFUSED_EXIT = 64, PANE_LAUNCH_VARS, PANE_SHELL_MANAGED_KEYS, NESTED_SESSION_REFUSAL = "already inside a session started by the claudish MCP server; one level of nesting is the limit", processCwdOps, bootNotes, bootstrapped = false;
 var init_child_env = __esm(() => {
   init_config();
-  PANE_MARKER_VARS = [
-    ENV.CLAUDISH_PANE_CHILD,
-    ENV.CLAUDISH_PANE_ENV,
-    ENV.CLAUDISH_PANE_CWD
-  ];
+  PANE_LAUNCH_VARS = [ENV.CLAUDISH_PANE_ENV, ENV.CLAUDISH_PANE_CWD];
   PANE_SHELL_MANAGED_KEYS = [
     "COLUMNS",
     "LINES",
@@ -889,7 +901,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "10.6.2";
+var VERSION = "10.6.3";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -61914,7 +61926,7 @@ function buildLauncherScript(claudeBinary, claudeArgs, deltas) {
 }
 function magmuxPaneCapability(input) {
   const parentEnv = input.parentEnv ?? process.env;
-  if (isPaneChild(parentEnv))
+  if (inMcpSession(parentEnv))
     return { kind: "none", reason: "pane-child" };
   if (!input.interactive)
     return { kind: "none", reason: "not-interactive" };
@@ -68881,6 +68893,26 @@ var init_channel = __esm(() => {
   init_types3();
 });
 
+// src/mcp/nested-mode.ts
+var NESTED_MCP_TOOL_NAMES, NESTED_INSTRUCTIONS = `Claudish MCP server provides access to external AI models for one-shot calls.
+
+## Nested mode \u2014 no sessions
+
+This server runs inside a session that a claudish MCP server started (CLAUDISH_PANE_CHILD=1). One level of nesting is the limit, so these tools are not registered: create_session, team, send_input, get_output, cancel_session, list_sessions, get_diagnostics, capture_session, preflight, report_error. No channel notifications are sent.
+
+- run_prompt or compare_models: a one-shot answer from another model.
+- list_models, search_models: find a model.
+
+Do not start a claudish session another way: \`claudish -p\`, an interactive claudish or \`claudish team\` run from this session's shell exits 64 with "nested session refused".`;
+var init_nested_mode = __esm(() => {
+  NESTED_MCP_TOOL_NAMES = [
+    "run_prompt",
+    "list_models",
+    "search_models",
+    "compare_models"
+  ];
+});
+
 // src/mcp/progress-heartbeat.ts
 function isProgressToken(v) {
   return typeof v === "string" || typeof v === "number" && Number.isFinite(v);
@@ -69278,8 +69310,9 @@ async function teamContractVerb(mode, args) {
     return contractErrorAnswer(e);
   }
 }
-function defineTools(sessionManager, notifyChannel) {
+function defineTools(sessionManager, notifyChannel, nested) {
   const tools = [];
+  const reportHint = (text) => nested ? "" : text;
   function withOpFailureContext(message, subject) {
     const block = renderOpFailureBlock(subject);
     return block.length === 0 ? message : `${message}
@@ -69322,10 +69355,10 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
           content: [
             {
               type: "text",
-              text: withOpFailureContext(`Error: ${errMsg}
+              text: withOpFailureContext(`Error: ${errMsg}${reportHint(`
 
 ---
-**To report this error**, use the \`report_error\` tool with \`error_type: "provider_failure"\` and \`model: "${args.model}"\`.`, `while routing ${args.model}`)
+**To report this error**, use the \`report_error\` tool with \`error_type: "provider_failure"\` and \`model: "${args.model}"\`.`)}`, `while routing ${args.model}`)
             }
           ],
           isError: true
@@ -69536,7 +69569,7 @@ Use with: run_prompt(model="${suggested}", prompt="your prompt")`;
       }
       const failed = results.filter((r) => r.error);
       if (failed.length > 0) {
-        output += '---\n**To report failed model(s)**, use the `report_error` tool with `error_type: "provider_failure"` and the model ID(s) above.\n';
+        output += reportHint('---\n**To report failed model(s)**, use the `report_error` tool with `error_type: "provider_failure"` and the model ID(s) above.\n');
       }
       return { content: [{ type: "text", text: output }] };
     }
@@ -70312,13 +70345,15 @@ function mapEventToTaskStatus(event) {
 }
 async function main() {
   const toolMode = (process.env.CLAUDISH_MCP_TOOLS || "all").toLowerCase();
+  const nested = inMcpSession();
   const enabledGroups = resolveToolGroups(toolMode);
+  const channelEnabled = !nested && enabledGroups.has("channel");
   const server = new Server({ name: "claudish", version: "9.0.0" }, {
     capabilities: {
-      ...enabledGroups.has("channel") ? { experimental: { "claude/channel": {} } } : {},
+      ...channelEnabled ? { experimental: { "claude/channel": {} } } : {},
       tools: {}
     },
-    instructions: INSTRUCTIONS
+    instructions: nested ? NESTED_INSTRUCTIONS : INSTRUCTIONS
   });
   const sessionManager = new SessionManager({
     onStateChange: wrapStateChange((sessionId, event) => {
@@ -70345,7 +70380,6 @@ Call get_diagnostics with session_id: "${sessionId}" for the final screen, the u
       watchNotificationResult(result, { sessionId, eventType: event.type });
     })
   });
-  const channelEnabled = enabledGroups.has("channel");
   const notifyChannel = (p) => {
     if (!channelEnabled)
       return;
@@ -70370,10 +70404,11 @@ Call get_diagnostics with session_id: "${sessionId}" for the final screen, the u
     } catch {}
   };
   const progressIntervalMs = resolveProgressIntervalMs();
-  const allTools = defineTools(sessionManager, notifyChannel);
-  const enabledTools = allTools.filter((t) => enabledGroups.has(t.group));
+  const allTools = defineTools(sessionManager, notifyChannel, nested);
+  const nestedNames = NESTED_MCP_TOOL_NAMES;
+  const enabledTools = allTools.filter((t) => enabledGroups.has(t.group) && (!nested || nestedNames.includes(t.name)));
   const toolMap = new Map(enabledTools.map((t) => [t.name, t]));
-  console.error(`[claudish] MCP server started (tools: ${toolMode}, ${enabledTools.length} tools)`);
+  console.error(`[claudish] MCP server started (tools: ${nested ? "nested" : toolMode}, ${enabledTools.length} tools)`);
   server.setRequestHandler(ListToolsRequestSchema, async () => ({
     tools: enabledTools.map((t) => ({
       name: t.name,
@@ -70477,8 +70512,10 @@ var init_mcp_server = __esm(() => {
   init_channel();
   init_parent_session();
   init_remote_provider_types();
+  init_nested_mode();
   init_progress_heartbeat();
   init_model_loader();
+  init_child_env();
   init_pane();
   init_port_manager();
   init_endpoint_registration();
@@ -71114,6 +71151,8 @@ async function teamCommand(args) {
   const firstArg = args[0] ?? "";
   const legacySubs = ["run", "judge", "run-and-judge", "status"];
   const subcommand = legacySubs.includes(firstArg) ? firstArg : "run";
+  if (subcommand !== "status")
+    assertNotNested();
   const rawSessionPath = getFlag(args, "--path") ?? ".";
   let sessionPath;
   try {
@@ -71200,6 +71239,7 @@ async function teamCommand(args) {
   }
 }
 var init_team_cli = __esm(() => {
+  init_child_env();
   init_pane();
   init_team_orchestrator();
 });
@@ -80553,7 +80593,7 @@ function scrubChildEnv(env, opts) {
     for (const key of STRIPPED_CHILD_VARS)
       delete env[key];
   }
-  for (const key of PANE_MARKER_VARS)
+  for (const key of PANE_LAUNCH_VARS)
     delete env[key];
 }
 function buildClaudishSettingsOverlay(statusLine, proxyAuthMode, paneChild = isPaneChild()) {
@@ -83974,6 +84014,7 @@ async function runCli() {
       await detectAndSetThemeMode();
     });
     const cliConfig = await traceSpan("startup:parse-args", () => parseArgs(process.argv.slice(2)));
+    assertNotNested();
     assertPaneChildInteractive(cliConfig);
     await traceSpan("startup:endpoint-registration", async () => {
       await Promise.resolve().then(() => init_endpoint_registration());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "10.6.2",
+  "version": "10.6.3",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "10.6.2",
-    "@claudish/magmux-darwin-x64": "10.6.2",
-    "@claudish/magmux-linux-arm64": "10.6.2",
-    "@claudish/magmux-linux-x64": "10.6.2"
+    "@claudish/magmux-darwin-arm64": "10.6.3",
+    "@claudish/magmux-darwin-x64": "10.6.3",
+    "@claudish/magmux-linux-arm64": "10.6.3",
+    "@claudish/magmux-linux-x64": "10.6.3"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",