@ghl-ai/aw 0.1.35-beta.13 → 0.1.35-beta.14

package/ecc.mjs

@@ -1,5 +1,8 @@
 import { execSync } from "node:child_process";
-import { existsSync, readFileSync, readdirSync, rmSync } from "node:fs";
+import {
+  existsSync, mkdirSync, readFileSync, readdirSync,
+  renameSync, rmSync, writeFileSync,
+} from "node:fs";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
 import * as fmt from "./fmt.mjs";
@@ -9,6 +12,12 @@ const AW_ECC_REPO_HTTPS = "https://github.com/shreyansh-ghl/aw-ecc.git";
 const AW_ECC_TAG = "v1.0.0";
 const TMP_DIR = "/tmp/aw-ecc";
 
+const TARGET_STATE = {
+  cursor: { state: ".cursor/ecc-install-state.json" },
+  claude: { state: ".claude/ecc/install-state.json" },
+  codex:  { state: ".codex/ecc-install-state.json" },
+};
+
 function run(cmd, opts = {}) {
   return execSync(cmd, { stdio: "pipe", ...opts });
 }
@@ -21,6 +30,44 @@ function cloneRepo(tag, dest) {
   }
 }
 
+function namespaceCommands(target) {
+  const HOME = homedir();
+  const cfg = TARGET_STATE[target];
+  if (!cfg) return;
+
+  const statePath = join(HOME, cfg.state);
+  if (!existsSync(statePath)) return;
+
+  try {
+    const state = JSON.parse(readFileSync(statePath, "utf8"));
+    let moved = false;
+
+    for (const op of state.operations) {
+      const dest = op.destinationPath;
+      // Match top-level command files only (e.g. /commands/plan.md)
+      // Skip files already in subdirs (e.g. /commands/aw/plan.md)
+      // Skip .opencode paths (different command structure)
+      if (dest.includes(".opencode/")) continue;
+      const match = dest.match(/^(.+\/commands)\/([^/]+\.md)$/);
+      if (!match) continue;
+      if (match[1].endsWith("/aw")) continue;
+
+      const cmdDir = match[1];
+      const filename = match[2];
+      const awDir = join(cmdDir, "aw");
+      const newDest = join(awDir, filename);
+
+      if (!existsSync(dest)) continue;
+      mkdirSync(awDir, { recursive: true });
+      renameSync(dest, newDest);
+      op.destinationPath = newDest;
+      moved = true;
+    }
+
+    if (moved) writeFileSync(statePath, JSON.stringify(state, null, 2));
+  } catch { /* best effort */ }
+}
+
 export async function installAwEcc(
   cwd,
   { targets = ["cursor", "claude", "codex"], silent = false } = {},
@@ -39,6 +86,7 @@ export async function installAwEcc(
           `node ${join(TMP_DIR, "scripts/install-apply.js")} --target ${target} --profile full`,
           { cwd },
         );
+        namespaceCommands(target);
       } catch {
         // Target not supported on this system — skip silently
       }
@@ -54,27 +102,24 @@ export async function installAwEcc(
 
 export function uninstallAwEcc({ silent = false } = {}) {
   const HOME = homedir();
-  const statePaths = [
-    { dir: join(HOME, ".cursor"), state: join(HOME, ".cursor", "ecc-install-state.json") },
-    { dir: join(HOME, ".claude"),  state: join(HOME, ".claude", "ecc", "install-state.json") },
-    { dir: join(HOME, ".codex"),   state: join(HOME, ".codex", "ecc-install-state.json") },
-  ];
   let removed = 0;
 
-  for (const { dir, state } of statePaths) {
-    if (!existsSync(state)) continue;
+  for (const cfg of Object.values(TARGET_STATE)) {
+    const statePath = join(HOME, cfg.state);
+    const ideDir = join(HOME, cfg.state.split("/")[0]); // e.g. ~/.cursor, ~/.claude, ~/.codex
+    if (!existsSync(statePath)) continue;
 
     try {
-      const data = JSON.parse(readFileSync(state, "utf8"));
+      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, dir);
+          pruneEmptyParents(op.destinationPath, ideDir);
         }
       }
-      rmSync(state, { force: true });
-      pruneEmptyParents(state, dir);
+      rmSync(statePath, { force: true });
+      pruneEmptyParents(statePath, ideDir);
     } catch { /* corrupted state — skip */ }
   }
 

package/package.json

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