@loucompanion/forge-bridge 0.1.3-dev.f2b8822ce953 → 0.1.3-dev.fbe15023cdfe

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

@@ -1,19 +1,208 @@
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 import { GitClient } from "../../shared/git/git.js";
 import { buildSpecBody, selectLaneCommand } from "../../worktree/artifact-injector.js";
 import { completionPhaseFromDispatch, prepareCompletionToolRuntime, readCompletionArtifact, usesDebugCycleCompletion, usesDevelopCycleCompletion } from "../phase-completion.js";
 import { cleanupCompletionTools, commitWorktreeChanges, completionPhaseFromArtifact, emitArchitectStructuredEvents, emitCompletionArtifactRecorded, emitDecomposeGateArtifacts, emitDraftGateArtifacts, emitPhaseCompletionEvent, emitPhaseGateEvents, emitQaArtifactRecorded, emitQaStructuredEvents, enforceQaBrowserLaunchTargetGate, LiveArchitectArtifactEmitter, LiveCompletionArtifactEmitter, LiveQaArtifactEmitter, readCompletionArtifactsForRun, readQaCompletionArtifactBundle, summarizeStderr, waitForCompletionArtifact } from "./provider-cli.artifacts.js";
 import { DeterministicProviderCliService } from "./provider-cli.deterministic.js";
-import { buildArchitectPrompt, buildConflictResolvePrompt, buildDebugCyclePrompt, buildDevelopCyclePrompt, buildDraftPrompt, buildDraftSpec, buildImplementationPrompt, buildProviderCliCommand, buildPullRequestCommentsPrompt, buildQaPrompt, formatProviderCliCommand, isDecomposeDraftDispatch, isPullRequestCommentsDispatch } from "./provider-cli.prompts.js";
+import { buildArchitectPrompt, buildConflictResolvePrompt, buildDebugCyclePrompt, buildDevelopCyclePrompt, buildDraftPrompt, buildDraftSpec, buildImplementationPrompt, buildProviderCliPrompt, buildProviderCliCommand, durableDraftInput, buildPullRequestCheckRepairPrompt, buildPullRequestCommentsPrompt, buildQaPrompt, formatProviderCliCommandForCheckpoint, isDecomposeDraftDispatch, isPullRequestCheckRepairDispatch, isPullRequestCommentsDispatch } from "./provider-cli.prompts.js";
 import { StreamingProviderProcessRunner } from "./provider-cli.process.js";
 import { emitProviderUsageEvent, providerProcessEnv } from "./provider-cli.runtime.js";
 import { clip, createProviderOutputState, parseJsonLine } from "./provider-output-state.js";
+import { writeCiRepairReadinessManifest } from "./ci-repair-readiness.js";
 export { DeterministicProviderCliService } from "./provider-cli.deterministic.js";
-export { buildProviderCliCommand, codexSandboxModeForPlatform, formatProviderCliCommand } from "./provider-cli.prompts.js";
-export { buildProviderChildEnvironment, chooseWindowsCommandCandidate, StreamingProviderProcessRunner } from "./provider-cli.process.js";
+export { buildProviderCliCommand, codexSandboxModeForPlatform, formatProviderCliCommand, formatProviderCliCommandForCheckpoint } from "./provider-cli.prompts.js";
+export { buildProviderChildEnvironment, chooseWindowsCommandCandidate, resolveCodexNpmDirectLaunch, resolvePackageManagerDirectLaunch, resolveWindowsCommandFromPath, StreamingProviderProcessRunner } from "./provider-cli.process.js";
 export { buildWindowsLaunchCommand } from "../../shared/process/windows-launch.js";
+async function pushWorktreeBranch(git, worktreePath, branchName, emit) {
+    try {
+        await git.run(worktreePath, ["push", "origin", `HEAD:${branchName}`]);
+        return;
+    }
+    catch (err) {
+        if (!isNonFastForwardPushError(err)) {
+            throw err;
+        }
+        await emit?.({
+            role: "runner",
+            kind: "checkpoint",
+            content: `Remote branch ${branchName} moved before push; fetching latest and rebasing local changes.`,
+            eventType: "worktree_branch_push_rebase"
+        });
+        try {
+            await git.run(worktreePath, ["fetch", "origin", remoteTrackingRefspec(branchName)]);
+            await git.run(worktreePath, ["rebase", `refs/remotes/origin/${branchName}`]);
+            await git.run(worktreePath, ["push", "origin", `HEAD:${branchName}`]);
+        }
+        catch (retryErr) {
+            throw new Error(`git push origin HEAD:${branchName} was rejected because the remote branch moved, and automatic fetch/rebase failed: ${errorMessage(retryErr)}`, { cause: retryErr });
+        }
+    }
+}
+function providerOwnsBranchPublication(context) {
+    return context.dispatch.sandbox?.executionMode !== "docker";
+}
+function remoteTrackingRefspec(branchName) {
+    return `refs/heads/${branchName}:refs/remotes/origin/${branchName}`;
+}
+function isNonFastForwardPushError(err) {
+    const message = errorMessage(err).toLowerCase();
+    return message.includes("non-fast-forward")
+        || message.includes("fetch first")
+        || message.includes("tip of your current branch is behind")
+        || message.includes("updates were rejected because the tip of your current branch is behind")
+        || message.includes("stale info");
+}
+function errorMessage(err) {
+    return err instanceof Error ? err.message : String(err);
+}
+const defaultProviderToolHeartbeatIntervalMs = 60_000;
+const defaultManagedVerificationProgressIntervalMs = 30_000;
+export class ManagedVerificationProgressEmitter {
+    logDirectory;
+    emit;
+    intervalMs;
+    timer = null;
+    lastSignature = null;
+    constructor(logDirectory, emit, intervalMs = defaultManagedVerificationProgressIntervalMs) {
+        this.logDirectory = logDirectory;
+        this.emit = emit;
+        this.intervalMs = intervalMs;
+    }
+    start() {
+        if (!this.logDirectory?.trim() || this.timer)
+            return;
+        this.timer = setInterval(() => {
+            void this.scan().catch(() => undefined);
+        }, Math.max(1, this.intervalMs));
+        void this.scan().catch(() => undefined);
+    }
+    async stop() {
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+        await this.scan().catch(() => undefined);
+    }
+    async scan() {
+        if (!this.logDirectory?.trim())
+            return;
+        const directory = path.join(this.logDirectory, "managed-commands");
+        const names = await fs.readdir(directory).catch(() => []);
+        const snapshots = await Promise.all(names
+            .filter(name => name.endsWith(".receipt.json"))
+            .map(async (name) => parseManagedVerificationSnapshot(path.join(directory, name))));
+        const current = snapshots
+            .filter((entry) => entry !== null)
+            .sort((left, right) => right.elapsedMs - left.elapsedMs)[0];
+        if (!current)
+            return;
+        const elapsedMs = current.startedAt
+            ? Math.max(current.elapsedMs ?? 0, Date.now() - Date.parse(current.startedAt))
+            : current.elapsedMs;
+        const progressBucket = elapsedMs === null ? "none" : Math.floor(elapsedMs / this.intervalMs);
+        const signature = `${current.commandId}:${current.status}:${current.outputRevision ?? "none"}:${progressBucket}`;
+        if (signature === this.lastSignature)
+            return;
+        const firstObservation = this.lastSignature === null;
+        this.lastSignature = signature;
+        const terminal = ["pass", "fail", "timed_out", "timeout_termination_failed", "runner_error"].includes(current.status);
+        const elapsed = elapsedMs === null ? "an unknown duration" : formatElapsed(elapsedMs);
+        const outputTail = current.stderrTail || current.stdoutTail;
+        await this.emit({
+            role: "runner",
+            kind: terminal && current.status !== "pass" ? "error" : "status",
+            content: terminal
+                ? `Managed verification ${current.status} after ${elapsed}${outputTail ? `: ${clip(outputTail, 600)}` : "."}`
+                : firstObservation
+                    ? `QA is waiting on managed verification ${current.commandId}; Forge will keep supervising it while the provider waits.`
+                    : `Managed verification is still running after ${elapsed}${outputTail ? `: ${clip(outputTail, 600)}` : "."}`,
+            eventType: terminal ? "verification_completed" : firstObservation ? "verification_waiting" : "verification_progress",
+            data: JSON.stringify({
+                command_id: current.commandId,
+                status: current.status,
+                elapsed_ms: elapsedMs,
+                output_revision: current.outputRevision,
+                last_output_at: current.lastOutputAt,
+            }),
+        });
+    }
+}
+async function parseManagedVerificationSnapshot(receiptPath) {
+    try {
+        const receipt = JSON.parse(await fs.readFile(receiptPath, "utf8"));
+        const commandId = typeof receipt.command_id === "string" ? receipt.command_id : null;
+        const status = typeof receipt.status === "string" ? receipt.status : null;
+        if (!commandId || !status)
+            return null;
+        return {
+            commandId,
+            status,
+            elapsedMs: typeof receipt.elapsed_ms === "number" ? receipt.elapsed_ms : null,
+            startedAt: typeof receipt.started_at === "string" ? receipt.started_at : null,
+            outputRevision: typeof receipt.output_revision === "number" ? receipt.output_revision : null,
+            lastOutputAt: typeof receipt.last_output_at === "string" ? receipt.last_output_at : null,
+            stdoutTail: tail(typeof receipt.stdout === "string" ? receipt.stdout : ""),
+            stderrTail: tail(typeof receipt.stderr === "string" ? receipt.stderr : ""),
+        };
+    }
+    catch {
+        return null;
+    }
+}
+function tail(value) {
+    return value.trim().split(/\r?\n/u).slice(-4).join("\n");
+}
+function formatElapsed(milliseconds) {
+    const seconds = Math.max(0, Math.round(milliseconds / 1000));
+    const minutes = Math.floor(seconds / 60);
+    return minutes > 0 ? `${minutes}m ${seconds % 60}s` : `${seconds}s`;
+}
+class ProviderToolActivityHeartbeat {
+    outputState;
+    emit;
+    intervalMs;
+    timer = null;
+    constructor(outputState, emit, intervalMs) {
+        this.outputState = outputState;
+        this.emit = emit;
+        this.intervalMs = intervalMs;
+    }
+    async consume(line) {
+        const events = this.outputState.consume(line);
+        this.sync();
+        for (const event of events) {
+            await this.emit(event);
+        }
+    }
+    stop() {
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+    }
+    sync() {
+        if (!this.outputState.hasActiveToolCall) {
+            this.stop();
+            return;
+        }
+        if (this.timer) {
+            return;
+        }
+        this.timer = setInterval(() => {
+            if (!this.outputState.hasActiveToolCall) {
+                this.stop();
+                return;
+            }
+            void this.emit({
+                role: "runner",
+                kind: "status",
+                content: "A supervised provider tool is still running.",
+                eventType: "provider_tool_heartbeat",
+            }).catch(() => undefined);
+        }, Math.max(1, this.intervalMs));
+    }
+}
 const fakeWorkerModel = "server-local-fake-worker";
 export class RoutingProviderCliService {
     realProvider;
@@ -32,6 +221,11 @@ export class RoutingProviderCliService {
             ? await this.deterministicProvider.runArchitect(context)
             : await this.realProvider.runArchitect(context);
     }
+    async runCiRepair(context) {
+        return isFakeWorkerModel(context.dispatch.execution.model)
+            ? await this.deterministicProvider.runCiRepair(context)
+            : await this.realProvider.runCiRepair(context);
+    }
     async runConflictResolve(context) {
         return isFakeWorkerModel(context.dispatch.execution.model)
             ? await this.deterministicProvider.runConflictResolve(context)
@@ -51,34 +245,36 @@ export class RoutingProviderCliService {
 export class ProcessBackedProviderCliService {
     processRunner;
     git;
-    constructor(processRunner = new StreamingProviderProcessRunner(), git = new GitClient()) {
+    providerToolHeartbeatIntervalMs;
+    constructor(processRunner = new StreamingProviderProcessRunner(), git = new GitClient(), providerToolHeartbeatIntervalMs = defaultProviderToolHeartbeatIntervalMs) {
         this.processRunner = processRunner;
         this.git = git;
+        this.providerToolHeartbeatIntervalMs = providerToolHeartbeatIntervalMs;
     }
     async runDraft(context) {
         const { dispatch } = context;
         if (!dispatch.draft) {
             throw new Error("Draft dispatch context is missing.");
         }
-        const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "forge-bridge-draft-"));
-        const draftWorktree = {
-            repoPath: tempDir,
-            worktreePath: tempDir,
-            branchName: "draft",
-            baseBranch: dispatch.cycleRun.baseBranch || dispatch.repo.defaultBranch || "draft",
-            cleanupWorktrees: true
-        };
-        const metadataRoot = path.join(tempDir, ".forge", "work-items", dispatch.workItem.id);
+        const { worktree } = context;
+        const metadataRoot = path.join(worktree.worktreePath, ".forge", "work-items", dispatch.workItem.id);
         await fs.mkdir(metadataRoot, { recursive: true });
-        await fs.writeFile(path.join(metadataRoot, "draft-input.json"), JSON.stringify(dispatch.draft, null, 2) + "\n", "utf8");
+        await fs.writeFile(path.join(metadataRoot, "draft-input.json"), JSON.stringify(durableDraftInput(dispatch), null, 2) + "\n", "utf8");
         await fs.writeFile(path.join(metadataRoot, "spec.md"), buildDraftSpec(dispatch), "utf8");
+        const stagedAttachments = await stageDraftAttachments(dispatch, metadataRoot);
         const decomposeDraft = isDecomposeDraftDispatch(dispatch);
-        const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree: draftWorktree, phase: decomposeDraft ? "decompose" : "draft" });
+        const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: decomposeDraft ? "decompose" : "draft", runtimeEnvironment: context.runtimeEnvironment });
+        const draftPrompt = buildDraftPrompt(dispatch, { attachmentReferences: stagedAttachments.textReferences });
+        const providerPrompt = buildProviderCliPrompt(dispatch, draftPrompt, context.runtimeEnvironment);
+        const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
         const command = buildProviderCliCommand(dispatch, {
-            worktreePath: tempDir,
-            prompt: buildDraftPrompt(dispatch),
+            worktreePath: worktree.worktreePath,
+            prompt: draftPrompt,
+            promptFromStdin: pipePromptToStdin,
             completionTools: completionTools ?? undefined,
-            skipGitRepoCheck: true
+            skipGitRepoCheck: false,
+            imagePaths: stagedAttachments.imagePaths,
+            runtimeEnvironment: context.runtimeEnvironment
         });
         const draftArtifactSlugs = dispatch.artifacts
             .filter((artifact) => artifact.scope === "operational" && ["command", "skill", "hook"].includes(artifact.kind))
@@ -92,8 +288,8 @@ export class ProcessBackedProviderCliService {
         await context.emit({
             role: "runner",
             kind: "checkpoint",
-            content: `Starting provider CLI Draft: ${formatProviderCliCommand(command)}`,
-            eventType: "provider_cli_started"
+            content: `Starting provider CLI Draft: ${formatProviderCliCommandForCheckpoint(command)}`,
+            eventType: "provider_cli_starting"
         });
         await context.emit({
             role: "runner",
@@ -104,6 +300,7 @@ export class ProcessBackedProviderCliService {
             eventType: "completion_tools_configured"
         });
         const outputState = createProviderOutputState(dispatch.execution.provider);
+        const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
         try {
             const providerCancellation = new AbortController();
             const abortProvider = () => providerCancellation.abort();
@@ -114,16 +311,23 @@ export class ProcessBackedProviderCliService {
                 context.signal?.addEventListener("abort", abortProvider, { once: true });
             }
             try {
-                const runPromise = this.processRunner.run({
+                const runPromise = (context.processRunner ?? this.processRunner).run({
                     command: command.command,
                     args: command.args,
-                    cwd: tempDir,
-                    env: providerProcessEnv(dispatch)
+                    cwd: worktree.worktreePath,
+                    env: providerProcessEnv(dispatch, context.runtimeEnvironment),
+                    stdin: pipePromptToStdin ? providerPrompt : undefined
                 }, {
+                    onStarted: async () => {
+                        await context.emit({
+                            role: "runner",
+                            kind: "checkpoint",
+                            content: "Provider CLI Draft is supervised and ready.",
+                            eventType: "provider_cli_started"
+                        });
+                    },
                     onStdoutLine: async (line) => {
-                        for (const event of outputState.consume(line)) {
-                            await context.emit(event);
-                        }
+                        await toolHeartbeat.consume(line);
                     }
                 }, providerCancellation.signal);
                 const artifactWaitCancellation = new AbortController();
@@ -134,7 +338,7 @@ export class ProcessBackedProviderCliService {
                 else {
                     context.signal?.addEventListener("abort", abortArtifactWait, { once: true });
                 }
-                const artifactWaitPromise = waitForCompletionArtifact(tempDir, dispatch.workItem.id, decomposeDraft ? "decompose" : "draft", artifactWaitCancellation.signal);
+                const artifactWaitPromise = waitForCompletionArtifact(worktree.worktreePath, dispatch.workItem.id, decomposeDraft ? "decompose" : "draft", artifactWaitCancellation.signal);
                 let result;
                 let earlyProposalArtifact = null;
                 try {
@@ -168,8 +372,8 @@ export class ProcessBackedProviderCliService {
                 });
                 await emitProviderUsageEvent(context.emit, dispatch, outputState);
                 if (decomposeDraft) {
-                    await emitDecomposeGateArtifacts(context.emit, tempDir, dispatch.workItem.id);
-                    const proposalArtifact = earlyProposalArtifact ?? await readCompletionArtifact(tempDir, dispatch.workItem.id, "decompose");
+                    await emitDecomposeGateArtifacts(context.emit, worktree.worktreePath, dispatch.workItem.id);
+                    const proposalArtifact = earlyProposalArtifact ?? await readCompletionArtifact(worktree.worktreePath, dispatch.workItem.id, "decompose");
                     if (!proposalArtifact) {
                         throw new Error("Provider CLI Decompose completed but did not call forge.complete_decompose_proposal.");
                     }
@@ -191,8 +395,8 @@ export class ProcessBackedProviderCliService {
                         artifacts: [proposalArtifact]
                     };
                 }
-                await emitDraftGateArtifacts(context.emit, tempDir, dispatch.workItem.id);
-                const proposalArtifact = earlyProposalArtifact ?? await readCompletionArtifact(tempDir, dispatch.workItem.id, "draft");
+                await emitDraftGateArtifacts(context.emit, worktree.worktreePath, dispatch.workItem.id);
+                const proposalArtifact = earlyProposalArtifact ?? await readCompletionArtifact(worktree.worktreePath, dispatch.workItem.id, "draft");
                 if (!proposalArtifact) {
                     throw new Error("Provider CLI Draft completed but did not call forge.complete_draft_proposal.");
                 }
@@ -219,8 +423,8 @@ export class ProcessBackedProviderCliService {
             }
         }
         finally {
+            toolHeartbeat.stop();
             await cleanupCompletionTools(completionTools, context.emit);
-            await fs.rm(tempDir, { recursive: true, force: true });
         }
     }
     async runImplementation(context) {
@@ -238,21 +442,26 @@ export class ProcessBackedProviderCliService {
         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 completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase, runtimeEnvironment: context.runtimeEnvironment });
+        const implementationPrompt = debugCycle
+            ? buildDebugCyclePrompt(dispatch, phase)
+            : developCycle
+                ? buildDevelopCyclePrompt(dispatch, phase)
+                : buildImplementationPrompt(dispatch, phase);
+        const providerPrompt = buildProviderCliPrompt(dispatch, implementationPrompt, context.runtimeEnvironment);
+        const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
         const command = buildProviderCliCommand(dispatch, {
             worktreePath: worktree.worktreePath,
-            prompt: debugCycle
-                ? buildDebugCyclePrompt(dispatch, phase)
-                : developCycle
-                    ? buildDevelopCyclePrompt(dispatch, phase)
-                    : buildImplementationPrompt(dispatch, phase),
-            completionTools
+            prompt: implementationPrompt,
+            promptFromStdin: pipePromptToStdin,
+            completionTools,
+            runtimeEnvironment: context.runtimeEnvironment
         });
         await context.emit({
             role: "runner",
             kind: "checkpoint",
-            content: `Starting provider CLI: ${formatProviderCliCommand(command)} in ${worktree.worktreePath}`,
-            eventType: "provider_cli_started"
+            content: `Starting provider CLI: ${formatProviderCliCommandForCheckpoint(command)} in ${worktree.worktreePath}`,
+            eventType: "provider_cli_starting"
         });
         await context.emit({
             role: "runner",
@@ -265,24 +474,33 @@ export class ProcessBackedProviderCliService {
             eventType: "completion_tools_configured"
         });
         const outputState = createProviderOutputState(dispatch.execution.provider);
+        const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
         const liveCompletionEvents = new LiveCompletionArtifactEmitter(worktree.worktreePath, dispatch.workItem.id, phase, developCycle, debugCycle, context.emit);
         let result;
         try {
             liveCompletionEvents.start();
-            result = await this.processRunner.run({
+            result = await (context.processRunner ?? this.processRunner).run({
                 command: command.command,
                 args: command.args,
                 cwd: worktree.worktreePath,
-                env: providerProcessEnv(dispatch)
+                env: providerProcessEnv(dispatch, context.runtimeEnvironment),
+                stdin: pipePromptToStdin ? providerPrompt : undefined
             }, {
+                onStarted: async () => {
+                    await context.emit({
+                        role: "runner",
+                        kind: "checkpoint",
+                        content: "Provider CLI is supervised and ready.",
+                        eventType: "provider_cli_started"
+                    });
+                },
                 onStdoutLine: async (line) => {
-                    for (const event of outputState.consume(line)) {
-                        await context.emit(event);
-                    }
+                    await toolHeartbeat.consume(line);
                 }
             }, context.signal);
         }
         finally {
+            toolHeartbeat.stop();
             await liveCompletionEvents.stop();
             await cleanupCompletionTools(completionTools, context.emit);
         }
@@ -298,8 +516,8 @@ export class ProcessBackedProviderCliService {
         });
         await emitProviderUsageEvent(context.emit, dispatch, outputState);
         const committed = await commitWorktreeChanges(this.git, worktree.worktreePath, dispatch.workItem.id);
-        if (developCycle || debugCycle || phase === "implementation") {
-            await this.git.run(worktree.worktreePath, ["push", "origin", `HEAD:${worktree.branchName}`]);
+        if ((developCycle || debugCycle || phase === "implementation") && providerOwnsBranchPublication(context)) {
+            await pushWorktreeBranch(this.git, worktree.worktreePath, worktree.branchName, context.emit);
             await context.emit({
                 role: "runner",
                 kind: "checkpoint",
@@ -357,18 +575,23 @@ export class ProcessBackedProviderCliService {
         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: "pending_approval", produced_by: "forge-lane-command" }) + "\n", "utf8");
-        const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "architect" });
+        const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "architect", runtimeEnvironment: context.runtimeEnvironment });
+        const architectPrompt = buildArchitectPrompt(dispatch);
+        const providerPrompt = buildProviderCliPrompt(dispatch, architectPrompt, context.runtimeEnvironment);
+        const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
         const command = buildProviderCliCommand(dispatch, {
             worktreePath: worktree.worktreePath,
-            prompt: buildArchitectPrompt(dispatch),
-            completionTools
+            prompt: architectPrompt,
+            promptFromStdin: pipePromptToStdin,
+            completionTools,
+            runtimeEnvironment: context.runtimeEnvironment
         });
-        const commandText = formatProviderCliCommand(command);
+        const commandText = formatProviderCliCommandForCheckpoint(command);
         await context.emit({
             role: "runner",
             kind: "checkpoint",
             content: `Starting provider CLI Architect: ${commandText} in ${worktree.worktreePath}`,
-            eventType: "provider_cli_started"
+            eventType: "provider_cli_starting"
         });
         await context.emit({
             role: "runner",
@@ -377,24 +600,31 @@ export class ProcessBackedProviderCliService {
             eventType: "completion_tools_configured"
         });
         const outputState = createProviderOutputState(dispatch.execution.provider);
+        const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
         const liveArchitectEvents = new LiveArchitectArtifactEmitter(worktree.worktreePath, dispatch.workItem.id, context.emit);
         let result;
         try {
             liveArchitectEvents.start();
-            result = await this.processRunner.run({
+            result = await (context.processRunner ?? this.processRunner).run({
                 command: command.command,
                 args: command.args,
                 cwd: worktree.worktreePath,
-                env: providerProcessEnv(dispatch)
+                env: providerProcessEnv(dispatch, context.runtimeEnvironment),
+                stdin: pipePromptToStdin ? providerPrompt : undefined
             }, {
-                onStdoutLine: async (line) => {
-                    for (const event of outputState.consume(line)) {
-                        await context.emit(event);
-                    }
-                }
+                onStarted: async () => {
+                    await context.emit({
+                        role: "runner",
+                        kind: "checkpoint",
+                        content: "Provider CLI Architect is supervised and ready.",
+                        eventType: "provider_cli_started"
+                    });
+                },
+                onStdoutLine: async (line) => await toolHeartbeat.consume(line)
             }, context.signal);
         }
         finally {
+            toolHeartbeat.stop();
             await liveArchitectEvents.stop();
             await cleanupCompletionTools(completionTools, context.emit);
         }
@@ -448,18 +678,23 @@ export class ProcessBackedProviderCliService {
         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 completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "qa", runtimeEnvironment: context.runtimeEnvironment });
+        const qaPrompt = buildQaPrompt(dispatch, specBody);
+        const providerPrompt = buildProviderCliPrompt(dispatch, qaPrompt, context.runtimeEnvironment);
+        const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
         const command = buildProviderCliCommand(dispatch, {
             worktreePath: worktree.worktreePath,
-            prompt: buildQaPrompt(dispatch, specBody),
-            completionTools
+            prompt: qaPrompt,
+            promptFromStdin: pipePromptToStdin,
+            completionTools,
+            runtimeEnvironment: context.runtimeEnvironment
         });
-        const commandText = formatProviderCliCommand(command);
+        const commandText = formatProviderCliCommandForCheckpoint(command);
         await context.emit({
             role: "runner",
             kind: "checkpoint",
             content: `Starting provider CLI QA: ${commandText} in ${worktree.worktreePath}`,
-            eventType: "provider_cli_started"
+            eventType: "provider_cli_starting"
         });
         await context.emit({
             role: "runner",
@@ -468,24 +703,34 @@ export class ProcessBackedProviderCliService {
             eventType: "completion_tools_configured"
         });
         const outputState = createProviderOutputState(dispatch.execution.provider);
+        const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
+        const verificationProgress = new ManagedVerificationProgressEmitter(context.runtimeEnvironment?.FORGE_LOG_DIR, context.emit);
         const liveQaEvents = new LiveQaArtifactEmitter(worktree.worktreePath, dispatch.workItem.id, dispatch, context.emit);
         let result;
         try {
             liveQaEvents.start();
-            result = await this.processRunner.run({
+            verificationProgress.start();
+            result = await (context.processRunner ?? this.processRunner).run({
                 command: command.command,
                 args: command.args,
                 cwd: worktree.worktreePath,
-                env: providerProcessEnv(dispatch)
+                env: providerProcessEnv(dispatch, context.runtimeEnvironment),
+                stdin: pipePromptToStdin ? providerPrompt : undefined
             }, {
-                onStdoutLine: async (line) => {
-                    for (const event of outputState.consume(line)) {
-                        await context.emit(event);
-                    }
-                }
+                onStarted: async () => {
+                    await context.emit({
+                        role: "runner",
+                        kind: "checkpoint",
+                        content: "Provider CLI QA is supervised and ready.",
+                        eventType: "provider_cli_started"
+                    });
+                },
+                onStdoutLine: async (line) => await toolHeartbeat.consume(line)
             }, context.signal);
         }
         finally {
+            toolHeartbeat.stop();
+            await verificationProgress.stop();
             await liveQaEvents.stop();
             await cleanupCompletionTools(completionTools, context.emit);
         }
@@ -507,7 +752,7 @@ export class ProcessBackedProviderCliService {
                 ? "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);
+        await enforceQaBrowserLaunchTargetGate(dispatch, qaArtifact);
         if (!liveQaEvents.hasEmitted()) {
             await emitQaArtifactRecorded(context.emit, worktree.worktreePath, qaArtifact);
             await emitQaStructuredEvents(context.emit, qaArtifact);
@@ -531,56 +776,216 @@ export class ProcessBackedProviderCliService {
             artifacts: [qaArtifact]
         };
     }
+    async runCiRepair(context) {
+        return await this.runPullRequestRepair(context, "ci_repair");
+    }
     async runConflictResolve(context) {
+        return await this.runPullRequestRepair(context, "conflict_resolve");
+    }
+    async runPullRequestRepair(context, route) {
         const { dispatch, worktree } = context;
-        const addressComments = isPullRequestCommentsDispatch(dispatch);
+        const repairChecks = route === "ci_repair" || isPullRequestCheckRepairDispatch(dispatch);
+        const addressComments = !repairChecks && isPullRequestCommentsDispatch(dispatch);
+        let repairSpec = null;
+        let repairEnvironment = context.runtimeEnvironment;
+        let completionTools = null;
+        if (repairChecks) {
+            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(`CI repair readiness failed: lane command for '${dispatch.execution.lane}' was not resolved, so the approved spec cannot be materialized.`);
+            }
+            const specBody = buildSpecBody(laneCommand, dispatch.workItem, "ci_repair");
+            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");
+            repairSpec = {
+                repoPath: worktree.worktreePath,
+                path: specPath,
+                body: specBody,
+                producedBy: "forge-lane-command",
+                status: "approved",
+            };
+            const readiness = await writeCiRepairReadinessManifest(dispatch, worktree.worktreePath, specPath, context.runtimeEnvironment);
+            repairEnvironment = readiness.environment;
+            completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "ci_repair", runtimeEnvironment: repairEnvironment });
+            await context.emit({
+                role: "runner",
+                kind: "checkpoint",
+                content: `CI repair readiness contract prepared at ${path.relative(worktree.worktreePath, readiness.path).replaceAll(path.sep, "/")}; approved spec, attempt URLs, browser readiness, and local-equivalence policy are available before provider start.`,
+                eventType: "ci_repair_readiness_ready",
+            });
+            await context.emit({
+                role: "runner",
+                kind: "checkpoint",
+                content: "Forge CI repair completion tool configured; provider must call forge.complete_ci_repair before Bridge-owned commit and push.",
+                eventType: "completion_tools_configured",
+            });
+        }
+        const repairPrompt = repairChecks
+            ? buildPullRequestCheckRepairPrompt(dispatch, worktree.branchName)
+            : addressComments
+                ? buildPullRequestCommentsPrompt(dispatch, worktree.branchName)
+                : buildConflictResolvePrompt(dispatch, worktree.branchName);
+        const providerPrompt = buildProviderCliPrompt(dispatch, repairPrompt, repairEnvironment);
+        const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
         const command = buildProviderCliCommand(dispatch, {
             worktreePath: worktree.worktreePath,
-            prompt: addressComments
-                ? buildPullRequestCommentsPrompt(dispatch, worktree.branchName)
-                : buildConflictResolvePrompt(dispatch, worktree.branchName)
+            prompt: repairPrompt,
+            promptFromStdin: pipePromptToStdin,
+            completionTools: completionTools ?? undefined,
+            runtimeEnvironment: repairEnvironment
         });
         await context.emit({
             role: "runner",
             kind: "checkpoint",
-            content: `Starting provider CLI ${addressComments ? "PR comment address" : "conflict resolve"}: ${formatProviderCliCommand(command)} in ${worktree.worktreePath}`,
-            eventType: "provider_cli_started"
+            content: `Starting provider CLI ${repairChecks ? "CI repair" : addressComments ? "PR comment address" : "conflict resolve"}: ${formatProviderCliCommandForCheckpoint(command)} in ${worktree.worktreePath}`,
+            eventType: "provider_cli_starting"
         });
         const outputState = createProviderOutputState(dispatch.execution.provider);
-        const result = await this.processRunner.run({
-            command: command.command,
-            args: command.args,
-            cwd: worktree.worktreePath,
-            env: providerProcessEnv(dispatch)
-        }, {
-            onStdoutLine: async (line) => {
-                for (const event of outputState.consume(line)) {
-                    await context.emit(event);
+        const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
+        let result;
+        try {
+            result = await (context.processRunner ?? this.processRunner).run({
+                command: command.command,
+                args: command.args,
+                cwd: worktree.worktreePath,
+                env: providerProcessEnv(dispatch, repairEnvironment),
+                stdin: pipePromptToStdin ? providerPrompt : undefined
+            }, {
+                onStarted: async () => {
+                    await context.emit({
+                        role: "runner",
+                        kind: "checkpoint",
+                        content: `Provider CLI ${repairChecks ? "CI repair" : addressComments ? "PR comment address" : "conflict resolve"} is supervised and ready.`,
+                        eventType: "provider_cli_started"
+                    });
+                },
+                onStdoutLine: async (line) => {
+                    await toolHeartbeat.consume(line);
                 }
+            }, context.signal);
+        }
+        finally {
+            toolHeartbeat.stop();
+            if (completionTools) {
+                await cleanupCompletionTools(completionTools, context.emit);
             }
-        }, context.signal);
+        }
         if (result.exitCode !== 0) {
             const stderr = clip(result.stderr.trim() || result.stdout.trim(), 1200);
             throw new Error(`${command.command} exited ${result.exitCode}${stderr ? `: ${stderr}` : ""}`);
         }
+        let repairArtifact = null;
+        if (repairChecks) {
+            repairArtifact = await readCompletionArtifact(worktree.worktreePath, dispatch.workItem.id, "ci_repair");
+            if (!repairArtifact) {
+                throw new Error("Provider CLI completed but did not call forge.complete_ci_repair. Forge did not commit or push the repair.");
+            }
+            if ((repairArtifact.status ?? "").trim().toLowerCase() !== "pass") {
+                throw new Error(`CI repair completion gate recorded ${repairArtifact.status}; Forge did not commit or push the repair.`);
+            }
+            await emitCompletionArtifactRecorded(context.emit, worktree.worktreePath, repairArtifact);
+            await emitPhaseCompletionEvent(context.emit, repairArtifact);
+            await emitPhaseGateEvents(context.emit, repairArtifact);
+        }
         const committed = await commitWorktreeChanges(this.git, worktree.worktreePath, dispatch.workItem.id);
-        await this.git.run(worktree.worktreePath, ["push", "origin", `HEAD:${worktree.branchName}`]);
+        if (providerOwnsBranchPublication(context)) {
+            await pushWorktreeBranch(this.git, worktree.worktreePath, worktree.branchName, context.emit);
+        }
         await emitProviderUsageEvent(context.emit, dispatch, outputState);
         await context.emit({
             role: "assistant",
             kind: "message",
-            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"
+            content: outputState.finalMessage || (repairChecks
+                ? `${dispatch.execution.provider} CLI repaired pull request checks for ${worktree.branchName}.`
+                : addressComments
+                    ? `${dispatch.execution.provider} CLI addressed pull request comments for ${worktree.branchName}.`
+                    : `${dispatch.execution.provider} CLI resolved merge conflicts for ${worktree.branchName}.`),
+            eventType: repairChecks ? "pr_checks_complete" : addressComments ? "pr_comments_complete" : "conflict_resolve_complete"
         });
         return {
-            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)}).`
+            summary: repairChecks
+                ? `${dispatch.execution.provider} CLI repaired PR checks on ${worktree.branchName} (${committed.commitSha.slice(0, 12)}).`
+                : 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)}).`,
+            spec: repairSpec,
+            artifact: repairArtifact,
+            artifacts: repairArtifact ? [repairArtifact] : [],
         };
     }
 }
+async function stageDraftAttachments(dispatch, metadataRoot) {
+    const attachments = dispatch.draft?.attachments ?? [];
+    const stageable = attachments.filter((attachment) => (attachment.kind === "text" && typeof attachment.textContent === "string")
+        || (attachment.kind === "image" && typeof attachment.contentBase64 === "string"));
+    if (stageable.length === 0) {
+        return { textReferences: [], imagePaths: [] };
+    }
+    const attachmentRoot = path.join(metadataRoot, "draft-attachments");
+    const worktreeRoot = path.resolve(metadataRoot, "../../..");
+    await fs.mkdir(attachmentRoot, { recursive: true });
+    const textReferences = [];
+    const imagePaths = [];
+    for (const attachment of stageable) {
+        const fileName = `${String(attachment.index + 1).padStart(2, "0")}-${safeAttachmentFileName(attachment.fileName)}`;
+        const absolutePath = path.join(attachmentRoot, fileName);
+        if (attachment.kind === "text") {
+            await fs.writeFile(absolutePath, attachment.textContent ?? "", { encoding: "utf8", mode: 0o600 });
+            textReferences.push({ index: attachment.index, path: path.relative(worktreeRoot, absolutePath).replaceAll(path.sep, "/") });
+            continue;
+        }
+        const imageContent = decodeDraftImageAttachment(attachment.contentBase64 ?? "", attachment.fileName, attachment.index);
+        await fs.writeFile(absolutePath, imageContent, { mode: 0o600 });
+        imagePaths.push(absolutePath);
+    }
+    return { textReferences, imagePaths };
+}
+function decodeDraftImageAttachment(contentBase64, fileName, index) {
+    const normalized = contentBase64.replace(/\s+/gu, "");
+    if (normalized.length === 0 || normalized.length % 4 !== 0 || !/^[A-Za-z0-9+/]*={0,2}$/u.test(normalized)) {
+        throw new Error(`Draft image attachment ${index + 1} (${fileName}) is not valid base64.`);
+    }
+    const decoded = Buffer.from(normalized, "base64");
+    if (decoded.length === 0 || decoded.toString("base64") !== normalized) {
+        throw new Error(`Draft image attachment ${index + 1} (${fileName}) is not valid base64.`);
+    }
+    return decoded;
+}
+function safeAttachmentFileName(fileName) {
+    const sanitized = path.basename(fileName || "attachment.txt")
+        .replace(/[^a-zA-Z0-9._-]/gu, "_")
+        .replace(/[. ]+$/gu, "") || "attachment.txt";
+    const maxFileNameLength = 120;
+    const clipped = clipFileName(sanitized, maxFileNameLength);
+    const extension = path.extname(clipped);
+    const stem = path.basename(clipped, extension).replace(/[. ]+$/gu, "") || "attachment";
+    const windowsReservedName = /^(con|prn|aux|nul|com[1-9]|lpt[1-9])$/iu;
+    const safeStem = stem === "." || stem === ".." || windowsReservedName.test(stem) ? `attachment-${stem.replaceAll(".", "_")}` : stem;
+    return clipFileName(`${safeStem}${extension}`, maxFileNameLength);
+}
+function clipFileName(fileName, maxLength) {
+    if (fileName.length <= maxLength) {
+        return fileName;
+    }
+    const originalExtension = path.extname(fileName);
+    const extension = originalExtension.length > maxLength - 1
+        ? originalExtension.slice(0, maxLength - 1)
+        : originalExtension;
+    const stem = path.basename(fileName, originalExtension);
+    const maxStemLength = Math.max(1, maxLength - extension.length);
+    return `${stem.slice(0, maxStemLength)}${extension}`;
+}
+const providerPromptStdinThreshold = 8_000;
+function shouldPipePromptToStdin(provider, prompt, force = false) {
+    return provider.trim().toLowerCase() === "codex"
+        && (force || Buffer.byteLength(prompt, "utf8") > providerPromptStdinThreshold);
+}
+function usesManagedWindowsHost(dispatch) {
+    return process.platform === "win32" && dispatch.sandbox?.executionMode === "host";
+}
 function isFakeWorkerModel(model) {
     return model.trim().toLowerCase() === fakeWorkerModel;
 }