pipeline-worker 0.1.26 → 0.1.28

package/dist/ui/treeRenderer.js

@@ -0,0 +1,271 @@
+/**
+ * The live TTY dashboard: a pinned bottom region holding the run header and
+ * the step tree, repainted in place, with freeform log lines (notes, agent
+ * output, stray console writes) scrolling into the terminal's scrollback
+ * ABOVE the region — the same strategy ora/listr2 use, hand-rolled to keep
+ * the dependency count at zero.
+ *
+ *   pipeline-worker · fix-login-redirect · worktree a91f · running · 9.4k tok
+ *   ├─ ✓ capture    staged + unstaged diff                                0.4s
+ *   ├─ ● ci-watch   pipeline #8123: fixing                 attempt 2/5 · 4.4k tok
+ *   └─ ○ merge      auto-merge + sync local main
+ *
+ * Invariants that keep the redraw exact:
+ * - Every painted line is pre-truncated to the terminal width, so no line
+ *   can wrap; `renderedLines` therefore always equals the physical rows the
+ *   region occupies, and one `ESC[{n}A CR ESC[J` erases exactly the region.
+ * - While attached, console.log/error are intercepted and routed through
+ *   log(), so nothing can print into the middle of the region (CLAUDE.md's
+ *   terminal-output discipline keeps direct process.stdout writers out of
+ *   the rest of the codebase).
+ * - The cursor is hidden on attach and restored on stop AND on process exit
+ *   (the 'exit' hook only does a sync write, which is allowed there), so a
+ *   ctrl-C mid-frame never leaves a cursorless terminal.
+ */
+import { styleText } from 'node:util';
+import { truncateToWidth } from './steps.js';
+import { formatTokens } from './format.js';
+import { formatElapsed, formatAttempt } from './renderer.js';
+const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const PAINT_INTERVAL_MS = 80;
+const DEFAULT_COLUMNS = 80;
+const HIDE_CURSOR = '\x1b[?25l';
+const SHOW_CURSOR = '\x1b[?25h';
+function isElision(row) {
+    return 'summary' in row;
+}
+function isFinished(node) {
+    return node.status === 'done' || node.status === 'skipped';
+}
+/** True when this subtree holds nothing the user still needs to see individually. */
+function subtreeFinished(node) {
+    return isFinished(node) && node.children.every(subtreeFinished);
+}
+/**
+ * Elides rows until header + rows fit in `maxRows`, keeping what the user
+ * actually watches: the running/failed/pending steps. Two passes, both
+ * deterministic (pure function, unit-tested directly):
+ *
+ * 1. collapse each parent's leading finished children (a long fix-attempt
+ *    history) into one `… ✓ N earlier attempts` row, keeping the last
+ *    finished child for context;
+ * 2. collapse leading fully-finished top-level steps into `… ✓ N earlier
+ *    steps`.
+ *
+ * If the tree still doesn't fit (tiny terminal), keep the tail — the newest
+ * rows are the live ones.
+ */
+export function fitToHeight(rows, maxRows) {
+    const budget = Math.max(1, maxRows - 1); // header takes one row
+    if (rows.length <= budget)
+        return rows;
+    let display = [...rows];
+    // Walks runs of consecutive rows matching `candidate` at the same depth
+    // and collapses each run (if longer than 2) down to a summary line plus
+    // its final row, so the most recent item of a run stays visible for context.
+    const collapseRuns = (candidate, label) => {
+        const next = [];
+        let run = [];
+        const flush = () => {
+            if (run.length > 2) {
+                const collapsed = run.slice(0, -1);
+                next.push({ summary: label(collapsed.length, run[0].depth), depth: run[0].depth });
+                next.push(run[run.length - 1]);
+            }
+            else {
+                next.push(...run);
+            }
+            run = [];
+        };
+        for (const row of display) {
+            if (!isElision(row) && candidate(row) && (run.length === 0 || run[0].depth === row.depth)) {
+                run.push(row);
+            }
+            else {
+                flush();
+                next.push(row);
+            }
+        }
+        flush();
+        display = next;
+    };
+    collapseRuns((row) => row.depth > 0 && isFinished(row.node) && row.node.children.length === 0, (n) => `… ${n} earlier attempts`);
+    if (display.length <= budget)
+        return display;
+    collapseRuns((row) => row.depth === 0 && subtreeFinished(row.node), (n) => `… ${n} earlier steps`);
+    if (display.length <= budget)
+        return display;
+    // Last resort: keep the newest rows (the live tail).
+    return display.slice(display.length - budget);
+}
+export class TreeRenderer {
+    out;
+    tree;
+    renderedLines = 0;
+    frame = 0;
+    timer;
+    stopped = false;
+    originalConsole = { log: console.log, error: console.error, warn: console.warn };
+    onResize = () => {
+        // Post-reflow, the terminal may have re-wrapped the old region in ways
+        // cursor math can't undo reliably; abandon it (one junk block stays in
+        // scrollback — the deliberate trade-off) and paint fresh.
+        this.out.write('\n');
+        this.renderedLines = 0;
+        this.paint();
+    };
+    restoreCursorOnExit = () => {
+        if (!this.stopped)
+            this.out.write(SHOW_CURSOR);
+    };
+    constructor(out = process.stdout) {
+        this.out = out;
+    }
+    columns() {
+        return this.out.columns ?? DEFAULT_COLUMNS;
+    }
+    /**
+     * Repaints immediately on every tree mutation — a step finishing or a
+     * token count changing must show up right away, not on the next spinner
+     * tick. The interval timer (attach()) exists only to keep the spinner
+     * glyph and the running step's elapsed-time counter animating during long
+     * stretches with no tree events at all (a multi-minute CI poll).
+     */
+    onEvent(event, tree) {
+        if (this.tree === undefined)
+            this.attach(tree);
+        void event;
+        this.paint();
+    }
+    attach(tree) {
+        this.tree = tree;
+        this.out.write(HIDE_CURSOR);
+        process.once('exit', this.restoreCursorOnExit);
+        this.out.on?.('resize', this.onResize);
+        // Route anything that would print mid-region through log() instead.
+        console.log = (...args) => this.log(args.map(String).join(' '));
+        console.error = (...args) => this.log(args.map(String).join(' '));
+        console.warn = (...args) => this.log(args.map(String).join(' '));
+        // unref() so a settled run's process never lingers on the spinner timer.
+        this.timer = setInterval(() => this.paint(), PAINT_INTERVAL_MS);
+        this.timer.unref?.();
+    }
+    eraseRegion() {
+        if (this.renderedLines > 0) {
+            this.out.write(`\x1b[${this.renderedLines}A\r\x1b[J`);
+            this.renderedLines = 0;
+        }
+    }
+    /** Freeform text: erase the region, let the text enter scrollback, repaint beneath it. */
+    log(text) {
+        this.eraseRegion();
+        this.out.write(`${text}\n`);
+        if (!this.stopped)
+            this.paint();
+    }
+    headerLine(status) {
+        const tree = this.tree;
+        const parts = ['pipeline-worker', tree.header.title];
+        if (tree.header.worktreeShortId)
+            parts.push(`worktree ${tree.header.worktreeShortId}`);
+        parts.push(status);
+        const total = tree.totalTokens();
+        if (total > 0)
+            parts.push(formatTokens(total));
+        return truncateToWidth(parts.join(' · '), this.columns());
+    }
+    statusGlyph(node) {
+        switch (node.status) {
+            case 'done':
+                return { glyph: '✓', color: 'green' };
+            case 'failed':
+                return { glyph: '✗', color: 'red' };
+            case 'running':
+                return { glyph: SPINNER_FRAMES[this.frame % SPINNER_FRAMES.length], color: 'cyan' };
+            case 'skipped':
+                return { glyph: '–', color: 'dim' };
+            default:
+                return { glyph: '○', color: 'dim' };
+        }
+    }
+    /** Right-hand figures: 'attempt 2/5 · 4.4k tok · 3.2s' — whichever are known. */
+    figures(node) {
+        const parts = [];
+        const attempt = formatAttempt(node);
+        if (attempt)
+            parts.push(attempt);
+        if (node.tokens !== undefined)
+            parts.push(formatTokens(node.tokens));
+        if (node.durationMs !== undefined)
+            parts.push(formatElapsed(node.durationMs));
+        else if (node.status === 'running' && node.startedAt !== undefined)
+            parts.push(formatElapsed(Date.now() - node.startedAt));
+        return parts.join(' · ');
+    }
+    branchPrefix(row) {
+        let prefix = '';
+        for (let d = 0; d < row.depth; d++)
+            prefix += row.isLast[d] ? '   ' : '│  ';
+        prefix += row.isLast[row.depth] ? '└─ ' : '├─ ';
+        return prefix;
+    }
+    rowLine(row, labelWidth) {
+        const width = this.columns();
+        if (isElision(row)) {
+            const indent = '   '.repeat(row.depth + 1);
+            return styleText('dim', truncateToWidth(`${indent}${row.summary}`, width));
+        }
+        const { node } = row;
+        const { glyph, color } = this.statusGlyph(node);
+        const prefix = this.branchPrefix(row);
+        const figures = this.figures(node);
+        // Compose the visible text first and truncate it, then colorize the two
+        // zones (glyph, rest) — escape codes are zero-width, so wrapping math
+        // must run on the plain string.
+        const body = `${node.label.padEnd(labelWidth)}  ${node.detail}`;
+        const room = width - prefix.length - 2; // glyph + space
+        const figuresPart = figures ? `  ${figures}` : '';
+        const bodyRoom = Math.max(0, room - figuresPart.length);
+        const text = `${truncateToWidth(body, bodyRoom)}${figuresPart}`;
+        const dimRow = node.status === 'skipped' || node.status === 'pending';
+        return `${prefix}${styleText(color, glyph)} ${dimRow ? styleText('dim', text) : text}`;
+    }
+    buildFrame(status) {
+        const tree = this.tree;
+        const rows = fitToHeight(tree.flatten(), this.out.rows ?? Number.POSITIVE_INFINITY);
+        const labelWidth = Math.max(0, ...rows.map((r) => (isElision(r) ? 0 : r.node.label.length)));
+        return [styleText('bold', this.headerLine(status)), ...rows.map((row) => this.rowLine(row, labelWidth))];
+    }
+    paint() {
+        if (!this.tree || this.stopped)
+            return;
+        this.frame += 1;
+        const lines = this.buildFrame(this.tree.header.status);
+        this.eraseRegion();
+        this.out.write(`${lines.join('\n')}\n`);
+        this.renderedLines = lines.length;
+    }
+    stop(status, detail, tree) {
+        if (this.tree === undefined)
+            this.tree = tree;
+        if (this.stopped)
+            return;
+        if (this.timer)
+            clearInterval(this.timer);
+        // Final frame: repaint with the terminal status so the settled tree stays
+        // in scrollback as the run's record, then the detail line beneath it.
+        const lines = this.buildFrame(status);
+        this.eraseRegion();
+        this.out.write(`${lines.join('\n')}\n`);
+        if (detail)
+            this.out.write(styleText('dim', `  ${truncateToWidth(detail, this.columns())}`) + '\n');
+        this.stopped = true;
+        this.renderedLines = 0;
+        this.out.write(SHOW_CURSOR);
+        console.log = this.originalConsole.log;
+        console.error = this.originalConsole.error;
+        console.warn = this.originalConsole.warn;
+        this.out.off?.('resize', this.onResize);
+    }
+}
+//# sourceMappingURL=treeRenderer.js.map

package/dist/ui/treeRenderer.js.map

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

package/dist/ui/welcome.js

@@ -1,7 +1,12 @@
 /** Prints a one-time banner summarizing this run's configuration before any workflow stage starts. */
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { styleText } from "node:util";
 import { getGitUser } from "../git/commit.js";
-const RULE_WIDTH = 60;
+import { boxBullet, boxBottom, boxTop } from "./format.js";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const pkg = JSON.parse(readFileSync(path.join(__dirname, '..', '..', 'package.json'), 'utf8'));
 export function repositoryUrl(config) {
     if (config.forge === "github") {
         return config.github.repo
@@ -26,20 +31,21 @@ export async function printWelcome(config, repoRoot) {
         ["Forge", config.forge],
         ["Repository", repositoryUrl(config)],
         [
-            "Git user",
+            "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 - By Mohan Talkad:"));
-    console.log(rule);
+    console.log(boxTop());
+    const title = `🚀 PIPELINE WORKER v${pkg.version} • By Mohan Talkad`;
+    const padding = Math.max(0, 98 - title.length);
+    const titleLine = `│ ${styleText("bold", title)}${" ".repeat(padding)}│`;
+    console.log(titleLine);
+    console.log(boxBottom());
     for (const [label, value] of rows) {
-        console.log(`  ${styleText("cyan", label.padEnd(labelWidth))}  ${value}`);
+        console.log(boxBullet(label, value, 2));
     }
-    console.log(rule);
+    console.log("");
 }
 //# sourceMappingURL=welcome.js.map

package/dist/ui/welcome.js.map

@@ -1 +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;YACvB,CAAC,CAAC,sBAAsB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAC5C,CAAC,CAAC,kBAAkB,CAAC;IACzB,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI;QACvB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,aAAa,MAAM,CAAC,MAAM,CAAC,SAAS,GAAG;QAC9D,CAAC,CAAC,kBAAkB,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAA4B;IAC3D,0EAA0E;IAC1E,IAAI,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;QACvD,OAAO,GAAG,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,WAAW,kDAAkD,CAAC;IAClG,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA4B,EAC5B,QAAgB;IAEhB,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;YACE,UAAU;YACV,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK;gBACrB,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,GAAG;gBAChC,CAAC,CAAC,kBAAkB;SACvB;KACF,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,CACT,SAAS,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,yCAAyC,CAAC,CACvE,CAAC;IACF,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"}
+{"version":3,"file":"welcome.js","sourceRoot":"","sources":["../../src/ui/welcome.ts"],"names":[],"mappings":"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"}

package/dist/workflow/adoptBranch.js

@@ -21,11 +21,11 @@ import { checkoutExistingBranch } from '../git/worktree.js';
 import { commit, hasChanges, mergeBase, stageAll } from '../git/commit.js';
 import { changedFilesSinceRef } from '../git/diff.js';
 import { detectDefaultBranch } from '../git/remote.js';
-import { recordEvent } from '../state/runState.js';
+import { recordEvent, recordAgentTokens } from '../state/runState.js';
 import { captureIntent } from './captureIntent.js';
 import { runAndReportChecks, maybeUpdateChangelog } from './orchestrate.js';
 import { openMergeRequest, buildDescription } from './openMergeRequest.js';
-import { runStep, note, step } from '../ui/steps.js';
+import { runStep, skipStep, note, announce } from '../ui/steps.js';
 const execFileAsync = promisify(execFile);
 async function fetchBranch(worktreePath, branch) {
     await execFileAsync('git', ['fetch', 'origin', branch], { cwd: worktreePath });
@@ -43,13 +43,18 @@ async function adoptWithExistingMr(agent, config, forge, worktreePath, state, re
         note(`--target ${targetOverride} ignored — MR/PR ${existingMr.webUrl} already targets ${existingMr.targetBranch}`);
     }
     state.targetBranch = existingMr.targetBranch;
-    const { files, baseRef } = await runStep('A.2', '🔍', "Diffing the branch's changes", `comparing against origin/${existingMr.targetBranch}`, () => diffSinceTarget(worktreePath, existingMr.targetBranch));
-    const intent = await runStep('5', '🧠', 'Understanding the branch\'s changes', `ask ${config.agent} to infer a summary, risk, and file-by-file breakdown`, () => captureIntent(agent, files, worktreePath, config.intentModel, baseRef));
+    const { files, baseRef } = await runStep('inspect', `comparing against origin/${existingMr.targetBranch}`, () => diffSinceTarget(worktreePath, existingMr.targetBranch));
+    // These skeleton steps only run on the no-MR-yet path (adoptWithoutMr):
+    // an already-open MR/PR means the branch is pushed and CI re-verifies it.
+    skipStep('checks', 'MR/PR already open — its CI pipeline verifies the branch');
+    skipStep('changelog', 'not updated when refreshing an existing MR/PR');
+    skipStep('push', 'branch is already pushed — that is how its MR/PR exists');
+    const { intent, usage } = await runStep('intent', `ask ${config.agent} to infer a summary, risk, and file-by-file breakdown`, () => captureIntent(agent, files, worktreePath, config.intentModel, baseRef));
     note(`${config.agent} says: ${intent.summary}`);
-    await runStep('11', '📝', 'Overwriting merge request description', `MR/PR ${existingMr.webUrl}`, () => forge.updateMrDescription(existingMr.iid, buildDescription(intent, config.agent, [])));
+    await runStep('mr', `overwriting the description of MR/PR ${existingMr.webUrl}`, () => forge.updateMrDescription(existingMr.iid, buildDescription(intent, config.agent, [])));
     state.mrIid = existingMr.iid;
     state.phase = 'mr';
-    recordEvent(repoRoot, state, `Overwrote description for existing MR/PR ${existingMr.webUrl}`);
+    recordEvent(repoRoot, state, `Overwrote description for existing MR/PR ${existingMr.webUrl}`, 'info', usage?.totalTokens);
     return state;
 }
 /** No MR/PR exists yet for this branch: run it like a fresh `pipeline-worker run` from checks onward. */
@@ -57,13 +62,14 @@ async function adoptWithoutMr(agent, config, forge, worktreePath, state, repoRoo
     const targetBranch = targetOverride ?? (await detectDefaultBranch(repoRoot));
     state.targetBranch = targetBranch;
     recordEvent(repoRoot, state, `No existing MR/PR found; targeting ${targetBranch}`);
-    const { files, baseRef } = await runStep('A.2', '🔍', "Diffing the branch's changes", `comparing against origin/${targetBranch}`, () => diffSinceTarget(worktreePath, targetBranch));
+    const { files, baseRef } = await runStep('inspect', `comparing against origin/${targetBranch}`, () => diffSinceTarget(worktreePath, targetBranch));
     const checks = await runAndReportChecks(config, worktreePath, state, repoRoot);
     if (!checks) {
         throw new Error(`pipeline-worker: local checks failed for branch ${branch} — aborting before opening a merge request.`);
     }
-    const intent = await runStep('5', '🧠', 'Understanding the branch\'s changes', `ask ${config.agent} to infer a summary, risk, and file-by-file breakdown`, () => captureIntent(agent, files, worktreePath, config.intentModel, baseRef));
+    const { intent, usage } = await runStep('intent', `ask ${config.agent} to infer a summary, risk, and file-by-file breakdown`, () => captureIntent(agent, files, worktreePath, config.intentModel, baseRef));
     note(`${config.agent} says: ${intent.summary}`);
+    recordAgentTokens(repoRoot, state, 'capture intent for adopted branch', usage);
     await maybeUpdateChangelog(config, worktreePath, intent);
     if (await hasChanges(worktreePath)) {
         await stageAll(worktreePath);
@@ -76,8 +82,8 @@ async function adoptWithoutMr(agent, config, forge, worktreePath, state, repoRoo
     return state;
 }
 export async function adoptBranch(repoRoot, config, forge, agent, branch, targetOverride) {
-    step('🌱', 'Adopting external branch', `${branch} has no pipeline-worker run recorded for it — checking it out`);
-    const worktreePath = await runStep('A.1', '🌳', 'Checking out branch', `fetch + checkout origin/${branch}`, () => checkoutExistingBranch(repoRoot, branch));
+    announce('Adopting external branch', `${branch} has no pipeline-worker run recorded for it — checking it out`);
+    const worktreePath = await runStep('adopt', `fetch + checkout origin/${branch}`, () => checkoutExistingBranch(repoRoot, branch));
     const state = { branch, targetBranch: '', worktreePath, ciFixAttempt: 0, conflictAttempt: 0, phase: 'intent' };
     recordEvent(repoRoot, state, `Adopted external branch ${branch} into worktree ${worktreePath}`);
     const existingMr = await forge.findExistingMr(branch);

package/dist/workflow/adoptBranch.js.map

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

package/dist/workflow/captureIntent.d.ts

@@ -1,5 +1,5 @@
 /** Step 3: ask the configured agent what a diff is *for*, in a structured, reusable shape. */
-import type { AgentAdapter } from '../agent/types.js';
+import type { AgentAdapter, AgentUsage } from '../agent/types.js';
 import type { CapturedIntent } from '../types.js';
 /**
  * Rather than embedding the (potentially huge — generated lockfiles, binary
@@ -25,4 +25,9 @@ import type { CapturedIntent } from '../types.js';
  * is already committed on the branch — `git diff HEAD` there would show
  * nothing.
  */
-export declare function captureIntent(agent: AgentAdapter, files: string[], worktreePath: string, model: string, baseRef?: string): Promise<CapturedIntent>;
+/** captureIntent's return: the validated intent plus the turn's best-effort token usage, so the caller can record the spend against its run state. */
+export interface IntentCapture {
+    intent: CapturedIntent;
+    usage?: AgentUsage;
+}
+export declare function captureIntent(agent: AgentAdapter, files: string[], worktreePath: string, model: string, baseRef?: string): Promise<IntentCapture>;

package/dist/workflow/captureIntent.js

@@ -88,30 +88,6 @@ const IntentShape = z.object({
     riskReason: singleLine('riskReason'),
     testScenarios: z.array(singleLine('testScenarios[]')).min(1),
 });
-/**
- * Rather than embedding the (potentially huge — generated lockfiles, binary
- * assets, etc.) diff text in the prompt, this only lists which files
- * changed and lets the agent read each one's diff itself with its own
- * tools, scoped to `worktreePath` (the isolated worktree the change was
- * already applied into by orchestrate.ts's "Applying your changes" step).
- * That keeps the prompt itself small and constant-size regardless of how
- * large any individual file's diff is, and lets the agent skip files it
- * judges irrelevant to intent (lockfiles, generated assets) instead of
- * paying to read them.
- *
- * `model` (config's `intentModel`, default "haiku" — see config/loader.ts)
- * lets a lighter model handle this step to keep its token cost down, since
- * naming a branch/commit/summary from a diff needs no deep reasoning.
- * Adapters with no per-invocation model selection (e.g. copilot) ignore it.
- * The CI-fix path (watchPipeline.ts) deliberately never sets a model override
- * — fixing a real failing build needs the stronger default model.
- *
- * `baseRef` defaults to `HEAD`, matching a normal run's uncommitted diff. The
- * `resume` branch-adoption path (adoptBranch.ts) passes a fixed merge-base
- * commit instead (see git/commit.ts's mergeBase), since there the change set
- * is already committed on the branch — `git diff HEAD` there would show
- * nothing.
- */
 export async function captureIntent(agent, files, worktreePath, model, baseRef = 'HEAD') {
     const prompt = 'The following files changed in this git worktree (which is your current working directory):\n' +
         files.map((file) => `- ${file}`).join('\n') +
@@ -134,7 +110,7 @@ export async function captureIntent(agent, files, worktreePath, model, baseRef =
     });
     noteSession(result, worktreePath);
     try {
-        return IntentShape.parse(JSON.parse(result.text));
+        return { intent: IntentShape.parse(JSON.parse(result.text)), usage: result.usage };
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);

package/dist/workflow/captureIntent.js.map

@@ -1 +1 @@
-{"version":3,"file":"captureIntent.js","sourceRoot":"","sources":["../../src/workflow/captureIntent.ts"],"names":[],"mappings":"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"}
+{"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,4 @@
-/** Stages 10-11: push the branch and open (or reuse) an MR/PR describing the workflow that produced it. */
+/** Steps 'push' and 'mr': 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, CheckResult, MergeMethod, MergeRequest } from '../types.js';
 /** Renders the MR/PR description as: Intent, Summary, per-file changes, Risk, Checks, Test Scenarios. */

package/dist/workflow/openMergeRequest.js

@@ -1,6 +1,6 @@
-/** Stages 10-11: push the branch and open (or reuse) an MR/PR describing the workflow that produced it. */
+/** Steps 'push' and 'mr': push the branch and open (or reuse) an MR/PR describing the workflow that produced it. */
 import { push } from '../git/commit.js';
-import { runStep, skipStep, note, noteRisk } from '../ui/steps.js';
+import { runStep, skipStep, addDynamicStep, note, noteRisk } from '../ui/steps.js';
 /**
  * ✅/❌ per check, mirroring the pass/fail glyphs cli.ts prints for the same
  * stage (see ui/steps.ts). An empty list means the `resume` branch-adoption
@@ -36,12 +36,13 @@ export function buildDescription(intent, agentName, checks) {
  * developer merges manually once CI is green.
  */
 async function maybeEnableAutoMerge(forge, mr, autoMergeOnGreen, mergeMethod) {
+    addDynamicStep('mr', 'mr/auto-merge', 'auto-merge');
     if (!autoMergeOnGreen) {
-        skipStep('11.1', '🔀', 'Enabling auto-merge on green', 'config.autoMergeOnGreen is disabled');
+        skipStep('mr/auto-merge', 'config.autoMergeOnGreen is disabled');
         return;
     }
     try {
-        await runStep('11.1', '🔀', 'Enabling auto-merge on green', `merge method: ${mergeMethod}`, () => forge.enableAutoMerge(mr.iid, mergeMethod));
+        await runStep('mr/auto-merge', `merge method: ${mergeMethod}`, () => forge.enableAutoMerge(mr.iid, mergeMethod));
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -49,17 +50,17 @@ async function maybeEnableAutoMerge(forge, mr, autoMergeOnGreen, mergeMethod) {
     }
 }
 export async function openMergeRequest(forge, worktreePath, branch, targetBranch, intent, agentName, checks, autoMergeOnGreen = false, mergeMethod = 'squash') {
-    await runStep(10, '⬆', 'Pushing your branch', `push ${branch} to origin`, () => push(worktreePath, 'origin', branch));
+    await runStep('push', `push ${branch} to origin`, () => push(worktreePath, 'origin', branch));
     const existing = await forge.findExistingMr(branch);
     if (existing) {
-        skipStep(11, '🔀', 'Opening merge request', `an MR/PR already exists for this branch — reusing ${existing.webUrl} instead of opening a new one`);
+        skipStep('mr', `an MR/PR already exists for this branch — reusing ${existing.webUrl} instead of opening a new one`);
         // Deliberately does not (re-)enable auto-merge here: a resumed run reusing
         // an existing MR/PR must not silently turn on something a human may have
         // turned off since it was opened.
         return existing;
     }
     const description = buildDescription(intent, agentName, checks);
-    const mr = await runStep(11, '🔀', 'Opening merge request', `target branch: ${targetBranch}`, () => forge.createMergeRequest({ sourceBranch: branch, targetBranch, title: intent.commitMessage, description }));
+    const mr = await runStep('mr', `target branch: ${targetBranch}`, () => forge.createMergeRequest({ sourceBranch: branch, targetBranch, title: intent.commitMessage, description }));
     note(mr.webUrl);
     await maybeEnableAutoMerge(forge, mr, autoMergeOnGreen, mergeMethod);
     return mr;

package/dist/workflow/openMergeRequest.js.map

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

package/dist/workflow/orchestrate.d.ts

@@ -1,4 +1,4 @@
-/** Top-level control flow wiring the user's workflow stages together — see ui/steps.ts's TOTAL_STAGES for the full numbered sequence. */
+/** Top-level control flow wiring the user's workflow steps together — see workflow/runPlan.ts for the full step skeleton. */
 import type { CapturedIntent, CheckResult, PipelineWorkerConfig, RunPhase, RunState } from '../types.js';
 /**
  * True once the run has an open MR/PR — from that point, `pipeline-worker