claudish 10.6.1 → 10.6.3

package/AI_AGENT_GUIDE.md

@@ -437,52 +437,75 @@ Claude: [calls compare_models tool with models=["openai/gpt-5.3", "google/gemini
 ### JSON Output (Recommended)
 
 ```bash
-claudish --models --json
+claudish --models-top --json
 ```
 
-**Output:**
+**Output** (abridged; one row shown):
 ```json
 {
-  "version": "1.8.0",
-  "lastUpdated": "2025-11-19",
-  "source": "https://openrouter.ai/models",
+  "contractVersion": 3,
+  "generationId": "g-20261016120000000-abcdef12",
+  "version": "g-20261016120000000-abcdef12",
+  "lastUpdated": "2026-10-16T12:00:00.000Z",
+  "generatedAt": "2026-10-16T12:00:00.000Z",
+  "recommendationTiers": ["flagship", "cost_efficient", "lightweight", "luxury", "subscription"],
   "models": [
     {
-      "id": "x-ai/grok-code-fast-1",
+      "id": "grok-code-fast-1",
       "name": "Grok Code Fast 1",
       "description": "Ultra-fast agentic coding",
-      "provider": "xAI",
-      "category": "coding",
+      "provider": "x-ai",
+      "recommendationTier": "flagship",
       "priority": 1,
       "pricing": {
-        "input": "$0.20/1M",
-        "output": "$1.50/1M",
+        "input": "$0.2/1M",
+        "output": "$1.5/1M",
         "average": "$0.85/1M"
       },
-      "context": "256K",
-      "supportsTools": true,
-      "supportsReasoning": true
+      "context": "256000"
     }
   ]
 }
 ```
 
+`recommendationTier` is one of `flagship`, `cost_efficient`, `lightweight`, `luxury` or
+`subscription`; `recommendationTiers` lists the tiers this claudish version knows. `priority` is
+the rank within that tier, from 1. A model listed in two tiers is two rows, so dedupe ids
+yourself. Only `subscription` rows carry `subscriptions[].command`, the model spec to run.
+Prices are `"N/A"` when the catalog has none.
+
+`claudish --models --json` prints the full catalog instead; its records carry no
+`recommendationTier`.
+
+### Filter with jq
+
+```bash
+# Flagship model ids, in rank order
+claudish --models-top --json | jq -r '.models | map(select(.recommendationTier == "flagship")) | sort_by(.priority) | .[].id'
+
+# Runnable subscription commands
+claudish --models-top --json | jq -r '.models[] | select(.recommendationTier == "subscription") | .subscriptions[]?.command'
+```
+
 ### Parse in TypeScript
 
 ```typescript
-const { stdout } = await Bash("claudish --models --json");
+const { stdout } = await Bash("claudish --models-top --json");
 const data = JSON.parse(stdout);
 
-// Get all model IDs
-const modelIds = data.models.map(m => m.id);
+// Every recommended model id, once (a model in two tiers is two rows)
+const modelIds = [...new Set(data.models.map(m => m.id))];
 
-// Get coding models
-const codingModels = data.models.filter(m => m.category === "coding");
+// Flagship models, in rank order
+const flagshipModels = data.models
+  .filter(m => m.recommendationTier === "flagship")
+  .sort((a, b) => a.priority - b.priority);
 
-// Get cheapest model
-const cheapest = data.models.sort((a, b) =>
-  parseFloat(a.pricing.average) - parseFloat(b.pricing.average)
-)[0];
+// Cheapest model by average price ("$0.85/1M"; "N/A" when unpriced)
+const price = m => Number.parseFloat(m.pricing.average.replace(/^\$/, ""));
+const cheapest = data.models
+  .filter(m => !Number.isNaN(price(m)))
+  .sort((a, b) => price(a) - price(b))[0];
 ```
 
 ## JSON Output Format

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.1";
+var VERSION = "10.6.3";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -44525,6 +44537,9 @@ var init_cache_ttl = __esm(() => {
 import { existsSync as existsSync21, mkdirSync as mkdirSync12, readFileSync as readFileSync21, writeFileSync as writeFileSync13 } from "fs";
 import { homedir as homedir28 } from "os";
 import { join as join31 } from "path";
+function isRecommendationTier(value) {
+  return typeof value === "string" && RECOMMENDATION_TIER_INDEX.has(value);
+}
 async function fetchCatalogPage(url, timeoutMs, generationId) {
   const requestUrl = new URL(url);
   if (generationId)
@@ -44546,93 +44561,262 @@ async function fetchCatalogPage(url, timeoutMs, generationId) {
 async function fetchCatalogData(url, timeoutMs, generationId) {
   return (await fetchCatalogPage(url, timeoutMs, generationId)).data;
 }
-function recommendationProjection(recommendations, richModels = []) {
+function readWireEntry(value) {
+  if (!value || typeof value !== "object")
+    return null;
+  const raw = value;
+  if (typeof raw.modelId !== "string" || !isRecommendationTier(raw.tier))
+    return null;
+  const rawRoute = raw.route;
+  const route = rawRoute && typeof rawRoute === "object" && typeof rawRoute.routeId === "string" && typeof rawRoute.routeProfileId === "string" ? { routeId: rawRoute.routeId, routeProfileId: rawRoute.routeProfileId } : undefined;
+  return {
+    modelId: raw.modelId,
+    tier: raw.tier,
+    ...route ? { route } : {},
+    ...typeof raw.planId === "string" ? { planId: raw.planId } : {}
+  };
+}
+function recommendationDedupeKey(entry) {
+  return entry.tier === "subscription" ? JSON.stringify([
+    entry.tier,
+    entry.modelId,
+    entry.route?.routeId ?? null,
+    entry.route?.routeProfileId ?? null,
+    entry.planId ?? null
+  ]) : JSON.stringify([entry.tier, entry.modelId]);
+}
+function projectRecommendations(recommendations, catalog, richModels = [], now = new Date) {
   if (recommendations.contractVersion !== 3 || !Array.isArray(recommendations.entries)) {
     throw new Error("Model catalog recommendations do not match v3");
   }
-  const cache = readAllModelsCache();
-  if (!cache || cache.catalogGenerationId !== recommendations.generationId) {
+  if (!catalog.catalogGenerationId || catalog.catalogGenerationId !== recommendations.generationId) {
     throw new Error("Recommendation and model catalog generations differ");
   }
-  const byId = new Map(cache?.entries.map((entry) => [entry.modelId, entry]) ?? []);
-  const richById = new Map(richModels.map((model) => [model.modelId, model]));
+  const byId = new Map(catalog.entries.map((entry) => [entry.modelId, entry]));
+  const richById = new Map;
+  for (const model of richModels) {
+    if (!richById.has(model.modelId))
+      richById.set(model.modelId, model);
+  }
+  const seenKeys = new Set;
+  const rankByTier = new Map;
+  const models = [];
+  for (const value of recommendations.entries) {
+    const recommended = readWireEntry(value);
+    if (!recommended)
+      continue;
+    const model = byId.get(recommended.modelId);
+    if (!model)
+      continue;
+    const key = recommendationDedupeKey(recommended);
+    if (seenKeys.has(key))
+      continue;
+    seenKeys.add(key);
+    const priority = (rankByTier.get(recommended.tier) ?? 0) + 1;
+    rankByTier.set(recommended.tier, priority);
+    const rich = richById.get(recommended.modelId);
+    const subscription = recommended.tier === "subscription" ? subscriptionRouteFor(recommended, model, catalog.plans) : undefined;
+    models.push({
+      id: recommended.modelId,
+      name: rich?.displayName ?? model.displayName ?? recommended.modelId,
+      description: rich?.description ?? "",
+      provider: rich?.provider ?? model.provider ?? "",
+      recommendationTier: recommended.tier,
+      priority,
+      pricing: {
+        input: typeof rich?.pricing?.input === "number" ? `$${rich.pricing.input}/1M` : "N/A",
+        output: typeof rich?.pricing?.output === "number" ? `$${rich.pricing.output}/1M` : "N/A",
+        average: typeof rich?.pricing?.input === "number" && typeof rich?.pricing?.output === "number" ? `$${((rich.pricing.input + rich.pricing.output) / 2).toFixed(2)}/1M` : "N/A"
+      },
+      context: rich?.contextWindow ? String(rich.contextWindow) : model.contextWindow ? String(model.contextWindow) : "N/A",
+      releaseDate: model.releaseDate,
+      ...subscription ? { subscription, subscriptions: [subscription] } : {}
+    });
+  }
+  const stamp = now.toISOString();
   return {
     contractVersion: 3,
     generationId: recommendations.generationId,
     version: recommendations.generationId,
-    lastUpdated: new Date().toISOString(),
-    generatedAt: new Date().toISOString(),
-    models: recommendations.entries.map((recommended, index) => {
-      const model = byId.get(recommended.modelId);
-      const rich = richById.get(recommended.modelId);
-      const provider = recommended.route ? providerForCatalogRoute(recommended.route) : undefined;
-      const connection = model?.aggregators?.find((candidate) => candidate.route?.routeId === recommended.route?.routeId && candidate.route?.routeProfileId === recommended.route?.routeProfileId);
-      const plan = cache?.plans.find((candidate) => candidate.id === recommended.planId);
-      const prefix = provider ? PROVIDER_TO_PREFIX[provider] ?? provider : undefined;
-      const command = prefix && connection?.externalModelId ? provider === "native-anthropic" ? connection.externalModelId : `${prefix}@${connection.externalModelId}` : undefined;
-      const subscription = recommended.tier === "subscription" && provider && command ? {
-        ...provider === "native-anthropic" ? {} : { prefix },
-        plan: plan?.id ?? recommended.planId ?? provider,
-        command,
-        planIds: recommended.planId ? [recommended.planId] : [],
-        routingProvider: provider,
-        tier: provider === "native-anthropic" ? "native" : "general"
-      } : undefined;
-      return {
-        id: recommended.modelId,
-        name: rich?.displayName ?? model?.displayName ?? recommended.modelId,
-        description: rich?.description ?? "",
-        provider: rich?.provider ?? model?.provider ?? "",
-        category: recommended.tier === "flagship" ? "programming" : recommended.tier === "lightweight" ? "fast" : "subscription",
-        priority: index + 1,
-        pricing: {
-          input: typeof rich?.pricing?.input === "number" ? `$${rich.pricing.input}/1M` : "N/A",
-          output: typeof rich?.pricing?.output === "number" ? `$${rich.pricing.output}/1M` : "N/A",
-          average: typeof rich?.pricing?.input === "number" && typeof rich?.pricing?.output === "number" ? `$${((rich.pricing.input + rich.pricing.output) / 2).toFixed(2)}/1M` : "N/A"
-        },
-        context: rich?.contextWindow ? String(rich.contextWindow) : model?.contextWindow ? String(model.contextWindow) : "N/A",
-        releaseDate: model?.releaseDate,
-        ...subscription ? { subscription, subscriptions: [subscription] } : {}
-      };
-    })
+    lastUpdated: stamp,
+    generatedAt: stamp,
+    recommendationTiers: RECOMMENDATION_SECTIONS.map((section) => section.recommendationTier),
+    models
   };
 }
+function subscriptionRouteFor(recommended, model, plans) {
+  if (!recommended.route)
+    return;
+  const provider = providerForCatalogRoute(recommended.route);
+  if (!provider)
+    return;
+  const connection = model.aggregators?.find((candidate) => candidate.route?.routeId === recommended.route?.routeId && candidate.route?.routeProfileId === recommended.route?.routeProfileId);
+  const prefix = PROVIDER_TO_PREFIX[provider] ?? provider;
+  if (!connection?.externalModelId)
+    return;
+  const command = provider === "native-anthropic" ? connection.externalModelId : `${prefix}@${connection.externalModelId}`;
+  const plan = plans.find((candidate) => candidate.id === recommended.planId);
+  return {
+    ...provider === "native-anthropic" ? {} : { prefix },
+    plan: plan?.id ?? recommended.planId ?? provider,
+    command,
+    planIds: recommended.planId ? [recommended.planId] : [],
+    routingProvider: provider,
+    tier: provider === "native-anthropic" ? "native" : "general"
+  };
+}
+function recommendationProjection(recommendations, richModels = []) {
+  const cache = readAllModelsCache();
+  return projectRecommendations(recommendations, cache ? {
+    catalogGenerationId: cache.catalogGenerationId,
+    entries: cache.entries,
+    plans: cache.plans
+  } : { catalogGenerationId: "", entries: [], plans: [] }, richModels);
+}
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function isStringArray(value) {
+  return Array.isArray(value) && value.every((item) => typeof item === "string");
+}
+function isRouteObject(value) {
+  return isRecord(value) && typeof value.plan === "string" && typeof value.command === "string" && (value.prefix === undefined || typeof value.prefix === "string") && (value.planIds === undefined || isStringArray(value.planIds));
+}
+function isUsableRow(value) {
+  if (!isRecord(value))
+    return false;
+  if (typeof value.id !== "string" || value.id.length === 0)
+    return false;
+  if (!isRecommendationTier(value.recommendationTier))
+    return false;
+  if (typeof value.priority !== "number" || !Number.isFinite(value.priority))
+    return false;
+  if (typeof value.name !== "string" || typeof value.description !== "string" || typeof value.provider !== "string" || typeof value.context !== "string") {
+    return false;
+  }
+  const pricing = value.pricing;
+  if (!isRecord(pricing) || typeof pricing.input !== "string" || typeof pricing.output !== "string" || typeof pricing.average !== "string") {
+    return false;
+  }
+  if (value.releaseDate !== undefined && typeof value.releaseDate !== "string")
+    return false;
+  if (value.subscription !== undefined && !isRouteObject(value.subscription))
+    return false;
+  if (value.subscriptions !== undefined && !(Array.isArray(value.subscriptions) && value.subscriptions.every(isRouteObject))) {
+    return false;
+  }
+  return true;
+}
+function readProjectedRecommendationsDoc(value) {
+  if (!isRecord(value))
+    return null;
+  if (value.contractVersion !== 3)
+    return null;
+  if (typeof value.generationId !== "string" || typeof value.version !== "string" || typeof value.lastUpdated !== "string" || typeof value.generatedAt !== "string" || !Array.isArray(value.models)) {
+    return null;
+  }
+  const writerTiers = value.recommendationTiers;
+  if (!isStringArray(writerTiers))
+    return null;
+  if (!RECOMMENDATION_SECTIONS.every((section) => writerTiers.includes(section.recommendationTier)))
+    return null;
+  const models = value.models.filter(isUsableRow);
+  if (models.length === 0)
+    return null;
+  return {
+    ...value,
+    recommendationTiers: RECOMMENDATION_SECTIONS.map((section) => section.recommendationTier),
+    models
+  };
+}
+function readRecommendedModelsCacheFile() {
+  if (!existsSync21(RECOMMENDED_MODELS_CACHE_PATH))
+    return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync21(RECOMMENDED_MODELS_CACHE_PATH, "utf-8"));
+  } catch {
+    return null;
+  }
+  return readProjectedRecommendationsDoc(parsed);
+}
+function sectionDefFor(tier) {
+  const index = RECOMMENDATION_TIER_INDEX.get(tier);
+  return index === undefined ? undefined : RECOMMENDATION_SECTIONS[index];
+}
 function groupRecommendedModels(entries) {
-  const byId = new Map;
-  const categoryOrder = new Map;
+  const subscriptionRowsById = new Map;
   for (const entry of entries) {
-    const list = byId.get(entry.id);
+    if (entry.recommendationTier !== "subscription")
+      continue;
+    const list = subscriptionRowsById.get(entry.id);
     if (list)
       list.push(entry);
     else
-      byId.set(entry.id, [entry]);
-    if (!categoryOrder.has(entry.category))
-      categoryOrder.set(entry.category, categoryOrder.size);
-  }
-  const flagship = [];
-  const fast = [];
-  for (const [id, members] of byId.entries()) {
-    const primary = members.find((m) => m.category !== "subscription") ?? members[0];
-    const subscriptions = members.filter((m) => m.category === "subscription");
-    const bucket = primary.category === "programming" || primary.category === "vision" || primary.category === "reasoning" ? "flagship" : "fast";
-    const group = { id, primary, subscriptions, bucket };
-    if (bucket === "flagship")
-      flagship.push(group);
-    else
-      fast.push(group);
+      subscriptionRowsById.set(entry.id, [entry]);
   }
-  const byCuratedPriorityThenFreshness = (a, b) => {
-    const aCat = categoryOrder.get(a.primary.category) ?? Number.MAX_SAFE_INTEGER;
-    const bCat = categoryOrder.get(b.primary.category) ?? Number.MAX_SAFE_INTEGER;
-    if (aCat !== bCat)
-      return aCat - bCat;
-    if (a.primary.priority !== b.primary.priority)
-      return a.primary.priority - b.primary.priority;
-    return compareByReleaseDateDesc(a.primary, b.primary);
-  };
-  flagship.sort(byCuratedPriorityThenFreshness);
-  fast.sort(byCuratedPriorityThenFreshness);
-  return { flagship, fast };
+  const sections = [];
+  for (const def of RECOMMENDATION_SECTIONS) {
+    const primaryById = new Map;
+    for (const entry of entries) {
+      if (entry.recommendationTier !== def.recommendationTier)
+        continue;
+      const current = primaryById.get(entry.id);
+      if (!current || entry.priority < current.priority)
+        primaryById.set(entry.id, entry);
+    }
+    if (primaryById.size === 0)
+      continue;
+    const groups = [...primaryById.values()].map((primary) => ({
+      id: primary.id,
+      primary,
+      subscriptions: subscriptionRowsById.get(primary.id) ?? []
+    }));
+    groups.sort((a, b) => a.primary.priority - b.primary.priority || compareByReleaseDateDesc(a.primary, b.primary));
+    const description = "description" in def ? def.description : undefined;
+    sections.push({
+      recommendationTier: def.recommendationTier,
+      title: def.title,
+      ...description ? { description } : {},
+      groups
+    });
+  }
+  return sections;
+}
+function quickPickCandidates(sections) {
+  const excluded = new Set;
+  for (const section of sections) {
+    if (sectionDefFor(section.recommendationTier)?.quickPickEligible === false) {
+      for (const group of section.groups)
+        excluded.add(group.id);
+    }
+  }
+  const seen = new Set;
+  const candidates = [];
+  for (const section of sections) {
+    if (sectionDefFor(section.recommendationTier)?.quickPickEligible !== true)
+      continue;
+    for (const group of section.groups) {
+      if (excluded.has(group.id) || seen.has(group.id))
+        continue;
+      seen.add(group.id);
+      candidates.push(group.primary);
+    }
+  }
+  return candidates;
+}
+function uniqueRecommendedModels(entries) {
+  const sectionIndex = (entry) => RECOMMENDATION_TIER_INDEX.get(entry.recommendationTier) ?? Number.MAX_SAFE_INTEGER;
+  const ordered = [...entries].sort((a, b) => sectionIndex(a) - sectionIndex(b) || a.priority - b.priority);
+  const seen = new Set;
+  const unique = [];
+  for (const entry of ordered) {
+    if (seen.has(entry.id))
+      continue;
+    seen.add(entry.id);
+    unique.push(entry);
+  }
+  return unique;
 }
 function collectRoutingPrefixes(group, getNativePrefix) {
   const slug = (group.primary.provider || "").toLowerCase();
@@ -44725,14 +44909,12 @@ async function getRecommendedModels(opts = {}) {
   if (!forceRefresh && cached && cached.generationId === readAllModelsCache()?.catalogGenerationId) {
     return cached;
   }
-  if (!forceRefresh && existsSync21(RECOMMENDED_MODELS_CACHE_PATH)) {
-    try {
-      const cacheData = JSON.parse(readFileSync21(RECOMMENDED_MODELS_CACHE_PATH, "utf-8"));
-      if (cacheData.contractVersion === 3 && cacheData.generationId === readAllModelsCache()?.catalogGenerationId && cacheData.models && cacheData.models.length > 0 && isFreshEnough(cacheData)) {
-        _cachedRecommendedModels = cacheData;
-        return cacheData;
-      }
-    } catch {}
+  if (!forceRefresh) {
+    const cacheData = readRecommendedModelsCacheFile();
+    if (cacheData && cacheData.generationId === readAllModelsCache()?.catalogGenerationId && isFreshEnough(cacheData)) {
+      _cachedRecommendedModels = cacheData;
+      return cacheData;
+    }
   }
   let fetchFailure;
   try {
@@ -44767,14 +44949,10 @@ function getRecommendedModelsSync() {
   const cached = _cachedRecommendedModels;
   if (cached && cached.generationId === generationId)
     return cached;
-  if (existsSync21(RECOMMENDED_MODELS_CACHE_PATH)) {
-    try {
-      const cacheData = JSON.parse(readFileSync21(RECOMMENDED_MODELS_CACHE_PATH, "utf-8"));
-      if (cacheData.contractVersion === 3 && cacheData.generationId === generationId && cacheData.models && cacheData.models.length > 0 && isFreshEnough(cacheData)) {
-        _cachedRecommendedModels = cacheData;
-        return cacheData;
-      }
-    } catch {}
+  const cacheData = readRecommendedModelsCacheFile();
+  if (cacheData && cacheData.generationId === generationId && isFreshEnough(cacheData)) {
+    _cachedRecommendedModels = cacheData;
+    return cacheData;
   }
   return { version: "0", lastUpdated: "", models: [] };
 }
@@ -44860,7 +45038,7 @@ function loadModelInfo() {
   }
   const data = getRecommendedModelsSync();
   const modelInfo = {};
-  for (const model of data.models) {
+  for (const model of uniqueRecommendedModels(data.models)) {
     modelInfo[model.id] = {
       name: model.name,
       description: model.description,
@@ -44882,20 +45060,38 @@ function getAvailableModels() {
     return _cachedModelIds;
   }
   const data = getRecommendedModelsSync();
-  const modelIds = data.models.sort((a, b) => a.priority - b.priority).map((m) => m.id);
+  const modelIds = uniqueRecommendedModels(data.models).map((m) => m.id);
   const result = [...modelIds, "custom"];
   _cachedModelIds = result;
   return result;
 }
-var _cachedModelInfo = null, _cachedModelIds = null, _cachedRecommendedModels = null, FIREBASE_BASE_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/queryModels", FIREBASE_RECOMMENDED_URL, RECOMMENDED_MODELS_CACHE_PATH, RECOMMENDED_FETCH_TIMEOUT_MS = 5000, SEARCH_FETCH_TIMEOUT_MS = 1e4, RECOMMENDED_ROUTE_TIER_ORDER;
+var RECOMMENDATION_SECTIONS, RECOMMENDATION_TIER_INDEX, _cachedModelInfo = null, _cachedModelIds = null, _cachedRecommendedModels = null, FIREBASE_BASE_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/queryModels", FIREBASE_RECOMMENDED_URL, RECOMMENDED_MODELS_CACHE_PATH, RECOMMENDED_FETCH_TIMEOUT_MS = 5000, SEARCH_FETCH_TIMEOUT_MS = 1e4, RECOMMENDED_ROUTE_TIER_ORDER;
 var init_model_loader = __esm(() => {
   init_all_models_cache();
   init_auto_route();
   init_cache_ttl();
   init_catalog_client();
   init_catalog_route_bindings();
+  RECOMMENDATION_SECTIONS = [
+    { recommendationTier: "flagship", title: "Flagship", quickPickEligible: true },
+    {
+      recommendationTier: "cost_efficient",
+      title: "Cost-efficient",
+      description: "Best value: strong models at a much lower cost per task",
+      quickPickEligible: true
+    },
+    { recommendationTier: "lightweight", title: "Lightweight", quickPickEligible: true },
+    {
+      recommendationTier: "luxury",
+      title: "Luxury",
+      description: "Most capable, most expensive. Use for the hardest tasks",
+      quickPickEligible: false
+    },
+    { recommendationTier: "subscription", title: "Subscription", quickPickEligible: true }
+  ];
+  RECOMMENDATION_TIER_INDEX = new Map(RECOMMENDATION_SECTIONS.map((section, index) => [section.recommendationTier, index]));
   FIREBASE_RECOMMENDED_URL = `${FIREBASE_BASE_URL}?catalog=recommended`;
-  RECOMMENDED_MODELS_CACHE_PATH = join31(homedir28(), ".claudish", "recommended-models-cache.json");
+  RECOMMENDED_MODELS_CACHE_PATH = join31(homedir28(), ".claudish", "recommended-models-cache-v2.json");
   RECOMMENDED_ROUTE_TIER_ORDER = {
     native: 0,
     general: 1,
@@ -50508,25 +50704,28 @@ function formatFirebaseProviderLabel(slug) {
 }
 async function loadRecommendedModels(forceRefresh = false) {
   try {
-    const doc = await getRecommendedModels({ forceRefresh });
-    return sortModelsNewestFirst(doc.models.map((model) => ({
-      id: model.id,
-      name: model.name,
-      description: model.description,
-      provider: formatFirebaseProviderLabel(model.provider),
-      providerSlug: model.provider.toLowerCase(),
-      pricing: model.pricing,
-      context: model.context,
-      contextLength: parseContextString(model.context),
-      supportsTools: model.supportsTools,
-      supportsReasoning: model.supportsReasoning,
-      supportsVision: model.supportsVision,
-      source: formatFirebaseProviderLabel(model.provider)
-    })));
+    return _recommendedFallbackRows(await getRecommendedModels({ forceRefresh }));
   } catch {
     return [];
   }
 }
+function _recommendedFallbackRows(doc) {
+  return sortModelsNewestFirst(uniqueRecommendedModels(doc.models).map((model) => ({
+    id: model.id,
+    name: model.name,
+    description: model.description,
+    provider: formatFirebaseProviderLabel(model.provider),
+    providerSlug: model.provider.toLowerCase(),
+    pricing: model.pricing,
+    context: model.context,
+    contextLength: parseContextString(model.context),
+    supportsTools: model.supportsTools,
+    supportsReasoning: model.supportsReasoning,
+    supportsVision: model.supportsVision,
+    releaseDate: model.releaseDate,
+    source: formatFirebaseProviderLabel(model.provider)
+  })));
+}
 function parseContextString(ctx) {
   if (!ctx || ctx === "N/A")
     return 0;
@@ -54434,6 +54633,159 @@ var init_provider_slug_resolve = __esm(() => {
   init_reserved_namespace();
 });
 
+// src/recommended-listing.ts
+function nativeShortcutForVendor(vendorSlug) {
+  const canonical = nativeProviderForVendor(vendorSlug);
+  if (!canonical)
+    return null;
+  const def = BUILTIN_PROVIDERS.find((provider) => provider.name === canonical);
+  const shortcut = def?.shortcuts?.[0];
+  return shortcut ? shortcut : null;
+}
+function textHeading(section) {
+  return section.description ? `${section.title} \u2014 ${section.description}` : section.title;
+}
+function textRow(group, getNativePrefix) {
+  const m = group.primary;
+  const rawId = m.id;
+  const modelId = rawId.length > 28 ? `${rawId.substring(0, 25)}...` : rawId;
+  const modelIdPadded = modelId.padEnd(28);
+  const pricing = formatListingPrice(m, { compact: true });
+  const pricingPadded = pricing.padEnd(10);
+  const context = m.context || "N/A";
+  const contextPadded = context.padEnd(6);
+  const caps = [];
+  if (m.supportsTools)
+    caps.push("\uD83D\uDD27");
+  if (m.supportsReasoning)
+    caps.push("\uD83E\uDDE0");
+  if (m.supportsVision)
+    caps.push("\uD83D\uDC41\uFE0F");
+  const capabilities = caps.join(" ");
+  const lines = [`  ${modelIdPadded} ${pricingPadded} ${contextPadded} ${capabilities}`];
+  const prefixes = collectRoutingPrefixes(group, getNativePrefix);
+  if (prefixes.length > 0) {
+    const viaLine = prefixes.map((p) => `${p}@`).join(" \xB7 ");
+    lines.push(`      via: ${viaLine}`);
+  }
+  return lines;
+}
+function renderRecommendedText(doc, getNativePrefix) {
+  const lastUpdated = doc.lastUpdated || "unknown";
+  const sections = groupRecommendedModels(doc.models);
+  const lines = ["", `Recommended Models (last updated: ${lastUpdated}):`, ""];
+  sections.forEach((section, sectionIndex) => {
+    if (sectionIndex > 0)
+      lines.push("");
+    lines.push(textHeading(section));
+    lines.push(`  ${"\u2500".repeat(70)}`);
+    section.groups.forEach((group, groupIndex) => {
+      lines.push(...textRow(group, getNativePrefix));
+      if (groupIndex < section.groups.length - 1)
+        lines.push("");
+    });
+  });
+  lines.push("");
+  lines.push("  Capabilities: \uD83D\uDD27 Tools  \uD83E\uDDE0 Reasoning  \uD83D\uDC41\uFE0F  Vision");
+  const picks = computeQuickPicks(quickPickCandidates(sections));
+  const pickLines = [];
+  if (picks.budget)
+    pickLines.push(`    Budget       \u2192 ${picks.budget.id} (${normalizePricingDisplay(picks.budget.pricing?.average)})`);
+  if (picks.largeContext)
+    pickLines.push(`    Large ctx    \u2192 ${picks.largeContext.id} (${picks.largeContext.context || "N/A"})`);
+  if (picks.mostCapable)
+    pickLines.push(`    Most capable \u2192 ${picks.mostCapable.id}`);
+  if (picks.visionCoding)
+    pickLines.push(`    Vision+code  \u2192 ${picks.visionCoding.id}`);
+  if (picks.agentic)
+    pickLines.push(`    Agentic      \u2192 ${picks.agentic.id}`);
+  if (pickLines.length > 0) {
+    lines.push("");
+    lines.push("  Quick picks:");
+    lines.push(...pickLines);
+  }
+  lines.push("");
+  lines.push("  Set default:  export CLAUDISH_MODEL=<model>");
+  lines.push("                 or:  claudish --model <model> ...");
+  lines.push("");
+  lines.push("  For more: claudish --models                     (browse full catalog)");
+  lines.push("            claudish --providers                   (list all providers + counts)");
+  lines.push("            claudish -s <query>                    (search by keyword)");
+  lines.push("            claudish --models-top --models-refresh (refresh from Firebase)");
+  lines.push("");
+  return lines.join(`
+`);
+}
+function markdownRow(group, getNativePrefix) {
+  const m = group.primary;
+  const pricing = formatListingPrice(m);
+  const ctx = m.context || "N/A";
+  const caps = [];
+  if (m.supportsTools)
+    caps.push("tools");
+  if (m.supportsReasoning)
+    caps.push("reasoning");
+  if (m.supportsVision)
+    caps.push("vision");
+  const capsLine = caps.length > 0 ? caps.join(", ") : "none";
+  const prefixes = collectRoutingPrefixes(group, getNativePrefix);
+  const accessLine = prefixes.length > 0 ? prefixes.map((p) => `\`${p}@${m.id}\``).join(" \xB7 ") : `\`${m.id}\``;
+  return [
+    `### ${m.id}`,
+    `- **Pricing**: ${pricing} avg \xB7 ${ctx} context`,
+    `- **Capabilities**: ${capsLine}`,
+    `- **Access**: ${accessLine}`,
+    ""
+  ].join(`
+`);
+}
+function renderRecommendedMarkdown(doc, getNativePrefix) {
+  const sections = groupRecommendedModels(doc.models);
+  let output = `# Recommended Models
+
+`;
+  output += `_Last updated: ${doc.lastUpdated || "unknown"}_
+
+`;
+  for (const section of sections) {
+    output += `## ${section.title}
+
+`;
+    if (section.description)
+      output += `_${section.description}_
+
+`;
+    for (const group of section.groups)
+      output += markdownRow(group, getNativePrefix);
+  }
+  const picks = computeQuickPicks(quickPickCandidates(sections));
+  const pickLines = [];
+  if (picks.budget)
+    pickLines.push(`- **Budget**: \`${picks.budget.id}\` (${normalizePricingDisplay(picks.budget.pricing?.average)})`);
+  if (picks.largeContext)
+    pickLines.push(`- **Large context**: \`${picks.largeContext.id}\` (${picks.largeContext.context || "N/A"})`);
+  if (picks.mostCapable)
+    pickLines.push(`- **Most capable**: \`${picks.mostCapable.id}\``);
+  if (picks.visionCoding)
+    pickLines.push(`- **Vision + coding**: \`${picks.visionCoding.id}\``);
+  if (picks.agentic)
+    pickLines.push(`- **Agentic**: \`${picks.agentic.id}\``);
+  if (pickLines.length > 0) {
+    output += `## Quick picks
+
+`;
+    output += `${pickLines.join(`
+`)}
+`;
+  }
+  return output;
+}
+var init_recommended_listing = __esm(() => {
+  init_model_loader();
+  init_provider_definitions();
+  init_route_candidates();
+});
+
 // src/branding.ts
 function paint(line) {
   const { RESET, BOLD, CYAN, BLUE, DIM } = cliAnsi();
@@ -59799,7 +60151,7 @@ function clearAllModelCaches() {
   const cacheDir = join36(homedir32(), ".claudish");
   if (!existsSync25(cacheDir))
     return;
-  const cachePatterns = ["pricing-cache.json", "recommended-models-cache.json"];
+  const cachePatterns = ["pricing-cache.json", "recommended-models-cache-v2.json"];
   let cleared = 0;
   try {
     const files = readdirSync4(cacheDir);
@@ -60599,95 +60951,7 @@ async function printRecommendedModels(jsonOutput, forceUpdate) {
     console.log(JSON.stringify(doc, null, 2));
     return;
   }
-  const lastUpdated = doc.lastUpdated || "unknown";
-  const { flagship, fast } = groupRecommendedModels(doc.models);
-  const providerByName = new Map(BUILTIN_PROVIDERS.map((p) => [p.name, p]));
-  const getNativePrefix = (firebaseSlug) => {
-    const canonical = nativeProviderForVendor(firebaseSlug);
-    if (!canonical)
-      return null;
-    const def = providerByName.get(canonical);
-    if (!def || !def.shortcuts || def.shortcuts.length === 0)
-      return null;
-    return def.shortcuts[0];
-  };
-  const renderGroup = (group) => {
-    const m = group.primary;
-    const rawId = m.id;
-    const modelId = rawId.length > 28 ? `${rawId.substring(0, 25)}...` : rawId;
-    const modelIdPadded = modelId.padEnd(28);
-    const pricing = formatListingPrice(m, { compact: true });
-    const pricingPadded = pricing.padEnd(10);
-    const context = m.context || "N/A";
-    const contextPadded = context.padEnd(6);
-    const caps = [];
-    if (m.supportsTools)
-      caps.push("\uD83D\uDD27");
-    if (m.supportsReasoning)
-      caps.push("\uD83E\uDDE0");
-    if (m.supportsVision)
-      caps.push("\uD83D\uDC41\uFE0F");
-    const capabilities = caps.join(" ");
-    console.log(`  ${modelIdPadded} ${pricingPadded} ${contextPadded} ${capabilities}`);
-    const prefixes = collectRoutingPrefixes(group, getNativePrefix);
-    if (prefixes.length > 0) {
-      const viaLine = prefixes.map((p) => `${p}@`).join(" \xB7 ");
-      console.log(`      via: ${viaLine}`);
-    }
-  };
-  console.log(`
-Recommended Models (last updated: ${lastUpdated}):
-`);
-  if (flagship.length > 0) {
-    console.log("Flagship models");
-    console.log(`  ${"\u2500".repeat(70)}`);
-    for (let i = 0;i < flagship.length; i++) {
-      renderGroup(flagship[i]);
-      if (i < flagship.length - 1)
-        console.log("");
-    }
-  }
-  if (fast.length > 0) {
-    if (flagship.length > 0)
-      console.log("");
-    console.log("Fast variants");
-    console.log(`  ${"\u2500".repeat(70)}`);
-    for (let i = 0;i < fast.length; i++) {
-      renderGroup(fast[i]);
-      if (i < fast.length - 1)
-        console.log("");
-    }
-  }
-  console.log("");
-  console.log("  Capabilities: \uD83D\uDD27 Tools  \uD83E\uDDE0 Reasoning  \uD83D\uDC41\uFE0F  Vision");
-  const primaries = [...flagship, ...fast].map((g) => g.primary);
-  const picks = computeQuickPicks(primaries);
-  const pickLines = [];
-  if (picks.budget)
-    pickLines.push(`    Budget       \u2192 ${picks.budget.id} (${normalizePricingDisplay(picks.budget.pricing?.average)})`);
-  if (picks.largeContext)
-    pickLines.push(`    Large ctx    \u2192 ${picks.largeContext.id} (${picks.largeContext.context || "N/A"})`);
-  if (picks.mostCapable)
-    pickLines.push(`    Most capable \u2192 ${picks.mostCapable.id}`);
-  if (picks.visionCoding)
-    pickLines.push(`    Vision+code  \u2192 ${picks.visionCoding.id}`);
-  if (picks.agentic)
-    pickLines.push(`    Agentic      \u2192 ${picks.agentic.id}`);
-  if (pickLines.length > 0) {
-    console.log("");
-    console.log("  Quick picks:");
-    for (const line of pickLines)
-      console.log(line);
-  }
-  console.log("");
-  console.log("  Set default:  export CLAUDISH_MODEL=<model>");
-  console.log("                 or:  claudish --model <model> ...");
-  console.log("");
-  console.log("  For more: claudish --models                     (browse full catalog)");
-  console.log("            claudish --providers                   (list all providers + counts)");
-  console.log("            claudish -s <query>                    (search by keyword)");
-  console.log("            claudish --models-top --models-refresh (refresh from Firebase)");
-  console.log("");
+  console.log(renderRecommendedText(doc, nativeShortcutForVendor));
 }
 async function printVersion() {
   if (!process.stdout.isTTY) {
@@ -61470,8 +61734,8 @@ var init_cli = __esm(() => {
   init_probe_runner();
   init_provider_definitions();
   init_provider_slug_resolve();
-  init_route_candidates();
   init_routing_rules();
+  init_recommended_listing();
   init_settings();
   init_ansi();
   init_provider_resolver();
@@ -61662,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" };
@@ -68629,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);
@@ -69026,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}
@@ -69070,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
@@ -69110,82 +69395,14 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
           ]
         };
       }
-      const { flagship, fast } = groupRecommendedModels(doc.models);
-      const providerByName = new Map(BUILTIN_PROVIDERS.map((p) => [p.name, p]));
-      const getNativePrefix = (firebaseSlug) => {
-        const canonical = nativeProviderForVendor(firebaseSlug);
-        if (!canonical)
-          return null;
-        const def = providerByName.get(canonical);
-        if (!def || !def.shortcuts || def.shortcuts.length === 0)
-          return null;
-        return def.shortcuts[0];
-      };
-      const renderGroup = (group) => {
-        const m = group.primary;
-        const pricing = formatListingPrice(m);
-        const ctx = m.context || "N/A";
-        const caps = [];
-        if (m.supportsTools)
-          caps.push("tools");
-        if (m.supportsReasoning)
-          caps.push("reasoning");
-        if (m.supportsVision)
-          caps.push("vision");
-        const capsLine = caps.length > 0 ? caps.join(", ") : "none";
-        const prefixes = collectRoutingPrefixes(group, getNativePrefix);
-        const accessLine = prefixes.length > 0 ? prefixes.map((p) => `\`${p}@${m.id}\``).join(" \xB7 ") : `\`${m.id}\``;
-        return [
-          `### ${m.id}`,
-          `- **Pricing**: ${pricing} avg \xB7 ${ctx} context`,
-          `- **Capabilities**: ${capsLine}`,
-          `- **Access**: ${accessLine}`,
-          ""
-        ].join(`
-`);
+      return {
+        content: [
+          {
+            type: "text",
+            text: renderRecommendedMarkdown(doc, nativeShortcutForVendor)
+          }
+        ]
       };
-      let output = `# Recommended Models
-
-`;
-      output += `_Last updated: ${doc.lastUpdated || "unknown"}_
-
-`;
-      if (flagship.length > 0) {
-        output += `## Flagship models
-
-`;
-        for (const group of flagship)
-          output += renderGroup(group);
-      }
-      if (fast.length > 0) {
-        output += `## Fast variants
-
-`;
-        for (const group of fast)
-          output += renderGroup(group);
-      }
-      const primaries = [...flagship, ...fast].map((g) => g.primary);
-      const picks = computeQuickPicks(primaries);
-      const pickLines = [];
-      if (picks.budget)
-        pickLines.push(`- **Budget**: \`${picks.budget.id}\` (${normalizePricingDisplay(picks.budget.pricing?.average)})`);
-      if (picks.largeContext)
-        pickLines.push(`- **Large context**: \`${picks.largeContext.id}\` (${picks.largeContext.context || "N/A"})`);
-      if (picks.mostCapable)
-        pickLines.push(`- **Most capable**: \`${picks.mostCapable.id}\``);
-      if (picks.visionCoding)
-        pickLines.push(`- **Vision + coding**: \`${picks.visionCoding.id}\``);
-      if (picks.agentic)
-        pickLines.push(`- **Agentic**: \`${picks.agentic.id}\``);
-      if (pickLines.length > 0) {
-        output += `## Quick picks
-
-`;
-        output += `${pickLines.join(`
-`)}
-`;
-      }
-      return { content: [{ type: "text", text: output }] };
     }
   });
   tools.push({
@@ -69352,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 }] };
     }
@@ -70128,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) => {
@@ -70161,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;
@@ -70186,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,
@@ -70293,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();
@@ -70302,10 +70523,9 @@ var init_mcp_server = __esm(() => {
   init_native_route();
   init_onepassword();
   init_probe_live();
-  init_provider_definitions();
-  init_route_candidates();
   init_routing_rules();
   init_proxy_server();
+  init_recommended_listing();
   init_redact();
   init_team_orchestrator();
   import_dotenv2 = __toESM(require_main(), 1);
@@ -70931,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 {
@@ -71017,6 +71239,7 @@ async function teamCommand(args) {
   }
 }
 var init_team_cli = __esm(() => {
+  init_child_env();
   init_pane();
   init_team_orchestrator();
 });
@@ -80370,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()) {
@@ -83791,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.1",
+  "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.1",
-    "@claudish/magmux-darwin-x64": "10.6.1",
-    "@claudish/magmux-linux-arm64": "10.6.1",
-    "@claudish/magmux-linux-x64": "10.6.1"
+    "@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",