@cubis/foundry 0.3.54 → 0.3.56

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project are documented in this file.
 
+## [0.3.56] - 2026-03-05
+
+### Fixed
+
+- Improved `cbx remove all` cleanup coverage:
+  - removes CBX-managed skills from all configured profile path candidates (not just a single preferred path)
+  - includes legacy Codex skill path cleanup (`~/.codex/skills`) for managed artifacts
+  - removes empty global CBX roots (`~/.cbx`, `~/.agents`) after cleanup when eligible.
+- Ensured global remove flow clears CBX-managed profile/config artifacts consistently (`~/.cbx/cbx_config.json`, `~/.cbx/state.json`, `~/.cbx/credentials.env` when present).
+
+## [0.3.55] - 2026-03-05
+
+### Added
+
+- Added Postman workspace selection step to `cbx init` wizard:
+  - interactive workspace list from Postman API when key is available
+  - manual workspace ID fallback prompt when listing is unavailable.
+- Added non-interactive workspace flag for wizard:
+  - `cbx init --postman-workspace-id <id|null>`
+
+### Changed
+
+- Updated wizard execution mapping so selected Postman workspace is persisted through install flow.
+- Updated init wizard docs and TTY smoke test to validate the new workspace selection step.
+
 ## [0.3.54] - 2026-03-05
 
 ### Added

package/README.md

@@ -72,7 +72,7 @@ Wizard flow:
 - MCP selection (`Cubis Foundry`, `Postman`, `Stitch`)
 - Separate scope selection for Skills and MCP (`project` or `global`)
 - MCP runtime selection (`cbx mcp serve` local, Docker pull, Docker local build) when Postman/Stitch is enabled
-- Conditional Postman mode/key and Stitch key prompts
+- Conditional Postman mode/key/workspace and Stitch key prompts
 - Final summary + confirmation
 
 Non-interactive default mode:
@@ -95,6 +95,7 @@ cbx init \
   --mcps cubis-foundry,postman,stitch \
   --mcp-scope global \
   --postman-mode minimal \
+  --postman-workspace-id null \
   --mcp-runtime local
 ```
 

package/dist/cli/commands/register.js

@@ -21,6 +21,7 @@ export function registerCommands(deps) {
         .option("--mcp-scope <scope>", "scope for MCP config: global|project")
         .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)")
         .option("--mcp-runtime <runtime>", "MCP runtime: docker|local")
         .option("--mcp-build-local", "when MCP runtime is docker, build image locally instead of pulling")
         .option("--no-banner", "skip init welcome banner")

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

@@ -2246,6 +2246,45 @@ async function resolveProfilePaths(profileId, scope, cwd = process.cwd()) {
         ruleFilesByPriority: cfg.ruleFilesByPriority.map((filePath) => expandPath(filePath, cwd)),
     };
 }
+function expandUniquePaths(pathList, cwd = process.cwd()) {
+    const seen = new Set();
+    const output = [];
+    for (const value of pathList || []) {
+        const normalized = String(value || "").trim();
+        if (!normalized)
+            continue;
+        const expanded = expandPath(normalized, cwd);
+        const key = path.resolve(expanded);
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        output.push(expanded);
+    }
+    return output;
+}
+function resolveProfilePathCandidates(profileId, scope, cwd = process.cwd()) {
+    const profile = WORKFLOW_PROFILES[profileId];
+    if (!profile)
+        throw new Error(`Unknown platform '${profileId}'.`);
+    const cfg = profile[scope];
+    return {
+        workflowsDirs: expandUniquePaths(cfg.workflowDirs, cwd),
+        agentsDirs: expandUniquePaths(cfg.agentDirs, cwd),
+        skillsDirs: expandUniquePaths(cfg.skillDirs, cwd),
+        commandsDirs: expandUniquePaths(cfg.commandDirs, cwd),
+        promptsDirs: expandUniquePaths(cfg.promptDirs, cwd),
+        ruleFilesByPriority: expandUniquePaths(cfg.ruleFilesByPriority, cwd),
+    };
+}
+function resolveLegacySkillDirsForCleanup(platform, scope, cwd = process.cwd()) {
+    if (platform !== "codex")
+        return [];
+    if (scope === "global") {
+        return [path.join(os.homedir(), ".codex", "skills")];
+    }
+    const workspaceRoot = findWorkspaceRoot(cwd);
+    return [path.join(workspaceRoot, ".codex", "skills")];
+}
 async function resolveArtifactProfilePaths(profileId, scope, cwd = process.cwd()) {
     const scopedPaths = await resolveProfilePaths(profileId, scope, cwd);
     if (scope !== "global")
@@ -3808,6 +3847,69 @@ async function fetchPostmanWorkspaces({ apiKey, apiBaseUrl = POSTMAN_API_BASE_UR
         clearTimeout(timeout);
     }
 }
+async function promptPostmanWorkspaceSelection({ apiKey, defaultWorkspaceId = null, }) {
+    let selectedWorkspaceId = normalizePostmanWorkspaceId(defaultWorkspaceId);
+    let usedWorkspaceSelector = false;
+    const warnings = [];
+    const selectableApiKey = normalizePostmanApiKey(apiKey);
+    if (selectableApiKey) {
+        try {
+            const fetchedWorkspaces = await fetchPostmanWorkspaces({
+                apiKey: selectableApiKey,
+            });
+            if (fetchedWorkspaces.length > 0) {
+                usedWorkspaceSelector = true;
+                const sortedWorkspaces = [...fetchedWorkspaces].sort((a, b) => a.name.localeCompare(b.name));
+                const workspaceChoice = await select({
+                    message: "Choose default Postman workspace for this install:",
+                    choices: [
+                        { name: "No default workspace (null)", value: null },
+                        ...sortedWorkspaces.map((workspace) => {
+                            const details = [workspace.type, workspace.visibility]
+                                .filter(Boolean)
+                                .join(", ");
+                            const suffix = details ? ` - ${details}` : "";
+                            return {
+                                name: `${workspace.name} (${workspace.id})${suffix}`,
+                                value: workspace.id,
+                            };
+                        }),
+                        {
+                            name: "Enter workspace ID manually",
+                            value: POSTMAN_WORKSPACE_MANUAL_CHOICE,
+                        },
+                    ],
+                    default: selectedWorkspaceId,
+                });
+                if (workspaceChoice === POSTMAN_WORKSPACE_MANUAL_CHOICE) {
+                    const promptedWorkspaceId = await input({
+                        message: "Default Postman workspace ID (optional, leave blank for null):",
+                        default: selectedWorkspaceId || "",
+                    });
+                    selectedWorkspaceId =
+                        normalizePostmanWorkspaceId(promptedWorkspaceId);
+                }
+                else {
+                    selectedWorkspaceId = normalizePostmanWorkspaceId(workspaceChoice);
+                }
+            }
+        }
+        catch (error) {
+            warnings.push(`Could not load Postman workspaces for selection: ${error.message}`);
+        }
+    }
+    if (!usedWorkspaceSelector) {
+        const promptedWorkspaceId = await input({
+            message: "Default Postman workspace ID (optional, leave blank for null):",
+            default: selectedWorkspaceId || "",
+        });
+        selectedWorkspaceId = normalizePostmanWorkspaceId(promptedWorkspaceId);
+    }
+    return {
+        workspaceId: selectedWorkspaceId,
+        warnings,
+    };
+}
 function parseJsonLenient(raw) {
     try {
         return {
@@ -4203,63 +4305,12 @@ async function resolvePostmanInstallSelection({ platform, scope, options, cwd =
     const foundryMcpEnabled = options.foundryMcp !== false;
     const canPrompt = !options.yes && process.stdin.isTTY;
     if (postmanRequested && canPrompt && !hasWorkspaceOption) {
-        const selectableApiKey = normalizePostmanApiKey(envApiKey);
-        let usedWorkspaceSelector = false;
-        let selectedWorkspaceId = defaultWorkspaceId;
-        if (selectableApiKey) {
-            try {
-                const fetchedWorkspaces = await fetchPostmanWorkspaces({
-                    apiKey: selectableApiKey,
-                });
-                if (fetchedWorkspaces.length > 0) {
-                    usedWorkspaceSelector = true;
-                    const sortedWorkspaces = [...fetchedWorkspaces].sort((a, b) => a.name.localeCompare(b.name));
-                    const workspaceChoice = await select({
-                        message: "Choose default Postman workspace for this install:",
-                        choices: [
-                            { name: "No default workspace (null)", value: null },
-                            ...sortedWorkspaces.map((workspace) => {
-                                const details = [workspace.type, workspace.visibility]
-                                    .filter(Boolean)
-                                    .join(", ");
-                                const suffix = details ? ` - ${details}` : "";
-                                return {
-                                    name: `${workspace.name} (${workspace.id})${suffix}`,
-                                    value: workspace.id,
-                                };
-                            }),
-                            {
-                                name: "Enter workspace ID manually",
-                                value: POSTMAN_WORKSPACE_MANUAL_CHOICE,
-                            },
-                        ],
-                        default: null,
-                    });
-                    if (workspaceChoice === POSTMAN_WORKSPACE_MANUAL_CHOICE) {
-                        const promptedWorkspaceId = await input({
-                            message: "Default Postman workspace ID (optional, leave blank for null):",
-                            default: "",
-                        });
-                        selectedWorkspaceId =
-                            normalizePostmanWorkspaceId(promptedWorkspaceId);
-                    }
-                    else {
-                        selectedWorkspaceId = normalizePostmanWorkspaceId(workspaceChoice);
-                    }
-                }
-            }
-            catch (error) {
-                warnings.push(`Could not load Postman workspaces for selection: ${error.message}`);
-            }
-        }
-        if (!usedWorkspaceSelector) {
-            const promptedWorkspaceId = await input({
-                message: "Default Postman workspace ID (optional, leave blank for null):",
-                default: "",
-            });
-            selectedWorkspaceId = normalizePostmanWorkspaceId(promptedWorkspaceId);
-        }
-        defaultWorkspaceId = selectedWorkspaceId;
+        const workspaceSelection = await promptPostmanWorkspaceSelection({
+            apiKey: envApiKey,
+            defaultWorkspaceId,
+        });
+        defaultWorkspaceId = workspaceSelection.workspaceId;
+        warnings.push(...workspaceSelection.warnings);
         workspaceSelectionSource = "interactive";
     }
     if (canPrompt && !requestedMcpScope) {
@@ -6468,6 +6519,35 @@ async function removePathRecord({ targetPath, category, dryRun = false, records,
         });
     }
 }
+async function removeEmptyDirectoryRecord({ dirPath, category, dryRun = false, records, }) {
+    if (!dirPath)
+        return;
+    if (!(await pathExists(dirPath)))
+        return;
+    let entries = [];
+    try {
+        entries = await readdir(dirPath);
+    }
+    catch {
+        return;
+    }
+    if (entries.length > 0)
+        return;
+    if (dryRun) {
+        records.push({
+            path: dirPath,
+            category,
+            action: "would-remove",
+        });
+        return;
+    }
+    await rm(dirPath, { recursive: true, force: true });
+    records.push({
+        path: dirPath,
+        category,
+        action: "removed",
+    });
+}
 async function removeMcpRuntimeEntriesJson({ filePath, keyName, serverIds, dryRun = false, }) {
     if (!(await pathExists(filePath))) {
         return { path: filePath, action: "missing", warnings: [] };
@@ -6605,6 +6685,7 @@ async function runWorkflowRemoveAll(options) {
         const scopes = resolveRemoveAllScopes(opts.scope);
         const platforms = resolveRemoveAllPlatforms(opts.platform);
         const bundleIds = await listBundleIds();
+        const knownTopLevelSkillIds = await listTopLevelSkillIdsFromRoot(workflowSkillsRoot());
         if (!dryRun && !opts.yes && process.stdin.isTTY) {
             const proceed = await confirm({
                 message: `Remove ALL CBX-managed artifacts for platforms [${platforms.join(", ")}] and scopes [${scopes.join(", ")}]?`,
@@ -6621,7 +6702,20 @@ async function runWorkflowRemoveAll(options) {
         const warnings = [];
         for (const scope of scopes) {
             for (const platform of platforms) {
-                const artifactProfilePaths = await resolveArtifactProfilePaths(platform, scope, cwd);
+                const artifactProfilePaths = await resolveProfilePaths(platform, scope, cwd);
+                const profileCandidates = resolveProfilePathCandidates(platform, scope, cwd);
+                const legacySkillDirs = resolveLegacySkillDirsForCleanup(platform, scope, cwd);
+                const allSkillDirs = expandUniquePaths([...profileCandidates.skillsDirs, ...legacySkillDirs], cwd);
+                const isPrimaryDir = (candidateDir, primaryDir) => {
+                    if (!candidateDir || !primaryDir)
+                        return false;
+                    return path.resolve(candidateDir) === path.resolve(primaryDir);
+                };
+                const alternateWorkflowsDirs = profileCandidates.workflowsDirs.filter((dirPath) => !isPrimaryDir(dirPath, artifactProfilePaths.workflowsDir));
+                const alternateAgentsDirs = profileCandidates.agentsDirs.filter((dirPath) => !isPrimaryDir(dirPath, artifactProfilePaths.agentsDir));
+                const alternateCommandsDirs = profileCandidates.commandsDirs.filter((dirPath) => !isPrimaryDir(dirPath, artifactProfilePaths.commandsDir));
+                const alternatePromptsDirs = profileCandidates.promptsDirs.filter((dirPath) => !isPrimaryDir(dirPath, artifactProfilePaths.promptsDir));
+                const alternateSkillsDirs = allSkillDirs.filter((dirPath) => !isPrimaryDir(dirPath, artifactProfilePaths.skillsDir));
                 for (const bundleId of bundleIds) {
                     const manifest = await readBundleManifest(bundleId);
                     const removedBundle = await removeBundleArtifacts({
@@ -6640,19 +6734,91 @@ async function runWorkflowRemoveAll(options) {
                             action: dryRun ? "would-remove" : "removed",
                         });
                     }
-                }
-                const extraSkillPaths = [
-                    path.join(artifactProfilePaths.skillsDir || "", POSTMAN_SKILL_ID),
-                    path.join(artifactProfilePaths.skillsDir || "", STITCH_SKILL_ID),
-                    path.join(artifactProfilePaths.skillsDir || "", "skills_index.json"),
-                ];
-                for (const extraPath of extraSkillPaths) {
-                    await removePathRecord({
-                        targetPath: extraPath,
-                        category: `${platform}/${scope}/extra-skill`,
-                        dryRun,
-                        records: removedRecords,
+                    const platformSpec = manifest.platforms?.[platform];
+                    if (!platformSpec)
+                        continue;
+                    const workflowFiles = (platformSpec.workflows || []).map((entry) => path.basename(entry));
+                    const agentFiles = (platformSpec.agents || []).map((entry) => path.basename(entry));
+                    const commandFiles = (platformSpec.commands || []).map((entry) => path.basename(entry));
+                    const promptFiles = (platformSpec.prompts || []).map((entry) => path.basename(entry));
+                    const skillIds = await resolveInstallSkillIds({
+                        platformSpec,
+                        extraSkillIds: [],
                     });
+                    const wrapperSkillIds = platform === "codex" ? buildCodexWrapperSkillIds(platformSpec) : [];
+                    const bundleSkillIds = [...new Set([...skillIds, ...wrapperSkillIds])];
+                    for (const workflowsDir of alternateWorkflowsDirs) {
+                        for (const workflowFile of workflowFiles) {
+                            await removePathRecord({
+                                targetPath: path.join(workflowsDir, workflowFile),
+                                category: `${platform}/${scope}/bundle-alt`,
+                                dryRun,
+                                records: removedRecords,
+                            });
+                        }
+                    }
+                    for (const agentsDir of alternateAgentsDirs) {
+                        for (const agentFile of agentFiles) {
+                            await removePathRecord({
+                                targetPath: path.join(agentsDir, agentFile),
+                                category: `${platform}/${scope}/bundle-alt`,
+                                dryRun,
+                                records: removedRecords,
+                            });
+                        }
+                    }
+                    for (const commandsDir of alternateCommandsDirs) {
+                        for (const commandFile of commandFiles) {
+                            await removePathRecord({
+                                targetPath: path.join(commandsDir, commandFile),
+                                category: `${platform}/${scope}/bundle-alt`,
+                                dryRun,
+                                records: removedRecords,
+                            });
+                        }
+                    }
+                    for (const promptsDir of alternatePromptsDirs) {
+                        for (const promptFile of promptFiles) {
+                            await removePathRecord({
+                                targetPath: path.join(promptsDir, promptFile),
+                                category: `${platform}/${scope}/bundle-alt`,
+                                dryRun,
+                                records: removedRecords,
+                            });
+                        }
+                    }
+                    for (const skillsDir of alternateSkillsDirs) {
+                        for (const skillId of bundleSkillIds) {
+                            await removePathRecord({
+                                targetPath: path.join(skillsDir, skillId),
+                                category: `${platform}/${scope}/bundle-alt`,
+                                dryRun,
+                                records: removedRecords,
+                            });
+                        }
+                    }
+                }
+                for (const skillsDir of allSkillDirs) {
+                    for (const entry of [
+                        POSTMAN_SKILL_ID,
+                        STITCH_SKILL_ID,
+                        "skills_index.json",
+                    ]) {
+                        await removePathRecord({
+                            targetPath: path.join(skillsDir, entry),
+                            category: `${platform}/${scope}/extra-skill`,
+                            dryRun,
+                            records: removedRecords,
+                        });
+                    }
+                    for (const skillId of knownTopLevelSkillIds) {
+                        await removePathRecord({
+                            targetPath: path.join(skillsDir, skillId),
+                            category: `${platform}/${scope}/known-skill`,
+                            dryRun,
+                            records: removedRecords,
+                        });
+                    }
                 }
                 if (platform === "antigravity") {
                     const terminalCleanup = await cleanupAntigravityTerminalIntegration({
@@ -6698,6 +6864,21 @@ async function runWorkflowRemoveAll(options) {
                         warnings.push(...runtimeResult.warnings);
                     }
                 }
+                for (const managedDir of expandUniquePaths([
+                    ...profileCandidates.skillsDirs,
+                    ...profileCandidates.agentsDirs,
+                    ...profileCandidates.workflowsDirs,
+                    ...profileCandidates.commandsDirs,
+                    ...profileCandidates.promptsDirs,
+                    ...legacySkillDirs,
+                ], cwd)) {
+                    await removeEmptyDirectoryRecord({
+                        dirPath: managedDir,
+                        category: `${platform}/${scope}/managed-dir-empty`,
+                        dryRun,
+                        records: removedRecords,
+                    });
+                }
                 const scopedProfilePaths = await resolveProfilePaths(platform, scope, cwd);
                 const ruleCandidates = [...scopedProfilePaths.ruleFilesByPriority];
                 if (scope === "global") {
@@ -6760,7 +6941,7 @@ async function runWorkflowRemoveAll(options) {
                     records: removedRecords,
                 });
             }
-            else if (includeCredentials) {
+            else if (scope === "global" || includeCredentials) {
                 await removePathRecord({
                     targetPath: resolveManagedCredentialsEnvPath(),
                     category: "global/credentials",
@@ -6768,6 +6949,19 @@ async function runWorkflowRemoveAll(options) {
                     records: removedRecords,
                 });
             }
+            if (scope === "global") {
+                for (const globalRootDir of [
+                    path.join(os.homedir(), ".cbx"),
+                    path.join(os.homedir(), ".agents"),
+                ]) {
+                    await removeEmptyDirectoryRecord({
+                        dirPath: globalRootDir,
+                        category: "global/root-dir-empty",
+                        dryRun,
+                        records: removedRecords,
+                    });
+                }
+            }
         }
         if (await checkDockerAvailable({ cwd })) {
             const containerName = DEFAULT_MCP_DOCKER_CONTAINER_NAME;
@@ -8886,6 +9080,9 @@ async function runInitWizard(options) {
         const defaultMcpScope = normalizeMcpScope(options.mcpScope, defaultSkillsScope) === "global"
             ? "global"
             : "project";
+        const defaultPostmanWorkspaceId = options.postmanWorkspaceId !== undefined
+            ? normalizePostmanWorkspaceId(options.postmanWorkspaceId)
+            : null;
         const defaultMcpSelections = normalizeInitMcpSelections(options.mcps);
         const defaultPlatforms = normalizeInitPlatforms(options.platforms);
         const defaultMcpRuntime = normalizeMcpRuntime(options.mcpRuntime, defaultMcpSelections.some((item) => item === "postman" || item === "stitch")
@@ -8928,9 +9125,11 @@ async function runInitWizard(options) {
             postmanMode: options.postmanMode && normalizePostmanMode(options.postmanMode)
                 ? normalizePostmanMode(options.postmanMode)
                 : "full",
+            postmanWorkspaceId: defaultPostmanWorkspaceId,
             postmanApiKey: null,
             stitchApiKey: null,
         };
+        const initWarnings = [];
         if (selections.platforms.length === 0) {
             throw new Error("No platforms selected.");
         }
@@ -8951,6 +9150,15 @@ async function runInitWizard(options) {
         if (selections.selectedMcps.includes("postman") && isInteractive) {
             selections.postmanMode = await promptInitPostmanMode(selections.postmanMode);
             selections.postmanApiKey = await promptOptionalSecret("Postman API key (optional, leave blank to keep existing env/profile state):");
+            const postmanLookupApiKey = normalizePostmanApiKey(selections.postmanApiKey) ||
+                normalizePostmanApiKey(process.env[profileEnvVarAlias("postman", DEFAULT_CREDENTIAL_PROFILE_NAME)]) ||
+                normalizePostmanApiKey(process.env[POSTMAN_API_KEY_ENV_VAR]);
+            const postmanWorkspaceSelection = await promptPostmanWorkspaceSelection({
+                apiKey: postmanLookupApiKey,
+                defaultWorkspaceId: selections.postmanWorkspaceId,
+            });
+            selections.postmanWorkspaceId = postmanWorkspaceSelection.workspaceId;
+            initWarnings.push(...postmanWorkspaceSelection.warnings);
         }
         if (selections.selectedMcps.includes("stitch") && isInteractive) {
             selections.stitchApiKey = await promptOptionalSecret("Stitch API key (optional, leave blank to keep existing env/profile state):");
@@ -8969,6 +9177,12 @@ async function runInitWizard(options) {
             target: options.target,
         });
         const initSummary = formatInitSummary(selections);
+        if (initWarnings.length > 0) {
+            console.log("\nInit warnings:");
+            for (const warning of initWarnings) {
+                console.log(`- ${warning}`);
+            }
+        }
         if (!options.yes && isInteractive) {
             const proceed = await promptInitApplyConfirmation(initSummary);
             if (!proceed) {