@cubis/foundry 0.3.67 → 0.3.69

package/README.md

@@ -51,6 +51,20 @@ Generated rule files are intentionally route-first and lazy about skill loading:
 - execute directly for simple tasks
 - load skills only when the user names one or the domain is still unclear
 
+Source of truth inside this repo:
+
+- `workflows/skills/<id>` is the canonical source for skill packages.
+- `workflows/workflows/agent-environment-setup/shared/{agents,workflows}` is the canonical source for custom agents and workflows.
+- `workflows/workflows/agent-environment-setup/platforms/*` contains generated platform adapters and mirrors, not the authoring source.
+- Active generated skill mirrors are maintained for `copilot` and `claude`.
+- Any leftover `cursor` or `windsurf` folders under `platforms/*` should be treated as legacy artifacts, not active CLI targets.
+
+Recommended edit and verification loop:
+
+- Edit canonical files under `workflows/skills/*` and `workflows/workflows/agent-environment-setup/shared/*` only.
+- Regenerate all platform mirrors and managed files with `npm run generate:all`.
+- Verify generated mirrors, rules, manifest, attributes, and smoke coverage with `npm run test:ci`.
+
 ## Install
 
 ```bash
@@ -77,7 +91,7 @@ Wizard flow:
 
 - Welcome screen (Cubis Foundry banner + version)
 - Bundle selection
-- Multi-platform selection (`codex`, `antigravity`, `copilot`)
+- Multi-platform selection (`codex`, `antigravity`, `copilot`, `claude`)
 - Skills profile selection (`core`, `web-backend`, `full`)
 - MCP selection (`Cubis Foundry`, `Postman`, `Stitch`)
 - Separate scope selection for Skills and MCP (`project` or `global`)
@@ -144,6 +158,12 @@ This also manages default `StitchMCP` wiring for Antigravity.
 cbx workflows install --platform copilot --scope global --bundle agent-environment-setup --postman --postman-mode full
 ```
 
+### Claude
+
+```bash
+cbx workflows install --platform claude --scope global --bundle agent-environment-setup --postman --postman-mode full
+```
+
 ## Scope Model (Global vs Project)
 
 Default install scope is `global`.
@@ -375,7 +395,7 @@ Copilot:
 ### Install / Remove / Doctor / Rule Sync
 
 ```bash
-cbx workflows install --platform <codex|antigravity|copilot> --bundle agent-environment-setup
+cbx workflows install --platform <codex|antigravity|copilot|claude> --bundle agent-environment-setup
 cbx workflows remove <bundle-or-workflow> --platform <platform>
 cbx workflows remove-all --scope <project|global|all> --platform <platform|all>
 cbx workflows prune-skills --platform <platform> --scope <project|global> --skill-profile <core|web-backend|full> [--include-mcp] [--dry-run]

package/bin/cubis.js

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 
 import("../dist/cli/index.js").catch((error) => {
-  console.error("\nError: failed to load compiled CLI runtime at dist/cli/index.js.");
+  console.error(
+    "\nError: failed to load compiled CLI runtime at dist/cli/index.js.",
+  );
   console.error("Run `npm run build:cli` and retry.");
   if (error?.message) {
     console.error(`Details: ${error.message}`);

package/dist/cli/commands/register.js

@@ -16,10 +16,10 @@ export function registerCommands(deps) {
         .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")
+        .option("--platforms <items>", "comma-separated platforms: codex,antigravity,copilot,claude")
         .option("--skill-profile <profile>", "skills profile: core|web-backend|full")
-        .option("--skills-scope <scope>", "scope for skills install: global|project")
-        .option("--mcp-scope <scope>", "scope for MCP config: global|project")
+        .option("--skills-scope <scope>", "deprecated for init: installs are workspace-only")
+        .option("--mcp-scope <scope>", "deprecated for init: MCP config installs in workspace scope")
         .option("--mcps <items>", "comma-separated MCP selections: cubis-foundry,postman,stitch")
         .option("--postman-mode <mode>", "Postman mode: full|minimal")
         .option("--postman-workspace-id <id|null>", "optional: set default Postman workspace ID (use 'null' for no default)")

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

@@ -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) {
@@ -4583,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);
@@ -4598,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,
@@ -4608,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";
@@ -5066,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({
@@ -5466,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({
@@ -5722,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) {
@@ -5746,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}`);
@@ -5813,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)
@@ -5834,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 ? postmanSetup.effectiveMcpRuntime === "docker" ? "enabled (docker endpoint)" : "enabled (cbx mcp serve)" : "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}`);
     }
@@ -6155,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")
@@ -6164,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)
@@ -6255,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?",
@@ -6349,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);
@@ -6472,6 +6522,7 @@ async function performWorkflowInstall(options, { postmanSelectionOverride = null
         cancelled: false,
         cwd,
         scope,
+        warnings: requestedInstallScope.warning ? [requestedInstallScope.warning] : [],
         ruleScope,
         dryRun,
         platform,
@@ -6502,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);
@@ -6789,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);
@@ -6928,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 = [
@@ -6974,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 [
@@ -9415,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;
@@ -9447,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)
@@ -9468,7 +9523,10 @@ 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.");
         }
@@ -9550,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);