@bridge_gpt/mcp-server 0.2.67 → 0.2.68

package/build/mcp-install-state.js

@@ -16,6 +16,7 @@
  * All filesystem access is through injected dependencies so the module is fully
  * unit-testable with in-memory fakes.
  */
+import { validPackagedAssetInventory } from "./generated-assets-context.js";
 import { executorIdFromLaunchdFilename, executorIdFromSystemdFilename, } from "./executor/service-unit.js";
 import { HOST_PLATFORM_ORDER, isHostPlatformId, } from "./mcp-host-targets.js";
 /** Current on-disk schema version. */
@@ -217,8 +218,7 @@ export async function readMcpInstallState(cwd, deps) {
     catch (err) {
         if (isEnoent(err))
             return { status: "missing" };
-        // A non-ENOENT read error is treated as missing state, not a crash.
-        return { status: "missing" };
+        return { status: "unreadable" };
     }
     let parsed;
     try {
@@ -271,6 +271,9 @@ export async function readMcpInstallState(cwd, deps) {
         status: "valid",
         state: {
             version: MCP_INSTALL_STATE_VERSION,
+            ...(doc.packagedAssets === undefined ? {} : validPackagedAssetInventory(doc.packagedAssets)
+                ? { packagedAssets: doc.packagedAssets }
+                : { packagedAssetsStatus: (doc.packagedAssets && typeof doc.packagedAssets === "object" && doc.packagedAssets.version !== 1 ? "unsupported" : "invalid") }),
             selectedPlatforms: normalizePlatforms(rawPlatforms),
             projectConfigPaths: normalizeProjectPaths(projectConfigPaths),
             // Entries that are not generated-unit locators are DROPPED rather than
@@ -291,6 +294,7 @@ export function serializeMcpInstallState(state) {
     // Explicit key order — do not rely on object insertion order for stability.
     const ordered = {
         version: state.version,
+        ...(state.packagedAssets ? { packagedAssets: cleanAssetInventory(state.packagedAssets) } : {}),
         selectedPlatforms: state.selectedPlatforms,
         projectConfigPaths: state.projectConfigPaths,
         // Re-normalized at serialization time, not trusted from the input object:
@@ -315,10 +319,13 @@ export function serializeMcpInstallState(state) {
  */
 export async function writeMcpInstallState(cwd, input, deps) {
     const existing = await readMcpInstallState(cwd, deps);
+    if (!canPreserveAssetInventory(existing))
+        return { ok: false, error: "Existing installation state cannot be safely preserved." };
     const priorUnitPaths = existing.status === "valid" ? existing.state.executorServiceUnitPaths : [];
     const priorCapabilities = existing.status === "valid" ? (existing.state.capabilities ?? []) : [];
     const state = {
         version: MCP_INSTALL_STATE_VERSION,
+        ...(existing.status === "valid" && existing.state.packagedAssets ? { packagedAssets: existing.state.packagedAssets } : {}),
         selectedPlatforms: normalizePlatforms(input.selectedPlatforms),
         projectConfigPaths: normalizeProjectPaths(input.projectConfigPaths),
         executorServiceUnitPaths: normalizeExecutorServiceUnitPaths([
@@ -330,6 +337,11 @@ export async function writeMcpInstallState(cwd, input, deps) {
         // them (BAPI-775).
         capabilities: normalizeCapabilities(priorCapabilities),
     };
+    if (input.packagedAssets) {
+        if (!validPackagedAssetInventory(input.packagedAssets))
+            return { ok: false, error: "Invalid packaged-asset inventory." };
+        state.packagedAssets = cleanAssetInventory(input.packagedAssets);
+    }
     const finalPath = installStatePath(cwd);
     return persistMcpInstallState(cwd, state, finalPath, deps);
 }
@@ -351,8 +363,7 @@ async function persistMcpInstallState(cwd, state, finalPath, deps) {
                 // Best-effort cleanup only; ignore secondary failures.
             }
         }
-        const message = err instanceof Error ? err.message : String(err);
-        return { ok: false, error: `failed to persist install state: ${message}` };
+        return { ok: false, error: "failed to persist install state" };
     }
     return { ok: true, path: finalPath, state };
 }
@@ -379,11 +390,14 @@ export async function recordInstalledProjectArtifact(cwd, relPath, deps) {
         };
     }
     const existing = await readMcpInstallState(cwd, deps);
+    if (!canPreserveAssetInventory(existing))
+        return { ok: false, error: "Existing installation state cannot be safely preserved." };
     const priorPlatforms = existing.status === "valid" ? existing.state.selectedPlatforms : [];
     const priorPaths = existing.status === "valid" ? existing.state.projectConfigPaths : [];
     const priorUnitPaths = existing.status === "valid" ? existing.state.executorServiceUnitPaths : [];
     const state = {
         version: MCP_INSTALL_STATE_VERSION,
+        ...(existing.status === "valid" && existing.state.packagedAssets ? { packagedAssets: existing.state.packagedAssets } : {}),
         selectedPlatforms: normalizePlatforms(priorPlatforms),
         projectConfigPaths: normalizeProjectPaths([...priorPaths, relPath]),
         // Preserved, not rebuilt: recording a workflow file must not drop the
@@ -417,11 +431,14 @@ export async function recordInstalledExecutorServiceUnit(cwd, unitPath, homeDir,
         };
     }
     const existing = await readMcpInstallState(cwd, deps);
+    if (!canPreserveAssetInventory(existing))
+        return { ok: false, error: "Existing installation state cannot be safely preserved." };
     const priorPlatforms = existing.status === "valid" ? existing.state.selectedPlatforms : [];
     const priorPaths = existing.status === "valid" ? existing.state.projectConfigPaths : [];
     const priorUnitPaths = existing.status === "valid" ? existing.state.executorServiceUnitPaths : [];
     const state = {
         version: MCP_INSTALL_STATE_VERSION,
+        ...(existing.status === "valid" && existing.state.packagedAssets ? { packagedAssets: existing.state.packagedAssets } : {}),
         selectedPlatforms: normalizePlatforms(priorPlatforms),
         projectConfigPaths: normalizeProjectPaths(priorPaths),
         executorServiceUnitPaths: normalizeExecutorServiceUnitPaths([...priorUnitPaths, locator]),
@@ -453,12 +470,15 @@ export async function recordInstalledConductorCapability(cwd, capability, deps)
         };
     }
     const existing = await readMcpInstallState(cwd, deps);
+    if (!canPreserveAssetInventory(existing))
+        return { ok: false, error: "Existing installation state cannot be safely preserved." };
     const priorPlatforms = existing.status === "valid" ? existing.state.selectedPlatforms : [];
     const priorPaths = existing.status === "valid" ? existing.state.projectConfigPaths : [];
     const priorUnitPaths = existing.status === "valid" ? existing.state.executorServiceUnitPaths : [];
     const priorCapabilities = existing.status === "valid" ? (existing.state.capabilities ?? []) : [];
     const state = {
         version: MCP_INSTALL_STATE_VERSION,
+        ...(existing.status === "valid" && existing.state.packagedAssets ? { packagedAssets: existing.state.packagedAssets } : {}),
         selectedPlatforms: normalizePlatforms(priorPlatforms),
         projectConfigPaths: normalizeProjectPaths(priorPaths),
         executorServiceUnitPaths: normalizeExecutorServiceUnitPaths(priorUnitPaths),
@@ -466,3 +486,29 @@ export async function recordInstalledConductorCapability(cwd, capability, deps)
     };
     return persistMcpInstallState(cwd, state, installStatePath(cwd), deps);
 }
+function canPreserveAssetInventory(existing) {
+    return existing.status === "missing" || (existing.status === "valid" && !existing.state.packagedAssetsStatus);
+}
+function cleanAssetInventory(inventory) {
+    if (!validPackagedAssetInventory(inventory))
+        throw new Error("Invalid packaged-asset inventory.");
+    return { version: 1, packageVersion: inventory.packageVersion, rootBinding: inventory.rootBinding,
+        assets: inventory.assets.map(a => ({ id: a.id, destination: a.destination, host: a.host })) };
+}
+export async function recordPackagedAssetInventory(cwd, inventory, deps) {
+    if (!validPackagedAssetInventory(inventory))
+        return { ok: false, error: "Invalid packaged-asset inventory." };
+    const prior = await readMcpInstallState(cwd, deps);
+    if (!canPreserveAssetInventory(prior))
+        return { ok: false, error: "Existing installation state cannot be safely preserved." };
+    const state = prior.status === "valid" ? prior.state : undefined;
+    const records = new Map();
+    if (state?.packagedAssets?.rootBinding === inventory.rootBinding) {
+        for (const a of state.packagedAssets.assets)
+            records.set(`${a.host}:${a.id}`, a);
+    }
+    for (const a of inventory.assets)
+        records.set(`${a.host}:${a.id}`, a);
+    return writeMcpInstallState(cwd, { selectedPlatforms: state?.selectedPlatforms ?? [],
+        projectConfigPaths: state?.projectConfigPaths ?? [], packagedAssets: { ...inventory, assets: [...records.values()] } }, deps);
+}

package/build/merge-workflow-install.js

@@ -43,6 +43,7 @@
  * remediation sentence, because subprocess text is unbounded and can carry a
  * remote URL with an embedded token.
  */
+import { resolve } from "node:path";
 import { MERGE_WORKFLOW_EXPECTED_VERSION, MERGE_WORKFLOW_PATH, } from "./conductor/merge-execution-contract.js";
 import { MERGE_WORKFLOW_API_KEY_SECRET_NAME, } from "./merge-workflow-config.js";
 import { MERGE_WORKFLOW_CLASSIFICATION_TEXT, classifyMergeWorkflowContent, } from "./merge-workflow-drift.js";
@@ -247,10 +248,8 @@ export async function runMergeWorkflowPreflight(deps, options) {
     if (!repositoryRoot)
         return { ok: false, result: fail("not_repository_root") };
     const normalizedCwd = deps.cwd.endsWith("/") ? deps.cwd.slice(0, -1) : deps.cwd;
-    const normalizedRoot = repositoryRoot.endsWith("/")
-        ? repositoryRoot.slice(0, -1)
-        : repositoryRoot;
-    if (normalizedRoot !== normalizedCwd) {
+    const normalizedRoot = repositoryRoot.endsWith("/") ? repositoryRoot.slice(0, -1) : repositoryRoot;
+    if (resolve(normalizedRoot) !== resolve(normalizedCwd)) {
         return { ok: false, result: fail("not_repository_root") };
     }
     deps.log(`  repository root: ${normalizedRoot}`);

package/build/pipeline-utils.js

@@ -178,7 +178,7 @@ export const UPGRADE_ADVICE_SURFACING_INSTRUCTIONS = " Upgrade advice: when any
 export function resolveRecipe(pipeline, instructions, variables, skipSteps, autoApprove, options) {
     // Validate required variables are provided
     const declared = pipeline.variables ?? [];
-    const missing = declared.filter((v) => !(v in variables));
+    const missing = declared.filter((v) => v !== "verification_scope" && !(v in variables));
     if (missing.length > 0) {
         throw new Error(`Missing required variable(s): ${missing.join(", ")}. ` +
             `Pipeline "${pipeline.name}" declares: [${declared.join(", ")}].`);
@@ -189,7 +189,11 @@ export function resolveRecipe(pipeline, instructions, variables, skipSteps, auto
     // `execution_mode` must not be able to make a phase believe an orchestrator is
     // watching when none is.
     const executionMode = options?.executionMode ?? "inline";
-    variables = { ...variables, [EXECUTION_MODE_VARIABLE]: executionMode };
+    variables = {
+        ...variables,
+        verification_scope: variables.verification_scope === "targeted" ? "targeted" : "full",
+        [EXECUTION_MODE_VARIABLE]: executionMode,
+    };
     // Filter and resolve steps
     const resolvedSteps = [];
     let stepIndex = 1;