blyuecode 0.2.0 → 0.3.0

package/dist/core/models.js

@@ -0,0 +1,150 @@
+// Universal model fetcher — works with any OpenAI-compatible /v1/models
+// endpoint: OpenAI, OpenRouter, Groq, xAI (Grok), Ollama, LM Studio,
+// llama.cpp, vLLM, together, deepseek, etc.
+const CACHE_TTL_MS = 5 * 60 * 1000;
+let cache = null;
+function currentBaseUrl() {
+    const raw = process.env.OPENAI_BASE_URL ||
+        process.env.OPENAI_API_BASE ||
+        'https://api.openai.com/v1';
+    // Strip trailing slash for consistent concat.
+    return raw.replace(/\/+$/, '');
+}
+function currentApiKey() {
+    return process.env.OPENAI_API_KEY || process.env.API_KEY || '';
+}
+function providerLabel(baseUrl) {
+    const u = baseUrl.toLowerCase();
+    if (u.includes('openrouter'))
+        return 'OpenRouter';
+    if (u.includes('api.x.ai'))
+        return 'xAI';
+    if (u.includes('groq.com'))
+        return 'Groq';
+    if (u.includes('api.openai.com'))
+        return 'OpenAI';
+    if (u.includes('api.deepseek.com'))
+        return 'DeepSeek';
+    if (u.includes('api.together'))
+        return 'Together';
+    if (u.includes('localhost') || u.includes('127.0.0.1'))
+        return 'local';
+    // Fall back to the hostname.
+    try {
+        return new URL(baseUrl).host;
+    }
+    catch {
+        return 'provider';
+    }
+}
+export function currentProviderLabel() {
+    return providerLabel(currentBaseUrl());
+}
+/**
+ * Non-chat models we should hide from the picker. Conservative — better
+ * to show a couple of extras than to hide something the user wants.
+ */
+function isChatModel(id) {
+    const l = id.toLowerCase();
+    const block = [
+        'embed',
+        'embedding',
+        'whisper',
+        '-tts',
+        'tts-',
+        'dall-e',
+        'dalle',
+        'moderation',
+        'realtime',
+        'transcribe',
+        '-audio',
+        'audio-',
+        'image-',
+        '-vision-preview',
+        'davinci',
+        'babbage',
+        'curie',
+        'ada-',
+    ];
+    return !block.some((b) => l.includes(b));
+}
+function parseNumber(v) {
+    if (v === undefined)
+        return undefined;
+    const n = typeof v === 'string' ? parseFloat(v) : v;
+    return Number.isFinite(n) ? n : undefined;
+}
+/**
+ * Fetches the model list from the current provider. Cached for 5 minutes
+ * per base URL, so reopening /model is instant but "new models" surface
+ * within one cache window.
+ */
+export async function fetchModels(opts) {
+    const baseUrl = currentBaseUrl();
+    const url = baseUrl + '/models';
+    if (!opts?.force &&
+        cache &&
+        cache.url === url &&
+        Date.now() - cache.at < CACHE_TTL_MS) {
+        return cache.models;
+    }
+    const headers = { Accept: 'application/json' };
+    const key = currentApiKey();
+    if (key)
+        headers.Authorization = `Bearer ${key}`;
+    let res;
+    try {
+        res = await fetch(url, { headers });
+    }
+    catch (err) {
+        throw new Error(`Could not reach ${url}: ${err.message}. ` +
+            `Is the provider reachable and the base URL correct?`);
+    }
+    if (!res.ok) {
+        throw new Error(`${url} returned HTTP ${res.status} ${res.statusText}. ` +
+            `Check your API key and base URL in /settings.`);
+    }
+    const body = (await res.json());
+    const raw = Array.isArray(body) ? body : body.data ?? [];
+    const models = raw
+        .map((m) => {
+        const id = m.id || m.name;
+        if (!id)
+            return null;
+        const prompt = parseNumber(m.pricing?.prompt);
+        const completion = parseNumber(m.pricing?.completion);
+        const isFree = prompt !== undefined &&
+            completion !== undefined &&
+            prompt === 0 &&
+            completion === 0;
+        return {
+            id,
+            contextLength: m.context_length ?? m.context_window,
+            ownedBy: m.owned_by,
+            pricing: prompt !== undefined && completion !== undefined
+                ? { prompt, completion }
+                : undefined,
+            isFree,
+        };
+    })
+        .filter((m) => m !== null)
+        .filter((m) => isChatModel(m.id));
+    // Sort: free first, then alphabetical. (OpenRouter returns them in
+    // arbitrary order; this makes the useful ones surface at the top.)
+    models.sort((a, b) => {
+        if (!!a.isFree !== !!b.isFree)
+            return a.isFree ? -1 : 1;
+        return a.id.localeCompare(b.id);
+    });
+    cache = { at: Date.now(), url, models };
+    return models;
+}
+export function clearModelCache() {
+    cache = null;
+}
+/**
+ * Returns the current model ID — from config/env.
+ */
+export function currentModelId() {
+    return process.env.MODEL || '';
+}

package/dist/ui/Chat.js

@@ -16,6 +16,7 @@ import { useSlowColor } from './useSlowColor.js';
 import { pastelAt } from './pastel.js';
 import { bumpActivity } from './activity.js';
 import { theme } from './theme.js';
+import { getConfig, saveConfig, applyConfig } from '../core/config.js';
 let nextId = 0;
 const mkItem = (kind, text) => ({ kind, text, id: nextId++ });
 const HistoryLine = ({ item }) => {
@@ -100,9 +101,9 @@ export const Chat = ({ resumedCount = 0 }) => {
         bumpActivity();
         if (permReq)
             return;
-        if (key.ctrl && inputChar === 'p')
+        if (key.ctrl && inputChar === 'l')
             setOverlay('model');
-        if (key.ctrl && inputChar === 's')
+        if (key.ctrl && inputChar === 'o')
             setOverlay('settings');
     });
     const flush = (kind, text) => {
@@ -169,8 +170,8 @@ export const Chat = ({ resumedCount = 0 }) => {
             setHistory((h) => [
                 ...h,
                 mkItem('tool', 'Commands:'),
-                mkItem('tool', '  /model     switch model            (Ctrl+P)'),
-                mkItem('tool', '  /settings  open settings           (Ctrl+S)'),
+                mkItem('tool', '  /model     switch model            (Ctrl+L)'),
+                mkItem('tool', '  /settings  open settings           (Ctrl+O)'),
                 mkItem('tool', '  /compact   summarize history to free context'),
                 mkItem('tool', '  /debug     show last request to provider'),
                 mkItem('tool', '  /clear     clear session and permissions'),
@@ -227,10 +228,17 @@ export const Chat = ({ resumedCount = 0 }) => {
     };
     const handleModelSelect = (id) => {
         process.env.MODEL = id;
+        try {
+            const cfg = getConfig();
+            const next = { ...cfg, model: id };
+            saveConfig(next);
+            applyConfig(next);
+        }
+        catch { }
         setCurrentModel(id);
         setOverlay('none');
         setAgent(new Agent());
-        setHistory((h) => [...h, mkItem('tool', `model → ${id}`)]);
+        setHistory((h) => [...h, mkItem('tool', 'model → ' + id)]);
     };
     if (permReq) {
         return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: history, children: (item) => _jsx(HistoryLine, { item: item }, item.id) }), _jsx(Box, { marginTop: 1, children: _jsx(PermissionPrompt, { req: permReq }) }), _jsx(Box, { marginTop: 1, children: _jsx(InputBar, { value: "", onChange: () => { }, onSubmit: () => { }, loading: false, mascotState: "permission", awaitingPermission: true }) })] }));

package/dist/ui/ModelPicker.js

@@ -1,22 +1,39 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useEffect } from 'react';
 import { Box, Text, useInput, useStdout } from 'ink';
-import { fetchFreeModels } from '../core/freeModels.js';
+import { fetchModels, currentProviderLabel, } from '../core/models.js';
 import { theme } from './theme.js';
 export const ModelPicker = ({ current, onSelect, onCancel }) => {
     const { stdout } = useStdout();
     const width = Math.max(40, stdout?.columns ?? 60);
+    const provider = currentProviderLabel();
     const [models, setModels] = useState([]);
     const [loading, setLoading] = useState(true);
+    const [error, setError] = useState(null);
     const [idx, setIdx] = useState(0);
     const [filter, setFilter] = useState('');
     useEffect(() => {
-        fetchFreeModels(process.env.OPENAI_API_KEY).then((m) => {
+        let cancelled = false;
+        setLoading(true);
+        setError(null);
+        fetchModels()
+            .then((m) => {
+            if (cancelled)
+                return;
             setModels(m);
             const found = m.findIndex((x) => x.id === current);
             setIdx(found >= 0 ? found : 0);
             setLoading(false);
+        })
+            .catch((err) => {
+            if (cancelled)
+                return;
+            setError(err.message);
+            setLoading(false);
         });
+        return () => {
+            cancelled = true;
+        };
     }, [current]);
     const filtered = filter
         ? models.filter((m) => m.id.toLowerCase().includes(filter.toLowerCase()))
@@ -24,9 +41,9 @@ export const ModelPicker = ({ current, onSelect, onCancel }) => {
     useInput((input, key) => {
         if (key.escape)
             return onCancel();
-        if (key.upArrow)
+        if (key.upArrow && filtered.length)
             setIdx((i) => (i - 1 + filtered.length) % filtered.length);
-        if (key.downArrow)
+        if (key.downArrow && filtered.length)
             setIdx((i) => (i + 1) % filtered.length);
         if (key.return && filtered[idx])
             onSelect(filtered[idx].id);
@@ -40,18 +57,26 @@ export const ModelPicker = ({ current, onSelect, onCancel }) => {
     });
     const inner = width - 4;
     const maxVisible = 12;
-    const start = Math.max(0, Math.min(idx - 6, filtered.length - maxVisible));
+    const start = Math.max(0, Math.min(idx - 6, Math.max(0, filtered.length - maxVisible)));
     const visible = filtered.slice(start, start + maxVisible);
-    const topLabel = filter ? `filter: ${filter}` : 'free models';
-    const topPad = Math.max(1, inner - topLabel.length - 4);
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: '╭─ ' }), _jsx(Text, { color: theme.accent, bold: true, children: topLabel }), _jsx(Text, { color: theme.muted, children: ' ' + '─'.repeat(topPad) + '╮' })] }), loading ? (_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: '│ ' }), _jsx(Text, { color: theme.muted, children: "loading catalog\u2026" })] })) : visible.length === 0 ? (_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: '│ ' }), _jsx(Text, { color: theme.error, children: "no matches" })] })) : (visible.map((m, i) => {
+    const label = filter ? `filter: ${filter}` : `${provider} models`;
+    const topPad = Math.max(1, inner - label.length - 4);
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: '╭─ ' }), _jsx(Text, { color: theme.accent, bold: true, children: label }), _jsx(Text, { color: theme.muted, children: ' ' + '─'.repeat(topPad) + '╮' })] }), loading ? (_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: '│ ' }), _jsxs(Text, { color: theme.muted, children: ["fetching ", provider, " catalog\u2026"] })] })) : error ? (_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: '│ ' }), _jsxs(Text, { color: theme.error, children: ["\u2717 ", error.slice(0, inner - 6)] })] })) : visible.length === 0 ? (_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: '│ ' }), _jsx(Text, { color: theme.error, children: "no matches" })] })) : (visible.map((m, i) => {
                 const realIdx = start + i;
                 const active = realIdx === idx;
                 const isCurrent = m.id === current;
-                const ctx = m.context >= 1000 ? `${Math.round(m.context / 1000)}k` : `${m.context}`;
-                const label = m.id.length > inner - 10 ? m.id.slice(0, inner - 13) + '…' : m.id;
-                const right = `${ctx}`;
-                const pad = Math.max(1, inner - label.length - right.length - 4);
-                return (_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: '│ ' }), _jsx(Text, { color: active ? theme.accent : theme.muted, bold: active, children: active ? '❯ ' : '  ' }), _jsx(Text, { color: active ? theme.text : theme.muted, bold: active, children: label }), _jsx(Text, { color: theme.muted, children: ' '.repeat(pad) }), _jsx(Text, { color: theme.muted, children: right }), isCurrent && _jsx(Text, { color: theme.accent, children: " \u2713" })] }, m.id));
+                const ctx = m.contextLength
+                    ? m.contextLength >= 1000
+                        ? `${Math.round(m.contextLength / 1000)}k`
+                        : `${m.contextLength}`
+                    : '';
+                const freeTag = m.isFree ? 'FREE' : '';
+                // Right side:  ctx + free badge
+                const right = [ctx, freeTag].filter(Boolean).join(' · ');
+                const label0 = m.id.length > inner - 10
+                    ? m.id.slice(0, inner - 13) + '…'
+                    : m.id;
+                const pad = Math.max(1, inner - label0.length - right.length - 4);
+                return (_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: '│ ' }), _jsx(Text, { color: active ? theme.accent : theme.muted, bold: active, children: active ? '❯ ' : '  ' }), _jsx(Text, { color: active ? theme.text : theme.muted, bold: active, children: label0 }), _jsx(Text, { color: theme.muted, children: ' '.repeat(pad) }), _jsx(Text, { color: theme.muted, children: right }), isCurrent && _jsx(Text, { color: theme.accent, children: " \u2713" })] }, m.id));
             })), _jsx(Text, { children: _jsx(Text, { color: theme.muted, children: '╰' + '─'.repeat(inner) + '╯' }) }), _jsx(Text, { color: theme.muted, children: "\u2191\u2193 move \u00B7 type to filter \u00B7 \u21B5 select \u00B7 esc cancel" })] }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blyuecode",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "BLYUE Code — a coding agent by Lumen",
   "type": "module",
   "license": "MIT",