acdev 1.0.13 → 1.0.15

package/src/server.js

@@ -3,13 +3,14 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Store } from './store.js';
-import { parseIssueUrl, createPr, fetchIssueDetails } from './github.js';
+import { parseIssueUrl, createPr, fetchGithubPrStatus, fetchIssueDetails, listGithubIssueStatuses } from './github.js';
 import {
   parseJiraIssueRef,
   resolveJiraCredentials,
   testJiraConnection,
   fetchJiraIssue,
   mapJiraIssueType,
+  listJiraBoardStatuses,
 } from './jira.js';
 import { applyAfterPrOpenedRules } from './afterPrRules.js';
 import {
@@ -43,7 +44,7 @@ import { upsertEnvVars } from './env.js';
 import { listModels } from './models.js';
 import { splitIssueUrls } from './urls.js';
 import { usageFromLogs, withJobUsage, snapshotJobLlm, tagUsageProvider } from './usage.js';
-import { checkGhAuth } from './gh-auth.js';
+import { checkGhAuth, originRemoteInfo } from './gh-auth.js';
 import { checkClaudeAuth } from './claude-auth.js';
 import { checkOpenRouterAuth } from './openrouter-auth.js';
 import { isValidModelId, isNoModel, NO_MODEL, isModelIdForProvider } from './models.js';
@@ -171,6 +172,8 @@ export function normalizeReviewComments(body) {
  *   deps?: {
  *     pushBranch?: typeof pushBranch,
  *     createPr?: typeof createPr,
+ *     fetchGithubPrStatus?: typeof fetchGithubPrStatus,
+ *     removeWorktree?: typeof removeWorktree,
  *     getDiff?: typeof getDiff,
  *     listChangedFiles?: typeof listChangedFiles,
  *     applyFileExclusions?: typeof applyFileExclusions,
@@ -182,6 +185,8 @@ export function normalizeReviewComments(body) {
  *     resolveJiraCredentials?: Function,
  *     checkGhAuth?: typeof checkGhAuth,
  *     checkClaudeAuth?: typeof checkClaudeAuth,
+ *     listJiraBoardStatuses?: typeof listJiraBoardStatuses,
+ *     listGithubIssueStatuses?: typeof listGithubIssueStatuses,
  *   },
  * }} options
  */
@@ -189,14 +194,36 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
   const app = express();
   const publicDir = path.join(__dirname, '..', 'public');
   app.use(express.json());
-
   const doPushBranch = deps.pushBranch || pushBranch;
   const doCreatePr = deps.createPr || createPr;
+  const doRemoveWorktree = deps.removeWorktree || removeWorktree;
   const doGetDiff = deps.getDiff || getDiff;
   const doListChangedFiles = deps.listChangedFiles || listChangedFiles;
   const doApplyFileExclusions = deps.applyFileExclusions || applyFileExclusions;
+  const doFetchGithubPrStatus = deps.fetchGithubPrStatus || fetchGithubPrStatus;
   const doCheckGhAuth = deps.checkGhAuth || checkGhAuth;
   const doCheckClaudeAuth = deps.checkClaudeAuth || checkClaudeAuth;
+  const doListJiraBoardStatuses = deps.listJiraBoardStatuses || listJiraBoardStatuses;
+  const doListGithubIssueStatuses = deps.listGithubIssueStatuses || listGithubIssueStatuses;
+
+  /** @type {Map<string, { at: number, value: object }>} */
+  const prStatusCache = new Map();
+
+  async function getPrStatusForJob(job) {
+    const prUrl = String(job?.prUrl || '').trim();
+    if (!prUrl) return null;
+
+    const cached = prStatusCache.get(prUrl);
+    const now = Date.now();
+    if (cached && now - cached.at < 15_000) {
+      return cached.value;
+    }
+
+    const result = await doFetchGithubPrStatus({ prUrl, cwd: repoRoot });
+    const value = result.ok ? { ok: true, ...result } : result;
+    prStatusCache.set(prUrl, { at: now, value });
+    return value;
+  }
 
   function formatAgentJobError(err) {
     return err instanceof Error ? err.message : String(err);
@@ -608,10 +635,16 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
     }
   }
 
-  app.get('/api/jobs', (_req, res) => {
+  app.get('/api/jobs', async (_req, res) => {
     try {
-      // Backfill usage from logs for older jobs that never got a first-class field.
-      res.json(store.getJobs().map(withJobUsage));
+      const jobs = await Promise.all(
+        store.getJobs().map(async (job) => {
+          const withUsage = withJobUsage(job);
+          const prStatus = await getPrStatusForJob(withUsage);
+          return prStatus ? { ...withUsage, prStatus } : withUsage;
+        })
+      );
+      res.json(jobs);
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
@@ -731,6 +764,54 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
     }
   });
 
+  app.get('/api/jira/statuses', async (_req, res) => {
+    try {
+      const creds = resolveJiraCredentials({ configBaseUrl: config.jiraBaseUrl });
+      if ('error' in creds) {
+        return res.status(400).json({ ok: false, error: creds.error, statuses: [] });
+      }
+      const result = await doListJiraBoardStatuses(creds);
+      if (!result.ok) {
+        return res.status(400).json(result);
+      }
+      res.json(result);
+    } catch (err) {
+      res.status(500).json({
+        ok: false,
+        error: err instanceof Error ? err.message : String(err),
+        statuses: [],
+      });
+    }
+  });
+
+  app.get('/api/github/statuses', async (_req, res) => {
+    try {
+      const gh = doCheckGhAuth();
+      if (!gh.ok) {
+        const error =
+          gh.reason === 'not-found'
+            ? 'GitHub CLI (gh) is not installed.'
+            : 'GitHub is not authenticated. Configure a PAT in Settings → Authentication, or run gh auth login.';
+        return res.status(400).json({ ok: false, error, statuses: [] });
+      }
+      const origin = originRemoteInfo(repoRoot);
+      const result = await doListGithubIssueStatuses({
+        cwd: repoRoot,
+        originUrl: origin.url,
+      });
+      if (!result.ok) {
+        return res.status(400).json(result);
+      }
+      res.json(result);
+    } catch (err) {
+      res.status(500).json({
+        ok: false,
+        error: err instanceof Error ? err.message : String(err),
+        statuses: [],
+      });
+    }
+  });
+
   app.post('/api/issues', (req, res) => {
     try {
       const gate = authGate({ needGh: true, needLlm: true });
@@ -1076,7 +1157,23 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
           );
         }
 
-        res.json(store.getJob(updated.id) || updated);
+        const refreshed = store.getJob(updated.id) || updated;
+        const wtId = worktreeIdForJob(refreshed);
+        if (wtId != null && refreshed.worktreePath) {
+          try {
+            await doRemoveWorktree(repoRoot, wtId, refreshed.branchName);
+          } catch (cleanupErr) {
+            console.warn(
+              `[acdev] removeWorktree after PR open failed for job ${refreshed.id}:`,
+              cleanupErr instanceof Error ? cleanupErr.message : cleanupErr
+            );
+          }
+          store.updateJob(refreshed.id, { worktreePath: undefined });
+        }
+
+        const finalJob = withJobUsage(store.getJob(updated.id) || updated);
+        const finalPrStatus = await getPrStatusForJob(finalJob);
+        res.json(finalPrStatus ? { ...finalJob, prStatus: finalPrStatus } : finalJob);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         store.updateJob(job.id, { status: 'failed', error: message });