@cubis/foundry 0.3.60 → 0.3.62

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this project are documented in this file.
 
+## [0.3.62] - 2026-03-05
+
+### Fixed
+
+- Added `--overwrite` support to `cbx init` and wired it through wizard execution so guided installs can replace existing managed files instead of failing/being skipped.
+- Updated init wizard documentation/help examples to include overwrite usage in scripted and repeat install flows.
+
+## [0.3.61] - 2026-03-05
+
+### Fixed
+
+- Extended MCP startup reliability fixes across all supported platforms:
+  - project/global Postman MCP runtime targets now prefer static Authorization headers when managed keys are available
+  - Stitch header generation now also supports managed static key injection for runtime startup reliability.
+- Unified default managed credential aliases across install paths:
+  - Postman default env alias is now `POSTMAN_API_KEY_DEFAULT`
+  - Stitch default env alias is now `STITCH_API_KEY_DEFAULT`
+  - aligns non-wizard installs with wizard persistence behavior across platforms.
+
 ## [0.3.60] - 2026-03-05
 
 ### Fixed

package/README.md

@@ -87,6 +87,7 @@ Non-interactive scripted selection:
 cbx init \
   --yes \
   --dry-run \
+  --overwrite \
   --no-banner \
   --bundle agent-environment-setup \
   --platforms codex,antigravity \

package/dist/cli/commands/register.js

@@ -13,6 +13,7 @@ export function registerCommands(deps) {
         .description("Run guided interactive install wizard")
         .option("-y, --yes", "accept defaults and apply without confirmation")
         .option("--dry-run", "preview wizard execution without writing files")
+        .option("--overwrite", "overwrite existing files where supported")
         .option("--target <path>", "run against target project directory")
         .option("--bundle <bundleId>", "workflow bundle id")
         .option("--platforms <items>", "comma-separated platforms: codex,antigravity,copilot")

package/dist/cli/commands/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/cli/commands/register.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/cli/commands/register.ts"],"names":[],"mappings":"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"}

package/dist/cli/core.js

@@ -134,7 +134,7 @@ const CODEX_WORKFLOW_SKILL_PREFIX = "workflow-";
 const CODEX_AGENT_SKILL_PREFIX = "agent-";
 const TERMINAL_VERIFIER_PROVIDERS = ["codex", "gemini"];
 const DEFAULT_TERMINAL_VERIFIER = "codex";
-const POSTMAN_API_KEY_ENV_VAR = "POSTMAN_API_KEY";
+const POSTMAN_API_KEY_ENV_VAR = "POSTMAN_API_KEY_DEFAULT";
 const POSTMAN_MODE_TO_URL = Object.freeze({
     minimal: "https://mcp.postman.com/minimal",
     code: "https://mcp.postman.com/code",
@@ -151,7 +151,7 @@ const FOUNDRY_MCP_SERVER_ID = "cubis-foundry";
 const FOUNDRY_MCP_COMMAND = "cbx";
 const STITCH_SKILL_ID = "stitch";
 const STITCH_MCP_SERVER_ID = "StitchMCP";
-const STITCH_API_KEY_ENV_VAR = "STITCH_API_KEY";
+const STITCH_API_KEY_ENV_VAR = "STITCH_API_KEY_DEFAULT";
 const STITCH_MCP_URL = "https://stitch.googleapis.com/mcp";
 const POSTMAN_WORKSPACE_MANUAL_CHOICE = "__postman_workspace_manual__";
 const CBX_CONFIG_FILENAME = "cbx_config.json";
@@ -3601,24 +3601,32 @@ function resolvePostmanMcpDefinitionPath({ platform, scope, cwd = process.cwd(),
 function resolveStitchMcpDefinitionPath({ scope, cwd = process.cwd() }) {
     return path.join(resolveMcpRootPath({ scope, cwd }), "antigravity", "stitch.json");
 }
-function buildPostmanAuthHeader({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR }) {
+function buildPostmanAuthHeader({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, apiKey = null, }) {
+    const normalizedApiKey = normalizePostmanApiKey(apiKey);
+    if (normalizedApiKey) {
+        return `Bearer ${normalizedApiKey}`;
+    }
     return `Bearer \${${apiKeyEnvVar}}`;
 }
-function buildStitchApiHeader({ apiKeyEnvVar = STITCH_API_KEY_ENV_VAR }) {
+function buildStitchApiHeader({ apiKeyEnvVar = STITCH_API_KEY_ENV_VAR, apiKey = null, }) {
+    const normalizedApiKey = normalizePostmanApiKey(apiKey);
+    if (normalizedApiKey) {
+        return `X-Goog-Api-Key: ${normalizedApiKey}`;
+    }
     return `X-Goog-Api-Key: \${${apiKeyEnvVar}}`;
 }
-function buildPostmanMcpDefinition({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, mcpUrl = POSTMAN_MCP_URL, }) {
+function buildPostmanMcpDefinition({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, apiKey = null, mcpUrl = POSTMAN_MCP_URL, }) {
     return {
         schemaVersion: 1,
         server: POSTMAN_SKILL_ID,
         transport: "http",
         url: mcpUrl,
         headers: {
-            Authorization: buildPostmanAuthHeader({ apiKeyEnvVar }),
+            Authorization: buildPostmanAuthHeader({ apiKeyEnvVar, apiKey }),
         },
     };
 }
-function buildStitchMcpDefinition({ apiKeyEnvVar = STITCH_API_KEY_ENV_VAR, mcpUrl = STITCH_MCP_URL, }) {
+function buildStitchMcpDefinition({ apiKeyEnvVar = STITCH_API_KEY_ENV_VAR, apiKey = null, mcpUrl = STITCH_MCP_URL, }) {
     return {
         schemaVersion: 1,
         server: STITCH_MCP_SERVER_ID,
@@ -3629,17 +3637,17 @@ function buildStitchMcpDefinition({ apiKeyEnvVar = STITCH_API_KEY_ENV_VAR, mcpUr
             "mcp-remote",
             mcpUrl,
             "--header",
-            buildStitchApiHeader({ apiKeyEnvVar }),
+            buildStitchApiHeader({ apiKeyEnvVar, apiKey }),
         ],
         env: {},
     };
 }
-function buildVsCodePostmanServer({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, mcpUrl = POSTMAN_MCP_URL, }) {
+function buildVsCodePostmanServer({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, apiKey = null, mcpUrl = POSTMAN_MCP_URL, }) {
     return {
         type: "sse",
         url: mcpUrl,
         headers: {
-            Authorization: buildPostmanAuthHeader({ apiKeyEnvVar }),
+            Authorization: buildPostmanAuthHeader({ apiKeyEnvVar, apiKey }),
         },
     };
 }
@@ -3657,12 +3665,12 @@ function buildVsCodeFoundryServer({ scope = "auto" } = {}) {
         env: {},
     };
 }
-function buildCopilotCliPostmanServer({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, mcpUrl = POSTMAN_MCP_URL, }) {
+function buildCopilotCliPostmanServer({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, apiKey = null, mcpUrl = POSTMAN_MCP_URL, }) {
     return {
         type: "http",
         url: mcpUrl,
         headers: {
-            Authorization: buildPostmanAuthHeader({ apiKeyEnvVar }),
+            Authorization: buildPostmanAuthHeader({ apiKeyEnvVar, apiKey }),
         },
         tools: ["*"],
     };
@@ -3676,11 +3684,11 @@ function buildCopilotCliFoundryServer({ scope = "auto" } = {}) {
         tools: ["*"],
     };
 }
-function buildGeminiPostmanServer({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, mcpUrl = POSTMAN_MCP_URL, }) {
+function buildGeminiPostmanServer({ apiKeyEnvVar = POSTMAN_API_KEY_ENV_VAR, apiKey = null, mcpUrl = POSTMAN_MCP_URL, }) {
     return {
         httpUrl: mcpUrl,
         headers: {
-            Authorization: buildPostmanAuthHeader({ apiKeyEnvVar }),
+            Authorization: buildPostmanAuthHeader({ apiKeyEnvVar, apiKey }),
         },
     };
 }
@@ -3691,7 +3699,7 @@ function buildGeminiFoundryServer({ scope = "auto" } = {}) {
         env: {},
     };
 }
-function buildGeminiStitchServer({ apiKeyEnvVar = STITCH_API_KEY_ENV_VAR, mcpUrl = STITCH_MCP_URL, }) {
+function buildGeminiStitchServer({ apiKeyEnvVar = STITCH_API_KEY_ENV_VAR, apiKey = null, mcpUrl = STITCH_MCP_URL, }) {
     return {
         command: "npx",
         args: [
@@ -3699,7 +3707,7 @@ function buildGeminiStitchServer({ apiKeyEnvVar = STITCH_API_KEY_ENV_VAR, mcpUrl
             "mcp-remote",
             mcpUrl,
             "--header",
-            buildStitchApiHeader({ apiKeyEnvVar }),
+            buildStitchApiHeader({ apiKeyEnvVar, apiKey }),
         ],
         env: {},
     };
@@ -4113,6 +4121,8 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
     const workspaceRoot = findWorkspaceRoot(cwd);
     const warnings = [];
     const foundryScope = mcpScope === "global" ? "global" : "project";
+    const resolvedPostmanApiKey = normalizePostmanApiKey(process.env[apiKeyEnvVar || POSTMAN_API_KEY_ENV_VAR]);
+    const resolvedStitchApiKey = normalizePostmanApiKey(process.env[stitchApiKeyEnvVar || STITCH_API_KEY_ENV_VAR]);
     if (platform === "antigravity") {
         const settingsPath = mcpScope === "global"
             ? path.join(os.homedir(), ".gemini", "settings.json")
@@ -4129,6 +4139,7 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
                 if (includePostmanMcp) {
                     mcpServers[POSTMAN_SKILL_ID] = buildGeminiPostmanServer({
                         apiKeyEnvVar,
+                        apiKey: resolvedPostmanApiKey,
                         mcpUrl,
                     });
                 }
@@ -4143,6 +4154,7 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
                 if (includeStitchMcp) {
                     mcpServers[STITCH_MCP_SERVER_ID] = buildGeminiStitchServer({
                         apiKeyEnvVar: stitchApiKeyEnvVar,
+                        apiKey: resolvedStitchApiKey,
                         mcpUrl: stitchMcpUrl,
                     });
                 }
@@ -4176,6 +4188,7 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
                     if (includePostmanMcp) {
                         mcpServers[POSTMAN_SKILL_ID] = buildCopilotCliPostmanServer({
                             apiKeyEnvVar,
+                            apiKey: resolvedPostmanApiKey,
                             mcpUrl,
                         });
                     }
@@ -4198,6 +4211,7 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
                 if (includePostmanMcp) {
                     servers[POSTMAN_SKILL_ID] = buildVsCodePostmanServer({
                         apiKeyEnvVar,
+                        apiKey: resolvedPostmanApiKey,
                         mcpUrl,
                     });
                 }
@@ -4237,6 +4251,7 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, apiKeyEnvVar, mc
                     if (includePostmanMcp) {
                         servers[POSTMAN_SKILL_ID] = buildVsCodePostmanServer({
                             apiKeyEnvVar,
+                            apiKey: resolvedPostmanApiKey,
                             mcpUrl,
                         });
                     }
@@ -4713,6 +4728,7 @@ async function configurePostmanInstallArtifacts({ platform, scope, profilePaths,
         });
         const mcpDefinitionContent = `${JSON.stringify(buildPostmanMcpDefinition({
             apiKeyEnvVar: effectiveApiKeyEnvVar,
+            apiKey: envApiKey,
             mcpUrl: effectiveMcpUrl,
         }), null, 2)}\n`;
         mcpDefinitionResult = await writeGeneratedArtifact({
@@ -4730,6 +4746,7 @@ async function configurePostmanInstallArtifacts({ platform, scope, profilePaths,
         });
         const stitchMcpDefinitionContent = `${JSON.stringify(buildStitchMcpDefinition({
             apiKeyEnvVar: effectiveStitchApiKeyEnvVar,
+            apiKey: envStitchApiKey,
             mcpUrl: effectiveStitchMcpUrl,
         }), null, 2)}\n`;
         stitchMcpDefinitionResult = await writeGeneratedArtifact({
@@ -4844,6 +4861,8 @@ 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 resolvedPostmanApiKey = normalizePostmanApiKey(process.env[postmanApiKeyEnvVar]);
+    const resolvedStitchApiKey = normalizePostmanApiKey(process.env[stitchApiKeyEnvVar]);
     const mcpDefinitionPath = resolvePostmanMcpDefinitionPath({
         platform,
         scope: mcpScope,
@@ -4851,6 +4870,7 @@ async function applyPostmanConfigArtifacts({ platform, mcpScope, configValue, dr
     });
     const mcpDefinitionContent = `${JSON.stringify(buildPostmanMcpDefinition({
         apiKeyEnvVar: postmanApiKeyEnvVar,
+        apiKey: resolvedPostmanApiKey,
         mcpUrl: postmanMcpUrl,
     }), null, 2)}\n`;
     const mcpDefinitionResult = await writeGeneratedArtifact({
@@ -4867,6 +4887,7 @@ async function applyPostmanConfigArtifacts({ platform, mcpScope, configValue, dr
         });
         const stitchMcpDefinitionContent = `${JSON.stringify(buildStitchMcpDefinition({
             apiKeyEnvVar: stitchApiKeyEnvVar,
+            apiKey: resolvedStitchApiKey,
             mcpUrl: stitchMcpUrl,
         }), null, 2)}\n`;
         stitchMcpDefinitionResult = await writeGeneratedArtifact({
@@ -9160,6 +9181,7 @@ function normalizeInitMcpSelections(value) {
 async function runInitWizard(options) {
     try {
         const dryRun = Boolean(options.dryRun);
+        const overwrite = Boolean(options.overwrite);
         const emitJson = Boolean(options.json);
         const hideBanner = options.banner === false || Boolean(options.noBanner);
         const cwd = options.target ? path.resolve(options.target) : process.cwd();
@@ -9289,6 +9311,7 @@ async function runInitWizard(options) {
         const plan = buildInitExecutionPlan({
             selections,
             dryRun,
+            overwrite,
             target: options.target,
         });
         const initSummary = formatInitSummary(selections);