@ghl-ai/aw 0.1.36-beta.61 → 0.1.36-beta.63

package/ecc.mjs

@@ -1,7 +1,7 @@
 import { execSync } from "node:child_process";
 import {
   existsSync, readFileSync, readdirSync,
-  mkdirSync, rmSync, writeFileSync,
+  mkdirSync, rmSync, writeFileSync, renameSync,
 } from "node:fs";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
@@ -16,13 +16,14 @@ const PLUGIN_KEY = `aw@${MARKETPLACE_NAME}`;
 
 function eccDir() { return join(homedir(), ".aw-ecc"); }
 
-// "claude" intentionally excluded — Claude Code is handled via the plugin
-// marketplace (installClaudePlugin), which registers commands under the aw:
-// namespace. Running install-apply.js --target claude would create a duplicate
-// flat copy at ~/.claude/commands/ accessible as /tdd instead of /aw:tdd.
-const FILE_COPY_TARGETS = ["cursor", "codex"];
+// "claude" runs install-apply.js --without baseline:commands so hooks, rules,
+// and agents land in ~/.claude/ — but commands are skipped because the plugin
+// marketplace (installClaudePlugin) already registers them under /aw:tdd.
+// File-copying commands would create a duplicate flat /tdd alongside /aw:tdd.
+const FILE_COPY_TARGETS = ["claude", "cursor", "codex"];
 
 const TARGET_STATE = {
+  claude: { state: ".claude/ecc/install-state.json" },
   cursor: { state: ".cursor/ecc-install-state.json" },
   codex:  { state: ".codex/ecc-install-state.json" },
 };
@@ -71,6 +72,45 @@ function uninstallClaudePlugin() {
   try { run(`claude plugin marketplace remove ${MARKETPLACE_NAME}`); } catch { /* not registered */ }
 }
 
+/**
+ * Move ecc command files from ~/.cursor/commands/*.md → ~/.cursor/commands/aw/*.md
+ * so Cursor exposes them as /aw:tdd, /aw:plan — consistent with Claude Code's plugin namespace.
+ * Also updates the ecc-install-state.json paths so nuke can clean them up correctly.
+ */
+function namespaceCursorCommands(home) {
+  const commandsDir = join(home, ".cursor", "commands");
+  const awDir = join(commandsDir, "aw");
+  if (!existsSync(commandsDir)) return;
+
+  // Move any flat .md files (not already in a subdirectory) into aw/
+  const moved = [];
+  for (const file of readdirSync(commandsDir)) {
+    if (!file.endsWith(".md") || file.startsWith(".")) continue;
+    const src = join(commandsDir, file);
+    mkdirSync(awDir, { recursive: true });
+    const dest = join(awDir, file);
+    try {
+      renameSync(src, dest);
+      moved.push({ from: src, to: dest });
+    } catch { /* best effort */ }
+  }
+
+  if (moved.length === 0) return;
+
+  // Update install-state so nuke removes files from the new aw/ location
+  const statePath = join(home, ".cursor", "ecc-install-state.json");
+  if (!existsSync(statePath)) return;
+  try {
+    const state = JSON.parse(readFileSync(statePath, "utf8"));
+    const pathMap = new Map(moved.map(({ from, to }) => [from, to]));
+    state.operations = (state.operations || []).map((op) => {
+      const newPath = op.destinationPath && pathMap.get(op.destinationPath);
+      return newPath ? { ...op, destinationPath: newPath } : op;
+    });
+    writeFileSync(statePath, JSON.stringify(state, null, 2));
+  } catch { /* best effort */ }
+}
+
 export async function installAwEcc(
   cwd,
   { targets = ["cursor", "claude", "codex"], silent = false } = {},
@@ -92,7 +132,7 @@ export async function installAwEcc(
       }
     }
 
-    // Cursor + Codex: file-copy via install-apply.js
+    // Claude + 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", {
@@ -100,13 +140,20 @@ export async function installAwEcc(
       });
       for (const target of fileCopyTargets) {
         try {
-          // cursor/codex install relative to cwd — always use HOME so they
-          // land in ~/.cursor/ and ~/.codex/ globally, not in the project dir.
+          // Always use HOME as cwd so files land in ~/.<target>/ globally.
           const runCwd = homedir();
+          // For claude: skip commands (plugin handles them as /aw:tdd) but
+          // install hooks, rules, agents into ~/.claude/.
+          const withoutFlag = target === "claude" ? " --without baseline:commands" : "";
           run(
-            `node ${join(repoDir, "scripts/install-apply.js")} --target ${target} --profile full`,
+            `node ${join(repoDir, "scripts/install-apply.js")} --target ${target} --profile full${withoutFlag}`,
             { cwd: runCwd },
           );
+          // Move cursor commands into aw/ subfolder for namespace consistency
+          // so they're accessible as /aw:tdd, /aw:plan — same as Claude Code plugin.
+          if (target === "cursor") {
+            namespaceCursorCommands(runCwd);
+          }
         } catch { /* target not supported — skip */ }
       }
     }
@@ -146,22 +193,6 @@ export function uninstallAwEcc({ silent = false } = {}) {
     } 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)) {

package/package.json

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