@yeaft/webchat-agent 0.1.1011 → 0.1.1012

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.1011",
+  "version": "0.1.1012",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/yeaft/llm/anthropic.js

@@ -62,11 +62,29 @@ const API_VERSION = '2023-06-01';
 export class AnthropicAdapter extends LLMAdapter {
   #apiKey;
   #baseUrl;
+  #authHeaderMode;
 
-  constructor({ apiKey, baseUrl = DEFAULT_BASE_URL }) {
+  /**
+   * @param {{ apiKey: string, baseUrl?: string, authHeaderMode?: 'x-api-key'|'bearer' }} config
+   */
+  constructor({ apiKey, baseUrl = DEFAULT_BASE_URL, authHeaderMode = 'x-api-key' }) {
     super({ apiKey, baseUrl });
     this.#apiKey = apiKey;
     this.#baseUrl = baseUrl;
+    this.#authHeaderMode = authHeaderMode === 'bearer' ? 'bearer' : 'x-api-key';
+  }
+
+  #headers() {
+    const headers = {
+      'Content-Type': 'application/json',
+      'anthropic-version': API_VERSION,
+    };
+    if (this.#authHeaderMode === 'bearer') {
+      headers.Authorization = `Bearer ${this.#apiKey}`;
+    } else {
+      headers['x-api-key'] = this.#apiKey;
+    }
+    return headers;
   }
 
   /**
@@ -159,23 +177,24 @@ export class AnthropicAdapter extends LLMAdapter {
    * @param {string} body
    */
   #classifyError(status, body) {
+    const authHint = `auth=${this.#authHeaderMode}`;
     if (status === 401 || status === 403) {
-      return new LLMAuthError(`Anthropic auth error: ${body}`, status);
+      return new LLMAuthError(`Anthropic auth error (${authHint}): ${body}`, status);
     }
     if (status === 429) {
       const retryAfter = null; // Could parse retry-after header
-      return new LLMRateLimitError(`Anthropic rate limit: ${body}`, status, retryAfter);
+      return new LLMRateLimitError(`Anthropic rate limit (${authHint}): ${body}`, status, retryAfter);
     }
     if (status === 529) {
-      return new LLMRateLimitError(`Anthropic overloaded: ${body}`, status);
+      return new LLMRateLimitError(`Anthropic overloaded (${authHint}): ${body}`, status);
     }
     if (body.includes('prompt is too long') || body.includes('max_tokens')) {
-      return new LLMContextError(`Anthropic context error: ${body}`);
+      return new LLMContextError(`Anthropic context error (${authHint}): ${body}`);
     }
     if (status >= 500) {
-      return new LLMServerError(`Anthropic server error: ${body}`, status);
+      return new LLMServerError(`Anthropic server error (${authHint}): ${body}`, status);
     }
-    return new Error(`Anthropic API error ${status}: ${body}`);
+    return new Error(`Anthropic API error ${status} (${authHint}): ${body}`);
   }
 
   /**
@@ -205,11 +224,7 @@ export class AnthropicAdapter extends LLMAdapter {
     if (translatedTools) body.tools = translatedTools;
 
     const url = `${this.#baseUrl}/v1/messages`;
-    const headers = {
-      'Content-Type': 'application/json',
-      'x-api-key': this.#apiKey,
-      'anthropic-version': API_VERSION,
-    };
+    const headers = this.#headers();
 
     // Expose the raw request (auth-redacted) for the debug panel. The body
     // is captured verbatim — never truncated — so "copy request" matches
@@ -456,11 +471,7 @@ export class AnthropicAdapter extends LLMAdapter {
 
     const response = await fetch(`${this.#baseUrl}/v1/messages`, {
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': this.#apiKey,
-        'anthropic-version': API_VERSION,
-      },
+      headers: this.#headers(),
       body: JSON.stringify(body),
       signal,
     });

package/yeaft/llm/router.js

@@ -23,7 +23,12 @@
 
 import { LLMAdapter } from './adapter.js';
 import { getModelEffortOptions, getThinkingCapability, normalizeEffort, parseModelRef } from '../models.js';
-import { normalizeKnownProviderForRuntime } from './known-providers.js';
+import {
+  GITHUB_COPILOT_BASE_URL,
+  GITHUB_COPILOT_CREDENTIAL_PROVIDER,
+  GITHUB_COPILOT_PROVIDER_NAME,
+  normalizeKnownProviderForRuntime,
+} from './known-providers.js';
 import { pairSanitize } from '../pair-sanitize.js';
 
 /**
@@ -182,6 +187,31 @@ function sliceUnchanged(original, cleaned) {
   return true;
 }
 
+function normalizedOrigin(url) {
+  try {
+    return new URL(url).origin;
+  } catch {
+    return '';
+  }
+}
+
+/**
+ * Anthropic native uses x-api-key. Copilot's Anthropic-compatible endpoint uses
+ * a bearer token, and dynamic credential providers generally hand back bearer
+ * tokens unless explicitly overridden.
+ *
+ * @param {object} provider
+ * @returns {'x-api-key'|'bearer'}
+ */
+export function anthropicAuthHeaderModeForProvider(provider) {
+  const explicit = provider?.anthropicAuthHeaderMode || provider?.authHeaderMode;
+  if (explicit === 'bearer' || explicit === 'x-api-key') return explicit;
+  if (provider?.credentialProvider) return 'bearer';
+  if (provider?.name === GITHUB_COPILOT_PROVIDER_NAME) return 'bearer';
+  if (normalizedOrigin(provider?.baseUrl) === GITHUB_COPILOT_BASE_URL) return 'bearer';
+  return 'x-api-key';
+}
+
 /**
  * AdapterRouter — Implements LLMAdapter, routes by model → provider.
  */
@@ -393,7 +423,11 @@ export class AdapterRouter extends LLMAdapter {
     // header. For static providers the apiKey never changes so this stays
     // a one-time-build cache exactly like before.
     const apiKeyFp = apiKey ? this.#shortFingerprint(apiKey) : 'none';
-    const cacheKey = `${provider.name}::${protocol}::${apiKeyFp}`;
+    const anthropicAuthHeaderMode = protocol === 'anthropic'
+      ? anthropicAuthHeaderModeForProvider(provider)
+      : null;
+    const authModeKey = anthropicAuthHeaderMode || 'default';
+    const cacheKey = `${provider.name}::${protocol}::${authModeKey}::${apiKeyFp}`;
     const cached = this.#adapterCache.get(cacheKey);
     if (cached) return { adapter: cached, modelId: entry.id };
 
@@ -403,7 +437,7 @@ export class AdapterRouter extends LLMAdapter {
     // (Copilot tokens rotate every ~30 min). Static-apiKey providers never
     // change fingerprint, so this loop never finds anything to evict for
     // them — back-compat preserved.
-    const prefix = `${provider.name}::${protocol}::`;
+    const prefix = `${provider.name}::${protocol}::${authModeKey}::`;
     for (const key of this.#adapterCache.keys()) {
       if (key.startsWith(prefix)) this.#adapterCache.delete(key);
     }
@@ -415,6 +449,7 @@ export class AdapterRouter extends LLMAdapter {
       adapter = new AnthropicAdapter({
         apiKey,
         baseUrl: provider.baseUrl,
+        authHeaderMode: anthropicAuthHeaderMode,
       });
     } else if (protocol === 'openai-responses') {
       // OpenAI Responses API (/v1/responses) — canonical OpenAI-compatible path.