synabun 1.3.0 → 2.0.0-beta

package/neural-interface/lib/claude-model-catalog.js

@@ -0,0 +1,483 @@
+// Live model discovery for Claude Code.
+//
+// The CLI is the only authoritative source for which models an account can
+// actually run — the list reflects entitlements and org restrictions, and it
+// changes whenever the CLI updates. Hardcoding it guarantees drift, so we ask
+// the CLI instead: spawn it with stream-json I/O, send one `initialize`
+// control request, read `models[]` out of the control_response, kill the child.
+// No user message is sent and no tokens are spent; the handshake is ~300ms.
+//
+// Mirrors queryCodexAppServerModels() in server.js — same cache/fallback shape,
+// different wire protocol (Codex speaks JSON-RPC `model/list`).
+
+import { spawn } from 'node:child_process';
+import { dirname, join, sep } from 'node:path';
+import { existsSync, readFileSync, realpathSync, statSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { getAugmentedPath } from './augmented-path.js';
+import { resolveClaudeExecutableOverride } from './native-binary-runtime.js';
+
+// Effort ladder the Claude Code CLI accepts for --effort. Models advertise their
+// own subset via supportedEffortLevels; this is the superset used as a fallback
+// and as the server-side allowlist at every spawn site.
+export const CLAUDE_EFFORT_LEVELS = Object.freeze(['low', 'medium', 'high', 'xhigh', 'max']);
+
+// Used only when discovery fails (CLI missing, spawn error, timeout). Kept
+// deliberately short — a stale fallback is less harmful than a stale primary,
+// because `source: 'fallback'` tells the UI the list is unverified.
+export const CLAUDE_FALLBACK_MODELS = Object.freeze([
+  { id: 'default', label: 'Default (recommended)', desc: 'CLI default model', tier: 'default' },
+  { id: 'opus', label: 'Opus', desc: 'Most capable' },
+  { id: 'sonnet', label: 'Sonnet', desc: 'Balanced' },
+  { id: 'haiku', label: 'Haiku', desc: 'Fastest' },
+].map(m => Object.freeze({
+  ...m,
+  resolvedModel: '',
+  contextWindow: 200000,
+  effortLevels: m.id === 'haiku' ? [] : [...CLAUDE_EFFORT_LEVELS],
+  supportsEffort: m.id !== 'haiku',
+  supportsFastMode: false,
+  cliReady: true,
+})));
+
+const DISCOVERY_TIMEOUT_MS = 15000;
+const CACHE_TTL_MS = 10 * 60 * 1000;
+
+let _cache = { at: 0, key: '', models: [] };
+let _inflight = null;
+
+// What a cache keyed on "the CLI" has to key on. An update never changes the
+// configured path: the native installer and Homebrew re-point a symlink at a new
+// version directory, and npm rewrites the entrypoint in place. The resolved target
+// plus its mtime and size changes with every one of those, so a cache keyed on this
+// sees the update on the next request instead of serving the previous model table
+// until the TTL runs out or the server restarts. A bare command name has nothing to
+// resolve and keys on itself.
+export function binaryIdentity(bin) {
+  const value = String(bin || '');
+  if (!value) return '';
+  try {
+    const real = realpathSync(value);
+    const { mtimeMs, size } = statSync(real);
+    return `${real}|${mtimeMs}|${size}`;
+  } catch {
+    return value;
+  }
+}
+
+// The CLI marks a 1M-context variant with a `[1m]` suffix on the selector value.
+// `resolvedModel` carries it too for aliases (opus[1m] → claude-opus-5[1m]), but
+// not always (claude-fable-5[1m] → claude-fable-5), so check both.
+function contextWindowFor(model) {
+  const marked = [model?.value, model?.resolvedModel]
+    .some(v => /\[1m\]$/.test(String(v || '')));
+  return marked ? 1000000 : 200000;
+}
+
+// CLI descriptions read "Opus 5 with 1M context · Best for everyday, complex tasks".
+// The lead-in restates the display name, so chips and dropdowns want only the tagline.
+function shortDescription(description) {
+  const text = String(description || '').trim();
+  const parts = text.split('·');
+  return (parts.length > 1 ? parts.slice(1).join('·') : text).trim();
+}
+
+function escapeRe(text) {
+  return String(text).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+// The versioned family name, taken from the description lead-in:
+// "Opus 5 with 1M context · …" → "Opus 5"; "Haiku 4.5 · …" → "Haiku 4.5".
+// Returns '' when the lead-in carries no version, so callers keep the CLI wording.
+function versionedFamily(description) {
+  const leadIn = String(description || '').split('·')[0].trim();
+  const family = leadIn.replace(/\s+with\s+.*$/i, '').trim();
+  return /\d/.test(family) ? family : '';
+}
+
+// The CLI's displayName is version-less ("Opus", "Fable", "Sonnet") while the
+// version appears only in `description`. The picker renders the label alone, so a
+// bare "Opus" is indistinguishable from any earlier Opus — fold the version back
+// in. Derived from CLI output rather than hardcoded, so it tracks CLI updates.
+export function versionedLabel(displayName, description) {
+  const label = String(displayName || '').trim();
+  const family = versionedFamily(description);
+  if (!family || !label) return label;
+  const base = family.replace(/\s+[\d.]+$/, '').trim(); // "Opus 5" → "Opus"
+  if (!base) return label;
+  // Already versioned by the CLI ("Opus 4.8") — leave its wording alone. Anchored
+  // to the family name on purpose: "Opus (1M context)" has digits but no version.
+  if (new RegExp(`^${escapeRe(base)}\\s*\\d`, 'i').test(label)) return label;
+  if (new RegExp(`^${escapeRe(base)}\\b`, 'i').test(label)) {
+    // "Opus (1M context)" → "Opus 5 (1M context)"; "Fable" → "Fable 5".
+    return label.replace(new RegExp(`^${escapeRe(base)}`, 'i'), family);
+  }
+  // "Default (recommended)" names no family — say which model it resolves to.
+  return `${label} — ${family}`;
+}
+
+// ModelInfo (from the SDK's SDKControlInitializeResponse) → SynaBun option shape.
+// `value` is already CLI-ready, so it becomes the selector id verbatim — no
+// ":<contextWindow>" composite, which is what `cliReady` signals downstream.
+export function normalizeClaudeModel(model) {
+  const id = String(model?.value || '').trim();
+  if (!id) return null;
+  const effortLevels = Array.isArray(model?.supportedEffortLevels)
+    ? model.supportedEffortLevels.map(String).filter(Boolean)
+    : [];
+  return {
+    id,
+    label: versionedLabel(model?.displayName || id, model?.description),
+    desc: shortDescription(model?.description),
+    description: String(model?.description || ''),
+    resolvedModel: String(model?.resolvedModel || ''),
+    contextWindow: contextWindowFor(model),
+    effortLevels,
+    supportsEffort: model?.supportsEffort === true && effortLevels.length > 0,
+    supportsFastMode: model?.supportsFastMode === true,
+    // Which controls the sidepanel may offer for this model (Auto mode, thinking).
+    supportsAutoMode: model?.supportsAutoMode === true,
+    supportsAdaptiveThinking: model?.supportsAdaptiveThinking === true,
+    cliReady: true,
+    ...(id === 'default' ? { tier: 'default' } : {}),
+  };
+}
+
+export function normalizeClaudeModels(models = []) {
+  const out = [];
+  const seen = new Set();
+  for (const model of Array.isArray(models) ? models : []) {
+    const option = normalizeClaudeModel(model);
+    if (!option || seen.has(option.id)) continue;
+    seen.add(option.id);
+    out.push(option);
+  }
+  return out;
+}
+
+// Ask the CLI for its model list. Resolves to [] on any failure — callers fall
+// back to CLAUDE_FALLBACK_MODELS rather than surfacing an error, because a
+// missing model list should degrade the picker, not break the panel.
+export function queryClaudeCliModels(claudeBin, { cwd, timeoutMs = DISCOVERY_TIMEOUT_MS } = {}) {
+  return new Promise((resolveResult) => {
+    let bin = claudeBin;
+    const args = [
+      '-p',
+      '--input-format', 'stream-json',
+      '--output-format', 'stream-json',
+      '--verbose',
+      // Load no settings files. Without this the user's own SessionStart hooks
+      // fire on every discovery — slow, and with visible side effects.
+      //
+      // Written as one `=` token, not a `'--setting-sources', ''` pair: the spawn
+      // below falls back to a shell whenever `bin` is a bare command name, and a
+      // shell concatenates argv instead of passing it through. The empty string
+      // vanishes in that concatenation, leaving a dangling flag, and the CLI exits
+      // with "option '--setting-sources <sources>' argument missing" — which this
+      // function reports as an empty model list, silently degrading the whole
+      // picker to CLAUDE_FALLBACK_MODELS. The `=` form survives either path.
+      '--setting-sources=',
+    ];
+    // Same spawn quirks as the main session path: Windows can't exec a .js
+    // directly, and .cmd/.bat need a shell.
+    if (process.platform === 'win32' && /\.js$/i.test(bin)) {
+      args.unshift(bin);
+      bin = process.execPath;
+    }
+    const useShell = !String(bin).includes(sep)
+      || (process.platform === 'win32' && /\.(cmd|bat)$/i.test(bin));
+
+    let child;
+    let settled = false;
+    const finish = (models) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      try { child?.kill(); } catch {}
+      resolveResult(models);
+    };
+    const timer = setTimeout(() => finish([]), timeoutMs);
+    timer.unref?.();
+
+    try {
+      child = spawn(bin, args, {
+        cwd: cwd || process.cwd(),
+        env: { ...process.env, PATH: getAugmentedPath(), CLAUDE_CODE_ENTRYPOINT: 'sdk-cli' },
+        stdio: ['pipe', 'pipe', 'ignore'],
+        shell: useShell,
+      });
+    } catch {
+      return finish([]);
+    }
+
+    child.on('error', () => finish([]));
+    child.on('exit', () => finish([]));
+
+    let buf = '';
+    child.stdout.setEncoding('utf-8');
+    child.stdout.on('data', (chunk) => {
+      buf += chunk;
+      const lines = buf.split('\n');
+      buf = lines.pop() || '';
+      for (const line of lines) {
+        if (!line.trim()) continue;
+        let msg;
+        try { msg = JSON.parse(line); } catch { continue; }
+        if (msg?.type !== 'control_response') continue;
+        const payload = msg.response?.response;
+        finish(Array.isArray(payload?.models) ? payload.models : []);
+        return;
+      }
+    });
+
+    try {
+      child.stdin.write(JSON.stringify({
+        type: 'control_request',
+        request_id: 'synabun-models',
+        request: { subtype: 'initialize' },
+      }) + '\n');
+    } catch {
+      finish([]);
+    }
+  });
+}
+
+// Cached discovery. `source` lets the UI distinguish a verified list from the
+// baked-in fallback. Cache is keyed on the binary's identity, so switching the
+// configured CLI (Settings > Terminal) or updating it re-discovers.
+export async function discoverClaudeModels(claudeBin, { force = false, cwd } = {}) {
+  const bin = String(claudeBin || '');
+  const key = binaryIdentity(bin);
+  const fresh = _cache.models.length
+    && _cache.key === key
+    && Date.now() - _cache.at < CACHE_TTL_MS;
+  if (!force && fresh) return { source: 'cache', models: _cache.models };
+  if (_inflight) return _inflight;
+
+  _inflight = (async () => {
+    try {
+      const raw = await queryClaudeCliModels(bin, { cwd });
+      const models = normalizeClaudeModels(raw);
+      if (models.length) {
+        _cache = { at: Date.now(), key, models };
+        return { source: 'cli', models };
+      }
+      return { source: 'fallback', models: [...CLAUDE_FALLBACK_MODELS] };
+    } finally {
+      _inflight = null;
+    }
+  })();
+  return _inflight;
+}
+
+export function clearClaudeModelCache() {
+  _cache = { at: 0, key: '', models: [] };
+  _skewCache = { key: null, result: undefined };
+  _skewInflight.clear();
+  _alignFailures.clear();
+}
+
+// ── CLI version skew ──────────────────────────────────────────────────────────
+// Two different Claude Code binaries are in play: this module discovers models
+// from the CLI resolved for terminals/agents/loops, while sidepanel chats run on
+// the one the Agent SDK bundles. Both accept the same *alias* ids ("default",
+// "opus[1m]", "sonnet"), but each maps them with its own model table — so when
+// the versions drift the picker labels a model from one table and the session
+// silently runs whatever the other table calls "opus". That is invisible from
+// the outside: the only symptom is the model naming a different version of
+// itself. Compare the two, say so, and — when the installed CLI is the newer
+// one — run sessions on it (see alignedClaudeExecutable below).
+
+const _require = createRequire(import.meta.url);
+
+// The Claude Code version the installed Agent SDK ships, from the SDK's own
+// manifest (`manifest.json` → "version": "2.1.220"). Not in the package's
+// exports map, so walk up from the resolved entry file. null when the SDK is
+// absent — the legacy engine spawns the discovered CLI and cannot skew.
+export function sdkBundledCliVersion() {
+  try {
+    let dir = dirname(_require.resolve('@anthropic-ai/claude-agent-sdk'));
+    for (let i = 0; i < 5; i++) {
+      const manifest = join(dir, 'manifest.json');
+      if (existsSync(manifest)) {
+        const v = JSON.parse(readFileSync(manifest, 'utf-8'))?.version;
+        return v ? String(v) : null;
+      }
+      dir = dirname(dir);
+    }
+  } catch {}
+  return null;
+}
+
+// `claude --version` prints "2.1.220 (Claude Code)".
+export function parseCliVersion(text) {
+  const m = /(\d+\.\d+\.\d+)/.exec(String(text || ''));
+  return m ? m[1] : null;
+}
+
+// Numeric x.y.z comparison — a string compare would put 2.1.99 above 2.1.100.
+// 1 when `a` is newer, -1 when older, 0 when equal, null when either side is not
+// a version.
+export function compareCliVersions(a, b) {
+  const va = parseCliVersion(a);
+  const vb = parseCliVersion(b);
+  if (!va || !vb) return null;
+  const pa = va.split('.').map(Number);
+  const pb = vb.split('.').map(Number);
+  for (let i = 0; i < pa.length; i++) {
+    if (pa[i] !== pb[i]) return pa[i] > pb[i] ? 1 : -1;
+  }
+  return 0;
+}
+
+export function queryClaudeCliVersion(claudeBin, { timeoutMs = 10000 } = {}) {
+  return new Promise((resolveResult) => {
+    let bin = claudeBin;
+    const args = ['--version'];
+    if (process.platform === 'win32' && /\.js$/i.test(bin)) {
+      args.unshift(bin);
+      bin = process.execPath;
+    }
+    const useShell = !String(bin).includes(sep)
+      || (process.platform === 'win32' && /\.(cmd|bat)$/i.test(bin));
+
+    let child;
+    let settled = false;
+    let out = '';
+    const finish = (value) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      try { child?.kill(); } catch {}
+      resolveResult(value);
+    };
+    const timer = setTimeout(() => finish(null), timeoutMs);
+    timer.unref?.();
+
+    try {
+      child = spawn(bin, args, {
+        env: { ...process.env, PATH: getAugmentedPath() },
+        stdio: ['ignore', 'pipe', 'ignore'],
+        shell: useShell,
+      });
+    } catch {
+      return finish(null);
+    }
+    child.on('error', () => finish(null));
+    child.stdout.setEncoding('utf-8');
+    child.stdout.on('data', (chunk) => { out += chunk; });
+    child.on('close', () => finish(parseCliVersion(out)));
+  });
+}
+
+// Never blocks discovery. The result is cached per binary identity — the model
+// endpoints ask on every request, and it now also decides which binary SDK
+// sessions run — so a `claude --version` spawn happens once per installed CLI,
+// not once per request. A CLI update changes the identity and re-probes. `null`
+// (nothing to compare: no SDK, unreadable CLI) is cached too. Warns once per
+// distinct pair so repeated checks don't spam the log.
+const _warnedSkew = new Set();
+let _skewCache = { key: null, result: undefined };
+const _skewInflight = new Map(); // binary identity → pending probe
+
+function warnSkewOnce(result, claudeBin, log) {
+  const pair = `${result.discovered}→${result.bundled}`;
+  if (_warnedSkew.has(pair)) return;
+  _warnedSkew.add(pair);
+  if (result.installedNewer) {
+    log(
+      `[claude-models] CLI version skew: the installed CLI ${result.discovered} (${claudeBin}) is newer `
+      + `than the ${result.bundled} bundled with @anthropic-ai/claude-agent-sdk. Sidepanel sessions and `
+      + 'native loops will run the installed CLI, so a picked model launches as the version the picker '
+      + 'names. Bump @anthropic-ai/claude-agent-sdk to the release that bundles it to re-align the runtime.',
+    );
+    return;
+  }
+  log(
+    `[claude-models] CLI version skew: model picker reads ${result.discovered} (${claudeBin}) `
+    + `but sidepanel sessions run ${result.bundled} (bundled with @anthropic-ai/claude-agent-sdk). `
+    + 'Alias ids like "opus[1m]" resolve per-binary, so a picked model can launch as a '
+    + `different version. Align them: update the installed Claude CLI to ${result.bundled} or newer.`,
+  );
+}
+
+export async function checkClaudeCliSkew(claudeBin, {
+  log = console.warn,
+  force = false,
+  queryVersion = queryClaudeCliVersion,
+  bundledVersion = sdkBundledCliVersion,
+} = {}) {
+  const key = binaryIdentity(claudeBin);
+  let result;
+  if (!force && _skewCache.key === key && _skewCache.result !== undefined) {
+    result = _skewCache.result;
+  } else {
+    let probe = _skewInflight.get(key);
+    if (!probe) {
+      probe = (async () => {
+        const bundled = bundledVersion();
+        const discovered = bundled ? await queryVersion(claudeBin) : null;
+        const order = compareCliVersions(discovered, bundled);
+        const value = order === null ? null : {
+          discovered,
+          bundled,
+          skewed: order !== 0,
+          installedNewer: order > 0,
+        };
+        _skewCache = { key, result: value };
+        return value;
+      })().finally(() => _skewInflight.delete(key));
+      _skewInflight.set(key, probe);
+    }
+    result = await probe;
+  }
+  if (result?.skewed) warnSkewOnce(result, claudeBin, log);
+  return result;
+}
+
+// Synchronous view of the last probe for this binary: the result, null (probed,
+// nothing to compare), or undefined (not probed at this identity — typically
+// because the CLI was updated since).
+export function cachedClaudeCliSkew(claudeBin) {
+  return _skewCache.key === binaryIdentity(claudeBin) ? _skewCache.result : undefined;
+}
+
+// ── Runtime alignment ─────────────────────────────────────────────────────────
+// The picker's model table comes from the installed CLI; SDK sessions (sidepanel)
+// and native loops default to the CLI the SDK bundles. When the installed one is
+// newer, the same alias resolves to a newer model there — "opus[1m]" is Opus 5.5 on
+// 2.1.280 but Opus 5 on 2.1.278 — so the picker would promise a model the session
+// cannot launch. In that case sessions run the installed CLI instead. Everywhere
+// else the bundled, version-matched binary stays the default: when the versions
+// match, when the bundled one is the newer of the two, and when no usable CLI is
+// installed.
+const _alignFailures = new Set(); // binary identities whose aligned launch failed
+
+// A launch failure of the aligned CLI sends every later session back to the bundled
+// runtime. Keyed by identity, so the next CLI update gets a fresh chance.
+export function markAlignedClaudeExecutableFailed(claudeBin) {
+  const key = binaryIdentity(claudeBin);
+  if (key) _alignFailures.add(key);
+}
+
+// The path SDK sessions should run instead of the bundled CLI, or null to keep the
+// bundled one. Never blocks: when this binary has not been compared yet, the check
+// starts in the background and this call answers null, so no session waits on a
+// version probe — the next one aligns.
+export function alignedClaudeExecutable(claudeBin, {
+  skew = cachedClaudeCliSkew(claudeBin),
+  refresh = true,
+  resolveOverride = resolveClaudeExecutableOverride,
+} = {}) {
+  if (!claudeBin) return null;
+  if (skew === undefined) {
+    if (refresh) checkClaudeCliSkew(claudeBin).catch(() => {});
+    return null;
+  }
+  if (!skew?.installedNewer) return null;
+  if (_alignFailures.has(binaryIdentity(claudeBin))) return null;
+  // The SDK spawns this path verbatim with shell:false; the shared override
+  // contract rejects bare command names and anything that is not executable.
+  const candidate = resolveOverride(claudeBin);
+  return candidate?.ok && candidate.path ? candidate.path : null;
+}

package/neural-interface/lib/claude-panel-requests.js

@@ -0,0 +1,165 @@
+// ── Questions a sidepanel tab asks its live session ──
+//
+// One request/response pair on the socket (`session_request` → `session_response`)
+// for the Query's control calls the panel shows as cards: context usage, plan
+// usage, MCP server status and control, a rewind preview. The answers are
+// trimmed here: the panel needs the numbers, not every tool description.
+
+const num = (v) => (Number.isFinite(Number(v)) ? Number(v) : 0);
+const text = (v, max = 300) => String(v ?? '').slice(0, max);
+const top = (list, n, by = 'tokens') => (Array.isArray(list) ? [...list] : []).sort((a, b) => num(b?.[by]) - num(a?.[by])).slice(0, n);
+
+export function slimContextUsage(r) {
+  const o = r && typeof r === 'object' ? r : {};
+  return {
+    model: text(o.model, 120),
+    totalTokens: num(o.totalTokens),
+    maxTokens: num(o.maxTokens),
+    rawMaxTokens: num(o.rawMaxTokens),
+    percentage: num(o.percentage),
+    autoCompact: { enabled: o.isAutoCompactEnabled === true, threshold: num(o.autoCompactThreshold) },
+    categories: (Array.isArray(o.categories) ? o.categories : []).map(c => ({ name: text(c?.name, 80), tokens: num(c?.tokens), kind: text(c?.kind, 20), deferred: c?.isDeferred === true })),
+    memoryFiles: top(o.memoryFiles, 12).map(f => ({ path: text(f?.path, 300), type: text(f?.type, 40), tokens: num(f?.tokens) })),
+    mcpTools: top(o.mcpTools, 15).map(t => ({ name: text(t?.name, 120), server: text(t?.serverName, 80), tokens: num(t?.tokens), loaded: t?.isLoaded !== false })),
+    mcpToolCount: Array.isArray(o.mcpTools) ? o.mcpTools.length : 0,
+    agents: top(o.agents, 12).map(a => ({ name: text(a?.agentType, 80), source: text(a?.source, 40), tokens: num(a?.tokens) })),
+    skills: o.skills ? { total: num(o.skills.totalSkills), included: num(o.skills.includedSkills), tokens: num(o.skills.tokens) } : null,
+    slashCommands: o.slashCommands ? { total: num(o.slashCommands.totalCommands), included: num(o.slashCommands.includedCommands), tokens: num(o.slashCommands.tokens) } : null,
+  };
+}
+
+const windowOf = (w) => (w && typeof w === 'object' ? { utilization: w.utilization == null ? null : num(w.utilization), resetsAt: w.resets_at || null } : null);
+
+export function slimUsage(r) {
+  const o = r && typeof r === 'object' ? r : {};
+  const s = o.session && typeof o.session === 'object' ? o.session : {};
+  const rl = o.rate_limits && typeof o.rate_limits === 'object' ? o.rate_limits : null;
+  return {
+    session: {
+      costUsd: num(s.total_cost_usd),
+      apiDurationMs: num(s.total_api_duration_ms),
+      durationMs: num(s.total_duration_ms),
+      linesAdded: num(s.total_lines_added),
+      linesRemoved: num(s.total_lines_removed),
+      models: Object.entries(s.model_usage && typeof s.model_usage === 'object' ? s.model_usage : {}).map(([model, u]) => ({
+        model: text(model, 120),
+        input: num(u?.inputTokens) + num(u?.cacheReadInputTokens) + num(u?.cacheCreationInputTokens),
+        output: num(u?.outputTokens),
+        costUsd: num(u?.costUSD),
+      })),
+    },
+    subscription: o.subscription_type ? text(o.subscription_type, 60) : '',
+    limitsAvailable: o.rate_limits_available === true && !!rl,
+    limits: rl ? {
+      fiveHour: windowOf(rl.five_hour),
+      sevenDay: windowOf(rl.seven_day),
+      sevenDayOpus: windowOf(rl.seven_day_opus),
+      sevenDaySonnet: windowOf(rl.seven_day_sonnet),
+      models: (Array.isArray(rl.model_scoped) ? rl.model_scoped : []).slice(0, 8).map(m => ({ name: text(m?.display_name, 80), ...windowOf(m) })),
+      extraUsage: rl.extra_usage ? {
+        enabled: rl.extra_usage.is_enabled === true,
+        monthlyLimit: rl.extra_usage.monthly_limit == null ? null : num(rl.extra_usage.monthly_limit),
+        used: rl.extra_usage.used_credits == null ? null : num(rl.extra_usage.used_credits),
+        currency: rl.extra_usage.currency || '',
+      } : null,
+    } : null,
+  };
+}
+
+export function slimMcpStatus(list) {
+  return (Array.isArray(list) ? list : []).map(s => ({
+    name: text(s?.name, 120),
+    status: text(s?.status, 20),
+    error: s?.error ? text(s.error, 400) : '',
+    scope: text(s?.scope || s?.source || '', 40),
+    version: s?.serverInfo?.version ? text(`${s.serverInfo.name || ''} ${s.serverInfo.version}`.trim(), 80) : '',
+    toolCount: Array.isArray(s?.tools) ? s.tools.length : 0,
+    tools: (Array.isArray(s?.tools) ? s.tools : []).slice(0, 60).map(t => text(t?.name, 100)),
+  }));
+}
+
+export function slimRewind(r) {
+  const o = r && typeof r === 'object' ? r : {};
+  return {
+    canRewind: o.canRewind !== false,
+    error: o.error ? text(o.error, 300) : '',
+    filesChanged: (Array.isArray(o.filesChanged) ? o.filesChanged : []).slice(0, 100).map(f => text(f, 400)),
+    fileCount: Array.isArray(o.filesChanged) ? o.filesChanged.length : 0,
+    insertions: num(o.insertions),
+    deletions: num(o.deletions),
+    skippedLinks: num(o.skippedLinks),
+  };
+}
+
+// The experimental usage call is named so that hosts expect it to change: find
+// it by its prefix instead of hard-coding the whole name.
+function usageMethod(q) {
+  if (!q) return null;
+  for (const key of ['usage', 'getUsage']) if (typeof q[key] === 'function') return key;
+  let proto = q;
+  for (let depth = 0; proto && depth < 4; depth++, proto = Object.getPrototypeOf(proto)) {
+    const hit = Object.getOwnPropertyNames(proto).find(k => k.startsWith('usage_') && typeof q[k] === 'function');
+    if (hit) return hit;
+  }
+  return null;
+}
+
+// (`permission_rules` and `forget_session_rules` are answered by the bridge
+// itself: they are about the session object, not a Query call.)
+// (`mcp_set_servers` too: it needs the host's own server entries.)
+export const SESSION_REQUESTS = ['context_usage', 'usage', 'mcp_status', 'mcp_reconnect', 'mcp_toggle', 'rewind_preview', 'permission_rules', 'forget_session_rules', 'mcp_set_servers', 'mcp_permission_mode'];
+
+/**
+ * Run one request against a live Query.
+ * @returns the data for the session_response; throws with a message for the user.
+ */
+export async function runSessionRequest(q, what, args = {}) {
+  if (!q) throw new Error('No active session. Send a message first.');
+  const need = (name) => { if (typeof q[name] !== 'function') throw new Error('Not supported by this Claude Code version'); };
+  switch (what) {
+    case 'context_usage':
+      need('getContextUsage');
+      // `full` costs token-count calls: only when the user asked for it.
+      return slimContextUsage(await q.getContextUsage({ detail: args.detail === 'full' ? 'full' : 'summary' }));
+    case 'usage': {
+      const method = usageMethod(q);
+      if (!method) throw new Error('Not supported by this Claude Code version');
+      return slimUsage(await q[method]({ skipBehaviors: true }));
+    }
+    case 'mcp_status':
+      need('mcpServerStatus');
+      return { servers: slimMcpStatus(await q.mcpServerStatus()) };
+    case 'mcp_reconnect': {
+      need('reconnectMcpServer');
+      const name = String(args.serverName || '');
+      if (!name) throw new Error('Missing server name');
+      await q.reconnectMcpServer(name);
+      return { servers: slimMcpStatus(await q.mcpServerStatus()) };
+    }
+    case 'mcp_toggle': {
+      need('toggleMcpServer');
+      const name = String(args.serverName || '');
+      if (!name) throw new Error('Missing server name');
+      await q.toggleMcpServer(name, args.enabled === true);
+      return { servers: slimMcpStatus(await q.mcpServerStatus()) };
+    }
+    case 'mcp_permission_mode': {
+      // Force a prompt for every call of one server ('default'), hand its calls
+      // to the auto-mode classifier ('auto'), or clear the override (null).
+      need('setMcpPermissionModeOverride');
+      const name = String(args.serverName || '');
+      if (!name) throw new Error('Missing server name');
+      const mode = args.mode === 'default' || args.mode === 'auto' ? args.mode : null;
+      const r = await q.setMcpPermissionModeOverride(name, mode);
+      return { serverName: name, mode, warning: typeof r?.warning === 'string' ? r.warning.slice(0, 300) : '' };
+    }
+    case 'rewind_preview': {
+      need('rewindFiles');
+      const uuid = String(args.userMessageUuid || '');
+      if (!uuid) throw new Error('Missing message id');
+      return slimRewind(await q.rewindFiles(uuid, { dryRun: true }));
+    }
+    default:
+      throw new Error(`Unknown request: ${what}`);
+  }
+}