fix(orchestrator): commit agent changes before pushing branch

tkowalczyk · claude · tkowalczyk · commit 50024d526424 · 2026-03-15T15:05:41.000+01:00
The orchestrator pushed the feature branch without committing the agent's
file changes first, resulting in an empty branch and a 422 from GitHub
("No commits between main and branch").

- Add commitChanges() to stage and commit all workspace changes
- Call it in runPipeline after validation passes, before git push

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/dist/cli.js b/dist/cli.js
@@ -300,6 +300,15 @@ async function runAgent(options) {
 
 // src/lib/pr.ts
 import { execaCommand } from "execa";
+async function commitChanges(cwd, issueNumber, title) {
+  await execaCommand("git add -A", { cwd });
+  try {
+    await execaCommand(`git commit -m "feat(#${issueNumber}): ${title}"`, { cwd });
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function pushBranch(cwd, branch, force = false) {
   const forceFlag = force ? "--force-with-lease " : "";
   await execaCommand(`git push ${forceFlag}-u origin ${branch}`, { cwd });
@@ -495,6 +504,7 @@ async function runPipeline(deps, issue, isRework, existingState) {
   }
   state = updateIssue(state, issue.number, { phase: "PR" });
   await saveState(statePath, state);
+  await commitChanges(dir, issue.number, issue.title);
   const force = isRework;
   await pushBranch(dir, branch, force);
   const validationOutput = "All checks passed";
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -150,6 +150,7 @@ interface CliOptions {
 }
 declare function startCli(argv: string[], options?: CliOptions): Promise<void>;
 
+declare function commitChanges(cwd: string, issueNumber: number, title: string): Promise<boolean>;
 declare function pushBranch(cwd: string, branch: string, force?: boolean): Promise<void>;
 declare function buildPRBody(issue: Issue, validationOutput: string): string;
 declare function createPR(github: GitHubClient, config: ConductorConfig, issue: Issue, branch: string, validationOutput: string): Promise<number>;
@@ -178,4 +179,4 @@ declare function createWorkspace(config: ConductorConfig, issueNumber: number, t
 }>;
 declare function cleanupWorkspace(dir: string): Promise<void>;
 
-export { type AgentResult, type CliOptions, type ConductorConfig, GitHubClient, type Issue, type IssueState, type OrchestratorDeps, type Phase, type QAResult, type State, type ValidationResult, buildPRBody, buildPrompt, cleanupWorkspace, createPR, createWorkspace, loadState, parseArgs, parseBlockedBy, parseConfig, pushBranch, renderTemplate, run, runAgent, runQA, runValidation, saveState, slugify, startCli, tick, updateIssue };
+export { type AgentResult, type CliOptions, type ConductorConfig, GitHubClient, type Issue, type IssueState, type OrchestratorDeps, type Phase, type QAResult, type State, type ValidationResult, buildPRBody, buildPrompt, cleanupWorkspace, commitChanges, createPR, createWorkspace, loadState, parseArgs, parseBlockedBy, parseConfig, pushBranch, renderTemplate, run, runAgent, runQA, runValidation, saveState, slugify, startCli, tick, updateIssue };
diff --git a/dist/index.js b/dist/index.js
@@ -298,6 +298,15 @@ var GitHubClient = class {
 
 // src/lib/pr.ts
 import { execaCommand } from "execa";
+async function commitChanges(cwd, issueNumber, title) {
+  await execaCommand("git add -A", { cwd });
+  try {
+    await execaCommand(`git commit -m "feat(#${issueNumber}): ${title}"`, { cwd });
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function pushBranch(cwd, branch, force = false) {
   const forceFlag = force ? "--force-with-lease " : "";
   await execaCommand(`git push ${forceFlag}-u origin ${branch}`, { cwd });
@@ -493,6 +502,7 @@ async function runPipeline(deps, issue, isRework, existingState) {
   }
   state = updateIssue(state, issue.number, { phase: "PR" });
   await saveState(statePath, state);
+  await commitChanges(dir, issue.number, issue.title);
   const force = isRework;
   await pushBranch(dir, branch, force);
   const validationOutput = "All checks passed";
@@ -593,6 +603,7 @@ export {
   buildPRBody,
   buildPrompt,
   cleanupWorkspace,
+  commitChanges,
   createPR,
   createWorkspace,
   loadState,
diff --git a/src/index.ts b/src/index.ts
@@ -8,7 +8,7 @@ export type { Issue } from "./lib/github.js";
 export { GitHubClient } from "./lib/github.js";
 export type { OrchestratorDeps, Phase } from "./lib/orchestrator.js";
 export { parseBlockedBy, run, tick } from "./lib/orchestrator.js";
-export { buildPRBody, createPR, pushBranch } from "./lib/pr.js";
+export { buildPRBody, commitChanges, createPR, pushBranch } from "./lib/pr.js";
 export type { QAResult } from "./lib/qa.js";
 export { runQA } from "./lib/qa.js";
 export type { IssueState, State } from "./lib/state.js";
diff --git a/src/lib/orchestrator.test.ts b/src/lib/orchestrator.test.ts
@@ -3,7 +3,7 @@ import { buildPrompt, runAgent } from "./agent.js";
 import type { ConductorConfig } from "./config.js";
 import type { GitHubClient, Issue } from "./github.js";
 import { parseBlockedBy, run, tick } from "./orchestrator.js";
-import { createPR, pushBranch } from "./pr.js";
+import { commitChanges, createPR, pushBranch } from "./pr.js";
 import { runQA } from "./qa.js";
 import { loadState, saveState } from "./state.js";
 import { runValidation } from "./validation.js";
@@ -34,6 +34,7 @@ vi.mock("./qa.js", () => ({
 }));
 
 vi.mock("./pr.js", () => ({
+  commitChanges: vi.fn(),
   pushBranch: vi.fn(),
   createPR: vi.fn(),
 }));
@@ -306,6 +307,31 @@ describe("tick", () => {
     expect(secondCall?.[0].prompt).toContain("Unexpected token");
   });
 
+  it("commits changes before pushing branch", async () => {
+    const github = createMockGitHub({
+      listIssues: mockListIssues([issue]),
+    });
+    vi.mocked(createWorkspace).mockResolvedValue({
+      dir: "/tmp/ws",
+      branch: "conductor/42-fix-login-bug",
+    });
+    vi.mocked(runAgent).mockResolvedValue({ ok: true, attempts: 1 });
+    vi.mocked(runValidation).mockResolvedValue({ ok: true });
+    vi.mocked(runQA).mockReturnValue({ ok: true, skipped: true });
+    vi.mocked(commitChanges).mockResolvedValue(true);
+    vi.mocked(createPR).mockResolvedValue(101);
+
+    await tick({ github, config: makeConfig(), statePath: "/tmp/state.json" });
+
+    expect(commitChanges).toHaveBeenCalledWith("/tmp/ws", 42, "Fix login bug");
+    expect(pushBranch).toHaveBeenCalled();
+
+    // commitChanges must be called before pushBranch
+    const commitOrder = vi.mocked(commitChanges).mock.invocationCallOrder[0];
+    const pushOrder = vi.mocked(pushBranch).mock.invocationCallOrder[0];
+    expect(commitOrder).toBeLessThan(pushOrder ?? 0);
+  });
+
   it("passes validate.timeout_ms to runValidation", async () => {
     const github = createMockGitHub({
       listIssues: mockListIssues([issue]),
diff --git a/src/lib/orchestrator.ts b/src/lib/orchestrator.ts
@@ -1,7 +1,7 @@
 import { buildPrompt, runAgent } from "./agent.js";
 import type { ConductorConfig } from "./config.js";
 import type { GitHubClient, Issue } from "./github.js";
-import { createPR, pushBranch } from "./pr.js";
+import { commitChanges, createPR, pushBranch } from "./pr.js";
 import { runQA } from "./qa.js";
 import type { IssueState } from "./state.js";
 import { loadState, saveState, updateIssue } from "./state.js";
@@ -140,7 +140,8 @@ async function runPipeline(
   state = updateIssue(state, issue.number, { phase: "PR" });
   await saveState(statePath, state);
 
-  // PR: push and create
+  // PR: commit, push, and create
+  await commitChanges(dir, issue.number, issue.title);
   const force = isRework;
   await pushBranch(dir, branch, force);
   const validationOutput = "All checks passed";
diff --git a/src/lib/pr.test.ts b/src/lib/pr.test.ts
@@ -2,7 +2,7 @@ import { execaCommand } from "execa";
 import { describe, expect, it, type MockedFunction, vi } from "vitest";
 import type { ConductorConfig } from "./config.js";
 import type { Issue } from "./github.js";
-import { buildPRBody, createPR, pushBranch } from "./pr.js";
+import { buildPRBody, commitChanges, createPR, pushBranch } from "./pr.js";
 
 vi.mock("execa");
 
@@ -31,6 +31,42 @@ describe("pushBranch", () => {
   });
 });
 
+describe("commitChanges", () => {
+  it("stages all changes and commits with issue-based message", async () => {
+    mockExecaCommand.mockResolvedValue({} as never);
+
+    await commitChanges("/tmp/ws", 42, "Fix login bug");
+
+    expect(mockExecaCommand).toHaveBeenCalledWith("git add -A", { cwd: "/tmp/ws" });
+    expect(mockExecaCommand).toHaveBeenCalledWith(
+      expect.stringContaining("git commit"),
+      expect.objectContaining({ cwd: "/tmp/ws" })
+    );
+    const commitCall = mockExecaCommand.mock.calls.find((c) =>
+      (c[0] as string).includes("git commit")
+    );
+    expect(commitCall?.[0]).toContain("#42");
+  });
+
+  it("returns true when there are changes to commit", async () => {
+    mockExecaCommand.mockResolvedValue({} as never);
+
+    const result = await commitChanges("/tmp/ws", 42, "Fix login bug");
+
+    expect(result).toBe(true);
+  });
+
+  it("returns false when there are no changes to commit", async () => {
+    mockExecaCommand
+      .mockResolvedValueOnce({} as never) // git add -A
+      .mockRejectedValueOnce(new Error("nothing to commit")); // git commit fails
+
+    const result = await commitChanges("/tmp/ws", 42, "Fix login bug");
+
+    expect(result).toBe(false);
+  });
+});
+
 const issue: Issue = {
   number: 42,
   title: "Fix login bug",
diff --git a/src/lib/pr.ts b/src/lib/pr.ts
@@ -2,6 +2,20 @@ import { execaCommand } from "execa";
 import type { ConductorConfig } from "./config.js";
 import type { GitHubClient, Issue } from "./github.js";
 
+export async function commitChanges(
+  cwd: string,
+  issueNumber: number,
+  title: string
+): Promise<boolean> {
+  await execaCommand("git add -A", { cwd });
+  try {
+    await execaCommand(`git commit -m "feat(#${issueNumber}): ${title}"`, { cwd });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export async function pushBranch(cwd: string, branch: string, force = false): Promise<void> {
   const forceFlag = force ? "--force-with-lease " : "";
   await execaCommand(`git push ${forceFlag}-u origin ${branch}`, { cwd });
