open-jarvis-cli 1.1.0 → 1.1.1

package/bin/jarvis.js

@@ -6,7 +6,7 @@ import * as cfgMod from '../src/config.js';
 import * as memory from '../src/memory.js';
 import { startRepl, ask } from '../src/repl.js';
 import { stats, trySkill } from '../src/skills.js';
-import { runSetup, addKey, needsSetup, commandsHelp } from '../src/setup.js';
+import { runSetup, addKey, changeModel, needsSetup, commandsHelp } from '../src/setup.js';
 import { byId } from '../src/providers.js';
 import { green, dim, red, cyan } from '../src/ui.js';
 
@@ -56,6 +56,7 @@ try {
   else if (cmd === 'config') handleConfig(rest);
   else if (cmd === 'setup' || cmd === 'switch') await runSetup();
   else if (cmd === 'key') await addKey();
+  else if (cmd === 'model') await changeModel();
   else if (cmd === 'ask') {
     const q = rest.join(' ').trim();
     if (!q) console.log(red('Usage: jarvis ask "question"'));

package/package.json

@@ -1,32 +1,17 @@
 {
   "name": "open-jarvis-cli",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "JARVIS-style AI assistant for your terminal. BYOK, streaming, free-tier friendly.",
   "type": "module",
   "bin": {
     "jarvis": "bin/jarvis.js",
     "openjarvispro": "bin/jarvis.js"
   },
-  "files": [
-    "bin",
-    "src",
-    "README.md"
-  ],
-  "engines": {
-    "node": ">=18"
-  },
+  "files": ["bin", "src", "README.md"],
+  "engines": { "node": ">=18" },
   "author": "Rongon Kairy",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/RongonKairy/openjarvispro.git"
-  },
+  "repository": { "type": "git", "url": "git+https://github.com/RongonKairy/openjarvispro.git" },
   "homepage": "https://github.com/RongonKairy",
-  "keywords": [
-    "jarvis",
-    "ai",
-    "cli",
-    "assistant",
-    "terminal"
-  ],
+  "keywords": ["jarvis", "ai", "cli", "assistant", "terminal"],
   "license": "MIT"
 }

package/src/llm.js

@@ -23,6 +23,7 @@ export function modelFor(cfg, id) {
 
 function classify(status, text) {
   if (/credit balance|insufficient|quota|billing|exhausted|exceeded|out of credits|payment/i.test(text) || status === 429 || status === 402) return 'limit';
+  if ([400, 404, 422].includes(status) && /model/i.test(text) && /valid|found|exist|unknown|invalid|support|decommission/i.test(text)) return 'model';
   if (status === 401 || status === 403) return 'auth';
   return 'other';
 }
@@ -124,7 +125,7 @@ export async function chat(cfg, system, history, onToken, signal) {
   try {
     return await run(id, cfg, system, history, onToken, signal);
   } catch (err) {
-    if (signal?.aborted || id === 'ollama' || err.kind === 'limit' || err.kind === 'auth') throw err;
+    if (signal?.aborted || id === 'ollama' || err.kind === 'limit' || err.kind === 'auth' || err.kind === 'model') throw err;
     try {
       return await run('ollama', { ...cfg, AI_MODEL: '' }, system, history, onToken, signal);
     } catch {
@@ -132,3 +133,46 @@ export async function chat(cfg, system, history, onToken, signal) {
     }
   }
 }
+
+/** Ask the provider which models exist right now. Returns an array of ids, or null on any failure. */
+export async function listModels(cfg, id) {
+  const p = byId(id);
+  if (!p) return null;
+  const key = cfg.AI_API_KEY || '';
+  const ctl = new AbortController();
+  const timer = setTimeout(() => ctl.abort(), 6000);
+  try {
+    let url;
+    let headers = {};
+    if (p.type === 'openai') {
+      const chatUrl = p.custom ? (cfg.CUSTOM_URL || '').replace(/\/+$/, '') + '/chat/completions' : p.url;
+      url = chatUrl.replace(/\/chat\/completions$/, '/models');
+      headers = { authorization: `Bearer ${key}` };
+    } else if (p.type === 'anthropic') {
+      url = 'https://api.anthropic.com/v1/models?limit=100';
+      headers = { 'x-api-key': key, 'anthropic-version': '2023-06-01' };
+    } else if (p.type === 'gemini') {
+      url = 'https://generativelanguage.googleapis.com/v1beta/models?pageSize=200';
+      headers = { 'x-goog-api-key': key };
+    } else if (p.type === 'ollama') {
+      url = `${(cfg.OLLAMA_URL || 'http://localhost:11434').replace(/\/$/, '')}/api/tags`;
+    }
+    const res = await fetch(url, { headers, signal: ctl.signal });
+    if (!res.ok) return null;
+    const j = await res.json();
+    let ids;
+    if (p.type === 'gemini') {
+      ids = (j.models || []).filter((m) => (m.supportedGenerationMethods || []).includes('generateContent')).map((m) => m.name.replace(/^models\//, ''));
+    } else if (p.type === 'ollama') ids = (j.models || []).map((m) => m.name);
+    else ids = (j.data || []).map((m) => m.id);
+    ids = [...new Set(ids)].filter(Boolean);
+    if (id === 'openai') ids = ids.filter((m) => /^(gpt|o\d|chatgpt)/.test(m) && !/audio|realtime|transcribe|tts|image|embedding|moderation|search/.test(m));
+    if (id === 'openrouter') ids.sort((a, b) => (Number(b.endsWith(':free')) - Number(a.endsWith(':free'))) || a.localeCompare(b));
+    else ids.sort();
+    return ids.length ? ids : null;
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timer);
+  }
+}

package/src/repl.js

@@ -9,7 +9,7 @@ import { chat, detectProvider, modelFor } from './llm.js';
 import { byId } from './providers.js';
 import { trySkill, HELP } from './skills.js';
 import { speak, stopSpeaking } from './voice.js';
-import { runSetup, addKey, needsSetup } from './setup.js';
+import { runSetup, addKey, needsSetup, changeModel } from './setup.js';
 import { select } from './menu.js';
 import { banner, spinner, green, cyan, dim, red, amber } from './ui.js';
 
@@ -29,6 +29,7 @@ function friendly(e) {
   const m = String(e.message || e);
   if (e.kind === 'auth') return 'The API key was rejected or missing.';
   if (e.kind === 'limit') return 'Limit reached (credits/quota or rate limit).';
+  if (e.kind === 'model') return 'This model name is not valid for the selected provider.';
   if (/fetch failed|ENOTFOUND|ECONN/i.test(m)) return 'Cannot reach the network (or Ollama is not running).';
   return m;
 }
@@ -58,15 +59,19 @@ async function tryOnce(cfg, history, text) {
 async function recover(err, S) {
   const id = detectProvider(S.cfg);
   const name = byId(id)?.name || id;
-  console.log(amber(err.kind === 'limit' ? `⚠ ${name}: limit reached.` : `⚠ ${name}: API key problem.`));
-  const c = await select('What would you like to do?', [
-    { label: `Add a NEW API key for ${name}`, value: 'key', hint: 'command: jarvis key' },
-    { label: 'Switch to another provider / model', value: 'setup', hint: 'command: jarvis setup' },
-    { label: 'Retry the same message', value: 'retry' },
-    { label: 'Cancel', value: 'cancel' },
-  ]);
+  const model = err.kind === 'model';
+  console.log(amber(model ? `⚠ ${name}: model "${modelFor(S.cfg, id)}" is not valid.`
+    : err.kind === 'limit' ? `⚠ ${name}: limit reached.` : `⚠ ${name}: API key problem.`));
+  const options = [];
+  if (model) options.push({ label: 'Pick a different model', value: 'model', hint: 'command: jarvis model' });
+  else options.push({ label: `Add a NEW API key for ${name}`, value: 'key', hint: 'command: jarvis key' });
+  options.push({ label: 'Switch to another provider', value: 'setup', hint: 'command: jarvis setup' });
+  if (!model) options.push({ label: 'Retry the same message', value: 'retry' });
+  options.push({ label: 'Cancel', value: 'cancel' });
+  const c = await select('What would you like to do?', options);
   if (!c || c.value === 'cancel') return false;
   if (c.value === 'key' && !(await addKey())) return false;
+  if (c.value === 'model' && !(await changeModel())) return false;
   if (c.value === 'setup' && !(await runSetup())) return false;
   S.cfg = cfgMod.load();
   return true;
@@ -79,7 +84,7 @@ export async function ask(S, history, text) {
     if (res.ok) return res.reply;
     console.log(red(`✖ ${friendly(res.err)}`));
     const k = res.err.kind;
-    if (k === 'limit' || k === 'auth') {
+    if (k === 'limit' || k === 'auth' || k === 'model') {
       console.log(dim(String(res.err.message).slice(0, 160)));
       if (!process.stdin.isTTY) {
         console.log(dim('Add a new key with:  jarvis key   (or)   jarvis config set AI_API_KEY=your_key'));
@@ -147,7 +152,8 @@ export async function startRepl() {
           console.log(dim(`Voice ${S.cfg.VOICE}.`));
         } else if (cmd === 'model') {
           const id = detectProvider(S.cfg);
-          console.log(`${byId(id)?.name || id} / ${modelFor(S.cfg, id)}   ${dim('(change with /setup)')}`);
+          console.log(`${byId(id)?.name || id} / ${modelFor(S.cfg, id)}`);
+          if (await changeModel()) S.cfg = cfgMod.load();
         } else if (cmd === 'setup' || cmd === 'switch') {
           if (await runSetup()) { S.cfg = cfgMod.load(); history.length = 0; }
         } else if (cmd === 'key') {

package/src/setup.js

@@ -1,6 +1,6 @@
 import * as cfgMod from './config.js';
 import { PROVIDERS, byId } from './providers.js';
-import { detectProvider } from './llm.js';
+import { detectProvider, listModels } from './llm.js';
 import { select, lineInput } from './menu.js';
 import { green, dim, cyan, red } from './ui.js';
 
@@ -9,6 +9,7 @@ export function commandsHelp() {
 ${cyan('Handy commands')}
   ${green('jarvis')}                              start chatting
   ${green('jarvis setup')}                        change provider / model  ${dim('(↑ ↓ + Enter)')}
+  ${green('jarvis model')}                        pick a different model of the same provider
   ${green('jarvis key')}                          add a NEW API key  ${dim('(when your limit is over)')}
   ${green('jarvis config set AI_API_KEY=')}${dim('your_key')}   same thing, one line
   ${green('jarvis config list')}                  show current settings
@@ -65,17 +66,8 @@ export async function runSetup() {
     prof.key = key;
   }
 
-  const mItems = [
-    ...(p.models || []).map((m, i) => ({ label: m, value: m, hint: i === 0 ? 'recommended' : '' })),
-    { label: '✎ Type a model name…', value: '__custom' },
-  ];
-  let model;
-  const mp = mItems.length > 1 ? await select(`Choose a model for ${p.name}`, mItems) : mItems[0];
-  if (!mp) return false;
-  if (mp.value === '__custom') {
-    model = await lineInput('Model name: ');
-    if (!model) { console.log(red('No model entered. Cancelled.')); return false; }
-  } else model = mp.value;
+  const model = await pickModel(p, { ...cfgMod.load(), AI_API_KEY: prof.key || '', CUSTOM_URL: prof.url || '' });
+  if (!model) return false;
 
   cfgMod.saveProfile(p.id, { key: prof.key, model, url: prof.url });
   console.log(`\n${green('✔ Ready:')} ${p.name} · ${model}`);
@@ -98,3 +90,40 @@ export async function addKey() {
   console.log(green('✔ New key saved ') + dim(`(${cfgMod.mask('AI_API_KEY', key)})`));
   return true;
 }
+
+/** Model picker: loads the provider's live model list; falls back to common models. Returns id or null. */
+export async function pickModel(p, cfgLike) {
+  process.stdout.write(dim('  Loading available models…'));
+  const live = await listModels(cfgLike, p.id);
+  process.stdout.write('\r\x1b[2K');
+  const curated = p.models || [];
+  if (!live && curated.length) console.log(dim('  (could not load the live model list — showing common models)'));
+  const list = live || curated;
+  const custom = { label: '✎ Type a model name…', value: '__custom' };
+  const items = list.map((m) => ({ label: m, value: m, hint: m.endsWith(':free') ? 'free' : m === curated[0] ? 'recommended' : '' }));
+  if (list.length > 12) items.unshift(custom); else items.push(custom);
+  const pick = items.length > 1
+    ? await select(`Choose a model for ${p.name}${live ? '  (live list)' : ''}`, items, { initial: list.length > 12 ? 1 : 0 })
+    : custom;
+  if (!pick) return null;
+  if (pick.value === '__custom') {
+    const m = await lineInput('Model name: ');
+    if (!m) { console.log(red('No model entered.')); return null; }
+    return m;
+  }
+  return pick.value;
+}
+
+/** Change only the model of the current provider (keeps the key). */
+export async function changeModel() {
+  const cfg = cfgMod.load();
+  const id = detectProvider(cfg);
+  const p = byId(id);
+  if (!process.stdin.isTTY) { console.log(red('Run this in an interactive terminal, or use: jarvis config set AI_MODEL=model-name')); return false; }
+  if (!p) return false;
+  const model = await pickModel(p, cfg);
+  if (!model) return false;
+  cfgMod.saveProfile(id, { model });
+  console.log(green('✔ Model set: ') + model);
+  return true;
+}

package/src/skills.js

@@ -123,7 +123,7 @@ ${green('Skills')}   ${dim('(no API call needed)')}
 ${green('Slash')}
   /voice on|off   speak replies aloud
   /clear          reset conversation
-  /model          show provider & model
+  /model          show current model and pick another
   /setup          change provider / model (arrow keys)
   /key            add a NEW API key
   /help  /exit