@cubis/foundry 0.3.54 → 0.3.56

package/dist/cli/init/execute.js

@@ -32,6 +32,9 @@ export function buildInitExecutionPlan({ selections, dryRun, target, }) {
             mcpFallback: "local",
             mcpBuildLocal: wantsPostman || stitchEnabled ? selections.mcpBuildLocal : false,
             postmanMode: wantsPostman ? selections.postmanMode : undefined,
+            postmanWorkspaceId: wantsPostman
+                ? selections.postmanWorkspaceId
+                : undefined,
             initWizardMode: true,
         };
         planItems.push({
@@ -45,6 +48,7 @@ export function buildInitExecutionPlan({ selections, dryRun, target, }) {
     };
 }
 export function formatInitSummary(selections) {
+    const postmanSelected = selections.selectedMcps.includes("postman");
     return [
         "Init plan summary:",
         `- Bundle: ${selections.bundleId}`,
@@ -54,7 +58,8 @@ export function formatInitSummary(selections) {
         `- MCP scope: ${selections.mcpScope}`,
         `- MCP runtime: ${selections.mcpRuntime}${selections.mcpRuntime === "docker" ? selections.mcpBuildLocal ? " (build local image)" : " (pull image)" : ""}`,
         `- MCP selections: ${selections.selectedMcps.length > 0 ? selections.selectedMcps.join(", ") : "(none)"}`,
-        `- Postman mode: ${selections.postmanMode}`,
+        `- Postman mode: ${postmanSelected ? selections.postmanMode : "(not selected)"}`,
+        `- Postman workspace: ${postmanSelected ? selections.postmanWorkspaceId === null ? "null" : selections.postmanWorkspaceId : "(not selected)"}`,
     ].join("\n");
 }
 //# sourceMappingURL=execute.js.map

package/dist/cli/init/execute.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubis/foundry",
-  "version": "0.3.54",
+  "version": "0.3.56",
   "description": "Cubis Foundry CLI for workflow-first AI agent environments",
   "type": "module",
   "bin": {

package/src/cli/commands/register.ts

@@ -67,6 +67,10 @@ export function registerCommands(deps: CliRegistrationDeps) {
       "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",

package/src/cli/core.ts

@@ -2622,6 +2622,44 @@ async function resolveProfilePaths(profileId, scope, cwd = process.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,
@@ -4574,6 +4612,81 @@ async function fetchPostmanWorkspaces({
   }
 }
 
+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 {
@@ -5043,71 +5156,12 @@ async function resolvePostmanInstallSelection({
 
   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";
   }
 
@@ -8088,6 +8142,41 @@ async function removePathRecord({
   }
 }
 
+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,
@@ -8256,6 +8345,8 @@ 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({
@@ -8275,11 +8366,45 @@ async function runWorkflowRemoveAll(options) {
 
     for (const scope of scopes) {
       for (const platform of platforms) {
-        const artifactProfilePaths = await resolveArtifactProfilePaths(
+        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({
@@ -8298,20 +8423,103 @@ 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") {
@@ -8363,6 +8571,25 @@ async function runWorkflowRemoveAll(options) {
           }
         }
 
+        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") {
@@ -8429,7 +8656,7 @@ async function runWorkflowRemoveAll(options) {
           dryRun,
           records: removedRecords,
         });
-      } else if (includeCredentials) {
+      } else if (scope === "global" || includeCredentials) {
         await removePathRecord({
           targetPath: resolveManagedCredentialsEnvPath(),
           category: "global/credentials",
@@ -8437,6 +8664,20 @@ 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 })) {
@@ -10987,6 +11228,10 @@ async function runInitWizard(options) {
       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(
@@ -11035,9 +11280,11 @@ async function runInitWizard(options) {
         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.");
@@ -11066,6 +11313,20 @@ async function runInitWizard(options) {
       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) {
@@ -11090,6 +11351,12 @@ async function runInitWizard(options) {
     });
 
     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) {

package/src/cli/init/execute.ts

@@ -53,6 +53,9 @@ export function buildInitExecutionPlan({
       mcpBuildLocal:
         wantsPostman || stitchEnabled ? selections.mcpBuildLocal : false,
       postmanMode: wantsPostman ? selections.postmanMode : undefined,
+      postmanWorkspaceId: wantsPostman
+        ? selections.postmanWorkspaceId
+        : undefined,
       initWizardMode: true,
     };
 
@@ -69,6 +72,7 @@ export function buildInitExecutionPlan({
 }
 
 export function formatInitSummary(selections: InitWizardSelections) {
+  const postmanSelected = selections.selectedMcps.includes("postman");
   return [
     "Init plan summary:",
     `- Bundle: ${selections.bundleId}`,
@@ -78,6 +82,7 @@ export function formatInitSummary(selections: InitWizardSelections) {
     `- MCP scope: ${selections.mcpScope}`,
     `- MCP runtime: ${selections.mcpRuntime}${selections.mcpRuntime === "docker" ? selections.mcpBuildLocal ? " (build local image)" : " (pull image)" : ""}`,
     `- MCP selections: ${selections.selectedMcps.length > 0 ? selections.selectedMcps.join(", ") : "(none)"}`,
-    `- Postman mode: ${selections.postmanMode}`,
+    `- Postman mode: ${postmanSelected ? selections.postmanMode : "(not selected)"}`,
+    `- Postman workspace: ${postmanSelected ? selections.postmanWorkspaceId === null ? "null" : selections.postmanWorkspaceId : "(not selected)"}`,
   ].join("\n");
 }

package/src/cli/init/types.ts

@@ -15,6 +15,7 @@ export interface InitWizardSelections {
   mcpBuildLocal: boolean;
   selectedMcps: InitMcpId[];
   postmanMode: InitPostmanMode;
+  postmanWorkspaceId: string | null;
   postmanApiKey: string | null;
   stitchApiKey: string | null;
 }