@loucompanion/forge-bridge 0.1.3-dev.04a84914da09 → 0.1.3-dev.6e59f152916f

package/dist/session/phase-completion.js

@@ -308,10 +308,7 @@ export async function prepareCompletionToolRuntime(options) {
         qaCycle: usesQaCycleCompletion(options.dispatch),
         debugCycle: usesDebugCycleCompletion(options.dispatch),
         architectCycle: usesArchitectCycleCompletion(options.dispatch),
-        draftCycle: (phase === "draft"
-            || options.dispatch.execution.lane.trim().toLowerCase() === "draft"
-            || options.dispatch.cycleRun.kind.trim().toLowerCase() === "draft")
-            && !isDecomposeDispatch(options.dispatch),
+        draftCycle: (options.dispatch.execution.lane.trim().toLowerCase() === "draft" || options.dispatch.cycleRun.kind.trim().toLowerCase() === "draft") && !isDecomposeDispatch(options.dispatch),
         decomposeCycle: isDecomposeDispatch(options.dispatch)
     });
     const runtime = {
@@ -442,9 +439,9 @@ Complete the Draft cycle in order inside this same provider session:
 2. Follow the returned repo-context instruction, inspect selected project/repo assumptions, then call \`forge.complete_draft_repo_context(...)\`.
 3. Follow the returned graph-context instruction, account for DAG/dependency placement, then call \`forge.complete_draft_graph_context(...)\`.
 4. Follow the returned product-scope instruction, choose product scope for the selected project, then call \`forge.complete_draft_product_scope(...)\`.
-5. Follow the returned work-order-plan instruction, draft the requested final JSON shape and any candidate boundaries, then call \`forge.complete_draft_work_order_plan(...)\`.
+5. Follow the returned work-order-plan instruction, draft Work Order fields and candidate feature boundaries, then call \`forge.complete_draft_work_order_plan(...)\`.
 6. Follow the returned critic instruction, critique literalism, wrong-project scope, and decomposition quality, then call \`forge.complete_draft_critic(...)\`.
-7. Follow the returned proposal instruction, then call \`forge.complete_draft_proposal(...)\` with the final Draft JSON payload in \`draft_json\`.
+7. Follow the returned proposal instruction, then call \`forge.complete_draft_proposal(...)\` with the final Work Order JSON in \`draft_json\`.
 The final proposal tool writes \`draft.proposal.json\` under \`.forge/work-items/{workItemId}/artifacts/\`. Reporting Draft completion in prose is not enough.`;
 }
 export function completionPromptForDecomposeCycle(currentGate = "decompose_subject_intake") {
@@ -799,7 +796,11 @@ async function writeDraftGateCompletionArtifact(config, gate, toolName, input) {
     const status = normalizeDraftStatus(optionalString(payload, "status") ?? "pass");
     if (gate === "draft_proposal") {
         const draftJson = asRecord(payload["draft_json"], "draft_json");
-        validateDraftProposalJson(draftJson);
+        for (const key of ["title", "summary", "objective", "planningPacket", "decompositionContext"]) {
+            if (typeof draftJson[key] !== "string" || draftJson[key].trim().length === 0) {
+                throw new Error(`draft_json.${key}: expected non-empty string`);
+            }
+        }
     }
     const redactedPayload = redactSecrets({ ...payload, status, phase: "draft", gate, tool_name: toolName }, config.redactionSecrets ?? []);
     const root = artifactRootFor(config.worktreePath, config.workItemId);
@@ -827,22 +828,6 @@ function normalizeDraftStatus(value) {
     const normalized = value.trim().toLowerCase();
     return normalized === "blocked" || normalized === "needs_revision" || normalized === "needs_rework" ? normalized : "pass";
 }
-function validateDraftProposalJson(draftJson) {
-    if (isDecompositionDraftJson(draftJson)) {
-        return;
-    }
-    for (const key of ["title", "summary", "objective", "planningPacket", "decompositionContext"]) {
-        if (typeof draftJson[key] !== "string" || draftJson[key].trim().length === 0) {
-            throw new Error(`draft_json.${key}: expected non-empty string`);
-        }
-    }
-}
-function isDecompositionDraftJson(draftJson) {
-    const summary = draftJson["summary"];
-    return typeof summary === "string"
-        && summary.trim().length > 0
-        && Array.isArray(draftJson["candidates"]);
-}
 export async function writeCompletionArtifact(config, toolName, input) {
     const phase = phaseFromToolName(toolName);
     if (phase !== config.phase) {

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

@@ -241,110 +241,91 @@ export class ProcessBackedProviderCliService {
             else {
                 context.signal?.addEventListener("abort", abortProvider, { once: true });
             }
-            try {
-                const runPromise = this.processRunner.run({
-                    command: command.command,
-                    args: command.args,
-                    cwd: tempDir,
-                    env: providerProcessEnv(dispatch)
-                }, {
-                    onStdoutLine: async (line) => {
-                        for (const event of outputState.consume(line)) {
-                            await context.emit(event);
-                        }
-                    }
-                }, providerCancellation.signal);
-                const artifactWaitCancellation = new AbortController();
-                const abortArtifactWait = () => artifactWaitCancellation.abort();
-                if (context.signal?.aborted) {
-                    abortArtifactWait();
-                }
-                else {
-                    context.signal?.addEventListener("abort", abortArtifactWait, { once: true });
-                }
-                const artifactWaitPromise = waitForCompletionArtifact(tempDir, dispatch.workItem.id, decomposeDraft ? "decompose" : "draft", artifactWaitCancellation.signal);
-                let result;
-                let earlyProposalArtifact = null;
-                try {
-                    const terminal = await Promise.race([
-                        runPromise.then(value => ({ kind: "process", value })),
-                        artifactWaitPromise.then(value => ({ kind: "artifact", value }))
-                    ]);
-                    artifactWaitCancellation.abort();
-                    await artifactWaitPromise.catch(() => undefined);
-                    if (terminal.kind === "artifact") {
-                        earlyProposalArtifact = terminal.value;
-                        providerCancellation.abort();
-                        result = await runPromise.catch(() => ({ exitCode: 0, stdout: "", stderr: "" }));
-                    }
-                    else {
-                        result = terminal.value;
+            const runPromise = this.processRunner.run({
+                command: command.command,
+                args: command.args,
+                cwd: tempDir,
+                env: providerProcessEnv(dispatch)
+            }, {
+                onStdoutLine: async (line) => {
+                    for (const event of outputState.consume(line)) {
+                        await context.emit(event);
                     }
                 }
-                finally {
-                    artifactWaitCancellation.abort();
-                    context.signal?.removeEventListener("abort", abortArtifactWait);
-                }
-                if (result.exitCode !== 0 && !earlyProposalArtifact) {
-                    throw new Error(`Provider CLI exited with code ${result.exitCode}${summarizeStderr(result.stderr)}.`);
+            }, providerCancellation.signal);
+            let result;
+            let earlyProposalArtifact = null;
+            {
+                const terminal = await Promise.race([
+                    runPromise.then(value => ({ kind: "process", value })),
+                    waitForCompletionArtifact(tempDir, dispatch.workItem.id, decomposeDraft ? "decompose" : "draft", context.signal).then(value => ({ kind: "artifact", value }))
+                ]);
+                if (terminal.kind === "artifact") {
+                    earlyProposalArtifact = terminal.value;
+                    providerCancellation.abort();
+                    result = await runPromise.catch(() => ({ exitCode: 0, stdout: "", stderr: "" }));
                 }
-                await context.emit({
-                    role: "runner",
-                    kind: "checkpoint",
-                    content: `Provider CLI Draft completed: ${command.command} exit ${result.exitCode}${outputState.sessionLabel ? ` ${outputState.sessionLabel}` : ""}.`,
-                    eventType: "provider_cli_completed"
-                });
-                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");
-                    if (!proposalArtifact) {
-                        throw new Error("Provider CLI Decompose completed but did not call forge.complete_decompose_proposal.");
-                    }
-                    const proposal = parseJsonLine(proposalArtifact.verdictJson) ?? {};
-                    const proposalJson = proposal["proposal_json"] ?? proposal["decomposition_json"];
-                    if (!proposalJson || typeof proposalJson !== "object" || Array.isArray(proposalJson)) {
-                        throw new Error("Provider CLI Decompose completed but decompose.proposal.json did not contain proposal_json.");
-                    }
-                    const json = JSON.stringify(proposalJson);
-                    await context.emit({
-                        role: "assistant",
-                        kind: "message",
-                        content: json,
-                        eventType: "decompose_proposal"
-                    });
-                    return {
-                        summary: "Decomposition proposal generated through Forge Decompose completion cycle.",
-                        artifact: proposalArtifact,
-                        artifacts: [proposalArtifact]
-                    };
+                else {
+                    result = terminal.value;
                 }
-                await emitDraftGateArtifacts(context.emit, tempDir, dispatch.workItem.id);
-                const proposalArtifact = earlyProposalArtifact ?? await readCompletionArtifact(tempDir, dispatch.workItem.id, "draft");
+            }
+            context.signal?.removeEventListener("abort", abortProvider);
+            if (result.exitCode !== 0 && !earlyProposalArtifact) {
+                throw new Error(`Provider CLI exited with code ${result.exitCode}${summarizeStderr(result.stderr)}.`);
+            }
+            await context.emit({
+                role: "runner",
+                kind: "checkpoint",
+                content: `Provider CLI Draft completed: ${command.command} exit ${result.exitCode}${outputState.sessionLabel ? ` ${outputState.sessionLabel}` : ""}.`,
+                eventType: "provider_cli_completed"
+            });
+            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");
                 if (!proposalArtifact) {
-                    throw new Error("Provider CLI Draft completed but did not call forge.complete_draft_proposal.");
+                    throw new Error("Provider CLI Decompose completed but did not call forge.complete_decompose_proposal.");
                 }
                 const proposal = parseJsonLine(proposalArtifact.verdictJson) ?? {};
-                const draftJson = proposal["draft_json"];
-                if (!draftJson || typeof draftJson !== "object" || Array.isArray(draftJson)) {
-                    throw new Error("Provider CLI Draft completed but draft.proposal.json did not contain draft_json.");
+                const proposalJson = proposal["proposal_json"] ?? proposal["decomposition_json"];
+                if (!proposalJson || typeof proposalJson !== "object" || Array.isArray(proposalJson)) {
+                    throw new Error("Provider CLI Decompose completed but decompose.proposal.json did not contain proposal_json.");
                 }
-                const json = JSON.stringify(draftJson);
+                const json = JSON.stringify(proposalJson);
                 await context.emit({
                     role: "assistant",
                     kind: "message",
                     content: json,
-                    eventType: "draft_complete"
+                    eventType: "decompose_proposal"
                 });
                 return {
-                    summary: "Draft generated through Forge Draft completion cycle.",
+                    summary: "Decomposition proposal generated through Forge Decompose completion cycle.",
                     artifact: proposalArtifact,
                     artifacts: [proposalArtifact]
                 };
             }
-            finally {
-                context.signal?.removeEventListener("abort", abortProvider);
+            await emitDraftGateArtifacts(context.emit, tempDir, dispatch.workItem.id);
+            const proposalArtifact = earlyProposalArtifact ?? await readCompletionArtifact(tempDir, dispatch.workItem.id, "draft");
+            if (!proposalArtifact) {
+                throw new Error("Provider CLI Draft completed but did not call forge.complete_draft_proposal.");
             }
+            const proposal = parseJsonLine(proposalArtifact.verdictJson) ?? {};
+            const draftJson = proposal["draft_json"];
+            if (!draftJson || typeof draftJson !== "object" || Array.isArray(draftJson)) {
+                throw new Error("Provider CLI Draft completed but draft.proposal.json did not contain draft_json.");
+            }
+            const json = JSON.stringify(draftJson);
+            await context.emit({
+                role: "assistant",
+                kind: "message",
+                content: json,
+                eventType: "draft_complete"
+            });
+            return {
+                summary: "Draft generated through Forge Draft completion cycle.",
+                artifact: proposalArtifact,
+                artifacts: [proposalArtifact]
+            };
         }
         finally {
             await cleanupCompletionTools(completionTools, context.emit);
@@ -2187,33 +2168,10 @@ async function waitForCompletionArtifact(worktreePath, workItemId, phase, signal
         if (artifact) {
             return artifact;
         }
-        await delay(1000, signal);
+        await new Promise((resolve) => setTimeout(resolve, 1000));
     }
     throw new Error(`${phase} proposal artifact wait was cancelled.`);
 }
-async function delay(ms, signal) {
-    if (!signal) {
-        await new Promise((resolve) => setTimeout(resolve, ms));
-        return;
-    }
-    const abortSignal = signal;
-    if (abortSignal.aborted) {
-        return;
-    }
-    await new Promise((resolve) => {
-        const timeout = setTimeout(done, ms);
-        const abort = () => done();
-        function done() {
-            clearTimeout(timeout);
-            abortSignal.removeEventListener("abort", abort);
-            resolve();
-        }
-        abortSignal.addEventListener("abort", abort, { once: true });
-        if (abortSignal.aborted) {
-            done();
-        }
-    });
-}
 function deterministicDraftPayload(dispatch) {
     const kind = dispatch.draft?.kind ?? "work_item";
     if (kind === "work_order_decomposition") {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const forgeBridgeVersion = "0.1.3-dev.04a84914da09";
+export declare const forgeBridgeVersion = "0.1.3-dev.6e59f152916f";

package/dist/version.js

@@ -1 +1 @@
-export const forgeBridgeVersion = "0.1.3-dev.04a84914da09";
+export const forgeBridgeVersion = "0.1.3-dev.6e59f152916f";

package/package.json

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