@ghl-ai/aw 0.1.38-beta.1 → 0.1.38-beta.11

package/cli.mjs

@@ -4,8 +4,9 @@ import { readFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import * as fmt from './fmt.mjs';
-import { chalk } from './fmt.mjs';
+import { chalk, CancelError } from './fmt.mjs';
 import { checkForUpdate, notifyUpdate } from './update.mjs';
+import { startSpan } from './telemetry.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const VERSION = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf8')).version;
@@ -24,6 +25,7 @@ const COMMANDS = {
   link:    () => import('./commands/link-project.mjs').then(m => m.linkProjectCommand),
   nuke:    () => import('./commands/nuke.mjs').then(m => m.nukeCommand),
   daemon:  () => import('./commands/daemon.mjs').then(m => m.daemonCommand),
+  telemetry: () => import('./commands/telemetry.mjs').then(m => m.telemetryCommand),
 };
 
 function parseArgs(argv) {
@@ -109,6 +111,13 @@ function printHelp() {
     cmd('aw daemon install --interval 30m', 'Set custom interval (e.g. 30m, 2h, 3600)'),
     cmd('aw daemon uninstall', 'Stop the background daemon'),
     cmd('aw daemon status', 'Check if daemon is running'),
+    cmd('aw slack-sim run <scenario>', 'Replay Slack-like scenarios against real runtime'),
+    cmd('aw slack-sim list-scenarios', 'List built-in Slack simulator scenarios'),
+
+    sec('Settings'),
+    cmd('aw telemetry status', 'Show telemetry status'),
+    cmd('aw telemetry disable', 'Opt out of anonymous analytics'),
+    cmd('aw telemetry enable', 'Re-enable analytics'),
 
     sec('Examples'),
     '',
@@ -125,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)'),
@@ -158,9 +167,21 @@ export async function run(argv) {
   }
 
   if (command && COMMANDS[command]) {
+    const span = await startSpan(command, args);
+    span.notice();
     args._updateCheck = updateCheck;
-    const handler = await COMMANDS[command]();
-    await handler(args);
+    try {
+      const handler = await COMMANDS[command]();
+      await handler(args);
+      await span.end({ status: 'completed' });
+    } catch (err) {
+      if (err instanceof CancelError) {
+        await span.end({ status: 'cancelled', error_type: 'CancelError' });
+        process.exit(err.exitCode ?? 1);
+      }
+      await span.end({ status: 'failed', error_type: err.constructor.name });
+      throw err;
+    }
     notifyUpdate(await updateCheck);
     return;
   }
@@ -170,5 +191,5 @@ export async function run(argv) {
     process.exit(0);
   }
 
-  fmt.cancel(`Unknown command: ${command}`);
+  fmt.cancelAndExit(`Unknown command: ${command}`);
 }

package/commands/doctor.mjs

@@ -162,10 +162,12 @@ 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_rules'),
+    join(homeDir, '.aw_registry', '.aw_rules'),
+    join(homeDir, '.aw', '.aw_registry', '.aw_rules'),
+  ];
+  return candidates.find(existsSync) || null;
 }
 
 function findClaudePlugin(homeDir) {
@@ -471,7 +473,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_rules/platform/');
 }
 
 function textHasManagedRouterBridge(text) {
@@ -484,9 +486,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 +507,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 +567,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_rules tree found under ~/.aw_rules',
+      'Run `aw init` or `aw pull platform` to sync the AW rules source into ~/.aw_rules.',
     ));
   } else {
     const topLevelRulesAgents = join(rulesDir, 'AGENTS.md');
@@ -578,7 +580,7 @@ function buildDoctorChecks(homeDir, cwd) {
           'aw-rules-source',
           'AW rules source',
           'fail',
-          'Rules source is incomplete under ~/.aw_registry/.aw_rules',
+          'Rules source is incomplete under ~/.aw_rules',
           'Run `aw pull platform` to refresh .aw_rules, then rerun `aw doctor`.',
         ),
     );
@@ -784,7 +786,7 @@ function buildDoctorChecks(homeDir, cwd) {
   );
 
   const claudeRuleFiles = listGeneratedRuleFiles(claudeRulesDir, '.md');
-  const brokenClaudeRuleRefs = findBrokenRegistryReferences(claudeRuleFiles);
+  const brokenClaudeRuleRefs = findBrokenRuleReferences(claudeRuleFiles);
   checks.push(
     claudeRuleFiles.length === 0
       ? makeCheck(
@@ -795,13 +797,13 @@ function buildDoctorChecks(homeDir, cwd) {
         '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_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_rules.',
         ),
   );
 
@@ -894,7 +896,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
@@ -1004,7 +1006,7 @@ function buildDoctorChecks(homeDir, cwd) {
 
   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(
@@ -1015,13 +1017,13 @@ function buildDoctorChecks(homeDir, cwd) {
         '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_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_rules.',
         ),
   );
 

package/commands/init.mjs

@@ -26,6 +26,7 @@ import { linkWorkspace } from '../link.mjs';
 import { generateCommands, copyInstructions, initAwDocs, syncHomeHarnessInstructions } 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';
@@ -58,6 +59,21 @@ 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);
@@ -100,7 +116,7 @@ function installIdeTasks() {
       {
         label: 'aw: sync registry',
         type: 'shell',
-        command: 'aw init --silent',
+        command: 'AW_TRIGGER=ide:task aw init --silent',
         presentation: { reveal: 'silent', panel: 'shared', close: true },
         runOptions: { runOn: 'folderOpen' },
         problemMatcher: [],
@@ -221,7 +237,7 @@ export async function initCommand(args) {
     }
 
     if (choice === 'platform-only') {
-      namespace = null; team = null; subTeam = null; folderName = null;
+      namespace = 'platform'; team = 'platform'; subTeam = null; folderName = null;
     }
   }
 
@@ -261,9 +277,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)
@@ -310,6 +328,7 @@ export async function initCommand(args) {
     const awDirForLinks = (projectRegistryDir && existsSync(projectRegistryDir)) ? projectRegistryDir : null;
     const symlinks = linkWorkspace(HOME, awDirForLinks, { silent: true });
     const commands = generateCommands(HOME, { silent: true });
+    if (cwd !== HOME) installLocalCommitHook(cwd);
 
     if (silent) {
       autoUpdate(await args._updateCheck);
@@ -397,14 +416,16 @@ export async function initCommand(args) {
     }
   }
 
-  // Create sync config
-  const cfg = config.create(GLOBAL_AW_DIR, { namespace: team, user });
+  // Create sync config — default to 'platform' when no namespace specified
+  const cfg = config.create(GLOBAL_AW_DIR, { namespace: team || 'platform', user });
   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 });
@@ -445,6 +466,7 @@ export async function initCommand(args) {
   const projectRegistryDir = cwd !== HOME ? join(cwd, '.aw', REGISTRY_DIR) : null;
   const awDirForLinks = (projectRegistryDir && existsSync(projectRegistryDir)) ? projectRegistryDir : null;
   const symlinks = linkWorkspace(HOME, awDirForLinks, { silent: true });
+  if (cwd !== HOME) installLocalCommitHook(cwd);
   ideSpinner.message('Generating commands...');
   const commands = generateCommands(HOME, { silent: true });
   ideSpinner.stop(`IDE wired — ${chalk.bold(symlinks)} symlinks · ${chalk.bold(commands)} commands`);

package/commands/link-project.mjs

@@ -11,6 +11,7 @@ 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();
 const AW_HOME = join(HOME, '.aw');
@@ -43,8 +44,10 @@ export function linkProjectCommand(args) {
     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' : ''}` : ''}`);
+
     return;
   }
 
@@ -55,6 +58,7 @@ export function linkProjectCommand(args) {
     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`,

package/commands/nuke.mjs

@@ -148,19 +148,24 @@ async function removeProjectSymlinks() {
   }
 
   // Also remove legacy local .git/hooks/post-checkout installed by old aw versions
+  // and prepare-commit-msg hooks installed by installLocalCommitHook
   let hooksRemoved = 0;
-  const { stdout: hookFiles } = await exec(
-    `find "${HOME}" -maxdepth 5 -path "*/.git/hooks/post-checkout" -type f 2>/dev/null || true`,
-    { encoding: 'utf8', timeout: 30000 }
-  );
-  for (const hookPath of hookFiles.trim().split('\n').filter(Boolean)) {
-    try {
-      const content = readFileSync(hookPath, 'utf8');
-      if (content.includes('aw: auto-link registry') || content.includes('ln -s "$AW_REGISTRY"')) {
-        unlinkSync(hookPath);
-        hooksRemoved++;
-      }
-    } catch { /* best effort */ }
+  const hookNames = ['post-checkout', 'prepare-commit-msg'];
+  for (const hookName of hookNames) {
+    const { stdout: hookFiles } = await exec(
+      `find "${HOME}" -maxdepth 5 -path "*/.git/hooks/${hookName}" -type f 2>/dev/null || true`,
+      { encoding: 'utf8', timeout: 30000 }
+    );
+    for (const hookPath of hookFiles.trim().split('\n').filter(Boolean)) {
+      try {
+        const content = readFileSync(hookPath, 'utf8');
+        // Only remove hooks that AW installed — identified by our marker comment
+        if (content.includes('aw:') || content.includes('aw: auto-link registry') || content.includes('ln -s "$AW_REGISTRY"')) {
+          unlinkSync(hookPath);
+          hooksRemoved++;
+        }
+      } catch { /* best effort */ }
+    }
   }
 
   return { removed, hooksRemoved };
@@ -209,8 +214,8 @@ function removeIdeTasks() {
 
 export async function nukeCommand(args) {
   // Catch unhandled errors and surface them instead of letting clack show generic "Something went wrong"
-  process.on('uncaughtException', (e) => { fmt.cancel(`Unexpected error: ${e.message}`); });
-  process.on('unhandledRejection', (e) => { fmt.cancel(`Unexpected error: ${e?.message ?? e}`); });
+  process.on('uncaughtException', (e) => { fmt.cancelAndExit(`Unexpected error: ${e.message}`); });
+  process.on('unhandledRejection', (e) => { fmt.cancelAndExit(`Unexpected error: ${e?.message ?? e}`); });
 
   fmt.intro('aw nuke');
 

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';
@@ -38,13 +39,28 @@ 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();
   const silent = args['--silent'] === true || args._silent === true;
 
   const log = {
-    cancel: silent ? () => { process.exit(0); } : fmt.cancel,
+    cancel: silent ? (msg) => { throw new fmt.CancelError(msg || 'silent cancel', { exitCode: 0 }); } : fmt.cancel,
     logInfo: silent ? () => {} : fmt.logInfo,
     logSuccess: silent ? () => {} : fmt.logSuccess,
     logStep: silent ? () => {} : fmt.logStep,
@@ -179,13 +195,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 +253,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

@@ -5,7 +5,7 @@ import { tmpdir } from 'node:os';
 
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
-import { REGISTRY_BASE_BRANCH, REGISTRY_REPO, RULES_SOURCE_DIR } from '../constants.mjs';
+import { REGISTRY_BASE_BRANCH, REGISTRY_REPO, RULES_SOURCE_DIR, AW_CO_AUTHOR } from '../constants.mjs';
 import { syncFileTree } from '../file-tree.mjs';
 
 function normalizeSlashes(path) {
@@ -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,13 +136,11 @@ 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);
 
-    execSync('git commit -m "registry: sync platform rules"', { cwd: tempDir, stdio: 'pipe' });
+    execSync(`git commit -m "registry: sync platform rules\n\n${AW_CO_AUTHOR}"`, { cwd: tempDir, stdio: 'pipe' });
     s2.stop('Rules sync prepared');
 
     const s3 = fmt.spinner();
@@ -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/push.mjs

@@ -1,7 +1,8 @@
 // commands/push.mjs — Push local agents/skills to registry via PR using persistent git clone
 
 import { existsSync, statSync, readFileSync, appendFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { exec as execCb, execFile as execFileCb } from 'node:child_process';
 import { promisify } from 'node:util';
 import { homedir } from 'node:os';
@@ -10,7 +11,7 @@ const exec = promisify(execCb);
 const execFile = promisify(execFileCb);
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
-import { REGISTRY_REPO, REGISTRY_URL, REGISTRY_BASE_BRANCH, REGISTRY_DIR } from '../constants.mjs';
+import { REGISTRY_REPO, REGISTRY_URL, REGISTRY_BASE_BRANCH, REGISTRY_DIR, AW_CO_AUTHOR } from '../constants.mjs';
 import { resolveInput } from '../paths.mjs';
 import { walkRegistryTree } from '../registry.mjs';
 import {
@@ -25,6 +26,9 @@ import {
 } from '../git.mjs';
 import { hasRulesChanges, isRulesPushInput, pushRulesCommand } from './push-rules.mjs';
 
+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'];
 
 // ── PR content generation ────────────────────────────────────────────
@@ -187,11 +191,14 @@ function generateCommitMsg(files) {
   const deletedParts = Object.entries(groupBy(deleted, 'type')).map(([t, items]) => `${items.length} ${singular(t, items.length)} removed`);
   const countParts = [...addedParts, ...deletedParts];
 
+  const version = VERSION;
+  const trailer = `\n\nGenerated-By: aw/${version}\n${AW_CO_AUTHOR}`;
+
   if (files.length === 1) {
     const f = files[0];
-    return `registry: ${f.deleted ? 'remove' : 'add'} ${f.type}/${f.slug} ${f.deleted ? 'from' : 'to'} ${f.namespace}`;
+    return `registry: ${f.deleted ? 'remove' : 'add'} ${f.type}/${f.slug} ${f.deleted ? 'from' : 'to'} ${f.namespace}${trailer}`;
   }
-  return `registry: sync ${files.length} files (${countParts.join(', ')})`;
+  return `registry: sync ${files.length} files (${countParts.join(', ')})${trailer}`;
 }
 
 // ── Batch file collection from folder ────────────────────────────────