@loucompanion/forge-bridge 0.1.3-dev.d1ca67076aa9 → 0.1.3-dev.eeefdb0d19c1

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

@@ -1,9 +1,11 @@
 import { execFile, spawn } from "node:child_process";
+import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import readline from "node:readline";
 import { promisify } from "node:util";
 import { resolveCursorAgentDirectLaunch } from "../../shared/cursor-agent/cursor-agent.launch.js";
+import { persistHostProcessSupervisorMetadata, resolveHostProcessSupervisedLaunch, terminateHostProcessTree, } from "../../shared/process/host-process-supervisor.js";
 import { buildWindowsLaunchCommand } from "../../shared/process/windows-launch.js";
 const execFileAsync = promisify(execFile);
 const allowedProviderParentEnvNames = [
@@ -137,24 +139,35 @@ function setEnvironmentValueIfMissing(env, name, value) {
 }
 export class StreamingProviderProcessRunner {
     async run(request, handlers = {}, signal) {
-        const launch = await resolveProviderProcessLaunch(request.command, request.args);
+        const providerLaunch = await resolveProviderProcessLaunch(request.command, request.args);
+        const supervisedLaunch = resolveHostProcessSupervisedLaunch(request, providerLaunch.command, providerLaunch.args);
+        const launch = supervisedLaunch ?? { ...providerLaunch, detached: false };
         return await new Promise((resolve, reject) => {
+            const rootCreatedAt = new Date().toISOString();
             const child = spawn(launch.command, launch.args, {
                 cwd: request.cwd,
                 env: buildProviderChildEnvironment(request.env),
-                stdio: ["ignore", "pipe", "pipe"],
-                windowsHide: true
+                stdio: [request.stdin === undefined ? "ignore" : "pipe", "pipe", "pipe"],
+                windowsHide: true,
+                detached: launch.detached,
             });
+            let termination = null;
+            const terminate = () => {
+                termination ??= terminateHostProcessTree(child, supervisedLaunch);
+                return termination;
+            };
             const childStdout = child.stdout;
             const childStderr = child.stderr;
             if (!childStdout || !childStderr) {
-                child.kill("SIGTERM");
+                void terminate();
                 reject(new Error("Provider process stdout/stderr streams were not piped."));
                 return;
             }
             let stdout = "";
             let stderr = "";
             let settled = false;
+            let closed = false;
+            let readiness = null;
             const cleanup = () => {
                 signal?.removeEventListener("abort", abort);
             };
@@ -164,15 +177,14 @@ export class StreamingProviderProcessRunner {
                 }
                 settled = true;
                 cleanup();
+                void terminate().catch(() => undefined);
                 reject(error);
             };
             const abort = () => {
-                try {
-                    child.kill("SIGTERM");
-                }
-                catch {
-                    // Best effort; close/error will settle the promise.
-                }
+                // Cancellation is not a launch failure when the supervised tree can be
+                // proven stopped. Let the close handler settle the command after exact
+                // termination; only a failed termination proof rejects the run.
+                void terminate().catch(fail);
             };
             if (signal?.aborted) {
                 abort();
@@ -181,18 +193,66 @@ export class StreamingProviderProcessRunner {
                 signal?.addEventListener("abort", abort, { once: true });
             }
             child.on("error", fail);
+            child.once("spawn", () => {
+                readiness = (async () => {
+                    const providerReady = supervisedLaunch?.strategy === "windows_job_object"
+                        ? await waitForWindowsProviderReady(supervisedLaunch, signal, () => closed)
+                        : undefined;
+                    if (supervisedLaunch) {
+                        persistHostProcessSupervisorMetadata(supervisedLaunch, request, child.pid ?? 0, rootCreatedAt, providerReady);
+                    }
+                    await handlers.onStarted?.();
+                    if (supervisedLaunch?.strategy === "windows_job_object") {
+                        grantWindowsProviderStart(supervisedLaunch);
+                    }
+                })();
+                void readiness.catch(error => {
+                    if (!closed && !signal?.aborted)
+                        fail(error);
+                });
+            });
+            const writeProviderInput = () => {
+                if (request.stdin === undefined)
+                    return;
+                if (!child.stdin) {
+                    void terminate();
+                    fail(new Error("Provider process stdin stream was not piped."));
+                    return;
+                }
+                child.stdin.on("error", (error) => {
+                    void terminate();
+                    fail(error);
+                });
+                child.stdin.end(request.stdin, "utf8");
+            };
+            if (request.stdin !== undefined) {
+                if (supervisedLaunch?.strategy === "windows_job_object") {
+                    // The outer supervisor must receive stdin before it can launch the
+                    // inner provider. Its start-grant file prevents prompt delivery.
+                    writeProviderInput();
+                }
+                else {
+                    child.once("spawn", () => {
+                        void readiness?.then(writeProviderInput).catch(fail);
+                    });
+                }
+            }
             const readers = [
                 readProcessLines(childStdout, (line) => {
-                    stdout += `${line}\n`;
+                    if (request.captureOutput !== false)
+                        stdout += `${line}\n`;
                     return handlers.onStdoutLine?.(line);
                 }),
                 readProcessLines(childStderr, (line) => {
-                    stderr += `${line}\n`;
+                    if (request.captureOutput !== false)
+                        stderr += `${line}\n`;
                     return handlers.onStderrLine?.(line);
                 })
             ];
             child.on("close", (code) => {
-                Promise.allSettled(readers).then((readerResults) => {
+                closed = true;
+                Promise.allSettled(readers).then(async (readerResults) => {
+                    await readiness?.catch(() => undefined);
                     const rejected = readerResults.find((result) => result.status === "rejected");
                     if (rejected?.status === "rejected") {
                         fail(rejected.reason);
@@ -201,6 +261,18 @@ export class StreamingProviderProcessRunner {
                     if (settled) {
                         return;
                     }
+                    try {
+                        if (supervisedLaunch?.strategy === "unix_process_group") {
+                            await terminate();
+                        }
+                        else if (termination) {
+                            await termination;
+                        }
+                    }
+                    catch (error) {
+                        fail(error);
+                        return;
+                    }
                     settled = true;
                     cleanup();
                     resolve({
@@ -222,12 +294,115 @@ async function resolveProviderProcessLaunch(command, args) {
         return cursorDirect;
     }
     const resolved = await resolveWindowsCommand(command);
-    return resolved ? buildWindowsLaunchCommand(resolved, args) : { command, args };
+    if (!resolved) {
+        return { command, args };
+    }
+    return resolveCodexNpmDirectLaunch(resolved, args)
+        ?? resolvePackageManagerDirectLaunch(resolved, args)
+        ?? buildWindowsLaunchCommand(resolved, args);
+}
+function grantWindowsProviderStart(launch) {
+    if (!launch.startGrantPath) {
+        throw new Error("host_process_supervisor_invalid: Windows provider start-grant path was not assigned.");
+    }
+    fs.writeFileSync(launch.startGrantPath, "granted\n", {
+        encoding: "utf8",
+        flag: "wx",
+        mode: 0o600,
+    });
+}
+async function waitForWindowsProviderReady(launch, signal, isClosed) {
+    const readyPath = launch.readyPath;
+    if (!readyPath) {
+        throw new Error("host_process_supervisor_invalid: Windows provider-ready path was not assigned.");
+    }
+    while (true) {
+        try {
+            const parsed = JSON.parse(await fs.promises.readFile(readyPath, "utf8"));
+            if (parsed.schemaVersion !== 1
+                || parsed.supervisorId !== launch.supervisorId
+                || !Number.isSafeInteger(parsed.rootPid)
+                || (parsed.rootPid ?? 0) <= 0
+                || typeof parsed.rootIdentity !== "string"
+                || !/^win32:\d+$/u.test(parsed.rootIdentity)
+                || !Number.isSafeInteger(parsed.providerPid)
+                || (parsed.providerPid ?? 0) <= 0
+                || typeof parsed.providerCreatedAt !== "string"
+                || Number.isNaN(Date.parse(parsed.providerCreatedAt))
+                || (parsed.providerIdentity !== undefined
+                    && (typeof parsed.providerIdentity !== "string" || !/^win32:\d+$/u.test(parsed.providerIdentity)))
+                || !Number.isSafeInteger(parsed.startAttempt)
+                || (parsed.startAttempt ?? 0) < 1) {
+                throw new Error("host_process_supervisor_invalid: provider-ready receipt was invalid.");
+            }
+            return parsed;
+        }
+        catch (error) {
+            if (error.code !== "ENOENT")
+                throw error;
+        }
+        if (isClosed()) {
+            throw new Error("host_process_supervisor_start_failed: supervisor exited before the provider became ready.");
+        }
+        if (signal?.aborted) {
+            throw signal.reason instanceof Error ? signal.reason : new Error("Provider process launch was aborted.");
+        }
+        await new Promise(resolve => setTimeout(resolve, 25));
+    }
+}
+export function resolveCodexNpmDirectLaunch(commandPath, args) {
+    const extension = path.extname(commandPath).toLowerCase();
+    if ((extension !== ".cmd" && extension !== ".ps1")
+        || path.basename(commandPath, extension).toLowerCase() !== "codex") {
+        return null;
+    }
+    const entryPoint = path.join(path.dirname(commandPath), "node_modules", "@openai", "codex", "bin", "codex.js");
+    return fs.existsSync(entryPoint)
+        ? { command: process.execPath, args: [entryPoint, ...args] }
+        : null;
+}
+/**
+ * Avoids cmd.exe's nested-quote handling for package-manager shims. That
+ * quoting loses executable paths containing spaces after the command is
+ * wrapped by the Windows Job Object supervisor.
+ */
+export function resolvePackageManagerDirectLaunch(commandPath, args) {
+    const extension = path.extname(commandPath).toLowerCase();
+    if (extension !== ".cmd" && extension !== ".ps1")
+        return null;
+    const packageManager = path.basename(commandPath, extension).toLowerCase();
+    if (!["npm", "npx", "pnpm", "pnpx", "yarn", "yarnpkg"].includes(packageManager))
+        return null;
+    const root = path.dirname(commandPath);
+    const candidates = [
+        path.join(root, "node_modules", "corepack", "dist", `${packageManager}.js`),
+        ...(packageManager === "npm" || packageManager === "npx"
+            ? [path.join(root, "node_modules", "npm", "bin", `${packageManager}-cli.js`)]
+            : []),
+        ...(packageManager === "pnpm" || packageManager === "pnpx"
+            ? [path.join(root, "node_modules", "pnpm", "bin", `${packageManager}.cjs`)]
+            : []),
+        ...(packageManager === "yarn" || packageManager === "yarnpkg"
+            ? [path.join(root, "node_modules", "yarn", "bin", "yarn.js")]
+            : []),
+    ];
+    const entryPoint = candidates.find(candidate => fs.existsSync(candidate));
+    if (!entryPoint)
+        return null;
+    const adjacentNode = path.join(root, "node.exe");
+    return {
+        command: fs.existsSync(adjacentNode) ? adjacentNode : process.execPath,
+        args: [entryPoint, ...args],
+    };
 }
 async function resolveWindowsCommand(command) {
     if (path.isAbsolute(command)) {
         return command;
     }
+    const resolvedFromPath = resolveWindowsCommandFromPath(command);
+    if (resolvedFromPath) {
+        return resolvedFromPath;
+    }
     try {
         const result = await execFileAsync("where.exe", [command], { timeout: 2000 });
         return chooseWindowsCommandCandidate(result.stdout.split(/\r?\n/));
@@ -236,6 +411,40 @@ async function resolveWindowsCommand(command) {
         return null;
     }
 }
+/**
+ * Resolves Windows commands without spawning where.exe. Runtime launches can
+ * happen while the machine is under enough process pressure for where.exe to
+ * miss its timeout; returning the unresolved package-manager name in that case
+ * makes Node fall back to a shell shim that cannot survive Job Object wrapping.
+ */
+export function resolveWindowsCommandFromPath(command, pathValue = process.env.PATH ?? "", pathExtValue = process.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD") {
+    if (!command || path.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
+        return null;
+    }
+    const hasExtension = path.extname(command).length > 0;
+    const extensions = hasExtension
+        ? [""]
+        : [...new Set([
+                "",
+                ".exe",
+                ".ps1",
+                ".cmd",
+                ".bat",
+                ...pathExtValue.split(";").map(value => value.trim().toLowerCase()).filter(Boolean),
+            ])];
+    const candidates = [];
+    for (const rawDirectory of pathValue.split(path.delimiter)) {
+        const directory = rawDirectory.trim().replace(/^"|"$/gu, "");
+        if (!directory)
+            continue;
+        for (const extension of extensions) {
+            const candidate = path.join(directory, `${command}${extension}`);
+            if (fs.existsSync(candidate))
+                candidates.push(candidate);
+        }
+    }
+    return chooseWindowsCommandCandidate(candidates);
+}
 export function chooseWindowsCommandCandidate(candidates) {
     const normalized = candidates
         .map((candidate) => candidate.trim())

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

@@ -2,18 +2,30 @@ import { completionPhaseFromDispatch, type CompletionToolRuntime } from "../phas
 import type { RunOnceDispatchPacket } from "../session.types.js";
 import type { ProviderCliCommand } from "./provider-cli.process.js";
 export declare function buildDraftSpec(dispatch: RunOnceDispatchPacket): string;
-export declare function buildDraftPrompt(dispatch: RunOnceDispatchPacket): string;
+export interface DraftAttachmentPromptReference {
+    readonly index: number;
+    readonly path: string;
+}
+export declare function buildDraftPrompt(dispatch: RunOnceDispatchPacket, options?: {
+    readonly attachmentReferences?: readonly DraftAttachmentPromptReference[];
+}): string;
+export declare function durableDraftInput(dispatch: RunOnceDispatchPacket): RunOnceDispatchPacket["draft"];
 export declare function isDecomposeDraftKind(kind: string | null | undefined): boolean;
 export declare function isDecomposeDraftDispatch(dispatch: RunOnceDispatchPacket): boolean;
 export declare function formatProviderCliCommand(command: ProviderCliCommand): string;
+export declare function formatProviderCliCommandForCheckpoint(command: ProviderCliCommand): string;
 export declare function singleLine(value: string): string;
 export declare function buildProviderCliCommand(dispatch: RunOnceDispatchPacket, run?: {
     readonly prompt?: string;
+    readonly promptFromStdin?: boolean;
     readonly worktreePath?: string;
     readonly completionTools?: CompletionToolRuntime;
     readonly skipGitRepoCheck?: boolean;
+    readonly imagePaths?: readonly string[];
+    readonly runtimeEnvironment?: Readonly<Record<string, string>>;
 }): ProviderCliCommand;
-export declare function codexSandboxModeForPlatform(platform?: NodeJS.Platform): "workspace-write" | "danger-full-access";
+export declare function buildProviderCliPrompt(dispatch: RunOnceDispatchPacket, prompt: string, runtimeEnvironment?: Readonly<Record<string, string>>): string;
+export declare function codexSandboxModeForPlatform(platform?: NodeJS.Platform, executionMode?: string): "workspace-write" | "danger-full-access";
 export declare function buildArchitectPrompt(dispatch: RunOnceDispatchPacket): string;
 export declare function architectDependencyInstruction(dispatch: RunOnceDispatchPacket): string;
 export declare function designerRefInstruction(dispatch: RunOnceDispatchPacket): string;
@@ -29,5 +41,7 @@ export declare function qaBrowserInstruction(dispatch: RunOnceDispatchPacket): s
 export declare function storyQaInstruction(dispatch: RunOnceDispatchPacket): string;
 export declare function buildQaPrompt(dispatch: RunOnceDispatchPacket, laneSpec: string): string;
 export declare function buildConflictResolvePrompt(dispatch: RunOnceDispatchPacket, branchName: string): string;
+export declare function buildPullRequestCheckRepairPrompt(dispatch: RunOnceDispatchPacket, branchName: string): string;
 export declare function buildPullRequestCommentsPrompt(dispatch: RunOnceDispatchPacket, branchName: string): string;
+export declare function isPullRequestCheckRepairDispatch(dispatch: RunOnceDispatchPacket): boolean;
 export declare function isPullRequestCommentsDispatch(dispatch: RunOnceDispatchPacket): boolean;