acdev 1.0.10 → 1.0.11

package/.acdev/.env.example

@@ -13,6 +13,9 @@
 # An API key takes precedence over subscription login:
 # ANTHROPIC_API_KEY=sk-ant-your-key-here
 #
+# OpenRouter (Settings → switch LLM provider to OpenRouter):
+# OPENROUTER_API_KEY=sk-or-your-key-here
+#
 # Jira Cloud (only when ticketSource is "jira" in Settings / config.json):
 # JIRA_BASE_URL=https://your-domain.atlassian.net
 # JIRA_EMAIL=you@company.com

package/bin/acdev.js

@@ -4,8 +4,9 @@ import { execSync } from 'node:child_process';
 import http from 'node:http';
 import open from 'open';
 import { checkClaudeAuth, formatClaudeAuthError } from '../src/claude-auth.js';
+import { checkOpenRouterAuth, formatOpenRouterAuthError } from '../src/openrouter-auth.js';
 import { checkGhAuth, formatGhAuthError } from '../src/gh-auth.js';
-import { loadConfig } from '../src/config.js';
+import { loadConfig, normalizeLlmProvider } from '../src/config.js';
 import { loadEnv } from '../src/env.js';
 import { migrateLegacyDataDir, migrateLegacyWorktreesDir } from '../src/paths.js';
 import { Store } from '../src/store.js';
@@ -75,9 +76,16 @@ async function main() {
   }
 
   if (!opts.stubAgent) {
-    const claudeAuth = checkClaudeAuth();
-    if (!claudeAuth.ok) {
-      console.warn(formatClaudeAuthError(claudeAuth));
+    if (normalizeLlmProvider(config.llmProvider) === 'openrouter') {
+      const openrouterAuth = checkOpenRouterAuth();
+      if (!openrouterAuth.ok) {
+        console.warn(formatOpenRouterAuthError(openrouterAuth));
+      }
+    } else {
+      const claudeAuth = checkClaudeAuth();
+      if (!claudeAuth.ok) {
+        console.warn(formatClaudeAuthError(claudeAuth));
+      }
     }
   } else {
     console.log('✓ Stub agent enabled (LLM auth not required)');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acdev",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Local CLI + web UI for running AI agents on GitHub issues via git worktrees",
   "type": "module",
   "bin": {
@@ -22,11 +22,13 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.1.77",
+    "@openrouter/agent": "^0.11.0",
     "dotenv": "^17.4.2",
     "express": "^4.21.2",
     "open": "^10.1.0",
     "simple-git": "^3.27.0",
-    "uuid": "^11.1.0"
+    "uuid": "^11.1.0",
+    "zod": "^4.5.4"
   },
   "publishConfig": {
     "access": "public"

package/public/app.js

@@ -160,6 +160,8 @@ let currentModel = 'claude-sonnet-5';
 let availableModels = [];
 /** @type {'github' | 'jira'} */
 let ticketSource = 'github';
+/** @type {'claude' | 'openrouter'} */
+let llmProvider = 'claude';
 /** @type {{
  *   repoName?: string,
  *   baseBranch?: string,
@@ -170,6 +172,8 @@ let ticketSource = 'github';
  *   knownTools?: string[],
  *   models?: Array<{id:string,label:string}>,
  *   model?: string,
+ *   llmProvider?: 'claude' | 'openrouter',
+ *   lastModelsByProvider?: { claude?: string, openrouter?: string },
  *   ticketSource?: 'github' | 'jira',
  *   jiraBaseUrl?: string,
  *   jiraEmail?: string | null,
@@ -190,6 +194,9 @@ let ticketSource = 'github';
  *   anthropicApiKeyMasked?: string | null,
  *   claudeOauthTokenSet?: boolean,
  *   claudeOauthTokenMasked?: string | null,
+ *   openrouterApiKeySet?: boolean,
+ *   openrouterApiKeyMasked?: string | null,
+ *   openrouterAuthOk?: boolean,
  *   llmAuthOk?: boolean,
  *   stubAgent?: boolean,
  * }} */
@@ -331,6 +338,13 @@ const els = {
   settingsClaudeOauth: document.getElementById('settings-claude-oauth'),
   settingsClaudeOauthClear: document.getElementById('settings-claude-oauth-clear'),
   settingsClaudeOauthHint: document.getElementById('settings-claude-oauth-hint'),
+  settingsOpenrouterStatus: document.getElementById('settings-openrouter-status'),
+  settingsOpenrouterKey: document.getElementById('settings-openrouter-key'),
+  settingsOpenrouterKeyClear: document.getElementById('settings-openrouter-key-clear'),
+  settingsOpenrouterKeyHint: document.getElementById('settings-openrouter-key-hint'),
+  settingsLlmProvider: document.getElementById('settings-llm-provider'),
+  overviewLlmProvider: document.getElementById('overview-llm-provider'),
+  sidebarAgentLabel: document.getElementById('sidebar-agent-label'),
   settingsTabs: document.getElementById('settings-tabs'),
 };
 
@@ -3008,6 +3022,7 @@ function updateModelLabel() {
     ? 'none selected'
     : currentModel;
   const combined = agentDisplayText(currentModel);
+  const providerLabel = llmProvider === 'openrouter' ? 'OpenRouter' : 'Claude';
 
   if (els.modelCurrent) {
     els.modelCurrent.textContent = modelText;
@@ -3015,7 +3030,21 @@ function updateModelLabel() {
   }
   if (els.modelCombined) {
     els.modelCombined.textContent = combined;
-    els.modelCombined.title = combined;
+    els.modelCombined.title = `${providerLabel}: ${combined}`;
+  }
+  if (els.modelProvider) {
+    els.modelProvider.textContent = providerLabel;
+  }
+  if (els.sidebarAgentLabel) {
+    els.sidebarAgentLabel.textContent = providerLabel;
+  }
+  if (els.overviewAgentIcon) {
+    els.overviewAgentIcon.classList.toggle('agent-pill-icon--claude', llmProvider !== 'openrouter');
+    els.overviewAgentIcon.classList.toggle('agent-pill-icon--openrouter', llmProvider === 'openrouter');
+  }
+  const pillLabel = els.overviewAgentTrigger?.querySelector('.agent-pill-label');
+  if (pillLabel) {
+    pillLabel.textContent = providerLabel;
   }
   syncAgentPickerDisplay();
   refreshModelSourceHint();
@@ -3521,6 +3550,16 @@ function reconcileModelForProvider(models, candidate = currentModel, storedCandi
  * @returns {Array<{id:string,label?:string,name?:string}>}
  */
 function defaultModels() {
+  if (llmProvider === 'openrouter') {
+    return [
+      { id: 'google/gemini-2.5-pro', label: 'Google: Gemini 2.5 Pro' },
+      { id: 'google/gemini-2.5-flash', label: 'Google: Gemini 2.5 Flash' },
+      { id: 'openai/gpt-4.1', label: 'OpenAI: GPT-4.1' },
+      { id: 'openai/gpt-4o', label: 'OpenAI: GPT-4o' },
+      { id: 'anthropic/claude-sonnet-4.5', label: 'Anthropic: Claude Sonnet 4.5' },
+      { id: 'anthropic/claude-opus-4.5', label: 'Anthropic: Claude Opus 4.5' },
+    ];
+  }
   return [
     { id: 'claude-sonnet-5', label: 'Sonnet 5' },
     { id: 'claude-opus-5', label: 'Opus 5' },
@@ -3532,16 +3571,24 @@ function defaultModels() {
 }
 
 /**
- * @param {'anthropic' | 'fallback' | string | undefined} source
+ * @param {'anthropic' | 'fallback' | 'openrouter' | 'openrouter-fallback' | string | undefined} source
  */
 function updateModelSourceHint(source) {
   if (!els.settingsModelHint) return;
-  if (source === 'anthropic') {
+  if (source === 'openrouter') {
+    modelSourceHintBase =
+      'OpenRouter model for agent runs. List loaded from OpenRouter Models API.';
+  } else if (source === 'openrouter-fallback') {
+    modelSourceHintBase =
+      'OpenRouter model for agent runs. Showing a short fallback list (live catalog unavailable).';
+  } else if (source === 'anthropic') {
     modelSourceHintBase =
       'Claude model for agent runs. List loaded from Anthropic Models API.';
   } else if (source === 'fallback') {
     modelSourceHintBase =
       'Claude model for agent runs. Showing curated Claude Code models (live list unavailable — set an API key or use claude auth login).';
+  } else if (llmProvider === 'openrouter') {
+    modelSourceHintBase = 'OpenRouter model for agent runs.';
   } else {
     modelSourceHintBase = 'Claude model for agent runs.';
   }
@@ -3611,6 +3658,7 @@ async function fetchModels(opts = {}) {
   }
   const query = new URLSearchParams();
   if (refresh) query.set('refresh', '1');
+  if (llmProvider) query.set('provider', llmProvider);
   try {
     const res = await fetch(`/api/models?${query.toString()}`);
     if (!res.ok) {
@@ -3753,6 +3801,13 @@ function claudeStatusText(cfg) {
   }
 }
 
+function openrouterStatusText(cfg) {
+  if (cfg.openrouterAuthOk) {
+    return 'Authenticated via OPENROUTER_API_KEY';
+  }
+  return 'Not authenticated — add an OpenRouter API key';
+}
+
 function fillAuthSettings(cfg) {
   if (els.settingsGhStatus) {
     els.settingsGhStatus.textContent = ghStatusText(cfg);
@@ -3811,6 +3866,25 @@ function fillAuthSettings(cfg) {
       ? 'OAuth token stored in <code>.acdev/.env</code> as <code>CLAUDE_CODE_OAUTH_TOKEN</code>. Settings cannot complete browser OAuth — that still needs <code>claude auth login</code> on this host.'
       : 'From <code>claude setup-token</code> for non-interactive subscription auth. Stored as <code>CLAUDE_CODE_OAUTH_TOKEN</code>. Settings cannot complete browser OAuth — that still needs <code>claude auth login</code> on this host.';
   }
+
+  if (els.settingsOpenrouterStatus) {
+    els.settingsOpenrouterStatus.textContent = openrouterStatusText(cfg);
+    els.settingsOpenrouterStatus.className = cfg.openrouterAuthOk
+      ? 'auth-status ok'
+      : 'auth-status err';
+  }
+  fillSecretInput(
+    els.settingsOpenrouterKey,
+    els.settingsOpenrouterKeyClear,
+    Boolean(cfg.openrouterApiKeySet),
+    cfg.openrouterApiKeyMasked,
+    'Paste an OpenRouter API key'
+  );
+  if (els.settingsOpenrouterKeyHint) {
+    els.settingsOpenrouterKeyHint.innerHTML = cfg.openrouterApiKeySet
+      ? 'API key stored in <code>.acdev/.env</code> as <code>OPENROUTER_API_KEY</code> (not committed). Leave blank to keep.'
+      : 'From openrouter.ai → Keys. Required when the LLM provider is OpenRouter. Stored as <code>OPENROUTER_API_KEY</code>.';
+  }
 }
 
 function fillSettingsForm(cfg) {
@@ -3819,6 +3893,7 @@ function fillSettingsForm(cfg) {
   fillAuthSettings(cfg);
 
   updateTicketSourceUI(cfg.ticketSource === 'jira' ? 'jira' : 'github');
+  updateLlmProviderUI(cfg.llmProvider === 'openrouter' ? 'openrouter' : 'claude');
 
   if (els.settingsJiraBaseUrl) {
     els.settingsJiraBaseUrl.value = cfg.jiraBaseUrl || '';
@@ -4045,6 +4120,23 @@ function updateTicketSourceUI(source) {
   }
 }
 
+/**
+ * @param {'claude' | 'openrouter'} provider
+ */
+function updateLlmProviderUI(provider) {
+  llmProvider = provider === 'openrouter' ? 'openrouter' : 'claude';
+
+  for (const toggle of [els.settingsLlmProvider, els.overviewLlmProvider]) {
+    if (!toggle) continue;
+    toggle.querySelectorAll('.source-btn').forEach((btn) => {
+      const active = btn.dataset.provider === llmProvider;
+      btn.classList.toggle('active', active);
+      btn.setAttribute('aria-pressed', active ? 'true' : 'false');
+    });
+  }
+  updateModelLabel();
+}
+
 /**
  * @param {'github' | 'jira'} next
  */
@@ -4066,6 +4158,26 @@ async function saveTicketSource(next) {
   }
 }
 
+async function saveLlmProvider(next) {
+  const provider = next === 'openrouter' ? 'openrouter' : 'claude';
+  updateLlmProviderUI(provider);
+  clearAvailableModels();
+  try {
+    const res = await fetch('/api/config', {
+      method: 'PATCH',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ llmProvider: provider }),
+    });
+    const data = await readJson(res);
+    if (res.ok) {
+      applyConfigSnapshot({ ...appConfig, ...data });
+      await fetchModels({ refresh: true, reconcile: true });
+    }
+  } catch {
+    void fetchModels({ refresh: true, reconcile: true });
+  }
+}
+
 function updateTimeoutMsHint(minutes) {
   if (!els.settingsTimeoutMs) return;
   const m = Number(minutes);
@@ -4093,6 +4205,7 @@ function setOverviewLlmFeedback(message, kind = 'ok') {
  */
 function fillOverviewLlmControls(cfg) {
   if (!cfg) return;
+  updateLlmProviderUI(cfg.llmProvider === 'openrouter' ? 'openrouter' : 'claude');
   syncAllModelComboboxValues(currentModel);
 }
 
@@ -4140,6 +4253,7 @@ function applyConfigSnapshot(data) {
   updateModelLabel();
   fillOverviewLlmControls(data);
   updateTicketSourceUI(data?.ticketSource === 'jira' ? 'jira' : 'github');
+  updateLlmProviderUI(data?.llmProvider === 'openrouter' ? 'openrouter' : 'claude');
   if (els.repoName) {
     els.repoName.textContent = data?.repoName || 'local repo';
   }
@@ -4186,6 +4300,7 @@ function readSettingsForm() {
     testCommand: testTrimmed === '' ? null : testTrimmed,
     allowedTools,
     ticketSource,
+    llmProvider,
   };
 
   const ghToken = secretPatchValue(els.settingsGhToken);
@@ -4194,6 +4309,8 @@ function readSettingsForm() {
   if (anthropicApiKey !== undefined) patch.anthropicApiKey = anthropicApiKey;
   const claudeOauthToken = secretPatchValue(els.settingsClaudeOauth);
   if (claudeOauthToken !== undefined) patch.claudeOauthToken = claudeOauthToken;
+  const openrouterApiKey = secretPatchValue(els.settingsOpenrouterKey);
+  if (openrouterApiKey !== undefined) patch.openrouterApiKey = openrouterApiKey;
 
   if (ticketSource === 'jira' || els.settingsJiraBaseUrl?.value) {
     patch.jiraBaseUrl = els.settingsJiraBaseUrl?.value?.trim() || '';
@@ -4361,6 +4478,12 @@ bindSecretClear(
   els.settingsClaudeOauthHint,
   'Saved CLAUDE_CODE_OAUTH_TOKEN will be removed when you click Save settings.'
 );
+bindSecretClear(
+  els.settingsOpenrouterKeyClear,
+  els.settingsOpenrouterKey,
+  els.settingsOpenrouterKeyHint,
+  'Saved OPENROUTER_API_KEY will be removed when you click Save settings.'
+);
 
 
 document.addEventListener('click', (ev) => {
@@ -4466,9 +4589,6 @@ els.addBtn.addEventListener('click', async () => {
 
   const urls = splitIssueUrls(text);
   const branchName = els.preferredBranch?.value?.trim() || '';
-  // #region agent log
-  fetch('http://127.0.0.1:7258/ingest/377aa5e2-15ea-4447-a68b-7ce215882bc3',{method:'POST',headers:{'Content-Type':'application/json','X-Debug-Session-Id':'473a78'},body:JSON.stringify({sessionId:'473a78',runId:'pre-fix',hypothesisId:'B',location:'public/app.js:addBtn',message:'enqueue submit',data:{hasCustom:Boolean(branchName),branchName:branchName||null,urlCount:urls.length},timestamp:Date.now()})}).catch(()=>{});
-  // #endregion
 
   try {
     const res = await fetch('/api/issues', {
@@ -4524,6 +4644,18 @@ function handleTicketSourceToggleClick(e) {
 els.settingsTicketSource?.addEventListener('click', handleTicketSourceToggleClick);
 els.overviewTicketSource?.addEventListener('click', handleTicketSourceToggleClick);
 
+function handleLlmProviderToggleClick(e) {
+  const btn = e.target.closest('.source-btn');
+  if (!btn?.dataset.provider) return;
+  const next = btn.dataset.provider === 'openrouter' ? 'openrouter' : 'claude';
+  if (next === llmProvider) return;
+  e.stopPropagation();
+  void saveLlmProvider(next);
+}
+
+els.settingsLlmProvider?.addEventListener('click', handleLlmProviderToggleClick);
+els.overviewLlmProvider?.addEventListener('click', handleLlmProviderToggleClick);
+
 els.enqueueJiraSettingsLink?.addEventListener('click', (e) => {
   e.preventDefault();
   setView('settings');

package/public/index.html

@@ -72,7 +72,7 @@
       <div class="sidebar-footer">
         <div class="sidebar-divider"></div>
         <div class="model-block">
-          <div class="model-label">Agent</div>
+          <div class="model-label" id="sidebar-agent-label">Agent</div>
           <div class="model-meta-row">
             <span class="model-combined" id="model-combined">—</span>
           </div>
@@ -190,6 +190,10 @@
                       <svg class="agent-pill-chevron" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m6 9 6 6 6-6"/></svg>
                     </button>
                     <div class="agent-picker-panel" id="overview-agent-panel" role="dialog" aria-label="Choose agent model" aria-hidden="true">
+                      <div class="source-toggle source-toggle--compact agent-picker-provider" id="overview-llm-provider" role="group" aria-label="LLM provider">
+                        <button type="button" class="source-btn active" data-provider="claude">Claude</button>
+                        <button type="button" class="source-btn" data-provider="openrouter">OpenRouter</button>
+                      </div>
                       <label class="sr-only" for="overview-agent-search">Search models</label>
                       <input
                         id="overview-agent-search"
@@ -548,6 +552,21 @@
                       </div>
                     </div>
                   </div>
+
+                  <div class="card settings-card">
+                    <div class="rules-heading">OpenRouter authentication</div>
+                    <p id="settings-openrouter-status" class="auth-status" role="status">Checking OpenRouter auth…</p>
+                    <div class="settings-grid">
+                      <div class="settings-field settings-field-full">
+                        <label class="field-label" for="settings-openrouter-key">OpenRouter API key</label>
+                        <input id="settings-openrouter-key" class="input" type="password" name="openrouterApiKey" autocomplete="new-password" placeholder="Leave blank to keep existing">
+                        <button type="button" class="auth-clear hidden" id="settings-openrouter-key-clear">Clear saved API key</button>
+                        <p class="field-hint" id="settings-openrouter-key-hint">
+                          From openrouter.ai → Keys. Required when the LLM provider is OpenRouter. Stored as <code>OPENROUTER_API_KEY</code>.
+                        </p>
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
 
@@ -643,6 +662,14 @@
                   Changes save to <code>.acdev/config.json</code> and apply to the next job — no restart needed.
                 </p>
                 <div class="card settings-card">
+                  <div class="settings-field settings-field-full">
+                    <div class="field-label">LLM provider</div>
+                    <div class="source-toggle" id="settings-llm-provider" role="group" aria-label="LLM provider">
+                      <button type="button" class="source-btn active" data-provider="claude">Claude</button>
+                      <button type="button" class="source-btn" data-provider="openrouter">OpenRouter</button>
+                    </div>
+                    <p class="field-hint">Claude uses the Claude Agent SDK. OpenRouter uses <code>@openrouter/agent</code> with the same coding tools (any catalog model).</p>
+                  </div>
                   <div class="settings-grid">
                     <div class="settings-field">
                       <label class="field-label" for="settings-base-branch">Base branch</label>
@@ -682,7 +709,7 @@
                           ></ul>
                         </div>
                       </div>
-                      <p class="field-hint" id="settings-model-hint">Claude model for agent runs.</p>
+                      <p class="field-hint" id="settings-model-hint">Model for agent runs.</p>
                     </div>
 
                     <div class="settings-field">

package/public/styles.css

@@ -588,6 +588,10 @@ a { color: var(--primary); text-underline-offset: 3px; }
   background: linear-gradient(145deg, #e8a87c 0%, #d97706 100%);
 }
 
+.agent-pill-icon--openrouter {
+  background: linear-gradient(145deg, #7c9cff 0%, #4f46e5 100%);
+}
+
 .agent-pill-body {
   flex: 1;
   min-width: 0;
@@ -636,7 +640,7 @@ a { color: var(--primary); text-underline-offset: 3px; }
   display: flex;
   flex-direction: column;
   width: min(360px, calc(100vw - 48px));
-  max-height: 320px;
+  max-height: 360px;
   background: var(--surface);
   border: 1px solid var(--border);
   border-radius: 10px;
@@ -713,6 +717,16 @@ a { color: var(--primary); text-underline-offset: 3px; }
   background: transparent;
 }
 
+.agent-picker-provider {
+  margin: 10px 10px 0;
+  max-width: none;
+}
+
+.agent-picker-provider .source-btn {
+  padding: 7px 10px;
+  font-size: 12px;
+}
+
 .agent-picker-search {
   flex-shrink: 0;
   min-height: 36px;

package/src/agent.js

@@ -3,6 +3,7 @@ import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { ensureNoAiAttributionSettings, getIssueTitle } from './git.js';
 import { extractUsageFromResult } from './usage.js';
+import { runOpenRouterQuery } from './openrouter-agent.js';
 
 const execFileAsync = promisify(execFile);
 
@@ -494,6 +495,42 @@ async function runAgentQuery({ prompt, worktreePath, config, onEvent, queryFn =
   return { resultText, meta, usage };
 }
 
+/**
+ * Dispatch Claude Agent SDK vs OpenRouter Agent SDK.
+ * @param {{
+ *   prompt: string,
+ *   worktreePath: string,
+ *   config: object,
+ *   onEvent: (message: unknown) => void,
+ *   queryFn?: typeof query,
+ *   callModelFn?: (args: object) => object,
+ * }} params
+ */
+async function runConfiguredQuery({
+  prompt,
+  worktreePath,
+  config,
+  onEvent,
+  queryFn,
+  callModelFn,
+}) {
+  if (config.llmProvider === 'openrouter') {
+    const out = await runOpenRouterQuery({
+      prompt,
+      worktreePath,
+      config,
+      onEvent,
+      callModelFn,
+    });
+    return {
+      resultText: out.resultText,
+      meta: extractPrMetadata(out.resultText),
+      usage: out.usage,
+    };
+  }
+  return runAgentQuery({ prompt, worktreePath, config, onEvent, queryFn });
+}
+
 function stubAgentResult(onEvent, title, body) {
   const fakeResult = {
     type: 'result',
@@ -543,6 +580,7 @@ function stubAgentResult(onEvent, title, body) {
  *   jiraKey?: string,
  *   jiraIssue?: object,
  *   queryFn?: typeof query,
+ *   callModelFn?: (args: object) => object,
  * }} params
  */
 export async function runAgentOnIssue({
@@ -557,6 +595,7 @@ export async function runAgentOnIssue({
   jiraKey,
   jiraIssue,
   queryFn = query,
+  callModelFn,
 }) {
   if (stub) {
     await new Promise((resolve) => setTimeout(resolve, 2000));
@@ -567,19 +606,22 @@ export async function runAgentOnIssue({
     return stubAgentResult(onEvent, 'Fix issue (stub)', body);
   }
 
-  const { resultText, meta, usage } = await runAgentQuery({
-    prompt: buildPrompt(issueUrl, config, {
-      branchName,
-      issueNumber,
-      ticketSource,
-      jiraKey,
-      jiraIssue,
-      jiraPrLinkPhrase: config.jiraPrLinkPhrase,
-    }),
+  const prompt = buildPrompt(issueUrl, config, {
+    branchName,
+    issueNumber,
+    ticketSource,
+    jiraKey,
+    jiraIssue,
+    jiraPrLinkPhrase: config.jiraPrLinkPhrase,
+  });
+
+  const { resultText, meta, usage } = await runConfiguredQuery({
+    prompt,
     worktreePath,
     config,
     onEvent,
     queryFn,
+    callModelFn,
   });
 
   if (meta) {
@@ -612,6 +654,7 @@ export async function runAgentOnIssue({
  *   ticketSource?: 'github' | 'jira',
  *   jiraKey?: string,
  *   queryFn?: typeof query,
+ *   callModelFn?: (args: object) => object,
  * }} params
  */
 export async function runAgentOnReviewFeedback({
@@ -627,6 +670,7 @@ export async function runAgentOnReviewFeedback({
   ticketSource,
   jiraKey,
   queryFn = query,
+  callModelFn,
 }) {
   if (stub) {
     await new Promise((resolve) => setTimeout(resolve, 500));
@@ -637,22 +681,25 @@ export async function runAgentOnReviewFeedback({
     return stubAgentResult(onEvent, 'Address review feedback (stub)', body);
   }
 
-  const { resultText, meta, usage } = await runAgentQuery({
-    prompt: buildReviewFeedbackPrompt({
-      issueUrl,
-      generalComment,
-      lineComments,
-      config,
-      branchName,
-      issueNumber,
-      ticketSource,
-      jiraKey,
-      jiraPrLinkPhrase: config.jiraPrLinkPhrase,
-    }),
+  const prompt = buildReviewFeedbackPrompt({
+    issueUrl,
+    generalComment,
+    lineComments,
+    config,
+    branchName,
+    issueNumber,
+    ticketSource,
+    jiraKey,
+    jiraPrLinkPhrase: config.jiraPrLinkPhrase,
+  });
+
+  const { resultText, meta, usage } = await runConfiguredQuery({
+    prompt,
     worktreePath,
     config,
     onEvent,
     queryFn,
+    callModelFn,
   });
 
   if (meta) {