@ghl-ai/aw 0.1.38-beta.12 → 0.1.38-beta.13

package/cli.mjs

@@ -18,9 +18,6 @@ const COMMANDS = {
   'push-rules': () => import('./commands/push-rules.mjs').then(m => m.pushRulesCommand),
   drop:    () => import('./commands/drop.mjs').then(m => m.dropCommand),
   status:  () => import('./commands/status.mjs').then(m => m.statusCommand),
-  doctor:  () => import('./commands/doctor.mjs').then(m => m.doctorCommand),
-  routing: () => import('./commands/startup.mjs').then(m => m.routingCommand),
-  startup: () => import('./commands/startup.mjs').then(m => m.startupCommand),
   search:  () => import('./commands/search.mjs').then(m => m.searchCommand),
   link:    () => import('./commands/link-project.mjs').then(m => m.linkProjectCommand),
   nuke:    () => import('./commands/nuke.mjs').then(m => m.nukeCommand),
@@ -100,11 +97,7 @@ function printHelp() {
 
     sec('Manage'),
     cmd('aw status', 'Show synced paths, modified files & conflicts'),
-    cmd('aw doctor', 'Run a health check for routing, MCP, plugin, and AW ECC surfaces'),
     cmd('aw link', 'Link current project as a git worktree (wires IDE symlinks)'),
-    cmd('aw routing status', 'Show global AW session-routing mode for Claude/Cursor/Codex'),
-    cmd('aw routing disable', 'Disable automatic AW session routing globally'),
-    cmd('aw routing enable', 'Re-enable automatic AW session routing globally'),
     cmd('aw drop <path>', 'Stop syncing or delete local content'),
     cmd('aw nuke', 'Remove entire .aw_registry/ & start fresh'),
     cmd('aw daemon install', 'Auto-pull on a schedule (macOS launchd / Linux cron)'),
@@ -134,7 +127,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'),
+    cmd('aw push-rules', 'Pushes .aw_rules or .aw_registry/.aw_rules'),
     '',
     `  ${chalk.dim('# Remove content from workspace')}`,
     cmd('aw drop <team>', 'Stop syncing a namespace (removes all files)'),

package/commands/init.mjs

@@ -23,14 +23,12 @@ import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { linkWorkspace } from '../link.mjs';
-import { generateCommands, copyInstructions, initAwDocs, syncHomeHarnessInstructions } from '../integrate.mjs';
+import { generateCommands, copyInstructions, initAwDocs } from '../integrate.mjs';
 import { setupMcp } from '../mcp.mjs';
-import { applyStoredStartupPreferences, ensureAwRuntimeHook } from '../startup.mjs';
 import { installLocalCommitHook } from '../hooks.mjs';
 import { autoUpdate, promptUpdate } from '../update.mjs';
 import { installGlobalHooks } from '../hooks.mjs';
 import { installAwEcc } from '../ecc.mjs';
-import { removeWorkspaceHookDefaults } from '../codex.mjs';
 import {
   initPersistentClone,
   isValidClone,
@@ -59,34 +57,6 @@ 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_SOURCE_DIR));
-  return true;
-}
-
-function removeLegacyRegistryRules() {
-  try {
-    rmSync(join(GLOBAL_AW_DIR, RULES_SOURCE_DIR), { recursive: true, force: true });
-  } catch {
-    // best effort cleanup
-  }
-}
-
-function syncInstructionsAndAwDocs(targetDir, namespace) {
-  copyInstructions(targetDir, null, namespace);
-  initAwDocs(targetDir);
-}
-
-function syncHomeAndProjectInstructions(cwd, namespace) {
-  syncHomeHarnessInstructions(HOME);
-  initAwDocs(HOME);
-  if (cwd !== HOME) {
-    syncInstructionsAndAwDocs(cwd, namespace);
-  }
-}
-
 // ── Ensure ~/.aw/.gitignore has personal/local entries ───────────────────
 
 const AW_GITIGNORE_ENTRIES = [
@@ -277,11 +247,9 @@ export async function initCommand(args) {
 
     ensureAwGitignore(AW_HOME);
     const freshCfg = config.load(GLOBAL_AW_DIR);
-    syncRulesTargets(HOME);
-    if (cwd !== HOME) {
-      syncRulesTargets(cwd);
+    if (existsSync(GLOBAL_AW_DIR)) {
+      syncFileTree(join(AW_HOME, RULES_SOURCE_DIR), join(GLOBAL_AW_DIR, RULES_SOURCE_DIR));
     }
-    removeLegacyRegistryRules();
 
     // Ensure project worktree sparse checkout matches the global clone.
     // Covers the case where a namespace was added from HOME (or another project)
@@ -292,11 +260,9 @@ export async function initCommand(args) {
     }
 
     await installAwEcc(cwd, { silent });
-    ensureAwRuntimeHook(HOME);
-    syncHomeAndProjectInstructions(cwd, freshCfg?.namespace || team);
+    copyInstructions(HOME, null, freshCfg?.namespace || team) || [];
+    initAwDocs(HOME);
     await setupMcp(HOME, freshCfg?.namespace || team, { silent });
-    applyStoredStartupPreferences(HOME);
-    const removedLegacyStartupFiles = cwd !== HOME ? removeWorkspaceHookDefaults(cwd) : [];
     installGlobalHooks();
 
     // Remove old local .git/hooks/post-checkout that pre-dates core.hooksPath (creates stale .aw_registry symlink)
@@ -338,9 +304,6 @@ export async function initCommand(args) {
         '',
         `  ${chalk.green('✓')} Registry synced`,
         `  ${chalk.green('✓')} IDE refreshed — ${chalk.bold(symlinks)} symlinks · ${chalk.bold(commands)} commands`,
-        removedLegacyStartupFiles.length > 0
-          ? `  ${chalk.green('✓')} Removed ${removedLegacyStartupFiles.length} legacy repo startup file${removedLegacyStartupFiles.length > 1 ? 's' : ''}`
-          : null,
         cwd !== HOME && isWorktree(join(cwd, '.aw')) ? `  ${chalk.green('✓')} Project linked` : null,
       ].filter(Boolean).join('\n'));
     }
@@ -421,19 +384,15 @@ export async function initCommand(args) {
   if (folderName) {
     config.addPattern(GLOBAL_AW_DIR, folderName);
   }
-  syncRulesTargets(HOME);
-  if (cwd !== HOME) {
-    syncRulesTargets(cwd);
+  if (existsSync(GLOBAL_AW_DIR)) {
+    syncFileTree(join(AW_HOME, RULES_SOURCE_DIR), join(GLOBAL_AW_DIR, RULES_SOURCE_DIR));
   }
-  removeLegacyRegistryRules();
 
   // Step 3: Setup tasks, MCP, hooks
   await installAwEcc(cwd, { silent });
-  ensureAwRuntimeHook(HOME);
-  syncHomeAndProjectInstructions(cwd, team);
+  const instructionFiles = copyInstructions(HOME, null, team) || [];
+  initAwDocs(HOME);
   const mcpFiles = await setupMcp(HOME, team, { silent }) || [];
-  applyStoredStartupPreferences(HOME);
-  const removedLegacyStartupFiles = cwd !== HOME ? removeWorkspaceHookDefaults(cwd) : [];
   const hooksInstalled = installGlobalHooks();
   installIdeTasks();
 
@@ -480,10 +439,6 @@ export async function initCommand(args) {
     `  ${chalk.green('✓')} Source of truth: ~/.aw/ (git clone)`,
     `  ${chalk.green('✓')} Symlink: ~/.aw_registry/ → ~/.aw/.aw_registry/`,
     `  ${chalk.green('✓')} IDE integration: ~/.claude/, ~/.cursor/, ~/.codex/`,
-    cwd !== HOME ? `  ${chalk.green('✓')} Global startup managed from ~/.claude/, ~/.cursor/, ~/.codex/` : null,
-    removedLegacyStartupFiles.length > 0
-      ? `  ${chalk.green('✓')} Removed ${removedLegacyStartupFiles.length} legacy repo startup file${removedLegacyStartupFiles.length > 1 ? 's' : ''}`
-      : null,
     hooksInstalled ? `  ${chalk.green('✓')} Git hooks: auto-sync on pull/clone (core.hooksPath)` : null,
     `  ${chalk.green('✓')} IDE task: auto-sync on workspace open`,
     cwd !== HOME && isWorktree(join(cwd, '.aw')) ? `  ${chalk.green('✓')} Linked in current project` : null,

package/commands/link-project.mjs

@@ -9,8 +9,6 @@ import { addProjectWorktree, isWorktree, isValidClone } from '../git.mjs';
 import { REGISTRY_DIR, REGISTRY_URL } from '../constants.mjs';
 import { linkWorkspace } from '../link.mjs';
 import { generateCommands } from '../integrate.mjs';
-import { removeWorkspaceHookDefaults } from '../codex.mjs';
-import { applyStoredStartupPreferences } from '../startup.mjs';
 import { installLocalCommitHook } from '../hooks.mjs';
 
 const HOME = homedir();
@@ -43,11 +41,8 @@ export function linkProjectCommand(args) {
     const awDirForLinks = existsSync(projectRegistryDir) ? projectRegistryDir : null;
     const symlinks = linkWorkspace(HOME, awDirForLinks, { silent: true });
     const commands = generateCommands(HOME, { silent: true });
-    applyStoredStartupPreferences(HOME);
     installLocalCommitHook(cwd);
-    const removedLegacyStartupFiles = removeWorkspaceHookDefaults(cwd);
-    fmt.logSuccess(`Already linked — refreshed ${chalk.bold(symlinks)} IDE symlinks · ${chalk.bold(commands)} commands${removedLegacyStartupFiles.length > 0 ? ` · removed ${removedLegacyStartupFiles.length} legacy repo startup file${removedLegacyStartupFiles.length > 1 ? 's' : ''}` : ''}`);
-
+    fmt.logSuccess(`Already linked — refreshed ${chalk.bold(symlinks)} IDE symlinks · ${chalk.bold(commands)} commands`);
     return;
   }
 
@@ -57,19 +52,13 @@ export function linkProjectCommand(args) {
     const awDirForLinks = existsSync(projectRegistryDir) ? projectRegistryDir : null;
     const symlinks = linkWorkspace(HOME, awDirForLinks, { silent: true });
     const commands = generateCommands(HOME, { silent: true });
-    applyStoredStartupPreferences(HOME);
     installLocalCommitHook(cwd);
-    const removedLegacyStartupFiles = removeWorkspaceHookDefaults(cwd);
     fmt.logSuccess([
       `Project linked — ${chalk.bold(symlinks)} IDE symlinks · ${chalk.bold(commands)} commands`,
       '',
       `  ${chalk.green('✓')} ${chalk.dim('.aw/')}                  git worktree (IDE git panel enabled)`,
       `  ${chalk.green('✓')} ${chalk.dim(`.aw/${REGISTRY_DIR}/`)} registry content`,
       `  ${chalk.green('✓')} ${chalk.dim('.claude/.cursor/.codex/')} IDE symlinks wired`,
-      `  ${chalk.green('✓')} ${chalk.dim('startup mode')}          global-first via ~/.claude/, ~/.cursor/, ~/.codex/`,
-      removedLegacyStartupFiles.length > 0
-        ? `  ${chalk.green('✓')} ${chalk.dim('legacy repo hooks')} removed ${removedLegacyStartupFiles.length} AW-managed file${removedLegacyStartupFiles.length > 1 ? 's' : ''}`
-        : null,
     ].join('\n'));
   } catch (e) {
     fmt.cancel(`Failed to link project: ${e.message}`);

package/commands/nuke.mjs

@@ -2,7 +2,7 @@
 //
 // Safety guarantee: NEVER deletes files that AW didn't create.
 
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
 import { existsSync, rmSync, lstatSync, unlinkSync, readdirSync, readFileSync, readlinkSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { execSync, exec as execCb } from 'node:child_process';
@@ -15,14 +15,13 @@ import { removeGlobalHooks } from '../hooks.mjs';
 import { uninstallAwEcc } from '../ecc.mjs';
 import { removeMcpConfig } from '../mcp.mjs';
 import { listProjectWorktrees } from '../git.mjs';
-import { removeWorkspaceHookDefaults } from '../codex.mjs';
 
 const HOME = homedir();
 const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
 const MANIFEST_PATH = join(GLOBAL_AW_DIR, '.aw-manifest.json');
 
 const IDE_DIRS = ['.claude', '.cursor', '.codex', '.agents'];
-const CONTENT_TYPES = ['agents', 'skills', 'commands', 'evals', 'references'];
+const CONTENT_TYPES = ['agents', 'skills', 'commands', 'evals'];
 
 function loadManifest() {
   if (!existsSync(MANIFEST_PATH)) return null;
@@ -140,11 +139,7 @@ async function removeProjectSymlinks() {
     { encoding: 'utf8', timeout: 30000 }
   );
   for (const linkPath of registryLinks.trim().split('\n').filter(Boolean)) {
-    try {
-      removeWorkspaceHookDefaults(dirname(linkPath));
-      unlinkSync(linkPath);
-      removed++;
-    } catch { /* best effort */ }
+    try { unlinkSync(linkPath); removed++; } catch { /* best effort */ }
   }
 
   // Also remove legacy local .git/hooks/post-checkout installed by old aw versions
@@ -222,12 +217,7 @@ export async function nukeCommand(args) {
   // Remove stale local .aw_registry symlink if present (skip if cwd IS home — that's the global one)
   if (process.cwd() !== HOME) {
     const local = join(process.cwd(), '.aw_registry');
-    try {
-      if (lstatSync(local).isSymbolicLink()) {
-        removeWorkspaceHookDefaults(process.cwd());
-        unlinkSync(local);
-      }
-    } catch { /* fine */ }
+    try { if (lstatSync(local).isSymbolicLink()) unlinkSync(local); } catch { /* fine */ }
   }
 
   const manifest = loadManifest();

package/commands/pull.mjs

@@ -3,9 +3,8 @@
 import {
   existsSync,
   lstatSync,
-  rmSync,
 } from 'node:fs';
-import { dirname, join, extname } from 'node:path';
+import { join, extname } from 'node:path';
 import { homedir } from 'node:os';
 import { exec as execCb, execSync } from 'node:child_process';
 import { promisify } from 'node:util';
@@ -31,29 +30,12 @@ import {
 } from '../constants.mjs';
 import { collectAllPaths, syncFileTree } from '../file-tree.mjs';
 import { linkWorkspace } from '../link.mjs';
-import { generateCommands, copyInstructions, syncHomeHarnessInstructions } from '../integrate.mjs';
-import { removeWorkspaceHookDefaults } from '../codex.mjs';
-import { applyStoredStartupPreferences, ensureAwRuntimeHook } from '../startup.mjs';
+import { generateCommands, copyInstructions } from '../integrate.mjs';
 
 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_SOURCE_DIR));
-  return true;
-}
-
-function removeLegacyRegistryRules() {
-  try {
-    rmSync(join(GLOBAL_AW_DIR, 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();
@@ -195,6 +177,13 @@ 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.
@@ -253,20 +242,9 @@ 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;
-    const startupCleanupDir = localAw ? dirname(localAw) : (cwd !== HOME ? cwd : null);
 
     if (!silent) {
       const ideSpinner = log.spinner();
@@ -274,18 +252,12 @@ export async function pullCommand(args) {
       const symlinks = linkWorkspace(HOME, awDirForLinks, { silent: true });
       ideSpinner.message('Generating commands...');
       const commands = generateCommands(HOME, { silent: true });
-      syncHomeHarnessInstructions(HOME);
-      ensureAwRuntimeHook(HOME);
-      applyStoredStartupPreferences(HOME);
-      if (startupCleanupDir) removeWorkspaceHookDefaults(startupCleanupDir);
+      copyInstructions(HOME, null, cfg.namespace);
       ideSpinner.stop(`IDE wired — ${chalk.bold(symlinks)} symlink${symlinks !== 1 ? 's' : ''}, ${chalk.bold(commands)} command${commands !== 1 ? 's' : ''}`);
     } else {
       linkWorkspace(HOME, awDirForLinks, { silent: true });
       generateCommands(HOME, { silent: true });
-      syncHomeHarnessInstructions(HOME);
-      ensureAwRuntimeHook(HOME);
-      applyStoredStartupPreferences(HOME);
-      if (startupCleanupDir) removeWorkspaceHookDefaults(startupCleanupDir);
+      copyInstructions(HOME, null, cfg.namespace);
     }
   }
 
@@ -318,73 +290,3 @@ function registerMcp(namespace) {
     fmt.logWarn('MCP registration failed (pull still successful)');
   }
 }
-function printDryRun(actions, verbose) {
-  const counts = { ADD: 0, UPDATE: 0, CONFLICT: 0, ORPHAN: 0, UNCHANGED: 0 };
-  const lines = [];
-
-  for (const type of ['agents', 'skills', 'commands', 'evals', 'references']) {
-    const items = actions.filter(a => a.type === type);
-    if (items.length === 0) continue;
-
-    lines.push(chalk.bold(`${type}/`));
-    for (const act of items.sort((a, b) => a.targetFilename.localeCompare(b.targetFilename))) {
-      counts[act.action] = (counts[act.action] || 0) + 1;
-      if (!verbose && act.action === 'UNCHANGED') continue;
-      const ns = act.namespacePath ? chalk.dim(` [${act.namespacePath}]`) : '';
-      lines.push(`  ${fmt.actionLabel(act.action)} ${act.targetFilename}${ns}`);
-    }
-  }
-
-  if (lines.length > 0) {
-    fmt.note(lines.join('\n'), 'Dry Run');
-  }
-
-  fmt.logInfo(`Summary: ${fmt.countSummary(counts)}`);
-  fmt.logWarn('No files modified (--dry-run)');
-}
-
-function printSummary(actions, verbose, conflictCount) {
-  const conflicts = actions.filter(a => a.action === 'CONFLICT');
-
-  for (const type of ['agents', 'skills', 'commands', 'evals', 'references']) {
-    const typeActions = actions.filter(a => a.type === type);
-    if (typeActions.length === 0) continue;
-
-    const counts = { ADD: 0, UPDATE: 0, CONFLICT: 0, ORPHAN: 0, UNCHANGED: 0 };
-    for (const a of typeActions) counts[a.action]++;
-
-    const parts = [];
-    if (counts.ADD > 0) parts.push(chalk.green(`${counts.ADD} new`));
-    if (counts.UPDATE > 0) parts.push(chalk.cyan(`${counts.UPDATE} updated`));
-    if (counts.CONFLICT > 0) parts.push(chalk.red(`${counts.CONFLICT} conflict`));
-    if (counts.ORPHAN > 0) parts.push(chalk.yellow(`${counts.ORPHAN} removed`));
-    const detail = parts.length > 0 ? ` (${parts.join(', ')})` : '';
-
-    fmt.logSuccess(`${typeActions.length} ${type} pulled${detail}`);
-
-    if (verbose) {
-      for (const a of typeActions.filter(a => a.action !== 'UNCHANGED')) {
-        const ns = a.namespacePath ? chalk.dim(` [${a.namespacePath}]`) : '';
-        fmt.logMessage(`  ${fmt.actionLabel(a.action)} ${a.targetFilename}${ns}`);
-      }
-    }
-  }
-
-  if (conflicts.length > 0) {
-    const conflictLines = conflicts.map(c => {
-      return `${chalk.red('both modified:')}  ${c.type}/${c.targetFilename}`;
-    }).join('\n');
-
-    fmt.note(
-      conflictLines + '\n\n' +
-      chalk.dim('Fix conflicts, then re-run pull to verify.\n') +
-      chalk.dim('grep -r "<<<<<<< " .aw_registry/'),
-      chalk.red('Merge Conflicts')
-    );
-
-    fmt.outro(chalk.red('Pull completed with conflicts — resolve and re-run'));
-    process.exit(1);
-  }
-
-  fmt.outro('Pull complete');
-}

package/commands/push-rules.mjs

@@ -23,9 +23,11 @@ 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;
   }
 
@@ -37,19 +39,22 @@ 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 null;
+
+    return { sourceRoot: syncedRulesRoot, sourceType: 'synced' };
   }
 
   return null;
 }
 
 export function hasRulesChanges(cwd = process.cwd()) {
-  const candidateDirs = [RULES_SOURCE_DIR]
+  const candidateDirs = [RULES_SOURCE_DIR, `.aw_registry/${RULES_SOURCE_DIR}`]
     .filter(rel => existsSync(join(cwd, rel)));
 
   if (candidateDirs.length === 0) return false;
@@ -136,7 +141,9 @@ function pushRulesTree(sourceRoot, { repo, dryRun, cwd }) {
       fmt.cancel('Nothing to push — remote rules already match local content.');
     }
 
-    const sourceType = 'local';
+    const sourceType = normalize(sourceRoot).includes(normalize(join('.aw_registry', RULES_SOURCE_DIR)))
+      ? 'synced'
+      : 'local';
     const prTitle = buildRulesPrTitle(sourceRoot, cwd);
     const prBody = buildRulesPrBody(sourceRoot, sourceType, cwd);
 
@@ -184,12 +191,16 @@ export function pushRulesCommand(args) {
     fmt.cancel([
       'Could not find a rules source to push.',
       '',
-      `  Checked ${chalk.cyan('.aw_rules/')}.`,
+      `  Checked ${chalk.cyan('.aw_rules/')} and ${chalk.cyan('.aw_registry/.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/push.mjs

@@ -29,7 +29,7 @@ import { hasRulesChanges, isRulesPushInput, pushRulesCommand } from './push-rule
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const VERSION = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf8')).version;
 
-const PUSHABLE_TYPES = ['agents', 'skills', 'commands', 'evals', 'references'];
+const PUSHABLE_TYPES = ['agents', 'skills', 'commands', 'evals'];
 
 // ── PR content generation ────────────────────────────────────────────
 
@@ -635,8 +635,8 @@ export async function pushCommand(args) {
     const registryAbsPath = join(registrySubDir, relFromRegistry);
     const allFiles = collectBatchFiles(registryAbsPath, registrySubDir);
     if (allFiles.length === 0) {
-      // Folder/namespace input → batch push
-      fmt.cancel(`Nothing to push in ${chalk.cyan(input)} — no agents, skills, commands, evals, or references found.`);
+      fmt.cancel(`Nothing to push in ${chalk.cyan(input)} — no agents, skills, commands, or evals found.`);
+      return;
     }
     // Only include files that actually have changes (new or modified)
     const folderChanges = detectChanges(awHome, REGISTRY_DIR);
@@ -688,7 +688,7 @@ export async function pushCommand(args) {
     fmt.cancel([
       `Invalid push path: ${chalk.red(resolved.registryPath)}`,
       '',
-      `  Content must live under an ${chalk.bold('agents/')}, ${chalk.bold('skills/')}, ${chalk.bold('commands/')}, ${chalk.bold('evals/')}, or ${chalk.bold('references/')} directory.`,
+      `  Content must live under an ${chalk.bold('agents/')}, ${chalk.bold('skills/')}, ${chalk.bold('commands/')}, or ${chalk.bold('evals/')} directory.`,
       '',
       `  ${chalk.dim('Valid examples:')}`,
       `    aw push .aw_registry/commerce/quality/agents/unit-tester.md`,

package/commands/search.mjs

@@ -98,7 +98,7 @@ function searchLocal(workspaceDir, query) {
     if (!nsEntry.isDirectory() || nsEntry.name.startsWith('.')) continue;
     const ns = nsEntry.name;
 
-    for (const type of ['agents', 'skills', 'commands', 'evals', 'references']) {
+    for (const type of ['agents', 'skills', 'commands', 'evals']) {
       const typeDir = join(workspaceDir, ns, type);
       if (!existsSync(typeDir)) continue;
 

package/constants.mjs

@@ -25,7 +25,7 @@ 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 (synced into root-level .aw_rules/) */
+/** Directory in platform-docs repo containing platform rules (pulled into .aw_registry/.aw_rules/) */
 export const RULES_SOURCE_DIR = '.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';