acdev 1.0.10 → 1.0.12

package/src/server.js

@@ -33,14 +33,15 @@ import {
   runAgentOnReviewFeedback,
   stripAiAttribution,
 } from './agent.js';
-import { publicConfig, updateConfig } from './config.js';
+import { publicConfig, updateConfig, normalizeLlmProvider } from './config.js';
 import { upsertEnvVars } from './env.js';
 import { listModels } from './models.js';
 import { splitIssueUrls } from './urls.js';
-import { usageFromLogs, withJobUsage } from './usage.js';
+import { usageFromLogs, withJobUsage, snapshotJobLlm, tagUsageProvider } from './usage.js';
 import { checkGhAuth } from './gh-auth.js';
 import { checkClaudeAuth } from './claude-auth.js';
-import { isValidModelId, isNoModel, NO_MODEL } from './models.js';
+import { checkOpenRouterAuth } from './openrouter-auth.js';
+import { isValidModelId, isNoModel, NO_MODEL, isModelIdForProvider } from './models.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -233,15 +234,39 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         };
       }
 
-      const claude = doCheckClaudeAuth();
-      if (!claude.ok) {
+      const provider = normalizeLlmProvider(config.llmProvider);
+      if (!isModelIdForProvider(model, provider)) {
         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',
+            provider === 'openrouter'
+              ? 'Invalid OpenRouter model. Choose a model from the OpenRouter catalog in Settings → Configuration.'
+              : 'Invalid Claude model. Choose a model in Settings → Configuration.',
+          code: 'model_invalid',
         };
       }
+
+      if (provider === 'openrouter') {
+        const orAuth = checkOpenRouterAuth();
+        if (!orAuth.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',
+          };
+        }
+      } 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',
+          };
+        }
+      }
     }
 
     return null;
@@ -279,6 +304,25 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
     return store.updateJob(job.id, { logs });
   }
 
+  /**
+   * Persist current LLM provider/model on the job and emit a log line.
+   * @param {string} jobId
+   */
+  function stampJobLlm(jobId) {
+    const snap = snapshotJobLlm(config);
+    let job = store.getJob(jobId);
+    if (!job) return undefined;
+    job = store.updateJob(jobId, snap);
+    job = appendLog(job, 'llm', {
+      provider: snap.llmProvider,
+      model: snap.model,
+    });
+    if (job?.logs?.length) {
+      emitEvent(jobId, job.logs[job.logs.length - 1]);
+    }
+    return job;
+  }
+
   function setStatus(jobId, status, extra = {}) {
     if (!store.getJob(jobId)) return undefined;
     const job = store.updateJob(jobId, { status, ...extra });
@@ -305,6 +349,9 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
       return;
     }
 
+    job = stampJobLlm(jobId);
+    if (!job) return;
+
     try {
       job = setStatus(jobId, 'syncing');
       if (!job) return;
@@ -348,29 +395,6 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         issueType,
         issueTitle
       );
-      // #region agent log
-      try {
-        fs.appendFileSync(
-          '/Users/giancarlogarcia/Documents/Personal/Projects-2026/agent-mcp/.cursor/debug-473a78.log',
-          `${JSON.stringify({
-            sessionId: '473a78',
-            runId: 'pre-fix',
-            hypothesisId: 'C',
-            location: 'src/server.js:resolveDesiredBranchName',
-            message: 'resolved worktree branch name',
-            data: {
-              preferred: job.preferredBranchName ?? null,
-              issueType,
-              usedCustom: Boolean(job.preferredBranchName),
-              desiredBranchName,
-            },
-            timestamp: Date.now(),
-          })}\n`
-        );
-      } catch {
-        // ignore debug log failures
-      }
-      // #endregion
       const worktreeId = worktreeIdForJob(job);
       if (worktreeId == null) {
         throw new Error('Job is missing issueNumber / jiraKey for worktree path');
@@ -430,7 +454,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         prTitle: stripAiAttribution(prTitle),
         prBody: stripAiAttribution(prBody),
       };
-      if (usage) patch.usage = usage;
+      if (usage) patch.usage = tagUsageProvider(usage, config.llmProvider);
       setStatus(jobId, 'awaiting_review', patch);
     } catch (err) {
       const message = formatAgentJobError(err);
@@ -443,7 +467,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         status: 'failed',
         error: message,
       };
-      if (usage) failPatch.usage = usage;
+      if (usage) failPatch.usage = tagUsageProvider(usage, config.llmProvider);
       store.updateJob(jobId, failPatch);
       const updated = store.getJob(jobId);
       if (updated?.logs?.length) {
@@ -490,6 +514,9 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
       return;
     }
 
+    job = stampJobLlm(jobId);
+    if (!job) return;
+
     try {
       const onEvent = (message) => {
         const current = store.getJob(jobId);
@@ -531,7 +558,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         prBody: stripAiAttribution(prBody),
         pendingReviewFeedback: undefined,
       };
-      if (usage) patch.usage = usage;
+      if (usage) patch.usage = tagUsageProvider(usage, config.llmProvider);
       setStatus(jobId, 'awaiting_review', patch);
     } catch (err) {
       const message = formatAgentJobError(err);
@@ -545,7 +572,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         error: message,
         pendingReviewFeedback: undefined,
       };
-      if (usage) failPatch.usage = usage;
+      if (usage) failPatch.usage = tagUsageProvider(usage, config.llmProvider);
       store.updateJob(jobId, failPatch);
       const updated = store.getJob(jobId);
       if (updated?.logs?.length) {
@@ -599,7 +626,18 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         req.query.refresh === '1' ||
         req.query.refresh === 'true' ||
         req.query.force === '1';
-      const result = await listModels({ selected: config.model, force });
+      const provider = normalizeLlmProvider(
+        typeof req.query.provider === 'string' ? req.query.provider : config.llmProvider
+      );
+      const selected =
+        provider === normalizeLlmProvider(config.llmProvider)
+          ? config.model
+          : config.lastModelsByProvider?.[provider];
+      const result = await listModels({
+        selected,
+        force,
+        provider,
+      });
       res.json(result);
     } catch (err) {
       res.status(500).json({ error: err.message });
@@ -623,6 +661,7 @@ 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();
@@ -640,6 +679,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         ghToken: _gh,
         anthropicApiKey: _ak,
         claudeOauthToken: _oa,
+        openrouterApiKey: _or,
         ...configPatch
       } = patch;
       updateConfig(repoRoot, config, configPatch);
@@ -691,29 +731,6 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         return res.status(400).json({ error: preferredParsed.error });
       }
       const preferredBranchName = preferredParsed.value;
-      // #region agent log
-      try {
-        fs.appendFileSync(
-          '/Users/giancarlogarcia/Documents/Personal/Projects-2026/agent-mcp/.cursor/debug-473a78.log',
-          `${JSON.stringify({
-            sessionId: '473a78',
-            runId: 'pre-fix',
-            hypothesisId: 'A',
-            location: 'src/server.js:POST /api/issues',
-            message: 'enqueue preferred branch parse',
-            data: {
-              rawProvided: req.body?.branchName != null,
-              rawType: typeof req.body?.branchName,
-              preferredBranchName: preferredBranchName ?? null,
-              urlCount: urls.length,
-            },
-            timestamp: Date.now(),
-          })}\n`
-        );
-      } catch {
-        // ignore debug log failures
-      }
-      // #endregion
 
       const ticketSource =
         req.body?.ticketSource === 'jira' || req.body?.ticketSource === 'github'
@@ -804,12 +821,15 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
           skipped.push(item.jiraKey || item.url);
           continue;
         }
+        const llm = snapshotJobLlm(config);
         const job = store.addJob({
           issueUrl: item.url,
           issueNumber: item.number,
           ticketSource: item.ticketSource,
           jiraKey: item.jiraKey,
           ...(preferredBranchName ? { preferredBranchName } : {}),
+          llmProvider: llm.llmProvider,
+          model: llm.model,
         });
         created.push(job);
       }
@@ -1143,6 +1163,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         usage: undefined,
         pendingReviewFeedback: undefined,
         latestReviewComments: undefined,
+        ...snapshotJobLlm(config),
       });
       updated = appendLog(updated, 'status', 'retry queued');
       res.json(updated);

package/src/store.js

@@ -53,21 +53,27 @@ export class Store {
    * @param {{
    *   issueUrl: string,
    *   issueNumber?: number,
-   *   ticketSource?: 'github' | 'jira',
-   *   jiraKey?: string,
-   *   preferredBranchName?: string,
-   * }} data
-   * @returns {Job}
-   */
+ *   ticketSource?: 'github' | 'jira',
+ *   jiraKey?: string,
+ *   preferredBranchName?: string,
+ *   llmProvider?: 'claude' | 'openrouter',
+ *   model?: string,
+ * }} data
+ * @returns {Job}
+ */
   addJob(data) {
     const now = new Date().toISOString();
     const ticketSource = data.ticketSource === 'jira' ? 'jira' : 'github';
+    const llmProvider = data.llmProvider === 'openrouter' ? 'openrouter' : 'claude';
+    const model = typeof data.model === 'string' ? data.model.trim() : '';
     /** @type {Job} */
     const job = {
       id: randomUUID(),
       issueUrl: data.issueUrl,
       issueNumber: data.issueNumber,
       ticketSource,
+      llmProvider,
+      ...(model ? { model } : {}),
       ...(data.jiraKey ? { jiraKey: data.jiraKey } : {}),
       ...(data.preferredBranchName ? { preferredBranchName: data.preferredBranchName } : {}),
       status: 'queued',

package/src/usage.js

@@ -11,6 +11,7 @@
  * @property {number} [cacheCreationInputTokens]
  * @property {number} [numTurns]
  * @property {number} [durationMs]
+ * @property {'claude' | 'openrouter'} [provider]
  * @property {Record<string, object>} [modelUsage]
  */
 
@@ -23,6 +24,73 @@ function asFiniteNumber(n) {
   return n;
 }
 
+/**
+ * @param {object | null | undefined} job
+ * @returns {'claude' | 'openrouter'}
+ */
+export function jobLlmProvider(job) {
+  if (job?.llmProvider === 'openrouter') return 'openrouter';
+  if (job?.llmProvider === 'claude') return 'claude';
+  if (job?.usage?.provider === 'openrouter') return 'openrouter';
+  if (job?.usage?.provider === 'claude') return 'claude';
+  const model = String(job?.model || '');
+  return model.includes('/') ? 'openrouter' : 'claude';
+}
+
+/**
+ * Snapshot of the LLM used for a job (enqueue / run start).
+ * @param {object | null | undefined} config
+ * @returns {{ llmProvider: 'claude' | 'openrouter', model: string }}
+ */
+export function snapshotJobLlm(config) {
+  const llmProvider = config?.llmProvider === 'openrouter' ? 'openrouter' : 'claude';
+  const model = typeof config?.model === 'string' ? config.model.trim() : '';
+  return { llmProvider, model: model || '-' };
+}
+
+/**
+ * @param {JobUsage | null | undefined} usage
+ * @param {'claude' | 'openrouter' | string | undefined} provider
+ * @returns {JobUsage | null | undefined}
+ */
+export function tagUsageProvider(usage, provider) {
+  if (!usage || typeof usage !== 'object') return usage;
+  const p = provider === 'openrouter' ? 'openrouter' : 'claude';
+  return { ...usage, provider: p };
+}
+
+/**
+ * @typedef {{ totalCostUsd: number, totalTokens: number, withCost: number, withTokens: number }} UsageAgg
+ * @param {object[]} jobs
+ * @returns {{ claude: UsageAgg, openrouter: UsageAgg }}
+ */
+export function aggregateUsageByProvider(jobs) {
+  const empty = () => ({
+    totalCostUsd: 0,
+    totalTokens: 0,
+    withCost: 0,
+    withTokens: 0,
+  });
+  /** @type {{ claude: UsageAgg, openrouter: UsageAgg }} */
+  const out = { claude: empty(), openrouter: empty() };
+  if (!Array.isArray(jobs)) return out;
+  for (const job of jobs) {
+    const u = job?.usage;
+    if (!u) continue;
+    const bucket = out[jobLlmProvider(job)];
+    if (typeof u.totalCostUsd === 'number' && Number.isFinite(u.totalCostUsd)) {
+      bucket.totalCostUsd += u.totalCostUsd;
+      bucket.withCost += 1;
+    }
+    const tok = (u.inputTokens || 0) + (u.outputTokens || 0);
+    if (tok > 0) {
+      bucket.totalTokens += tok;
+      bucket.withTokens += 1;
+    }
+  }
+  return out;
+}
+
 /**
  * Extract usage from an SDK `result` message (success or error subtypes).
  * @param {object | null | undefined} message
@@ -70,6 +138,41 @@ export function extractUsageFromResult(message) {
   return out;
 }
 
+/**
+ * Map OpenRouter Agent SDK getUsage() totals onto JobUsage.
+ * @param {object | null | undefined} totals
+ * @param {{ durationMs?: number, numTurns?: number }} [extra]
+ * @returns {JobUsage | null}
+ */
+export function extractUsageFromOpenRouter(totals, extra = {}) {
+  if (!totals || typeof totals !== 'object') return null;
+  const totalCostUsd = asFiniteNumber(totals.cost);
+  const inputTokens = asFiniteNumber(totals.inputTokens);
+  const outputTokens = asFiniteNumber(totals.outputTokens);
+  const cacheReadInputTokens = asFiniteNumber(totals.cachedTokens);
+  const numTurns = asFiniteNumber(extra.numTurns ?? totals.modelCalls);
+  const durationMs = asFiniteNumber(extra.durationMs);
+
+  const hasSignal =
+    totalCostUsd !== undefined ||
+    inputTokens !== undefined ||
+    outputTokens !== undefined ||
+    cacheReadInputTokens !== undefined ||
+    numTurns !== undefined;
+
+  if (!hasSignal) return null;
+
+  /** @type {JobUsage} */
+  const out = {};
+  if (totalCostUsd !== undefined) out.totalCostUsd = totalCostUsd;
+  if (inputTokens !== undefined) out.inputTokens = inputTokens;
+  if (outputTokens !== undefined) out.outputTokens = outputTokens;
+  if (cacheReadInputTokens !== undefined) out.cacheReadInputTokens = cacheReadInputTokens;
+  if (numTurns !== undefined) out.numTurns = numTurns;
+  if (durationMs !== undefined) out.durationMs = durationMs;
+  return out;
+}
+
 /**
  * Scan job logs for the last `agent_event` whose payload is a `result` message
  * that carries usage/cost fields. Used to backfill older jobs.