@pruddiman/dispatch 1.4.0 → 1.4.1

package/dist/cli.js

@@ -210,6 +210,27 @@ var init_logger = __esm({
   }
 });
 
+// src/helpers/cleanup.ts
+function registerCleanup(fn) {
+  cleanups.push(fn);
+}
+async function runCleanup() {
+  const fns = cleanups.splice(0);
+  for (const fn of fns) {
+    try {
+      await fn();
+    } catch {
+    }
+  }
+}
+var cleanups;
+var init_cleanup = __esm({
+  "src/helpers/cleanup.ts"() {
+    "use strict";
+    cleanups = [];
+  }
+});
+
 // src/helpers/guards.ts
 function hasProperty(value, key) {
   return typeof value === "object" && value !== null && Object.prototype.hasOwnProperty.call(value, key);
@@ -592,7 +613,7 @@ var init_copilot = __esm({
 });
 
 // src/providers/claude.ts
-import { randomUUID } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import { unstable_v2_createSession } from "@anthropic-ai/claude-agent-sdk";
 async function listModels3(_opts) {
   return [
@@ -615,7 +636,7 @@ async function boot3(opts) {
       try {
         const sessionOpts = { model, permissionMode: "acceptEdits", ...cwd ? { cwd } : {} };
         const session = unstable_v2_createSession(sessionOpts);
-        const sessionId = randomUUID();
+        const sessionId = randomUUID2();
         sessions.set(sessionId, session);
         log.debug(`Session created: ${sessionId}`);
         return sessionId;
@@ -667,7 +688,7 @@ var init_claude = __esm({
 });
 
 // src/providers/codex.ts
-import { randomUUID as randomUUID2 } from "crypto";
+import { randomUUID as randomUUID3 } from "crypto";
 async function loadAgentLoop() {
   return import("@openai/codex");
 }
@@ -689,7 +710,7 @@ async function boot4(opts) {
     async createSession() {
       log.debug("Creating Codex session...");
       try {
-        const sessionId = randomUUID2();
+        const sessionId = randomUUID3();
         const agent = new AgentLoop({
           model,
           config: { model, instructions: "" },
@@ -756,11 +777,11 @@ var init_codex = __esm({
 });
 
 // src/providers/detect.ts
-import { execFile as execFile6 } from "child_process";
-import { promisify as promisify6 } from "util";
+import { execFile as execFile8 } from "child_process";
+import { promisify as promisify8 } from "util";
 async function checkProviderInstalled(name) {
   try {
-    await exec6(PROVIDER_BINARIES[name], ["--version"], {
+    await exec8(PROVIDER_BINARIES[name], ["--version"], {
       shell: process.platform === "win32",
       timeout: DETECTION_TIMEOUT_MS
     });
@@ -769,11 +790,11 @@ async function checkProviderInstalled(name) {
     return false;
   }
 }
-var exec6, DETECTION_TIMEOUT_MS, PROVIDER_BINARIES;
+var exec8, DETECTION_TIMEOUT_MS, PROVIDER_BINARIES;
 var init_detect = __esm({
   "src/providers/detect.ts"() {
     "use strict";
-    exec6 = promisify6(execFile6);
+    exec8 = promisify8(execFile8);
     DETECTION_TIMEOUT_MS = 5e3;
     PROVIDER_BINARIES = {
       opencode: "opencode",
@@ -857,27 +878,6 @@ var init_environment = __esm({
   }
 });
 
-// src/helpers/cleanup.ts
-function registerCleanup(fn) {
-  cleanups.push(fn);
-}
-async function runCleanup() {
-  const fns = cleanups.splice(0);
-  for (const fn of fns) {
-    try {
-      await fn();
-    } catch {
-    }
-  }
-}
-var cleanups;
-var init_cleanup = __esm({
-  "src/helpers/cleanup.ts"() {
-    "use strict";
-    cleanups = [];
-  }
-});
-
 // src/orchestrator/fix-tests-pipeline.ts
 var fix_tests_pipeline_exports = {};
 __export(fix_tests_pipeline_exports, {
@@ -1442,7 +1442,6 @@ var datasource2 = {
         "json"
       ];
       if (opts.org) batchArgs.push("--org", opts.org);
-      if (opts.project) batchArgs.push("--project", opts.project);
       const { stdout: batchStdout } = await exec2("az", batchArgs, {
         cwd: opts.cwd || process.cwd(),
         shell: process.platform === "win32"
@@ -1487,9 +1486,6 @@ var datasource2 = {
     if (opts.org) {
       args.push("--org", opts.org);
     }
-    if (opts.project) {
-      args.push("--project", opts.project);
-    }
     const { stdout } = await exec2("az", args, {
       cwd: opts.cwd || process.cwd(),
       shell: process.platform === "win32"
@@ -1516,7 +1512,6 @@ var datasource2 = {
       body
     ];
     if (opts.org) args.push("--org", opts.org);
-    if (opts.project) args.push("--project", opts.project);
     await exec2("az", args, { cwd: opts.cwd || process.cwd(), shell: process.platform === "win32" });
   },
   async close(issueId, opts = {}) {
@@ -1532,7 +1527,6 @@ var datasource2 = {
         "json"
       ];
       if (opts.org) showArgs.push("--org", opts.org);
-      if (opts.project) showArgs.push("--project", opts.project);
       const { stdout } = await exec2("az", showArgs, {
         cwd: opts.cwd || process.cwd(),
         shell: process.platform === "win32"
@@ -1555,7 +1549,6 @@ var datasource2 = {
       state
     ];
     if (opts.org) args.push("--org", opts.org);
-    if (opts.project) args.push("--project", opts.project);
     await exec2("az", args, { cwd: opts.cwd || process.cwd(), shell: process.platform === "win32" });
   },
   async create(title, body, opts = {}) {
@@ -1754,9 +1747,6 @@ async function fetchComments(workItemId, opts) {
     if (opts.org) {
       args.push("--org", opts.org);
     }
-    if (opts.project) {
-      args.push("--project", opts.project);
-    }
     const { stdout } = await exec2("az", args, {
       cwd: opts.cwd || process.cwd(),
       shell: process.platform === "win32"
@@ -2120,7 +2110,243 @@ async function resolveSource(issues, issueSource, cwd) {
   return null;
 }
 
+// src/orchestrator/datasource-helpers.ts
+init_logger();
+import { basename as basename2, join as join3 } from "path";
+import { mkdtemp, writeFile as writeFile2 } from "fs/promises";
+import { tmpdir } from "os";
+import { execFile as execFile5 } from "child_process";
+import { promisify as promisify5 } from "util";
+var exec5 = promisify5(execFile5);
+function parseIssueFilename(filePath) {
+  const filename = basename2(filePath);
+  const match = /^(\d+)-(.+)\.md$/.exec(filename);
+  if (!match) return null;
+  return { issueId: match[1], slug: match[2] };
+}
+async function fetchItemsById(issueIds, datasource4, fetchOpts) {
+  const ids = issueIds.flatMap(
+    (id) => id.split(",").map((s) => s.trim()).filter(Boolean)
+  );
+  const items = [];
+  for (const id of ids) {
+    try {
+      const item = await datasource4.fetch(id, fetchOpts);
+      items.push(item);
+    } catch (err) {
+      const prefix = id.includes("/") || id.includes("\\") || id.endsWith(".md") ? "" : "#";
+      log.warn(`Could not fetch issue ${prefix}${id}: ${log.formatErrorChain(err)}`);
+    }
+  }
+  return items;
+}
+async function writeItemsToTempDir(items) {
+  const tempDir = await mkdtemp(join3(tmpdir(), "dispatch-"));
+  const files = [];
+  const issueDetailsByFile = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    const slug = slugify(item.title, MAX_SLUG_LENGTH);
+    const filename = `${item.number}-${slug}.md`;
+    const filepath = join3(tempDir, filename);
+    await writeFile2(filepath, item.body, "utf-8");
+    files.push(filepath);
+    issueDetailsByFile.set(filepath, item);
+  }
+  files.sort((a, b) => {
+    const numA = parseInt(basename2(a).match(/^(\d+)/)?.[1] ?? "0", 10);
+    const numB = parseInt(basename2(b).match(/^(\d+)/)?.[1] ?? "0", 10);
+    if (numA !== numB) return numA - numB;
+    return a.localeCompare(b);
+  });
+  return { files, issueDetailsByFile };
+}
+async function getCommitSummaries(defaultBranch, cwd) {
+  try {
+    const { stdout } = await exec5(
+      "git",
+      ["log", `${defaultBranch}..HEAD`, "--pretty=format:%s"],
+      { cwd, shell: process.platform === "win32" }
+    );
+    return stdout.trim().split("\n").filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+async function getBranchDiff(defaultBranch, cwd) {
+  try {
+    const { stdout } = await exec5(
+      "git",
+      ["diff", `${defaultBranch}..HEAD`],
+      { cwd, maxBuffer: 10 * 1024 * 1024, shell: process.platform === "win32" }
+    );
+    return stdout;
+  } catch {
+    return "";
+  }
+}
+async function squashBranchCommits(defaultBranch, message, cwd) {
+  const { stdout } = await exec5(
+    "git",
+    ["merge-base", defaultBranch, "HEAD"],
+    { cwd, shell: process.platform === "win32" }
+  );
+  const mergeBase = stdout.trim();
+  await exec5("git", ["reset", "--soft", mergeBase], { cwd, shell: process.platform === "win32" });
+  await exec5("git", ["commit", "-m", message], { cwd, shell: process.platform === "win32" });
+}
+async function buildPrBody(details, tasks, results, defaultBranch, datasourceName, cwd) {
+  const sections = [];
+  const commits = await getCommitSummaries(defaultBranch, cwd);
+  if (commits.length > 0) {
+    sections.push("## Summary\n");
+    for (const commit of commits) {
+      sections.push(`- ${commit}`);
+    }
+    sections.push("");
+  }
+  const taskResults = new Map(
+    results.filter((r) => tasks.includes(r.task)).map((r) => [r.task, r])
+  );
+  const completedTasks = tasks.filter((t) => taskResults.get(t)?.success);
+  const failedTasks = tasks.filter((t) => {
+    const r = taskResults.get(t);
+    return r && !r.success;
+  });
+  if (completedTasks.length > 0 || failedTasks.length > 0) {
+    sections.push("## Tasks\n");
+    for (const task of completedTasks) {
+      sections.push(`- [x] ${task.text}`);
+    }
+    for (const task of failedTasks) {
+      sections.push(`- [ ] ${task.text}`);
+    }
+    sections.push("");
+  }
+  if (details.labels.length > 0) {
+    sections.push(`**Labels:** ${details.labels.join(", ")}
+`);
+  }
+  if (datasourceName === "github") {
+    sections.push(`Closes #${details.number}`);
+  } else if (datasourceName === "azdevops") {
+    sections.push(`Resolves AB#${details.number}`);
+  }
+  return sections.join("\n");
+}
+async function buildPrTitle(issueTitle, defaultBranch, cwd) {
+  const commits = await getCommitSummaries(defaultBranch, cwd);
+  if (commits.length === 0) {
+    return issueTitle;
+  }
+  if (commits.length === 1) {
+    return commits[0];
+  }
+  return `${commits[commits.length - 1]} (+${commits.length - 1} more)`;
+}
+function buildFeaturePrTitle(featureBranchName, issues) {
+  if (issues.length === 1) {
+    return issues[0].title;
+  }
+  const issueRefs = issues.map((d) => `#${d.number}`).join(", ");
+  return `feat: ${featureBranchName} (${issueRefs})`;
+}
+function buildFeaturePrBody(issues, tasks, results, datasourceName) {
+  const sections = [];
+  sections.push("## Issues\n");
+  for (const issue of issues) {
+    sections.push(`- #${issue.number}: ${issue.title}`);
+  }
+  sections.push("");
+  const taskResults = new Map(results.map((r) => [r.task, r]));
+  const completedTasks = tasks.filter((t) => taskResults.get(t)?.success);
+  const failedTasks = tasks.filter((t) => {
+    const r = taskResults.get(t);
+    return r && !r.success;
+  });
+  if (completedTasks.length > 0 || failedTasks.length > 0) {
+    sections.push("## Tasks\n");
+    for (const task of completedTasks) {
+      sections.push(`- [x] ${task.text}`);
+    }
+    for (const task of failedTasks) {
+      sections.push(`- [ ] ${task.text}`);
+    }
+    sections.push("");
+  }
+  for (const issue of issues) {
+    if (datasourceName === "github") {
+      sections.push(`Closes #${issue.number}`);
+    } else if (datasourceName === "azdevops") {
+      sections.push(`Resolves AB#${issue.number}`);
+    }
+  }
+  return sections.join("\n");
+}
+
+// src/helpers/worktree.ts
+import { join as join4, basename as basename3 } from "path";
+import { execFile as execFile6 } from "child_process";
+import { promisify as promisify6 } from "util";
+import { randomUUID } from "crypto";
+init_logger();
+var exec6 = promisify6(execFile6);
+var WORKTREE_DIR = ".dispatch/worktrees";
+async function git2(args, cwd) {
+  const { stdout } = await exec6("git", args, { cwd, shell: process.platform === "win32" });
+  return stdout;
+}
+function worktreeName(issueFilename) {
+  const base = basename3(issueFilename);
+  const withoutExt = base.replace(/\.md$/i, "");
+  const match = withoutExt.match(/^(\d+)/);
+  return match ? `issue-${match[1]}` : slugify(withoutExt);
+}
+async function createWorktree(repoRoot, issueFilename, branchName, startPoint) {
+  const name = worktreeName(issueFilename);
+  const worktreePath = join4(repoRoot, WORKTREE_DIR, name);
+  try {
+    const args = ["worktree", "add", worktreePath, "-b", branchName];
+    if (startPoint) args.push(startPoint);
+    await git2(args, repoRoot);
+    log.debug(`Created worktree at ${worktreePath} on branch ${branchName}`);
+  } catch (err) {
+    const message = log.extractMessage(err);
+    if (message.includes("already exists")) {
+      await git2(["worktree", "add", worktreePath, branchName], repoRoot);
+      log.debug(`Created worktree at ${worktreePath} using existing branch ${branchName}`);
+    } else {
+      throw err;
+    }
+  }
+  return worktreePath;
+}
+async function removeWorktree(repoRoot, issueFilename) {
+  const name = worktreeName(issueFilename);
+  const worktreePath = join4(repoRoot, WORKTREE_DIR, name);
+  try {
+    await git2(["worktree", "remove", worktreePath], repoRoot);
+  } catch {
+    try {
+      await git2(["worktree", "remove", "--force", worktreePath], repoRoot);
+    } catch (err) {
+      log.warn(`Could not remove worktree ${name}: ${log.formatErrorChain(err)}`);
+      return;
+    }
+  }
+  try {
+    await git2(["worktree", "prune"], repoRoot);
+  } catch (err) {
+    log.warn(`Could not prune worktrees: ${log.formatErrorChain(err)}`);
+  }
+}
+function generateFeatureBranchName() {
+  const uuid = randomUUID();
+  const octet = uuid.split("-")[0];
+  return `dispatch/feature-${octet}`;
+}
+
 // src/orchestrator/runner.ts
+init_cleanup();
 init_logger();
 
 // src/helpers/confirm-large-batch.ts
@@ -2140,9 +2366,9 @@ async function confirmLargeBatch(count, threshold = LARGE_BATCH_THRESHOLD) {
 }
 
 // src/helpers/prereqs.ts
-import { execFile as execFile5 } from "child_process";
-import { promisify as promisify5 } from "util";
-var exec5 = promisify5(execFile5);
+import { execFile as execFile7 } from "child_process";
+import { promisify as promisify7 } from "util";
+var exec7 = promisify7(execFile7);
 var MIN_NODE_VERSION = "20.12.0";
 function parseSemver(version) {
   const [major, minor, patch] = version.split(".").map(Number);
@@ -2158,7 +2384,7 @@ function semverGte(current, minimum) {
 async function checkPrereqs(context) {
   const failures = [];
   try {
-    await exec5("git", ["--version"], { shell: process.platform === "win32" });
+    await exec7("git", ["--version"], { shell: process.platform === "win32" });
   } catch {
     failures.push("git is required but was not found on PATH. Install it from https://git-scm.com");
   }
@@ -2170,7 +2396,7 @@ async function checkPrereqs(context) {
   }
   if (context?.datasource === "github") {
     try {
-      await exec5("gh", ["--version"], { shell: process.platform === "win32" });
+      await exec7("gh", ["--version"], { shell: process.platform === "win32" });
     } catch {
       failures.push(
         "gh (GitHub CLI) is required for the github datasource but was not found on PATH. Install it from https://cli.github.com/"
@@ -2179,7 +2405,7 @@ async function checkPrereqs(context) {
   }
   if (context?.datasource === "azdevops") {
     try {
-      await exec5("az", ["--version"], { shell: process.platform === "win32" });
+      await exec7("az", ["--version"], { shell: process.platform === "win32" });
     } catch {
       failures.push(
         "az (Azure CLI) is required for the azdevops datasource but was not found on PATH. Install it from https://learn.microsoft.com/en-us/cli/azure/"
@@ -2191,10 +2417,10 @@ async function checkPrereqs(context) {
 
 // src/helpers/gitignore.ts
 init_logger();
-import { readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
-import { join as join3 } from "path";
+import { readFile as readFile2, writeFile as writeFile3 } from "fs/promises";
+import { join as join5 } from "path";
 async function ensureGitignoreEntry(repoRoot, entry) {
-  const gitignorePath = join3(repoRoot, ".gitignore");
+  const gitignorePath = join5(repoRoot, ".gitignore");
   let contents = "";
   try {
     contents = await readFile2(gitignorePath, "utf8");
@@ -2213,7 +2439,7 @@ async function ensureGitignoreEntry(repoRoot, entry) {
   }
   try {
     const separator = contents.length > 0 && !contents.endsWith("\n") ? "\n" : "";
-    await writeFile2(gitignorePath, `${contents}${separator}${entry}
+    await writeFile3(gitignorePath, `${contents}${separator}${entry}
 `, "utf8");
     log.debug(`Added '${entry}' to .gitignore`);
   } catch (err) {
@@ -2223,14 +2449,14 @@ async function ensureGitignoreEntry(repoRoot, entry) {
 
 // src/orchestrator/cli-config.ts
 init_logger();
-import { join as join5 } from "path";
+import { join as join7 } from "path";
 import { access } from "fs/promises";
 import { constants } from "fs";
 
 // src/config.ts
 init_providers();
-import { readFile as readFile3, writeFile as writeFile3, mkdir as mkdir2 } from "fs/promises";
-import { join as join4, dirname as dirname3 } from "path";
+import { readFile as readFile3, writeFile as writeFile4, mkdir as mkdir2 } from "fs/promises";
+import { join as join6, dirname as dirname3 } from "path";
 
 // src/config-prompts.ts
 init_logger();
@@ -2407,8 +2633,8 @@ var CONFIG_BOUNDS = {
 };
 var CONFIG_KEYS = ["provider", "model", "source", "testTimeout", "planTimeout", "concurrency", "org", "project", "workItemType", "iteration", "area"];
 function getConfigPath(configDir) {
-  const dir = configDir ?? join4(process.cwd(), ".dispatch");
-  return join4(dir, "config.json");
+  const dir = configDir ?? join6(process.cwd(), ".dispatch");
+  return join6(dir, "config.json");
 }
 async function loadConfig(configDir) {
   const configPath = getConfigPath(configDir);
@@ -2422,7 +2648,7 @@ async function loadConfig(configDir) {
 async function saveConfig(config, configDir) {
   const configPath = getConfigPath(configDir);
   await mkdir2(dirname3(configPath), { recursive: true });
-  await writeFile3(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+  await writeFile4(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
 }
 async function handleConfigCommand(_argv, configDir) {
   await runInteractiveConfigWizard(configDir);
@@ -2447,7 +2673,7 @@ function setCliField(target, key, value) {
 }
 async function resolveCliConfig(args) {
   const { explicitFlags } = args;
-  const configDir = join5(args.cwd, ".dispatch");
+  const configDir = join7(args.cwd, ".dispatch");
   const config = await loadConfig(configDir);
   const merged = { ...args };
   for (const configKey of CONFIG_KEYS) {
@@ -2475,7 +2701,7 @@ async function resolveCliConfig(args) {
     }
   }
   const sourceConfigured = explicitFlags.has("issueSource") || config.source !== void 0;
-  const needsSource = !merged.fixTests && !merged.spec && !merged.respec;
+  const needsSource = !(merged.fixTests && merged.issueIds.length === 0) && !merged.spec && !merged.respec;
   if (needsSource && !sourceConfigured) {
     const detected = await detectDatasource(merged.cwd);
     if (detected) {
@@ -2494,15 +2720,15 @@ async function resolveCliConfig(args) {
 }
 
 // src/orchestrator/spec-pipeline.ts
-import { join as join7 } from "path";
+import { join as join9 } from "path";
 import { mkdir as mkdir4, readFile as readFile5, rename as rename2, unlink as unlink2 } from "fs/promises";
 import { glob as glob2 } from "glob";
 init_providers();
 
 // src/agents/spec.ts
-import { mkdir as mkdir3, readFile as readFile4, writeFile as writeFile4, unlink } from "fs/promises";
-import { join as join6, resolve as resolve2, sep } from "path";
-import { randomUUID as randomUUID3 } from "crypto";
+import { mkdir as mkdir3, readFile as readFile4, writeFile as writeFile5, unlink } from "fs/promises";
+import { join as join8, resolve as resolve2, sep } from "path";
+import { randomUUID as randomUUID4 } from "crypto";
 init_logger();
 init_file_logger();
 init_environment();
@@ -2527,10 +2753,10 @@ async function boot5(opts) {
             durationMs: Date.now() - startTime
           };
         }
-        const tmpDir = join6(resolvedCwd, ".dispatch", "tmp");
+        const tmpDir = join8(resolvedCwd, ".dispatch", "tmp");
         await mkdir3(tmpDir, { recursive: true });
-        const tmpFilename = `spec-${randomUUID3()}.md`;
-        const tmpPath = join6(tmpDir, tmpFilename);
+        const tmpFilename = `spec-${randomUUID4()}.md`;
+        const tmpPath = join8(tmpDir, tmpFilename);
         let prompt;
         if (issue) {
           prompt = buildSpecPrompt(issue, workingDir, tmpPath);
@@ -2577,7 +2803,7 @@ async function boot5(opts) {
         if (!validation.valid) {
           log.warn(`Spec validation warning for ${outputPath}: ${validation.reason}`);
         }
-        await writeFile4(resolvedOutput, cleanedContent, "utf-8");
+        await writeFile5(resolvedOutput, cleanedContent, "utf-8");
         log.debug(`Wrote cleaned spec to ${resolvedOutput}`);
         try {
           await unlink(tmpPath);
@@ -2932,7 +3158,7 @@ function buildInlineTextItem(issues, outputDir) {
   const title = text.length > 80 ? text.slice(0, 80).trimEnd() + "\u2026" : text;
   const slug = slugify(text, MAX_SLUG_LENGTH);
   const filename = `${slug}.md`;
-  const filepath = join7(outputDir, filename);
+  const filepath = join9(outputDir, filename);
   const details = {
     number: filepath,
     title,
@@ -2994,7 +3220,7 @@ function previewDryRun(validItems, items, isTrackerMode, isInlineText, outputDir
     let filepath;
     if (isTrackerMode) {
       const slug = slugify(details.title, 60);
-      filepath = join7(outputDir, `${id}-${slug}.md`);
+      filepath = join9(outputDir, `${id}-${slug}.md`);
     } else {
       filepath = id;
     }
@@ -3057,7 +3283,7 @@ async function generateSpecsBatch(validItems, items, specAgent, instance, isTrac
           if (isTrackerMode) {
             const slug = slugify(details.title, MAX_SLUG_LENGTH);
             const filename = `${id}-${slug}.md`;
-            filepath = join7(outputDir, filename);
+            filepath = join9(outputDir, filename);
           } else if (isInlineText) {
             filepath = id;
           } else {
@@ -3086,7 +3312,7 @@ async function generateSpecsBatch(validItems, items, specAgent, instance, isTrac
               const h1Title = extractTitle(result.data.content, filepath);
               const h1Slug = slugify(h1Title, MAX_SLUG_LENGTH);
               const finalFilename = isTrackerMode ? `${id}-${h1Slug}.md` : `${h1Slug}.md`;
-              const finalFilepath = join7(outputDir, finalFilename);
+              const finalFilepath = join9(outputDir, finalFilename);
               if (finalFilepath !== filepath) {
                 await rename2(filepath, finalFilepath);
                 filepath = finalFilepath;
@@ -3191,7 +3417,7 @@ async function runSpecPipeline(opts) {
     model,
     serverUrl,
     cwd: specCwd,
-    outputDir = join7(specCwd, ".dispatch", "specs"),
+    outputDir = join9(specCwd, ".dispatch", "specs"),
     org,
     project,
     workItemType,
@@ -3272,7 +3498,7 @@ import { readFile as readFile7 } from "fs/promises";
 import { glob as glob3 } from "glob";
 
 // src/parser.ts
-import { readFile as readFile6, writeFile as writeFile5 } from "fs/promises";
+import { readFile as readFile6, writeFile as writeFile6 } from "fs/promises";
 var UNCHECKED_RE = /^(\s*[-*]\s)\[ \]\s+(.+)$/;
 var CHECKED_SUB = "$1[x] $2";
 var MODE_PREFIX_RE = /^\(([PSI])\)\s+/;
@@ -3340,7 +3566,7 @@ async function markTaskComplete(task) {
     );
   }
   lines[lineIndex] = updated;
-  await writeFile5(task.file, lines.join(eol), "utf-8");
+  await writeFile6(task.file, lines.join(eol), "utf-8");
 }
 function groupTasksByMode(tasks) {
   if (tasks.length === 0) return [];
@@ -3611,9 +3837,9 @@ ${err.stack}` : ""}`);
 init_logger();
 init_file_logger();
 init_environment();
-import { mkdir as mkdir5, writeFile as writeFile6 } from "fs/promises";
-import { join as join8, resolve as resolve3 } from "path";
-import { randomUUID as randomUUID4 } from "crypto";
+import { mkdir as mkdir5, writeFile as writeFile7 } from "fs/promises";
+import { join as join10, resolve as resolve3 } from "path";
+import { randomUUID as randomUUID5 } from "crypto";
 async function boot8(opts) {
   const { provider } = opts;
   if (!provider) {
@@ -3626,10 +3852,10 @@ async function boot8(opts) {
     async generate(genOpts) {
       try {
         const resolvedCwd = resolve3(genOpts.cwd);
-        const tmpDir = join8(resolvedCwd, ".dispatch", "tmp");
+        const tmpDir = join10(resolvedCwd, ".dispatch", "tmp");
         await mkdir5(tmpDir, { recursive: true });
-        const tmpFilename = `commit-${randomUUID4()}.md`;
-        const tmpPath = join8(tmpDir, tmpFilename);
+        const tmpFilename = `commit-${randomUUID5()}.md`;
+        const tmpPath = join10(tmpDir, tmpFilename);
         const prompt = buildCommitPrompt(genOpts);
         fileLoggerStorage.getStore()?.prompt("commit", prompt);
         const sessionId = await provider.createSession();
@@ -3657,7 +3883,7 @@ async function boot8(opts) {
           };
         }
         const outputContent = formatOutputFile(parsed);
-        await writeFile6(tmpPath, outputContent, "utf-8");
+        await writeFile7(tmpPath, outputContent, "utf-8");
         log.debug(`Wrote commit agent output to ${tmpPath}`);
         fileLoggerStorage.getStore()?.agentEvent("commit", "completed", `message: ${parsed.commitMessage.slice(0, 80)}`);
         return {
@@ -3809,68 +4035,6 @@ function formatOutputFile(parsed) {
 init_logger();
 init_cleanup();
 
-// src/helpers/worktree.ts
-import { join as join9, basename as basename2 } from "path";
-import { execFile as execFile7 } from "child_process";
-import { promisify as promisify7 } from "util";
-import { randomUUID as randomUUID5 } from "crypto";
-init_logger();
-var exec7 = promisify7(execFile7);
-var WORKTREE_DIR = ".dispatch/worktrees";
-async function git2(args, cwd) {
-  const { stdout } = await exec7("git", args, { cwd, shell: process.platform === "win32" });
-  return stdout;
-}
-function worktreeName(issueFilename) {
-  const base = basename2(issueFilename);
-  const withoutExt = base.replace(/\.md$/i, "");
-  const match = withoutExt.match(/^(\d+)/);
-  return match ? `issue-${match[1]}` : slugify(withoutExt);
-}
-async function createWorktree(repoRoot, issueFilename, branchName, startPoint) {
-  const name = worktreeName(issueFilename);
-  const worktreePath = join9(repoRoot, WORKTREE_DIR, name);
-  try {
-    const args = ["worktree", "add", worktreePath, "-b", branchName];
-    if (startPoint) args.push(startPoint);
-    await git2(args, repoRoot);
-    log.debug(`Created worktree at ${worktreePath} on branch ${branchName}`);
-  } catch (err) {
-    const message = log.extractMessage(err);
-    if (message.includes("already exists")) {
-      await git2(["worktree", "add", worktreePath, branchName], repoRoot);
-      log.debug(`Created worktree at ${worktreePath} using existing branch ${branchName}`);
-    } else {
-      throw err;
-    }
-  }
-  return worktreePath;
-}
-async function removeWorktree(repoRoot, issueFilename) {
-  const name = worktreeName(issueFilename);
-  const worktreePath = join9(repoRoot, WORKTREE_DIR, name);
-  try {
-    await git2(["worktree", "remove", worktreePath], repoRoot);
-  } catch {
-    try {
-      await git2(["worktree", "remove", "--force", worktreePath], repoRoot);
-    } catch (err) {
-      log.warn(`Could not remove worktree ${name}: ${log.formatErrorChain(err)}`);
-      return;
-    }
-  }
-  try {
-    await git2(["worktree", "prune"], repoRoot);
-  } catch (err) {
-    log.warn(`Could not prune worktrees: ${log.formatErrorChain(err)}`);
-  }
-}
-function generateFeatureBranchName() {
-  const uuid = randomUUID5();
-  const octet = uuid.split("-")[0];
-  return `dispatch/feature-${octet}`;
-}
-
 // src/tui.ts
 import chalk6 from "chalk";
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
@@ -4127,181 +4291,6 @@ function createTui() {
 
 // src/orchestrator/dispatch-pipeline.ts
 init_providers();
-
-// src/orchestrator/datasource-helpers.ts
-init_logger();
-import { basename as basename3, join as join10 } from "path";
-import { mkdtemp, writeFile as writeFile7 } from "fs/promises";
-import { tmpdir } from "os";
-import { execFile as execFile8 } from "child_process";
-import { promisify as promisify8 } from "util";
-var exec8 = promisify8(execFile8);
-function parseIssueFilename(filePath) {
-  const filename = basename3(filePath);
-  const match = /^(\d+)-(.+)\.md$/.exec(filename);
-  if (!match) return null;
-  return { issueId: match[1], slug: match[2] };
-}
-async function fetchItemsById(issueIds, datasource4, fetchOpts) {
-  const ids = issueIds.flatMap(
-    (id) => id.split(",").map((s) => s.trim()).filter(Boolean)
-  );
-  const items = [];
-  for (const id of ids) {
-    try {
-      const item = await datasource4.fetch(id, fetchOpts);
-      items.push(item);
-    } catch (err) {
-      const prefix = id.includes("/") || id.includes("\\") || id.endsWith(".md") ? "" : "#";
-      log.warn(`Could not fetch issue ${prefix}${id}: ${log.formatErrorChain(err)}`);
-    }
-  }
-  return items;
-}
-async function writeItemsToTempDir(items) {
-  const tempDir = await mkdtemp(join10(tmpdir(), "dispatch-"));
-  const files = [];
-  const issueDetailsByFile = /* @__PURE__ */ new Map();
-  for (const item of items) {
-    const slug = slugify(item.title, MAX_SLUG_LENGTH);
-    const filename = `${item.number}-${slug}.md`;
-    const filepath = join10(tempDir, filename);
-    await writeFile7(filepath, item.body, "utf-8");
-    files.push(filepath);
-    issueDetailsByFile.set(filepath, item);
-  }
-  files.sort((a, b) => {
-    const numA = parseInt(basename3(a).match(/^(\d+)/)?.[1] ?? "0", 10);
-    const numB = parseInt(basename3(b).match(/^(\d+)/)?.[1] ?? "0", 10);
-    if (numA !== numB) return numA - numB;
-    return a.localeCompare(b);
-  });
-  return { files, issueDetailsByFile };
-}
-async function getCommitSummaries(defaultBranch, cwd) {
-  try {
-    const { stdout } = await exec8(
-      "git",
-      ["log", `${defaultBranch}..HEAD`, "--pretty=format:%s"],
-      { cwd, shell: process.platform === "win32" }
-    );
-    return stdout.trim().split("\n").filter(Boolean);
-  } catch {
-    return [];
-  }
-}
-async function getBranchDiff(defaultBranch, cwd) {
-  try {
-    const { stdout } = await exec8(
-      "git",
-      ["diff", `${defaultBranch}..HEAD`],
-      { cwd, maxBuffer: 10 * 1024 * 1024, shell: process.platform === "win32" }
-    );
-    return stdout;
-  } catch {
-    return "";
-  }
-}
-async function squashBranchCommits(defaultBranch, message, cwd) {
-  const { stdout } = await exec8(
-    "git",
-    ["merge-base", defaultBranch, "HEAD"],
-    { cwd, shell: process.platform === "win32" }
-  );
-  const mergeBase = stdout.trim();
-  await exec8("git", ["reset", "--soft", mergeBase], { cwd, shell: process.platform === "win32" });
-  await exec8("git", ["commit", "-m", message], { cwd, shell: process.platform === "win32" });
-}
-async function buildPrBody(details, tasks, results, defaultBranch, datasourceName, cwd) {
-  const sections = [];
-  const commits = await getCommitSummaries(defaultBranch, cwd);
-  if (commits.length > 0) {
-    sections.push("## Summary\n");
-    for (const commit of commits) {
-      sections.push(`- ${commit}`);
-    }
-    sections.push("");
-  }
-  const taskResults = new Map(
-    results.filter((r) => tasks.includes(r.task)).map((r) => [r.task, r])
-  );
-  const completedTasks = tasks.filter((t) => taskResults.get(t)?.success);
-  const failedTasks = tasks.filter((t) => {
-    const r = taskResults.get(t);
-    return r && !r.success;
-  });
-  if (completedTasks.length > 0 || failedTasks.length > 0) {
-    sections.push("## Tasks\n");
-    for (const task of completedTasks) {
-      sections.push(`- [x] ${task.text}`);
-    }
-    for (const task of failedTasks) {
-      sections.push(`- [ ] ${task.text}`);
-    }
-    sections.push("");
-  }
-  if (details.labels.length > 0) {
-    sections.push(`**Labels:** ${details.labels.join(", ")}
-`);
-  }
-  if (datasourceName === "github") {
-    sections.push(`Closes #${details.number}`);
-  } else if (datasourceName === "azdevops") {
-    sections.push(`Resolves AB#${details.number}`);
-  }
-  return sections.join("\n");
-}
-async function buildPrTitle(issueTitle, defaultBranch, cwd) {
-  const commits = await getCommitSummaries(defaultBranch, cwd);
-  if (commits.length === 0) {
-    return issueTitle;
-  }
-  if (commits.length === 1) {
-    return commits[0];
-  }
-  return `${commits[commits.length - 1]} (+${commits.length - 1} more)`;
-}
-function buildFeaturePrTitle(featureBranchName, issues) {
-  if (issues.length === 1) {
-    return issues[0].title;
-  }
-  const issueRefs = issues.map((d) => `#${d.number}`).join(", ");
-  return `feat: ${featureBranchName} (${issueRefs})`;
-}
-function buildFeaturePrBody(issues, tasks, results, datasourceName) {
-  const sections = [];
-  sections.push("## Issues\n");
-  for (const issue of issues) {
-    sections.push(`- #${issue.number}: ${issue.title}`);
-  }
-  sections.push("");
-  const taskResults = new Map(results.map((r) => [r.task, r]));
-  const completedTasks = tasks.filter((t) => taskResults.get(t)?.success);
-  const failedTasks = tasks.filter((t) => {
-    const r = taskResults.get(t);
-    return r && !r.success;
-  });
-  if (completedTasks.length > 0 || failedTasks.length > 0) {
-    sections.push("## Tasks\n");
-    for (const task of completedTasks) {
-      sections.push(`- [x] ${task.text}`);
-    }
-    for (const task of failedTasks) {
-      sections.push(`- [ ] ${task.text}`);
-    }
-    sections.push("");
-  }
-  for (const issue of issues) {
-    if (datasourceName === "github") {
-      sections.push(`Closes #${issue.number}`);
-    } else if (datasourceName === "azdevops") {
-      sections.push(`Resolves AB#${issue.number}`);
-    }
-  }
-  return sections.join("\n");
-}
-
-// src/orchestrator/dispatch-pipeline.ts
 init_timeout();
 import chalk7 from "chalk";
 init_file_logger();
@@ -5017,6 +5006,58 @@ async function dryRunMode(issueIds, cwd, source, org, project, workItemType, ite
 }
 
 // src/orchestrator/runner.ts
+async function runMultiIssueFixTests(opts) {
+  const { runFixTestsPipeline: runFixTestsPipeline2 } = await Promise.resolve().then(() => (init_fix_tests_pipeline(), fix_tests_pipeline_exports));
+  const datasource4 = getDatasource(opts.source);
+  const fetchOpts = { cwd: opts.cwd, org: opts.org, project: opts.project };
+  const items = await fetchItemsById(opts.issueIds, datasource4, fetchOpts);
+  if (items.length === 0) {
+    log.warn("No issues found for the given IDs");
+    return { mode: "fix-tests", success: false, error: "No issues found" };
+  }
+  let username = "";
+  try {
+    username = await datasource4.getUsername({ cwd: opts.cwd });
+  } catch (err) {
+    log.warn(`Could not resolve git username for branch naming: ${log.formatErrorChain(err)}`);
+  }
+  log.info(`Running fix-tests for ${items.length} issue(s) in worktrees`);
+  const issueResults = [];
+  for (const item of items) {
+    const branchName = datasource4.buildBranchName(item.number, item.title, username);
+    const issueFilename = `${item.number}-fix-tests.md`;
+    let worktreePath;
+    try {
+      worktreePath = await createWorktree(opts.cwd, issueFilename, branchName);
+      registerCleanup(async () => {
+        await removeWorktree(opts.cwd, issueFilename);
+      });
+      log.info(`Created worktree for issue #${item.number} at ${worktreePath}`);
+      const result = await runFixTestsPipeline2({
+        cwd: worktreePath,
+        provider: opts.provider,
+        serverUrl: opts.serverUrl,
+        verbose: opts.verbose,
+        testTimeout: opts.testTimeout
+      });
+      issueResults.push({ issueId: item.number, branch: branchName, success: result.success, error: result.error });
+    } catch (err) {
+      const message = log.extractMessage(err);
+      log.error(`Fix-tests failed for issue #${item.number}: ${message}`);
+      issueResults.push({ issueId: item.number, branch: branchName, success: false, error: message });
+    } finally {
+      if (worktreePath) {
+        try {
+          await removeWorktree(opts.cwd, issueFilename);
+        } catch (err) {
+          log.warn(`Could not remove worktree for issue #${item.number}: ${log.formatErrorChain(err)}`);
+        }
+      }
+    }
+  }
+  const allSuccess = issueResults.length > 0 && issueResults.every((r) => r.success);
+  return { mode: "fix-tests", success: allSuccess, issueResults };
+}
 async function boot9(opts) {
   const { cwd } = opts;
   const runner = {
@@ -5029,7 +5070,25 @@ async function boot9(opts) {
       }
       if (opts2.mode === "fix-tests") {
         const { runFixTestsPipeline: runFixTestsPipeline2 } = await Promise.resolve().then(() => (init_fix_tests_pipeline(), fix_tests_pipeline_exports));
-        return runFixTestsPipeline2({ cwd, provider: "opencode", serverUrl: void 0, verbose: false, testTimeout: opts2.testTimeout });
+        if (!opts2.issueIds || opts2.issueIds.length === 0) {
+          return runFixTestsPipeline2({ cwd, provider: opts2.provider ?? "opencode", serverUrl: opts2.serverUrl, verbose: opts2.verbose ?? false, testTimeout: opts2.testTimeout });
+        }
+        const source = opts2.source;
+        if (!source) {
+          log.error("No datasource configured for multi-issue fix-tests.");
+          return { mode: "fix-tests", success: false, error: "No datasource configured" };
+        }
+        return runMultiIssueFixTests({
+          cwd,
+          issueIds: opts2.issueIds,
+          source,
+          provider: opts2.provider ?? "opencode",
+          serverUrl: opts2.serverUrl,
+          verbose: opts2.verbose ?? false,
+          testTimeout: opts2.testTimeout,
+          org: opts2.org,
+          project: opts2.project
+        });
       }
       const { mode: _, ...rest } = opts2;
       return runner.orchestrate(rest);
@@ -5058,13 +5117,27 @@ async function boot9(opts) {
         log.error("--feature and --no-branch are mutually exclusive");
         process.exit(1);
       }
-      if (m.fixTests && m.issueIds.length > 0) {
-        log.error("--fix-tests cannot be combined with issue IDs");
-        process.exit(1);
-      }
       if (m.fixTests) {
         const { runFixTestsPipeline: runFixTestsPipeline2 } = await Promise.resolve().then(() => (init_fix_tests_pipeline(), fix_tests_pipeline_exports));
-        return runFixTestsPipeline2({ cwd: m.cwd, provider: m.provider, serverUrl: m.serverUrl, verbose: m.verbose, testTimeout: m.testTimeout });
+        if (m.issueIds.length === 0) {
+          return runFixTestsPipeline2({ cwd: m.cwd, provider: m.provider, serverUrl: m.serverUrl, verbose: m.verbose, testTimeout: m.testTimeout });
+        }
+        const source = m.issueSource;
+        if (!source) {
+          log.error("No datasource configured. Use --source or run 'dispatch config' to set up defaults.");
+          process.exit(1);
+        }
+        return runMultiIssueFixTests({
+          cwd: m.cwd,
+          issueIds: m.issueIds,
+          source,
+          provider: m.provider,
+          serverUrl: m.serverUrl,
+          verbose: m.verbose,
+          testTimeout: m.testTimeout,
+          org: m.org,
+          project: m.project
+        });
       }
       if (m.spec) {
         return this.generateSpecs({
@@ -5170,6 +5243,7 @@ var HELP = `
     dispatch --respec <glob>         Regenerate specs matching a glob pattern
     dispatch --spec "description"    Generate a spec from an inline text description
     dispatch --fix-tests             Run tests and fix failures via AI agent
+    dispatch --fix-tests <ids>       Fix tests on specific issue branches (in worktrees)
 
   Dispatch options:
     --dry-run              List tasks without dispatching (also works with --spec)
@@ -5224,6 +5298,10 @@ var HELP = `
     dispatch --spec "feature A should do x" --provider copilot
     dispatch --feature
     dispatch --feature my-feature
+    dispatch --fix-tests
+    dispatch --fix-tests 14
+    dispatch --fix-tests 14 15 16
+    dispatch --fix-tests 14,15,16
     dispatch config
 `.trimStart();
 function parseArgs(argv) {
@@ -5233,7 +5311,7 @@ function parseArgs(argv) {
     },
     writeErr: () => {
     }
-  }).helpOption(false).argument("[issueIds...]").option("-h, --help", "Show help").option("-v, --version", "Show version").option("--dry-run", "List tasks without dispatching").option("--no-plan", "Skip the planner agent").option("--no-branch", "Skip branch creation").option("--no-worktree", "Skip git worktree isolation").option("--feature [name]", "Group issues into a single feature branch").option("--force", "Ignore prior run state").option("--verbose", "Show detailed debug output").option("--fix-tests", "Run tests and fix failures").option("--spec <values...>", "Spec mode: issue numbers, glob, or text").option("--respec [values...]", "Regenerate specs").addOption(
+  }).helpOption(false).argument("[issueIds...]").option("-h, --help", "Show help").option("-v, --version", "Show version").option("--dry-run", "List tasks without dispatching").option("--no-plan", "Skip the planner agent").option("--no-branch", "Skip branch creation").option("--no-worktree", "Skip git worktree isolation").option("--feature [name]", "Group issues into a single feature branch").option("--force", "Ignore prior run state").option("--verbose", "Show detailed debug output").option("--fix-tests", "Run tests and fix failures (optionally pass issue IDs to target specific branches)").option("--spec <values...>", "Spec mode: issue numbers, glob, or text").option("--respec [values...]", "Regenerate specs").addOption(
     new Option("--provider <name>", "Agent backend").choices(PROVIDER_NAMES)
   ).addOption(
     new Option("--source <name>", "Issue source").choices(
@@ -5397,7 +5475,7 @@ async function main() {
     process.exit(0);
   }
   if (args.version) {
-    console.log(`dispatch v${"1.4.0"}`);
+    console.log(`dispatch v${"1.4.1"}`);
     process.exit(0);
   }
   const orchestrator = await boot9({ cwd: args.cwd });