nothumanallowed 16.0.60 → 16.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "16.0.60",
+  "version": "16.0.62",
   "description": "Local AI assistant: 80 tools (Gmail, Calendar, Drive, GitHub, Slack, browser, code, files), 38 agents, visual workflows (Studio, AWF, WebCraft). Install with `npm i -g nothumanallowed`, run with `nha ui`. Free tier built-in (Liara), no API key required. Your data stays on your PC — OAuth tokens local, no cloud. Open-source MIT.",
   "type": "module",
   "bin": {

package/src/constants.mjs

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-export const VERSION = '16.0.60';
+export const VERSION = '16.0.62';
 export const BASE_URL = 'https://nothumanallowed.com/cli';
 export const API_BASE = 'https://nothumanallowed.com/api/v1';
 

package/src/services/llm.mjs

@@ -634,34 +634,23 @@ export async function callOpenRouter(apiKey, model, systemPrompt, userMessage, s
   });
   if (!res.ok) {
     const err = await res.text();
-    // Auto-recovery: if OpenRouter routed to OpenAI (model is openai/*) and
-    // returned 401 mentioning platform.openai.com, the OpenRouter account has
-    // BYOK enabled with an invalid/missing OpenAI key. Retry once with safe
-    // default model anthropic/claude-sonnet-4.5 (works with OpenRouter credit).
-    const isBYOKFailure = res.status === 401 &&
-      /platform\.openai\.com|Incorrect API key/i.test(err) &&
-      model.startsWith('openai/') &&
-      !opts._retriedFromByokFailure;
-    if (isBYOKFailure) {
-      if (process.env.NHA_LOG_OPENROUTER === '1') {
-        console.error(`[openrouter] BYOK failure on ${model}, retrying with anthropic/claude-sonnet-4.5`);
-      }
-      return callOpenRouter(apiKey, 'anthropic/claude-sonnet-4.5', systemPrompt, userMessage, stream, { ...opts, _retriedFromByokFailure: true });
-    }
-    // OpenRouter often passes through misleading "platform.openai.com" key errors
-    // when the real cause is (a) invalid OpenRouter key, (b) model name without
-    // vendor prefix, (c) model requires BYOK. Provide an actionable hint.
+    // OpenRouter passes through provider-side errors verbatim. The most confusing
+    // case is "platform.openai.com" 401 — this means: OpenRouter forwarded the
+    // request to OpenAI in BYOK mode (Bring Your Own Key) and OpenAI rejected
+    // the key. We DO NOT silently swap the user's model — they chose it on purpose.
     let hint = '';
     if (res.status === 401) {
       if (/platform\.openai\.com/i.test(err)) {
-        hint = `\n  → 401 with "platform.openai.com" hint: model "${model}" routes via OpenAI but your OpenRouter account either lacks credit or has BYOK enabled with an invalid OpenAI key.\n     Fix: (1) use an Anthropic/Gemini model instead (e.g. "anthropic/claude-sonnet-4.5"), OR (2) add credit at openrouter.ai/credits, OR (3) disable BYOK in OpenRouter Settings → Integrations.`;
+        hint = `\n  → BYOK mode rejected: model "${model}" is being routed via OpenAI in BYOK (Bring Your Own Key) mode, and the OpenAI key configured on your OpenRouter account is invalid or missing.\n     Fix (keep using ${model}):\n       1. Go to openrouter.ai/settings/integrations\n       2. Either DISABLE the OpenAI integration (so OpenRouter uses its own credit), OR add a valid OpenAI key there.\n     Note: NHA will NOT silently switch to a different model — your config stays as you set it.`;
       } else {
-        hint = '\n  → 401 from OpenRouter: your sk-or-v1-... key is invalid/expired. Regenerate at openrouter.ai/keys.';
+        hint = '\n  → 401 from OpenRouter: your sk-or-v1-... key is invalid/expired. Regenerate at openrouter.ai/keys and run `nha config set key <new-key>`.';
       }
     } else if (res.status === 404) {
-      hint = '\n  → 404 from OpenRouter: model "' + model + '" does not exist. See openrouter.ai/models for valid IDs.';
+      hint = `\n  → 404 from OpenRouter: model "${model}" does not exist. See openrouter.ai/models for valid IDs (need vendor prefix like "openai/", "anthropic/", "google/").`;
     } else if (res.status === 402) {
       hint = '\n  → 402 from OpenRouter: insufficient credits. Top up at openrouter.ai/credits.';
+    } else if (res.status === 429) {
+      hint = '\n  → 429 from OpenRouter: rate limited. Wait a few seconds or upgrade your tier at openrouter.ai/settings.';
     }
     throw new Error(`OpenRouter ${res.status}: ${err}${hint}`);
   }
@@ -1099,7 +1088,19 @@ async function _callOpenAIWithTools(apiKey, model, systemPrompt, messages, tools
       headers,
       body: JSON.stringify(body),
     });
-    if (!res.ok) { const err = await res.text(); throw new Error(`${opts.baseUrl ? 'OpenRouter' : 'OpenAI'} ${res.status}: ${err}`); }
+    if (!res.ok) {
+      const err = await res.text();
+      const isOR = !!opts.baseUrl;
+      let hint = '';
+      if (isOR && res.status === 401 && /platform\.openai\.com/i.test(err)) {
+        hint = `\n  → BYOK mode rejected for model "${body.model}". OpenRouter forwarded the request to OpenAI in BYOK (Bring Your Own Key) mode, and the OpenAI key on your OpenRouter account is invalid/missing.\n     Fix: openrouter.ai/settings/integrations → either DISABLE the OpenAI integration (so OpenRouter uses its own credit), OR add a valid OpenAI key there. NHA will keep your chosen model.`;
+      } else if (isOR && res.status === 404) {
+        hint = `\n  → 404 from OpenRouter: model "${body.model}" not found. Must be in vendor/model format (e.g. "openai/gpt-4o", "anthropic/claude-sonnet-4.5").`;
+      } else if (isOR && res.status === 402) {
+        hint = '\n  → 402 from OpenRouter: insufficient credits. Top up at openrouter.ai/credits.';
+      }
+      throw new Error(`${isOR ? 'OpenRouter' : 'OpenAI'} ${res.status}: ${err}${hint}`);
+    }
 
     const reader = res.body.getReader();
     const dec = new TextDecoder();
@@ -1456,16 +1457,23 @@ function buildRequestBody(provider, model, systemPrompt, userMessage, stream) {
       stream,
     };
   }
-  // OpenAI-compatible format (OpenAI, DeepSeek, Grok, Mistral)
+  // OpenAI-compatible format (OpenAI, OpenRouter, DeepSeek, Grok, Mistral)
   const modelDefaults = {
     nha: '/opt/models/qwen3-32b',
     openai: 'gpt-4o',
+    openrouter: 'anthropic/claude-sonnet-4.5',
     deepseek: 'deepseek-chat',
     grok: 'grok-3-latest',
     mistral: 'mistral-large-latest',
   };
+  let resolvedModel = model || modelDefaults[provider] || 'gpt-4o';
+  // OpenRouter requires vendor/model format. Auto-prefix bare names so users
+  // who set "gpt-4o" or "claude-sonnet-4.5" don't hit a misleading 404/401.
+  if (provider === 'openrouter' && resolvedModel && !resolvedModel.includes('/')) {
+    resolvedModel = _autoPrefixOpenRouterModel(resolvedModel);
+  }
   const req = {
-    model: model || modelDefaults[provider] || 'gpt-4o',
+    model: resolvedModel,
     max_tokens: 8192,
     messages: [
       { role: 'system', content: systemPrompt },
@@ -1473,7 +1481,6 @@ function buildRequestBody(provider, model, systemPrompt, userMessage, stream) {
     ],
     stream,
   };
-  // NHA: add thinking control
   if (provider === 'nha') {
     req.chat_template_kwargs = { enable_thinking: false };
   }
@@ -1486,11 +1493,16 @@ function getProviderUrl(provider, model, apiKey) {
     nha: 'https://nothumanallowed.com/api/v1/liara/chat',
     anthropic: 'https://api.anthropic.com/v1/messages',
     openai: 'https://api.openai.com/v1/chat/completions',
+    openrouter: 'https://openrouter.ai/api/v1/chat/completions',
     deepseek: 'https://api.deepseek.com/v1/chat/completions',
     grok: 'https://api.x.ai/v1/chat/completions',
     mistral: 'https://api.mistral.ai/v1/chat/completions',
+    cohere: 'https://api.cohere.ai/v2/chat',
   };
-  return urls[provider] || urls.openai;
+  if (!urls[provider]) {
+    throw new Error(`Unknown provider "${provider}". Refusing to silently fall back to OpenAI — set a known provider via "nha config set provider <name>".`);
+  }
+  return urls[provider];
 }
 
 /** Get provider request headers */
@@ -1503,7 +1515,15 @@ function getProviderHeaders(provider, apiKey) {
     };
   }
   if (provider === 'nha') {
-    return { 'Content-Type': 'application/json' }; // No auth needed for free tier
+    return { 'Content-Type': 'application/json' };
+  }
+  if (provider === 'openrouter') {
+    return {
+      'Content-Type': 'application/json',
+      'Authorization': `Bearer ${apiKey}`,
+      'HTTP-Referer': 'https://nothumanallowed.com',
+      'X-Title': 'NotHumanAllowed CLI',
+    };
   }
   return {
     'Content-Type': 'application/json',