@moxxy/cli 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moxxy/cli",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "CLI for the Moxxy agentic framework — manage agents, skills, plugins, channels, and vaults from the terminal",
   "type": "module",
   "license": "MIT",
@@ -50,5 +50,8 @@
     "marked": "^15.0.0",
     "react": "^19.0.0",
     "tsx": "^4.21.0"
+  },
+  "devDependencies": {
+    "react-devtools-core": "file:./stubs/react-devtools-core"
   }
 }

package/src/cli.js

@@ -137,8 +137,10 @@ async function routeCommand(client, command, rest) {
     return;
   }
 
-  clearScreen();
-  console.log(LOGO);
+  if (isInteractive()) {
+    clearScreen();
+    console.log(LOGO);
+  }
 
   switch (command) {
     case 'init':

package/src/commands/provider.js

@@ -7,6 +7,7 @@ import { isInteractive, handleCancel, withSpinner, showResult, p } from '../ui.j
 import { spawn } from 'node:child_process';
 import { createHash, randomBytes } from 'node:crypto';
 import { createServer } from 'node:http';
+import { BUILTIN_PROVIDERS } from './providers/index.js';
 
 const OPENAI_API_BASE = 'https://api.openai.com/v1';
 export const OPENAI_CODEX_PROVIDER_ID = 'openai-codex';
@@ -41,12 +42,12 @@ const ANTHROPIC_OAUTH_SESSION_MODE = 'anthropic_oauth_session';
 const OLLAMA_PROVIDER_ID = 'ollama';
 const OLLAMA_API_BASE = 'http://127.0.0.1:11434/v1';
 const OPENAI_CODEX_MODEL_IDS = [
+  'gpt-5.4',
+  'gpt-5.4-mini',
+  'gpt-5.4-nano',
   'gpt-5.3-codex',
-  'gpt-5.2-codex',
-  'gpt-5.1-codex',
-  'gpt-5.1-codex-mini',
-  'gpt-5.1-codex-max',
   'gpt-5.2',
+  'gpt-5.2-codex',
   'gpt-4.1',
   'gpt-4.1-mini',
   'gpt-4.1-nano',
@@ -813,6 +814,22 @@ async function fetchOllamaModels(apiBase = OLLAMA_API_BASE) {
   return [];
 }
 
+export function getProviderCatalog() {
+  return BUILTIN_PROVIDERS.map(bp => ({
+    id: bp.id,
+    display_name: bp.display_name,
+    api_base: bp.api_base ?? null,
+    api_key_env: bp.api_key_env ?? null,
+    cli_binary: bp.cli_binary ?? null,
+    api_key_login: Boolean(bp.api_key_login),
+    oauth_login: Boolean(bp.oauth_login),
+    models: (bp.models ?? []).map(m => ({
+      model_id: m.model_id,
+      display_name: m.display_name ?? m.model_id,
+    })),
+  }));
+}
+
 export async function resolveBuiltinProviderModels(builtin) {
   const fallbackModels = builtin.models.map(model => ({
     ...model,
@@ -1500,135 +1517,10 @@ export async function checkProviderCredentials(builtin, client) {
 }
 
 // ── Built-in Provider Catalog ────────────────────────────────────────────────
+// Each provider lives in its own file under ./providers/ — see providers/index.js.
+// Re-exported here for back-compat with existing importers.
 
-export const BUILTIN_PROVIDERS = [
-  {
-    id: 'anthropic',
-    display_name: 'Anthropic',
-    api_key_env: 'ANTHROPIC_API_KEY',
-    api_base: 'https://api.anthropic.com',
-    api_key_login: true,
-    oauth_login: true,
-    models: [
-      { model_id: 'claude-sonnet-5-20260203', display_name: 'Claude Sonnet 5 "Fennec"' },
-      { model_id: 'claude-opus-4-20250514', display_name: 'Claude Opus 4' },
-      { model_id: 'claude-sonnet-4-20250514', display_name: 'Claude Sonnet 4' },
-      { model_id: 'claude-haiku-4-20250506', display_name: 'Claude Haiku 4' },
-      { model_id: 'claude-3-5-sonnet-20241022', display_name: 'Claude 3.5 Sonnet' },
-      { model_id: 'claude-3-5-haiku-20241022', display_name: 'Claude 3.5 Haiku' },
-    ],
-  },
-  {
-    id: 'openai',
-    display_name: 'OpenAI',
-    api_key_env: 'OPENAI_API_KEY',
-    api_base: OPENAI_API_BASE,
-    models: [
-      { model_id: 'gpt-5.2', display_name: 'GPT-5.2' },
-      { model_id: 'gpt-4.1', display_name: 'GPT-4.1' },
-      { model_id: 'gpt-4.1-mini', display_name: 'GPT-4.1 Mini' },
-      { model_id: 'gpt-4.1-nano', display_name: 'GPT-4.1 Nano' },
-      { model_id: 'o3', display_name: 'o3' },
-      { model_id: 'o4-mini', display_name: 'o4-mini' },
-      { model_id: 'gpt-4o', display_name: 'GPT-4o' },
-      { model_id: 'gpt-4o-mini', display_name: 'GPT-4o Mini' },
-    ],
-  },
-  {
-    id: OPENAI_CODEX_PROVIDER_ID,
-    display_name: OPENAI_CODEX_DISPLAY_NAME,
-    api_key_env: OPENAI_CODEX_SECRET_KEY_NAME,
-    api_base: OPENAI_API_BASE,
-    oauth_login: true,
-    models: [
-      { model_id: 'gpt-5.2', display_name: 'GPT-5.2' },
-      { model_id: 'gpt-4.1', display_name: 'GPT-4.1' },
-      { model_id: 'gpt-4.1-mini', display_name: 'GPT-4.1 Mini' },
-      { model_id: 'gpt-4.1-nano', display_name: 'GPT-4.1 Nano' },
-      { model_id: 'o3', display_name: 'o3' },
-      { model_id: 'o4-mini', display_name: 'o4-mini' },
-      { model_id: 'gpt-4o', display_name: 'GPT-4o' },
-      { model_id: 'gpt-4o-mini', display_name: 'GPT-4o Mini' },
-    ],
-  },
-  {
-    id: OLLAMA_PROVIDER_ID,
-    display_name: 'Ollama',
-    api_base: OLLAMA_API_BASE,
-    models: [
-      { model_id: 'qwen3:8b', display_name: 'Qwen 3 8B' },
-      { model_id: 'gemma3', display_name: 'Gemma 3' },
-      { model_id: 'gpt-oss:20b', display_name: 'GPT OSS 20B' },
-    ],
-  },
-  {
-    id: 'xai',
-    display_name: 'xAI',
-    api_key_env: 'XAI_API_KEY',
-    api_base: 'https://api.x.ai/v1',
-    models: [
-      { model_id: 'grok-4', display_name: 'Grok 4' },
-      { model_id: 'grok-3', display_name: 'Grok 3' },
-      { model_id: 'grok-3-mini', display_name: 'Grok 3 Mini' },
-      { model_id: 'grok-3-fast', display_name: 'Grok 3 Fast' },
-      { model_id: 'grok-2', display_name: 'Grok 2' },
-    ],
-  },
-  {
-    id: 'google',
-    display_name: 'Google Gemini',
-    api_key_env: 'GOOGLE_API_KEY',
-    api_base: 'https://generativelanguage.googleapis.com/v1beta',
-    models: [
-      { model_id: 'gemini-3.1-pro', display_name: 'Gemini 3.1 Pro' },
-      { model_id: 'gemini-2.5-pro', display_name: 'Gemini 2.5 Pro' },
-      { model_id: 'gemini-2.5-flash', display_name: 'Gemini 2.5 Flash' },
-      { model_id: 'gemini-2.0-flash', display_name: 'Gemini 2.0 Flash' },
-    ],
-  },
-  {
-    id: 'deepseek',
-    display_name: 'DeepSeek',
-    api_key_env: 'DEEPSEEK_API_KEY',
-    api_base: 'https://api.deepseek.com',
-    models: [
-      { model_id: 'deepseek-v4', display_name: 'DeepSeek V4' },
-      { model_id: 'deepseek-r1', display_name: 'DeepSeek R1' },
-      { model_id: 'deepseek-v3', display_name: 'DeepSeek V3' },
-    ],
-  },
-  {
-    id: 'zai',
-    display_name: 'ZAI',
-    api_key_env: 'ZAI_API_KEY',
-    api_base: 'https://api.zai.com/v1',
-    models: [
-      { model_id: 'zai-pro', display_name: 'ZAI Pro' },
-      { model_id: 'zai-standard', display_name: 'ZAI Standard' },
-      { model_id: 'zai-fast', display_name: 'ZAI Fast' },
-    ],
-  },
-  {
-    id: 'zai-plan',
-    display_name: 'ZAI Plan',
-    api_key_env: 'ZAI_API_KEY',
-    api_base: 'https://api.zai.com/v1',
-    models: [
-      { model_id: 'zai-plan-pro', display_name: 'ZAI Plan Pro' },
-      { model_id: 'zai-plan-standard', display_name: 'ZAI Plan Standard' },
-    ],
-  },
-  {
-    id: 'claude-cli',
-    display_name: 'Claude Code CLI',
-    cli_binary: 'claude',
-    models: [
-      { model_id: 'opus', display_name: 'Claude Opus' },
-      { model_id: 'sonnet', display_name: 'Claude Sonnet' },
-      { model_id: 'haiku', display_name: 'Claude Haiku' },
-    ],
-  },
-];
+export { BUILTIN_PROVIDERS };
 
 // ── CLI Command ──────────────────────────────────────────────────────────────
 
@@ -1644,6 +1536,7 @@ export async function runProvider(client, args) {
         { value: 'install', label: 'Install provider', hint: 'add a built-in or custom provider' },
         { value: 'login', label: 'Login provider', hint: 'OAuth/subscription login for supported providers' },
         { value: 'list',    label: 'List providers',    hint: 'show installed providers' },
+        { value: 'catalog', label: 'Catalog',           hint: 'list all built-in providers and their known models' },
       ],
     });
     handleCancel(action);
@@ -1670,6 +1563,23 @@ export async function runProvider(client, args) {
       return result;
     }
 
+    case 'catalog': {
+      const catalog = getProviderCatalog();
+      if (isInteractive() && !flags.json) {
+        p.intro('Built-in provider catalog');
+        for (const pr of catalog) {
+          p.log.info(`${pr.display_name}  (${pr.id})`);
+          for (const m of pr.models) {
+            console.log(`    - ${m.model_id}${m.display_name ? `  (${m.display_name})` : ''}`);
+          }
+        }
+        p.outro(`${catalog.length} provider(s)`);
+      } else {
+        console.log(JSON.stringify(catalog, null, 2));
+      }
+      return catalog;
+    }
+
     case 'install': {
       if (isInteractive()) {
         return await installInteractive(client);
@@ -1683,7 +1593,7 @@ export async function runProvider(client, args) {
 
     default:
       if (!action) {
-        console.error('Usage: moxxy provider <install|login|list>');
+        console.error('Usage: moxxy provider <install|login|list|catalog>');
       } else {
         console.error(`Unknown provider action: ${action}`);
       }
@@ -1916,7 +1826,7 @@ async function installNonInteractive(client, flags) {
 
   // Custom provider
   if (!providerId) {
-    throw new Error('Required: --id (provider id). Built-in: openai, openai-codex, anthropic, ollama, xai, zai, zai-plan, claude-cli');
+    throw new Error('Required: --id (provider id). Built-in: openai, openai-codex, anthropic, ollama, xai, google, deepseek, zai, zai-coding-plan, claude-cli');
   }
 
   const displayName = flags.name || flags.display_name || providerId;

package/src/commands/providers/anthropic.js

@@ -0,0 +1,18 @@
+export default {
+  id: 'anthropic',
+  display_name: 'Anthropic',
+  api_key_env: 'ANTHROPIC_API_KEY',
+  api_base: 'https://api.anthropic.com',
+  api_key_login: true,
+  oauth_login: true,
+  models: [
+    { model_id: 'claude-opus-4-6', display_name: 'Claude Opus 4.6' },
+    { model_id: 'claude-sonnet-4-6', display_name: 'Claude Sonnet 4.6' },
+    { model_id: 'claude-haiku-4-5-20251001', display_name: 'Claude Haiku 4.5' },
+    { model_id: 'claude-opus-4-5-20251101', display_name: 'Claude Opus 4.5' },
+    { model_id: 'claude-sonnet-4-5-20250929', display_name: 'Claude Sonnet 4.5' },
+    { model_id: 'claude-opus-4-1-20250805', display_name: 'Claude Opus 4.1' },
+    { model_id: 'claude-sonnet-4-20250514', display_name: 'Claude Sonnet 4' },
+    { model_id: 'claude-opus-4-20250514', display_name: 'Claude Opus 4' },
+  ],
+};

package/src/commands/providers/claude-cli.js

@@ -0,0 +1,10 @@
+export default {
+  id: 'claude-cli',
+  display_name: 'Claude Code CLI',
+  cli_binary: 'claude',
+  models: [
+    { model_id: 'opus', display_name: 'Claude Opus' },
+    { model_id: 'sonnet', display_name: 'Claude Sonnet' },
+    { model_id: 'haiku', display_name: 'Claude Haiku' },
+  ],
+};

package/src/commands/providers/deepseek.js

@@ -0,0 +1,11 @@
+export default {
+  id: 'deepseek',
+  display_name: 'DeepSeek',
+  api_key_env: 'DEEPSEEK_API_KEY',
+  api_base: 'https://api.deepseek.com',
+  models: [
+    { model_id: 'deepseek-v4', display_name: 'DeepSeek V4' },
+    { model_id: 'deepseek-r1', display_name: 'DeepSeek R1' },
+    { model_id: 'deepseek-v3', display_name: 'DeepSeek V3' },
+  ],
+};

package/src/commands/providers/google.js

@@ -0,0 +1,12 @@
+export default {
+  id: 'google',
+  display_name: 'Google Gemini',
+  api_key_env: 'GOOGLE_API_KEY',
+  api_base: 'https://generativelanguage.googleapis.com/v1beta',
+  models: [
+    { model_id: 'gemini-3.1-pro', display_name: 'Gemini 3.1 Pro' },
+    { model_id: 'gemini-2.5-pro', display_name: 'Gemini 2.5 Pro' },
+    { model_id: 'gemini-2.5-flash', display_name: 'Gemini 2.5 Flash' },
+    { model_id: 'gemini-2.0-flash', display_name: 'Gemini 2.0 Flash' },
+  ],
+};

package/src/commands/providers/index.js

@@ -0,0 +1,23 @@
+import anthropic from './anthropic.js';
+import openai from './openai.js';
+import openaiCodex from './openai-codex.js';
+import ollama from './ollama.js';
+import xai from './xai.js';
+import google from './google.js';
+import deepseek from './deepseek.js';
+import zai from './zai.js';
+import zaiCodingPlan from './zai-coding-plan.js';
+import claudeCli from './claude-cli.js';
+
+export const BUILTIN_PROVIDERS = [
+  anthropic,
+  openai,
+  openaiCodex,
+  ollama,
+  xai,
+  google,
+  deepseek,
+  zai,
+  zaiCodingPlan,
+  claudeCli,
+];

package/src/commands/providers/ollama.js

@@ -0,0 +1,10 @@
+export default {
+  id: 'ollama',
+  display_name: 'Ollama',
+  api_base: 'http://127.0.0.1:11434/v1',
+  models: [
+    { model_id: 'qwen3:8b', display_name: 'Qwen 3 8B' },
+    { model_id: 'gemma3', display_name: 'Gemma 3' },
+    { model_id: 'gpt-oss:20b', display_name: 'GPT OSS 20B' },
+  ],
+};

package/src/commands/providers/openai-codex.js

@@ -0,0 +1,22 @@
+export default {
+  id: 'openai-codex',
+  display_name: 'OpenAI (Codex OAuth)',
+  api_key_env: 'OPENAI_CODEX_API_KEY',
+  api_base: 'https://api.openai.com/v1',
+  oauth_login: true,
+  models: [
+    { model_id: 'gpt-5.4', display_name: 'GPT-5.4' },
+    { model_id: 'gpt-5.4-mini', display_name: 'GPT-5.4 Mini' },
+    { model_id: 'gpt-5.4-nano', display_name: 'GPT-5.4 Nano' },
+    { model_id: 'gpt-5.3-codex', display_name: 'GPT-5.3 Codex' },
+    { model_id: 'gpt-5.2', display_name: 'GPT-5.2' },
+    { model_id: 'gpt-5.2-codex', display_name: 'GPT-5.2 Codex' },
+    { model_id: 'gpt-4.1', display_name: 'GPT-4.1' },
+    { model_id: 'gpt-4.1-mini', display_name: 'GPT-4.1 Mini' },
+    { model_id: 'gpt-4.1-nano', display_name: 'GPT-4.1 Nano' },
+    { model_id: 'o3', display_name: 'o3' },
+    { model_id: 'o4-mini', display_name: 'o4-mini' },
+    { model_id: 'gpt-4o', display_name: 'GPT-4o' },
+    { model_id: 'gpt-4o-mini', display_name: 'GPT-4o Mini' },
+  ],
+};

package/src/commands/providers/openai.js

@@ -0,0 +1,19 @@
+export default {
+  id: 'openai',
+  display_name: 'OpenAI',
+  api_key_env: 'OPENAI_API_KEY',
+  api_base: 'https://api.openai.com/v1',
+  models: [
+    { model_id: 'gpt-5.4', display_name: 'GPT-5.4' },
+    { model_id: 'gpt-5.4-mini', display_name: 'GPT-5.4 Mini' },
+    { model_id: 'gpt-5.4-nano', display_name: 'GPT-5.4 Nano' },
+    { model_id: 'gpt-5.2', display_name: 'GPT-5.2' },
+    { model_id: 'gpt-4.1', display_name: 'GPT-4.1' },
+    { model_id: 'gpt-4.1-mini', display_name: 'GPT-4.1 Mini' },
+    { model_id: 'gpt-4.1-nano', display_name: 'GPT-4.1 Nano' },
+    { model_id: 'o3', display_name: 'o3' },
+    { model_id: 'o4-mini', display_name: 'o4-mini' },
+    { model_id: 'gpt-4o', display_name: 'GPT-4o' },
+    { model_id: 'gpt-4o-mini', display_name: 'GPT-4o Mini' },
+  ],
+};

package/src/commands/providers/xai.js

@@ -0,0 +1,13 @@
+export default {
+  id: 'xai',
+  display_name: 'xAI',
+  api_key_env: 'XAI_API_KEY',
+  api_base: 'https://api.x.ai/v1',
+  models: [
+    { model_id: 'grok-4', display_name: 'Grok 4' },
+    { model_id: 'grok-3', display_name: 'Grok 3' },
+    { model_id: 'grok-3-mini', display_name: 'Grok 3 Mini' },
+    { model_id: 'grok-3-fast', display_name: 'Grok 3 Fast' },
+    { model_id: 'grok-2', display_name: 'Grok 2' },
+  ],
+};

package/src/commands/providers/zai-coding-plan.js

@@ -0,0 +1,13 @@
+export default {
+  id: 'zai-coding-plan',
+  display_name: 'Z.AI GLM Coding Plan',
+  api_key_env: 'ZAI_API_KEY',
+  api_base: 'https://api.z.ai/api/coding/paas/v4',
+  models: [
+    { model_id: 'glm-5.1', display_name: 'GLM-5.1' },
+    { model_id: 'glm-4.7', display_name: 'GLM-4.7' },
+    { model_id: 'glm-4.6', display_name: 'GLM-4.6' },
+    { model_id: 'glm-4.5', display_name: 'GLM-4.5' },
+    { model_id: 'glm-4.5-air', display_name: 'GLM-4.5 Air' },
+  ],
+};

package/src/commands/providers/zai.js

@@ -0,0 +1,16 @@
+export default {
+  id: 'zai',
+  display_name: 'Z.AI (GLM)',
+  api_key_env: 'ZAI_API_KEY',
+  api_base: 'https://api.z.ai/api/paas/v4',
+  models: [
+    { model_id: 'glm-5.1', display_name: 'GLM-5.1' },
+    { model_id: 'glm-4.7', display_name: 'GLM-4.7' },
+    { model_id: 'glm-4.6', display_name: 'GLM-4.6' },
+    { model_id: 'glm-4.5', display_name: 'GLM-4.5' },
+    { model_id: 'glm-4.5-x', display_name: 'GLM-4.5 X' },
+    { model_id: 'glm-4.5-air', display_name: 'GLM-4.5 Air' },
+    { model_id: 'glm-4.5-airx', display_name: 'GLM-4.5 AirX' },
+    { model_id: 'glm-4.5-flash', display_name: 'GLM-4.5 Flash' },
+  ],
+};

package/src/help.js

@@ -99,6 +99,7 @@ Actions:
   install   Add a built-in or custom provider
   login     OAuth/subscription login (currently openai-codex)
   list      Show installed providers
+  catalog   Show all built-in providers and their known models (no gateway needed)
 
 Options:
   --id <id>          Provider ID for install (e.g. openai, anthropic, xai)
@@ -125,6 +126,8 @@ Built-in providers:
 
 Examples:
   moxxy provider list
+  moxxy provider catalog
+  moxxy provider catalog --json
   moxxy provider install --id openai
   moxxy provider login --id openai-codex --method browser
   moxxy provider login --id openai-codex --method headless --no-browser