acdev 1.0.8 → 1.0.10

package/public/index.html

@@ -138,6 +138,24 @@
                   or a browse link. Press <kbd class="enqueue-kbd">Enter</kbd> to add.
                 </p>
 
+                <div class="enqueue-branch-field">
+                  <div class="enqueue-branch-label-row">
+                    <label class="field-label" for="preferred-branch">Branch name</label>
+                    <span class="enqueue-branch-optional">Optional</span>
+                  </div>
+                  <input
+                    id="preferred-branch"
+                    class="input enqueue-branch-input"
+                    type="text"
+                    spellcheck="false"
+                    autocomplete="off"
+                    placeholder="your-branch-name"
+                  >
+                  <p class="enqueue-input-hint">
+                    Leave empty to keep feat/fix + ticket title. If set, that name is used instead.
+                  </p>
+                </div>
+
                 <div class="enqueue-info-banner" id="enqueue-info-banner" role="note">
                   <svg class="enqueue-info-icon" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
                     <circle cx="12" cy="12" r="10"/>
@@ -155,10 +173,6 @@
 
                 <div class="enqueue-actions">
                   <div class="agent-picker" id="overview-agent-picker" aria-label="Agent">
-                    <select id="overview-llm-provider" class="sr-only" aria-hidden="true" tabindex="-1">
-                      <option value="claude">Claude</option>
-                      <option value="openrouter">OpenRouter</option>
-                    </select>
                     <input type="hidden" id="overview-model" value="">
                     <button
                       type="button"
@@ -171,15 +185,11 @@
                       <span class="agent-pill-icon agent-pill-icon--claude" id="overview-agent-icon" aria-hidden="true"></span>
                       <span class="agent-pill-body">
                         <span class="agent-pill-label">Agent</span>
-                        <span class="agent-pill-value" id="overview-agent-value">Claude • —</span>
+                        <span class="agent-pill-value" id="overview-agent-value">—</span>
                       </span>
                       <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="agent-picker-tabs" role="tablist" aria-label="Provider">
-                        <button type="button" class="agent-picker-tab is-active" data-provider="claude" role="tab" aria-selected="true">Claude</button>
-                        <button type="button" class="agent-picker-tab" data-provider="openrouter" role="tab" aria-selected="false">OpenRouter</button>
-                      </div>
                       <label class="sr-only" for="overview-agent-search">Search models</label>
                       <input
                         id="overview-agent-search"
@@ -538,21 +548,6 @@
                       </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">
-                          Required when LLM provider is OpenRouter. Get a key at <a href="https://openrouter.ai/keys" target="_blank" rel="noopener noreferrer">openrouter.ai/keys</a>. Stored as <code>OPENROUTER_API_KEY</code> in <code>.acdev/.env</code>.
-                        </p>
-                      </div>
-                    </div>
-                  </div>
                 </div>
               </div>
 
@@ -649,15 +644,6 @@
                 </p>
                 <div class="card settings-card">
                   <div class="settings-grid">
-                    <div class="settings-field">
-                      <label class="field-label" for="settings-llm-provider">LLM provider</label>
-                      <select id="settings-llm-provider" class="input" name="llmProvider">
-                        <option value="claude">Claude (Anthropic / Claude Code)</option>
-                        <option value="openrouter">OpenRouter</option>
-                      </select>
-                      <p class="field-hint" id="settings-llm-provider-hint">Agent runs use the selected provider and model below.</p>
-                    </div>
-
                     <div class="settings-field">
                       <label class="field-label" for="settings-base-branch">Base branch</label>
                       <input id="settings-base-branch" class="input" type="text" name="baseBranch" autocomplete="off" required>

package/public/styles.css

@@ -459,6 +459,38 @@ a { color: var(--primary); text-underline-offset: 3px; }
   color: var(--text-muted);
 }
 
+.enqueue-branch-field {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.enqueue-branch-field .field-label {
+  margin-bottom: 0;
+}
+
+.enqueue-branch-field .enqueue-input-hint {
+  margin: 0;
+}
+
+.enqueue-branch-label-row {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 8px;
+}
+
+.enqueue-branch-optional {
+  font-size: 11px;
+  font-weight: 500;
+  color: var(--text-muted);
+}
+
+.enqueue-branch-input {
+  font-family: 'JetBrains Mono', ui-monospace, monospace;
+  font-size: 13px;
+}
+
 .enqueue-kbd {
   display: inline-block;
   padding: 1px 6px;
@@ -556,10 +588,6 @@ a { color: var(--primary); text-underline-offset: 3px; }
   background: linear-gradient(145deg, #e8a87c 0%, #d97706 100%);
 }
 
-.agent-pill-icon--openrouter {
-  background: linear-gradient(145deg, #7c8cf5 0%, #5b4fe8 100%);
-}
-
 .agent-pill-body {
   flex: 1;
   min-width: 0;
@@ -2298,13 +2326,6 @@ 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;
@@ -2312,26 +2333,6 @@ body.diff-fs-open {
   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

@@ -2,7 +2,6 @@ import { query } from '@anthropic-ai/claude-agent-sdk';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { ensureNoAiAttributionSettings, getIssueTitle } from './git.js';
-import { isValidLlmProvider } from './models.js';
 import { extractUsageFromResult } from './usage.js';
 
 const execFileAsync = promisify(execFile);
@@ -397,66 +396,6 @@ async function fetchIssueTitle(issueUrl, worktreePath) {
  */
 export const DISALLOWED_AGENT_TOOLS = ['Task', 'TaskOutput', 'AskUserQuestion'];
 
-const OPENROUTER_ANTHROPIC_BASE_URL = 'https://openrouter.ai/api';
-
-/**
- * Run an agent query with provider-specific Anthropic env overrides.
- * OpenRouter uses Claude Agent SDK via Anthropic-compatible "skin" routing.
- * @template T
- * @param {object} config
- * @param {() => Promise<T>} fn
- * @returns {Promise<T>}
- */
-export async function withLlmProviderEnv(config, fn) {
-  const provider = isValidLlmProvider(config.llmProvider) ? config.llmProvider : 'claude';
-  if (provider !== 'openrouter') {
-    return fn();
-  }
-
-  const apiKey = (process.env.OPENROUTER_API_KEY || '').trim();
-  if (!apiKey) {
-    throw new Error(
-      'OpenRouter is not authenticated. Add OPENROUTER_API_KEY in Settings → Authentication.'
-    );
-  }
-
-  /** @type {Record<string, string | undefined>} */
-  const saved = {
-    ANTHROPIC_BASE_URL: process.env.ANTHROPIC_BASE_URL,
-    ANTHROPIC_AUTH_TOKEN: process.env.ANTHROPIC_AUTH_TOKEN,
-    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';
-  }
-  if (!process.env.X_TITLE) {
-    process.env.X_TITLE = 'acdev';
-  }
-
-  try {
-    return await fn();
-  } finally {
-    for (const [key, value] of Object.entries(saved)) {
-      if (value === undefined) {
-        delete process.env[key];
-      } else {
-        process.env[key] = value;
-      }
-    }
-  }
-}
-
 /**
  * Prefer the first successful SDK result. A known SDK bug can emit a follow-up
  * `error_during_execution` right after success when async subagents finish.
@@ -483,78 +422,76 @@ export function mergeAgentResult(current, incoming) {
  * }} params
  */
 async function runAgentQuery({ prompt, worktreePath, config, onEvent, queryFn = query }) {
-  return withLlmProviderEnv(config, async () => {
-    const timeoutMs = config.agentTimeoutMs ?? 900_000;
-    let lastMessage = null;
-    let resultMessage = null;
-    const abortController = new AbortController();
-
-    // Claude Agent SDK defaults to injecting Co-Authored-By trailers into commit
-    // instructions unless attribution is cleared via Claude settings.
-    ensureNoAiAttributionSettings(worktreePath);
-
-    const runLoop = async () => {
-      try {
-        for await (const message of queryFn({
-          // String prompt = single-turn SDK input (still uses stream-json transport).
-          prompt,
-          options: {
-            cwd: worktreePath,
-            allowedTools: config.allowedTools,
-            disallowedTools: DISALLOWED_AGENT_TOOLS,
-            permissionMode: 'acceptEdits',
-            maxTurns: config.maxAgentTurns,
-            model: config.model || 'claude-sonnet-5',
-            // Load only local settings so our empty attribution wins without
-            // pulling in unrelated user settings.
-            settingSources: ['local'],
-            abortController,
-          },
-        })) {
-          onEvent(message);
-          lastMessage = message;
-          if (message?.type === 'result') {
-            resultMessage = mergeAgentResult(resultMessage, message);
-            // First success is authoritative — stop before SDK async-task teardown
-            // can overwrite it with a spurious streaming-mode error.
-            if (message.subtype === 'success') {
-              abortController.abort();
-              break;
-            }
-          }
-        }
-      } catch (err) {
-        // Aborting after success can surface as an iterator/abort error.
-        if (resultMessage?.subtype === 'success') return;
-        throw err;
-      }
-    };
+  const timeoutMs = config.agentTimeoutMs ?? 900_000;
+  let lastMessage = null;
+  let resultMessage = null;
+  const abortController = new AbortController();
+
+  // Claude Agent SDK defaults to injecting Co-Authored-By trailers into commit
+  // instructions unless attribution is cleared via Claude settings.
+  ensureNoAiAttributionSettings(worktreePath);
 
-    let timeoutId;
+  const runLoop = async () => {
     try {
-      await Promise.race([
-        runLoop(),
-        new Promise((_, reject) => {
-          timeoutId = setTimeout(() => {
+      for await (const message of queryFn({
+        // String prompt = single-turn SDK input (still uses stream-json transport).
+        prompt,
+        options: {
+          cwd: worktreePath,
+          allowedTools: config.allowedTools,
+          disallowedTools: DISALLOWED_AGENT_TOOLS,
+          permissionMode: 'acceptEdits',
+          maxTurns: config.maxAgentTurns,
+          model: config.model || 'claude-sonnet-5',
+          // Load only local settings so our empty attribution wins without
+          // pulling in unrelated user settings.
+          settingSources: ['local'],
+          abortController,
+        },
+      })) {
+        onEvent(message);
+        lastMessage = message;
+        if (message?.type === 'result') {
+          resultMessage = mergeAgentResult(resultMessage, message);
+          // First success is authoritative — stop before SDK async-task teardown
+          // can overwrite it with a spurious streaming-mode error.
+          if (message.subtype === 'success') {
             abortController.abort();
-            reject(new Error(`Agent timed out after ${timeoutMs}ms`));
-          }, timeoutMs);
-        }),
-      ]);
-    } finally {
-      if (timeoutId) clearTimeout(timeoutId);
+            break;
+          }
+        }
+      }
+    } catch (err) {
+      // Aborting after success can surface as an iterator/abort error.
+      if (resultMessage?.subtype === 'success') return;
+      throw err;
     }
+  };
 
-    if (!resultMessage || resultMessage.subtype !== 'success') {
-      const detail = lastMessage ? JSON.stringify(lastMessage) : 'no result received';
-      throw new Error(`Agent did not complete successfully: ${detail}`);
-    }
+  let timeoutId;
+  try {
+    await Promise.race([
+      runLoop(),
+      new Promise((_, reject) => {
+        timeoutId = setTimeout(() => {
+          abortController.abort();
+          reject(new Error(`Agent timed out after ${timeoutMs}ms`));
+        }, timeoutMs);
+      }),
+    ]);
+  } finally {
+    if (timeoutId) clearTimeout(timeoutId);
+  }
 
-    const resultText = resultMessage.result ?? '';
-    const meta = extractPrMetadata(resultText);
-    const usage = extractUsageFromResult(resultMessage);
-    return { resultText, meta, usage };
-  });
+  if (!resultMessage || resultMessage.subtype !== 'success') {
+    const detail = lastMessage ? JSON.stringify(lastMessage) : 'no result received';
+    throw new Error(`Agent did not complete successfully: ${detail}`);
+  }
+
+  const resultText = resultMessage.result ?? '';
+  const meta = extractPrMetadata(resultText);
+  const usage = extractUsageFromResult(resultMessage);
+  return { resultText, meta, usage };
 }
 
 function stubAgentResult(onEvent, title, body) {