@ghl-ai/aw 0.1.62-beta.0 → 0.1.62-beta.2

package/c4/commandSurface.mjs

@@ -318,13 +318,15 @@ function isDir(p) {
  * Supports nested domain dirs (e.g. platform/review/commands/).
  */
 function findCommandDirs(nsDir, segments = []) {
+  if (segments.includes('evals')) return [];
+
   const results = [];
   const commandsDir = join(nsDir, 'commands');
   if (existsSync(commandsDir) && isDir(commandsDir)) {
     results.push({ dir: commandsDir, segments });
   }
   for (const entry of safeReaddir(nsDir)) {
-    if (entry === 'commands' || entry.startsWith('.')) continue;
+    if (entry === 'commands' || entry === 'evals' || entry.startsWith('.')) continue;
     const sub = join(nsDir, entry);
     if (isDir(sub)) {
       results.push(...findCommandDirs(sub, [...segments, entry]));

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

@@ -111,6 +111,18 @@ AW_PACKAGE="${AW_PACKAGE:-@ghl-ai/aw@latest}"
 echo "[aw-c4-bootstrap] installing ${AW_PACKAGE}"
 npm install -g "${AW_PACKAGE}"
 
+# --dry-run and --diagnose are read-only modes; skip post-c4 verification
+# so we don't mutate $HOME or contact the registry unexpectedly.
+is_readonly_mode=false
+for arg in "$@"; do
+  case "$arg" in --dry-run|--diagnose) is_readonly_mode=true ;; esac
+done
+
+if "$is_readonly_mode"; then
+  echo "[aw-c4-bootstrap] running: aw c4 $*"
+  exec aw c4 "$@"
+fi
+
 echo "[aw-c4-bootstrap] running: aw c4 $*"
 aw c4 "$@"
 aw_c4_exit=$?
@@ -130,12 +142,12 @@ verify_registry_commands() {
   fi
 
   local cmd_count
-  cmd_count=$(find "$aw_cmd_dir" -name '*.md' -path '*/commands/*' 2>/dev/null | wc -l | tr -d ' ')
+  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_cmd_dir" -name '*.md' -path '*/commands/*' 2>/dev/null | wc -l | tr -d ' ')
+    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: ${cmd_count} commands OK"

package/commands/c4.mjs

@@ -24,7 +24,7 @@
  */
 
 import { spawnSync as nodeSpawnSync } from 'node:child_process';
-import { existsSync as fsExistsSync, readdirSync } from 'node:fs';
+import { existsSync as fsExistsSync, readdirSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import * as c4Default from '../c4/index.mjs';
 import { isMcpEnabled } from '../mcp.mjs';
@@ -101,6 +101,15 @@ function safeReaddirSync(dir) {
   try { return readdirSync(dir); } catch { return []; }
 }
 
+function safeListNamespaceDirs(dir) {
+  try {
+    return readdirSync(dir).filter((entry) => {
+      if (entry.startsWith('.')) return false;
+      try { return statSync(join(dir, entry)).isDirectory(); } catch { return false; }
+    });
+  } catch { return []; }
+}
+
 async function safeAsync(label, fn, writer) {
   try {
     return { ok: true, value: await fn() };
@@ -396,20 +405,19 @@ export async function c4Command(rawArgs, overrides = {}) {
     return exit(1);
   }
 
-  // Step 9a — verify registry has content. `aw init --silent` can succeed
-  // (exit 0) but fail to fetch from remote (fetchAndMerge swallows the error
-  // in silent mode). When the registry dir exists but contains no namespace
-  // directories, the fetch likely failed. Retry with `aw pull` which runs
-  // a targeted git pull on the existing clone.
+  // 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 directories (namespaces like
+  // "platform") to confirm the registry content was actually pulled.
   {
-    const registryEntries = safeReaddirSync(awRegistry).filter(
-      (e) => !e.startsWith('.'),
-    );
-    if (registryEntries.length === 0) {
-      writer.stderr('[aw-c4] registry empty 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 && pullRes.status !== 0) {
-        writer.stderr('[aw-c4] aw pull also failed; commands may be incomplete\n');
+      if (pullRes?.status !== 0 || safeListNamespaceDirs(awRegistry).length === 0) {
+        writer.stderr('[aw-c4] FATAL: registry commands were not fetched\n');
+        return exit(1);
       }
     }
   }

package/package.json

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