@tianmucreations/jeeves 0.3.1 → 0.3.2

package/dist/components/Input.js

@@ -1,12 +1,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
+import stringWidth from 'string-width';
 import { Box, Text, useCursor, useInput, usePaste, useStdout } from 'ink';
-import { runTurn } from '../agent/loop.js';
+import { runTurn, stopTurn } from '../agent/loop.js';
+import { copySelection } from '../ink/selection.js';
+import { pressCtrlCToQuit } from '../ink/quit.js';
 import { answerApproval, currentApprovalTrustable } from '../agent/permissions.js';
 import { session, useSession } from '../state/session.js';
 import { BLOCK_CURSOR, inputFrameRow } from '../ink/cursor.js';
 import { isMouseSequence, handleMouseInput } from '../ink/mouse.js';
-import { inputLayout, dropLastChar, splitTypedBurst, cleanPaste } from './input-layout.js';
+import { inputLayout, splitTypedBurst, cleanPaste, scrollToShowCursor, previousWordStart, nextWordEnd } from './input-layout.js';
 // The rows the input box needs for the text being typed (the window makes room).
 export const MAX_INPUT_ROWS = 6;
 export function inputRowsFor(text, width) {
@@ -27,11 +30,63 @@ export function Input({ scrollPage = 10, width = 76 }) {
     const s = useSession();
     const { stdout } = useStdout();
     const { setCursorPosition } = useCursor();
-    const layout = inputLayout(valueRef.current, width, MAX_INPUT_ROWS);
-    const showingText = !s.approvalPending && s.transcriptScrollUp === 0;
-    const setValue = (text) => {
+    // How far the box is scrolled back through a message taller than it (0 = the
+    // end, where the typing is). A ref for the same reason as the text.
+    const draftUpRef = useRef(0);
+    const [, setDraftUp] = useState(0);
+    // Where the cursor is in the message, in characters; null means at the end (as
+    // Claude Code: arrows, Option+arrows for words, Ctrl+A / Ctrl+E, and a click
+    // move it, and typing goes in where it is - owner, 19 Sept).
+    const cursorRef = useRef(null);
+    const [, setCursorTick] = useState(0);
+    const layout = inputLayout(valueRef.current, width, MAX_INPUT_ROWS, draftUpRef.current, cursorRef.current);
+    // The real cursor only at the end of the message; inside it, the highlighted
+    // character is the cursor.
+    const showingText = !s.approvalPending && s.transcriptScrollUp === 0 && layout.scrollUp === 0 && cursorRef.current === null;
+    const scrollDraft = (up) => {
+        draftUpRef.current = up;
+        setDraftUp(up);
+    };
+    const chars = () => Array.from(valueRef.current);
+    const moveCursor = (to) => {
+        const length = chars().length;
+        const next = to === null || to >= length ? null : Math.max(0, to);
+        cursorRef.current = next;
+        scrollDraft(scrollToShowCursor(valueRef.current, width, MAX_INPUT_ROWS, next === null ? 0 : draftUpRef.current, next));
+        setCursorTick((tick) => tick + 1);
+    };
+    const setValue = (text, cursor = null) => {
         valueRef.current = text;
         session.setInputText(text);
+        cursorRef.current = cursor !== null && cursor < Array.from(text).length ? cursor : null;
+        // A change shows where it was made: at the end, or at the cursor inside the text.
+        const up = cursorRef.current === null ? 0 : scrollToShowCursor(text, width, MAX_INPUT_ROWS, draftUpRef.current, cursorRef.current);
+        if (up !== draftUpRef.current)
+            scrollDraft(up);
+    };
+    // Typed or pasted text goes in at the cursor.
+    const insert = (text) => {
+        const all = chars();
+        const at = cursorRef.current ?? all.length;
+        const added = Array.from(text);
+        setValue([...all.slice(0, at), ...added, ...all.slice(at)].join(''), cursorRef.current === null ? null : at + added.length);
+    };
+    // Clicking in the typing box puts the cursor there.
+    session.inputClick = (col, row) => {
+        const rows = stdout.rows ?? 24;
+        const first = rows - 2 - (layout.rows.length - 1);
+        const target = layout.rows[row - first];
+        if (!valueRef.current || !target || target.hint || target.start === undefined)
+            return;
+        let width = 0;
+        let offset = 0;
+        for (const ch of Array.from(target.text)) {
+            if (width >= col - 3)
+                break;
+            width += stringWidth(ch);
+            offset += 1;
+        }
+        moveCursor(target.start + offset);
     };
     // The block cursor sits at the text insertion point: two columns in (the
     // border's │ and its padding space) plus the visible text's width, measured
@@ -41,7 +96,8 @@ export function Input({ scrollPage = 10, width = 76 }) {
     // hands the position to Ink in its own useInsertionEffect, which runs before
     // this commit's frame is written - a useLayoutEffect call runs after that and
     // only lands a frame late (measured: the cursor stayed hidden when the window
-    // opened). Hidden while the row shows a hint instead of the text.
+    // opened). Hidden while the row shows a hint instead of the text, and while the
+    // box is scrolled back through a long message (the typing point is out of view).
     // The last row of the box stays on the same terminal row however tall the box
     // grows (it grows upwards), so the cursor's row is unchanged.
     setCursorPosition(showingText ? { x: 2 + layout.cursorX, y: inputFrameRow(stdout.rows ?? 24) } : undefined);
@@ -65,6 +121,33 @@ export function Input({ scrollPage = 10, width = 76 }) {
         }
         if (s.pickerOpen || s.keysOpen || s.wizardActive || s.helpOpen)
             return;
+        // Ctrl+C, as Claude Code: copy a selection, else clear the typing, else stop the
+        // job, else quit only when pressed twice. It used to quit at once, losing the
+        // conversation - and Windows and Linux people press Ctrl+C to copy (audit, 19 Sept).
+        if (key.ctrl && input === 'c') {
+            if (session.selection) {
+                void copySelection();
+                session.setSelection(null);
+            }
+            else if (valueRef.current) {
+                setValue('');
+            }
+            else if (s.status === 'working' || s.approvalPending) {
+                stopTurn();
+            }
+            else {
+                pressCtrlCToQuit();
+            }
+            return;
+        }
+        // Esc stops the job, as in Claude Code and the window's Stop button.
+        if (key.escape && (s.status === 'working' || s.approvalPending)) {
+            stopTurn();
+            return;
+        }
+        // Any key clears a selection, as in Claude Code.
+        if (session.selection)
+            session.setSelection(null);
         if (s.approvalPending) {
             const answer = input.toLowerCase();
             if (answer === 'y')
@@ -83,6 +166,31 @@ export function Input({ scrollPage = 10, width = 76 }) {
             s.toggleShowLastReasoning();
             return;
         }
+        // A message taller than the box: the arrows move through the message itself
+        // (as Claude Code's do when the input spans more than one line). Page Up/Down
+        // and the mouse wheel still scroll the conversation.
+        if ((key.upArrow || key.downArrow) && layout.maxScrollUp > 0 && s.transcriptScrollUp === 0) {
+            const next = Math.min(draftUpRef.current, layout.maxScrollUp) + (key.upArrow ? 3 : -3);
+            scrollDraft(Math.max(0, Math.min(next, layout.maxScrollUp)));
+            return;
+        }
+        // Moving the cursor within the message, as in Claude Code.
+        if (valueRef.current && s.transcriptScrollUp === 0) {
+            const here = cursorRef.current ?? chars().length;
+            if (key.leftArrow && !key.meta && !key.ctrl)
+                return moveCursor(Math.max(0, here - 1));
+            if (key.rightArrow && !key.meta && !key.ctrl)
+                return moveCursor(here + 1);
+            // Option+Left / Option+Right arrive from Terminal.app as Esc-b / Esc-f.
+            if ((key.leftArrow && (key.meta || key.ctrl)) || (key.meta && input === 'b'))
+                return moveCursor(previousWordStart(valueRef.current, here));
+            if ((key.rightArrow && (key.meta || key.ctrl)) || (key.meta && input === 'f'))
+                return moveCursor(nextWordEnd(valueRef.current, here));
+            if (key.ctrl && input === 'a')
+                return moveCursor(0);
+            if (key.ctrl && input === 'e')
+                return moveCursor(null);
+        }
         // The alternate screen has no native scrollback, so these keys scroll the
         // transcript region itself (Claude Code's bindings): arrows move 3 rows,
         // Page Up/Down a full page, End jumps back to the newest and re-follows.
@@ -109,7 +217,9 @@ export function Input({ scrollPage = 10, width = 76 }) {
         // A burst of typing that ends with Enter is typing plus Enter (see splitTypedBurst).
         const burst = key.return ? { typed: '', enter: true, rest: '' } : splitTypedBurst(input);
         if (burst.enter) {
-            const text = (valueRef.current + burst.typed).trim();
+            if (burst.typed)
+                insert(burst.typed);
+            const text = valueRef.current.trim();
             setValue(burst.rest);
             if (!text)
                 return;
@@ -127,13 +237,18 @@ export function Input({ scrollPage = 10, width = 76 }) {
         }
         if (key.backspace || key.delete) {
             s.followTranscript();
-            setValue(dropLastChar(valueRef.current));
+            // The character before the cursor goes (one whole character, never half of one).
+            const all = chars();
+            const at = cursorRef.current ?? all.length;
+            if (at === 0)
+                return;
+            setValue([...all.slice(0, at - 1), ...all.slice(at)].join(''), cursorRef.current === null ? null : at - 1);
             return;
         }
         if (!input || key.ctrl || key.meta)
             return;
         s.followTranscript();
-        setValue(valueRef.current + input);
+        insert(input);
     });
     // Pasted text arrives whole (bracketed paste), keeps its line breaks, and never
     // sends by itself - only Enter does.
@@ -141,7 +256,7 @@ export function Input({ scrollPage = 10, width = 76 }) {
         if (s.pickerOpen || s.keysOpen || s.wizardActive || s.helpOpen || s.approvalPending)
             return;
         s.followTranscript();
-        setValue(valueRef.current + cleanPaste(text));
+        insert(cleanPaste(text));
     });
     if (s.approvalPending) {
         return (_jsx(Text, { color: "yellow", children: currentApprovalTrustable() ? 'y = allow · a = always allow in this project · n = deny' : 'y = allow · n = deny' }));
@@ -156,7 +271,14 @@ export function Input({ scrollPage = 10, width = 76 }) {
     // bytes differ from the same text without them, keeping Ink on its full-frame
     // path (see input-layout.ts).
     if (!valueRef.current) {
-        return _jsx(Text, { dimColor: true, children: s.status === 'working' ? 'type your next message - it will be sent when I finish' : 'ask anything' });
+        return _jsx(Text, { dimColor: true, children: s.status === 'working' ? 'type your next message - it will be sent when I finish · Esc stops' : 'ask anything' });
     }
-    return (_jsx(Box, { flexDirection: "column", children: layout.rows.map((row, index) => (_jsxs(Text, { children: [row.text, row.trailingSpaces ? _jsx(Text, { dimColor: true, children: row.trailingSpaces }) : null] }, index))) }));
+    return (_jsx(Box, { flexDirection: "column", children: layout.rows.map((row, index) => {
+            if (row.cursorAt !== undefined) {
+                // The cursor inside the text: the character under it drawn reversed.
+                const rowChars = Array.from(row.text);
+                return (_jsxs(Text, { children: [rowChars.slice(0, row.cursorAt).join(''), _jsx(Text, { inverse: true, children: rowChars[row.cursorAt] ?? ' ' }), rowChars.slice(row.cursorAt + 1).join('')] }, index));
+            }
+            return (_jsxs(Text, { dimColor: row.hint, children: [row.text, row.trailingSpaces ? _jsx(Text, { dimColor: true, children: row.trailingSpaces }) : null] }, index));
+        }) }));
 }

package/dist/components/KeysManager.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import { session, useSession } from '../state/session.js';
@@ -9,6 +9,8 @@ import { setDefaultModel, setDefaultProvider } from '../platform/config.js';
 import { setKey, deleteKey } from '../keys/store.js';
 import { keyLooksValid } from '../commands/keys.js';
 import { isMouseSequence } from '../ink/mouse.js';
+import { OpenRouterConnect } from './OpenRouterConnect.js';
+import { COPY_KEYS, KEY_STORE, KEY_STORE_SUBJECT } from '../platform/wording.js';
 // Every service Jeeves connects to. The optional OpenRouter management key (it unlocks
 // the real account balance) is for /keys only, and the compatible service needs its
 // address too, so it is set up in /model - the first-run wizard keeps to the essentials.
@@ -34,10 +36,10 @@ export function KeysManager({ mode, rows, columns }) {
     function statusFor(rowId) {
         if (rowId === 'openrouter') {
             if (getKeySource() === 'keychain')
-                return 'key stored in your Mac keychain';
+                return `key stored in ${KEY_STORE}`;
             if (getKeySource() === 'env')
                 return 'key in a local file - add it with /keys to store it safely';
-            return stored.includes('openrouter') ? 'key stored in your Mac keychain' : 'no key';
+            return stored.includes('openrouter') ? `key stored in ${KEY_STORE}` : 'no key';
         }
         if (rowId === 'openrouter-management') {
             return stored.includes('openrouter-management')
@@ -54,7 +56,7 @@ export function KeysManager({ mode, rows, columns }) {
         }
         return stored.includes(rowId) ? 'key stored - direct connection ready' : 'no key';
     }
-    function finishWizard(message, connected) {
+    function finishWizard(message, connected, skipped = false) {
         if (connected) {
             session.addNotice(message);
             if (session.status === 'disconnected')
@@ -64,17 +66,17 @@ export function KeysManager({ mode, rows, columns }) {
         else {
             session.addNotice(message);
         }
-        session.endWizard();
+        session.endWizard(skipped);
     }
     async function saveKey(provider, key) {
         if (provider === 'openrouter') {
             const saved = await storeOpenRouterKey(key);
             if (!saved) {
-                setNote('The Mac keychain was not reachable - press Enter and try again.');
+                setNote(`${KEY_STORE_SUBJECT} was not reachable - press Enter and try again.`);
                 return;
             }
             refreshStored();
-            const message = 'Your key is saved securely in your Mac keychain. You will not be asked for it again.';
+            const message = `Your key is saved securely in ${KEY_STORE}. You will not be asked for it again.`;
             if (mode === 'wizard') {
                 finishWizard(message, true);
             }
@@ -86,7 +88,7 @@ export function KeysManager({ mode, rows, columns }) {
         if (provider === 'zai') {
             const saved = await storeZaiKey(key);
             if (!saved) {
-                setNote('The Mac keychain was not reachable - press Enter and try again.');
+                setNote(`${KEY_STORE_SUBJECT} was not reachable - press Enter and try again.`);
                 return;
             }
             refreshStored();
@@ -109,7 +111,7 @@ export function KeysManager({ mode, rows, columns }) {
                 return;
             }
             if (result === 'keychain') {
-                setNote('The Mac keychain was not reachable - press Enter and try again.');
+                setNote(`${KEY_STORE_SUBJECT} was not reachable - press Enter and try again.`);
                 return;
             }
             refreshStored();
@@ -132,7 +134,7 @@ export function KeysManager({ mode, rows, columns }) {
         }
         const saved = await setKey(provider, key);
         if (!saved) {
-            setNote('The Mac keychain was not reachable - press Enter and try again.');
+            setNote(`${KEY_STORE_SUBJECT} was not reachable - press Enter and try again.`);
             return;
         }
         refreshStored();
@@ -189,6 +191,9 @@ export function KeysManager({ mode, rows, columns }) {
     useInput((input, key) => {
         if (isMouseSequence(input))
             return;
+        // The OpenRouter screen handles its own keys.
+        if (phase.kind === 'openrouter')
+            return;
         if (phase.kind === 'ask') {
             const answer = input.toLowerCase();
             if (answer === 'y') {
@@ -196,7 +201,7 @@ export function KeysManager({ mode, rows, columns }) {
                 setPhase({ kind: 'list' });
             }
             else if (answer === 'n') {
-                finishWizard('No key for now - you can add one any time with /keys.', false);
+                finishWizard('Not connected yet - type /keys any time to connect an AI service. It takes about a minute.', false, true);
             }
             return;
         }
@@ -255,7 +260,7 @@ export function KeysManager({ mode, rows, columns }) {
         // phase: list
         if (key.escape) {
             if (mode === 'wizard') {
-                finishWizard('Setup skipped - you can add a key any time with /keys.', false);
+                finishWizard('Not connected yet - type /keys any time to connect an AI service. It takes about a minute.', false, true);
             }
             else {
                 session.closeKeys();
@@ -282,9 +287,10 @@ export function KeysManager({ mode, rows, columns }) {
                 }
                 return;
             }
-            setPhase({ kind: 'enter-key', provider: row.id, label: row.label });
             setNote('');
             setHidden('');
+            // OpenRouter gets the explained choice: sign in through the browser, or paste a key.
+            setPhase(row.id === 'openrouter' ? { kind: 'openrouter' } : { kind: 'enter-key', provider: row.id, label: row.label });
             return;
         }
         const answer = input.toLowerCase();
@@ -300,7 +306,7 @@ export function KeysManager({ mode, rows, columns }) {
         }
     });
     const title = phase.kind === 'ask'
-        ? 'Welcome - one quick setup question'
+        ? 'Welcome - one quick setup step'
         : phase.kind === 'enter-key'
             ? `Paste the ${phase.label} key`
             : phase.kind === 'confirm-remove'
@@ -309,9 +315,9 @@ export function KeysManager({ mode, rows, columns }) {
                     ? 'Saved'
                     : mode === 'wizard'
                         ? 'Which AI service should do the thinking?'
-                        : 'Keys - stored in your Mac keychain';
+                        : `Keys - stored in ${KEY_STORE}`;
     const hint = phase.kind === 'ask'
-        ? 'y = yes · n = not now'
+        ? 'y = yes, set it up · n = not now'
         : phase.kind === 'enter-key'
             ? 'paste the key · Enter save · Esc back'
             : phase.kind === 'confirm-remove'
@@ -321,6 +327,15 @@ export function KeysManager({ mode, rows, columns }) {
                     : mode === 'wizard'
                         ? '↑↓ move · Enter choose · Esc back'
                         : '↑↓ move · Enter add or replace · d remove · Esc close';
-    return (_jsxs(Box, { flexDirection: "column", height: rows, children: [_jsx(Text, { dimColor: true, children: title }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, justifyContent: "center", children: [phase.kind === 'ask' && _jsx(Text, { children: '  Add an API key?' }), phase.kind === 'list' &&
-                        visibleRows.map((row, index) => (_jsxs(Text, { inverse: index === cursor, children: [` ${row.label}`.padEnd(21), _jsx(Text, { dimColor: true, children: statusFor(row.id) })] }, row.id))), phase.kind === 'enter-key' && (_jsxs(Text, { children: [_jsxs(Text, { children: ["Paste the ", phase.label, " key (it stays hidden): "] }), _jsx(Text, { inverse: true, children: " " })] })), phase.kind === 'confirm-remove' && (_jsxs(Text, { children: ["Remove the ", phase.label, " key from your Mac keychain?"] })), phase.kind === 'saved' && _jsx(Text, { children: phase.message })] }), note ? (_jsx(Text, { color: "yellow", children: note })) : (_jsx(Text, { dimColor: true, children: hint }))] }));
+    if (phase.kind === 'openrouter') {
+        return (_jsx(Box, { flexDirection: "column", height: rows, children: _jsx(OpenRouterConnect, { hasKey: stored.includes('openrouter') || getKeySource() !== null, onBack: () => setPhase({ kind: 'list' }), onDone: (message) => {
+                    refreshStored();
+                    if (mode === 'wizard')
+                        finishWizard(message, true);
+                    else
+                        setPhase({ kind: 'saved', message });
+                } }) }));
+    }
+    return (_jsxs(Box, { flexDirection: "column", height: rows, children: [_jsx(Text, { dimColor: true, children: title }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, justifyContent: "center", children: [phase.kind === 'ask' && (_jsxs(_Fragment, { children: [_jsx(Text, { children: "Jeeves needs an AI service to think with - the company that runs the AI models." }), _jsx(Text, { children: "You connect one account once, and pay that service only for what you use." }), _jsx(Text, { children: " " }), _jsx(Text, { children: "Set one up now? (y/n)" })] })), phase.kind === 'list' &&
+                        visibleRows.map((row, index) => (_jsxs(Text, { inverse: index === cursor, children: [` ${row.label}`.padEnd(21), _jsx(Text, { dimColor: true, children: mode === 'wizard' && 'description' in row && !stored.includes(row.id) ? row.description : statusFor(row.id) })] }, row.id))), phase.kind === 'enter-key' && (_jsxs(_Fragment, { children: [_jsxs(Text, { children: [_jsxs(Text, { children: ["Paste the ", phase.label, " key (it stays hidden): "] }), _jsx(Text, { dimColor: true, children: hidden ? `${Array.from(hidden).length} characters ` : '' }), _jsx(Text, { inverse: true, children: " " })] }), isDirectService(phase.provider) ? (_jsx(Text, { dimColor: true, children: `Get one at ${directService(phase.provider).keyPage} - select the address with the mouse and press ${COPY_KEYS} to copy it.` })) : phase.provider === 'zai' ? (_jsx(Text, { dimColor: true, children: `Get one at z.ai/manage-apikey/apikey-list - select the address with the mouse and press ${COPY_KEYS} to copy it.` })) : null] })), phase.kind === 'confirm-remove' && (_jsxs(Text, { children: ["Remove the ", phase.label, " key from ", KEY_STORE, "?"] })), phase.kind === 'saved' && _jsx(Text, { children: phase.message })] }), note ? (_jsx(Text, { color: "yellow", children: note })) : (_jsx(Text, { dimColor: true, children: hint }))] }));
 }

package/dist/components/ModelPicker.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import Spinner from 'ink-spinner';
 import Fuse from 'fuse.js';
@@ -12,10 +12,12 @@ import { directService, isDirectService, CUSTOM_SERVICE_ID } from '../providers/
 import { loadDirectModels, checkCustomService } from '../providers/catalogue.js';
 import { autoRowFor, noAutoNote } from '../agent/auto.js';
 import { getCustomService } from '../platform/config.js';
+import { OpenRouterConnect } from './OpenRouterConnect.js';
 import { keyLooksValid } from '../commands/keys.js';
 import { listLocalOllamaModels, isOllamaOnline } from '../providers/ollama.js';
 import { ZAI_MODELS } from '../providers/zai.js';
 import { isMouseSequence } from '../ink/mouse.js';
+import { COPY_KEYS, KEY_STORE, KEY_STORE_SUBJECT } from '../platform/wording.js';
 const TABS = ['favorites', 'recent', 'all', 'tools', 'free'];
 const TAB_LABELS = {
     favorites: 'Favorites',
@@ -134,6 +136,8 @@ export function ModelPicker({ rows, columns }) {
     const [addressValue, setAddressValue] = useState('');
     // True while a key is being checked with its company.
     const [checking, setChecking] = useState(false);
+    // The browser sign-in in progress, so Esc can cancel it.
+    const signInAbort = useRef(null);
     const [limitValue, setLimitValue] = useState('');
     const [limitNote, setLimitNote] = useState('');
     const [limitReturn, setLimitReturn] = useState('providers');
@@ -431,9 +435,24 @@ export function ModelPicker({ rows, columns }) {
             setAddressValue((v) => v + input);
             return;
         }
+        // OpenRouter's key step is its own explained screen, which handles its own keys.
+        if (step === 'key' && keyFor === 'openrouter')
+            return;
+        if (step === 'key' && keyFor === 'openrouter') {
+            return (_jsx(Box, { flexDirection: "column", height: rows, children: _jsx(OpenRouterConnect, { hasKey: false, onBack: () => setStep('providers'), onDone: (message) => {
+                        // Said in the conversation too - including "no credit yet" for a new account.
+                        s.addNotice(message);
+                        if (s.status === 'disconnected')
+                            s.setStatus('idle');
+                        enterModelStep('openrouter');
+                    } }) }));
+        }
         if (step === 'key') {
-            if (checking)
+            if (checking) {
+                if (key.escape && signInAbort.current)
+                    signInAbort.current.abort();
                 return;
+            }
             if (key.escape) {
                 goBack();
                 return;
@@ -456,7 +475,7 @@ export function ModelPicker({ rows, columns }) {
                         setKeyNote("The service didn't accept that key - paste it again, or Esc");
                     }
                     else if (result === 'keychain') {
-                        setKeyNote('The Mac keychain was not reachable - press Enter and try again.');
+                        setKeyNote(`${KEY_STORE_SUBJECT} was not reachable - press Enter and try again.`);
                     }
                     else {
                         setStep('address');
@@ -483,7 +502,7 @@ export function ModelPicker({ rows, columns }) {
                         return;
                     }
                     if (result === 'keychain') {
-                        setKeyNote('The Mac keychain was not reachable - press Enter and try again.');
+                        setKeyNote(`${KEY_STORE_SUBJECT} was not reachable - press Enter and try again.`);
                         return;
                     }
                     if (result === 'saved-unchecked') {
@@ -508,7 +527,7 @@ export function ModelPicker({ rows, columns }) {
                 const store = keyFor === 'openrouter' ? storeOpenRouterKey : storeZaiKey;
                 void store(trimmed).then((saved) => {
                     if (!saved) {
-                        setKeyNote('The Mac keychain was not reachable - press Enter and try again.');
+                        setKeyNote(`${KEY_STORE_SUBJECT} was not reachable - press Enter and try again.`);
                         return;
                     }
                     if (keyFor === 'zai') {
@@ -648,13 +667,13 @@ export function ModelPicker({ rows, columns }) {
                     ? `Other service — ${addressValue.trim()}`
                     : `${service} — a direct connection with your own key`;
         const where = keyFor === 'openrouter'
-            ? 'Get one at openrouter.ai/settings/keys. '
+            ? ''
             : direct
-                ? `Get one at ${direct.keyPage}. `
+                ? `Get one at ${direct.keyPage} (select it with the mouse, ${COPY_KEYS} to copy). `
                 : keyFor === CUSTOM_SERVICE_ID
                     ? 'No key needed for a service on this computer - just press Enter. '
                     : '';
-        return (_jsxs(Box, { flexDirection: "column", height: rows, children: [_jsx(Text, { dimColor: true, children: title }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, justifyContent: "center", children: [_jsxs(Text, { children: [_jsxs(Text, { children: ["Paste your ", service, " API key (it stays hidden): "] }), _jsx(Text, { dimColor: true, children: keyValue ? `${keyValue.length} characters ` : '' }), _jsx(Text, { inverse: true, children: " " })] }), _jsxs(Text, { dimColor: true, children: [where, "It is stored in your Mac keychain and never shown again."] })] }), keyNote ? (_jsx(Text, { color: "yellow", children: keyNote })) : (_jsx(Text, { dimColor: true, children: "paste the key \u00B7 Enter save \u00B7 Esc back" }))] }));
+        return (_jsxs(Box, { flexDirection: "column", height: rows, children: [_jsx(Text, { dimColor: true, children: title }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, justifyContent: "center", children: [_jsxs(Text, { children: [_jsxs(Text, { children: ["Paste your ", service, " API key (it stays hidden): "] }), _jsx(Text, { dimColor: true, children: keyValue ? `${keyValue.length} characters ` : '' }), _jsx(Text, { inverse: true, children: " " })] }), _jsxs(Text, { dimColor: true, children: [where, "It is stored in ", KEY_STORE, " and never shown again."] })] }), keyNote ? (_jsx(Text, { color: "yellow", children: keyNote })) : (_jsx(Text, { dimColor: true, children: "paste the key \u00B7 Enter save \u00B7 Esc back" }))] }));
     }
     if (step === 'curated') {
         const picks = resolveCurated(catalog);

package/dist/components/OpenRouterConnect.js

@@ -0,0 +1,114 @@
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useRef, useState } from 'react';
+import { Box, Text, useInput } from 'ink';
+import { signInWithOpenRouter, WAITING_STEPS } from '../providers/openrouter-signin.js';
+import { noCreditNote } from '../providers/openrouter.js';
+import { storeOpenRouterKey, refreshCredit } from '../providers/index.js';
+import { keyLooksValid } from '../commands/keys.js';
+import { isMouseSequence } from '../ink/mouse.js';
+import { KEY_STORE, KEY_STORE_SUBJECT } from '../platform/wording.js';
+const CHOICES = [
+    { title: 'Sign in with OpenRouter (recommended)', detail: 'Your browser opens. Log in, or make a free account, then click Authorize and come back. No key to copy.' },
+    { title: 'Paste a key I already have', detail: 'For people who already made a key at openrouter.ai/keys.' },
+];
+export function OpenRouterConnect({ hasKey, onDone, onBack }) {
+    const [step, setStep] = useState('choose');
+    const [cursor, setCursor] = useState(0);
+    const [pasted, setPasted] = useState('');
+    const [note, setNote] = useState('');
+    const [address, setAddress] = useState('');
+    const signingIn = useRef(null);
+    useEffect(() => () => signingIn.current?.abort(), []);
+    async function saveKey(key, how) {
+        if (!(await storeOpenRouterKey(key))) {
+            setStep('choose');
+            setNote(`${KEY_STORE_SUBJECT} was not reachable - please try again.`);
+            return;
+        }
+        void refreshCredit();
+        const credit = await noCreditNote(key);
+        const saved = how === 'signed-in'
+            ? `Connected - Jeeves is signed in to OpenRouter, and the key is saved securely in ${KEY_STORE}.`
+            : `Your OpenRouter key is saved securely in ${KEY_STORE}. You will not be asked for it again.`;
+        onDone(credit ? `${saved} ${credit}` : saved);
+    }
+    function signIn() {
+        const controller = new AbortController();
+        signingIn.current = controller;
+        setStep('waiting');
+        setNote('');
+        setAddress('');
+        void signInWithOpenRouter({ signal: controller.signal, onUrl: setAddress }).then((result) => {
+            signingIn.current = null;
+            if (result.ok) {
+                void saveKey(result.key, 'signed-in');
+                return;
+            }
+            setStep('choose');
+            if (result.reason === 'cancelled')
+                return;
+            setNote(result.reason === 'timeout'
+                ? 'No approval arrived after fifteen minutes, so I stopped waiting. Choose Sign in to try again.'
+                : "OpenRouter didn't complete the sign-in. Choose Sign in to try again, or paste a key.");
+        });
+    }
+    useInput((input, key) => {
+        if (isMouseSequence(input))
+            return;
+        if (step === 'waiting') {
+            if (key.escape)
+                signingIn.current?.abort();
+            return;
+        }
+        if (step === 'paste') {
+            if (key.escape) {
+                setStep('choose');
+                setPasted('');
+                setNote('');
+                return;
+            }
+            if (key.return) {
+                const value = pasted.trim();
+                if (!value) {
+                    setNote('Paste your key first - or press Esc to go back and choose Sign in instead.');
+                    return;
+                }
+                if (!keyLooksValid(value, 'openrouter')) {
+                    setPasted('');
+                    setNote('That does not look like an OpenRouter key (they start with sk-or-) - paste it again.');
+                    return;
+                }
+                void saveKey(value, 'pasted');
+                return;
+            }
+            if (key.backspace || key.delete) {
+                setPasted((current) => current.slice(0, -1));
+                return;
+            }
+            if (!input || key.ctrl || key.meta)
+                return;
+            setNote('');
+            setPasted((current) => current + input.replace(/[\r\n]/g, ''));
+            return;
+        }
+        // step: choose
+        if (key.escape)
+            return onBack();
+        if (key.upArrow || key.downArrow) {
+            setCursor((current) => (current === 0 ? 1 : 0));
+            return;
+        }
+        if (input === '1' || input === '2') {
+            setCursor(Number(input) - 1);
+        }
+        if (key.return || input === '1' || input === '2') {
+            const choice = input === '1' ? 0 : input === '2' ? 1 : cursor;
+            setNote('');
+            if (choice === 0)
+                signIn();
+            else
+                setStep('paste');
+        }
+    });
+    return (_jsxs(Box, { flexDirection: "column", flexGrow: 1, children: [_jsx(Text, { dimColor: true, children: "Connect Jeeves to OpenRouter" }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, justifyContent: "center", children: [step === 'choose' && (_jsxs(_Fragment, { children: [_jsx(Text, { children: "OpenRouter runs the AI models Jeeves thinks with. One account gives you hundreds of models, and you pay only for what you use." }), hasKey ? _jsx(Text, { color: "yellow", children: "You already have an OpenRouter key saved. A new one replaces it - same account, same credit." }) : null, _jsx(Text, { children: " " }), CHOICES.map((choice, index) => (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { inverse: index === cursor, children: ` ${index + 1}. ${choice.title} ` }), _jsx(Box, { paddingLeft: 4, children: _jsx(Text, { dimColor: true, children: choice.detail }) })] }, choice.title)))] })), step === 'waiting' && (_jsxs(_Fragment, { children: [WAITING_STEPS.map((line) => (_jsx(Text, { children: line }, line))), _jsx(Text, { children: " " }), address ? _jsx(Text, { dimColor: true, children: `Browser didn't open? Go to: ${address}` }) : null] })), step === 'paste' && (_jsxs(_Fragment, { children: [_jsxs(Text, { children: [_jsx(Text, { children: "Paste your OpenRouter key (it stays hidden): " }), _jsx(Text, { dimColor: true, children: pasted ? `${pasted.length} characters ` : '' }), _jsx(Text, { inverse: true, children: " " })] }), _jsx(Text, { dimColor: true, children: "Keys start with sk-or- and are made at openrouter.ai/keys." })] }))] }), note ? (_jsx(Text, { color: "yellow", children: note })) : (_jsx(Text, { dimColor: true, children: step === 'choose' ? '↑↓ or 1 / 2 choose · Enter continue · Esc back' : step === 'waiting' ? 'Esc stop waiting' : 'paste the key · Enter save · Esc back' }))] }));
+}