@ghl-ai/aw 0.1.72 → 0.1.73-beta.0

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

@@ -129,29 +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.
-# Re-run `aw pull` post-c4 if the skill surface looks too small.
-verify_registry_skills() {
-  local aw_registry_dir="$HOME/.aw/.aw_registry"
-  if [ ! -d "$aw_registry_dir" ]; then
+# 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
     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 skill_count
-  skill_count=$(find "$aw_registry_dir" -name 'SKILL.md' -path '*/skills/*' ! -path '*/evals/*' 2>/dev/null | wc -l | tr -d ' ')
-  if [ "${skill_count:-0}" -lt 5 ]; then
-    echo "[aw-c4-bootstrap] only ${skill_count} registry skills found — running aw pull"
+  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"
     aw pull 2>&1 | tail -5 || true
     local new_count
-    new_count=$(find "$aw_registry_dir" -name 'SKILL.md' -path '*/skills/*' ! -path '*/evals/*' 2>/dev/null | wc -l | tr -d ' ')
-    echo "[aw-c4-bootstrap] registry skills: ${skill_count} → ${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}"
   else
-    echo "[aw-c4-bootstrap] registry: ${skill_count} skills OK"
+    echo "[aw-c4-bootstrap] registry: ${cmd_count} commands OK"
   fi
 }
-verify_registry_skills || true
+verify_registry_commands || true
 
 exit "$aw_c4_exit"

package/commands/c4.mjs

@@ -110,11 +110,6 @@ function safeListNamespaceDirs(dir) {
   } catch { return []; }
 }
 
-function hasRegistrySkillSurface(registryDir, existsSync = fsExistsSync) {
-  if (existsSync(join(registryDir, 'platform', 'core', 'skills'))) return true;
-  return safeListNamespaceDirs(registryDir).length > 0;
-}
-
 async function safeAsync(label, fn, writer) {
   try {
     return { ok: true, value: await fn() };
@@ -410,17 +405,18 @@ export async function c4Command(rawArgs, overrides = {}) {
     return exit(1);
   }
 
-  // Step 9a — verify registry has the skill surface. `aw init --silent`
+  // Step 9a — verify registry has namespace directories. `aw init --silent`
   // can exit 0 but fail to fetch (fetchAndMerge swallows the error in silent
   // mode). Metadata-only artifacts (AW-PROTOCOL.md) pass a simple non-empty
-  // check, so we specifically look for the platform skill namespace to confirm
-  // the registry content was actually pulled.
+  // check, so we specifically look for directories (namespaces like
+  // "platform") to confirm the registry content was actually pulled.
   {
-    if (!hasRegistrySkillSurface(awRegistry, fs.existsSync)) {
-      writer.stderr('[aw-c4] registry has no platform skill surface after init — retrying with aw pull\n');
+    const registryNamespaces = safeListNamespaceDirs(awRegistry);
+    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 || !hasRegistrySkillSurface(awRegistry, fs.existsSync)) {
-        writer.stderr('[aw-c4] FATAL: registry skills were not fetched\n');
+      if (pullRes?.status !== 0 || safeListNamespaceDirs(awRegistry).length === 0) {
+        writer.stderr('[aw-c4] FATAL: registry commands were not fetched\n');
         return exit(1);
       }
     }
@@ -443,7 +439,7 @@ export async function c4Command(rawArgs, overrides = {}) {
     writer.stdout('[aw-c4] MCP disabled; skipping registerGhlAiMcp\n');
   }
 
-  // Step 12 — legacy slash command surface, when provided by the installed ECC.
+  // Step 12 — slash command surface (10 stage commands from ECC).
   safe('ensureCommandSurface', () => c4.ensureCommandSurface({ harness, home, eccHome }), writer);
 
   // Step 12a — full registry command surface.

package/commands/init.mjs

@@ -25,6 +25,7 @@ import * as fmt from '../fmt.mjs';
 import { chalk, setSilent } from '../fmt.mjs';
 import { linkWorkspace } from '../link.mjs';
 import { generateCommands, copyInstructions, initAwDocs, syncHomeHarnessInstructions } from '../integrate.mjs';
+import { renderRules } from '../render-rules.mjs';
 import { setupMcp } from '../mcp.mjs';
 import { isContextModeRequested } from '../integrations/context-mode.mjs';
 import { applyStoredStartupPreferences, ensureAwRuntimeHook, isDefaultRoutingEnabled } from '../startup.mjs';
@@ -150,6 +151,11 @@ function syncHomeAndProjectInstructions(cwd, namespace) {
   initAwDocs(HOME);
   if (cwd !== HOME) {
     syncInstructionsAndAwDocs(cwd, namespace);
+  } else {
+    // Running from $HOME (fresh-laptop flow): render global IDE rules directly.
+    // The project branch above is otherwise the only renderRules call site, so
+    // init from $HOME used to leave ~/.claude/rules and ~/.cursor/rules empty.
+    renderRules(HOME, { homeDir: HOME });
   }
 }
 

package/ecc.mjs

@@ -12,7 +12,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.4.67-beta.0";
+export const AW_ECC_TAG = "v1.4.66";
 const REQUIRED_ECC_FILES = [
   "package.json",
   "scripts/install-apply.js",

package/git.mjs

@@ -390,7 +390,8 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
   // drops bare-name patterns (e.g. "content", "CODEOWNERS") when HEAD advances.
   //
   // --autostash: AW writes into the registry working tree from external
-  // sources (transformCursorAwRefs rewrites /aw: → /aw- through Cursor
+  // sources (ensureAwRuntimeHook copies ~/.aw-ecc/.../session-start.sh into a
+  // tracked path; transformCursorAwRefs rewrites /aw: → /aw- through Cursor
   // skill directory symlinks that resolve into .aw_registry/). When those
   // versions drift, the working tree is dirty at rebase time and rebase
   // refuses to run, silently aborting the entire pull. Autostash stashes the

package/hooks/aw-usage/lib/aw-usage-telemetry.js

@@ -119,6 +119,11 @@ function getAwCliVersionDetails() {
   const candidates = [
     path.join(AW_HOME, 'node_modules', '@ghl-ai', 'aw', 'package.json'),
   ];
+  // Derive global npm prefix from the running node binary (no shell needed)
+  try {
+    const nodeDir = path.dirname(process.execPath);
+    candidates.push(path.join(nodeDir, '..', 'lib', 'node_modules', '@ghl-ai', 'aw', 'package.json'));
+  } catch { /* ignore */ }
   try {
     const globalPrefix = execSync('npm prefix -g', { encoding: 'utf8', timeout: 3000 }).trim();
     candidates.push(path.join(globalPrefix, 'lib', 'node_modules', '@ghl-ai', 'aw', 'package.json'));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.72",
-  "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
+  "version": "0.1.73-beta.0",
+  "description": "Agentic Workspace CLI \u2014 pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": {
     "aw": "bin.js"
@@ -74,4 +74,4 @@
   "devDependencies": {
     "vitest": "^4.1.2"
   }
-}
+}

package/startup.mjs

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { homedir } from 'node:os';
 import { randomBytes } from 'node:crypto';
@@ -83,6 +83,10 @@ function resolveRegistryRoot(homeDir = homedir()) {
   ].find(existsSync) || null;
 }
 
+function awRuntimeHookSourcePath(homeDir = homedir()) {
+  return join(homeDir, '.aw-ecc', 'skills', 'using-aw-skills', 'hooks', 'session-start.sh');
+}
+
 function readJson(filePath, fallback = {}) {
   if (!existsSync(filePath)) return fallback;
   try {
@@ -389,10 +393,27 @@ function hasCodexSessionStartScript(homeDir = homedir()) {
 }
 
 export function ensureAwRuntimeHook(homeDir = homedir()) {
-  resolveRegistryRoot(homeDir);
-  // The AW router hook is registry-owned. aw-ecc no longer ships SDLC skills
-  // or using-aw-skills, so init/pull must not recreate it from ~/.aw-ecc.
-  return [];
+  const sourcePath = awRuntimeHookSourcePath(homeDir);
+  const registryRoot = resolveRegistryRoot(homeDir);
+  if (!existsSync(sourcePath) || !registryRoot) return [];
+
+  const destinationPath = join(
+    registryRoot,
+    'platform',
+    'core',
+    'skills',
+    'using-aw-skills',
+    'hooks',
+    'session-start.sh',
+  );
+  const sourceContent = readFileSync(sourcePath, 'utf8');
+  const existingContent = existsSync(destinationPath) ? readFileSync(destinationPath, 'utf8') : null;
+  if (existingContent === sourceContent) return [];
+
+  mkdirSync(dirname(destinationPath), { recursive: true });
+  writeFileSync(destinationPath, sourceContent);
+  try { chmodSync(destinationPath, 0o755); } catch { /* best effort */ }
+  return [destinationPath];
 }
 
 function hasCodexHooksEnabled(homeDir = homedir()) {