acdev 1.0.6 → 1.0.8

package/package.json

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

package/public/app.js

@@ -129,6 +129,73 @@ let settingsSaving = false;
 let settingsTab = 'ticket';
 /** Sentinel: no model selected (jobs blocked until user picks one). */
 const NO_MODEL = '-';
+const OPENROUTER_AGENT_MODEL_PREFIX = 'anthropic/';
+/** @type {string} */
+let modelSourceHintBase = '';
+/**
+ * @param {string} modelId
+ * @returns {boolean}
+ */
+function isOpenRouterAgentCompatibleModel(modelId) {
+  if (!modelId || !String(modelId).includes('/')) return false;
+  return String(modelId).trim().toLowerCase().startsWith(OPENROUTER_AGENT_MODEL_PREFIX);
+}
+
+/**
+ * @param {HTMLElement} btn
+ * @param {{ id: string, agentCompatible?: boolean }} model
+ */
+function appendModelCompatibilityBadge(btn, model) {
+  if (currentLlmProviderSelection() !== 'openrouter') return;
+  const compatible =
+    model.agentCompatible ?? isOpenRouterAgentCompatibleModel(model.id);
+  const badge = document.createElement('span');
+  badge.className = compatible
+    ? 'model-picker-badge model-picker-badge--agent'
+    : 'model-picker-badge model-picker-badge--reference';
+  badge.textContent = compatible ? 'Agent' : 'May not work';
+  badge.title = compatible
+    ? 'Supported for acdev agent jobs (anthropic/* via Claude Agent SDK)'
+    : 'Listed for reference; agent jobs require anthropic/* models';
+  btn.appendChild(badge);
+}
+
+/**
+ * @param {HTMLElement} btn
+ * @param {{ id: string, label?: string, name?: string, agentCompatible?: boolean }} model
+ */
+function populateModelPickerOption(btn, model) {
+  const titleRow = document.createElement('span');
+  titleRow.className = 'model-picker-option-title-row';
+
+  const title = document.createElement('span');
+  title.className = 'model-picker-option-title';
+  title.textContent = modelPickerLabel(model);
+  titleRow.appendChild(title);
+  appendModelCompatibilityBadge(titleRow, model);
+  btn.appendChild(titleRow);
+
+  if (model.id !== modelPickerLabel(model)) {
+    const sub = document.createElement('span');
+    sub.className = 'model-picker-option-id';
+    sub.textContent = model.id;
+    btn.appendChild(sub);
+  }
+}
+
+function refreshModelSourceHint() {
+  if (!els.settingsModelHint) return;
+  const provider = currentLlmProviderSelection();
+  let text = modelSourceHintBase;
+  if (
+    provider === 'openrouter' &&
+    !isNoModelSelection(currentModel) &&
+    !isOpenRouterAgentCompatibleModel(currentModel)
+  ) {
+    text += ` Selected model "${currentModel}" may not work for agent jobs — choose an anthropic/* model to run jobs.`;
+  }
+  els.settingsModelHint.textContent = text;
+}
 /** @type {string} */
 let currentModel = 'claude-sonnet-5';
 /** @type {Array<{id:string,label?:string,name?:string}>} */
@@ -3012,6 +3079,7 @@ function updateModelLabel() {
     els.modelCombined.title = combined;
   }
   syncAgentPickerDisplay();
+  refreshModelSourceHint();
 }
 
 /**
@@ -3019,8 +3087,10 @@ function updateModelLabel() {
  * @returns {Array<{id:string,label?:string,name?:string}>}
  */
 function getAvailableModels(provider = currentLlmProviderSelection()) {
-  if (availableModelsProvider === provider) return availableModels;
-  return [];
+  if (availableModelsProvider === provider && availableModels.length) {
+    return availableModels;
+  }
+  return defaultModelsForProvider(provider);
 }
 
 /**
@@ -3281,16 +3351,7 @@ function renderModelComboboxList(instance, selectedId = currentModel) {
       btn.classList.add('is-active');
     }
 
-    const title = document.createElement('span');
-    title.textContent = modelPickerLabel(m);
-    btn.appendChild(title);
-
-    if (m.id !== modelPickerLabel(m)) {
-      const sub = document.createElement('span');
-      sub.className = 'model-picker-option-id';
-      sub.textContent = m.id;
-      btn.appendChild(sub);
-    }
+    populateModelPickerOption(btn, m);
 
     btn.addEventListener('click', () => {
       instance.onSelect(m.id);
@@ -3477,16 +3538,7 @@ function renderAgentPickerModelList(instance, selectedId = currentModel) {
       btn.classList.add('is-active');
     }
 
-    const title = document.createElement('span');
-    title.textContent = modelPickerLabel(m);
-    btn.appendChild(title);
-
-    if (m.id !== modelPickerLabel(m)) {
-      const sub = document.createElement('span');
-      sub.className = 'model-picker-option-id';
-      sub.textContent = m.id;
-      btn.appendChild(sub);
-    }
+    populateModelPickerOption(btn, m);
 
     btn.addEventListener('click', () => {
       instance.onSelect(m.id);
@@ -3637,10 +3689,16 @@ function lastModelForProvider(provider) {
 function defaultModelsForProvider(provider = 'claude') {
   if (provider === 'openrouter') {
     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-sonnet-4', label: 'Claude Sonnet 4 (Anthropic)', agentCompatible: true },
+      { id: 'anthropic/claude-opus-4', label: 'Claude Opus 4 (Anthropic)', agentCompatible: true },
+      { id: 'anthropic/claude-3.5-sonnet', label: 'Claude 3.5 Sonnet (Anthropic)', agentCompatible: true },
+      { id: 'anthropic/claude-3.7-sonnet', label: 'Claude 3.7 Sonnet (Anthropic)', agentCompatible: true },
+      { id: 'openai/gpt-4o', label: 'GPT-4o (OpenAI)', agentCompatible: false },
+      { id: 'openai/gpt-4o-mini', label: 'GPT-4o Mini (OpenAI)', agentCompatible: false },
+      { id: 'google/gemini-2.5-pro-preview', label: 'Gemini 2.5 Pro Preview (Google)', agentCompatible: false },
+      { id: 'qwen/qwen3-235b-a22b', label: 'Qwen3 235B (Qwen)', agentCompatible: false },
+      { id: 'deepseek/deepseek-chat-v3-0324', label: 'DeepSeek Chat V3 (DeepSeek)', agentCompatible: false },
+      { id: 'meta-llama/llama-3.3-70b-instruct', label: 'Llama 3.3 70B Instruct (Meta)', agentCompatible: false },
     ];
   }
   return [
@@ -3661,22 +3719,23 @@ function updateModelSourceHint(source, provider = 'claude') {
   if (!els.settingsModelHint) return;
   const name = provider === 'openrouter' ? 'OpenRouter' : 'Claude';
   if (source === 'anthropic') {
-    els.settingsModelHint.textContent =
+    modelSourceHintBase =
       `${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.';
+    modelSourceHintBase =
+      'OpenRouter models for agent runs. Full catalog from OpenRouter Models API. Agent jobs require anthropic/* models (marked “Agent” in the list).';
   } 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).';
+      modelSourceHintBase =
+        'OpenRouter models for agent runs. Showing curated catalog (live list unavailable — set OPENROUTER_API_KEY in Authentication). Agent jobs require anthropic/* models.';
     } else {
-      els.settingsModelHint.textContent =
+      modelSourceHintBase =
         'Claude model for agent runs. Showing curated Claude Code models (live list unavailable — set an API key or use claude auth login).';
     }
   } else {
-    els.settingsModelHint.textContent = `${name} model for agent runs.`;
+    modelSourceHintBase = `${name} model for agent runs.`;
   }
+  refreshModelSourceHint();
 }
 
 /**
@@ -3722,7 +3781,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). All models are listed; agent jobs need anthropic/* models.'
         : 'Agent runs use Claude via Anthropic API, OAuth token, or claude auth login.';
   }
 }
@@ -3733,13 +3792,16 @@ function syncLlmProviderSelects(provider) {
 function populateSettingsModels(data) {
   const provider = data?.provider || currentLlmProviderSelection();
   const cached = getAvailableModels(provider);
-  const models = Array.isArray(data?.models)
+  let models = Array.isArray(data?.models)
     ? data.models
     : data?.reconcileProvider
       ? []
       : cached.length
         ? cached
         : defaultModelsForProvider(provider);
+  if (!models.length && data?.source) {
+    models = defaultModelsForProvider(provider);
+  }
   setAvailableModels(provider, models);
 
   if (data?.reconcileProvider) {
@@ -3759,10 +3821,9 @@ function populateSettingsModels(data) {
   updateModelLabel();
 }
 
-function modelsForFetchFallback(provider, reconcileProvider) {
-  if (reconcileProvider) return [];
+function modelsForFetchFallback(provider) {
   const cached = getAvailableModels(provider);
-  if (cached.length) return cached;
+  if (availableModelsProvider === provider && cached.length) return cached;
   return defaultModelsForProvider(provider);
 }
 
@@ -3780,7 +3841,7 @@ async function fetchModels(opts = {}) {
     const res = await fetch(`/api/models?${query.toString()}`);
     if (!res.ok) {
       populateSettingsModels({
-        models: modelsForFetchFallback(provider, reconcileProvider),
+        models: modelsForFetchFallback(provider),
         selected: currentModel,
         provider,
         reconcileProvider,
@@ -3798,7 +3859,7 @@ async function fetchModels(opts = {}) {
   } catch (err) {
     console.error('Failed to fetch models:', err);
     populateSettingsModels({
-      models: modelsForFetchFallback(provider, reconcileProvider),
+      models: modelsForFetchFallback(provider),
       selected: currentModel,
       provider,
       reconcileProvider,
@@ -4380,11 +4441,13 @@ function applyConfigSnapshot(data) {
 async function fetchConfig() {
   try {
     const res = await fetch('/api/config');
-    if (!res.ok) return;
+    if (!res.ok) return null;
     const data = await readJson(res);
     applyConfigSnapshot(data);
+    return data;
   } catch (err) {
     console.error('Failed to fetch config:', err);
+    return null;
   }
 }
 
@@ -5032,7 +5095,10 @@ els.logJobFilter.addEventListener('change', () => {
 });
 
 applyTheme(loadTheme());
-fetchConfig();
-fetchModels();
+void (async () => {
+  const cfg = await fetchConfig();
+  const provider = cfg?.llmProvider === 'openrouter' ? 'openrouter' : 'claude';
+  await fetchModels({ provider });
+})();
 fetchJobs();
 setInterval(fetchJobs, 3000);

package/public/styles.css

@@ -2298,6 +2298,40 @@ body.diff-fs-open {
   cursor: pointer;
 }
 
+.model-picker-option-title-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+}
+
+.model-picker-option-title {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.model-picker-badge {
+  flex-shrink: 0;
+  padding: 1px 6px;
+  border-radius: 999px;
+  font-size: 10px;
+  font-weight: 600;
+  letter-spacing: 0.02em;
+  text-transform: uppercase;
+}
+
+.model-picker-badge--agent {
+  color: var(--primary);
+  background: color-mix(in srgb, var(--primary) 14%, transparent);
+}
+
+.model-picker-badge--reference {
+  color: var(--text-muted);
+  background: color-mix(in srgb, var(--text-muted) 12%, transparent);
+}
+
 .model-picker-option:hover,
 .model-picker-option.is-active {
   background: var(--surface-2);

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,24 @@ export const MODEL_OPTIONS = CLAUDE_MODEL_OPTIONS;
 
 export const DEFAULT_MODEL = 'claude-sonnet-5';
 
-/** Curated OpenRouter model ids used as defaults + fallback. */
+/**
+ * OpenRouter slugs commonly used with acdev. Curated list is merged with the
+ * live OpenRouter catalog; anthropic/* entries are agent-compatible.
+ */
+export const OPENROUTER_AGENT_MODEL_PREFIX = 'anthropic/';
+
+/** Curated OpenRouter model ids used as defaults + fallback when the live API is unavailable. */
 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)' },
+  { id: 'openai/gpt-4o-mini', label: 'GPT-4o Mini (OpenAI)' },
+  { id: 'google/gemini-2.5-pro-preview', label: 'Gemini 2.5 Pro Preview (Google)' },
+  { id: 'qwen/qwen3-235b-a22b', label: 'Qwen3 235B (Qwen)' },
+  { id: 'deepseek/deepseek-chat-v3-0324', label: 'DeepSeek Chat V3 (DeepSeek)' },
+  { id: 'meta-llama/llama-3.3-70b-instruct', label: 'Llama 3.3 70B Instruct (Meta)' },
 ];
 
 export const DEFAULT_OPENROUTER_MODEL = 'anthropic/claude-sonnet-4';
@@ -74,7 +81,7 @@ 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 {{ id: string, name?: string, label?: string, agentCompatible?: boolean }} ModelOption */
 /** @typedef {'anthropic' | 'openrouter' | 'fallback'} ModelsSource */
 /** @typedef {{ models: ModelOption[], selected: string, source: ModelsSource, provider?: LlmProvider }} ModelsListResult */
 
@@ -191,6 +198,89 @@ 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);
+}
+
+/**
+ * Mark whether each OpenRouter slug is supported for acdev agent jobs.
+ * @param {ModelOption} model
+ * @returns {ModelOption}
+ */
+export function annotateOpenRouterModelCompatibility(model) {
+  if (!model?.id) return model;
+  return {
+    ...model,
+    agentCompatible: isOpenRouterAgentCompatibleModel(model.id),
+  };
+}
+
+/**
+ * @param {ModelOption[]} models
+ * @returns {ModelOption[]}
+ */
+function annotateOpenRouterModelsCompatibility(models) {
+  return models.map(annotateOpenRouterModelCompatibility);
+}
+
+/**
+ * If the live list is empty, fall back to curated options. Listing is not
+ * filtered to anthropic/* — runtime enqueue still validates agent compatibility.
+ * @param {ModelOption[]} models
+ * @param {ModelOption[]} curated
+ * @returns {ModelOption[]}
+ */
+function ensureOpenRouterModels(models, curated) {
+  const list = models.length > 0 ? models : curated;
+  return annotateOpenRouterModelsCompatibility(list);
+}
+
+/**
+ * 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 +621,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 = ensureOpenRouterModels(models, curated);
+    }
     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 = ensureOpenRouterModels(models, curated);
+    }
     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);