koneck 2.71.1 → 2.72.0

package/dist/ink-chat.js

@@ -7,7 +7,7 @@ import { estimateCost, formatCost } from './pricing.js';
 import { generateSessionId, saveSession, listSessions, loadSession, relativeAge, renameSession, forkSession, archiveSession, findSession, } from './session.js';
 import { loadMemory } from './memory.js';
 import { loadKoneckConfig, saveKoneckConfig, setConfigKey, configKeyDescriptions, CONFIG_FILE, CONFIG_SCHEMA, stepValue, displayValue } from './config-store.js';
-import { PROVIDERS, resolveProvider, getApiKey, addUserProvider, userProvidersPath, servesLocally, servesOwnWeights, endpointForProvider } from './providers.js';
+import { PROVIDERS, resolveProvider, getApiKey, addUserProvider, removeUserProvider, userProvidersPath, keyEnvFor, BUILT_INS as BUILT_IN_PROVIDERS, servesLocally, servesOwnWeights, endpointForProvider } from './providers.js';
 import { normaliseEndpoint, withEndpoint, savedEndpoints, shortSource, resolveModelChoice, withModel } from './endpoints.js';
 import { loadProjectConfig, loadGlobalConfig, saveGlobalConfig, withoutStoredApiKey } from './config.js';
 import { rememberKey, forgetAllKeys } from './credentials.js';
@@ -200,6 +200,37 @@ export function wrapPreserving(text, width) {
     return out;
 }
 /** Beyond this a paste is summarised in the transcript; it is still sent in full. */
+/**
+ * The picker row that declares a provider rather than choosing one.
+ *
+ * A sentinel rather than a name, so it can never collide with a real provider — somebody is entitled
+ * to declare one called "add".
+ */
+export const ADD_PROVIDER = 'add-provider';
+/**
+ * Checks one field and says what is wrong with it, or nothing.
+ *
+ * Separate from the component so the rules can be tested without mounting an Ink app — and they are
+ * worth testing: the name rule is what keeps a provider addressable from a command line, and the key
+ * variable rule is the one that stops a pasted credential being written into a JSON file.
+ */
+export function addProviderProblem(step, value) {
+    const said = value.trim();
+    if (step === 'name') {
+        if (said === '')
+            return 'A name is needed — it is how you refer to this provider afterwards.';
+        if (!/^[a-z0-9][a-z0-9._-]{0,40}$/.test(said.toLowerCase())) {
+            return 'Letters, digits, dot, dash and underscore only, starting with a letter or digit.';
+        }
+        return null;
+    }
+    if (step === 'url') {
+        if (!/^https?:\/\/.+/i.test(said))
+            return 'That is not an http or https URL.';
+        return null;
+    }
+    return null;
+}
 export const MAX_PASTE_ROWS = 80;
 /**
  * The pasted text as it should appear once submitted: what was copied, structure intact.
@@ -1776,6 +1807,16 @@ export function App({ config: initialConfig, clearFrame }) {
     // to the client as a runtime override — KONECK never writes it to disk, and it is never put
     // into a transcript row, so it cannot end up in a saved session file.
     const [keyPrompt, setKeyPrompt] = useState(null);
+    /**
+     * Declaring a provider, one field at a time.
+     *
+     * A step at a time rather than one long command, because the command form already existed and was
+     * the problem: `/connect openrouter https://openrouter.ai/api/v1 anthropic/claude-sonnet-4.5` is
+     * three things to know before you can type anything at all. Asked one at a time, each question
+     * carries its own example and its own refusal, and the endpoint is checked before it is written
+     * rather than failing on the first message afterwards.
+     */
+    const [addProv, setAddProv] = useState(null);
     const [picker, setPicker] = useState(null);
     const [pickIndex, setPickIndex] = useState(0);
     const [pickQuery, setPickQuery] = useState('');
@@ -2429,13 +2470,103 @@ export function App({ config: initialConfig, clearFrame }) {
             current: m.id === cfg.model,
         }));
     }
+    /**
+     * The providers to choose from, with declaring one as the first choice.
+     *
+     * Declaring has been possible from the terminal all along — `/connect <name> <url>` writes it to
+     * disk and makes it a first-class choice — but nothing said so. The picker listed what existed and
+     * stopped there, `/provider` with no argument printed the same list and a usage line about
+     * switching, and the browser meanwhile had a visible "+ add a provider" button. So the answer to
+     * "how do I add one here" was a command form you had to already know. It is an entry in the list
+     * now, where somebody looking for it is looking.
+     */
     function providerItems() {
-        return Object.values(PROVIDERS).map(p => ({
-            value: p.name,
-            label: p.name,
-            desc: `${p.displayName} - ${p.defaultModel}` + (p.userDefined ? '  (yours)' : ''),
-            current: p.name === cfg.provider,
-        }));
+        return [
+            { value: ADD_PROVIDER, label: '+ add a provider',
+                desc: 'an OpenAI-compatible endpoint KONECK does not ship with' },
+            ...Object.values(PROVIDERS).map(p => ({
+                value: p.name,
+                label: p.name,
+                desc: `${p.displayName} - ${p.defaultModel}` + (p.userDefined ? '  (yours)' : ''),
+                current: p.name === cfg.provider,
+            })),
+        ];
+    }
+    /** Opens the declare-a-provider prompt, optionally with fields already known. */
+    function startAddProvider(seed = {}) {
+        setAddProv({ step: 'name', name: '', url: '', model: '', value: '', ...seed });
+    }
+    /**
+     * Takes what was typed into the current field and moves on, or refuses it.
+     *
+     * The built-in check sits between the endpoint and the model rather than at the start, because it
+     * is not about the name being invalid: repointing a name KONECK ships with is a legitimate thing
+     * to want — a company proxy in front of a vendor is exactly this — and the only requirement is
+     * that it cannot happen by accident. Same reasoning as the browser, and the same wording.
+     */
+    async function advanceAddProvider() {
+        const at = addProv;
+        if (!at)
+            return;
+        const said = at.value.trim();
+        const problem = addProviderProblem(at.step, said);
+        if (problem) {
+            setAddProv({ ...at, error: problem });
+            return;
+        }
+        if (at.step === 'name') {
+            const name = said.toLowerCase();
+            setAddProv({ ...at, name, step: 'url', value: '', error: undefined });
+            return;
+        }
+        if (at.step === 'url') {
+            const url = said.replace(/\/+$/, '');
+            setAddProv({ ...at, url, step: 'model', value: '', error: undefined });
+            return;
+        }
+        if (at.step === 'model') {
+            const next = { ...at, model: said, value: '', error: undefined };
+            if (BUILT_IN_PROVIDERS[at.name]) {
+                setAddProv({ ...next, step: 'confirm' });
+                return;
+            }
+            await saveDeclaredProvider(next);
+            return;
+        }
+        // confirm
+        if (/^y(es)?$/i.test(said)) {
+            await saveDeclaredProvider(at);
+            return;
+        }
+        setAddProv(null);
+        addSystem(`Left ${at.name} pointing at ${BUILT_IN_PROVIDERS[at.name]?.baseURL}.`);
+    }
+    /** Writes the declaration and switches to it, which is what somebody adding one meant to do. */
+    async function saveDeclaredProvider(from) {
+        const shadowed = BUILT_IN_PROVIDERS[from.name];
+        let def;
+        try {
+            def = addUserProvider({
+                name: from.name,
+                displayName: from.name,
+                baseURL: from.url,
+                apiKeyEnv: keyEnvFor(from.name),
+                defaultModel: from.model.trim() || 'default',
+            });
+        }
+        catch (e) {
+            setAddProv({ ...from, error: e instanceof Error ? e.message : String(e) });
+            return;
+        }
+        setAddProv(null);
+        addSystem((shadowed
+            ? `⚠️  Repointed **${def.name}** → ${def.baseURL}  (was ${shadowed.baseURL})\n`
+                + 'Everything that uses this name now goes there, in the browser as well as here.\n'
+            : `Declared **${def.name}** → ${def.baseURL}\n`)
+            + `Saved to ${userProvidersPath()}. Its key is read from ${def.apiKeyEnv} `
+            + '(or KONECK_API_KEY).\n'
+            + `Remove it again with \`/provider remove ${def.name}\`.`);
+        await choosePick({ value: def.name, label: def.name, desc: '' }, 'provider');
     }
     /**
      * Offers workspace paths for an `@` reference.
@@ -2575,6 +2706,10 @@ export function App({ config: initialConfig, clearFrame }) {
             addSystem(`Model → ${item.value}  ·  remembered for ${cfg.provider}  (session reset)`);
             return;
         }
+        if (kind === 'provider' && item.value === ADD_PROVIDER) {
+            startAddProvider();
+            return;
+        }
         if (kind === 'provider') {
             const def = PROVIDERS[item.value];
             // The endpoint saved for the provider being switched to, not its built-in address. Passing
@@ -2975,8 +3110,64 @@ export function App({ config: initialConfig, clearFrame }) {
                 return;
             }
             case '/provider': {
+                const [verb, ...restArgs] = arg.trim().split(/\s+/).filter(Boolean);
+                /*
+                 * add and remove, named as what they are.
+                 *
+                 * Declaring was only ever reachable as `/connect <name> <url>`, which is a thing you have to
+                 * already know — and somebody looking for how to add a provider looks at `/provider`. The
+                 * old form still works; this is where it can be found.
+                 */
+                if (verb?.toLowerCase() === 'add') {
+                    const [name, url, ...model] = restArgs;
+                    // With arguments it is one step; without, it asks. Both end in the same place.
+                    startAddProvider({
+                        ...(name ? { name: name.toLowerCase(), step: 'url' } : {}),
+                        ...(name && url ? { url: url.replace(/\/+$/, ''), step: 'model' } : {}),
+                        ...(model.length ? { value: model.join(' ') } : {}),
+                    });
+                    return;
+                }
+                if (verb?.toLowerCase() === 'remove' || verb?.toLowerCase() === 'forget') {
+                    const target = (restArgs[0] ?? '').toLowerCase();
+                    if (!target) {
+                        const mine = Object.values(PROVIDERS).filter(p => p.userDefined).map(p => p.name);
+                        addSystem(mine.length
+                            ? `Usage: /provider remove <name>\nYours: ${mine.join(', ')}`
+                            : 'You have not declared any providers, so there is nothing to remove.');
+                        return;
+                    }
+                    const wasShadowing = BUILT_IN_PROVIDERS[target] !== undefined;
+                    if (!removeUserProvider(target)) {
+                        addSystem(PROVIDERS[target]
+                            ? `"${target}" ships with KONECK — it was not declared by you, so there is nothing to remove.`
+                            : `No declared provider called "${target}".`);
+                        return;
+                    }
+                    addSystem(wasShadowing
+                        ? `Removed your "${target}". The built-in one is back, pointing at ${BUILT_IN_PROVIDERS[target].baseURL}.`
+                        : `Removed "${target}".`);
+                    return;
+                }
                 if (!arg) {
-                    addSystem(`Current provider: ${cfg.provider}\nAvailable: ${Object.keys(PROVIDERS).join(', ')}\nUsage: /provider <name>`);
+                    /*
+                     * Says where things stand, then opens the picker.
+                     *
+                     * The list scrolls into the transcript where it can be read back; the picker is for doing
+                     * something about it, and carries "+ add a provider" as its first row. An earlier version
+                     * of this printed the summary and stopped, and the summary said the picker would open —
+                     * which it did not, because nothing opened it. A help line that describes behaviour the
+                     * program does not have is worse than no help line.
+                     */
+                    const mine = Object.values(PROVIDERS).filter(p => p.userDefined).map(p => p.name);
+                    addSystem(`Current provider: ${cfg.provider}\n`
+                        + `Available: ${Object.keys(PROVIDERS).join(', ')}\n`
+                        + (mine.length ? `Declared by you: ${mine.join(', ')}\n` : '')
+                        + '\nSwitch:  /provider <name>, or pick one below\n'
+                        + 'Add:     /provider add  — asks for a name, an endpoint and a default model\n'
+                        + '         /provider add <name> <url> [model]  if you have them to hand\n'
+                        + 'Remove:  /provider remove <name>');
+                    openPicker('provider', providerItems());
                     return;
                 }
                 const name = arg.trim().toLowerCase();
@@ -2985,7 +3176,7 @@ export function App({ config: initialConfig, clearFrame }) {
                     // Switching to a name that does not resolve used to reset the session anyway, leaving it
                     // pointed at nothing and failing on the next message instead of on the command.
                     addSystem(`Unknown provider "${arg}". Known: ${Object.keys(PROVIDERS).join(', ')}\n` +
-                        `Declare one:  /connect ${name} https://endpoint/v1`);
+                        `Declare it:  /provider add ${name} https://endpoint/v1`);
                     return;
                 }
                 // Keep the typed command and picker on one implementation path. The picker clears a
@@ -4084,6 +4275,26 @@ export function App({ config: initialConfig, clearFrame }) {
                 answer(typed);
             return;
         }
+        if (addProv) {
+            if (key.escape) {
+                setAddProv(null);
+                addSystem('Cancelled — nothing was declared.');
+                return;
+            }
+            if (key.return) {
+                void advanceAddProvider();
+                return;
+            }
+            if (key.backspace || key.delete) {
+                setAddProv(p => (p ? { ...p, value: p.value.slice(0, -1) } : p));
+                return;
+            }
+            // A pasted endpoint arrives as one chunk, so it is taken whole rather than a letter at a time.
+            if (!key.ctrl && !key.meta && input) {
+                setAddProv(p => (p ? { ...p, value: p.value + input } : p));
+            }
+            return;
+        }
         if (keyPrompt) {
             if (key.escape) {
                 setKeyPrompt(null);
@@ -5138,6 +5349,14 @@ export function App({ config: initialConfig, clearFrame }) {
                             return (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { backgroundColor: selected ? CYAN : undefined, color: selected ? '#10222A' : INK, bold: selected, children: fitCells(`${selected ? G.caret + ' ' : '  '}${label}` +
                                         `${item.current ? '(current) ' : ''}${header ? `${header} · ` : ''}${item.desc}`, width) }) }, item.value + absolute));
                         }), list.length > pickerRows && (_jsxs(Text, { color: DIM, children: ["\u2191\u2193 navigate \u00B7 pgup/pgdn jump \u00B7 enter select \u00B7 showing ", Math.max(0, start) + 1, "\u2013", Math.max(0, start) + shown.length, " of ", list.length] }))] }));
+            })(), addProv && (() => {
+                const shadowed = BUILT_IN_PROVIDERS[addProv.name];
+                const ask = addProv.step === 'name' ? { label: 'name', hint: 'short and lowercase, e.g. openrouter' }
+                    : addProv.step === 'url' ? { label: 'endpoint', hint: 'OpenAI-compatible, e.g. https://openrouter.ai/api/v1' }
+                        : addProv.step === 'model' ? { label: 'default model', hint: 'optional — enter to skip' }
+                            : { label: 'repoint ' + addProv.name + '? (y/n)',
+                                hint: `it ships with KONECK, pointing at ${shadowed?.baseURL}` };
+                return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: CYAN, paddingX: 1, marginTop: 1, width: barWidth, children: [_jsx(Text, { color: CYAN, bold: true, children: "Declare a provider" }), _jsxs(Text, { color: MUTED, children: [ask.hint, "  \u00B7  esc to cancel"] }), addProv.name !== '' && (_jsxs(Text, { color: DIM, children: [addProv.name, addProv.url ? '  ' + addProv.url : ''] })), addProv.error && _jsx(Text, { color: CRIMSON, children: addProv.error }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: MUTED, children: [ask.label, ": "] }), _jsx(Text, { color: INK, children: addProv.value }), _jsx(Text, { color: CYAN, children: "\u2588" })] })] }));
             })(), keyPrompt && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: AMBER, paddingX: 1, marginTop: 1, width: barWidth, children: [_jsxs(Text, { color: AMBER, bold: true, children: ["API key for ", keyPrompt.provider] }), _jsx(Text, { color: MUTED, children: "Paste it and press enter. Held in memory for this session only; esc to cancel." }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: MUTED, children: [keyPrompt.env, ": "] }), _jsx(Text, { color: INK, children: '*'.repeat(Math.min(keyPrompt.value.length, 48)) }), _jsx(Text, { color: CYAN, children: "\u2588" })] })] })), ask && (() => {
                 let detail = '';
                 try {