pipeline-worker 0.1.0 → 0.1.2

package/dist/workflow/captureIntent.js

@@ -1,29 +1,92 @@
 /** Step 3: ask the configured agent what a diff is *for*, in a structured, reusable shape. */
 import { z } from 'zod';
+const COMMIT_MESSAGE_MAX_LENGTH = 72;
+/**
+ * Naming a branch/commit/summary from a diff needs no deep reasoning, so a
+ * lighter model keeps this step's token cost down. Adapters that don't
+ * support per-invocation model selection (e.g. copilot) just ignore this.
+ * The CI-fix path (watchPipeline.ts) deliberately does NOT set this — fixing
+ * a real failing build needs the stronger default model.
+ */
+const INTENT_MODEL = 'haiku';
+const RISK_CRITERIA = 'low: the change is isolated to independent components with a small blast radius. ' +
+    'medium: the change touches a shared/dependent component, but that component is well covered by existing unit tests. ' +
+    "high: the change touches existing/critical code paths and needs a human reviewer's attention before merging.";
 const INTENT_SCHEMA = {
     type: 'object',
     properties: {
-        summary: { type: 'string', description: 'One or two sentence description of what this change does and why' },
+        intent: { type: 'string', description: 'One short sentence, no line breaks: why this change exists / what problem it solves.' },
+        summary: { type: 'string', description: 'One or two sentences (single line, no line breaks) on what this change does and why' },
         branchName: { type: 'string', description: 'A short kebab-case branch name, prefixed with pipeline-worker/' },
-        commitMessage: { type: 'string', description: 'A conventional-commit-style commit message for this change' },
+        commitMessage: {
+            type: 'string',
+            maxLength: COMMIT_MESSAGE_MAX_LENGTH,
+            description: `A single-line conventional-commit subject (e.g. "fix: handle empty diff"), max ${COMMIT_MESSAGE_MAX_LENGTH} characters. ` +
+                'Used verbatim as both the git commit message and the MR/PR title — no body, bullet list, or line breaks.',
+        },
+        fileChanges: {
+            type: 'array',
+            items: {
+                type: 'object',
+                properties: {
+                    file: { type: 'string', description: 'The file path (single line).' },
+                    summary: { type: 'string', description: 'A single-line summary of what changed in that file.' },
+                },
+                required: ['file', 'summary'],
+            },
+            description: 'One entry per file touched in the diff, each a single-line summary of what changed in that file.',
+        },
+        risk: { type: 'string', enum: ['low', 'medium', 'high'], description: RISK_CRITERIA },
+        riskReason: { type: 'string', description: 'One short sentence (no line breaks) justifying the risk level.' },
+        testScenarios: {
+            type: 'array',
+            items: { type: 'string', description: 'A single-line test scenario a reviewer should verify before merging.' },
+            description: 'Concrete test scenarios (each a single line) a reviewer should verify before merging.',
+        },
     },
-    required: ['summary', 'branchName', 'commitMessage'],
+    required: ['intent', 'summary', 'branchName', 'commitMessage', 'fileChanges', 'risk', 'riskReason', 'testScenarios'],
 };
+/**
+ * Every one of these fields is rendered by openMergeRequest.ts's
+ * buildDescription() as a single inline line or bullet, so — like
+ * commitMessage — none of them may contain a newline, or they'd break the
+ * MR/PR description's formatting.
+ */
+function singleLine(fieldName) {
+    return z
+        .string()
+        .min(1)
+        .refine((s) => !s.includes('\n'), `${fieldName} must be a single line`);
+}
 /**
  * Agent output is untrusted input: validate the shape and constrain the
  * branch name to characters that are safe as a git ref and a URL segment.
+ * commitMessage doubles as the MR/PR title (see openMergeRequest.ts), so it
+ * must stay a single line short enough to render as one.
  */
 const IntentShape = z.object({
-    summary: z.string().min(1),
+    intent: singleLine('intent'),
+    summary: singleLine('summary'),
     branchName: z.string().regex(/^pipeline-worker\/[A-Za-z0-9][A-Za-z0-9._-]*$/, 'branchName must be pipeline-worker/<kebab-case-name>'),
-    commitMessage: z.string().min(1),
+    commitMessage: z
+        .string()
+        .min(1)
+        .max(COMMIT_MESSAGE_MAX_LENGTH)
+        .refine((s) => !s.includes('\n'), 'commitMessage must be a single line (it doubles as the MR/PR title)'),
+    fileChanges: z.array(z.object({ file: singleLine('fileChanges[].file'), summary: singleLine('fileChanges[].summary') })).min(1),
+    risk: z.enum(['low', 'medium', 'high']),
+    riskReason: singleLine('riskReason'),
+    testScenarios: z.array(singleLine('testScenarios[]')).min(1),
 });
 export async function captureIntent(agent, diffText, worktreePath) {
     const prompt = 'Read the following git diff and determine the intent behind it. ' +
-        'Respond with a JSON object matching the given schema: a short summary of what changed and why, ' +
-        'a kebab-case branch name prefixed with "pipeline-worker/", and a conventional-commit-style commit message.\n\n' +
+        'Respond with a JSON object matching the given schema: why this change exists, a short summary of what changed, ' +
+        'a kebab-case branch name prefixed with "pipeline-worker/", a short single-line conventional-commit ' +
+        `subject (max ${COMMIT_MESSAGE_MAX_LENGTH} characters, no body or bullet list, used verbatim as the MR/PR title), ` +
+        'a one-line summary per changed file, a risk level with a one-line justification ' +
+        `(${RISK_CRITERIA}), and the concrete test scenarios a reviewer should check before merging.\n\n` +
         `\`\`\`diff\n${diffText}\n\`\`\``;
-    const result = await agent.invoke({ prompt, cwd: worktreePath, jsonSchema: INTENT_SCHEMA });
+    const result = await agent.invoke({ prompt, cwd: worktreePath, jsonSchema: INTENT_SCHEMA, model: INTENT_MODEL });
     try {
         return IntentShape.parse(JSON.parse(result.text));
     }

package/dist/workflow/captureIntent.js.map

@@ -1 +1 @@
-{"version":3,"file":"captureIntent.js","sourceRoot":"","sources":["../../src/workflow/captureIntent.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAE9F,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,MAAM,aAAa,GAAG;IACpB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,kEAAkE,EAAE;QAC5G,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,gEAAgE,EAAE;QAC7G,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,4DAA4D,EAAE;KAC7G;IACD,QAAQ,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,eAAe,CAAC;CAC5C,CAAC;AAEX;;;GAGG;AACH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,+CAA+C,EAAE,sDAAsD,CAAC;IACrI,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,KAAmB,EAAE,QAAgB,EAAE,YAAoB;IAC7F,MAAM,MAAM,GACV,kEAAkE;QAClE,iGAAiG;QACjG,gHAAgH;QAChH,eAAe,QAAQ,UAAU,CAAC;IAEpC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;IAC5F,IAAI,CAAC;QACH,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,8CAA8C,OAAO,2BAA2B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAChI,CAAC;AACH,CAAC"}
+{"version":3,"file":"captureIntent.js","sourceRoot":"","sources":["../../src/workflow/captureIntent.ts"],"names":[],"mappings":"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"}

package/dist/workflow/openMergeRequest.d.ts

@@ -1,4 +1,6 @@
 /** Steps 6-7: push the branch and open (or reuse) an MR/PR describing the workflow that produced it. */
 import type { ForgeClient } from '../forge/types.js';
 import type { CapturedIntent, MergeRequest } from '../types.js';
+/** Renders the MR/PR description as: Intent, Summary, per-file changes, Risk, Test Scenarios. */
+export declare function buildDescription(intent: CapturedIntent, agentName: string): string;
 export declare function openMergeRequest(forge: ForgeClient, worktreePath: string, branch: string, targetBranch: string, intent: CapturedIntent, agentName: string): Promise<MergeRequest>;

package/dist/workflow/openMergeRequest.js

@@ -1,20 +1,31 @@
 /** Steps 6-7: push the branch and open (or reuse) an MR/PR describing the workflow that produced it. */
 import { push } from '../git/commit.js';
-export async function openMergeRequest(forge, worktreePath, branch, targetBranch, intent, agentName) {
-    await push(worktreePath, 'origin', branch);
-    const existing = await forge.findExistingMr(branch);
-    if (existing)
-        return existing;
-    const description = `${intent.summary}\n\n` +
+import { runStep, note } from '../ui/steps.js';
+/** Renders the MR/PR description as: Intent, Summary, per-file changes, Risk, Test Scenarios. */
+export function buildDescription(intent, agentName) {
+    const fileChanges = intent.fileChanges.map((f) => `- \`${f.file}\`: ${f.summary}`).join('\n');
+    const testScenarios = intent.testScenarios.map((s) => `- ${s}`).join('\n');
+    const risk = intent.risk.charAt(0).toUpperCase() + intent.risk.slice(1);
+    return (`**Intent:** ${intent.intent}\n\n` +
+        `**Summary:** ${intent.summary}\n\n` +
+        `**File changes:**\n${fileChanges}\n\n` +
+        `**Risk:** ${risk} — ${intent.riskReason}\n\n` +
+        `**Test Scenarios:**\n${testScenarios}\n\n` +
         '---\n' +
         `Generated by \`pipeline-worker\`: intent captured via **${agentName}**, ` +
         'build/lint/test passed locally before this MR was opened. ' +
-        'If the pipeline fails, pipeline-worker will attempt automated fixes (up to the configured retry cap) before escalating here.';
-    return forge.createMergeRequest({
-        sourceBranch: branch,
-        targetBranch,
-        title: intent.commitMessage,
-        description,
-    });
+        'If the pipeline fails, pipeline-worker will attempt automated fixes (up to the configured retry cap) before escalating here.');
+}
+export async function openMergeRequest(forge, worktreePath, branch, targetBranch, intent, agentName) {
+    await runStep(9, '⬆', 'Pushing your branch', `push ${branch} to origin`, () => push(worktreePath, 'origin', branch));
+    const existing = await forge.findExistingMr(branch);
+    if (existing) {
+        note(`reusing existing merge request ${existing.webUrl}`);
+        return existing;
+    }
+    const description = buildDescription(intent, agentName);
+    const mr = await runStep(10, '🔀', 'Opening merge request', `target branch: ${targetBranch}`, () => forge.createMergeRequest({ sourceBranch: branch, targetBranch, title: intent.commitMessage, description }));
+    note(mr.webUrl);
+    return mr;
 }
 //# sourceMappingURL=openMergeRequest.js.map

package/dist/workflow/openMergeRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"openMergeRequest.js","sourceRoot":"","sources":["../../src/workflow/openMergeRequest.ts"],"names":[],"mappings":"AAAA,wGAAwG;AAExG,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAIxC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAAkB,EAClB,YAAoB,EACpB,MAAc,EACd,YAAoB,EACpB,MAAsB,EACtB,SAAiB;IAEjB,MAAM,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE3C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE9B,MAAM,WAAW,GACf,GAAG,MAAM,CAAC,OAAO,MAAM;QACvB,OAAO;QACP,2DAA2D,SAAS,MAAM;QAC1E,4DAA4D;QAC5D,8HAA8H,CAAC;IAEjI,OAAO,KAAK,CAAC,kBAAkB,CAAC;QAC9B,YAAY,EAAE,MAAM;QACpB,YAAY;QACZ,KAAK,EAAE,MAAM,CAAC,aAAa;QAC3B,WAAW;KACZ,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"openMergeRequest.js","sourceRoot":"","sources":["../../src/workflow/openMergeRequest.ts"],"names":[],"mappings":"AAAA,wGAAwG;AAExG,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAI/C,iGAAiG;AACjG,MAAM,UAAU,gBAAgB,CAAC,MAAsB,EAAE,SAAiB;IACxE,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9F,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAExE,OAAO,CACL,eAAe,MAAM,CAAC,MAAM,MAAM;QAClC,gBAAgB,MAAM,CAAC,OAAO,MAAM;QACpC,sBAAsB,WAAW,MAAM;QACvC,aAAa,IAAI,MAAM,MAAM,CAAC,UAAU,MAAM;QAC9C,wBAAwB,aAAa,MAAM;QAC3C,OAAO;QACP,2DAA2D,SAAS,MAAM;QAC1E,4DAA4D;QAC5D,8HAA8H,CAC/H,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAAkB,EAClB,YAAoB,EACpB,MAAc,EACd,YAAoB,EACpB,MAAsB,EACtB,SAAiB;IAEjB,MAAM,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,QAAQ,MAAM,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IAErH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,kCAAkC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1D,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAExD,MAAM,EAAE,GAAG,MAAM,OAAO,CACtB,EAAE,EACF,IAAI,EACJ,uBAAuB,EACvB,kBAAkB,YAAY,EAAE,EAChC,GAAG,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC,CACjH,CAAC;IACF,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IAChB,OAAO,EAAE,CAAC;AACZ,CAAC"}

package/dist/workflow/orchestrate.js

@@ -3,30 +3,55 @@ import { loadConfig } from '../config/loader.js';
 import { createForge } from '../forge/index.js';
 import { selectAgent } from '../agent/index.js';
 import { captureDiff } from '../git/diff.js';
-import { createWorktree, applyDiffToWorktree, removeWorktree, renameBranch, generateTempBranchName } from '../git/worktree.js';
-import { currentBranch, commit } from '../git/commit.js';
+import { createWorktree, syncWithOrigin, applyDiffToWorktree, removeWorktree, renameBranch, generateTempBranchName } from '../git/worktree.js';
+import { currentBranch, commit, stageAll, findUnresolvedConflictMarkers } from '../git/commit.js';
 import { captureIntent } from './captureIntent.js';
 import { runChecks } from './runChecks.js';
 import { openMergeRequest } from './openMergeRequest.js';
 import { watchPipeline } from './watchPipeline.js';
 import { saveRunState } from '../state/runState.js';
+import { step, runStep, note, noteRisk } from '../ui/steps.js';
+import { printWelcome } from '../ui/welcome.js';
 /** Function-boundary read so TS reports the declared RunPhase union, not a narrowed literal. */
 function readPhase(state) {
     return state.phase;
 }
+function buildApplyConflictPrompt(conflictedFiles) {
+    return (`Applying your diff produced merge conflicts (the target branch moved since the diff was captured) in: ${conflictedFiles.join(', ')}. ` +
+        'Resolve the conflict markers (<<<<<<<, =======, >>>>>>>) in each file by choosing the correct combined content ' +
+        'that preserves the intent of both sides, then remove the markers.');
+}
+/**
+ * A best-effort, single attempt: there's no MR yet at this point in the
+ * workflow, so unlike watchPipeline.ts's CI-fix/merge-conflict loops there's
+ * nothing to leave an escalation comment on if the agent can't resolve it —
+ * fail the run clearly instead so the user can intervene manually.
+ */
+async function resolveApplyConflicts(agent, worktreePath, conflictedFiles) {
+    const agentResponse = await runStep(4, '🔧', 'Resolving conflicts', `asking the agent to resolve ${conflictedFiles.length} conflicted file(s)`, async () => (await agent.invoke({ prompt: buildApplyConflictPrompt(conflictedFiles), cwd: worktreePath, permissionMode: 'acceptEdits' })).text);
+    note(`agent: ${agentResponse.slice(0, 300).trim()}${agentResponse.length > 300 ? '…' : ''}`);
+    const stillConflicted = findUnresolvedConflictMarkers(worktreePath, conflictedFiles);
+    if (stillConflicted.length > 0) {
+        throw new Error(`pipeline-worker: could not automatically resolve conflicts applying your diff — ${stillConflicted.join(', ')} ` +
+            'still have conflict markers. Resolve them manually and retry.');
+    }
+    await stageAll(worktreePath);
+}
 export async function runWorkflow(repoRoot) {
     const config = loadConfig(repoRoot);
     const forge = createForge(config);
     const agent = selectAgent(config);
-    const { diffText, untrackedFiles } = await captureDiff(repoRoot);
+    await printWelcome(config, repoRoot);
+    const { diffText, untrackedFiles } = await runStep(1, '📸', 'Capturing your changes', 'reading uncommitted edits and untracked files from your repo', () => captureDiff(repoRoot));
     if (diffText.trim().length === 0 && untrackedFiles.length === 0) {
         console.log('pipeline-worker: no changes to process.');
         return;
     }
+    note(`${untrackedFiles.length} new file(s), ${diffText.split('\n').length} line(s) of diff`);
     const targetBranch = await currentBranch(repoRoot);
     const tempBranch = generateTempBranchName();
-    const worktreePath = await createWorktree(repoRoot, tempBranch);
-    let state = { branch: tempBranch, worktreePath, attempt: 0, phase: 'diff' };
+    const worktreePath = await runStep(2, '🌳', 'Creating worktree', `create worktree with name ${tempBranch}`, () => createWorktree(repoRoot, tempBranch));
+    let state = { branch: tempBranch, targetBranch, worktreePath, attempt: 0, phase: 'diff' };
     saveRunState(repoRoot, state);
     let cleanedUp = false;
     const cleanup = async () => {
@@ -41,12 +66,21 @@ export async function runWorkflow(repoRoot) {
     process.once('SIGINT', () => onSignal(130));
     process.once('SIGTERM', () => onSignal(143));
     try {
-        await applyDiffToWorktree(worktreePath, diffText, untrackedFiles, repoRoot);
-        const intent = await captureIntent(agent, diffText, worktreePath);
-        await renameBranch(worktreePath, intent.branchName);
+        await runStep(3, '🔄', 'Syncing worktree with origin', `pull --rebase origin ${targetBranch}, so the diff lands on the latest base`, () => syncWithOrigin(worktreePath, targetBranch));
+        const applyResult = await runStep(4, '📦', 'Applying your changes', 'replay your diff and untracked files into the new worktree', () => applyDiffToWorktree(worktreePath, diffText, untrackedFiles, repoRoot));
+        if (applyResult.conflicted) {
+            note(`conflict in: ${applyResult.conflictedFiles.join(', ')}`);
+            await resolveApplyConflicts(agent, worktreePath, applyResult.conflictedFiles);
+        }
+        const intent = await runStep(5, '🧠', 'Understanding your changes', `ask ${config.agent} to infer a branch name, commit message, and summary`, () => captureIntent(agent, diffText, worktreePath));
+        note(`${config.agent} says: ${intent.summary}`);
+        noteRisk(intent.risk, intent.riskReason);
+        await runStep(6, '🌿', 'Checkout feature branch', `switch to feature branch ${intent.branchName}`, () => renameBranch(worktreePath, intent.branchName));
         state = { ...state, branch: intent.branchName, phase: 'intent' };
         saveRunState(repoRoot, state);
-        const checks = await runChecks(config, worktreePath);
+        const checks = await runStep(7, '✅', 'Running checks', 'build, lint, and test — whichever your repo has configured', () => runChecks(config, worktreePath));
+        for (const check of checks)
+            note(`${check.name}: ${check.ok ? 'passed' : 'failed'} (${(check.durationMs / 1000).toFixed(1)}s)`);
         const failedCheck = checks.find((c) => !c.ok);
         if (failedCheck) {
             console.error(`pipeline-worker: ${failedCheck.name} failed, aborting before opening a merge request.\n${failedCheck.stderr}`);
@@ -55,23 +89,24 @@ export async function runWorkflow(repoRoot) {
         }
         state.phase = 'checks';
         saveRunState(repoRoot, state);
+        await runStep(8, '💾', 'Committing changes', `commit message: "${intent.commitMessage}"`, 
         // applyDiffToWorktree left everything staged; without this commit the
         // push would carry no changes and the MR would be empty.
-        await commit(worktreePath, intent.commitMessage);
+        () => commit(worktreePath, intent.commitMessage));
         const mr = await openMergeRequest(forge, worktreePath, state.branch, targetBranch, intent, config.agent);
         state.mrIid = mr.iid;
         state.phase = 'mr';
         saveRunState(repoRoot, state);
-        await watchPipeline(forge, config, agent, worktreePath, state.branch, mr.iid, state, repoRoot);
+        await watchPipeline(forge, config, agent, worktreePath, state.branch, targetBranch, mr.iid, state, repoRoot);
         // watchPipeline mutates state.phase in place; go through a function
         // boundary so TS uses the declared RunPhase return type instead of the
         // 'mr' literal it narrowed state.phase to just before the call.
         const finalPhase = readPhase(state);
         if (finalPhase === 'done') {
-            console.log(`pipeline-worker: MR ${mr.webUrl} passed CI.`);
+            step('🎉', 'Done', `MR ${mr.webUrl} passed CI`);
         }
         else if (finalPhase === 'escalated') {
-            console.log(`pipeline-worker: automated fixes exhausted — escalated to a human on ${mr.webUrl}.`);
+            step('🚨', 'Stopped for human review', `see ${mr.webUrl} for what was tried and why`);
             process.exitCode = 1;
         }
     }

package/dist/workflow/orchestrate.js.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../src/workflow/orchestrate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../src/workflow/orchestrate.ts"],"names":[],"mappings":"AAAA,yEAAyE;AAEzE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC/I,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIhD,gGAAgG;AAChG,SAAS,SAAS,CAAC,KAAe;IAChC,OAAO,KAAK,CAAC,KAAK,CAAC;AACrB,CAAC;AAED,SAAS,wBAAwB,CAAC,eAAyB;IACzD,OAAO,CACL,yGAAyG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;QACvI,iHAAiH;QACjH,mEAAmE,CACpE,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,qBAAqB,CAAC,KAAmB,EAAE,YAAoB,EAAE,eAAyB;IACvG,MAAM,aAAa,GAAG,MAAM,OAAO,CACjC,CAAC,EACD,IAAI,EACJ,qBAAqB,EACrB,+BAA+B,eAAe,CAAC,MAAM,qBAAqB,EAC1E,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,wBAAwB,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAC/I,CAAC;IACF,IAAI,CAAC,UAAU,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,aAAa,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7F,MAAM,eAAe,GAAG,6BAA6B,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;IACrF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,mFAAmF,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YAC9G,+DAA+D,CAClE,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAAgB;IAChD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAErC,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,OAAO,CAChD,CAAC,EACD,IAAI,EACJ,wBAAwB,EACxB,8DAA8D,EAC9D,GAAG,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAC5B,CAAC;IACF,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;QACvD,OAAO;IACT,CAAC;IACD,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,iBAAiB,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,kBAAkB,CAAC,CAAC;IAE7F,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,sBAAsB,EAAE,CAAC;IAC5C,MAAM,YAAY,GAAG,MAAM,OAAO,CAChC,CAAC,EACD,IAAI,EACJ,mBAAmB,EACnB,6BAA6B,UAAU,EAAE,EACzC,GAAG,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAC3C,CAAC;IAEF,IAAI,KAAK,GAAa,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACpG,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAE9B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,MAAM,OAAO,GAAG,KAAK,IAAmB,EAAE;QACxC,IAAI,SAAS;YAAE,OAAO;QACtB,SAAS,GAAG,IAAI,CAAC;QACjB,MAAM,cAAc,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC/C,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAE,EAAE;QACpC,KAAK,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAE7C,IAAI,CAAC;QACH,MAAM,OAAO,CACX,CAAC,EACD,IAAI,EACJ,8BAA8B,EAC9B,wBAAwB,YAAY,wCAAwC,EAC5E,GAAG,EAAE,CAAC,cAAc,CAAC,YAAY,EAAE,YAAY,CAAC,CACjD,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,OAAO,CAC/B,CAAC,EACD,IAAI,EACJ,uBAAuB,EACvB,4DAA4D,EAC5D,GAAG,EAAE,CAAC,mBAAmB,CAAC,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,CAAC,CAC5E,CAAC;QACF,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;YAC3B,IAAI,CAAC,gBAAgB,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC/D,MAAM,qBAAqB,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,CAAC,EACD,IAAI,EACJ,4BAA4B,EAC5B,OAAO,MAAM,CAAC,KAAK,sDAAsD,EACzE,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,CACnD,CAAC;QACF,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAEzC,MAAM,OAAO,CACX,CAAC,EACD,IAAI,EACJ,yBAAyB,EACzB,4BAA4B,MAAM,CAAC,UAAU,EAAE,EAC/C,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,CACpD,CAAC;QACF,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QACjE,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,CAAC,EACD,GAAG,EACH,gBAAgB,EAChB,4DAA4D,EAC5D,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CACtC,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,MAAM;YAAE,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAChI,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CACX,oBAAoB,WAAW,CAAC,IAAI,sDAAsD,WAAW,CAAC,MAAM,EAAE,CAC/G,CAAC;YACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QACD,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC;QACvB,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,OAAO,CACX,CAAC,EACD,IAAI,EACJ,oBAAoB,EACpB,oBAAoB,MAAM,CAAC,aAAa,GAAG;QAC3C,sEAAsE;QACtE,yDAAyD;QACzD,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,CACjD,CAAC;QAEF,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACzG,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,GAAG,CAAC;QACrB,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;QACnB,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAE9B,MAAM,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAE7G,oEAAoE;QACpE,uEAAuE;QACvE,gEAAgE;QAChE,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,MAAM,YAAY,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;YACtC,IAAI,CAAC,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,CAAC,MAAM,6BAA6B,CAAC,CAAC;YACtF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC"}

package/dist/workflow/runChecks.d.ts

@@ -4,5 +4,11 @@
  * only to fix a failure the scripts already reported (see watchPipeline.ts).
  */
 import type { CheckResult, PipelineWorkerConfig } from '../types.js';
+/**
+ * Splits a command into argv, keeping "..."/'...'-quoted substrings (e.g. a
+ * dotnet test filter) together as one argument instead of splitting on the
+ * spaces inside them.
+ */
+export declare function parseCommand(command: string): string[];
 /** Runs build, then lint, then test, stopping at the first failure (fail-fast). */
 export declare function runChecks(config: PipelineWorkerConfig, worktreePath: string): Promise<CheckResult[]>;

package/dist/workflow/runChecks.js

@@ -3,16 +3,44 @@
  * from process exit codes only — the agent is never asked to judge these,
  * only to fix a failure the scripts already reported (see watchPipeline.ts).
  */
-import { execFile } from 'node:child_process';
+import { execFile, exec } from 'node:child_process';
 import { promisify } from 'node:util';
 const execFileAsync = promisify(execFile);
+const execAsync = promisify(exec);
+/**
+ * Shell operators (&&, ||, ;, |, backticks, redirects) require a shell
+ * interpreter. Commands that contain any of these are routed to exec();
+ * plain commands (no shell metacharacters) use execFile() for tighter control.
+ */
+const NEEDS_SHELL = /&&|\|\|?|[;`<>()]|\$\(/;
+/**
+ * Splits a command into argv, keeping "..."/'...'-quoted substrings (e.g. a
+ * dotnet test filter) together as one argument instead of splitting on the
+ * spaces inside them.
+ */
+export function parseCommand(command) {
+    const tokens = [];
+    const tokenPattern = /"([^"]*)"|'([^']*)'|(\S+)/g;
+    let match;
+    while ((match = tokenPattern.exec(command)) !== null) {
+        tokens.push(match[1] ?? match[2] ?? match[3]);
+    }
+    return tokens;
+}
 async function runStage(name, command, cwd) {
-    // execFile (not exec) runs argv directly with no shell, so command must be
-    // plain space-separated argv — no quoting, pipes, or `&&` chains.
-    const [cmd, ...args] = command.split(' ');
     const start = Date.now();
+    const opts = { cwd, maxBuffer: 64 * 1024 * 1024 };
     try {
-        const { stdout, stderr } = await execFileAsync(cmd, args, { cwd, maxBuffer: 64 * 1024 * 1024 });
+        let stdout;
+        let stderr;
+        if (NEEDS_SHELL.test(command)) {
+            // Shell-compound commands (e.g. 'dotnet tool restore && dotnet csharpier check .')
+            ({ stdout, stderr } = await execAsync(command, opts));
+        }
+        else {
+            const [cmd, ...args] = parseCommand(command);
+            ({ stdout, stderr } = await execFileAsync(cmd, args, opts));
+        }
         return { name, ok: true, stdout, stderr, durationMs: Date.now() - start };
     }
     catch (error) {

package/dist/workflow/runChecks.js.map

@@ -1 +1 @@
-{"version":3,"file":"runChecks.js","sourceRoot":"","sources":["../../src/workflow/runChecks.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,KAAK,UAAU,QAAQ,CAAC,IAAyB,EAAE,OAAe,EAAE,GAAW;IAC7E,2EAA2E;IAC3E,kEAAkE;IAClE,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;QAChG,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;IAC5E,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,KAA+D,CAAC;QAC5E,OAAO;YACL,IAAI;YACJ,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE;YACxB,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;YAClD,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;SAC/B,CAAC;IACJ,CAAC;AACH,CAAC;AAED,mFAAmF;AACnF,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAA4B,EAAE,YAAoB;IAChF,MAAM,MAAM,GAA0D;QACpE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE;QACxC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;QACtC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;KACvC,CAAC;IAEF,MAAM,OAAO,GAAkB,EAAE,CAAC;IAClC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE;YAAE,SAAS,CAAC,+DAA+D;QACpG,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACvE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,MAAM;IACxB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"runChecks.js","sourceRoot":"","sources":["../../src/workflow/runChecks.ts"],"names":[],"mappings":"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"}

package/dist/workflow/watchPipeline.d.ts

@@ -6,8 +6,15 @@
  * config.maxFixAttempts before escalating via an MR comment. Never retries
  * indefinitely, and never spends agent tokens on pipelines that are not
  * actually failed (canceled/skipped go straight to a human).
+ *
+ * Also watches for the forge confirming a real merge conflict against the
+ * target branch (GitHub's "dirty" / GitLab's "cannot_be_merged") — some
+ * repos never even run CI on an unmergeable PR, so this is checked on every
+ * poll interval rather than only after a pipeline goes terminal. When found,
+ * merges the target branch in and asks the agent to resolve any actual
+ * conflict markers, sharing the same maxFixAttempts budget as CI fixes.
  */
 import type { AgentAdapter } from '../agent/types.js';
 import type { ForgeClient } from '../forge/types.js';
 import type { PipelineWorkerConfig, RunState } from '../types.js';
-export declare function watchPipeline(forge: ForgeClient, config: PipelineWorkerConfig, agent: AgentAdapter, worktreePath: string, branch: string, mrIid: number, state: RunState, repoRoot: string): Promise<void>;
+export declare function watchPipeline(forge: ForgeClient, config: PipelineWorkerConfig, agent: AgentAdapter, worktreePath: string, branch: string, targetBranch: string, mrIid: number, state: RunState, repoRoot: string): Promise<void>;

package/dist/workflow/watchPipeline.js

@@ -6,35 +6,61 @@
  * config.maxFixAttempts before escalating via an MR comment. Never retries
  * indefinitely, and never spends agent tokens on pipelines that are not
  * actually failed (canceled/skipped go straight to a human).
+ *
+ * Also watches for the forge confirming a real merge conflict against the
+ * target branch (GitHub's "dirty" / GitLab's "cannot_be_merged") — some
+ * repos never even run CI on an unmergeable PR, so this is checked on every
+ * poll interval rather than only after a pipeline goes terminal. When found,
+ * merges the target branch in and asks the agent to resolve any actual
+ * conflict markers, sharing the same maxFixAttempts budget as CI fixes.
  */
+import { execFile } from 'node:child_process';
 import { writeFileSync, unlinkSync } from 'node:fs';
 import { join } from 'node:path';
 import { randomUUID } from 'node:crypto';
 import { tmpdir } from 'node:os';
-import { stageAll, commit, push, hasChanges } from '../git/commit.js';
+import { promisify } from 'node:util';
+import { stageAll, commit, push, hasChanges, listConflictedFiles, findUnresolvedConflictMarkers } from '../git/commit.js';
 import { saveRunState } from '../state/runState.js';
+import { step, runStep, note } from '../ui/steps.js';
+const execFileAsync = promisify(execFile);
 const MAX_POLL_WINDOW_MS = 2 * 60 * 60 * 1000; // per pipeline attempt, as a safety net
 const TERMINAL_STATUSES = ['success', 'failed', 'canceled', 'skipped'];
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 /**
- * Waits for a *new* terminal pipeline: `previousPipelineId` is the one we
- * already handled, and it stays "latest" on the forge until the pipeline for
- * our fix push is created — without this, the loop would re-fix stale logs
- * and burn attempts on a single real failure.
+ * Waits for either a *new* terminal pipeline or a confirmed merge conflict,
+ * whichever comes first. `previousPipelineId` is the one we already
+ * handled, and it stays "latest" on the forge until the pipeline for our fix
+ * push is created — without this, the loop would re-fix stale logs and burn
+ * attempts on a single real failure.
+ *
+ * The conflict check runs on every interval (not just once per outer loop
+ * iteration): some repos never run CI on an unmergeable PR, so waiting for a
+ * terminal pipeline that will never arrive would otherwise spin until the
+ * 2-hour safety window times out instead of surfacing the conflict promptly.
  */
-async function pollLatestPipeline(forge, mrIid, intervalMs, previousPipelineId) {
+async function pollForNextAction(forge, mrIid, intervalMs, previousPipelineId) {
     const maxPolls = Math.max(1, Math.ceil(MAX_POLL_WINDOW_MS / intervalMs));
     for (let i = 0; i < maxPolls; i++) {
+        if (await forge.hasMergeConflicts(mrIid)) {
+            return { kind: 'conflict' };
+        }
         const pipelines = await forge.getMrPipelines(mrIid);
         const latest = pipelines[0];
         if (latest && latest.id !== previousPipelineId && TERMINAL_STATUSES.includes(latest.status)) {
-            return latest;
+            return { kind: 'pipeline', pipeline: latest };
         }
         await sleep(intervalMs);
     }
-    throw new Error(`Pipeline for MR ${mrIid} did not reach a terminal state within the polling window`);
+    throw new Error(`MR ${mrIid} did not reach a terminal pipeline state or a resolvable conflict within the polling window`);
+}
+function buildConflictPrompt(conflictedFiles) {
+    return (`This branch has merge conflicts with the target branch in the following file(s): ${conflictedFiles.join(', ')}. ` +
+        'Resolve the conflict markers (<<<<<<<, =======, >>>>>>>) in each file by choosing the correct combined content ' +
+        'that preserves the intent of both sides, then remove the markers. Do not run git commands — pipeline-worker ' +
+        'stages and commits the resolution itself.');
 }
 function writeAgentMcpConfig() {
     const path = join(tmpdir(), `pipeline-worker-mcp-${randomUUID()}.json`);
@@ -51,17 +77,77 @@ function buildFixPrompt(pipeline, jobs) {
         jobSummaries);
 }
 async function escalate(forge, mrIid, message, state, repoRoot) {
-    await forge.createMrNote(mrIid, message);
+    await runStep(11, '🚨', 'Escalating to a human', message, () => forge.createMrNote(mrIid, message));
     state.phase = 'escalated';
     saveRunState(repoRoot, state);
 }
-export async function watchPipeline(forge, config, agent, worktreePath, branch, mrIid, state, repoRoot) {
+/**
+ * Merges origin/targetBranch into the worktree's branch to clear a confirmed
+ * merge conflict, asking the agent to resolve any real conflict markers.
+ * Shares state.attempt/config.maxFixAttempts with the CI-fix loop — both are
+ * "automated intervention attempts before giving up and escalating to a
+ * human" from the same budget. Returns false when it escalated instead of
+ * resolving (caller should stop the run in that case).
+ */
+async function tryResolveConflicts(forge, agent, config, worktreePath, branch, targetBranch, mrIid, state, repoRoot) {
+    state.attempt += 1;
+    saveRunState(repoRoot, state);
+    step('⚠️', 'Merge conflicts detected', `attempt ${state.attempt}/${config.maxFixAttempts} — merging origin/${targetBranch} into ${branch}`);
+    if (state.attempt > config.maxFixAttempts) {
+        await escalate(forge, mrIid, `pipeline-worker: automated fix attempts exhausted (${state.attempt - 1} attempts). This MR/PR still has merge conflicts and needs a human to resolve them.`, state, repoRoot);
+        return false;
+    }
+    const cleanMerge = await runStep(11, '🔀', 'Merging target branch', `git merge origin/${targetBranch} --no-edit`, async () => {
+        await execFileAsync('git', ['fetch', 'origin', targetBranch], { cwd: worktreePath });
+        try {
+            await execFileAsync('git', ['merge', `origin/${targetBranch}`, '--no-edit'], { cwd: worktreePath });
+            return true; // merge succeeded and auto-committed; nothing left to resolve
+        }
+        catch {
+            return false; // conflicts left in the working tree, merge in progress
+        }
+    });
+    if (!cleanMerge) {
+        const conflictedFiles = await listConflictedFiles(worktreePath);
+        if (conflictedFiles.length === 0) {
+            throw new Error(`git merge origin/${targetBranch} failed for a reason other than conflicts — check the worktree for details`);
+        }
+        note(conflictedFiles.join(', '));
+        const mcpConfigPath = writeAgentMcpConfig();
+        let agentResponse;
+        try {
+            agentResponse = await runStep(11, '🔧', 'Resolving conflicts', `asking the agent to resolve ${conflictedFiles.length} conflicted file(s)`, async () => (await agent.invoke({ prompt: buildConflictPrompt(conflictedFiles), cwd: worktreePath, mcpConfigPath, permissionMode: 'acceptEdits' })).text);
+        }
+        finally {
+            unlinkSync(mcpConfigPath);
+        }
+        note(`agent: ${agentResponse.slice(0, 300).trim()}${agentResponse.length > 300 ? '…' : ''}`);
+        const stillConflicted = findUnresolvedConflictMarkers(worktreePath, conflictedFiles);
+        if (stillConflicted.length > 0) {
+            await escalate(forge, mrIid, `pipeline-worker: agent left ${stillConflicted.length} file(s) still conflicted (${stillConflicted.join(', ')}) — escalating to a human.`, state, repoRoot);
+            return false;
+        }
+        await execFileAsync('git', ['add', '-A'], { cwd: worktreePath });
+        await commit(worktreePath, `merge: resolve conflicts with origin/${targetBranch}`);
+    }
+    await runStep(11, '⬆', 'Pushing the merge', `push ${branch} to origin`, () => push(worktreePath, 'origin', branch));
+    return true;
+}
+export async function watchPipeline(forge, config, agent, worktreePath, branch, targetBranch, mrIid, state, repoRoot) {
     const intervalMs = config.pollIntervalSeconds * 1000;
     state.phase = 'watch';
     saveRunState(repoRoot, state);
     let previousPipelineId;
     for (;;) {
-        const pipeline = await pollLatestPipeline(forge, mrIid, intervalMs, previousPipelineId);
+        const outcome = await runStep(11, '👀', 'Watching pipeline', `poll CI every ${config.pollIntervalSeconds}s until it finishes`, () => pollForNextAction(forge, mrIid, intervalMs, previousPipelineId));
+        if (outcome.kind === 'conflict') {
+            const resolved = await tryResolveConflicts(forge, agent, config, worktreePath, branch, targetBranch, mrIid, state, repoRoot);
+            if (!resolved)
+                return; // already escalated inside tryResolveConflicts
+            continue;
+        }
+        const pipeline = outcome.pipeline;
+        note(`pipeline ${pipeline.id}: ${pipeline.status} — ${pipeline.webUrl}`);
         state.pipelineId = pipeline.id;
         saveRunState(repoRoot, state);
         if (pipeline.status === 'success') {
@@ -76,33 +162,37 @@ export async function watchPipeline(forge, config, agent, worktreePath, branch,
         }
         state.attempt += 1;
         saveRunState(repoRoot, state);
+        step('💥', 'Pipeline failed', `attempt ${state.attempt}/${config.maxFixAttempts} — ${pipeline.webUrl}`);
         if (state.attempt > config.maxFixAttempts) {
             await escalate(forge, mrIid, `pipeline-worker: automated fix attempts exhausted (${state.attempt - 1} attempts). ` +
                 `Pipeline ${pipeline.webUrl} is still failing and needs a human to take over.`, state, repoRoot);
             return;
         }
-        const failedJobs = await forge.getFailedJobs(pipeline.id);
-        const logs = await Promise.all(failedJobs.map(async (job) => ({ job, log: await forge.getJobLog(job.id) })));
+        const { failedJobs, logs } = await runStep(11, '🔍', 'Diagnosing the failure', `reading logs for ${pipeline.webUrl}`, async () => {
+            const jobs = await forge.getFailedJobs(pipeline.id);
+            const jobLogs = await Promise.all(jobs.map(async (job) => ({ job, log: await forge.getJobLog(job.id) })));
+            return { failedJobs: jobs, logs: jobLogs };
+        });
+        note(failedJobs.length > 0 ? failedJobs.map((job) => job.name).join(', ') : 'no specific job names reported');
         const mcpConfigPath = writeAgentMcpConfig();
+        let agentResponse;
         try {
-            await agent.invoke({
-                prompt: buildFixPrompt(pipeline, logs),
-                cwd: worktreePath,
-                mcpConfigPath,
-                permissionMode: 'acceptEdits',
-            });
+            agentResponse = await runStep(11, '🔧', 'Fixing CI failure', `asking the agent to fix ${failedJobs.length} failed job(s)`, async () => (await agent.invoke({ prompt: buildFixPrompt(pipeline, logs), cwd: worktreePath, mcpConfigPath, permissionMode: 'acceptEdits' })).text);
         }
         finally {
             unlinkSync(mcpConfigPath);
         }
+        note(`agent: ${agentResponse.slice(0, 300).trim()}${agentResponse.length > 300 ? '…' : ''}`);
         if (!(await hasChanges(worktreePath))) {
             // Re-pushing an identical tree would never produce a new pipeline; stop here.
             await escalate(forge, mrIid, `pipeline-worker: fix attempt ${state.attempt} produced no changes for pipeline ${pipeline.webUrl} — escalating to a human.`, state, repoRoot);
             return;
         }
-        await stageAll(worktreePath);
-        await commit(worktreePath, `fix: address CI failure (attempt ${state.attempt})`);
-        await push(worktreePath, 'origin', branch);
+        await runStep(11, '⬆', 'Pushing the fix', `commit and push attempt ${state.attempt} to ${branch}`, async () => {
+            await stageAll(worktreePath);
+            await commit(worktreePath, `fix: address CI failure (attempt ${state.attempt})`);
+            await push(worktreePath, 'origin', branch);
+        });
         previousPipelineId = pipeline.id;
     }
 }