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

package/dist/shared/process/host-process-supervisor.js

@@ -0,0 +1,282 @@
+import { createHash } from "node:crypto";
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+const windowsJobSupervisorPath = fileURLToPath(new URL("../../../runtime/windows-job-supervisor.ps1", import.meta.url));
+export function resolveHostProcessSupervisedLaunch(request, resolvedCommand, resolvedArgs, platform = process.platform) {
+    const env = request.env;
+    if (env?.FORGE_RUNTIME_MODE !== "host")
+        return null;
+    const supervisorId = requiredEnvironment(env, "FORGE_PROCESS_SUPERVISOR_ID");
+    const metadataPath = requiredEnvironment(env, "FORGE_PROCESS_SUPERVISOR_METADATA_PATH");
+    const logDirectory = requiredEnvironment(env, "FORGE_LOG_DIR");
+    assertMetadataPath(logDirectory, metadataPath);
+    const commandDigest = createHash("sha256")
+        .update(JSON.stringify([resolvedCommand, ...resolvedArgs]))
+        .digest("hex");
+    if (platform === "win32") {
+        if (!fs.existsSync(windowsJobSupervisorPath)) {
+            throw new Error(`host_process_supervisor_missing: ${windowsJobSupervisorPath}`);
+        }
+        const payloadPath = `${metadataPath}.launch.json`;
+        const readyPath = `${metadataPath}.provider-ready.json`;
+        const startGrantPath = `${metadataPath}.provider-start-granted`;
+        fs.writeFileSync(payloadPath, `${JSON.stringify({
+            command: resolvedCommand,
+            args: resolvedArgs,
+            cwd: request.cwd,
+            parentPid: process.pid,
+            supervisorId,
+            readyPath,
+            startGrantPath,
+        })}\n`, {
+            encoding: "utf8",
+            flag: "wx",
+            mode: 0o600,
+        });
+        return {
+            command: windowsPowerShellPath(),
+            args: [
+                "-NoLogo",
+                "-NoProfile",
+                "-NonInteractive",
+                "-ExecutionPolicy",
+                "Bypass",
+                "-File",
+                windowsJobSupervisorPath,
+                "-Mode",
+                "Outer",
+                "-PayloadPath",
+                payloadPath,
+            ],
+            detached: false,
+            supervisorId,
+            strategy: "windows_job_object",
+            metadataPath,
+            payloadPath,
+            readyPath,
+            startGrantPath,
+            commandDigest,
+        };
+    }
+    return {
+        command: resolvedCommand,
+        args: resolvedArgs,
+        detached: true,
+        supervisorId,
+        strategy: "unix_process_group",
+        metadataPath,
+        commandDigest,
+    };
+}
+export function persistHostProcessSupervisorMetadata(launch, request, rootPid, rootCreatedAt, providerReady) {
+    if (!Number.isSafeInteger(rootPid) || rootPid <= 0) {
+        throw new Error("host_process_supervisor_invalid: supervised root PID was not assigned.");
+    }
+    const env = request.env ?? {};
+    const metadata = {
+        schemaVersion: 1,
+        supervisorId: launch.supervisorId,
+        strategy: launch.strategy,
+        rootPid,
+        rootCreatedAt,
+        rootIdentity: providerReady?.rootPid === rootPid
+            ? providerReady.rootIdentity ?? null
+            : captureHostProcessIdentity(rootPid),
+        commandDigest: launch.commandDigest,
+        worktreePath: request.cwd,
+        runtimeLeaseId: requiredEnvironment(env, "FORGE_RESOURCE_LEASE_ID"),
+        dispatchAttemptId: requiredEnvironment(env, "FORGE_DISPATCH_ATTEMPT_ID"),
+        fencingToken: requiredEnvironment(env, "FORGE_FENCING_TOKEN"),
+        bridgePid: process.pid,
+        providerPid: providerReady?.providerPid,
+        providerCreatedAt: providerReady?.providerCreatedAt,
+        providerIdentity: providerReady?.providerIdentity
+            ?? (providerReady ? captureHostProcessIdentity(providerReady.providerPid) : undefined),
+        providerStartAttempt: providerReady?.startAttempt,
+    };
+    fs.writeFileSync(launch.metadataPath, `${JSON.stringify(metadata)}\n`, {
+        encoding: "utf8",
+        flag: "wx",
+        mode: 0o600,
+    });
+    return metadata;
+}
+/**
+ * Captures an OS-issued process birth marker. Recovery compares this marker
+ * before signalling a persisted PID so PID reuse can never redirect cleanup
+ * at an unrelated process.
+ */
+export function captureHostProcessIdentity(pid, platform = process.platform) {
+    if (!Number.isSafeInteger(pid) || pid <= 0)
+        return null;
+    try {
+        if (platform === "linux") {
+            const bootId = fs.readFileSync("/proc/sys/kernel/random/boot_id", "utf8").trim();
+            const stat = fs.readFileSync(`/proc/${pid}/stat`, "utf8");
+            const close = stat.lastIndexOf(")");
+            const fields = close >= 0 ? stat.slice(close + 2).trim().split(/\s+/u) : [];
+            const startTicks = fields[19];
+            return bootId && startTicks && /^\d+$/u.test(startTicks)
+                ? `linux:${bootId}:${startTicks}`
+                : null;
+        }
+        if (platform === "win32") {
+            const output = execFileSync(windowsPowerShellPath(), [
+                "-NoLogo",
+                "-NoProfile",
+                "-NonInteractive",
+                "-Command",
+                `(Get-Process -Id ${pid} -ErrorAction Stop).StartTime.ToUniversalTime().Ticks`,
+            ], {
+                encoding: "utf8",
+                windowsHide: true,
+                timeout: 10_000,
+                stdio: ["ignore", "pipe", "ignore"],
+            }).trim();
+            return /^\d+$/u.test(output) ? `win32:${output}` : null;
+        }
+        // Other Unix variants do not expose a sufficiently strong birth marker
+        // through Node. Fail closed rather than trust a second-resolution ps time.
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+export async function terminateHostProcessTree(child, launch, graceMs = 2_000) {
+    if (!launch) {
+        try {
+            child.kill("SIGTERM");
+        }
+        catch {
+            // The process already settled.
+        }
+        return;
+    }
+    if (launch.strategy === "windows_job_object") {
+        const rootPid = child.pid ?? 0;
+        const metadata = readSupervisorMetadata(launch.metadataPath);
+        const rootIdentity = metadata?.rootPid === rootPid
+            ? metadata.rootIdentity ?? null
+            : captureHostProcessIdentity(rootPid, "win32");
+        try {
+            child.kill("SIGTERM");
+        }
+        catch {
+            // Closing the launcher is best effort when the Job Object already settled.
+        }
+        await waitForExactProcessExit(rootPid, rootIdentity, graceMs, "win32");
+        if (exactProcessExists(rootPid, rootIdentity, "win32")) {
+            forceWindowsProcessTree(rootPid);
+            await waitForExactProcessExit(rootPid, rootIdentity, graceMs, "win32");
+        }
+        if (exactProcessExists(rootPid, rootIdentity, "win32")) {
+            throw new Error("host_process_supervisor_termination_failed: supervised Windows root did not stop.");
+        }
+        const providerPid = metadata?.providerPid ?? 0;
+        const providerIdentity = metadata?.providerIdentity ?? null;
+        if (exactProcessExists(providerPid, providerIdentity, "win32")) {
+            forceWindowsProcessTree(providerPid);
+            await waitForExactProcessExit(providerPid, providerIdentity, graceMs, "win32");
+        }
+        if (exactProcessExists(providerPid, providerIdentity, "win32")) {
+            throw new Error("host_process_supervisor_termination_failed: supervised Windows provider tree did not stop.");
+        }
+        return;
+    }
+    const processGroupId = child.pid;
+    if (!processGroupId || !signalUnixProcessGroup(processGroupId, "SIGTERM"))
+        return;
+    await new Promise(resolve => setTimeout(resolve, graceMs));
+    if (unixProcessGroupExists(processGroupId)) {
+        signalUnixProcessGroup(processGroupId, "SIGKILL");
+    }
+}
+function requiredEnvironment(env, name) {
+    const value = env[name]?.trim();
+    if (!value)
+        throw new Error(`host_process_supervisor_invalid: ${name} is required.`);
+    return value;
+}
+function assertMetadataPath(logDirectory, metadataPath) {
+    const root = path.resolve(logDirectory);
+    const target = path.resolve(metadataPath);
+    if (target !== root && !target.startsWith(`${root}${path.sep}`)) {
+        throw new Error("host_process_supervisor_invalid: metadata path must be inside FORGE_LOG_DIR.");
+    }
+}
+function windowsPowerShellPath() {
+    const systemRoot = process.env.SystemRoot?.trim() || "C:\\Windows";
+    const candidate = path.win32.join(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
+    return fs.existsSync(candidate) ? candidate : "powershell.exe";
+}
+function signalUnixProcessGroup(processGroupId, signal) {
+    try {
+        process.kill(-processGroupId, signal);
+        return true;
+    }
+    catch (error) {
+        if (error.code === "ESRCH")
+            return false;
+        throw error;
+    }
+}
+function unixProcessGroupExists(processGroupId) {
+    try {
+        process.kill(-processGroupId, 0);
+        return true;
+    }
+    catch (error) {
+        if (error.code === "ESRCH")
+            return false;
+        throw error;
+    }
+}
+function readSupervisorMetadata(metadataPath) {
+    try {
+        return JSON.parse(fs.readFileSync(metadataPath, "utf8"));
+    }
+    catch {
+        return null;
+    }
+}
+function exactProcessExists(pid, identity, platform) {
+    if (!identity || !processExists(pid))
+        return false;
+    return captureHostProcessIdentity(pid, platform) === identity;
+}
+function processExists(pid) {
+    if (!Number.isSafeInteger(pid) || pid <= 0)
+        return false;
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        return error.code === "EPERM";
+    }
+}
+async function waitForExactProcessExit(pid, identity, timeoutMs, platform) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline && exactProcessExists(pid, identity, platform)) {
+        await new Promise(resolve => setTimeout(resolve, 25));
+    }
+}
+function forceWindowsProcessTree(pid) {
+    if (!Number.isSafeInteger(pid) || pid <= 0)
+        return;
+    const systemRoot = process.env.SystemRoot?.trim() || "C:\\Windows";
+    const taskkill = path.win32.join(systemRoot, "System32", "taskkill.exe");
+    try {
+        execFileSync(taskkill, ["/PID", String(pid), "/T", "/F"], {
+            windowsHide: true,
+            timeout: 5_000,
+            stdio: "ignore",
+        });
+    }
+    catch {
+        // A racing process exit is verified by the caller before it returns.
+    }
+}

package/dist/shared/process/process.d.ts

@@ -2,6 +2,7 @@ export interface ProcessRunRequest {
     readonly command: string;
     readonly args: readonly string[];
     readonly cwd: string;
+    readonly env?: NodeJS.ProcessEnv;
 }
 export interface ProcessRunResult {
     readonly exitCode: number;

package/dist/shared/process/process.js

@@ -5,6 +5,7 @@ export class NodeProcessRunner {
         return await new Promise((resolve, reject) => {
             const child = spawn(request.command, request.args, {
                 cwd: request.cwd,
+                env: request.env,
                 stdio: ["ignore", "pipe", "pipe"]
             });
             let stdout = "";

package/dist/shared/process/windows-launch.d.ts

@@ -2,7 +2,7 @@ export interface LaunchCommand {
     readonly command: string;
     readonly args: readonly string[];
 }
-export declare function buildWindowsCmdLaunch(command: string, args: readonly string[]): LaunchCommand;
+export declare function buildWindowsCmdLaunch(command: string, args: readonly string[], comSpec?: string | undefined): LaunchCommand;
 export declare function buildWindowsLaunchCommand(commandPath: string, args: readonly string[]): LaunchCommand;
 export declare function windowsCommandLine(command: string, args: readonly string[]): string;
 export declare function quoteWindowsCommandLineArg(value: string): string;

package/dist/shared/process/windows-launch.js

@@ -1,8 +1,11 @@
 import path from "node:path";
-export function buildWindowsCmdLaunch(command, args) {
+export function buildWindowsCmdLaunch(command, args, comSpec = process.env.ComSpec) {
+    const resolvedComSpec = comSpec?.trim();
+    const commandLine = windowsCommandLine(command, args);
+    const cmdPayload = commandLine.startsWith('"') ? `"${commandLine}"` : commandLine;
     return {
-        command: process.env.ComSpec ?? "cmd.exe",
-        args: ["/d", "/s", "/v:off", "/c", `"${windowsCommandLine(command, args)}"`]
+        command: resolvedComSpec || "cmd.exe",
+        args: ["/d", "/s", "/v:off", "/c", cmdPayload]
     };
 }
 export function buildWindowsLaunchCommand(commandPath, args) {

package/dist/shared/provider-capabilities.d.ts

@@ -0,0 +1 @@
+export declare function supportsDraftImageAttachmentsFor(cliProviders: readonly string[]): boolean;

package/dist/shared/provider-capabilities.js

@@ -0,0 +1,3 @@
+export function supportsDraftImageAttachmentsFor(cliProviders) {
+    return cliProviders.some((provider) => provider.trim().toLowerCase() === "codex");
+}

package/dist/shared/redaction/redaction.js

@@ -1,16 +1,23 @@
 const secretKeyPattern = /(api[_-]?key|authorization|bearer|client[_-]?secret|password|secret|token)/i;
+const attachmentContentKeyPattern = /^(textContent|contentBase64)$/i;
+const serializedAttachmentContentPattern = /("(?:textContent|contentBase64)"\s*:\s*")(?:(?:\\.)|[^"\\])*(")/gi;
+const authorizationCredentialPattern = /(\bauthorization\s*[:=]\s*(?:bearer|basic)?\s*)([^"',\s]+)/gi;
+const bearerCredentialPattern = /(\bbearer\s+)([^"',\s]+)/gi;
+const secretAssignmentPattern = /(api[_-]?key|client[_-]?secret|password|secret|token)(\s*["']?\s*[:=]\s*["']?\s*)([^"',\s]+)/gi;
 export function redactSecrets(value, exactSecrets = []) {
     return redactValue(value, exactSecrets);
 }
 export function redactText(value, exactSecrets = []) {
-    let redacted = value;
+    let redacted = value.replace(serializedAttachmentContentPattern, "$1[REDACTED]$2");
     for (const secret of exactSecrets) {
         if (secret.length > 0) {
             redacted = redacted.split(secret).join("[REDACTED]");
         }
     }
     return redacted
-        .replace(/(api[_-]?key|authorization|bearer|client[_-]?secret|password|secret|token)(["':=\s]+)([^"',\s]+)/gi, "$1$2[REDACTED]")
+        .replace(authorizationCredentialPattern, "$1[REDACTED]")
+        .replace(bearerCredentialPattern, "$1[REDACTED]")
+        .replace(secretAssignmentPattern, "$1$2[REDACTED]")
         .replace(/(sk-[a-zA-Z0-9_-]{12,})/g, "[REDACTED]");
 }
 function redactValue(value, exactSecrets) {
@@ -25,6 +32,6 @@ function redactValue(value, exactSecrets) {
     }
     return Object.fromEntries(Object.entries(value).map(([key, item]) => [
         key,
-        secretKeyPattern.test(key) ? "[REDACTED]" : redactValue(item, exactSecrets)
+        secretKeyPattern.test(key) || attachmentContentKeyPattern.test(key) ? "[REDACTED]" : redactValue(item, exactSecrets)
     ]));
 }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const forgeBridgeVersion = "0.1.3-dev.d1ca67076aa9";
+export declare const forgeBridgeVersion = "0.1.3-dev.eeefdb0d19c1";

package/dist/version.js

@@ -1 +1 @@
-export const forgeBridgeVersion = "0.1.3-dev.d1ca67076aa9";
+export const forgeBridgeVersion = "0.1.3-dev.eeefdb0d19c1";

package/dist/worktree/artifact-injector.d.ts

@@ -1,9 +1,10 @@
 import type { DispatchResolvedArtifact } from "../session/session.types.js";
-export declare function injectWorktreeArtifacts(worktreePath: string, artifacts: readonly DispatchResolvedArtifact[]): Promise<void>;
+export declare function injectWorktreeArtifacts(worktreePath: string, artifacts: readonly DispatchResolvedArtifact[], protectedRelativePaths?: ReadonlySet<string>): Promise<void>;
 export declare function filterArtifactsForLane(artifacts: readonly DispatchResolvedArtifact[], lane: string, phase: string): readonly DispatchResolvedArtifact[];
-export declare function writeArtifact(worktreePath: string, artifact: DispatchResolvedArtifact): Promise<void>;
+export declare function writeArtifact(worktreePath: string, artifact: DispatchResolvedArtifact, protectedRelativePaths?: ReadonlySet<string>): Promise<void>;
 export declare function selectLaneCommand(artifacts: readonly DispatchResolvedArtifact[], lane: string, phase: string): DispatchResolvedArtifact | undefined;
 export declare function resolveCommandSlug(lane: string, phase: string): string;
+export declare function artifactExecutionBody(artifact: DispatchResolvedArtifact): string;
 export declare function buildSpecBody(laneCommand: DispatchResolvedArtifact, workItem: {
     readonly id: string;
     readonly title: string;

package/dist/worktree/artifact-injector.js

@@ -1,4 +1,5 @@
 import crypto from "node:crypto";
+import { spawn } from "node:child_process";
 import fs from "node:fs/promises";
 import path from "node:path";
 const DEBUG_OPERATIONAL_SKILLS = new Set(["debug-repro", "debug-root-cause", "debug-fix", "debug-regression"]);
@@ -59,9 +60,9 @@ const DRAFT_WORK_ITEM_OPERATIONAL_HOOKS = new Set([
 const DRAFT_WORK_ORDER_OPERATIONAL_HOOKS = new Set([
     "draft-work-order-plan"
 ]);
-export async function injectWorktreeArtifacts(worktreePath, artifacts) {
+export async function injectWorktreeArtifacts(worktreePath, artifacts, protectedRelativePaths = new Set()) {
     for (const artifact of artifacts) {
-        await writeArtifact(worktreePath, artifact);
+        await writeArtifact(worktreePath, artifact, protectedRelativePaths);
     }
 }
 export function filterArtifactsForLane(artifacts, lane, phase) {
@@ -78,7 +79,7 @@ export function filterArtifactsForLane(artifacts, lane, phase) {
     }
     return artifacts;
 }
-export async function writeArtifact(worktreePath, artifact) {
+export async function writeArtifact(worktreePath, artifact, protectedRelativePaths = new Set()) {
     const writtenHash = sha256(artifact.body);
     if (writtenHash !== artifact.contentHash.toLowerCase()) {
         throw new Error(`Injected artifact '${artifact.slug}' content_hash mismatch (expected ${artifact.contentHash}, got ${writtenHash}).`);
@@ -93,6 +94,11 @@ export async function writeArtifact(worktreePath, artifact) {
         ? path.resolve(scopeDir, slug, "SKILL.md")
         : path.resolve(scopeDir, `${slug}.md`);
     assertInside(forgeRoot, filePath, "Artifact file");
+    const relativePath = path.relative(worktreePath, filePath).replaceAll(path.sep, "/");
+    if (protectedRelativePaths.has(relativePath)) {
+        await restoreTrackedArtifactIfItMatchesManagedBody(worktreePath, filePath, relativePath, artifact);
+        return;
+    }
     await fs.mkdir(path.dirname(filePath), { recursive: true });
     await fs.writeFile(filePath, artifact.body, "utf8");
 }
@@ -120,6 +126,39 @@ export function resolveCommandSlug(lane, phase) {
             return "dev-prompt";
     }
 }
+async function restoreTrackedArtifactIfItMatchesManagedBody(worktreePath, filePath, relativePath, artifact) {
+    const current = await fs.readFile(filePath, "utf8").catch(() => null);
+    if (current === null
+        || (current !== artifact.body && current !== artifactExecutionBody(artifact)))
+        return;
+    const result = await new Promise((resolve) => {
+        const child = spawn("git", ["show", `HEAD:${relativePath}`], {
+            cwd: worktreePath,
+            windowsHide: true,
+            stdio: ["ignore", "pipe", "ignore"],
+        });
+        let stdout = "";
+        child.stdout?.setEncoding("utf8");
+        child.stdout?.on("data", chunk => { stdout += chunk; });
+        child.on("error", () => resolve({ exitCode: 1, stdout: "" }));
+        child.on("close", code => resolve({ exitCode: code ?? 1, stdout }));
+    });
+    if (result.exitCode === 0)
+        await fs.writeFile(filePath, result.stdout, "utf8");
+}
+export function artifactExecutionBody(artifact) {
+    const content = artifact.body;
+    if (!content.startsWith("---"))
+        return content;
+    const end = content.indexOf("\n---", 3);
+    if (end < 3)
+        return content;
+    let bodyStart = end + 4;
+    while (bodyStart < content.length && (content[bodyStart] === "\n" || content[bodyStart] === "\r")) {
+        bodyStart += 1;
+    }
+    return content.slice(bodyStart);
+}
 function shouldInjectDebugArtifact(artifact, commandSlug) {
     if (artifact.scope.trim().toLowerCase() !== "operational") {
         return false;
@@ -192,7 +231,7 @@ function normalizeDraftPhase(phase) {
     return phase.trim().toLowerCase().replaceAll("-", "_");
 }
 export function buildSpecBody(laneCommand, workItem, phase = "implementation") {
-    const prompt = laneCommand.body.replaceAll("{workItemId}", workItem.id);
+    const prompt = artifactExecutionBody(laneCommand).replaceAll("{workItemId}", workItem.id);
     return `---
 work_item_id: ${workItem.id}
 status: approved

package/dist/worktree/dependency-warmer.d.ts

@@ -22,7 +22,10 @@ export interface WarmDependenciesResult {
     readonly fallbacks: readonly InstallFallbackResult[];
 }
 export interface CommandExecutor {
-    run(cwd: string, command: string, args: readonly string[]): Promise<void>;
+    run(cwd: string, command: string, args: readonly string[], options?: CommandExecutionOptions): Promise<void>;
+}
+export interface CommandExecutionOptions {
+    readonly env?: NodeJS.ProcessEnv;
 }
 export declare function detectWarmPaths(repoRoot: string, warmPathOverrides?: readonly string[]): Promise<WarmPathEntry[]>;
 export declare function warmWorktreeDependencies(request: WarmDependenciesRequest, executor?: CommandExecutor): Promise<WarmDependenciesResult>;
@@ -30,3 +33,20 @@ export declare function createDirectoryLink(sourcePath: string, targetPath: stri
 export declare function lockfilesDiffer(baseCheckoutPath: string, worktreePath: string, packageRootRelative: string): Promise<boolean>;
 export declare function requiresInstallFallback(entry: WarmPathEntry, baseCheckoutPath: string, worktreePath: string, sourceExists: boolean): Promise<string | null>;
 export declare function declaresNativeModules(packageRootPath: string): Promise<boolean>;
+export interface NpmLaunchOptions {
+    readonly env?: NodeJS.ProcessEnv;
+    readonly execPath?: string;
+    readonly platform?: NodeJS.Platform;
+    readonly homeDir?: string;
+    readonly candidates?: readonly string[];
+}
+export declare function resolveNpmLaunch(args: readonly string[], options?: NpmLaunchOptions): {
+    command: string;
+    args: readonly string[];
+};
+export declare function resolvePnpmLaunch(args: readonly string[]): {
+    command: string;
+    args: readonly string[];
+};
+export declare function formatCommandFailureOutput(stdout: string, stderr: string): string;
+export declare function unattendedPackageManagerEnvironment(env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;