acdev 1.0.7 → 1.0.9

package/src/models.js

@@ -15,7 +15,6 @@ import { join } from 'node:path';
 /**
  * Curated Claude Agent SDK / Claude Code model ids used as defaults + fallback.
  * Prefer documented Code aliases and Anthropic API ids (not invented snapshots).
- * OpenRouter slugs (provider/model) are excluded — those belong in OPENROUTER_MODEL_OPTIONS.
  */
 export const CLAUDE_MODEL_OPTIONS = [
   { id: 'claude-sonnet-5', label: 'Sonnet 5' },
@@ -44,44 +43,23 @@ export const MODEL_OPTIONS = CLAUDE_MODEL_OPTIONS;
 
 export const DEFAULT_MODEL = 'claude-sonnet-5';
 
-/**
- * OpenRouter slugs that work with acdev agent runs.
- * Agent jobs use Claude Agent SDK via OpenRouter's Anthropic-compatible API;
- * only anthropic/* models are supported on that path.
- */
-export const OPENROUTER_AGENT_MODEL_PREFIX = 'anthropic/';
-
-/** Curated OpenRouter model ids used as defaults + fallback (agent-compatible only). */
-export const OPENROUTER_MODEL_OPTIONS = [
-  { id: 'anthropic/claude-sonnet-4', label: 'Claude Sonnet 4 (Anthropic)' },
-  { id: 'anthropic/claude-opus-4', label: 'Claude Opus 4 (Anthropic)' },
-  { id: 'anthropic/claude-3.5-sonnet', label: 'Claude 3.5 Sonnet (Anthropic)' },
-  { id: 'anthropic/claude-3.7-sonnet', label: 'Claude 3.7 Sonnet (Anthropic)' },
-];
-
-export const DEFAULT_OPENROUTER_MODEL = 'anthropic/claude-sonnet-4';
-
 /** Config value meaning no model selected (jobs blocked until user picks one). */
 export const NO_MODEL = '-';
 
-/** @typedef {'claude' | 'openrouter'} LlmProvider */
-export const LLM_PROVIDERS = /** @type {const} */ (['claude', 'openrouter']);
-
-/** Loose model id shape accepted by config (Claude aliases, API ids, OpenRouter slugs). */
+/** Claude direct path ids: Anthropic API ids and Claude Code aliases (no `/`). */
 export const MODEL_ID_RE = /^[a-zA-Z0-9][a-zA-Z0-9._:\/-]{0,127}$/;
 
 const ANTHROPIC_MODELS_URL = 'https://api.anthropic.com/v1/models';
-const OPENROUTER_MODELS_URL = 'https://openrouter.ai/api/v1/models';
 const ANTHROPIC_VERSION = '2023-06-01';
 const CACHE_TTL_MS = 5 * 60_000;
 const KEYCHAIN_SERVICE = 'Claude Code-credentials';
 
 /** @typedef {{ id: string, name?: string, label?: string }} ModelOption */
-/** @typedef {'anthropic' | 'openrouter' | 'fallback'} ModelsSource */
-/** @typedef {{ models: ModelOption[], selected: string, source: ModelsSource, provider?: LlmProvider }} ModelsListResult */
+/** @typedef {'anthropic' | 'fallback'} ModelsSource */
+/** @typedef {{ models: ModelOption[], selected: string, source: ModelsSource }} ModelsListResult */
 
-/** @type {Map<LlmProvider, { expiresAt: number, result: Omit<ModelsListResult, 'selected' | 'provider'> }>} */
-const cacheByProvider = new Map();
+/** @type {{ expiresAt: number, result: Omit<ModelsListResult, 'selected'> } | null} */
+let cache = null;
 
 /** @type {typeof fetch | null} */
 let fetchImpl = null;
@@ -120,23 +98,7 @@ export function _resetCredentialsTokenResolver() {
 }
 
 export function _resetModelsCache() {
-  cacheByProvider.clear();
-}
-
-/**
- * @param {unknown} value
- * @returns {value is LlmProvider}
- */
-export function isValidLlmProvider(value) {
-  return value === 'claude' || value === 'openrouter';
-}
-
-/**
- * Default model id for an LLM provider.
- * @param {LlmProvider} [provider]
- */
-export function defaultModelForProvider(provider = 'claude') {
-  return provider === 'openrouter' ? DEFAULT_OPENROUTER_MODEL : DEFAULT_MODEL;
+  cache = null;
 }
 
 /**
@@ -176,7 +138,7 @@ function toOption(id, displayName) {
 }
 
 /**
- * Claude direct path ids: Anthropic API ids and Claude Code aliases (no provider/ prefix).
+ * Claude catalog ids: Anthropic API ids and Claude Code aliases (no provider/ prefix).
  * @param {string} id
  * @returns {boolean}
  */
@@ -185,122 +147,45 @@ export function isClaudeCatalogId(id) {
 }
 
 /**
- * OpenRouter slugs use provider/model form (always includes `/`).
- * @param {string} id
- * @returns {boolean}
- */
-export function isOpenRouterCatalogId(id) {
-  return isValidModelId(id) && String(id).includes('/');
-}
-
-/**
- * Whether an OpenRouter slug can be used for acdev agent runs.
- * Non-anthropic slugs may appear in OpenRouter's catalog but fail at runtime
- * because the Claude Agent SDK speaks Anthropic Messages API semantics.
- * @param {string} modelId
- * @returns {boolean}
- */
-export function isOpenRouterAgentCompatibleModel(modelId) {
-  if (!isOpenRouterCatalogId(modelId)) return false;
-  return String(modelId).trim().toLowerCase().startsWith(OPENROUTER_AGENT_MODEL_PREFIX);
-}
-
-/**
- * @param {ModelOption[]} models
- * @returns {ModelOption[]}
- */
-function filterOpenRouterAgentModels(models) {
-  return models.filter((m) => m?.id && isOpenRouterAgentCompatibleModel(m.id));
-}
-
-/**
- * Improve OpenRouter agent failure messages for the job UI.
- * @param {string} message
- * @param {string} [model]
- * @returns {string}
- */
-export function enhanceOpenRouterAgentError(message, model) {
-  const raw = String(message || '').trim();
-  if (!raw) return raw;
-
-  const id = String(model || '').trim();
-  const routingFailure =
-    /no allowed providers are available/i.test(raw) ||
-    /not allowed by provider/i.test(raw) ||
-    /model.*not allowed/i.test(raw);
-
-  if (id && !isOpenRouterAgentCompatibleModel(id)) {
-    return [
-      `OpenRouter model "${id}" is not supported for acdev agent runs.`,
-      'Agent jobs use the Claude Agent SDK via OpenRouter\'s Anthropic-compatible API.',
-      'Choose an anthropic/* model (e.g. anthropic/claude-sonnet-4).',
-      raw !== id ? `Provider error: ${raw}` : '',
-    ]
-      .filter(Boolean)
-      .join(' ');
-  }
-
-  if (routingFailure) {
-    return [
-      raw,
-      'If you use OpenRouter provider allowlists, clear Settings → Privacy → Providers or add the model\'s upstream provider.',
-      'For acdev, anthropic/* models on OpenRouter are the most reliable choice.',
-    ].join(' ');
-  }
-
-  return raw;
-}
-
-/**
- * Curated fallback list for a provider.
- * @param {LlmProvider} provider
+ * Curated fallback list.
  * @returns {ModelOption[]}
  */
-export function curatedModelOptions(provider) {
-  return provider === 'openrouter'
-    ? OPENROUTER_MODEL_OPTIONS.map((m) => ({ ...m }))
-    : CLAUDE_MODEL_OPTIONS.map((m) => ({ ...m }));
+export function curatedModelOptions() {
+  return CLAUDE_MODEL_OPTIONS.map((m) => ({ ...m }));
 }
 
 /**
- * Whether a model id belongs in a provider's curated catalog.
+ * Whether a model id belongs in the curated catalog.
  * @param {string} modelId
- * @param {LlmProvider} provider
  * @returns {boolean}
  */
-export function isModelInCuratedCatalog(modelId, provider) {
+export function isModelInCuratedCatalog(modelId) {
   if (isNoModel(modelId)) return false;
   const id = String(modelId).trim();
-  return curatedModelOptions(provider).some((m) => m.id === id);
+  return curatedModelOptions().some((m) => m.id === id);
 }
 
 /**
- * Whether a model id is valid for a provider (format-based, not curated-only).
- * Claude: direct ids without `/`. OpenRouter: provider/model slugs with `/`.
+ * Whether a model id is valid for Claude (direct ids without `/`).
  * @param {string} modelId
- * @param {LlmProvider} provider
  * @returns {boolean}
  */
-export function isModelIdForProvider(modelId, provider) {
+export function isModelIdForProvider(modelId) {
   if (isNoModel(modelId) || !isValidModelId(modelId)) return false;
-  const id = String(modelId).trim();
-  return provider === 'openrouter' ? isOpenRouterCatalogId(id) : isClaudeCatalogId(id);
+  return isClaudeCatalogId(String(modelId).trim());
 }
 
 /**
- * Drop ids that do not belong in this provider's catalog.
+ * Drop ids that do not belong in the Claude catalog.
  * @param {ModelOption[]} models
- * @param {LlmProvider} provider
  * @returns {ModelOption[]}
  */
-function filterModelsForProvider(models, provider) {
-  const keep =
-    provider === 'openrouter' ? isOpenRouterCatalogId : isClaudeCatalogId;
-  return models.filter((m) => m?.id && keep(m.id));
+function filterClaudeModels(models) {
+  return models.filter((m) => m?.id && isClaudeCatalogId(m.id));
 }
 
 /**
- * Merge curated options (stable order / aliases) with live rows for one provider.
+ * Merge curated options (stable order / aliases) with live rows.
  * Same ids keep curated position but prefer live display names.
  * @param {ModelOption[]} curated
  * @param {ModelOption[]} live
@@ -335,7 +220,7 @@ function mergeModelLists(curated, live) {
 }
 
 /**
- * Keep selected only when it exists in the provider model catalog.
+ * Keep selected only when it exists in the model catalog.
  * @param {ModelOption[]} models
  * @param {string} selected
  * @returns {string}
@@ -509,69 +394,14 @@ export async function fetchAnthropicModels() {
 }
 
 /**
- * @param {Response} res
- * @returns {Promise<ModelOption[]>}
- */
-async function parseOpenRouterModelsResponse(res) {
-  if (!res.ok) {
-    throw new Error(`OpenRouter Models API HTTP ${res.status}`);
-  }
-  const body = await res.json();
-  const rows = Array.isArray(body?.data) ? body.data : [];
-  /** @type {ModelOption[]} */
-  const models = [];
-  for (const row of rows) {
-    const id = typeof row?.id === 'string' ? row.id.trim() : '';
-    if (!isValidModelId(id)) continue;
-    const display =
-      typeof row.name === 'string'
-        ? row.name
-        : typeof row?.id === 'string'
-          ? row.id
-          : '';
-    models.push(toOption(id, display));
-  }
-  if (models.length === 0) {
-    throw new Error('OpenRouter Models API returned no models');
-  }
-  return models;
-}
-
-/**
- * Fetch live models from OpenRouter (no cache).
- * @returns {Promise<ModelOption[]>}
- */
-export async function fetchOpenRouterModels() {
-  const env = envResolver();
-  const apiKey = (env.OPENROUTER_API_KEY || '').trim();
-  if (!apiKey) {
-    throw new Error('No OpenRouter API key for models list');
-  }
-  const doFetch = fetchImpl || globalThis.fetch;
-  if (typeof doFetch !== 'function') {
-    throw new Error('fetch is not available');
-  }
-  const res = await doFetch(OPENROUTER_MODELS_URL, {
-    method: 'GET',
-    headers: {
-      Authorization: `Bearer ${apiKey}`,
-      'HTTP-Referer': 'https://github.com/acdev',
-      'X-Title': 'acdev',
-    },
-  });
-  return parseOpenRouterModelsResponse(res);
-}
-
-/**
- * @param {LlmProvider} provider
- * @param {{ selected?: string, force?: boolean }} opts
+ * List Claude models for the UI.
+ * @param {{ selected?: string, force?: boolean }} [opts]
  * @returns {Promise<ModelsListResult>}
  */
-async function listModelsForProvider(provider, opts = {}) {
+export async function listModels(opts = {}) {
   const selectedRaw = opts.selected;
   const force = opts.force === true;
   const now = Date.now();
-  const cache = cacheByProvider.get(provider);
 
   if (!force && cache && cache.expiresAt > now) {
     const selected = reconcileModelForProvider(cache.result.models, selectedRaw);
@@ -579,45 +409,24 @@ async function listModelsForProvider(provider, opts = {}) {
       ...cache.result,
       models: cache.result.models,
       selected,
-      provider,
     };
   }
 
-  const curated = curatedModelOptions(provider);
+  const curated = curatedModelOptions();
 
   try {
-    const liveRaw =
-      provider === 'openrouter'
-        ? await fetchOpenRouterModels()
-        : await fetchAnthropicModels();
-    const live = filterModelsForProvider(liveRaw, provider);
-    let models = filterModelsForProvider(mergeModelLists(curated, live), provider);
-    if (provider === 'openrouter') {
-      models = filterOpenRouterAgentModels(models);
-    }
+    const liveRaw = await fetchAnthropicModels();
+    const live = filterClaudeModels(liveRaw);
+    const models = filterClaudeModels(mergeModelLists(curated, live));
     const selected = reconcileModelForProvider(models, selectedRaw);
-    const source = /** @type {ModelsSource} */ (provider === 'openrouter' ? 'openrouter' : 'anthropic');
-    const result = { models, source };
-    cacheByProvider.set(provider, { expiresAt: now + CACHE_TTL_MS, result });
-    return { ...result, selected, provider };
+    const result = { models, source: /** @type {ModelsSource} */ ('anthropic') };
+    cache = { expiresAt: now + CACHE_TTL_MS, result };
+    return { ...result, selected };
   } catch {
-    let models = curated;
-    if (provider === 'openrouter') {
-      models = filterOpenRouterAgentModels(models);
-    }
+    const models = curated;
     const selected = reconcileModelForProvider(models, selectedRaw);
     const result = { models, source: /** @type {ModelsSource} */ ('fallback') };
-    cacheByProvider.set(provider, { expiresAt: now + 30_000, result });
-    return { ...result, selected, provider };
+    cache = { expiresAt: now + 30_000, result };
+    return { ...result, selected };
   }
 }
-
-/**
- * List models for the UI.
- * @param {{ selected?: string, force?: boolean, provider?: LlmProvider }} [opts]
- * @returns {Promise<ModelsListResult>}
- */
-export async function listModels(opts = {}) {
-  const provider = isValidLlmProvider(opts.provider) ? opts.provider : 'claude';
-  return listModelsForProvider(provider, opts);
-}

package/src/server.js

@@ -38,8 +38,7 @@ import { splitIssueUrls } from './urls.js';
 import { usageFromLogs, withJobUsage } from './usage.js';
 import { checkGhAuth } from './gh-auth.js';
 import { checkClaudeAuth } from './claude-auth.js';
-import { checkOpenRouterAuth } from './openrouter-auth.js';
-import { isValidLlmProvider, isValidModelId, isNoModel, NO_MODEL, isOpenRouterAgentCompatibleModel, enhanceOpenRouterAgentError } from './models.js';
+import { isValidModelId, isNoModel, NO_MODEL } from './models.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -175,7 +174,6 @@ export function normalizeReviewComments(body) {
  *     resolveJiraCredentials?: Function,
  *     checkGhAuth?: typeof checkGhAuth,
  *     checkClaudeAuth?: typeof checkClaudeAuth,
- *     checkOpenRouterAuth?: typeof checkOpenRouterAuth,
  *   },
  * }} options
  */
@@ -191,18 +189,9 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
   const doApplyFileExclusions = deps.applyFileExclusions || applyFileExclusions;
   const doCheckGhAuth = deps.checkGhAuth || checkGhAuth;
   const doCheckClaudeAuth = deps.checkClaudeAuth || checkClaudeAuth;
-  const doCheckOpenRouterAuth = deps.checkOpenRouterAuth || checkOpenRouterAuth;
-
-  function currentLlmProvider() {
-    return isValidLlmProvider(config.llmProvider) ? config.llmProvider : 'claude';
-  }
 
   function formatAgentJobError(err) {
-    let message = err instanceof Error ? err.message : String(err);
-    if (currentLlmProvider() === 'openrouter') {
-      message = enhanceOpenRouterAgentError(message, config.model);
-    }
-    return message;
+    return err instanceof Error ? err.message : String(err);
   }
 
   /**
@@ -242,35 +231,14 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         };
       }
 
-      const provider = currentLlmProvider();
-      if (provider === 'openrouter') {
-        const openrouter = doCheckOpenRouterAuth();
-        if (!openrouter.ok) {
-          return {
-            status: 400,
-            error:
-              'OpenRouter is not authenticated. Add an API key in Settings → Authentication, or start with --stub-agent.',
-            code: 'openrouter_auth_required',
-          };
-        }
-        if (!isOpenRouterAgentCompatibleModel(model)) {
-          return {
-            status: 400,
-            error:
-              `Model "${model}" is not supported for OpenRouter agent runs. acdev uses the Claude Agent SDK (Anthropic-compatible API). Choose an anthropic/* model such as anthropic/claude-sonnet-4.`,
-            code: 'openrouter_model_incompatible',
-          };
-        }
-      } else {
-        const claude = doCheckClaudeAuth();
-        if (!claude.ok) {
-          return {
-            status: 400,
-            error:
-              'Claude is not authenticated. Add an API key or OAuth token in Settings → Authentication, run claude auth login, or start with --stub-agent.',
-            code: 'claude_auth_required',
-          };
-        }
+      const claude = doCheckClaudeAuth();
+      if (!claude.ok) {
+        return {
+          status: 400,
+          error:
+            'Claude is not authenticated. Add an API key or OAuth token in Settings → Authentication, run claude auth login, or start with --stub-agent.',
+          code: 'claude_auth_required',
+        };
       }
     }
 
@@ -283,7 +251,6 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
       stubAgent: useStubAgent,
       ghAuth: doCheckGhAuth(),
       claudeAuth: doCheckClaudeAuth(),
-      openrouterAuth: doCheckOpenRouterAuth(),
     });
   }
 
@@ -603,11 +570,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         req.query.refresh === '1' ||
         req.query.refresh === 'true' ||
         req.query.force === '1';
-      const provider =
-        req.query.provider === 'openrouter' || req.query.provider === 'claude'
-          ? req.query.provider
-          : currentLlmProvider();
-      const result = await listModels({ selected: config.model, force, provider });
+      const result = await listModels({ selected: config.model, force });
       res.json(result);
     } catch (err) {
       res.status(500).json({ error: err.message });
@@ -631,7 +594,6 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
       applySecretField(envPatch, 'GH_TOKEN', patch.ghToken);
       applySecretField(envPatch, 'ANTHROPIC_API_KEY', patch.anthropicApiKey);
       applySecretField(envPatch, 'CLAUDE_CODE_OAUTH_TOKEN', patch.claudeOauthToken);
-      applySecretField(envPatch, 'OPENROUTER_API_KEY', patch.openrouterApiKey);
       if (patch.jiraBaseUrl !== undefined && typeof patch.jiraBaseUrl === 'string') {
         // Also mirror base URL into env for convenience when set via Settings
         const trimmed = patch.jiraBaseUrl.trim();
@@ -649,7 +611,6 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         ghToken: _gh,
         anthropicApiKey: _ak,
         claudeOauthToken: _oa,
-        openrouterApiKey: _or,
         ...configPatch
       } = patch;
       updateConfig(repoRoot, config, configPatch);

package/src/openrouter-auth.js

@@ -1,37 +0,0 @@
-/** @typedef {{ ok: true } | { ok: false, reason: 'missing' }} OpenRouterAuthResult */
-
-/** @type {() => NodeJS.ProcessEnv} */
-let envResolver = () => process.env;
-
-/** @param {() => NodeJS.ProcessEnv} fn */
-export function _setEnvResolver(fn) {
-  envResolver = fn;
-}
-
-export function _resetEnvResolver() {
-  envResolver = () => process.env;
-}
-
-/**
- * Whether OpenRouter can authenticate agent runs.
- * @returns {OpenRouterAuthResult}
- */
-export function checkOpenRouterAuth() {
-  const key = (envResolver().OPENROUTER_API_KEY || '').trim();
-  if (key) return { ok: true };
-  return { ok: false, reason: 'missing' };
-}
-
-/**
- * Human-readable startup warning for a failed {@link checkOpenRouterAuth}.
- * Soft-auth: server still starts so Settings can configure the key.
- * @param {OpenRouterAuthResult} [_result]
- */
-export function formatOpenRouterAuthError(_result) {
-  return [
-    '⚠ OpenRouter is not authenticated — server will still start.',
-    '  Open Settings → Authentication to add your OpenRouter API key',
-    '  (or set OPENROUTER_API_KEY in `.acdev/.env`).',
-    '  For UI-only testing without auth: pass `--stub-agent`.',
-  ].join('\n');
-}