@bridge_gpt/mcp-server 0.2.65 → 0.2.67

package/build/init.js

@@ -10,6 +10,7 @@
  * effects and depends only on leaf modules.
  */
 import { writeFile, mkdir, readFile, stat } from "fs/promises";
+import { execFile } from "child_process";
 import path from "path";
 import os from "os";
 import { COMMANDS } from "./commands.generated.js";
@@ -19,7 +20,7 @@ import { AGENTS } from "./agents.generated.js";
 import { DOCS } from "./docs.generated.js";
 import { VERSION, LAUNCHER_ARGS } from "./version.generated.js";
 import { reconstructAgentMarkdown, translateAgentToCopilot, translateCommandToCopilot, } from "./agent-utils.js";
-import { validateRepoName, resolveRepoNameForProjectRoot } from "./bridge-config.js";
+import { BRIDGE_CONFIG_TEAMMATE_NOTICE_LINES, validateBridgeConfigRepoNameRepresentability, validateRepoName, resolveRepoNameForProjectRoot, } from "./bridge-config.js";
 import { ensureGitignored as ensureGitignoredShared } from "./git-ignore-utils.js";
 import { resolveBapiCredentials } from "./credential-store.js";
 import { describeLauncherReason, DUPLICATE_REGISTRATION_GUIDANCE, inspectLauncherConfigs, isPrerequisiteFailure, } from "./launcher-config-inspection.js";
@@ -133,6 +134,8 @@ export function buildBridgeConfigManifest(repoName) {
         "# Inherited by every git worktree; start-tickets worktree provisioning reads it",
         "# to decide which Bridge API MCP registrations to write. Do not add credentials,",
         "# connection URLs, or machine-specific paths here — those are resolved at runtime.",
+        "#",
+        ...BRIDGE_CONFIG_TEAMMATE_NOTICE_LINES,
         "",
         `repo_name = "${repoName}"`,
         "",
@@ -389,6 +392,65 @@ export class InitPreflightError extends Error {
         this.failures = failures;
     }
 }
+/**
+ * Classify `git ls-files --error-unmatch -- <relPath>` from its exit code: 0 is
+ * tracked, 1 is untracked, anything else is undetermined. Shared by `runInit`
+ * and install so both reach the same verdict from the same probe.
+ */
+export function classifyTrackedProbeExitCode(exitCode) {
+    if (exitCode === 0)
+        return "tracked";
+    if (exitCode === 1)
+        return "untracked";
+    return "undetermined";
+}
+/**
+ * Default tracked-config probe for `runInit`: runs git with an ARGUMENT LIST,
+ * never a shell string, in `cwd`. Any failure is `undetermined`, which callers
+ * treat as untracked — the probe fails OPEN, so a missing git or a non-repo
+ * folder still gets today's `BAPI_PROJECT_ROOT = cwd` rewrite.
+ */
+export function defaultIsTrackedConfig(cwd) {
+    return (relPath) => new Promise((resolve) => {
+        try {
+            execFile("git", ["ls-files", "--error-unmatch", "--", relPath], { cwd, windowsHide: true, timeout: 10_000 }, (error) => {
+                if (!error)
+                    return resolve("tracked");
+                const code = error.code;
+                resolve(classifyTrackedProbeExitCode(typeof code === "number" ? code : null));
+            });
+        }
+        catch {
+            resolve("undetermined");
+        }
+    });
+}
+/**
+ * Decide the `BAPI_PROJECT_ROOT` an EXISTING Bridge entry should carry (BAPI-1318).
+ * A git-tracked config keeps its existing non-blank value exactly: the runtime
+ * check in `project-root.ts` makes a committed path harmless for teammates, and
+ * rewriting it would put this machine's path into everyone's diff. Untracked and
+ * undetermined configs, and blank or absent values, get `cwd` as before.
+ *
+ * `warnReplaced` is true only when the probe was undetermined AND a different,
+ * non-blank value is being replaced — the one case where a tracked path may have
+ * been rewritten without the protection applying.
+ */
+export function decideExistingProjectRoot(existing, cwd, tracked) {
+    const current = typeof existing === "string" ? existing : "";
+    const blank = current.trim().length === 0;
+    if (tracked === "tracked" && !blank)
+        return { value: current, warnReplaced: false };
+    return {
+        value: cwd,
+        warnReplaced: tracked === "undetermined" && !blank && current !== cwd,
+    };
+}
+/** The one secret-safe warning for an undetermined probe that replaced a root. */
+export function formatUndeterminedRootReplacedWarning(relPath) {
+    return (`  Warning: could not tell whether ${relPath} is tracked by git, so its BAPI_PROJECT_ROOT ` +
+        "was rewritten to this folder. Review its diff before committing.");
+}
 /**
  * Resolve the non-secret identity a NEW Bridge entry should carry.
  *
@@ -518,6 +580,20 @@ export async function runInit(cwd, options = {}) {
     const targetSpec = `${MCP_PACKAGE_NAME}@${targetVersion}`;
     const say = options.stdout ?? ((m) => console.log(m));
     const warn = options.stderr ?? ((m) => console.error(m));
+    const trackedProbe = options.isTrackedConfig ?? defaultIsTrackedConfig(cwd);
+    const probeTracked = async (relPath) => {
+        try {
+            const verdict = await trackedProbe(relPath);
+            if (verdict === true)
+                return "tracked";
+            if (verdict === false)
+                return "untracked";
+            return verdict === "tracked" || verdict === "untracked" ? verdict : "undetermined";
+        }
+        catch {
+            return "undetermined";
+        }
+    };
     // ---- Phase 1: IDE Detection ----
     // BAPI-708: detection lives in `detectInitIdes` so the commit-safe asset
     // manifest resolves the SAME conditional targets this scaffolder writes.
@@ -701,7 +777,17 @@ export async function runInit(cwd, options = {}) {
         entry.args = refreshed;
         if (!entry.env)
             entry.env = {};
-        entry.env.BAPI_PROJECT_ROOT = cwd;
+        // BAPI-1318: a git-tracked config keeps its committed BAPI_PROJECT_ROOT.
+        // The probe runs only when there is a non-blank value to preserve.
+        const existingRoot = entry.env.BAPI_PROJECT_ROOT;
+        let trackedVerdict = "untracked";
+        if (typeof existingRoot === "string" && existingRoot.trim().length > 0 && existingRoot !== cwd) {
+            trackedVerdict = await probeTracked(target.path);
+        }
+        const rootDecision = decideExistingProjectRoot(existingRoot, cwd, trackedVerdict);
+        entry.env.BAPI_PROJECT_ROOT = rootDecision.value;
+        if (rootDecision.warnReplaced)
+            warn(formatUndeterminedRootReplacedWarning(target.path));
         await io.writeFile(fullPath, JSON.stringify(parsed, null, 2) + "\n", "utf-8");
         const kind = found.action === "already-current"
             ? "already-current"
@@ -1094,9 +1180,24 @@ says to serialize structured output.
     // the credential landed and which generated assets are safe to commit. Removed
     // outright rather than behind an output-mode flag — parameterizing would change
     // the injected `deps.runInit` seam signature for no user-visible gain.
+    // BAPI-1318: a caller that already resolved the project name (install) is
+    // authoritative, so the manifest agrees with the MCP entry. `--init` and
+    // `upgrade` pass no creation context and keep the folder-name default.
+    let bridgeConfigCreated = false;
+    let bridgeConfigRepoName;
     if (!bridgeConfigExists) {
-        await mkdir(path.dirname(bridgeConfigPath), { recursive: true });
-        await writeFile(bridgeConfigPath, buildBridgeConfigManifest(chooseScaffoldRepoName(cwd)), "utf-8");
+        const scaffoldName = options.creationContext?.repoName ?? chooseScaffoldRepoName(cwd);
+        const representable = validateBridgeConfigRepoNameRepresentability(scaffoldName);
+        if (representable.ok) {
+            await mkdir(path.dirname(bridgeConfigPath), { recursive: true });
+            await writeFile(bridgeConfigPath, buildBridgeConfigManifest(representable.value), "utf-8");
+            bridgeConfigCreated = true;
+            bridgeConfigRepoName = representable.value;
+        }
+        else {
+            warn("  Warning: .bridge/config was not created because this project name cannot be written " +
+                `there (${representable.error}). Worktrees and shell tools will fall back to the git folder name.`);
+        }
     }
     // BAPI-728: authoritative, secret-free outcome. `ok` is false whenever any
     // entry authenticates as nobody, so no caller can report full success over a
@@ -1106,5 +1207,7 @@ says to serialize structured output.
         configActions: structuredActions,
         readinessWarnings,
         targetVersion,
+        bridgeConfigCreated,
+        ...(bridgeConfigRepoName !== undefined ? { bridgeConfigRepoName } : {}),
     };
 }

package/build/install-bridge-conductor.js

@@ -106,6 +106,7 @@
  * The command does NOT persist a repository-level review policy: that is
  * BAPI-694's. The policy selected here is per-run and is reported as such.
  */
+import { PRINTED_INSTALL_COMMAND } from "./printed-remedy-commands.js";
 import { bootstrapConductorSupervisorDefaults, classifySupervisorBootstrapFailure, fetchConductorReadiness, previewConductorSupervisorBootstrap, } from "./conductor/bridge-api-client.js";
 import { CONDUCTOR_OPERATOR_RUNBOOK_POINTER, EXECUTOR_PROVISIONING_GUIDANCE, conductorInstallDoctorExitCode, conductorInstallDoctorHasFatal, formatConductorInstallDoctorReport, } from "./conductor/install-doctor.js";
 import { describeNativeLedgerAvailability, } from "./conductor/doctor.js";
@@ -138,7 +139,7 @@ export function getInstallBridgeConductorUsage() {
     return [
         "Usage: install conductor [options]",
         "",
-        "Bootstrap Epic Conductor v2 for this repository: run the unified read-only",
+        "Bootstrap the Epic Implementer for this repository: run the unified read-only",
         "doctor, write the safe project-default supervisor posture, optionally scaffold",
         "the claude-review workflow, report the capability matrix, and re-run the doctor.",
         "",
@@ -183,9 +184,10 @@ export function getInstallBridgeConductorUsage() {
         "                             approves one named server and has no default.",
         "  --execution-mode <mode>    local | durable (default: durable with",
         "                             --executor-id, otherwise local).",
-        "  --policy-file <path>       Run policy the profile references; an unattended",
-        "                             run needs notify.webhook_url reachable from the",
-        "                             API server (notify.local_sink is not enough).",
+        "  --policy-file <path>       Run policy the profile references. An unattended",
+        "                             run escalates to a notify.webhook_url reachable",
+        "                             from the API server or, with none declared, to the",
+        "                             account's email (notify.local_sink is not enough).",
         "  --dry-run                  Diagnose and preview only. Performs NO writes:",
         "                             no POST, no file write, no host MCP config write,",
         "                             no Git hook write, no install-state or capability",
@@ -208,7 +210,7 @@ export function getInstallBridgeConductorUsage() {
         "nor changed. No file is ever created: when no supported config carries a",
         "a Bridge entry, the run says so and points at the base `install` command.",
         "The MCP server captures its active groups at startup, so a merge activates on",
-        "the next launch — restart your MCP client to see the conductor tools.",
+        "the next launch — restart your MCP client to see the Epic Implementer tools.",
         "",
         "Local observability (a SEPARATE consent): installs or updates this",
         "repository's managed conductor Git hooks (post-commit,",
@@ -939,7 +941,7 @@ export function formatConductorRestartAdvisory(mergedProfile) {
         "client to gain access to the Epic Implementer tools.");
 }
 /** Remediation printed when no supported host config carries a Bridge entry. */
-export const CONDUCTOR_PROFILE_EMPTY_MERGE_REMEDIATION = `run \`npx ${MCP_PACKAGE_NAME} install\` to create and register the host MCP entry, ` +
+export const CONDUCTOR_PROFILE_EMPTY_MERGE_REMEDIATION = `run \`${PRINTED_INSTALL_COMMAND}\` to create and register the host MCP entry, ` +
     "then re-run `install conductor`.";
 /** Remediation printed whenever the managed conductor hooks were not installed. */
 export const CONDUCTOR_HOOKS_MANUAL_REMEDIATION = "re-run `install conductor` and accept the local-observability consent, or run " +