@loucompanion/forge-bridge 0.1.1-dev.040867847f42 → 0.1.1-dev.0524dc700434

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,15 +49,22 @@ 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 {
+                catch (error) {
                     if (this.stopped || signal?.aborted) {
                         break;
                     }
                     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);
                 }
             }
@@ -154,7 +162,7 @@ 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;
@@ -222,7 +230,7 @@ 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,
@@ -362,10 +370,13 @@ function positiveFiniteNumber(value, fallback) {
 function providerStatusesFor(providers) {
     return Object.fromEntries(providers.map((provider) => [provider, { signedIn: true, version: "", models: configuredModelsFor(provider) }]));
 }
-function defaultSandboxProfiles(providers) {
-    return providers.some((provider) => provider.toLowerCase() === "codex")
-        ? ["provider-workspace-write"]
-        : ["none"];
+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`;
@@ -377,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()) {
@@ -433,6 +500,18 @@ 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();

package/dist/cli/cli.service.js

@@ -24,10 +24,18 @@ export class ForgeBridgeCliService {
         this.pairRunner = pairRunner;
     }
     async run(argv, io = { stdout: process.stdout, stderr: process.stderr }) {
-        if (argv.length === 0 || isHelpArg(argv[0])) {
+        if (argv.length === 0 || argv[0] === "--help" || argv[0] === "-h") {
             io.stdout.write(helpText());
             return 0;
         }
+        if (argv[0] === "help") {
+            io.stdout.write(argv[1] ? commandHelpText(argv[1]) : helpText());
+            return 0;
+        }
+        if (argv[1] === "--help" || argv[1] === "-h") {
+            io.stdout.write(commandHelpText(argv[0]));
+            return 0;
+        }
         if (argv[0] === "version" || argv[0] === "--version" || argv[0] === "-v") {
             io.stdout.write(`forge-bridge ${defaultBridgeServiceConfig().version ?? forgeBridgeVersion}\n`);
             return 0;
@@ -536,52 +544,178 @@ function normalizePairingCode(code) {
 function normalizeServerUrl(serverUrl) {
     return serverUrl.endsWith("/") ? serverUrl : `${serverUrl}/`;
 }
-function isHelpArg(arg) {
-    return arg === "help" || arg === "--help" || arg === "-h";
-}
 function usage() {
     return helpText();
 }
 function helpText() {
     const version = defaultBridgeServiceConfig().version ?? forgeBridgeVersion;
     return [
-        `Forge Bridge ${version}`,
-        "Connect this machine to Forge as a local runner for agent dispatch.",
+        `🛠 Forge Bridge ${version} — Local provider runners for Forge.`,
         "",
-        "Usage:",
-        "  forge-bridge <command> [options]",
+        "Usage: forge-bridge [options] [command]",
         "",
         "Options:",
-        "  -h, --help       Show this help.",
-        "  -v, --version    Print the bridge version.",
+        "  -h, --help       Display help for command",
+        "  -v, --version    Output the version number",
         "",
         "Commands:",
-        "  pair [code]       Pair this machine with Forge and save runner credentials.",
-        "  connect           Start the bridge and wait for Forge dispatches.",
-        "  status            Show saved config, runner identity, repos, and detected CLIs.",
-        "  add-repo          Map a Forge project/repo label to a local checkout path.",
-        "  remove-repo       Remove a saved repo mapping.",
-        "  cleanup           Prune or remove managed bridge worktrees.",
-        "  run-once          Internal worker entrypoint used by Forge dispatch.",
-        "  mcp               Internal MCP server for phase completion.",
+        "  Hint: commands suffixed with * have detailed help. Run <command> --help for details.",
+        "  connect *        Start the runner bridge and wait for Forge dispatches",
+        "  pair *           Pair this machine with Forge and save runner credentials",
+        "  status *         Show config, runner identity, repos, provider CLIs, and updates",
+        "  add-repo *       Map a Forge repo label/name to a local checkout path",
+        "  remove-repo *    Remove a saved repo mapping",
+        "  cleanup *        Prune managed bridge worktrees",
+        "  version *        Print the installed bridge package version",
+        "  help *           Display help for command",
+        "  run-once *       Internal: run one dispatch packet from JSON",
+        "  mcp *            Internal: run the phase-completion MCP server",
         "",
         "Examples:",
         "  npm install -g @loucompanion/forge-bridge@next",
-        "  forge-bridge pair <code> --server https://forge.example.com --repo-root \"%USERPROFILE%\\ForgeRepos\"",
+        "  forge-bridge pair 1234-5678 --server https://srv1493013.tail66073d.ts.net:8443 --repo-root \"%USERPROFILE%\\ForgeRepos\"",
         "  forge-bridge connect",
         "  forge-bridge status --check-updates",
-        "  forge-bridge add-repo Forge C:\\Users\\you\\src\\Forge",
+        "  forge-bridge add-repo Forge D:\\Programming\\repos\\Forge",
+        "  forge-bridge cleanup --stale",
         "",
-        "Setup:",
-        "  1. In Forge, open Profile Settings -> Runners -> Pair runner.",
-        "  2. Copy the pairing code and command shown there.",
-        "  3. Run forge-bridge connect and keep the terminal open.",
+        "Troubleshooting:",
+        "  If Forge says the bridge is old: npm install -g @loucompanion/forge-bridge@next",
+        "  If connect shows 502/500: leave it open; it reconnects with backoff while dev restarts.",
+        "  If a provider is missing: run forge-bridge status --check-updates and verify CLI login.",
         "",
         "Docs:",
         "  https://github.com/coleman399/Forge/tree/develop/tools/forge-bridge#readme",
         "",
     ].join("\n");
 }
+function commandHelpText(command) {
+    switch (command) {
+        case "pair":
+            return [
+                "Forge Bridge — pair",
+                "Pair this machine with Forge and save runner credentials.",
+                "",
+                "Usage:",
+                "  forge-bridge pair [code] [options]",
+                "",
+                "Options:",
+                "  --server <url>              Forge server URL.",
+                "  --repo-root <path>          Folder where bridge-managed repos/worktrees live.",
+                "  --name <name>               Display name for this runner.",
+                "  --fingerprint <value>       Stable device fingerprint override.",
+                "  --cli-provider <list>       Comma-separated providers, e.g. codex,cursor.",
+                "  --cleanup-worktrees         Enable managed worktree cleanup.",
+                "  --no-cleanup-worktrees      Disable managed worktree cleanup.",
+                "",
+                "Example:",
+                "  forge-bridge pair 1234-5678 --server https://forge.example.com --repo-root \"%USERPROFILE%\\ForgeRepos\"",
+                "",
+            ].join("\n");
+        case "connect":
+            return [
+                "Forge Bridge — connect",
+                "Start the runner bridge and keep it connected for Forge dispatches.",
+                "",
+                "Usage:",
+                "  forge-bridge connect [options]",
+                "",
+                "Options:",
+                "  --server <url>              Forge server URL; saved config is used when omitted.",
+                "  --runner-id <id>            Runner id; saved config is used when omitted.",
+                "  --device-token <token>      Device token; saved config is used when omitted.",
+                "  --repo-root <path>          Override repo/worktree folder for this run.",
+                "  --cli-provider <list>       Comma-separated providers, e.g. codex,cursor.",
+                "  --heartbeat-interval-ms <n> Heartbeat interval in milliseconds.",
+                "  --cleanup-worktrees         Enable managed worktree cleanup for this run.",
+                "  --no-cleanup-worktrees      Disable managed worktree cleanup for this run.",
+                "",
+                "Example:",
+                "  forge-bridge connect",
+                "",
+            ].join("\n");
+        case "status":
+            return [
+                "Forge Bridge — status",
+                "Show saved configuration, paired runner identity, repo mappings, detected provider CLIs, and optional update info.",
+                "",
+                "Usage:",
+                "  forge-bridge status [--check-updates]",
+                "",
+                "Example:",
+                "  forge-bridge status --check-updates",
+                "",
+            ].join("\n");
+        case "add-repo":
+            return [
+                "Forge Bridge — add-repo",
+                "Map a Forge repo label/name to an existing local checkout.",
+                "",
+                "Usage:",
+                "  forge-bridge add-repo <label> <path>",
+                "",
+                "Example:",
+                "  forge-bridge add-repo Forge D:\\Programming\\repos\\Forge",
+                "",
+            ].join("\n");
+        case "remove-repo":
+            return [
+                "Forge Bridge — remove-repo",
+                "Remove a saved local repo mapping.",
+                "",
+                "Usage:",
+                "  forge-bridge remove-repo <label>",
+                "",
+            ].join("\n");
+        case "cleanup":
+            return [
+                "Forge Bridge — cleanup",
+                "Prune managed bridge worktrees under the configured repo folder.",
+                "",
+                "Usage:",
+                "  forge-bridge cleanup [--stale|--merged|--all] [--force]",
+                "",
+                "Examples:",
+                "  forge-bridge cleanup --stale",
+                "  forge-bridge cleanup --all --force",
+                "",
+            ].join("\n");
+        case "run-once":
+            return [
+                "Forge Bridge — run-once",
+                "Internal command used by Forge to run a single dispatch packet.",
+                "",
+                "Usage:",
+                "  forge-bridge run-once --dispatch <dispatch-json-path> --result <result-json-path>",
+                "",
+            ].join("\n");
+        case "mcp":
+            return [
+                "Forge Bridge — mcp",
+                "Internal MCP server used by provider CLIs to report Forge phase artifacts.",
+                "",
+                "Usage:",
+                "  forge-bridge mcp --worktree <path> --work-item-id <id> --phase <phase>",
+                "",
+            ].join("\n");
+        case "version":
+            return [
+                "Forge Bridge — version",
+                "Print the installed bridge package version.",
+                "",
+                "Usage:",
+                "  forge-bridge version",
+                "",
+            ].join("\n");
+        default:
+            return [
+                `Unknown forge-bridge command: ${command}`,
+                "",
+                "Run `forge-bridge help` to see available commands.",
+                "",
+            ].join("\n");
+    }
+}
 function connectStartupText(config) {
     const runner = config.runnerId
         ? `${config.runnerId}${config.deviceName ? ` (${config.deviceName})` : ""}`

package/dist/cli/local-config.js

@@ -49,7 +49,7 @@ export function applyLocalConfigDefaults(config, local) {
         providerStatuses: normalizeProviderStatuses(local.providerStatuses) ?? providerStatusesFor(cliProviders),
         projectLabels: local.projectLabels ?? config.projectLabels,
         repoMappings: local.repoMappings ?? config.repoMappings,
-        sandboxProfiles: local.sandboxProfiles ?? config.sandboxProfiles,
+        sandboxProfiles: normalizeSandboxProfiles(local.sandboxProfiles ?? config.sandboxProfiles, cliProviders) ?? config.sandboxProfiles,
         supportsApiSecretGrant: local.supportsApiSecretGrant ?? config.supportsApiSecretGrant,
         supportsManagedWorktrees: local.supportsManagedWorktrees ?? config.supportsManagedWorktrees,
         supportsManagedForgeArtifacts: local.supportsManagedForgeArtifacts ?? config.supportsManagedForgeArtifacts,
@@ -151,6 +151,19 @@ function splitCsv(value) {
         .map((entry) => entry.trim())
         .filter((entry) => entry.length > 0);
 }
+function normalizeSandboxProfiles(profiles, cliProviders) {
+    const normalized = cleanList(profiles);
+    if (process.platform === "win32"
+        && cliProviders.some((provider) => provider.toLowerCase() === "codex")
+        && normalized?.some((profile) => profile.toLowerCase() === "provider-workspace-write")
+        && !normalized.some((profile) => profile.toLowerCase() === "danger-full-access")) {
+        return [
+            ...normalized.filter((profile) => profile.toLowerCase() !== "provider-workspace-write"),
+            "danger-full-access"
+        ];
+    }
+    return normalized;
+}
 function normalizeRepoMappings(values) {
     return (values ?? [])
         .filter((mapping) => !!mapping.label?.trim() && !!mapping.localPath?.trim())

package/dist/session/phase-completion.d.ts

@@ -3,8 +3,10 @@ import type { WorktreeHandle } from "../worktree/worktree.types.js";
 export type DevelopCompletionPhase = "implementation" | "self_review" | "validation";
 export type DebugCompletionPhase = "debug_repro" | "debug_root_cause" | "debug_fix" | "debug_regression";
 export type ArchitectCompletionPhase = "architect";
-export type CompletionPhase = DevelopCompletionPhase | "qa" | DebugCompletionPhase | ArchitectCompletionPhase;
+export type DraftCompletionPhase = "draft";
+export type CompletionPhase = DevelopCompletionPhase | "qa" | DebugCompletionPhase | ArchitectCompletionPhase | DraftCompletionPhase;
 export type QaCompletionGate = "qa_plan" | "qa_regression" | "qa_api" | "qa_manual_web" | "qa_bug_repro" | "qa_findings" | "qa_verdict";
+export type DraftCompletionGate = "draft_intent" | "draft_repo_context" | "draft_graph_context" | "draft_product_scope" | "draft_work_order_plan" | "draft_critic" | "draft_proposal";
 export interface CompletionToolRuntime {
     readonly serverName: string;
     readonly command: string;
@@ -30,6 +32,7 @@ export interface CompletionToolServerConfig {
     readonly qaCycle?: boolean;
     readonly debugCycle?: boolean;
     readonly architectCycle?: boolean;
+    readonly draftCycle?: boolean;
 }
 export interface CompletionToolCallResult {
     readonly content: readonly {
@@ -40,6 +43,7 @@ export interface CompletionToolCallResult {
         readonly gate: {
             readonly phase: CompletionPhase;
             readonly qaGate?: QaCompletionGate;
+            readonly draftGate?: DraftCompletionGate;
             readonly status: string;
             readonly allowed: boolean;
             readonly reason: string;
@@ -62,6 +66,7 @@ export interface CompletionArtifactReference {
 }
 export declare const debugCompletionPhaseOrder: readonly DebugCompletionPhase[];
 export declare const qaCompletionGateOrder: readonly QaCompletionGate[];
+export declare const draftCompletionGateOrder: readonly DraftCompletionGate[];
 export declare function completionPhaseFromDispatch(dispatch: RunOnceDispatchPacket): CompletionPhase;
 export declare function normalizeCompletionPhase(value: string | null | undefined): CompletionPhase;
 export declare function usesDevelopCycleCompletion(dispatch: RunOnceDispatchPacket): boolean;
@@ -71,9 +76,11 @@ export declare function usesArchitectCycleCompletion(dispatch: RunOnceDispatchPa
 export declare function completionToolNamesForPhase(phase: CompletionPhase): readonly string[];
 export declare function completionToolNamesForQaGate(gate: QaCompletionGate): readonly string[];
 export declare function completionToolNamesForDebugGate(gate: DebugCompletionPhase): readonly string[];
+export declare function completionToolNamesForDraftGate(gate: DraftCompletionGate): readonly string[];
 export declare function expectedCompletionToolName(phase: CompletionPhase): string;
 export declare function expectedQaCompletionToolName(gate: QaCompletionGate): string;
 export declare function expectedDebugCompletionToolName(gate: DebugCompletionPhase): string;
+export declare function expectedDraftCompletionToolName(gate: DraftCompletionGate): string;
 export declare function artifactRootFor(worktreePath: string, workItemId: string): string;
 export declare function artifactRootForOwner(worktreePath: string, ownerType: string, ownerId: string): string;
 export declare function completionArtifactJsonPath(worktreePath: string, workItemId: string, phase: CompletionPhase, ownerType?: string | null, ownerId?: string | null): string;
@@ -85,20 +92,24 @@ export declare function cursorMcpServerConfig(runtime: CompletionToolRuntime): u
 export declare function completionPromptForPhase(phase: CompletionPhase): string;
 export declare function completionPromptForDevelopCycle(phase: CompletionPhase): string;
 export declare function completionPromptForQaCycle(currentGate?: QaCompletionGate): string;
+export declare function completionPromptForDraftCycle(currentGate?: DraftCompletionGate): string;
 export declare function completionPromptForDebugCycle(currentGate?: DebugCompletionPhase): string;
 export declare function completionToolNamesForServer(config: CompletionToolServerConfig): readonly string[];
 export declare class CompletionToolServerSession {
     private readonly config;
     private currentPhase;
     private currentQaGate;
+    private currentDraftGate;
     private completed;
     constructor(config: CompletionToolServerConfig);
     get instructions(): string;
     toolDefinitions(): readonly unknown[];
     callTool(toolName: string, input: unknown): Promise<CompletionToolCallResult>;
+    private callDraftGateTool;
     private callDebugGateTool;
     private callQaGateTool;
     private advanceAfterPass;
+    private advanceAfterDraftGate;
     private advanceAfterQaGate;
     private advanceAfterDebugGate;
 }