@mrciphersmith/keryx 0.2.99 → 0.2.100

package/dist/cli.js

@@ -48173,7 +48173,7 @@ import path47 from "path";
 // package.json
 var package_default = {
   name: "@mrciphersmith/keryx",
-  version: "0.2.99",
+  version: "0.2.100",
   description: "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   private: false,
   publishConfig: {
@@ -73168,7 +73168,7 @@ async function connectStdioMcpServer(argv, options, handshakeTimeoutMs, signal,
 }
 
 // src/mcp-servers/runtime.ts
-import path168 from "path";
+import path169 from "path";
 
 // src/mcp-servers/manager.ts
 var DEFAULT_CONNECT_CONCURRENCY = 4;
@@ -73356,6 +73356,152 @@ function credentialSummary(raw) {
   return parts.join(" + ");
 }
 
+// src/mcp-servers/store.ts
+init_config_dir();
+import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync7 } from "fs";
+import path168 from "path";
+var SERVER_NAME_PATTERN = /^[A-Za-z0-9_-]+$/;
+function userConfigFile(configDir) {
+  return path168.join(configDir ?? ensureKeryxConfigDir(), "mcp-servers.json");
+}
+function projectConfigFile(projectRoot) {
+  return path168.join(projectRoot, ".keryx", "mcp-servers.json");
+}
+function overlayFile(configDir) {
+  return path168.join(configDir ?? ensureKeryxConfigDir(), "mcp-servers-disabled.json");
+}
+function readForWrite(file) {
+  const read = readConfigFile(file);
+  if (!read.ok) {
+    return isDefiniteAbsence(read.reason) ? { doc: { schemaVersion: 1, servers: Object.create(null) }, existed: false } : { error: `${file} could not be read (${read.reason}); nothing was written` };
+  }
+  let parsed;
+  try {
+    parsed = parseJsonTolerant(read.text);
+  } catch (error) {
+    return {
+      error: `${file} is not valid JSON (${error instanceof Error ? error.message : String(error)}); nothing was written. Fix it by hand first.`
+    };
+  }
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    return { error: `${file} is not a JSON object; nothing was written` };
+  }
+  const doc = parsed;
+  const servers = doc.servers;
+  if (servers !== undefined && (typeof servers !== "object" || servers === null || Array.isArray(servers))) {
+    return { error: `${file} has a \`servers\` that is not an object; nothing was written` };
+  }
+  return {
+    doc: {
+      ...parsed,
+      schemaVersion: typeof doc.schemaVersion === "number" ? doc.schemaVersion : 1,
+      servers: Object.assign(Object.create(null), servers)
+    },
+    existed: true
+  };
+}
+function writeDocument(file, doc, scope) {
+  const body = `${JSON.stringify(doc, null, 2)}
+`;
+  if (scope === "user") {
+    writeOwnerOnlyFileAtomic(file, body);
+    return;
+  }
+  mkdirSync6(path168.dirname(file), { recursive: true });
+  writeFileSync7(file, body, { encoding: "utf8" });
+}
+function addServer(options) {
+  if (!SERVER_NAME_PATTERN.test(options.name)) {
+    return { ok: false, error: `server name "${options.name}" must match ${SERVER_NAME_PATTERN.source}` };
+  }
+  if (!/^[A-Za-z_]/.test(options.name)) {
+    return {
+      ok: false,
+      error: `server name "${options.name}" must start with a letter or underscore, or none of its tools can be named`
+    };
+  }
+  if (options.name.length > MAX_SERVER_NAME_LENGTH) {
+    return {
+      ok: false,
+      error: `server name "${options.name}" is ${options.name.length} characters; the limit is ${MAX_SERVER_NAME_LENGTH} so that "<server>__<tool>" fits in 64`
+    };
+  }
+  const file = fileForScope(options.scope, options);
+  if (typeof file !== "string")
+    return file;
+  const loaded = readForWrite(file);
+  if ("error" in loaded)
+    return { ok: false, error: loaded.error };
+  if (loaded.doc.servers[options.name] !== undefined && options.force !== true) {
+    return {
+      ok: false,
+      error: `server "${options.name}" already exists in ${file}. Pass --force to replace it, or remove it first.`
+    };
+  }
+  loaded.doc.servers[options.name] = options.entry;
+  writeDocument(file, loaded.doc, options.scope);
+  return { ok: true, file, created: !loaded.existed };
+}
+function removeServer(options) {
+  const file = fileForScope(options.scope, options);
+  if (typeof file !== "string")
+    return file;
+  const loaded = readForWrite(file);
+  if ("error" in loaded)
+    return { ok: false, error: loaded.error };
+  if (loaded.doc.servers[options.name] === undefined) {
+    return { ok: false, error: `server "${options.name}" is not defined in ${file}` };
+  }
+  delete loaded.doc.servers[options.name];
+  writeDocument(file, loaded.doc, options.scope);
+  return { ok: true, file, created: false };
+}
+function setServerEnabled(options) {
+  const file = overlayFile(options.configDir);
+  const read = readConfigFile(file);
+  let overlay = {};
+  if (read.ok) {
+    try {
+      const parsed = parseJsonTolerant(read.text);
+      if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+        overlay = parsed;
+      }
+    } catch {
+      overlay = {};
+    }
+  } else if (!isDefiniteAbsence(read.reason)) {
+    return { ok: false, error: `${file} could not be read (${read.reason}); nothing was written` };
+  }
+  const overrides = { ...overlay.overrides, [options.name]: options.enabled };
+  writeOwnerOnlyFileAtomic(file, `${JSON.stringify({ ...overlay, overrides }, null, 2)}
+`);
+  if (options.source === "user") {
+    clearStickyUserFlag(options.name, options.enabled, options.configDir);
+  }
+  return { ok: true, file, created: !read.ok };
+}
+function clearStickyUserFlag(name, enabled, configDir) {
+  const file = userConfigFile(configDir);
+  const loaded = readForWrite(file);
+  if ("error" in loaded)
+    return;
+  const entry = loaded.doc.servers[name];
+  if (entry === undefined)
+    return;
+  if (entry.enabled === undefined || entry.enabled === enabled)
+    return;
+  delete entry.enabled;
+  writeDocument(file, loaded.doc, "user");
+}
+function fileForScope(scope, targets) {
+  if (scope === "user")
+    return userConfigFile(targets.configDir);
+  if (targets.projectRoot === undefined) {
+    return { ok: false, error: "--scope project needs a project root; none was resolved" };
+  }
+  return projectConfigFile(targets.projectRoot);
+}
+
 // src/harness/external/env.ts
 var EXTERNAL_ENV_DENY = [
   "ANTHROPIC_API_KEY",
@@ -73585,11 +73731,32 @@ function createMcpRuntime(options) {
   const kills = [];
   const env = options.env ?? process.env;
   const connect = options.connect ?? ((server) => defaultConnect(server, env, dialling.signal, kills, options.configDir));
+  const closedAlready = new WeakSet;
+  const mutated = new Set;
   const settled = startServers(launchable, connect).then((result) => {
-    catalog = result.catalog;
-    states = [...heldStates, ...result.servers].sort((a, b) => a.name.localeCompare(b.name));
+    for (const incoming of result.servers) {
+      if (!mutated.has(incoming.name))
+        continue;
+      if (incoming.connection !== undefined && !closedAlready.has(incoming.connection)) {
+        closedAlready.add(incoming.connection);
+        incoming.connection.close().catch(() => {});
+      }
+    }
+    const kept = states.filter((state) => mutated.has(state.name));
+    const incoming = result.servers.filter((state) => !mutated.has(state.name));
+    const heldStill = heldStates.filter((state) => !mutated.has(state.name));
+    states = uniqueByName([...heldStill, ...incoming, ...kept]).sort((a, b) => a.name.localeCompare(b.name));
+    catalog = mergeCatalogs([
+      {
+        entries: result.catalog.entries.filter((entry) => !mutated.has(entry.server)),
+        skipped: result.catalog.skipped.filter((skip) => !mutated.has(skip.server))
+      },
+      {
+        entries: catalog.entries.filter((entry) => mutated.has(entry.server)),
+        skipped: catalog.skipped.filter((skip) => mutated.has(skip.server))
+      }
+    ]);
   }).catch(() => {});
-  const closedAlready = new WeakSet;
   const closeOnce = async (list) => {
     const fresh = list.filter((state) => state.connection !== undefined && !closedAlready.has(state.connection));
     for (const state of fresh) {
@@ -73599,6 +73766,7 @@ function createMcpRuntime(options) {
     await closeServers(fresh);
   };
   let closing;
+  const inflight = new Map;
   return {
     catalog: () => catalog,
     servers: () => states,
@@ -73608,8 +73776,100 @@ function createMcpRuntime(options) {
     ready: async () => {
       await settled;
     },
+    connectServer: (name) => runExclusive(name, () => connectOne(name)),
+    disconnectServer: (name) => runExclusive(name, () => disconnectOne(name)),
     close: () => closing ??= closeNow()
   };
+  function runExclusive(name, work) {
+    const existing = inflight.get(name);
+    if (existing !== undefined)
+      return existing;
+    const pending = work().finally(() => {
+      inflight.delete(name);
+    });
+    inflight.set(name, pending);
+    return pending;
+  }
+  function replaceState(next) {
+    states = uniqueByName([...states.filter((state) => state.name !== next.name), next]).sort((a, b) => a.name.localeCompare(b.name));
+  }
+  function stripCatalog(name) {
+    catalog = {
+      entries: catalog.entries.filter((entry) => entry.server !== name),
+      skipped: catalog.skipped.filter((skip) => skip.server !== name)
+    };
+  }
+  async function persistEnabled(server, enabled) {
+    const written = setServerEnabled({
+      name: server.name,
+      enabled,
+      source: server.source,
+      ...options.configDir === undefined ? {} : { configDir: options.configDir }
+    });
+    return written.ok ? undefined : { ok: false, message: written.error };
+  }
+  async function connectOne(name) {
+    if (closing !== undefined)
+      return { ok: false, message: "session is closing" };
+    const server = byName.get(name);
+    if (server === undefined)
+      return { ok: false, message: `no server named "${name}"` };
+    if (requiresApproval(server, loadTrustStore(options.configDir))) {
+      return { ok: false, message: `project server not approved; run \`keryx mcp trust ${name}\`` };
+    }
+    const current = states.find((state) => state.name === name);
+    if (current?.status === "connected")
+      return { ok: true };
+    if (current?.status === "connecting") {
+      return { ok: false, message: `server "${name}" is already connecting` };
+    }
+    const persist = await persistEnabled(server, true);
+    if (persist !== undefined)
+      return persist;
+    mutated.add(name);
+    if (current?.connection !== undefined) {
+      if (!closedAlready.has(current.connection))
+        closedAlready.add(current.connection);
+      await closeServers([current]);
+    }
+    stripCatalog(name);
+    replaceState({ name, status: "connecting", toolCount: 0 });
+    const result = await startServers([{ ...server, enabled: true }], connect);
+    const next = result.servers[0];
+    if (next === undefined) {
+      replaceState({ name, status: "failed", error: "dial returned nothing", toolCount: 0 });
+      return { ok: false, message: "dial returned nothing" };
+    }
+    replaceState(next);
+    if (next.status === "connected") {
+      catalog = mergeCatalogs([catalog, result.catalog]);
+      return { ok: true };
+    }
+    return { ok: false, message: next.error ?? `server "${name}" did not connect` };
+  }
+  async function disconnectOne(name) {
+    if (closing !== undefined)
+      return { ok: false, message: "session is closing" };
+    const server = byName.get(name);
+    if (server === undefined)
+      return { ok: false, message: `no server named "${name}"` };
+    const current = states.find((state) => state.name === name);
+    if (current?.status === "connecting") {
+      return { ok: false, message: `server "${name}" is still connecting` };
+    }
+    const persist = await persistEnabled(server, false);
+    if (persist !== undefined)
+      return persist;
+    mutated.add(name);
+    if (current?.connection !== undefined) {
+      if (!closedAlready.has(current.connection))
+        closedAlready.add(current.connection);
+      await closeServers([current]);
+    }
+    stripCatalog(name);
+    replaceState({ name, status: "disabled", toolCount: 0 });
+    return { ok: true };
+  }
   async function closeNow() {
     {
       dialling.abort();
@@ -73620,6 +73880,17 @@ function createMcpRuntime(options) {
     }
   }
 }
+function uniqueByName(list) {
+  const seen = new Set;
+  const out = [];
+  for (const state of list) {
+    if (seen.has(state.name))
+      continue;
+    seen.add(state.name);
+    out.push(state);
+  }
+  return out;
+}
 function handshakeBudgetMs(server) {
   const configured = server.startup_timeout_sec;
   if (configured === undefined || !Number.isFinite(configured) || configured <= 0) {
@@ -73685,153 +73956,7 @@ async function defaultConnect(server, env, signal, kills, configDir) {
 function defaultServerCwd(server, fallbackCwd = process.cwd()) {
   if (server.source !== "project")
     return fallbackCwd;
-  return path168.dirname(path168.dirname(server.file));
-}
-
-// src/mcp-servers/store.ts
-init_config_dir();
-import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync7 } from "fs";
-import path169 from "path";
-var SERVER_NAME_PATTERN = /^[A-Za-z0-9_-]+$/;
-function userConfigFile(configDir) {
-  return path169.join(configDir ?? ensureKeryxConfigDir(), "mcp-servers.json");
-}
-function projectConfigFile(projectRoot) {
-  return path169.join(projectRoot, ".keryx", "mcp-servers.json");
-}
-function overlayFile(configDir) {
-  return path169.join(configDir ?? ensureKeryxConfigDir(), "mcp-servers-disabled.json");
-}
-function readForWrite(file) {
-  const read = readConfigFile(file);
-  if (!read.ok) {
-    return isDefiniteAbsence(read.reason) ? { doc: { schemaVersion: 1, servers: Object.create(null) }, existed: false } : { error: `${file} could not be read (${read.reason}); nothing was written` };
-  }
-  let parsed;
-  try {
-    parsed = parseJsonTolerant(read.text);
-  } catch (error) {
-    return {
-      error: `${file} is not valid JSON (${error instanceof Error ? error.message : String(error)}); nothing was written. Fix it by hand first.`
-    };
-  }
-  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-    return { error: `${file} is not a JSON object; nothing was written` };
-  }
-  const doc = parsed;
-  const servers = doc.servers;
-  if (servers !== undefined && (typeof servers !== "object" || servers === null || Array.isArray(servers))) {
-    return { error: `${file} has a \`servers\` that is not an object; nothing was written` };
-  }
-  return {
-    doc: {
-      ...parsed,
-      schemaVersion: typeof doc.schemaVersion === "number" ? doc.schemaVersion : 1,
-      servers: Object.assign(Object.create(null), servers)
-    },
-    existed: true
-  };
-}
-function writeDocument(file, doc, scope) {
-  const body = `${JSON.stringify(doc, null, 2)}
-`;
-  if (scope === "user") {
-    writeOwnerOnlyFileAtomic(file, body);
-    return;
-  }
-  mkdirSync6(path169.dirname(file), { recursive: true });
-  writeFileSync7(file, body, { encoding: "utf8" });
-}
-function addServer(options) {
-  if (!SERVER_NAME_PATTERN.test(options.name)) {
-    return { ok: false, error: `server name "${options.name}" must match ${SERVER_NAME_PATTERN.source}` };
-  }
-  if (!/^[A-Za-z_]/.test(options.name)) {
-    return {
-      ok: false,
-      error: `server name "${options.name}" must start with a letter or underscore, or none of its tools can be named`
-    };
-  }
-  if (options.name.length > MAX_SERVER_NAME_LENGTH) {
-    return {
-      ok: false,
-      error: `server name "${options.name}" is ${options.name.length} characters; the limit is ${MAX_SERVER_NAME_LENGTH} so that "<server>__<tool>" fits in 64`
-    };
-  }
-  const file = fileForScope(options.scope, options);
-  if (typeof file !== "string")
-    return file;
-  const loaded = readForWrite(file);
-  if ("error" in loaded)
-    return { ok: false, error: loaded.error };
-  if (loaded.doc.servers[options.name] !== undefined && options.force !== true) {
-    return {
-      ok: false,
-      error: `server "${options.name}" already exists in ${file}. Pass --force to replace it, or remove it first.`
-    };
-  }
-  loaded.doc.servers[options.name] = options.entry;
-  writeDocument(file, loaded.doc, options.scope);
-  return { ok: true, file, created: !loaded.existed };
-}
-function removeServer(options) {
-  const file = fileForScope(options.scope, options);
-  if (typeof file !== "string")
-    return file;
-  const loaded = readForWrite(file);
-  if ("error" in loaded)
-    return { ok: false, error: loaded.error };
-  if (loaded.doc.servers[options.name] === undefined) {
-    return { ok: false, error: `server "${options.name}" is not defined in ${file}` };
-  }
-  delete loaded.doc.servers[options.name];
-  writeDocument(file, loaded.doc, options.scope);
-  return { ok: true, file, created: false };
-}
-function setServerEnabled(options) {
-  const file = overlayFile(options.configDir);
-  const read = readConfigFile(file);
-  let overlay = {};
-  if (read.ok) {
-    try {
-      const parsed = parseJsonTolerant(read.text);
-      if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-        overlay = parsed;
-      }
-    } catch {
-      overlay = {};
-    }
-  } else if (!isDefiniteAbsence(read.reason)) {
-    return { ok: false, error: `${file} could not be read (${read.reason}); nothing was written` };
-  }
-  const overrides = { ...overlay.overrides, [options.name]: options.enabled };
-  writeOwnerOnlyFileAtomic(file, `${JSON.stringify({ ...overlay, overrides }, null, 2)}
-`);
-  if (options.source === "user") {
-    clearStickyUserFlag(options.name, options.enabled, options.configDir);
-  }
-  return { ok: true, file, created: !read.ok };
-}
-function clearStickyUserFlag(name, enabled, configDir) {
-  const file = userConfigFile(configDir);
-  const loaded = readForWrite(file);
-  if ("error" in loaded)
-    return;
-  const entry = loaded.doc.servers[name];
-  if (entry === undefined)
-    return;
-  if (entry.enabled === undefined || entry.enabled === enabled)
-    return;
-  delete entry.enabled;
-  writeDocument(file, loaded.doc, "user");
-}
-function fileForScope(scope, targets) {
-  if (scope === "user")
-    return userConfigFile(targets.configDir);
-  if (targets.projectRoot === undefined) {
-    return { ok: false, error: "--scope project needs a project root; none was resolved" };
-  }
-  return projectConfigFile(targets.projectRoot);
+  return path169.dirname(path169.dirname(server.file));
 }
 
 // src/commands/mcp-servers.ts
@@ -88242,36 +88367,257 @@ function buildConsumerModel(input) {
   project: ${input.projectFile}`
   };
 }
-function renderConsumerLines(model) {
+var MCP_CONSUMER_FOOTER = [
+  { key: "\u2191/\u2193", label: "select" },
+  { key: "click", label: "row: select/act" },
+  { key: "c/d", label: "connect/disconnect" },
+  { key: "y", label: "confirm" },
+  { key: "esc", label: "close" }
+];
+var MCP_CONSUMER_HEADER = "Servers keryx CONNECTS TO. c/d then y to connect or disconnect. Held project servers need `keryx mcp trust` first.";
+var STATUS_GLYPH = {
+  connected: "\u25CF connected",
+  connecting: "\u2026 connecting",
+  failed: "\u2717 failed",
+  disabled: "\u25CB disabled",
+  "needs-approval": "! needs approval",
+  needs_auth: "! needs auth"
+};
+function consumerActionFor(status) {
+  if (status === "connected")
+    return "disconnect";
+  if (status === "disabled" || status === "failed")
+    return "connect";
+  return;
+}
+function statusGlyph(status) {
+  return STATUS_GLYPH[status] ?? status;
+}
+function formatConsumerModalRow(row, isSelected, status) {
+  const mark = isSelected ? ">" : " ";
+  const name = row.name.padEnd(18);
+  const source = row.source.padEnd(10);
+  const transport = row.transport.padEnd(6);
+  const glyph = statusGlyph(row.status).padEnd(18);
+  const tools = row.status === "connected" ? `${row.toolCount} tool(s)` : "";
+  let action;
+  const offered = consumerActionFor(row.status);
+  if (status.kind === "armed" && status.target.name === row.name) {
+    action = `  [click again or press y to ${status.target.action}]`;
+  } else if (status.kind === "running" && status.target.name === row.name) {
+    action = `  ${status.target.action === "connect" ? "connecting\u2026" : "disconnecting\u2026"}`;
+  } else if (status.kind === "done" && status.target.name === row.name) {
+    action = status.outcome.ok ? "  \u2713 done" : `  \u2717 ${status.outcome.message}`;
+  } else if (offered === "disconnect") {
+    action = "  [d] disconnect";
+  } else if (offered === "connect") {
+    action = "  [c] connect";
+  } else if (row.action !== undefined) {
+    action = `  \u2192 ${row.action}`;
+  } else {
+    action = "";
+  }
+  const creds = row.credentials.length > 0 ? `  [reads ${row.credentials.join(", ")}]` : "";
+  return `${mark} ${name} ${source} ${transport} ${glyph}${tools}${action}  ${row.target}${creds}`.trimEnd();
+}
+function formatConsumerModalLines(model, selected, status) {
   if (model === undefined) {
     return [
       "No MCP session yet \u2014 this shell has not built a tool list.",
       "Configured servers are listed by `keryx mcp list`; `keryx mcp doctor` dials them."
     ];
   }
+  const header = [MCP_CONSUMER_HEADER];
+  const problems = model.problems.flatMap((problem) => problem.split(`
+`).map((line, index) => index === 0 ? `config problem \u2014 ${line}` : `    ${line}`));
+  if (model.emptyHint !== undefined) {
+    return [...header, ...problems, ...model.emptyHint.split(`
+`)];
+  }
   return [
-    ...model.problems.flatMap((problem) => problem.split(`
-`).map((line, index) => index === 0 ? `config problem \u2014 ${line}` : `    ${line}`)),
-    ...model.emptyHint === undefined ? [] : model.emptyHint.split(`
-`),
-    ...model.rows.flatMap((row) => {
-      const lines = [formatConsumerRow(row)];
-      if (row.detail !== undefined) {
-        for (const line of row.detail.split(`
-`))
-          lines.push(`    ${line}`);
-      }
-      if (row.action !== undefined)
-        lines.push(`    \u2192 ${row.action}`);
-      return lines;
-    })
+    ...header,
+    ...problems,
+    ...model.rows.map((row, index) => formatConsumerModalRow(row, index === selected, status))
   ];
 }
-function formatConsumerRow(row) {
-  const tags = [row.source, row.transport, row.status].join(" ");
-  const tools = row.status === "connected" ? ` \u2014 ${row.toolCount} tool(s)` : "";
-  const creds = row.credentials.length > 0 ? `  [reads ${row.credentials.join(", ")}]` : "";
-  return `${row.name} (${tags})${tools}  ${row.target}${creds}`;
+function asRowTarget2(body) {
+  const parent = body;
+  if (parent.add === undefined || parent.getChildren === undefined || parent.remove === undefined) {
+    return;
+  }
+  return {
+    add: parent.add.bind(parent),
+    getChildren: parent.getChildren.bind(parent),
+    remove: parent.remove.bind(parent)
+  };
+}
+function presentMcpConsumer(openModalFn, otui, chrome, options) {
+  let selected = 0;
+  let scroll = 0;
+  let status = { kind: "idle" };
+  let body;
+  let rowCtor;
+  let activeRenderer;
+  let unsubscribeKey;
+  const rendererHint = options.renderer ?? chrome?.renderer;
+  const bodyRows = options.visibleRows ?? (typeof rendererHint?.width === "number" && typeof rendererHint.height === "number" ? modalBodyRows(resolveModalPanelSize(rendererHint.width, rendererHint.height).height) : 13);
+  const rowsOf = () => options.snapshot()?.rows ?? [];
+  const paint = () => {
+    if (body === undefined || rowCtor === undefined)
+      return;
+    clearTranscriptChildren(body);
+    const model = options.snapshot();
+    const rows = model?.rows ?? [];
+    selected = rows.length === 0 ? 0 : Math.min(selected, rows.length - 1);
+    scroll = scrollToReveal3(selected, scroll, bodyRows);
+    scroll = clampScroll3(scroll, Math.max(rows.length, 1), bodyRows);
+    const lines = formatConsumerModalLines(model, selected, status);
+    if (rows.length === 0) {
+      for (const [i, line] of lines.entries()) {
+        body.add(new rowCtor(activeRenderer, { id: `mcp-consumer-line-${i}`, content: line }));
+      }
+      return;
+    }
+    body.add(new rowCtor(activeRenderer, { id: "mcp-consumer-header", content: MCP_CONSUMER_HEADER }));
+    const problems = model?.problems ?? [];
+    for (const [i, problem] of problems.entries()) {
+      body.add(new rowCtor(activeRenderer, {
+        id: `mcp-consumer-problem-${i}`,
+        content: `config problem \u2014 ${problem}`
+      }));
+    }
+    const start = clampScroll3(scroll, rows.length, bodyRows);
+    for (const [i, row] of rows.slice(start, start + bodyRows).entries()) {
+      const index = start + i;
+      body.add(new rowCtor(activeRenderer, {
+        id: `mcp-consumer-row-${row.name}`,
+        content: formatConsumerModalRow(row, index === selected, status),
+        onMouseDown: () => handleRowClick(row.name, index)
+      }));
+    }
+  };
+  const moveSelection = (next) => {
+    const rows = rowsOf();
+    if (rows.length === 0)
+      return;
+    const clamped = Math.min(rows.length - 1, Math.max(0, next));
+    if (clamped === selected)
+      return;
+    selected = clamped;
+    status = { kind: "idle" };
+    paint();
+  };
+  const runAction = () => {
+    if (status.kind !== "armed")
+      return;
+    const target = status.target;
+    status = { kind: "running", target };
+    paint();
+    const fn = target.action === "connect" ? options.connect : options.disconnect;
+    fn(target.name).then((outcome) => {
+      status = { kind: "done", target, outcome };
+      paint();
+    });
+  };
+  const armFor = (name) => {
+    const rows = rowsOf();
+    const index = rows.findIndex((row) => row.name === name);
+    const row = rows[index];
+    const offered = row === undefined ? undefined : consumerActionFor(row.status);
+    if (index < 0 || row === undefined || offered === undefined || status.kind === "running")
+      return;
+    selected = index;
+    status = { kind: "armed", target: { name: row.name, action: offered } };
+    paint();
+  };
+  const handleRowClick = (name, index) => {
+    if (status.kind === "armed" && status.target.name === name) {
+      runAction();
+      return;
+    }
+    if (status.kind === "running")
+      return;
+    const row = rowsOf()[index];
+    if (row === undefined || consumerActionFor(row.status) === undefined) {
+      if (index !== selected) {
+        selected = index;
+        status = { kind: "idle" };
+        paint();
+      }
+      return;
+    }
+    armFor(name);
+  };
+  const handle = openModalFn(otui, chrome, {
+    title: "MCP servers",
+    tabs: [{ id: "servers", label: "Servers" }],
+    initialTab: "servers",
+    footer: MCP_CONSUMER_FOOTER,
+    renderTab: (_tabId, tabBody, ctx) => {
+      const renderer = options.renderer ?? chrome?.renderer;
+      const ctor = otui.TextRenderable;
+      const target = asRowTarget2(tabBody);
+      if (target === undefined || ctor === undefined)
+        return;
+      rowCtor = ctor;
+      activeRenderer = renderer;
+      body = target;
+      paint();
+    },
+    onClose: () => {
+      unsubscribeKey?.();
+    }
+  });
+  if (handle === undefined)
+    return;
+  if (options.onKeypress !== undefined) {
+    unsubscribeKey = options.onKeypress((key) => {
+      const token = key.name || key.sequence;
+      const rows = rowsOf();
+      if (status.kind === "armed") {
+        if (token === "y") {
+          runAction();
+        } else {
+          status = { kind: "idle" };
+          paint();
+        }
+        return;
+      }
+      if (token === "c") {
+        const row = rows[selected];
+        if (row !== undefined && consumerActionFor(row.status) === "connect" && status.kind !== "running") {
+          status = { kind: "armed", target: { name: row.name, action: "connect" } };
+          paint();
+        }
+        return;
+      }
+      if (token === "d") {
+        const row = rows[selected];
+        if (row !== undefined && consumerActionFor(row.status) === "disconnect" && status.kind !== "running") {
+          status = { kind: "armed", target: { name: row.name, action: "disconnect" } };
+          paint();
+        }
+        return;
+      }
+      if (token === "up" || token === "k") {
+        moveSelection(selected - 1);
+        return;
+      }
+      if (token === "down" || token === "j") {
+        moveSelection(selected + 1);
+        return;
+      }
+      if (token === "pageup" || token === "pagedown") {
+        const step = token === "pageup" ? -bodyRows : bodyRows;
+        scroll = clampScroll3(scroll + step, Math.max(rows.length, 1), bodyRows);
+        paint();
+      }
+    });
+  }
+  return handle;
+}
+function openMcpConsumer(otui, chrome, options) {
+  return presentMcpConsumer((hostOtui, hostChrome, input) => openModal(hostOtui, hostChrome, input), otui, chrome, options);
 }
 
 // src/tui/tui-shell.ts
@@ -89048,7 +89394,7 @@ var AGENT_SLASH_COMMANDS = [
   },
   {
     name: "/mcp",
-    description: "MCP servers keryx is connected to \u2014 status, tools, what needs trust",
+    description: "MCP servers keryx is connected to \u2014 status, connect/disconnect",
     modes: AGENT_ONLY
   },
   {
@@ -91817,7 +92163,7 @@ function stepQueueNavAction(selected, direction) {
 }
 
 // src/tui/worker-fleet.ts
-var STATUS_GLYPH = {
+var STATUS_GLYPH2 = {
   queued: "\u25CB",
   running: "\u25D0",
   done: "\u25CF",
@@ -91956,7 +92302,7 @@ function formatFleetSidebar(workers, maxLines = 14) {
     const room = Math.max(2, maxLines - lines.length);
     const shown = sorted.slice(0, room);
     for (const w of shown) {
-      const g = STATUS_GLYPH[w.status];
+      const g = STATUS_GLYPH2[w.status];
       const phase = humanFleetPhase(w.status, w.detail);
       const label = clip4(w.label, 12);
       const det = phase.length > 0 ? ` ${clip4(phase, 12)}` : "";
@@ -92050,7 +92396,7 @@ class WorkerFleet {
 var MAX_SUBAGENT_EVENTS = 200;
 var MAX_SUBAGENT_EVENT_CHARS = 2000;
 var EXTERNAL_SUBAGENT_MARK = "\u2933";
-var STATUS_GLYPH2 = {
+var STATUS_GLYPH3 = {
   queued: "\u25CB",
   running: "\u25D0",
   done: "\u25CF",
@@ -92092,7 +92438,7 @@ function formatElapsed(ms) {
   return minRem === 0 ? `${hours}h` : `${hours}h ${minRem}m`;
 }
 function formatSubagentRow(session, width = SIDEBAR_TEXT_WIDTH) {
-  const glyph = STATUS_GLYPH2[session.status];
+  const glyph = STATUS_GLYPH3[session.status];
   const phase = humanFleetPhase(session.status, session.detail);
   const mark = session.runtime === "external" ? EXTERNAL_SUBAGENT_MARK : "";
   const budget = Math.max(4, width - glyph.length - 1);
@@ -93451,7 +93797,7 @@ function openExternalInspector(otui, chrome, options) {
 
 // src/tui/background-job-session.ts
 var MAX_BACKGROUND_JOB_OUTPUT_CHARS = 20000;
-var STATUS_GLYPH3 = {
+var STATUS_GLYPH4 = {
   running: "\u25D0",
   exited: "\u25CF",
   killed: "\u2717"
@@ -93469,7 +93815,7 @@ function formatJobListHeader(count) {
   return `Background Jobs ${count}`;
 }
 function formatJobRow(entry, width = SIDEBAR_TEXT_WIDTH) {
-  const glyph = STATUS_GLYPH3[entry.status];
+  const glyph = STATUS_GLYPH4[entry.status];
   const budget = Math.max(1, width - glyph.length - 1);
   const cmd = clip7(entry.command, budget);
   return clip7(`${glyph} ${cmd}`, width);
@@ -96059,19 +96405,36 @@ Staying in the current session.
       })();
     };
     const showMcpConsumer = () => {
-      const runtime = deps.mcpRuntime?.();
       const cwd = inspectorCwd();
-      const model = runtime === undefined ? undefined : buildConsumerModel({
-        configured: runtime.configured(),
-        states: runtime.servers(),
-        problems: runtime.problems(),
-        userFile: userConfigFile(),
-        projectFile: projectConfigFile(cwd)
+      const snapshot = () => {
+        const live = deps.mcpRuntime?.();
+        if (live === undefined)
+          return;
+        return buildConsumerModel({
+          configured: live.configured(),
+          states: live.servers(),
+          problems: live.problems(),
+          userFile: userConfigFile(),
+          projectFile: projectConfigFile(cwd)
+        });
+      };
+      openMcpConsumer(otui, chrome, {
+        snapshot,
+        connect: async (name) => {
+          const live = deps.mcpRuntime?.();
+          if (live === undefined)
+            return { ok: false, message: "No MCP session yet" };
+          return live.connectServer(name);
+        },
+        disconnect: async (name) => {
+          const live = deps.mcpRuntime?.();
+          if (live === undefined)
+            return { ok: false, message: "No MCP session yet" };
+          return live.disconnectServer(name);
+        },
+        renderer: r,
+        ...inspectorKeys
       });
-      const lines = renderConsumerLines(model);
-      for (const line of lines) {
-        transcript.add(new otui.TextRenderable(r, { id: `mcp${uid++}`, content: otui.t`${otui.dim(line)}` }));
-      }
     };
     const showTools = () => {
       (async () => {
@@ -103099,7 +103462,7 @@ function monitorCommand(args) {
   }
   renderAgentsTree(snapshot);
 }
-var STATUS_GLYPH4 = {
+var STATUS_GLYPH5 = {
   running: "\u25D0",
   done: "\u25CF",
   blocked: "\u25FC",
@@ -103112,7 +103475,7 @@ function renderAgentsTree(snapshot) {
   console.log(`run ${snapshot.runId ?? "(unknown)"} \u2014 ${snapshot.agents.length} subagent(s)`);
   for (const agent of snapshot.agents) {
     const tokens = `\u2191${agent.usage.inputTokens} \u2193${agent.usage.outputTokens}${agent.usage.exact ? "" : "~"}`;
-    const glyph = STATUS_GLYPH4[agent.status] ?? "\u25CB";
+    const glyph = STATUS_GLYPH5[agent.status] ?? "\u25CB";
     console.log(`  ${glyph} ${agent.dispatchId}  ${agent.status}  ${agent.model ?? "-"}  ${tokens}`);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrciphersmith/keryx",
-  "version": "0.2.99",
+  "version": "0.2.100",
   "description": "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   "private": false,
   "publishConfig": {