@loucompanion/forge-bridge 0.1.1-dev.03b8ba168599 → 0.1.1-dev.2ac58b6f94ce

package/dist/session/provider-cli/provider-cli.service.js

@@ -5,9 +5,14 @@ import { execFile, spawn } from "node:child_process";
 import readline from "node:readline";
 import { promisify } from "node:util";
 import { GitClient } from "../../shared/git/git.js";
+import { resolveCursorAgentDirectLaunch } from "../../shared/cursor-agent/cursor-agent.launch.js";
+import { ensureNoSymbolicLinkPathSegments, isPathUnderRoot, sha256File } from "../qa-sidecar-validation.js";
 import { buildSpecBody, selectLaneCommand } from "../../worktree/artifact-injector.js";
+import { codexMcpConfigArgs, completionPhaseFromDispatch, completionPromptForDevelopCycle, completionPromptForPhase, completionPromptForQaCycle, completionRedactionEnv, expectedCompletionToolName, expectedQaCompletionToolName, prepareCompletionToolRuntime, readCompletionArtifact, usesDevelopCycleCompletion, writeCompletionArtifact, artifactRootFor, qaCompletionGateOrder } from "../phase-completion.js";
+import { addUsage, buildProviderUsageEvent, emptyUsage, hasUsage, readUsageNumber } from "./provider-usage.js";
 const fakeWorkerModel = "server-local-fake-worker";
 const execFileAsync = promisify(execFile);
+const developCyclePhaseOrder = ["implementation", "self_review", "validation"];
 export class RoutingProviderCliService {
     realProvider;
     deterministicProvider;
@@ -25,10 +30,10 @@ export class RoutingProviderCliService {
             ? await this.deterministicProvider.runConflictResolve(context)
             : await this.realProvider.runConflictResolve(context);
     }
-    async runQa(dispatch, emit, signal) {
-        return isFakeWorkerModel(dispatch.execution.model)
-            ? await this.deterministicProvider.runQa(dispatch, emit, signal)
-            : await this.realProvider.runQa(dispatch, emit, signal);
+    async runQa(context) {
+        return isFakeWorkerModel(context.dispatch.execution.model)
+            ? await this.deterministicProvider.runQa(context)
+            : await this.realProvider.runQa(context);
     }
 }
 export class ProcessBackedProviderCliService {
@@ -40,20 +45,23 @@ export class ProcessBackedProviderCliService {
     }
     async runImplementation(context) {
         const { dispatch, worktree } = context;
+        const phase = completionPhaseFromDispatch(dispatch);
+        const developCycle = usesDevelopCycleCompletion(dispatch);
         const metadataRoot = path.join(worktree.worktreePath, ".forge", "work-items", dispatch.workItem.id);
-        const artifactRoot = path.join(metadataRoot, "artifacts");
-        await fs.mkdir(artifactRoot, { recursive: true });
+        await fs.mkdir(metadataRoot, { recursive: true });
         const laneCommand = selectLaneCommand(dispatch.artifacts, dispatch.execution.lane, dispatch.cycleRun.phase);
         if (!laneCommand) {
             throw new Error(`Lane command for lane '${dispatch.execution.lane}' phase '${dispatch.cycleRun.phase}' was not resolved.`);
         }
-        const specBody = buildSpecBody(laneCommand, dispatch.workItem);
+        const specBody = buildSpecBody(laneCommand, dispatch.workItem, phase);
         const specPath = path.join(metadataRoot, "spec.md");
         await fs.writeFile(specPath, specBody, "utf8");
         await fs.writeFile(path.join(metadataRoot, "spec.meta.json"), JSON.stringify({ schema_version: 1, status: "approved", produced_by: "forge-lane-command" }) + "\n", "utf8");
+        const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase });
         const command = buildProviderCliCommand(dispatch, {
             worktreePath: worktree.worktreePath,
-            prompt: buildImplementationPrompt(dispatch)
+            prompt: developCycle ? buildDevelopCyclePrompt(dispatch, phase) : buildImplementationPrompt(dispatch, phase),
+            completionTools
         });
         await context.emit({
             role: "runner",
@@ -61,19 +69,37 @@ export class ProcessBackedProviderCliService {
             content: `Starting provider CLI: ${formatProviderCliCommand(command)} in ${worktree.worktreePath}`,
             eventType: "provider_cli_started"
         });
-        const codexState = new CodexJsonState();
-        const result = await this.processRunner.run({
-            command: command.command,
-            args: command.args,
-            cwd: worktree.worktreePath
-        }, {
-            onStdoutLine: async (line) => {
-                const event = codexState.consume(line);
-                if (event) {
-                    await context.emit(event);
+        await context.emit({
+            role: "runner",
+            kind: "checkpoint",
+            content: developCycle
+                ? "Forge completion tools configured for implementation -> self_review -> validation; provider must call each MCP completion tool before exit."
+                : `Forge completion tools configured for ${phase}; provider must call the MCP completion tool before exit.`,
+            eventType: "completion_tools_configured"
+        });
+        const outputState = createProviderOutputState(dispatch.execution.provider);
+        const liveCompletionEvents = new LiveCompletionArtifactEmitter(worktree.worktreePath, dispatch.workItem.id, phase, developCycle, context.emit);
+        let result;
+        try {
+            liveCompletionEvents.start();
+            result = await this.processRunner.run({
+                command: command.command,
+                args: command.args,
+                cwd: worktree.worktreePath,
+                env: providerRedactionEnv(dispatch)
+            }, {
+                onStdoutLine: async (line) => {
+                    const event = outputState.consume(line);
+                    if (event) {
+                        await context.emit(event);
+                    }
                 }
-            }
-        }, context.signal);
+            }, context.signal);
+        }
+        finally {
+            await liveCompletionEvents.stop();
+            await cleanupCompletionTools(completionTools, context.emit);
+        }
         if (result.exitCode !== 0) {
             const stderr = clip(result.stderr.trim() || result.stdout.trim(), 1200);
             throw new Error(`${command.command} exited ${result.exitCode}${stderr ? `: ${stderr}` : ""}`);
@@ -81,43 +107,26 @@ export class ProcessBackedProviderCliService {
         await context.emit({
             role: "runner",
             kind: "checkpoint",
-            content: `Provider CLI completed: ${command.command} exit ${result.exitCode}${codexState.threadId ? ` thread ${codexState.threadId}` : ""}.`,
+            content: `Provider CLI completed: ${command.command} exit ${result.exitCode}${outputState.sessionLabel ? ` ${outputState.sessionLabel}` : ""}.`,
             eventType: "provider_cli_completed"
         });
+        await emitProviderUsageEvent(context.emit, dispatch, outputState);
         const committed = await commitWorktreeChanges(this.git, worktree.worktreePath, dispatch.workItem.id);
-        const artifactPath = path.join(artifactRoot, "implementation.verdict.json");
-        const reportPath = path.join(artifactRoot, "implementation.report.md");
-        const report = buildImplementationReport(dispatch, command, committed, codexState);
-        const verdict = {
-            schema_version: 1,
-            status: "pass",
-            checks: [
-                {
-                    name: "provider_cli_exit",
-                    status: "pass",
-                    command: formatProviderCliCommand(command),
-                    exit_code: result.exitCode
-                }
-            ],
-            metrics: {
-                files_changed: committed.changedFiles.length
-            },
-            provider: dispatch.execution.provider,
-            model: dispatch.execution.model,
-            produced_by: `${dispatch.execution.provider}-cli`,
-            thread_id: codexState.threadId,
-            commit_sha: committed.commitSha,
-            content_hash: sha256(report)
-        };
-        const verdictJson = JSON.stringify(verdict);
-        await fs.writeFile(artifactPath, `${verdictJson}\n`, "utf8");
-        await fs.writeFile(reportPath, report, "utf8");
-        if (codexState.finalMessage) {
+        const completionArtifacts = await readCompletionArtifactsForRun(worktree.worktreePath, dispatch.workItem.id, phase, developCycle);
+        for (const artifact of completionArtifacts) {
+            if (!liveCompletionEvents.hasEmitted(completionPhaseFromArtifact(artifact))) {
+                await emitCompletionArtifactRecorded(context.emit, worktree.worktreePath, artifact);
+                await emitPhaseCompletionEvent(context.emit, artifact);
+                await emitPhaseGateEvents(context.emit, artifact);
+            }
+        }
+        const completionArtifact = completionArtifacts[0];
+        if (outputState.finalMessage) {
             await context.emit({
                 role: "assistant",
                 kind: "message",
-                content: codexState.finalMessage,
-                eventType: "implementation_complete"
+                content: outputState.finalMessage,
+                eventType: "provider_final_message"
             });
         }
         else {
@@ -125,11 +134,11 @@ export class ProcessBackedProviderCliService {
                 role: "assistant",
                 kind: "message",
                 content: `${dispatch.execution.provider} CLI completed for ${worktree.branchName}.`,
-                eventType: "implementation_complete"
+                eventType: "provider_final_message"
             });
         }
         return {
-            summary: `${dispatch.execution.provider} CLI completed ${worktree.branchName}.`,
+            summary: `${dispatch.execution.provider} CLI completed ${worktree.branchName} (${developCycle ? "develop cycle" : phase}, ${committed.commitSha.slice(0, 12)}).`,
             spec: {
                 repoPath: worktree.worktreePath,
                 path: specPath,
@@ -137,73 +146,129 @@ export class ProcessBackedProviderCliService {
                 producedBy: "forge-lane-command",
                 status: "approved"
             },
-            artifact: {
-                repoPath: worktree.worktreePath,
-                path: artifactPath,
-                verdictJson,
-                report,
-                producedBy: `${dispatch.execution.provider}-cli`,
-                status: "pass"
-            }
+            artifact: completionArtifact,
+            artifacts: completionArtifacts
         };
     }
-    async runQa(dispatch, emit, signal) {
+    async runQa(context) {
+        const { dispatch, worktree } = context;
+        const metadataRoot = path.join(worktree.worktreePath, ".forge", "work-items", dispatch.workItem.id);
+        await fs.mkdir(metadataRoot, { recursive: true });
+        const laneCommand = selectLaneCommand(dispatch.artifacts, dispatch.execution.lane, dispatch.cycleRun.phase);
+        if (!laneCommand) {
+            throw new Error(`Lane command for lane '${dispatch.execution.lane}' phase '${dispatch.cycleRun.phase}' was not resolved.`);
+        }
+        const specBody = buildSpecBody(laneCommand, dispatch.workItem, "qa");
+        const specPath = path.join(metadataRoot, "spec.md");
+        await fs.writeFile(specPath, specBody, "utf8");
+        await fs.writeFile(path.join(metadataRoot, "spec.meta.json"), JSON.stringify({ schema_version: 1, status: "approved", produced_by: "forge-lane-command" }) + "\n", "utf8");
+        const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "qa" });
         const command = buildProviderCliCommand(dispatch, {
-            prompt: buildQaPrompt(dispatch)
+            worktreePath: worktree.worktreePath,
+            prompt: buildQaPrompt(dispatch, specBody),
+            completionTools
         });
-        await emit({
+        const commandText = formatProviderCliCommand(command);
+        await context.emit({
             role: "runner",
             kind: "checkpoint",
-            content: `Starting provider CLI QA: ${formatProviderCliCommand(command)}`,
+            content: `Starting provider CLI QA: ${commandText} in ${worktree.worktreePath}`,
             eventType: "provider_cli_started"
         });
-        const codexState = new CodexJsonState();
-        const result = await this.processRunner.run({
-            command: command.command,
-            args: command.args,
-            cwd: process.cwd()
-        }, {
-            onStdoutLine: async (line) => {
-                const event = codexState.consume(line);
-                if (event) {
-                    await emit(event);
+        await context.emit({
+            role: "runner",
+            kind: "checkpoint",
+            content: "Forge QA completion tools configured; provider must call all seven QA MCP gates before exit.",
+            eventType: "completion_tools_configured"
+        });
+        const outputState = createProviderOutputState(dispatch.execution.provider);
+        const liveQaEvents = new LiveQaArtifactEmitter(worktree.worktreePath, dispatch.workItem.id, dispatch, context.emit);
+        let result;
+        try {
+            liveQaEvents.start();
+            result = await this.processRunner.run({
+                command: command.command,
+                args: command.args,
+                cwd: worktree.worktreePath,
+                env: providerRedactionEnv(dispatch)
+            }, {
+                onStdoutLine: async (line) => {
+                    const event = outputState.consume(line);
+                    if (event) {
+                        await context.emit(event);
+                    }
                 }
-            }
-        }, signal);
+            }, context.signal);
+        }
+        finally {
+            await liveQaEvents.stop();
+            await cleanupCompletionTools(completionTools, context.emit);
+        }
         if (result.exitCode !== 0) {
             const stderr = clip(result.stderr.trim() || result.stdout.trim(), 1200);
             throw new Error(`${command.command} exited ${result.exitCode}${stderr ? `: ${stderr}` : ""}`);
         }
-        await emit({
+        await context.emit({
             role: "runner",
             kind: "checkpoint",
-            content: `Provider CLI QA completed: ${command.command} exit ${result.exitCode}${codexState.threadId ? ` thread ${codexState.threadId}` : ""}.`,
+            content: `Provider CLI QA completed: ${command.command} exit ${result.exitCode}${outputState.sessionLabel ? ` ${outputState.sessionLabel}` : ""}.`,
             eventType: "provider_cli_completed"
         });
+        await emitProviderUsageEvent(context.emit, dispatch, outputState);
+        const qaArtifact = await readQaCompletionArtifactBundle(worktree.worktreePath, dispatch.workItem.id);
+        if (!qaArtifact) {
+            const verdictOnly = await readCompletionArtifact(worktree.worktreePath, dispatch.workItem.id, "qa");
+            throw new Error(verdictOnly
+                ? "Provider CLI QA completed but did not produce the complete durable QA artifact bundle."
+                : "Provider CLI QA completed but did not call the Forge QA completion tool.");
+        }
+        enforceQaBrowserLaunchTargetGate(dispatch, qaArtifact);
+        if (!liveQaEvents.hasEmitted()) {
+            await emitQaArtifactRecorded(context.emit, worktree.worktreePath, qaArtifact);
+            await emitQaStructuredEvents(context.emit, worktree.worktreePath, dispatch.workItem.id, qaArtifact);
+        }
+        const status = (qaArtifact.status ?? "unknown").trim().toLowerCase();
+        const statusSummary = status === "pass"
+            ? "passed"
+            : status === "blocked"
+                ? "blocked"
+                : "found rework";
         return {
-            summary: `${dispatch.execution.provider} CLI QA passed.`
+            summary: `${dispatch.execution.provider} CLI QA ${statusSummary}.`,
+            spec: {
+                repoPath: worktree.worktreePath,
+                path: specPath,
+                body: specBody,
+                producedBy: "forge-lane-command",
+                status: "approved"
+            },
+            artifact: qaArtifact,
+            artifacts: [qaArtifact]
         };
     }
     async runConflictResolve(context) {
         const { dispatch, worktree } = context;
+        const addressComments = isPullRequestCommentsDispatch(dispatch);
         const command = buildProviderCliCommand(dispatch, {
             worktreePath: worktree.worktreePath,
-            prompt: buildConflictResolvePrompt(dispatch, worktree.branchName)
+            prompt: addressComments
+                ? buildPullRequestCommentsPrompt(dispatch, worktree.branchName)
+                : buildConflictResolvePrompt(dispatch, worktree.branchName)
         });
         await context.emit({
             role: "runner",
             kind: "checkpoint",
-            content: `Starting provider CLI conflict resolve: ${formatProviderCliCommand(command)} in ${worktree.worktreePath}`,
+            content: `Starting provider CLI ${addressComments ? "PR comment address" : "conflict resolve"}: ${formatProviderCliCommand(command)} in ${worktree.worktreePath}`,
             eventType: "provider_cli_started"
         });
-        const codexState = new CodexJsonState();
+        const outputState = createProviderOutputState(dispatch.execution.provider);
         const result = await this.processRunner.run({
             command: command.command,
             args: command.args,
             cwd: worktree.worktreePath
         }, {
             onStdoutLine: async (line) => {
-                const event = codexState.consume(line);
+                const event = outputState.consume(line);
                 if (event) {
                     await context.emit(event);
                 }
@@ -215,14 +280,19 @@ export class ProcessBackedProviderCliService {
         }
         const committed = await commitWorktreeChanges(this.git, worktree.worktreePath, dispatch.workItem.id);
         await this.git.run(worktree.worktreePath, ["push", "origin", `HEAD:${worktree.branchName}`]);
+        await emitProviderUsageEvent(context.emit, dispatch, outputState);
         await context.emit({
             role: "assistant",
             kind: "message",
-            content: codexState.finalMessage || `${dispatch.execution.provider} CLI resolved merge conflicts for ${worktree.branchName}.`,
-            eventType: "conflict_resolve_complete"
+            content: outputState.finalMessage || (addressComments
+                ? `${dispatch.execution.provider} CLI addressed pull request comments for ${worktree.branchName}.`
+                : `${dispatch.execution.provider} CLI resolved merge conflicts for ${worktree.branchName}.`),
+            eventType: addressComments ? "pr_comments_complete" : "conflict_resolve_complete"
         });
         return {
-            summary: `${dispatch.execution.provider} CLI resolved conflicts on ${worktree.branchName} (${committed.commitSha.slice(0, 12)}).`
+            summary: addressComments
+                ? `${dispatch.execution.provider} CLI addressed PR comments on ${worktree.branchName} (${committed.commitSha.slice(0, 12)}).`
+                : `${dispatch.execution.provider} CLI resolved conflicts on ${worktree.branchName} (${committed.commitSha.slice(0, 12)}).`
         };
     }
 }
@@ -233,6 +303,8 @@ export class DeterministicProviderCliService {
     }
     async runImplementation(context) {
         const { dispatch, worktree } = context;
+        const phase = completionPhaseFromDispatch(dispatch);
+        const developCycle = usesDevelopCycleCompletion(dispatch);
         const providerCommand = buildProviderCliCommand(dispatch);
         const providerCommandText = formatProviderCliCommand(providerCommand);
         const metadataRoot = path.join(worktree.worktreePath, ".forge", "work-items", dispatch.workItem.id);
@@ -242,7 +314,7 @@ export class DeterministicProviderCliService {
         if (!laneCommand) {
             throw new Error(`Lane command for lane '${dispatch.execution.lane}' phase '${dispatch.cycleRun.phase}' was not resolved.`);
         }
-        const specBody = `${buildSpecBody(laneCommand, dispatch.workItem)}
+        const specBody = `${buildSpecBody(laneCommand, dispatch.workItem, phase)}
 ## Execution
 
 - Provider: ${singleLine(dispatch.execution.provider)}
@@ -263,27 +335,34 @@ export class DeterministicProviderCliService {
             content: `Created bridge changeset at ${changesetPath}`,
             eventType: "changeset"
         });
-        const verdict = {
-            schema_version: 1,
-            status: "pass",
-            checks: [{ name: "forge_bridge_run_once", status: "pass" }],
-            metrics: { files_changed: 1 },
-            produced_by: "forge-bridge",
-            content_hash: sha256(changesetBody)
-        };
-        const verdictJson = JSON.stringify(verdict);
-        const report = `# Implementation report\n\nforge-bridge prepared \`${worktree.branchName}\` and created \`${changesetPath}\`.\n`;
-        const artifactPath = path.join(artifactRoot, "implementation.verdict.json");
-        await fs.writeFile(artifactPath, verdictJson + "\n", "utf8");
-        await fs.writeFile(path.join(artifactRoot, "implementation.report.md"), report, "utf8");
-        await context.emit({
-            role: "assistant",
-            kind: "message",
-            content: "Implementation complete. forge-bridge produced deterministic phase artifacts.",
-            eventType: "implementation_complete"
-        });
+        const phases = developCycle
+            ? ["implementation", "self_review", "validation"]
+            : [phase];
+        const completionArtifacts = [];
+        for (const completionPhase of phases) {
+            await writeCompletionArtifact({
+                worktreePath: worktree.worktreePath,
+                workItemId: dispatch.workItem.id,
+                phase: completionPhase,
+                producedBy: "forge-bridge",
+                redactionSecrets: exactRedactionSecrets(dispatch)
+            }, expectedCompletionToolName(completionPhase), deterministicCompletionPayload(completionPhase, dispatch, changesetBody));
+            const completionArtifact = await readCompletionArtifact(worktree.worktreePath, dispatch.workItem.id, completionPhase);
+            if (!completionArtifact) {
+                throw new Error(`Deterministic provider did not produce the Forge ${completionPhase} completion artifact.`);
+            }
+            completionArtifacts.push(completionArtifact);
+            await emitCompletionArtifactRecorded(context.emit, worktree.worktreePath, completionArtifact);
+            await context.emit({
+                role: "assistant",
+                kind: "message",
+                content: `${completionPhase.replace(/_/g, " ")} complete. forge-bridge produced deterministic phase artifacts.`,
+                eventType: phaseCompleteEventType(completionPhase)
+            });
+        }
+        await context.emit(buildProviderUsageEvent(dispatch, estimatedDeterministicUsage()));
         return {
-            summary: `forge-bridge completed ${worktree.branchName}.`,
+            summary: `forge-bridge completed ${worktree.branchName} (${developCycle ? "develop cycle" : phase}).`,
             spec: {
                 repoPath: worktree.worktreePath,
                 path: specPath,
@@ -291,46 +370,774 @@ export class DeterministicProviderCliService {
                 producedBy: "forge-lane-command",
                 status: "approved"
             },
-            artifact: {
-                repoPath: worktree.worktreePath,
-                path: artifactPath,
-                verdictJson,
-                report,
-                producedBy: "forge-bridge",
-                status: "pass"
-            }
+            artifact: completionArtifacts[0],
+            artifacts: completionArtifacts
         };
     }
-    async runQa(dispatch, emit) {
-        await emit({
+    async runQa(context) {
+        const { dispatch, worktree } = context;
+        await context.emit({
             role: "worker",
             kind: "message",
-            content: `Running ${dispatch.execution.provider} QA checks through forge-bridge.`,
-            eventType: "qa_analysis"
-        });
-        await emit({
-            role: "assistant",
-            kind: "message",
-            content: "All checks passed. forge-bridge QA completed.",
-            eventType: "qa_complete"
+            content: `Planning ${dispatch.execution.provider} QA checks through forge-bridge.`,
+            eventType: "qa_plan"
         });
+        const qaBrowser = dispatch.qaBrowser;
+        const launchTarget = qaBrowser?.launchTarget ?? null;
+        const missingLaunchTarget = qaBrowser?.required === true && !hasLaunchTarget(launchTarget);
+        const browserSidecar = !missingLaunchTarget && qaBrowser?.required === true && launchTarget
+            ? deterministicBrowserSidecar(dispatch.workItem.id, launchTarget)
+            : null;
+        const browserChecks = browserSidecar && launchTarget
+            ? [deterministicBrowserCheck(launchTarget, browserSidecar.relativePath)]
+            : [];
+        const sidecars = await writeQaSidecarFiles(worktree.worktreePath, browserSidecar ? [browserSidecar] : []);
+        const summary = missingLaunchTarget
+            ? "QA blocked because browser testing is required but no app launch target was provided."
+            : "All checks passed. forge-bridge QA completed.";
+        const criterion = dispatch.workItem.acceptanceCriteria.trim() || "Forge QA evidence exists";
+        for (const gate of qaCompletionGateOrder) {
+            await writeCompletionArtifact({
+                worktreePath: worktree.worktreePath,
+                workItemId: dispatch.workItem.id,
+                phase: "qa",
+                producedBy: "forge-bridge",
+                redactionSecrets: exactRedactionSecrets(dispatch),
+                qaCycle: true
+            }, expectedQaCompletionToolName(gate), deterministicQaGatePayload({
+                gate,
+                criterion,
+                summary,
+                missingLaunchTarget,
+                browserChecks,
+                sidecars
+            }));
+            await context.emit({
+                role: "hook",
+                kind: "checkpoint",
+                content: `qa_gate: ${gate} artifact accepted.`,
+                eventType: "qa_gate"
+            });
+        }
+        const qaArtifact = await readQaCompletionArtifactBundle(worktree.worktreePath, dispatch.workItem.id);
+        if (!qaArtifact) {
+            throw new Error("Deterministic QA did not produce the complete durable QA artifact bundle.");
+        }
+        await emitQaArtifactRecorded(context.emit, worktree.worktreePath, qaArtifact);
+        await emitQaStructuredEvents(context.emit, worktree.worktreePath, dispatch.workItem.id, qaArtifact);
+        await context.emit(buildProviderUsageEvent(dispatch, estimatedDeterministicUsage()));
         return {
-            summary: "forge-bridge QA passed."
+            summary: missingLaunchTarget ? "forge-bridge QA blocked." : "forge-bridge QA passed.",
+            artifact: qaArtifact,
+            artifacts: [qaArtifact]
         };
     }
     async runConflictResolve(context) {
         const { dispatch, worktree } = context;
-        await this.git.run(worktree.worktreePath, ["commit", "--allow-empty", "-m", `forge bridge conflict resolve for ${dispatch.workItem.id.slice(0, 8)}`]);
+        const addressComments = isPullRequestCommentsDispatch(dispatch);
+        await this.git.run(worktree.worktreePath, ["commit", "--allow-empty", "-m", `forge bridge ${addressComments ? "pr comments" : "conflict resolve"} for ${dispatch.workItem.id.slice(0, 8)}`]);
+        await context.emit(buildProviderUsageEvent(dispatch, estimatedDeterministicUsage()));
         await context.emit({
             role: "assistant",
             kind: "message",
-            content: `Deterministic conflict resolve completed for ${worktree.branchName}.`,
-            eventType: "conflict_resolve_complete"
+            content: addressComments
+                ? `Deterministic PR comment addressing completed for ${worktree.branchName}.`
+                : `Deterministic conflict resolve completed for ${worktree.branchName}.`,
+            eventType: addressComments ? "pr_comments_complete" : "conflict_resolve_complete"
         });
         return {
-            summary: `forge-bridge resolved conflicts for ${worktree.branchName}.`
+            summary: addressComments
+                ? `forge-bridge addressed PR comments for ${worktree.branchName}.`
+                : `forge-bridge resolved conflicts for ${worktree.branchName}.`
+        };
+    }
+}
+function phaseCompleteEventType(phase) {
+    return phase === "implementation" ? "implementation_complete" : `${phase}_complete`;
+}
+function deterministicCompletionPayload(phase, dispatch, changesetBody) {
+    const changesetHash = sha256(changesetBody);
+    const criterion = dispatch.workItem.acceptanceCriteria || "Deterministic bridge changeset exists";
+    if (phase === "implementation") {
+        return {
+            status: "pass",
+            summary: "forge-bridge produced a deterministic implementation changeset.",
+            plan: [{ step: "Create deterministic changeset", status: "done" }],
+            changed_files: [{ path: "FORGE_PHASE5_CHANGESET.md", summary: "Recorded deterministic bridge evidence." }],
+            tests_added_or_updated: [{ name: "forge_bridge_run_once", evidence: "The bridge committed FORGE_PHASE5_CHANGESET.md." }],
+            docs_added_or_updated: [{ path: "FORGE_PHASE5_CHANGESET.md", summary: "Deterministic evidence document created for the run." }],
+            acceptance_criteria: [
+                {
+                    criterion,
+                    evidence: `FORGE_PHASE5_CHANGESET.md was committed with content hash ${changesetHash}.`,
+                    status: "satisfied"
+                }
+            ],
+            known_gaps: [],
+            next_phase_context: "Review FORGE_PHASE5_CHANGESET.md and the bridge commit before validation."
+        };
+    }
+    if (phase === "self_review") {
+        return {
+            status: "pass",
+            summary: "forge-bridge fake worker completed deterministic self-review.",
+            reviewed_diff: true,
+            findings: [],
+            security_review: {
+                status: "pass",
+                notes: "No secret handling, auth, or destructive behavior changes were introduced by the deterministic changeset."
+            },
+            edge_case_review: {
+                status: "pass",
+                notes: "The deterministic fake-worker changeset is intentionally narrow and repeatable."
+            },
+            design_review: {
+                status: "not_applicable",
+                screenshots: [],
+                notes: "No UI changes."
+            },
+            deterministic_comparison: {
+                status: "pass",
+                command_or_tool: "git diff --stat HEAD~1..HEAD",
+                notes: `Reviewed deterministic changeset with content hash ${changesetHash}.`
+            },
+            fixes_applied: [],
+            remaining_risks: []
         };
     }
+    return {
+        status: "pass",
+        summary: "forge-bridge fake worker completed deterministic validation.",
+        commands: [
+            {
+                command: "git status --short && git diff --check",
+                exit_code: 0,
+                status: "pass",
+                summary: "Deterministic validation command completed for the fake-worker changeset."
+            }
+        ],
+        acceptance_criteria: [
+            {
+                criterion,
+                evidence: `FORGE_PHASE5_CHANGESET.md exists with content hash ${changesetHash}.`,
+                status: "satisfied"
+            }
+        ],
+        build_status: "pass",
+        test_status: "pass",
+        lint_status: "not_applicable",
+        design_status: "not_applicable",
+        drift_checks: [
+            {
+                command_or_tool: "git diff --check",
+                status: "pass",
+                summary: "No deterministic drift or whitespace errors were reported for the fake-worker changeset."
+            }
+        ],
+        ready_for_dev_test: true
+    };
+}
+function deterministicQaGatePayload(options) {
+    const blocked = options.missingLaunchTarget;
+    const skippedBecauseBlocked = blocked
+        ? {
+            status: "skipped",
+            summary: "Skipped because browser QA was blocked by missing launch target.",
+            reason: "Upstream browser QA blocker prevents meaningful downstream evidence."
+        }
+        : null;
+    switch (options.gate) {
+        case "qa_plan":
+            return {
+                status: "pass",
+                summary: "Deterministic QA plan recorded.",
+                checklist: [
+                    "Review the validated work item against acceptance criteria.",
+                    "Run deterministic regression evidence.",
+                    "Confirm no in-scope QA findings remain."
+                ],
+                acceptance_criteria: [options.criterion]
+            };
+        case "qa_regression":
+            return {
+                status: "pass",
+                summary: "Deterministic regression QA completed.",
+                commands: [
+                    {
+                        command: "forge-bridge deterministic QA",
+                        exit_code: 0,
+                        status: "pass",
+                        summary: "Deterministic regression evidence completed."
+                    }
+                ],
+                notes: "Regression gate passed in deterministic fake-worker mode."
+            };
+        case "qa_api":
+            return {
+                status: "skipped",
+                summary: "No API/backend surface was identified for deterministic QA.",
+                reason: "The deterministic fake-worker changeset does not exercise API/backend behavior."
+            };
+        case "qa_manual_web":
+            return blocked
+                ? {
+                    status: "blocked",
+                    summary: "Browser QA could not run because no app launch target was provided.",
+                    blocker_reason: "missing_app_launch_target"
+                }
+                : options.browserChecks.length > 0
+                    ? {
+                        status: "pass",
+                        summary: "Deterministic browser QA exercised the configured launch target.",
+                        browser_checks: options.browserChecks,
+                        sidecars: options.sidecars,
+                        notes: "Browser sidecar evidence recorded."
+                    }
+                    : {
+                        status: "skipped",
+                        summary: "Manual web QA was not required for this deterministic run.",
+                        reason: "Forge did not require browser QA and no launch target was necessary."
+                    };
+        case "qa_bug_repro":
+            return skippedBecauseBlocked ?? {
+                status: "skipped",
+                summary: "No failed QA observation required bug reproduction.",
+                reason: "No defects or candidate bugs were observed."
+            };
+        case "qa_findings":
+            return skippedBecauseBlocked ?? {
+                status: "pass",
+                summary: "No QA findings or candidate bugs were identified.",
+                findings: [],
+                candidate_bugs: []
+            };
+        case "qa_verdict":
+            return {
+                status: blocked ? "blocked" : "pass",
+                summary: options.summary,
+                checklist: [
+                    "Review the validated work item against acceptance criteria.",
+                    "Run deterministic regression evidence.",
+                    blocked ? "Record missing browser launch target blocker." : "Confirm no in-scope QA findings remain."
+                ],
+                tested_acceptance_criteria: blocked ? [] : [options.criterion],
+                commands: blocked
+                    ? []
+                    : [
+                        {
+                            command: "forge-bridge deterministic QA",
+                            exit_code: 0,
+                            status: "pass",
+                            summary: "Deterministic QA command completed."
+                        }
+                    ],
+                browser_checks: blocked ? [] : options.browserChecks,
+                sidecars: blocked ? [] : options.sidecars,
+                notes: options.summary,
+                findings: [],
+                candidate_bugs: [],
+                blocker_reason: blocked ? "missing_app_launch_target" : null,
+                report_markdown: `# QA report\n\n${options.summary}\n`
+            };
+    }
+}
+const qaArtifactFileNames = {
+    plan: "qa.plan.json",
+    evidence: "qa.evidence.json",
+    findings: "qa.findings.json",
+    verdict: "qa.verdict.json",
+    report: "qa.report.md"
+};
+function hasLaunchTarget(target) {
+    return Boolean(target?.url?.trim()
+        || target?.ready_url?.trim()
+        || target?.command?.trim()
+        || (target?.routes ?? []).some((route) => route.trim().length > 0));
+}
+function deterministicBrowserSidecar(workItemId, target) {
+    const route = primaryLaunchRoute(target);
+    return {
+        relativePath: qaArtifactRelativePath(workItemId, "qa/screenshots/deterministic-browser-check.txt"),
+        content: `Deterministic Forge QA browser evidence\nRoute: ${route}\nConsole errors: []\nNetwork errors: []\nResponsive checks: desktop, mobile\n`
+    };
+}
+function deterministicBrowserCheck(target, screenshotPath) {
+    const route = primaryLaunchRoute(target);
+    return {
+        route,
+        url: route,
+        status: "pass",
+        summary: "Deterministic browser QA exercised the configured launch target.",
+        actions: ["open launch target", "walk acceptance criteria", "check console/network summaries", "check responsive viewport"],
+        screenshots: [screenshotPath],
+        console_errors: [],
+        network_errors: [],
+        responsive_checks: ["desktop", "mobile"]
+    };
+}
+function primaryLaunchRoute(target) {
+    return target.ready_url?.trim()
+        || target.url?.trim()
+        || target.routes.find((route) => route.trim().length > 0)?.trim()
+        || "app launch command";
+}
+async function writeQaSidecarFiles(worktreePath, files) {
+    const sidecars = [];
+    for (const file of files) {
+        const fullPath = path.resolve(worktreePath, file.relativePath);
+        const relativePath = path.relative(worktreePath, fullPath).split(path.sep).join("/");
+        if (relativePath.startsWith("..") || path.isAbsolute(relativePath)) {
+            throw new Error(`QA sidecar path must stay under the worktree: ${file.relativePath}`);
+        }
+        await fs.mkdir(path.dirname(fullPath), { recursive: true });
+        await fs.writeFile(fullPath, file.content, "utf8");
+        sidecars.push({
+            path: relativePath,
+            content_hash: sha256(file.content),
+            bytes: Buffer.byteLength(file.content, "utf8")
+        });
+    }
+    return sidecars;
+}
+async function writeQaArtifacts(request) {
+    const artifactRoot = artifactRootFor(request.worktreePath, request.workItemId);
+    await fs.mkdir(artifactRoot, { recursive: true });
+    const sidecars = await writeQaSidecarFiles(request.worktreePath, request.sidecarFiles ?? []);
+    const status = request.status ?? "pass";
+    const criterion = request.acceptanceCriteria.trim() || "Forge QA evidence exists";
+    const relativeEvidencePath = qaArtifactRelativePath(request.workItemId, qaArtifactFileNames.evidence);
+    const relativeFindingsPath = qaArtifactRelativePath(request.workItemId, qaArtifactFileNames.findings);
+    const relativeReportPath = qaArtifactRelativePath(request.workItemId, qaArtifactFileNames.report);
+    const planJson = jsonText({
+        schema_version: 1,
+        phase: "qa",
+        checklist: [
+            "Review the validated work item against acceptance criteria.",
+            "Run relevant provider QA verification.",
+            "Confirm no in-scope QA findings remain."
+        ],
+        acceptance_criteria: [criterion]
+    });
+    const evidenceJson = jsonText({
+        schema_version: 1,
+        phase: "qa",
+        commands: status === "blocked"
+            ? []
+            : [
+                {
+                    command: request.command,
+                    exit_code: 0,
+                    status: "pass",
+                    summary: `${request.provider} QA completed successfully.`
+                }
+            ],
+        browser_checks: request.browserChecks ?? [],
+        sidecars,
+        notes: request.summary
+    });
+    const findingsJson = jsonText({
+        schema_version: 1,
+        phase: "qa",
+        findings: [],
+        candidate_bugs: []
+    });
+    const verdictJson = jsonText({
+        schema_version: 1,
+        phase: "qa",
+        status,
+        summary: request.summary,
+        tested_acceptance_criteria: status === "blocked" ? [] : [criterion],
+        finding_ids: [],
+        candidate_bug_ids: [],
+        blocker_reason: status === "blocked" ? request.blockerReason ?? "inconclusive" : null,
+        evidence_path: relativeEvidencePath,
+        findings_path: relativeFindingsPath,
+        report_path: relativeReportPath
+    });
+    const report = `# QA report\n\n${request.summary}\n\n- Provider: ${singleLine(request.provider)}\n- Model: ${singleLine(request.model)}\n- Command: ${singleLine(request.command)}\n`;
+    await fs.writeFile(path.join(artifactRoot, qaArtifactFileNames.plan), planJson, "utf8");
+    await fs.writeFile(path.join(artifactRoot, qaArtifactFileNames.evidence), evidenceJson, "utf8");
+    await fs.writeFile(path.join(artifactRoot, qaArtifactFileNames.findings), findingsJson, "utf8");
+    const verdictPath = path.join(artifactRoot, qaArtifactFileNames.verdict);
+    await fs.writeFile(verdictPath, verdictJson, "utf8");
+    await fs.writeFile(path.join(artifactRoot, qaArtifactFileNames.report), report, "utf8");
+    return {
+        repoPath: request.worktreePath,
+        path: verdictPath,
+        verdictJson,
+        report,
+        producedBy: request.producedBy,
+        status,
+        phase: "qa"
+    };
+}
+async function emitQaArtifactRecorded(emit, worktreePath, artifact) {
+    const relativePath = path.relative(worktreePath, artifact.path) || path.basename(artifact.path);
+    await emit({
+        role: "tool",
+        kind: "tool_result",
+        content: `Forge QA artifact recorded ${relativePath} (${artifact.status}).`,
+        eventType: "qa_artifact_recorded"
+    });
+    await emit({
+        role: "hook",
+        kind: "checkpoint",
+        content: `phase_gate: qa artifact accepted with status ${artifact.status}.`,
+        eventType: "phase_gate"
+    });
+}
+async function readQaCompletionArtifactBundle(worktreePath, workItemId) {
+    const artifact = await readCompletionArtifact(worktreePath, workItemId, "qa");
+    if (!artifact || !await hasCompleteQaArtifactBundle(worktreePath, workItemId)) {
+        return null;
+    }
+    await validateQaBundleSidecarReferences(worktreePath, workItemId);
+    return artifact;
+}
+async function hasCompleteQaArtifactBundle(worktreePath, workItemId) {
+    const artifactRoot = artifactRootFor(worktreePath, workItemId);
+    for (const fileName of Object.values(qaArtifactFileNames)) {
+        try {
+            const stat = await fs.stat(path.join(artifactRoot, fileName));
+            if (!stat.isFile()) {
+                return false;
+            }
+        }
+        catch (error) {
+            if (isNodeError(error) && error.code === "ENOENT") {
+                return false;
+            }
+            throw error;
+        }
+    }
+    return true;
+}
+function enforceQaBrowserLaunchTargetGate(dispatch, artifact) {
+    const qaBrowser = dispatch.qaBrowser;
+    if (!qaBrowser?.required || hasLaunchTarget(qaBrowser.launchTarget ?? null)) {
+        return;
+    }
+    const verdict = parseJsonLine(artifact.verdictJson) ?? {};
+    const status = normalizedString(stringField(verdict, "status") ?? artifact.status ?? "");
+    const blockerReason = normalizedString(stringField(verdict, "blocker_reason") ?? "");
+    if (status !== "blocked" || blockerReason !== "missing_app_launch_target") {
+        throw new Error("QA browser testing is required but no app launch target was provided; provider must return blocked with blocker_reason missing_app_launch_target.");
+    }
+}
+async function validateQaBundleSidecarReferences(worktreePath, workItemId) {
+    const artifactRoot = artifactRootFor(worktreePath, workItemId);
+    const evidence = await readJsonObjectFile(path.join(artifactRoot, qaArtifactFileNames.evidence));
+    const sidecars = arrayField(evidence, "sidecars");
+    if (sidecars.length === 0) {
+        return;
+    }
+    const qaSidecarRoot = path.resolve(artifactRoot, "qa");
+    for (const [index, sidecar] of sidecars.entries()) {
+        const sidecarPath = stringField(sidecar, "path");
+        const expectedHash = stringField(sidecar, "content_hash");
+        const expectedBytes = sidecar.bytes;
+        if (!sidecarPath || !expectedHash || typeof expectedBytes !== "number" || !Number.isFinite(expectedBytes) || expectedBytes <= 0) {
+            throw new Error(`QA sidecar ${index} must include path, content_hash, and positive bytes.`);
+        }
+        if (path.isAbsolute(sidecarPath)) {
+            throw new Error(`QA sidecar ${index} path must be relative to the worktree.`);
+        }
+        const fullPath = path.resolve(worktreePath, sidecarPath);
+        if (!isPathUnderRoot(qaSidecarRoot, fullPath)) {
+            throw new Error(`QA sidecar ${index} path must be under .forge/work-items/${workItemId}/artifacts/qa/.`);
+        }
+        const stat = await fs.lstat(fullPath).catch((error) => {
+            if (isNodeError(error) && error.code === "ENOENT") {
+                throw new Error(`QA sidecar ${index} file does not exist: ${sidecarPath}`);
+            }
+            throw error;
+        });
+        if (!stat.isFile() || stat.isSymbolicLink()) {
+            throw new Error(`QA sidecar ${index} must reference a regular file.`);
+        }
+        await ensureNoSymbolicLinkPathSegments(qaSidecarRoot, path.dirname(fullPath), `QA sidecar ${index} path must not traverse symbolic links.`);
+        if (stat.size !== expectedBytes) {
+            throw new Error(`QA sidecar ${index} bytes do not match the referenced file.`);
+        }
+        const actualHash = await sha256File(fullPath);
+        if (actualHash !== expectedHash.trim().toLowerCase()) {
+            throw new Error(`QA sidecar ${index} content_hash does not match the referenced file.`);
+        }
+    }
+}
+async function emitQaStructuredEvents(emit, worktreePath, workItemId, artifact) {
+    const artifactRoot = artifactRootFor(worktreePath, workItemId);
+    const plan = await readJsonObjectFile(path.join(artifactRoot, qaArtifactFileNames.plan));
+    const evidence = await readJsonObjectFile(path.join(artifactRoot, qaArtifactFileNames.evidence));
+    const findings = await readJsonObjectFile(path.join(artifactRoot, qaArtifactFileNames.findings));
+    const verdict = parseJsonLine(artifact.verdictJson) ?? {};
+    const status = stringField(verdict, "status") ?? artifact.status ?? "unknown";
+    const checklist = stringArrayField(plan, "checklist");
+    await emit({
+        role: "worker",
+        kind: "message",
+        content: checklist.length > 0
+            ? `QA plan: ${checklist.join("; ")}`
+            : "QA plan recorded.",
+        eventType: "qa_plan"
+    });
+    for (const browserCheck of arrayField(evidence, "browser_checks")) {
+        await emit({
+            role: "worker",
+            kind: "checkpoint",
+            content: `QA browser check: ${summarizeQaObject(browserCheck)}`,
+            eventType: "qa_browser_check"
+        });
+    }
+    for (const finding of [...arrayField(findings, "findings"), ...arrayField(findings, "candidate_bugs")]) {
+        await emit({
+            role: "worker",
+            kind: "checkpoint",
+            content: `QA finding: ${summarizeQaObject(finding)}`,
+            eventType: "qa_finding"
+        });
+    }
+    await emit({
+        role: "assistant",
+        kind: "message",
+        content: status === "blocked"
+            ? `QA blocked: ${stringField(verdict, "summary") ?? "No summary provided."}`
+            : `QA completed with status ${status}: ${stringField(verdict, "summary") ?? "No summary provided."}`,
+        eventType: status === "blocked" ? "qa_blocked" : "qa_complete"
+    });
+}
+class LiveQaArtifactEmitter {
+    worktreePath;
+    workItemId;
+    dispatch;
+    emit;
+    emitted = false;
+    timer = null;
+    pending = Promise.resolve();
+    constructor(worktreePath, workItemId, dispatch, emit) {
+        this.worktreePath = worktreePath;
+        this.workItemId = workItemId;
+        this.dispatch = dispatch;
+        this.emit = emit;
+    }
+    start() {
+        void this.pollQueued();
+        this.timer = setInterval(() => {
+            void this.pollQueued();
+        }, 250);
+    }
+    async stop() {
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+        await this.pollQueued();
+    }
+    hasEmitted() {
+        return this.emitted;
+    }
+    pollQueued() {
+        this.pending = this.pending
+            .then(() => this.poll())
+            .catch(() => undefined);
+        return this.pending;
+    }
+    async poll() {
+        if (this.emitted) {
+            return;
+        }
+        const artifact = await readQaCompletionArtifactBundle(this.worktreePath, this.workItemId);
+        if (!artifact) {
+            return;
+        }
+        enforceQaBrowserLaunchTargetGate(this.dispatch, artifact);
+        this.emitted = true;
+        await emitQaArtifactRecorded(this.emit, this.worktreePath, artifact);
+        await emitQaStructuredEvents(this.emit, this.worktreePath, this.workItemId, artifact);
+    }
+}
+async function readJsonObjectFile(filePath) {
+    const content = await fs.readFile(filePath, "utf8").catch(() => "");
+    return parseJsonLine(content) ?? {};
+}
+function arrayField(source, key) {
+    const value = source[key];
+    if (!Array.isArray(value)) {
+        return [];
+    }
+    return value.filter((entry) => Boolean(entry) && typeof entry === "object" && !Array.isArray(entry));
+}
+function stringArrayField(source, key) {
+    const value = source[key];
+    if (!Array.isArray(value)) {
+        return [];
+    }
+    return value.filter((entry) => typeof entry === "string" && entry.trim().length > 0);
+}
+function summarizeQaObject(source) {
+    return clip(stringField(source, "title")
+        ?? stringField(source, "summary")
+        ?? stringField(source, "id")
+        ?? JSON.stringify(source), 500);
+}
+function qaArtifactRelativePath(workItemId, fileName) {
+    return [".forge", "work-items", workItemId, "artifacts", fileName].join("/");
+}
+function jsonText(value) {
+    return `${JSON.stringify(value, null, 2)}\n`;
+}
+async function emitCompletionArtifactRecorded(emit, worktreePath, artifact) {
+    const relativePath = path.relative(worktreePath, artifact.path) || path.basename(artifact.path);
+    await emit({
+        role: "tool",
+        kind: "tool_result",
+        content: `Forge completion tool recorded ${artifact.phase ?? "unknown"} artifact ${relativePath} (${artifact.status}).`,
+        eventType: "completion_tool_artifact_recorded"
+    });
+}
+async function emitPhaseCompletionEvent(emit, artifact) {
+    const phase = completionPhaseFromArtifact(artifact);
+    await emit({
+        role: "assistant",
+        kind: "message",
+        content: `${phase.replace(/_/g, " ")} completion artifact recorded with status ${artifact.status}.`,
+        eventType: phaseCompleteEventType(phase)
+    });
+}
+async function emitPhaseGateEvents(emit, artifact) {
+    const phase = completionPhaseFromArtifact(artifact);
+    const status = (artifact.status ?? "").trim().toLowerCase() || "unknown";
+    await emit({
+        role: "hook",
+        kind: "checkpoint",
+        content: `phase_gate: ${phase} artifact accepted with status ${status}.`,
+        eventType: "phase_gate"
+    });
+    if (status !== "pass") {
+        return;
+    }
+    const progression = phase === "implementation"
+        ? "phase_progression: implementation -> self_review"
+        : phase === "self_review"
+            ? "phase_progression: self_review -> validation"
+            : "phase_progression: validation -> QA ready";
+    await emit({
+        role: "hook",
+        kind: "checkpoint",
+        content: progression,
+        eventType: "phase_gate"
+    });
+}
+function completionPhaseFromArtifact(artifact) {
+    const phase = artifact.phase?.trim();
+    return phase === "self_review" || phase === "validation" || phase === "implementation" || phase === "qa"
+        ? phase
+        : "implementation";
+}
+class LiveCompletionArtifactEmitter {
+    worktreePath;
+    workItemId;
+    emit;
+    phases;
+    emitted = new Set();
+    timer = null;
+    pending = Promise.resolve();
+    constructor(worktreePath, workItemId, phase, developCycle, emit) {
+        this.worktreePath = worktreePath;
+        this.workItemId = workItemId;
+        this.emit = emit;
+        this.phases = developCycle
+            ? developCyclePhaseOrder.slice(developCyclePhaseOrder.indexOf(phase))
+            : [phase];
+    }
+    start() {
+        void this.pollQueued();
+        this.timer = setInterval(() => {
+            void this.pollQueued();
+        }, 250);
+    }
+    async stop() {
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+        await this.pollQueued();
+    }
+    hasEmitted(phase) {
+        return this.emitted.has(phase);
+    }
+    pollQueued() {
+        this.pending = this.pending
+            .then(() => this.poll())
+            .catch(() => undefined);
+        return this.pending;
+    }
+    async poll() {
+        for (const phase of this.phases) {
+            if (this.emitted.has(phase)) {
+                continue;
+            }
+            const artifact = await readCompletionArtifact(this.worktreePath, this.workItemId, phase);
+            if (!artifact) {
+                return;
+            }
+            this.emitted.add(phase);
+            await emitCompletionArtifactRecorded(this.emit, this.worktreePath, artifact);
+            await emitPhaseCompletionEvent(this.emit, artifact);
+            await emitPhaseGateEvents(this.emit, artifact);
+            if ((artifact.status ?? "").trim().toLowerCase() !== "pass") {
+                return;
+            }
+        }
+    }
+}
+async function readCompletionArtifactsForRun(worktreePath, workItemId, phase, developCycle) {
+    if (!developCycle) {
+        const artifact = await readCompletionArtifact(worktreePath, workItemId, phase);
+        if (!artifact) {
+            throw new Error(`Provider CLI completed but did not call the Forge ${phase} completion tool.`);
+        }
+        return [artifact];
+    }
+    const artifacts = [];
+    for (const expectedPhase of ["implementation", "self_review", "validation"]) {
+        const artifact = await readCompletionArtifact(worktreePath, workItemId, expectedPhase);
+        if (!artifact) {
+            if (artifacts.length === 0) {
+                throw new Error("Provider CLI completed but did not call the Forge implementation completion tool.");
+            }
+            const previous = artifacts[artifacts.length - 1];
+            if ((previous.status ?? "").trim().toLowerCase() === "pass") {
+                throw new Error(`Provider CLI completed after ${previous.phase} passed but did not call the Forge ${expectedPhase} completion tool.`);
+            }
+            return artifacts;
+        }
+        artifacts.push(artifact);
+        if ((artifact.status ?? "").trim().toLowerCase() !== "pass") {
+            return artifacts;
+        }
+    }
+    return artifacts;
+}
+function providerRedactionEnv(dispatch) {
+    const env = completionRedactionEnv(exactRedactionSecrets(dispatch));
+    return Object.keys(env).length > 0 ? env : undefined;
+}
+function exactRedactionSecrets(dispatch) {
+    return dispatch.apiKeySecretGrant?.secret ? [dispatch.apiKeySecretGrant.secret] : [];
+}
+async function emitProviderUsageEvent(emit, dispatch, outputState) {
+    const usage = outputState.usage;
+    if (hasUsage(usage)) {
+        await emit(buildProviderUsageEvent(dispatch, usage));
+    }
+}
+function estimatedDeterministicUsage() {
+    return addUsage(emptyUsage("estimated"), {
+        inputTokens: 1000,
+        outputTokens: 400,
+        source: "estimated"
+    });
 }
 export class StreamingProviderProcessRunner {
     async run(request, handlers = {}, signal) {
@@ -338,6 +1145,7 @@ export class StreamingProviderProcessRunner {
         return await new Promise((resolve, reject) => {
             const child = spawn(launch.command, launch.args, {
                 cwd: request.cwd,
+                env: request.env ? { ...process.env, ...request.env } : undefined,
                 stdio: ["ignore", "pipe", "pipe"],
                 windowsHide: true
             });
@@ -406,6 +1214,10 @@ async function resolveProviderProcessLaunch(command, args) {
     if (process.platform !== "win32") {
         return { command, args };
     }
+    const cursorDirect = await resolveCursorAgentDirectLaunch(command, args);
+    if (cursorDirect) {
+        return cursorDirect;
+    }
     const resolved = await resolveWindowsCommand(command);
     return resolved ? buildWindowsLaunchCommand(resolved, args) : { command, args };
 }
@@ -413,10 +1225,6 @@ async function resolveWindowsCommand(command) {
     if (path.isAbsolute(command)) {
         return command;
     }
-    const cursorScript = await resolveCursorAgentPowerShellScript(command);
-    if (cursorScript) {
-        return cursorScript;
-    }
     try {
         const result = await execFileAsync("where.exe", [command], { timeout: 2000 });
         return chooseWindowsCommandCandidate(result.stdout.split(/\r?\n/));
@@ -425,18 +1233,6 @@ async function resolveWindowsCommand(command) {
         return null;
     }
 }
-async function resolveCursorAgentPowerShellScript(command) {
-    const normalized = command.trim().toLowerCase();
-    if (normalized !== "cursor-agent" && normalized !== "agent") {
-        return null;
-    }
-    const localAppData = process.env.LOCALAPPDATA;
-    if (!localAppData) {
-        return null;
-    }
-    const script = path.join(localAppData, "cursor-agent", "cursor-agent.ps1");
-    return await fileExists(script) ? script : null;
-}
 export function chooseWindowsCommandCandidate(candidates) {
     const normalized = candidates
         .map((candidate) => candidate.trim())
@@ -518,7 +1314,11 @@ export function buildProviderCliCommand(dispatch, run) {
     const normalizedProvider = provider.toLowerCase();
     const model = dispatch.execution.model.trim();
     if (normalizedProvider === "codex") {
-        const args = ["exec", "--model", model];
+        const args = ["exec"];
+        if (run?.completionTools) {
+            args.push(...codexMcpConfigArgs(run.completionTools));
+        }
+        args.push("--model", model);
         if (run) {
             args.push("--json", "--dangerously-bypass-approvals-and-sandbox");
             if (run.worktreePath) {
@@ -529,10 +1329,12 @@ export function buildProviderCliCommand(dispatch, run) {
         return { command: "codex", args };
     }
     if (normalizedProvider === "cursor") {
-        const args = ["--model", model];
+        const args = ["--print", "--output-format", "stream-json", "--model", model];
+        if (run?.worktreePath) {
+            args.push("--workspace", run.worktreePath);
+        }
         if (run?.prompt) {
-            args.push("--yolo");
-            args.push(run.prompt);
+            args.push("--yolo", "--approve-mcps", "--trust", run.prompt);
         }
         return { command: "cursor-agent", args };
     }
@@ -542,20 +1344,115 @@ export function buildProviderCliCommand(dispatch, run) {
     }
     return { command: provider, args };
 }
-function buildImplementationPrompt(dispatch) {
-    return `You are Forge's Develop lane running locally in a prepared git worktree.
+function buildImplementationPrompt(dispatch, phase = completionPhaseFromDispatch(dispatch)) {
+    return `You are Forge's ${phase.replace(/_/g, " ")} phase runner running locally in a prepared git worktree.
+
+Read .forge/work-items/${dispatch.workItem.id}/spec.md and any prior phase artifacts required by this phase.
+${phaseWorkInstruction(phase)}
+${qaReworkImplementationInstruction(dispatch)}
+Use the repository's existing conventions. Run relevant tests when practical.
+Forge owns protocol files: worktree prep, injected .forge commands/hooks/skills, phase verdict artifacts, reports, and commits.
+Read Forge-provided context under .forge when needed, but do not edit .forge files or create Forge verdict/report artifacts by hand.
+
+${completionPromptForPhase(phase)}
+
+Finish with a concise summary of changed files and verification after calling the completion tool.`;
+}
+function buildDevelopCyclePrompt(dispatch, phase = completionPhaseFromDispatch(dispatch)) {
+    return `You are Forge's develop-cycle runner running locally in a prepared git worktree.
 
-Read .forge/work-items/${dispatch.workItem.id}/spec.md, implement the work item, and keep the change focused.
+Read .forge/work-items/${dispatch.workItem.id}/spec.md, implement the work item, self-review the diff, then validate it in this same provider session.
+Start in the ${phase.replace(/_/g, " ")} phase. Do not stop after implementation if it passes; continue through self-review and validation using the next instruction returned by each completion tool.
+${qaReworkImplementationInstruction(dispatch)}
 Use the repository's existing conventions. Run relevant tests when practical.
-The runner owns Forge protocol files: worktree prep, injected .forge commands/hooks/skills, phase verdict artifacts, reports, and commits.
-Only read the work item spec under .forge; do not edit .forge files or create Forge verdict/report artifacts.
-Finish with a concise summary of changed files and verification.`;
+Forge owns protocol files: worktree prep, injected .forge commands/hooks/skills, phase verdict artifacts, reports, and commits.
+Read Forge-provided context under .forge when needed, but do not edit .forge files or create Forge verdict/report artifacts by hand.
+
+${completionPromptForDevelopCycle(phase)}
+
+Finish with a concise summary of changed files and verification after the validation completion tool has accepted the work, or after the current phase tool records a non-pass blocker.`;
+}
+function qaReworkImplementationInstruction(dispatch) {
+    if (!dispatch.qaRework) {
+        return "";
+    }
+    return `
+QA rework context:
+- Attempt ${dispatch.qaRework.attempt}/${dispatch.qaRework.maxAttempts}
+- Rework packet: ${dispatch.qaRework.packetPath}
+- Required QA finding IDs: ${dispatch.qaRework.findingIds.join(", ")}
+Read the packet JSON and fix or explicitly dispute each listed finding. The implementation completion artifact must include resolved_findings entries for every required QA ID with qa_id, status, summary, evidence, changed_files, tests_added_or_updated, and regression_evidence.`;
+}
+function qaReworkRetestInstruction(dispatch) {
+    if (!dispatch.qaRework) {
+        return "";
+    }
+    return `
+QA retest context:
+- Rework attempt ${dispatch.qaRework.attempt}/${dispatch.qaRework.maxAttempts}
+- Rework packet: ${dispatch.qaRework.packetPath}
+- Priority finding IDs: ${dispatch.qaRework.findingIds.join(", ")}
+Prioritize retesting the listed QA findings and their required regressions before deciding pass, needs_rework, or blocked.`;
+}
+function phaseWorkInstruction(phase) {
+    if (phase === "self_review") {
+        return "Review the implementation diff, apply safe fixes when needed, and record remaining risks explicitly.";
+    }
+    if (phase === "validation") {
+        return "Run the validation commands and deterministic drift checks needed to prove the work is ready for QA.";
+    }
+    return "Implement the work item and keep the change focused.";
 }
-function buildQaPrompt(dispatch) {
-    return `You are Forge's QA lane running locally.
+function qaBrowserInstruction(dispatch) {
+    const qaBrowser = dispatch.qaBrowser;
+    if (!qaBrowser) {
+        return "Browser/app launch context: not provided by Forge.";
+    }
+    const launchTarget = qaBrowser.launchTarget;
+    if (qaBrowser.required && !hasLaunchTarget(launchTarget ?? null)) {
+        return `Browser/app launch context:\n- UI/browser QA is required for this item.\n- No app launch target was provided.\n- Return blocked with blocker_reason: missing_app_launch_target instead of pretending browser testing occurred.\n- Artifact sidecars path when available: ${qaBrowser.artifactsPath || `.forge/work-items/${dispatch.workItem.id}/artifacts/qa`}`;
+    }
+    if (!launchTarget) {
+        return `Browser/app launch context:\n- UI/browser QA is not required by Forge heuristics for this item.\n- If you determine browser testing is needed, return blocked with blocker_reason: missing_app_launch_target unless you can safely identify a launch target from the repo.\n- Browser sidecars path: ${qaBrowser.artifactsPath || `.forge/work-items/${dispatch.workItem.id}/artifacts/qa`}`;
+    }
+    const routes = launchTarget.routes.length > 0 ? launchTarget.routes.join(", ") : "not specified";
+    return `Browser/app launch context:\n- Browser QA required: ${qaBrowser.required ? "yes" : "no, unless the diff/AC requires it"}\n- URL: ${launchTarget.url || "not specified"}\n- Ready URL: ${launchTarget.ready_url || "not specified"}\n- Launch command: ${launchTarget.command || "not specified"}\n- Working directory: ${launchTarget.working_directory || "repo root"}\n- Routes to cover: ${routes}\n- Notes: ${launchTarget.notes || "none"}\n- Browser sidecars path: ${qaBrowser.artifactsPath || `.forge/work-items/${dispatch.workItem.id}/artifacts/qa`}`;
+}
+function buildQaPrompt(dispatch, laneSpec) {
+    return `You are Forge's QA lane running locally in a prepared git worktree.
+
+First read and follow the injected QA lane command at .forge/work-items/${dispatch.workItem.id}/spec.md. It defines the required gated QA skill workflow for this run.
+
+Injected QA lane command and work item spec:
+${laneSpec}
 
-Review the implementation for work item ${dispatch.workItem.id}: ${dispatch.workItem.title}
-Run relevant verification when practical and finish with a concise QA verdict.`;
+---
+
+Work item: ${dispatch.workItem.id}
+Title: ${dispatch.workItem.title}
+Description:
+${dispatch.workItem.description || "Not provided."}
+
+Acceptance criteria:
+${dispatch.workItem.acceptanceCriteria || "Not specified."}
+
+Repro steps / scenario:
+${dispatch.workItem.reproSteps || "Not provided."}
+
+System info / environment notes:
+${dispatch.workItem.systemInfo || "Not provided."}
+
+Inspect the validated implementation and Forge artifacts under .forge/work-items/${dispatch.workItem.id}/artifacts/ when present, especially implementation, self-review, and validation evidence.
+${qaBrowserInstruction(dispatch)}
+${qaReworkRetestInstruction(dispatch)}
+QA is read-mostly: inspect code, run commands, and exercise browser/app flows when available, but do not edit product source or tests.
+Record concrete evidence. For UI/browser work, include browser_checks with URLs/routes, actions, observed results, screenshots/traces when available, console errors, failed network requests, and responsive checks. Store browser sidecars under .forge/work-items/${dispatch.workItem.id}/artifacts/qa/.
+Report in-scope defects as actionable findings with repro steps, expected/actual behavior, evidence, likely area, required fix, and required regression.
+Out-of-scope or follow-up issues belong in candidate_bugs instead of blocking the current item.
+
+${completionPromptForQaCycle()}
+
+Finish with a concise summary only after forge.complete_qa_verdict accepts the QA bundle.`;
 }
 function buildConflictResolvePrompt(dispatch, branchName) {
     const targetBranch = dispatch.cycleRun.requestedBase || dispatch.repo.defaultBranch || "main";
@@ -570,6 +1467,46 @@ Keep the original work item intent intact:
 
 Finish with a concise summary of the conflicts resolved and verification performed.`;
 }
+function buildPullRequestCommentsPrompt(dispatch, branchName) {
+    const pr = dispatch.pullRequest;
+    const targetBranch = pr?.targetBranch || dispatch.cycleRun.requestedBase || dispatch.repo.defaultBranch || "main";
+    const prLocator = pr
+        ? `PR #${pr.number}${pr.url ? ` (${pr.url})` : ""}`
+        : "the open pull request for this work item";
+    return `You are Forge's Pull Request Comments lane running locally in a prepared git worktree.
+
+The current branch is the pull request branch ${branchName}. Address unresolved review comments on ${prLocator}.
+PR context:
+- Provider: ${pr?.provider || "not provided"}
+- Source branch: ${pr?.sourceBranch || branchName}
+- Target branch: ${targetBranch}
+- Unresolved comments: ${pr?.unresolvedThreads ?? "unknown"}
+
+Use the PR URL, local git metadata, and available GitHub tooling/auth to inspect unresolved review threads. Make focused code or test changes that answer the feedback, commit the changes, and push ${branchName} to origin.
+If the review thread contents are unavailable, stop with a clear summary of what could not be accessed instead of guessing.
+Keep the original work item intent intact:
+- Work item: ${dispatch.workItem.id}
+- Title: ${dispatch.workItem.title}
+- Acceptance criteria: ${dispatch.workItem.acceptanceCriteria || "Not specified"}
+
+Finish with a concise summary of comments addressed and verification performed.`;
+}
+function isPullRequestCommentsDispatch(dispatch) {
+    return dispatch.cycleRun.kind.trim().toLowerCase() === "pr_comments";
+}
+async function cleanupCompletionTools(completionTools, emit) {
+    try {
+        await completionTools.cleanup();
+    }
+    catch (error) {
+        await emit({
+            role: "runner",
+            kind: "checkpoint",
+            content: `Forge completion tool cleanup failed and was ignored: ${clip(messageFromError(error), 600)}`,
+            eventType: "completion_tools_cleanup_failed"
+        }).catch(() => undefined);
+    }
+}
 async function commitWorktreeChanges(git, worktreePath, workItemId) {
     await git.run(worktreePath, ["add", "-A"]);
     await git.run(worktreePath, ["reset", "--", ".forge"]).catch(() => "");
@@ -586,26 +1523,8 @@ async function commitWorktreeChanges(git, worktreePath, workItemId) {
     const commitSha = (await git.run(worktreePath, ["rev-parse", "HEAD"])).trim();
     return { commitSha, changedFiles };
 }
-function buildImplementationReport(dispatch, command, committed, codexState) {
-    const files = committed.changedFiles.length > 0
-        ? committed.changedFiles.map((file) => `- ${file}`).join("\n")
-        : "- No staged repository files changed; Forge recorded an empty completion commit.";
-    return `# Implementation report
-
-Provider: ${dispatch.execution.provider}
-Model: ${dispatch.execution.model}
-Command: ${formatProviderCliCommand(command)}
-Thread: ${codexState.threadId ?? "n/a"}
-Commit: ${committed.commitSha}
-
-## Changed files
-
-${files}
-
-## Final message
-
-${codexState.finalMessage ?? "Provider CLI completed without a final assistant message."}
-`;
+function messageFromError(error) {
+    return error instanceof Error ? error.message : String(error);
 }
 function clip(value, maxLength) {
     if (value.length <= maxLength) {
@@ -613,27 +1532,227 @@ function clip(value, maxLength) {
     }
     return `${value.slice(0, maxLength)}...`;
 }
-class CodexJsonState {
-    threadId = null;
+function createProviderOutputState(provider) {
+    return provider.trim().toLowerCase() === "cursor"
+        ? new CursorStreamJsonState()
+        : new CodexJsonState();
+}
+class CursorStreamJsonState {
+    sessionId = null;
     finalMessage = null;
-    emittedThread = false;
+    emittedSession = false;
+    accumulatedUsage = null;
+    get sessionLabel() {
+        return this.sessionId ? `session ${this.sessionId}` : null;
+    }
+    get usage() {
+        return this.accumulatedUsage;
+    }
     consume(line) {
-        const trimmed = line.trim();
-        if (!trimmed.startsWith("{")) {
+        const event = parseJsonLine(line);
+        if (!event) {
             return null;
         }
-        let parsed;
-        try {
-            parsed = JSON.parse(trimmed);
+        const type = stringField(event, "type");
+        if (type === "system" && stringField(event, "subtype") === "init") {
+            this.sessionId = stringField(event, "session_id");
+            if (this.sessionId && !this.emittedSession) {
+                this.emittedSession = true;
+                return {
+                    role: "runner",
+                    kind: "checkpoint",
+                    content: `Cursor session started: ${this.sessionId}.`,
+                    eventType: "provider_thread_started"
+                };
+            }
+        }
+        if (type === "assistant") {
+            const text = assistantMessageText(event);
+            if (text) {
+                this.finalMessage = clip(text, 4000);
+                return {
+                    role: "assistant",
+                    kind: "message",
+                    content: this.finalMessage,
+                    eventType: "provider_message"
+                };
+            }
+        }
+        if (type === "tool_call") {
+            const subtype = stringField(event, "subtype");
+            const toolCall = objectField(event, "tool_call");
+            if (subtype === "started") {
+                const summary = formatCursorToolCallStarted(toolCall);
+                if (summary) {
+                    return {
+                        role: "worker",
+                        kind: "checkpoint",
+                        content: summary,
+                        eventType: "provider_tool_call"
+                    };
+                }
+            }
+            if (subtype === "completed") {
+                const completed = formatCursorToolCallCompleted(toolCall);
+                if (completed) {
+                    return {
+                        role: "worker",
+                        kind: completed.kind,
+                        content: completed.content,
+                        eventType: completed.kind === "file_edit" ? "provider_file_edit" : "provider_tool_call"
+                    };
+                }
+            }
+        }
+        if (type === "result" && stringField(event, "subtype") === "success") {
+            const result = stringField(event, "result");
+            if (result) {
+                this.finalMessage = clip(result, 4000);
+            }
+            this.accumulateUsage(event);
         }
-        catch {
+        if (type === "error" || (type === "result" && event.is_error === true)) {
+            return {
+                role: "runner",
+                kind: "error",
+                content: clip(line.trim(), 1000),
+                eventType: "provider_cli_error"
+            };
+        }
+        return null;
+    }
+    accumulateUsage(event) {
+        const usage = objectField(event, "usage");
+        const durationMs = readUsageNumber(event, "duration_ms") || readUsageNumber(event, "duration_api_ms");
+        if (Object.keys(usage).length === 0 && durationMs === 0) {
+            return;
+        }
+        this.accumulatedUsage = addUsage(this.accumulatedUsage ?? emptyUsage("provider_reported"), {
+            inputTokens: readUsageNumber(usage, "inputTokens"),
+            outputTokens: readUsageNumber(usage, "outputTokens"),
+            cacheReadTokens: readUsageNumber(usage, "cacheReadTokens"),
+            cacheCreationTokens: readUsageNumber(usage, "cacheWriteTokens"),
+            providerDurationMs: durationMs > 0 ? durationMs : null,
+            source: "provider_reported"
+        });
+    }
+}
+function formatCursorToolCallStarted(toolCall) {
+    const readArgs = objectField(objectField(toolCall, "readToolCall"), "args");
+    const readPath = stringField(readArgs, "path");
+    if (readPath) {
+        return `Reading ${readPath}`;
+    }
+    const writeArgs = objectField(objectField(toolCall, "writeToolCall"), "args");
+    const writePath = stringField(writeArgs, "path");
+    if (writePath) {
+        return `Writing ${writePath}`;
+    }
+    const shellArgs = objectField(objectField(toolCall, "shellToolCall"), "args");
+    const command = stringField(shellArgs, "command");
+    if (command) {
+        return `Shell command started: ${clip(command, 500)}`;
+    }
+    const fn = objectField(toolCall, "function");
+    const name = stringField(fn, "name");
+    if (name) {
+        return `Tool call started: ${name}`;
+    }
+    return null;
+}
+function formatCursorToolCallCompleted(toolCall) {
+    const writeArgs = objectField(objectField(toolCall, "writeToolCall"), "args");
+    const writePath = stringField(writeArgs, "path");
+    const writeResult = objectField(objectField(objectField(toolCall, "writeToolCall"), "result"), "success");
+    const writtenPath = stringField(writeResult, "path") ?? writePath;
+    if (writtenPath) {
+        return {
+            kind: "file_edit",
+            content: `Wrote ${writtenPath}`
+        };
+    }
+    const readArgs = objectField(objectField(toolCall, "readToolCall"), "args");
+    const readPath = stringField(readArgs, "path");
+    if (readPath) {
+        const readResult = objectField(objectField(objectField(toolCall, "readToolCall"), "result"), "success");
+        const totalLines = readResult.totalLines;
+        const lineSummary = typeof totalLines === "number" ? ` (${totalLines} lines)` : "";
+        return {
+            kind: "checkpoint",
+            content: `Read ${readPath}${lineSummary}`
+        };
+    }
+    const shellArgs = objectField(objectField(toolCall, "shellToolCall"), "args");
+    const command = stringField(shellArgs, "command");
+    if (command) {
+        return {
+            kind: "checkpoint",
+            content: `Shell command completed: ${clip(command, 500)}`
+        };
+    }
+    const fn = objectField(toolCall, "function");
+    const name = stringField(fn, "name");
+    if (name) {
+        return {
+            kind: "checkpoint",
+            content: `Tool call completed: ${name}`
+        };
+    }
+    return null;
+}
+function assistantMessageText(event) {
+    const message = objectField(event, "message");
+    const content = message.content;
+    if (!Array.isArray(content)) {
+        return null;
+    }
+    const parts = content
+        .map((entry) => {
+        if (!entry || typeof entry !== "object") {
             return null;
         }
-        if (!parsed || typeof parsed !== "object") {
+        const block = entry;
+        return stringField(block, "text");
+    })
+        .filter((text) => Boolean(text));
+    if (parts.length === 0) {
+        return null;
+    }
+    return parts.join("");
+}
+function parseJsonLine(line) {
+    const trimmed = line.trim();
+    if (!trimmed.startsWith("{")) {
+        return null;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(trimmed);
+    }
+    catch {
+        return null;
+    }
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+        ? parsed
+        : null;
+}
+class CodexJsonState {
+    threadId = null;
+    finalMessage = null;
+    emittedThread = false;
+    accumulatedUsage = null;
+    get sessionLabel() {
+        return this.threadId ? `thread ${this.threadId}` : null;
+    }
+    get usage() {
+        return this.accumulatedUsage;
+    }
+    consume(line) {
+        const event = parseJsonLine(line);
+        if (!event) {
             return null;
         }
-        const event = parsed;
-        const type = typeof event.type === "string" ? event.type : "";
+        const type = stringField(event, "type") ?? "";
         if (type === "thread.started") {
             this.threadId = stringField(event, "thread_id");
             if (this.threadId && !this.emittedThread) {
@@ -647,6 +1766,7 @@ class CodexJsonState {
             }
         }
         if (type === "turn.completed") {
+            this.accumulateUsage(event);
             return {
                 role: "runner",
                 kind: "checkpoint",
@@ -658,7 +1778,7 @@ class CodexJsonState {
             return {
                 role: "runner",
                 kind: "error",
-                content: clip(trimmed, 1000),
+                content: clip(line.trim(), 1000),
                 eventType: "provider_cli_error"
             };
         }
@@ -692,6 +1812,19 @@ class CodexJsonState {
         }
         return null;
     }
+    accumulateUsage(event) {
+        const usage = objectField(event, "usage");
+        if (Object.keys(usage).length === 0) {
+            return;
+        }
+        this.accumulatedUsage = addUsage(this.accumulatedUsage ?? emptyUsage("provider_reported"), {
+            inputTokens: readUsageNumber(usage, "input_tokens"),
+            outputTokens: readUsageNumber(usage, "output_tokens"),
+            cacheReadTokens: readUsageNumber(usage, "cached_input_tokens"),
+            reasoningOutputTokens: readUsageNumber(usage, "reasoning_output_tokens"),
+            source: "provider_reported"
+        });
+    }
 }
 function objectField(source, key) {
     const value = source[key];
@@ -703,3 +1836,9 @@ function stringField(source, key) {
     const value = source[key];
     return typeof value === "string" && value.trim().length > 0 ? value : null;
 }
+function normalizedString(value) {
+    return value.trim().toLowerCase().replace(/-/g, "_");
+}
+function isNodeError(error) {
+    return error instanceof Error && "code" in error;
+}