nothumanallowed 16.0.59 → 16.0.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "16.0.59",
+  "version": "16.0.61",
   "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.59';
+export const VERSION = '16.0.61';
 export const BASE_URL = 'https://nothumanallowed.com/cli';
 export const API_BASE = 'https://nothumanallowed.com/api/v1';
 

package/src/services/llm.mjs

@@ -605,7 +605,11 @@ export function _autoPrefixOpenRouterModel(model) {
  * Model names: "anthropic/claude-sonnet-4.5", "openai/gpt-4o", "google/gemini-2.5-pro"...
  */
 export async function callOpenRouter(apiKey, model, systemPrompt, userMessage, stream = false, opts = {}) {
+  const originalModel = model;
   model = _autoPrefixOpenRouterModel(model);
+  if (process.env.NHA_LOG_OPENROUTER === '1') {
+    console.error(`[openrouter] model resolved: "${originalModel}" → "${model}"`);
+  }
   const body = {
     model: model || 'anthropic/claude-sonnet-4.5',
     max_tokens: opts.max_tokens || 8192,
@@ -630,16 +634,23 @@ export async function callOpenRouter(apiKey, model, systemPrompt, userMessage, s
   });
   if (!res.ok) {
     const err = await res.text();
-    // 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) {
-      hint = '\n  → 401 from OpenRouter usually means: (1) your sk-or-v1-... key is invalid/expired (regenerate at openrouter.ai/keys), or (2) the model name "' + model + '" needs a vendor prefix like "anthropic/' + model.replace(/^[a-z-]+\//, '') + '". This call auto-prefixed to "' + model + '".';
+      if (/platform\.openai\.com/i.test(err)) {
+        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 and run `nha config set key <new-key>`.';
+      }
     } else if (res.status === 404) {
-      hint = '\n  → 404 from OpenRouter usually means the 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 means insufficient credits. Top up at openrouter.ai/credits.';
+      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}`);
   }
@@ -1077,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();