@mrciphersmith/keryx 0.3.78 → 0.3.79

package/dist/cli.js

@@ -1758,7 +1758,8 @@ function isValidIp(value) {
   return false;
 }
 function isWordBoundary(flavour, content, index) {
-  return flavour.wordChar.test(wordCharBefore(content, index)) !== flavour.wordChar.test(wordCharAt(content, index));
+  flavour.boundary.lastIndex = index;
+  return flavour.boundary.test(content);
 }
 function wordCharBefore(content, index) {
   if (index <= 0) {
@@ -2498,12 +2499,12 @@ var init_pii = __esm(() => {
   UNICODE_EMAIL = {
     from: /(?:(?<=[\p{L}\p{N}\p{M}_])(?![\p{L}\p{N}\p{M}_])|(?<![\p{L}\p{N}\p{M}_])(?=[\p{L}\p{N}\p{M}_]))[\p{L}\p{N}\p{M}._%+-]+@[\p{L}\p{N}\p{M}.-]+\.[\p{L}\p{M}]{2,}(?![\p{L}\p{N}\p{M}_])/uy,
     localChar: /[\p{L}\p{N}\p{M}._%+-]/u,
-    wordChar: /[\p{L}\p{N}\p{M}_]/u
+    boundary: /(?:(?<=[\p{L}\p{N}\p{M}_])(?![\p{L}\p{N}\p{M}_])|(?<![\p{L}\p{N}\p{M}_])(?=[\p{L}\p{N}\p{M}_]))/uy
   };
   ASCII_EMAIL = {
     from: /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/y,
     localChar: /[A-Za-z0-9._%+-]/,
-    wordChar: /\w/
+    boundary: /\b/y
   };
   emailScanner = emailScannerFor(UNICODE_EMAIL);
   asciiEmailScanner = emailScannerFor(ASCII_EMAIL);
@@ -21097,7 +21098,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@mrciphersmith/keryx",
-    version: "0.3.78",
+    version: "0.3.79",
     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: {
@@ -110125,6 +110126,22 @@ var init_theme_text = __esm(() => {
   init_theme();
 });
 
+// src/tui/transcript-history.ts
+function trackTranscriptNode(node, policy) {
+  policies.set(node, policy);
+}
+function transcriptNodeProtected(node) {
+  return policies.get(node)?.protected() === true;
+}
+function forgetTranscriptNode(node) {
+  policies.get(node)?.evict?.();
+  policies.delete(node);
+}
+var TRANSCRIPT_HISTORY_LIMIT = 256, policies;
+var init_transcript_history = __esm(() => {
+  policies = new WeakMap;
+});
+
 // src/tui/transcript-blocks.ts
 function createBlockRegistry(options = {}) {
   const maxBlocks = options.maxBlocks ?? DEFAULT_MAX_BLOCKS;
@@ -110185,6 +110202,15 @@ function createBlockRegistry(options = {}) {
       }
       return id;
     },
+    remove: (id) => {
+      const index = blocks.findIndex((block) => block.id === id);
+      if (index < 0)
+        return;
+      blocks.splice(index, 1);
+      if (focusIndex > index)
+        focusIndex -= 1;
+      focusIndex = Math.min(focusIndex, blocks.length - 1);
+    },
     get: (id) => {
       const block = find(id);
       return block === undefined ? undefined : snapshot(block);
@@ -110582,8 +110608,13 @@ function createAssistantMessageStream(otui, renderer, parent) {
       flexDirection: "column",
       flexShrink: 0
     });
+    let live = true;
+    trackTranscriptNode(container, { protected: () => live });
+    const complete = () => {
+      live = false;
+    };
     parent.add(container);
-    return { container, segmenter: createStreamSegmenter(), views: [], frozen: 0 };
+    return { complete, container, segmenter: createStreamSegmenter(), views: [], frozen: 0 };
   };
   const paint = (m, segments, frozen) => {
     for (let i = m.frozen;i < segments.length; i++) {
@@ -110626,9 +110657,10 @@ function createAssistantMessageStream(otui, renderer, parent) {
       m.frozen = 0;
       const segments = segmentMarkdown(text);
       paint(m, segments, segments.length);
+      m.complete();
       if (segments.length === 0) {
         try {
-          parent.remove(m.container);
+          m.container.destroyRecursively();
         } catch {}
       }
       message = undefined;
@@ -110638,11 +110670,12 @@ function createAssistantMessageStream(otui, renderer, parent) {
       if (message === undefined) {
         return;
       }
+      message.complete();
       for (const view of message.views.splice(0)) {
         view.destroy();
       }
       try {
-        parent.remove(message.container);
+        message.container.destroyRecursively();
       } catch {}
       message = undefined;
     },
@@ -110660,6 +110693,8 @@ function createBlockView(otui, renderer, parent, block, options = {}) {
   });
   const header = new otui.TextRenderable(renderer, { id: `${id}-h`, content: "" });
   box.add(header);
+  let protectedView = false;
+  trackTranscriptNode(box, { protected: () => protectedView, evict: () => options.onHistoryEvict?.() });
   parent.add(box);
   let body;
   let bodyText;
@@ -110732,6 +110767,9 @@ function createBlockView(otui, renderer, parent, block, options = {}) {
   return {
     id: block.id,
     render: (state, opts = {}) => {
+      if (box.isDestroyed)
+        return;
+      protectedView = opts.focused === true;
       paintHeader(state, opts.focused === true);
       if (state.collapsed) {
         if (options.collapsedPreview !== undefined) {
@@ -110788,7 +110826,14 @@ function createBlockMount(otui, renderer, parent, registry) {
       }
       const state = registry.get(id);
       if (state !== undefined) {
-        views.set(id, createBlockView(otui, renderer, parent, state, options));
+        views.set(id, createBlockView(otui, renderer, parent, state, {
+          ...options,
+          onHistoryEvict: () => {
+            views.delete(id);
+            registry.remove(id);
+            options.onHistoryEvict?.();
+          }
+        }));
       }
       return id;
     },
@@ -111014,6 +111059,7 @@ var init_transcript_blocks = __esm(() => {
   init_md_blocks();
   init_theme();
   init_theme_text();
+  init_transcript_history();
 });
 
 // src/tui/modal-host.ts
@@ -111062,6 +111108,20 @@ function resolveModalInnerWidth(availableWidth) {
 function formatModalFooter(actions) {
   return actions.map((action) => `${action.key} ${action.label}`).join(" \xB7 ");
 }
+function modalFocusFallback(node) {
+  return modalHandBack.get(node) ?? null;
+}
+function focusIsLive(node, root) {
+  let current = node;
+  while (current !== null) {
+    if (current.isDestroyed || !current.visible)
+      return false;
+    if (current === root)
+      return true;
+    current = current.parent;
+  }
+  return false;
+}
 function destroyModalHost(renderer) {
   hosts.get(renderer)?.unsubTheme();
 }
@@ -111076,6 +111136,10 @@ function containsNode(root, node) {
   }
   return false;
 }
+function modalHides(renderer, node) {
+  const state = hosts.get(renderer);
+  return state !== undefined && state.open && !containsNode(state.backdrop, node);
+}
 function resolveInitialTab(tabs, initialTab) {
   const first = tabs[0];
   if (first === undefined) {
@@ -111160,7 +111224,15 @@ function closeHost(state, opts) {
     if (state.savedScrollTop !== undefined && scroll !== undefined) {
       scroll.scrollTop = state.savedScrollTop;
     }
-    state.chrome.focusComposer();
+    const r = state.chrome.renderer;
+    const current = r.currentFocusedRenderable;
+    if (current === null || containsNode(state.backdrop, current)) {
+      const previous = state.savedFocus;
+      if (previous !== null && focusIsLive(previous, r.root))
+        previous.focus();
+      else
+        state.chrome.focusComposer();
+    }
   }
   if (opts.runOnClose && onClose !== undefined) {
     onClose();
@@ -111290,6 +111362,7 @@ function ensureHost(otui, chrome) {
     releaseOverlay: undefined,
     unsubKeys: undefined,
     savedScrollTop: undefined,
+    savedFocus: null,
     unsubTheme: () => {}
   };
   state.releaseOverlay = chrome.addOverlaySource(() => state.open, { kind: "modal" });
@@ -111414,6 +111487,8 @@ function openModal(otui, chrome, input) {
     state.onClose = undefined;
     previousClose?.();
   } else {
+    state.savedFocus = chrome.renderer.currentFocusedRenderable;
+    modalHandBack.set(state.tabStrip, state.savedFocus);
     state.savedScrollTop = chrome.scroll.scrollTop;
     chrome.hideMenu();
     chrome.blurComposer();
@@ -111440,7 +111515,7 @@ function openModal(otui, chrome, input) {
   }, 0);
   return makeHandle(state, generation);
 }
-var BACKDROP_ID = "modal-backdrop", PANEL_ID = "modal-panel", BACKDROP_ALPHA = 1, MODAL_PANEL_MARGIN = 1, MODAL_PANEL_CHROME_X = 4, MODAL_PANEL_MIN_WIDTH = 72, MODAL_PANEL_MIN_HEIGHT = 18, MODAL_PANEL_SIZE_RATIO = 0.95, MODAL_PANEL_MAX_HEIGHT_RATIO = 0.85, MODAL_CHROME_ROWS = 5, MODAL_PANEL_WIDTH, MODAL_PANEL_HEIGHT, MODAL_PANEL_INNER_WIDTH, CLOSE_HINT = "[x] esc", DEFAULT_FOOTER, hosts, MODAL_BODY_SCROLLBAR_COLS = 1;
+var BACKDROP_ID = "modal-backdrop", PANEL_ID = "modal-panel", BACKDROP_ALPHA = 1, MODAL_PANEL_MARGIN = 1, MODAL_PANEL_CHROME_X = 4, MODAL_PANEL_MIN_WIDTH = 72, MODAL_PANEL_MIN_HEIGHT = 18, MODAL_PANEL_SIZE_RATIO = 0.95, MODAL_PANEL_MAX_HEIGHT_RATIO = 0.85, MODAL_CHROME_ROWS = 5, MODAL_PANEL_WIDTH, MODAL_PANEL_HEIGHT, MODAL_PANEL_INNER_WIDTH, CLOSE_HINT = "[x] esc", DEFAULT_FOOTER, modalHandBack, hosts, MODAL_BODY_SCROLLBAR_COLS = 1;
 var init_modal_host = __esm(() => {
   init_theme();
   init_theme_text();
@@ -111452,6 +111527,7 @@ var init_modal_host = __esm(() => {
     { key: "\u2190/\u2192", label: "tabs" },
     { key: "esc", label: "close" }
   ];
+  modalHandBack = new WeakMap;
   hosts = new WeakMap;
 });
 
@@ -134844,14 +134920,60 @@ async function createShellChrome(otui, renderer, opts) {
   let liveStatus;
   const originalTranscriptAdd = transcript.add.bind(transcript);
   const originalTranscriptRemove = transcript.remove.bind(transcript);
+  let historyNotice;
+  let historyAnchor;
+  const restoreHistoryAnchor = () => {
+    const anchor = historyAnchor;
+    historyAnchor = undefined;
+    if (anchor === undefined || anchor.node.isDestroyed || scroll.stickyScroll || scroll.scrollTop !== anchor.scrollTop)
+      return;
+    scroll.scrollTop += anchor.node.y - anchor.y;
+  };
+  r.on(otui.CliRenderEvents.FRAME, restoreHistoryAnchor);
+  const trimHistory = () => {
+    const completed = transcript.getChildren().filter((node) => node !== liveStatus && node !== historyNotice && !transcriptNodeProtected(node));
+    const excess = completed.length - TRANSCRIPT_HISTORY_LIMIT;
+    if (excess <= 0)
+      return;
+    if (!scroll.stickyScroll && historyAnchor === undefined) {
+      const evicted = new Set(completed.slice(0, excess));
+      const node = transcript.getChildren().find((child) => child !== liveStatus && child !== historyNotice && !evicted.has(child) && child.y + child.height > scroll.y && child.y < scroll.y + scroll.height);
+      if (node !== undefined)
+        historyAnchor = { node, y: node.y, scrollTop: scroll.scrollTop };
+    }
+    for (const node of completed.slice(0, excess)) {
+      forgetTranscriptNode(node);
+      node.destroyRecursively();
+    }
+    for (let i = userPrompts.length - 1;i >= 0; i--) {
+      if (userPrompts[i]?.box.isDestroyed)
+        userPrompts.splice(i, 1);
+    }
+    if (pinnedPrompt?.box.isDestroyed) {
+      pinnedPrompt = undefined;
+      promptPin.visible = false;
+    }
+    if (historyNotice === undefined || historyNotice.isDestroyed) {
+      historyNotice = new otui.TextRenderable(r, {
+        id: "transcript-history-notice",
+        content: "Older output is no longer mounted in this view.",
+        fg: getTheme().muted,
+        flexShrink: 0
+      });
+      originalTranscriptAdd(historyNotice, 0);
+    }
+  };
   transcript.add = (child, index) => {
     if (liveStatus !== undefined && child !== liveStatus) {
       originalTranscriptRemove(liveStatus);
       const added = originalTranscriptAdd(child, index);
       originalTranscriptAdd(liveStatus);
+      trimHistory();
       return added;
     }
-    return originalTranscriptAdd(child, index);
+    const added = originalTranscriptAdd(child, index);
+    trimHistory();
+    return added;
   };
   const queueDock = new otui.BoxRenderable(r, {
     id: "queue-dock",
@@ -135392,6 +135514,7 @@ async function createShellChrome(otui, renderer, opts) {
       } catch {}
       try {
         r.off(otui.CliRenderEvents.FRAME, syncPromptPin);
+        r.off(otui.CliRenderEvents.FRAME, restoreHistoryAnchor);
       } catch {}
     }
   };
@@ -135404,6 +135527,7 @@ var init_shell_chrome = __esm(() => {
   init_modal_host();
   init_debug_log();
   init_renderer_debug();
+  init_transcript_history();
   SIDEBAR_TEXT_WIDTH = SIDEBAR_WIDTH - SIDEBAR_BORDER_LEFT - SIDEBAR_PADDING_LEFT - SIDEBAR_PADDING_RIGHT;
   SPINNER = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 });
@@ -136741,7 +136865,7 @@ function openRouting(otui, chrome, options) {
     cwd: options.cwd,
     ...options.userConfigDir !== undefined ? { userConfigDir: options.userConfigDir } : {}
   };
-  const loadProviders = options.providers ?? defaultProviders;
+  const loadProviders = options.providers ?? loadRoutingProviders;
   const loadProfiles = options.loadProfiles ?? ((dir) => loadModelProfiles(dir));
   const rendererHint = options.renderer ?? chrome?.renderer;
   const panelRows = typeof rendererHint?.width === "number" && typeof rendererHint.height === "number" ? modalBodyRows(resolveModalPanelSize(rendererHint.width, rendererHint.height).height) : 13;
@@ -136956,7 +137080,7 @@ function describePickerRowProfile(opt, profiles) {
     parts.push("non-chat/free \u2014 never auto-derived");
   return parts.join("  \xB7  ");
 }
-async function defaultProviders() {
+async function loadRoutingProviders() {
   await Promise.resolve().then(() => init_provider_catalog());
   await Promise.resolve().then(() => init_shell_config());
   const catalog = await loadOrRefreshProviderCatalog({ fetch, env: envWithSavedApiKeys() });
@@ -145390,33 +145514,55 @@ var init_classifier_model = __esm(() => {
 });
 
 // src/tui/routing-classifier-source.ts
+async function loadTurnProviders(load, signal, timeoutMs) {
+  if (signal?.aborted || timeoutMs <= 0)
+    return;
+  let stop;
+  const stopped = new Promise((resolve) => {
+    stop = () => resolve(undefined);
+  });
+  signal?.addEventListener("abort", stop, { once: true });
+  const timer = setTimeout(stop, timeoutMs);
+  try {
+    return await Promise.race([Promise.resolve().then(load), stopped]);
+  } finally {
+    clearTimeout(timer);
+    signal?.removeEventListener("abort", stop);
+  }
+}
 async function runRoutingClassifierForTurn(line, opts) {
   if (opts.signal?.aborted)
     return;
   if (!opts.enabled)
     return;
+  const deadline = performance.now() + Math.max(0, opts.timeoutMs ?? CLASSIFY_TURN_TIMEOUT_MS);
   const profiles = loadModelProfiles(opts.userConfigDir);
+  const providers = opts.providers === undefined ? opts.detected : await loadTurnProviders(opts.providers, opts.signal, Math.max(0, deadline - performance.now()));
+  if (providers === undefined)
+    return;
+  if (opts.signal?.aborted)
+    return;
   const env = envWithSavedApiKeys(opts.env ?? process.env);
   const external = await resolveExternalSetting({ cwd: opts.cwd, ...opts.userConfigDir !== undefined ? { dir: opts.userConfigDir } : {} });
   if (opts.signal?.aborted)
     return;
-  const externalAllowed = externalAllowedConnectedPredicate(connectedPredicateFrom(opts.detected), external.value === "on", loadExternalProvidersConfig(opts.userConfigDir).config);
-  const fallbackModel = selectClassifierModel(opts.detected, profiles, (providerId, modelId) => externalAllowed(providerId, modelId) && (opts.classifierAllowed?.(providerId, modelId) ?? true) && (opts.providerFactory !== undefined || hasCredential(providerId, env)));
+  const externalAllowed = externalAllowedConnectedPredicate(connectedPredicateFrom(providers), external.value === "on", loadExternalProvidersConfig(opts.userConfigDir).config);
+  const fallbackModel = selectClassifierModel(providers, profiles, (providerId, modelId) => externalAllowed(providerId, modelId) && (opts.classifierAllowed?.(providerId, modelId) ?? true) && (opts.providerFactory !== undefined || hasCredential(providerId, env)));
   const classification = await classifyTurn(line, TURN_CLASSIFIER_CATEGORIES, {
-    jevEnabled: opts.jevEnabled && opts.jevAllowed !== false,
+    jevEnabled: opts.jevEnabled && opts.jevAllowed !== false && external.value === "on",
     ...opts.signal !== undefined ? { signal: opts.signal } : {},
     fallbackModel: fallbackModel ?? null,
     ...opts.providerFactory !== undefined ? { providerFactory: opts.providerFactory } : {},
     ...opts.env !== undefined ? { env: opts.env } : {},
     ...opts.fetch !== undefined ? { fetch: opts.fetch } : {},
-    timeoutMs: opts.timeoutMs ?? CLASSIFY_TURN_TIMEOUT_MS
+    timeoutMs: Math.max(0, deadline - performance.now())
   });
   if (opts.signal?.aborted)
     return;
   if (classification === undefined)
     return;
   const baseline = { providerId: opts.sessionProvider, modelId: opts.sessionModel };
-  const skippedJev = opts.jevEnabled && opts.jevAllowed === false ? "jev: caller policy denied" : opts.jevEnabled && resolveJevClassifierCredential(opts.env).key === undefined ? "jev: credentials unavailable" : undefined;
+  const skippedJev = opts.jevEnabled && opts.jevAllowed === false ? "jev: caller policy denied" : opts.jevEnabled && external.value !== "on" ? "jev: external policy denied" : opts.jevEnabled && resolveJevClassifierCredential(opts.env).key === undefined ? "jev: credentials unavailable" : undefined;
   if (!classification.result.ok) {
     const failures = classification.trace.flatMap((stage) => stage.result.ok ? [] : [`${stage.source}: ${stage.result.reason}`]);
     return {
@@ -145436,12 +145582,12 @@ async function runRoutingClassifierForTurn(line, opts) {
   const [project, user] = await Promise.all([loadRoutingConfig("project", location), loadRoutingConfig("user", location)]);
   if (opts.signal?.aborted)
     return;
-  const connected = connectedPredicateFrom(opts.detected);
+  const connected = connectedPredicateFrom(providers);
   const available = availablePredicateFromProfiles(profiles);
   let fallbackReason;
   const connectedForTurn = (providerId, modelId) => {
     if (modelId !== undefined) {
-      const reason = !connected(providerId, modelId) ? "model not connected" : !available(providerId, modelId) ? "model unavailable" : !(opts.executorAllowed?.(providerId, modelId) ?? true) ? "executor policy denied" : undefined;
+      const reason = !connected(providerId, modelId) ? "model not connected" : !externalAllowed(providerId, modelId) ? "external policy denied" : !available(providerId, modelId) ? "model unavailable" : !(opts.executorAllowed?.(providerId, modelId) ?? true) ? "executor policy denied" : opts.providerFactory === undefined && !hasCredential(providerId, env) ? "credentials unavailable" : undefined;
       if (reason !== undefined) {
         fallbackReason ??= `${providerId}/${modelId}: ${reason}`;
         return false;
@@ -145449,14 +145595,14 @@ async function runRoutingClassifierForTurn(line, opts) {
       return true;
     }
     const defaultId = resolveProviderDefaultModelId(providerId);
-    const reason = !connected(providerId) ? "provider not connected" : defaultId === undefined ? "no documented provider default" : !connected(providerId, defaultId) ? "default model not connected" : !available(providerId, defaultId) ? "default model unavailable" : !(opts.executorAllowed?.(providerId, defaultId) ?? true) ? "executor policy denied" : opts.providerFactory === undefined && !hasCredential(providerId, env) ? "credentials unavailable" : undefined;
+    const reason = !connected(providerId) ? "provider not connected" : defaultId === undefined ? "no documented provider default" : !connected(providerId, defaultId) ? "default model not connected" : !externalAllowed(providerId, defaultId) ? "external policy denied" : !available(providerId, defaultId) ? "default model unavailable" : !(opts.executorAllowed?.(providerId, defaultId) ?? true) ? "executor policy denied" : opts.providerFactory === undefined && !hasCredential(providerId, env) ? "credentials unavailable" : undefined;
     if (reason !== undefined) {
       fallbackReason ??= `${providerId} (provider default): ${reason}`;
       return false;
     }
     return true;
   };
-  const sessionProvider = opts.detected.find((p) => p.name === opts.sessionProvider);
+  const sessionProvider = providers.find((p) => p.name === opts.sessionProvider);
   const models = sessionProvider?.models ?? [opts.sessionModel];
   const derived = deriveDefaultTable(opts.sessionProvider, models, profiles, opts.sessionModel);
   const resolved = resolveCategoryDetailed(category, { project: project.table, user: user.table, derived }, connectedForTurn, available);
@@ -145479,11 +145625,17 @@ async function runRoutingClassifierForTurn(line, opts) {
   const modelId = resolveProviderDefaultModelId(resolved.assignment.providerId);
   return modelId === undefined ? result : { ...result, routed: { providerId: resolved.assignment.providerId, modelId } };
 }
+function classificationSource(result) {
+  if (!result.classification.result.ok)
+    return "none";
+  const source = result.classification.result.source;
+  return source === "jev" ? "JEV" : source === "main-model" ? "fallback" : source;
+}
 function renderRoutingFallbackLine(result) {
   if (result === undefined)
     return "[route fallback: no classifier category; using session model]";
   const target = result.baseline === undefined ? "session model" : `${result.baseline.providerId}/${result.baseline.modelId}`;
-  return redactSensitiveText(`[route fallback: ${result.category ?? "no classifier category"} -> ${describeAssignment(result.assignment)}${result.fallbackReason !== undefined ? `; ${result.fallbackReason}` : ""}; using ${target}]`);
+  return redactSensitiveText(`[route fallback: ${result.category ?? "no classifier category"} -> ${describeAssignment(result.assignment)}; classifier: ${classificationSource(result)}${result.fallbackReason !== undefined ? `; ${result.fallbackReason}` : ""}; using ${target}]`);
 }
 function pct6(n) {
   return `${Math.round(n * 100)}%`;
@@ -145491,7 +145643,7 @@ function pct6(n) {
 function renderRoutingTagLine(result) {
   if (result.routed === undefined)
     return;
-  const source = result.classification.result.ok ? result.classification.result.source : "none";
+  const source = classificationSource(result);
   const confidence = result.classification.result.ok ? ` ${pct6(result.classification.result.confidence)}` : "";
   return `[${result.category} -> ${result.routed.providerId}/${result.routed.modelId}] (${source}${confidence}${result.fallbackReason !== undefined ? `; fallback: ${result.fallbackReason}` : ""})`;
 }
@@ -151547,6 +151699,53 @@ function onKeypress3(r, handler) {
   r._internalKeyInput.onInternal("keypress", handler);
   return () => r._internalKeyInput.offInternal("keypress", handler);
 }
+function focusedNode(r) {
+  return r.currentFocusedRenderable;
+}
+function canTakeKeyboard(node, root) {
+  let current = node;
+  while (current !== null && current !== undefined) {
+    if (current.isDestroyed === true || current.visible === false) {
+      return false;
+    }
+    if (current === root) {
+      return true;
+    }
+    current = current.parent;
+  }
+  return false;
+}
+function resolveHandBack(start, root) {
+  const seen = new Set;
+  let candidate = start;
+  while (candidate !== null && !seen.has(candidate)) {
+    if (canTakeKeyboard(candidate, root)) {
+      return candidate;
+    }
+    seen.add(candidate);
+    candidate = handBackFrom.get(candidate) ?? modalFocusFallback(candidate);
+  }
+  return;
+}
+function handBackFocus(r, previous, mounted, title) {
+  if (r.isDestroyed === true) {
+    return;
+  }
+  const current = focusedNode(r);
+  if (current !== null && !mounted.some((node) => containsNode(node, current))) {
+    debugEvent("choice.focus-kept", { title, focused: current.id ?? null });
+    return;
+  }
+  const target = resolveHandBack(previous, r.root);
+  if (target === undefined || modalHides(r, target)) {
+    debugEvent("choice.focus-not-restored", { title, previous: previous?.id ?? null, modal: target !== undefined });
+    return;
+  }
+  try {
+    target.focus();
+    debugEvent("choice.focus-restored", { title, focused: target.id ?? null });
+  } catch {}
+}
 function dockBusy(dock) {
   return (dockDepth.get(dock) ?? 0) > 0;
 }
@@ -151603,6 +151802,7 @@ function presentComposerChoice(otui, r, dock, request) {
     return Promise.resolve({ kind: "id", id: request.cancelId });
   }
   return new Promise((resolve) => {
+    const previousFocus = focusedNode(r);
     const ownEnabled = request.ownAnswer !== undefined;
     const options = request.options.map((o) => ({
       ...o,
@@ -151653,6 +151853,7 @@ function presentComposerChoice(otui, r, dock, request) {
         scrollY: true,
         contentOptions: { flexDirection: "column" }
       });
+      handBackFrom.set(subtitleScroll, previousFocus);
       for (const [i, line] of subtitleLines.entries()) {
         subtitleScroll.content.add(new otui.TextRenderable(r, {
           id: `ch-sub-line-${i}-${Date.now()}`,
@@ -151676,6 +151877,7 @@ function presentComposerChoice(otui, r, dock, request) {
       contentOptions: { flexDirection: "column" }
     });
     dock.add(optionsScroll);
+    handBackFrom.set(optionsScroll, previousFocus);
     const optionsBox = optionsScroll.content;
     const rows = [];
     const paintOptions = () => {
@@ -151736,6 +151938,7 @@ function presentComposerChoice(otui, r, dock, request) {
         content: otui.t`${dimChunk(otui, picked === undefined ? "Your own answer \u2014 Enter sends, Esc goes back to the options" : `Reason for "${picked.label}" \u2014 Enter sends, Esc goes back to the options`)}`
       });
       ownInput = new otui.InputRenderable(r, { id: `ch-own-input-${Date.now()}`, value: "", marginTop: 0 });
+      handBackFrom.set(ownInput, previousFocus);
       dock.add(ownNote);
       dock.add(ownInput);
       paintTitle();
@@ -151792,7 +151995,8 @@ function presentComposerChoice(otui, r, dock, request) {
         id: rowId,
         width: "100%",
         flexDirection: "column",
-        onMouseDown: () => {
+        onMouseDown: (event) => {
+          event.preventDefault();
           finish(o.id, "click");
         }
       });
@@ -151850,6 +152054,9 @@ function presentComposerChoice(otui, r, dock, request) {
         }
       } catch {}
       dock.visible = false;
+      queueMicrotask(() => {
+        handBackFocus(r, previousFocus, mounted, request.title);
+      });
       setTimeout(() => {
         for (const node of mounted) {
           try {
@@ -151959,12 +152166,13 @@ function presentComposerChoice(otui, r, dock, request) {
     });
   });
 }
-var OWN_ROW_ID = "\x00own-answer", DEFAULT_ACCEPT_DELAY_MS = 400, MAX_SUBTITLE_CHARS = 8000, MAX_SUBTITLE_ROWS = 10, SUBTITLE_INLINE_MAX_CHARS = 76, OPTION_ROWS = 2, MAX_OPTIONS_ROWS = 16, dockChain, dockDepth;
+var OWN_ROW_ID = "\x00own-answer", DEFAULT_ACCEPT_DELAY_MS = 400, MAX_SUBTITLE_CHARS = 8000, MAX_SUBTITLE_ROWS = 10, SUBTITLE_INLINE_MAX_CHARS = 76, OPTION_ROWS = 2, MAX_OPTIONS_ROWS = 16, handBackFrom, dockChain, dockDepth;
 var init_composer_choice = __esm(() => {
   init_theme();
   init_theme_text();
   init_modal_host();
   init_debug_log();
+  handBackFrom = new WeakMap;
   dockChain = new WeakMap;
   dockDepth = new WeakMap;
 });
@@ -164541,6 +164749,7 @@ ${formatThemeList(getThemeId())}`);
               jevEnabled: routingEnabled,
               cwd: opts.session?.cwd ?? process.cwd(),
               detected: opts.detected ?? [],
+              providers: loadRoutingProviders,
               sessionProvider: currentSel.provider,
               sessionModel: currentSel.model
             });
@@ -214877,7 +215086,7 @@ function parseCategory(raw) {
     return;
   return raw;
 }
-async function defaultProviders2() {
+async function defaultProviders() {
   await Promise.resolve().then(() => init_provider_catalog());
   const catalog = await loadOrRefreshProviderCatalog({ fetch, env: envWithSavedApiKeys() });
   return catalogToFlatPickerProviders(catalog);
@@ -214890,7 +215099,7 @@ function defaultSession(userConfigDir) {
   return { providerId: cfg.provider, modelId: cfg.model };
 }
 async function runList5(args, location, deps) {
-  const loadProviders = deps.providers ?? defaultProviders2;
+  const loadProviders = deps.providers ?? defaultProviders;
   const loadSession = deps.session ?? (() => defaultSession(location.userConfigDir));
   const [project, user, providers] = await Promise.all([
     loadRoutingConfig("project", location),

package/dist/core.js

@@ -1970,7 +1970,8 @@ function isValidIp(value) {
   return false;
 }
 function isWordBoundary(flavour, content, index) {
-  return flavour.wordChar.test(wordCharBefore(content, index)) !== flavour.wordChar.test(wordCharAt(content, index));
+  flavour.boundary.lastIndex = index;
+  return flavour.boundary.test(content);
 }
 function wordCharBefore(content, index) {
   if (index <= 0) {
@@ -2710,12 +2711,12 @@ var init_pii = __esm(() => {
   UNICODE_EMAIL = {
     from: /(?:(?<=[\p{L}\p{N}\p{M}_])(?![\p{L}\p{N}\p{M}_])|(?<![\p{L}\p{N}\p{M}_])(?=[\p{L}\p{N}\p{M}_]))[\p{L}\p{N}\p{M}._%+-]+@[\p{L}\p{N}\p{M}.-]+\.[\p{L}\p{M}]{2,}(?![\p{L}\p{N}\p{M}_])/uy,
     localChar: /[\p{L}\p{N}\p{M}._%+-]/u,
-    wordChar: /[\p{L}\p{N}\p{M}_]/u
+    boundary: /(?:(?<=[\p{L}\p{N}\p{M}_])(?![\p{L}\p{N}\p{M}_])|(?<![\p{L}\p{N}\p{M}_])(?=[\p{L}\p{N}\p{M}_]))/uy
   };
   ASCII_EMAIL = {
     from: /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/y,
     localChar: /[A-Za-z0-9._%+-]/,
-    wordChar: /\w/
+    boundary: /\b/y
   };
   emailScanner = emailScannerFor(UNICODE_EMAIL);
   asciiEmailScanner = emailScannerFor(ASCII_EMAIL);

package/package.json

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