@cubis/foundry 0.3.66 → 0.3.68

package/src/cli/core.ts

@@ -31,7 +31,6 @@ import {
   promptInitMcpSelection,
   promptInitPlatforms,
   promptInitPostmanMode,
-  promptInitScope,
   promptInitSkillProfile,
   promptOptionalSecret,
   renderInitWelcome,
@@ -425,6 +424,34 @@ function normalizeMcpScope(value, fallback = "project") {
   );
 }
 
+function coerceWorkspaceOnlyInstallScope(value, optionName) {
+  const normalized = normalizeScope(value);
+  if (normalized === "global") {
+    return {
+      scope: "project",
+      warning: `${optionName}=${value} is ignored for install/init. Using workspace scope instead.`,
+    };
+  }
+  return {
+    scope: normalized,
+    warning: null,
+  };
+}
+
+function coerceWorkspaceOnlyMcpScope(value, optionName) {
+  const normalized = normalizeMcpScope(value, "project");
+  if (normalized === "global") {
+    return {
+      scope: "project",
+      warning: `${optionName}=${value} is ignored for install/init. Using workspace MCP config instead.`,
+    };
+  }
+  return {
+    scope: normalized,
+    warning: null,
+  };
+}
+
 function normalizeMcpRuntime(value, fallback = DEFAULT_MCP_RUNTIME) {
   const normalized = String(value || fallback)
     .trim()
@@ -3784,7 +3811,7 @@ function buildManagedWorkflowBlock(platformId, workflows) {
     "- Add supporting skills only when the active task explicitly crosses domains.",
   );
   lines.push(
-    "- Direct skill-package creation or repair work to `skill-authoring` instead of starting with `skill_search`.",
+    "- Direct skill-package creation or repair work to `skill-creator` instead of starting with `skill_search`.",
   );
   lines.push("# Full reference: foundry-detail.md#tiered-routing");
   lines.push("<!-- cbx:managed:skill-routing end -->");
@@ -4207,13 +4234,46 @@ async function syncRulesForPlatform({
 async function safeRemove(targetPath, dryRun = false) {
   if (await pathExists(targetPath)) {
     if (!dryRun) {
-      await rm(targetPath, { recursive: true, force: true });
+      await removePathWithRetry(targetPath);
     }
     return true;
   }
   return false;
 }
 
+function shouldRetryRm(error) {
+  const code = String(error?.code || "").toUpperCase();
+  return code === "EPERM" || code === "EBUSY" || code === "ENOTEMPTY";
+}
+
+async function sleep(ms) {
+  await new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function removePathWithRetry(
+  targetPath,
+  { attempts = 5, initialDelayMs = 40 } = {},
+) {
+  let lastError = null;
+  let delayMs = initialDelayMs;
+
+  for (let attempt = 1; attempt <= attempts; attempt += 1) {
+    try {
+      await rm(targetPath, { recursive: true, force: true });
+      return;
+    } catch (error) {
+      lastError = error;
+      if (!shouldRetryRm(error) || attempt === attempts) {
+        throw error;
+      }
+      await sleep(delayMs);
+      delayMs *= 2;
+    }
+  }
+
+  if (lastError) throw lastError;
+}
+
 async function copyArtifact({
   source,
   destination,
@@ -4546,7 +4606,23 @@ function buildFoundryServeArgs({ scope = "auto" } = {}) {
   return ["mcp", "serve", "--transport", "stdio", "--scope", normalizedScope];
 }
 
-function buildVsCodeFoundryServer({ scope = "auto" } = {}) {
+function buildFoundryDockerUrl({ port = DEFAULT_MCP_DOCKER_HOST_PORT } = {}) {
+  return `http://127.0.0.1:${normalizePortNumber(port, DEFAULT_MCP_DOCKER_HOST_PORT)}/mcp`;
+}
+
+function buildVsCodeFoundryServer({
+  scope = "auto",
+  runtime = "local",
+  dockerPort = DEFAULT_MCP_DOCKER_HOST_PORT,
+} = {}) {
+  if (runtime === "docker") {
+    return {
+      type: "http",
+      url: buildFoundryDockerUrl({ port: dockerPort }),
+      headers: {},
+    };
+  }
+
   return {
     type: "stdio",
     command: FOUNDRY_MCP_COMMAND,
@@ -4570,7 +4646,20 @@ function buildCopilotCliPostmanServer({
   };
 }
 
-function buildCopilotCliFoundryServer({ scope = "auto" } = {}) {
+function buildCopilotCliFoundryServer({
+  scope = "auto",
+  runtime = "local",
+  dockerPort = DEFAULT_MCP_DOCKER_HOST_PORT,
+} = {}) {
+  if (runtime === "docker") {
+    return {
+      type: "http",
+      url: buildFoundryDockerUrl({ port: dockerPort }),
+      headers: {},
+      tools: ["*"],
+    };
+  }
+
   return {
     type: "stdio",
     command: FOUNDRY_MCP_COMMAND,
@@ -4593,7 +4682,18 @@ function buildGeminiPostmanServer({
   };
 }
 
-function buildGeminiFoundryServer({ scope = "auto" } = {}) {
+function buildGeminiFoundryServer({
+  scope = "auto",
+  runtime = "local",
+  dockerPort = DEFAULT_MCP_DOCKER_HOST_PORT,
+} = {}) {
+  if (runtime === "docker") {
+    return {
+      httpUrl: buildFoundryDockerUrl({ port: dockerPort }),
+      headers: {},
+    };
+  }
+
   return {
     command: FOUNDRY_MCP_COMMAND,
     args: buildFoundryServeArgs({ scope }),
@@ -5110,18 +5210,35 @@ async function applyPostmanMcpForPlatform({
   stitchMcpUrl,
   includeStitchMcp = false,
   includeFoundryMcp = true,
+  foundryRuntime = "local",
   dryRun = false,
   cwd = process.cwd(),
 }) {
   const workspaceRoot = findWorkspaceRoot(cwd);
   const warnings = [];
   const foundryScope = mcpScope === "global" ? "global" : "project";
+  const normalizedFoundryRuntime = normalizeMcpRuntime(foundryRuntime, "local");
   const resolvedPostmanApiKey = normalizePostmanApiKey(
     process.env[apiKeyEnvVar || POSTMAN_API_KEY_ENV_VAR],
   );
   const resolvedStitchApiKey = normalizePostmanApiKey(
     process.env[stitchApiKeyEnvVar || STITCH_API_KEY_ENV_VAR],
   );
+  let foundryDockerPort = DEFAULT_MCP_DOCKER_HOST_PORT;
+  if (includeFoundryMcp && normalizedFoundryRuntime === "docker") {
+    const runningPort = await resolveDockerContainerHostPort({
+      name: DEFAULT_MCP_DOCKER_CONTAINER_NAME,
+      containerPort: MCP_DOCKER_CONTAINER_PORT,
+      cwd,
+    });
+    if (runningPort) {
+      foundryDockerPort = runningPort;
+    } else {
+      warnings.push(
+        `Foundry MCP is configured for Docker runtime at ${buildFoundryDockerUrl({ port: foundryDockerPort })}. Start it with 'cbx mcp runtime up --scope ${mcpScope}'.`,
+      );
+    }
+  }
 
   if (platform === "antigravity") {
     const settingsPath =
@@ -5148,6 +5265,8 @@ async function applyPostmanMcpForPlatform({
         if (includeFoundryMcp) {
           mcpServers[FOUNDRY_MCP_SERVER_ID] = buildGeminiFoundryServer({
             scope: foundryScope,
+            runtime: normalizedFoundryRuntime,
+            dockerPort: foundryDockerPort,
           });
         } else {
           delete mcpServers[FOUNDRY_MCP_SERVER_ID];
@@ -5199,6 +5318,8 @@ async function applyPostmanMcpForPlatform({
           if (includeFoundryMcp) {
             mcpServers[FOUNDRY_MCP_SERVER_ID] = buildCopilotCliFoundryServer({
               scope: foundryScope,
+              runtime: normalizedFoundryRuntime,
+              dockerPort: foundryDockerPort,
             });
           } else {
             delete mcpServers[FOUNDRY_MCP_SERVER_ID];
@@ -5223,6 +5344,8 @@ async function applyPostmanMcpForPlatform({
         if (includeFoundryMcp) {
           servers[FOUNDRY_MCP_SERVER_ID] = buildVsCodeFoundryServer({
             scope: foundryScope,
+            runtime: normalizedFoundryRuntime,
+            dockerPort: foundryDockerPort,
           });
         } else {
           delete servers[FOUNDRY_MCP_SERVER_ID];
@@ -5272,6 +5395,8 @@ async function applyPostmanMcpForPlatform({
           if (includeFoundryMcp) {
             servers[FOUNDRY_MCP_SERVER_ID] = buildVsCodeFoundryServer({
               scope: foundryScope,
+              runtime: normalizedFoundryRuntime,
+              dockerPort: foundryDockerPort,
             });
           } else {
             delete servers[FOUNDRY_MCP_SERVER_ID];
@@ -5362,18 +5487,32 @@ async function applyPostmanMcpForPlatform({
 
     if (includeFoundryMcp) {
       try {
-        await execFile(
-          "codex",
-          [
-            "mcp",
-            "add",
-            FOUNDRY_MCP_SERVER_ID,
-            "--",
-            FOUNDRY_MCP_COMMAND,
-            ...buildFoundryServeArgs({ scope: foundryScope }),
-          ],
-          { cwd },
-        );
+        if (normalizedFoundryRuntime === "docker") {
+          await execFile(
+            "codex",
+            [
+              "mcp",
+              "add",
+              FOUNDRY_MCP_SERVER_ID,
+              "--url",
+              buildFoundryDockerUrl({ port: foundryDockerPort }),
+            ],
+            { cwd },
+          );
+        } else {
+          await execFile(
+            "codex",
+            [
+              "mcp",
+              "add",
+              FOUNDRY_MCP_SERVER_ID,
+              "--",
+              FOUNDRY_MCP_COMMAND,
+              ...buildFoundryServeArgs({ scope: foundryScope }),
+            ],
+            { cwd },
+          );
+        }
       } catch (error) {
         warnings.push(
           `Failed to register ${FOUNDRY_MCP_SERVER_ID} MCP via Codex CLI. Ensure 'cbx' and 'codex' are installed and rerun. (${error.message})`,
@@ -5467,10 +5606,16 @@ async function resolvePostmanInstallSelection({
     : null;
   let workspaceSelectionSource = hasWorkspaceOption ? "option" : "none";
   const requestedMcpScope = options.mcpScope
-    ? normalizeMcpScope(options.mcpScope, normalizeMcpScope(scope, "project"))
+    ? coerceWorkspaceOnlyMcpScope(
+        options.mcpScope,
+        "--mcp-scope",
+      )
     : null;
-  let mcpScope = requestedMcpScope || normalizeMcpScope(scope, "project");
+  let mcpScope = requestedMcpScope?.scope || "project";
   const warnings = [];
+  if (requestedMcpScope?.warning) {
+    warnings.push(requestedMcpScope.warning);
+  }
   const stitchEnabled =
     stitchRequested ||
     (platform === "antigravity" &&
@@ -5496,7 +5641,8 @@ async function resolvePostmanInstallSelection({
   const mcpToolSync = options.mcpToolSync !== false;
   const foundryMcpEnabled = options.foundryMcp !== false;
 
-  const canPrompt = !options.yes && process.stdin.isTTY;
+  const canPrompt =
+    !options.yes && !options.dryRun && !process.env.CI && process.stdin.isTTY;
   if (postmanRequested && canPrompt && !hasWorkspaceOption) {
     const workspaceSelection = await promptPostmanWorkspaceSelection({
       apiKey: envApiKey,
@@ -5507,23 +5653,6 @@ async function resolvePostmanInstallSelection({
     workspaceSelectionSource = "interactive";
   }
 
-  if (canPrompt && !requestedMcpScope) {
-    mcpScope = await select({
-      message: "Install MCP config in workspace or global scope?",
-      choices: [
-        {
-          name: scope === "global" ? "Global (recommended)" : "Global",
-          value: "global",
-        },
-        {
-          name: scope === "project" ? "Workspace (recommended)" : "Workspace",
-          value: "project",
-        },
-      ],
-      default: mcpScope,
-    });
-  }
-
   let effectiveRuntime = requestedRuntime;
   let runtimeSkipped = false;
   let dockerImageAction = "not-requested";
@@ -5928,6 +6057,7 @@ async function configurePostmanInstallArtifacts({
         stitchMcpUrl: effectiveStitchMcpUrl,
         includeStitchMcp: shouldInstallStitch,
         includeFoundryMcp: postmanSelection.foundryMcpEnabled,
+        foundryRuntime: postmanSelection.effectiveMcpRuntime || "local",
         dryRun,
         cwd,
       });
@@ -6040,6 +6170,10 @@ async function applyPostmanConfigArtifacts({
   const stitchApiKeyEnvVar =
     normalizePostmanApiKey(stitchState?.apiKeyEnvVar) || STITCH_API_KEY_ENV_VAR;
   const stitchMcpUrl = stitchState?.mcpUrl || STITCH_MCP_URL;
+  const foundryRuntime = normalizeMcpRuntime(
+    configValue?.mcp?.effectiveRuntime || configValue?.mcp?.runtime,
+    "local",
+  );
   const resolvedPostmanApiKey = normalizePostmanApiKey(
     process.env[postmanApiKeyEnvVar],
   );
@@ -6093,7 +6227,7 @@ async function applyPostmanConfigArtifacts({
   let mcpRuntimeResult = null;
   if (!platform) {
     warnings.push(
-      "Skipped platform runtime MCP target patch because platform could not be resolved. Re-run with --platform <codex|antigravity|copilot>.",
+      "Skipped platform runtime MCP target patch because platform could not be resolved. Re-run with --platform <codex|antigravity|copilot|claude>.",
     );
   } else {
     mcpRuntimeResult = await applyPostmanMcpForPlatform({
@@ -6105,6 +6239,7 @@ async function applyPostmanConfigArtifacts({
       stitchMcpUrl,
       includeStitchMcp: stitchEnabled,
       includeFoundryMcp: true,
+      foundryRuntime,
       dryRun,
       cwd,
     });
@@ -6579,6 +6714,9 @@ async function installBundleArtifacts({
       const destination = path.join(profilePaths.skillsDir, skillId);
 
       if (!source) {
+        if (skillId === POSTMAN_SKILL_ID || skillId === STITCH_SKILL_ID) {
+          continue;
+        }
         throw new Error(
           `Missing skill source directory for '${skillId}' (checked ${workflowSkillsRoot()}).`,
         );
@@ -6925,7 +7063,7 @@ function printPlatforms() {
       `  global rules:      ${profile.global.ruleFilesByPriority.join(" | ")}`,
     );
     console.log(
-      "  default install:   workflows/agents/commands/prompts -> project, skills -> global",
+      "  default install:   workflows/agents/commands/prompts/skills/MCP -> project",
     );
   }
 }
@@ -6969,6 +7107,7 @@ function printInstallSummary({
   sanitizedAgents = [],
   terminalIntegration = null,
   terminalIntegrationRules = null,
+  warnings = [],
   dryRun = false,
 }) {
   console.log(`\nPlatform: ${platform}`);
@@ -7075,6 +7214,13 @@ function printInstallSummary({
       console.log(`- ...and ${sanitizedAgents.length - 8} more agent file(s).`);
     }
   }
+
+  if (warnings.length > 0) {
+    console.log("\nWarnings:");
+    for (const warning of warnings) {
+      console.log(`- ${warning}`);
+    }
+  }
 }
 
 function printPostmanSetupSummary({ postmanSetup }) {
@@ -7106,7 +7252,7 @@ function printPostmanSetupSummary({ postmanSetup }) {
     `- MCP tool sync: ${postmanSetup.mcpToolSync ? "enabled" : "disabled"}`,
   );
   console.log(
-    `- Foundry MCP side-by-side: ${postmanSetup.foundryMcpEnabled ? "enabled" : "disabled"}`,
+    `- Foundry MCP side-by-side: ${postmanSetup.foundryMcpEnabled ? (postmanSetup.effectiveMcpRuntime === "docker" ? "enabled (docker endpoint)" : "enabled (cbx mcp serve)") : "disabled"}`,
   );
   if (postmanSetup.postmanEnabled) {
     console.log(`- Postman API key source: ${postmanSetup.apiKeySource}`);
@@ -7574,7 +7720,11 @@ function withWorkflowBaseOptions(command) {
 function withInstallOptions(command) {
   return command
     .option("-p, --platform <platform>", "target platform id")
-    .option("--scope <scope>", "target scope: project|global", "global")
+    .option(
+      "--scope <scope>",
+      "install scope: project (global is accepted but coerced to project)",
+      "project",
+    )
     .option(
       "-b, --bundle <bundle>",
       "bundle id (default: agent-environment-setup)",
@@ -7606,7 +7756,7 @@ function withInstallOptions(command) {
     )
     .option(
       "--mcp-scope <scope>",
-      "optional: MCP config scope for --postman (project|workspace|global|user)",
+      "optional: MCP config scope for --postman (workspace/project only; global is coerced to project)",
     )
     .option(
       "--mcp-runtime <runtime>",
@@ -7801,7 +7951,8 @@ async function resolveAntigravityTerminalVerifierSelection({
   let enabled = hasTerminalIntegrationFlag || Boolean(normalizedVerifier);
   let provider = normalizedVerifier;
 
-  const canPrompt = !options.yes && process.stdin.isTTY;
+  const canPrompt =
+    !options.yes && !options.dryRun && !process.env.CI && process.stdin.isTTY;
   if (!enabled && !provider && canPrompt) {
     enabled = await confirm({
       message: "Enable Antigravity terminal verification integration?",
@@ -7939,7 +8090,11 @@ async function performWorkflowInstall(
     }
   }
   const useSymlinks = Boolean(options.link);
-  const scope = normalizeScope(options.scope);
+  const requestedInstallScope = coerceWorkspaceOnlyInstallScope(
+    options.scope,
+    "--scope",
+  );
+  const scope = requestedInstallScope.scope;
   const ruleScope = scope === "global" ? "project" : scope;
   const dryRun = Boolean(options.dryRun);
   const platform = await resolvePlatform(options.platform, scope, cwd);
@@ -8084,6 +8239,7 @@ async function performWorkflowInstall(
     cancelled: false,
     cwd,
     scope,
+    warnings: requestedInstallScope.warning ? [requestedInstallScope.warning] : [],
     ruleScope,
     dryRun,
     platform,
@@ -8116,6 +8272,7 @@ async function runWorkflowInstall(options) {
       sanitizedAgents: result.installResult.sanitizedAgents,
       terminalIntegration: result.installResult.terminalIntegration,
       terminalIntegrationRules: result.terminalVerificationRuleResult,
+      warnings: result.warnings,
       dryRun: result.dryRun,
     });
     printRuleSyncResult(result.syncResult);
@@ -8461,7 +8618,7 @@ function resolveRemoveAllPlatforms(platformOption) {
   for (const candidate of candidates) {
     if (!WORKFLOW_PROFILES[candidate]) {
       throw new Error(
-        `Unknown platform '${candidate}'. Use codex|antigravity|copilot|all.`,
+        `Unknown platform '${candidate}'. Use codex|antigravity|copilot|claude|all.`,
       );
     }
     if (!normalized.includes(candidate)) {
@@ -8628,6 +8785,54 @@ async function removeMcpRuntimeEntriesJson({
   };
 }
 
+async function removeMcpRuntimeEntriesCodexToml({
+  filePath,
+  serverIds,
+  dryRun = false,
+  cwd = process.cwd(),
+}) {
+  if (!(await pathExists(filePath))) {
+    return { path: filePath, action: "missing", warnings: [] };
+  }
+
+  const warnings = [];
+  let raw = "";
+  try {
+    raw = await readFile(filePath, "utf8");
+  } catch (error) {
+    warnings.push(
+      `Skipped MCP runtime cleanup for ${filePath}: ${error.message}`,
+    );
+    return { path: filePath, action: "skipped", warnings };
+  }
+
+  const presentServerIds = serverIds.filter((serverId) =>
+    new RegExp(
+      `^\\s*\\[mcp_servers\\.${escapeRegExp(serverId)}\\]\\s*$`,
+      "m",
+    ).test(raw),
+  );
+  if (presentServerIds.length === 0) {
+    return { path: filePath, action: "unchanged", warnings };
+  }
+
+  if (dryRun) {
+    return { path: filePath, action: "would-patch", warnings };
+  }
+
+  for (const serverId of presentServerIds) {
+    try {
+      await execFile("codex", ["mcp", "remove", serverId], { cwd });
+    } catch (error) {
+      warnings.push(
+        `Could not remove '${serverId}' via codex CLI: ${error.message}`,
+      );
+    }
+  }
+
+  return { path: filePath, action: "patched", warnings };
+}
+
 async function removePlatformMcpRuntimeTargets({
   platform,
   scope,
@@ -8685,32 +8890,13 @@ async function removePlatformMcpRuntimeTargets({
     }
 
     const codexConfigPath = path.join(os.homedir(), ".codex", "config.toml");
-    if (dryRun) {
-      return [
-        {
-          path: codexConfigPath,
-          action: "would-patch",
-          warnings: [],
-        },
-      ];
-    }
-
-    const warnings = [];
-    for (const serverId of serverIds) {
-      try {
-        await execFile("codex", ["mcp", "remove", serverId], { cwd });
-      } catch (error) {
-        warnings.push(
-          `Could not remove '${serverId}' via codex CLI: ${error.message}`,
-        );
-      }
-    }
     return [
-      {
-        path: codexConfigPath,
-        action: "patched",
-        warnings,
-      },
+      await removeMcpRuntimeEntriesCodexToml({
+        filePath: codexConfigPath,
+        serverIds,
+        dryRun,
+        cwd,
+      }),
     ];
   }
 
@@ -10205,7 +10391,7 @@ async function runWorkflowConfig(options) {
     );
 
     let postmanArtifacts = null;
-    if (hasPostmanModeOption) {
+    if (hasPostmanModeOption || hasMcpRuntimeOption) {
       const mcpScope = resolveMcpScopeFromConfigDocument(next, scope);
       let platform = null;
       const explicitPlatform = normalizePlatform(opts.platform);
@@ -11624,13 +11810,16 @@ async function runInitWizard(options) {
       options.skillProfile,
       DEFAULT_SKILL_PROFILE,
     );
-    const defaultSkillsScope = normalizeScope(
+    const requestedSkillsScope = coerceWorkspaceOnlyInstallScope(
       options.skillsScope || options.scope,
+      options.skillsScope ? "--skills-scope" : "--scope",
+    );
+    const requestedMcpScope = coerceWorkspaceOnlyMcpScope(
+      options.mcpScope,
+      "--mcp-scope",
     );
-    const defaultMcpScope =
-      normalizeMcpScope(options.mcpScope, defaultSkillsScope) === "global"
-        ? "global"
-        : "project";
+    const defaultSkillsScope = requestedSkillsScope.scope;
+    const defaultMcpScope = requestedMcpScope.scope;
     const defaultPostmanWorkspaceId =
       options.postmanWorkspaceId !== undefined
         ? normalizePostmanWorkspaceId(options.postmanWorkspaceId)
@@ -11667,18 +11856,8 @@ async function runInitWizard(options) {
         : defaultMcpSelections.length > 0
           ? defaultMcpSelections
           : ["cubis-foundry"],
-      skillsScope: isInteractive
-        ? await promptInitScope({
-            message: "Select scope for Skills installation:",
-            defaultScope: defaultSkillsScope,
-          })
-        : defaultSkillsScope,
-      mcpScope: isInteractive
-        ? await promptInitScope({
-            message: "Select scope for MCP configuration:",
-            defaultScope: defaultMcpScope,
-          })
-        : defaultMcpScope,
+      skillsScope: defaultSkillsScope,
+      mcpScope: defaultMcpScope,
       mcpRuntime: defaultMcpRuntime,
       mcpBuildLocal: defaultMcpBuildLocal,
       postmanMode:
@@ -11689,24 +11868,25 @@ async function runInitWizard(options) {
       postmanApiKey: null,
       stitchApiKey: null,
     };
-    const initWarnings = [];
+    const initWarnings = [
+      requestedSkillsScope.warning,
+      requestedMcpScope.warning,
+    ].filter(Boolean);
 
     if (selections.platforms.length === 0) {
       throw new Error("No platforms selected.");
     }
 
-    const remoteMcpSelected =
-      selections.selectedMcps.includes("postman") ||
-      selections.selectedMcps.includes("stitch");
+    const runtimeSelectableMcp = selections.selectedMcps.length > 0;
 
-    if (remoteMcpSelected && isInteractive) {
+    if (runtimeSelectableMcp && isInteractive) {
       const runtimeSelection = await promptInitMcpRuntime({
         defaultRuntime: selections.mcpRuntime,
         defaultBuildLocal: selections.mcpBuildLocal,
       });
       selections.mcpRuntime = runtimeSelection.mcpRuntime;
       selections.mcpBuildLocal = runtimeSelection.mcpBuildLocal;
-    } else if (!remoteMcpSelected) {
+    } else if (!runtimeSelectableMcp) {
       selections.mcpRuntime = "local";
       selections.mcpBuildLocal = false;
     }
@@ -11800,6 +11980,7 @@ async function runInitWizard(options) {
           terminalIntegration: installOutcome.installResult.terminalIntegration,
           terminalIntegrationRules:
             installOutcome.terminalVerificationRuleResult,
+          warnings: installOutcome.warnings,
           dryRun: installOutcome.dryRun,
         });
         printRuleSyncResult(installOutcome.syncResult);

package/src/cli/init/execute.ts

@@ -28,6 +28,7 @@ export function buildInitExecutionPlan({
   for (const platform of selections.platforms) {
     const stitchSupported = platform === "antigravity";
     const stitchEnabled = wantsStitch && stitchSupported;
+    const hasAnyMcp = wantsPostman || stitchEnabled || wantsFoundry;
     const warnings: string[] = [];
     if (wantsStitch && !stitchSupported) {
       warnings.push(
@@ -51,10 +52,9 @@ export function buildInitExecutionPlan({
       mcpScope: selections.mcpScope,
       foundryMcp: wantsFoundry,
       mcpToolSync: wantsPostman || stitchEnabled,
-      mcpRuntime: wantsPostman || stitchEnabled ? selections.mcpRuntime : "local",
+      mcpRuntime: hasAnyMcp ? selections.mcpRuntime : "local",
       mcpFallback: "local",
-      mcpBuildLocal:
-        wantsPostman || stitchEnabled ? selections.mcpBuildLocal : false,
+      mcpBuildLocal: hasAnyMcp ? selections.mcpBuildLocal : false,
       postmanMode: wantsPostman ? selections.postmanMode : undefined,
       postmanWorkspaceId: wantsPostman
         ? selections.postmanWorkspaceId