acdev 1.0.2 → 1.0.4

package/src/server.js

@@ -33,8 +33,11 @@ import {
 } from './agent.js';
 import { publicConfig, updateConfig } 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 { checkGhAuth } from './gh-auth.js';
+import { checkClaudeAuth } from './claude-auth.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -76,6 +79,23 @@ function jobDedupeKey(job) {
   }
   return `github:${job.issueUrl}`;
 }
+
+/**
+ * Empty string = leave the existing secret unchanged; null = clear.
+ * @param {Record<string, string | null>} envPatch
+ * @param {string} envKey
+ * @param {unknown} value
+ */
+function applySecretField(envPatch, envKey, value) {
+  if (value === undefined) return;
+  if (value === null) {
+    envPatch[envKey] = null;
+    return;
+  }
+  if (typeof value === 'string' && value.trim()) {
+    envPatch[envKey] = value.trim();
+  }
+}
 /**
  * Normalize + validate POST /api/jobs/:id/review body.
  * @param {unknown} body
@@ -146,9 +166,13 @@ export function normalizeReviewComments(body) {
  *     listChangedFiles?: typeof listChangedFiles,
  *     applyFileExclusions?: typeof applyFileExclusions,
  *     transitionJiraIssue?: Function,
+ *     addJiraIssueLabel?: Function,
+ *     closeJiraIssue?: Function,
  *     addIssueLabel?: Function,
  *     closeIssue?: Function,
  *     resolveJiraCredentials?: Function,
+ *     checkGhAuth?: typeof checkGhAuth,
+ *     checkClaudeAuth?: typeof checkClaudeAuth,
  *   },
  * }} options
  */
@@ -162,6 +186,52 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
   const doGetDiff = deps.getDiff || getDiff;
   const doListChangedFiles = deps.listChangedFiles || listChangedFiles;
   const doApplyFileExclusions = deps.applyFileExclusions || applyFileExclusions;
+  const doCheckGhAuth = deps.checkGhAuth || checkGhAuth;
+  const doCheckClaudeAuth = deps.checkClaudeAuth || checkClaudeAuth;
+
+  /**
+   * Reject enqueue / agent / PR actions when required auth is missing.
+   * @param {{ needGh?: boolean, needClaude?: boolean }} [opts]
+   * @returns {{ status: number, error: string, code: string } | null}
+   */
+  function authGate(opts = {}) {
+    const needGh = opts.needGh !== false;
+    const needClaude = opts.needClaude === true && !useStubAgent;
+
+    if (needGh) {
+      const gh = doCheckGhAuth();
+      if (!gh.ok) {
+        const error =
+          gh.reason === 'not-found'
+            ? 'GitHub CLI (gh) is not installed. Install it from https://cli.github.com/, then restart acdev.'
+            : 'GitHub is not authenticated. Configure a PAT in Settings → Authentication, or run gh auth login.';
+        return { status: 400, error, code: 'gh_auth_required' };
+      }
+    }
+
+    if (needClaude) {
+      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;
+  }
+
+  function publicConfigPayload() {
+    return publicConfig(config, {
+      repoRoot,
+      stubAgent: useStubAgent,
+      ghAuth: doCheckGhAuth(),
+      claudeAuth: doCheckClaudeAuth(),
+    });
+  }
 
   /** @type {Map<string, Set<import('http').ServerResponse>>} */
   const subscribers = new Map();
@@ -201,6 +271,17 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
     let job = store.getJob(jobId);
     if (!job) return;
 
+    const gate = authGate({ needGh: true, needClaude: true });
+    if (gate) {
+      appendLog(job, 'error', gate.error);
+      store.updateJob(jobId, { status: 'failed', error: gate.error });
+      const updated = store.getJob(jobId);
+      if (updated?.logs?.length) {
+        emitEvent(jobId, updated.logs[updated.logs.length - 1]);
+      }
+      return;
+    }
+
     try {
       job = setStatus(jobId, 'syncing');
       if (!job) return;
@@ -329,6 +410,21 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
     let job = store.getJob(jobId);
     if (!job || job.status !== 'applying_feedback') return;
 
+    const gate = authGate({ needGh: false, needClaude: true });
+    if (gate) {
+      appendLog(job, 'error', gate.error);
+      store.updateJob(jobId, {
+        status: 'failed',
+        error: gate.error,
+        pendingReviewFeedback: undefined,
+      });
+      const updated = store.getJob(jobId);
+      if (updated?.logs?.length) {
+        emitEvent(jobId, updated.logs[updated.logs.length - 1]);
+      }
+      return;
+    }
+
     const feedback = job.pendingReviewFeedback;
     if (!feedback || (!feedback.generalComment && !(feedback.lineComments || []).length)) {
       const message = 'Missing review feedback payload';
@@ -441,7 +537,20 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
 
   app.get('/api/config', (_req, res) => {
     try {
-      res.json(publicConfig(config, { repoRoot }));
+      res.json(publicConfigPayload());
+    } catch (err) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  app.get('/api/models', async (req, res) => {
+    try {
+      const force =
+        req.query.refresh === '1' ||
+        req.query.refresh === 'true' ||
+        req.query.force === '1';
+      const result = await listModels({ selected: config.model, force });
+      res.json(result);
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
@@ -451,7 +560,8 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
     try {
       const patch = req.body || {};
 
-      // Jira secrets → .env (never persisted in config.json)
+      // Secrets → .acdev/.env (never persisted in config.json).
+      // Empty string = leave unchanged; null = clear.
       /** @type {Record<string, string | null>} */
       const envPatch = {};
       if (patch.jiraEmail !== undefined) {
@@ -459,16 +569,10 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
           typeof patch.jiraEmail === 'string' ? patch.jiraEmail.trim() : '';
         envPatch.JIRA_EMAIL = email || null;
       }
-      if (patch.jiraApiToken !== undefined) {
-        const token =
-          typeof patch.jiraApiToken === 'string' ? patch.jiraApiToken.trim() : '';
-        // Empty string means "leave unchanged" when token already set — only clear if null
-        if (patch.jiraApiToken === null) {
-          envPatch.JIRA_API_TOKEN = null;
-        } else if (token) {
-          envPatch.JIRA_API_TOKEN = token;
-        }
-      }
+      applySecretField(envPatch, 'JIRA_API_TOKEN', patch.jiraApiToken);
+      applySecretField(envPatch, 'GH_TOKEN', patch.ghToken);
+      applySecretField(envPatch, 'ANTHROPIC_API_KEY', patch.anthropicApiKey);
+      applySecretField(envPatch, 'CLAUDE_CODE_OAUTH_TOKEN', patch.claudeOauthToken);
       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();
@@ -483,10 +587,13 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
       const {
         jiraEmail: _e,
         jiraApiToken: _t,
+        ghToken: _gh,
+        anthropicApiKey: _ak,
+        claudeOauthToken: _oa,
         ...configPatch
       } = patch;
       updateConfig(repoRoot, config, configPatch);
-      res.json(publicConfig(config, { repoRoot }));
+      res.json(publicConfigPayload());
     } catch (err) {
       res.status(400).json({ error: err.message });
     }
@@ -516,6 +623,11 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
 
   app.post('/api/issues', (req, res) => {
     try {
+      const gate = authGate({ needGh: true, needClaude: true });
+      if (gate) {
+        return res.status(gate.status).json({ error: gate.error, code: gate.code });
+      }
+
       const urls = splitIssueUrls(req.body?.urls);
       if (urls.length === 0) {
         return res.status(400).json({
@@ -691,6 +803,11 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
 
   app.post('/api/jobs/:id/review', (req, res) => {
     try {
+      const gate = authGate({ needGh: false, needClaude: true });
+      if (gate) {
+        return res.status(gate.status).json({ error: gate.error, code: gate.code });
+      }
+
       const job = store.getJob(req.params.id);
       if (!job) {
         return res.status(404).json({ error: 'Job not found' });
@@ -736,6 +853,11 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
 
   app.post('/api/jobs/:id/approve', async (req, res) => {
     try {
+      const gate = authGate({ needGh: true, needClaude: false });
+      if (gate) {
+        return res.status(gate.status).json({ error: gate.error, code: gate.code });
+      }
+
       const job = store.getJob(req.params.id);
       if (!job) {
         return res.status(404).json({ error: 'Job not found' });
@@ -814,6 +936,8 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
             appendLog: (j, type, payload) => appendLog(j, type, payload),
             deps: {
               transitionJiraIssue: deps.transitionJiraIssue,
+              addJiraIssueLabel: deps.addJiraIssueLabel,
+              closeJiraIssue: deps.closeJiraIssue,
               addIssueLabel: deps.addIssueLabel,
               closeIssue: deps.closeIssue,
               resolveJiraCredentials: deps.resolveJiraCredentials,
@@ -912,6 +1036,11 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
 
   app.post('/api/jobs/:id/retry', (req, res) => {
     try {
+      const gate = authGate({ needGh: true, needClaude: true });
+      if (gate) {
+        return res.status(gate.status).json({ error: gate.error, code: gate.code });
+      }
+
       const job = store.getJob(req.params.id);
       if (!job) {
         return res.status(404).json({ error: 'Job not found' });