@cubis/foundry 0.3.63 → 0.3.65

package/src/cli/core.ts

@@ -147,7 +147,7 @@ const WORKFLOW_PROFILES = {
       agentDirs: [".github/agents"],
       skillDirs: [".github/skills"],
       promptDirs: [".github/prompts"],
-      ruleFilesByPriority: [".github/copilot-instructions.md", "AGENTS.md"],
+      ruleFilesByPriority: [".github/copilot-instructions.md"],
     },
     global: {
       workflowDirs: ["~/.copilot/workflows"],
@@ -158,7 +158,8 @@ const WORKFLOW_PROFILES = {
     },
     detectorPaths: [
       ".github/agents",
-      ".github/skills",
+      ".github/prompts",
+      ".vscode/mcp.json",
       ".github/copilot-instructions.md",
       ".github/instructions",
       "AGENTS.md",
@@ -166,6 +167,31 @@ const WORKFLOW_PROFILES = {
     legacyDetectorPaths: [],
     ruleHintName: "AGENTS.md or .github/copilot-instructions.md",
   },
+  claude: {
+    id: "claude",
+    label: "Claude Code",
+    installsCustomAgents: true,
+    project: {
+      workflowDirs: [".claude/workflows"],
+      agentDirs: [".claude/agents"],
+      skillDirs: [".claude/skills"],
+      ruleFilesByPriority: ["CLAUDE.md"],
+    },
+    global: {
+      workflowDirs: ["~/.claude/workflows"],
+      agentDirs: ["~/.claude/agents"],
+      skillDirs: ["~/.claude/skills"],
+      ruleFilesByPriority: ["~/.claude/CLAUDE.md"],
+    },
+    detectorPaths: [
+      "CLAUDE.md",
+      ".claude",
+      ".claude/rules",
+      ".claude/settings.json",
+    ],
+    legacyDetectorPaths: [],
+    ruleHintName: "CLAUDE.md",
+  },
 };
 
 const PLATFORM_IDS = Object.keys(WORKFLOW_PROFILES);
@@ -1081,7 +1107,10 @@ async function upsertEngineeringRulesFile({
 
   if (analysis.status === "absent") {
     if (!isLikelyGeneratedEngineeringRules(original)) {
-      return { action: dryRun ? "would-skip" : "skipped", filePath: targetPath };
+      return {
+        action: dryRun ? "would-skip" : "skipped",
+        filePath: targetPath,
+      };
     }
     return writeTextFile({
       targetPath,
@@ -1231,8 +1260,7 @@ async function patchCodexPostmanHttpHeaders({
   const lines = original.split(/\r?\n/);
   const nextLines = [];
 
-  const headerLine =
-    `http_headers = { Authorization = "Bearer ${escapeTomlBasicString(normalizedToken)}" }`;
+  const headerLine = `http_headers = { Authorization = "Bearer ${escapeTomlBasicString(normalizedToken)}" }`;
   const serverHeader = "[mcp_servers.postman]";
   let inPostmanSection = false;
   let postmanSectionFound = false;
@@ -1278,7 +1306,9 @@ async function patchCodexPostmanHttpHeaders({
       nextLines.push("");
     }
     nextLines.push(serverHeader);
-    nextLines.push(`url = "${escapeTomlBasicString(mcpUrl || POSTMAN_MCP_URL)}"`);
+    nextLines.push(
+      `url = "${escapeTomlBasicString(mcpUrl || POSTMAN_MCP_URL)}"`,
+    );
     nextLines.push(headerLine);
   }
 
@@ -1494,7 +1524,9 @@ function collectChildDirs(relativeFiles, prefix) {
 
 function hasPathPrefix(relativeFiles, prefix) {
   const normalizedPrefix = prefix.endsWith("/") ? prefix : `${prefix}/`;
-  return relativeFiles.some((filePath) => filePath.startsWith(normalizedPrefix));
+  return relativeFiles.some((filePath) =>
+    filePath.startsWith(normalizedPrefix),
+  );
 }
 
 function inferArchitectureForApp(rootPath, relativeFiles, relativeDirs) {
@@ -1503,7 +1535,9 @@ function inferArchitectureForApp(rootPath, relativeFiles, relativeDirs) {
   const appStructurePaths = structurePaths.filter((entryPath) =>
     entryPath.startsWith(rootPrefix),
   );
-  const appFiles = relativeFiles.filter((filePath) => filePath.startsWith(rootPrefix));
+  const appFiles = relativeFiles.filter((filePath) =>
+    filePath.startsWith(rootPrefix),
+  );
   const rel = (p) => (rootPath === "." ? p : `${rootPath}/${p}`);
   const architectureSignals = [];
   const structureHints = [];
@@ -1569,7 +1603,10 @@ function inferArchitectureForApp(rootPath, relativeFiles, relativeDirs) {
 
   if (hasLibCore && hasLibFeatures) {
     const coreModules = collectChildDirs(appStructurePaths, rel("lib/core"));
-    const featureModules = collectChildDirs(appStructurePaths, rel("lib/features"));
+    const featureModules = collectChildDirs(
+      appStructurePaths,
+      rel("lib/features"),
+    );
     const featurePreview = featureModules.slice(0, 8).join(", ");
     const remainingFeatureCount = Math.max(0, featureModules.length - 8);
     structureHints.push("- `lib/core/` present for shared/core concerns.");
@@ -1585,7 +1622,10 @@ function inferArchitectureForApp(rootPath, relativeFiles, relativeDirs) {
       structureHints.push("- `lib/main.dart` present as app entrypoint.");
     }
   } else if (hasSrcFeatures) {
-    const featureModules = collectChildDirs(appStructurePaths, rel("src/features"));
+    const featureModules = collectChildDirs(
+      appStructurePaths,
+      rel("src/features"),
+    );
     if (featureModules.length > 0) {
       const featurePreview = featureModules.slice(0, 8).join(", ");
       const remainingFeatureCount = Math.max(0, featureModules.length - 8);
@@ -1606,7 +1646,10 @@ function inferArchitectureByApp(relativeFiles, relativeDirs) {
   const appRoots = new Set(["."]);
   for (const relPath of relativeFiles) {
     const segments = relPath.split("/");
-    if (segments.length >= 3 && (segments[0] === "apps" || segments[0] === "packages")) {
+    if (
+      segments.length >= 3 &&
+      (segments[0] === "apps" || segments[0] === "packages")
+    ) {
       appRoots.add(`${segments[0]}/${segments[1]}`);
       continue;
     }
@@ -2270,7 +2313,9 @@ function buildTechMd(snapshot, { compact = false } = {}) {
   if (snapshot.frameworks.length === 0) {
     lines.push("- Framework/runtime signals: none detected.");
   } else {
-    lines.push(`- Framework/runtime signals: ${snapshot.frameworks.join(", ")}.`);
+    lines.push(
+      `- Framework/runtime signals: ${snapshot.frameworks.join(", ")}.`,
+    );
   }
   if (snapshot.languages.length === 0) {
     lines.push("- Primary languages: none detected.");
@@ -2318,7 +2363,9 @@ function buildTechMd(snapshot, { compact = false } = {}) {
       .join(", ");
     lines.push(`- Top directories: ${topDirPreview}.`);
   } else if (snapshot.topDirs.length > 0) {
-    lines.push(`- Top directories: ${snapshot.topDirs.slice(0, 10).join(", ")}.`);
+    lines.push(
+      `- Top directories: ${snapshot.topDirs.slice(0, 10).join(", ")}.`,
+    );
   } else {
     lines.push("- Top directories: none detected.");
   }
@@ -2773,7 +2820,11 @@ function resolveProfilePathCandidates(profileId, scope, cwd = process.cwd()) {
   };
 }
 
-function resolveLegacySkillDirsForCleanup(platform, scope, cwd = process.cwd()) {
+function resolveLegacySkillDirsForCleanup(
+  platform,
+  scope,
+  cwd = process.cwd(),
+) {
   if (platform !== "codex") return [];
   if (scope === "global") {
     return [path.join(os.homedir(), ".codex", "skills")];
@@ -3160,7 +3211,7 @@ function unique(values) {
 }
 
 function extractFrontmatter(markdown) {
-  const match = markdown.match(/^---\n([\s\S]*?)\n---\n?/);
+  const match = markdown.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?/);
   if (!match) {
     return { frontmatter: "", body: markdown };
   }
@@ -3171,7 +3222,7 @@ function extractFrontmatter(markdown) {
 }
 
 function hasFrontmatter(markdown) {
-  return /^---\n[\s\S]*?\n---\n?/.test(markdown);
+  return /^---\r?\n[\s\S]*?\r?\n---\r?\n?/.test(markdown);
 }
 
 function collectTopLevelFrontmatterKeys(frontmatter) {
@@ -3470,12 +3521,12 @@ function buildCodexWorkflowWrapperSkillMarkdown(wrapperSkillId, workflow) {
     `  workflow-command: ${yamlSingleQuoted(workflow.command)}`,
     "---",
     "",
-    `# Workflow Wrapper: ${workflow.command}`,
+    `# Workflow Compatibility Alias: ${workflow.command}`,
     "",
-    `Use this skill as a callable replacement for \`${workflow.command}\` workflow instructions in Codex.`,
+    `Compatibility alias for \`${workflow.command}\` in Codex. Prefer the direct workflow route first and use this wrapper only when older installs or prompts mention $${wrapperSkillId}.`,
     "",
     "## Invocation Contract",
-    "1. Match the current task against this workflow intent before execution.",
+    "1. Resolve the workflow route first; do not use this alias as a substitute for skill discovery.",
     "2. Follow the sequence and guardrails in the source instructions below.",
     "3. Produce actionable output and call out assumptions before edits.",
     "",
@@ -3505,14 +3556,15 @@ function buildCodexAgentWrapperSkillMarkdown(wrapperSkillId, agent) {
     `  agent-id: ${yamlSingleQuoted(agent.id)}`,
     "---",
     "",
-    `# Agent Wrapper: @${agent.id}`,
+    `# Agent Compatibility Alias: @${agent.id}`,
     "",
-    "Use this skill as a callable replacement for custom @agent files in Codex.",
+    `Compatibility alias for @${agent.id} in Codex. Prefer the direct @agent route first and use this wrapper only when older installs or prompts mention $${wrapperSkillId}.`,
     "",
     "## Invocation Contract",
-    "1. Adopt the role and constraints defined in the source agent content.",
-    "2. Apply domain heuristics and escalation rules before coding.",
-    "3. Ask clarifying questions when requirements are ambiguous.",
+    "1. Resolve the agent route first; do not use this alias as a substitute for skill discovery.",
+    "2. Adopt the role and constraints defined in the source agent content.",
+    "3. Apply domain heuristics and escalation rules before coding.",
+    "4. Ask clarifying questions when requirements are ambiguous.",
     "",
     `- Source agent name: ${agent.name}`,
     `- Source agent description: ${agent.description}`,
@@ -3714,12 +3766,58 @@ function buildManagedWorkflowBlock(platformId, workflows) {
     `<!-- cbx:workflows:auto:start platform=${platformId} version=1 -->`,
   );
   lines.push("## CBX Workflow Routing (auto-managed)");
+  lines.push("");
+  lines.push("<!-- cbx:managed:skill-routing start -->");
+  lines.push("Classify intent before any MCP call.");
+  lines.push(
+    "- TIER 1 DIRECT: `skill_get <exact-skill-id>` when domain and skill are obvious.",
+  );
+  lines.push(
+    "- TIER 2 TARGETED SEARCH: one `skill_search <1-3 word noun>` max, then `skill_validate` -> `skill_get`.",
+  );
+  lines.push(
+    "- TIER 3 SKIP: no MCP call for conversational, same-session, or native-tool-sufficient work.",
+  );
+  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("# Full reference: foundry-detail.md#tiered-routing");
+  lines.push("<!-- cbx:managed:skill-routing end -->");
+  lines.push("");
+  lines.push("<!-- cbx:managed:long-plan-execution start -->");
+  lines.push(
+    "When `PLAN_HANDOFF` is present, continue task 1→N without confirmation pauses.",
+  );
+  lines.push(
+    "- Pre-load deduped `skill_hint` values once, then run `skill_budget_report`.",
+  );
+  lines.push(
+    "- Execute in order, respecting `depends_on` and `stop_if_failed`.",
+  );
+  lines.push("- Emit `CHECKPOINT` every ~3 tasks in runs of 5+.");
+  lines.push(
+    "- Finish with `EXECUTION_SUMMARY {completed, skipped, stopped_at, artifacts, skills_used, dropped}`.",
+  );
+  lines.push(
+    "- Stop only for blocking artifact failure, unplanned destructive action, missing required skill after one search, or explicit user halt.",
+  );
+  lines.push(
+    "- Codex: compact before context exhaustion. Antigravity: native long context. Copilot: write `.copilot-tracking/handoff.md`.",
+  );
+  lines.push("# Full reference: foundry-detail.md#plan-handoff-and-execution");
+  lines.push("<!-- cbx:managed:long-plan-execution end -->");
+  lines.push("");
   if (platformId === "codex") {
-    lines.push("Use Codex callable wrappers:");
-    lines.push("- Workflows: $workflow-<name>");
-    lines.push("- Agents: $agent-<name>");
+    lines.push("Prefer direct route identifiers first:");
+    lines.push("- Workflows: `/workflow-name`");
+    lines.push("- Agents: `@agent-name`");
     lines.push(
-      "- Use raw $workflow-* / $agent-* tokens (no backticks) so Codex can render icons.",
+      "- Compatibility aliases remain available: `$workflow-*`, `$agent-*`",
     );
     lines.push("");
 
@@ -3730,23 +3828,58 @@ function buildManagedWorkflowBlock(platformId, workflows) {
         const triggerPreview = workflow.triggers.slice(0, 2).join(", ");
         const hint = triggerPreview ? ` (${triggerPreview})` : "";
         lines.push(
-          `- ${workflow.command} -> $${CODEX_WORKFLOW_SKILL_PREFIX}${workflow.id}${hint}`,
+          `- ${workflow.command} -> primary route (${workflow.id})${hint}`,
         );
       }
     }
 
     lines.push("");
     lines.push("Selection policy:");
-    lines.push("1. If user names a $workflow-*, use it directly.");
+    lines.push(
+      "1. If the user names `/workflow` or `@agent`, use that route directly.",
+    );
     lines.push("2. Else map intent to one primary workflow.");
     lines.push(
-      "3. Use $agent-* wrappers only when role specialization is needed.",
+      "3. Treat `$workflow-*` / `$agent-*` as compatibility aliases only.",
     );
     lines.push("");
     lines.push("<!-- cbx:workflows:auto:end -->");
     return lines.join("\n");
   }
 
+  if (platformId === "copilot") {
+    lines.push("Prefer native Copilot route surfaces first:");
+    lines.push("- Workflow prompts: `.github/prompts/workflow-*.prompt.md`");
+    lines.push("- Workflow files: `.github/copilot/workflows/*.md`");
+    lines.push("- Agents: `@agent-name`");
+    lines.push("- Workspace-first MCP: `.vscode/mcp.json`");
+    lines.push(
+      "- Do not use `$workflow-*` / `$agent-*` as the primary route surface here; those are Codex compatibility aliases.",
+    );
+    lines.push(
+      "- `.github/skills` is installed by default, but route through workflows and agents before loading skills.",
+    );
+    lines.push("");
+  } else if (platformId === "antigravity") {
+    lines.push("Prefer native Antigravity route surfaces first:");
+    lines.push("- Commands: `.gemini/commands/*.toml`");
+    lines.push("- Workflow files: `.agent/workflows/*.md`");
+    lines.push("- Agents: `@agent-name`");
+    lines.push(
+      "- Do not use `$workflow-*` / `$agent-*` as the primary route surface here; those are Codex compatibility aliases.",
+    );
+    lines.push("");
+  } else if (platformId === "claude") {
+    lines.push("Prefer native Claude Code route surfaces first:");
+    lines.push("- Rules: `.claude/rules/*.md`");
+    lines.push("- Workflow files: `.claude/workflows/*.md`");
+    lines.push("- Memory: `CLAUDE.md`");
+    lines.push(
+      "- Do not use `$workflow-*` / `$agent-*` as the primary route surface here; those are Codex compatibility aliases.",
+    );
+    lines.push("");
+  }
+
   lines.push(
     "Use the following workflows proactively when task intent matches:",
   );
@@ -3769,11 +3902,41 @@ function buildManagedWorkflowBlock(platformId, workflows) {
 
   lines.push("");
   lines.push("Selection policy:");
-  lines.push("1. Match explicit slash command first.");
-  lines.push("2. Else match user intent to workflow description and triggers.");
-  lines.push(
-    "3. Prefer one primary workflow; reference others only when needed.",
-  );
+  if (platformId === "copilot") {
+    lines.push(
+      "1. Match explicit workflow prompt, workflow, or `@agent` first.",
+    );
+    lines.push(
+      "2. Else match user intent to one primary workflow and reuse the matching prompt file when available.",
+    );
+    lines.push(
+      "3. Treat `$workflow-*` / `$agent-*` as Codex compatibility aliases, not as the primary route surface here.",
+    );
+  } else if (platformId === "antigravity") {
+    lines.push(
+      "1. Match explicit Gemini command, workflow, or `@agent` first.",
+    );
+    lines.push(
+      "2. Else match user intent to one primary workflow and use the matching command file when available.",
+    );
+    lines.push(
+      "3. Treat `$workflow-*` / `$agent-*` as Codex compatibility aliases, not as the primary route surface here.",
+    );
+  } else if (platformId === "claude") {
+    lines.push("1. Match explicit workflow or scoped rule first.");
+    lines.push("2. Else match user intent to one primary workflow.");
+    lines.push(
+      "3. Treat `$workflow-*` / `$agent-*` as Codex compatibility aliases, not as the primary route surface here.",
+    );
+  } else {
+    lines.push("1. Match explicit slash command first.");
+    lines.push(
+      "2. Else match user intent to workflow description and triggers.",
+    );
+    lines.push(
+      "3. Prefer one primary workflow; reference others only when needed.",
+    );
+  }
   lines.push("");
   lines.push("<!-- cbx:workflows:auto:end -->");
 
@@ -4261,7 +4424,8 @@ async function persistManagedCredentialsEnv({ envVarNames, dryRun = false }) {
     "# Managed by cbx workflows config keys persist-env",
     "# Stores credential env vars for future cbx sessions.",
     ...orderedNames.map(
-      (name) => `export ${name}=${quoteShellEnvValue(existingEntries.get(name))}`,
+      (name) =>
+        `export ${name}=${quoteShellEnvValue(existingEntries.get(name))}`,
     ),
     "",
   ].join("\n");
@@ -4816,8 +4980,7 @@ async function promptPostmanWorkspaceSelection({
 
   if (!usedWorkspaceSelector) {
     const promptedWorkspaceId = await input({
-      message:
-        "Default Postman workspace ID (optional, leave blank for null):",
+      message: "Default Postman workspace ID (optional, leave blank for null):",
       default: selectedWorkspaceId || "",
     });
     selectedWorkspaceId = normalizePostmanWorkspaceId(promptedWorkspaceId);
@@ -5074,7 +5237,15 @@ async function applyPostmanMcpForPlatform({
       scope: mcpScope,
       path: configPath,
       action: result.action,
-      warnings: [...warnings, ...result.warnings],
+      warnings: [
+        ...(mcpScope === "global"
+          ? [
+              "Copilot global MCP config is legacy compatibility. Prefer workspace .vscode/mcp.json as the primary supported path.",
+            ]
+          : []),
+        ...warnings,
+        ...result.warnings,
+      ],
     };
   }
 
@@ -5084,8 +5255,8 @@ async function applyPostmanMcpForPlatform({
       const result = await upsertJsonObjectFile({
         targetPath: vscodePath,
         updater: (existing) => {
-        const next = { ...existing };
-        const servers =
+          const next = { ...existing };
+          const servers =
             next.servers &&
             typeof next.servers === "object" &&
             !Array.isArray(next.servers)
@@ -5302,7 +5473,8 @@ async function resolvePostmanInstallSelection({
   const warnings = [];
   const stitchEnabled =
     stitchRequested ||
-    (platform === "antigravity" && options.stitchDefaultForAntigravity !== false);
+    (platform === "antigravity" &&
+      options.stitchDefaultForAntigravity !== false);
   const envStitchApiKey = normalizePostmanApiKey(
     process.env[STITCH_API_KEY_ENV_VAR],
   );
@@ -5748,13 +5920,13 @@ async function configurePostmanInstallArtifacts({
       }
     : await applyPostmanMcpForPlatform({
         platform,
-      mcpScope: postmanSelection.mcpScope,
-      apiKeyEnvVar: effectiveApiKeyEnvVar,
-      mcpUrl: effectiveMcpUrl,
-      includePostmanMcp: shouldInstallPostman,
-      stitchApiKeyEnvVar: effectiveStitchApiKeyEnvVar,
-      stitchMcpUrl: effectiveStitchMcpUrl,
-      includeStitchMcp: shouldInstallStitch,
+        mcpScope: postmanSelection.mcpScope,
+        apiKeyEnvVar: effectiveApiKeyEnvVar,
+        mcpUrl: effectiveMcpUrl,
+        includePostmanMcp: shouldInstallPostman,
+        stitchApiKeyEnvVar: effectiveStitchApiKeyEnvVar,
+        stitchMcpUrl: effectiveStitchMcpUrl,
+        includeStitchMcp: shouldInstallStitch,
         includeFoundryMcp: postmanSelection.foundryMcpEnabled,
         dryRun,
         cwd,
@@ -5812,7 +5984,10 @@ async function configurePostmanInstallArtifacts({
     postmanEnabled: shouldInstallPostman,
     postmanMode:
       shouldInstallPostman && effectiveMcpUrl
-        ? resolvePostmanModeFromUrl(effectiveMcpUrl, DEFAULT_POSTMAN_INSTALL_MODE)
+        ? resolvePostmanModeFromUrl(
+            effectiveMcpUrl,
+            DEFAULT_POSTMAN_INSTALL_MODE,
+          )
         : null,
     postmanMcpUrl: shouldInstallPostman ? effectiveMcpUrl : null,
     apiKeySource: effectiveApiKeySource,
@@ -5858,7 +6033,8 @@ async function applyPostmanConfigArtifacts({
   const postmanState = ensureCredentialServiceState(configValue, "postman");
   const stitchState = parseStoredStitchConfig(configValue);
   const postmanApiKeyEnvVar =
-    normalizePostmanApiKey(postmanState.apiKeyEnvVar) || POSTMAN_API_KEY_ENV_VAR;
+    normalizePostmanApiKey(postmanState.apiKeyEnvVar) ||
+    POSTMAN_API_KEY_ENV_VAR;
   const postmanMcpUrl = postmanState.mcpUrl || POSTMAN_MCP_URL;
   const stitchEnabled = Boolean(stitchState);
   const stitchApiKeyEnvVar =
@@ -6022,23 +6198,41 @@ async function sanitizeInstalledSkillsForPlatform({
   skillDirs,
   dryRun = false,
 }) {
-  if (dryRun || platform !== "copilot") return [];
-
   const sanitized = [];
 
   for (const skillDir of skillDirs) {
+    if (!(await pathExists(skillDir))) continue;
+    const entries = await readdir(skillDir, { withFileTypes: true });
+    const removedFiles = [];
+    for (const entry of entries) {
+      if (!entry.isFile()) continue;
+      if (!entry.name.endsWith(".md")) continue;
+      if (entry.name === "SKILL.md") continue;
+      const targetPath = path.join(skillDir, entry.name);
+      if (!dryRun) {
+        await rm(targetPath, { force: true });
+      }
+      removedFiles.push(entry.name);
+    }
+
     const skillFile = path.join(skillDir, "SKILL.md");
     if (!(await pathExists(skillFile))) continue;
 
-    const raw = await readFile(skillFile, "utf8");
-    const { changed, content, removedKeys } =
-      sanitizeSkillMarkdownForCopilot(raw);
-    if (!changed) continue;
+    let removedKeys = [];
+    if (!dryRun && platform === "copilot") {
+      const raw = await readFile(skillFile, "utf8");
+      const sanitizedSkill = sanitizeSkillMarkdownForCopilot(raw);
+      removedKeys = sanitizedSkill.removedKeys;
+      if (sanitizedSkill.changed) {
+        await writeFile(skillFile, sanitizedSkill.content, "utf8");
+      }
+    }
 
-    await writeFile(skillFile, content, "utf8");
+    if (removedKeys.length === 0 && removedFiles.length === 0) continue;
     sanitized.push({
       skillId: path.basename(skillDir),
       removedKeys,
+      removedFiles,
     });
   }
 
@@ -6221,9 +6415,13 @@ async function installBundleArtifacts({
     );
   }
 
+  const shouldInstallPlatformSkills = true;
+
   if (!dryRun) {
     await mkdir(profilePaths.workflowsDir, { recursive: true });
-    await mkdir(profilePaths.skillsDir, { recursive: true });
+    if (shouldInstallPlatformSkills) {
+      await mkdir(profilePaths.skillsDir, { recursive: true });
+    }
     if (platformInstallsCustomAgents(platform)) {
       await mkdir(profilePaths.agentsDir, { recursive: true });
     }
@@ -6366,56 +6564,60 @@ async function installBundleArtifacts({
       skipped.push(destination);
     else installed.push(destination);
   }
-  const agentSkillDependencies = await resolvePlatformAgentSkillDependencies({
-    platformRoot,
-    platformSpec,
-  });
-  const skillIds = await resolveInstallSkillIds({
-    platformSpec,
-    extraSkillIds: [...extraSkillIds, ...agentSkillDependencies],
-    skillProfile,
-  });
-  for (const skillId of skillIds) {
-    const source = await resolveSkillSourceDirectory(skillId);
-    const destination = path.join(profilePaths.skillsDir, skillId);
+  if (shouldInstallPlatformSkills) {
+    const agentSkillDependencies = await resolvePlatformAgentSkillDependencies({
+      platformRoot,
+      platformSpec,
+    });
+    const skillIds = await resolveInstallSkillIds({
+      platformSpec,
+      extraSkillIds: [...extraSkillIds, ...agentSkillDependencies],
+      skillProfile,
+    });
+    for (const skillId of skillIds) {
+      const source = await resolveSkillSourceDirectory(skillId);
+      const destination = path.join(profilePaths.skillsDir, skillId);
 
-    if (!source) {
-      throw new Error(
-        `Missing skill source directory for '${skillId}' (checked ${workflowSkillsRoot()}).`,
-      );
-    }
+      if (!source) {
+        throw new Error(
+          `Missing skill source directory for '${skillId}' (checked ${workflowSkillsRoot()}).`,
+        );
+      }
 
-    const result = await copyArt({
-      source,
-      destination,
-      overwrite,
-      dryRun,
-    });
-    artifacts.skills.push(destination);
-    if (result.action === "skipped" || result.action === "would-skip")
-      skipped.push(destination);
-    else installed.push(destination);
-  }
+      const result = await copyArt({
+        source,
+        destination,
+        overwrite,
+        dryRun,
+      });
+      artifacts.skills.push(destination);
+      if (result.action === "skipped" || result.action === "would-skip")
+        skipped.push(destination);
+      else installed.push(destination);
+    }
 
-  // Copy skills_index.json if it exists in the package skills root
-  const skillsIndexSource = path.join(
-    workflowSkillsRoot(),
-    "skills_index.json",
-  );
-  if (await pathExists(skillsIndexSource)) {
-    const skillsIndexDest = path.join(
-      profilePaths.skillsDir,
+    const skillsIndexSource = path.join(
+      workflowSkillsRoot(),
       "skills_index.json",
     );
-    const indexResult = await copyArt({
-      source: skillsIndexSource,
-      destination: skillsIndexDest,
-      overwrite,
-      dryRun,
-    });
-    if (indexResult.action === "skipped" || indexResult.action === "would-skip")
-      skipped.push(skillsIndexDest);
-    else installed.push(skillsIndexDest);
+    if (await pathExists(skillsIndexSource)) {
+      const skillsIndexDest = path.join(
+        profilePaths.skillsDir,
+        "skills_index.json",
+      );
+      const indexResult = await copyArt({
+        source: skillsIndexSource,
+        destination: skillsIndexDest,
+        overwrite,
+        dryRun,
+      });
+      if (
+        indexResult.action === "skipped" ||
+        indexResult.action === "would-skip"
+      )
+        skipped.push(skillsIndexDest);
+      else installed.push(skillsIndexDest);
+    }
   }
 
   let generatedWrapperSkills = [];
@@ -6807,7 +7009,9 @@ function printInstallSummary({
     console.log(
       `\nCodex callable wrapper skills: ${generatedWrapperSkills.length} (workflow=${workflowCount}, agent=${agentCount})`,
     );
-    console.log("Invoke these with $workflow-... or $agent-... in Codex.");
+    console.log(
+      "These remain compatibility aliases. Prefer direct /workflow and @agent routing in Codex when available.",
+    );
   }
 
   if (terminalIntegration) {
@@ -7800,7 +8004,11 @@ async function performWorkflowInstall(
   });
 
   if (platform === "codex" && scope === "global") {
-    const codexProjectPaths = await resolveProfilePaths("codex", "project", cwd);
+    const codexProjectPaths = await resolveProfilePaths(
+      "codex",
+      "project",
+      cwd,
+    );
     if (
       path.resolve(artifactProfilePaths.workflowsDir) !==
       path.resolve(codexProjectPaths.workflowsDir)
@@ -8427,7 +8635,11 @@ async function removePlatformMcpRuntimeTargets({
   cwd = process.cwd(),
 }) {
   const workspaceRoot = findWorkspaceRoot(cwd);
-  const serverIds = [POSTMAN_SKILL_ID, FOUNDRY_MCP_SERVER_ID, STITCH_MCP_SERVER_ID];
+  const serverIds = [
+    POSTMAN_SKILL_ID,
+    FOUNDRY_MCP_SERVER_ID,
+    STITCH_MCP_SERVER_ID,
+  ];
 
   if (platform === "antigravity") {
     const settingsPath =
@@ -8570,7 +8782,8 @@ async function runWorkflowRemoveAll(options) {
           return path.resolve(candidateDir) === path.resolve(primaryDir);
         };
         const alternateWorkflowsDirs = profileCandidates.workflowsDirs.filter(
-          (dirPath) => !isPrimaryDir(dirPath, artifactProfilePaths.workflowsDir),
+          (dirPath) =>
+            !isPrimaryDir(dirPath, artifactProfilePaths.workflowsDir),
         );
         const alternateAgentsDirs = profileCandidates.agentsDirs.filter(
           (dirPath) => !isPrimaryDir(dirPath, artifactProfilePaths.agentsDir),
@@ -8625,7 +8838,9 @@ async function runWorkflowRemoveAll(options) {
           });
           const wrapperSkillIds =
             platform === "codex" ? buildCodexWrapperSkillIds(platformSpec) : [];
-          const bundleSkillIds = [...new Set([...skillIds, ...wrapperSkillIds])];
+          const bundleSkillIds = [
+            ...new Set([...skillIds, ...wrapperSkillIds]),
+          ];
 
           for (const workflowsDir of alternateWorkflowsDirs) {
             for (const workflowFile of workflowFiles) {
@@ -8770,7 +8985,11 @@ async function runWorkflowRemoveAll(options) {
           });
         }
 
-        const scopedProfilePaths = await resolveProfilePaths(platform, scope, cwd);
+        const scopedProfilePaths = await resolveProfilePaths(
+          platform,
+          scope,
+          cwd,
+        );
         const ruleCandidates = [...scopedProfilePaths.ruleFilesByPriority];
         if (scope === "global") {
           const workspaceRule = await resolveWorkspaceRuleFileForGlobalScope(
@@ -8902,7 +9121,9 @@ async function runWorkflowRemoveAll(options) {
     if (ruleRecords.length > 0) {
       console.log("\nRule file cleanup:");
       for (const item of ruleRecords) {
-        console.log(`- [${item.platform}/${item.scope}] ${item.filePath}: ${item.action}`);
+        console.log(
+          `- [${item.platform}/${item.scope}] ${item.filePath}: ${item.action}`,
+        );
       }
     }
 
@@ -9771,7 +9992,10 @@ async function runWorkflowConfigKeysPersistEnv(options) {
       let selectedProfiles = [];
 
       if (requestedProfileName) {
-        const selected = findProfileByName(state.profiles, requestedProfileName);
+        const selected = findProfileByName(
+          state.profiles,
+          requestedProfileName,
+        );
         if (!selected) {
           warnings.push(
             `${serviceId}: profile '${requestedProfileName}' was not found`,
@@ -9986,15 +10210,9 @@ async function runWorkflowConfig(options) {
       let platform = null;
       const explicitPlatform = normalizePlatform(opts.platform);
       const configuredPlatform = normalizePlatform(next?.mcp?.platform);
-      if (
-        explicitPlatform &&
-        WORKFLOW_PROFILES[explicitPlatform]
-      ) {
+      if (explicitPlatform && WORKFLOW_PROFILES[explicitPlatform]) {
         platform = explicitPlatform;
-      } else if (
-        configuredPlatform &&
-        WORKFLOW_PROFILES[configuredPlatform]
-      ) {
+      } else if (configuredPlatform && WORKFLOW_PROFILES[configuredPlatform]) {
         platform = configuredPlatform;
       } else {
         try {
@@ -11349,7 +11567,9 @@ function normalizeInitMcpSelections(value) {
   const items = Array.isArray(value) ? value : parseCsvOption(value);
   const normalized = [];
   for (const item of items) {
-    const key = String(item || "").trim().toLowerCase();
+    const key = String(item || "")
+      .trim()
+      .toLowerCase();
     if (!allowed.has(key)) continue;
     if (!normalized.includes(key)) normalized.push(key);
   }
@@ -11404,7 +11624,9 @@ async function runInitWizard(options) {
       options.skillProfile,
       DEFAULT_SKILL_PROFILE,
     );
-    const defaultSkillsScope = normalizeScope(options.skillsScope || options.scope);
+    const defaultSkillsScope = normalizeScope(
+      options.skillsScope || options.scope,
+    );
     const defaultMcpScope =
       normalizeMcpScope(options.mcpScope, defaultSkillsScope) === "global"
         ? "global"
@@ -11417,7 +11639,9 @@ async function runInitWizard(options) {
     const defaultPlatforms = normalizeInitPlatforms(options.platforms);
     const defaultMcpRuntime = normalizeMcpRuntime(
       options.mcpRuntime,
-      defaultMcpSelections.some((item) => item === "postman" || item === "stitch")
+      defaultMcpSelections.some(
+        (item) => item === "postman" || item === "stitch",
+      )
         ? "docker"
         : "local",
     );
@@ -11517,12 +11741,14 @@ async function runInitWizard(options) {
     }
 
     if (selections.postmanApiKey) {
-      process.env[profileEnvVarAlias("postman", DEFAULT_CREDENTIAL_PROFILE_NAME)] =
-        selections.postmanApiKey;
+      process.env[
+        profileEnvVarAlias("postman", DEFAULT_CREDENTIAL_PROFILE_NAME)
+      ] = selections.postmanApiKey;
     }
     if (selections.stitchApiKey) {
-      process.env[profileEnvVarAlias("stitch", DEFAULT_CREDENTIAL_PROFILE_NAME)] =
-        selections.stitchApiKey;
+      process.env[
+        profileEnvVarAlias("stitch", DEFAULT_CREDENTIAL_PROFILE_NAME)
+      ] = selections.stitchApiKey;
     }
 
     const plan = buildInitExecutionPlan({
@@ -11552,7 +11778,9 @@ async function runInitWizard(options) {
     const results = [];
     for (const item of plan.items) {
       try {
-        const installOutcome = await performWorkflowInstall(item.installOptions);
+        const installOutcome = await performWorkflowInstall(
+          item.installOptions,
+        );
         if (installOutcome.cancelled) {
           console.log("Cancelled.");
           process.exit(0);
@@ -11563,17 +11791,21 @@ async function runInitWizard(options) {
           bundleId: installOutcome.bundleId,
           installed: installOutcome.installResult.installed,
           skipped: installOutcome.installResult.skipped,
-          generatedWrapperSkills: installOutcome.installResult.generatedWrapperSkills,
-          duplicateSkillCleanup: installOutcome.installResult.duplicateSkillCleanup,
+          generatedWrapperSkills:
+            installOutcome.installResult.generatedWrapperSkills,
+          duplicateSkillCleanup:
+            installOutcome.installResult.duplicateSkillCleanup,
           sanitizedSkills: installOutcome.installResult.sanitizedSkills,
           sanitizedAgents: installOutcome.installResult.sanitizedAgents,
           terminalIntegration: installOutcome.installResult.terminalIntegration,
-          terminalIntegrationRules: installOutcome.terminalVerificationRuleResult,
+          terminalIntegrationRules:
+            installOutcome.terminalVerificationRuleResult,
           dryRun: installOutcome.dryRun,
         });
         printRuleSyncResult(installOutcome.syncResult);
         printInstallEngineeringSummary({
-          engineeringResults: installOutcome.engineeringArtifactsResult.engineeringResults,
+          engineeringResults:
+            installOutcome.engineeringArtifactsResult.engineeringResults,
           techResult: installOutcome.engineeringArtifactsResult.techResult,
         });
         printPostmanSetupSummary({
@@ -11598,7 +11830,9 @@ async function runInitWizard(options) {
           error: error?.message || String(error),
         };
         results.push(failure);
-        console.error(`\nInit failed on platform '${item.platform}': ${failure.error}`);
+        console.error(
+          `\nInit failed on platform '${item.platform}': ${failure.error}`,
+        );
         if (emitJson) {
           console.log(JSON.stringify({ dryRun, results }, null, 2));
         }
@@ -11694,7 +11928,9 @@ export function buildCliProgram() {
 
 export async function runCli(argv = process.argv) {
   const program = buildCliProgram();
-  const removedTopLevelAlias = String(argv[2] || "").trim().toLowerCase();
+  const removedTopLevelAlias = String(argv[2] || "")
+    .trim()
+    .toLowerCase();
   if (["skills", "install", "platforms"].includes(removedTopLevelAlias)) {
     console.error(
       `\nError: '${removedTopLevelAlias}' has been removed. Use 'cbx workflows' commands instead.`,
@@ -11711,7 +11947,9 @@ export async function runCli(argv = process.argv) {
 
   if (
     removedTopLevelAlias === "workflows" &&
-    String(argv[3] || "").trim().toLowerCase() === "init"
+    String(argv[3] || "")
+      .trim()
+      .toLowerCase() === "init"
   ) {
     console.error("\nError: 'cbx workflows init' has been removed.");
     console.error("Use: cbx workflows install");