acdev 1.0.14 → 1.0.15

package/README.md

@@ -148,7 +148,7 @@ The tool starts a local server (default port `4848`), opens the browser, and sho
 1. Paste GitHub issue URLs or Jira keys/URLs on **Overview** and click **Add to queue**
 2. Jobs process sequentially: sync base branch → create worktree → run agent → await review
 3. Monitor live logs on **Runs**; review diffs on **Review**
-4. **Approve as draft** (draft PR) or **Approve as ready for review** (non-draft PR), or **Reject** (cleanup worktree, keep history as discarded)
+4. **Approve as draft** (draft PR) or **Approve as ready for review** (non-draft PR); approval now opens PR and removes local worktree. **Reject** still cleanup worktree, keep history as discarded
 5. **Clear** removes a job from history entirely (so you can re-queue the same issue). Allowed for queued / awaiting review / PR opened / failed / discarded; refused while a job is in-flight
 
 ### Web UI views
@@ -160,7 +160,7 @@ The tool starts a local server (default port `4848`), opens the browser, and sho
 | **Review** | Edit PR title/body, colored diff, approve draft or ready, reject, or Clear |
 | **Logs** | Cross-job activity log with job filter |
 | **Alerts** | Failures / warnings with Retry, Clear, and dismiss |
-| **Settings** | Ticket source (GitHub / Jira), GitHub + Claude authentication, Jira connection, post-PR rules, and `.acdev/config.json` fields |
+| **Settings** | Ticket source (GitHub / Jira), GitHub + Claude authentication, Jira connection, and `.acdev/config.json` fields |
 
 Model selection lives in **Settings → Configuration**. The sidebar shows the current model as a read-only label. Default is **Sonnet 5** (`claude-sonnet-5`).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acdev",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Local CLI + web UI for running AI agents on GitHub issues via git worktrees",
   "type": "module",
   "bin": {

package/public/app.js

@@ -125,7 +125,7 @@ let reviewFileLists = {};
 /** @type {Record<string, Set<string>>} excluded paths per job while reviewing */
 let reviewExcludedByJob = {};
 let settingsSaving = false;
-/** @type {'ticket' | 'auth' | 'rules' | 'config'} */
+/** @type {'ticket' | 'auth' | 'config'} */
 let settingsTab = 'ticket';
 /** Sentinel: no model selected (jobs blocked until user picks one). */
 const NO_MODEL = '-';
@@ -301,12 +301,12 @@ const els = {
   settingsModelValue: document.getElementById('settings-model-value'),
   settingsModelPanel: document.getElementById('settings-model-panel'),
   settingsModelList: document.getElementById('settings-model-list'),
-  settingsModelSearch: document.getElementById('settings-model-search'),
-  settingsModelHint: document.getElementById('settings-model-hint'),
-  settingsMaxTurns: document.getElementById('settings-max-turns'),
-  settingsTimeout: document.getElementById('settings-timeout'),
-  settingsTimeoutMs: document.getElementById('settings-timeout-ms'),
-  settingsTestCommand: document.getElementById('settings-test-command'),
+  reviewPrLink: document.getElementById('review-pr-link'),
+  reviewPrStatusLine: document.getElementById('review-pr-status-line'),
+  reviewPrStatusNotes: document.getElementById('review-pr-status-notes'),
+  reviewTerminalSection: document.getElementById('review-terminal-section'),
+  reviewTerminalMessage: document.getElementById('review-terminal-message'),
+  reviewRetryBtn: document.getElementById('review-retry-btn'),
   settingsTools: document.getElementById('settings-tools'),
   settingsFeedback: document.getElementById('settings-feedback'),
   settingsSaveBtn: document.getElementById('settings-save-btn'),
@@ -941,14 +941,64 @@ function jobRepoLine(job) {
   const branch = name ? ` · ${name}` : '';
   return { repo, number: num, branch, text: `${repo} #${num}${branch}`, isJira: false };
 }
+function prDecisionLabel(decision) {
+  switch (String(decision || '').trim().toUpperCase()) {
+    case 'APPROVED':
+      return 'approved';
+    case 'CHANGES_REQUESTED':
+      return 'changes requested';
+    case 'REVIEW_REQUIRED':
+      return 'review required';
+    default:
+      return '';
+  }
+}
+
+function jobPrStatusSummary(job) {
+  const pr = job?.prStatus;
+  if (!pr) return '';
+  if (!pr.ok) {
+    return `GitHub status unavailable${pr.error ? ` · ${truncate(pr.error, 72)}` : ''}`;
+  }
+
+  const parts = [];
+  if (pr.state === 'MERGED') {
+    parts.push('Merged');
+  } else if (pr.state === 'CLOSED') {
+    parts.push('Closed');
+  } else if (pr.isDraft) {
+    parts.push('Draft');
+  } else {
+    parts.push('Open');
+  }
+
+  const decision = prDecisionLabel(pr.reviewDecision);
+  if (decision) parts.push(decision);
+  if (pr.mergeStateStatus) {
+    parts.push(`merge ${pr.mergeStateStatus.toLowerCase().replace(/_/g, ' ')}`);
+  }
+  if (Array.isArray(pr.requestedReviewers) && pr.requestedReviewers.length) {
+    parts.push(`requested ${pr.requestedReviewers.join(', ')}`);
+  }
+  const changeRequest = Array.isArray(pr.latestReviews)
+    ? pr.latestReviews.find((review) => review.state === 'CHANGES_REQUESTED' && review.body)
+    : null;
+  if (changeRequest?.body) {
+    const who = changeRequest.author ? `${changeRequest.author}: ` : '';
+    parts.push(`CR ${who}${truncate(changeRequest.body, 72)}`);
+  }
+
+  return `GitHub · ${parts.join(' · ')}`;
+}
 
 function jobSubLine(job) {
   const meta = jobRepoLine(job);
   const agent = jobLlmLine(job);
+  const pr = jobPrStatusSummary(job);
   const base = meta.isJira
     ? `${meta.number}${meta.branch}`
     : `${meta.repo} #${meta.number}${meta.branch}`;
-  return agent ? `${base} · ${agent}` : base;
+  return [base, agent, pr].filter(Boolean).join(' · ');
 }
 
 /**
@@ -1001,6 +1051,62 @@ function sortedJobs() {
   );
 }
 
+/**
+ * @param {HTMLElement | null} container
+ * @param {object | null | undefined} pr
+ */
+function renderPrStatusNotes(container, pr) {
+  if (!container) return;
+  container.innerHTML = '';
+  if (!pr || !pr.ok) return;
+
+  const reviews = Array.isArray(pr.latestReviews) ? [...pr.latestReviews] : [];
+  reviews.sort((a, b) => {
+    const ta = Date.parse(a.submittedAt || '') || 0;
+    const tb = Date.parse(b.submittedAt || '') || 0;
+    return tb - ta;
+  });
+
+  if (reviews.length > 0) {
+    const heading = document.createElement('div');
+    heading.className = 'pr-status-notes-title';
+    heading.textContent = 'Latest reviews';
+    container.appendChild(heading);
+
+    const list = document.createElement('div');
+    list.className = 'pr-status-note-list';
+
+    for (const review of reviews.slice(0, 4)) {
+      const item = document.createElement('div');
+      item.className = 'pr-status-note';
+      const meta = document.createElement('div');
+      meta.className = 'pr-status-note-meta';
+      const parts = [review.state.replace(/_/g, ' ').toLowerCase()];
+      if (review.author) parts.push(review.author);
+      if (review.submittedAt) parts.push(formatTime(review.submittedAt));
+      meta.textContent = parts.join(' · ');
+      item.appendChild(meta);
+
+      if (review.body) {
+        const body = document.createElement('div');
+        body.className = 'pr-status-note-body';
+        body.textContent = review.body;
+        item.appendChild(body);
+      }
+
+      list.appendChild(item);
+    }
+
+    container.appendChild(list);
+  }
+
+  if (Array.isArray(pr.requestedReviewers) && pr.requestedReviewers.length > 0) {
+    const requested = document.createElement('div');
+    requested.className = 'pr-status-note-meta';
+    requested.textContent = `Requested reviewers: ${pr.requestedReviewers.join(', ')}`;
+    container.appendChild(requested);
+  }
+}
 function formatTime(ts) {
   try {
     return new Date(ts).toLocaleTimeString([], {
@@ -2579,9 +2685,18 @@ function renderReview(jobs) {
     els.reviewGeneralComment.disabled = !editable;
   }
   els.reviewPrSection.classList.toggle('hidden', !isOpened);
+  if (isOpened) {
+    if (els.reviewPrStatusLine) {
+      els.reviewPrStatusLine.textContent = job.prStatus
+        ? jobPrStatusSummary(job)
+        : 'GitHub status loading…';
+    }
+    renderPrStatusNotes(els.reviewPrStatusNotes, job.prStatus);
+  } else {
+    if (els.reviewPrStatusLine) els.reviewPrStatusLine.textContent = '';
+    if (els.reviewPrStatusNotes) els.reviewPrStatusNotes.innerHTML = '';
+  }
   els.reviewTerminalSection.classList.toggle('hidden', !isTerminal);
-
-  const prMeta = resolvePrMeta(job);
   if (document.activeElement !== els.prTitle && document.activeElement !== els.prBody) {
     els.prTitle.value = prMeta.prTitle;
     els.prBody.value = prMeta.prBody;
@@ -3799,12 +3914,11 @@ function knownToolsList(cfg = appConfig) {
 }
 
 /**
- * Switch Settings top-level tab (Ticket source / Authentication / Rules / Configuration).
- * @param {'ticket' | 'auth' | 'rules' | 'config'} tab
+ * Switch Settings top-level tab (Ticket source / Authentication / Configuration).
+ * @param {'ticket' | 'auth' | 'config'} tab
  */
 function setSettingsTab(tab) {
-  const next =
-    tab === 'auth' || tab === 'rules' || tab === 'config' ? tab : 'ticket';
+  const next = tab === 'auth' || tab === 'config' ? tab : 'ticket';
   settingsTab = next;
 
   if (els.settingsTabs) {
@@ -3823,9 +3937,6 @@ function setSettingsTab(tab) {
   if (next === 'config') {
     void fetchModels();
   }
-  if (next === 'rules') {
-    void fetchRuleStatuses();
-  }
 }
 
 /**
@@ -4714,7 +4825,7 @@ els.settingsTabs?.addEventListener('click', (e) => {
   const btn = e.target.closest('[data-settings-tab]');
   if (!btn?.dataset.settingsTab) return;
   setSettingsTab(
-    /** @type {'ticket' | 'auth' | 'rules' | 'config'} */ (btn.dataset.settingsTab)
+    /** @type {'ticket' | 'auth' | 'config'} */ (btn.dataset.settingsTab)
   );
 });
 
@@ -4738,7 +4849,7 @@ els.settingsTabs?.addEventListener('keydown', (e) => {
   e.preventDefault();
   const nextTab = tabs[nextIdx];
   setSettingsTab(
-    /** @type {'ticket' | 'auth' | 'rules' | 'config'} */ (nextTab.dataset.settingsTab)
+    /** @type {'ticket' | 'auth' | 'config'} */ (nextTab.dataset.settingsTab)
   );
   nextTab.focus();
 });
@@ -4990,7 +5101,6 @@ els.jiraTestBtn?.addEventListener('click', async () => {
     }
     els.jiraStatus.textContent = `Connected as ${data.displayName || 'OK'}`;
     els.jiraStatus.className = 'jira-status ok';
-    if (settingsTab === 'rules') void fetchJiraRuleStatuses();
   } catch (err) {
     els.jiraStatus.textContent = err.message || 'Test failed';
     els.jiraStatus.className = 'jira-status err';

package/public/index.html

@@ -352,6 +352,8 @@
 
                 <div id="review-pr-section" class="card card-success hidden">
                   <p class="pr-opened-line">PR opened: <a id="review-pr-link" href="#" target="_blank" rel="noopener"></a></p>
+                  <p id="review-pr-status-line" class="field-hint"></p>
+                  <div id="review-pr-status-notes" class="pr-status-notes"></div>
                   <div class="actions">
                     <button id="review-pr-clear-btn" type="button" class="btn btn-secondary btn-sm">Clear from history</button>
                   </div>
@@ -431,6 +433,7 @@
                 aria-selected="false"
                 tabindex="-1"
               >Authentication</button>
+              <!--
               <button
                 type="button"
                 class="settings-tab"
@@ -441,6 +444,7 @@
                 aria-selected="false"
                 tabindex="-1"
               >Rules</button>
+              -->
               <button
                 type="button"
                 class="settings-tab"
@@ -571,6 +575,7 @@
                 </div>
               </div>
 
+              <!--
               <div
                 class="settings-panel hidden"
                 role="tabpanel"
@@ -640,7 +645,7 @@
                       <div class="settings-field" id="settings-github-rule-status-field">
                         <label class="field-label" for="settings-github-rule-status">Target status</label>
                         <select id="settings-github-rule-status" class="input" name="githubRuleTargetStatus"></select>
-                        <p class="field-hint" id="settings-github-rule-status-hint">Live GitHub Project Status options, or repo labels if no Status field exists.</p>
+                        <p class="field-hint" id="settings-github-rule-status-hint">Live statuses from GitHub Project v2 or labels. Must match a reachable board status / label.</p>
                       </div>
                       <div class="settings-field" id="settings-github-rule-label-field">
                         <label class="field-label" for="settings-github-rule-label">Label</label>
@@ -651,6 +656,8 @@
                   </div>
                 </div>
               </div>
+              -->
+              </div>
 
               <div
                 class="settings-panel hidden"

package/public/styles.css

@@ -1594,6 +1594,43 @@ a { color: var(--primary); text-underline-offset: 3px; }
   margin-bottom: 12px;
 }
 
+.pr-status-notes {
+  display: grid;
+  gap: 10px;
+  margin: 0 0 12px;
+}
+
+.pr-status-notes-title {
+  font-size: 12px;
+  font-weight: 700;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+  color: var(--text-muted);
+}
+
+.pr-status-note-list {
+  display: grid;
+  gap: 8px;
+}
+
+.pr-status-note {
+  padding: 10px 12px;
+  border: 1px solid var(--border-soft);
+  border-radius: 10px;
+  background: var(--surface-2);
+}
+
+.pr-status-note-meta {
+  font-size: 12px;
+  color: var(--text-muted);
+  margin-bottom: 4px;
+}
+
+.pr-status-note-body {
+  white-space: pre-wrap;
+  line-height: 1.45;
+}
+
 /* —— Review file selection —— */
 .review-files-header {
   display: flex;

package/src/github.js

@@ -393,6 +393,122 @@ export function buildPrCreateArgs({ title, body, baseBranch, branchName, draft =
   return args;
 }
 
+/**
+ * @typedef {{
+ *   ok: true,
+ *   url: string,
+ *   title: string,
+ *   number: number,
+ *   state: string,
+ *   isDraft: boolean,
+ *   reviewDecision: string | null,
+ *   mergeStateStatus: string | null,
+ *   closedAt: string | null,
+ *   mergedAt: string | null,
+ *   author: string | null,
+ *   requestedReviewers: string[],
+ *   latestReviews: Array<{
+ *     author: string | null,
+ *     state: string,
+ *     body: string,
+ *     submittedAt: string | null,
+ *   }>,
+ * }} GithubPrStatusOk
+ *
+ * @typedef {{
+ *   ok: false,
+ *   error: string,
+ * }} GithubPrStatusError
+ *
+ * @typedef {GithubPrStatusOk | GithubPrStatusError} GithubPrStatusResult
+ */
+
+/**
+ * @param {unknown} user
+ * @returns {string | null}
+ */
+function userName(user) {
+  if (!user || typeof user !== 'object') return null;
+  const name = String(user.login || user.name || user.displayName || '').trim();
+  return name || null;
+}
+
+/**
+ * @param {unknown} review
+ * @returns {{ author: string | null, state: string, body: string, submittedAt: string | null } | null}
+ */
+function normalizeReview(review) {
+  if (!review || typeof review !== 'object') return null;
+  const state = String(review.state || '').trim().toUpperCase();
+  const body = String(review.body || '').trim();
+  const submittedAt = String(review.submittedAt || review.createdAt || review.updatedAt || '').trim();
+  return {
+    author: userName(review.author),
+    state: state || 'UNKNOWN',
+    body,
+    submittedAt: submittedAt || null,
+  };
+}
+
+/**
+ * Current GitHub PR review state + summary via `gh pr view`.
+ * @param {{
+ *   prUrl: string,
+ *   cwd: string,
+ *   runGh?: typeof execFileAsync,
+ * }} opts
+ * @returns {Promise<GithubPrStatusResult>}
+ */
+export async function fetchGithubPrStatus({ prUrl, cwd, runGh = execFileAsync }) {
+  const url = String(prUrl || '').trim();
+  if (!url) {
+    return { ok: false, error: 'PR URL is required' };
+  }
+  try {
+    const { stdout } = await runGh(
+      'gh',
+      [
+        'pr',
+        'view',
+        url,
+        '--json',
+        'url,title,number,state,isDraft,reviewDecision,mergeStateStatus,closedAt,mergedAt,author,reviewRequests,latestReviews',
+      ],
+      { cwd }
+    );
+    const raw = JSON.parse(stdout);
+    const latestReviews = Array.isArray(raw.latestReviews)
+      ? raw.latestReviews.map(normalizeReview).filter(Boolean)
+      : [];
+    const requestedReviewers = Array.isArray(raw.reviewRequests || raw.requestedReviewers)
+      ? (raw.reviewRequests || raw.requestedReviewers).map((item) => {
+          if (item && typeof item === 'object' && 'requestedReviewer' in item) {
+            return userName(item.requestedReviewer);
+          }
+          return userName(item);
+        }).filter(Boolean)
+      : [];
+    return {
+      ok: true,
+      url: String(raw.url || url),
+      title: String(raw.title || '').trim(),
+      number: Number(raw.number || 0),
+      state: String(raw.state || '').trim().toUpperCase() || 'UNKNOWN',
+      isDraft: Boolean(raw.isDraft),
+      reviewDecision: String(raw.reviewDecision || '').trim().toUpperCase() || null,
+      mergeStateStatus: String(raw.mergeStateStatus || '').trim().toUpperCase() || null,
+      closedAt: String(raw.closedAt || '').trim() || null,
+      mergedAt: String(raw.mergedAt || '').trim() || null,
+      author: userName(raw.author),
+      requestedReviewers,
+      latestReviews,
+    };
+  } catch (err) {
+    const message = err.stderr?.toString() || err.message || String(err);
+    return { ok: false, error: `Failed to fetch PR status for ${url}: ${message}` };
+  }
+}
+
 /**
  * Create a GitHub PR (draft or ready for review).
  * @param {{
@@ -442,7 +558,6 @@ export async function createPr({
     throw err;
   }
 }
-
 /**
  * Add a label to a GitHub issue via `gh`.
  * @param {number | string} issueNumber

package/src/server.js

@@ -3,7 +3,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Store } from './store.js';
-import { parseIssueUrl, createPr, fetchIssueDetails, listGithubIssueStatuses } from './github.js';
+import { parseIssueUrl, createPr, fetchGithubPrStatus, fetchIssueDetails, listGithubIssueStatuses } from './github.js';
 import {
   parseJiraIssueRef,
   resolveJiraCredentials,
@@ -172,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,
@@ -192,17 +194,37 @@ 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);
   }
@@ -613,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 });
     }
@@ -1129,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 });