@loucompanion/forge-bridge 0.1.1-dev.32d4dd5874ee → 0.1.1-dev.440026b50fad

package/dist/bridge/bridge.service.d.ts

@@ -15,6 +15,7 @@ export declare class ForgeBridgeService implements BridgeService {
     run(signal?: AbortSignal): Promise<void>;
     stop(): Promise<void>;
     private handleDispatch;
+    private parseDispatchOrReport;
     private handleCancel;
     private abortActiveSessions;
     private normalizeDispatch;

package/dist/bridge/bridge.service.js

@@ -1,4 +1,5 @@
 import { HubConnectionBuilder, LogLevel } from "@microsoft/signalr";
+import fs from "node:fs";
 import path from "node:path";
 import { defaultForgeBridgeConfig } from "../config.js";
 import { redactSecrets, redactText } from "../shared/redaction/redaction.js";
@@ -48,8 +49,14 @@ export class ForgeBridgeService {
             while (!this.stopped && !signal?.aborted) {
                 try {
                     await this.connectOnce();
+                    if (attempt > 0) {
+                        logBridgeStatus("Connected to Forge. Waiting for dispatches...");
+                    }
                     attempt = 0;
                     await this.waitForClose(signal);
+                    if (!this.stopped && !signal?.aborted) {
+                        logBridgeStatus("Connection closed. Reconnecting...");
+                    }
                 }
                 catch (error) {
                     if (this.stopped || signal?.aborted) {
@@ -57,6 +64,7 @@ export class ForgeBridgeService {
                     }
                     const backoff = this.config.reconnectBackoffMs[Math.min(attempt, this.config.reconnectBackoffMs.length - 1)] ?? 5000;
                     attempt += 1;
+                    logBridgeStatus(`Connect attempt ${attempt} failed: ${errorMessage(error)}. Retrying in ${formatDelay(backoff)}...`);
                     await delay(backoff, signal);
                 }
             }
@@ -73,10 +81,14 @@ export class ForgeBridgeService {
         this.abortActiveSessions("bridge stopping");
         await this.stopConnection();
     }
-    async handleDispatch(dispatch) {
+    async handleDispatch(rawDispatch) {
+        const dispatch = this.parseDispatchOrReport(rawDispatch);
+        if (!dispatch) {
+            return;
+        }
         const leaseId = dispatch.lease.id;
         const fencingToken = dispatch.lease.fencingToken;
-        const redactionSecrets = exactSecrets(dispatch);
+        const redactionSecrets = exactSecrets(dispatch, this.config);
         if (this.activeSessions.has(leaseId)) {
             await this.sendResult(leaseId, fencingToken, failureResult("Dispatch is already active on this bridge.")).catch(() => undefined);
             return;
@@ -87,11 +99,20 @@ export class ForgeBridgeService {
             const normalized = this.normalizeDispatch(dispatch);
             const result = await this.sessions.runOnce(normalized, {
                 emit: async (event) => {
-                    await this.invokeAck("DispatchEvent", {
-                        leaseId,
-                        fencingToken,
-                        event: redactSecrets(event, redactionSecrets)
-                    });
+                    try {
+                        await this.invokeAck("DispatchEvent", {
+                            leaseId,
+                            fencingToken,
+                            event: redactSecrets(event, redactionSecrets)
+                        });
+                    }
+                    catch (error) {
+                        if (isDispatchNoLongerPending(error)) {
+                            controller.abort(error instanceof Error ? error.message : "Dispatch is no longer pending.");
+                            return;
+                        }
+                        throw error;
+                    }
                 }
             }, controller.signal);
             await this.sendResult(leaseId, fencingToken, redactSecrets(result, redactionSecrets));
@@ -106,6 +127,27 @@ export class ForgeBridgeService {
             this.activeSessions.delete(leaseId);
         }
     }
+    parseDispatchOrReport(rawDispatch) {
+        try {
+            return parseRunOnceDispatchPacket(rawDispatch);
+        }
+        catch (error) {
+            const identifiers = readDispatchIdentifiers(rawDispatch);
+            if (!identifiers) {
+                return null;
+            }
+            const summary = invalidDispatchSummary(error);
+            void this.sendResult(identifiers.leaseId, identifiers.fencingToken, failureResult(summary, [
+                {
+                    role: "runner",
+                    kind: "error",
+                    content: summary,
+                    eventType: "invalid_dispatch"
+                }
+            ])).catch(() => undefined);
+            return null;
+        }
+    }
     async handleCancel(request) {
         const active = this.activeSessions.get(request.leaseId);
         if (!active || active.fencingToken !== request.fencingToken) {
@@ -120,9 +162,10 @@ export class ForgeBridgeService {
         this.activeSessions.clear();
     }
     normalizeDispatch(dispatch) {
-        const mapping = findRepoMapping(dispatch, this.config.repoMappings);
+        const mapping = findRepoMapping(dispatch, repoMappingsFor(this.config));
         const localPath = mapping?.localPath?.trim();
         const repoRoot = localPath ? path.dirname(path.resolve(localPath)) : this.config.defaultRepoRoot;
+        const qaLaunchTarget = normalizeQaAppLaunchTarget(mapping?.qaAppLaunchTarget) ?? dispatch.qaBrowser?.launchTarget ?? null;
         return {
             ...dispatch,
             repo: {
@@ -133,7 +176,13 @@ export class ForgeBridgeService {
             serverLocal: {
                 repoRoot,
                 cleanupWorktrees: this.config.cleanupWorktrees
-            }
+            },
+            qaBrowser: dispatch.qaBrowser
+                ? {
+                    ...dispatch.qaBrowser,
+                    launchTarget: qaLaunchTarget
+                }
+                : dispatch.qaBrowser
         };
     }
     async sendResult(leaseId, fencingToken, result) {
@@ -142,7 +191,15 @@ export class ForgeBridgeService {
             fencingToken,
             result
         };
-        await this.invokeAck("DispatchResult", payload);
+        try {
+            await this.invokeAck("DispatchResult", payload);
+        }
+        catch (error) {
+            if (isDispatchNoLongerPending(error)) {
+                return;
+            }
+            throw error;
+        }
     }
     startHeartbeat() {
         this.stopHeartbeat();
@@ -173,13 +230,14 @@ export class ForgeBridgeService {
             cliProviders: this.config.cliProviders,
             providerStatuses: this.config.providerStatuses,
             projectLabels: this.config.projectLabels,
-            repoMappings: this.config.repoMappings,
+            repoMappings: repoMappingsFor(this.config),
             os: this.config.os,
             sandboxProfiles: this.config.sandboxProfiles,
             supportsApiSecretGrant: this.config.supportsApiSecretGrant,
             supportsManagedWorktrees: this.config.supportsManagedWorktrees,
             supportsManagedForgeArtifacts: this.config.supportsManagedForgeArtifacts,
-            supportsRunnerAuthoredPhaseArtifacts: this.config.supportsRunnerAuthoredPhaseArtifacts
+            supportsRunnerAuthoredPhaseArtifacts: this.config.supportsRunnerAuthoredPhaseArtifacts,
+            supportsDraftRunOnce: this.config.supportsDraftRunOnce
         };
     }
     async invokeAck(methodName, payload) {
@@ -189,7 +247,7 @@ export class ForgeBridgeService {
         }
         const ack = await connection.invoke(methodName, payload);
         if (!ack.accepted) {
-            throw new Error(ack.message ?? ack.code ?? `${methodName} callback was rejected.`);
+            throw new BridgeCallbackRejectedError(ack.code ?? null, ack.message ?? ack.code ?? `${methodName} callback was rejected.`);
         }
         return ack;
     }
@@ -207,6 +265,20 @@ export class ForgeBridgeService {
         }
     }
 }
+class BridgeCallbackRejectedError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.code = code;
+        this.name = "BridgeCallbackRejectedError";
+    }
+}
+function isDispatchNoLongerPending(error) {
+    if (error instanceof BridgeCallbackRejectedError) {
+        return error.code === "bridge.dispatch_not_pending" || error.code === "bridge.stale_dispatch";
+    }
+    return error instanceof Error && error.message === "Dispatch is no longer pending.";
+}
 export class SignalRBridgeConnectionFactory {
     create(config) {
         return new SignalRBridgeConnection(config);
@@ -237,14 +309,7 @@ export class SignalRBridgeConnection {
     }
     onDispatch(handler) {
         this.connection.on("Dispatch", (raw) => {
-            let dispatch;
-            try {
-                dispatch = parseRunOnceDispatchPacket(raw);
-            }
-            catch {
-                return;
-            }
-            void handler(dispatch).catch(() => undefined);
+            void handler(raw).catch(() => undefined);
         });
     }
     onCancel(handler) {
@@ -271,11 +336,12 @@ export function defaultBridgeServiceConfig(overrides = {}) {
         projectLabels: splitCsv(process.env.FORGE_PROJECT_LABELS ?? ""),
         repoMappings: [],
         os: process.platform,
-        sandboxProfiles: ["default"],
+        sandboxProfiles: overrides.sandboxProfiles,
         supportsApiSecretGrant: true,
         supportsManagedWorktrees: true,
         supportsManagedForgeArtifacts: true,
         supportsRunnerAuthoredPhaseArtifacts: true,
+        supportsDraftRunOnce: true,
         version: process.env.FORGE_BRIDGE_VERSION ?? forgeBridgeVersion,
         protocolVersion: 1,
         minServerVersion: null,
@@ -285,6 +351,7 @@ export function defaultBridgeServiceConfig(overrides = {}) {
     };
     return {
         ...config,
+        sandboxProfiles: config.sandboxProfiles ?? defaultSandboxProfiles(config.cliProviders),
         heartbeatIntervalMs: positiveFiniteNumber(config.heartbeatIntervalMs, 30_000)
     };
 }
@@ -303,6 +370,14 @@ function positiveFiniteNumber(value, fallback) {
 function providerStatusesFor(providers) {
     return Object.fromEntries(providers.map((provider) => [provider, { signedIn: true, version: "", models: configuredModelsFor(provider) }]));
 }
+function defaultSandboxProfiles(providers, platform = process.platform) {
+    if (!providers.some((provider) => provider.toLowerCase() === "codex")) {
+        return ["none"];
+    }
+    return platform === "win32"
+        ? ["danger-full-access"]
+        : ["provider-workspace-write"];
+}
 function configuredModelsFor(provider) {
     const envName = `FORGE_${provider.replace(/[^a-zA-Z0-9]/g, "_").toUpperCase()}_MODELS`;
     return splitCsv(process.env[envName] ?? "");
@@ -313,6 +388,62 @@ function splitCsv(value) {
         .map((entry) => entry.trim())
         .filter((entry) => entry.length > 0);
 }
+function repoMappingsFor(config) {
+    const explicit = [...config.repoMappings];
+    const discovered = discoverRepoRootMappings(config.defaultRepoRoot);
+    if (explicit.length === 0) {
+        return discovered;
+    }
+    const explicitKeys = new Set(explicit.flatMap(mappingKeys));
+    return [
+        ...explicit,
+        ...discovered.filter((mapping) => !mappingKeys(mapping).some((key) => explicitKeys.has(key)))
+    ];
+}
+function discoverRepoRootMappings(defaultRepoRoot) {
+    const root = defaultRepoRoot.trim();
+    if (!root) {
+        return [];
+    }
+    const resolvedRoot = path.resolve(root);
+    const mappings = [];
+    if (isGitCheckout(resolvedRoot)) {
+        mappings.push({ name: path.basename(resolvedRoot), localPath: resolvedRoot });
+    }
+    let entries;
+    try {
+        entries = fs.readdirSync(resolvedRoot, { withFileTypes: true });
+    }
+    catch {
+        return mappings;
+    }
+    for (const entry of entries) {
+        if (!entry.isDirectory()) {
+            continue;
+        }
+        const localPath = path.join(resolvedRoot, entry.name);
+        if (isGitCheckout(localPath)) {
+            mappings.push({ name: entry.name, localPath });
+        }
+    }
+    return mappings.sort((a, b) => (a.name ?? "").localeCompare(b.name ?? ""));
+}
+function isGitCheckout(localPath) {
+    try {
+        return fs.existsSync(path.join(localPath, ".git"));
+    }
+    catch {
+        return false;
+    }
+}
+function mappingKeys(mapping) {
+    return [
+        mapping.repoId ? `id:${mapping.repoId.toLowerCase()}` : null,
+        mapping.name ? `name:${mapping.name.trim().toLowerCase()}` : null,
+        mapping.remoteUrl ? `remote:${mapping.remoteUrl.trim().toLowerCase()}` : null,
+        mapping.localPath ? `path:${path.resolve(mapping.localPath).toLowerCase()}` : null
+    ].filter((key) => Boolean(key));
+}
 function findRepoMapping(dispatch, mappings) {
     return mappings.find((mapping) => {
         if (!mapping.localPath?.trim()) {
@@ -323,16 +454,70 @@ function findRepoMapping(dispatch, mappings) {
             (!!mapping.remoteUrl?.trim() && equalsIgnoreCase(mapping.remoteUrl, dispatch.repo.remoteUrl)));
     });
 }
+function normalizeQaAppLaunchTarget(target) {
+    if (!target) {
+        return null;
+    }
+    const routes = [...new Set((target.routes ?? []).map((route) => route.trim()).filter(Boolean))];
+    const normalized = {
+        url: cleanString(target.url),
+        command: cleanString(target.command),
+        working_directory: cleanString(target.working_directory),
+        ready_url: cleanString(target.ready_url),
+        routes,
+        notes: cleanString(target.notes)
+    };
+    return normalized.url || normalized.command || normalized.ready_url || routes.length > 0
+        ? normalized
+        : null;
+}
+function cleanString(value) {
+    const clean = value?.trim();
+    return clean ? clean : null;
+}
 function equalsIgnoreCase(left, right) {
     return !!left?.trim() && !!right?.trim() && left.trim().toLowerCase() === right.trim().toLowerCase();
 }
+function readDispatchIdentifiers(rawDispatch) {
+    if (!rawDispatch || typeof rawDispatch !== "object" || Array.isArray(rawDispatch)) {
+        return null;
+    }
+    const packet = rawDispatch;
+    const rawLease = packet.lease ?? packet.Lease;
+    if (!rawLease || typeof rawLease !== "object" || Array.isArray(rawLease)) {
+        return null;
+    }
+    const lease = rawLease;
+    const leaseId = readString(lease, "id", "Id");
+    const fencingToken = readString(lease, "fencingToken", "FencingToken");
+    return leaseId && fencingToken ? { leaseId, fencingToken } : null;
+}
+function readString(source, camelKey, pascalKey) {
+    const value = source[camelKey] ?? source[pascalKey];
+    return typeof value === "string" && value.trim() ? value : null;
+}
+function invalidDispatchSummary(error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    return `Invalid bridge dispatch packet: ${detail}`;
+}
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function formatDelay(ms) {
+    if (ms >= 1000 && ms % 1000 === 0) {
+        return `${ms / 1000}s`;
+    }
+    return `${ms}ms`;
+}
+function logBridgeStatus(message) {
+    process.stderr.write(`[${new Date().toISOString()}] ${message}\n`);
+}
 function delay(ms, signal) {
     if (signal?.aborted) {
         return Promise.resolve();
     }
     return new Promise((resolve) => {
         const timeout = setTimeout(resolve, ms);
-        timeout.unref?.();
         signal?.addEventListener("abort", () => {
             clearTimeout(timeout);
             resolve();
@@ -348,6 +533,9 @@ function abortPromise(signal) {
     }
     return new Promise((resolve) => signal.addEventListener("abort", () => resolve(), { once: true }));
 }
-function exactSecrets(dispatch) {
-    return dispatch.apiKeySecretGrant?.secret ? [dispatch.apiKeySecretGrant.secret] : [];
+function exactSecrets(dispatch, config) {
+    return [
+        dispatch.apiKeySecretGrant?.secret,
+        config.deviceToken
+    ].filter((secret) => typeof secret === "string" && secret.length > 0);
 }

package/dist/bridge/bridge.types.d.ts

@@ -1,4 +1,4 @@
-import type { RunOnceDispatchPacket, RunOnceResultPacket, RunnerDispatchEvent } from "../session/session.types.js";
+import type { RunOnceResultPacket, RunnerDispatchEvent } from "../session/session.types.js";
 export interface BridgeServiceConfig {
     readonly serverUrl: string;
     readonly runnerId: string;
@@ -16,6 +16,7 @@ export interface BridgeServiceConfig {
     readonly supportsManagedWorktrees: boolean;
     readonly supportsManagedForgeArtifacts: boolean;
     readonly supportsRunnerAuthoredPhaseArtifacts: boolean;
+    readonly supportsDraftRunOnce: boolean;
     readonly version: string;
     readonly protocolVersion: number;
     readonly minServerVersion?: string | null;
@@ -27,6 +28,15 @@ export interface BridgeRepoMapping {
     readonly name?: string | null;
     readonly remoteUrl?: string | null;
     readonly localPath?: string | null;
+    readonly qaAppLaunchTarget?: QaAppLaunchTarget | null;
+}
+export interface QaAppLaunchTarget {
+    readonly url?: string | null;
+    readonly command?: string | null;
+    readonly working_directory?: string | null;
+    readonly ready_url?: string | null;
+    readonly routes?: readonly string[] | null;
+    readonly notes?: string | null;
 }
 export interface BridgeProviderStatus {
     readonly signedIn?: boolean | null;
@@ -46,6 +56,7 @@ export interface BridgeCapabilities {
     readonly supportsManagedWorktrees?: boolean | null;
     readonly supportsManagedForgeArtifacts?: boolean | null;
     readonly supportsRunnerAuthoredPhaseArtifacts?: boolean | null;
+    readonly supportsDraftRunOnce?: boolean | null;
 }
 export interface BridgeHelloRequest {
     readonly version: string;
@@ -79,5 +90,5 @@ export interface BridgeCancelRequest {
     readonly fencingToken: string;
     readonly reason?: string | null;
 }
-export type BridgeDispatchHandler = (dispatch: RunOnceDispatchPacket) => Promise<void>;
+export type BridgeDispatchHandler = (dispatch: unknown) => Promise<void>;
 export type BridgeCancelHandler = (request: BridgeCancelRequest) => Promise<void>;