@loucompanion/forge-bridge 0.1.1-dev.af36c7fa102b → 0.1.1-dev.ec3c3e74a648

package/dist/cli/cli.service.js

@@ -4,6 +4,7 @@ import os from "node:os";
 import path from "node:path";
 import { createInterface } from "node:readline/promises";
 import { promisify } from "node:util";
+import { resolveCursorAgentDirectLaunch } from "../shared/cursor-agent/cursor-agent.launch.js";
 import { redactSecrets, redactText } from "../shared/redaction/redaction.js";
 import { defaultBridgeServiceConfig, ForgeBridgeService } from "../bridge/bridge.service.js";
 import { addRepoMapping, applyLocalConfigDefaults, providerStatusesFor, readLocalConfigSync, removeRepoMapping, resolveLocalConfigPath, writeLocalConfig } from "./local-config.js";
@@ -633,6 +634,12 @@ function cliProbeCommandsFor(provider) {
     ];
 }
 async function execVersionCommand(probe, timeout = 2000) {
+    const directLaunch = process.platform === "win32"
+        ? await resolveCursorAgentDirectLaunch(probe.command, probe.args)
+        : null;
+    if (directLaunch) {
+        return await execFileAsync(directLaunch.command, [...directLaunch.args], { timeout });
+    }
     try {
         return await execFileAsync(probe.command, probe.args, { timeout });
     }

package/dist/session/phase-completion.d.ts

@@ -19,6 +19,7 @@ export interface CompletionToolServerConfig {
     readonly workItemId: string;
     readonly phase: CompletionPhase;
     readonly producedBy?: string;
+    readonly redactionSecrets?: readonly string[];
 }
 export interface CompletionArtifactReference {
     readonly phase: CompletionPhase;
@@ -52,3 +53,4 @@ export declare function parseCompletionMcpArgs(argv: readonly string[]): {
     readonly ok: false;
     readonly error: string;
 };
+export declare function completionRedactionEnv(secrets: readonly string[]): Readonly<Record<string, string>>;

package/dist/session/phase-completion.js

@@ -2,7 +2,9 @@ import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { redactSecrets } from "../shared/redaction/redaction.js";
 const toolServerName = "forge";
+const completionRedactionSecretsEnv = "FORGE_COMPLETION_REDACTION_SECRETS";
 const phaseFiles = {
     implementation: {
         jsonFileName: "implementation.completeness.json",
@@ -122,12 +124,13 @@ export async function writeCompletionArtifact(config, toolName, input) {
     const payload = asRecord(input, "completion payload");
     validatePayloadShape(phase, payload);
     validateOptionalWorkItemId(payload, config.workItemId);
-    const producedBy = optionalString(payload, "produced_by")
-        ?? optionalString(payload, "producedBy")
+    const redactedPayload = redactSecrets(payload, config.redactionSecrets ?? []);
+    const producedBy = optionalString(redactedPayload, "produced_by")
+        ?? optionalString(redactedPayload, "producedBy")
         ?? config.producedBy
         ?? "forge-completion-tool";
-    const status = requiredString(payload, "status").trim().toLowerCase();
-    const artifactWithoutHash = normalizeArtifactPayload(payload, {
+    const status = requiredString(redactedPayload, "status").trim().toLowerCase();
+    const artifactWithoutHash = normalizeArtifactPayload(redactedPayload, {
         phase,
         workItemId: config.workItemId,
         producedBy,
@@ -139,7 +142,7 @@ export async function writeCompletionArtifact(config, toolName, input) {
         content_hash: contentHash
     };
     const artifactJson = `${JSON.stringify(artifact, null, 2)}\n`;
-    const report = reportMarkdown(payload, phase, status, producedBy, contentHash);
+    const report = reportMarkdown(redactedPayload, phase, status, producedBy, contentHash);
     const artifactPath = completionArtifactJsonPath(config.worktreePath, config.workItemId, phase);
     const reportPath = completionArtifactReportPath(config.worktreePath, config.workItemId, phase);
     await fs.mkdir(path.dirname(artifactPath), { recursive: true });
@@ -171,7 +174,8 @@ export async function readCompletionArtifact(worktreePath, workItemId, phase) {
         verdictJson,
         report,
         producedBy: optionalString(parsed, "produced_by") ?? optionalString(parsed, "producedBy") ?? "forge-completion-tool",
-        status: optionalString(parsed, "status") ?? "unknown"
+        status: optionalString(parsed, "status") ?? "unknown",
+        phase
     };
 }
 export async function runCompletionMcpServer(config) {
@@ -231,10 +235,17 @@ export function parseCompletionMcpArgs(argv) {
             worktreePath: path.resolve(worktreePath),
             workItemId,
             phase,
-            producedBy
+            producedBy,
+            redactionSecrets: parseCompletionRedactionSecrets(process.env[completionRedactionSecretsEnv])
         }
     };
 }
+export function completionRedactionEnv(secrets) {
+    const filtered = secrets.filter((secret) => secret.length > 0);
+    return filtered.length > 0
+        ? { [completionRedactionSecretsEnv]: JSON.stringify(filtered) }
+        : {};
+}
 async function prepareCursorCompletionToolRuntime(worktreePath, runtime) {
     const cursorDir = path.join(worktreePath, ".cursor");
     const configPath = path.join(cursorDir, "mcp.json");
@@ -421,10 +432,12 @@ function validatePayloadShape(phase, payload) {
     if (phase === "implementation") {
         requireArray(payload, "plan");
         requireArray(payload, "changed_files");
-        requireArray(payload, "verification");
+        requireArray(payload, "tests_added_or_updated");
+        requireArray(payload, "docs_added_or_updated");
         requireArray(payload, "acceptance_criteria");
         requireArray(payload, "known_gaps");
         requireField(payload, "next_phase_context");
+        requireImplementationEvidence(payload);
         requireSatisfiedAcceptanceCriteria(payload);
         return;
     }
@@ -450,6 +463,7 @@ function validatePayloadShape(phase, payload) {
     if (payload.ready_for_dev_test !== true) {
         throw new Error("validation pass requires ready_for_dev_test: true.");
     }
+    requirePassingCommands(payload);
     requireSatisfiedAcceptanceCriteria(payload);
 }
 function validateOptionalWorkItemId(payload, expectedWorkItemId) {
@@ -500,6 +514,21 @@ function parseStrictCompletionPhase(value) {
     }
     return null;
 }
+function parseCompletionRedactionSecrets(raw) {
+    if (!raw?.trim()) {
+        return [];
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        if (!Array.isArray(parsed)) {
+            return [];
+        }
+        return parsed.filter((value) => typeof value === "string" && value.length > 0);
+    }
+    catch {
+        return [];
+    }
+}
 function phaseFromToolName(toolName) {
     const normalized = toolName.trim().toLowerCase();
     if (normalized === "forge.complete_implementation" || normalized === "complete_implementation") {
@@ -534,6 +563,47 @@ function requireNonPassEvidence(payload) {
         throw new Error("non-pass completion requires explicit blockers, findings, failures, or known gaps.");
     }
 }
+function requireImplementationEvidence(payload) {
+    const knownGaps = payload.known_gaps;
+    const hasKnownGap = Array.isArray(knownGaps) && knownGaps.length > 0;
+    for (const key of ["changed_files", "tests_added_or_updated", "docs_added_or_updated"]) {
+        const value = payload[key];
+        if (Array.isArray(value) && value.length === 0 && !hasKnownGap) {
+            throw new Error(`${key} is empty; known_gaps must explain why.`);
+        }
+    }
+}
+function requirePassingCommands(payload) {
+    const commands = payload.commands;
+    if (!Array.isArray(commands)) {
+        return;
+    }
+    if (commands.length === 0) {
+        throw new Error("commands must include at least one deterministic validation command.");
+    }
+    for (const [index, command] of commands.entries()) {
+        if (!command || typeof command !== "object" || Array.isArray(command)) {
+            throw new Error(`commands[${index}] must be an object.`);
+        }
+        const record = command;
+        if (typeof record.command !== "string" || record.command.trim().length === 0) {
+            throw new Error(`commands[${index}].command must be a non-empty string.`);
+        }
+        if (typeof record.summary !== "string" || record.summary.trim().length === 0) {
+            throw new Error(`commands[${index}].summary must be a non-empty string.`);
+        }
+        if (typeof record.exit_code !== "number" || !Number.isFinite(record.exit_code)) {
+            throw new Error(`commands[${index}].exit_code must be a finite number.`);
+        }
+        if (record.exit_code !== 0) {
+            throw new Error(`commands[${index}].exit_code must be 0 when status is pass.`);
+        }
+        const status = typeof record.status === "string" ? record.status.trim().toLowerCase() : "";
+        if (status !== "pass") {
+            throw new Error(`commands[${index}].status must be pass.`);
+        }
+    }
+}
 function requireArray(payload, key) {
     if (!Array.isArray(payload[key])) {
         throw new Error(`${key} must be an array.`);

package/dist/session/provider-cli/provider-cli.service.d.ts

@@ -11,6 +11,7 @@ export interface ProviderProcessRunRequest {
     readonly command: string;
     readonly args: readonly string[];
     readonly cwd: string;
+    readonly env?: Readonly<Record<string, string>>;
 }
 export interface ProviderProcessRunResult {
     readonly exitCode: number;

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

@@ -5,8 +5,9 @@ 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 { buildSpecBody, selectLaneCommand } from "../../worktree/artifact-injector.js";
-import { codexMcpConfigArgs, completionPhaseFromDispatch, completionPromptForPhase, prepareCompletionToolRuntime, readCompletionArtifact } from "../phase-completion.js";
+import { codexMcpConfigArgs, completionPhaseFromDispatch, completionPromptForPhase, completionRedactionEnv, expectedCompletionToolName, prepareCompletionToolRuntime, readCompletionArtifact, writeCompletionArtifact } from "../phase-completion.js";
 const fakeWorkerModel = "server-local-fake-worker";
 const execFileAsync = promisify(execFile);
 export class RoutingProviderCliService {
@@ -70,16 +71,17 @@ export class ProcessBackedProviderCliService {
             content: `Forge completion tools configured for ${phase}; provider must call the MCP completion tool before exit.`,
             eventType: "completion_tools_configured"
         });
-        const codexState = new CodexJsonState();
+        const outputState = createProviderOutputState(dispatch.execution.provider);
         let result;
         try {
             result = await this.processRunner.run({
                 command: command.command,
                 args: command.args,
-                cwd: worktree.worktreePath
+                cwd: worktree.worktreePath,
+                env: providerRedactionEnv(dispatch)
             }, {
                 onStdoutLine: async (line) => {
-                    const event = codexState.consume(line);
+                    const event = outputState.consume(line);
                     if (event) {
                         await context.emit(event);
                     }
@@ -96,7 +98,7 @@ 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"
         });
         const committed = await commitWorktreeChanges(this.git, worktree.worktreePath, dispatch.workItem.id);
@@ -104,12 +106,13 @@ export class ProcessBackedProviderCliService {
         if (!completionArtifact) {
             throw new Error(`Provider CLI completed but did not call the Forge ${phase} completion tool.`);
         }
-        if (codexState.finalMessage) {
+        await emitCompletionArtifactRecorded(context.emit, worktree.worktreePath, completionArtifact);
+        if (outputState.finalMessage) {
             await context.emit({
                 role: "assistant",
                 kind: "message",
-                content: codexState.finalMessage,
-                eventType: "implementation_complete"
+                content: outputState.finalMessage,
+                eventType: phaseCompleteEventType(phase)
             });
         }
         else {
@@ -117,7 +120,7 @@ export class ProcessBackedProviderCliService {
                 role: "assistant",
                 kind: "message",
                 content: `${dispatch.execution.provider} CLI completed for ${worktree.branchName}.`,
-                eventType: "implementation_complete"
+                eventType: phaseCompleteEventType(phase)
             });
         }
         return {
@@ -142,14 +145,14 @@ export class ProcessBackedProviderCliService {
             content: `Starting provider CLI QA: ${formatProviderCliCommand(command)}`,
             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: process.cwd()
         }, {
             onStdoutLine: async (line) => {
-                const event = codexState.consume(line);
+                const event = outputState.consume(line);
                 if (event) {
                     await emit(event);
                 }
@@ -162,7 +165,7 @@ export class ProcessBackedProviderCliService {
         await 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"
         });
         return {
@@ -181,14 +184,14 @@ export class ProcessBackedProviderCliService {
             content: `Starting provider CLI 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);
                 }
@@ -203,7 +206,7 @@ export class ProcessBackedProviderCliService {
         await context.emit({
             role: "assistant",
             kind: "message",
-            content: codexState.finalMessage || `${dispatch.execution.provider} CLI resolved merge conflicts for ${worktree.branchName}.`,
+            content: outputState.finalMessage || `${dispatch.execution.provider} CLI resolved merge conflicts for ${worktree.branchName}.`,
             eventType: "conflict_resolve_complete"
         });
         return {
@@ -249,27 +252,26 @@ 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 writeCompletionArtifact({
+            worktreePath: worktree.worktreePath,
+            workItemId: dispatch.workItem.id,
+            phase,
+            producedBy: "forge-bridge",
+            redactionSecrets: exactRedactionSecrets(dispatch)
+        }, expectedCompletionToolName(phase), deterministicCompletionPayload(phase, dispatch, changesetBody));
+        const completionArtifact = await readCompletionArtifact(worktree.worktreePath, dispatch.workItem.id, phase);
+        if (!completionArtifact) {
+            throw new Error(`Deterministic provider did not produce the Forge ${phase} completion artifact.`);
+        }
+        await emitCompletionArtifactRecorded(context.emit, worktree.worktreePath, completionArtifact);
         await context.emit({
             role: "assistant",
             kind: "message",
-            content: "Implementation complete. forge-bridge produced deterministic phase artifacts.",
-            eventType: "implementation_complete"
+            content: `${phase.replace(/_/g, " ")} complete. forge-bridge produced deterministic phase artifacts.`,
+            eventType: phaseCompleteEventType(phase)
         });
         return {
-            summary: `forge-bridge completed ${worktree.branchName}.`,
+            summary: `forge-bridge completed ${worktree.branchName} (${phase}).`,
             spec: {
                 repoPath: worktree.worktreePath,
                 path: specPath,
@@ -277,14 +279,7 @@ export class DeterministicProviderCliService {
                 producedBy: "forge-lane-command",
                 status: "approved"
             },
-            artifact: {
-                repoPath: worktree.worktreePath,
-                path: artifactPath,
-                verdictJson,
-                report,
-                producedBy: "forge-bridge",
-                status: "pass"
-            }
+            artifact: completionArtifact
         };
     }
     async runQa(dispatch, emit) {
@@ -318,12 +313,114 @@ export class DeterministicProviderCliService {
         };
     }
 }
+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
+    };
+}
+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"
+    });
+}
+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] : [];
+}
 export class StreamingProviderProcessRunner {
     async run(request, handlers = {}, signal) {
         const launch = await resolveProviderProcessLaunch(request.command, request.args);
         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
             });
@@ -392,6 +489,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 };
 }
@@ -399,10 +500,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/));
@@ -411,18 +508,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())
@@ -519,10 +604,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 };
     }
@@ -611,27 +698,203 @@ 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;
+    get sessionLabel() {
+        return this.sessionId ? `session ${this.sessionId}` : null;
+    }
     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"
+                };
+            }
         }
-        catch {
+        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);
+            }
+        }
+        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;
+    }
+}
+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;
+    get sessionLabel() {
+        return this.threadId ? `thread ${this.threadId}` : null;
+    }
+    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) {
@@ -656,7 +919,7 @@ class CodexJsonState {
             return {
                 role: "runner",
                 kind: "error",
-                content: clip(trimmed, 1000),
+                content: clip(line.trim(), 1000),
                 eventType: "provider_cli_error"
             };
         }

package/dist/session/provider-cli/provider-cli.types.d.ts

@@ -10,4 +10,5 @@ export interface ProviderCliRunResult {
     readonly summary: string;
     readonly spec?: RunnerDispatchSpec | null;
     readonly artifact?: RunnerDispatchArtifact | null;
+    readonly artifacts?: readonly RunnerDispatchArtifact[] | null;
 }

package/dist/session/session.service.js

@@ -65,13 +65,15 @@ export class BridgeSessionService {
                         emit,
                         signal
                     });
+            const phaseArtifacts = run.artifacts?.length ? run.artifacts : run.artifact ? [run.artifact] : [];
             return redactSecrets({
                 schemaVersion: 1,
                 exitCode: 0,
                 summary: run.summary,
                 events,
                 spec: run.spec ?? null,
-                artifact: run.artifact ?? null
+                artifact: run.artifact ?? null,
+                artifacts: phaseArtifacts
             }, redactionSecrets);
         }
         finally {

package/dist/session/session.types.d.ts

@@ -18,6 +18,7 @@ export interface DispatchResolvedArtifact {
     readonly scope: string;
     readonly body: string;
     readonly contentHash: string;
+    readonly version: number;
     readonly lane?: string | null;
     readonly event?: string | null;
 }
@@ -101,6 +102,7 @@ export interface RunnerDispatchArtifact {
     readonly report: string;
     readonly producedBy: string;
     readonly status: string;
+    readonly phase?: string | null;
 }
 export interface RunOnceResultPacket {
     readonly schemaVersion: 1;
@@ -109,6 +111,7 @@ export interface RunOnceResultPacket {
     readonly events: readonly RunnerDispatchEvent[];
     readonly spec?: RunnerDispatchSpec | null;
     readonly artifact?: RunnerDispatchArtifact | null;
+    readonly artifacts?: readonly RunnerDispatchArtifact[] | null;
 }
 export interface RunnerEventLine {
     readonly type: "runner_event";

package/dist/session/session.types.js

@@ -153,6 +153,7 @@ function parseArtifacts(value) {
             scope: requiredString(artifact, "scope"),
             body: optionalString(artifact, "body") ?? "",
             contentHash: requiredString(artifact, "contentHash"),
+            version: optionalPositiveInteger(artifact, "version") ?? 1,
             lane: optionalString(artifact, "lane"),
             event: optionalString(artifact, "event")
         };
@@ -188,6 +189,16 @@ function requiredBoolean(source, key) {
     }
     return value;
 }
+function optionalPositiveInteger(source, key) {
+    const value = source[key];
+    if (value === undefined || value === null) {
+        return null;
+    }
+    if (typeof value !== "number" || !Number.isInteger(value) || value < 1) {
+        throw new Error(`${key} must be a positive integer when provided.`);
+    }
+    return value;
+}
 function requiredNumber(source, key) {
     const value = source[key];
     if (typeof value !== "number" || !Number.isFinite(value)) {

package/dist/shared/cursor-agent/cursor-agent.launch.d.ts

@@ -0,0 +1,9 @@
+export interface CursorAgentLaunch {
+    readonly command: string;
+    readonly args: readonly string[];
+}
+export declare function isCursorAgentCommand(command: string): boolean;
+export declare function resolveCursorAgentDirectLaunch(command: string, args: readonly string[]): Promise<CursorAgentLaunch | null>;
+export declare function findLatestCursorAgentVersionDir(versionsRoot: string): Promise<string | null>;
+export declare function compareCursorAgentVersionDirNames(left: string, right: string): number;
+export declare function parseCursorAgentVersionSortKey(name: string): number;

package/dist/shared/cursor-agent/cursor-agent.launch.js

@@ -0,0 +1,66 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+const cursorAgentVersionDirPattern = /^\d{4}\.\d{1,2}\.\d{1,2}-.+/;
+export function isCursorAgentCommand(command) {
+    const normalized = command.trim().toLowerCase();
+    return normalized === "cursor-agent" || normalized === "agent";
+}
+export async function resolveCursorAgentDirectLaunch(command, args) {
+    if (!isCursorAgentCommand(command)) {
+        return null;
+    }
+    const localAppData = process.env.LOCALAPPDATA;
+    if (!localAppData) {
+        return null;
+    }
+    const versionDir = await findLatestCursorAgentVersionDir(path.join(localAppData, "cursor-agent", "versions"));
+    if (!versionDir) {
+        return null;
+    }
+    const nodePath = path.join(versionDir, "node.exe");
+    const indexPath = path.join(versionDir, "index.js");
+    if (!(await fileExists(nodePath)) || !(await fileExists(indexPath))) {
+        return null;
+    }
+    return {
+        command: nodePath,
+        args: [indexPath, ...args]
+    };
+}
+export async function findLatestCursorAgentVersionDir(versionsRoot) {
+    let entries;
+    try {
+        entries = await fs.readdir(versionsRoot);
+    }
+    catch {
+        return null;
+    }
+    const latestName = entries
+        .filter((name) => cursorAgentVersionDirPattern.test(name))
+        .sort(compareCursorAgentVersionDirNames)
+        .at(-1);
+    return latestName ? path.join(versionsRoot, latestName) : null;
+}
+export function compareCursorAgentVersionDirNames(left, right) {
+    const leftKey = parseCursorAgentVersionSortKey(left);
+    const rightKey = parseCursorAgentVersionSortKey(right);
+    if (leftKey !== rightKey) {
+        return leftKey - rightKey;
+    }
+    return left.localeCompare(right);
+}
+export function parseCursorAgentVersionSortKey(name) {
+    const datePart = name.split("-")[0] ?? "";
+    const parts = datePart.split(".");
+    if (parts.length !== 3) {
+        return 0;
+    }
+    const year = parts[0] ?? "";
+    const month = (parts[1] ?? "").padStart(2, "0");
+    const day = (parts[2] ?? "").padStart(2, "0");
+    const numeric = Number(`${year}${month}${day}`);
+    return Number.isFinite(numeric) ? numeric : 0;
+}
+async function fileExists(inputPath) {
+    return fs.stat(inputPath).then((stat) => stat.isFile()).catch(() => false);
+}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const forgeBridgeVersion = "0.1.1-dev.af36c7fa102b";
+export declare const forgeBridgeVersion = "0.1.1-dev.ec3c3e74a648";

package/dist/version.js

@@ -1 +1 @@
-export const forgeBridgeVersion = "0.1.1-dev.af36c7fa102b";
+export const forgeBridgeVersion = "0.1.1-dev.ec3c3e74a648";

package/dist/worktree/artifact-injector.js

@@ -29,10 +29,7 @@ export function selectLaneCommand(artifacts, lane, phase) {
     return artifacts.find((artifact) => normalizedArtifactKind(artifact.kind) === "command" && artifact.slug.trim().toLowerCase() === slug);
 }
 export function resolveCommandSlug(lane, phase) {
-    const normalizedPhase = phase.trim().toLowerCase();
-    if (normalizedPhase === "self_review") {
-        return "self-review-prompt";
-    }
+    const normalizedPhase = phase.trim().toLowerCase().replace(/-/g, "_");
     if (normalizedPhase === "rework") {
         return "rework-prompt";
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loucompanion/forge-bridge",
-  "version": "0.1.1-dev.af36c7fa102b",
+  "version": "0.1.1-dev.ec3c3e74a648",
   "description": "Forge runner bridge CLI for connecting local developer machines to Forge dispatch.",
   "license": "UNLICENSED",
   "type": "module",