@orchagent/cli 0.3.17 → 0.3.19

package/dist/commands/call.js

@@ -138,6 +138,7 @@ function registerCallCommand(program) {
         .option('--input <json>', 'Alias for --data')
         .option('--key <key>', 'LLM API key (overrides env vars)')
         .option('--provider <provider>', 'LLM provider (openai, anthropic, gemini)')
+        .option('--model <model>', 'LLM model to use (overrides agent default)')
         .option('--json', 'Output raw JSON')
         .option('--output <file>', 'Save response body to a file')
         .option('--skills <skills>', 'Add skills (comma-separated)')
@@ -189,12 +190,46 @@ argument or --file option instead.
                 throw new errors_1.CliError('When using --key, you must also specify --provider (openai, anthropic, or gemini)');
             }
             (0, llm_1.validateProvider)(options.provider);
+            // Warn on potential model/provider mismatch
+            if (options.model && options.provider) {
+                const modelLower = options.model.toLowerCase();
+                const providerPatterns = {
+                    openai: /^(gpt-|o1-|o3-|davinci|text-)/,
+                    anthropic: /^claude-/,
+                    gemini: /^gemini-/,
+                    ollama: /^(llama|mistral|deepseek|phi|qwen)/,
+                };
+                const expectedPattern = providerPatterns[options.provider];
+                if (expectedPattern && !expectedPattern.test(modelLower)) {
+                    process.stderr.write(`Warning: Model '${options.model}' may not be a ${options.provider} model.\n\n`);
+                }
+            }
             llmKey = options.key;
             llmProvider = options.provider;
         }
         else {
             // Try to detect from environment or server
-            const detected = await (0, llm_1.detectLlmKey)(supportedProviders, resolved);
+            // If --provider specified, prioritize that provider
+            let providersToCheck = supportedProviders;
+            if (options.provider) {
+                (0, llm_1.validateProvider)(options.provider);
+                providersToCheck = [options.provider];
+                // Warn on potential model/provider mismatch
+                if (options.model) {
+                    const modelLower = options.model.toLowerCase();
+                    const providerPatterns = {
+                        openai: /^(gpt-|o1-|o3-|davinci|text-)/,
+                        anthropic: /^claude-/,
+                        gemini: /^gemini-/,
+                        ollama: /^(llama|mistral|deepseek|phi|qwen)/,
+                    };
+                    const expectedPattern = providerPatterns[options.provider];
+                    if (expectedPattern && !expectedPattern.test(modelLower)) {
+                        process.stderr.write(`Warning: Model '${options.model}' may not be a ${options.provider} model.\n\n`);
+                    }
+                }
+            }
+            const detected = await (0, llm_1.detectLlmKey)(providersToCheck, resolved);
             if (detected) {
                 llmKey = detected.key;
                 llmProvider = detected.provider;
@@ -204,12 +239,17 @@ argument or --file option instead.
         // Headers can be logged by proxies/load balancers, body is not logged by default
         let llmCredentials;
         if (llmKey && llmProvider) {
-            llmCredentials = { api_key: llmKey, provider: llmProvider };
+            llmCredentials = {
+                api_key: llmKey,
+                provider: llmProvider,
+                ...(options.model && { model: options.model }),
+            };
         }
         else if (agentMeta.type === 'prompt') {
             // Warn if no key found for prompt-based agent
-            const providerList = supportedProviders.join(', ');
-            process.stderr.write(`Warning: No LLM key found for providers: ${providerList}\n` +
+            const searchedProviders = options.provider ? [options.provider] : supportedProviders;
+            const providerList = searchedProviders.join(', ');
+            process.stderr.write(`Warning: No LLM key found for provider(s): ${providerList}\n` +
                 `Set an env var (e.g., OPENAI_API_KEY), run 'orchagent keys add <provider>', use --key, or configure in web dashboard\n\n`);
         }
         // Add skill headers

package/dist/commands/run.js

@@ -291,7 +291,7 @@ async function detectAllLlmKeys(supportedProviders, config) {
     }
     return providers;
 }
-async function executePromptLocally(agentData, inputData, skillPrompts = [], config, providerOverride) {
+async function executePromptLocally(agentData, inputData, skillPrompts = [], config, providerOverride, modelOverride) {
     // If provider override specified, validate and use only that provider
     if (providerOverride) {
         (0, llm_1.validateProvider)(providerOverride);
@@ -318,7 +318,7 @@ async function executePromptLocally(agentData, inputData, skillPrompts = [], con
         // Apply agent default models to each provider config
         const providersWithModels = allProviders.map((p) => ({
             ...p,
-            model: agentData.default_models?.[p.provider] || p.model,
+            model: modelOverride || agentData.default_models?.[p.provider] || p.model,
         }));
         // Show which provider is being used (primary)
         const primary = providersWithModels[0];
@@ -345,8 +345,8 @@ async function executePromptLocally(agentData, inputData, skillPrompts = [], con
             `Set an environment variable (e.g., OPENAI_API_KEY), run 'orchagent keys add <provider>', or configure in web dashboard`);
     }
     const { provider, key, model: serverModel } = detected;
-    // Priority: server config model > agent default model > hardcoded default
-    const model = serverModel || agentData.default_models?.[provider] || (0, llm_1.getDefaultModel)(provider);
+    // Priority: CLI override > server config model > agent default model > hardcoded default
+    const model = modelOverride || serverModel || agentData.default_models?.[provider] || (0, llm_1.getDefaultModel)(provider);
     // Show which provider is being used (helpful for debugging rate limits)
     process.stderr.write(`Running with ${provider} (${model})...\n`);
     // Call the LLM directly
@@ -772,6 +772,7 @@ function registerRunCommand(program) {
         .option('--here', 'Scan current directory (passes absolute path to agent)')
         .option('--path <dir>', 'Shorthand for --input \'{"path": "<dir>"}\'')
         .option('--provider <name>', 'LLM provider to use (openai, anthropic, gemini, ollama)')
+        .option('--model <model>', 'LLM model to use (overrides agent default)')
         .addHelpText('after', `
 Examples:
   orch run orchagent/leak-finder --input '{"path": "."}'
@@ -793,6 +794,19 @@ Note: Use 'run' for local execution, 'call' for server-side execution.
         else if (options.path) {
             options.input = JSON.stringify({ path: options.path });
         }
+        if (options.model && options.provider) {
+            const modelLower = options.model.toLowerCase();
+            const providerPatterns = {
+                openai: /^(gpt-|o1-|o3-|davinci|text-)/,
+                anthropic: /^claude-/,
+                gemini: /^gemini-/,
+                ollama: /^(llama|mistral|deepseek|phi|qwen)/,
+            };
+            const expectedPattern = providerPatterns[options.provider];
+            if (expectedPattern && !expectedPattern.test(modelLower)) {
+                process.stderr.write(`Warning: Model '${options.model}' may not be a ${options.provider} model.\n\n`);
+            }
+        }
         const resolved = await (0, config_1.getResolvedConfig)();
         const parsed = parseAgentRef(agentRef);
         const org = parsed.org ?? resolved.defaultOrg;
@@ -941,7 +955,7 @@ Note: Use 'run' for local execution, 'call' for server-side execution.
         }
         // Execute locally
         process.stderr.write(`Executing locally...\n\n`);
-        const result = await executePromptLocally(agentData, inputData, skillPrompts, resolved, options.provider);
+        const result = await executePromptLocally(agentData, inputData, skillPrompts, resolved, options.provider, options.model);
         if (options.json) {
             (0, output_1.printJson)(result);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orchagent/cli",
-  "version": "0.3.17",
+  "version": "0.3.19",
   "description": "Command-line interface for the orchagent AI agent marketplace",
   "license": "MIT",
   "author": "orchagent <hello@orchagent.io>",