@cubis/foundry 0.3.66 → 0.3.68

package/dist/cli/core.js

@@ -11,7 +11,7 @@ import process from "node:process";
 import { promisify } from "node:util";
 import { registerCommands } from "./commands/register.js";
 import { DEFAULT_SKILL_PROFILE } from "./constants.js";
-import { buildInitExecutionPlan, formatInitSummary, promptInitApplyConfirmation, promptInitBundle, promptInitMcpRuntime, promptInitMcpSelection, promptInitPlatforms, promptInitPostmanMode, promptInitScope, promptInitSkillProfile, promptOptionalSecret, renderInitWelcome, } from "./init/index.js";
+import { buildInitExecutionPlan, formatInitSummary, promptInitApplyConfirmation, promptInitBundle, promptInitMcpRuntime, promptInitMcpSelection, promptInitPlatforms, promptInitPostmanMode, promptInitSkillProfile, promptOptionalSecret, renderInitWelcome, } from "./init/index.js";
 import { agentAssetsRoot, expandPath, findWorkspaceRoot, packageRoot, workflowSkillsRoot, } from "./pathing.js";
 const require = createRequire(import.meta.url);
 const { version: CLI_VERSION } = require("../../package.json");
@@ -373,6 +373,32 @@ function normalizeMcpScope(value, fallback = "project") {
         return "global";
     throw new Error(`Unknown MCP scope '${value}'. Use project/workspace or global/user.`);
 }
+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()
@@ -3183,7 +3209,7 @@ function buildManagedWorkflowBlock(platformId, workflows) {
     lines.push("- Never pre-load skills or agents speculatively.");
     lines.push("- Keep one primary agent and one primary skill by default.");
     lines.push("- 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`.");
+    lines.push("- 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 -->");
     lines.push("");
@@ -3491,12 +3517,39 @@ async function syncRulesForPlatform({ platform, scope, cwd = process.cwd(), dryR
 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, overwrite, dryRun = false, useSymlinks = false, }) {
     const exists = await pathExists(destination);
     if (exists && !overwrite) {
@@ -3755,7 +3808,17 @@ function buildFoundryServeArgs({ scope = "auto" } = {}) {
         : "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,
@@ -3773,7 +3836,15 @@ function buildCopilotCliPostmanServer({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR,
         tools: ["*"],
     };
 }
-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,
@@ -3790,7 +3861,13 @@ function buildGeminiPostmanServer({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, apiK
         },
     };
 }
-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 }),
@@ -4215,12 +4292,27 @@ async function removeGeneratedArtifactIfExists({ targetPath, dryRun = false }) {
         path: targetPath,
     };
 }
-async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mcpUrl, includePostmanMcp = true, stitchApiKeyEnvVar, stitchMcpUrl, includeStitchMcp = false, includeFoundryMcp = true, dryRun = false, cwd = process.cwd(), }) {
+async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mcpUrl, includePostmanMcp = true, stitchApiKeyEnvVar, 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 = mcpScope === "global"
             ? path.join(os.homedir(), ".gemini", "settings.json")
@@ -4244,6 +4336,8 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
                 if (includeFoundryMcp) {
                     mcpServers[FOUNDRY_MCP_SERVER_ID] = buildGeminiFoundryServer({
                         scope: foundryScope,
+                        runtime: normalizedFoundryRuntime,
+                        dockerPort: foundryDockerPort,
                     });
                 }
                 else {
@@ -4293,6 +4387,8 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
                     if (includeFoundryMcp) {
                         mcpServers[FOUNDRY_MCP_SERVER_ID] = buildCopilotCliFoundryServer({
                             scope: foundryScope,
+                            runtime: normalizedFoundryRuntime,
+                            dockerPort: foundryDockerPort,
                         });
                     }
                     else {
@@ -4316,6 +4412,8 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
                 if (includeFoundryMcp) {
                     servers[FOUNDRY_MCP_SERVER_ID] = buildVsCodeFoundryServer({
                         scope: foundryScope,
+                        runtime: normalizedFoundryRuntime,
+                        dockerPort: foundryDockerPort,
                     });
                 }
                 else {
@@ -4364,6 +4462,8 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
                     if (includeFoundryMcp) {
                         servers[FOUNDRY_MCP_SERVER_ID] = buildVsCodeFoundryServer({
                             scope: foundryScope,
+                            runtime: normalizedFoundryRuntime,
+                            dockerPort: foundryDockerPort,
                         });
                     }
                     else {
@@ -4444,14 +4544,25 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
         }
         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})`);
@@ -4525,10 +4636,13 @@ async function resolvePostmanInstallSelection({ platform, scope, options, cwd =
         : 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" &&
             options.stitchDefaultForAntigravity !== false);
@@ -4540,7 +4654,7 @@ async function resolvePostmanInstallSelection({ platform, scope, options, cwd =
     const mcpBuildLocal = Boolean(options.mcpBuildLocal);
     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,
@@ -4550,22 +4664,6 @@ async function resolvePostmanInstallSelection({ platform, scope, options, cwd =
         warnings.push(...workspaceSelection.warnings);
         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";
@@ -4880,6 +4978,7 @@ async function configurePostmanInstallArtifacts({ platform, scope, profilePaths,
             stitchMcpUrl: effectiveStitchMcpUrl,
             includeStitchMcp: shouldInstallStitch,
             includeFoundryMcp: postmanSelection.foundryMcpEnabled,
+            foundryRuntime: postmanSelection.effectiveMcpRuntime || "local",
             dryRun,
             cwd,
         });
@@ -4969,6 +5068,7 @@ async function applyPostmanConfigArtifacts({ platform, mcpScope, configValue, dr
     const stitchEnabled = Boolean(stitchState);
     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]);
     const resolvedStitchApiKey = normalizePostmanApiKey(process.env[stitchApiKeyEnvVar]);
     const mcpDefinitionPath = resolvePostmanMcpDefinitionPath({
@@ -5006,7 +5106,7 @@ async function applyPostmanConfigArtifacts({ platform, mcpScope, configValue, dr
     }
     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>.");
+        warnings.push("Skipped platform runtime MCP target patch because platform could not be resolved. Re-run with --platform <codex|antigravity|copilot|claude>.");
     }
     else {
         mcpRuntimeResult = await applyPostmanMcpForPlatform({
@@ -5018,6 +5118,7 @@ async function applyPostmanConfigArtifacts({ platform, mcpScope, configValue, dr
             stitchMcpUrl,
             includeStitchMcp: stitchEnabled,
             includeFoundryMcp: true,
+            foundryRuntime,
             dryRun,
             cwd,
         });
@@ -5405,6 +5506,9 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
             const source = await resolveSkillSourceDirectory(skillId);
             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()}).`);
             }
             const result = await copyArt({
@@ -5661,7 +5765,7 @@ function printPlatforms() {
             console.log(`  global prompts:    ${profile.global.promptDirs[0]}`);
         }
         console.log(`  global rules:      ${profile.global.ruleFilesByPriority.join(" | ")}`);
-        console.log("  default install:   workflows/agents/commands/prompts -> project, skills -> global");
+        console.log("  default install:   workflows/agents/commands/prompts/skills/MCP -> project");
     }
 }
 function printRuleSyncResult(result) {
@@ -5685,7 +5789,7 @@ function printRuleSyncResult(result) {
         }
     }
 }
-function printInstallSummary({ platform, scope, bundleId, installed, skipped, generatedWrapperSkills = [], duplicateSkillCleanup = [], sanitizedSkills = [], sanitizedAgents = [], terminalIntegration = null, terminalIntegrationRules = null, dryRun = false, }) {
+function printInstallSummary({ platform, scope, bundleId, installed, skipped, generatedWrapperSkills = [], duplicateSkillCleanup = [], sanitizedSkills = [], sanitizedAgents = [], terminalIntegration = null, terminalIntegrationRules = null, warnings = [], dryRun = false, }) {
     console.log(`\nPlatform: ${platform}`);
     console.log(`Scope: ${scope}`);
     console.log(`Bundle: ${bundleId}`);
@@ -5752,6 +5856,12 @@ function printInstallSummary({ platform, scope, bundleId, installed, skipped, ge
             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 }) {
     if (!postmanSetup?.enabled)
@@ -5773,7 +5883,7 @@ function printPostmanSetupSummary({ postmanSetup }) {
     console.log(`- MCP build local: ${postmanSetup.mcpBuildLocal ? "yes" : "no"}`);
     console.log(`- MCP image prepare: ${postmanSetup.dockerImageAction}`);
     console.log(`- MCP tool sync: ${postmanSetup.mcpToolSync ? "enabled" : "disabled"}`);
-    console.log(`- Foundry MCP side-by-side: ${postmanSetup.foundryMcpEnabled ? "enabled" : "disabled"}`);
+    console.log(`- 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}`);
     }
@@ -6094,7 +6204,7 @@ 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)")
         .option("--overwrite", "overwrite existing files")
         .option("--postman", "optional: install Postman skill and generate cbx_config.json")
@@ -6103,7 +6213,7 @@ function withInstallOptions(command) {
         .option("--postman-api-key <key>", "deprecated: inline key mode is disabled. Use env vars + profiles.")
         .option("--postman-workspace-id <id|null>", "optional: set default Postman workspace ID (use 'null' for no default)")
         .option("--stitch-api-key <key>", "deprecated: inline key mode is disabled. Use env vars + profiles.")
-        .option("--mcp-scope <scope>", "optional: MCP config scope for --postman (project|workspace|global|user)")
+        .option("--mcp-scope <scope>", "optional: MCP config scope for --postman (workspace/project only; global is coerced to project)")
         .option("--mcp-runtime <runtime>", "MCP runtime: docker|local", DEFAULT_MCP_RUNTIME)
         .option("--mcp-fallback <fallback>", "When docker runtime is unavailable: local|fail|skip", DEFAULT_MCP_FALLBACK)
         .option("--mcp-image <image:tag>", "Docker image for MCP runtime", DEFAULT_MCP_DOCKER_IMAGE)
@@ -6194,7 +6304,7 @@ async function resolveAntigravityTerminalVerifierSelection({ platform, options,
     }
     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?",
@@ -6288,7 +6398,8 @@ async function performWorkflowInstall(options, { postmanSelectionOverride = null
         }
     }
     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);
@@ -6411,6 +6522,7 @@ async function performWorkflowInstall(options, { postmanSelectionOverride = null
         cancelled: false,
         cwd,
         scope,
+        warnings: requestedInstallScope.warning ? [requestedInstallScope.warning] : [],
         ruleScope,
         dryRun,
         platform,
@@ -6441,6 +6553,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);
@@ -6728,7 +6841,7 @@ function resolveRemoveAllPlatforms(platformOption) {
     const normalized = [];
     for (const candidate of candidates) {
         if (!WORKFLOW_PROFILES[candidate]) {
-            throw new Error(`Unknown platform '${candidate}'. Use codex|antigravity|copilot|all.`);
+            throw new Error(`Unknown platform '${candidate}'. Use codex|antigravity|copilot|claude|all.`);
         }
         if (!normalized.includes(candidate)) {
             normalized.push(candidate);
@@ -6867,6 +6980,36 @@ async function removeMcpRuntimeEntriesJson({ filePath, keyName, serverIds, dryRu
         warnings,
     };
 }
+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, dryRun = false, cwd = process.cwd(), }) {
     const workspaceRoot = findWorkspaceRoot(cwd);
     const serverIds = [
@@ -6913,30 +7056,13 @@ async function removePlatformMcpRuntimeTargets({ platform, scope, dryRun = false
             ];
         }
         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,
+            }),
         ];
     }
     return [
@@ -8162,7 +8288,7 @@ async function runWorkflowConfig(options) {
         const effectivePostmanState = ensureCredentialServiceState(next, "postman");
         const effectivePostmanMode = resolvePostmanModeFromUrl(effectivePostmanState.mcpUrl, DEFAULT_POSTMAN_CONFIG_MODE);
         let postmanArtifacts = null;
-        if (hasPostmanModeOption) {
+        if (hasPostmanModeOption || hasMcpRuntimeOption) {
             const mcpScope = resolveMcpScopeFromConfigDocument(next, scope);
             let platform = null;
             const explicitPlatform = normalizePlatform(opts.platform);
@@ -9354,10 +9480,10 @@ async function runInitWizard(options) {
                 ? "agent-environment-setup"
                 : bundleIds[0];
         const defaultSkillProfile = normalizeSkillProfile(options.skillProfile, DEFAULT_SKILL_PROFILE);
-        const defaultSkillsScope = normalizeScope(options.skillsScope || options.scope);
-        const defaultMcpScope = normalizeMcpScope(options.mcpScope, defaultSkillsScope) === "global"
-            ? "global"
-            : "project";
+        const requestedSkillsScope = coerceWorkspaceOnlyInstallScope(options.skillsScope || options.scope, options.skillsScope ? "--skills-scope" : "--scope");
+        const requestedMcpScope = coerceWorkspaceOnlyMcpScope(options.mcpScope, "--mcp-scope");
+        const defaultSkillsScope = requestedSkillsScope.scope;
+        const defaultMcpScope = requestedMcpScope.scope;
         const defaultPostmanWorkspaceId = options.postmanWorkspaceId !== undefined
             ? normalizePostmanWorkspaceId(options.postmanWorkspaceId)
             : null;
@@ -9386,18 +9512,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: options.postmanMode && normalizePostmanMode(options.postmanMode)
@@ -9407,13 +9523,15 @@ 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");
-        if (remoteMcpSelected && isInteractive) {
+        const runtimeSelectableMcp = selections.selectedMcps.length > 0;
+        if (runtimeSelectableMcp && isInteractive) {
             const runtimeSelection = await promptInitMcpRuntime({
                 defaultRuntime: selections.mcpRuntime,
                 defaultBuildLocal: selections.mcpBuildLocal,
@@ -9421,7 +9539,7 @@ async function runInitWizard(options) {
             selections.mcpRuntime = runtimeSelection.mcpRuntime;
             selections.mcpBuildLocal = runtimeSelection.mcpBuildLocal;
         }
-        else if (!remoteMcpSelected) {
+        else if (!runtimeSelectableMcp) {
             selections.mcpRuntime = "local";
             selections.mcpBuildLocal = false;
         }
@@ -9490,6 +9608,7 @@ async function runInitWizard(options) {
                     sanitizedAgents: installOutcome.installResult.sanitizedAgents,
                     terminalIntegration: installOutcome.installResult.terminalIntegration,
                     terminalIntegrationRules: installOutcome.terminalVerificationRuleResult,
+                    warnings: installOutcome.warnings,
                     dryRun: installOutcome.dryRun,
                 });
                 printRuleSyncResult(installOutcome.syncResult);