@ghl-ai/aw 0.1.38-beta.8 → 0.1.38

package/cli.mjs

@@ -134,7 +134,7 @@ function printHelp() {
     cmd('aw push .aw_registry/agents/<name>.md', 'Push a single agent'),
     cmd('aw push .aw_registry/skills/<name>/', 'Push a single skill folder'),
     cmd('aw push .aw_rules', 'Auto-redirects to aw push-rules'),
-    cmd('aw push-rules', 'Pushes .aw_rules or .aw_registry/.aw_rules'),
+    cmd('aw push-rules', 'Pushes .aw_rules'),
     '',
     `  ${chalk.dim('# Remove content from workspace')}`,
     cmd('aw drop <team>', 'Stop syncing a namespace (removes all files)'),

package/commands/doctor.mjs

@@ -162,10 +162,11 @@ function resolveAwRegistryDir(homeDir) {
 }
 
 function resolveRulesDir(homeDir) {
-  const awRegistryDir = resolveAwRegistryDir(homeDir);
-  if (!awRegistryDir) return null;
-  const rulesDir = join(awRegistryDir, '.aw_rules');
-  return existsSync(rulesDir) ? rulesDir : null;
+  const candidates = [
+    join(homeDir, '.aw', '.aw_rules'),
+    join(homeDir, '.aw', '.aw_registry', '.aw_rules'),
+  ];
+  return candidates.find(existsSync) || null;
 }
 
 function findClaudePlugin(homeDir) {
@@ -471,7 +472,7 @@ function getProjectClaudeSessionStartStatus(cwd) {
 }
 
 function textHasRulesReference(text) {
-  return text.includes('Platform Rules') && text.includes('.aw_registry/.aw_rules/platform/');
+  return text.includes('Platform Rules') && text.includes('.aw/.aw_rules/platform/');
 }
 
 function textHasManagedRouterBridge(text) {
@@ -484,9 +485,9 @@ function textHasManagedRouterBridge(text) {
     && text.includes('incremental-implementation');
 }
 
-function extractRegistryReferencePaths(text) {
+function extractRuleReferencePaths(text) {
   const matches = [];
-  const pattern = /(?:\]\(|`)([^)\n`]*\.aw_registry\/[^)\n`]+\.md)(?:\)|`)/g;
+  const pattern = /(?:\]\(|`)([^)\n`]*(?:\.aw_rules|\.aw_registry\/\.aw_rules)\/[^)\n`]+\.md)(?:\)|`)/g;
   for (const match of text.matchAll(pattern)) {
     if (match[1]) matches.push(match[1]);
   }
@@ -505,11 +506,11 @@ function listGeneratedRuleFiles(dirPath, extension) {
   }
 }
 
-function findBrokenRegistryReferences(filePaths) {
+function findBrokenRuleReferences(filePaths) {
   const broken = [];
   for (const filePath of filePaths) {
     const content = readText(filePath);
-    const refs = extractRegistryReferencePaths(content);
+    const refs = extractRuleReferencePaths(content);
     for (const ref of refs) {
       if (ref.includes('<domain>')) continue;
       const resolvedPath = join(dirname(filePath), ref);
@@ -565,8 +566,8 @@ function buildDoctorChecks(homeDir, cwd) {
       'aw-rules-source',
       'AW rules source',
       'fail',
-      'No synced .aw_rules tree found under ~/.aw_registry',
-      'Run `aw init` or `aw pull platform` to sync the AW rules source into ~/.aw_registry.',
+      'No synced .aw/.aw_rules tree found under ~/.aw/.aw_rules',
+      'Run `aw init` or `aw pull platform` to sync the AW rules source into ~/.aw/.aw_rules.',
     ));
   } else {
     const topLevelRulesAgents = join(rulesDir, 'AGENTS.md');
@@ -578,8 +579,8 @@ function buildDoctorChecks(homeDir, cwd) {
           'aw-rules-source',
           'AW rules source',
           'fail',
-          'Rules source is incomplete under ~/.aw_registry/.aw_rules',
-          'Run `aw pull platform` to refresh .aw_rules, then rerun `aw doctor`.',
+          'Rules source is incomplete under ~/.aw/.aw_rules',
+          'Run `aw pull platform` to refresh .aw/.aw_rules, then rerun `aw doctor`.',
         ),
     );
   }
@@ -778,30 +779,30 @@ function buildDoctorChecks(homeDir, cwd) {
         'claude-rules',
         'Claude AW rules',
         rulesDir ? 'fail' : 'warn',
-        rulesDir ? 'Claude platform rules are missing or not generated by AW' : 'Claude platform rules were not checked because .aw_rules is not synced',
+        rulesDir ? 'Claude platform rules are missing or not generated by AW' : 'Claude platform rules were not checked because .aw/.aw_rules is not synced',
         'Run `aw pull platform` or `aw init` to render Claude platform rules.',
       ),
   );
 
   const claudeRuleFiles = listGeneratedRuleFiles(claudeRulesDir, '.md');
-  const brokenClaudeRuleRefs = findBrokenRegistryReferences(claudeRuleFiles);
+  const brokenClaudeRuleRefs = findBrokenRuleReferences(claudeRuleFiles);
   checks.push(
     claudeRuleFiles.length === 0
       ? makeCheck(
         'claude-rule-references',
         'Claude rule references',
         rulesDir ? 'fail' : 'warn',
-        rulesDir ? 'Claude generated rule files are missing, so reference links could not be validated' : 'Claude rule references were not checked because .aw_rules is not synced',
+        rulesDir ? 'Claude generated rule files are missing, so reference links could not be validated' : 'Claude rule references were not checked because .aw/.aw_rules is not synced',
         'Run `aw pull platform` or `aw init` to render Claude rules, then rerun `aw doctor`.',
       )
       : brokenClaudeRuleRefs.length === 0
-        ? makeCheck('claude-rule-references', 'Claude rule references', 'pass', 'Claude generated rule references resolve to real files in ~/.aw_registry')
+        ? makeCheck('claude-rule-references', 'Claude rule references', 'pass', 'Claude generated rule references resolve to real files in ~/.aw/.aw_rules')
         : makeCheck(
           'claude-rule-references',
           'Claude rule references',
           'fail',
           `Claude rule reference is broken in ${brokenClaudeRuleRefs[0].filePath.replace(`${homeDir}/`, '~/')}: ${brokenClaudeRuleRefs[0].ref}`,
-          'Refresh the rendered Claude rules so embedded reference links point at real files under ~/.aw_registry/.aw_rules.',
+          'Refresh the rendered Claude rules so embedded reference links point at real files under ~/.aw/.aw_rules.',
         ),
   );
 
@@ -894,7 +895,7 @@ function buildDoctorChecks(homeDir, cwd) {
   );
 
   const codexAgentsText = readText(codexAgentsPath);
-  const codexBrokenRuleRefs = existsSync(codexAgentsPath) ? findBrokenRegistryReferences([codexAgentsPath]) : [];
+  const codexBrokenRuleRefs = existsSync(codexAgentsPath) ? findBrokenRuleReferences([codexAgentsPath]) : [];
   checks.push(
     existsSync(codexAgentsPath) && textHasRulesReference(codexAgentsText)
       ? codexBrokenRuleRefs.length === 0
@@ -997,31 +998,31 @@ function buildDoctorChecks(homeDir, cwd) {
         'cursor-rules',
         'Cursor AW rules',
         rulesDir ? 'fail' : 'warn',
-        rulesDir ? 'Cursor rules are missing or not generated by AW' : 'Cursor rules were not checked because .aw_rules is not synced',
+        rulesDir ? 'Cursor rules are missing or not generated by AW' : 'Cursor rules were not checked because .aw/.aw_rules is not synced',
         'Run `aw pull platform` or `aw init` to render Cursor rule files.',
       ),
   );
 
   const cursorRulesDir = join(homeDir, '.cursor', 'rules');
   const cursorRuleFiles = listGeneratedRuleFiles(cursorRulesDir, '.mdc');
-  const brokenCursorRuleRefs = findBrokenRegistryReferences(cursorRuleFiles);
+  const brokenCursorRuleRefs = findBrokenRuleReferences(cursorRuleFiles);
   checks.push(
     cursorRuleFiles.length === 0
       ? makeCheck(
         'cursor-rule-references',
         'Cursor rule references',
         rulesDir ? 'fail' : 'warn',
-        rulesDir ? 'Cursor generated rule files are missing, so reference links could not be validated' : 'Cursor rule references were not checked because .aw_rules is not synced',
+        rulesDir ? 'Cursor generated rule files are missing, so reference links could not be validated' : 'Cursor rule references were not checked because .aw/.aw_rules is not synced',
         'Run `aw pull platform` or `aw init` to render Cursor rules, then rerun `aw doctor`.',
       )
       : brokenCursorRuleRefs.length === 0
-        ? makeCheck('cursor-rule-references', 'Cursor rule references', 'pass', 'Cursor generated rule references resolve to real files in ~/.aw_registry')
+        ? makeCheck('cursor-rule-references', 'Cursor rule references', 'pass', 'Cursor generated rule references resolve to real files in ~/.aw/.aw_rules')
         : makeCheck(
           'cursor-rule-references',
           'Cursor rule references',
           'fail',
           `Cursor rule reference is broken in ${brokenCursorRuleRefs[0].filePath.replace(`${homeDir}/`, '~/')}: ${brokenCursorRuleRefs[0].ref}`,
-          'Refresh the rendered Cursor rules so embedded reference links point at real files under ~/.aw_registry/.aw_rules.',
+          'Refresh the rendered Cursor rules so embedded reference links point at real files under ~/.aw/.aw_rules.',
         ),
   );
 

package/commands/init.mjs

@@ -44,7 +44,7 @@ import {
   syncWorktreeSparseCheckout,
   findNearestWorktree,
 } from '../git.mjs';
-import { REGISTRY_DIR, REGISTRY_REPO, REGISTRY_URL, RULES_SOURCE_DIR } from '../constants.mjs';
+import { REGISTRY_DIR, REGISTRY_REPO, REGISTRY_URL, RULES_SOURCE_DIR, RULES_RUNTIME_DIR } from '../constants.mjs';
 import { syncFileTree } from '../file-tree.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -59,6 +59,22 @@ const HOME = (() => { try { return realpathSync(_rawHome); } catch { return _raw
 const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
 const AW_HOME = join(HOME, '.aw');
 
+function syncRulesTargets(targetDir) {
+  const rulesSrc = join(AW_HOME, RULES_SOURCE_DIR);
+  if (!existsSync(rulesSrc)) return false;
+  syncFileTree(rulesSrc, join(targetDir, RULES_RUNTIME_DIR));
+  return true;
+}
+
+function removeLegacyRegistryRules() {
+  try {
+    rmSync(join(GLOBAL_AW_DIR, RULES_SOURCE_DIR), { recursive: true, force: true });
+    rmSync(join(HOME, RULES_SOURCE_DIR), { recursive: true, force: true });
+  } catch {
+    // best effort cleanup
+  }
+}
+
 function syncInstructionsAndAwDocs(targetDir, namespace) {
   copyInstructions(targetDir, null, namespace);
   initAwDocs(targetDir);
@@ -262,9 +278,11 @@ export async function initCommand(args) {
 
     ensureAwGitignore(AW_HOME);
     const freshCfg = config.load(GLOBAL_AW_DIR);
-    if (existsSync(GLOBAL_AW_DIR)) {
-      syncFileTree(join(AW_HOME, RULES_SOURCE_DIR), join(GLOBAL_AW_DIR, RULES_SOURCE_DIR));
+    syncRulesTargets(HOME);
+    if (cwd !== HOME) {
+      syncRulesTargets(cwd);
     }
+    removeLegacyRegistryRules();
 
     // Ensure project worktree sparse checkout matches the global clone.
     // Covers the case where a namespace was added from HOME (or another project)
@@ -404,9 +422,11 @@ export async function initCommand(args) {
   if (folderName) {
     config.addPattern(GLOBAL_AW_DIR, folderName);
   }
-  if (existsSync(GLOBAL_AW_DIR)) {
-    syncFileTree(join(AW_HOME, RULES_SOURCE_DIR), join(GLOBAL_AW_DIR, RULES_SOURCE_DIR));
+  syncRulesTargets(HOME);
+  if (cwd !== HOME) {
+    syncRulesTargets(cwd);
   }
+  removeLegacyRegistryRules();
 
   // Step 3: Setup tasks, MCP, hooks
   await installAwEcc(cwd, { silent });

package/commands/pull.mjs

@@ -3,6 +3,7 @@
 import {
   existsSync,
   lstatSync,
+  rmSync,
 } from 'node:fs';
 import { dirname, join, extname } from 'node:path';
 import { homedir } from 'node:os';
@@ -27,6 +28,7 @@ import {
   REGISTRY_URL,
   DOCS_SOURCE_DIR,
   RULES_SOURCE_DIR,
+  RULES_RUNTIME_DIR,
 } from '../constants.mjs';
 import { collectAllPaths, syncFileTree } from '../file-tree.mjs';
 import { linkWorkspace } from '../link.mjs';
@@ -38,6 +40,22 @@ const HOME = homedir();
 const AW_HOME = join(HOME, '.aw');
 const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
 
+function syncRulesTargets(targetDir) {
+  const rulesSrc = join(AW_HOME, RULES_SOURCE_DIR);
+  if (!existsSync(rulesSrc)) return false;
+  syncFileTree(rulesSrc, join(targetDir, RULES_RUNTIME_DIR));
+  return true;
+}
+
+function removeLegacyRegistryRules() {
+  try {
+    rmSync(join(GLOBAL_AW_DIR, RULES_SOURCE_DIR), { recursive: true, force: true });
+    rmSync(join(HOME, RULES_SOURCE_DIR), { recursive: true, force: true });
+  } catch {
+    // best effort cleanup
+  }
+}
+
 export async function pullCommand(args) {
   const input = args._positional?.[0] || '';
   const cwd = process.cwd();
@@ -179,13 +197,6 @@ export async function pullCommand(args) {
     log.logWarn(`Conflicts in: ${fetchResult.conflicts.join(', ')}`);
   }
 
-  const rulesSrc = join(AW_HOME, RULES_SOURCE_DIR);
-  if (existsSync(rulesSrc)) {
-    const rulesDest = join(GLOBAL_AW_DIR, RULES_SOURCE_DIR);
-    syncFileTree(rulesSrc, rulesDest);
-    if (!silent) log.logSuccess('Synced .aw_rules');
-  }
-
   // Rebase project worktree branch onto origin/main — only for legacy git worktrees.
   // In the symlink model, <project>/.aw IS ~/.aw (same repo), so fetchAndMerge already
   // brought it up to date. Nothing to rebase.
@@ -244,6 +255,16 @@ export async function pullCommand(args) {
     }
   }
 
+  let rulesSynced = syncRulesTargets(HOME);
+  const workspaceRoot = localAw ? dirname(localAw) : (cwd !== HOME ? cwd : null);
+  if (workspaceRoot && workspaceRoot !== HOME) {
+    rulesSynced = syncRulesTargets(workspaceRoot) || rulesSynced;
+  }
+  removeLegacyRegistryRules();
+  if (rulesSynced && !silent) {
+    log.logSuccess('Synced .aw_rules');
+  }
+
   if (!args._skipIntegrate) {
     const projectRegistryDir = cwd !== HOME ? join(cwd, '.aw', REGISTRY_DIR) : null;
     const awDirForLinks = (projectRegistryDir && existsSync(projectRegistryDir)) ? projectRegistryDir : null;

package/commands/push-rules.mjs

@@ -23,11 +23,9 @@ export function isRulesPushInput(input) {
 
 export function resolveRulesPushSource(input, cwd = process.cwd()) {
   const localRulesRoot = join(cwd, RULES_SOURCE_DIR);
-  const syncedRulesRoot = join(cwd, '.aw_registry', RULES_SOURCE_DIR);
 
   if (!input) {
     if (existsSync(localRulesRoot)) return { sourceRoot: localRulesRoot, sourceType: 'local' };
-    if (existsSync(syncedRulesRoot)) return { sourceRoot: syncedRulesRoot, sourceType: 'synced' };
     return null;
   }
 
@@ -39,22 +37,19 @@ export function resolveRulesPushSource(input, cwd = process.cwd()) {
   }
 
   if (normalizedInput === `.aw_registry/${RULES_SOURCE_DIR}` || normalizedInput.startsWith(`.aw_registry/${RULES_SOURCE_DIR}/`)) {
-    if (!existsSync(syncedRulesRoot)) return null;
-
     const relativeRulesPath = normalizedInput.slice(`.aw_registry/${RULES_SOURCE_DIR}`.length).replace(/^\/+/, '');
     const localOverridePath = relativeRulesPath ? join(localRulesRoot, relativeRulesPath) : localRulesRoot;
     if (existsSync(localOverridePath)) {
       return { sourceRoot: localRulesRoot, sourceType: 'local' };
     }
-
-    return { sourceRoot: syncedRulesRoot, sourceType: 'synced' };
+    return null;
   }
 
   return null;
 }
 
 export function hasRulesChanges(cwd = process.cwd()) {
-  const candidateDirs = [RULES_SOURCE_DIR, `.aw_registry/${RULES_SOURCE_DIR}`]
+  const candidateDirs = [RULES_SOURCE_DIR]
     .filter(rel => existsSync(join(cwd, rel)));
 
   if (candidateDirs.length === 0) return false;
@@ -141,9 +136,7 @@ function pushRulesTree(sourceRoot, { repo, dryRun, cwd }) {
       fmt.cancel('Nothing to push — remote rules already match local content.');
     }
 
-    const sourceType = normalize(sourceRoot).includes(normalize(join('.aw_registry', RULES_SOURCE_DIR)))
-      ? 'synced'
-      : 'local';
+    const sourceType = 'local';
     const prTitle = buildRulesPrTitle(sourceRoot, cwd);
     const prBody = buildRulesPrBody(sourceRoot, sourceType, cwd);
 
@@ -191,16 +184,12 @@ export function pushRulesCommand(args) {
     fmt.cancel([
       'Could not find a rules source to push.',
       '',
-      `  Checked ${chalk.cyan('.aw_rules/')} and ${chalk.cyan('.aw_registry/.aw_rules/')}.`,
+      `  Checked ${chalk.cyan('.aw_rules/')}.`,
       '',
       '  Use `aw pull platform` first or create a local `.aw_rules/` authoring tree.',
     ].join('\n'));
   }
 
-  if (resolved.sourceType === 'synced') {
-    fmt.logWarn('Pushing from synced `.aw_registry/.aw_rules/`. Local `.aw_rules/` is safer for authoring.');
-  }
-
   pushRulesTree(resolved.sourceRoot, { repo, dryRun, cwd });
 }
 

package/commands/telemetry.mjs

@@ -1,8 +1,5 @@
-// commands/telemetry.mjs — `aw telemetry [enable|disable|status|flush-queue]`
+// commands/telemetry.mjs — `aw telemetry [enable|disable|status]`
 
-import { existsSync, readFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { homedir } from 'node:os';
 import { enableTelemetry, disableTelemetry, getStatus } from '../telemetry.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
@@ -22,66 +19,13 @@ export async function telemetryCommand(args) {
     return;
   }
 
-  if (sub === 'flush-queue') {
-    await flushQueueCommand();
-    return;
-  }
-
   // status (default)
   const status = getStatus();
   fmt.intro('aw telemetry');
   fmt.logStep(`Status:     ${status.enabled ? chalk.green('enabled') : chalk.red('disabled')}`);
   fmt.logStep(`Machine ID: ${chalk.dim(status.machine_id)}`);
   fmt.logStep(`Config:     ${chalk.dim(status.config_path)}`);
-
-  // Show queue depth if available
-  const queueFile = join(homedir(), '.aw', 'telemetry', 'queue.jsonl');
-  if (existsSync(queueFile)) {
-    try {
-      const lines = readFileSync(queueFile, 'utf8').trim().split('\n').filter(Boolean);
-      fmt.logStep(`Queue:      ${chalk.yellow(lines.length)} pending prompt(s)`);
-    } catch { /* best effort */ }
-  }
-
   fmt.logMessage('');
-  fmt.logMessage(`  ${chalk.dim('aw telemetry disable')}      — opt out of anonymous analytics`);
-  fmt.logMessage(`  ${chalk.dim('aw telemetry enable')}       — re-enable analytics`);
-  fmt.logMessage(`  ${chalk.dim('aw telemetry flush-queue')}  — manually flush pending queue`);
-}
-
-async function flushQueueCommand() {
-  const eccBase = join(homedir(), '.aw-ecc');
-  const libPath = join(eccBase, 'scripts', 'hooks', 'capabilities', 'telemetry', 'telemetry-lib.js');
-
-  if (!existsSync(libPath)) {
-    fmt.logWarn('Telemetry library not found. Run aw init first.');
-    return;
-  }
-
-  const {
-    readQueue,
-    flushQueueToApi,
-    getNamespace,
-    buildTelemetryHeaders,
-  } = await import(libPath);
-
-  const entries = readQueue();
-  if (entries.length === 0) {
-    fmt.logSuccess('Queue is empty — nothing to flush.');
-    return;
-  }
-
-  fmt.logStep(`Flushing ${entries.length} pending prompt(s)...`);
-
-  const namespace = getNamespace();
-  const headers = buildTelemetryHeaders(namespace);
-  const result = await flushQueueToApi(headers);
-
-  if (result.flushed > 0) {
-    fmt.logSuccess(`Flushed ${result.flushed} prompt(s) to API.`);
-  } else if (result.failed) {
-    fmt.logWarn('Flush failed — entries remain in queue for retry.');
-  } else {
-    fmt.logSuccess('Nothing to flush.');
-  }
+  fmt.logMessage(`  ${chalk.dim('aw telemetry disable')}  — opt out of anonymous analytics`);
+  fmt.logMessage(`  ${chalk.dim('aw telemetry enable')}   — re-enable analytics`);
 }

package/constants.mjs

@@ -25,8 +25,10 @@ export const DOCS_SOURCE_DIR = 'content';
 /** Persistent git clone root — ~/.aw/ */
 export const AW_HOME = join(homedir(), '.aw');
 
-/** Directory in platform-docs repo containing platform rules (pulled into .aw_registry/.aw_rules/) */
+/** Directory in platform-docs repo containing platform rules (synced into root-level .aw_rules/) */
 export const RULES_SOURCE_DIR = '.aw_rules';
+/** Runtime location exposed to harnesses and generated instructions */
+export const RULES_RUNTIME_DIR = '.aw/.aw_rules';
 /** Telemetry endpoint — override with AW_TELEMETRY_URL env var */
 export const TELEMETRY_URL = process.env.AW_TELEMETRY_URL || 'https://services.leadconnectorhq.com/agentic-workspace/api/telemetry/events';
 

package/ecc.mjs

@@ -10,7 +10,7 @@ import { applyStoredStartupPreferences } from "./startup.mjs";
 
 const AW_ECC_REPO_SSH = "git@github.com:shreyansh-ghl/aw-ecc.git";
 const AW_ECC_REPO_HTTPS = "https://github.com/shreyansh-ghl/aw-ecc.git";
-export const AW_ECC_TAG = "v1.0.2";
+export const AW_ECC_TAG = "v1.4.37";
 
 const MARKETPLACE_NAME = "aw-marketplace";
 const PLUGIN_KEY = `aw@${MARKETPLACE_NAME}`;
@@ -160,6 +160,32 @@ function cloneOrUpdate(tag, dest) {
   }
 }
 
+/**
+ * Transform canonical /aw: references to Cursor-compatible /aw- in installed
+ * skill and rule files. Cursor namespaces commands via directory structure
+ * (commands/aw/plan.md → /aw-plan) rather than colons.
+ */
+function transformCursorAwRefs(home) {
+  const dirs = [
+    join(home, ".cursor", "skills"),
+    join(home, ".cursor", "rules"),
+  ];
+  for (const dir of dirs) {
+    if (!existsSync(dir)) continue;
+    for (const entry of readdirSync(dir, { withFileTypes: true, recursive: true })) {
+      if (!entry.isFile()) continue;
+      const ext = entry.name.split(".").pop();
+      if (!["md", "mdc"].includes(ext)) continue;
+      const filePath = join(entry.parentPath || entry.path, entry.name);
+      try {
+        const content = readFileSync(filePath, "utf8");
+        if (!content.includes("/aw:")) continue;
+        writeFileSync(filePath, content.replace(/\/aw:/g, "/aw-"));
+      } catch { /* best effort */ }
+    }
+  }
+}
+
 function installClaudePlugin(repoDir) {
   // Always remove first so we re-register from the correct repoDir.
   // Falling back to `marketplace update` is unsafe — it updates from the
@@ -241,9 +267,6 @@ export async function installAwEcc(
   try {
     cloneOrUpdate(AW_ECC_TAG, repoDir);
 
-    // Ensure telemetry state directory exists (vendor-agnostic, shared across IDEs)
-    mkdirSync(join(home, ".aw", "telemetry"), { recursive: true });
-
     // Claude Code: plugin install via marketplace CLI (proper agent dispatch)
     if (targets.includes("claude")) {
       try {
@@ -259,6 +282,15 @@ export async function installAwEcc(
       run("npm install --no-audit --no-fund --ignore-scripts --loglevel=error", {
         cwd: repoDir,
       });
+      // generate-aw-hooks.js produces hooks.json and hook script sources that
+      // install-apply.js needs.  npm install uses --ignore-scripts so the
+      // prepare script (which normally runs this) is skipped — call explicitly.
+      const generateHooksScript = join(repoDir, "scripts", "generate-aw-hooks.js");
+      if (existsSync(generateHooksScript)) {
+        try {
+          run(`node "${generateHooksScript}"`, { cwd: repoDir });
+        } catch { /* best effort — older engine versions may not have this script */ }
+      }
       for (const target of fileCopyTargets) {
         try {
           const snapshot = snapshotProtectedConfigs(home, target);
@@ -279,6 +311,10 @@ export async function installAwEcc(
           // so they're accessible as /aw:tdd, /aw:plan — same as Claude Code plugin.
           if (target === "cursor") {
             namespaceCursorCommands(runCwd);
+            // Cursor commands use hyphens (commands/aw/plan.md -> /aw-plan)
+            // but source skill/rule files use canonical colons (/aw:plan).
+            // Transform /aw: -> /aw- in installed cursor skill/rule files.
+            transformCursorAwRefs(home);
           }
           // Run sync script for codex: generates ~/.codex/prompts/*.md and
           // merges AGENTS.md — Codex has no slash commands, so prompts are the

package/hooks/codex-home.mjs

@@ -3,7 +3,6 @@ import { join } from 'node:path';
 import { getSupportedHarnessPhaseEntries } from '../hook-manifest.mjs';
 import {
   buildDelegatingPhaseScript,
-  buildNodeSilentPhaseScript,
   buildRegistryDelegatingPhaseScript,
   buildReservedPhaseScript,
 } from './shared-phase-scripts.mjs';
@@ -111,9 +110,10 @@ const CODEX_HOME_PHASE_BLUEPRINTS = {
     scriptName: 'aw-stop.sh',
     scriptMarker: '# aw-managed: codex-global-stop',
     buildScriptContent() {
-      return buildNodeSilentPhaseScript({
+      return buildReservedPhaseScript({
         marker: this.scriptMarker,
-        targetPath: '$HOME/.aw-ecc/scripts/hooks/capabilities/telemetry/telemetry-stop.js',
+        phase: 'Stop',
+        harnessLabel: 'Codex home routing',
       });
     },
     buildEntry(command) {

package/hooks/shared-phase-scripts.mjs

@@ -54,23 +54,6 @@ exit 0
 `;
 }
 
-export function buildNodeSilentPhaseScript({
-  marker,
-  targetPath,
-}) {
-  return `#!/usr/bin/env bash
-${marker}
-set -euo pipefail
-
-TARGET="${targetPath}"
-if [[ -f "$TARGET" ]]; then
-  node "$TARGET" > /dev/null
-fi
-
-exit 0
-`;
-}
-
 export function buildReservedPhaseScript({
   marker,
   phase,

package/integrate.mjs

@@ -29,7 +29,7 @@ function generateAwRouterBridgeSection() {
 - Do not assume the previous skill stack is still active
 
 ### 2. Read Rules Before Acting (MANDATORY)
-- Read applicable AW rules from \`~/.aw/.aw_registry/.aw_rules/platform/<domain>/AGENTS.md\`
+- Read applicable AW rules from \`~/.aw/.aw_rules/platform/<domain>/AGENTS.md\`
 - Also read \`universal\` and \`security\` rules whenever they apply
 - If repo-local instructions conflict with org-level sources of truth, follow org-level sources
 
@@ -260,12 +260,12 @@ export function syncHomeHarnessInstructions(homeDir = homedir()) {
   const codexRulesSection = rulesDir
     ? generateAgentsMdRulesSection(rulesDir, {
       outputDir: join(homeDir, '.codex'),
-    }).replaceAll('../.aw/.aw_registry/', '../.aw_registry/')
+    })
     : '';
   const cursorRulesSection = rulesDir
     ? generateAgentsMdRulesSection(rulesDir, {
       outputDir: join(homeDir, '.cursor'),
-    }).replaceAll('../.aw/.aw_registry/', '../.aw_registry/')
+    })
     : '';
   const claudeRulesSection = rulesDir ? generateClaudeMdRulesSection(rulesDir) : '';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.38-beta.8",
+  "version": "0.1.38",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": {

package/render-rules.mjs

@@ -1,12 +1,17 @@
-// render-rules.mjs — Render .aw_rules into IDE-specific output files.
+// render-rules.mjs — Render runtime AW rules into IDE-specific output files.
 
 import { existsSync, readFileSync, mkdirSync, writeFileSync, readdirSync, unlinkSync } from 'node:fs';
 import { dirname, join, relative } from 'node:path';
 import { homedir } from 'node:os';
 import * as fmt from './fmt.mjs';
-import { RULES_SOURCE_DIR } from './constants.mjs';
-
-const GENERATED_HEADER = '<!-- Generated by aw — do not edit manually -->\n\n';
+import { RULES_RUNTIME_DIR } from './constants.mjs';
+
+// The marker is placed AFTER the YAML frontmatter so Cursor/Markdown parsers
+// see the frontmatter at byte 0. Putting an HTML comment before --- breaks
+// Cursor's alwaysApply/globs detection.
+const GENERATED_MARKER = '<!-- Generated by aw — do not edit manually -->';
+// Legacy header (pre-pattern comment first) — kept for pruning old files.
+const LEGACY_GENERATED_HEADER = '<!-- Generated by aw — do not edit manually -->\n\n';
 const STACK_OVERLAY_FLAG = 'AW_ENABLE_STACK_OVERLAY_RULES';
 
 /** Rule scope → Cursor .mdc glob patterns */
@@ -171,14 +176,12 @@ function relativeRuleLink(outputDir, targetPath) {
 export function resolveRulesSourceDir(cwd, options = {}) {
   const HOME = options.homeDir || homedir();
   const candidates = [
-    join(cwd, '.aw_registry', RULES_SOURCE_DIR),
-    join(cwd, '.aw', '.aw_registry', RULES_SOURCE_DIR),
+    join(cwd, RULES_RUNTIME_DIR),
   ];
 
   if (cwd !== HOME) {
     candidates.push(
-      join(HOME, '.aw_registry', RULES_SOURCE_DIR),
-      join(HOME, '.aw', '.aw_registry', RULES_SOURCE_DIR),
+      join(HOME, RULES_RUNTIME_DIR),
     );
   }
 
@@ -198,7 +201,8 @@ function pruneStaleGeneratedRules(outputDir, expectedFilenames) {
 
     const fullPath = join(outputDir, entry.name);
     const content = readOrNull(fullPath);
-    if (!content?.startsWith(GENERATED_HEADER)) continue;
+    // Match both new pattern (marker after frontmatter) and legacy (marker at top).
+    if (!content || (!content.includes(GENERATED_MARKER) && !content.startsWith(LEGACY_GENERATED_HEADER))) continue;
 
     try {
       unlinkSync(fullPath);
@@ -305,14 +309,92 @@ function renderCursorRules(cwd, rulesDir, options = {}) {
       }
     }
 
-    const content = GENERATED_HEADER + frontmatter.join('\n') + '\n\n' + agentsMd.trim() + '\n' + refSection;
+    // Frontmatter MUST be at byte 0 for Cursor's YAML parser.
+    // Generated marker goes on the line immediately after the closing ---.
+    const content = frontmatter.join('\n') + '\n' + GENERATED_MARKER + '\n\n' + agentsMd.trim() + '\n' + refSection;
     writeFileSync(join(cursorRulesDir, `${scopeToFilename(scope)}.mdc`), content);
     count++;
   }
 
+  // Generate the AW routing rule — this is the hard gate that forces
+  // route selection → stage skill read → follow behavior → respond.
+  const routingRule = generateCursorAwRoutingRule();
+  writeFileSync(join(cursorRulesDir, 'common-aw-routing.mdc'), routingRule);
+  count++;
+
   return count;
 }
 
+function generateCursorAwRoutingRule() {
+  // Frontmatter MUST be at byte 0 for Cursor's alwaysApply/globs detection.
+  return `---
+description: "AW global routing: select route, READ stage skill, then respond"
+alwaysApply: true
+---
+${GENERATED_MARKER}
+
+# AW Global Routing
+
+## Hard Gate (MUST — do not skip)
+
+For every non-trivial request, execute these steps in order before any substantive response:
+
+1. **Load the router** — Read the using-aw-skills SKILL.md from the skills directory.
+
+2. **Select route** — using the decision tree below, pick the smallest correct AW route.
+
+3. **Read the stage skill** — you MUST Read the matching skill file before responding:
+   - /aw-plan → Read aw-plan/SKILL.md
+   - /aw-build → Read aw-build/SKILL.md
+   - /aw-investigate → Read aw-investigate/SKILL.md
+   - /aw-test → Read aw-test/SKILL.md
+   - /aw-review → Read aw-review/SKILL.md
+   - /aw-deploy → Read aw-deploy/SKILL.md
+   - /aw-ship → Read aw-ship/SKILL.md
+
+4. **Follow the skill's behavior** — produce the artifacts the skill defines, not general-knowledge answers.
+
+5. **Then respond** — only after steps 1-4.
+
+Stating a route without Reading the skill file is NOT compliance.
+
+## Route Decision Tree
+
+\`\`\`text
+Does an approved plan/spec already exist for this exact work?
+├── NO → Is the request about a bug, alert, or unclear failure?
+│         ├── YES → /aw-investigate
+│         └── NO  → /aw-plan  ← DEFAULT for anything new
+└── YES → Is the work implemented and needs testing/review?
+          ├── YES → /aw-test or /aw-review
+          └── NO  → Is this a deploy or release action?
+                    ├── YES → /aw-deploy or /aw-ship
+                    └── NO  → /aw-build
+\`\`\`
+
+**Plan-first rule**: New endpoints, services, schemas, features, architecture changes, and integrations ALL go through /aw-plan first. /aw-build requires an approved plan or a mechanical change.
+
+## Default Assumptions
+
+- /aw-plan → write file artifacts under .aw_docs/features/<slug>/ unless user says "chat only".
+- /aw-build → code changes with tests.
+- /aw-investigate → reproduction + root cause evidence.
+
+## Org Rules
+
+After the stage skill is loaded, also read the relevant org rules:
+
+- Always read: universal/AGENTS.md and security/AGENTS.md
+- Then pick the smallest correct domain rule (api-design, backend, data, frontend, infra, mobile, sdet).
+- If repo-local instructions conflict with org-level AW rules, follow org-level.
+
+## Compatibility
+
+- /aw-execute → resolve to /aw-build
+- /aw-verify → resolve to /aw-test or /aw-review
+`;
+}
+
 /** Rule scope → Claude Code paths: frontmatter (only supported field for .claude/rules/) */
 const SCOPE_PATHS = {
   'api-design': ['src/**/*.controller.ts', 'src/**/dto/**/*.ts', 'src/**/*.client.ts'],
@@ -389,7 +471,8 @@ function renderClaudeRules(cwd, rulesDir, options = {}) {
       }
     }
 
-    const content = GENERATED_HEADER + frontmatter + agentsMd.trim() + '\n' + refSection;
+    // Claude Code reads .md frontmatter similarly — keep marker after frontmatter.
+    const content = frontmatter + GENERATED_MARKER + '\n\n' + agentsMd.trim() + '\n' + refSection;
     writeFileSync(join(claudeRulesDir, `${scopeToFilename(scope)}.md`), content);
     count++;
   }
@@ -398,7 +481,7 @@ function renderClaudeRules(cwd, rulesDir, options = {}) {
 }
 
 /**
- * Generate a rules section for CLAUDE.md from .aw_rules.
+ * Generate a rules section for CLAUDE.md from runtime AW rules.
  */
 export function generateClaudeMdRulesSection(rulesDir) {
   const manifest = readManifest(rulesDir);
@@ -410,7 +493,7 @@ export function generateClaudeMdRulesSection(rulesDir) {
   const lines = [
     '## Platform Rules (MUST)',
     '',
-    '> Auto-synced from `.aw_registry/.aw_rules/`. Full details in reference files.',
+    '> Rendered from platform `.aw/.aw_rules/`. Full details in reference files.',
     '',
   ];
 
@@ -419,14 +502,14 @@ export function generateClaudeMdRulesSection(rulesDir) {
   }
 
   lines.push('');
-  lines.push('See `.aw_registry/.aw_rules/rule-manifest.json` for all rules including SHOULD/MAY.');
+  lines.push('See `.aw/.aw_rules/rule-manifest.json` for all rules including SHOULD/MAY.');
   lines.push('');
 
   return lines.join('\n');
 }
 
 /**
- * Generate a rules section for AGENTS.md from the top-level AGENTS.md in .aw_rules.
+ * Generate a rules section for AGENTS.md from the top-level AGENTS.md in runtime AW rules.
  */
 export function generateAgentsMdRulesSection(rulesDir, options = {}) {
   const topLevelAgents = readOrNull(join(rulesDir, 'AGENTS.md'));
@@ -436,7 +519,7 @@ export function generateAgentsMdRulesSection(rulesDir, options = {}) {
   const lines = [
     '## Platform Rules — Non-Negotiables',
     '',
-    '> Auto-synced from `.aw_registry/.aw_rules/`.',
+    '> Rendered from platform `.aw/.aw_rules/`.',
     '',
     topLevelAgents.trim(),
     '',
@@ -487,7 +570,7 @@ export function generateAgentsMdRulesSection(rulesDir, options = {}) {
 
 /**
  * Main render function. Call after aw pull / aw sync.
- * Reads .aw_registry/.aw_rules/ and renders:
+ * Reads runtime .aw/.aw_rules/ and renders:
  *   1. .cursor/rules/<scope>.mdc — at cwd AND at $HOME (global)
  *   2. Returns sections for CLAUDE.md and AGENTS.md injection
  */