@ghl-ai/aw 0.1.35-beta.2 → 0.1.35-beta.20

package/commands/init.mjs

@@ -19,7 +19,7 @@ import { generateCommands, copyInstructions, initAwDocs } from '../integrate.mjs
 import { setupMcp } from '../mcp.mjs';
 import { autoUpdate, promptUpdate } from '../update.mjs';
 import { installGlobalHooks } from '../hooks.mjs';
-import { installIdeHooks } from '../ide-hooks.mjs';
+import { installAwEcc } from '../ecc.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const VERSION = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf8')).version;
@@ -201,13 +201,13 @@ export async function initCommand(args) {
 
     // Re-link IDE dirs + hooks (idempotent)
     linkWorkspace(HOME);
+    await installAwEcc(cwd, { silent });
     generateCommands(HOME);
     copyInstructions(HOME, null, freshCfg?.namespace || team) || [];
     initAwDocs(HOME);
     setupMcp(HOME, freshCfg?.namespace || team) || [];
     if (cwd !== HOME) setupMcp(cwd, freshCfg?.namespace || team);
     installGlobalHooks();
-    const ideHookFiles = installIdeHooks(HOME);
 
     // Link current project if needed
     if (cwd !== HOME && !existsSync(join(cwd, '.aw_registry'))) {
@@ -282,13 +282,13 @@ export async function initCommand(args) {
   // Step 3: Link IDE dirs + setup tasks
   fmt.logStep('Linking IDE symlinks...');
   linkWorkspace(HOME);
+  await installAwEcc(cwd, { silent });
   generateCommands(HOME);
   const instructionFiles = copyInstructions(HOME, null, team) || [];
   initAwDocs(HOME);
   const mcpFiles = setupMcp(HOME, team) || [];
   if (cwd !== HOME) setupMcp(cwd, team);
   const hooksInstalled = installGlobalHooks();
-  const ideHookFilesInit = installIdeHooks(HOME);
   installIdeTasks();
 
   // Step 4: Symlink in current directory if it's a git repo
@@ -307,7 +307,6 @@ export async function initCommand(args) {
     createdFiles: [
       ...instructionFiles.map(p => p.startsWith(HOME) ? p.slice(HOME.length + 1) : p),
       ...mcpFiles.map(p => p.startsWith(HOME) ? p.slice(HOME.length + 1) : p),
-      ...(ideHookFilesInit || []).map(p => p.startsWith(HOME) ? p.slice(HOME.length + 1) : p),
     ],
     globalHooksDir: hooksInstalled ? join(HOME, '.aw', 'hooks') : null,
   };

package/commands/nuke.mjs

@@ -9,7 +9,7 @@ import { execSync } from 'node:child_process';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { removeGlobalHooks } from '../hooks.mjs';
-import { removeIdeHooks } from '../ide-hooks.mjs';
+import { uninstallAwEcc } from '../ecc.mjs';
 
 const HOME = homedir();
 const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
@@ -244,31 +244,31 @@ export function nukeCommand(args) {
   // 2. Remove IDE symlinks (only those pointing to .aw_registry)
   removeIdeSymlinks();
 
-  // 3. Remove .aw_registry symlinks from ALL project directories
+  // 3. Remove aw-ecc installed files (agents, commands, rules, skills, hooks)
+  uninstallAwEcc();
+
+  // 4. Remove .aw_registry symlinks from ALL project directories
   removeProjectSymlinks();
 
-  // 4. Remove git hooks (core.hooksPath + legacy template)
+  // 5. Remove git hooks (core.hooksPath + legacy template)
   removeGitHooks(manifest);
 
-  // 5. Remove IDE session hooks (superpowers bootstrap)
-  removeIdeHooks(HOME);
-
   // 6. Remove IDE auto-init tasks
   removeIdeTasks();
 
-  // 5b. Remove upgrade lock/log (inside .aw_registry, must happen before dir removal)
+  // Remove upgrade lock/log (inside .aw_registry, must happen before dir removal)
   for (const p of [join(GLOBAL_AW_DIR, '.aw-upgrade.lock'), join(GLOBAL_AW_DIR, '.aw-upgrade.log')]) {
     try { if (existsSync(p)) rmSync(p, { recursive: true, force: true }); } catch { /* best effort */ }
   }
 
-  // 6. Remove ~/.aw_docs/
+  // 7. Remove ~/.aw_docs/
   const awDocs = join(HOME, '.aw_docs');
   if (existsSync(awDocs)) {
     rmSync(awDocs, { recursive: true, force: true });
     fmt.logStep('Removed ~/.aw_docs/');
   }
 
-  // 7. Remove any manual `aw` symlinks (e.g. ~/.local/bin/aw)
+  // 8. Remove any manual `aw` symlinks (e.g. ~/.local/bin/aw)
   const manualBins = [
     join(HOME, '.local', 'bin', 'aw'),
     join(HOME, 'bin', 'aw'),
@@ -282,7 +282,7 @@ export function nukeCommand(args) {
     } catch { /* doesn't exist */ }
   }
 
-  // 8. Uninstall npm global package (skip if already in npm uninstall lifecycle)
+  // 9. Uninstall npm global package (skip if already in npm uninstall lifecycle)
   if (!process.env.npm_lifecycle_event) {
     try {
       execSync('npm uninstall -g @ghl-ai/aw', { stdio: 'pipe', timeout: 15000 });
@@ -290,7 +290,7 @@ export function nukeCommand(args) {
     } catch { /* not installed via npm or no permissions */ }
   }
 
-  // 9. Remove ~/.aw_registry/ itself (source of truth — last!)
+  // 10. Remove ~/.aw_registry/ itself (source of truth — last!)
   rmSync(GLOBAL_AW_DIR, { recursive: true, force: true });
   fmt.logStep('Removed ~/.aw_registry/');
 
@@ -299,6 +299,7 @@ export function nukeCommand(args) {
     '',
     `  ${chalk.green('✓')} Generated files cleaned`,
     `  ${chalk.green('✓')} IDE symlinks cleaned`,
+    `  ${chalk.green('✓')} aw-ecc engine removed`,
     `  ${chalk.green('✓')} Project symlinks cleaned`,
     `  ${chalk.green('✓')} Git hooks removed`,
     `  ${chalk.green('✓')} IDE auto-sync tasks removed`,

package/commands/push.mjs

@@ -73,17 +73,12 @@ function collectBatchFiles(folderAbsPath, workspaceDir) {
 }
 
 /**
- * Collect all modified + untracked files for no-args push.
- * 1. Manifest-tracked files that are modified or template-derived (never pushed).
- * 2. Filesystem files not in the manifest at all (newly added by user).
+ * Collect all modified files from manifest (for no-args push).
  * Returns array of { absPath, registryTarget, type, namespace, slug, isDir }.
  */
 function collectModifiedFiles(workspaceDir) {
   const manifest = loadManifest(workspaceDir);
-  const manifestKeys = new Set(Object.keys(manifest.files || {}));
   const files = [];
-
-  // 1. Manifest-tracked: modified or never-pushed
   for (const [key, entry] of Object.entries(manifest.files || {})) {
     const filePath = join(workspaceDir, key);
     if (!existsSync(filePath)) continue;
@@ -104,30 +99,6 @@ function collectModifiedFiles(workspaceDir) {
       }
     }
   }
-
-  // 2. Untracked: files on disk but not in manifest (e.g. manually added)
-  for (const name of readdirSync(workspaceDir, { withFileTypes: true })) {
-    if (!name.isDirectory() || name.name.startsWith('.')) continue;
-    const nsDir = join(workspaceDir, name.name);
-    const entries = walkRegistryTree(nsDir, name.name);
-    for (const entry of entries) {
-      // Build the manifest key for this file
-      const manifestKey = (entry.type === 'skills' || entry.type === 'evals')
-        ? `${entry.namespacePath}/${entry.type}/${entry.slug}/${entry.skillRelPath || entry.filename}`
-        : `${entry.namespacePath}/${entry.type}/${entry.filename}`;
-      if (manifestKeys.has(manifestKey)) continue;  // Already handled above
-      const registryTarget = `${REGISTRY_DIR}/${manifestKey}`;
-      files.push({
-        absPath: entry.sourcePath,
-        registryTarget,
-        type: entry.type,
-        namespace: entry.namespacePath,
-        slug: entry.slug,
-        isDir: false,
-      });
-    }
-  }
-
   return files;
 }
 

package/constants.mjs

@@ -1,7 +1,7 @@
 // constants.mjs — Single source of truth for registry settings.
 
 /** Base branch for PRs and sync checkout */
-export const REGISTRY_BASE_BRANCH = 'sync/platform-superpowers-l8ynb';
+export const REGISTRY_BASE_BRANCH = 'main';
 
 /** Default registry repository */
 export const REGISTRY_REPO = 'GoHighLevel/platform-docs';

package/ecc.mjs

@@ -0,0 +1,180 @@
+import { execSync } from "node:child_process";
+import {
+  existsSync, readFileSync, readdirSync,
+  mkdirSync, rmSync, writeFileSync,
+} from "node:fs";
+import { dirname, join } from "node:path";
+import { homedir } from "node:os";
+import * as fmt from "./fmt.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";
+const AW_ECC_TAG = "v1.2.0";
+
+const MARKETPLACE_NAME = "aw-marketplace";
+const PLUGIN_KEY = `aw@${MARKETPLACE_NAME}`;
+
+function eccDir() { return join(homedir(), ".aw-ecc"); }
+
+const FILE_COPY_TARGETS = ["cursor", "codex"];
+
+const TARGET_STATE = {
+  cursor: { state: ".cursor/ecc-install-state.json" },
+  codex:  { state: ".codex/ecc-install-state.json" },
+};
+
+function run(cmd, opts = {}) {
+  return execSync(cmd, { stdio: "pipe", ...opts });
+}
+
+function cloneOrUpdate(tag, dest) {
+  if (existsSync(join(dest, ".git"))) {
+    try {
+      run(`git -C ${dest} fetch --quiet --depth 1 origin tag ${tag}`);
+      run(`git -C ${dest} checkout --quiet ${tag}`);
+      return;
+    } catch { /* fall through to fresh clone */ }
+  }
+  if (existsSync(dest)) rmSync(dest, { recursive: true, force: true });
+  try {
+    run(`git clone --quiet --depth 1 --branch ${tag} ${AW_ECC_REPO_SSH} ${dest}`);
+  } catch {
+    run(`git clone --quiet --depth 1 --branch ${tag} ${AW_ECC_REPO_HTTPS} ${dest}`);
+  }
+}
+
+function installClaudePlugin(repoDir) {
+  try {
+    run(`claude plugin marketplace add ${repoDir} --scope user`);
+  } catch {
+    try { run(`claude plugin marketplace update ${MARKETPLACE_NAME}`); } catch { /* ok */ }
+  }
+  run(`claude plugin install ${PLUGIN_KEY} --scope user`);
+}
+
+function uninstallClaudePlugin() {
+  try { run(`claude plugin uninstall ${PLUGIN_KEY} --scope user`); } catch { /* not installed */ }
+  try { run(`claude plugin marketplace remove ${MARKETPLACE_NAME}`); } catch { /* not registered */ }
+}
+
+export async function installAwEcc(
+  cwd,
+  { targets = ["cursor", "claude", "codex"], silent = false } = {},
+) {
+  if (!silent) fmt.logStep("Installing aw-ecc engine...");
+
+  const repoDir = eccDir();
+
+  try {
+    cloneOrUpdate(AW_ECC_TAG, repoDir);
+
+    // Claude Code: plugin install via marketplace CLI (proper agent dispatch)
+    if (targets.includes("claude")) {
+      try {
+        installClaudePlugin(repoDir);
+      } catch (err) {
+        if (!silent) fmt.logWarn(`Claude plugin install skipped: ${err.message}`);
+      }
+    }
+
+    // Cursor + Codex: file-copy via install-apply.js
+    const fileCopyTargets = targets.filter((t) => FILE_COPY_TARGETS.includes(t));
+    if (fileCopyTargets.length > 0) {
+      run("npm install --no-audit --no-fund --ignore-scripts --loglevel=error", {
+        cwd: repoDir,
+      });
+      for (const target of fileCopyTargets) {
+        try {
+          run(
+            `node ${join(repoDir, "scripts/install-apply.js")} --target ${target} --profile full`,
+            { cwd },
+          );
+        } catch { /* target not supported — skip */ }
+      }
+    }
+
+    if (!silent) fmt.logSuccess("aw-ecc engine installed");
+  } catch (err) {
+    if (!silent) fmt.logWarn(`aw-ecc install failed: ${err.message}`);
+  }
+}
+
+export function uninstallAwEcc({ silent = false } = {}) {
+  const HOME = homedir();
+  let removed = 0;
+
+  // Claude Code: uninstall plugin + remove marketplace via CLI
+  try {
+    uninstallClaudePlugin();
+    removed++;
+  } catch { /* best effort */ }
+
+  // Cursor + Codex: remove file-copied content via install-state
+  for (const cfg of Object.values(TARGET_STATE)) {
+    const statePath = join(HOME, cfg.state);
+    if (!existsSync(statePath)) continue;
+
+    try {
+      const data = JSON.parse(readFileSync(statePath, "utf8"));
+      for (const op of data.operations || []) {
+        if (op.destinationPath && existsSync(op.destinationPath)) {
+          rmSync(op.destinationPath, { recursive: true, force: true });
+          removed++;
+          pruneEmptyParents(op.destinationPath, join(HOME, cfg.state.split("/")[0]));
+        }
+      }
+      rmSync(statePath, { force: true });
+      pruneEmptyParents(statePath, join(HOME, cfg.state.split("/")[0]));
+    } catch { /* corrupted state — skip */ }
+  }
+
+  // Clean leftover claude install-state from older file-copy versions
+  const claudeState = join(HOME, ".claude", "ecc", "install-state.json");
+  if (existsSync(claudeState)) {
+    try {
+      const data = JSON.parse(readFileSync(claudeState, "utf8"));
+      for (const op of data.operations || []) {
+        if (op.destinationPath && existsSync(op.destinationPath)) {
+          rmSync(op.destinationPath, { recursive: true, force: true });
+          removed++;
+        }
+      }
+      rmSync(claudeState, { force: true });
+      pruneEmptyParents(claudeState, join(HOME, ".claude"));
+    } catch { /* best effort */ }
+  }
+
+  // Clean leftover manual plugin cache from older versions
+  const oldCache = join(HOME, ".claude", "plugins", "cache", "aw");
+  if (existsSync(oldCache)) {
+    rmSync(oldCache, { recursive: true, force: true });
+    removed++;
+  }
+
+  // Remove permanent aw-ecc repo clone
+  const repoDir = eccDir();
+  if (existsSync(repoDir)) {
+    rmSync(repoDir, { recursive: true, force: true });
+    removed++;
+  }
+
+  if (!silent && removed > 0)
+    fmt.logStep(`Removed ${removed} aw-ecc file${removed > 1 ? "s" : ""}`);
+  return removed;
+}
+
+function pruneEmptyParents(filePath, stopAt) {
+  let dir = dirname(filePath);
+  while (dir !== stopAt && dir.startsWith(stopAt)) {
+    try {
+      if (readdirSync(dir).length === 0) {
+        rmSync(dir);
+        dir = dirname(dir);
+      } else {
+        break;
+      }
+    } catch {
+      break;
+    }
+  }
+}

package/integrate.mjs

@@ -136,7 +136,7 @@ Team: ${team} | Local-first orchestration via \`.aw_docs/\` | MCPs: \`memory/*\`
 └── tasks/BOARD.md              # Task board
 \`\`\`
 
-Symlinked to \`.claude/{agents,skills,commands/aw,evals}\`.
+Symlinked to \`.claude/{agents,skills,commands/ghl,evals}\`.
 
 ## Local-First Operations
 
@@ -172,7 +172,7 @@ stitch/*       → External design generation
 All symlinks are prefixed with their namespace (\`platform-\` or \`${team}-\`):
 - \`.aw_registry/platform/review/agents/security-reviewer.md\` → \`.claude/agents/platform-review-security-reviewer.md\`
 - \`.aw_registry/${team}/frontend/agents/frontend-developer.md\` → \`.claude/agents/${team}-frontend-developer.md\`
-- \`.aw_registry/${team}/commands/ship.md\` → \`.claude/commands/aw/${team}-ship.md\`
+- \`.aw_registry/${team}/commands/ship.md\` → \`.claude/commands/ghl/${team}-ship.md\`
 
 ## Dependency Rule
 

package/link.mjs

@@ -217,7 +217,7 @@ export function linkWorkspace(cwd) {
         const cmdFileName = [ns, ...segments, file].join('-');
 
         for (const ide of IDE_DIRS) {
-          const linkDir = join(cwd, ide, 'commands', 'aw');
+          const linkDir = join(cwd, ide, 'commands', 'ghl');
           mkdirSync(linkDir, { recursive: true });
           const linkPath = join(linkDir, cmdFileName);
           const targetPath = join(commandsDir, file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.35-beta.2",
+  "version": "0.1.35-beta.20",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": {
@@ -25,7 +25,7 @@
     "apply.mjs",
     "update.mjs",
     "hooks.mjs",
-    "ide-hooks.mjs"
+    "ecc.mjs"
   ],
   "engines": {
     "node": ">=18.0.0"

package/ide-hooks.mjs

@@ -1,193 +0,0 @@
-// ide-hooks.mjs — Generate IDE session-start hooks for superpowers bootstrap.
-//
-// installIdeHooks(cwd) → writes/merges hook configs into ~/.claude/ and ~/.cursor/
-// removeIdeHooks(cwd)  → removes aw-generated hook entries from IDE hook configs
-
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
-import { join } from 'node:path';
-import { homedir } from 'node:os';
-import * as fmt from './fmt.mjs';
-
-const HOME = homedir();
-const AW_REGISTRY = join(HOME, '.aw_registry');
-const HOOKS_DIR = join(AW_REGISTRY, 'platform', 'superpowers', 'hooks');
-const SESSION_START = join(HOOKS_DIR, 'session-start');
-const RUN_HOOK_CMD = join(HOOKS_DIR, 'run-hook.cmd');
-
-const AW_MARKER = 'aw-superpowers-session';
-
-/**
- * Install IDE session-start hooks that bootstrap using-superpowers.
- * Only installs if the superpowers hooks exist in the registry.
- * Merges with existing hook configs — never clobbers user hooks.
- * @returns {string[]} paths of created/modified hook config files
- */
-export function installIdeHooks(cwd) {
-  if (!existsSync(SESSION_START)) return [];
-
-  const created = [];
-
-  const claudeResult = installClaudeCodeHooks(cwd);
-  if (claudeResult) created.push(claudeResult);
-
-  const cursorResult = installCursorHooks(cwd);
-  if (cursorResult) created.push(cursorResult);
-
-  if (created.length > 0) {
-    fmt.logStep('IDE session hooks installed (superpowers bootstrap)');
-  }
-
-  return created;
-}
-
-/**
- * Remove aw-generated hook entries from IDE hook configs.
- */
-export function removeIdeHooks(cwd) {
-  removeClaudeCodeHooks(cwd);
-  removeCursorHooks(cwd);
-  fmt.logStep('IDE session hooks removed');
-}
-
-// ── Claude Code ─────────────────────────────────────────────────────────
-
-function installClaudeCodeHooks(cwd) {
-  const hooksPath = join(HOME, '.claude', 'hooks.json');
-
-  const hookEntry = {
-    matcher: AW_MARKER,
-    hooks: [{
-      type: 'command',
-      command: `"${RUN_HOOK_CMD}" session-start`,
-      async: false,
-    }],
-  };
-
-  let config;
-  if (existsSync(hooksPath)) {
-    try {
-      config = JSON.parse(readFileSync(hooksPath, 'utf8'));
-    } catch {
-      return null;
-    }
-
-    if (!config.hooks) config.hooks = {};
-    if (!Array.isArray(config.hooks.SessionStart)) config.hooks.SessionStart = [];
-
-    const existing = config.hooks.SessionStart.findIndex(
-      e => e.matcher === AW_MARKER
-    );
-    if (existing !== -1) {
-      config.hooks.SessionStart[existing] = hookEntry;
-    } else {
-      config.hooks.SessionStart.push(hookEntry);
-    }
-  } else {
-    mkdirSync(join(HOME, '.claude'), { recursive: true });
-    config = {
-      hooks: {
-        SessionStart: [hookEntry],
-      },
-    };
-  }
-
-  writeFileSync(hooksPath, JSON.stringify(config, null, 2) + '\n');
-  return hooksPath;
-}
-
-function removeClaudeCodeHooks(cwd) {
-  const hooksPath = join(HOME, '.claude', 'hooks.json');
-  if (!existsSync(hooksPath)) return;
-
-  try {
-    const config = JSON.parse(readFileSync(hooksPath, 'utf8'));
-    if (!config.hooks?.SessionStart) return;
-
-    config.hooks.SessionStart = config.hooks.SessionStart.filter(
-      e => e.matcher !== AW_MARKER
-    );
-
-    if (config.hooks.SessionStart.length === 0) {
-      delete config.hooks.SessionStart;
-    }
-    if (Object.keys(config.hooks).length === 0) {
-      delete config.hooks;
-    }
-
-    if (Object.keys(config).length === 0) {
-      writeFileSync(hooksPath, '{}\n');
-    } else {
-      writeFileSync(hooksPath, JSON.stringify(config, null, 2) + '\n');
-    }
-  } catch { /* best effort */ }
-}
-
-// ── Cursor ──────────────────────────────────────────────────────────────
-
-function installCursorHooks(cwd) {
-  const hooksPath = join(HOME, '.cursor', 'hooks.json');
-
-  const hookEntry = {
-    command: SESSION_START,
-    _aw: AW_MARKER,
-  };
-
-  let config;
-  if (existsSync(hooksPath)) {
-    try {
-      config = JSON.parse(readFileSync(hooksPath, 'utf8'));
-    } catch {
-      return null;
-    }
-
-    if (!config.hooks) config.hooks = {};
-    if (!Array.isArray(config.hooks.sessionStart)) config.hooks.sessionStart = [];
-
-    const existing = config.hooks.sessionStart.findIndex(
-      e => e._aw === AW_MARKER
-    );
-    if (existing !== -1) {
-      config.hooks.sessionStart[existing] = hookEntry;
-    } else {
-      config.hooks.sessionStart.push(hookEntry);
-    }
-  } else {
-    mkdirSync(join(HOME, '.cursor'), { recursive: true });
-    config = {
-      version: 1,
-      hooks: {
-        sessionStart: [hookEntry],
-      },
-    };
-  }
-
-  writeFileSync(hooksPath, JSON.stringify(config, null, 2) + '\n');
-  return hooksPath;
-}
-
-function removeCursorHooks(cwd) {
-  const hooksPath = join(HOME, '.cursor', 'hooks.json');
-  if (!existsSync(hooksPath)) return;
-
-  try {
-    const config = JSON.parse(readFileSync(hooksPath, 'utf8'));
-    if (!config.hooks?.sessionStart) return;
-
-    config.hooks.sessionStart = config.hooks.sessionStart.filter(
-      e => e._aw !== AW_MARKER
-    );
-
-    if (config.hooks.sessionStart.length === 0) {
-      delete config.hooks.sessionStart;
-    }
-    if (config.hooks && Object.keys(config.hooks).length === 0) {
-      delete config.hooks;
-    }
-
-    if (Object.keys(config).length <= 1 && config.version) {
-      writeFileSync(hooksPath, JSON.stringify({ version: config.version }, null, 2) + '\n');
-    } else {
-      writeFileSync(hooksPath, JSON.stringify(config, null, 2) + '\n');
-    }
-  } catch { /* best effort */ }
-}