@mrciphersmith/keryx 0.2.119 → 0.2.121

package/dist/cli.js

@@ -29500,6 +29500,7 @@ async function runAgentTurnCore(io, deps, history, userLine, options = {}) {
     const spawnConcurrencyCandidates = calls.filter((call) => call.name === "spawn_subagent" && reservationByCallId.get(call.id)?.ok === true);
     const untrustedGateBlocksSpawns = untrustedContentSeen || batchContainsUntrustedWeb;
     const concurrentSpawnResults = spawnConcurrencyCandidates.length >= 2 && !untrustedGateBlocksSpawns && maxToolCalls === undefined ? await runConcurrentSpawnBatch(spawnConcurrencyCandidates, toolByName, io, deps, hasInvocationCapacity, reserveInvocation) : undefined;
+    const answeredToolIds = new Set;
     let anchorsToAnnounce;
     let repeatedFailureHint;
     for (const call of calls) {
@@ -29507,6 +29508,26 @@ async function runAgentTurnCore(io, deps, history, userLine, options = {}) {
         system(`
 [stopped] Model turn interrupted by user.
 `);
+        if (concurrentSpawnResults !== undefined) {
+          for (const spawnCall of spawnConcurrencyCandidates) {
+            if (answeredToolIds.has(spawnCall.id)) {
+              continue;
+            }
+            const settled = concurrentSpawnResults.get(spawnCall.id);
+            if (settled === undefined) {
+              continue;
+            }
+            io.onToolResult?.(spawnCall.name, settled);
+            history.push({
+              role: "tool",
+              content: redactSensitiveText(settled.output),
+              provenance: "tool",
+              toolCallId: spawnCall.id,
+              ts: now()
+            });
+            io.onHistoryChange?.("tool");
+          }
+        }
         return {};
       }
       if (deps.unattended === true && call.name === "ask_user") {
@@ -29549,6 +29570,7 @@ ${modelOutput}` : modelOutput,
         ts: now()
       });
       io.onHistoryChange?.("tool");
+      answeredToolIds.add(call.id);
       if (untrusted) {
         untrustedContentSeen = true;
       }
@@ -50252,7 +50274,7 @@ import path47 from "path";
 // package.json
 var package_default = {
   name: "@mrciphersmith/keryx",
-  version: "0.2.119",
+  version: "0.2.121",
   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: {
@@ -85105,13 +85127,14 @@ function createSearchProviderRegistry(transport, resolveCredential = () => {
       return normalize2("searxng", query, parsed === undefined ? [] : resultsFrom(parsed), { title: "title", url: "url", snippet: "content", date: "publishedDate" });
     }
   };
+  const apiKeyLabel = (displayName) => /\bAPI$/.test(displayName) ? `${displayName} key` : `${displayName} API key`;
   const remote = (id, displayName, endpoint, injection, name, mapping) => ({
     id,
     displayName,
     kind: "remote",
     fields: [],
     defaults: {},
-    credentialSchema: { required: true, label: `${displayName} API key`, secret: true },
+    credentialSchema: { required: true, label: apiKeyLabel(displayName), secret: true },
     documentationUrl: id === "brave" ? "https://api.search.brave.com/app/documentation" : id === "tavily" ? "https://docs.tavily.com/" : "https://docs.exa.ai/",
     capabilities: { localLoopback: false, supportsPublicationDate: Boolean(mapping.date) },
     async testConnection(_fields) {
@@ -91637,11 +91660,13 @@ function presentMcpTools(openModal, otui, chrome, options) {
       bodyWidth = ctx?.width;
       if (tabId === "tools") {
         toolsBody = target;
+        mcpBody = undefined;
         toolsScroll = Math.max(0, toolsScroll);
         paintToolsRows();
         return;
       }
       mcpBody = target;
+      toolsBody = undefined;
       mcpScroll = scrollToReveal3(mcpSelected, mcpScroll, bodyRows);
       paintMcpRows();
     },
@@ -94355,7 +94380,48 @@ function onKeypress2(r, handler) {
   r._internalKeyInput.onInternal("keypress", handler);
   return () => r._internalKeyInput.offInternal("keypress", handler);
 }
-function showComposerChoice(otui, r, dock, request) {
+var dockChain = new WeakMap;
+var dockDepth = new WeakMap;
+function dockBusy(dock) {
+  return (dockDepth.get(dock) ?? 0) > 0;
+}
+function lockDock(dock) {
+  dockDepth.set(dock, (dockDepth.get(dock) ?? 0) + 1);
+  const prev = dockChain.get(dock) ?? Promise.resolve();
+  let release;
+  const mine = new Promise((resolve) => {
+    release = resolve;
+  });
+  dockChain.set(dock, prev.then(() => mine));
+  return prev.then(() => {
+    return () => {
+      const n = (dockDepth.get(dock) ?? 1) - 1;
+      if (n <= 0) {
+        dockDepth.delete(dock);
+      } else {
+        dockDepth.set(dock, n);
+      }
+      release();
+    };
+  });
+}
+async function showComposerChoice(otui, r, dock, request) {
+  const enqueue = request.enqueue !== false;
+  if (!enqueue && dockBusy(dock)) {
+    request.onBusy?.();
+    return request.cancelId;
+  }
+  const unlock = await lockDock(dock);
+  try {
+    if (request.signal?.aborted === true) {
+      return request.cancelId;
+    }
+    return await presentComposerChoice(otui, r, dock, request);
+  } finally {
+    unlock();
+  }
+}
+function presentComposerChoice(otui, r, dock, request) {
   if (dock.visible === true) {
     request.onBusy?.();
     return Promise.resolve(request.cancelId);
@@ -94368,6 +94434,7 @@ function showComposerChoice(otui, r, dock, request) {
     const recommendedIdx = options.findIndex((o) => o.recommended === true);
     let selected = recommendedIdx >= 0 ? recommendedIdx : 0;
     dock.visible = true;
+    request.onOpen?.();
     const theme = getTheme();
     const rawSubtitle = request.subtitle !== undefined && request.subtitle.length > 0 ? request.subtitle : undefined;
     const subtitleText = rawSubtitle !== undefined && rawSubtitle.length > MAX_SUBTITLE_CHARS ? `${rawSubtitle.slice(0, MAX_SUBTITLE_CHARS)}
@@ -94432,7 +94499,15 @@ function showComposerChoice(otui, r, dock, request) {
         }
       }
     };
+    let settled = false;
+    const onAbort = () => {
+      finish(request.cancelId);
+    };
     const finish = (id) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
       cleanup();
       resolve(id);
     };
@@ -94484,6 +94559,7 @@ function showComposerChoice(otui, r, dock, request) {
     function cleanup() {
       closed = true;
       unsub();
+      request.signal?.removeEventListener("abort", onAbort);
       try {
         dock.remove(title);
         if (subtitleScroll !== undefined) {
@@ -94520,7 +94596,7 @@ function showComposerChoice(otui, r, dock, request) {
       }
       const focused = r.currentFocusedRenderable;
       const inScroll = subtitleScroll !== undefined && focused !== null && containsNode(subtitleScroll, focused);
-      if (inScroll) {
+      if (inScroll && key.name !== "return" && key.name !== "linefeed" && key.name !== "kpenter") {
         return;
       }
       if (key.name === "up") {
@@ -94547,6 +94623,9 @@ function showComposerChoice(otui, r, dock, request) {
       }
     };
     const unsub = onKeypress2(r, onKey);
+    if (request.signal !== undefined) {
+      request.signal.addEventListener("abort", onAbort, { once: true });
+    }
     optionsScroll.focus();
   });
 }
@@ -95350,6 +95429,9 @@ async function createShellChrome(otui, renderer, opts) {
     }
   });
   textarea.onSubmit = () => {
+    if (overlayActive()) {
+      return;
+    }
     const line = input.value.trim();
     input.value = "";
     hideMenu();
@@ -98145,7 +98227,7 @@ function createApprovalContextLoader(cwd) {
     return buildApprovalContext(port, command);
   };
 }
-async function pickShellApproval(otui, r, dock, command, loadContext, destructive = false, credentials = false) {
+async function pickShellApproval(otui, r, dock, command, loadContext, destructive = false, credentials = false, ui = {}) {
   let context;
   try {
     context = loadContext(command);
@@ -98185,7 +98267,9 @@ async function pickShellApproval(otui, r, dock, command, loadContext, destructiv
     subtitle: command,
     ...context !== undefined ? { context } : {},
     cancelId: "deny",
-    options
+    options,
+    ...ui.onOpen !== undefined ? { onOpen: ui.onOpen } : {},
+    ...ui.signal !== undefined ? { signal: ui.signal } : {}
   });
   if (id === "once" || id === "always-exact" || id === "always-prefix" || id === "deny") {
     return id;
@@ -99530,10 +99614,12 @@ async function launchTuiAgentShell(opts) {
           chrome.hideMenu();
           setMainAgent("blocked", "approval");
           const preview = request.task.length > 80 ? `${request.task.slice(0, 77)}\u2026` : request.task;
-          const id = await showComposerChoice(otui, r, chrome.dock, {
+          const id = await chrome.withOverlay(() => showComposerChoice(otui, r, chrome.dock, {
             title: `Run the external agent ${request.agentId}?`,
             subtitle: preview,
             cancelId: "deny",
+            onOpen: () => chrome.blurComposer(),
+            signal: foregroundOperation.signal,
             options: [
               {
                 id: "allow",
@@ -99542,7 +99628,7 @@ async function launchTuiAgentShell(opts) {
               },
               { id: "deny", label: "Deny", description: "Do not start the external agent" }
             ]
-          });
+          }));
           input.focus();
           setMainAgent("running", id === "allow" ? "external" : "denied");
           return id === "allow" ? { ok: true } : { ok: false, reason: `you declined the external spawn of ${request.agentId}` };
@@ -99713,10 +99799,12 @@ async function launchTuiAgentShell(opts) {
         }
         chrome.hideMenu();
         setMainAgent("blocked", "approval");
-        const id = await showComposerChoice(otui, r, chrome.dock, {
+        const id = await chrome.withOverlay(() => showComposerChoice(otui, r, chrome.dock, {
           title: "Spawn general subagent?",
           subtitle: taskPreview,
           cancelId: "deny",
+          onOpen: () => chrome.blurComposer(),
+          signal: foregroundOperation.signal,
           options: [
             {
               id: "allow",
@@ -99726,7 +99814,7 @@ async function launchTuiAgentShell(opts) {
             },
             { id: "deny", label: "Deny", description: "Do not spawn" }
           ]
-        });
+        }));
         input.focus();
         setMainAgent("running", id === "allow" ? "subagent" : "denied");
         transcript.add(new otui.TextRenderable(r, {
@@ -99755,15 +99843,17 @@ async function launchTuiAgentShell(opts) {
         }
         chrome.hideMenu();
         setMainAgent("blocked", "approval");
-        const id = await showComposerChoice(otui, r, chrome.dock, {
+        const id = await chrome.withOverlay(() => showComposerChoice(otui, r, chrome.dock, {
           title: "Approve apply_patch?",
           subtitle: "Diff shown above \xB7 Esc denies",
           cancelId: "deny",
+          onOpen: () => chrome.blurComposer(),
+          signal: foregroundOperation.signal,
           options: [
             { id: "allow", label: "Approve", description: "Write the patch to disk", recommended: true },
             { id: "deny", label: "Deny", description: "Do not write anything" }
           ]
-        });
+        }));
         input.focus();
         setMainAgent("running", id === "allow" ? "write" : "denied");
         transcript.add(new otui.TextRenderable(r, {
@@ -99789,15 +99879,17 @@ async function launchTuiAgentShell(opts) {
         }
         chrome.hideMenu();
         setMainAgent("blocked", "approval");
-        const id = await showComposerChoice(otui, r, chrome.dock, {
+        const id = await chrome.withOverlay(() => showComposerChoice(otui, r, chrome.dock, {
           title: described.title,
           subtitle: summariseUseToolApproval(described),
           cancelId: "deny",
+          onOpen: () => chrome.blurComposer(),
+          signal: foregroundOperation.signal,
           options: [
             { id: APPROVAL_ALLOW_ID, label: "Approve", description: `run ${described.tool} on ${described.server}` },
             { id: "deny", label: "Deny", description: "the tool call is refused", recommended: true }
           ]
-        });
+        }));
         input.focus();
         const allowed = isDockApproval(id);
         setMainAgent("running", allowed ? "write" : "denied");
@@ -99835,15 +99927,17 @@ async function launchTuiAgentShell(opts) {
         chrome.hideMenu();
         setMainAgent("blocked", "approval");
         const elicitationSubtitle = described.message.length > 80 ? `${described.message.slice(0, 77)}\u2026` : described.message;
-        const id = await showComposerChoice(otui, r, chrome.dock, {
+        const id = await chrome.withOverlay(() => showComposerChoice(otui, r, chrome.dock, {
           title: "Approve codex elicitation?",
           subtitle: elicitationSubtitle,
           cancelId: "deny",
+          onOpen: () => chrome.blurComposer(),
+          signal: foregroundOperation.signal,
           options: [
             { id: "allow", label: "Approve", description: "codex proceeds with this action", recommended: true },
             { id: "deny", label: "Deny", description: "codex's action is refused" }
           ]
-        });
+        }));
         input.focus();
         setMainAgent("running", id === "allow" ? "write" : "denied");
         transcript.add(new otui.TextRenderable(r, {
@@ -99898,7 +99992,10 @@ async function launchTuiAgentShell(opts) {
       setMainAgent("blocked", "approval");
       setBusyPhase("waiting for your approval (menu above input)");
       chrome.hideMenu();
-      const choice = await pickShellApproval(otui, r, chrome.dock, cmd, approvalContext, destructive, meta?.credentials === true);
+      const choice = await chrome.withOverlay(() => pickShellApproval(otui, r, chrome.dock, cmd, approvalContext, destructive, meta?.credentials === true, {
+        onOpen: () => chrome.blurComposer(),
+        signal: foregroundOperation.signal
+      }));
       input.focus();
       if (choice === "deny") {
         transcript.add(new otui.TextRenderable(r, {
@@ -99942,17 +100039,19 @@ async function launchTuiAgentShell(opts) {
         id: `ask${uid++}`,
         content: otui.t`${otui.yellow("? ")} ${otui.dim(qShort)}`
       }));
-      const chosen = await showComposerChoice(otui, r, chrome.dock, {
+      const chosen = await chrome.withOverlay(() => showComposerChoice(otui, r, chrome.dock, {
         title: req.question.length > 72 ? `${req.question.slice(0, 69)}\u2026` : req.question,
         subtitle: "Pick an option \xB7 Esc cancels",
         cancelId: "__cancel__",
+        onOpen: () => chrome.blurComposer(),
+        signal: foregroundOperation.signal,
         options: req.options.map((o) => ({
           id: o.id,
           label: o.label,
           description: o.description.length > 0 ? o.description : " ",
           ...o.recommended === true ? { recommended: true } : {}
         }))
-      });
+      }));
       input.focus();
       if (chosen !== "__cancel__") {
         const picked = req.options.find((o) => o.id === chosen);
@@ -100414,14 +100513,15 @@ Staying in the current session.
             title: "Switch to auto mode?",
             subtitle: "Skips confirmation for EVERY action, including destructive commands. Only credential-touching commands still ask.",
             cancelId: "cancel",
-            options: [
-              { id: "confirm", label: "Confirm", description: "I understand the risk" },
-              { id: "cancel", label: "Cancel", description: "Keep the current mode", recommended: true }
-            ],
+            enqueue: false,
             onBusy: () => {
               blockedByOpenDialog = true;
               chrome.showToast("Answer the open approval first, then retry /mode.");
-            }
+            },
+            options: [
+              { id: "confirm", label: "Confirm", description: "I understand the risk" },
+              { id: "cancel", label: "Cancel", description: "Keep the current mode", recommended: true }
+            ]
           }));
           input.focus();
           if (blockedByOpenDialog) {
@@ -100462,16 +100562,17 @@ Staying in the current session.
           title: `Permission mode (current: ${permissionMode})`,
           subtitle: stored !== undefined ? `Project default: ${stored}` : "No project default set.",
           cancelId: permissionMode,
+          enqueue: false,
+          onBusy: () => {
+            blockedByOpenDialog = true;
+            chrome.showToast("Answer the open approval first, then retry /mode.");
+          },
           options: PERMISSION_MODES.map((m) => ({
             id: m,
             label: m,
             description: MODE_PICKER_DESCRIPTIONS[m],
             recommended: m === permissionMode
-          })),
-          onBusy: () => {
-            blockedByOpenDialog = true;
-            chrome.showToast("Answer the open approval first, then retry /mode.");
-          }
+          }))
         }));
         input.focus();
         if (blockedByOpenDialog) {
@@ -101064,6 +101165,7 @@ Staying in the current session.
               { id: "side", label: "Side-1", description: "read-only answer, outside main history (as before)" }
             ],
             cancelId: "side",
+            enqueue: false,
             onBusy: () => {
               blockedByOpenDialog = true;
               chrome.showToast("Answer the open approval first, then resend.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrciphersmith/keryx",
-  "version": "0.2.119",
+  "version": "0.2.121",
   "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": {