@astralyn/pi 0.84.6 → 0.84.8

package/dist/extensions/router/ui.js

@@ -8,6 +8,7 @@ import { BorderedLoader } from "../../modes/interactive/components/bordered-load
 import { getModelSelectorSearchText } from "../../modes/interactive/model-search.js";
 import { formatError, isValidRelayId, NO_UI_WARNING, ROUTER_THINKING_LEVELS, truncate } from "./constants.js";
 import { createModelChecklist, createSearchableSelector, createThinkingMapEditor, } from "./dialog.js";
+import { createNativeRouterDialogs, RouterTuiSession, RouterTuiSessionClosedError, } from "./dialog-host.js";
 import { createDefaultModelConfig, displayModelLabel, resolveModelConfig, resolveRouterThinkingMap, summarizeThinkingMap, } from "./presets.js";
 import { probeRelayModels } from "./probe.js";
 import { applyRouterFile, registerOneRelay, unregisterOneRelay } from "./register.js";
@@ -52,6 +53,18 @@ class RelayAutoSaver {
         }
     }
 }
+/** Abort the catalog request if its internal page or the whole Router session is disposed. */
+class RouterProbeLoader extends BorderedLoader {
+    constructor(tui, theme, message) {
+        super(tui, theme, message, { cancellable: true });
+        this.disposeController = new AbortController();
+        this.probeSignal = AbortSignal.any([this.signal, this.disposeController.signal]);
+    }
+    dispose() {
+        this.disposeController.abort();
+        super.dispose();
+    }
+}
 export function isCurrentRouterModel(current, relayId, modelId) {
     return current?.provider === relayId && current.id === modelId;
 }
@@ -61,14 +74,6 @@ export async function runRouterCommand(args, ctx, pi) {
         return;
     }
     const trimmed = args.trim().toLowerCase();
-    if (!trimmed || trimmed === "list") {
-        await openMainMenu(ctx, pi);
-        return;
-    }
-    if (trimmed === "add") {
-        await addRelayFlow(ctx, pi);
-        return;
-    }
     if (trimmed === "reload") {
         const file = await loadRouterFile();
         applyRouterFile(pi, file);
@@ -76,16 +81,63 @@ export async function runRouterCommand(args, ctx, pi) {
         ctx.ui.notify(`Reloaded ${file.relays.length} relay(s).`, "info");
         return;
     }
-    // Treat as relay id open
+    if (ctx.mode === "tui") {
+        await runRouterTuiCommand(args, ctx, pi);
+        return;
+    }
+    await runRouterDialogCommand(args, ctx, pi, createNativeRouterDialogs(ctx));
+}
+async function runRouterTuiCommand(args, ctx, pi) {
+    let failure;
+    let closedDuringTransition = false;
+    await ctx.ui.custom((tui, theme, keybindings, done) => {
+        const session = new RouterTuiSession(tui, theme, keybindings, () => {
+            closedDuringTransition = true;
+            done();
+        });
+        void runRouterDialogCommand(args, ctx, pi, session).then(() => {
+            if (!closedDuringTransition)
+                done();
+        }, (error) => {
+            if (closedDuringTransition) {
+                if (!(error instanceof RouterTuiSessionClosedError)) {
+                    try {
+                        ctx.ui.notify(formatError(error), "error");
+                    }
+                    catch {
+                        // The command context may have gone stale after the modal closed.
+                    }
+                }
+                return;
+            }
+            failure = { error };
+            done();
+        });
+        return session;
+    });
+    if (failure)
+        throw failure.error;
+}
+async function runRouterDialogCommand(args, ctx, pi, dialogs) {
+    const trimmed = args.trim().toLowerCase();
+    if (!trimmed || trimmed === "list") {
+        await openMainMenu(ctx, pi, dialogs);
+        return;
+    }
+    if (trimmed === "add") {
+        await addRelayFlow(ctx, pi, dialogs);
+        return;
+    }
+    // Treat as relay id open.
     const file = await loadRouterFile();
     const exact = file.relays.find((relay) => relay.id.toLowerCase() === trimmed);
     if (exact) {
-        await editRelayFlow(ctx, pi, exact);
+        await editRelayFlow(ctx, pi, dialogs, exact);
         return;
     }
-    await openMainMenu(ctx, pi, args.trim());
+    await openMainMenu(ctx, pi, dialogs, args.trim());
 }
-async function openMainMenu(ctx, pi, initialQuery) {
+async function openMainMenu(ctx, pi, dialogs, initialQuery) {
     let cursor;
     let query = initialQuery;
     while (true) {
@@ -111,8 +163,8 @@ async function openMainMenu(ctx, pi, initialQuery) {
                 searchText: "reload refresh",
             },
         ];
-        const selected = ctx.mode === "tui"
-            ? await ctx.ui.custom(createSearchableSelector({
+        const selected = dialogs.kind === "tui"
+            ? await dialogs.show(createSearchableSelector({
                 title: "API relays",
                 subtitle: file.relays.length === 0
                     ? "No relays yet — add a base URL + API key."
@@ -122,13 +174,13 @@ async function openMainMenu(ctx, pi, initialQuery) {
                 initialQuery: query,
                 maxVisible: 10,
             }))
-            : await selectNative(ctx, "API relays", items.map((item) => ({ value: item.value, label: item.label, description: item.description })));
+            : await selectRouterItem(dialogs, "API relays", items.map((item) => ({ value: item.value, label: item.label, description: item.description })));
         query = undefined;
         if (selected === undefined)
             return;
         cursor = selected;
         if (selected === "action:add") {
-            const id = await addRelayFlow(ctx, pi);
+            const id = await addRelayFlow(ctx, pi, dialogs);
             if (id)
                 cursor = `relay:${id}`;
             continue;
@@ -148,14 +200,14 @@ async function openMainMenu(ctx, pi, initialQuery) {
                 ctx.ui.notify(`Relay "${id}" not found.`, "warning");
                 continue;
             }
-            await editRelayFlow(ctx, pi, relay);
+            await editRelayFlow(ctx, pi, dialogs, relay);
         }
     }
 }
-async function addRelayFlow(ctx, pi) {
+async function addRelayFlow(ctx, pi, dialogs) {
     const file = await loadRouterFile();
     const existing = new Set(file.relays.map((relay) => relay.id));
-    const id = await promptText(ctx, "New relay · name (provider id)", "my-relay", (value) => {
+    const id = await promptText(ctx, dialogs, "New relay · name (provider id)", "my-relay", (value) => {
         const trimmed = value.trim();
         if (!trimmed)
             return "Name is required.";
@@ -167,7 +219,7 @@ async function addRelayFlow(ctx, pi) {
     });
     if (id === undefined)
         return undefined;
-    const baseUrl = await promptText(ctx, `New relay · ${id.trim()} · base URL`, "https://relay.example/v1", (value) => {
+    const baseUrl = await promptText(ctx, dialogs, `New relay · ${id.trim()} · base URL`, "https://relay.example/v1", (value) => {
         const trimmed = value.trim();
         if (!trimmed)
             return "Base URL is required.";
@@ -183,7 +235,7 @@ async function addRelayFlow(ctx, pi) {
     });
     if (baseUrl === undefined)
         return undefined;
-    const apiKey = await promptText(ctx, `New relay · ${id.trim()} · API key`, "sk-… or $RELAY_KEY", (value) => {
+    const apiKey = await promptText(ctx, dialogs, `New relay · ${id.trim()} · API key`, "sk-… or $RELAY_KEY", (value) => {
         if (!value.trim())
             return "API key is required.";
         return undefined;
@@ -199,7 +251,7 @@ async function addRelayFlow(ctx, pi) {
     // Connection fields are committed before the network step so cancelling or
     // failing catalog discovery never loses the relay the user just entered.
     await persistRelay(ctx, pi, relay);
-    await fetchAndSelectModels(ctx, pi, relay);
+    await fetchAndSelectModels(ctx, pi, dialogs, relay);
     if (relay.models.length === 0) {
         ctx.ui.notify(`Relay "${relay.id}" has no models yet.`, "warning");
     }
@@ -209,7 +261,7 @@ async function addRelayFlow(ctx, pi) {
  * Relay editor — flat menu. Every mutation writes router.json immediately.
  * Hierarchy: list → relay → (models list | connection field | fetch | remove).
  */
-async function editRelayFlow(ctx, pi, initial) {
+async function editRelayFlow(ctx, pi, dialogs, initial) {
     const relay = structuredClone(initial);
     while (true) {
         const modelSummary = relay.models.length === 0
@@ -220,7 +272,7 @@ async function editRelayFlow(ctx, pi, initial) {
                     .slice(0, 2)
                     .map((m) => displayModelLabel(m))
                     .join(", ")}…`;
-        const choice = await selectNative(ctx, `Relay · ${relay.id}`, [
+        const choice = await selectRouterItem(dialogs, `Relay · ${relay.id}`, [
             {
                 value: "models",
                 label: "Models",
@@ -234,7 +286,7 @@ async function editRelayFlow(ctx, pi, initial) {
         if (choice === undefined || choice === "back")
             return;
         if (choice === "baseUrl") {
-            const next = await promptText(ctx, `Relay · ${relay.id} · base URL`, relay.baseUrl, (value) => {
+            const next = await promptText(ctx, dialogs, `Relay · ${relay.id} · base URL`, relay.baseUrl, (value) => {
                 try {
                     const url = new URL(value.trim());
                     if (url.protocol !== "http:" && url.protocol !== "https:")
@@ -255,7 +307,7 @@ async function editRelayFlow(ctx, pi, initial) {
             continue;
         }
         if (choice === "apiKey") {
-            const next = await promptText(ctx, `Relay · ${relay.id} · API key`, relay.apiKey, (value) => value.trim() ? undefined : "API key is required.");
+            const next = await promptText(ctx, dialogs, `Relay · ${relay.id} · API key`, relay.apiKey, (value) => value.trim() ? undefined : "API key is required.");
             if (next === undefined)
                 continue;
             const trimmed = next.trim();
@@ -268,7 +320,7 @@ async function editRelayFlow(ctx, pi, initial) {
         if (choice === "models") {
             // Always open the models screen (fetch lives only here). Empty list still
             // shows Fetch so the path is Relay → Models → Fetch, not a top-level shortcut.
-            await manageModelsFlow(ctx, pi, relay);
+            await manageModelsFlow(ctx, pi, dialogs, relay);
             continue;
         }
         if (choice === "remove") {
@@ -276,7 +328,7 @@ async function editRelayFlow(ctx, pi, initial) {
                 ctx.ui.notify(`Switch away from relay "${relay.id}" before removing it.`, "warning");
                 continue;
             }
-            const ok = await ctx.ui.confirm(`Remove relay "${relay.id}"?`, "Models will disappear from /model.");
+            const ok = await dialogs.confirm(`Remove relay "${relay.id}"?`, "Models will disappear from /model.");
             if (!ok)
                 continue;
             await removeRelay(relay.id);
@@ -291,7 +343,7 @@ async function editRelayFlow(ctx, pi, initial) {
  * Models screen: searchable configured models plus fetch/manual-add actions.
  * Selecting a model opens its editor (name / thinking / remove).
  */
-async function manageModelsFlow(ctx, pi, relay) {
+async function manageModelsFlow(ctx, pi, dialogs, relay) {
     let cursor;
     while (true) {
         const items = [
@@ -325,16 +377,16 @@ async function manageModelsFlow(ctx, pi, relay) {
         ];
         const currentValue = `model:${ctx.model?.id}`;
         const initialValue = cursor ?? (ctx.model?.provider === relay.id ? currentValue : undefined);
-        const choice = await selectNative(ctx, `Relay · ${relay.id} · models`, items, { initialValue });
+        const choice = await selectRouterItem(dialogs, `Relay · ${relay.id} · models`, items, { initialValue });
         if (choice === undefined || choice === "action:back")
             return;
         cursor = choice;
         if (choice === "action:fetch") {
-            await fetchAndSelectModels(ctx, pi, relay);
+            await fetchAndSelectModels(ctx, pi, dialogs, relay);
             continue;
         }
         if (choice === "action:manual") {
-            const additions = await manualModelEntry(ctx);
+            const additions = await manualModelEntry(ctx, dialogs);
             if (!additions)
                 continue;
             relay.models = mergeAddedModels(relay.models, additions);
@@ -346,16 +398,16 @@ async function manageModelsFlow(ctx, pi, relay) {
             const model = relay.models.find((entry) => entry.id === modelId);
             if (!model)
                 continue;
-            await editModelFlow(ctx, pi, relay, model);
+            await editModelFlow(ctx, pi, dialogs, relay, model);
         }
     }
 }
 /** Single-model editor: display name + thinking. Every confirmed change is live. */
-async function editModelFlow(ctx, pi, relay, model) {
+async function editModelFlow(ctx, pi, dialogs, relay, model) {
     while (true) {
         const resolved = resolveModelConfig(model);
         const nameDesc = resolved.name ? resolved.name : "(empty · /model shows id)";
-        const action = await selectNative(ctx, `Relay · ${relay.id} · ${model.id}`, [
+        const action = await selectRouterItem(dialogs, `Relay · ${relay.id} · ${model.id}`, [
             { value: "name", label: "Display name", description: nameDesc },
             {
                 value: "thinking",
@@ -368,7 +420,7 @@ async function editModelFlow(ctx, pi, relay, model) {
         if (action === undefined || action === "back")
             return;
         if (action === "name") {
-            const next = await promptText(ctx, `Display name · ${model.id} (empty = show id)`, resolved.name ?? "");
+            const next = await promptText(ctx, dialogs, `Display name · ${model.id} (empty = show id)`, resolved.name ?? "");
             if (next === undefined)
                 continue;
             const trimmed = next.trim();
@@ -385,8 +437,8 @@ async function editModelFlow(ctx, pi, relay, model) {
         }
         if (action === "thinking") {
             const saver = new RelayAutoSaver(ctx, pi, relay);
-            if (ctx.mode === "tui") {
-                await ctx.ui.custom(createThinkingMapEditor({
+            if (dialogs.kind === "tui") {
+                await dialogs.show(createThinkingMapEditor({
                     title: `Thinking · ${relay.id} / ${model.id}`,
                     map: resolved.thinkingLevelMap,
                     levels: ROUTER_THINKING_LEVELS,
@@ -398,7 +450,7 @@ async function editModelFlow(ctx, pi, relay, model) {
                 }));
             }
             else {
-                await editThinkingMapNative(ctx, resolved.thinkingLevelMap, (nextMap) => {
+                await editThinkingMapNative(dialogs, resolved.thinkingLevelMap, (nextMap) => {
                     model.thinkingLevelMap = nextMap;
                     model.reasoning = true;
                     saver.save();
@@ -412,7 +464,7 @@ async function editModelFlow(ctx, pi, relay, model) {
                 ctx.ui.notify(`Switch away from model "${model.id}" before removing it.`, "warning");
                 continue;
             }
-            const ok = await ctx.ui.confirm(`Remove model "${model.id}"?`, "Its display name and thinking settings will be removed.");
+            const ok = await dialogs.confirm(`Remove model "${model.id}"?`, "Its display name and thinking settings will be removed.");
             if (!ok)
                 continue;
             relay.models = relay.models.filter((entry) => entry.id !== model.id);
@@ -422,10 +474,10 @@ async function editModelFlow(ctx, pi, relay, model) {
         }
     }
 }
-async function editThinkingMapNative(ctx, map, onChange) {
+async function editThinkingMapNative(dialogs, map, onChange) {
     let working = resolveRouterThinkingMap(map);
     while (true) {
-        const choice = await selectNative(ctx, "Toggle thinking level", [
+        const choice = await selectRouterItem(dialogs, "Toggle thinking level", [
             ...ROUTER_THINKING_LEVELS.map((level) => ({
                 value: level,
                 label: level,
@@ -447,21 +499,19 @@ async function editThinkingMapNative(ctx, map, onChange) {
         onChange({ ...working });
     }
 }
-async function fetchAndSelectModels(ctx, pi, relay) {
+async function fetchAndSelectModels(ctx, pi, dialogs, relay) {
     const key = resolveProbeApiKey(relay.apiKey);
     if (key.error) {
         ctx.ui.notify(key.error, "warning");
-        await recoverWithManualModels(ctx, pi, relay);
+        await recoverWithManualModels(ctx, pi, dialogs, relay);
         return;
     }
     let result;
     while (true) {
         const probeOptions = { baseUrl: relay.baseUrl, apiKey: key.value };
-        if (ctx.mode === "tui") {
-            result = await ctx.ui.custom((tui, theme, _kb, done) => {
-                const loader = new BorderedLoader(tui, theme, `Fetching models · ${relay.id}`, {
-                    cancellable: true,
-                });
+        if (dialogs.kind === "tui") {
+            result = await dialogs.show((tui, theme, _kb, done) => {
+                const loader = new RouterProbeLoader(tui, theme, `Fetching models · ${relay.id}`);
                 let settled = false;
                 const finish = (value) => {
                     if (settled)
@@ -471,7 +521,7 @@ async function fetchAndSelectModels(ctx, pi, relay) {
                     done(value);
                 };
                 loader.onAbort = () => finish(undefined);
-                void probeRelayModels({ ...probeOptions, signal: loader.signal })
+                void probeRelayModels({ ...probeOptions, signal: loader.probeSignal })
                     .then(finish)
                     .catch((error) => finish({ ok: false, error: formatError(error) }));
                 return loader;
@@ -485,7 +535,7 @@ async function fetchAndSelectModels(ctx, pi, relay) {
             return;
         if (result.ok && result.models.length === 0) {
             ctx.ui.notify("Server returned an empty model list.", "warning");
-            const recovery = await selectNative(ctx, `Catalog empty · ${relay.id}`, [
+            const recovery = await selectRouterItem(dialogs, `Catalog empty · ${relay.id}`, [
                 { value: "retry", label: "Retry", description: "Fetch /models again" },
                 { value: "manual", label: "Add models manually", description: "Enter model ids without a catalog" },
                 { value: "back", label: "Back", description: "Return to relay settings" },
@@ -493,13 +543,13 @@ async function fetchAndSelectModels(ctx, pi, relay) {
             if (recovery === "retry")
                 continue;
             if (recovery === "manual")
-                await recoverWithManualModels(ctx, pi, relay);
+                await recoverWithManualModels(ctx, pi, dialogs, relay);
             return;
         }
         if (result.ok)
             break;
         ctx.ui.notify(`Fetch failed: ${result.error}`, "error");
-        const recovery = await selectNative(ctx, `Catalog unavailable · ${relay.id}`, [
+        const recovery = await selectRouterItem(dialogs, `Catalog unavailable · ${relay.id}`, [
             { value: "retry", label: "Retry", description: "Fetch /models again" },
             { value: "manual", label: "Add models manually", description: "Enter model ids without a catalog" },
             { value: "back", label: "Back", description: "Return to relay settings" },
@@ -507,7 +557,7 @@ async function fetchAndSelectModels(ctx, pi, relay) {
         if (recovery === "retry")
             continue;
         if (recovery === "manual")
-            await recoverWithManualModels(ctx, pi, relay);
+            await recoverWithManualModels(ctx, pi, dialogs, relay);
         return;
     }
     if (!result || !result.ok)
@@ -536,8 +586,8 @@ async function fetchAndSelectModels(ctx, pi, relay) {
         });
         saver.save();
     };
-    if (ctx.mode === "tui") {
-        const choice = await ctx.ui.custom(createModelChecklist({
+    if (dialogs.kind === "tui") {
+        const choice = await dialogs.show(createModelChecklist({
             title: `Select models · ${relay.id}`,
             subtitle: "Space toggles immediately · Enter/Esc returns",
             models: catalog,
@@ -550,7 +600,7 @@ async function fetchAndSelectModels(ctx, pi, relay) {
             applySelectionIfChanged(relay, choice.selectedIds, applySelection);
     }
     else {
-        const ok = await ctx.ui.confirm(`Import ${result.models.length} models?`, "Non-TUI mode imports the full catalog.");
+        const ok = await dialogs.confirm(`Import ${result.models.length} models?`, "Non-TUI mode imports the full catalog.");
         if (ok)
             applySelection([...new Set([...initiallySelected, ...result.models.map((model) => model.id)])]);
     }
@@ -558,8 +608,8 @@ async function fetchAndSelectModels(ctx, pi, relay) {
     if (relay.models.length === 0)
         ctx.ui.notify(`No models enabled for "${relay.id}".`, "warning");
 }
-async function manualModelEntry(ctx) {
-    const value = await ctx.ui.input("Model IDs (comma-separated)", "gpt-5.6-sol, gpt-5.6-luna");
+async function manualModelEntry(ctx, dialogs) {
+    const value = await dialogs.input("Model IDs (comma-separated)", "gpt-5.6-sol, gpt-5.6-luna");
     if (value === undefined)
         return undefined;
     const ids = [
@@ -574,8 +624,8 @@ async function manualModelEntry(ctx) {
     }
     return ids.map((id) => createDefaultModelConfig(id));
 }
-async function recoverWithManualModels(ctx, pi, relay) {
-    const additions = await manualModelEntry(ctx);
+async function recoverWithManualModels(ctx, pi, dialogs, relay) {
+    const additions = await manualModelEntry(ctx, dialogs);
     if (!additions)
         return;
     relay.models = mergeAddedModels(relay.models, additions);
@@ -624,9 +674,9 @@ async function persistRelay(ctx, pi, relay) {
     registerOneRelay(pi, relay);
     await ctx.modelRegistry.refresh();
 }
-async function promptText(ctx, title, placeholder, validate) {
+async function promptText(ctx, dialogs, title, placeholder, validate) {
     while (true) {
-        const value = await ctx.ui.input(title, placeholder);
+        const value = await dialogs.input(title, placeholder);
         if (value === undefined)
             return undefined;
         const error = validate?.(value);
@@ -637,9 +687,9 @@ async function promptText(ctx, title, placeholder, validate) {
         return value;
     }
 }
-async function selectNative(ctx, title, items, opts) {
-    if (ctx.mode === "tui") {
-        return ctx.ui.custom(createSearchableSelector({
+async function selectRouterItem(dialogs, title, items, opts) {
+    if (dialogs.kind === "tui") {
+        return dialogs.show(createSearchableSelector({
             title,
             items,
             initialValue: opts?.initialValue,
@@ -648,7 +698,7 @@ async function selectNative(ctx, title, items, opts) {
         }));
     }
     const labels = items.map((item) => (item.description ? `${item.label} — ${item.description}` : item.label));
-    const selected = await ctx.ui.select(title, labels);
+    const selected = await dialogs.select(title, labels);
     if (selected === undefined)
         return undefined;
     return items[labels.indexOf(selected)]?.value;