@ghl-ai/aw 0.1.69 → 0.1.70-beta.1

package/c4/diagnostics.mjs

@@ -9,7 +9,7 @@
  *
  *   diagnoseAwRouterView({ awHome })
  *     Codex-relevant: replays the upstream `find * /skills/* /SKILL.md`
- *     enumeration logic against ~/.aw/.aw_registry/platform/core/skills/
+ *     enumeration logic against ~/.aw/.aw_registry/aw/skills/
  *     and reports which expected stage skills are visible to the
  *     SessionStart hook. Catches Bug A failures (registry path empty
  *     post-init).
@@ -22,7 +22,7 @@
  *     Tests both that the wrapper is registered AND that it actually
  *     emits the router (catches "wrapper installed but does nothing").
  *
- *   diagnoseSkillResolution({ harness, home, awHome, eccHome, skills })
+ *   diagnoseSkillResolution({ harness, home, awHome, skills })
  *     Multi-path × multi-skill probe. For each skill, checks four
  *     candidate paths in priority order. Top-level ok=true ONLY if
  *     using-aw-skills AND every stage skill the slim card promises
@@ -146,8 +146,8 @@ function slashShimSummaryToken(action) {
  * ───────────────────────────────────────────────────────────────────────── */
 
 /**
- * Replay of the upstream session-start.sh enumerator scan:
- *   find <awHome>/.aw_registry/platform -path STAR/skills/STAR/SKILL.md
+ * Replay of the AW registry skill scan:
+ *   find <awHome>/.aw_registry/aw/skills/<skill>/SKILL.md
  *
  * @param {object} opts
  * @param {string} opts.awHome
@@ -156,8 +156,8 @@ function slashShimSummaryToken(action) {
 export function diagnoseAwRouterView({ awHome } = {}) {
   if (!awHome) throw new Error('diagnoseAwRouterView: awHome is required');
 
-  const platformRoot = join(awHome, '.aw_registry/platform');
-  const enumerableSkills = enumerateRegistrySkills(platformRoot);
+  const awSkillsRoot = join(awHome, '.aw_registry/aw/skills');
+  const enumerableSkills = enumerateAwSkills(awSkillsRoot);
   const expected = [...EXPECTED_STAGE_SKILLS];
   const missing = expected.filter((s) => !enumerableSkills.includes(s));
   const ok = missing.length === 0;
@@ -166,38 +166,23 @@ export function diagnoseAwRouterView({ awHome } = {}) {
 }
 
 /**
- * Walk <root>/<team>/skills/<skill>/SKILL.md two levels deep, mirroring the
- * upstream find pattern. Returns the deduped sorted list of skill
- * directory names.
+ * Walk <root>/<skill>/SKILL.md and return the deduped sorted skill names.
  */
-function enumerateRegistrySkills(platformRoot) {
-  if (!existsSync(platformRoot)) return [];
+function enumerateAwSkills(awSkillsRoot) {
+  if (!existsSync(awSkillsRoot)) return [];
   const set = new Set();
-  let teams;
+  let skills;
   try {
-    teams = readdirSync(platformRoot, { withFileTypes: true });
+    skills = readdirSync(awSkillsRoot, { withFileTypes: true });
   } catch {
-    // readdir on the platform root failed (EACCES, ENOENT). Treat as
+    // readdir on the AW skills root failed (EACCES, ENOENT). Treat as
     // "no skills enumerable" — the caller's missing-list will surface it.
     return [];
   }
-  for (const team of teams) {
-    if (!team.isDirectory()) continue;
-    const skillsDir = join(platformRoot, team.name, 'skills');
-    if (!existsSync(skillsDir)) continue;
-    let skills;
-    try {
-      skills = readdirSync(skillsDir, { withFileTypes: true });
-    } catch {
-      // readdir on a team's skills/ subdirectory failed — skip this team
-      // dir but continue probing siblings.
-      continue;
-    }
-    for (const skill of skills) {
-      if (!skill.isDirectory()) continue;
-      const skillMd = join(skillsDir, skill.name, 'SKILL.md');
-      if (existsSync(skillMd)) set.add(skill.name);
-    }
+  for (const skill of skills) {
+    if (!skill.isDirectory()) continue;
+    const skillMd = join(awSkillsRoot, skill.name, 'SKILL.md');
+    if (existsSync(skillMd)) set.add(skill.name);
   }
   return [...set].sort();
 }
@@ -337,7 +322,6 @@ function envelopeContainsRouter(output) {
  * @param {Harness} opts.harness
  * @param {string}  opts.home
  * @param {string}  opts.awHome
- * @param {string}  opts.eccHome
  * @param {string[]} [opts.skills]  Default: DEFAULT_SKILL_LIST
  * @returns {{
  *   perSkill: SkillResolutionResult[],
@@ -350,12 +334,11 @@ export function diagnoseSkillResolution(opts = {}) {
   if (!opts.harness) throw new Error('diagnoseSkillResolution: harness is required');
   if (!opts.home) throw new Error('diagnoseSkillResolution: home is required');
   if (!opts.awHome) throw new Error('diagnoseSkillResolution: awHome is required');
-  if (!opts.eccHome) throw new Error('diagnoseSkillResolution: eccHome is required');
 
-  const { harness, home, awHome, eccHome } = opts;
+  const { harness, home, awHome } = opts;
   const skills = opts.skills ?? [...DEFAULT_SKILL_LIST];
 
-  const perSkill = skills.map((skill) => probeOneSkill(skill, harness, home, awHome, eccHome));
+  const perSkill = skills.map((skill) => probeOneSkill(skill, harness, home, awHome));
   const routerSkill = perSkill.find((e) => e.skill === ROUTER_SKILL) ?? {
     skill: ROUTER_SKILL,
     candidatePathsChecked: [],
@@ -374,11 +357,11 @@ function harnessSkillsDir(harness, home) {
   if (harness === 'claude-web') return join(home, '.claude/skills');
   if (harness === 'cursor-cloud') return join(home, '.cursor/skills');
   // codex-web: registry path is the canonical source; the per-harness skills
-  // dir is conventionally absent. We still probe the registry + ECC paths.
+  // dir is conventionally absent. We still probe the AW registry path.
   return null;
 }
 
-function probeOneSkill(skill, harness, home, awHome, eccHome) {
+function probeOneSkill(skill, harness, home, awHome) {
   const harnessDir = harnessSkillsDir(harness, home);
   const candidatePathsChecked = [];
 
@@ -386,8 +369,7 @@ function probeOneSkill(skill, harness, home, awHome, eccHome) {
     candidatePathsChecked.push(join(harnessDir, skill, 'SKILL.md'));
     candidatePathsChecked.push(join(harnessDir, `platform-core-${skill}`, 'SKILL.md'));
   }
-  candidatePathsChecked.push(join(awHome, '.aw_registry/platform/core/skills', skill, 'SKILL.md'));
-  candidatePathsChecked.push(join(eccHome, 'skills', skill, 'SKILL.md'));
+  candidatePathsChecked.push(join(awHome, '.aw_registry/aw/skills', skill, 'SKILL.md'));
 
   let found = null;
   for (const p of candidatePathsChecked) {
@@ -544,7 +526,7 @@ function enumerateConfigKeysOnly(filePath) {
 }
 
 function sampleRegistrySkillPaths(awHome, max) {
-  const root = join(awHome, '.aw_registry/platform');
+  const root = join(awHome, '.aw_registry/aw');
   if (!existsSync(root)) return ['  <registry not provisioned>'];
   const out = [];
   walkSkillMd(root, out, max);
@@ -569,8 +551,7 @@ function walkSkillMd(dir, out, max) {
     } else if (e.isDirectory()) {
       walkSkillMd(p, out, max);
     } else if (e.isSymbolicLink()) {
-      // Cheap stat check — symlinks pointing at SKILL.md (the bridge case)
-      // should still appear in the dump.
+      // Cheap stat check — symlinks pointing at SKILL.md should still appear.
       try {
         const st = statSync(p);
         if (st.isFile() && e.name === 'SKILL.md') out.push(p);

package/c4/index.mjs

@@ -29,7 +29,6 @@ export {
   verifyAuth,
   preflightPlatformDocs,
 } from './gitAuth.mjs';
-export { applyEccRegistryBridge } from './eccRegistryBridge.mjs';
 export {
   SLIM_CARD_HARD_CEILING_BYTES,
   REQUIRED_ENFORCEMENT_PHRASES,
@@ -49,7 +48,7 @@ export {
 export { MCP_URL_DEFAULT, registerGhlAiMcp } from './mcpServer.mjs';
 export { probeMcpServer } from './mcpSmokeProbe.mjs';
 export { ensureClaudeMarketplace } from './claudePluginRegistry.mjs';
-export { ensureCommandSurface, ensureRegistryCommandSurface, diagnoseCommandResolution } from './commandSurface.mjs';
+export { ensureCommandSurface, diagnoseCommandResolution } from './commandSurface.mjs';
 export { installCursorSlashShim, CURSOR_SLASH_SHIM_RULE } from './cursorRulesShim.mjs';
 export { ensureRepoLocalClaudeSettings } from './repoLocalClaudeSettings.mjs';
 export { copyRepoRootInstructions } from './repoRootInstructions.mjs';

package/c4/preflight.mjs

@@ -2,7 +2,7 @@
  * c4/preflight.mjs — preflight aggregator for `aw c4`.
  *
  * Composes harness, token resolution, REST-API auth verification, gh CLI
- * presence, ECC bridge-status probe, and disk-free reporting into a single
+ * presence, AW registry-skill probe, and disk-free reporting into a single
  * PreflightResult shape with per-failure recommendation strings. Pure
  * orchestration over already-tested c4 primitives — no new I/O patterns.
  *
@@ -71,10 +71,10 @@ const REC = Object.freeze({
     `Insufficient disk: ${mb}MB free (aw c4 needs at least ${DISK_FREE_THRESHOLD_MB}MB ` +
     'for ECC clone + registry pull).',
   bridgeWillInstall:
-    'ECC registry bridge will be installed during this run (Codex only — ' +
-    'Bug A workaround that symlinks ECC stage skills into ~/.aw/.aw_registry).',
+    'AW registry skills will be installed during this run from platform-docs ' +
+    '(Codex uses ~/.aw/.aw_registry/aw/skills for stage routing).',
   bridgeFailed:
-    'ECC and/or AW registry not yet provisioned — aw init will create them ' +
+    'AW registry skills are not yet provisioned — aw init will create them ' +
     'on the first c4 run; re-run preflight afterwards.',
 });
 
@@ -120,22 +120,18 @@ function classifyAuthError(verifyResult) {
   return 'unknown';
 }
 
-function probeBridgeStatus(harness, awHome, eccHome) {
+function probeBridgeStatus(harness, awHome) {
   if (harness !== 'codex-web') return 'ok';
 
-  // Bridge installs ~/.aw/.aw_registry/platform/core/skills/<aw-*>/SKILL.md
-  // symlinks pointing at ~/.aw-ecc/skills/<aw-*>/SKILL.md. If aw-plan is
-  // already present in the registry path, the bridge is a no-op (ok).
-  const bridgedSkillPath = join(
+  // AW skills are now owned by platform-docs under the top-level aw namespace.
+  // If aw-plan is already present in the registry path, routing is ready.
+  const awSkillPath = join(
     awHome,
-    '.aw_registry/platform/core/skills/aw-plan/SKILL.md',
+    '.aw_registry/aw/skills/aw-plan/SKILL.md',
   );
-  if (existsSync(bridgedSkillPath)) return 'ok';
+  if (existsSync(awSkillPath)) return 'ok';
 
-  // Bridge can install when both ECC home and the registry skeleton exist.
-  // (The aw-plan skill source must exist somewhere — the bridge follows
-  // applyEccRegistryBridge's contract; preflight only certifies feasibility.)
-  if (existsSync(eccHome) && existsSync(awHome)) return 'will-install';
+  if (existsSync(awHome)) return 'will-install';
 
   return 'failed';
 }
@@ -180,7 +176,6 @@ function buildRecommendations({
  * @param {typeof globalThis.fetch} [opts.fetchImpl]
  * @param {string}  [opts.home]      Defaults to env.HOME.
  * @param {string}  [opts.awHome]    Defaults to <home>/.aw.
- * @param {string}  [opts.eccHome]   Defaults to <home>/.aw-ecc.
  * @param {number}  [opts.diskFreeMb]  Inject for tests; production defaults to a real statfs probe.
  * @returns {Promise<PreflightResult>}
  */
@@ -200,7 +195,6 @@ export async function runPreflight(opts = {}) {
   // when env is the injected `{}`, opts.home should have been passed instead.
   const home = opts.home ?? env.HOME ?? '~';
   const awHome = opts.awHome ?? join(home, '.aw');
-  const eccHome = opts.eccHome ?? join(home, '.aw-ecc');
 
   // 1. Token resolution.
   const { token, source: tokenSource } = getGithubToken(env);
@@ -221,7 +215,7 @@ export async function runPreflight(opts = {}) {
   const ghCliPresent = runShell(shell, 'command -v gh').ok;
 
   // 4. Bridge status (codex-web only; other harnesses always 'ok').
-  const bridgeStatus = probeBridgeStatus(harness, awHome, eccHome);
+  const bridgeStatus = probeBridgeStatus(harness, awHome);
 
   // 5. Disk free MB. For tests, callers inject the value directly; in
   //    production the orchestrator passes a measured number. Defaulting to

package/c4/templates/scripts/aw-c4-bootstrap.sh

@@ -129,30 +129,30 @@ aw_c4_exit=$?
 
 # Defense-in-depth: `aw c4` delegates registry sync to `aw init --silent`,
 # which can fail to fetch in silent mode without surfacing an error. When
-# that happens, the registry (~/.aw/.aw_registry) may be empty or incomplete
-# and only the 10 hardcoded stage commands get linked. Re-run `aw pull`
-# post-c4 if the command count looks low.
-verify_registry_commands() {
-  local aw_cmd_dir="$HOME/.aw/.aw_registry"
-  if [ ! -d "$aw_cmd_dir" ]; then
+# that happens, the registry (~/.aw/.aw_registry) may be empty or incomplete.
+# Re-run `aw pull` post-c4 if the AW skill count looks low.
+verify_registry_skills() {
+  local aw_registry_dir="$HOME/.aw/.aw_registry"
+  local aw_skills_dir="$aw_registry_dir/aw/skills"
+  if [ ! -d "$aw_registry_dir" ]; then
     echo "[aw-c4-bootstrap] registry dir missing — running aw init + pull"
     aw init --no-integrations --silent 2>&1 | tail -3 || true
     aw pull 2>&1 | tail -5 || true
     return
   fi
 
-  local cmd_count
-  cmd_count=$(find "$aw_cmd_dir" -name '*.md' -path '*/commands/*' ! -path '*/evals/*' 2>/dev/null | wc -l | tr -d ' ')
-  if [ "${cmd_count:-0}" -lt 20 ]; then
-    echo "[aw-c4-bootstrap] only ${cmd_count} registry commands found — running aw pull"
+  local skill_count
+  skill_count=$( (find "$aw_skills_dir" -name 'SKILL.md' 2>/dev/null || true) | wc -l | tr -d ' ' )
+  if [ "${skill_count:-0}" -lt 5 ]; then
+    echo "[aw-c4-bootstrap] only ${skill_count} AW registry skills found — running aw pull"
     aw pull 2>&1 | tail -5 || true
     local new_count
-    new_count=$(find "$aw_cmd_dir" -name '*.md' -path '*/commands/*' ! -path '*/evals/*' 2>/dev/null | wc -l | tr -d ' ')
-    echo "[aw-c4-bootstrap] registry commands: ${cmd_count} → ${new_count}"
+    new_count=$( (find "$aw_skills_dir" -name 'SKILL.md' 2>/dev/null || true) | wc -l | tr -d ' ' )
+    echo "[aw-c4-bootstrap] AW registry skills: ${skill_count} -> ${new_count}"
   else
-    echo "[aw-c4-bootstrap] registry: ${cmd_count} commands OK"
+    echo "[aw-c4-bootstrap] registry: ${skill_count} AW skills OK"
   fi
 }
-verify_registry_commands || true
+verify_registry_skills || true
 
 exit "$aw_c4_exit"

package/codex.mjs

@@ -88,10 +88,19 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 ROOT_DIR="$(cd "\${SCRIPT_DIR}/.." && pwd)"
-TARGET_SCRIPT="\$ROOT_DIR/.aw_registry/platform/core/skills/using-aw-skills/hooks/session-start.sh"
-
-if [[ ! -f "\$TARGET_SCRIPT" ]]; then
-  echo '{"hookSpecificOutput": {"hookEventName": "SessionStart", "additionalContext": "WARNING: AW session-start hook not found at .aw_registry/platform/core/skills/using-aw-skills/hooks/session-start.sh. Run aw pull platform or aw init."}}'
+TARGET_SCRIPT=""
+for candidate in \
+  "\$ROOT_DIR/.aw/.aw_registry/aw/skills/using-aw-skills/hooks/session-start.sh" \
+  "\$ROOT_DIR/.aw_registry/aw/skills/using-aw-skills/hooks/session-start.sh"
+do
+  if [[ -f "\$candidate" ]]; then
+    TARGET_SCRIPT="\$candidate"
+    break
+  fi
+done
+
+if [[ -z "\$TARGET_SCRIPT" ]]; then
+  echo '{"hookSpecificOutput": {"hookEventName": "SessionStart", "additionalContext": "WARNING: AW session-start hook not found at .aw_registry/aw/skills/using-aw-skills/hooks/session-start.sh. Run aw pull platform or aw init."}}'
   exit 0
 fi
 

package/commands/c4.mjs

@@ -101,11 +101,13 @@ function safeReaddirSync(dir) {
   try { return readdirSync(dir); } catch { return []; }
 }
 
-function safeListNamespaceDirs(dir) {
+function safeListNamespaceDirs(dir, fsApi = {}) {
+  const readDir = fsApi.readdirSync ?? readdirSync;
+  const stat = fsApi.statSync ?? statSync;
   try {
-    return readdirSync(dir).filter((entry) => {
+    return readDir(dir).filter((entry) => {
       if (entry.startsWith('.')) return false;
-      try { return statSync(join(dir, entry)).isDirectory(); } catch { return false; }
+      try { return stat(join(dir, entry)).isDirectory(); } catch { return false; }
     });
   } catch { return []; }
 }
@@ -132,17 +134,15 @@ function setupGitAuth({ token, c4, home, cwd }) {
   c4.ensureOriginRemote({ cwd });
 }
 
-function resolveCodexRouterSkillPath({ awHome, eccHome, existsSync = fsExistsSync }) {
-  const eccRouterSkillPath = join(eccHome, 'skills/using-aw-skills/SKILL.md');
-  if (existsSync(eccRouterSkillPath)) return eccRouterSkillPath;
-  return join(awHome, '.aw_registry/platform/core/skills/using-aw-skills/SKILL.md');
+function resolveCodexRouterSkillPath({ awHome }) {
+  return join(awHome, '.aw_registry/aw/skills/using-aw-skills/SKILL.md');
 }
 
 /* ─────────────────────────────────────────────────────────────────────────
  * Per-harness branch (step 10).
  *
  * Returns `{ ok, bridge, injector }` so the summary line can pick up
- * codex-specific status ticks. Hard failures (bridge / injector / claude
+ * codex-specific status ticks. Hard failures (injector / claude
  * marketplace / slim card) bubble up as thrown Errors.
  * ───────────────────────────────────────────────────────────────────────── */
 
@@ -165,9 +165,8 @@ function runHarnessBranch({ harness, c4, home, eccHome, cwd, writer, existsSync
   }
   if (harness === 'codex-web') {
     const awHome = join(home, '.aw');
-    c4.applyEccRegistryBridge({ awHome, eccHome });
     c4.ensureCodexHooksFlag(home);
-    const routerSkillPath = resolveCodexRouterSkillPath({ awHome, eccHome, existsSync });
+    const routerSkillPath = resolveCodexRouterSkillPath({ awHome });
     // Pass hookPath explicitly: defaultHookPath() reads os.homedir() at module
     // load time, which ignores the orchestrator's `home` (env.HOME). Without
     // this, installs land in the real ~/.codex even when HOME is overridden
@@ -193,7 +192,7 @@ function runSelfTests({ harness, c4, home, awHome, eccHome }) {
   if (!skill.ok) failures.push('skill-resolution');
 
   // diagnoseCommandResolution is warn-only — does NOT add to failures.
-  const command = c4.diagnoseCommandResolution({ harness, home });
+  const command = c4.diagnoseCommandResolution({ harness, home, awHome });
 
   let view;
   let injector;
@@ -411,12 +410,27 @@ export async function c4Command(rawArgs, overrides = {}) {
   // check, so we specifically look for directories (namespaces like
   // "platform") to confirm the registry content was actually pulled.
   {
-    const registryNamespaces = safeListNamespaceDirs(awRegistry);
+    const registryNamespaces = safeListNamespaceDirs(awRegistry, fs);
     if (registryNamespaces.length === 0) {
       writer.stderr('[aw-c4] registry has no namespace directories after init — retrying with aw pull\n');
       const pullRes = spawnSync('aw', ['pull'], { stdio: 'pipe' });
-      if (pullRes?.status !== 0 || safeListNamespaceDirs(awRegistry).length === 0) {
-        writer.stderr('[aw-c4] FATAL: registry commands were not fetched\n');
+      if (pullRes?.status !== 0 || safeListNamespaceDirs(awRegistry, fs).length === 0) {
+        writer.stderr('[aw-c4] FATAL: registry skills were not fetched\n');
+        return exit(1);
+      }
+    }
+  }
+
+  // Step 9b — verify active AW skills exist. `/aw:*` adapters point directly
+  // at ~/.aw/.aw_registry/aw/skills/<skill>/SKILL.md, so an empty registry is
+  // not enough; the AW namespace must be present.
+  {
+    const awSkillsDir = join(awRegistry, 'aw', 'skills');
+    if (!fs.existsSync(awSkillsDir)) {
+      writer.stderr('[aw-c4] AW skills missing after init — retrying with aw pull\n');
+      const pullRes = spawnSync('aw', ['pull'], { stdio: 'pipe' });
+      if (pullRes?.status !== 0 || !fs.existsSync(awSkillsDir)) {
+        writer.stderr('[aw-c4] FATAL: AW skills were not fetched\n');
         return exit(1);
       }
     }
@@ -439,26 +453,9 @@ export async function c4Command(rawArgs, overrides = {}) {
     writer.stdout('[aw-c4] MCP disabled; skipping registerGhlAiMcp\n');
   }
 
-  // Step 12 — slash command surface (10 stage commands from ECC).
-  safe('ensureCommandSurface', () => c4.ensureCommandSurface({ harness, home, eccHome }), writer);
-
-  // Step 12a — full registry command surface.
-  // `ensureCommandSurface` only links the 10 AW routing-stage commands from
-  // ~/.aw-ecc/commands/. The full registry (~100+ domain commands like
-  // platform-review-security-hardening) lives in ~/.aw/.aw_registry/ and is
-  // populated by `aw init` (step 7). Link them all into the harness command
-  // dir so `/aw:*` resolution works for every registered command.
-  const registryCmdResult = safe(
-    'ensureRegistryCommandSurface',
-    () => c4.ensureRegistryCommandSurface({ harness, home, awRegistryDir: awRegistry }),
-    writer,
-  );
-  if (registryCmdResult.ok) {
-    const { linked, skipped } = registryCmdResult.value;
-    if (linked > 0) {
-      writer.stdout(`[aw-c4] registry commands: ${linked} linked, ${skipped} skipped\n`);
-    }
-  }
+  // Step 12 — slash surface backed by active AW skills. No ECC command files
+  // are linked; each adapter points directly at a registry SKILL.md.
+  safe('ensureCommandSurface', () => c4.ensureCommandSurface({ harness, home, awHome }), writer);
 
   // Step 12b — Cursor Cloud slash-expand rule (no-op on other harnesses).
   // The model-side workaround for Cursor Cloud's chat UI not pre-expanding

package/commands/doctor.mjs

@@ -523,22 +523,14 @@ function findBrokenRuleReferences(filePaths) {
   return broken;
 }
 
-function missingCorePromptFiles(promptsDir) {
-  return EXPECTED_AW_ROUTES
-    .map(route => `aw-${route}.md`)
-    .filter(fileName => !existsSync(join(promptsDir, fileName)));
-}
-
-function missingCoreCursorCommandFiles(commandsDir) {
-  return EXPECTED_AW_ROUTES
-    .map(route => `${route}.md`)
-    .filter(fileName => !existsSync(join(commandsDir, fileName)));
-}
-
-function missingCoreClaudeCommandFiles(pluginRoot) {
-  return EXPECTED_AW_ROUTES
-    .map(route => `commands/${route}.md`)
-    .filter(relativePath => !existsSync(join(pluginRoot, relativePath)));
+function missingCoreAwSkillFiles(awRegistryDir) {
+  const expectedSkills = [
+    'using-aw-skills',
+    ...EXPECTED_AW_ROUTES.map(route => `aw-${route}`),
+  ];
+  return expectedSkills
+    .map(skillName => `aw/skills/${skillName}/SKILL.md`)
+    .filter(relativePath => !awRegistryDir || !existsSync(join(awRegistryDir, relativePath)));
 }
 
 function buildDoctorChecks(homeDir, cwd) {
@@ -548,8 +540,8 @@ function buildDoctorChecks(homeDir, cwd) {
   const rulesDir = resolveRulesDir(homeDir);
 
   const usingAwHookPath = [
-    join(homeDir, '.aw_registry', 'platform', 'core', 'skills', 'using-aw-skills', 'hooks', 'session-start.sh'),
-    join(homeDir, '.aw', '.aw_registry', 'platform', 'core', 'skills', 'using-aw-skills', 'hooks', 'session-start.sh'),
+    join(homeDir, '.aw_registry', 'aw', 'skills', 'using-aw-skills', 'hooks', 'session-start.sh'),
+    join(homeDir, '.aw', '.aw_registry', 'aw', 'skills', 'using-aw-skills', 'hooks', 'session-start.sh'),
   ].find(existsSync);
 
   checks.push(usingAwHookPath
@@ -586,6 +578,19 @@ function buildDoctorChecks(homeDir, cwd) {
     );
   }
 
+  const missingAwSkills = missingCoreAwSkillFiles(awRegistryDir);
+  checks.push(
+    missingAwSkills.length === 0
+      ? makeCheck('aw-skills-source', 'AW skills source', 'pass', 'AW core route skills are synced under ~/.aw/.aw_registry/aw/skills')
+      : makeCheck(
+        'aw-skills-source',
+        'AW skills source',
+        'fail',
+        `AW registry is missing core skill files: ${missingAwSkills.join(', ')}`,
+        'Run `aw init` or `aw pull platform` to sync AW skills into ~/.aw/.aw_registry/aw/skills.',
+      ),
+  );
+
   if (cwd !== homeDir) {
     const projectAgentsPath = join(cwd, 'AGENTS.md');
     const projectClaudePath = join(cwd, 'CLAUDE.md');
@@ -646,12 +651,10 @@ function buildDoctorChecks(homeDir, cwd) {
     const missingBundleFiles = missingFiles(claudePluginRoot, [
       '.claude-plugin/plugin.json',
       'hooks/hooks.json',
-      'skills/using-aw-skills/SKILL.md',
-      'skills/using-aw-skills/hooks/session-start.sh',
     ]);
     checks.push(
       missingBundleFiles.length === 0 && claudeSessionStartStatus.ok
-        ? makeCheck('claude-plugin-bundle', 'Claude plugin bundle', 'pass', 'Claude plugin bundle contains AW routing hooks and router skill files')
+        ? makeCheck('claude-plugin-bundle', 'Claude plugin bundle', 'pass', 'Claude plugin bundle contains AW routing hooks')
         : makeCheck(
           'claude-plugin-bundle',
           'Claude plugin bundle',
@@ -667,21 +670,8 @@ function buildDoctorChecks(homeDir, cwd) {
         ),
     );
 
-    const missingPluginCommands = missingCoreClaudeCommandFiles(claudePluginRoot);
-    checks.push(
-      missingPluginCommands.length === 0
-        ? makeCheck('claude-plugin-commands', 'Claude public commands', 'pass', 'Claude plugin bundle exposes the current AW command surface (primary, conditional, and compatibility routes)')
-        : makeCheck(
-          'claude-plugin-commands',
-          'Claude public commands',
-          'fail',
-          `Claude plugin bundle is missing core command files: ${missingPluginCommands.join(', ')}`,
-          'Refresh the AW Claude plugin so the plugin bundle includes the full AW public command surface.',
-        ),
-    );
   } else {
     checks.push(makeCheck('claude-plugin-bundle', 'Claude plugin bundle', 'warn', 'Claude plugin bundle is not installed', 'Enable/install the AW Claude plugin, then rerun `aw doctor`.'));
-    checks.push(makeCheck('claude-plugin-commands', 'Claude public commands', 'warn', 'Claude plugin command bundle could not be inspected because the plugin is not installed'));
   }
 
   const claudeLegacyHooks = parseLegacyClaudeHookTargets(claudeSettings?.hooks?.SessionStart || []);
@@ -867,19 +857,6 @@ function buildDoctorChecks(homeDir, cwd) {
       : makeCheck('codex-references', 'Codex shared references', 'fail', 'Codex shared references are missing', projectRelinkFix(homeDir, cwd, '~/.codex/references')),
   );
 
-  const missingPrompts = missingCorePromptFiles(join(homeDir, '.codex', 'prompts'));
-  checks.push(
-      missingPrompts.length === 0
-      ? makeCheck('codex-prompts', 'Codex prompts', 'pass', 'Codex prompt sync produced the current AW prompt surface (primary, conditional, and compatibility routes)')
-      : makeCheck(
-        'codex-prompts',
-        'Codex prompts',
-        'fail',
-        `Codex is missing core prompt files: ${missingPrompts.join(', ')}`,
-        'Run `aw init` or refresh the AW ECC bundle to regenerate the Codex prompts.',
-      ),
-  );
-
   const codexAgentsPath = join(homeDir, '.codex', 'AGENTS.md');
   checks.push(
     existsSync(codexAgentsPath) && textHasManagedRouterBridge(readText(codexAgentsPath)) && textHasRulesReference(readText(codexAgentsPath))
@@ -944,20 +921,6 @@ function buildDoctorChecks(homeDir, cwd) {
     : makeCheck('cursor-install-state', 'Cursor install state', 'fail', 'Cursor install-state file is missing', globalInstallStateFix(homeDir, cwd, 'Cursor install state')),
   );
 
-  const cursorCommandsDir = join(homeDir, '.cursor', 'commands', 'aw');
-  const missingCursorCommands = missingCoreCursorCommandFiles(cursorCommandsDir);
-  checks.push(
-    missingCursorCommands.length === 0
-      ? makeCheck('cursor-commands', 'Cursor public commands', 'pass', 'Cursor has the current AW command surface under ~/.cursor/commands/aw/')
-      : makeCheck(
-        'cursor-commands',
-        'Cursor public commands',
-        'fail',
-        `Cursor is missing core command files: ${missingCursorCommands.join(', ')}`,
-        projectRelinkFix(homeDir, cwd, 'AW command files under ~/.cursor/commands/aw/'),
-      ),
-  );
-
   const cursorMcp = jsonMcpHealth(join(homeDir, '.cursor', 'mcp.json'));
   checks.push(
     cursorMcp.present && cursorMcp.url && cursorMcp.authorization

package/commands/init.mjs

@@ -49,7 +49,16 @@ import {
   syncWorktreeSparseCheckout,
   findNearestWorktree,
 } from '../git.mjs';
-import { REGISTRY_DIR, REGISTRY_REPO, REGISTRY_URL, DOCS_SOURCE_DIR, AW_DOCS_DIR, RULES_SOURCE_DIR, RULES_RUNTIME_DIR } from '../constants.mjs';
+import {
+  REGISTRY_DIR,
+  REGISTRY_REPO,
+  REGISTRY_URL,
+  AW_REGISTRY_NAMESPACE_DIR,
+  DOCS_SOURCE_DIR,
+  AW_DOCS_DIR,
+  RULES_SOURCE_DIR,
+  RULES_RUNTIME_DIR,
+} from '../constants.mjs';
 import { syncFileTree } from '../file-tree.mjs';
 import { installAwUsageHooks, formatAwUsageHooksInstallReport } from '../install-aw-usage-hooks.mjs';
 
@@ -390,7 +399,7 @@ export async function initCommand(args) {
     const isNewSubTeam = folderName && cfg && !cfg.include.includes(folderName);
     if (isNewSubTeam) {
       if (!silent) fmt.logStep(`Adding sub-team ${chalk.cyan(folderName)}...`);
-      const newSparsePaths = [`.aw_registry/${folderName}`, DOCS_SOURCE_DIR, AW_DOCS_DIR, RULES_SOURCE_DIR];
+      const newSparsePaths = [AW_REGISTRY_NAMESPACE_DIR, `.aw_registry/${folderName}`, DOCS_SOURCE_DIR, AW_DOCS_DIR, RULES_SOURCE_DIR];
       addToSparseCheckout(AW_HOME, newSparsePaths);
       config.addPattern(GLOBAL_AW_DIR, folderName);
       scaffoldNamespace(AW_HOME, folderName);
@@ -537,7 +546,7 @@ export async function initCommand(args) {
   }
 
   // Determine sparse paths
-  const sparsePaths = [`.aw_registry/platform`, DOCS_SOURCE_DIR, AW_DOCS_DIR, RULES_SOURCE_DIR, `.aw_registry/AW-PROTOCOL.md`, `CODEOWNERS`];
+  const sparsePaths = [AW_REGISTRY_NAMESPACE_DIR, `.aw_registry/platform`, DOCS_SOURCE_DIR, AW_DOCS_DIR, RULES_SOURCE_DIR, `.aw_registry/AW-PROTOCOL.md`, `CODEOWNERS`];
   if (folderName) {
     sparsePaths.push(`.aw_registry/${folderName}`);
   }

package/commands/pull.mjs

@@ -26,6 +26,7 @@ import {
 import {
   REGISTRY_DIR,
   REGISTRY_URL,
+  AW_REGISTRY_NAMESPACE_DIR,
   DOCS_SOURCE_DIR,
   AW_DOCS_DIR,
   RULES_SOURCE_DIR,
@@ -93,7 +94,7 @@ export async function pullCommand(args) {
   // Ensure platform pulls also fetch docs and rules on older installs that
   // pre-date the new sparse-checkout paths.
   if (input === 'platform') {
-    addToSparseCheckout(AW_HOME, [`.aw_registry/platform`, DOCS_SOURCE_DIR, AW_DOCS_DIR, RULES_SOURCE_DIR]);
+    addToSparseCheckout(AW_HOME, [AW_REGISTRY_NAMESPACE_DIR, `.aw_registry/platform`, DOCS_SOURCE_DIR, AW_DOCS_DIR, RULES_SOURCE_DIR]);
     if (!cfg.include.includes('platform')) {
       config.addPattern(GLOBAL_AW_DIR, 'platform');
     }

package/constants.mjs

@@ -19,6 +19,9 @@ export const REGISTRY_URL = process.env.AW_REGISTRY_URL
 /** Directory inside the registry repo that holds platform/ and [template]/ */
 export const REGISTRY_DIR = '.aw_registry';
 
+/** Top-level AW namespace in the registry. Holds active AW-owned skills. */
+export const AW_REGISTRY_NAMESPACE_DIR = `${REGISTRY_DIR}/aw`;
+
 /** Directory in platform-docs repo containing documentation (pulled into platform/docs/) */
 export const DOCS_SOURCE_DIR = 'content';