acdev 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acdev",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Local CLI + web UI for running AI agents on GitHub issues via git worktrees",
   "type": "module",
   "bin": {

package/public/app.js

@@ -3639,8 +3639,7 @@ function defaultModelsForProvider(provider = 'claude') {
     return [
       { id: 'anthropic/claude-sonnet-4', label: 'Claude Sonnet 4 (Anthropic)' },
       { id: 'anthropic/claude-opus-4', label: 'Claude Opus 4 (Anthropic)' },
-      { id: 'openai/gpt-4o', label: 'GPT-4o (OpenAI)' },
-      { id: 'x-ai/grok-2', label: 'Grok 2 (xAI)' },
+      { id: 'anthropic/claude-3.5-sonnet', label: 'Claude 3.5 Sonnet (Anthropic)' },
     ];
   }
   return [
@@ -3665,11 +3664,11 @@ function updateModelSourceHint(source, provider = 'claude') {
       `${name} model for agent runs. List loaded from Anthropic Models API.`;
   } else if (source === 'openrouter') {
     els.settingsModelHint.textContent =
-      'OpenRouter model for agent runs. List loaded from OpenRouter Models API.';
+      'OpenRouter model for agent runs (anthropic/* only — Claude Agent SDK uses Anthropic-compatible API). List loaded from OpenRouter Models API.';
   } else if (source === 'fallback') {
     if (provider === 'openrouter') {
       els.settingsModelHint.textContent =
-        'OpenRouter model for agent runs. Showing curated models (live list unavailable — set OPENROUTER_API_KEY in Authentication).';
+        'OpenRouter model for agent runs (anthropic/* only). Showing curated Anthropic models (live list unavailable — set OPENROUTER_API_KEY in Authentication).';
     } else {
       els.settingsModelHint.textContent =
         'Claude model for agent runs. Showing curated Claude Code models (live list unavailable — set an API key or use claude auth login).';
@@ -3722,7 +3721,7 @@ function syncLlmProviderSelects(provider) {
   if (els.settingsLlmProviderHint) {
     els.settingsLlmProviderHint.textContent =
       value === 'openrouter'
-        ? 'Agent runs route through OpenRouter (requires OPENROUTER_API_KEY in Authentication).'
+        ? 'Agent runs route through OpenRouter (requires OPENROUTER_API_KEY). Use anthropic/* models only.'
         : 'Agent runs use Claude via Anthropic API, OAuth token, or claude auth login.';
   }
 }

package/src/agent.js

@@ -427,11 +427,16 @@ export async function withLlmProviderEnv(config, fn) {
     ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY,
     HTTP_REFERER: process.env.HTTP_REFERER,
     X_TITLE: process.env.X_TITLE,
+    CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS: process.env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS,
   };
 
   process.env.ANTHROPIC_BASE_URL = OPENROUTER_ANTHROPIC_BASE_URL;
   process.env.ANTHROPIC_AUTH_TOKEN = apiKey;
   process.env.ANTHROPIC_API_KEY = '';
+  // OpenRouter rejects Anthropic-only beta headers on some models.
+  if (!process.env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS) {
+    process.env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS = '1';
+  }
   if (!process.env.HTTP_REFERER) {
     process.env.HTTP_REFERER = 'https://github.com/acdev';
   }

package/src/models.js

@@ -44,17 +44,19 @@ export const MODEL_OPTIONS = CLAUDE_MODEL_OPTIONS;
 
 export const DEFAULT_MODEL = 'claude-sonnet-5';
 
-/** Curated OpenRouter model ids used as defaults + fallback. */
+/**
+ * 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)' },
-  { id: 'openai/gpt-4.1', label: 'GPT-4.1 (OpenAI)' },
-  { id: 'openai/gpt-4o', label: 'GPT-4o (OpenAI)' },
-  { id: 'google/gemini-2.5-pro-preview', label: 'Gemini 2.5 Pro (Google)' },
-  { id: 'x-ai/grok-2', label: 'Grok 2 (xAI)' },
-  { id: 'x-ai/grok-2-1212', label: 'Grok 2 1212 (xAI)' },
 ];
 
 export const DEFAULT_OPENROUTER_MODEL = 'anthropic/claude-sonnet-4';
@@ -191,6 +193,64 @@ 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
@@ -531,14 +591,20 @@ async function listModelsForProvider(provider, opts = {}) {
         ? await fetchOpenRouterModels()
         : await fetchAnthropicModels();
     const live = filterModelsForProvider(liveRaw, provider);
-    const models = filterModelsForProvider(mergeModelLists(curated, live), provider);
+    let models = filterModelsForProvider(mergeModelLists(curated, live), provider);
+    if (provider === 'openrouter') {
+      models = filterOpenRouterAgentModels(models);
+    }
     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 };
   } catch {
-    const models = curated;
+    let models = curated;
+    if (provider === 'openrouter') {
+      models = filterOpenRouterAgentModels(models);
+    }
     const selected = reconcileModelForProvider(models, selectedRaw);
     const result = { models, source: /** @type {ModelsSource} */ ('fallback') };
     cacheByProvider.set(provider, { expiresAt: now + 30_000, result });

package/src/server.js

@@ -39,7 +39,7 @@ 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 } from './models.js';
+import { isValidLlmProvider, isValidModelId, isNoModel, NO_MODEL, isOpenRouterAgentCompatibleModel, enhanceOpenRouterAgentError } from './models.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -197,6 +197,14 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
     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;
+  }
+
   /**
    * Reject enqueue / agent / PR actions when required auth is missing.
    * @param {{ needGh?: boolean, needLlm?: boolean }} [opts]
@@ -245,6 +253,14 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
             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) {
@@ -421,7 +437,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
       if (usage) patch.usage = usage;
       setStatus(jobId, 'awaiting_review', patch);
     } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
+      const message = formatAgentJobError(err);
       const current = store.getJob(jobId);
       if (!current) return;
       appendLog(current, 'error', message);
@@ -522,7 +538,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
       if (usage) patch.usage = usage;
       setStatus(jobId, 'awaiting_review', patch);
     } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
+      const message = formatAgentJobError(err);
       const current = store.getJob(jobId);
       if (!current) return;
       appendLog(current, 'error', message);