@loucompanion/forge-bridge 0.1.3-dev.8777774c67bc → 0.1.3-dev.88e93f53db5b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +51 -0
- package/dist/bridge/bridge.base.d.ts +4 -1
- package/dist/bridge/bridge.service.d.ts +50 -3
- package/dist/bridge/bridge.service.js +730 -87
- package/dist/bridge/bridge.types.d.ts +63 -1
- package/dist/cleanup/cleanup.service.d.ts +14 -2
- package/dist/cleanup/cleanup.service.js +496 -3
- package/dist/cleanup/cleanup.types.d.ts +10 -0
- package/dist/cleanup/index.d.ts +1 -1
- package/dist/cleanup/index.js +1 -1
- package/dist/cleanup/internals.d.ts +2 -2
- package/dist/cleanup/internals.js +1 -1
- package/dist/cli/cli.help.js +37 -3
- package/dist/cli/cli.service.d.ts +30 -2
- package/dist/cli/cli.service.js +191 -27
- package/dist/cli/local-config.d.ts +4 -0
- package/dist/cli/local-config.js +41 -1
- package/dist/runtime/aspnet-runtime-prebuild.d.ts +36 -0
- package/dist/runtime/aspnet-runtime-prebuild.js +340 -0
- package/dist/runtime/attempt-node-runtime-launcher.d.ts +17 -0
- package/dist/runtime/attempt-node-runtime-launcher.js +105 -0
- package/dist/runtime/attempt-process-supervisor-registry.d.ts +20 -0
- package/dist/runtime/attempt-process-supervisor-registry.js +64 -0
- package/dist/runtime/attempt-process-supervisor.d.ts +97 -0
- package/dist/runtime/attempt-process-supervisor.js +384 -0
- package/dist/runtime/generated-output-reset.d.ts +10 -0
- package/dist/runtime/generated-output-reset.js +103 -0
- package/dist/runtime/host-listener-inspector.d.ts +46 -0
- package/dist/runtime/host-listener-inspector.js +349 -0
- package/dist/runtime/host-port-broker.d.ts +76 -0
- package/dist/runtime/host-port-broker.js +333 -0
- package/dist/runtime/host-runtime-contract.d.ts +47 -0
- package/dist/runtime/host-runtime-contract.js +700 -0
- package/dist/runtime/host-runtime-lease.d.ts +194 -0
- package/dist/runtime/host-runtime-lease.js +2138 -0
- package/dist/runtime/host-runtime-promotion.d.ts +23 -0
- package/dist/runtime/host-runtime-promotion.js +159 -0
- package/dist/runtime/memory-capacity.d.ts +68 -0
- package/dist/runtime/memory-capacity.js +121 -0
- package/dist/runtime/node-host-runtime-adapter.d.ts +54 -0
- package/dist/runtime/node-host-runtime-adapter.js +284 -0
- package/dist/runtime/playwright-host-runtime-adapter.d.ts +21 -0
- package/dist/runtime/playwright-host-runtime-adapter.js +225 -0
- package/dist/runtime/runtime-isolation-lease.d.ts +67 -0
- package/dist/runtime/runtime-isolation-lease.js +158 -0
- package/dist/runtime/workspace-resource-estimator.d.ts +17 -0
- package/dist/runtime/workspace-resource-estimator.js +174 -0
- package/dist/sandbox/image-policy.d.ts +3 -1
- package/dist/sandbox/image-policy.js +4 -2
- package/dist/sandbox/preflight.d.ts +49 -1
- package/dist/sandbox/preflight.js +313 -31
- package/dist/sandbox/process.js +125 -40
- package/dist/sandbox/repository-lock.js +41 -3
- package/dist/sandbox/runtime.d.ts +85 -4
- package/dist/sandbox/runtime.js +806 -126
- package/dist/sandbox/sandbox.types.d.ts +10 -0
- package/dist/sandbox/smoke.d.ts +76 -0
- package/dist/sandbox/smoke.js +380 -0
- package/dist/sandbox/worker-supervisor.js +1 -1
- package/dist/sandbox/worker.js +2 -5
- package/dist/sandbox/workspace.service.d.ts +1 -0
- package/dist/sandbox/workspace.service.js +28 -5
- package/dist/session/managed-attempt-tools.d.ts +18 -0
- package/dist/session/managed-attempt-tools.js +854 -0
- package/dist/session/managed-build-coordinator.d.ts +5 -0
- package/dist/session/managed-build-coordinator.js +105 -0
- package/dist/session/managed-build-receipt.d.ts +21 -0
- package/dist/session/managed-build-receipt.js +335 -0
- package/dist/session/phase-completion.artifacts.d.ts +17 -0
- package/dist/session/phase-completion.artifacts.js +233 -24
- package/dist/session/phase-completion.d.ts +11 -2
- package/dist/session/phase-completion.helpers.d.ts +5 -0
- package/dist/session/phase-completion.helpers.js +51 -10
- package/dist/session/phase-completion.js +12 -3
- package/dist/session/phase-completion.prompts.d.ts +3 -3
- package/dist/session/phase-completion.prompts.js +21 -6
- package/dist/session/phase-completion.runtime.d.ts +13 -1
- package/dist/session/phase-completion.runtime.js +189 -8
- package/dist/session/phase-completion.schemas.js +108 -3
- package/dist/session/phase-completion.validation.d.ts +4 -1
- package/dist/session/phase-completion.validation.js +151 -21
- package/dist/session/provider-cli/ci-repair-readiness.d.ts +14 -0
- package/dist/session/provider-cli/ci-repair-readiness.js +105 -0
- package/dist/session/provider-cli/provider-cli.artifacts.d.ts +3 -2
- package/dist/session/provider-cli/provider-cli.artifacts.js +65 -7
- package/dist/session/provider-cli/provider-cli.deterministic.js +47 -1
- package/dist/session/provider-cli/provider-cli.process.d.ts +23 -0
- package/dist/session/provider-cli/provider-cli.process.js +420 -32
- package/dist/session/provider-cli/provider-cli.prompts.d.ts +4 -1
- package/dist/session/provider-cli/provider-cli.prompts.js +99 -19
- package/dist/session/provider-cli/provider-cli.qa-sidecars.js +1 -0
- package/dist/session/provider-cli/provider-cli.runtime.d.ts +1 -1
- package/dist/session/provider-cli/provider-cli.runtime.js +6 -3
- package/dist/session/provider-cli/provider-cli.service.d.ts +20 -2
- package/dist/session/provider-cli/provider-cli.service.js +464 -102
- package/dist/session/provider-cli/provider-cli.types.d.ts +5 -0
- package/dist/session/provider-cli/provider-output-state.d.ts +2 -0
- package/dist/session/provider-cli/provider-output-state.js +91 -16
- package/dist/session/provider-cli/provider-usage.d.ts +7 -0
- package/dist/session/provider-cli/provider-usage.js +28 -5
- package/dist/session/session-redaction.d.ts +3 -0
- package/dist/session/session-redaction.js +38 -0
- package/dist/session/session.base.d.ts +6 -1
- package/dist/session/session.service.d.ts +8 -2
- package/dist/session/session.service.js +522 -41
- package/dist/session/session.types.d.ts +70 -0
- package/dist/session/session.types.js +76 -4
- package/dist/shared/format/format-bytes.d.ts +1 -0
- package/dist/shared/format/format-bytes.js +9 -0
- package/dist/shared/path/path.d.ts +1 -0
- package/dist/shared/path/path.js +21 -1
- package/dist/shared/process/host-process-recovery.d.ts +12 -0
- package/dist/shared/process/host-process-recovery.js +78 -0
- package/dist/shared/process/host-process-supervisor.d.ts +59 -0
- package/dist/shared/process/host-process-supervisor.js +330 -0
- package/dist/shared/process/process.d.ts +1 -0
- package/dist/shared/process/process.js +1 -0
- package/dist/shared/redaction/redaction.js +12 -2
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/worktree/artifact-injector.d.ts +3 -2
- package/dist/worktree/artifact-injector.js +43 -4
- package/dist/worktree/dependency-warmer.d.ts +28 -1
- package/dist/worktree/dependency-warmer.js +308 -9
- package/dist/worktree/index.d.ts +2 -1
- package/dist/worktree/index.js +1 -0
- package/dist/worktree/prior-phase-artifact-hydrator.d.ts +2 -0
- package/dist/worktree/prior-phase-artifact-hydrator.js +136 -0
- package/dist/worktree/worktree-paths.d.ts +4 -0
- package/dist/worktree/worktree-paths.js +30 -0
- package/dist/worktree/worktree.base.d.ts +3 -0
- package/dist/worktree/worktree.service.d.ts +9 -2
- package/dist/worktree/worktree.service.js +217 -48
- package/dist/worktree/worktree.types.d.ts +5 -1
- package/package.json +5 -3
- package/runtime/windows-job-supervisor.ps1 +444 -0
- package/runtime/windows-listener-owner.ps1 +33 -0
|
@@ -1,42 +1,50 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
+
import { RepositoryCoordinatorLock } from "../../sandbox/repository-lock.js";
|
|
3
4
|
import { GitClient } from "../../shared/git/git.js";
|
|
4
5
|
import { buildSpecBody, selectLaneCommand } from "../../worktree/artifact-injector.js";
|
|
6
|
+
import { defaultWorktreeCoordinatorStateRoot } from "../../worktree/worktree-paths.js";
|
|
5
7
|
import { completionPhaseFromDispatch, prepareCompletionToolRuntime, readCompletionArtifact, usesDebugCycleCompletion, usesDevelopCycleCompletion } from "../phase-completion.js";
|
|
6
|
-
import { cleanupCompletionTools, commitWorktreeChanges, completionPhaseFromArtifact, emitArchitectStructuredEvents, emitCompletionArtifactRecorded, emitDecomposeGateArtifacts, emitDraftGateArtifacts, emitPhaseCompletionEvent, emitPhaseGateEvents, emitQaArtifactRecorded, emitQaStructuredEvents, enforceQaBrowserLaunchTargetGate, LiveArchitectArtifactEmitter, LiveCompletionArtifactEmitter, LiveQaArtifactEmitter, readCompletionArtifactsForRun, readQaCompletionArtifactBundle,
|
|
8
|
+
import { cleanupCompletionTools, commitWorktreeChanges, completionPhaseFromArtifact, emitArchitectStructuredEvents, emitCompletionArtifactRecorded, emitDecomposeGateArtifacts, emitDraftGateArtifacts, emitPhaseCompletionEvent, emitPhaseGateEvents, emitQaArtifactRecorded, emitQaStructuredEvents, enforceQaBrowserLaunchTargetGate, LiveArchitectArtifactEmitter, LiveCompletionArtifactEmitter, LiveQaArtifactEmitter, readCompletionArtifactsForRun, readQaCompletionArtifactBundle, waitForCompletionArtifact } from "./provider-cli.artifacts.js";
|
|
7
9
|
import { DeterministicProviderCliService } from "./provider-cli.deterministic.js";
|
|
8
|
-
import { buildArchitectPrompt, buildConflictResolvePrompt, buildDebugCyclePrompt, buildDevelopCyclePrompt, buildDraftPrompt, buildDraftSpec, buildImplementationPrompt, buildProviderCliCommand, durableDraftInput, buildPullRequestCheckRepairPrompt, buildPullRequestCommentsPrompt, buildQaPrompt, formatProviderCliCommandForCheckpoint, isDecomposeDraftDispatch, isPullRequestCheckRepairDispatch, isPullRequestCommentsDispatch } from "./provider-cli.prompts.js";
|
|
10
|
+
import { buildArchitectPrompt, buildConflictResolvePrompt, buildDebugCyclePrompt, buildDevelopCyclePrompt, buildDraftPrompt, buildDraftSpec, buildImplementationPrompt, buildProviderCliPrompt, buildProviderCliCommand, durableDraftInput, buildPullRequestCheckRepairPrompt, buildPullRequestCommentsPrompt, buildQaPrompt, formatProviderCliCommandForCheckpoint, isDecomposeDraftDispatch, isPullRequestCheckRepairDispatch, isPullRequestCommentsDispatch } from "./provider-cli.prompts.js";
|
|
9
11
|
import { StreamingProviderProcessRunner } from "./provider-cli.process.js";
|
|
10
12
|
import { emitProviderUsageEvent, providerProcessEnv } from "./provider-cli.runtime.js";
|
|
11
13
|
import { clip, createProviderOutputState, parseJsonLine } from "./provider-output-state.js";
|
|
14
|
+
import { writeCiRepairReadinessManifest } from "./ci-repair-readiness.js";
|
|
12
15
|
export { DeterministicProviderCliService } from "./provider-cli.deterministic.js";
|
|
13
16
|
export { buildProviderCliCommand, codexSandboxModeForPlatform, formatProviderCliCommand, formatProviderCliCommandForCheckpoint } from "./provider-cli.prompts.js";
|
|
14
|
-
export { buildProviderChildEnvironment, chooseWindowsCommandCandidate, StreamingProviderProcessRunner } from "./provider-cli.process.js";
|
|
17
|
+
export { buildProviderChildEnvironment, chooseWindowsCommandCandidate, resolveCodexNpmDirectLaunch, resolvePackageManagerDirectLaunch, resolveWindowsCommandFromPath, PROVIDER_OUTPUT_CAPTURE_LIMIT_CHARS, StreamingProviderProcessRunner } from "./provider-cli.process.js";
|
|
15
18
|
export { buildWindowsLaunchCommand } from "../../shared/process/windows-launch.js";
|
|
16
|
-
async function pushWorktreeBranch(git, worktreePath, branchName, emit) {
|
|
17
|
-
|
|
18
|
-
await git.run(worktreePath, ["push", "origin", `HEAD:${branchName}`]);
|
|
19
|
-
return;
|
|
20
|
-
}
|
|
21
|
-
catch (err) {
|
|
22
|
-
if (!isNonFastForwardPushError(err)) {
|
|
23
|
-
throw err;
|
|
24
|
-
}
|
|
25
|
-
await emit?.({
|
|
26
|
-
role: "runner",
|
|
27
|
-
kind: "checkpoint",
|
|
28
|
-
content: `Remote branch ${branchName} moved before push; fetching latest and rebasing local changes.`,
|
|
29
|
-
eventType: "worktree_branch_push_rebase"
|
|
30
|
-
});
|
|
19
|
+
async function pushWorktreeBranch(git, worktreePath, branchName, repoPath, coordinator, signal, emit) {
|
|
20
|
+
await coordinator.withLock(repoPath, async () => {
|
|
31
21
|
try {
|
|
32
|
-
await git.run(worktreePath, ["fetch", "origin", remoteTrackingRefspec(branchName)]);
|
|
33
|
-
await git.run(worktreePath, ["rebase", `refs/remotes/origin/${branchName}`]);
|
|
34
22
|
await git.run(worktreePath, ["push", "origin", `HEAD:${branchName}`]);
|
|
23
|
+
return;
|
|
35
24
|
}
|
|
36
|
-
catch (
|
|
37
|
-
|
|
25
|
+
catch (err) {
|
|
26
|
+
if (!isNonFastForwardPushError(err)) {
|
|
27
|
+
throw err;
|
|
28
|
+
}
|
|
29
|
+
await emit?.({
|
|
30
|
+
role: "runner",
|
|
31
|
+
kind: "checkpoint",
|
|
32
|
+
content: `Remote branch ${branchName} moved before push; fetching latest and rebasing local changes.`,
|
|
33
|
+
eventType: "worktree_branch_push_rebase"
|
|
34
|
+
});
|
|
35
|
+
try {
|
|
36
|
+
await git.run(worktreePath, ["fetch", "origin", remoteTrackingRefspec(branchName)]);
|
|
37
|
+
await git.run(worktreePath, ["rebase", `refs/remotes/origin/${branchName}`]);
|
|
38
|
+
await git.run(worktreePath, ["push", "origin", `HEAD:${branchName}`]);
|
|
39
|
+
}
|
|
40
|
+
catch (retryErr) {
|
|
41
|
+
throw new Error(`worktree_branch_integration_conflict: git push origin HEAD:${branchName} was rejected because the remote branch moved, and automatic fetch/rebase failed: ${errorMessage(retryErr)}`, { cause: retryErr });
|
|
42
|
+
}
|
|
38
43
|
}
|
|
39
|
-
}
|
|
44
|
+
}, signal);
|
|
45
|
+
}
|
|
46
|
+
function providerOwnsBranchPublication(context) {
|
|
47
|
+
return context.dispatch.sandbox?.executionMode !== "docker";
|
|
40
48
|
}
|
|
41
49
|
function remoteTrackingRefspec(branchName) {
|
|
42
50
|
return `refs/heads/${branchName}:refs/remotes/origin/${branchName}`;
|
|
@@ -52,6 +60,226 @@ function isNonFastForwardPushError(err) {
|
|
|
52
60
|
function errorMessage(err) {
|
|
53
61
|
return err instanceof Error ? err.message : String(err);
|
|
54
62
|
}
|
|
63
|
+
function providerCliExitFailure(command, result) {
|
|
64
|
+
const output = [result.stderr.trim(), result.stdout.trim()]
|
|
65
|
+
.filter(value => value.length > 0)
|
|
66
|
+
.join("\n");
|
|
67
|
+
const detail = clip(output, 1200);
|
|
68
|
+
const suffix = detail ? `: ${detail}` : "";
|
|
69
|
+
if (isProviderNetworkFailure(output)) {
|
|
70
|
+
return new Error(`provider_network_unavailable: ${command} could not reach its provider service${suffix}`);
|
|
71
|
+
}
|
|
72
|
+
return new Error(`${command} exited ${result.exitCode}${suffix}`);
|
|
73
|
+
}
|
|
74
|
+
export function isProviderNetworkFailure(output) {
|
|
75
|
+
const normalized = output.trim().toLowerCase();
|
|
76
|
+
if (!normalized) {
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
return [
|
|
80
|
+
"eai_again",
|
|
81
|
+
"enotfound",
|
|
82
|
+
"could not resolve host",
|
|
83
|
+
"failed to lookup address",
|
|
84
|
+
"name or service not known",
|
|
85
|
+
"no such host is known",
|
|
86
|
+
"temporary failure in name resolution",
|
|
87
|
+
"network is unreachable",
|
|
88
|
+
"no route to host",
|
|
89
|
+
"error sending request for url",
|
|
90
|
+
"client error (connect)",
|
|
91
|
+
"connection refused",
|
|
92
|
+
"connection reset by peer",
|
|
93
|
+
"stream disconnected before completion",
|
|
94
|
+
].some(marker => normalized.includes(marker));
|
|
95
|
+
}
|
|
96
|
+
const defaultProviderToolHeartbeatIntervalMs = 60_000;
|
|
97
|
+
const defaultManagedVerificationProgressIntervalMs = 30_000;
|
|
98
|
+
function compareManagedVerificationSnapshots(left, right) {
|
|
99
|
+
const leftOrder = managedVerificationStartedAt(left.startedAt) ?? Number.MAX_SAFE_INTEGER;
|
|
100
|
+
const rightOrder = managedVerificationStartedAt(right.startedAt) ?? Number.MAX_SAFE_INTEGER;
|
|
101
|
+
return leftOrder - rightOrder || left.commandId.localeCompare(right.commandId);
|
|
102
|
+
}
|
|
103
|
+
function managedVerificationStartedAt(value) {
|
|
104
|
+
const parsed = Date.parse(value ?? "");
|
|
105
|
+
return Number.isFinite(parsed) ? parsed : null;
|
|
106
|
+
}
|
|
107
|
+
export class ManagedVerificationProgressEmitter {
|
|
108
|
+
logDirectory;
|
|
109
|
+
emit;
|
|
110
|
+
intervalMs;
|
|
111
|
+
timer = null;
|
|
112
|
+
observedStatuses = new Map();
|
|
113
|
+
completedCommands = new Set();
|
|
114
|
+
constructor(logDirectory, emit, intervalMs = defaultManagedVerificationProgressIntervalMs) {
|
|
115
|
+
this.logDirectory = logDirectory;
|
|
116
|
+
this.emit = emit;
|
|
117
|
+
this.intervalMs = intervalMs;
|
|
118
|
+
}
|
|
119
|
+
start() {
|
|
120
|
+
if (!this.logDirectory?.trim() || this.timer)
|
|
121
|
+
return;
|
|
122
|
+
this.timer = setInterval(() => {
|
|
123
|
+
void this.scan().catch(() => undefined);
|
|
124
|
+
}, Math.max(1, this.intervalMs));
|
|
125
|
+
void this.scan().catch(() => undefined);
|
|
126
|
+
}
|
|
127
|
+
async stop() {
|
|
128
|
+
if (this.timer) {
|
|
129
|
+
clearInterval(this.timer);
|
|
130
|
+
this.timer = null;
|
|
131
|
+
}
|
|
132
|
+
await this.scan().catch(() => undefined);
|
|
133
|
+
}
|
|
134
|
+
async scan() {
|
|
135
|
+
if (!this.logDirectory?.trim())
|
|
136
|
+
return;
|
|
137
|
+
const directory = path.join(this.logDirectory, "managed-commands");
|
|
138
|
+
const names = await fs.readdir(directory).catch(() => []);
|
|
139
|
+
const snapshots = await Promise.all(names
|
|
140
|
+
.filter(name => name.endsWith(".receipt.json"))
|
|
141
|
+
.map(async (name) => parseManagedVerificationSnapshot(path.join(directory, name))));
|
|
142
|
+
const current = snapshots
|
|
143
|
+
.filter((entry) => entry !== null)
|
|
144
|
+
.sort(compareManagedVerificationSnapshots);
|
|
145
|
+
if (current.some(snapshot => isManagedVerificationNonterminal(snapshot.status))) {
|
|
146
|
+
// Durable managed-command receipts are authoritative evidence that Forge
|
|
147
|
+
// still supervises work even when the provider is not inside an MCP tool
|
|
148
|
+
// call. Refresh the API idle deadline without inflating the transcript.
|
|
149
|
+
await this.emit({
|
|
150
|
+
role: "runner",
|
|
151
|
+
kind: "status",
|
|
152
|
+
content: "A supervised managed verification command is still running.",
|
|
153
|
+
eventType: "provider_tool_heartbeat",
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
for (const snapshot of current) {
|
|
157
|
+
await this.emitTransition(snapshot);
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
async emitTransition(current) {
|
|
161
|
+
const terminal = ["pass", "fail", "timed_out", "timeout_termination_failed", "runner_error"].includes(current.status);
|
|
162
|
+
if (terminal && this.completedCommands.has(current.commandId))
|
|
163
|
+
return;
|
|
164
|
+
const previousStatus = this.observedStatuses.get(current.commandId);
|
|
165
|
+
if (previousStatus === current.status)
|
|
166
|
+
return;
|
|
167
|
+
this.observedStatuses.set(current.commandId, current.status);
|
|
168
|
+
if (terminal)
|
|
169
|
+
this.completedCommands.add(current.commandId);
|
|
170
|
+
// Starting and running are one externally meaningful state. The receipt is
|
|
171
|
+
// still refreshed on disk for UI telemetry, but repeated output/elapsed
|
|
172
|
+
// changes must not inflate the provider transcript or session history.
|
|
173
|
+
if (!terminal && previousStatus === "starting" && current.status === "running")
|
|
174
|
+
return;
|
|
175
|
+
const startedAt = managedVerificationStartedAt(current.startedAt);
|
|
176
|
+
const elapsedMs = startedAt !== null
|
|
177
|
+
? Math.max(current.elapsedMs ?? 0, Date.now() - startedAt)
|
|
178
|
+
: current.elapsedMs;
|
|
179
|
+
const elapsed = elapsedMs === null ? "an unknown duration" : formatElapsed(elapsedMs);
|
|
180
|
+
const outputTail = current.lastOutputStream === "stderr"
|
|
181
|
+
? current.stderrTail || current.stdoutTail
|
|
182
|
+
: current.stdoutTail || current.stderrTail;
|
|
183
|
+
const recovered = previousStatus === undefined && terminal;
|
|
184
|
+
await this.emit({
|
|
185
|
+
role: "runner",
|
|
186
|
+
kind: terminal && current.status !== "pass" ? "error" : "status",
|
|
187
|
+
content: terminal
|
|
188
|
+
? `Managed verification ${current.status} after ${elapsed}${recovered ? " (recovered from its durable receipt)" : ""}${outputTail ? `: ${clip(outputTail, 600)}` : "."}`
|
|
189
|
+
: `QA started managed verification ${current.commandId}. Forge is supervising it; durable progress remains available in the UI while the provider continues independent work.`,
|
|
190
|
+
eventType: terminal ? "verification_completed" : "verification_waiting",
|
|
191
|
+
data: JSON.stringify({
|
|
192
|
+
command_id: current.commandId,
|
|
193
|
+
status: current.status,
|
|
194
|
+
elapsed_ms: elapsedMs,
|
|
195
|
+
output_revision: current.outputRevision,
|
|
196
|
+
last_output_at: current.lastOutputAt,
|
|
197
|
+
recovered,
|
|
198
|
+
}),
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
function isManagedVerificationNonterminal(status) {
|
|
203
|
+
return status === "starting" || status === "running" || status === "waiting_for_build_slot";
|
|
204
|
+
}
|
|
205
|
+
async function parseManagedVerificationSnapshot(receiptPath) {
|
|
206
|
+
try {
|
|
207
|
+
const receipt = JSON.parse(await fs.readFile(receiptPath, "utf8"));
|
|
208
|
+
const commandId = typeof receipt.command_id === "string" ? receipt.command_id : null;
|
|
209
|
+
const status = typeof receipt.status === "string" ? receipt.status : null;
|
|
210
|
+
if (!commandId || !status)
|
|
211
|
+
return null;
|
|
212
|
+
return {
|
|
213
|
+
commandId,
|
|
214
|
+
status,
|
|
215
|
+
elapsedMs: typeof receipt.elapsed_ms === "number" ? receipt.elapsed_ms : null,
|
|
216
|
+
startedAt: typeof receipt.started_at === "string" ? receipt.started_at : null,
|
|
217
|
+
outputRevision: typeof receipt.output_revision === "number" ? receipt.output_revision : null,
|
|
218
|
+
lastOutputAt: typeof receipt.last_output_at === "string" ? receipt.last_output_at : null,
|
|
219
|
+
lastOutputStream: receipt.last_output_stream === "stdout" || receipt.last_output_stream === "stderr"
|
|
220
|
+
? receipt.last_output_stream
|
|
221
|
+
: null,
|
|
222
|
+
stdoutTail: tail(typeof receipt.stdout === "string" ? receipt.stdout : ""),
|
|
223
|
+
stderrTail: tail(typeof receipt.stderr === "string" ? receipt.stderr : ""),
|
|
224
|
+
};
|
|
225
|
+
}
|
|
226
|
+
catch {
|
|
227
|
+
return null;
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
function tail(value) {
|
|
231
|
+
return value.trim().split(/\r?\n/u).slice(-4).join("\n");
|
|
232
|
+
}
|
|
233
|
+
function formatElapsed(milliseconds) {
|
|
234
|
+
const seconds = Math.max(0, Math.round(milliseconds / 1000));
|
|
235
|
+
const minutes = Math.floor(seconds / 60);
|
|
236
|
+
return minutes > 0 ? `${minutes}m ${seconds % 60}s` : `${seconds}s`;
|
|
237
|
+
}
|
|
238
|
+
class ProviderToolActivityHeartbeat {
|
|
239
|
+
outputState;
|
|
240
|
+
emit;
|
|
241
|
+
intervalMs;
|
|
242
|
+
timer = null;
|
|
243
|
+
constructor(outputState, emit, intervalMs) {
|
|
244
|
+
this.outputState = outputState;
|
|
245
|
+
this.emit = emit;
|
|
246
|
+
this.intervalMs = intervalMs;
|
|
247
|
+
}
|
|
248
|
+
async consume(line) {
|
|
249
|
+
const events = this.outputState.consume(line);
|
|
250
|
+
this.sync();
|
|
251
|
+
for (const event of events) {
|
|
252
|
+
await this.emit(event);
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
stop() {
|
|
256
|
+
if (this.timer) {
|
|
257
|
+
clearInterval(this.timer);
|
|
258
|
+
this.timer = null;
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
sync() {
|
|
262
|
+
if (!this.outputState.hasActiveToolCall) {
|
|
263
|
+
this.stop();
|
|
264
|
+
return;
|
|
265
|
+
}
|
|
266
|
+
if (this.timer) {
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
this.timer = setInterval(() => {
|
|
270
|
+
if (!this.outputState.hasActiveToolCall) {
|
|
271
|
+
this.stop();
|
|
272
|
+
return;
|
|
273
|
+
}
|
|
274
|
+
void this.emit({
|
|
275
|
+
role: "runner",
|
|
276
|
+
kind: "status",
|
|
277
|
+
content: "A supervised provider tool is still running.",
|
|
278
|
+
eventType: "provider_tool_heartbeat",
|
|
279
|
+
}).catch(() => undefined);
|
|
280
|
+
}, Math.max(1, this.intervalMs));
|
|
281
|
+
}
|
|
282
|
+
}
|
|
55
283
|
const fakeWorkerModel = "server-local-fake-worker";
|
|
56
284
|
export class RoutingProviderCliService {
|
|
57
285
|
realProvider;
|
|
@@ -94,9 +322,13 @@ export class RoutingProviderCliService {
|
|
|
94
322
|
export class ProcessBackedProviderCliService {
|
|
95
323
|
processRunner;
|
|
96
324
|
git;
|
|
97
|
-
|
|
325
|
+
providerToolHeartbeatIntervalMs;
|
|
326
|
+
publicationCoordinator;
|
|
327
|
+
constructor(processRunner = new StreamingProviderProcessRunner(), git = new GitClient(), providerToolHeartbeatIntervalMs = defaultProviderToolHeartbeatIntervalMs, publicationCoordinator = new RepositoryCoordinatorLock(defaultWorktreeCoordinatorStateRoot())) {
|
|
98
328
|
this.processRunner = processRunner;
|
|
99
329
|
this.git = git;
|
|
330
|
+
this.providerToolHeartbeatIntervalMs = providerToolHeartbeatIntervalMs;
|
|
331
|
+
this.publicationCoordinator = publicationCoordinator;
|
|
100
332
|
}
|
|
101
333
|
async runDraft(context) {
|
|
102
334
|
const { dispatch } = context;
|
|
@@ -110,15 +342,18 @@ export class ProcessBackedProviderCliService {
|
|
|
110
342
|
await fs.writeFile(path.join(metadataRoot, "spec.md"), buildDraftSpec(dispatch), "utf8");
|
|
111
343
|
const stagedAttachments = await stageDraftAttachments(dispatch, metadataRoot);
|
|
112
344
|
const decomposeDraft = isDecomposeDraftDispatch(dispatch);
|
|
113
|
-
const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: decomposeDraft ? "decompose" : "draft" });
|
|
345
|
+
const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: decomposeDraft ? "decompose" : "draft", runtimeEnvironment: context.runtimeEnvironment });
|
|
114
346
|
const draftPrompt = buildDraftPrompt(dispatch, { attachmentReferences: stagedAttachments.textReferences });
|
|
115
|
-
const
|
|
347
|
+
const providerPrompt = buildProviderCliPrompt(dispatch, draftPrompt, context.runtimeEnvironment);
|
|
348
|
+
const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
|
|
116
349
|
const command = buildProviderCliCommand(dispatch, {
|
|
117
350
|
worktreePath: worktree.worktreePath,
|
|
118
|
-
prompt:
|
|
351
|
+
prompt: draftPrompt,
|
|
352
|
+
promptFromStdin: pipePromptToStdin,
|
|
119
353
|
completionTools: completionTools ?? undefined,
|
|
120
354
|
skipGitRepoCheck: false,
|
|
121
|
-
imagePaths: stagedAttachments.imagePaths
|
|
355
|
+
imagePaths: stagedAttachments.imagePaths,
|
|
356
|
+
runtimeEnvironment: context.runtimeEnvironment
|
|
122
357
|
});
|
|
123
358
|
const draftArtifactSlugs = dispatch.artifacts
|
|
124
359
|
.filter((artifact) => artifact.scope === "operational" && ["command", "skill", "hook"].includes(artifact.kind))
|
|
@@ -133,7 +368,7 @@ export class ProcessBackedProviderCliService {
|
|
|
133
368
|
role: "runner",
|
|
134
369
|
kind: "checkpoint",
|
|
135
370
|
content: `Starting provider CLI Draft: ${formatProviderCliCommandForCheckpoint(command)}`,
|
|
136
|
-
eventType: "
|
|
371
|
+
eventType: "provider_cli_starting"
|
|
137
372
|
});
|
|
138
373
|
await context.emit({
|
|
139
374
|
role: "runner",
|
|
@@ -144,6 +379,7 @@ export class ProcessBackedProviderCliService {
|
|
|
144
379
|
eventType: "completion_tools_configured"
|
|
145
380
|
});
|
|
146
381
|
const outputState = createProviderOutputState(dispatch.execution.provider);
|
|
382
|
+
const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
|
|
147
383
|
try {
|
|
148
384
|
const providerCancellation = new AbortController();
|
|
149
385
|
const abortProvider = () => providerCancellation.abort();
|
|
@@ -154,17 +390,23 @@ export class ProcessBackedProviderCliService {
|
|
|
154
390
|
context.signal?.addEventListener("abort", abortProvider, { once: true });
|
|
155
391
|
}
|
|
156
392
|
try {
|
|
157
|
-
const runPromise = this.processRunner.run({
|
|
393
|
+
const runPromise = (context.processRunner ?? this.processRunner).run({
|
|
158
394
|
command: command.command,
|
|
159
395
|
args: command.args,
|
|
160
396
|
cwd: worktree.worktreePath,
|
|
161
|
-
env: providerProcessEnv(dispatch),
|
|
162
|
-
stdin: pipePromptToStdin ?
|
|
397
|
+
env: providerProcessEnv(dispatch, context.runtimeEnvironment),
|
|
398
|
+
stdin: pipePromptToStdin ? providerPrompt : undefined
|
|
163
399
|
}, {
|
|
400
|
+
onStarted: async () => {
|
|
401
|
+
await context.emit({
|
|
402
|
+
role: "runner",
|
|
403
|
+
kind: "checkpoint",
|
|
404
|
+
content: "Provider CLI Draft is supervised and ready.",
|
|
405
|
+
eventType: "provider_cli_started"
|
|
406
|
+
});
|
|
407
|
+
},
|
|
164
408
|
onStdoutLine: async (line) => {
|
|
165
|
-
|
|
166
|
-
await context.emit(event);
|
|
167
|
-
}
|
|
409
|
+
await toolHeartbeat.consume(line);
|
|
168
410
|
}
|
|
169
411
|
}, providerCancellation.signal);
|
|
170
412
|
const artifactWaitCancellation = new AbortController();
|
|
@@ -199,7 +441,7 @@ export class ProcessBackedProviderCliService {
|
|
|
199
441
|
context.signal?.removeEventListener("abort", abortArtifactWait);
|
|
200
442
|
}
|
|
201
443
|
if (result.exitCode !== 0 && !earlyProposalArtifact) {
|
|
202
|
-
throw
|
|
444
|
+
throw providerCliExitFailure(command.command, result);
|
|
203
445
|
}
|
|
204
446
|
await context.emit({
|
|
205
447
|
role: "runner",
|
|
@@ -260,6 +502,7 @@ export class ProcessBackedProviderCliService {
|
|
|
260
502
|
}
|
|
261
503
|
}
|
|
262
504
|
finally {
|
|
505
|
+
toolHeartbeat.stop();
|
|
263
506
|
await cleanupCompletionTools(completionTools, context.emit);
|
|
264
507
|
}
|
|
265
508
|
}
|
|
@@ -278,21 +521,26 @@ export class ProcessBackedProviderCliService {
|
|
|
278
521
|
const specPath = path.join(metadataRoot, "spec.md");
|
|
279
522
|
await fs.writeFile(specPath, specBody, "utf8");
|
|
280
523
|
await fs.writeFile(path.join(metadataRoot, "spec.meta.json"), JSON.stringify({ schema_version: 1, status: "approved", produced_by: "forge-lane-command" }) + "\n", "utf8");
|
|
281
|
-
const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase });
|
|
524
|
+
const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase, runtimeEnvironment: context.runtimeEnvironment });
|
|
525
|
+
const implementationPrompt = debugCycle
|
|
526
|
+
? buildDebugCyclePrompt(dispatch, phase)
|
|
527
|
+
: developCycle
|
|
528
|
+
? buildDevelopCyclePrompt(dispatch, phase)
|
|
529
|
+
: buildImplementationPrompt(dispatch, phase);
|
|
530
|
+
const providerPrompt = buildProviderCliPrompt(dispatch, implementationPrompt, context.runtimeEnvironment);
|
|
531
|
+
const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
|
|
282
532
|
const command = buildProviderCliCommand(dispatch, {
|
|
283
533
|
worktreePath: worktree.worktreePath,
|
|
284
|
-
prompt:
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
: buildImplementationPrompt(dispatch, phase),
|
|
289
|
-
completionTools
|
|
534
|
+
prompt: implementationPrompt,
|
|
535
|
+
promptFromStdin: pipePromptToStdin,
|
|
536
|
+
completionTools,
|
|
537
|
+
runtimeEnvironment: context.runtimeEnvironment
|
|
290
538
|
});
|
|
291
539
|
await context.emit({
|
|
292
540
|
role: "runner",
|
|
293
541
|
kind: "checkpoint",
|
|
294
542
|
content: `Starting provider CLI: ${formatProviderCliCommandForCheckpoint(command)} in ${worktree.worktreePath}`,
|
|
295
|
-
eventType: "
|
|
543
|
+
eventType: "provider_cli_starting"
|
|
296
544
|
});
|
|
297
545
|
await context.emit({
|
|
298
546
|
role: "runner",
|
|
@@ -305,30 +553,38 @@ export class ProcessBackedProviderCliService {
|
|
|
305
553
|
eventType: "completion_tools_configured"
|
|
306
554
|
});
|
|
307
555
|
const outputState = createProviderOutputState(dispatch.execution.provider);
|
|
556
|
+
const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
|
|
308
557
|
const liveCompletionEvents = new LiveCompletionArtifactEmitter(worktree.worktreePath, dispatch.workItem.id, phase, developCycle, debugCycle, context.emit);
|
|
309
558
|
let result;
|
|
310
559
|
try {
|
|
311
560
|
liveCompletionEvents.start();
|
|
312
|
-
result = await this.processRunner.run({
|
|
561
|
+
result = await (context.processRunner ?? this.processRunner).run({
|
|
313
562
|
command: command.command,
|
|
314
563
|
args: command.args,
|
|
315
564
|
cwd: worktree.worktreePath,
|
|
316
|
-
env: providerProcessEnv(dispatch)
|
|
565
|
+
env: providerProcessEnv(dispatch, context.runtimeEnvironment),
|
|
566
|
+
stdin: pipePromptToStdin ? providerPrompt : undefined
|
|
317
567
|
}, {
|
|
568
|
+
onStarted: async () => {
|
|
569
|
+
await context.emit({
|
|
570
|
+
role: "runner",
|
|
571
|
+
kind: "checkpoint",
|
|
572
|
+
content: "Provider CLI is supervised and ready.",
|
|
573
|
+
eventType: "provider_cli_started"
|
|
574
|
+
});
|
|
575
|
+
},
|
|
318
576
|
onStdoutLine: async (line) => {
|
|
319
|
-
|
|
320
|
-
await context.emit(event);
|
|
321
|
-
}
|
|
577
|
+
await toolHeartbeat.consume(line);
|
|
322
578
|
}
|
|
323
579
|
}, context.signal);
|
|
324
580
|
}
|
|
325
581
|
finally {
|
|
582
|
+
toolHeartbeat.stop();
|
|
326
583
|
await liveCompletionEvents.stop();
|
|
327
584
|
await cleanupCompletionTools(completionTools, context.emit);
|
|
328
585
|
}
|
|
329
586
|
if (result.exitCode !== 0) {
|
|
330
|
-
|
|
331
|
-
throw new Error(`${command.command} exited ${result.exitCode}${stderr ? `: ${stderr}` : ""}`);
|
|
587
|
+
throw providerCliExitFailure(command.command, result);
|
|
332
588
|
}
|
|
333
589
|
await context.emit({
|
|
334
590
|
role: "runner",
|
|
@@ -338,8 +594,8 @@ export class ProcessBackedProviderCliService {
|
|
|
338
594
|
});
|
|
339
595
|
await emitProviderUsageEvent(context.emit, dispatch, outputState);
|
|
340
596
|
const committed = await commitWorktreeChanges(this.git, worktree.worktreePath, dispatch.workItem.id);
|
|
341
|
-
if (developCycle || debugCycle || phase === "implementation") {
|
|
342
|
-
await pushWorktreeBranch(this.git, worktree.worktreePath, worktree.branchName, context.emit);
|
|
597
|
+
if ((developCycle || debugCycle || phase === "implementation") && providerOwnsBranchPublication(context)) {
|
|
598
|
+
await pushWorktreeBranch(this.git, worktree.worktreePath, worktree.branchName, worktree.repoPath, this.publicationCoordinator, context.signal, context.emit);
|
|
343
599
|
await context.emit({
|
|
344
600
|
role: "runner",
|
|
345
601
|
kind: "checkpoint",
|
|
@@ -397,18 +653,23 @@ export class ProcessBackedProviderCliService {
|
|
|
397
653
|
const specPath = path.join(metadataRoot, "spec.md");
|
|
398
654
|
await fs.writeFile(specPath, specBody, "utf8");
|
|
399
655
|
await fs.writeFile(path.join(metadataRoot, "spec.meta.json"), JSON.stringify({ schema_version: 1, status: "pending_approval", produced_by: "forge-lane-command" }) + "\n", "utf8");
|
|
400
|
-
const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "architect" });
|
|
656
|
+
const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "architect", runtimeEnvironment: context.runtimeEnvironment });
|
|
657
|
+
const architectPrompt = buildArchitectPrompt(dispatch);
|
|
658
|
+
const providerPrompt = buildProviderCliPrompt(dispatch, architectPrompt, context.runtimeEnvironment);
|
|
659
|
+
const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
|
|
401
660
|
const command = buildProviderCliCommand(dispatch, {
|
|
402
661
|
worktreePath: worktree.worktreePath,
|
|
403
|
-
prompt:
|
|
404
|
-
|
|
662
|
+
prompt: architectPrompt,
|
|
663
|
+
promptFromStdin: pipePromptToStdin,
|
|
664
|
+
completionTools,
|
|
665
|
+
runtimeEnvironment: context.runtimeEnvironment
|
|
405
666
|
});
|
|
406
667
|
const commandText = formatProviderCliCommandForCheckpoint(command);
|
|
407
668
|
await context.emit({
|
|
408
669
|
role: "runner",
|
|
409
670
|
kind: "checkpoint",
|
|
410
671
|
content: `Starting provider CLI Architect: ${commandText} in ${worktree.worktreePath}`,
|
|
411
|
-
eventType: "
|
|
672
|
+
eventType: "provider_cli_starting"
|
|
412
673
|
});
|
|
413
674
|
await context.emit({
|
|
414
675
|
role: "runner",
|
|
@@ -417,30 +678,36 @@ export class ProcessBackedProviderCliService {
|
|
|
417
678
|
eventType: "completion_tools_configured"
|
|
418
679
|
});
|
|
419
680
|
const outputState = createProviderOutputState(dispatch.execution.provider);
|
|
681
|
+
const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
|
|
420
682
|
const liveArchitectEvents = new LiveArchitectArtifactEmitter(worktree.worktreePath, dispatch.workItem.id, context.emit);
|
|
421
683
|
let result;
|
|
422
684
|
try {
|
|
423
685
|
liveArchitectEvents.start();
|
|
424
|
-
result = await this.processRunner.run({
|
|
686
|
+
result = await (context.processRunner ?? this.processRunner).run({
|
|
425
687
|
command: command.command,
|
|
426
688
|
args: command.args,
|
|
427
689
|
cwd: worktree.worktreePath,
|
|
428
|
-
env: providerProcessEnv(dispatch)
|
|
690
|
+
env: providerProcessEnv(dispatch, context.runtimeEnvironment),
|
|
691
|
+
stdin: pipePromptToStdin ? providerPrompt : undefined
|
|
429
692
|
}, {
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
693
|
+
onStarted: async () => {
|
|
694
|
+
await context.emit({
|
|
695
|
+
role: "runner",
|
|
696
|
+
kind: "checkpoint",
|
|
697
|
+
content: "Provider CLI Architect is supervised and ready.",
|
|
698
|
+
eventType: "provider_cli_started"
|
|
699
|
+
});
|
|
700
|
+
},
|
|
701
|
+
onStdoutLine: async (line) => await toolHeartbeat.consume(line)
|
|
435
702
|
}, context.signal);
|
|
436
703
|
}
|
|
437
704
|
finally {
|
|
705
|
+
toolHeartbeat.stop();
|
|
438
706
|
await liveArchitectEvents.stop();
|
|
439
707
|
await cleanupCompletionTools(completionTools, context.emit);
|
|
440
708
|
}
|
|
441
709
|
if (result.exitCode !== 0) {
|
|
442
|
-
|
|
443
|
-
throw new Error(`${command.command} exited ${result.exitCode}${stderr ? `: ${stderr}` : ""}`);
|
|
710
|
+
throw providerCliExitFailure(command.command, result);
|
|
444
711
|
}
|
|
445
712
|
await context.emit({
|
|
446
713
|
role: "runner",
|
|
@@ -488,18 +755,23 @@ export class ProcessBackedProviderCliService {
|
|
|
488
755
|
const specPath = path.join(metadataRoot, "spec.md");
|
|
489
756
|
await fs.writeFile(specPath, specBody, "utf8");
|
|
490
757
|
await fs.writeFile(path.join(metadataRoot, "spec.meta.json"), JSON.stringify({ schema_version: 1, status: "approved", produced_by: "forge-lane-command" }) + "\n", "utf8");
|
|
491
|
-
const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "qa" });
|
|
758
|
+
const completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "qa", runtimeEnvironment: context.runtimeEnvironment });
|
|
759
|
+
const qaPrompt = buildQaPrompt(dispatch, specBody);
|
|
760
|
+
const providerPrompt = buildProviderCliPrompt(dispatch, qaPrompt, context.runtimeEnvironment);
|
|
761
|
+
const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
|
|
492
762
|
const command = buildProviderCliCommand(dispatch, {
|
|
493
763
|
worktreePath: worktree.worktreePath,
|
|
494
|
-
prompt:
|
|
495
|
-
|
|
764
|
+
prompt: qaPrompt,
|
|
765
|
+
promptFromStdin: pipePromptToStdin,
|
|
766
|
+
completionTools,
|
|
767
|
+
runtimeEnvironment: context.runtimeEnvironment
|
|
496
768
|
});
|
|
497
769
|
const commandText = formatProviderCliCommandForCheckpoint(command);
|
|
498
770
|
await context.emit({
|
|
499
771
|
role: "runner",
|
|
500
772
|
kind: "checkpoint",
|
|
501
773
|
content: `Starting provider CLI QA: ${commandText} in ${worktree.worktreePath}`,
|
|
502
|
-
eventType: "
|
|
774
|
+
eventType: "provider_cli_starting"
|
|
503
775
|
});
|
|
504
776
|
await context.emit({
|
|
505
777
|
role: "runner",
|
|
@@ -508,30 +780,39 @@ export class ProcessBackedProviderCliService {
|
|
|
508
780
|
eventType: "completion_tools_configured"
|
|
509
781
|
});
|
|
510
782
|
const outputState = createProviderOutputState(dispatch.execution.provider);
|
|
783
|
+
const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
|
|
784
|
+
const verificationProgress = new ManagedVerificationProgressEmitter(context.runtimeEnvironment?.FORGE_LOG_DIR, context.emit);
|
|
511
785
|
const liveQaEvents = new LiveQaArtifactEmitter(worktree.worktreePath, dispatch.workItem.id, dispatch, context.emit);
|
|
512
786
|
let result;
|
|
513
787
|
try {
|
|
514
788
|
liveQaEvents.start();
|
|
515
|
-
|
|
789
|
+
verificationProgress.start();
|
|
790
|
+
result = await (context.processRunner ?? this.processRunner).run({
|
|
516
791
|
command: command.command,
|
|
517
792
|
args: command.args,
|
|
518
793
|
cwd: worktree.worktreePath,
|
|
519
|
-
env: providerProcessEnv(dispatch)
|
|
794
|
+
env: providerProcessEnv(dispatch, context.runtimeEnvironment),
|
|
795
|
+
stdin: pipePromptToStdin ? providerPrompt : undefined
|
|
520
796
|
}, {
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
797
|
+
onStarted: async () => {
|
|
798
|
+
await context.emit({
|
|
799
|
+
role: "runner",
|
|
800
|
+
kind: "checkpoint",
|
|
801
|
+
content: "Provider CLI QA is supervised and ready.",
|
|
802
|
+
eventType: "provider_cli_started"
|
|
803
|
+
});
|
|
804
|
+
},
|
|
805
|
+
onStdoutLine: async (line) => await toolHeartbeat.consume(line)
|
|
526
806
|
}, context.signal);
|
|
527
807
|
}
|
|
528
808
|
finally {
|
|
809
|
+
toolHeartbeat.stop();
|
|
810
|
+
await verificationProgress.stop();
|
|
529
811
|
await liveQaEvents.stop();
|
|
530
812
|
await cleanupCompletionTools(completionTools, context.emit);
|
|
531
813
|
}
|
|
532
814
|
if (result.exitCode !== 0) {
|
|
533
|
-
|
|
534
|
-
throw new Error(`${command.command} exited ${result.exitCode}${stderr ? `: ${stderr}` : ""}`);
|
|
815
|
+
throw providerCliExitFailure(command.command, result);
|
|
535
816
|
}
|
|
536
817
|
await context.emit({
|
|
537
818
|
role: "runner",
|
|
@@ -547,7 +828,7 @@ export class ProcessBackedProviderCliService {
|
|
|
547
828
|
? "Provider CLI QA completed but did not produce the complete durable QA artifact bundle."
|
|
548
829
|
: "Provider CLI QA completed but did not call the Forge QA completion tool.");
|
|
549
830
|
}
|
|
550
|
-
enforceQaBrowserLaunchTargetGate(dispatch, qaArtifact);
|
|
831
|
+
await enforceQaBrowserLaunchTargetGate(dispatch, qaArtifact);
|
|
551
832
|
if (!liveQaEvents.hasEmitted()) {
|
|
552
833
|
await emitQaArtifactRecorded(context.emit, worktree.worktreePath, qaArtifact);
|
|
553
834
|
await emitQaStructuredEvents(context.emit, qaArtifact);
|
|
@@ -581,39 +862,113 @@ export class ProcessBackedProviderCliService {
|
|
|
581
862
|
const { dispatch, worktree } = context;
|
|
582
863
|
const repairChecks = route === "ci_repair" || isPullRequestCheckRepairDispatch(dispatch);
|
|
583
864
|
const addressComments = !repairChecks && isPullRequestCommentsDispatch(dispatch);
|
|
865
|
+
let repairSpec = null;
|
|
866
|
+
let repairEnvironment = context.runtimeEnvironment;
|
|
867
|
+
let completionTools = null;
|
|
868
|
+
if (repairChecks) {
|
|
869
|
+
const metadataRoot = path.join(worktree.worktreePath, ".forge", "work-items", dispatch.workItem.id);
|
|
870
|
+
await fs.mkdir(metadataRoot, { recursive: true });
|
|
871
|
+
const laneCommand = selectLaneCommand(dispatch.artifacts, dispatch.execution.lane, dispatch.cycleRun.phase);
|
|
872
|
+
if (!laneCommand) {
|
|
873
|
+
throw new Error(`CI repair readiness failed: lane command for '${dispatch.execution.lane}' was not resolved, so the approved spec cannot be materialized.`);
|
|
874
|
+
}
|
|
875
|
+
const specBody = buildSpecBody(laneCommand, dispatch.workItem, "ci_repair");
|
|
876
|
+
const specPath = path.join(metadataRoot, "spec.md");
|
|
877
|
+
await fs.writeFile(specPath, specBody, "utf8");
|
|
878
|
+
await fs.writeFile(path.join(metadataRoot, "spec.meta.json"), `${JSON.stringify({ schema_version: 1, status: "approved", produced_by: "forge-lane-command" })}\n`, "utf8");
|
|
879
|
+
repairSpec = {
|
|
880
|
+
repoPath: worktree.worktreePath,
|
|
881
|
+
path: specPath,
|
|
882
|
+
body: specBody,
|
|
883
|
+
producedBy: "forge-lane-command",
|
|
884
|
+
status: "approved",
|
|
885
|
+
};
|
|
886
|
+
const readiness = await writeCiRepairReadinessManifest(dispatch, worktree.worktreePath, specPath, context.runtimeEnvironment);
|
|
887
|
+
repairEnvironment = readiness.environment;
|
|
888
|
+
completionTools = await prepareCompletionToolRuntime({ dispatch, worktree, phase: "ci_repair", runtimeEnvironment: repairEnvironment });
|
|
889
|
+
await context.emit({
|
|
890
|
+
role: "runner",
|
|
891
|
+
kind: "checkpoint",
|
|
892
|
+
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.`,
|
|
893
|
+
eventType: "ci_repair_readiness_ready",
|
|
894
|
+
});
|
|
895
|
+
await context.emit({
|
|
896
|
+
role: "runner",
|
|
897
|
+
kind: "checkpoint",
|
|
898
|
+
content: "Forge CI repair completion tool configured; provider must call forge.complete_ci_repair before Bridge-owned commit and push.",
|
|
899
|
+
eventType: "completion_tools_configured",
|
|
900
|
+
});
|
|
901
|
+
}
|
|
902
|
+
const repairPrompt = repairChecks
|
|
903
|
+
? buildPullRequestCheckRepairPrompt(dispatch, worktree.branchName)
|
|
904
|
+
: addressComments
|
|
905
|
+
? buildPullRequestCommentsPrompt(dispatch, worktree.branchName)
|
|
906
|
+
: buildConflictResolvePrompt(dispatch, worktree.branchName);
|
|
907
|
+
const providerPrompt = buildProviderCliPrompt(dispatch, repairPrompt, repairEnvironment);
|
|
908
|
+
const pipePromptToStdin = shouldPipePromptToStdin(dispatch.execution.provider, providerPrompt, usesManagedWindowsHost(dispatch));
|
|
584
909
|
const command = buildProviderCliCommand(dispatch, {
|
|
585
910
|
worktreePath: worktree.worktreePath,
|
|
586
|
-
prompt:
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
: buildConflictResolvePrompt(dispatch, worktree.branchName)
|
|
911
|
+
prompt: repairPrompt,
|
|
912
|
+
promptFromStdin: pipePromptToStdin,
|
|
913
|
+
completionTools: completionTools ?? undefined,
|
|
914
|
+
runtimeEnvironment: repairEnvironment
|
|
591
915
|
});
|
|
592
916
|
await context.emit({
|
|
593
917
|
role: "runner",
|
|
594
918
|
kind: "checkpoint",
|
|
595
919
|
content: `Starting provider CLI ${repairChecks ? "CI repair" : addressComments ? "PR comment address" : "conflict resolve"}: ${formatProviderCliCommandForCheckpoint(command)} in ${worktree.worktreePath}`,
|
|
596
|
-
eventType: "
|
|
920
|
+
eventType: "provider_cli_starting"
|
|
597
921
|
});
|
|
598
922
|
const outputState = createProviderOutputState(dispatch.execution.provider);
|
|
599
|
-
const
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
923
|
+
const toolHeartbeat = new ProviderToolActivityHeartbeat(outputState, context.emit, this.providerToolHeartbeatIntervalMs);
|
|
924
|
+
let result;
|
|
925
|
+
try {
|
|
926
|
+
result = await (context.processRunner ?? this.processRunner).run({
|
|
927
|
+
command: command.command,
|
|
928
|
+
args: command.args,
|
|
929
|
+
cwd: worktree.worktreePath,
|
|
930
|
+
env: providerProcessEnv(dispatch, repairEnvironment),
|
|
931
|
+
stdin: pipePromptToStdin ? providerPrompt : undefined
|
|
932
|
+
}, {
|
|
933
|
+
onStarted: async () => {
|
|
934
|
+
await context.emit({
|
|
935
|
+
role: "runner",
|
|
936
|
+
kind: "checkpoint",
|
|
937
|
+
content: `Provider CLI ${repairChecks ? "CI repair" : addressComments ? "PR comment address" : "conflict resolve"} is supervised and ready.`,
|
|
938
|
+
eventType: "provider_cli_started"
|
|
939
|
+
});
|
|
940
|
+
},
|
|
941
|
+
onStdoutLine: async (line) => {
|
|
942
|
+
await toolHeartbeat.consume(line);
|
|
608
943
|
}
|
|
944
|
+
}, context.signal);
|
|
945
|
+
}
|
|
946
|
+
finally {
|
|
947
|
+
toolHeartbeat.stop();
|
|
948
|
+
if (completionTools) {
|
|
949
|
+
await cleanupCompletionTools(completionTools, context.emit);
|
|
609
950
|
}
|
|
610
|
-
}
|
|
951
|
+
}
|
|
611
952
|
if (result.exitCode !== 0) {
|
|
612
|
-
|
|
613
|
-
|
|
953
|
+
throw providerCliExitFailure(command.command, result);
|
|
954
|
+
}
|
|
955
|
+
let repairArtifact = null;
|
|
956
|
+
if (repairChecks) {
|
|
957
|
+
repairArtifact = await readCompletionArtifact(worktree.worktreePath, dispatch.workItem.id, "ci_repair");
|
|
958
|
+
if (!repairArtifact) {
|
|
959
|
+
throw new Error("Provider CLI completed but did not call forge.complete_ci_repair. Forge did not commit or push the repair.");
|
|
960
|
+
}
|
|
961
|
+
if ((repairArtifact.status ?? "").trim().toLowerCase() !== "pass") {
|
|
962
|
+
throw new Error(`CI repair completion gate recorded ${repairArtifact.status}; Forge did not commit or push the repair.`);
|
|
963
|
+
}
|
|
964
|
+
await emitCompletionArtifactRecorded(context.emit, worktree.worktreePath, repairArtifact);
|
|
965
|
+
await emitPhaseCompletionEvent(context.emit, repairArtifact);
|
|
966
|
+
await emitPhaseGateEvents(context.emit, repairArtifact);
|
|
614
967
|
}
|
|
615
968
|
const committed = await commitWorktreeChanges(this.git, worktree.worktreePath, dispatch.workItem.id);
|
|
616
|
-
|
|
969
|
+
if (providerOwnsBranchPublication(context)) {
|
|
970
|
+
await pushWorktreeBranch(this.git, worktree.worktreePath, worktree.branchName, worktree.repoPath, this.publicationCoordinator, context.signal, context.emit);
|
|
971
|
+
}
|
|
617
972
|
await emitProviderUsageEvent(context.emit, dispatch, outputState);
|
|
618
973
|
await context.emit({
|
|
619
974
|
role: "assistant",
|
|
@@ -630,7 +985,10 @@ export class ProcessBackedProviderCliService {
|
|
|
630
985
|
? `${dispatch.execution.provider} CLI repaired PR checks on ${worktree.branchName} (${committed.commitSha.slice(0, 12)}).`
|
|
631
986
|
: addressComments
|
|
632
987
|
? `${dispatch.execution.provider} CLI addressed PR comments on ${worktree.branchName} (${committed.commitSha.slice(0, 12)}).`
|
|
633
|
-
: `${dispatch.execution.provider} CLI resolved conflicts on ${worktree.branchName} (${committed.commitSha.slice(0, 12)})
|
|
988
|
+
: `${dispatch.execution.provider} CLI resolved conflicts on ${worktree.branchName} (${committed.commitSha.slice(0, 12)}).`,
|
|
989
|
+
spec: repairSpec,
|
|
990
|
+
artifact: repairArtifact,
|
|
991
|
+
artifacts: repairArtifact ? [repairArtifact] : [],
|
|
634
992
|
};
|
|
635
993
|
}
|
|
636
994
|
}
|
|
@@ -696,8 +1054,12 @@ function clipFileName(fileName, maxLength) {
|
|
|
696
1054
|
return `${stem.slice(0, maxStemLength)}${extension}`;
|
|
697
1055
|
}
|
|
698
1056
|
const providerPromptStdinThreshold = 8_000;
|
|
699
|
-
function shouldPipePromptToStdin(provider, prompt) {
|
|
700
|
-
return provider.trim().toLowerCase() === "codex"
|
|
1057
|
+
function shouldPipePromptToStdin(provider, prompt, force = false) {
|
|
1058
|
+
return provider.trim().toLowerCase() === "codex"
|
|
1059
|
+
&& (force || Buffer.byteLength(prompt, "utf8") > providerPromptStdinThreshold);
|
|
1060
|
+
}
|
|
1061
|
+
function usesManagedWindowsHost(dispatch) {
|
|
1062
|
+
return process.platform === "win32" && dispatch.sandbox?.executionMode === "host";
|
|
701
1063
|
}
|
|
702
1064
|
function isFakeWorkerModel(model) {
|
|
703
1065
|
return model.trim().toLowerCase() === fakeWorkerModel;
|