@qduc/term2 0.24.1 → 0.26.0

package/dist/components/input/McpMenuSession.js

@@ -0,0 +1,370 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useInputContext } from '../../context/InputContext.js';
+import { McpSelectionMenu } from '../menu/McpSelectionMenu.js';
+import { applyMenuEditorEvent } from './menu-editor.js';
+const jsonFields = new Set(['args', 'env', 'headers', 'redirectPorts']);
+const fieldLabel = {
+    name: 'Name',
+    type: 'Transport',
+    command: 'Command',
+    url: 'URL',
+    args: 'Arguments (JSON array)',
+    cwd: 'Working directory',
+    env: 'Environment (JSON object)',
+    headers: 'Headers (JSON object)',
+    clientId: 'OAuth client ID',
+    clientMetadataUrl: 'Client metadata URL',
+    redirectPorts: 'OAuth redirect ports (JSON array)',
+};
+const transportOf = (config) => config.type === 'sse'
+    ? 'sse'
+    : config.type === 'http' || (config.url !== undefined && config.command === undefined)
+        ? 'http'
+        : 'stdio';
+const displayValue = (field, draft) => {
+    if (field === 'name')
+        return draft.name || 'required';
+    if (field === 'type')
+        return transportOf(draft.config);
+    const value = draft.config[field];
+    if (draft.maskedFields.has(field))
+        return value === undefined || value === '' ? '<none>' : '<configured>';
+    if (value === undefined || value === '')
+        return '<none>';
+    return typeof value === 'string' ? value : JSON.stringify(value);
+};
+const formFields = (draft) => {
+    const type = transportOf(draft.config);
+    return type === 'stdio'
+        ? ['name', 'type', 'command', 'args', 'cwd', 'env']
+        : ['name', 'type', 'url', 'headers', 'clientId', 'clientMetadataUrl', 'redirectPorts'];
+};
+const normalizedConfig = (draft) => {
+    const type = transportOf(draft.config);
+    const config = { ...draft.config, type };
+    if (type === 'stdio') {
+        delete config.url;
+        if (typeof config.command !== 'string' || !config.command.trim()) {
+            throw new Error('Command is required for a stdio server.');
+        }
+    }
+    else {
+        delete config.command;
+        delete config.args;
+        delete config.cwd;
+        delete config.env;
+        if (typeof config.url !== 'string' || !config.url.trim()) {
+            throw new Error('URL is required for an HTTP or SSE server.');
+        }
+        try {
+            new URL(config.url);
+        }
+        catch {
+            throw new Error('URL must be an absolute URL.');
+        }
+    }
+    return Object.fromEntries(Object.entries(config).filter(([, value]) => value !== undefined && value !== ''));
+};
+export function McpMenuSession({ frame, active, controller, interactions, services }) {
+    const manager = services.mcpManager;
+    const configController = services.mcpConfigController;
+    const { setMenuPromptLabel } = useInputContext();
+    const [phase, setPhase] = useState('list');
+    const [selectedIndex, setSelectedIndex] = useState(0);
+    const [snapshots, setSnapshots] = useState(manager.snapshot());
+    const [userConfigs, setUserConfigs] = useState([]);
+    const [selectedName, setSelectedName] = useState(null);
+    const [draft, setDraft] = useState(null);
+    const [editingField, setEditingField] = useState(null);
+    const [error, setError] = useState();
+    const pendingIntents = useRef(new Map());
+    const refresh = useCallback(async () => {
+        setSnapshots(manager.snapshot());
+        setUserConfigs(await configController.listUserServers());
+    }, [configController, manager]);
+    useEffect(() => {
+        void refresh().catch((e) => setError(e instanceof Error ? e.message : String(e)));
+        return manager.onCatalogChanged(() => setSnapshots(manager.snapshot()));
+    }, [manager, refresh]);
+    useEffect(() => {
+        if (!active)
+            return;
+        setMenuPromptLabel(editingField ? `${fieldLabel[editingField]}: ` : undefined);
+        return () => setMenuPromptLabel(undefined);
+    }, [active, editingField, setMenuPromptLabel]);
+    const selectedSnapshot = snapshots.find((server) => server.name === selectedName);
+    const isUser = userConfigs.some((entry) => entry.name === selectedName);
+    const items = useMemo(() => {
+        if (phase === 'list')
+            return [
+                ...snapshots.map((server) => ({
+                    kind: 'server',
+                    id: server.name,
+                    name: server.name,
+                    label: server.name,
+                    detail: `${server.state} · ${server.tools.length} tools · ${server.provenance} ${server.transport}`,
+                    ...(server.state === 'failed'
+                        ? { tone: 'danger' }
+                        : server.state === 'needs-auth'
+                            ? { tone: 'warning' }
+                            : {}),
+                })),
+                { kind: 'add', id: 'add', label: '+ Add user server' },
+            ];
+        if (phase === 'detail') {
+            const out = [];
+            if (isUser)
+                out.push({ kind: 'action', id: 'edit', action: 'edit', label: 'Edit configuration' });
+            out.push({ kind: 'action', id: 'reconnect', action: 'reconnect', label: 'Reconnect now' });
+            if (selectedName && manager.oauthTarget(selectedName))
+                out.push({ kind: 'action', id: 'login', action: 'login', label: 'Log in with OAuth' });
+            if (isUser)
+                out.push({ kind: 'action', id: 'delete', action: 'delete', label: 'Delete user server', tone: 'danger' });
+            out.push({ kind: 'action', id: 'back', action: 'back', label: 'Back' });
+            return out;
+        }
+        if (phase === 'confirm-delete')
+            return [
+                { kind: 'action', id: 'confirm', action: 'confirm-delete', label: `Delete ${selectedName}?`, tone: 'danger' },
+                { kind: 'action', id: 'cancel', action: 'cancel-delete', label: 'Cancel' },
+            ];
+        if (!draft)
+            return [];
+        return [
+            ...formFields(draft).map((field) => ({
+                kind: 'field',
+                id: field,
+                field,
+                label: fieldLabel[field],
+                detail: displayValue(field, draft),
+            })),
+            { kind: 'action', id: 'save', action: 'save', label: 'Save and reload', tone: 'warning' },
+            { kind: 'action', id: 'cancel', action: 'cancel-form', label: 'Cancel' },
+        ];
+    }, [draft, isUser, manager, phase, selectedName, snapshots]);
+    useEffect(() => setSelectedIndex((index) => Math.min(index, Math.max(0, items.length - 1))), [items.length]);
+    const enterForm = (entry) => {
+        setDraft(entry
+            ? {
+                originalName: entry.name,
+                name: entry.name,
+                config: { ...entry.config },
+                maskedFields: new Set(Object.keys(entry.config).filter((field) => field !== 'type' && field in fieldLabel)),
+            }
+            : { originalName: null, name: '', config: { type: 'stdio' }, maskedFields: new Set() });
+        setPhase('form');
+        setSelectedIndex(0);
+        setError(undefined);
+    };
+    const back = () => {
+        if (editingField) {
+            setEditingField(null);
+            controller.clearText();
+            return;
+        }
+        if (phase === 'list') {
+            controller.close();
+            return;
+        }
+        setPhase(phase === 'form' && selectedName ? 'detail' : 'list');
+        setSelectedIndex(0);
+        setError(undefined);
+    };
+    const interaction = useMemo(() => ({
+        handle: (event) => {
+            const keep = () => ({ stack: { type: 'keep' } });
+            if (!('type' in event)) {
+                const pending = pendingIntents.current.get(event.id);
+                if (!pending)
+                    return keep();
+                pendingIntents.current.delete(event.id);
+                if (!event.ok) {
+                    setError(event.message);
+                    return keep();
+                }
+                setError(undefined);
+                if (pending.type === 'save' || pending.type === 'delete') {
+                    void refresh()
+                        .then(() => {
+                        setSelectedName(pending.type === 'save' ? pending.name : null);
+                        setPhase(pending.type === 'save' ? 'detail' : 'list');
+                        setSelectedIndex(0);
+                    })
+                        .catch((e) => setError(e instanceof Error ? e.message : String(e)));
+                }
+                return keep();
+            }
+            if (editingField) {
+                if (event.type === 'input' ||
+                    (event.type === 'command' && ['left', 'right', 'backspace', 'delete'].includes(event.command))) {
+                    applyMenuEditorEvent(controller, event);
+                    return keep();
+                }
+                if (event.type === 'accept' && draft) {
+                    const text = event.input.kind === 'none' ? '' : event.input.text;
+                    try {
+                        if (draft.maskedFields.has(editingField) && text === '') {
+                            setEditingField(null);
+                            controller.clearText();
+                            return keep();
+                        }
+                        const value = text === '<clear>' ? undefined : jsonFields.has(editingField) && text ? JSON.parse(text) : text;
+                        if (editingField === 'args' &&
+                            value !== undefined &&
+                            (!Array.isArray(value) || value.some((x) => typeof x !== 'string')))
+                            throw new Error('Arguments must be a JSON array of strings.');
+                        if ((editingField === 'env' || editingField === 'headers') &&
+                            value !== undefined &&
+                            (typeof value !== 'object' ||
+                                value === null ||
+                                Array.isArray(value) ||
+                                Object.values(value).some((x) => typeof x !== 'string')))
+                            throw new Error(`${fieldLabel[editingField]} must be a JSON object of strings.`);
+                        if (editingField === 'redirectPorts' &&
+                            value !== undefined &&
+                            (!Array.isArray(value) || value.some((x) => !Number.isInteger(x) || x < 1 || x > 65535)))
+                            throw new Error('Redirect ports must be a JSON array of port numbers.');
+                        if (editingField === 'name')
+                            setDraft({ ...draft, name: text });
+                        else {
+                            const maskedFields = new Set(draft.maskedFields);
+                            maskedFields.delete(editingField);
+                            setDraft({ ...draft, config: { ...draft.config, [editingField]: value || undefined }, maskedFields });
+                        }
+                        setEditingField(null);
+                        controller.clearText();
+                        setError(undefined);
+                    }
+                    catch (e) {
+                        setError(e instanceof Error ? e.message : String(e));
+                    }
+                    return keep();
+                }
+                if (event.type === 'escape') {
+                    back();
+                    return keep();
+                }
+                return keep();
+            }
+            if (event.type === 'move') {
+                setSelectedIndex((i) => event.direction === 'up'
+                    ? Math.max(0, i - 1)
+                    : event.direction === 'down'
+                        ? Math.min(items.length - 1, i + 1)
+                        : i);
+                return keep();
+            }
+            if (event.type === 'escape') {
+                back();
+                return keep();
+            }
+            if (event.type !== 'accept')
+                return keep();
+            const item = items[selectedIndex];
+            if (!item)
+                return keep();
+            if (item.kind === 'server') {
+                setSelectedName(item.name);
+                setPhase('detail');
+                setSelectedIndex(0);
+            }
+            else if (item.kind === 'add') {
+                setSelectedName(null);
+                enterForm();
+            }
+            else if (item.kind === 'field' && draft) {
+                if (item.field === 'type') {
+                    const current = transportOf(draft.config);
+                    const next = current === 'stdio' ? 'http' : current === 'http' ? 'sse' : 'stdio';
+                    setDraft({ ...draft, config: { ...draft.config, type: next } });
+                }
+                else {
+                    setEditingField(item.field);
+                    const existing = item.field === 'name' ? draft.name : draft.config[item.field];
+                    controller.replaceText(draft.maskedFields.has(item.field)
+                        ? ''
+                        : existing === undefined
+                            ? ''
+                            : typeof existing === 'string'
+                                ? existing
+                                : JSON.stringify(existing));
+                }
+            }
+            else if (item.kind === 'action') {
+                if (item.action === 'back' || item.action === 'cancel-form' || item.action === 'cancel-delete')
+                    back();
+                else if (item.action === 'edit') {
+                    const entry = userConfigs.find((x) => x.name === selectedName);
+                    if (entry)
+                        enterForm(entry);
+                }
+                else if (item.action === 'delete') {
+                    setPhase('confirm-delete');
+                    setSelectedIndex(0);
+                }
+                else if (item.action === 'reconnect' && selectedName) {
+                    const id = `mcp-reconnect:${frame.id}:${selectedName}`;
+                    pendingIntents.current.set(id, { type: 'refresh' });
+                    return {
+                        stack: { type: 'keep' },
+                        intent: { id, sourceFrameId: frame.id, intent: { type: 'mcp-reconnect', serverName: selectedName } },
+                    };
+                }
+                else if (item.action === 'login' && selectedName) {
+                    const id = `mcp-login:${frame.id}:${selectedName}`;
+                    pendingIntents.current.set(id, { type: 'refresh' });
+                    return {
+                        stack: { type: 'keep' },
+                        intent: { id, sourceFrameId: frame.id, intent: { type: 'mcp-login', serverName: selectedName } },
+                    };
+                }
+                else if (item.action === 'confirm-delete' && selectedName) {
+                    const id = `mcp-delete:${frame.id}:${selectedName}`;
+                    pendingIntents.current.set(id, { type: 'delete' });
+                    return {
+                        stack: { type: 'keep' },
+                        intent: { id, sourceFrameId: frame.id, intent: { type: 'mcp-delete', serverName: selectedName } },
+                    };
+                }
+                else if (item.action === 'save' && draft) {
+                    try {
+                        const config = normalizedConfig(draft);
+                        const name = draft.name.trim();
+                        const id = `mcp-save:${frame.id}:${draft.originalName ?? 'new'}:${name}`;
+                        pendingIntents.current.set(id, { type: 'save', name });
+                        return {
+                            stack: { type: 'keep' },
+                            intent: {
+                                id,
+                                sourceFrameId: frame.id,
+                                intent: { type: 'mcp-save', originalName: draft.originalName, name, config },
+                            },
+                        };
+                    }
+                    catch (e) {
+                        setError(e instanceof Error ? e.message : String(e));
+                    }
+                }
+            }
+            return keep();
+        },
+    }), [controller, draft, editingField, items, manager, phase, refresh, selectedIndex, selectedName, userConfigs]);
+    useEffect(() => {
+        if (!active)
+            return;
+        return interactions.register(frame.id, interaction);
+    }, [active, frame.id, interaction, interactions]);
+    if (!active)
+        return null;
+    const title = phase === 'list'
+        ? 'MCP Server Management'
+        : phase === 'detail'
+            ? `MCP Server: ${selectedName}`
+            : phase === 'confirm-delete'
+                ? 'Confirm MCP Server Deletion'
+                : draft?.originalName
+                    ? `Edit MCP Server: ${draft.originalName}`
+                    : 'Add MCP Server';
+    return (React.createElement(McpSelectionMenu, { title: title, items: items, selectedIndex: selectedIndex, error: error ?? selectedSnapshot?.error, editing: editingField !== null }));
+}
+//# sourceMappingURL=McpMenuSession.js.map

package/dist/components/input/McpMenuSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"McpMenuSession.js","sourceRoot":"","sources":["../../../source/components/input/McpMenuSession.tsx"],"names":[],"mappings":"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"}

package/dist/components/input/ModelMenuSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelMenuSession.d.ts","sourceRoot":"","sources":["../../../source/components/input/ModelMenuSession.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAIpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAc,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAK9E,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAExD,KAAK,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,GAAG;IACvE,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG;QAChF,MAAM,EAAE,WAAW,CAAC;QACpB,eAAe,EAAE,eAAe,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,KAAK,4BAuM5F"}
+{"version":3,"file":"ModelMenuSession.d.ts","sourceRoot":"","sources":["../../../source/components/input/ModelMenuSession.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAIpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAc,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAK9E,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAExD,KAAK,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,GAAG;IACvE,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG;QAChF,MAAM,EAAE,WAAW,CAAC;QACpB,eAAe,EAAE,eAAe,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,KAAK,4BAyM5F"}

package/dist/components/input/ModelMenuSession.js

@@ -60,6 +60,8 @@ export function ModelMenuSession({ frame, active, controller, interactions, serv
                                 models.backspaceNicknameDraft();
                             else if (event.command === 'favorite')
                                 models.toggleFavorite();
+                            else if (event.command === 'delete')
+                                models.removeNicknameDraft();
                             return keep();
                         case 'move':
                             return keep();
@@ -73,13 +75,14 @@ export function ModelMenuSession({ frame, active, controller, interactions, serv
                             return keep();
                     }
                 }
-                // Tab and the horizontal arrows all switch the Favorites/All tab. Tab
+                // Tab and Right advance; Left moves backward through Favorites/Nicknames/All.
+                // tab. Tab
                 // deliberately does not complete the highlighted model id into the
                 // composer: it is the user's key for moving between tabs, and Enter
                 // already selects.
                 if (event.type === 'command' &&
                     (event.command === 'tab' || event.command === 'left' || event.command === 'right')) {
-                    models.switchModelTab();
+                    models.switchModelTab(event.command === 'left' ? 'previous' : 'next');
                     return keep();
                 }
                 if (applyMenuEditorEvent(controller, event, { horizontal: false }))

package/dist/components/input/ModelMenuSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelMenuSession.js","sourceRoot":"","sources":["../../../source/components/input/ModelMenuSession.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ModelMenuSession.js","sourceRoot":"","sources":["../../../source/components/input/ModelMenuSession.tsx"],"names":[],"mappings":"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"}

package/dist/components/input/SettingsValueMenuSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SettingsValueMenuSession.d.ts","sourceRoot":"","sources":["../../../source/components/input/SettingsValueMenuSession.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAK5D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAc,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAI9E,KAAK,kBAAkB,GAAG,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAExE,KAAK,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAAC,GAAG;IAChF,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE;QAAE,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG;QACzF,aAAa,EAAE,kBAAkB,CAAC;QAClC,eAAe,EAAE,eAAe,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,KAAK,4BAuJpG"}
+{"version":3,"file":"SettingsValueMenuSession.d.ts","sourceRoot":"","sources":["../../../source/components/input/SettingsValueMenuSession.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAWzE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAc,SAAS,EAAmB,MAAM,iBAAiB,CAAC;AAI9E,KAAK,kBAAkB,GAAG,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAExE,KAAK,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAAC,GAAG;IAChF,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE;QAAE,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG;QACzF,aAAa,EAAE,kBAAkB,CAAC;QAClC,eAAe,EAAE,eAAe,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,KAAK,4BAyKpG"}

package/dist/components/input/SettingsValueMenuSession.js

@@ -1,38 +1,42 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Box, Text } from 'ink';
 import SettingsValueSelectionMenu from '../menu/SettingsValueSelectionMenu.js';
 import { parseSettingValueForKey } from '../../utils/settings-command.js';
 import { isSecretSetting } from '../../utils/value-suggestions.js';
+import { getSettingMetadata, isDurationSetting, isUsdMicrosSetting, } from '../../services/settings/settings-ui-metadata.js';
+import { formatSettingValueDetail } from '../menu/settings-value-formatter.js';
 import { applyMenuEditorEvent } from './menu-editor.js';
 import { COLOR_DANGER } from '../theme.js';
 export function SettingsValueMenuSession({ frame, active, controller, interactions, services }) {
     const settingsValue = services.settingsValue;
     const settingsService = services.settingsService;
     const [applyError, setApplyError] = useState(null);
+    // Enums and booleans only accept their listed options; typed text that
+    // matches none of them has nothing valid to apply.
+    const settingType = getSettingMetadata(frame.settingKey)?.type;
+    const isChoice = settingType === 'enum' || settingType === 'boolean';
+    const resolveTypedOrSelectedValue = useCallback(() => {
+        const suggestion = settingsValue.getSelectedItem();
+        // A free-form string frame is a field, not a picker: Enter applies the
+        // whole value text from the value-region start. binding.query is
+        // truncated at the cursor, so Home/End (or left/right) cursor moves
+        // would otherwise silently drop the tail of what was typed. A blank
+        // draft returns undefined and the accept branch reports it inline.
+        if (settingsValue.isFreeFormString) {
+            const editor = controller.getSnapshot().editor;
+            const draft = editor.text.slice(frame.binding.replacement.start).trim();
+            return draft ? parseSettingValueForKey(frame.settingKey, draft) : undefined;
+        }
+        const typedValueText = frame.binding.query;
+        const parsedTypedValue = typedValueText ? parseSettingValueForKey(frame.settingKey, typedValueText) : undefined;
+        const parsedSuggestionValue = suggestion ? parseSettingValueForKey(frame.settingKey, suggestion.value) : undefined;
+        const shouldPreferTypedNumericValue = settingsValue.isNumericSettings &&
+            parsedTypedValue !== undefined &&
+            String(parsedTypedValue) !== suggestion?.value;
+        return shouldPreferTypedNumericValue ? parsedTypedValue : parsedSuggestionValue ?? parsedTypedValue;
+    }, [controller, frame, settingsValue]);
     const interaction = useMemo(() => {
         const keep = () => ({ stack: { type: 'keep' } });
-        const resolveTypedOrSelectedValue = () => {
-            const suggestion = settingsValue.getSelectedItem();
-            // A free-form string frame is a field, not a picker: Enter applies the
-            // whole value text from the value-region start. binding.query is
-            // truncated at the cursor, so Home/End (or left/right) cursor moves
-            // would otherwise silently drop the tail of what was typed. A blank
-            // draft returns undefined and the accept branch reports it inline.
-            if (settingsValue.isFreeFormString) {
-                const editor = controller.getSnapshot().editor;
-                const draft = editor.text.slice(frame.binding.replacement.start).trim();
-                return draft ? parseSettingValueForKey(frame.settingKey, draft) : undefined;
-            }
-            const typedValueText = frame.binding.query;
-            const parsedTypedValue = typedValueText ? parseSettingValueForKey(frame.settingKey, typedValueText) : undefined;
-            const parsedSuggestionValue = suggestion
-                ? parseSettingValueForKey(frame.settingKey, suggestion.value)
-                : undefined;
-            const shouldPreferTypedNumericValue = settingsValue.isNumericSettings &&
-                parsedTypedValue !== undefined &&
-                String(parsedTypedValue) !== suggestion?.value;
-            return shouldPreferTypedNumericValue ? parsedTypedValue : parsedSuggestionValue ?? parsedTypedValue;
-        };
         return {
             handle: (event) => {
                 if (!('type' in event)) {
@@ -102,18 +106,18 @@ export function SettingsValueMenuSession({ frame, active, controller, interactio
                     }
                     case 'accept': {
                         setApplyError(null);
+                        if (isChoice && !settingsValue.getSelectedItem()) {
+                            setApplyError(frame.binding.query
+                                ? `"${frame.binding.query}" is not one of the options`
+                                : 'Pick one of the options before applying');
+                            return keep();
+                        }
                         const parsedValue = resolveTypedOrSelectedValue();
                         if (parsedValue === undefined) {
-                            // A field commits its draft; an empty draft has nothing to
-                            // apply. Keep the frame open and report instead of silently
-                            // closing (the old undefined path looked like a successful
-                            // no-op commit). Choices that genuinely cannot apply typed
-                            // text still close as before.
-                            if (settingsValue.isFreeFormString) {
-                                setApplyError('Type a value before applying');
-                                return keep();
-                            }
-                            return { stack: { type: 'close-top' } };
+                            // An empty draft has nothing to apply. Keep the frame open and
+                            // report instead of closing, which looked like a successful save.
+                            setApplyError('Type a value before applying');
+                            return keep();
                         }
                         const persistence = settingsService.isRuntimeModifiable(frame.settingKey) ? 'runtime' : 'restart';
                         return {
@@ -135,7 +139,7 @@ export function SettingsValueMenuSession({ frame, active, controller, interactio
                 }
             },
         };
-    }, [controller, frame, settingsService, settingsValue]);
+    }, [controller, frame, isChoice, resolveTypedOrSelectedValue, settingsService, settingsValue]);
     useEffect(() => {
         if (!active)
             return;
@@ -143,8 +147,24 @@ export function SettingsValueMenuSession({ frame, active, controller, interactio
     }, [active, frame.id, interaction, interactions]);
     if (!active)
         return null;
+    const draftValue = isChoice && !settingsValue.getSelectedItem() ? undefined : resolveTypedOrSelectedValue();
+    const currentValue = readSetting(() => settingsService.getDynamic(frame.settingKey));
+    const defaultValue = readSetting(() => settingsService.getDefault(frame.settingKey));
+    const unitHint = isDurationSetting(frame.settingKey)
+        ? 'Also accepts 30s, 5m, 1h 30m (plain numbers are milliseconds)'
+        : isUsdMicrosSetting(frame.settingKey)
+            ? 'Also accepts $5 or $0.25 (plain numbers are USD micros)'
+            : undefined;
     return (React.createElement(Box, { flexDirection: "column" },
-        React.createElement(SettingsValueSelectionMenu, { settingKey: frame.settingKey, items: settingsValue.filteredEntries, selectedIndex: settingsValue.selectedIndex, query: frame.binding.query, isNumericSettings: settingsValue.isNumericSettings, isFreeFormString: settingsValue.isFreeFormString }),
+        React.createElement(SettingsValueSelectionMenu, { settingKey: frame.settingKey, items: settingsValue.filteredEntries, selectedIndex: settingsValue.selectedIndex, query: frame.binding.query, isNumericSettings: settingsValue.isNumericSettings, currentText: currentValue.ok ? formatSettingValueDetail(frame.settingKey, currentValue.value) : undefined, defaultText: defaultValue.ok ? formatSettingValueDetail(frame.settingKey, defaultValue.value) : undefined, previewText: draftValue === undefined ? undefined : formatSettingValueDetail(frame.settingKey, draftValue), unitHint: unitHint }),
         applyError && React.createElement(Text, { color: COLOR_DANGER }, applyError)));
 }
+function readSetting(read) {
+    try {
+        return { ok: true, value: read() };
+    }
+    catch {
+        return { ok: false };
+    }
+}
 //# sourceMappingURL=SettingsValueMenuSession.js.map