@cubis/foundry 0.3.82 → 0.3.84

package/dist/cli/core.js

@@ -1,8 +1,8 @@
 // @ts-nocheck
-import { confirm, input, select } from "@inquirer/prompts";
+import { checkbox, confirm, input, select } from "@inquirer/prompts";
 import { parse as parseJsonc } from "jsonc-parser";
 import { existsSync } from "node:fs";
-import { chmod, cp, mkdir, readdir, readFile, rm, stat, symlink, writeFile, } from "node:fs/promises";
+import { chmod, cp, mkdir, readdir, readFile, rename, rm, stat, symlink, writeFile, } from "node:fs/promises";
 import { createHash } from "node:crypto";
 import { createRequire } from "node:module";
 import { spawn, execFile as execFileCallback } from "node:child_process";
@@ -12,8 +12,14 @@ import process from "node:process";
 import { promisify } from "node:util";
 import { registerCommands } from "./commands/register.js";
 import { DEFAULT_SKILL_PROFILE } from "./constants.js";
+import { assertBundledMcpBuildFreshness } from "./mcp/buildFreshness.js";
+import { runMobileQa } from "./mobile/run.js";
+import { runWebQa } from "./web/run.js";
 import { buildInitExecutionPlan, formatInitSummary, promptInitApplyConfirmation, promptInitBundle, promptInitMcpRuntime, promptInitMcpSelection, promptInitPlatforms, promptInitPostmanMode, promptInitSkillProfile, promptOptionalSecret, renderInitWelcome, } from "./init/index.js";
+import { FOUNDATION_ADR_DIR, FOUNDATION_DESIGN_DIR, FOUNDATION_DOCS_DIR, FOUNDATION_MEMORY_DIR, ARCHITECTURE_BUILD_PLATFORM_CAPABILITIES, buildAdrReadme, buildAdrTemplate, buildArchitectureBuildSkeleton, buildDesignBuildSkeleton, buildMemoryBuildSkeleton, buildMemoryTopicSkeleton, buildProductBuildSkeleton, buildTechBuildSkeleton, } from "./build/foundation.js";
+import { expandUniquePaths, PLATFORM_IDS, WORKFLOW_PROFILES, resolveArtifactProfilePaths, resolveLegacySkillDirsForCleanup, resolveProfilePathCandidates, resolveProfilePaths, } from "./config/index.js";
 import { agentAssetsRoot, expandPath, findWorkspaceRoot, packageRoot, workflowSkillsRoot, } from "./pathing.js";
+import { AUDIT_RUNTIME_DIR, DEFAULT_HOOK_PROFILE, DEFAULT_LEARNING_MODE, LOOP_RUNTIME_DIR, MEMORY_APPLIED_DIR, MEMORY_INBOX_DIR, MEMORY_REJECTED_DIR, STACK_IDS, WORKSPACE_MANIFEST_FILE, WORKSPACE_SUMMARY_FILE, buildWorkspaceManifest, collectFoundationDocState, detectRecommendedPlatforms, detectWorkspaceStack, ensureWorkspaceRuntimeDirs, normalizeAuthoringAi, normalizeCapabilityPacks, normalizeHookProfile, normalizeWorkspaceProfile, readWorkspaceManifest, runWorkspaceHarnessAudit, writeWorkspaceManifest, writeWorkspaceSummary, } from "./foundry/state.js";
 const require = createRequire(import.meta.url);
 const { version: CLI_VERSION } = require("../../package.json");
 const execFile = promisify(execFileCallback);
@@ -33,10 +39,14 @@ const ARCHITECTURE_DOC_BLOCK_START_RE = /<!--\s*cbx:architecture:doc:start[^>]*-
 const ARCHITECTURE_DOC_BLOCK_END_RE = /<!--\s*cbx:architecture:doc:end\s*-->/g;
 const TECH_ARCHITECTURE_BLOCK_START_RE = /<!--\s*cbx:architecture:tech:start[^>]*-->/g;
 const TECH_ARCHITECTURE_BLOCK_END_RE = /<!--\s*cbx:architecture:tech:end\s*-->/g;
+const DESIGN_FOUNDATION_BLOCK_START_RE = /<!--\s*cbx:design:foundation:start[^>]*-->/g;
+const DESIGN_FOUNDATION_BLOCK_END_RE = /<!--\s*cbx:design:foundation:end\s*-->/g;
+const MEMORY_FOUNDATION_BLOCK_START_RE = /<!--\s*cbx:memory:index:start[^>]*-->/g;
+const MEMORY_FOUNDATION_BLOCK_END_RE = /<!--\s*cbx:memory:index:end\s*-->/g;
+const MEMORY_TOPIC_BLOCK_START_RE = /<!--\s*cbx:memory:topic:start[^>]*-->/g;
+const MEMORY_TOPIC_BLOCK_END_RE = /<!--\s*cbx:memory:topic:end\s*-->/g;
 const ROADMAP_FOUNDATION_BLOCK_START_RE = /<!--\s*cbx:roadmap:foundation:start[^>]*-->/g;
 const ROADMAP_FOUNDATION_BLOCK_END_RE = /<!--\s*cbx:roadmap:foundation:end\s*-->/g;
-const FOUNDATION_DOCS_DIR = path.join("docs", "foundation");
-const FOUNDATION_ADR_DIR = path.join(FOUNDATION_DOCS_DIR, "adr");
 const COPILOT_ALLOWED_SKILL_FRONTMATTER_KEYS = new Set([
     "compatibility",
     "description",
@@ -56,150 +66,6 @@ const COPILOT_ALLOWED_AGENT_FRONTMATTER_KEYS = new Set([
     "handoffs",
     "argument-hint",
 ]);
-const WORKFLOW_PROFILES = {
-    antigravity: {
-        id: "antigravity",
-        label: "Antigravity",
-        installsCustomAgents: true,
-        project: {
-            workflowDirs: [".agent/workflows"],
-            agentDirs: [".agent/agents"],
-            skillDirs: [".agent/skills"],
-            commandDirs: [".gemini/commands"],
-            ruleFilesByPriority: [".agent/rules/GEMINI.md"],
-        },
-        global: {
-            workflowDirs: [
-                "~/.gemini/antigravity/workflows",
-                "~/.gemini/antigravity/global_workflows",
-            ],
-            agentDirs: [
-                "~/.gemini/antigravity/agents",
-                "~/.gemini/antigravity/global_agents",
-            ],
-            skillDirs: [
-                "~/.gemini/antigravity/skills",
-                "~/.gemini/antigravity/global_skills",
-            ],
-            commandDirs: ["~/.gemini/commands"],
-            ruleFilesByPriority: ["~/.gemini/GEMINI.md"],
-        },
-        detectorPaths: [".agent", ".agent/workflows", ".agent/rules/GEMINI.md"],
-        legacyDetectorPaths: [],
-        ruleHintName: "GEMINI.md",
-    },
-    codex: {
-        id: "codex",
-        label: "Codex",
-        installsCustomAgents: false,
-        project: {
-            workflowDirs: [".agents/workflows"],
-            agentDirs: [".agents/agents"],
-            skillDirs: [".agents/skills"],
-            ruleFilesByPriority: ["AGENTS.md"],
-        },
-        global: {
-            workflowDirs: ["~/.agents/workflows"],
-            agentDirs: ["~/.agents/agents"],
-            skillDirs: ["~/.agents/skills"],
-            ruleFilesByPriority: ["~/.codex/AGENTS.md"],
-        },
-        detectorPaths: [
-            ".agents",
-            ".agents/workflows",
-            ".agents/skills",
-            "AGENTS.md",
-        ],
-        legacyDetectorPaths: [".codex/skills"],
-        ruleHintName: "AGENTS.md",
-    },
-    copilot: {
-        id: "copilot",
-        label: "GitHub Copilot",
-        installsCustomAgents: true,
-        project: {
-            workflowDirs: [".github/copilot/workflows"],
-            agentDirs: [".github/agents"],
-            skillDirs: [".github/skills"],
-            promptDirs: [".github/prompts"],
-            ruleFilesByPriority: [".github/copilot-instructions.md"],
-        },
-        global: {
-            workflowDirs: ["~/.copilot/workflows"],
-            agentDirs: ["~/.copilot/agents"],
-            skillDirs: ["~/.copilot/skills"],
-            promptDirs: ["~/.copilot/prompts"],
-            ruleFilesByPriority: ["~/.copilot/copilot-instructions.md"],
-        },
-        detectorPaths: [
-            ".github/agents",
-            ".github/prompts",
-            ".vscode/mcp.json",
-            ".github/copilot-instructions.md",
-            ".github/instructions",
-            "AGENTS.md",
-        ],
-        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"],
-            hookDirs: [".claude/hooks"],
-            ruleFilesByPriority: ["CLAUDE.md"],
-        },
-        global: {
-            workflowDirs: ["~/.claude/workflows"],
-            agentDirs: ["~/.claude/agents"],
-            skillDirs: ["~/.claude/skills"],
-            hookDirs: ["~/.claude/hooks"],
-            ruleFilesByPriority: ["~/.claude/CLAUDE.md"],
-        },
-        detectorPaths: [
-            "CLAUDE.md",
-            ".claude",
-            ".claude/hooks",
-            ".claude/rules",
-            ".claude/settings.json",
-        ],
-        legacyDetectorPaths: [],
-        ruleHintName: "CLAUDE.md",
-    },
-    gemini: {
-        id: "gemini",
-        label: "Gemini CLI",
-        installsCustomAgents: false,
-        project: {
-            workflowDirs: [".gemini/workflows"],
-            skillDirs: [".gemini/skills"],
-            commandDirs: [".gemini/commands"],
-            ruleFilesByPriority: [".gemini/GEMINI.md", "GEMINI.md"],
-        },
-        global: {
-            workflowDirs: ["~/.gemini/workflows"],
-            skillDirs: ["~/.gemini/skills"],
-            commandDirs: ["~/.gemini/commands"],
-            ruleFilesByPriority: ["~/.gemini/GEMINI.md"],
-        },
-        detectorPaths: [
-            ".gemini",
-            ".gemini/workflows",
-            ".gemini/commands",
-            ".gemini/GEMINI.md",
-            "GEMINI.md",
-        ],
-        legacyDetectorPaths: [],
-        ruleHintName: "GEMINI.md",
-    },
-};
-const PLATFORM_IDS = Object.keys(WORKFLOW_PROFILES);
-const CODEX_WORKFLOW_SKILL_PREFIX = "workflow-";
-const CODEX_AGENT_SKILL_PREFIX = "agent-";
 const TERMINAL_VERIFIER_PROVIDERS = ["codex", "gemini"];
 const DEFAULT_TERMINAL_VERIFIER = "codex";
 const POSTMAN_API_KEY_ENV_VAR = "POSTMAN_API_KEY_DEFAULT";
@@ -225,6 +91,8 @@ const PLAYWRIGHT_SKILL_ID = "playwright";
 const PLAYWRIGHT_MCP_SERVER_ID = "PlaywrightMCP";
 const PLAYWRIGHT_DEFAULT_PORT = 8931;
 const PLAYWRIGHT_MCP_URL = `http://localhost:${PLAYWRIGHT_DEFAULT_PORT}/mcp`;
+const ANDROID_MCP_SERVER_ID = "android";
+const ANDROID_MCP_PACKAGE_SPEC = "android-mcp-server@1.3.0";
 const POSTMAN_WORKSPACE_MANUAL_CHOICE = "__postman_workspace_manual__";
 const CBX_CONFIG_FILENAME = "cbx_config.json";
 const CBX_CREDENTIALS_ENV_FILENAME = "credentials.env";
@@ -235,6 +103,7 @@ const RESERVED_CREDENTIAL_PROFILE_NAMES = new Set(["all"]);
 const CREDENTIAL_SERVICES = new Set(["postman", "stitch"]);
 const MCP_RUNTIMES = new Set(["docker", "local"]);
 const ARCHITECTURE_BUILD_PLATFORMS = new Set([
+    "antigravity",
     "codex",
     "claude",
     "gemini",
@@ -341,7 +210,7 @@ const TECH_RUST_FRAMEWORK_SIGNALS = [
     ["rocket", "Rocket"],
     ["tokio", "Tokio"],
 ];
-const SKILL_PROFILES = new Set(["core", "web-backend", "full"]);
+const SKILL_PROFILES = new Set(["core", "web-backend", "mobile-qa", "full"]);
 const REMOVE_ALL_SCOPES = new Set(["project", "global", "all"]);
 const CATALOG_FILES = Object.freeze({
     core: path.join("catalogs", "core.json"),
@@ -405,7 +274,7 @@ function normalizeSkillProfile(value) {
         .trim()
         .toLowerCase();
     if (!SKILL_PROFILES.has(normalized)) {
-        throw new Error(`Unknown skill profile '${value}'. Use core|web-backend|full.`);
+        throw new Error(`Unknown skill profile '${value}'. Use core|web-backend|mobile-qa|full.`);
     }
     return normalized;
 }
@@ -729,7 +598,11 @@ function toPosixPath(value) {
     return value.split(path.sep).join("/");
 }
 function getAntigravityTerminalIntegrationDir(profilePaths) {
-    return path.join(path.dirname(profilePaths.workflowsDir), "terminal-integration");
+    const baseDir = profilePaths.rulesDir ||
+        profilePaths.skillsDir ||
+        profilePaths.commandsDir ||
+        profilePaths.rootDir;
+    return path.join(path.dirname(baseDir), "terminal-integration");
 }
 function buildTerminalVerifierDefaultPrompt() {
     return "Review the latest completed Antigravity task. Focus on bugs, regressions, security risks, and missing tests.";
@@ -1137,7 +1010,7 @@ function buildEngineeringArchitectureSection(snapshot) {
         ...profile.testingStrategy.map((rule) => `  - ${rule}`),
         "- Doc refresh policy:",
         "  - Update these managed sections when architecture, scale, boundaries, design-system rules, or testing strategy changes.",
-        `  - For non-trivial work, read ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ENGINEERING_RULES.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, and ${FOUNDATION_DOCS_DIR}/TECH.md in that order when they exist.`,
+        `  - For non-trivial work, read ${FOUNDATION_DOCS_DIR}/MEMORY.md first. Then load ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ENGINEERING_RULES.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ${FOUNDATION_DOCS_DIR}/TECH.md, ${FOUNDATION_MEMORY_DIR}/*, and ADRs only when the active task needs that deeper context.`,
         "<!-- cbx:architecture:rules:end -->",
         "",
     ].join("\n");
@@ -1251,7 +1124,7 @@ function buildRoadmapFoundationSection(snapshot, specRoots = []) {
         "- Use this section for medium-term scaling themes, major migrations, or cross-team architecture investments.",
         "",
         "### Backbone Maintenance",
-        `- Keep ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ENGINEERING_RULES.md, and ${FOUNDATION_DOCS_DIR}/TECH.md aligned when direction or structure changes.`,
+        `- Keep ${FOUNDATION_DOCS_DIR}/MEMORY.md, ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ENGINEERING_RULES.md, and ${FOUNDATION_DOCS_DIR}/TECH.md aligned when direction or structure changes.`,
         "- Link major roadmap themes back to specs and ADRs instead of burying them in chat-only planning.",
         "<!-- cbx:roadmap:foundation:end -->",
         "",
@@ -1335,15 +1208,17 @@ function buildEngineeringRulesTemplate() {
         "- skill-name, workflow-name, or agent-name",
         "- or: none",
         "",
-        "## 9) Keep TECH.md Fresh",
+        "## 9) Keep Foundation Docs Fresh",
         "",
-        "- `TECH.md` is generated from current codebase reality.",
-        "- Re-run `cbx rules tech-md --overwrite` after major stack or architecture changes.",
+        "- `docs/foundation/MEMORY.md` is the AI entrypoint for non-trivial work.",
+        "- Read `docs/foundation/MEMORY.md` first, then load deeper foundation docs only when the active task needs them.",
+        "- Re-run `cbx build architecture --platform <antigravity|codex|claude|gemini|copilot>` after major product, architecture, runtime, or tooling changes.",
+        "- Re-run `cbx rules tech-md --overwrite` only when you specifically need the legacy root-level `TECH.md` snapshot refreshed.",
         "",
         "<!-- cbx:architecture:rules:start version=1 profile=bootstrap -->",
         "## 10) Architecture Contract (auto-managed)",
         "",
-        "- Declared style: bootstrap placeholder. Re-run `cbx build architecture --platform <codex|claude|gemini|copilot>` to refresh this contract from the repo.",
+        "- Declared style: bootstrap placeholder. Re-run `cbx build architecture --platform <antigravity|codex|claude|gemini|copilot>` to refresh this contract from the repo.",
         "- Design-system source of truth: bootstrap placeholder.",
         "- Dependency direction rules:",
         "  - Replace this placeholder with the managed architecture block when architecture generation runs.",
@@ -1388,93 +1263,8 @@ function buildRoadmapTemplate(snapshot, specRoots = []) {
         "",
     ].join("\n");
 }
-function buildProductBuildSkeleton() {
-    return [
-        "# Product",
-        "",
-        "This file is managed by `cbx build architecture`.",
-        "",
-        "<!-- cbx:product:foundation:start version=1 profile=uninitialized -->",
-        "Replace this managed section by running `cbx build architecture --platform <codex|claude|gemini|copilot>`.",
-        "<!-- cbx:product:foundation:end -->",
-        "",
-    ].join("\n");
-}
-function buildArchitectureBuildSkeleton() {
-    return [
-        "# Architecture",
-        "",
-        "This file is managed by `cbx build architecture`.",
-        "",
-        "<!-- cbx:architecture:doc:start version=1 profile=uninitialized -->",
-        "Replace this managed section by running `cbx build architecture --platform <codex|claude|gemini|copilot>`.",
-        "<!-- cbx:architecture:doc:end -->",
-        "",
-    ].join("\n");
-}
-function buildTechBuildSkeleton() {
-    return [
-        "# TECH.md",
-        "",
-        "This file is managed by `cbx build architecture`.",
-        "",
-        "<!-- cbx:architecture:tech:start version=1 snapshot=uninitialized -->",
-        "Replace this managed section by running `cbx build architecture --platform <codex|claude|gemini|copilot>`.",
-        "<!-- cbx:architecture:tech:end -->",
-        "",
-    ].join("\n");
-}
-function buildAdrReadme() {
-    return [
-        "# Architecture Decision Records",
-        "",
-        "Use this directory for durable decisions that future contributors and agents need to preserve.",
-        "",
-        "## When to add an ADR",
-        "",
-        "- Architecture style or boundary changes",
-        "- Data model or persistence strategy changes",
-        "- Deployment or scaling model changes",
-        "- Design-system ownership or shared UX pattern changes",
-        "",
-        "## Suggested format",
-        "",
-        "1. Context",
-        "2. Decision",
-        "3. Consequences",
-        "4. Validation",
-        "",
-        "Start with `0000-template.md` and create numbered follow-up ADRs for accepted decisions.",
-        "",
-    ].join("\n");
-}
-function buildAdrTemplate() {
-    return [
-        "# ADR 0000: Title",
-        "",
-        "## Status",
-        "",
-        "Proposed",
-        "",
-        "## Context",
-        "",
-        "- What problem or pressure led to this decision?",
-        "",
-        "## Decision",
-        "",
-        "- What is the chosen direction?",
-        "",
-        "## Consequences",
-        "",
-        "- What tradeoffs, benefits, or costs follow from this choice?",
-        "",
-        "## Validation",
-        "",
-        "- How will the team know this decision is working?",
-        "",
-    ].join("\n");
-}
-function buildEngineeringRulesManagedBlock({ platform, productFilePath, architectureFilePath, engineeringRulesFilePath, techMdFilePath, roadmapFilePath, ruleFilePath, }) {
+function buildEngineeringRulesManagedBlock({ platform, memoryFilePath, productFilePath, architectureFilePath, engineeringRulesFilePath, techMdFilePath, roadmapFilePath, ruleFilePath, }) {
+    const memoryRef = toPosixPath(path.resolve(memoryFilePath));
     const productRef = toPosixPath(path.resolve(productFilePath));
     const architectureRef = toPosixPath(path.resolve(architectureFilePath));
     const engineeringRef = toPosixPath(path.resolve(engineeringRulesFilePath));
@@ -1483,16 +1273,19 @@ function buildEngineeringRulesManagedBlock({ platform, productFilePath, architec
     const ruleRef = toPosixPath(path.resolve(ruleFilePath));
     const supportsAtImport = platform === "claude" || platform === "gemini";
     const ruleFileDir = path.dirname(path.resolve(ruleFilePath));
+    const relMemory = toPosixPath(path.relative(ruleFileDir, path.resolve(memoryFilePath)));
     const relProduct = toPosixPath(path.relative(ruleFileDir, path.resolve(productFilePath)));
     const relArchitecture = toPosixPath(path.relative(ruleFileDir, path.resolve(architectureFilePath)));
     const relTech = toPosixPath(path.relative(ruleFileDir, path.resolve(techMdFilePath)));
     const importLines = supportsAtImport
         ? [
             "",
-            "Foundation docs (auto-imported into context):",
-            `@${relProduct}`,
-            `@${relArchitecture}`,
-            `@${relTech}`,
+            "Foundation memory index (auto-imported into context):",
+            `@${relMemory}`,
+            "Load deeper docs from MEMORY.md only when needed:",
+            `- ${relProduct}`,
+            `- ${relArchitecture}`,
+            `- ${relTech}`,
         ]
         : [];
     return [
@@ -1500,6 +1293,7 @@ function buildEngineeringRulesManagedBlock({ platform, productFilePath, architec
         "## Engineering Guardrails (auto-managed)",
         "Apply these before planning, coding, review, and release:",
         "",
+        `- Shared memory index: \`${memoryRef}\``,
         `- Product backbone: \`${productRef}\``,
         `- Accepted architecture: \`${architectureRef}\``,
         `- Required baseline: \`${engineeringRef}\``,
@@ -1513,11 +1307,12 @@ function buildEngineeringRulesManagedBlock({ platform, productFilePath, architec
         "2. Keep architecture simple (KISS) and avoid speculative work (YAGNI).",
         "3. Apply SOLID pragmatically to reduce change risk, not add ceremony.",
         "4. Use clear naming with focused responsibilities and explicit boundaries.",
-        `5. For non-trivial work, read ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ENGINEERING_RULES.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, and ${FOUNDATION_DOCS_DIR}/TECH.md in that order when they exist before planning or implementation. Check ${FOUNDATION_DOCS_DIR}/PRODUCT.md for domain glossary and ${FOUNDATION_DOCS_DIR}/TECH.md for build/validation commands.`,
-        "6. Require validation evidence (lint/types/tests) before merge.",
-        "7. Use Decision Log response style.",
-        "8. Every Decision Log must include a `Skills Used` section listing skill, workflow, or agent names.",
-        "9. If no skill loaded, `Skills Used: none` is mandatory.",
+        `5. For non-trivial work, read ${FOUNDATION_DOCS_DIR}/MEMORY.md first. Then load ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ${FOUNDATION_DOCS_DIR}/TECH.md, ${FOUNDATION_MEMORY_DIR}/*, and ADRs only when the active task needs that deeper context. Check ${FOUNDATION_DOCS_DIR}/PRODUCT.md for domain glossary and ${FOUNDATION_DOCS_DIR}/TECH.md for build/validation commands.`,
+        "6. Use MEMORY.md's load map and consumer notes to decide which deeper docs the active workflow, agent, or skill should consult.",
+        "7. Require validation evidence (lint/types/tests) before merge.",
+        "8. Use Decision Log response style.",
+        "9. Every Decision Log must include a `Skills Used` section listing skill, workflow, or agent names.",
+        "10. If no skill loaded, `Skills Used: none` is mandatory.",
         "",
         "<!-- cbx:engineering:auto:end -->",
     ].join("\n");
@@ -1604,9 +1399,10 @@ async function upsertEngineeringRulesFile({ targetPath, template, overwrite = fa
         filePath: targetPath,
     };
 }
-async function upsertEngineeringRulesBlock({ ruleFilePath, platform, productFilePath, architectureFilePath, engineeringRulesFilePath, techMdFilePath, roadmapFilePath, dryRun = false, }) {
+async function upsertEngineeringRulesBlock({ ruleFilePath, platform, memoryFilePath, productFilePath, architectureFilePath, engineeringRulesFilePath, techMdFilePath, roadmapFilePath, dryRun = false, }) {
     const block = buildEngineeringRulesManagedBlock({
         platform,
+        memoryFilePath,
         productFilePath,
         architectureFilePath,
         engineeringRulesFilePath,
@@ -1819,7 +1615,20 @@ async function ensureArchitectureBuildScaffold({ workspaceRoot, dryRun = false,
     const foundationRoot = path.join(workspaceRoot, FOUNDATION_DOCS_DIR);
     const productPath = path.join(foundationRoot, "PRODUCT.md");
     const architectureDocPath = path.join(foundationRoot, "ARCHITECTURE.md");
+    const designDocPath = path.join(foundationRoot, "DESIGN.md");
     const techMdPath = path.join(foundationRoot, "TECH.md");
+    const memoryPath = path.join(foundationRoot, "MEMORY.md");
+    const memoryDir = path.join(workspaceRoot, FOUNDATION_MEMORY_DIR);
+    const designDir = path.join(workspaceRoot, FOUNDATION_DESIGN_DIR);
+    const designPagesDir = path.join(designDir, "pages");
+    const designFlowsDir = path.join(designDir, "flows");
+    const designMobileDir = path.join(designDir, "mobile");
+    const stitchDir = path.join(workspaceRoot, ".stitch");
+    const stitchDesignPath = path.join(stitchDir, "DESIGN.md");
+    const domainMemoryPath = path.join(memoryDir, "domain.md");
+    const runtimeMemoryPath = path.join(memoryDir, "runtime.md");
+    const integrationsMemoryPath = path.join(memoryDir, "integrations.md");
+    const debuggingMemoryPath = path.join(memoryDir, "debugging.md");
     const adrDir = path.join(workspaceRoot, FOUNDATION_ADR_DIR);
     const adrReadmePath = path.join(adrDir, "README.md");
     const adrTemplatePath = path.join(adrDir, "0000-template.md");
@@ -1828,7 +1637,7 @@ async function ensureArchitectureBuildScaffold({ workspaceRoot, dryRun = false,
         initialContent: `${buildProductBuildSkeleton()}\n`,
         block: [
             "<!-- cbx:product:foundation:start version=1 profile=uninitialized -->",
-            "Replace this managed section by running `cbx build architecture --platform <codex|claude|gemini|copilot>`.",
+            "Replace this managed section by running `cbx build architecture --platform <antigravity|codex|claude|gemini|copilot>`.",
             "<!-- cbx:product:foundation:end -->",
             "",
         ].join("\n"),
@@ -1841,7 +1650,7 @@ async function ensureArchitectureBuildScaffold({ workspaceRoot, dryRun = false,
         initialContent: `${buildArchitectureBuildSkeleton()}\n`,
         block: [
             "<!-- cbx:architecture:doc:start version=1 profile=uninitialized -->",
-            "Replace this managed section by running `cbx build architecture --platform <codex|claude|gemini|copilot>`.",
+            "Replace this managed section by running `cbx build architecture --platform <antigravity|codex|claude|gemini|copilot>`.",
             "<!-- cbx:architecture:doc:end -->",
             "",
         ].join("\n"),
@@ -1849,12 +1658,25 @@ async function ensureArchitectureBuildScaffold({ workspaceRoot, dryRun = false,
         endPattern: ARCHITECTURE_DOC_BLOCK_END_RE,
         dryRun,
     });
+    const designDocResult = await upsertTaggedSectionInFile({
+        targetPath: designDocPath,
+        initialContent: `${buildDesignBuildSkeleton()}\n`,
+        block: [
+            "<!-- cbx:design:foundation:start version=1 profile=uninitialized -->",
+            "Replace this managed section by running `cbx build architecture --platform <antigravity|codex|claude|gemini|copilot>`.",
+            "<!-- cbx:design:foundation:end -->",
+            "",
+        ].join("\n"),
+        startPattern: DESIGN_FOUNDATION_BLOCK_START_RE,
+        endPattern: DESIGN_FOUNDATION_BLOCK_END_RE,
+        dryRun,
+    });
     const techResult = await upsertTaggedSectionInFile({
         targetPath: techMdPath,
         initialContent: `${buildTechBuildSkeleton()}\n`,
         block: [
             "<!-- cbx:architecture:tech:start version=1 snapshot=uninitialized -->",
-            "Replace this managed section by running `cbx build architecture --platform <codex|claude|gemini|copilot>`.",
+            "Replace this managed section by running `cbx build architecture --platform <antigravity|codex|claude|gemini|copilot>`.",
             "<!-- cbx:architecture:tech:end -->",
             "",
         ].join("\n"),
@@ -1862,6 +1684,87 @@ async function ensureArchitectureBuildScaffold({ workspaceRoot, dryRun = false,
         endPattern: TECH_ARCHITECTURE_BLOCK_END_RE,
         dryRun,
     });
+    const memoryResult = await upsertTaggedSectionInFile({
+        targetPath: memoryPath,
+        initialContent: `${buildMemoryBuildSkeleton()}\n`,
+        block: [
+            "<!-- cbx:memory:index:start version=1 profile=uninitialized -->",
+            "Replace this managed section by running `cbx build architecture --platform <antigravity|codex|claude|gemini|copilot>`.",
+            "<!-- cbx:memory:index:end -->",
+            "",
+        ].join("\n"),
+        startPattern: MEMORY_FOUNDATION_BLOCK_START_RE,
+        endPattern: MEMORY_FOUNDATION_BLOCK_END_RE,
+        dryRun,
+    });
+    const domainMemoryResult = await upsertTaggedSectionInFile({
+        targetPath: domainMemoryPath,
+        initialContent: `${buildMemoryTopicSkeleton("Domain Memory", "domain")}\n`,
+        block: [
+            "<!-- cbx:memory:topic:start version=1 topic=domain profile=uninitialized -->",
+            "Replace this managed section by running `cbx build architecture`.",
+            "<!-- cbx:memory:topic:end -->",
+            "",
+        ].join("\n"),
+        startPattern: MEMORY_TOPIC_BLOCK_START_RE,
+        endPattern: MEMORY_TOPIC_BLOCK_END_RE,
+        dryRun,
+    });
+    const runtimeMemoryResult = await upsertTaggedSectionInFile({
+        targetPath: runtimeMemoryPath,
+        initialContent: `${buildMemoryTopicSkeleton("Runtime Memory", "runtime")}\n`,
+        block: [
+            "<!-- cbx:memory:topic:start version=1 topic=runtime profile=uninitialized -->",
+            "Replace this managed section by running `cbx build architecture`.",
+            "<!-- cbx:memory:topic:end -->",
+            "",
+        ].join("\n"),
+        startPattern: MEMORY_TOPIC_BLOCK_START_RE,
+        endPattern: MEMORY_TOPIC_BLOCK_END_RE,
+        dryRun,
+    });
+    const integrationsMemoryResult = await upsertTaggedSectionInFile({
+        targetPath: integrationsMemoryPath,
+        initialContent: `${buildMemoryTopicSkeleton("Integrations Memory", "integrations")}\n`,
+        block: [
+            "<!-- cbx:memory:topic:start version=1 topic=integrations profile=uninitialized -->",
+            "Replace this managed section by running `cbx build architecture`.",
+            "<!-- cbx:memory:topic:end -->",
+            "",
+        ].join("\n"),
+        startPattern: MEMORY_TOPIC_BLOCK_START_RE,
+        endPattern: MEMORY_TOPIC_BLOCK_END_RE,
+        dryRun,
+    });
+    const debuggingMemoryResult = await upsertTaggedSectionInFile({
+        targetPath: debuggingMemoryPath,
+        initialContent: `${buildMemoryTopicSkeleton("Debugging Memory", "debugging")}\n`,
+        block: [
+            "<!-- cbx:memory:topic:start version=1 topic=debugging profile=uninitialized -->",
+            "Replace this managed section by running `cbx build architecture`.",
+            "<!-- cbx:memory:topic:end -->",
+            "",
+        ].join("\n"),
+        startPattern: MEMORY_TOPIC_BLOCK_START_RE,
+        endPattern: MEMORY_TOPIC_BLOCK_END_RE,
+        dryRun,
+    });
+    if (!dryRun) {
+        await mkdir(designPagesDir, { recursive: true });
+        await mkdir(designFlowsDir, { recursive: true });
+        await mkdir(designMobileDir, { recursive: true });
+        await mkdir(stitchDir, { recursive: true });
+        if (!(await pathExists(stitchDesignPath))) {
+            await writeFile(stitchDesignPath, [
+                "# Stitch Design Mirror",
+                "",
+                "This file mirrors `docs/foundation/DESIGN.md` plus any scoped design overlays when Stitch design flows are active.",
+                "",
+                "Do not edit this file directly. Regenerate it from the canonical design engine.",
+                "",
+            ].join("\n"), "utf8");
+        }
+    }
     const adrReadmeResult = await writeTextFile({
         targetPath: adrReadmePath,
         content: `${buildAdrReadme()}\n`,
@@ -1877,12 +1780,24 @@ async function ensureArchitectureBuildScaffold({ workspaceRoot, dryRun = false,
     return {
         productPath,
         architectureDocPath,
+        designDocPath,
         techMdPath,
+        memoryPath,
+        domainMemoryPath,
+        runtimeMemoryPath,
+        integrationsMemoryPath,
+        debuggingMemoryPath,
         adrReadmePath,
         adrTemplatePath,
         productResult,
         architectureDocResult,
+        designDocResult,
         techResult,
+        memoryResult,
+        domainMemoryResult,
+        runtimeMemoryResult,
+        integrationsMemoryResult,
+        debuggingMemoryResult,
         adrReadmeResult,
         adrTemplateResult,
     };
@@ -2707,62 +2622,55 @@ function appendTechPackageSection(lines, heading, packages) {
 function inferRecommendedSkills(snapshot) {
     const recommended = new Set();
     const hasFramework = (name) => snapshot.frameworks.includes(name);
-    const hasJsPkg = (name) => snapshot.packageSignals.javascript.includes(name);
     if (hasFramework("Next.js")) {
-        recommended.add("nextjs-developer");
-        recommended.add("react-expert");
-        recommended.add("typescript-pro");
+        recommended.add("nextjs");
+        recommended.add("react");
+        recommended.add("typescript-best-practices");
     }
     if (hasFramework("React")) {
-        recommended.add("react-expert");
+        recommended.add("react");
     }
     if (hasFramework("NestJS")) {
-        recommended.add("nestjs-expert");
-        recommended.add("nodejs-best-practices");
+        recommended.add("nestjs");
+        recommended.add("typescript-best-practices");
     }
     if (hasFramework("FastAPI")) {
-        recommended.add("fastapi-expert");
-        recommended.add("python-pro");
+        recommended.add("fastapi");
+        recommended.add("python-best-practices");
     }
     if (hasFramework("Go Modules")) {
-        recommended.add("golang-pro");
+        recommended.add("golang-best-practices");
     }
     if (hasFramework("Rust Cargo")) {
-        recommended.add("rust-pro");
+        recommended.add("rust-best-practices");
     }
     if (hasFramework("Flutter")) {
-        recommended.add("flutter-expert");
-        recommended.add("mobile-design");
+        recommended.add("flutter-mobile-qa");
+        recommended.add("integration-testing");
     }
     // Language-level signals when no framework match already added the skill
     const hasLanguage = (lang) => snapshot.languages.some(([l]) => l === lang);
-    if (hasLanguage("TypeScript") && !recommended.has("typescript-pro")) {
-        recommended.add("typescript-pro");
+    if (hasLanguage("TypeScript") && !recommended.has("typescript-best-practices")) {
+        recommended.add("typescript-best-practices");
     }
-    if ((hasLanguage("JavaScript") || hasLanguage("TypeScript")) &&
-        !recommended.has("nodejs-best-practices") &&
-        !recommended.has("nextjs-developer") &&
-        !recommended.has("nestjs-expert")) {
-        recommended.add("nodejs-best-practices");
-    }
-    if (hasLanguage("Python") && !recommended.has("python-pro")) {
-        recommended.add("python-pro");
+    if (hasLanguage("Python") && !recommended.has("python-best-practices")) {
+        recommended.add("python-best-practices");
     }
     // MCP server detection
     if (snapshot.isMcpServer) {
-        recommended.add("api-patterns");
+        recommended.add("mcp-server-builder");
     }
     // Docker / DevOps signals
     if (snapshot.cicdSignals.length > 0 ||
         snapshot.entryPoints.some((ep) => ep.startsWith("docker:"))) {
-        recommended.add("devops-engineer");
+        recommended.add("ci-cd-pipeline");
     }
     // Testing signals
     if (hasFramework("Playwright")) {
-        recommended.add("playwright-expert");
+        recommended.add("playwright-interactive");
     }
     if (hasFramework("Vitest") || hasFramework("Jest")) {
-        recommended.add("test-master");
+        recommended.add("unit-testing");
     }
     // Database signals
     if (hasFramework("Prisma") ||
@@ -2772,9 +2680,15 @@ function inferRecommendedSkills(snapshot) {
         hasFramework("SQLAlchemy")) {
         recommended.add("database-design");
     }
+    if (hasFramework("Prisma")) {
+        recommended.add("prisma");
+    }
+    if (hasFramework("SQLAlchemy")) {
+        recommended.add("sqlalchemy");
+    }
     if (recommended.size === 0) {
-        recommended.add("clean-code");
-        recommended.add("plan-writing");
+        recommended.add("system-design");
+        recommended.add("spec-driven-delivery");
     }
     return [...recommended].sort((a, b) => a.localeCompare(b));
 }
@@ -2787,9 +2701,10 @@ function inferContextBudget(snapshot) {
         "Go Modules",
         "Rust Cargo",
     ]);
+    const mobileDetected = snapshot.frameworks.includes("Flutter");
     const webBackendDetected = snapshot.frameworks.some((framework) => webBackendSignals.has(framework));
     const hasMcp = snapshot.isMcpServer || snapshot.mcpSignals.length > 0;
-    const suggestedProfile = webBackendDetected || hasMcp ? "web-backend" : "core";
+    const suggestedProfile = mobileDetected ? "mobile-qa" : webBackendDetected || hasMcp ? "web-backend" : "core";
     return {
         suggestedProfile,
     };
@@ -3207,92 +3122,6 @@ async function recordBundleRemovalState({ scope, platform, bundleId, ruleFilePat
     state.lastSelected = { platform, scope };
     await writeState(scope, state, cwd);
 }
-async function resolveProfilePaths(profileId, scope, cwd = process.cwd()) {
-    const profile = WORKFLOW_PROFILES[profileId];
-    if (!profile)
-        throw new Error(`Unknown platform '${profileId}'.`);
-    const cfg = profile[scope];
-    const workflowDirs = Array.isArray(cfg.workflowDirs) ? cfg.workflowDirs : [];
-    const agentDirs = Array.isArray(cfg.agentDirs) ? cfg.agentDirs : [];
-    const skillDirs = Array.isArray(cfg.skillDirs) ? cfg.skillDirs : [];
-    const commandDirs = Array.isArray(cfg.commandDirs) ? cfg.commandDirs : [];
-    const promptDirs = Array.isArray(cfg.promptDirs) ? cfg.promptDirs : [];
-    const hookDirs = Array.isArray(cfg.hookDirs) ? cfg.hookDirs : [];
-    const resolvePreferredDir = async (dirs) => {
-        if (dirs.length === 0)
-            return null;
-        const expanded = dirs.map((dirPath) => expandPath(dirPath, cwd));
-        for (const candidate of expanded) {
-            if (await pathExists(candidate))
-                return candidate;
-        }
-        return expanded[0];
-    };
-    return {
-        workflowsDir: await resolvePreferredDir(workflowDirs),
-        agentsDir: await resolvePreferredDir(agentDirs),
-        skillsDir: await resolvePreferredDir(skillDirs),
-        commandsDir: commandDirs[0] ? expandPath(commandDirs[0], cwd) : null,
-        promptsDir: promptDirs[0] ? expandPath(promptDirs[0], cwd) : null,
-        hooksDir: hookDirs[0] ? expandPath(hookDirs[0], cwd) : null,
-        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),
-        hooksDirs: expandUniquePaths(cfg.hookDirs, 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")
-        return scopedPaths;
-    // Global install mode is skills-only. Keep workflows/agents in workspace scope.
-    const workspacePaths = await resolveProfilePaths(profileId, "project", cwd);
-    return {
-        ...scopedPaths,
-        workflowsDir: workspacePaths.workflowsDir,
-        agentsDir: workspacePaths.agentsDir,
-        commandsDir: workspacePaths.commandsDir ?? scopedPaths.commandsDir,
-        promptsDir: workspacePaths.promptsDir ?? scopedPaths.promptsDir,
-        hooksDir: scopedPaths.hooksDir,
-    };
-}
 async function listBundleIds() {
     const root = path.join(agentAssetsRoot(), "workflows");
     if (!(await pathExists(root)))
@@ -3764,36 +3593,9 @@ function normalizeMarkdownId(fileName) {
         .replace(/-+/g, "-")
         .replace(/^-|-$/g, "");
 }
-function yamlSingleQuoted(value) {
-    return `'${String(value || "").replace(/'/g, "''")}'`;
-}
 function escapeRegExp(value) {
     return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function rewriteCodexWorkflowAgentReferences(sourceBody, agentIds) {
-    if (!sourceBody || !Array.isArray(agentIds) || agentIds.length === 0)
-        return normalizeCodexWrapperMentions(sourceBody);
-    let rewritten = sourceBody;
-    const sortedAgentIds = unique(agentIds.filter(Boolean)).sort((a, b) => b.length - a.length);
-    for (const agentId of sortedAgentIds) {
-        const agentPattern = new RegExp(`(^|[^A-Za-z0-9_-])@${escapeRegExp(agentId)}(?=$|[^A-Za-z0-9_-])`, "g");
-        rewritten = rewritten.replace(agentPattern, (_match, prefix) => `${prefix}$${CODEX_AGENT_SKILL_PREFIX}${agentId}`);
-    }
-    return normalizeCodexWrapperMentions(rewritten);
-}
-function rewriteCodexAgentSkillReferences(sourceBody) {
-    if (!sourceBody)
-        return sourceBody;
-    // Agent source files live under platforms/*/agents, but wrapper skills live
-    // under .agents/skills/agent-*. Rebase ../skills/<id> links accordingly.
-    const rebased = sourceBody.replace(/\(\.\.\/skills\//g, "(../");
-    return normalizeCodexWrapperMentions(rebased);
-}
-function normalizeCodexWrapperMentions(sourceBody) {
-    if (!sourceBody)
-        return sourceBody;
-    return sourceBody.replace(/`\$(workflow|agent)-([A-Za-z0-9_-]+|\*)`/g, (_match, kind, id) => `$${kind}-${id}`);
-}
 async function parseWorkflowMetadata(filePath) {
     const raw = await readFile(filePath, "utf8");
     const { frontmatter, body } = extractFrontmatter(raw);
@@ -3832,175 +3634,6 @@ async function parseAgentMetadata(filePath) {
         body: body.trim(),
     };
 }
-function buildCodexWorkflowWrapperSkillMarkdown(wrapperSkillId, workflow) {
-    const description = `Callable Codex wrapper for ${workflow.command}: ${workflow.description}`;
-    const sourceBody = workflow.body?.trim() || "No source workflow content found.";
-    return [
-        "---",
-        `name: ${wrapperSkillId}`,
-        `description: ${yamlSingleQuoted(description)}`,
-        "metadata:",
-        "  source: cubis-foundry",
-        "  wrapper: workflow",
-        "  platform: codex",
-        `  workflow-id: ${yamlSingleQuoted(workflow.id)}`,
-        `  workflow-command: ${yamlSingleQuoted(workflow.command)}`,
-        "---",
-        "",
-        `# Workflow Compatibility Alias: ${workflow.command}`,
-        "",
-        `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. 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.",
-        "",
-        "## Source Workflow Instructions",
-        "",
-        sourceBody,
-        "",
-    ].join("\n");
-}
-function buildCodexAgentWrapperSkillMarkdown(wrapperSkillId, agent) {
-    const description = `Callable Codex wrapper for @${agent.id}: ${agent.description}`;
-    const sourceBody = agent.body?.trim() || "No source agent content found.";
-    const relatedSkillsLine = agent.skills.length > 0
-        ? `Related skills from source agent: ${agent.skills.join(", ")}`
-        : "Related skills from source agent: (none listed)";
-    return [
-        "---",
-        `name: ${wrapperSkillId}`,
-        `description: ${yamlSingleQuoted(description)}`,
-        "metadata:",
-        "  source: cubis-foundry",
-        "  wrapper: agent",
-        "  platform: codex",
-        `  agent-id: ${yamlSingleQuoted(agent.id)}`,
-        "---",
-        "",
-        `# Agent Compatibility Alias: @${agent.id}`,
-        "",
-        `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. 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}`,
-        `- ${relatedSkillsLine}`,
-        "",
-        "## Source Agent Instructions",
-        "",
-        sourceBody,
-        "",
-    ].join("\n");
-}
-async function writeGeneratedSkillArtifact({ destinationDir, content, overwrite, dryRun = false, }) {
-    const exists = await pathExists(destinationDir);
-    if (exists && !overwrite) {
-        return { action: dryRun ? "would-skip" : "skipped", path: destinationDir };
-    }
-    if (!dryRun && exists && overwrite) {
-        await rm(destinationDir, { recursive: true, force: true });
-    }
-    if (!dryRun) {
-        await mkdir(destinationDir, { recursive: true });
-        await writeFile(path.join(destinationDir, "SKILL.md"), content, "utf8");
-    }
-    if (dryRun) {
-        return {
-            action: exists ? "would-replace" : "would-install",
-            path: destinationDir,
-        };
-    }
-    return { action: exists ? "replaced" : "installed", path: destinationDir };
-}
-function buildCodexWrapperSkillIds(platformSpec) {
-    const workflowIds = (platformSpec.workflows || []).map((fileName) => {
-        const id = normalizeMarkdownId(path.basename(fileName));
-        return `${CODEX_WORKFLOW_SKILL_PREFIX}${id}`;
-    });
-    const agentIds = (platformSpec.agents || []).map((fileName) => {
-        const id = normalizeMarkdownId(path.basename(fileName));
-        return `${CODEX_AGENT_SKILL_PREFIX}${id}`;
-    });
-    return unique([...workflowIds, ...agentIds]);
-}
-async function generateCodexWrapperSkills({ platformRoot, platformSpec, skillsDir, overwrite, dryRun = false, }) {
-    const installed = [];
-    const skipped = [];
-    const artifacts = [];
-    const generated = [];
-    const codexAgentIds = (platformSpec.agents || []).map((fileName) => normalizeMarkdownId(path.basename(fileName)));
-    for (const workflowFile of platformSpec.workflows || []) {
-        const source = path.join(platformRoot, "workflows", workflowFile);
-        if (!(await pathExists(source))) {
-            throw new Error(`Missing workflow source file for wrapper generation: ${source}`);
-        }
-        const metadata = await parseWorkflowMetadata(source);
-        const raw = await readFile(source, "utf8");
-        const sourceBody = extractFrontmatter(raw).body.trim();
-        const rewrittenBody = rewriteCodexWorkflowAgentReferences(sourceBody, codexAgentIds);
-        const wrapperSkillId = `${CODEX_WORKFLOW_SKILL_PREFIX}${metadata.id}`;
-        const destinationDir = path.join(skillsDir, wrapperSkillId);
-        const content = buildCodexWorkflowWrapperSkillMarkdown(wrapperSkillId, {
-            ...metadata,
-            body: rewrittenBody,
-        });
-        const result = await writeGeneratedSkillArtifact({
-            destinationDir,
-            content,
-            overwrite,
-            dryRun,
-        });
-        artifacts.push(destinationDir);
-        generated.push({
-            kind: "workflow",
-            id: metadata.id,
-            skillId: wrapperSkillId,
-        });
-        if (result.action === "skipped" || result.action === "would-skip")
-            skipped.push(destinationDir);
-        else
-            installed.push(destinationDir);
-    }
-    for (const agentFile of platformSpec.agents || []) {
-        const source = path.join(platformRoot, "agents", agentFile);
-        if (!(await pathExists(source))) {
-            throw new Error(`Missing agent source file for wrapper generation: ${source}`);
-        }
-        const metadata = await parseAgentMetadata(source);
-        const rewrittenBody = rewriteCodexAgentSkillReferences(metadata.body);
-        const wrapperSkillId = `${CODEX_AGENT_SKILL_PREFIX}${metadata.id}`;
-        const destinationDir = path.join(skillsDir, wrapperSkillId);
-        const content = buildCodexAgentWrapperSkillMarkdown(wrapperSkillId, {
-            ...metadata,
-            body: rewrittenBody,
-        });
-        const result = await writeGeneratedSkillArtifact({
-            destinationDir,
-            content,
-            overwrite,
-            dryRun,
-        });
-        artifacts.push(destinationDir);
-        generated.push({ kind: "agent", id: metadata.id, skillId: wrapperSkillId });
-        if (result.action === "skipped" || result.action === "would-skip")
-            skipped.push(destinationDir);
-        else
-            installed.push(destinationDir);
-    }
-    return {
-        installed,
-        skipped,
-        artifacts,
-        generated,
-    };
-}
 async function resolvePlatformAgentSkillDependencies({ platformRoot, platformSpec, }) {
     const dependencyIds = [];
     for (const agentFile of platformSpec.agents || []) {
@@ -4013,15 +3646,41 @@ async function resolvePlatformAgentSkillDependencies({ platformRoot, platformSpe
     return unique(dependencyIds.filter(Boolean));
 }
 async function collectInstalledWorkflows(profileId, scope, cwd = process.cwd()) {
-    // Global install mode keeps workflows/agents in workspace paths.
-    // Index using artifact-aware paths so sync-rules reflects installed workflows.
+    const workflows = [];
+    const state = await readState(scope, cwd);
+    const key = targetStateKey(profileId, scope);
+    const bundleEntries = Object.entries(state.targets?.[key]?.bundles || {});
+    const seen = new Set();
+    for (const [bundleId] of bundleEntries) {
+        const sharedWorkflowsDir = path.join(agentAssetsRoot(), "workflows", bundleId, "shared", "workflows");
+        if (!(await pathExists(sharedWorkflowsDir)))
+            continue;
+        const entries = await readdir(sharedWorkflowsDir, {
+            withFileTypes: true,
+        });
+        for (const entry of entries) {
+            if (!entry.isFile() ||
+                !entry.name.endsWith(".md") ||
+                entry.name.startsWith(".")) {
+                continue;
+            }
+            const filePath = path.join(sharedWorkflowsDir, entry.name);
+            const metadata = await parseWorkflowMetadata(filePath);
+            if (seen.has(metadata.id))
+                continue;
+            seen.add(metadata.id);
+            workflows.push(metadata);
+        }
+    }
+    if (workflows.length > 0) {
+        return workflows.sort((a, b) => a.command.localeCompare(b.command));
+    }
     const profilePaths = await resolveArtifactProfilePaths(profileId, scope, cwd);
-    if (!(await pathExists(profilePaths.workflowsDir)))
+    if (!profilePaths.workflowsDir || !(await pathExists(profilePaths.workflowsDir)))
         return [];
     const entries = await readdir(profilePaths.workflowsDir, {
         withFileTypes: true,
     });
-    const workflows = [];
     for (const entry of entries) {
         if (!entry.isFile() ||
             !entry.name.endsWith(".md") ||
@@ -4065,7 +3724,8 @@ function buildManagedWorkflowBlock(platformId, workflows) {
         lines.push("Prefer direct route identifiers first:");
         lines.push("- Workflows: `/workflow-name`");
         lines.push("- Agents: `@agent-name`");
-        lines.push("- Compatibility aliases remain available: `$workflow-*`, `$agent-*`");
+        lines.push("- Native agents: `.codex/agents/*.toml`");
+        lines.push("- Native workflow skills: `.agents/skills/<workflow-id>/SKILL.md`");
         lines.push("");
         if (workflows.length === 0) {
             lines.push("- No installed workflows found yet.");
@@ -4081,44 +3741,41 @@ function buildManagedWorkflowBlock(platformId, workflows) {
         lines.push("Selection policy:");
         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. Treat `$workflow-*` / `$agent-*` as compatibility aliases only.");
+        lines.push("3. Load supporting skills only after route selection.");
         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("- Workflow prompts: `.github/prompts/*.prompt.md`");
+        lines.push("- Custom agents: `.github/agents/*.agent.md`");
+        lines.push("- Skills: `.github/skills/<skill>/SKILL.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("- Rules: `.agents/rules/GEMINI.md`");
+        lines.push("- Skills: `.agents/skills/<skill>/SKILL.md`");
+        lines.push("- Agent routes compile to native command/rule flows here.");
         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("- Skills: `.claude/skills/<skill>/SKILL.md`");
+        lines.push("- Agents: `.claude/agents/*.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("");
     }
     else if (platformId === "gemini") {
         lines.push("Prefer native Gemini route surfaces first:");
         lines.push("- Commands: `.gemini/commands/*.toml`");
-        lines.push("- Workflow files: `.gemini/workflows/*.md`");
         lines.push("- Rules: `.gemini/GEMINI.md`");
-        lines.push("- Specialists are inline postures here, not standalone agent files.");
-        lines.push("- Do not use `$workflow-*` / `$agent-*` as the primary route surface here; those are Codex compatibility aliases.");
+        lines.push("- Route specialists through commands and rule guidance.");
         lines.push("");
     }
     lines.push("Use the following workflows proactively when task intent matches:");
@@ -4143,24 +3800,24 @@ function buildManagedWorkflowBlock(platformId, workflows) {
     lines.push("");
     lines.push("Selection policy:");
     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.");
+        lines.push("1. Match explicit workflow prompt or `@agent` first.");
+        lines.push("2. Else match user intent to one primary workflow and reuse the matching prompt file.");
+        lines.push("3. Use skill_search only when the best workflow or agent route is unclear.");
     }
     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.");
+        lines.push("1. Match explicit Gemini command first.");
+        lines.push("2. Else match user intent to one primary workflow and use the matching command file.");
+        lines.push("3. Use skill_search only when workflow intent is unclear.");
     }
     else if (platformId === "claude") {
-        lines.push("1. Match explicit workflow or scoped rule first.");
+        lines.push("1. Match explicit workflow skill or `@agent` 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.");
+        lines.push("3. Use skill_search only when workflow intent is unclear.");
     }
     else if (platformId === "gemini") {
-        lines.push("1. Match explicit Gemini command or workflow first.");
-        lines.push("2. Else match user intent to one primary workflow and use the matching command file when available.");
-        lines.push("3. Treat specialists as inline postures defined by GEMINI.md, not separate agent files.");
+        lines.push("1. Match explicit Gemini command first.");
+        lines.push("2. Else match user intent to one primary workflow and use the matching command file.");
+        lines.push("3. Keep specialists inside the command plan; there are no standalone agent files.");
     }
     else {
         lines.push("1. Match explicit slash command first.");
@@ -4328,7 +3985,19 @@ async function syncRulesForPlatform({ platform, scope, cwd = process.cwd(), dryR
     const ruleFilePath = await resolveRuleFilePath(platform, scope, cwd);
     if (!ruleFilePath)
         throw new Error(`No rule file configured for platform '${platform}'.`);
-    const workflows = await collectInstalledWorkflows(platform, scope, cwd);
+    let workflows = await collectInstalledWorkflows(platform, scope, cwd);
+    if (scope === "global") {
+        const workspaceRuleFile = await resolveWorkspaceRuleFileForGlobalScope(platform, cwd);
+        const profile = WORKFLOW_PROFILES[platform];
+        const globalRuleFile = profile
+            ? expandPath(profile.global.ruleFilesByPriority[0], cwd)
+            : null;
+        if (workspaceRuleFile &&
+            globalRuleFile &&
+            path.resolve(workspaceRuleFile) !== path.resolve(globalRuleFile)) {
+            workflows = await collectInstalledWorkflows(platform, "project", cwd);
+        }
+    }
     const patchResult = await upsertManagedRuleBlock(ruleFilePath, platform, workflows, dryRun);
     const workspaceRuleSync = await syncWorkspaceRuleForGlobalScope({
         platform,
@@ -4751,6 +4420,17 @@ function buildVsCodePlaywrightServer({ mcpUrl = PLAYWRIGHT_MCP_URL } = {}) {
         headers: {},
     };
 }
+function buildAndroidMcpCommandArgs() {
+    return ["-y", ANDROID_MCP_PACKAGE_SPEC];
+}
+function buildVsCodeAndroidServer() {
+    return {
+        type: "stdio",
+        command: "npx",
+        args: buildAndroidMcpCommandArgs(),
+        env: {},
+    };
+}
 function buildCopilotCliPlaywrightServer({ mcpUrl = PLAYWRIGHT_MCP_URL } = {}) {
     return {
         type: "http",
@@ -4759,12 +4439,28 @@ function buildCopilotCliPlaywrightServer({ mcpUrl = PLAYWRIGHT_MCP_URL } = {}) {
         tools: ["*"],
     };
 }
+function buildCopilotCliAndroidServer() {
+    return {
+        type: "stdio",
+        command: "npx",
+        args: buildAndroidMcpCommandArgs(),
+        env: {},
+        tools: ["*"],
+    };
+}
 function buildGeminiPlaywrightServer({ mcpUrl = PLAYWRIGHT_MCP_URL } = {}) {
     return {
         httpUrl: mcpUrl,
         headers: {},
     };
 }
+function buildGeminiAndroidServer() {
+    return {
+        command: "npx",
+        args: buildAndroidMcpCommandArgs(),
+        env: {},
+    };
+}
 function getPostmanApiKeySource({ apiKey, envApiKey }) {
     if (apiKey)
         return "inline";
@@ -5170,7 +4866,7 @@ async function removeGeneratedArtifactIfExists({ targetPath, dryRun = false }) {
         path: targetPath,
     };
 }
-async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMcp = false, includeStitchMcp = false, includeFoundryMcp = true, includePlaywrightMcp = false, foundryRuntime = "local", dryRun = false, cwd = process.cwd(), }) {
+async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMcp = false, includeStitchMcp = false, includeFoundryMcp = true, includePlaywrightMcp = false, includeAndroidMcp = false, foundryRuntime = "local", dryRun = false, cwd = process.cwd(), }) {
     const workspaceRoot = findWorkspaceRoot(cwd);
     const warnings = [];
     const foundryScope = mcpScope === "global" ? "global" : "project";
@@ -5194,6 +4890,9 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMc
             warnings.push(`Foundry MCP is configured for Docker runtime at ${buildFoundryDockerUrl({ port: foundryDockerPort })}. Start it with 'cbx mcp runtime up --scope ${mcpScope}'.`);
         }
     }
+    if (includeAndroidMcp) {
+        warnings.push(`Android MCP uses '${ANDROID_MCP_PACKAGE_SPEC}' over stdio. Ensure Android SDK platform-tools are installed and ANDROID_HOME is available when SDK auto-discovery is unavailable.`);
+    }
     if (platform === "antigravity" || platform === "gemini") {
         const settingsPath = mcpScope === "global"
             ? path.join(os.homedir(), ".gemini", "settings.json")
@@ -5221,6 +4920,9 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMc
                 if (includePlaywrightMcp) {
                     mcpServers[PLAYWRIGHT_MCP_SERVER_ID] = buildGeminiPlaywrightServer();
                 }
+                if (includeAndroidMcp) {
+                    mcpServers[ANDROID_MCP_SERVER_ID] = buildGeminiAndroidServer();
+                }
                 next.mcpServers = mcpServers;
                 return next;
             },
@@ -5263,6 +4965,9 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMc
                         mcpServers[PLAYWRIGHT_MCP_SERVER_ID] =
                             buildCopilotCliPlaywrightServer();
                     }
+                    if (includeAndroidMcp) {
+                        mcpServers[ANDROID_MCP_SERVER_ID] = buildCopilotCliAndroidServer();
+                    }
                     next.mcpServers = mcpServers;
                     return next;
                 }
@@ -5285,6 +4990,9 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMc
                 if (includePlaywrightMcp) {
                     servers[PLAYWRIGHT_MCP_SERVER_ID] = buildVsCodePlaywrightServer();
                 }
+                if (includeAndroidMcp) {
+                    servers[ANDROID_MCP_SERVER_ID] = buildVsCodeAndroidServer();
+                }
                 next.servers = servers;
                 return next;
             },
@@ -5332,6 +5040,9 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMc
                     if (includePlaywrightMcp) {
                         servers[PLAYWRIGHT_MCP_SERVER_ID] = buildVsCodePlaywrightServer();
                     }
+                    if (includeAndroidMcp) {
+                        servers[ANDROID_MCP_SERVER_ID] = buildVsCodeAndroidServer();
+                    }
                     next.servers = servers;
                     return next;
                 },
@@ -5383,6 +5094,14 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMc
         catch {
             // Best effort. Add will still run and becomes source of truth.
         }
+        try {
+            await execFile("codex", ["mcp", "remove", ANDROID_MCP_SERVER_ID], {
+                cwd,
+            });
+        }
+        catch {
+            // Best effort. Add will still run and becomes source of truth.
+        }
         if (includeFoundryMcp) {
             try {
                 if (normalizedFoundryRuntime === "docker") {
@@ -5417,6 +5136,21 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMc
                 warnings.push(`Failed to register ${PLAYWRIGHT_MCP_SERVER_ID} MCP via Codex CLI. Ensure 'codex' is installed and rerun. (${error.message})`);
             }
         }
+        if (includeAndroidMcp) {
+            try {
+                await execFile("codex", [
+                    "mcp",
+                    "add",
+                    ANDROID_MCP_SERVER_ID,
+                    "--",
+                    "npx",
+                    ...buildAndroidMcpCommandArgs(),
+                ], { cwd });
+            }
+            catch (error) {
+                warnings.push(`Failed to register ${ANDROID_MCP_SERVER_ID} MCP via Codex CLI. Ensure 'codex', 'npx', and Android SDK platform-tools are installed and rerun. (${error.message})`);
+            }
+        }
         return {
             kind: "codex-cli",
             scope: mcpScope,
@@ -5463,6 +5197,13 @@ async function applyPostmanMcpForPlatform({ platform, mcpScope, includePostmanMc
                         url: PLAYWRIGHT_MCP_URL,
                     };
                 }
+                if (includeAndroidMcp) {
+                    mcpServers[ANDROID_MCP_SERVER_ID] = {
+                        type: "stdio",
+                        command: "npx",
+                        args: buildAndroidMcpCommandArgs(),
+                    };
+                }
                 next.mcpServers = mcpServers;
                 return next;
             },
@@ -5518,6 +5259,7 @@ async function resolvePostmanInstallSelection({ platform, scope, options, cwd =
     }
     const stitchRequested = Boolean(options.stitch);
     const playwrightRequested = Boolean(options.playwright);
+    const androidRequested = Boolean(options.android);
     const postmanRequested = Boolean(options.postman) ||
         hasWorkspaceOption ||
         options.postmanMode !== undefined;
@@ -5534,6 +5276,7 @@ async function resolvePostmanInstallSelection({ platform, scope, options, cwd =
     const enabled = postmanRequested ||
         stitchRequested ||
         playwrightRequested ||
+        androidRequested ||
         foundryOnlyRequested;
     if (!enabled)
         return { enabled: false };
@@ -5650,7 +5393,9 @@ async function resolvePostmanInstallSelection({ platform, scope, options, cwd =
                 ? FOUNDRY_MCP_SERVER_ID
                 : playwrightRequested
                     ? PLAYWRIGHT_MCP_SERVER_ID
-                    : FOUNDRY_MCP_SERVER_ID,
+                    : androidRequested
+                        ? ANDROID_MCP_SERVER_ID
+                        : FOUNDRY_MCP_SERVER_ID,
             platform,
             runtime: requestedRuntime,
             fallback: requestedFallback,
@@ -5697,12 +5442,22 @@ async function resolvePostmanInstallSelection({ platform, scope, options, cwd =
             mcpUrl: PLAYWRIGHT_MCP_URL,
         };
     }
-    return {
-        enabled: true,
+    if (androidRequested) {
+        cbxConfig.android = {
+            enabled: true,
+            server: ANDROID_MCP_SERVER_ID,
+            package: ANDROID_MCP_PACKAGE_SPEC,
+            transport: "stdio",
+        };
+        warnings.push("Android ADB MCP uses the external android-mcp-server package. Ensure Android SDK platform-tools are installed and ANDROID_HOME is set when auto-discovery is unavailable.");
+    }
+    return {
+        enabled: true,
         postmanEnabled: postmanRequested,
         apiKeySource,
         stitchEnabled,
         playwrightEnabled: playwrightRequested,
+        androidEnabled: androidRequested,
         stitchApiKeySource,
         mcpRuntime: requestedRuntime,
         effectiveMcpRuntime: runtimeSkipped ? null : effectiveRuntime,
@@ -5883,6 +5638,7 @@ async function configurePostmanInstallArtifacts({ platform, scope, profilePaths,
             includeStitchMcp: shouldInstallStitch,
             includeFoundryMcp: postmanSelection.foundryMcpEnabled,
             includePlaywrightMcp: postmanSelection.playwrightEnabled ?? false,
+            includeAndroidMcp: postmanSelection.androidEnabled ?? false,
             foundryRuntime: postmanSelection.effectiveMcpRuntime || "local",
             dryRun,
             cwd,
@@ -5911,7 +5667,7 @@ async function configurePostmanInstallArtifacts({ platform, scope, profilePaths,
             warnings.push(`MCP tool catalog sync failed: ${error.message}`);
         }
     }
-    const legacySkillMcpCleanup = shouldInstallPostman
+    const legacySkillMcpCleanup = shouldInstallPostman && profilePaths.skillsDir
         ? await removeGeneratedArtifactIfExists({
             targetPath: path.join(profilePaths.skillsDir, POSTMAN_SKILL_ID, "mcp.json"),
             dryRun,
@@ -5948,6 +5704,7 @@ async function configurePostmanInstallArtifacts({ platform, scope, profilePaths,
         foundryMcpEnabled: postmanSelection.foundryMcpEnabled,
         postmanEnabled: shouldInstallPostman,
         playwrightEnabled: Boolean(postmanSelection.playwrightEnabled),
+        androidEnabled: Boolean(postmanSelection.androidEnabled),
         postmanMode: shouldInstallPostman && effectiveMcpUrl
             ? resolvePostmanModeFromUrl(effectiveMcpUrl, DEFAULT_POSTMAN_INSTALL_MODE)
             : null,
@@ -5955,6 +5712,9 @@ async function configurePostmanInstallArtifacts({ platform, scope, profilePaths,
         playwrightMcpUrl: postmanSelection.playwrightEnabled
             ? PLAYWRIGHT_MCP_URL
             : null,
+        androidMcpPackage: postmanSelection.androidEnabled
+            ? ANDROID_MCP_PACKAGE_SPEC
+            : null,
         apiKeySource: effectiveApiKeySource,
         stitchApiKeySource: effectiveStitchApiKeySource,
         defaultWorkspaceId: effectiveDefaultWorkspaceId,
@@ -6005,6 +5765,12 @@ async function applyPostmanConfigArtifacts({ platform, mcpScope, configValue, dr
     const playwrightEnabled = Boolean(playwrightConfig?.enabled ?? configValue?.playwright);
     const playwrightMcpUrl = String(playwrightConfig?.mcpUrl || PLAYWRIGHT_MCP_URL).trim() ||
         PLAYWRIGHT_MCP_URL;
+    const androidConfig = configValue?.android &&
+        typeof configValue.android === "object" &&
+        !Array.isArray(configValue.android)
+        ? configValue.android
+        : null;
+    const androidEnabled = Boolean(androidConfig?.enabled ?? configValue?.android);
     const stitchApiKeyEnvVar = normalizePostmanApiKey(stitchState?.apiKeyEnvVar) || STITCH_API_KEY_ENV_VAR;
     const stitchMcpUrl = stitchState?.mcpUrl || STITCH_MCP_URL;
     const foundryRuntime = normalizeMcpRuntime(configValue?.mcp?.effectiveRuntime || configValue?.mcp?.runtime, "local");
@@ -6045,6 +5811,7 @@ async function applyPostmanConfigArtifacts({ platform, mcpScope, configValue, dr
             includeStitchMcp: stitchEnabled,
             includeFoundryMcp: true,
             includePlaywrightMcp: playwrightEnabled ?? false,
+            includeAndroidMcp: androidEnabled ?? false,
             foundryRuntime,
             dryRun,
             cwd,
@@ -6054,6 +5821,7 @@ async function applyPostmanConfigArtifacts({ platform, mcpScope, configValue, dr
     return {
         postmanEnabled,
         playwrightEnabled,
+        androidEnabled,
         playwrightMcpUrl: playwrightEnabled ? playwrightMcpUrl : null,
         legacyDefinitionCleanupResults,
         mcpRuntimeResult,
@@ -6297,27 +6065,57 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
         throw new Error(`Bundle '${bundleId}' does not define platform '${platform}'.`);
     }
     const shouldInstallPlatformSkills = true;
+    const workflowFiles = Array.isArray(platformSpec.workflows)
+        ? platformSpec.workflows
+        : [];
+    const generatedSkillDirs = Array.isArray(platformSpec.generatedSkills)
+        ? platformSpec.generatedSkills
+        : [];
+    const agentFiles = platformInstallsCustomAgents(platform)
+        ? Array.isArray(platformSpec.agents)
+            ? platformSpec.agents
+            : []
+        : [];
+    const commandFiles = Array.isArray(platformSpec.commands)
+        ? platformSpec.commands
+        : [];
+    const promptFiles = Array.isArray(platformSpec.prompts)
+        ? platformSpec.prompts
+        : [];
+    const hookFiles = Array.isArray(platformSpec.hooks)
+        ? platformSpec.hooks
+            .map((entry) => typeof entry === "string"
+            ? entry
+            : typeof entry?.file === "string"
+                ? entry.file
+                : null)
+            .filter(Boolean)
+        : [];
     if (!dryRun) {
-        await mkdir(profilePaths.workflowsDir, { recursive: true });
-        if (shouldInstallPlatformSkills) {
+        if (workflowFiles.length > 0) {
+            if (!profilePaths.workflowsDir) {
+                throw new Error(`Platform '${platform}' does not define a workflow install directory.`);
+            }
+            await mkdir(profilePaths.workflowsDir, { recursive: true });
+        }
+        if (shouldInstallPlatformSkills &&
+            profilePaths.skillsDir &&
+            (generatedSkillDirs.length > 0 || Array.isArray(platformSpec.skills))) {
             await mkdir(profilePaths.skillsDir, { recursive: true });
         }
-        if (platformInstallsCustomAgents(platform)) {
+        if (agentFiles.length > 0) {
+            if (!profilePaths.agentsDir) {
+                throw new Error(`Platform '${platform}' does not define an agent install directory.`);
+            }
             await mkdir(profilePaths.agentsDir, { recursive: true });
         }
-        if (profilePaths.commandsDir &&
-            Array.isArray(platformSpec.commands) &&
-            platformSpec.commands.length > 0) {
+        if (profilePaths.commandsDir && commandFiles.length > 0) {
             await mkdir(profilePaths.commandsDir, { recursive: true });
         }
-        if (profilePaths.promptsDir &&
-            Array.isArray(platformSpec.prompts) &&
-            platformSpec.prompts.length > 0) {
+        if (profilePaths.promptsDir && promptFiles.length > 0) {
             await mkdir(profilePaths.promptsDir, { recursive: true });
         }
-        if (profilePaths.hooksDir &&
-            Array.isArray(platformSpec.hooks) &&
-            platformSpec.hooks.some((entry) => typeof entry?.file === "string")) {
+        if (profilePaths.hooksDir && hookFiles.length > 0) {
             await mkdir(profilePaths.hooksDir, { recursive: true });
         }
     }
@@ -6335,10 +6133,9 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
     };
     // Bind useSymlinks into copyArtifact so every call site inherits it
     const copyArt = (args) => copyArtifact({ ...args, useSymlinks });
-    const workflowFiles = Array.isArray(platformSpec.workflows)
-        ? platformSpec.workflows
-        : [];
     for (const workflowFile of workflowFiles) {
+        if (!profilePaths.workflowsDir)
+            continue;
         const source = path.join(platformRoot, "workflows", workflowFile);
         const destination = path.join(profilePaths.workflowsDir, path.basename(workflowFile));
         if (!(await pathExists(source))) {
@@ -6356,12 +6153,9 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
         else
             installed.push(destination);
     }
-    const agentFiles = platformInstallsCustomAgents(platform)
-        ? Array.isArray(platformSpec.agents)
-            ? platformSpec.agents
-            : []
-        : [];
     for (const agentFile of agentFiles) {
+        if (!profilePaths.agentsDir)
+            continue;
         const source = path.join(platformRoot, "agents", agentFile);
         const destination = path.join(profilePaths.agentsDir, path.basename(agentFile));
         if (!(await pathExists(source))) {
@@ -6379,9 +6173,6 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
         else
             installed.push(destination);
     }
-    const commandFiles = Array.isArray(platformSpec.commands)
-        ? platformSpec.commands
-        : [];
     for (const commandFile of commandFiles) {
         if (!profilePaths.commandsDir)
             continue;
@@ -6402,9 +6193,6 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
         else
             installed.push(destination);
     }
-    const promptFiles = Array.isArray(platformSpec.prompts)
-        ? platformSpec.prompts
-        : [];
     for (const promptFile of promptFiles) {
         if (!profilePaths.promptsDir)
             continue;
@@ -6425,15 +6213,6 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
         else
             installed.push(destination);
     }
-    const hookFiles = Array.isArray(platformSpec.hooks)
-        ? platformSpec.hooks
-            .map((entry) => typeof entry === "string"
-            ? entry
-            : typeof entry?.file === "string"
-                ? entry.file
-                : null)
-            .filter(Boolean)
-        : [];
     for (const hookFile of hookFiles) {
         if (!profilePaths.hooksDir)
             continue;
@@ -6454,7 +6233,7 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
         else
             installed.push(destination);
     }
-    if (shouldInstallPlatformSkills) {
+    if (shouldInstallPlatformSkills && profilePaths.skillsDir) {
         const agentSkillDependencies = await resolvePlatformAgentSkillDependencies({
             platformRoot,
             platformSpec,
@@ -6500,20 +6279,24 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
             else
                 installed.push(skillsIndexDest);
         }
-    }
-    let generatedWrapperSkills = [];
-    if (platform === "codex") {
-        const wrapperResult = await generateCodexWrapperSkills({
-            platformRoot,
-            platformSpec,
-            skillsDir: profilePaths.skillsDir,
-            overwrite,
-            dryRun,
-        });
-        installed.push(...wrapperResult.installed);
-        skipped.push(...wrapperResult.skipped);
-        artifacts.skills.push(...wrapperResult.artifacts);
-        generatedWrapperSkills = wrapperResult.generated;
+        for (const generatedSkillDir of generatedSkillDirs) {
+            const source = path.join(platformRoot, "generated-skills", generatedSkillDir);
+            const destination = path.join(profilePaths.skillsDir, path.basename(generatedSkillDir));
+            if (!(await pathExists(source))) {
+                throw new Error(`Missing generated skill source directory: ${source}`);
+            }
+            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);
+        }
     }
     let terminalIntegration = null;
     if (platform === "antigravity" && terminalVerifierSelection?.enabled) {
@@ -6524,11 +6307,13 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
         });
         installed.push(...terminalIntegration.installedPaths);
     }
-    const duplicateSkillCleanup = await cleanupNestedDuplicateSkills({
-        skillsRootDir: profilePaths.skillsDir,
-        installedSkillDirs: artifacts.skills,
-        dryRun,
-    });
+    const duplicateSkillCleanup = profilePaths.skillsDir
+        ? await cleanupNestedDuplicateSkills({
+            skillsRootDir: profilePaths.skillsDir,
+            installedSkillDirs: artifacts.skills,
+            dryRun,
+        })
+        : [];
     const sanitizedSkills = await sanitizeInstalledSkillsForPlatform({
         platform,
         skillDirs: artifacts.skills,
@@ -6545,49 +6330,11 @@ async function installBundleArtifacts({ bundleId, manifest, platform, scope, ove
         skipped,
         artifacts,
         terminalIntegration,
-        generatedWrapperSkills,
         duplicateSkillCleanup,
         sanitizedSkills,
         sanitizedAgents,
     };
 }
-async function installCodexProjectWorkflowTemplates({ bundleId, manifest, overwrite, dryRun = false, cwd = process.cwd(), }) {
-    const platform = "codex";
-    const platformSpec = manifest.platforms?.[platform];
-    if (!platformSpec)
-        return { installed: [], skipped: [] };
-    const workflowFiles = Array.isArray(platformSpec.workflows)
-        ? platformSpec.workflows
-        : [];
-    if (workflowFiles.length === 0)
-        return { installed: [], skipped: [] };
-    const profilePaths = await resolveProfilePaths(platform, "project", cwd);
-    if (!dryRun) {
-        await mkdir(profilePaths.workflowsDir, { recursive: true });
-    }
-    const bundleRoot = path.join(agentAssetsRoot(), "workflows", bundleId);
-    const platformRoot = path.join(bundleRoot, "platforms", platform);
-    const installed = [];
-    const skipped = [];
-    for (const workflowFile of workflowFiles) {
-        const source = path.join(platformRoot, "workflows", workflowFile);
-        const destination = path.join(profilePaths.workflowsDir, path.basename(workflowFile));
-        if (!(await pathExists(source))) {
-            throw new Error(`Missing workflow source file: ${source}`);
-        }
-        const result = await copyArtifact({
-            source,
-            destination,
-            overwrite,
-            dryRun,
-        });
-        if (result.action === "skipped" || result.action === "would-skip")
-            skipped.push(destination);
-        else
-            installed.push(destination);
-    }
-    return { installed, skipped };
-}
 async function seedRuleFileFromTemplateIfMissing({ bundleId, manifest, platform, scope, overwrite = false, dryRun = false, cwd = process.cwd(), }) {
     const platformSpec = manifest.platforms?.[platform];
     if (!platformSpec || !platformSpec.rulesTemplate)
@@ -6621,6 +6368,8 @@ function commandToFilename(command) {
     return `${normalized}.md`;
 }
 async function findWorkflowFileByTarget(workflowsDir, target) {
+    if (!workflowsDir)
+        return null;
     const direct = target.endsWith(".md") ? target : `${target}.md`;
     const directPath = path.join(workflowsDir, direct);
     if (await pathExists(directPath))
@@ -6654,12 +6403,19 @@ async function removeBundleArtifacts({ bundleId, manifest, platform, scope, prof
     if (!platformSpec)
         throw new Error(`Bundle '${bundleId}' does not define platform '${platform}'.`);
     const removed = [];
+    const generatedSkillDirs = Array.isArray(platformSpec.generatedSkills)
+        ? platformSpec.generatedSkills
+        : [];
     for (const workflowFile of platformSpec.workflows || []) {
+        if (!profilePaths.workflowsDir)
+            continue;
         const destination = path.join(profilePaths.workflowsDir, path.basename(workflowFile));
         if (await safeRemove(destination, dryRun))
             removed.push(destination);
     }
     for (const agentFile of platformSpec.agents || []) {
+        if (!profilePaths.agentsDir)
+            continue;
         const destination = path.join(profilePaths.agentsDir, path.basename(agentFile));
         if (await safeRemove(destination, dryRun))
             removed.push(destination);
@@ -6697,48 +6453,50 @@ async function removeBundleArtifacts({ bundleId, manifest, platform, scope, prof
         extraSkillIds: [],
     });
     for (const skillId of skillIds) {
+        if (!profilePaths.skillsDir)
+            continue;
         const destination = path.join(profilePaths.skillsDir, skillId);
         if (await safeRemove(destination, dryRun))
             removed.push(destination);
     }
-    if (platform === "codex") {
-        const wrapperSkillIds = buildCodexWrapperSkillIds(platformSpec);
-        for (const skillId of wrapperSkillIds) {
-            const destination = path.join(profilePaths.skillsDir, skillId);
-            if (await safeRemove(destination, dryRun))
-                removed.push(destination);
-        }
+    for (const generatedSkillDir of generatedSkillDirs) {
+        if (!profilePaths.skillsDir)
+            continue;
+        const destination = path.join(profilePaths.skillsDir, path.basename(generatedSkillDir));
+        if (await safeRemove(destination, dryRun))
+            removed.push(destination);
     }
     return { removed, profilePaths };
 }
 function printPlatforms() {
+    const formatPathList = (paths, disabledLabel = "(not used)") => Array.isArray(paths) && paths.length > 0 ? paths.join(" | ") : disabledLabel;
     console.log("Workflow platforms:");
     for (const profileId of PLATFORM_IDS) {
         const profile = WORKFLOW_PROFILES[profileId];
         const agentsEnabled = platformInstallsCustomAgents(profileId);
         console.log(`- ${profile.id} (${profile.label})`);
-        console.log(`  project workflows: ${profile.project.workflowDirs[0]}`);
-        console.log(`  project agents:    ${agentsEnabled ? profile.project.agentDirs[0] : "(disabled for this platform)"}`);
-        console.log(`  project skills:    ${profile.project.skillDirs[0]}`);
+        console.log(`  project workflows: ${formatPathList(profile.project.workflowDirs)}`);
+        console.log(`  project agents:    ${agentsEnabled ? formatPathList(profile.project.agentDirs, "(not used)") : "(disabled for this platform)"}`);
+        console.log(`  project skills:    ${formatPathList(profile.project.skillDirs)}`);
         if (Array.isArray(profile.project.commandDirs) &&
             profile.project.commandDirs.length > 0) {
-            console.log(`  project commands:  ${profile.project.commandDirs[0]}`);
+            console.log(`  project commands:  ${formatPathList(profile.project.commandDirs)}`);
         }
         if (Array.isArray(profile.project.promptDirs) &&
             profile.project.promptDirs.length > 0) {
-            console.log(`  project prompts:   ${profile.project.promptDirs[0]}`);
+            console.log(`  project prompts:   ${formatPathList(profile.project.promptDirs)}`);
         }
         console.log(`  project rules:     ${profile.project.ruleFilesByPriority.join(" | ")}`);
-        console.log(`  global workflows:  ${profile.global.workflowDirs[0]}`);
-        console.log(`  global agents:     ${agentsEnabled ? profile.global.agentDirs[0] : "(disabled for this platform)"}`);
-        console.log(`  global skills:     ${profile.global.skillDirs[0]}`);
+        console.log(`  global workflows:  ${formatPathList(profile.global.workflowDirs)}`);
+        console.log(`  global agents:     ${agentsEnabled ? formatPathList(profile.global.agentDirs, "(not used)") : "(disabled for this platform)"}`);
+        console.log(`  global skills:     ${formatPathList(profile.global.skillDirs)}`);
         if (Array.isArray(profile.global.commandDirs) &&
             profile.global.commandDirs.length > 0) {
-            console.log(`  global commands:   ${profile.global.commandDirs[0]}`);
+            console.log(`  global commands:   ${formatPathList(profile.global.commandDirs)}`);
         }
         if (Array.isArray(profile.global.promptDirs) &&
             profile.global.promptDirs.length > 0) {
-            console.log(`  global prompts:    ${profile.global.promptDirs[0]}`);
+            console.log(`  global prompts:    ${formatPathList(profile.global.promptDirs)}`);
         }
         console.log(`  global rules:      ${profile.global.ruleFilesByPriority.join(" | ")}`);
         console.log("  default install:   workflows/agents/commands/prompts/skills/MCP -> project");
@@ -6765,7 +6523,7 @@ function printRuleSyncResult(result) {
         }
     }
 }
-function printInstallSummary({ platform, scope, bundleId, installed, skipped, generatedWrapperSkills = [], duplicateSkillCleanup = [], sanitizedSkills = [], sanitizedAgents = [], terminalIntegration = null, terminalIntegrationRules = null, warnings = [], dryRun = false, }) {
+function printInstallSummary({ platform, scope, bundleId, installed, skipped, duplicateSkillCleanup = [], sanitizedSkills = [], sanitizedAgents = [], terminalIntegration = null, terminalIntegrationRules = null, warnings = [], dryRun = false, }) {
     console.log(`\nPlatform: ${platform}`);
     console.log(`Scope: ${scope}`);
     console.log(`Bundle: ${bundleId}`);
@@ -6786,12 +6544,6 @@ function printInstallSummary({ platform, scope, bundleId, installed, skipped, ge
     if (installed.length === 0 && skipped.length === 0) {
         console.log("\nNo changes made.");
     }
-    if (generatedWrapperSkills.length > 0) {
-        const workflowCount = generatedWrapperSkills.filter((item) => item.kind === "workflow").length;
-        const agentCount = generatedWrapperSkills.filter((item) => item.kind === "agent").length;
-        console.log(`\nCodex callable wrapper skills: ${generatedWrapperSkills.length} (workflow=${workflowCount}, agent=${agentCount})`);
-        console.log("These remain compatibility aliases. Prefer direct /workflow and @agent routing in Codex when available.");
-    }
     if (terminalIntegration) {
         console.log("\nAntigravity terminal verification integration:");
         console.log(`- Provider: ${terminalIntegration.provider}`);
@@ -6847,6 +6599,9 @@ function printPostmanSetupSummary({ postmanSetup }) {
     if (postmanSetup.playwrightEnabled) {
         console.log(`- Playwright MCP: enabled (${postmanSetup.playwrightMcpUrl || PLAYWRIGHT_MCP_URL})`);
     }
+    if (postmanSetup.androidEnabled) {
+        console.log(`- Android ADB MCP: enabled (${postmanSetup.androidMcpPackage || ANDROID_MCP_PACKAGE_SPEC})`);
+    }
     if (postmanSetup.postmanEnabled && postmanSetup.postmanMode) {
         console.log(`- Postman mode: ${postmanSetup.postmanMode}`);
     }
@@ -7055,10 +6810,15 @@ async function createDoctorReport({ platform, scope, cwd = process.cwd() }) {
         if (await pathExists(gitignorePath)) {
             const gitignore = await readFile(gitignorePath, "utf8");
             const lines = gitignore.split(/\r?\n/).map((line) => line.trim());
-            const hasAgentIgnore = lines.some((line) => line === ".agent" || line === ".agent/" || line === "/.agent/");
+            const hasAgentIgnore = lines.some((line) => line === ".agent" ||
+                line === ".agent/" ||
+                line === "/.agent/" ||
+                line === ".agents" ||
+                line === ".agents/" ||
+                line === "/.agents/");
             if (hasAgentIgnore) {
-                warnings.push(".agent/ is ignored in .gitignore; this can hide team workflow/rule updates.");
-                recommendations.push("Prefer tracking .agent/ in git. For local-only excludes, use '.git/info/exclude' instead of .gitignore.");
+                warnings.push(".agents/ or legacy .agent/ is ignored in .gitignore; this can hide team workflow/rule updates.");
+                recommendations.push("Prefer tracking .agents/ in git. For local-only excludes, use '.git/info/exclude' instead of .gitignore.");
             }
         }
     }
@@ -7194,10 +6954,11 @@ function withInstallOptions(command) {
         .option("--postman-mode <mode>", "Postman MCP mode for --postman: minimal|code|full (default: full)")
         .option("--stitch", "optional: configure Stitch profiles and gateway-backed Foundry MCP wiring")
         .option("--playwright", "optional: include Playwright MCP server wiring")
+        .option("--android", `optional: include Android ADB MCP wiring via ${ANDROID_MCP_PACKAGE_SPEC}`)
         .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 (workspace/project only; global is coerced to project)")
+        .option("--mcp-scope <scope>", "optional: MCP config scope for --postman/--stitch/--android (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)
@@ -7349,10 +7110,10 @@ async function upsertTerminalVerificationForInstall({ scope, cwd, terminalIntegr
     };
 }
 async function cleanupAntigravityTerminalIntegration({ scope, cwd, dryRun = false, }) {
-    const profilePaths = await resolveArtifactProfilePaths("antigravity", scope, cwd);
+    const profilePaths = await resolveArtifactProfilePaths("antigravity", "project", cwd);
     const integrationDir = getAntigravityTerminalIntegrationDir(profilePaths);
     const dirRemoved = await safeRemove(integrationDir, dryRun);
-    const primaryRuleFile = await resolveRuleFilePath("antigravity", scope, cwd);
+    const primaryRuleFile = await resolveRuleFilePath("antigravity", "project", cwd);
     const primaryRule = primaryRuleFile
         ? await removeTerminalVerificationBlock(primaryRuleFile, dryRun)
         : { action: "missing-rule-file", filePath: null };
@@ -7437,21 +7198,6 @@ async function performWorkflowInstall(options, { postmanSelectionOverride = null
         dryRun,
         cwd,
     });
-    if (platform === "codex" && scope === "global") {
-        const codexProjectPaths = await resolveProfilePaths("codex", "project", cwd);
-        if (path.resolve(artifactProfilePaths.workflowsDir) !==
-            path.resolve(codexProjectPaths.workflowsDir)) {
-            const codexProjectWorkflows = await installCodexProjectWorkflowTemplates({
-                bundleId,
-                manifest,
-                overwrite: Boolean(options.overwrite),
-                dryRun,
-                cwd,
-            });
-            installResult.installed.push(...codexProjectWorkflows.installed);
-            installResult.skipped.push(...codexProjectWorkflows.skipped);
-        }
-    }
     await seedRuleFileFromTemplateIfMissing({
         bundleId,
         manifest,
@@ -7526,7 +7272,6 @@ async function runWorkflowInstall(options) {
             bundleId: result.bundleId,
             installed: result.installResult.installed,
             skipped: result.installResult.skipped,
-            generatedWrapperSkills: result.installResult.generatedWrapperSkills,
             duplicateSkillCleanup: result.installResult.duplicateSkillCleanup,
             sanitizedSkills: result.installResult.sanitizedSkills,
             sanitizedAgents: result.installResult.sanitizedAgents,
@@ -7743,6 +7488,9 @@ async function runWorkflowRemove(target, options) {
             }
         }
         else {
+            if (!artifactProfilePaths.workflowsDir) {
+                throw new Error(`Platform '${platform}' does not install standalone workflow files. Remove the bundle instead, or remove the native command/prompt/skill artifact directly.`);
+            }
             const workflowFile = await findWorkflowFileByTarget(artifactProfilePaths.workflowsDir, target);
             if (!workflowFile) {
                 throw new Error(`Could not find workflow or bundle '${target}' in platform '${platform}'.`);
@@ -7761,21 +7509,22 @@ async function runWorkflowRemove(target, options) {
                 removed.push(workflowFile);
             }
         }
-        const syncResult = await syncRulesForPlatform({
-            platform,
-            scope: ruleScope,
-            dryRun,
-            cwd,
-        });
         if (!dryRun && removedType === "bundle") {
+            const ruleFilePath = await resolveRuleFilePath(platform, ruleScope, cwd);
             await recordBundleRemovalState({
-                scope,
+                scope: ruleScope,
                 platform,
                 bundleId: target,
-                ruleFilePath: syncResult.filePath,
+                ruleFilePath,
                 cwd,
             });
         }
+        const syncResult = await syncRulesForPlatform({
+            platform,
+            scope: ruleScope,
+            dryRun,
+            cwd,
+        });
         printRemoveSummary({
             platform,
             scope,
@@ -8118,13 +7867,13 @@ async function runWorkflowRemoveAll(options) {
                     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 generatedSkillIds = (platformSpec.generatedSkills || []).map((entry) => path.basename(entry));
                     const skillIds = await resolveInstallSkillIds({
                         platformSpec,
                         extraSkillIds: [],
                     });
-                    const wrapperSkillIds = platform === "codex" ? buildCodexWrapperSkillIds(platformSpec) : [];
                     const bundleSkillIds = [
-                        ...new Set([...skillIds, ...wrapperSkillIds]),
+                        ...new Set([...skillIds, ...generatedSkillIds]),
                     ];
                     for (const workflowsDir of alternateWorkflowsDirs) {
                         for (const workflowFile of workflowFiles) {
@@ -9478,6 +9227,18 @@ function resolveMcpCatalogDir({ scope, cwd = process.cwd() }) {
 function resolveMcpCatalogPath({ service, scope, cwd = process.cwd() }) {
     return path.join(resolveMcpCatalogDir({ scope, cwd }), `${service}.json`);
 }
+function buildMcpPassthroughAliasName(service, toolName) {
+    const normalizedTool = String(toolName || "")
+        .trim()
+        .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
+        .replace(/[^A-Za-z0-9]+/g, "_")
+        .replace(/^_+|_+$/g, "")
+        .replace(/_+/g, "_")
+        .toLowerCase();
+    if (!normalizedTool)
+        return `${service}_tool`;
+    return `${service}_${normalizedTool}`;
+}
 function parseMcpJsonRpcResponse(raw) {
     const trimmed = String(raw || "").trim();
     if (!trimmed)
@@ -9902,6 +9663,7 @@ async function runMcpServe(options) {
         const opts = resolveActionOptions(options);
         const cwd = process.cwd();
         await loadManagedCredentialsEnv();
+        assertBundledMcpBuildFreshness();
         const entryPath = resolveBundledMcpEntryPath();
         if (!(await pathExists(entryPath))) {
             throw new Error(`Bundled MCP server not found at ${entryPath}. Install @cubis/foundry with bundled mcp/dist assets.`);
@@ -10402,7 +10164,7 @@ function printInstallEngineeringSummary({ engineeringResults, techResult }) {
 function printInstallDocumentationNotice() {
     console.log("\nProject backbone docs:");
     console.log("- Install only wires the rule references and workflow assets.");
-    console.log(`- Use \`cbx rules init\` to scaffold ENGINEERING_RULES.md and TECH.md, or \`cbx build architecture --platform <codex|claude|gemini|copilot>\` to generate ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ${FOUNDATION_DOCS_DIR}/TECH.md, and ADR scaffolds.`);
+    console.log(`- Use \`cbx rules init\` to scaffold ENGINEERING_RULES.md and TECH.md, or \`cbx build architecture --platform <antigravity|codex|claude|gemini|copilot>\` to generate ${FOUNDATION_DOCS_DIR}/MEMORY.md, ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ${FOUNDATION_DOCS_DIR}/TECH.md, topic memory docs, and ADR scaffolds.`);
 }
 async function upsertEngineeringArtifacts({ platform, scope, overwrite = false, skipTech = false, dryRun = false, cwd = process.cwd(), }) {
     const ruleFilePath = await resolveRuleFilePath(platform, scope, cwd);
@@ -10431,6 +10193,7 @@ async function upsertEngineeringArtifacts({ platform, scope, overwrite = false,
         const blockResult = await upsertEngineeringRulesBlock({
             ruleFilePath: target.ruleFilePath,
             platform,
+            memoryFilePath: path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "MEMORY.md"),
             productFilePath: scaffold.productPath,
             architectureFilePath: scaffold.architectureDocPath,
             engineeringRulesFilePath: scaffold.engineeringRulesPath,
@@ -10529,7 +10292,7 @@ async function runRulesTechMd(options) {
 function normalizeArchitectureBuildPlatform(value) {
     const normalized = normalizePlatform(value);
     if (!normalized || !ARCHITECTURE_BUILD_PLATFORMS.has(normalized)) {
-        throw new Error("Architecture build platform must be one of: codex, claude, gemini, copilot.");
+        throw new Error("Architecture build platform must be one of: antigravity, codex, claude, gemini, copilot.");
     }
     return normalized;
 }
@@ -10653,9 +10416,19 @@ async function resolveArchitectureSkillPathHints(platform, cwd, skillIds) {
         .map((filePath) => toPosixPath(path.relative(findWorkspaceRoot(cwd), filePath)));
 }
 function buildArchitecturePrompt({ platform, workspaceRoot, snapshot, specRoots, inspectionAnchors, researchMode, coreSkills, conditionalSkills, skillPathHints, }) {
+    const memoryPath = `${FOUNDATION_DOCS_DIR}/MEMORY.md`;
     const productPath = `${FOUNDATION_DOCS_DIR}/PRODUCT.md`;
     const architecturePath = `${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md`;
+    const designPath = `${FOUNDATION_DOCS_DIR}/DESIGN.md`;
     const techPath = `${FOUNDATION_DOCS_DIR}/TECH.md`;
+    const designPagesPath = `${FOUNDATION_DESIGN_DIR}/pages`;
+    const designFlowsPath = `${FOUNDATION_DESIGN_DIR}/flows`;
+    const designMobilePath = `${FOUNDATION_DESIGN_DIR}/mobile`;
+    const stitchDesignPath = `.stitch/DESIGN.md`;
+    const domainMemoryPath = `${FOUNDATION_MEMORY_DIR}/domain.md`;
+    const runtimeMemoryPath = `${FOUNDATION_MEMORY_DIR}/runtime.md`;
+    const integrationsMemoryPath = `${FOUNDATION_MEMORY_DIR}/integrations.md`;
+    const debuggingMemoryPath = `${FOUNDATION_MEMORY_DIR}/debugging.md`;
     const adrReadmePath = `${FOUNDATION_ADR_DIR}/README.md`;
     const adrTemplatePath = `${FOUNDATION_ADR_DIR}/0000-template.md`;
     const architectureSignals = snapshot.architectureByApp
@@ -10664,18 +10437,12 @@ function buildArchitecturePrompt({ platform, workspaceRoot, snapshot, specRoots,
         const label = item.rootPath === "." ? "repo root" : item.rootPath;
         return `${label}: ${item.architectureSignals.join(", ")}`;
     });
-    const platformCapabilities = {
-        codex: "You can read, write, and execute shell commands. Use `codex exec` mode.",
-        claude: "You can read, write files, and run bash commands. Use non-interactive mode.",
-        gemini: "You can read, write files, and run commands within your sandbox. Follow Gemini CLI conventions.",
-        copilot: "You can read, write files, and use terminal commands. Follow Copilot agent conventions.",
-    };
     return [
         `You are running inside ${platform}.`,
-        platformCapabilities[platform] || "",
+        ARCHITECTURE_BUILD_PLATFORM_CAPABILITIES[platform] || "",
         "",
         "Objective:",
-        `- Inspect the repository at ${toPosixPath(workspaceRoot)} and author or refresh the core foundation docs in ${productPath}, ${architecturePath}, ${techPath}, ${adrReadmePath}, and ${adrTemplatePath}.`,
+        `- Inspect the repository at ${toPosixPath(workspaceRoot)} and author or refresh the core foundation docs in ${memoryPath}, ${productPath}, ${architecturePath}, ${designPath}, ${techPath}, ${domainMemoryPath}, ${runtimeMemoryPath}, ${integrationsMemoryPath}, ${debuggingMemoryPath}, ${adrReadmePath}, and ${adrTemplatePath}.`,
         "- The content should be primarily AI-authored from repository inspection, not copied from placeholder scaffolding.",
         "- Preserve manual content outside the managed `cbx:*` markers.",
         "- The output docs must be immediately useful to any AI agent (Copilot, Claude, Gemini, Codex) inspecting this repo for the first time, reducing search and exploration time.",
@@ -10706,6 +10473,18 @@ function buildArchitecturePrompt({ platform, workspaceRoot, snapshot, specRoots,
             : "none detected"}`,
         `- Inspection anchors: ${inspectionAnchors.length > 0 ? inspectionAnchors.join(", ") : "no concrete anchors detected; inspect the repo root, main source trees, and manifest files manually"}`,
         "",
+        "Foundation doc usage contract:",
+        `- ${memoryPath} is the durable AI entrypoint and first-stop index. Keep it concise, keep it under roughly 120 lines when possible, and route readers to deeper docs instead of duplicating every deep detail.`,
+        `- ${productPath} is for planning, scoping, specs, product intent, business rules, and domain vocabulary.`,
+        `- ${architecturePath} is for structure, boundaries, dependency rules, ADR-worthy decisions, refactors, and design-system governance.`,
+        `- ${designPath} is the canonical design-system backbone for web, Stitch, and Flutter/mobile work. Use ${designPagesPath}, ${designFlowsPath}, and ${designMobilePath} for narrower overlays. Mirror Stitch-facing state into ${stitchDesignPath} only from the canonical docs.`,
+        `- ${techPath} is for build, test, run, debug, CI/CD, tooling, runtime operations, and exact commands.`,
+        `- ${domainMemoryPath}, ${runtimeMemoryPath}, ${integrationsMemoryPath}, and ${debuggingMemoryPath} are load-on-demand drill-down docs for their named topics.`,
+        `- ${adrReadmePath} and ${adrTemplatePath} exist for durable architecture decisions; they are not a replacement for the backbone docs.`,
+        "- `.cbx/architecture-build.json` is build metadata for automation and drift checks, not a primary context document for agents.",
+        "- These docs are downstream inputs to `ENGINEERING_RULES.md` and platform rule files such as `AGENTS.md`, `CLAUDE.md`, `.agents/rules/GEMINI.md`, `.gemini/GEMINI.md`, and `.github/copilot-instructions.md`.",
+        "- Each doc should make it easy for future rules, workflows, agents, and skills to decide whether they need to open it.",
+        "",
         "Markdown formatting rules (apply to all generated docs):",
         "- Start each file with a single `# Title` heading. Never use more than one H1 per file.",
         "- Use `## Heading` for major sections, `### Heading` for subsections. Never skip heading levels (e.g., do not jump from `##` to `####`).",
@@ -10728,11 +10507,20 @@ function buildArchitecturePrompt({ platform, workspaceRoot, snapshot, specRoots,
         "1. Inspect the repository first before writing any backbone doc content. Derive structure, product surfaces, runtime boundaries, and technical constraints from the actual codebase.",
         "2. Complete a real inspection pass before drafting. At minimum, inspect the concrete anchors listed above, plus any adjacent directories needed to understand the main execution paths, data boundaries, and integration surfaces.",
         "3. Do not infer architecture from filenames alone when you can open representative files. Read enough source to validate the main app boundaries, runtime flows, and persistence/integration patterns.",
-        `4. Then read ${productPath}, ${architecturePath}, and ${techPath} in that order when they exist so you can preserve useful manual context and update existing managed sections cleanly.`,
-        `5. Replace or update only the content between the existing managed markers in ${productPath}, ${architecturePath}, and ${techPath}. Do not append a second marker block.`,
-        "",
-        `6. In ${productPath}, write a concrete product foundation:`,
+        `4. Then read ${memoryPath}, ${productPath}, ${architecturePath}, ${techPath}, ${domainMemoryPath}, ${runtimeMemoryPath}, ${integrationsMemoryPath}, and ${debuggingMemoryPath} in that order when they exist so you can preserve useful manual context and update existing managed sections cleanly.`,
+        `5. Replace or update only the content between the existing managed markers in ${memoryPath}, ${productPath}, ${architecturePath}, ${techPath}, ${domainMemoryPath}, ${runtimeMemoryPath}, ${integrationsMemoryPath}, and ${debuggingMemoryPath}. Do not append a second marker block.`,
+        "",
+        `6. In ${memoryPath}, write the durable AI memory index:`,
+        "   - A terse project summary that a fresh agent can absorb in under a minute.",
+        "   - A task-based map telling rules, workflows, agents, and skills when to load PRODUCT, ARCHITECTURE, TECH, each topic memory doc, and ADRs.",
+        "   - Durable facts and invariants that are expensive to rediscover.",
+        "   - Active watchpoints: areas likely to break, drift, or require re-validation after changes.",
+        "   - Keep MEMORY.md as an index, not a dump: no long command catalogs, no repeated architecture prose, no copied API contracts, and no verbose troubleshooting playbooks when those belong in deeper docs.",
+        "   - If a section needs more than a short paragraph or 5-7 bullets, move the detail into PRODUCT, ARCHITECTURE, TECH, a topic memory doc, or an ADR and link to it from MEMORY.md.",
+        "",
+        `7. In ${productPath}, write a concrete product foundation:`,
         "   - Product purpose with a one-sentence elevator pitch an AI agent can use as context.",
+        "   - A short consumer note explaining that PRODUCT is the doc for planning, scoping, specs, UX, and domain-language questions.",
         "   - Primary users/operators with their key goals.",
         "   - Main journeys as numbered sequences an agent can follow to understand the happy path.",
         "   - Business capabilities that matter, linked to repo paths that implement them.",
@@ -10740,8 +10528,9 @@ function buildArchitecturePrompt({ platform, workspaceRoot, snapshot, specRoots,
         "   - What future contributors must preserve (invariants, contracts, compatibility guarantees).",
         "   - A domain glossary defining project-specific terms, abbreviations, and bounded-context language so AI agents use consistent vocabulary.",
         "",
-        `7. In ${architecturePath}, write a lean but detailed architecture backbone in a pragmatic arc42/C4 style:`,
+        `8. In ${architecturePath}, write a lean but detailed architecture backbone in a pragmatic arc42/C4 style:`,
         "   - Architecture classification (monolith, modular monolith, microservices, serverless, hybrid) with evidence.",
+        "   - A short consumer note explaining that ARCHITECTURE is the doc for refactors, boundary decisions, ADR work, and design-system governance.",
         "   - System purpose, constraints, and architectural drivers.",
         "   - Bounded contexts with ownership boundaries mapped to directories.",
         "   - Major building blocks as a table or Mermaid C4 diagram with responsibilities.",
@@ -10755,8 +10544,9 @@ function buildArchitecturePrompt({ platform, workspaceRoot, snapshot, specRoots,
         "   - Testing/debugging strategy with concrete test commands and coverage tooling.",
         "   - A dedicated folder-structure guide listing every important directory, what it owns, and contributor rules.",
         "",
-        `8. In ${techPath}, write the developer-facing technical map that an AI agent can use to start working immediately:`,
+        `9. In ${techPath}, write the developer-facing technical map that an AI agent can use to start working immediately:`,
         "   - Stack snapshot as a table (runtime, language, framework, version if discoverable).",
+        "   - A short consumer note explaining that TECH is the doc for build, run, test, debug, CI/CD, and tooling execution.",
         "   - Repository layout: directory tree with one-line purpose per directory.",
         "   - Entrypoints: the exact files that bootstrap each app/service/CLI.",
         "   - Key commands: the exact shell commands for bootstrap, build, test, lint, format, run, and deploy. Validate that these commands actually exist in the project manifests. Document required order and preconditions.",
@@ -10771,43 +10561,82 @@ function buildArchitecturePrompt({ platform, workspaceRoot, snapshot, specRoots,
         "   - Change hotspots: files/directories that change most often or have the most coupling, so agents know where to look first.",
         "   - Practical editing notes: conventions for naming, imports, test file placement, and PR hygiene.",
         "",
-        `9. ${techPath} should complement ${architecturePath}; do not repeat the same structure prose unless it helps a developer act faster.`,
-        "",
-        `10. Use exact required headings in ${productPath}: \`## Product Scope\`, \`## Product Purpose\`, \`## Primary Users And Operators\`, \`## Main Journeys\`, \`## Business Capabilities That Matter\`, \`## Operational Constraints\`, \`## Preservation Rules For Future Contributors\`, \`## Domain Glossary\`.`,
-        `11. Use exact required headings in ${architecturePath}: \`## Architecture Type\`, \`## System Purpose\`, \`## Constraints And Architectural Drivers\`, \`## Repository Structure Guide\`, \`## Bounded Contexts\`, \`## Major Building Blocks\`, \`## Dependency Rules\`, \`## Data Boundaries\`, \`## Integration Boundaries\`, \`## Runtime Flows\`, \`## Crosscutting Concerns\`, \`## Quality Requirements\`, \`## Risks And Tech Debt\`, \`## Deployment And Operability\`, \`## Testing And Debugging Strategy\`, \`## Architectural Guidance\`.`,
-        `12. Use exact required headings in ${techPath}: \`## Stack Snapshot\`, \`## Repository Layout\`, \`## Entrypoints\`, \`## Key Commands\`, \`## Build And Validation\`, \`## CI CD Pipeline\`, \`## Runtime Data Stores\`, \`## External Services And Integration Surfaces\`, \`## Environment And Config Surfaces\`, \`## Generated Artifacts To Respect\`, \`## Error Patterns And Debugging\`, \`## Change Hotspots\`, \`## Practical Editing Notes\`.`,
-        "",
-        "13. Every major claim should be grounded in repository evidence. Mention concrete repo paths in the docs when a structural claim would otherwise be ambiguous.",
-        "14. Avoid placeholder filler, generic checklists, and duplicated content across files. Each doc should have a clear job.",
-        "15. Do not create ROADMAP.md, ENGINEERING_RULES.md, or other extra docs unless the prompt explicitly asks for them.",
+        `10. In ${domainMemoryPath}, write the domain memory topic doc:`,
+        "   - Core entities, bounded contexts, business terminology, and invariants.",
+        "   - A short consumer note explaining that this topic doc is for domain modeling and product-language alignment.",
+        "   - Which files or modules embody each important concept.",
+        "   - Ambiguous terminology or overloaded names that agents should avoid misusing.",
+        "",
+        `11. In ${runtimeMemoryPath}, write the runtime memory topic doc:`,
+        "   - Runtime topology, entrypoints, queues/jobs, background workers, schedules, and deployment-time assumptions.",
+        "   - A short consumer note explaining that this topic doc is for request flow, process lifecycle, workers, and deployment reasoning.",
+        "   - The shortest path to understand request flow and process lifecycle.",
+        "",
+        `12. In ${integrationsMemoryPath}, write the integrations memory topic doc:`,
+        "   - External services, APIs, auth boundaries, data contracts, webhook/event flows, and migration-sensitive integration notes.",
+        "   - A short consumer note explaining that this topic doc is for external-service, API, auth-boundary, and contract-sensitive work.",
+        "",
+        `13. In ${debuggingMemoryPath}, write the debugging memory topic doc:`,
+        "   - Common failures, hot logs, exact investigation commands, smoke checks, and repo-specific diagnostic shortcuts.",
+        "   - A short consumer note explaining that this topic doc is for triage, incident response, and debugging workflows.",
+        "",
+        "Consumer guidance contract:",
+        "- Near the top of each foundation doc, include a short 'when to consult this doc' cue so future rules, workflows, agents, and skills can decide quickly whether they need that document.",
+        "- In MEMORY.md, name the likely downstream consumers of each deeper doc using concrete route families such as planning/spec, architecture/refactor, build/test/debug, runtime/integration, and ADR work.",
+        "- Keep MEMORY.md lean enough to be imported frequently. Prefer short bullets, compact tables only when necessary, and links outward instead of repeated explanations.",
+        "",
+        `14. ${techPath} should complement ${architecturePath}; do not repeat the same structure prose unless it helps a developer act faster.`,
+        "",
+        `15. Use exact required headings in ${memoryPath}: \`## Project Summary\`, \`## Load These Docs By Task\`, \`## Durable Facts\`, \`## Active Watchpoints\`.`,
+        `16. Use exact required headings in ${productPath}: \`## Product Scope\`, \`## Product Purpose\`, \`## Primary Users And Operators\`, \`## Main Journeys\`, \`## Business Capabilities That Matter\`, \`## Operational Constraints\`, \`## Preservation Rules For Future Contributors\`, \`## Domain Glossary\`.`,
+        `17. Use exact required headings in ${architecturePath}: \`## Architecture Type\`, \`## System Purpose\`, \`## Constraints And Architectural Drivers\`, \`## Repository Structure Guide\`, \`## Bounded Contexts\`, \`## Major Building Blocks\`, \`## Dependency Rules\`, \`## Data Boundaries\`, \`## Integration Boundaries\`, \`## Runtime Flows\`, \`## Crosscutting Concerns\`, \`## Quality Requirements\`, \`## Risks And Tech Debt\`, \`## Deployment And Operability\`, \`## Testing And Debugging Strategy\`, \`## Architectural Guidance\`.`,
+        `18. Use exact required headings in ${techPath}: \`## Stack Snapshot\`, \`## Repository Layout\`, \`## Entrypoints\`, \`## Key Commands\`, \`## Build And Validation\`, \`## CI CD Pipeline\`, \`## Runtime Data Stores\`, \`## External Services And Integration Surfaces\`, \`## Environment And Config Surfaces\`, \`## Generated Artifacts To Respect\`, \`## Error Patterns And Debugging\`, \`## Change Hotspots\`, \`## Practical Editing Notes\`.`,
+        `19. Use exact required headings in ${domainMemoryPath}: \`## Core Concepts\`, \`## Bounded Context Vocabulary\`, \`## Invariants To Preserve\`, \`## File Ownership Map\`.`,
+        `20. Use exact required headings in ${runtimeMemoryPath}: \`## Runtime Topology\`, \`## Entrypoint Paths\`, \`## Background Work\`, \`## Deployment Assumptions\`.`,
+        `21. Use exact required headings in ${integrationsMemoryPath}: \`## External Services\`, \`## Contracts And Schemas\`, \`## Auth And Trust Boundaries\`, \`## Change Risks\`.`,
+        `22. Use exact required headings in ${debuggingMemoryPath}: \`## Fast Triage Paths\`, \`## Logs And Signals\`, \`## Known Failure Modes\`, \`## Verification Shortcuts\`.`,
+        "",
+        "23. Every major claim should be grounded in repository evidence. Mention concrete repo paths in the docs when a structural claim would otherwise be ambiguous.",
+        "24. Avoid placeholder filler, generic checklists, and duplicated content across files. Each doc should have a clear job.",
+        "25. Do not create ROADMAP.md, ENGINEERING_RULES.md, or other extra docs unless the prompt explicitly asks for them.",
         researchMode === "never"
-            ? "16. Stay repo-only. Do not use outside research."
-            : "16. Use repo evidence first. Use official docs when needed. Treat Reddit or community sources only as labeled secondary evidence.",
+            ? "26. Stay repo-only. Do not use outside research."
+            : "26. Use repo evidence first. Use official docs when needed. Treat Reddit or community sources only as labeled secondary evidence.",
         researchMode === "always"
-            ? `17. Include an external research evidence subsection in ${techPath} with clearly labeled primary and secondary evidence.`
-            : "17. Include external research notes only if they materially informed the architecture update.",
-        `18. If the project clearly follows Clean Architecture, feature-first modules, DDD, modular monolith, or another stable structure, make that explicit in ${architecturePath} with evidence from the repo.`,
-        `19. Ensure ${adrReadmePath} and ${adrTemplatePath} exist as ADR entrypoints, but keep them lean.`,
-        "20. In all docs, when referencing other foundation docs, use relative markdown links: `[ARCHITECTURE.md](docs/foundation/ARCHITECTURE.md)`. This lets AI agents and humans navigate between docs.",
-        "21. Validate all Mermaid diagram syntax before writing. Each diagram must render without errors. Use simple node IDs (alphanumeric, no special characters) and quote labels containing spaces.",
-        "22. For each key command documented, note the expected exit code (0 for success) and any common failure modes. This helps AI agents validate their own changes.",
+            ? `27. Include an external research evidence subsection in ${techPath} with clearly labeled primary and secondary evidence.`
+            : "27. Include external research notes only if they materially informed the architecture update.",
+        `28. If the project clearly follows Clean Architecture, feature-first modules, DDD, modular monolith, or another stable structure, make that explicit in ${architecturePath} with evidence from the repo.`,
+        `29. Ensure ${adrReadmePath} and ${adrTemplatePath} exist as ADR entrypoints, but keep them lean.`,
+        "30. In all docs, when referencing other foundation docs, use relative markdown links: `[ARCHITECTURE.md](docs/foundation/ARCHITECTURE.md)`. This lets AI agents and humans navigate between docs.",
+        "31. Validate all Mermaid diagram syntax before writing. Each diagram must render without errors. Use simple node IDs (alphanumeric, no special characters) and quote labels containing spaces.",
+        "32. For each key command documented, note the expected exit code (0 for success) and any common failure modes. This helps AI agents validate their own changes.",
         "",
         "Platform context-loading awareness (these docs will be @imported into agent rule files):",
         "- Claude loads CLAUDE.md at session start via @file imports; each imported doc should be concise and self-contained.",
         "- Gemini loads GEMINI.md hierarchically with JIT context; structure docs with clear H2 headings so sections are independently useful.",
+        "- Antigravity benefits from the same hierarchical structure because `.agents/rules/GEMINI.md` should point to a small durable memory index, not dump every deep reference by default.",
         "- Codex concatenates AGENTS.md files root-to-CWD with a default 32 KiB combined limit; keep total foundation doc prose lean.",
         "- Copilot loads copilot-instructions.md automatically; headings and inline code markers aid discoverability.",
+        "- `ENGINEERING_RULES.md` and platform rule files should treat MEMORY.md as the first-stop shared memory index and load deeper docs only on demand.",
         "- Target each individual foundation doc under 300 lines so it stays effective when imported into any platform's context window.",
+        "- Treat MEMORY.md as the tightest budget document in the set. It should remain substantially shorter than PRODUCT.md, ARCHITECTURE.md, or TECH.md.",
         "- Front-load the most actionable information (commands, paths, constraints) in each doc; put supplementary detail later.",
         "",
         "Return one JSON object on the last line with this shape:",
-        `{"files_written":["${productPath}","${architecturePath}","${techPath}","${adrReadmePath}","${adrTemplatePath}"],"research_used":false,"gaps":[],"next_actions":[]}`,
+        `{"files_written":["${memoryPath}","${productPath}","${architecturePath}","${techPath}","${domainMemoryPath}","${runtimeMemoryPath}","${integrationsMemoryPath}","${debuggingMemoryPath}","${adrReadmePath}","${adrTemplatePath}"],"research_used":false,"gaps":[],"next_actions":[]}`,
         "",
         "Do not emit placeholder TODOs in the managed sections.",
     ].join("\n");
 }
 let architectureExecFileCaptureOverride = null;
 let architectureSpawnCaptureOverride = null;
+const WINDOWS_COMMAND_EXTENSION_PREFERENCE = [
+    ".exe",
+    ".cmd",
+    ".bat",
+    ".com",
+    "",
+];
 export function __setArchitectureCommandCaptureForTests(overrides = {}) {
     architectureExecFileCaptureOverride =
         overrides.execFileCapture || architectureExecFileCaptureOverride;
@@ -10818,12 +10647,86 @@ export function __resetArchitectureCommandCaptureForTests() {
     architectureExecFileCaptureOverride = null;
     architectureSpawnCaptureOverride = null;
 }
+function getEnvValueCaseInsensitive(env, key) {
+    if (!env)
+        return "";
+    const match = Object.keys(env).find((candidate) => candidate.toLowerCase() === key.toLowerCase());
+    return match ? String(env[match] || "") : "";
+}
+function rankWindowsCommandCandidate(command, candidate) {
+    const requestedBase = path.parse(command).name.toLowerCase();
+    const parsedCandidate = path.parse(candidate);
+    if (parsedCandidate.name.toLowerCase() !== requestedBase)
+        return -1;
+    const ext = parsedCandidate.ext.toLowerCase();
+    const rank = WINDOWS_COMMAND_EXTENSION_PREFERENCE.indexOf(ext);
+    if (rank !== -1) {
+        return WINDOWS_COMMAND_EXTENSION_PREFERENCE.length - rank;
+    }
+    return 0;
+}
+function pickWindowsCommandCandidate(command, candidates) {
+    const normalized = (candidates || [])
+        .map((candidate) => String(candidate || "").trim())
+        .filter(Boolean);
+    if (normalized.length === 0)
+        return null;
+    const ranked = normalized
+        .map((candidate) => ({
+        candidate,
+        score: rankWindowsCommandCandidate(command, candidate),
+    }))
+        .sort((left, right) => right.score - left.score);
+    return ranked[0]?.candidate || normalized[0];
+}
+function scanWindowsPathForCommand(command, env = process.env) {
+    const pathValue = getEnvValueCaseInsensitive(env, "PATH");
+    if (!pathValue)
+        return null;
+    const pathEntries = pathValue
+        .split(path.delimiter)
+        .map((entry) => entry.trim())
+        .filter(Boolean);
+    const requestedExt = path.extname(command).toLowerCase();
+    const pathExts = getEnvValueCaseInsensitive(env, "PATHEXT")
+        .split(";")
+        .map((ext) => ext.trim().toLowerCase())
+        .filter(Boolean)
+        .map((ext) => (ext.startsWith(".") ? ext : `.${ext}`));
+    const suffixes = requestedExt
+        ? [""]
+        : Array.from(new Set([
+            ...WINDOWS_COMMAND_EXTENSION_PREFERENCE,
+            ...pathExts,
+        ]));
+    const candidates = [];
+    for (const entry of pathEntries) {
+        const basePath = path.join(entry, command);
+        if (requestedExt && existsSync(basePath)) {
+            candidates.push(basePath);
+            continue;
+        }
+        for (const suffix of suffixes) {
+            const candidate = suffix ? `${basePath}${suffix}` : basePath;
+            if (existsSync(candidate)) {
+                candidates.push(candidate);
+            }
+        }
+    }
+    return pickWindowsCommandCandidate(command, candidates);
+}
+export function __pickWindowsCommandCandidateForTests(command, candidates) {
+    return pickWindowsCommandCandidate(command, candidates);
+}
+export function __scanWindowsPathForCommandForTests(command, env) {
+    return scanWindowsPathForCommand(command, env);
+}
 async function execFileCapture(command, args, options = {}) {
     if (architectureExecFileCaptureOverride) {
         return await architectureExecFileCaptureOverride(command, args, options);
     }
     const resolvedCommand = process.platform === "win32"
-        ? await resolveWindowsCommand(command)
+        ? await resolveWindowsCommand(command, options.env)
         : command;
     if (process.platform === "win32" &&
         /\.(cmd|bat)$/i.test(resolvedCommand)) {
@@ -10855,28 +10758,36 @@ async function execFileCapture(command, args, options = {}) {
         };
     }
 }
-async function resolveWindowsCommand(command) {
+async function resolveWindowsCommand(command, env = process.env) {
     if (process.platform !== "win32")
         return command;
     if (path.isAbsolute(command) || /[\\/]/.test(command))
         return command;
+    const pathCandidate = scanWindowsPathForCommand(command, env);
     try {
         const result = await execFile("where.exe", [command], {
             windowsHide: true,
             maxBuffer: 1024 * 1024,
         });
-        const resolved = String(result.stdout || "")
+        const candidates = String(result.stdout || "")
             .split(/\r?\n/)
             .map((line) => line.trim())
-            .find(Boolean);
+            .filter(Boolean);
+        const resolved = pickWindowsCommandCandidate(command, candidates);
         if (resolved)
             return resolved;
     }
     catch (error) {
         if (error?.code === "ENOENT") {
+            if (pathCandidate)
+                return pathCandidate;
             throw new Error(`Required CLI '${command}' is not installed or not on PATH.`);
         }
+        if (pathCandidate)
+            return pathCandidate;
     }
+    if (pathCandidate)
+        return pathCandidate;
     const missingError = new Error(`Required CLI '${command}' is not installed or not on PATH.`);
     missingError.code = "ENOENT";
     throw missingError;
@@ -10887,7 +10798,7 @@ async function spawnCapture(command, args, options = {}) {
     }
     const { cwd, env, streamOutput = false, useShell } = options;
     const resolvedCommand = process.platform === "win32"
-        ? await resolveWindowsCommand(command)
+        ? await resolveWindowsCommand(command, env)
         : command;
     const shell = typeof useShell === "boolean"
         ? useShell
@@ -10933,7 +10844,7 @@ async function spawnCapture(command, args, options = {}) {
 function explainArchitectureBuildFailure(platform, execution) {
     const combined = String(`${execution.stderr || ""}\n${execution.stdout || ""}`.trim());
     const notes = [];
-    if (platform === "gemini") {
+    if (platform === "gemini" || platform === "antigravity") {
         if (combined.includes("Error during discovery for MCP server") ||
             combined.includes("[MCP error]")) {
             notes.push("Gemini CLI is failing while loading MCP servers from your Gemini settings. Start the required MCP runtime(s) first or disable the broken server entries in `.gemini/settings.json` before retrying.");
@@ -10995,7 +10906,7 @@ async function probeArchitectureAdapter(platform, cwd) {
             },
         };
     }
-    if (platform === "gemini") {
+    if (platform === "gemini" || platform === "antigravity") {
         const help = await execFileCapture("gemini", ["--help"], { cwd });
         const helpText = `${help.stdout}\n${help.stderr}`.trim();
         const promptFlag = helpText.includes("--prompt")
@@ -11033,6 +10944,30 @@ async function probeArchitectureAdapter(platform, cwd) {
         },
     };
 }
+function buildArchitectureDryRunPlan(platform, prompt) {
+    if (platform === "codex") {
+        return {
+            adapter: "codex",
+            invocation: ["codex", "exec", prompt],
+        };
+    }
+    if (platform === "claude") {
+        return {
+            adapter: "claude",
+            invocation: ["claude", "--print", prompt],
+        };
+    }
+    if (platform === "gemini" || platform === "antigravity") {
+        return {
+            adapter: "gemini",
+            invocation: ["gemini", "--prompt", prompt],
+        };
+    }
+    return {
+        adapter: "copilot",
+        invocation: ["copilot", "chat", "--prompt", prompt],
+    };
+}
 function normalizeArchitectureResult({ stdout, workspaceRoot, researchMode, changedFiles = [], }) {
     const trimmed = String(stdout || "").trim();
     if (trimmed) {
@@ -11132,6 +11067,11 @@ async function collapseDuplicateTaggedBlocks({ targetPath, startPattern, endPatt
     return { changed: true };
 }
 async function normalizeArchitectureBuildOutputs(scaffold) {
+    await collapseDuplicateTaggedBlocks({
+        targetPath: scaffold.memoryPath,
+        startPattern: MEMORY_FOUNDATION_BLOCK_START_RE,
+        endPattern: MEMORY_FOUNDATION_BLOCK_END_RE,
+    });
     await collapseDuplicateTaggedBlocks({
         targetPath: scaffold.productPath,
         startPattern: PRODUCT_FOUNDATION_BLOCK_START_RE,
@@ -11147,20 +11087,56 @@ async function normalizeArchitectureBuildOutputs(scaffold) {
         startPattern: TECH_ARCHITECTURE_BLOCK_START_RE,
         endPattern: TECH_ARCHITECTURE_BLOCK_END_RE,
     });
+    for (const targetPath of [
+        scaffold.domainMemoryPath,
+        scaffold.runtimeMemoryPath,
+        scaffold.integrationsMemoryPath,
+        scaffold.debuggingMemoryPath,
+    ]) {
+        await collapseDuplicateTaggedBlocks({
+            targetPath,
+            startPattern: MEMORY_TOPIC_BLOCK_START_RE,
+            endPattern: MEMORY_TOPIC_BLOCK_END_RE,
+        });
+    }
 }
 async function readArchitectureDriftStatus(workspaceRoot, snapshot) {
+    const memoryPath = path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "MEMORY.md");
     const productPath = path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "PRODUCT.md");
     const architecturePath = path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "ARCHITECTURE.md");
+    const designPath = path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "DESIGN.md");
     const techPath = path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "TECH.md");
+    const domainMemoryPath = path.join(workspaceRoot, FOUNDATION_MEMORY_DIR, "domain.md");
+    const runtimeMemoryPath = path.join(workspaceRoot, FOUNDATION_MEMORY_DIR, "runtime.md");
+    const integrationsMemoryPath = path.join(workspaceRoot, FOUNDATION_MEMORY_DIR, "integrations.md");
+    const debuggingMemoryPath = path.join(workspaceRoot, FOUNDATION_MEMORY_DIR, "debugging.md");
     const adrReadmePath = path.join(workspaceRoot, FOUNDATION_ADR_DIR, "README.md");
     const metadataPath = path.join(workspaceRoot, ".cbx", ARCHITECTURE_BUILD_METADATA_FILENAME);
+    const memoryExists = await pathExists(memoryPath);
     const productExists = await pathExists(productPath);
     const architectureExists = await pathExists(architecturePath);
+    const designExists = await pathExists(designPath);
     const techExists = await pathExists(techPath);
+    const topicPaths = [
+        domainMemoryPath,
+        runtimeMemoryPath,
+        integrationsMemoryPath,
+        debuggingMemoryPath,
+    ];
     const adrReadmeExists = await pathExists(adrReadmePath);
     const findings = [];
+    if (!memoryExists) {
+        findings.push(`${FOUNDATION_DOCS_DIR}/MEMORY.md is missing.`);
+    }
+    else {
+        const content = await readFile(memoryPath, "utf8");
+        if (!extractTaggedMarkerAttribute(content, MEMORY_FOUNDATION_BLOCK_START_RE, "profile")) {
+            findings.push(`${FOUNDATION_DOCS_DIR}/MEMORY.md is missing the managed memory block.`);
+        }
+    }
     let actualProductHash = null;
     let actualArchitectureHash = null;
+    let actualDesignHash = null;
     let actualTechHash = null;
     if (!productExists) {
         findings.push(`${FOUNDATION_DOCS_DIR}/PRODUCT.md is missing.`);
@@ -11182,6 +11158,16 @@ async function readArchitectureDriftStatus(workspaceRoot, snapshot) {
             findings.push(`${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md is missing the managed architecture backbone block.`);
         }
     }
+    if (!designExists) {
+        findings.push(`${FOUNDATION_DOCS_DIR}/DESIGN.md is missing.`);
+    }
+    else {
+        const content = await readFile(designPath, "utf8");
+        actualDesignHash = extractTaggedMarkerAttribute(content, DESIGN_FOUNDATION_BLOCK_START_RE, "profile");
+        if (!actualDesignHash) {
+            findings.push(`${FOUNDATION_DOCS_DIR}/DESIGN.md is missing the managed design foundation block.`);
+        }
+    }
     if (!techExists) {
         findings.push(`${FOUNDATION_DOCS_DIR}/TECH.md is missing.`);
     }
@@ -11195,6 +11181,18 @@ async function readArchitectureDriftStatus(workspaceRoot, snapshot) {
     if (!adrReadmeExists) {
         findings.push(`${FOUNDATION_ADR_DIR}/README.md is missing.`);
     }
+    for (const topicPath of topicPaths) {
+        const exists = await pathExists(topicPath);
+        const relativePath = toPosixPath(path.relative(workspaceRoot, topicPath));
+        if (!exists) {
+            findings.push(`${relativePath} is missing.`);
+            continue;
+        }
+        const content = await readFile(topicPath, "utf8");
+        if (!extractTaggedMarkerAttribute(content, MEMORY_TOPIC_BLOCK_START_RE, "profile")) {
+            findings.push(`${relativePath} is missing the managed memory topic block.`);
+        }
+    }
     const metadata = await readJsonFileIfExists(metadataPath);
     if (!metadata.exists) {
         findings.push("Architecture build metadata is missing.");
@@ -11202,179 +11200,210 @@ async function readArchitectureDriftStatus(workspaceRoot, snapshot) {
     return {
         stale: findings.length > 0,
         findings,
+        memoryPath,
         productPath,
         architecturePath,
+        designPath,
         techPath,
         adrReadmePath,
         metadataPath,
         actualProductHash,
         actualArchitectureHash,
+        actualDesignHash,
         actualTechHash,
     };
 }
-async function runBuildArchitecture(options) {
-    try {
-        const platform = normalizeArchitectureBuildPlatform(options.platform);
-        const researchMode = normalizeArchitectureResearchMode(options.research);
-        const overwrite = Boolean(options.overwrite);
-        const dryRun = Boolean(options.dryRun);
-        const emitJson = Boolean(options.json);
-        const checkOnly = Boolean(options.check);
-        const cwd = process.cwd();
-        const workspaceRoot = findWorkspaceRoot(cwd);
-        const snapshot = await collectTechSnapshot(workspaceRoot);
-        const specRoots = await listSpecPackRoots(workspaceRoot);
-        if (checkOnly) {
-            const drift = await readArchitectureDriftStatus(workspaceRoot, snapshot);
-            if (emitJson) {
-                console.log(JSON.stringify(drift, null, 2));
-            }
-            else {
-                console.log(`Platform: ${platform}`);
-                console.log(`Workspace: ${toPosixPath(workspaceRoot)}`);
-                console.log(`Status: ${drift.stale ? "stale" : "fresh"}`);
-                console.log(`Backbone docs: ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ${FOUNDATION_DOCS_DIR}/TECH.md, ${FOUNDATION_ADR_DIR}/README.md`);
-                if (drift.findings.length > 0) {
-                    console.log("Findings:");
-                    for (const finding of drift.findings) {
-                        console.log(`- ${finding}`);
-                    }
-                }
-            }
-            if (drift.stale)
-                process.exit(1);
-            return;
-        }
-        const managedFilePaths = [
-            path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "PRODUCT.md"),
-            path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "ARCHITECTURE.md"),
-            path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "TECH.md"),
-            path.join(workspaceRoot, FOUNDATION_ADR_DIR, "README.md"),
-            path.join(workspaceRoot, FOUNDATION_ADR_DIR, "0000-template.md"),
-        ];
-        const coreSkills = [
-            "architecture-doc",
-            "system-design",
-            "tech-doc",
-            "frontend-design",
-        ];
-        const conditionalSkills = resolveArchitectureConditionalSkills(snapshot, specRoots, researchMode);
-        const skillBundle = [...coreSkills, ...conditionalSkills];
-        const skillPathHints = await resolveArchitectureSkillPathHints(platform, cwd, skillBundle);
-        const inspectionAnchors = await resolveArchitectureInspectionAnchors(workspaceRoot, snapshot, specRoots);
-        const prompt = buildArchitecturePrompt({
-            platform,
-            workspaceRoot,
-            snapshot,
-            specRoots,
-            inspectionAnchors,
-            researchMode,
-            coreSkills,
-            conditionalSkills,
-            skillPathHints,
-        });
-        const adapter = await probeArchitectureAdapter(platform, workspaceRoot);
-        const args = adapter.buildInvocation(prompt);
-        const managedTargets = [
-            path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "PRODUCT.md"),
-            path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "ARCHITECTURE.md"),
-            path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "TECH.md"),
-            path.join(workspaceRoot, FOUNDATION_ADR_DIR, "README.md"),
-            path.join(workspaceRoot, FOUNDATION_ADR_DIR, "0000-template.md"),
-        ].map((filePath) => toPosixPath(filePath));
-        if (dryRun) {
-            const summary = {
-                platform,
-                workspaceRoot: toPosixPath(workspaceRoot),
-                adapter: adapter.binary,
-                invocation: [adapter.binary, ...args],
-                researchMode,
-                managedTargets,
-                skillBundle,
-            };
-            if (emitJson) {
-                console.log(JSON.stringify(summary, null, 2));
-            }
-            else {
-                console.log(`Platform: ${platform}`);
-                console.log(`Workspace: ${toPosixPath(workspaceRoot)}`);
-                console.log(`Adapter: ${adapter.binary}`);
-                console.log(`Research mode: ${researchMode}`);
-                console.log(`Managed targets: ${summary.managedTargets.join(", ")}`);
-                console.log(`Skill bundle: ${skillBundle.join(", ")}`);
-                console.log(`Invocation: ${[adapter.binary, ...args].join(" ")}`);
-            }
-            return;
-        }
-        const filesBefore = await captureFileContents(managedFilePaths);
-        const scaffold = await ensureArchitectureBuildScaffold({
-            workspaceRoot,
-            dryRun,
-        });
-        if (!emitJson) {
-            console.log(`Streaming ${adapter.binary} output...`);
-        }
-        const execution = await spawnCapture(adapter.binary, args, {
-            cwd: workspaceRoot,
-            env: process.env,
-            streamOutput: !emitJson,
-        });
-        if (!execution.ok) {
-            throw new Error(explainArchitectureBuildFailure(platform, execution));
-        }
-        await normalizeArchitectureBuildOutputs(scaffold);
-        const filesAfter = await captureFileContents(managedFilePaths);
-        const changedFiles = managedFilePaths
-            .filter((filePath) => filesBefore[filePath] !== filesAfter[filePath])
-            .map((filePath) => toPosixPath(path.relative(workspaceRoot, filePath)));
-        const techContent = filesAfter[scaffold.techMdPath] ??
-            (await readFile(scaffold.techMdPath, "utf8"));
-        const productContent = filesAfter[scaffold.productPath] ??
-            (await readFile(scaffold.productPath, "utf8"));
-        const architectureContent = filesAfter[scaffold.architectureDocPath] ??
-            (await readFile(scaffold.architectureDocPath, "utf8"));
-        const metadataPath = path.join(workspaceRoot, ".cbx", ARCHITECTURE_BUILD_METADATA_FILENAME);
-        const metadata = buildArchitectureBuildMetadata({
+async function executeContextGeneration(options) {
+    const opts = resolveActionOptions(options);
+    const platform = normalizeArchitectureBuildPlatform(opts.platform);
+    const researchMode = normalizeArchitectureResearchMode(opts.research);
+    const overwrite = Boolean(opts.overwrite);
+    const dryRun = Boolean(opts.dryRun);
+    const checkOnly = Boolean(opts.check);
+    const quiet = Boolean(opts.quiet);
+    const emitJson = Boolean(opts.json);
+    const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+    const workspaceRoot = findWorkspaceRoot(cwd);
+    const snapshot = await collectTechSnapshot(workspaceRoot);
+    const specRoots = await listSpecPackRoots(workspaceRoot);
+    if (checkOnly) {
+        const drift = await readArchitectureDriftStatus(workspaceRoot, snapshot);
+        return {
+            mode: "check",
             platform,
             researchMode,
-            managedDocs: [
-                `${FOUNDATION_DOCS_DIR}/PRODUCT.md`,
-                `${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md`,
-                `${FOUNDATION_DOCS_DIR}/TECH.md`,
-                `${FOUNDATION_ADR_DIR}/README.md`,
-                `${FOUNDATION_ADR_DIR}/0000-template.md`,
-            ],
-        });
-        await mkdir(path.dirname(metadataPath), { recursive: true });
-        await writeFile(metadataPath, `${JSON.stringify(metadata, null, 2)}\n`, "utf8");
-        const result = normalizeArchitectureResult({
-            stdout: execution.stdout,
             workspaceRoot: toPosixPath(workspaceRoot),
-            researchMode,
-            changedFiles: [...new Set(changedFiles)],
-        });
+            drift,
+        };
+    }
+    const managedFilePaths = [
+        path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "MEMORY.md"),
+        path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "PRODUCT.md"),
+        path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "ARCHITECTURE.md"),
+        path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "DESIGN.md"),
+        path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "TECH.md"),
+        path.join(workspaceRoot, FOUNDATION_MEMORY_DIR, "domain.md"),
+        path.join(workspaceRoot, FOUNDATION_MEMORY_DIR, "runtime.md"),
+        path.join(workspaceRoot, FOUNDATION_MEMORY_DIR, "integrations.md"),
+        path.join(workspaceRoot, FOUNDATION_MEMORY_DIR, "debugging.md"),
+        path.join(workspaceRoot, FOUNDATION_ADR_DIR, "README.md"),
+        path.join(workspaceRoot, FOUNDATION_ADR_DIR, "0000-template.md"),
+    ];
+    const coreSkills = [
+        "architecture-doc",
+        "system-design",
+        "tech-doc",
+        "frontend-design",
+    ];
+    const conditionalSkills = resolveArchitectureConditionalSkills(snapshot, specRoots, researchMode);
+    const skillBundle = [...coreSkills, ...conditionalSkills];
+    const skillPathHints = await resolveArchitectureSkillPathHints(platform, cwd, skillBundle);
+    const inspectionAnchors = await resolveArchitectureInspectionAnchors(workspaceRoot, snapshot, specRoots);
+    const prompt = buildArchitecturePrompt({
+        platform,
+        workspaceRoot,
+        snapshot,
+        specRoots,
+        inspectionAnchors,
+        researchMode,
+        coreSkills,
+        conditionalSkills,
+        skillPathHints,
+    });
+    const managedTargets = managedFilePaths.map((filePath) => toPosixPath(filePath));
+    if (dryRun) {
+        const dryRunPlan = buildArchitectureDryRunPlan(platform, prompt);
+        return {
+            mode: "dry-run",
+            platform,
+            researchMode,
+            workspaceRoot: toPosixPath(workspaceRoot),
+            adapter: dryRunPlan.adapter,
+            invocation: dryRunPlan.invocation,
+            managedTargets,
+            skillBundle,
+        };
+    }
+    const adapter = await probeArchitectureAdapter(platform, workspaceRoot);
+    const args = adapter.buildInvocation(prompt);
+    const filesBefore = await captureFileContents(managedFilePaths);
+    const scaffold = await ensureArchitectureBuildScaffold({
+        workspaceRoot,
+        dryRun,
+    });
+    if (!quiet && !emitJson) {
+        console.log(`Streaming ${adapter.binary} output...`);
+    }
+    const execution = await spawnCapture(adapter.binary, args, {
+        cwd: workspaceRoot,
+        env: process.env,
+        streamOutput: !quiet && !emitJson,
+    });
+    if (!execution.ok) {
+        throw new Error(explainArchitectureBuildFailure(platform, execution));
+    }
+    await normalizeArchitectureBuildOutputs(scaffold);
+    const filesAfter = await captureFileContents(managedFilePaths);
+    const changedFiles = managedFilePaths
+        .filter((filePath) => filesBefore[filePath] !== filesAfter[filePath])
+        .map((filePath) => toPosixPath(path.relative(workspaceRoot, filePath)));
+    const metadataPath = path.join(workspaceRoot, ".cbx", ARCHITECTURE_BUILD_METADATA_FILENAME);
+    const metadata = buildArchitectureBuildMetadata({
+        platform,
+        researchMode,
+        managedDocs: [
+            `${FOUNDATION_DOCS_DIR}/MEMORY.md`,
+            `${FOUNDATION_DOCS_DIR}/PRODUCT.md`,
+            `${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md`,
+            `${FOUNDATION_DOCS_DIR}/TECH.md`,
+            `${FOUNDATION_MEMORY_DIR}/domain.md`,
+            `${FOUNDATION_MEMORY_DIR}/runtime.md`,
+            `${FOUNDATION_MEMORY_DIR}/integrations.md`,
+            `${FOUNDATION_MEMORY_DIR}/debugging.md`,
+            `${FOUNDATION_ADR_DIR}/README.md`,
+            `${FOUNDATION_ADR_DIR}/0000-template.md`,
+        ],
+    });
+    await mkdir(path.dirname(metadataPath), { recursive: true });
+    await writeFile(metadataPath, `${JSON.stringify(metadata, null, 2)}\n`, "utf8");
+    const result = normalizeArchitectureResult({
+        stdout: execution.stdout,
+        workspaceRoot: toPosixPath(workspaceRoot),
+        researchMode,
+        changedFiles: [...new Set(changedFiles)],
+    });
+    return {
+        mode: "generate",
+        platform,
+        researchMode,
+        workspaceRoot: toPosixPath(workspaceRoot),
+        adapter: adapter.binary,
+        skillBundle,
+        managedTargets,
+        result,
+    };
+}
+async function runBuildArchitecture(options) {
+    try {
+        const emitJson = Boolean(resolveActionOptions(options).json);
+        const outcome = await executeContextGeneration(options);
+        if (outcome.mode === "check") {
+            if (emitJson) {
+                console.log(JSON.stringify(outcome.drift, null, 2));
+            }
+            else {
+                console.log(`Platform: ${outcome.platform}`);
+                console.log(`Workspace: ${outcome.workspaceRoot}`);
+                console.log(`Status: ${outcome.drift.stale ? "stale" : "fresh"}`);
+                console.log(`Backbone docs: ${FOUNDATION_DOCS_DIR}/MEMORY.md, ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ${FOUNDATION_DOCS_DIR}/TECH.md, ${FOUNDATION_MEMORY_DIR}/*.md, ${FOUNDATION_ADR_DIR}/README.md`);
+                if (outcome.drift.findings.length > 0) {
+                    console.log("Findings:");
+                    for (const finding of outcome.drift.findings) {
+                        console.log(`- ${finding}`);
+                    }
+                }
+            }
+            if (outcome.drift.stale)
+                process.exit(1);
+            return;
+        }
+        if (outcome.mode === "dry-run") {
+            if (emitJson) {
+                console.log(JSON.stringify(outcome, null, 2));
+            }
+            else {
+                console.log(`Platform: ${outcome.platform}`);
+                console.log(`Workspace: ${outcome.workspaceRoot}`);
+                console.log(`Adapter: ${outcome.adapter}`);
+                console.log(`Research mode: ${outcome.researchMode}`);
+                console.log(`Managed targets: ${outcome.managedTargets.join(", ")}`);
+                console.log(`Skill bundle: ${outcome.skillBundle.join(", ")}`);
+                console.log(`Invocation: ${outcome.invocation.join(" ")}`);
+            }
+            return;
+        }
         if (emitJson) {
             console.log(JSON.stringify({
-                platform,
-                adapter: adapter.binary,
-                skillBundle,
-                result,
+                platform: outcome.platform,
+                adapter: outcome.adapter,
+                skillBundle: outcome.skillBundle,
+                result: outcome.result,
             }, null, 2));
             return;
         }
-        console.log(`Platform: ${platform}`);
-        console.log(`Adapter: ${adapter.binary}`);
-        console.log(`Workspace: ${toPosixPath(workspaceRoot)}`);
-        console.log(`Managed docs: ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ${FOUNDATION_DOCS_DIR}/TECH.md`);
+        console.log(`Platform: ${outcome.platform}`);
+        console.log(`Adapter: ${outcome.adapter}`);
+        console.log(`Workspace: ${outcome.workspaceRoot}`);
+        console.log(`Managed docs: ${FOUNDATION_DOCS_DIR}/MEMORY.md, ${FOUNDATION_DOCS_DIR}/PRODUCT.md, ${FOUNDATION_DOCS_DIR}/ARCHITECTURE.md, ${FOUNDATION_DOCS_DIR}/TECH.md, ${FOUNDATION_MEMORY_DIR}/*.md`);
         console.log(`ADR scaffold: ${FOUNDATION_ADR_DIR}/README.md, ${FOUNDATION_ADR_DIR}/0000-template.md`);
-        console.log(`Skill bundle: ${skillBundle.join(", ")}`);
-        console.log(`Files written: ${(result.filesWritten || []).join(", ") || "(none reported)"}`);
-        console.log(`Research used: ${result.researchUsed ? "yes" : "no"}`);
-        if (result.gaps.length > 0) {
-            console.log(`Gaps: ${result.gaps.join("; ")}`);
+        console.log(`Skill bundle: ${outcome.skillBundle.join(", ")}`);
+        console.log(`Files written: ${(outcome.result.filesWritten || []).join(", ") || "(none reported)"}`);
+        console.log(`Research used: ${outcome.result.researchUsed ? "yes" : "no"}`);
+        if (outcome.result.gaps.length > 0) {
+            console.log(`Gaps: ${outcome.result.gaps.join("; ")}`);
         }
-        if (result.nextActions.length > 0) {
-            console.log(`Next actions: ${result.nextActions.join("; ")}`);
+        if (outcome.result.nextActions.length > 0) {
+            console.log(`Next actions: ${outcome.result.nextActions.join("; ")}`);
         }
     }
     catch (error) {
@@ -11388,6 +11417,132 @@ function parseCsvOption(value) {
         .map((item) => item.trim())
         .filter(Boolean);
 }
+async function promptInitWorkspaceProfile(defaultProfile) {
+    return select({
+        message: "Select workspace profile:",
+        default: defaultProfile,
+        choices: [
+            { name: "core", value: "core" },
+            { name: "developer", value: "developer" },
+            { name: "security", value: "security" },
+            { name: "research", value: "research" },
+            { name: "full", value: "full" },
+        ],
+    });
+}
+async function promptInitAuthoringAi(defaultAuthoringAi) {
+    return select({
+        message: "Select the AI that should author context docs:",
+        default: defaultAuthoringAi,
+        choices: [
+            { name: "Codex", value: "codex" },
+            { name: "Claude Code", value: "claude" },
+            { name: "Gemini CLI", value: "gemini" },
+            { name: "GitHub Copilot", value: "copilot" },
+        ],
+    });
+}
+async function promptInitCapabilityPacks(defaultPacks) {
+    return checkbox({
+        message: "Select optional capability packs:",
+        choices: [
+            { name: "frontend", value: "frontend", checked: defaultPacks.includes("frontend") },
+            { name: "backend", value: "backend", checked: defaultPacks.includes("backend") },
+            { name: "database", value: "database", checked: defaultPacks.includes("database") },
+            { name: "devops", value: "devops", checked: defaultPacks.includes("devops") },
+            { name: "security", value: "security", checked: defaultPacks.includes("security") },
+            { name: "playwright", value: "playwright", checked: defaultPacks.includes("playwright") },
+            { name: "research", value: "research", checked: defaultPacks.includes("research") },
+            { name: "agentic", value: "agentic", checked: defaultPacks.includes("agentic") },
+        ],
+    });
+}
+async function resolveWorkspaceParitySummary(bundleId = "agent-environment-setup") {
+    try {
+        const manifest = await readBundleManifest(bundleId);
+        return manifest?.parity?.summary?.blockingSummary || {};
+    }
+    catch {
+        return {};
+    }
+}
+function collectInstalledAssetsFromResults(results, existingAssets = {}) {
+    const installedAssets = { ...existingAssets };
+    for (const result of results || []) {
+        if (!result || !result.installResult)
+            continue;
+        const platformKey = String(result.platform || "").trim();
+        if (!platformKey)
+            continue;
+        installedAssets[platformKey] = {
+            workflows: result.installResult.artifacts?.workflows || [],
+            agents: result.installResult.artifacts?.agents || [],
+            skills: result.installResult.artifacts?.skills || [],
+            commands: result.installResult.artifacts?.commands || [],
+            prompts: result.installResult.artifacts?.prompts || [],
+            hooks: result.installResult.artifacts?.hooks || [],
+            ruleFile: result.syncResult?.filePath || null,
+            updatedAt: new Date().toISOString(),
+        };
+    }
+    return installedAssets;
+}
+async function refreshWorkspaceControlPlane({ cwd, profile, stackOverride = null, authoringAi, platforms, capabilityPacks = [], selectedMcps = [], hookProfile = DEFAULT_HOOK_PROFILE, learningMode = DEFAULT_LEARNING_MODE, bundleId = "agent-environment-setup", installResults = [], generatedDocs = [], dryRun = false, }) {
+    const existingManifest = await readWorkspaceManifest(cwd);
+    const stackDetection = await detectWorkspaceStack(cwd, stackOverride);
+    const parityStates = await resolveWorkspaceParitySummary(bundleId);
+    const installedAssets = collectInstalledAssetsFromResults(installResults, existingManifest.installedAssets || {});
+    const docState = await collectFoundationDocState(cwd);
+    const manifest = await buildWorkspaceManifest({
+        cwd,
+        profile: normalizeWorkspaceProfile(profile),
+        stackDetection,
+        authoringAi: normalizeAuthoringAi(authoringAi),
+        platforms,
+        packs: [stackDetection.stack, ...capabilityPacks],
+        mcpServers: selectedMcps,
+        hookProfile: normalizeHookProfile(hookProfile),
+        learningMode,
+        parityStates,
+        installedAssets,
+        generatedDocs: generatedDocs.length > 0 ? generatedDocs : docState.docs,
+    });
+    manifest.foundryVersion = CLI_VERSION;
+    await ensureWorkspaceRuntimeDirs(cwd, { dryRun });
+    await writeWorkspaceManifest(cwd, manifest, { dryRun });
+    await writeWorkspaceSummary(cwd, manifest, { dryRun });
+    return manifest;
+}
+async function printWorkspaceStateSummary(cwd) {
+    const manifest = await readWorkspaceManifest(cwd);
+    if (!manifest || Object.keys(manifest).length === 0)
+        return;
+    console.log("\nWorkspace control plane:");
+    console.log(`- Manifest: ${WORKSPACE_MANIFEST_FILE}`);
+    console.log(`- Summary: ${WORKSPACE_SUMMARY_FILE}`);
+    console.log(`- Profile: ${manifest.profile || "unknown"}`);
+    console.log(`- Stack: ${manifest.detectedStack || "unknown"}`);
+    console.log(`- Platforms: ${Array.isArray(manifest.installedPlatforms) ? manifest.installedPlatforms.join(", ") : "(none)"}`);
+    console.log(`- Authoring AI: ${manifest.selectedAuthoringAI || "unset"}`);
+    console.log(`- Hook profile: ${manifest.hookProfile || DEFAULT_HOOK_PROFILE}`);
+    console.log(`- Learning mode: ${manifest.learningMode || DEFAULT_LEARNING_MODE}`);
+}
+function resolveSkillProfileFromWorkspaceProfile(profile) {
+    switch (normalizeWorkspaceProfile(profile)) {
+        case "core":
+            return "core";
+        case "full":
+            return "full";
+        case "mobile-qa":
+            return "mobile-qa";
+        case "research":
+            return "core";
+        case "developer":
+        case "security":
+        default:
+            return "web-backend";
+    }
+}
 function normalizeInitPlatforms(value) {
     const items = Array.isArray(value) ? value : parseCsvOption(value);
     const normalized = [];
@@ -11401,7 +11556,13 @@ function normalizeInitPlatforms(value) {
     return normalized;
 }
 function normalizeInitMcpSelections(value) {
-    const allowed = new Set(["cubis-foundry", "postman", "stitch", "playwright"]);
+    const allowed = new Set([
+        "cubis-foundry",
+        "postman",
+        "stitch",
+        "playwright",
+        "android",
+    ]);
     const items = Array.isArray(value) ? value : parseCsvOption(value);
     const normalized = [];
     for (const item of items) {
@@ -11449,7 +11610,16 @@ async function runInitWizard(options) {
             : bundleIds.includes("agent-environment-setup")
                 ? "agent-environment-setup"
                 : bundleIds[0];
-        const defaultSkillProfile = normalizeSkillProfile(options.skillProfile, DEFAULT_SKILL_PROFILE);
+        const detectedStack = await detectWorkspaceStack(cwd, options.stack);
+        const detectedPlatforms = await detectRecommendedPlatforms(cwd);
+        const defaultProfile = normalizeWorkspaceProfile(options.profile);
+        const defaultCapabilityPacks = normalizeCapabilityPacks(options.capabilityPacks);
+        const defaultAuthoringAi = normalizeAuthoringAi(options.authoringAi);
+        const skipContext = Boolean(options.skipContext);
+        const inferredSkillProfile = detectedStack.stack === "mobile"
+            ? "mobile-qa"
+            : resolveSkillProfileFromWorkspaceProfile(defaultProfile);
+        const defaultSkillProfile = normalizeSkillProfile(options.skillProfile || inferredSkillProfile, DEFAULT_SKILL_PROFILE);
         const requestedSkillsScope = coerceWorkspaceOnlyInstallScope(options.skillsScope || options.scope, options.skillsScope ? "--skills-scope" : "--scope");
         const requestedMcpScope = coerceWorkspaceOnlyMcpScope(options.mcpScope, "--mcp-scope");
         const defaultSkillsScope = requestedSkillsScope.scope;
@@ -11458,30 +11628,55 @@ async function runInitWizard(options) {
             ? normalizePostmanWorkspaceId(options.postmanWorkspaceId)
             : null;
         const defaultMcpSelections = normalizeInitMcpSelections(options.mcps);
+        if (defaultMcpSelections.length === 0 &&
+            detectedStack.stack === "mobile") {
+            defaultMcpSelections.push("android");
+        }
         const defaultPlatforms = normalizeInitPlatforms(options.platforms);
         const defaultMcpRuntime = normalizeMcpRuntime(options.mcpRuntime, defaultMcpSelections.some((item) => item === "postman" || item === "stitch")
             ? "docker"
             : "local");
         const defaultMcpBuildLocal = Boolean(options.mcpBuildLocal);
         const selections = {
+            stack: isInteractive
+                ? await select({
+                    message: "Select workspace stack:",
+                    default: detectedStack.stack,
+                    choices: STACK_IDS.map((stackId) => ({
+                        name: stackId,
+                        value: stackId,
+                    })),
+                })
+                : detectedStack.stack,
             bundleId: isInteractive
                 ? await promptInitBundle({ bundleIds, defaultBundle })
                 : defaultBundle,
             platforms: isInteractive
                 ? await promptInitPlatforms({
-                    defaultPlatforms: defaultPlatforms.length > 0 ? defaultPlatforms : ["codex"],
+                    defaultPlatforms: defaultPlatforms.length > 0 ? defaultPlatforms : detectedPlatforms,
                 })
                 : defaultPlatforms.length > 0
                     ? defaultPlatforms
-                    : ["codex"],
+                    : detectedPlatforms,
+            profile: isInteractive
+                ? await promptInitWorkspaceProfile(defaultProfile)
+                : defaultProfile,
             skillProfile: isInteractive
                 ? await promptInitSkillProfile(defaultSkillProfile)
                 : defaultSkillProfile,
+            authoringAi: isInteractive
+                ? await promptInitAuthoringAi(defaultAuthoringAi)
+                : defaultAuthoringAi,
+            capabilityPacks: isInteractive
+                ? await promptInitCapabilityPacks(defaultCapabilityPacks)
+                : defaultCapabilityPacks,
             selectedMcps: isInteractive
                 ? await promptInitMcpSelection(defaultMcpSelections)
                 : defaultMcpSelections.length > 0
                     ? defaultMcpSelections
-                    : ["cubis-foundry"],
+                    : detectedStack.stack === "mobile"
+                        ? ["android"]
+                        : ["cubis-foundry"],
             skillsScope: defaultSkillsScope,
             mcpScope: defaultMcpScope,
             mcpRuntime: defaultMcpRuntime,
@@ -11492,6 +11687,8 @@ async function runInitWizard(options) {
             postmanWorkspaceId: defaultPostmanWorkspaceId,
             postmanApiKey: null,
             stitchApiKey: null,
+            skipContext,
+            template: String(options.template || "").trim() || null,
         };
         const initWarnings = [
             requestedSkillsScope.warning,
@@ -11500,7 +11697,7 @@ async function runInitWizard(options) {
         if (selections.platforms.length === 0) {
             throw new Error("No platforms selected.");
         }
-        const runtimeSelectableMcp = selections.selectedMcps.some((item) => item !== "playwright");
+        const runtimeSelectableMcp = selections.selectedMcps.some((item) => item === "cubis-foundry" || item === "postman" || item === "stitch");
         if (runtimeSelectableMcp && isInteractive) {
             const runtimeSelection = await promptInitMcpRuntime({
                 defaultRuntime: selections.mcpRuntime,
@@ -11541,7 +11738,16 @@ async function runInitWizard(options) {
             overwrite,
             target: options.target,
         });
-        const initSummary = formatInitSummary(selections);
+        const initSummary = [
+            formatInitSummary(selections),
+            "",
+            `Workspace profile: ${selections.profile}`,
+            `Detected stack: ${selections.stack} (${detectedStack.confidence})`,
+            `Stack evidence: ${detectedStack.evidence.join(", ") || "(none)"}`,
+            `Authoring AI: ${selections.authoringAi}`,
+            `Capability packs: ${selections.capabilityPacks.join(", ") || "(none)"}`,
+            `Context generation: ${selections.skipContext ? "skip" : "generate"}`,
+        ].join("\n");
         if (initWarnings.length > 0) {
             console.log("\nInit warnings:");
             for (const warning of initWarnings) {
@@ -11572,7 +11778,6 @@ async function runInitWizard(options) {
                     bundleId: installOutcome.bundleId,
                     installed: installOutcome.installResult.installed,
                     skipped: installOutcome.installResult.skipped,
-                    generatedWrapperSkills: installOutcome.installResult.generatedWrapperSkills,
                     duplicateSkillCleanup: installOutcome.installResult.duplicateSkillCleanup,
                     sanitizedSkills: installOutcome.installResult.sanitizedSkills,
                     sanitizedAgents: installOutcome.installResult.sanitizedAgents,
@@ -11596,6 +11801,8 @@ async function runInitWizard(options) {
                     platform: item.platform,
                     status: "success",
                     warnings: item.warnings,
+                    installResult: installOutcome.installResult,
+                    syncResult: installOutcome.syncResult,
                 });
             }
             catch (error) {
@@ -11613,6 +11820,25 @@ async function runInitWizard(options) {
                 process.exit(1);
             }
         }
+        let contextResult = null;
+        if (!selections.skipContext) {
+            contextResult = await executeContextGeneration({
+                platform: selections.authoringAi,
+                research: "auto",
+                overwrite,
+                dryRun,
+                quiet: true,
+                target: cwd,
+            });
+            if (!emitJson) {
+                console.log("\nContext generation:");
+                console.log(`- Platform: ${contextResult.platform}`);
+                console.log(`- Mode: ${contextResult.mode}`);
+                if (contextResult.mode === "generate") {
+                    console.log(`- Files written: ${(contextResult.result.filesWritten || []).join(", ") || "(none reported)"}`);
+                }
+            }
+        }
         const envPersistTargets = [];
         if (selections.selectedMcps.includes("postman")) {
             envPersistTargets.push(profileEnvVarAlias("postman", DEFAULT_CREDENTIAL_PROFILE_NAME));
@@ -11634,6 +11860,24 @@ async function runInitWizard(options) {
                 console.log(`- Missing: ${persistedCredentials.missing.join(", ")}`);
             }
         }
+        const workspaceManifest = await refreshWorkspaceControlPlane({
+            cwd,
+            profile: selections.profile,
+            stackOverride: selections.stack,
+            authoringAi: selections.authoringAi,
+            platforms: selections.platforms,
+            capabilityPacks: selections.capabilityPacks,
+            selectedMcps: selections.selectedMcps,
+            hookProfile: DEFAULT_HOOK_PROFILE,
+            learningMode: DEFAULT_LEARNING_MODE,
+            bundleId: selections.bundleId,
+            installResults: results,
+            generatedDocs: contextResult && contextResult.mode === "generate"
+                ? contextResult.result.filesWritten || []
+                : [],
+            dryRun,
+        });
+        await printWorkspaceStateSummary(cwd);
         if (emitJson) {
             const sanitizedSelections = {
                 ...selections,
@@ -11645,6 +11889,7 @@ async function runInitWizard(options) {
                 selections: sanitizedSelections,
                 results,
                 persistedCredentials,
+                workspaceManifest,
             }, null, 2));
         }
         if (dryRun) {
@@ -11660,6 +11905,945 @@ async function runInitWizard(options) {
         process.exit(1);
     }
 }
+function uniqueStrings(values) {
+    return [...new Set((values || []).filter(Boolean))];
+}
+function normalizePlatformList(values) {
+    return uniqueStrings((values || [])
+        .map((value) => normalizePlatform(value))
+        .filter((value) => value && WORKFLOW_PROFILES[value]));
+}
+function actionRepresentsChange(action) {
+    const normalized = String(action || "")
+        .trim()
+        .toLowerCase();
+    if (!normalized)
+        return false;
+    return ![
+        "unchanged",
+        "exists",
+        "none",
+        "skipped",
+        "would-skip",
+        "missing-rule-file",
+    ].includes(normalized);
+}
+async function resolveWorkspaceControlState(cwd, overrides = {}) {
+    const existingManifest = await readWorkspaceManifest(cwd);
+    const detectedPlatforms = await detectRecommendedPlatforms(cwd);
+    const requestedPlatforms = normalizePlatformList(Array.isArray(overrides.platforms)
+        ? overrides.platforms
+        : [overrides.platform].filter(Boolean));
+    const manifestPlatforms = normalizePlatformList(existingManifest.installedPlatforms || []);
+    const platforms = requestedPlatforms.length > 0
+        ? requestedPlatforms
+        : manifestPlatforms.length > 0
+            ? manifestPlatforms
+            : detectedPlatforms;
+    return {
+        existingManifest,
+        profile: normalizeWorkspaceProfile(overrides.profile ?? existingManifest.profile),
+        authoringAi: normalizeAuthoringAi(overrides.authoringAi ?? existingManifest.selectedAuthoringAI),
+        platforms,
+        capabilityPacks: normalizeCapabilityPacks(overrides.capabilityPacks ?? existingManifest.installedPacks ?? []),
+        selectedMcps: uniqueStrings(Array.isArray(overrides.selectedMcps)
+            ? overrides.selectedMcps
+            : existingManifest.mcpServers || []),
+        hookProfile: normalizeHookProfile(overrides.hookProfile ?? existingManifest.hookProfile),
+        learningMode: String(overrides.learningMode ||
+            existingManifest.learningMode ||
+            DEFAULT_LEARNING_MODE).trim() || DEFAULT_LEARNING_MODE,
+        stackOverride: overrides.stackOverride ?? existingManifest.detectedStack,
+    };
+}
+function buildRequiredContextDocs(manifest = {}) {
+    const required = [
+        path.join(FOUNDATION_DOCS_DIR, "ARCHITECTURE.md"),
+        path.join(FOUNDATION_DOCS_DIR, "DESIGN.md"),
+        path.join(FOUNDATION_DOCS_DIR, "TECH.md"),
+        path.join(FOUNDATION_DOCS_DIR, "MEMORY.md"),
+        path.join(FOUNDATION_DOCS_DIR, "PRODUCT.md"),
+        WORKSPACE_SUMMARY_FILE,
+    ].map((item) => toPosixPath(item));
+    const authoringAi = normalizeAuthoringAi(manifest.selectedAuthoringAI);
+    if (authoringAi === "claude") {
+        required.push("CLAUDE.md");
+    }
+    else if (authoringAi === "gemini") {
+        required.push("GEMINI.md");
+    }
+    else {
+        required.push("AGENTS.md");
+    }
+    return uniqueStrings(required);
+}
+async function buildContextFreshnessReport(cwd) {
+    const workspaceRoot = findWorkspaceRoot(cwd);
+    const manifest = await readWorkspaceManifest(cwd);
+    const docState = await collectFoundationDocState(cwd);
+    const requiredDocs = buildRequiredContextDocs(manifest);
+    const presentSet = new Set(docState.docs);
+    const missingDocs = requiredDocs.filter((doc) => !presentSet.has(doc));
+    const docHashChanged = Boolean(manifest.docHash && manifest.docHash !== docState.hash);
+    let architectureDrift = null;
+    const memoryDocPath = path.join(workspaceRoot, FOUNDATION_DOCS_DIR, "MEMORY.md");
+    if (await pathExists(memoryDocPath)) {
+        const snapshot = await collectTechSnapshot(workspaceRoot);
+        architectureDrift = await readArchitectureDriftStatus(workspaceRoot, snapshot);
+    }
+    return {
+        workspaceRoot: toPosixPath(workspaceRoot),
+        manifestExists: Object.keys(manifest || {}).length > 0,
+        manifest,
+        docsPresent: docState.docs,
+        currentDocHash: docState.hash,
+        manifestDocHash: manifest.docHash || null,
+        requiredDocs,
+        missingDocs,
+        docHashChanged,
+        architectureDrift,
+        stale: missingDocs.length > 0 ||
+            docHashChanged ||
+            Boolean(architectureDrift?.stale),
+    };
+}
+async function executeWorkspaceSync(platformArg, rawOptions = {}) {
+    const opts = resolveActionOptions(rawOptions);
+    const dryRun = Boolean(opts.dryRun);
+    const checkOnly = Boolean(opts.check);
+    const overwrite = opts.overwrite === undefined ? true : Boolean(opts.overwrite);
+    const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+    await loadManagedCredentialsEnv();
+    const requestedPlatform = normalizePlatform(platformArg || opts.platform);
+    if (requestedPlatform && !WORKFLOW_PROFILES[requestedPlatform]) {
+        throw new Error(`Unknown platform '${platformArg || opts.platform}'. Use codex|antigravity|copilot|claude|gemini.`);
+    }
+    const state = await resolveWorkspaceControlState(cwd);
+    const touchedPlatforms = requestedPlatform ? [requestedPlatform] : state.platforms;
+    if (touchedPlatforms.length === 0) {
+        throw new Error("No installed platforms detected for workspace sync.");
+    }
+    const results = [];
+    for (const platform of touchedPlatforms) {
+        const installOutcome = await performWorkflowInstall({
+            platform,
+            scope: "project",
+            bundle: opts.bundle || "agent-environment-setup",
+            overwrite,
+            dryRun: dryRun || checkOnly,
+            yes: true,
+            target: cwd,
+            skillProfile: resolveSkillProfileFromWorkspaceProfile(state.profile),
+            initWizardMode: true,
+        });
+        const installChanges = installOutcome.installResult.installed.length;
+        const ruleAction = installOutcome.syncResult?.action || "unknown";
+        const platformDrift = installChanges > 0 || actionRepresentsChange(ruleAction);
+        results.push({
+            platform,
+            installOutcome,
+            installChanges,
+            ruleAction,
+            platformDrift,
+        });
+    }
+    const contextReport = await buildContextFreshnessReport(cwd);
+    const hasDrift = results.some((item) => item.platformDrift) || contextReport.stale;
+    let workspaceManifest = null;
+    if (!dryRun && !checkOnly) {
+        workspaceManifest = await refreshWorkspaceControlPlane({
+            cwd,
+            profile: state.profile,
+            stackOverride: state.stackOverride,
+            authoringAi: state.authoringAi,
+            platforms: state.platforms,
+            capabilityPacks: state.capabilityPacks,
+            selectedMcps: state.selectedMcps,
+            hookProfile: state.hookProfile,
+            learningMode: state.learningMode,
+            bundleId: opts.bundle || "agent-environment-setup",
+            installResults: results.map((item) => ({
+                platform: item.platform,
+                installResult: item.installOutcome.installResult,
+                syncResult: item.installOutcome.syncResult,
+            })),
+            generatedDocs: contextReport.docsPresent,
+            dryRun,
+        });
+    }
+    return {
+        cwd,
+        mode: checkOnly ? "check" : dryRun ? "dry-run" : "apply",
+        touchedPlatforms,
+        workspacePlatforms: state.platforms,
+        results,
+        contextReport,
+        hasDrift,
+        workspaceManifest,
+    };
+}
+function printWorkspaceSyncSummary(summary, { label = "Sync" } = {}) {
+    console.log(`${label} root: ${summary.cwd}`);
+    console.log(`Platforms: ${summary.touchedPlatforms.join(", ")}`);
+    for (const item of summary.results) {
+        console.log(`- ${item.platform}: ${item.installChanges} managed path(s) ${summary.mode === "apply" ? "updated" : "would change"}, rules=${item.ruleAction}`);
+    }
+    console.log(`Context docs: ${summary.contextReport.stale ? "stale" : "fresh"}`);
+    if (summary.contextReport.missingDocs.length > 0) {
+        console.log(`- Missing docs: ${summary.contextReport.missingDocs.join(", ")}`);
+    }
+    if (summary.contextReport.docHashChanged) {
+        console.log("- Context doc hash drift detected.");
+    }
+    if (summary.contextReport.architectureDrift?.findings?.length > 0) {
+        console.log("- Architecture drift findings:");
+        for (const finding of summary.contextReport.architectureDrift.findings) {
+            console.log(`  - ${finding}`);
+        }
+    }
+}
+async function runWorkspaceAdd(platformArg, options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const platform = normalizePlatform(platformArg);
+        if (!platform || !WORKFLOW_PROFILES[platform]) {
+            throw new Error(`Unknown platform '${platformArg}'. Use codex|antigravity|copilot|claude|gemini.`);
+        }
+        const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+        const dryRun = Boolean(opts.dryRun);
+        const state = await resolveWorkspaceControlState(cwd, {
+            platforms: uniqueStrings([
+                ...((await readWorkspaceManifest(cwd)).installedPlatforms || []),
+                platform,
+            ]),
+        });
+        const result = await performWorkflowInstall({
+            platform,
+            scope: "project",
+            bundle: opts.bundle || "agent-environment-setup",
+            overwrite: Boolean(opts.overwrite),
+            dryRun,
+            yes: Boolean(opts.yes),
+            target: cwd,
+            skillProfile: resolveSkillProfileFromWorkspaceProfile(state.profile),
+            initWizardMode: true,
+        });
+        if (result.cancelled) {
+            console.log("Cancelled.");
+            process.exit(0);
+        }
+        printInstallSummary({
+            platform: result.platform,
+            scope: result.scope,
+            bundleId: result.bundleId,
+            installed: result.installResult.installed,
+            skipped: result.installResult.skipped,
+            duplicateSkillCleanup: result.installResult.duplicateSkillCleanup,
+            sanitizedSkills: result.installResult.sanitizedSkills,
+            sanitizedAgents: result.installResult.sanitizedAgents,
+            terminalIntegration: result.installResult.terminalIntegration,
+            terminalIntegrationRules: result.terminalVerificationRuleResult,
+            warnings: result.warnings,
+            dryRun: result.dryRun,
+        });
+        printRuleSyncResult(result.syncResult);
+        const workspaceManifest = await refreshWorkspaceControlPlane({
+            cwd,
+            profile: state.profile,
+            stackOverride: state.stackOverride,
+            authoringAi: state.authoringAi,
+            platforms: uniqueStrings([...state.platforms, platform]),
+            capabilityPacks: state.capabilityPacks,
+            selectedMcps: state.selectedMcps,
+            hookProfile: state.hookProfile,
+            learningMode: state.learningMode,
+            bundleId: opts.bundle || "agent-environment-setup",
+            installResults: [
+                {
+                    platform,
+                    installResult: result.installResult,
+                    syncResult: result.syncResult,
+                },
+            ],
+            generatedDocs: [],
+            dryRun,
+        });
+        if (!dryRun) {
+            await printWorkspaceStateSummary(cwd);
+        }
+        if (opts.json) {
+            console.log(JSON.stringify({
+                platform,
+                dryRun,
+                workspaceManifest,
+            }, null, 2));
+        }
+    }
+    catch (error) {
+        if (error?.name === "ExitPromptError") {
+            console.error("\nCancelled.");
+            process.exit(130);
+        }
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runWorkspaceSync(platformArg, options) {
+    try {
+        const summary = await executeWorkspaceSync(platformArg, options);
+        const opts = resolveActionOptions(options);
+        if (opts.json) {
+            console.log(JSON.stringify(summary, null, 2));
+        }
+        else {
+            printWorkspaceSyncSummary(summary);
+            if (summary.mode === "apply") {
+                await printWorkspaceStateSummary(summary.cwd);
+            }
+        }
+        if (summary.mode === "check" && summary.hasDrift) {
+            process.exit(1);
+        }
+    }
+    catch (error) {
+        if (error?.name === "ExitPromptError") {
+            console.error("\nCancelled.");
+            process.exit(130);
+        }
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runContextGenerate(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        if (opts.watch) {
+            console.log("Watch mode is reserved for a follow-up pass. Running a one-shot generation now.");
+        }
+        const outcome = await executeContextGeneration(opts);
+        const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+        const state = await resolveWorkspaceControlState(cwd, {
+            authoringAi: opts.platform,
+        });
+        let workspaceManifest = null;
+        if (!opts.dryRun && outcome.mode === "generate") {
+            workspaceManifest = await refreshWorkspaceControlPlane({
+                cwd,
+                profile: state.profile,
+                stackOverride: state.stackOverride,
+                authoringAi: outcome.platform,
+                platforms: state.platforms,
+                capabilityPacks: state.capabilityPacks,
+                selectedMcps: state.selectedMcps,
+                hookProfile: state.hookProfile,
+                learningMode: state.learningMode,
+                bundleId: "agent-environment-setup",
+                installResults: [],
+                generatedDocs: outcome.result.filesWritten || [],
+                dryRun: false,
+            });
+        }
+        if (opts.json) {
+            console.log(JSON.stringify({ outcome, workspaceManifest }, null, 2));
+            return;
+        }
+        if (outcome.mode === "dry-run") {
+            console.log(`Platform: ${outcome.platform}`);
+            console.log(`Workspace: ${outcome.workspaceRoot}`);
+            console.log(`Adapter: ${outcome.adapter}`);
+            console.log(`Managed targets: ${outcome.managedTargets.join(", ")}`);
+            console.log(`Skill bundle: ${outcome.skillBundle.join(", ")}`);
+            console.log(`Invocation: ${outcome.invocation.join(" ")}`);
+            return;
+        }
+        console.log(`Platform: ${outcome.platform}`);
+        console.log(`Workspace: ${outcome.workspaceRoot}`);
+        console.log(`Adapter: ${outcome.adapter}`);
+        console.log(`Files written: ${(outcome.result.filesWritten || []).join(", ") || "(none reported)"}`);
+        if (outcome.result.gaps.length > 0) {
+            console.log(`Gaps: ${outcome.result.gaps.join("; ")}`);
+        }
+        if (outcome.result.nextActions.length > 0) {
+            console.log(`Next actions: ${outcome.result.nextActions.join("; ")}`);
+        }
+        if (workspaceManifest) {
+            await printWorkspaceStateSummary(cwd);
+        }
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runContextDiff(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+        const report = await buildContextFreshnessReport(cwd);
+        if (opts.json) {
+            console.log(JSON.stringify(report, null, 2));
+            return;
+        }
+        console.log(`Workspace: ${report.workspaceRoot}`);
+        console.log(`Manifest: ${report.manifestExists ? "present" : "missing"}`);
+        console.log(`Status: ${report.stale ? "stale" : "fresh"}`);
+        console.log(`Required docs: ${report.requiredDocs.length > 0 ? report.requiredDocs.join(", ") : "(none)"}`);
+        console.log(`Docs present: ${report.docsPresent.length > 0 ? report.docsPresent.join(", ") : "(none)"}`);
+        if (report.missingDocs.length > 0) {
+            console.log(`Missing docs: ${report.missingDocs.join(", ")}`);
+        }
+        if (report.docHashChanged) {
+            console.log("Doc hash drift: manifest hash differs from current docs.");
+        }
+        if (report.architectureDrift?.findings?.length > 0) {
+            console.log("Architecture drift findings:");
+            for (const finding of report.architectureDrift.findings) {
+                console.log(`- ${finding}`);
+            }
+        }
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runContextValidate(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+        const report = await buildContextFreshnessReport(cwd);
+        if (opts.json) {
+            console.log(JSON.stringify(report, null, 2));
+        }
+        else {
+            console.log(`Workspace: ${report.workspaceRoot}`);
+            console.log(`Status: ${report.stale ? "invalid" : "valid"}`);
+            if (report.missingDocs.length > 0) {
+                console.log(`Missing docs: ${report.missingDocs.join(", ")}`);
+            }
+            if (report.docHashChanged) {
+                console.log("Doc hash drift detected.");
+            }
+            if (report.architectureDrift?.findings?.length > 0) {
+                console.log("Architecture drift findings:");
+                for (const finding of report.architectureDrift.findings) {
+                    console.log(`- ${finding}`);
+                }
+            }
+        }
+        if (report.stale)
+            process.exit(1);
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runHarnessAudit(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+        await ensureWorkspaceRuntimeDirs(cwd);
+        const report = await runWorkspaceHarnessAudit({
+            cwd,
+            scope: String(opts.scope || "repo"),
+        });
+        const auditRoot = path.join(cwd, AUDIT_RUNTIME_DIR);
+        await mkdir(auditRoot, { recursive: true });
+        await writeFile(path.join(auditRoot, "latest.json"), `${JSON.stringify(report, null, 2)}\n`, "utf8");
+        if (String(opts.format || "text").toLowerCase() === "json") {
+            console.log(JSON.stringify(report, null, 2));
+        }
+        else {
+            console.log(`Scope: ${report.scope}`);
+            console.log(`Overall: ${report.overall}`);
+            console.log(`Findings: ${report.findings.length}`);
+            for (const finding of report.findings) {
+                console.log(`- [${finding.severity}] ${finding.title} (${finding.file})`);
+                console.log(`  ${finding.detail}`);
+            }
+            console.log(`Audit report: ${path.join(auditRoot, "latest.json")}`);
+        }
+        if (report.overall === "fail")
+            process.exit(1);
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+function buildLoopRunId() {
+    return `loop-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+}
+async function resolveLoopRunDir(cwd, id) {
+    return path.join(cwd, LOOP_RUNTIME_DIR, id);
+}
+async function readLoopStatusFile(statusPath) {
+    const status = await readJsonFileIfExists(statusPath);
+    return status.exists ? status.value : null;
+}
+async function runLoopStart(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+        const maxIterations = Number.parseInt(String(opts.maxIterations || "20"), 10);
+        if (!Number.isInteger(maxIterations) || maxIterations < 1 || maxIterations > 100) {
+            throw new Error("--max-iterations must be an integer between 1 and 100.");
+        }
+        const state = await resolveWorkspaceControlState(cwd, {
+            authoringAi: opts.platform,
+        });
+        const platform = normalizePlatform(opts.platform) ||
+            state.authoringAi ||
+            state.platforms[0] ||
+            "codex";
+        const id = buildLoopRunId();
+        const loopDir = await resolveLoopRunDir(cwd, id);
+        const taskPath = path.join(loopDir, "task.md");
+        const handoffPath = path.join(loopDir, "handoff.md");
+        const statusPath = path.join(loopDir, "status.json");
+        const resultPath = path.join(loopDir, "result.json");
+        const now = new Date().toISOString();
+        const statusPayload = {
+            id,
+            status: "active",
+            platform,
+            task: String(opts.task),
+            completionCriteria: String(opts.completionCriteria),
+            validateCommand: opts.validateCommand || null,
+            maxIterations,
+            currentIteration: 0,
+            createdAt: now,
+            updatedAt: now,
+        };
+        if (!opts.dryRun) {
+            await mkdir(loopDir, { recursive: true });
+            await writeFile(taskPath, [
+                `# ${id}`,
+                "",
+                `- Platform: ${platform}`,
+                `- Max iterations: ${maxIterations}`,
+                `- Created: ${now}`,
+                "",
+                "## Task",
+                String(opts.task),
+                "",
+                "## Completion Criteria",
+                String(opts.completionCriteria),
+                "",
+                "## Validation Command",
+                opts.validateCommand || "(none)",
+                "",
+            ].join("\n"), "utf8");
+            await writeFile(handoffPath, "# Handoff\n\nUse this file to capture iteration checkpoints and delegation notes.\n", "utf8");
+            await writeFile(statusPath, `${JSON.stringify(statusPayload, null, 2)}\n`, "utf8");
+            await writeFile(resultPath, `${JSON.stringify({ id, status: "pending", createdAt: now }, null, 2)}\n`, "utf8");
+        }
+        console.log(`Loop run: ${id}`);
+        console.log(`Platform: ${platform}`);
+        console.log(`Task: ${opts.task}`);
+        console.log(`Completion criteria: ${opts.completionCriteria}`);
+        console.log(`Max iterations: ${maxIterations}`);
+        console.log(`Runtime dir: ${loopDir}`);
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runLoopStatus(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+        const loopRoot = path.join(cwd, LOOP_RUNTIME_DIR);
+        if (!(await pathExists(loopRoot))) {
+            const empty = { loops: [] };
+            if (opts.json) {
+                console.log(JSON.stringify(empty, null, 2));
+            }
+            else {
+                console.log("No loop runs found.");
+            }
+            return;
+        }
+        const entries = await readdir(loopRoot, { withFileTypes: true });
+        const loops = [];
+        for (const entry of entries) {
+            if (!entry.isDirectory())
+                continue;
+            if (opts.id && entry.name !== String(opts.id))
+                continue;
+            const status = await readLoopStatusFile(path.join(loopRoot, entry.name, "status.json"));
+            if (status)
+                loops.push(status);
+        }
+        if (opts.json) {
+            console.log(JSON.stringify({ loops }, null, 2));
+            return;
+        }
+        if (loops.length === 0) {
+            console.log("No matching loop runs found.");
+            return;
+        }
+        for (const loop of loops) {
+            console.log(`${loop.id}: ${loop.status}`);
+            console.log(`- Platform: ${loop.platform}`);
+            console.log(`- Iterations: ${loop.currentIteration}/${loop.maxIterations}`);
+            console.log(`- Updated: ${loop.updatedAt || loop.createdAt}`);
+            console.log(`- Task: ${loop.task}`);
+        }
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runLoopStop(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+        const loopDir = await resolveLoopRunDir(cwd, String(opts.id));
+        const statusPath = path.join(loopDir, "status.json");
+        const resultPath = path.join(loopDir, "result.json");
+        const current = await readLoopStatusFile(statusPath);
+        if (!current) {
+            throw new Error(`Loop run '${opts.id}' was not found.`);
+        }
+        const now = new Date().toISOString();
+        const next = {
+            ...current,
+            status: "stopped",
+            stopReason: String(opts.reason || "stopped by operator"),
+            stoppedAt: now,
+            updatedAt: now,
+        };
+        await writeFile(statusPath, `${JSON.stringify(next, null, 2)}\n`, "utf8");
+        await writeFile(resultPath, `${JSON.stringify({
+            id: current.id,
+            status: "stopped",
+            reason: next.stopReason,
+            stoppedAt: now,
+        }, null, 2)}\n`, "utf8");
+        console.log(`Stopped loop run '${current.id}'.`);
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function listMemoryCandidates(cwd) {
+    const inboxRoot = path.join(cwd, MEMORY_INBOX_DIR);
+    if (!(await pathExists(inboxRoot)))
+        return [];
+    const entries = await readdir(inboxRoot, { withFileTypes: true });
+    const candidates = [];
+    for (const entry of entries) {
+        if (!entry.isFile())
+            continue;
+        const filePath = path.join(inboxRoot, entry.name);
+        const raw = await readFile(filePath, "utf8");
+        let parsed = null;
+        try {
+            parsed = JSON.parse(raw);
+        }
+        catch {
+            parsed = null;
+        }
+        const stats = await stat(filePath);
+        candidates.push({
+            id: entry.name,
+            filePath,
+            title: parsed?.title || parsed?.summary || entry.name,
+            source: parsed?.source || parsed?.provenance || "unknown",
+            confidence: parsed?.confidence ?? null,
+            trustLevel: parsed?.trustLevel || parsed?.trust || null,
+            content: parsed?.content ||
+                parsed?.summary ||
+                raw.trim().slice(0, 500),
+            updatedAt: stats.mtime.toISOString(),
+        });
+    }
+    return candidates.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
+}
+async function resolveMemoryCandidate(cwd, id) {
+    const candidates = await listMemoryCandidates(cwd);
+    const exact = candidates.find((candidate) => candidate.id === id);
+    if (exact)
+        return exact;
+    const byStem = candidates.filter((candidate) => candidate.id.replace(/\.[^.]+$/, "") === id);
+    if (byStem.length === 1)
+        return byStem[0];
+    if (byStem.length > 1) {
+        throw new Error(`Multiple memory candidates match '${id}'. Use the full file name.`);
+    }
+    return null;
+}
+async function moveMemoryCandidateFile(candidate, destinationDir) {
+    await mkdir(destinationDir, { recursive: true });
+    const destinationPath = path.join(destinationDir, path.basename(candidate.filePath));
+    if (await pathExists(destinationPath)) {
+        await rm(destinationPath, { recursive: true, force: true });
+    }
+    await rename(candidate.filePath, destinationPath);
+    return destinationPath;
+}
+async function runMemoryReview(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = process.cwd();
+        const candidates = await listMemoryCandidates(cwd);
+        if (opts.json) {
+            console.log(JSON.stringify({ candidates }, null, 2));
+            return;
+        }
+        if (candidates.length === 0) {
+            console.log("No staged memory candidates.");
+            return;
+        }
+        console.log(`Staged memory candidates: ${candidates.length}`);
+        for (const candidate of candidates) {
+            console.log(`- ${candidate.id}: ${candidate.title}`);
+            console.log(`  source=${candidate.source} confidence=${candidate.confidence ?? "n/a"} trust=${candidate.trustLevel || "n/a"} updated=${candidate.updatedAt}`);
+        }
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runMemoryApply(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = process.cwd();
+        const candidate = await resolveMemoryCandidate(cwd, String(opts.id));
+        if (!candidate) {
+            throw new Error(`Memory candidate '${opts.id}' was not found.`);
+        }
+        const target = String(opts.target || "memory").trim().toLowerCase();
+        const memoryPath = path.join(cwd, FOUNDATION_DOCS_DIR, "MEMORY.md");
+        const appliedRoot = path.join(cwd, MEMORY_APPLIED_DIR);
+        await mkdir(appliedRoot, { recursive: true });
+        if (target === "memory") {
+            const exists = await pathExists(memoryPath);
+            const heading = `## Learned ${new Date().toISOString()}\n`;
+            const block = [
+                heading,
+                `- Source: ${candidate.source}`,
+                `- Confidence: ${candidate.confidence ?? "n/a"}`,
+                `- Trust: ${candidate.trustLevel || "n/a"}`,
+                "",
+                String(candidate.content || "").trim(),
+                "",
+            ].join("\n");
+            const next = exists ? await readFile(memoryPath, "utf8") : "# Memory\n\n";
+            await mkdir(path.dirname(memoryPath), { recursive: true });
+            await writeFile(memoryPath, `${next.trimEnd()}\n\n${block}`, "utf8");
+        }
+        const appliedMetadataPath = path.join(appliedRoot, `${candidate.id.replace(/\.[^.]+$/, "")}.${target}.json`);
+        await writeFile(appliedMetadataPath, `${JSON.stringify({
+            id: candidate.id,
+            title: candidate.title,
+            source: candidate.source,
+            confidence: candidate.confidence,
+            trustLevel: candidate.trustLevel,
+            appliedTarget: target,
+            appliedAt: new Date().toISOString(),
+        }, null, 2)}\n`, "utf8");
+        await moveMemoryCandidateFile(candidate, appliedRoot);
+        console.log(`Applied memory candidate '${candidate.id}' to ${target}.`);
+        if (target === "memory") {
+            const state = await resolveWorkspaceControlState(cwd);
+            await refreshWorkspaceControlPlane({
+                cwd,
+                profile: state.profile,
+                stackOverride: state.stackOverride,
+                authoringAi: state.authoringAi,
+                platforms: state.platforms,
+                capabilityPacks: state.capabilityPacks,
+                selectedMcps: state.selectedMcps,
+                hookProfile: state.hookProfile,
+                learningMode: state.learningMode,
+                bundleId: "agent-environment-setup",
+                installResults: [],
+                generatedDocs: [],
+            });
+        }
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runMemoryPrune(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = process.cwd();
+        const candidates = await listMemoryCandidates(cwd);
+        let toPrune = [];
+        if (opts.all) {
+            toPrune = candidates;
+        }
+        else if (opts.id) {
+            const candidate = await resolveMemoryCandidate(cwd, String(opts.id));
+            if (!candidate) {
+                throw new Error(`Memory candidate '${opts.id}' was not found.`);
+            }
+            toPrune = [candidate];
+        }
+        else {
+            const cutoff = Date.now() - 30 * 24 * 60 * 60 * 1000;
+            toPrune = candidates.filter((candidate) => new Date(candidate.updatedAt).getTime() < cutoff);
+        }
+        if (toPrune.length === 0) {
+            console.log("No memory candidates selected for pruning.");
+            return;
+        }
+        const rejectedRoot = path.join(cwd, MEMORY_REJECTED_DIR);
+        for (const candidate of toPrune) {
+            await moveMemoryCandidateFile(candidate, rejectedRoot);
+        }
+        console.log(`Pruned ${toPrune.length} memory candidate(s).`);
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runProfileSet(profileArg, options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const hookProfile = normalizeHookProfile(profileArg);
+        const cwd = opts.target ? path.resolve(opts.target) : process.cwd();
+        const state = await resolveWorkspaceControlState(cwd);
+        if (hookProfile === "autonomous" &&
+            state.platforms.some((platform) => platform === "copilot")) {
+            throw new Error("Profile 'autonomous' is blocked while Copilot is installed because current Copilot hook parity is security-focused and does not yet provide full autonomous loop controls.");
+        }
+        const manifest = await refreshWorkspaceControlPlane({
+            cwd,
+            profile: state.profile,
+            stackOverride: state.stackOverride,
+            authoringAi: state.authoringAi,
+            platforms: state.platforms,
+            capabilityPacks: state.capabilityPacks,
+            selectedMcps: state.selectedMcps,
+            hookProfile,
+            learningMode: state.learningMode,
+            bundleId: "agent-environment-setup",
+            installResults: [],
+            generatedDocs: [],
+        });
+        console.log(`Hook profile set to '${hookProfile}'.`);
+        if (opts.json) {
+            console.log(JSON.stringify(manifest, null, 2));
+            return;
+        }
+        await printWorkspaceStateSummary(cwd);
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runWorkspaceUpgrade(options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const summary = await executeWorkspaceSync(opts.platform, {
+            ...opts,
+            overwrite: true,
+        });
+        if (opts.json) {
+            console.log(JSON.stringify(summary, null, 2));
+            if (summary.mode === "check" && summary.hasDrift)
+                process.exit(1);
+            return;
+        }
+        printWorkspaceSyncSummary(summary, { label: "Upgrade" });
+        if (opts.changelog) {
+            console.log("Managed changelog:");
+            for (const item of summary.results) {
+                const changed = item.installOutcome.installResult.installed;
+                console.log(`- ${item.platform}: ${changed.length > 0 ? changed.join(", ") : "(no file deltas detected)"}`);
+            }
+        }
+        if (summary.mode === "apply") {
+            await printWorkspaceStateSummary(summary.cwd);
+        }
+        if (summary.mode === "check" && summary.hasDrift) {
+            process.exit(1);
+        }
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runMcpStatus(options) {
+    await runMcpRuntimeStatus(options);
+}
+async function runMcpTest(toolArg, options) {
+    try {
+        const opts = resolveActionOptions(options);
+        const cwd = process.cwd();
+        const scope = normalizeMcpScope(opts.scope, "global");
+        const query = String(toolArg || "").trim().toLowerCase();
+        if (!query) {
+            throw new Error("Missing <tool> name.");
+        }
+        const matches = [];
+        for (const service of ["postman", "stitch"]) {
+            const catalogPath = resolveMcpCatalogPath({ service, scope, cwd });
+            const catalog = await readJsonFileIfExists(catalogPath);
+            if (!catalog.exists || !catalog.value)
+                continue;
+            const tools = Array.isArray(catalog.value.tools) ? catalog.value.tools : [];
+            for (const tool of tools) {
+                const name = String(tool?.name || "").trim();
+                if (!name)
+                    continue;
+                const normalizedName = name.toLowerCase();
+                const aliasName = buildMcpPassthroughAliasName(service, name);
+                if (normalizedName === query ||
+                    normalizedName.includes(query) ||
+                    aliasName === query) {
+                    matches.push({
+                        service,
+                        catalogPath,
+                        generatedAt: catalog.value.generatedAt || null,
+                        tool: {
+                            ...tool,
+                            aliasName,
+                        },
+                    });
+                }
+            }
+        }
+        if (matches.length === 0) {
+            throw new Error(`Tool '${toolArg}' was not found in local MCP catalogs. Run 'cbx mcp tools sync --service all --scope ${scope}' first.`);
+        }
+        console.log(`Tool query: ${toolArg}`);
+        for (const match of matches) {
+            console.log(`- Service: ${match.service}`);
+            console.log(`  Catalog: ${match.catalogPath}`);
+            console.log(`  Name: ${match.tool.name}`);
+            console.log(`  Alias: ${match.tool.aliasName}`);
+            console.log(`  Description: ${match.tool.description || "(no description cached)"}`);
+            console.log(`  Generated: ${match.generatedAt || "(unknown)"}`);
+        }
+    }
+    catch (error) {
+        console.error(`\nError: ${error.message}`);
+        process.exit(1);
+    }
+}
+async function runMcpProxy(options) {
+    const opts = resolveActionOptions(options);
+    await runMcpServe({
+        ...opts,
+        transport: "http",
+        scope: opts.scope || "auto",
+    });
+}
 export function buildCliProgram() {
     return registerCommands({
         cliVersion: CLI_VERSION,
@@ -11686,6 +12870,25 @@ export function buildCliProgram() {
         runRulesInit,
         runRulesTechMd,
         runBuildArchitecture,
+        runWorkspaceAdd,
+        runWorkspaceSync,
+        runContextGenerate,
+        runContextDiff,
+        runContextValidate,
+        runHarnessAudit,
+        runLoopStart,
+        runLoopStatus,
+        runLoopStop,
+        runMemoryReview,
+        runMemoryApply,
+        runMemoryPrune,
+        runProfileSet,
+        runWorkspaceUpgrade,
+        runMcpStatus,
+        runMcpTest,
+        runMcpProxy,
+        runMobileQa,
+        runWebQa,
     });
 }
 export async function runCli(argv = process.argv) {
@@ -11725,4 +12928,3 @@ export async function runCli(argv = process.argv) {
         process.exit(1);
     }
 }
-//# sourceMappingURL=core.js.map