acdev 1.0.9 → 1.0.10

package/package.json

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

package/public/app.js

@@ -228,6 +228,7 @@ const els = {
   enqueueJiraSettingsLink: document.getElementById('enqueue-jira-settings-link'),
   overviewTicketSource: document.getElementById('overview-ticket-source'),
   enqueueFeedback: document.getElementById('enqueue-feedback'),
+  preferredBranch: document.getElementById('preferred-branch'),
   addBtn: document.getElementById('add-btn'),
   statsGrid: document.getElementById('stats-grid'),
   overviewRunning: document.getElementById('overview-running'),
@@ -900,16 +901,22 @@ function jobTitle(job) {
   return job.issueTitle || truncate(job.issueUrl, 48);
 }
 
+function jobDisplayBranch(job) {
+  return job.branchName || job.preferredBranchName || '';
+}
+
 function jobRepoLine(job) {
   if (isJiraJob(job)) {
     const key = parseJiraKeyFromJob(job) || '—';
-    const branch = job.branchName ? ` · ${job.branchName}` : '';
+    const name = jobDisplayBranch(job);
+    const branch = name ? ` · ${name}` : '';
     return { repo: 'Jira', number: key, branch, text: `Jira ${key}${branch}`, isJira: true };
   }
   const ref = parseIssueRef(job.issueUrl);
   const repo = ref?.full || '—';
   const num = ref?.number || job.issueNumber || '—';
-  const branch = job.branchName ? ` · ${job.branchName}` : '';
+  const name = jobDisplayBranch(job);
+  const branch = name ? ` · ${name}` : '';
   return { repo, number: num, branch, text: `${repo} #${num}${branch}`, isJira: false };
 }
 
@@ -2696,6 +2703,7 @@ function jobMatchesReviewSearch(job, q) {
     job.issueTitle,
     job.issueUrl,
     job.branchName,
+    job.preferredBranchName,
     job.prTitle,
     job.prUrl,
     ref?.number,
@@ -4445,18 +4453,32 @@ els.issueUrls?.addEventListener('keydown', (ev) => {
   els.addBtn?.click();
 });
 
+els.preferredBranch?.addEventListener('keydown', (ev) => {
+  if (ev.key !== 'Enter' || ev.shiftKey || ev.metaKey || ev.ctrlKey || ev.altKey) return;
+  ev.preventDefault();
+  els.addBtn?.click();
+});
+
 els.addBtn.addEventListener('click', async () => {
   els.enqueueFeedback.classList.add('hidden');
   const text = els.issueUrls.value.trim();
   if (!text) return;
 
   const urls = splitIssueUrls(text);
+  const branchName = els.preferredBranch?.value?.trim() || '';
+  // #region agent log
+  fetch('http://127.0.0.1:7258/ingest/377aa5e2-15ea-4447-a68b-7ce215882bc3',{method:'POST',headers:{'Content-Type':'application/json','X-Debug-Session-Id':'473a78'},body:JSON.stringify({sessionId:'473a78',runId:'pre-fix',hypothesisId:'B',location:'public/app.js:addBtn',message:'enqueue submit',data:{hasCustom:Boolean(branchName),branchName:branchName||null,urlCount:urls.length},timestamp:Date.now()})}).catch(()=>{});
+  // #endregion
 
   try {
     const res = await fetch('/api/issues', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ urls, ticketSource }),
+      body: JSON.stringify({
+        urls,
+        ticketSource,
+        ...(branchName ? { branchName } : {}),
+      }),
     });
     const data = await res.json();
     if (!res.ok) {
@@ -4467,6 +4489,7 @@ els.addBtn.addEventListener('click', async () => {
       return;
     }
     els.issueUrls.value = '';
+    if (els.preferredBranch) els.preferredBranch.value = '';
     const parts = [];
     if (data.jobs?.length) parts.push(`Added ${data.jobs.length}`);
     if (data.skipped?.length) {

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"/>

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;

package/src/git.js

@@ -103,6 +103,68 @@ export function buildBranchName(type, title) {
   return `${type}/${slugifyTitle(title)}`;
 }
 
+const PREFERRED_BRANCH_MAX = 100;
+
+/**
+ * Sanitize a user-supplied git branch name. Preserves case (e.g. NC-2133).
+ * Empty / whitespace-only input returns ''.
+ * @param {unknown} raw
+ */
+export function normalizePreferredBranchName(raw) {
+  if (raw == null) return '';
+  let name = String(raw).trim().replace(/\s+/g, '-');
+  if (!name) return '';
+
+  name = name
+    .replace(/[~^:?*\[\\]+/g, '-')
+    .replace(/@{/g, '-at-')
+    .replace(/[^A-Za-z0-9._/-]+/g, '-')
+    .replace(/\/+/g, '/')
+    .replace(/\.{2,}/g, '.')
+    .replace(/-{2,}/g, '-')
+    .replace(/^[-./]+|[-./]+$/g, '');
+
+  if (/\.lock$/i.test(name)) {
+    name = name.replace(/\.lock$/i, '').replace(/[-./]+$/g, '');
+  }
+
+  name = name.slice(0, PREFERRED_BRANCH_MAX).replace(/[-./]+$/g, '');
+  if (!name || name === '@' || /^HEAD$/i.test(name)) return '';
+  return name;
+}
+
+/**
+ * Parse optional branchName from an API body.
+ * Omitted / blank → no preference (caller uses feat/fix slug).
+ * Provided but invalid after sanitize → error.
+ * @param {unknown} raw
+ * @returns {{ ok: true, value?: string } | { ok: false, error: string }}
+ */
+export function parsePreferredBranchName(raw) {
+  if (raw == null) return { ok: true };
+  if (typeof raw !== 'string') {
+    return { ok: false, error: 'branchName must be a string' };
+  }
+  if (!raw.trim()) return { ok: true };
+  const value = normalizePreferredBranchName(raw);
+  if (!value) {
+    return { ok: false, error: 'branchName is not a valid git branch name' };
+  }
+  return { ok: true, value };
+}
+
+/**
+ * Prefer a user-supplied branch name; otherwise feat/fix slug from the ticket.
+ * @param {string | undefined | null} preferred
+ * @param {'feat' | 'fix'} issueType
+ * @param {string} issueTitle
+ */
+export function resolveDesiredBranchName(preferred, issueType, issueTitle) {
+  const custom = normalizePreferredBranchName(preferred);
+  if (custom) return custom;
+  return buildBranchName(issueType, issueTitle);
+}
+
 /**
  * @param {string} repoRoot
  * @param {string | number} worktreeId GitHub issue number or Jira key

package/src/server.js

@@ -1,4 +1,5 @@
 import express from 'express';
+import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Store } from './store.js';
@@ -18,7 +19,8 @@ import {
   getDiff,
   pushBranch,
   detectIssueType,
-  buildBranchName,
+  parsePreferredBranchName,
+  resolveDesiredBranchName,
   sanitizeBranchCommits,
   listChangedFiles,
   applyFileExclusions,
@@ -341,7 +343,34 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         issueType = detectIssueType(issueDetails);
       }
 
-      const desiredBranchName = buildBranchName(issueType, issueTitle);
+      const desiredBranchName = resolveDesiredBranchName(
+        job.preferredBranchName,
+        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');
@@ -657,6 +686,35 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
         });
       }
 
+      const preferredParsed = parsePreferredBranchName(req.body?.branchName);
+      if (!preferredParsed.ok) {
+        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'
           ? req.body.ticketSource
@@ -751,6 +809,7 @@ export function createServer({ repoRoot, config, store, useStubAgent = false, de
           issueNumber: item.number,
           ticketSource: item.ticketSource,
           jiraKey: item.jiraKey,
+          ...(preferredBranchName ? { preferredBranchName } : {}),
         });
         created.push(job);
       }

package/src/store.js

@@ -55,6 +55,7 @@ export class Store {
    *   issueNumber?: number,
    *   ticketSource?: 'github' | 'jira',
    *   jiraKey?: string,
+   *   preferredBranchName?: string,
    * }} data
    * @returns {Job}
    */
@@ -68,6 +69,7 @@ export class Store {
       issueNumber: data.issueNumber,
       ticketSource,
       ...(data.jiraKey ? { jiraKey: data.jiraKey } : {}),
+      ...(data.preferredBranchName ? { preferredBranchName: data.preferredBranchName } : {}),
       status: 'queued',
       createdAt: now,
       updatedAt: now,