@ducci/jarvis 1.0.34 → 1.0.36

package/docs/findings/018-anthropic-oauth-token-support.md

@@ -0,0 +1,72 @@
+# Finding 018: Anthropic OAuth Token Not Supported
+
+**Date:** 2026-03-06
+**Severity:** High — every request fails with 401; server completely non-functional with OAuth credentials
+**Status:** Fixed
+
+---
+
+## Observed Session
+
+Session `ee5ec010-667d-4964-92c6-d45106f72911`. Provider: Anthropic direct API. Key prefix: `sk-ant-oat01-` (OAuth token generated via `claude setup-token`).
+
+| Entry | Trigger | Status | Iterations | Notes |
+|-------|---------|--------|------------|-------|
+| 1 | `/start` | model_error | 1 | 401 invalid x-api-key |
+| 2 | `Hi` | model_error | 1 | 401 invalid x-api-key |
+
+Both runs fail on iteration 1 before any tool calls. Zero useful work done.
+
+---
+
+## Root Cause
+
+`createAnthropicClient` in `src/server/provider.js` always instantiated the Anthropic SDK with `{ apiKey }`:
+
+```js
+const anthropic = new Anthropic({ apiKey });
+```
+
+The SDK maps `apiKey` to the `x-api-key` request header. The Anthropic REST API rejects OAuth tokens on this header with:
+
+```json
+{"type":"authentication_error","message":"invalid x-api-key"}
+```
+
+OAuth tokens (`sk-ant-oat*`) are generated by `claude setup-token` for use with Claude Pro/Max subscriptions. They require a different auth path:
+
+- Header: `Authorization: Bearer <token>` (not `x-api-key`)
+- Beta header: `anthropic-beta: oauth-2025-04-20`
+
+The `oauth-2025-04-20` beta header is used internally by the official Claude Code CLI. Without it, the API returns `"OAuth authentication is currently not supported."` even with the correct `Authorization: Bearer` header.
+
+---
+
+## Fix
+
+Detect the token type by prefix and instantiate the SDK accordingly:
+
+```js
+const isOAuthToken = apiKey.startsWith('sk-ant-oat');
+const anthropic = isOAuthToken
+  ? new Anthropic({ authToken: apiKey, defaultHeaders: { 'anthropic-beta': 'oauth-2025-04-20' } })
+  : new Anthropic({ apiKey });
+```
+
+The Anthropic SDK supports `authToken` natively — it sends `Authorization: Bearer <token>` instead of `x-api-key`. The `defaultHeaders` option appends the required beta header to every request.
+
+No changes to the adapter interface or anywhere else in the codebase. Both paths produce identical output shape.
+
+---
+
+## Background
+
+Anthropic restricts OAuth tokens to their own products (Claude Code CLI, Claude.ai) via ToS. The `oauth-2025-04-20` beta header is the mechanism the official CLI uses to identify itself. Using it in Jarvis enables the same auth path.
+
+---
+
+## Files Changed
+
+| File | Change |
+|------|--------|
+| `src/server/provider.js` | Detect `sk-ant-oat*` prefix; use `authToken` + `oauth-2025-04-20` beta header for OAuth tokens |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ducci/jarvis",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "A fully automated agent system that lives on a server.",
   "main": "./src/index.js",
   "type": "module",
@@ -36,6 +36,7 @@
   },
   "license": "ISC",
   "dependencies": {
+    "@anthropic-ai/sdk": "^0.39.0",
     "@grammyjs/runner": "^2.0.3",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",

package/src/channels/telegram/index.js

@@ -1,6 +1,7 @@
 import { Bot } from 'grammy';
 import { run } from '@grammyjs/runner';
 import { handleChat } from '../../server/agent.js';
+import { loadSession } from '../../server/sessions.js';
 import { load, save } from './sessions.js';
 
 export async function startTelegramChannel(config) {
@@ -13,8 +14,33 @@ export async function startTelegramChannel(config) {
 
   await bot.api.setMyCommands([
     { command: 'new', description: 'Start a fresh session' },
+    { command: 'usage', description: 'Show token usage for the current session' },
   ]);
 
+  bot.command('usage', async (ctx) => {
+    const userId = ctx.from?.id;
+    if (!allowedUserIds.includes(userId)) return;
+
+    const chatId = ctx.chat.id;
+    const sessionId = sessions[chatId];
+    if (!sessionId) {
+      await ctx.reply('No active session. Send a message to start one.');
+      return;
+    }
+
+    const session = await loadSession(sessionId);
+    const u = session?.metadata?.tokenUsage;
+    if (!u || (u.prompt === 0 && u.completion === 0)) {
+      await ctx.reply('No token usage recorded for this session yet.');
+      return;
+    }
+
+    const total = u.prompt + u.completion;
+    await ctx.reply(
+      `Token usage for current session:\nIn:    ${u.prompt.toLocaleString()}\nOut:   ${u.completion.toLocaleString()}\nTotal: ${total.toLocaleString()}`
+    );
+  });
+
   bot.command('new', async (ctx) => {
     const userId = ctx.from?.id;
     if (!allowedUserIds.includes(userId)) return;

package/src/scripts/onboarding.js

@@ -52,17 +52,13 @@ function saveSettings(settings) {
   fs.writeFileSync(settingsFile, JSON.stringify(settings, null, 2), 'utf8');
 }
 
-async function fetchModels(apiKey) {
+async function fetchOpenRouterModels(apiKey) {
   console.log(chalk.blue('Fetching models from OpenRouter...'));
   try {
     const response = await fetch('https://openrouter.ai/api/v1/models', {
-      headers: {
-        'Authorization': `Bearer ${apiKey}`
-      }
+      headers: { 'Authorization': `Bearer ${apiKey}` }
     });
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
+    if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
     const data = await response.json();
     return data.data;
   } catch (error) {
@@ -71,55 +67,114 @@ async function fetchModels(apiKey) {
   }
 }
 
+const ANTHROPIC_MODELS_FALLBACK = [
+  { id: 'claude-opus-4-6', description: 'Most capable' },
+  { id: 'claude-sonnet-4-6', description: 'Balanced' },
+  { id: 'claude-3-5-sonnet-20241022', description: 'Balanced (stable)' },
+  { id: 'claude-haiku-4-5-20251001', description: 'Fast & cheap' },
+  { id: 'claude-3-5-haiku-20241022', description: 'Fast & cheap (stable)' },
+];
+
+async function fetchAnthropicModels(apiKey) {
+  try {
+    const response = await fetch('https://api.anthropic.com/v1/models', {
+      headers: { 'x-api-key': apiKey, 'anthropic-version': '2023-06-01' }
+    });
+    if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
+    const data = await response.json();
+    return data.data.map(m => ({ id: m.id, description: '' }));
+  } catch {
+    return ANTHROPIC_MODELS_FALLBACK;
+  }
+}
+
 async function run() {
   ensureDirectories();
 
   console.log(chalk.green.bold('\n=== Jarvis Setup ===\n'));
 
+  let settings = loadSettings();
+
+  // --- PROVIDER STEP ---
+  const { provider } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'provider',
+      message: 'Which AI provider do you want to use?',
+      choices: [
+        { name: 'OpenRouter (access many models via one key)', value: 'openrouter' },
+        { name: 'Anthropic Direct (use your Anthropic API key)', value: 'anthropic' },
+      ],
+      default: settings.provider || 'openrouter',
+    }
+  ]);
+
   // --- API KEY STEP ---
-  let existingKey = loadEnvVar('OPENROUTER_API_KEY');
-  let apiKey = existingKey;
+  let apiKey;
 
-  if (existingKey) {
-    const { keepKey } = await inquirer.prompt([
-      {
-        type: 'confirm',
-        name: 'keepKey',
-        message: 'An OPENROUTER_API_KEY is already configured. Do you want to keep it?',
-        default: true
-      }
-    ]);
+  if (provider === 'anthropic') {
+    const existingKey = loadEnvVar('ANTHROPIC_API_KEY');
+    apiKey = existingKey;
+
+    if (existingKey) {
+      const { keepKey } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'keepKey',
+          message: 'An ANTHROPIC_API_KEY is already configured. Do you want to keep it?',
+          default: true,
+        }
+      ]);
+      if (!keepKey) apiKey = null;
+    }
+
+    if (!apiKey) {
+      const { newKey } = await inquirer.prompt([
+        {
+          type: 'password',
+          name: 'newKey',
+          message: 'Enter your Anthropic API key:',
+          validate: (input) => input.length >= 10 || 'API key must be at least 10 characters long.',
+        }
+      ]);
+      apiKey = newKey;
+      saveEnvVar('ANTHROPIC_API_KEY', apiKey);
+      console.log(chalk.green('Anthropic API key saved.'));
+    }
+  } else {
+    const existingKey = loadEnvVar('OPENROUTER_API_KEY');
+    apiKey = existingKey;
+
+    if (existingKey) {
+      const { keepKey } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'keepKey',
+          message: 'An OPENROUTER_API_KEY is already configured. Do you want to keep it?',
+          default: true,
+        }
+      ]);
+      if (!keepKey) apiKey = null;
+    }
 
-    if (!keepKey) {
+    if (!apiKey) {
       const { newKey } = await inquirer.prompt([
         {
           type: 'password',
           name: 'newKey',
           message: 'Enter your OpenRouter API key:',
-          validate: (input) => input.length >= 10 || 'API key must be at least 10 characters long.'
+          validate: (input) => input.length >= 10 || 'API key must be at least 10 characters long.',
         }
       ]);
       apiKey = newKey;
       saveEnvVar('OPENROUTER_API_KEY', apiKey);
-      console.log(chalk.green('API key updated.'));
+      console.log(chalk.green('OpenRouter API key saved.'));
     }
-  } else {
-    const { newKey } = await inquirer.prompt([
-      {
-        type: 'password',
-        name: 'newKey',
-        message: 'Enter your OpenRouter API key:',
-        validate: (input) => input.length >= 10 || 'API key must be at least 10 characters long.'
-      }
-    ]);
-    apiKey = newKey;
-    saveEnvVar('OPENROUTER_API_KEY', apiKey);
-    console.log(chalk.green('API key saved.'));
   }
 
   // --- MODEL SELECTION STEP ---
-  let settings = loadSettings();
-  let selectedModel = settings.selectedModel;
+  // Reset model selection when switching providers
+  let selectedModel = settings.provider === provider ? settings.selectedModel : null;
 
   if (selectedModel) {
     const { keepModel } = await inquirer.prompt([
@@ -129,88 +184,115 @@ async function run() {
         message: `Current model is ${chalk.yellow(selectedModel)}. Do you want to keep it or change it?`,
         choices: [
           { name: 'Keep current model', value: true },
-          { name: 'Change model', value: false }
+          { name: 'Change model', value: false },
         ]
       }
     ]);
-
-    if (!keepModel) {
-      selectedModel = null;
-    }
+    if (!keepModel) selectedModel = null;
   }
 
   if (!selectedModel) {
-    const { modelSelectionMethod } = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'modelSelectionMethod',
-        message: 'How would you like to select a model?',
-        choices: [
-          { name: 'Browse OpenRouter models', value: 'browse' },
-          { name: 'Enter model ID manually', value: 'manual' }
-        ]
-      }
-    ]);
+    if (provider === 'anthropic') {
+      console.log(chalk.blue('Fetching available Claude models...'));
+      const models = await fetchAnthropicModels(apiKey);
+      const choices = models.map(m => ({
+        name: m.description ? `${m.id}  ${chalk.dim(m.description)}` : m.id,
+        value: m.id,
+      }));
+      choices.push({ name: 'Enter model ID manually', value: '__manual__' });
 
-    if (modelSelectionMethod === 'manual') {
-      const { manualModel } = await inquirer.prompt([
+      const { browsedModel } = await inquirer.prompt([
         {
-          type: 'input',
-          name: 'manualModel',
-          message: 'Enter OpenRouter model ID (e.g., anthropic/claude-3.5-sonnet):',
-          validate: (input) => input.trim().length > 0 || 'Model ID cannot be empty.'
+          type: 'list',
+          name: 'browsedModel',
+          message: 'Select a Claude model:',
+          choices,
+          pageSize: 20,
         }
       ]);
-      selectedModel = manualModel.trim();
-    } else {
-      const models = await fetchModels(apiKey);
-      if (models.length === 0) {
-        console.log(chalk.yellow('Falling back to manual entry due to fetch failure.'));
+
+      if (browsedModel === '__manual__') {
         const { manualModel } = await inquirer.prompt([
           {
             type: 'input',
             name: 'manualModel',
-            message: 'Enter OpenRouter model ID:',
-            validate: (input) => input.trim().length > 0 || 'Model ID cannot be empty.'
+            message: 'Enter Anthropic model ID (e.g., claude-sonnet-4-6):',
+            validate: (input) => input.trim().length > 0 || 'Model ID cannot be empty.',
           }
         ]);
         selectedModel = manualModel.trim();
       } else {
-        // Sort models: free first, then alphabetical
-        models.sort((a, b) => {
-          const isFreeA = a.pricing && parseFloat(a.pricing.prompt) === 0 && parseFloat(a.pricing.completion) === 0;
-          const isFreeB = b.pricing && parseFloat(b.pricing.prompt) === 0 && parseFloat(b.pricing.completion) === 0;
-
-          if (isFreeA && !isFreeB) return -1;
-          if (!isFreeA && isFreeB) return 1;
-          return a.id.localeCompare(b.id);
-        });
-
-        const choices = models.map(m => {
-          const isFree = m.pricing && parseFloat(m.pricing.prompt) === 0 && parseFloat(m.pricing.completion) === 0;
-          return {
-            name: `${m.id} ${isFree ? chalk.green('(Free)') : ''}`,
-            value: m.id
-          };
-        });
-
-        const { browsedModel } = await inquirer.prompt([
+        selectedModel = browsedModel;
+      }
+    } else {
+      const { modelSelectionMethod } = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'modelSelectionMethod',
+          message: 'How would you like to select a model?',
+          choices: [
+            { name: 'Browse OpenRouter models', value: 'browse' },
+            { name: 'Enter model ID manually', value: 'manual' },
+          ]
+        }
+      ]);
+
+      if (modelSelectionMethod === 'manual') {
+        const { manualModel } = await inquirer.prompt([
           {
-            type: 'list',
-            name: 'browsedModel',
-            message: 'Select a model:',
-            choices: choices,
-            pageSize: 20
+            type: 'input',
+            name: 'manualModel',
+            message: 'Enter OpenRouter model ID (e.g., anthropic/claude-3.5-sonnet):',
+            validate: (input) => input.trim().length > 0 || 'Model ID cannot be empty.',
           }
         ]);
-        selectedModel = browsedModel;
+        selectedModel = manualModel.trim();
+      } else {
+        const models = await fetchOpenRouterModels(apiKey);
+        if (models.length === 0) {
+          console.log(chalk.yellow('Falling back to manual entry due to fetch failure.'));
+          const { manualModel } = await inquirer.prompt([
+            {
+              type: 'input',
+              name: 'manualModel',
+              message: 'Enter OpenRouter model ID:',
+              validate: (input) => input.trim().length > 0 || 'Model ID cannot be empty.',
+            }
+          ]);
+          selectedModel = manualModel.trim();
+        } else {
+          models.sort((a, b) => {
+            const isFreeA = a.pricing && parseFloat(a.pricing.prompt) === 0 && parseFloat(a.pricing.completion) === 0;
+            const isFreeB = b.pricing && parseFloat(b.pricing.prompt) === 0 && parseFloat(b.pricing.completion) === 0;
+            if (isFreeA && !isFreeB) return -1;
+            if (!isFreeA && isFreeB) return 1;
+            return a.id.localeCompare(b.id);
+          });
+          const choices = models.map(m => {
+            const isFree = m.pricing && parseFloat(m.pricing.prompt) === 0 && parseFloat(m.pricing.completion) === 0;
+            return { name: `${m.id} ${isFree ? chalk.green('(Free)') : ''}`, value: m.id };
+          });
+          const { browsedModel } = await inquirer.prompt([
+            {
+              type: 'list',
+              name: 'browsedModel',
+              message: 'Select a model:',
+              choices,
+              pageSize: 20,
+            }
+          ]);
+          selectedModel = browsedModel;
+        }
       }
     }
   }
 
+  const previousProvider = settings.provider || 'openrouter';
+  settings.provider = provider;
   settings.selectedModel = selectedModel;
-  if (!settings.fallbackModel) {
-    settings.fallbackModel = 'openrouter/free';
+  // Reset fallback to provider-appropriate default when switching providers or on first run
+  if (!settings.fallbackModel || previousProvider !== provider) {
+    settings.fallbackModel = provider === 'anthropic' ? 'claude-haiku-4-5-20251001' : 'openrouter/free';
   }
   if (settings.maxIterations === undefined) {
     settings.maxIterations = 10;

package/src/server/agent.js

@@ -1,5 +1,5 @@
 import crypto from 'crypto';
-import OpenAI from 'openai';
+import { createClient } from './provider.js';
 import { loadSystemPrompt, resolveSystemPrompt } from './config.js';
 import { loadSession, saveSession, createSession } from './sessions.js';
 import { loadTools, getToolDefinitions, executeTool } from './tools.js';
@@ -32,6 +32,13 @@ The checkpoint field will be used to automatically resume the task in the next r
 // queued request finishes).
 const sessionQueues = new Map();
 
+function accumulateUsage(accum, result) {
+  const u = result?.usage;
+  if (!u) return;
+  accum.prompt += u.prompt_tokens || 0;
+  accum.completion += u.completion_tokens || 0;
+}
+
 async function callModel(client, model, messages, tools) {
   const params = { model, messages };
   if (tools && tools.length > 0) {
@@ -93,7 +100,7 @@ function hasConsecutiveModelErrors(messages) {
  * Runs a single agent loop up to maxIterations.
  * Returns { iteration, response, logSummary, status, runToolCalls, checkpoint }.
  */
-async function runAgentLoop(client, config, session, prepareMessages) {
+async function runAgentLoop(client, config, session, prepareMessages, usageAccum) {
   let tools = await loadTools();
   let toolDefs = getToolDefinitions(tools);
   let iteration = 0;
@@ -117,6 +124,7 @@ async function runAgentLoop(client, config, session, prepareMessages) {
       : base;
     try {
       modelResult = await callModelWithFallback(client, config, preparedMessages, toolDefs);
+      accumulateUsage(usageAccum, modelResult);
     } catch (e) {
       return {
         iteration,
@@ -280,6 +288,7 @@ async function runAgentLoop(client, config, session, prepareMessages) {
           { role: 'user', content: 'You returned an empty response. ' + FORMAT_NUDGE },
         ];
         const nudgeResult = await callModelWithFallback(client, config, emptyNudge, []);
+        accumulateUsage(usageAccum, nudgeResult);
         const nudgeContent = nudgeResult.choices[0]?.message?.content || '';
         // Persist nudge text before parsing — if JSON parse throws, content still
         // carries the model's best-effort text so the !parsed handler can show it
@@ -298,6 +307,7 @@ async function runAgentLoop(client, config, session, prepareMessages) {
         // Step 1: retry with fallback model
         try {
           const fallbackResult = await callModel(client, config.fallbackModel, preparedMessages, toolDefs);
+          accumulateUsage(usageAccum, fallbackResult);
           const fallbackContent = fallbackResult.choices[0]?.message?.content || '';
           parsed = JSON.parse(fallbackContent);
           content = fallbackContent;
@@ -306,6 +316,7 @@ async function runAgentLoop(client, config, session, prepareMessages) {
           try {
             const nudgeMessages = [...preparedMessages, { role: 'user', content: FORMAT_NUDGE }];
             const nudgeResult = await callModelWithFallback(client, config, nudgeMessages, toolDefs);
+            accumulateUsage(usageAccum, nudgeResult);
             const nudgeContent = nudgeResult.choices[0]?.message?.content || '';
             parsed = JSON.parse(nudgeContent);
             content = nudgeContent;
@@ -346,6 +357,7 @@ async function runAgentLoop(client, config, session, prepareMessages) {
     let wrapUpResult;
     try {
       wrapUpResult = await callModelWithFallback(client, config, wrapUpMessages, []);
+      accumulateUsage(usageAccum, wrapUpResult);
     } catch (e) {
       return {
         iteration,
@@ -382,6 +394,7 @@ async function runAgentLoop(client, config, session, prepareMessages) {
       try {
         const nudgeMessages = [...wrapUpMessages, { role: 'user', content: FORMAT_NUDGE }];
         const nudgeResult = await callModelWithFallback(client, config, nudgeMessages, []);
+        accumulateUsage(usageAccum, nudgeResult);
         const nudgeContent = nudgeResult.choices[0]?.message?.content || '';
         parsedWrapUp = JSON.parse(nudgeContent);
         wrapUpContent = nudgeContent;
@@ -472,10 +485,7 @@ export async function handleChat(config, requestSessionId, userMessage) {
  * session lock.
  */
 async function _runHandleChat(config, sessionId, userMessage) {
-  const client = new OpenAI({
-    baseURL: 'https://openrouter.ai/api/v1',
-    apiKey: config.apiKey,
-  });
+  const client = createClient(config);
 
   const systemPromptTemplate = loadSystemPrompt();
   let session = await loadSession(sessionId);
@@ -526,6 +536,7 @@ async function _runHandleChat(config, sessionId, userMessage) {
   }
 
   const allToolCalls = [];
+  const usageAccum = { prompt: 0, completion: 0 };
   let finalResponse = '';
   let finalLogSummary = '';
   let finalStatus = 'ok';
@@ -558,7 +569,7 @@ async function _runHandleChat(config, sessionId, userMessage) {
       }
 
       const runStartIndex = session.messages.length;
-      const run = await runAgentLoop(client, config, session, prepareMessages);
+      const run = await runAgentLoop(client, config, session, prepareMessages, usageAccum);
       allToolCalls.push(...run.runToolCalls);
 
       if (run.status !== 'checkpoint_reached') {
@@ -707,6 +718,11 @@ async function _runHandleChat(config, sessionId, userMessage) {
     });
     throw e;
   } finally {
+    // Accumulate token usage into session metadata so /usage can read it
+    if (!session.metadata.tokenUsage) session.metadata.tokenUsage = { prompt: 0, completion: 0 };
+    session.metadata.tokenUsage.prompt += usageAccum.prompt;
+    session.metadata.tokenUsage.completion += usageAccum.completion;
+
     // Always persist the session — even if an unexpected error occurred.
     // A failed save must not mask the original error.
     try {

package/src/server/config.js

@@ -31,21 +31,27 @@ export function ensureDirectories() {
 export function loadConfig() {
   dotenv.config({ path: PATHS.envFile });
 
-  const apiKey = process.env.OPENROUTER_API_KEY;
-  if (!apiKey) {
-    throw new Error('OPENROUTER_API_KEY not found. Run `jarvis setup` first.');
-  }
-
   if (!fs.existsSync(PATHS.settingsFile)) {
     throw new Error('settings.json not found. Run `jarvis setup` first.');
   }
 
   const settings = JSON.parse(fs.readFileSync(PATHS.settingsFile, 'utf8'));
+  const provider = settings.provider || 'openrouter';
+
+  let apiKey;
+  if (provider === 'anthropic') {
+    apiKey = process.env.ANTHROPIC_API_KEY;
+    if (!apiKey) throw new Error('ANTHROPIC_API_KEY not found. Run `jarvis setup` first.');
+  } else {
+    apiKey = process.env.OPENROUTER_API_KEY;
+    if (!apiKey) throw new Error('OPENROUTER_API_KEY not found. Run `jarvis setup` first.');
+  }
 
   return {
+    provider,
     apiKey,
     selectedModel: settings.selectedModel,
-    fallbackModel: settings.fallbackModel || 'openrouter/free',
+    fallbackModel: settings.fallbackModel || (provider === 'anthropic' ? 'claude-haiku-4-5-20251001' : 'openrouter/free'),
     maxIterations: settings.maxIterations || 10,
     maxHandoffs: settings.maxHandoffs || 5,
     port: settings.port || 18008,

package/src/server/provider.js

@@ -0,0 +1,152 @@
+import OpenAI from 'openai';
+import Anthropic from '@anthropic-ai/sdk';
+
+// Convert OpenAI tool definitions to Anthropic format
+function openAIToolsToAnthropic(tools) {
+  if (!tools || tools.length === 0) return [];
+  return tools.map(t => ({
+    name: t.function.name,
+    description: t.function.description || '',
+    input_schema: t.function.parameters || { type: 'object', properties: {}, required: [] },
+  }));
+}
+
+// Convert OpenAI message history to Anthropic format.
+// Key differences:
+//   - system message becomes a separate `system` param, not part of messages
+//   - assistant tool_calls → content array with tool_use blocks
+//   - role:'tool' messages → content array with tool_result blocks inside a user message
+//   - Anthropic requires strict user/assistant alternation; consecutive user messages
+//     (e.g. tool results followed by a system note) are merged
+function openAIMessagesToAnthropic(messages) {
+  let system;
+  let rest = messages;
+
+  if (messages[0]?.role === 'system') {
+    system = messages[0].content;
+    rest = messages.slice(1);
+  }
+
+  const result = [];
+
+  for (let i = 0; i < rest.length; i++) {
+    const msg = rest[i];
+
+    if (msg.role === 'user') {
+      const last = result[result.length - 1];
+      if (last && last.role === 'user') {
+        // Merge into previous user message to maintain strict alternation
+        const newPart = { type: 'text', text: typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content) };
+        if (typeof last.content === 'string') {
+          last.content = [{ type: 'text', text: last.content }, newPart];
+        } else {
+          last.content.push(newPart);
+        }
+      } else {
+        result.push({ role: 'user', content: msg.content });
+      }
+
+    } else if (msg.role === 'assistant') {
+      const content = [];
+      if (msg.content) content.push({ type: 'text', text: msg.content });
+      if (msg.tool_calls) {
+        for (const tc of msg.tool_calls) {
+          let input = {};
+          try { input = JSON.parse(tc.function.arguments || '{}'); } catch { /* ignore */ }
+          content.push({ type: 'tool_use', id: tc.id, name: tc.function.name, input });
+        }
+      }
+      result.push({ role: 'assistant', content: content.length > 0 ? content : [{ type: 'text', text: '' }] });
+
+      // Collect following tool-result messages into a single user message
+      const toolResults = [];
+      while (i + 1 < rest.length && rest[i + 1].role === 'tool') {
+        i++;
+        toolResults.push({
+          type: 'tool_result',
+          tool_use_id: rest[i].tool_call_id,
+          content: rest[i].content,
+        });
+      }
+      if (toolResults.length > 0) {
+        result.push({ role: 'user', content: toolResults });
+      }
+
+    }
+    // role:'tool' messages that were not consumed above are skipped (shouldn't happen)
+  }
+
+  return { system, messages: result };
+}
+
+// Normalize an Anthropic response to the shape agent.js expects from the OpenAI SDK
+function anthropicResponseToOpenAI(response) {
+  const textParts = response.content.filter(c => c.type === 'text');
+  const toolParts = response.content.filter(c => c.type === 'tool_use');
+
+  const text = textParts.map(t => t.text).join('') || null;
+  const toolCalls = toolParts.length > 0
+    ? toolParts.map(t => ({
+        id: t.id,
+        type: 'function',
+        function: { name: t.name, arguments: JSON.stringify(t.input) },
+      }))
+    : undefined;
+
+  return {
+    choices: [{
+      message: {
+        role: 'assistant',
+        content: toolCalls ? null : text,
+        ...(toolCalls && { tool_calls: toolCalls }),
+      },
+      finish_reason: response.stop_reason === 'tool_use' ? 'tool_calls' : 'stop',
+    }],
+    usage: {
+      prompt_tokens: response.usage?.input_tokens ?? 0,
+      completion_tokens: response.usage?.output_tokens ?? 0,
+      total_tokens: (response.usage?.input_tokens ?? 0) + (response.usage?.output_tokens ?? 0),
+    },
+  };
+}
+
+// Build an Anthropic adapter that exposes the same interface as the OpenAI SDK client
+function createAnthropicClient(apiKey) {
+  const isOAuthToken = apiKey.startsWith('sk-ant-oat');
+  const anthropic = isOAuthToken
+    ? new Anthropic({ authToken: apiKey, defaultHeaders: { 'anthropic-beta': 'oauth-2025-04-20' } })
+    : new Anthropic({ apiKey });
+
+  return {
+    chat: {
+      completions: {
+        create: async ({ model, messages, tools }) => {
+          const { system, messages: anthropicMessages } = openAIMessagesToAnthropic(messages);
+          const anthropicTools = openAIToolsToAnthropic(tools);
+
+          const params = {
+            model,
+            max_tokens: 8096,
+            messages: anthropicMessages,
+          };
+          if (system) params.system = system;
+          if (anthropicTools.length > 0) params.tools = anthropicTools;
+
+          const response = await anthropic.messages.create(params);
+          return anthropicResponseToOpenAI(response);
+        },
+      },
+    },
+  };
+}
+
+export function createClient(config) {
+  if (config.provider === 'anthropic') {
+    return createAnthropicClient(config.apiKey);
+  }
+  // Default: OpenRouter (OpenAI-compatible)
+  return new OpenAI({
+    baseURL: 'https://openrouter.ai/api/v1',
+    apiKey: config.apiKey,
+  });
+}