pipeline-worker 0.1.0 → 0.1.2

package/dist/git/commit.d.ts

@@ -4,5 +4,25 @@ export declare function commit(worktreePath: string, message: string): Promise<v
 export declare function push(worktreePath: string, remote: string, branch: string): Promise<void>;
 /** True when the worktree has staged, unstaged, or untracked changes. */
 export declare function hasChanges(worktreePath: string): Promise<boolean>;
+/** Files git still reports as unmerged — conflict markers from a `git apply --3way` or `git merge` not yet resolved and staged. */
+export declare function listConflictedFiles(worktreePath: string): Promise<string[]>;
+/**
+ * Which of `files` still literally contain an unresolved `<<<<<<<`/`>>>>>>>`
+ * conflict marker line. Deliberately reads file content rather than reusing
+ * listConflictedFiles: git's index keeps a file flagged "unmerged" until
+ * `git add` re-stages it, regardless of whether its content still has
+ * markers — so checking the index right after an editor (human or agent)
+ * fixes the content, but before staging, would always report "still
+ * conflicted" even when it's actually resolved. Checking content directly
+ * also catches the opposite mistake: `git add` doesn't validate content, so
+ * staging first and then checking the index would silently accept a file
+ * that still has markers in it.
+ */
+export declare function findUnresolvedConflictMarkers(worktreePath: string, files: string[]): string[];
 export declare function currentSha(worktreePath: string): Promise<string>;
 export declare function currentBranch(cwd: string): Promise<string>;
+/** Reads git config user.name/user.email for display purposes; never throws — unset config just reads as ''. */
+export declare function getGitUser(cwd: string): Promise<{
+    name: string;
+    email: string;
+}>;

package/dist/git/commit.js

@@ -1,5 +1,7 @@
 /** Thin git plumbing wrappers used against the isolated worktree. */
 import { execFile } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
 import { promisify } from 'node:util';
 const execFileAsync = promisify(execFile);
 export async function stageAll(worktreePath) {
@@ -16,6 +18,27 @@ export async function hasChanges(worktreePath) {
     const { stdout } = await execFileAsync('git', ['status', '--porcelain'], { cwd: worktreePath });
     return stdout.trim().length > 0;
 }
+/** Files git still reports as unmerged — conflict markers from a `git apply --3way` or `git merge` not yet resolved and staged. */
+export async function listConflictedFiles(worktreePath) {
+    const { stdout } = await execFileAsync('git', ['diff', '--name-only', '--diff-filter=U'], { cwd: worktreePath });
+    return stdout.trim().split('\n').filter(Boolean);
+}
+const CONFLICT_MARKER = /^(<{7} |>{7} )/m;
+/**
+ * Which of `files` still literally contain an unresolved `<<<<<<<`/`>>>>>>>`
+ * conflict marker line. Deliberately reads file content rather than reusing
+ * listConflictedFiles: git's index keeps a file flagged "unmerged" until
+ * `git add` re-stages it, regardless of whether its content still has
+ * markers — so checking the index right after an editor (human or agent)
+ * fixes the content, but before staging, would always report "still
+ * conflicted" even when it's actually resolved. Checking content directly
+ * also catches the opposite mistake: `git add` doesn't validate content, so
+ * staging first and then checking the index would silently accept a file
+ * that still has markers in it.
+ */
+export function findUnresolvedConflictMarkers(worktreePath, files) {
+    return files.filter((file) => CONFLICT_MARKER.test(readFileSync(join(worktreePath, file), 'utf-8')));
+}
 export async function currentSha(worktreePath) {
     const { stdout } = await execFileAsync('git', ['rev-parse', 'HEAD'], { cwd: worktreePath });
     return stdout.trim();
@@ -24,4 +47,18 @@ export async function currentBranch(cwd) {
     const { stdout } = await execFileAsync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd });
     return stdout.trim();
 }
+/** Reads git config user.name/user.email for display purposes; never throws — unset config just reads as ''. */
+export async function getGitUser(cwd) {
+    async function readConfig(key) {
+        try {
+            const { stdout } = await execFileAsync('git', ['config', key], { cwd });
+            return stdout.trim();
+        }
+        catch {
+            return '';
+        }
+    }
+    const [name, email] = await Promise.all([readConfig('user.name'), readConfig('user.email')]);
+    return { name, email };
+}
 //# sourceMappingURL=commit.js.map

package/dist/git/commit.js.map

@@ -1 +1 @@
-{"version":3,"file":"commit.js","sourceRoot":"","sources":["../../src/git/commit.ts"],"names":[],"mappings":"AAAA,qEAAqE;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,YAAoB;IACjD,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,YAAoB,EAAE,OAAe;IAChE,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,YAAoB,EAAE,MAAc,EAAE,MAAc;IAC7E,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;AAChG,CAAC;AAED,yEAAyE;AACzE,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,YAAoB;IACnD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;IAChG,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,YAAoB;IACnD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;IAC5F,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAW;IAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9F,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC"}
+{"version":3,"file":"commit.js","sourceRoot":"","sources":["../../src/git/commit.ts"],"names":[],"mappings":"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"}

package/dist/git/diff.d.ts

@@ -7,5 +7,11 @@ export interface CapturedDiff {
  * Captures staged+unstaged changes (`git diff HEAD`) plus the list of
  * untracked files (which `git diff` never includes) so both can be carried
  * into an isolated worktree.
+ *
+ * `--full-index` records full (not abbreviated) blob hashes, which
+ * worktree.ts's `git apply --3way` needs to reliably locate each blob's
+ * common ancestor when the worktree has since been rebased onto a newer
+ * origin — otherwise a 3-way merge could fail to resolve an otherwise
+ * legitimate abbreviated hash.
  */
 export declare function captureDiff(repoRoot: string): Promise<CapturedDiff>;

package/dist/git/diff.js

@@ -6,9 +6,15 @@ const execFileAsync = promisify(execFile);
  * Captures staged+unstaged changes (`git diff HEAD`) plus the list of
  * untracked files (which `git diff` never includes) so both can be carried
  * into an isolated worktree.
+ *
+ * `--full-index` records full (not abbreviated) blob hashes, which
+ * worktree.ts's `git apply --3way` needs to reliably locate each blob's
+ * common ancestor when the worktree has since been rebased onto a newer
+ * origin — otherwise a 3-way merge could fail to resolve an otherwise
+ * legitimate abbreviated hash.
  */
 export async function captureDiff(repoRoot) {
-    const { stdout: diffText } = await execFileAsync('git', ['diff', 'HEAD'], {
+    const { stdout: diffText } = await execFileAsync('git', ['diff', 'HEAD', '--full-index'], {
         cwd: repoRoot,
         maxBuffer: 64 * 1024 * 1024,
     });

package/dist/git/diff.js.map

@@ -1 +1 @@
-{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/git/diff.ts"],"names":[],"mappings":"AAAA,qFAAqF;AAErF,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAO1C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAAgB;IAChD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QACxE,GAAG,EAAE,QAAQ;QACb,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;KAC5B,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvG,MAAM,cAAc,GAAG,SAAS;SAC7B,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACxC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAEvC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;AACtC,CAAC"}
+{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/git/diff.ts"],"names":[],"mappings":"AAAA,qFAAqF;AAErF,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAO1C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAAgB;IAChD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE;QACxF,GAAG,EAAE,QAAQ;QACb,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI;KAC5B,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvG,MAAM,cAAc,GAAG,SAAS;SAC7B,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACxC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAEvC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;AACtC,CAAC"}

package/dist/git/resolveProjectPath.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Derives a GitLab namespace/project path from a local directory structure that
+ * mirrors the GitLab group hierarchy.  Used when PIPELINE_WORKER_GITLAB_REPO_BASE
+ * is set and no explicit projectId is configured, so the user can run
+ * `pipeline-worker run` from any repo under the base without per-project config.
+ */
+/**
+ * Converts a single path segment to lowercase kebab-case.
+ * Handles both PascalCase ("RetailMediaPortal" → "retail-media-portal") and
+ * already-hyphenated names ("Store-Media-Api" → "store-media-api").
+ */
+export declare function toKebabCase(segment: string): string;
+/**
+ * Derives the GitLab project path from a local repo root and a base directory.
+ *
+ * @param repoBase - Local directory that mirrors the GitLab host root, e.g. '/home/user/REPO'
+ * @param repoRoot - Absolute path of the local repo, e.g. '/home/user/REPO/Media/RetailMediaPortal/Instore/Store-Media-Api'
+ * @returns GitLab project path, e.g. 'media/retail-media-portal/instore/store-media-api'
+ *
+ * @throws if repoRoot is not inside repoBase
+ */
+export declare function deriveProjectPath(repoBase: string, repoRoot: string): string;

package/dist/git/resolveProjectPath.js

@@ -0,0 +1,37 @@
+/**
+ * Derives a GitLab namespace/project path from a local directory structure that
+ * mirrors the GitLab group hierarchy.  Used when PIPELINE_WORKER_GITLAB_REPO_BASE
+ * is set and no explicit projectId is configured, so the user can run
+ * `pipeline-worker run` from any repo under the base without per-project config.
+ */
+import { relative, sep } from 'node:path';
+/**
+ * Converts a single path segment to lowercase kebab-case.
+ * Handles both PascalCase ("RetailMediaPortal" → "retail-media-portal") and
+ * already-hyphenated names ("Store-Media-Api" → "store-media-api").
+ */
+export function toKebabCase(segment) {
+    return segment
+        .replace(/([a-z\d])([A-Z])/g, '$1-$2')
+        .replace(/([A-Z]+)([A-Z][a-z])/g, '$1-$2')
+        .toLowerCase();
+}
+/**
+ * Derives the GitLab project path from a local repo root and a base directory.
+ *
+ * @param repoBase - Local directory that mirrors the GitLab host root, e.g. '/home/user/REPO'
+ * @param repoRoot - Absolute path of the local repo, e.g. '/home/user/REPO/Media/RetailMediaPortal/Instore/Store-Media-Api'
+ * @returns GitLab project path, e.g. 'media/retail-media-portal/instore/store-media-api'
+ *
+ * @throws if repoRoot is not inside repoBase
+ */
+export function deriveProjectPath(repoBase, repoRoot) {
+    const rel = relative(repoBase, repoRoot);
+    if (!rel || rel.startsWith('..')) {
+        throw new Error(`Cannot derive GitLab project path: '${repoRoot}' is not inside repoBase '${repoBase}'. ` +
+            `Set PIPELINE_WORKER_GITLAB_REPO_BASE (or gitlab.repoBase in .pipeline-worker.yml) ` +
+            `to the local directory that mirrors the GitLab host namespace root.`);
+    }
+    return rel.split(sep).map(toKebabCase).join('/');
+}
+//# sourceMappingURL=resolveProjectPath.js.map

package/dist/git/resolveProjectPath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveProjectPath.js","sourceRoot":"","sources":["../../src/git/resolveProjectPath.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAE1C;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,OAAe;IACzC,OAAO,OAAO;SACX,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC;SACrC,OAAO,CAAC,uBAAuB,EAAE,OAAO,CAAC;SACzC,WAAW,EAAE,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,QAAgB;IAClE,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,uCAAuC,QAAQ,6BAA6B,QAAQ,KAAK;YACvF,oFAAoF;YACpF,qEAAqE,CACxE,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACnD,CAAC"}

package/dist/git/worktree.d.ts

@@ -6,11 +6,34 @@
 export declare function generateTempBranchName(): string;
 /** Creates a new worktree off HEAD on a fresh branch, returning its path. */
 export declare function createWorktree(repoRoot: string, branchName: string): Promise<string>;
+/**
+ * Fetches origin and rebases the worktree's branch onto origin/targetBranch,
+ * so the diff applied afterward lands on the freshest possible base instead
+ * of whatever commit repoRoot's local HEAD happened to be at when the
+ * worktree was created. Safe to call before any diff is applied: the
+ * worktree has no uncommitted changes yet, so there's nothing for the
+ * rebase to conflict with except the diff's own base commit — if that
+ * conflicts, git reports it and the run fails clearly, same as a real rebase
+ * conflict would for a human.
+ */
+export declare function syncWithOrigin(worktreePath: string, targetBranch: string): Promise<void>;
+export interface ApplyDiffResult {
+    /** True when the diff didn't apply cleanly and left conflict markers for the caller to resolve. */
+    conflicted: boolean;
+    conflictedFiles: string[];
+}
 /**
  * Applies a captured diff (staged+unstaged) and copies untracked files into
  * the worktree, so it ends up with exactly the caller's original change set.
+ *
+ * Uses `--3way`: the diff was captured against repoRoot's HEAD *before*
+ * syncWithOrigin rebased the worktree onto the latest origin, so a plain
+ * `git apply` can fail outright once origin has moved. `--3way` falls back
+ * to a real three-way merge using the blobs recorded in the diff, leaving
+ * standard conflict markers (like a merge conflict) instead of a hard
+ * failure — the caller resolves them the same way as any other conflict.
  */
-export declare function applyDiffToWorktree(worktreePath: string, diffText: string, untrackedFiles: string[], repoRoot: string): Promise<void>;
+export declare function applyDiffToWorktree(worktreePath: string, diffText: string, untrackedFiles: string[], repoRoot: string): Promise<ApplyDiffResult>;
 /** Renames the worktree's current branch (used once the agent has proposed a real name). */
 export declare function renameBranch(worktreePath: string, newBranchName: string): Promise<void>;
 /**

package/dist/git/worktree.js

@@ -5,14 +5,46 @@
  */
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
-import { mkdtempSync, mkdirSync, cpSync, writeFileSync, unlinkSync, rmSync } from 'node:fs';
+import { mkdtempSync, mkdirSync, cpSync, writeFileSync, unlinkSync, rmSync, existsSync, symlinkSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { randomUUID } from 'node:crypto';
 import { join, dirname } from 'node:path';
+import { listConflictedFiles } from './commit.js';
 const execFileAsync = promisify(execFile);
 export function generateTempBranchName() {
     return `pipeline-worker/tmp-${randomUUID().slice(0, 8)}`;
 }
+/**
+ * Points worktreePath/node_modules at repoRoot/node_modules. git worktrees
+ * don't include node_modules (it's normally gitignored, not tracked), so
+ * build/lint/test would otherwise fail on a missing toolchain in every repo
+ * that has one. Symlinking the source repo's node_modules in is the same
+ * trick turbo/lerna use for worktree-based tooling: instant, no network, and
+ * safe because node_modules is never part of the diff being tested.
+ *
+ * Called only from applyDiffToWorktree, once the diff is fully applied —
+ * never from createWorktree. If node_modules was ever accidentally
+ * committed (as happened in this very repo), `git apply` needs to see the
+ * worktree exactly as `git worktree add` checked it out; pre-placing a
+ * symlink here would make that tracked path's working-tree content diverge
+ * from git's index before git apply runs, and its behavior on a mismatch
+ * ranges from silently dropping the symlink to rejecting the hunk outright.
+ * Linking only after the apply step sidesteps that entirely.
+ */
+function linkNodeModules(repoRoot, worktreePath) {
+    const sourceNodeModules = join(repoRoot, 'node_modules');
+    if (!existsSync(sourceNodeModules))
+        return;
+    const destNodeModules = join(worktreePath, 'node_modules');
+    try {
+        unlinkSync(destNodeModules);
+    }
+    catch (error) {
+        if (error.code !== 'ENOENT')
+            throw error;
+    }
+    symlinkSync(sourceNodeModules, destNodeModules, 'dir');
+}
 /** Creates a new worktree off HEAD on a fresh branch, returning its path. */
 export async function createWorktree(repoRoot, branchName) {
     const parentDir = mkdtempSync(join(tmpdir(), 'pipeline-worker-'));
@@ -20,16 +52,42 @@ export async function createWorktree(repoRoot, branchName) {
     await execFileAsync('git', ['worktree', 'add', '-b', branchName, worktreePath, 'HEAD'], { cwd: repoRoot });
     return worktreePath;
 }
+/**
+ * Fetches origin and rebases the worktree's branch onto origin/targetBranch,
+ * so the diff applied afterward lands on the freshest possible base instead
+ * of whatever commit repoRoot's local HEAD happened to be at when the
+ * worktree was created. Safe to call before any diff is applied: the
+ * worktree has no uncommitted changes yet, so there's nothing for the
+ * rebase to conflict with except the diff's own base commit — if that
+ * conflicts, git reports it and the run fails clearly, same as a real rebase
+ * conflict would for a human.
+ */
+export async function syncWithOrigin(worktreePath, targetBranch) {
+    await execFileAsync('git', ['pull', '--rebase', 'origin', targetBranch], { cwd: worktreePath });
+}
 /**
  * Applies a captured diff (staged+unstaged) and copies untracked files into
  * the worktree, so it ends up with exactly the caller's original change set.
+ *
+ * Uses `--3way`: the diff was captured against repoRoot's HEAD *before*
+ * syncWithOrigin rebased the worktree onto the latest origin, so a plain
+ * `git apply` can fail outright once origin has moved. `--3way` falls back
+ * to a real three-way merge using the blobs recorded in the diff, leaving
+ * standard conflict markers (like a merge conflict) instead of a hard
+ * failure — the caller resolves them the same way as any other conflict.
  */
 export async function applyDiffToWorktree(worktreePath, diffText, untrackedFiles, repoRoot) {
+    let conflictedFiles = [];
     if (diffText.trim().length > 0) {
         const diffFile = join(tmpdir(), `pipeline-worker-diff-${randomUUID()}.patch`);
         writeFileSync(diffFile, diffText, 'utf-8');
         try {
-            await execFileAsync('git', ['apply', '--index', diffFile], { cwd: worktreePath });
+            await execFileAsync('git', ['apply', '--3way', '--index', diffFile], { cwd: worktreePath });
+        }
+        catch (error) {
+            conflictedFiles = await listConflictedFiles(worktreePath);
+            if (conflictedFiles.length === 0)
+                throw error; // not a recoverable conflict — surface the real error
         }
         finally {
             unlinkSync(diffFile);
@@ -41,9 +99,11 @@ export async function applyDiffToWorktree(worktreePath, diffText, untrackedFiles
         mkdirSync(dirname(dest), { recursive: true });
         cpSync(src, dest, { recursive: true });
     }
-    if (untrackedFiles.length > 0) {
+    if (untrackedFiles.length > 0 && conflictedFiles.length === 0) {
         await execFileAsync('git', ['add', '-A'], { cwd: worktreePath });
     }
+    linkNodeModules(repoRoot, worktreePath);
+    return { conflicted: conflictedFiles.length > 0, conflictedFiles };
 }
 /** Renames the worktree's current branch (used once the agent has proposed a real name). */
 export async function renameBranch(worktreePath, newBranchName) {

package/dist/git/worktree.js.map

@@ -1 +1 @@
-{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/git/worktree.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/git/worktree.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -6,7 +6,8 @@ export interface PipelineWorkerConfig {
     forge: ForgeName;
     gitlab: {
         host: string;
-        projectId: number;
+        projectId: number | string;
+        repoBase?: string;
     };
     github: {
         /** "owner/name" slug of the repository. */
@@ -22,16 +23,30 @@ export interface PipelineWorkerConfig {
 export type RunPhase = 'diff' | 'intent' | 'checks' | 'mr' | 'watch' | 'done' | 'escalated';
 export interface RunState {
     branch: string;
+    targetBranch: string;
     worktreePath: string;
     mrIid?: number;
     pipelineId?: number;
     attempt: number;
     phase: RunPhase;
 }
+export type RiskLevel = 'low' | 'medium' | 'high';
+export interface FileChangeSummary {
+    file: string;
+    summary: string;
+}
 export interface CapturedIntent {
+    /** One short sentence: why this change exists / what problem it solves. */
+    intent: string;
     summary: string;
     branchName: string;
     commitMessage: string;
+    fileChanges: FileChangeSummary[];
+    risk: RiskLevel;
+    /** One short sentence justifying the risk level. */
+    riskReason: string;
+    /** Concrete scenarios a reviewer should verify before merging. */
+    testScenarios: string[];
 }
 export interface CheckResult {
     name: 'build' | 'lint' | 'test';

package/dist/ui/steps.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Friendly progress narration for `pipeline-worker run`: a bold, colored,
+ * numbered headline per workflow step (with an icon and a "[n/TOTAL_STAGES]"
+ * counter) and a dim technical detail line underneath — mirrors how Claude
+ * Code narrates its own tool calls, so a non-technical user can follow along
+ * without reading source.
+ */
+import type { RiskLevel } from '../types.js';
+/**
+ * The workflow always runs stages 1-10 once in order, then stage 11 (watching
+ * the pipeline, and fixing/escalating on failure) until it resolves — so
+ * every step, including the CI-fix loop's sub-steps, is stage 11.
+ */
+export declare const TOTAL_STAGES = 11;
+/** A one-off status line with no associated work to wait on (e.g. a final summary). */
+export declare function step(icon: string, title: string, detail?: string): void;
+/**
+ * An indented supplementary detail line under the current step (e.g. an
+ * agent's summary, a result). Input is freeform (agent output, forge data)
+ * with no single-line guarantee, so collapse any embedded newlines —
+ * otherwise a multi-line value would break out of the "one dim line" format.
+ */
+export declare function note(text: string): void;
+/** Like note(), but colors the text by risk level (green/yellow/red for low/medium/high). */
+export declare function noteRisk(risk: RiskLevel, reason: string): void;
+/**
+ * Runs one numbered workflow stage with a colored, iconed title, then a live
+ * status line beneath it while `task` runs: a spinner plus a counting-up
+ * elapsed timer in a TTY, settling into a green checkmark or red cross with
+ * the total duration on completion. Falls back to a single static print when
+ * stdout isn't a TTY (CI logs, redirected files) since carriage-return
+ * spinners would just garble those.
+ */
+export declare function runStep<T>(stage: number, icon: string, title: string, detail: string, task: () => Promise<T>): Promise<T>;

package/dist/ui/steps.js

@@ -0,0 +1,83 @@
+/**
+ * Friendly progress narration for `pipeline-worker run`: a bold, colored,
+ * numbered headline per workflow step (with an icon and a "[n/TOTAL_STAGES]"
+ * counter) and a dim technical detail line underneath — mirrors how Claude
+ * Code narrates its own tool calls, so a non-technical user can follow along
+ * without reading source.
+ */
+import { styleText } from 'node:util';
+const RISK_COLOR = { low: 'green', medium: 'yellow', high: 'red' };
+/**
+ * The workflow always runs stages 1-10 once in order, then stage 11 (watching
+ * the pipeline, and fixing/escalating on failure) until it resolves — so
+ * every step, including the CI-fix loop's sub-steps, is stage 11.
+ */
+export const TOTAL_STAGES = 11;
+const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const SPINNER_INTERVAL_MS = 80;
+function formatElapsed(ms) {
+    return `${(ms / 1000).toFixed(1)}s`;
+}
+function stageHeader(stage, icon, title) {
+    return styleText(['bold', 'cyan'], `[${stage}/${TOTAL_STAGES}] ${icon} ${title}`);
+}
+/** A one-off status line with no associated work to wait on (e.g. a final summary). */
+export function step(icon, title, detail) {
+    console.log(); // blank line for clear separation between stages
+    console.log(styleText('bold', `${icon} ${title}`));
+    if (detail)
+        console.log(styleText('dim', `  ${detail}`));
+}
+/**
+ * An indented supplementary detail line under the current step (e.g. an
+ * agent's summary, a result). Input is freeform (agent output, forge data)
+ * with no single-line guarantee, so collapse any embedded newlines —
+ * otherwise a multi-line value would break out of the "one dim line" format.
+ */
+export function note(text) {
+    console.log(styleText('dim', `  ${text.replace(/\s*\n\s*/g, ' ')}`));
+}
+/** Like note(), but colors the text by risk level (green/yellow/red for low/medium/high). */
+export function noteRisk(risk, reason) {
+    console.log(styleText('dim', '  ') + styleText(RISK_COLOR[risk], `risk: ${risk} — ${reason.replace(/\s*\n\s*/g, ' ')}`));
+}
+/**
+ * Runs one numbered workflow stage with a colored, iconed title, then a live
+ * status line beneath it while `task` runs: a spinner plus a counting-up
+ * elapsed timer in a TTY, settling into a green checkmark or red cross with
+ * the total duration on completion. Falls back to a single static print when
+ * stdout isn't a TTY (CI logs, redirected files) since carriage-return
+ * spinners would just garble those.
+ */
+export async function runStep(stage, icon, title, detail, task) {
+    console.log(); // blank line for clear separation between stages
+    console.log(stageHeader(stage, icon, title));
+    if (!process.stdout.isTTY) {
+        console.log(styleText('dim', `  ${detail}`));
+        return task();
+    }
+    const start = Date.now();
+    let frame = 0;
+    const render = (glyph, color = 'dim') => {
+        process.stdout.write(`\r\x1b[K${styleText(color, `  ${glyph} ${detail} (${formatElapsed(Date.now() - start)})`)}`);
+    };
+    render(SPINNER_FRAMES[0]);
+    const timer = setInterval(() => {
+        frame = (frame + 1) % SPINNER_FRAMES.length;
+        render(SPINNER_FRAMES[frame]);
+    }, SPINNER_INTERVAL_MS);
+    try {
+        const result = await task();
+        clearInterval(timer);
+        render('✓', 'green');
+        process.stdout.write('\n');
+        return result;
+    }
+    catch (error) {
+        clearInterval(timer);
+        render('✗', 'red');
+        process.stdout.write('\n');
+        throw error;
+    }
+}
+//# sourceMappingURL=steps.js.map

package/dist/ui/steps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../src/ui/steps.ts"],"names":[],"mappings":"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"}

package/dist/ui/welcome.d.ts

@@ -0,0 +1,5 @@
+/** Prints a one-time banner summarizing this run's configuration before any workflow stage starts. */
+import type { PipelineWorkerConfig } from '../types.js';
+export declare function repositoryUrl(config: PipelineWorkerConfig): string;
+export declare function agentDescription(config: PipelineWorkerConfig): string;
+export declare function printWelcome(config: PipelineWorkerConfig, repoRoot: string): Promise<void>;

package/dist/ui/welcome.js

@@ -0,0 +1,34 @@
+/** Prints a one-time banner summarizing this run's configuration before any workflow stage starts. */
+import { styleText } from 'node:util';
+import { getGitUser } from '../git/commit.js';
+const RULE_WIDTH = 60;
+export function repositoryUrl(config) {
+    if (config.forge === 'github') {
+        return config.github.repo ? `https://github.com/${config.github.repo}` : '(not configured)';
+    }
+    return config.gitlab.host ? `${config.gitlab.host} (project ${config.gitlab.projectId})` : '(not configured)';
+}
+export function agentDescription(config) {
+    // Mirrors captureIntent.ts's INTENT_MODEL choice: only claude supports
+    // per-invocation model selection today, so only claude has a "mode" to show.
+    return config.agent === 'claude' ? 'claude (haiku for intent capture, default model for CI fixes)' : 'copilot';
+}
+export async function printWelcome(config, repoRoot) {
+    const user = await getGitUser(repoRoot);
+    const rows = [
+        ['Agent', agentDescription(config)],
+        ['Forge', config.forge],
+        ['Repository', repositoryUrl(config)],
+        ['Git user', user.name && user.email ? `${user.name} <${user.email}>` : '(not configured)'],
+    ];
+    const labelWidth = Math.max(...rows.map(([label]) => label.length));
+    const rule = styleText('cyan', '─'.repeat(RULE_WIDTH));
+    console.log(rule);
+    console.log(styleText(['bold', 'cyan'], '  🚀 pipeline-worker'));
+    console.log(rule);
+    for (const [label, value] of rows) {
+        console.log(`  ${styleText('cyan', label.padEnd(labelWidth))}  ${value}`);
+    }
+    console.log(rule);
+}
+//# sourceMappingURL=welcome.js.map

package/dist/ui/welcome.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"welcome.js","sourceRoot":"","sources":["../../src/ui/welcome.ts"],"names":[],"mappings":"AAAA,sGAAsG;AAEtG,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,MAAM,UAAU,GAAG,EAAE,CAAC;AAEtB,MAAM,UAAU,aAAa,CAAC,MAA4B;IACxD,IAAI,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;IAC9F,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,aAAa,MAAM,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC;AAChH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAA4B;IAC3D,uEAAuE;IACvE,6EAA6E;IAC7E,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,+DAA+D,CAAC,CAAC,CAAC,SAAS,CAAC;AACjH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,MAA4B,EAAE,QAAgB;IAC/E,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,IAAI,GAA4B;QACpC,CAAC,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;QACvB,CAAC,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC;KAC5F,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAEvD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,sBAAsB,CAAC,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC"}