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

package/ecc.mjs

@@ -1,6 +1,6 @@
 import { execSync } from "node:child_process";
 import {
-  existsSync, mkdirSync, readFileSync, readdirSync,
+  cpSync, existsSync, mkdirSync, readFileSync, readdirSync,
   renameSync, rmSync, writeFileSync,
 } from "node:fs";
 import { dirname, join } from "node:path";
@@ -9,13 +9,18 @@ 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.0.0";
+const AW_ECC_TAG = "v1.1.0";
 const TMP_DIR = "/tmp/aw-ecc";
 
+const PLUGIN_NAME = "aw";
+const PLUGIN_VERSION = "1.1.0";
+const PLUGIN_KEY = `${PLUGIN_NAME}@${PLUGIN_NAME}`;
+
+const FILE_COPY_TARGETS = ["cursor", "codex"];
+
 const TARGET_STATE = {
   cursor: { state: ".cursor/ecc-install-state.json" },
-  claude: { state: ".claude/ecc/install-state.json" },
-  codex:  { state: ".codex/ecc-install-state.json" },
+  codex: { state: ".codex/ecc-install-state.json" },
 };
 
 function run(cmd, opts = {}) {
@@ -30,6 +35,66 @@ function cloneRepo(tag, dest) {
   }
 }
 
+function getPluginPaths() {
+  const HOME = homedir();
+  const pluginsDir = join(HOME, ".claude", "plugins");
+  const cachePath = join(pluginsDir, "cache", PLUGIN_NAME, PLUGIN_NAME, PLUGIN_VERSION);
+  const registryPath = join(pluginsDir, "installed_plugins.json");
+  return { pluginsDir, cachePath, registryPath };
+}
+
+function registerClaudePlugin(repoDir) {
+  const { cachePath, registryPath } = getPluginPaths();
+
+  if (existsSync(cachePath)) rmSync(cachePath, { recursive: true, force: true });
+  mkdirSync(cachePath, { recursive: true });
+  cpSync(repoDir, cachePath, { recursive: true });
+
+  // Remove .git from the cached copy
+  const dotGit = join(cachePath, ".git");
+  if (existsSync(dotGit)) rmSync(dotGit, { recursive: true, force: true });
+
+  let registry = { version: 2, plugins: {} };
+  if (existsSync(registryPath)) {
+    try { registry = JSON.parse(readFileSync(registryPath, "utf8")); } catch { /* fresh */ }
+  }
+
+  let commitSha = "";
+  try { commitSha = run("git rev-parse HEAD", { cwd: repoDir }).toString().trim(); } catch { /* ok */ }
+
+  registry.plugins[PLUGIN_KEY] = [
+    {
+      scope: "user",
+      installPath: cachePath,
+      version: PLUGIN_VERSION,
+      installedAt: new Date().toISOString(),
+      lastUpdated: new Date().toISOString(),
+      ...(commitSha && { gitCommitSha: commitSha }),
+    },
+  ];
+
+  writeFileSync(registryPath, JSON.stringify(registry, null, 2));
+}
+
+function unregisterClaudePlugin() {
+  const { cachePath, registryPath } = getPluginPaths();
+
+  if (existsSync(cachePath)) {
+    rmSync(cachePath, { recursive: true, force: true });
+    pruneEmptyParents(cachePath, join(homedir(), ".claude"));
+  }
+
+  if (existsSync(registryPath)) {
+    try {
+      const registry = JSON.parse(readFileSync(registryPath, "utf8"));
+      if (registry.plugins?.[PLUGIN_KEY]) {
+        delete registry.plugins[PLUGIN_KEY];
+        writeFileSync(registryPath, JSON.stringify(registry, null, 2));
+      }
+    } catch { /* best effort */ }
+  }
+}
+
 function namespaceCommands(target) {
   const HOME = homedir();
   const cfg = TARGET_STATE[target];
@@ -44,9 +109,6 @@ function namespaceCommands(target) {
 
     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;
@@ -78,17 +140,26 @@ export async function installAwEcc(
 
   try {
     cloneRepo(AW_ECC_TAG, TMP_DIR);
-    run("npm install --no-audit --no-fund --ignore-scripts --loglevel=error", { cwd: TMP_DIR });
-
-    for (const target of targets) {
-      try {
-        run(
-          `node ${join(TMP_DIR, "scripts/install-apply.js")} --target ${target} --profile full`,
-          { cwd },
-        );
-        namespaceCommands(target);
-      } catch {
-        // Target not supported on this system — skip silently
+
+    // Claude Code: register as plugin (proper agent dispatch)
+    if (targets.includes("claude")) {
+      registerClaudePlugin(TMP_DIR);
+    }
+
+    // Cursor + Codex: file-copy approach + namespace commands into /aw:
+    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: TMP_DIR,
+      });
+      for (const target of fileCopyTargets) {
+        try {
+          run(
+            `node ${join(TMP_DIR, "scripts/install-apply.js")} --target ${target} --profile full`,
+            { cwd },
+          );
+          namespaceCommands(target);
+        } catch { /* target not supported — skip */ }
       }
     }
 
@@ -104,9 +175,14 @@ export function uninstallAwEcc({ silent = false } = {}) {
   const HOME = homedir();
   let removed = 0;
 
+  // Claude Code: unregister plugin + remove cache
+  unregisterClaudePlugin();
+  removed++;
+
+  // Cursor + Codex: remove file-copied content via install-state
   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
+    const ideDir = join(HOME, cfg.state.split("/")[0]);
     if (!existsSync(statePath)) continue;
 
     try {
@@ -123,7 +199,24 @@ export function uninstallAwEcc({ silent = false } = {}) {
     } catch { /* corrupted state — skip */ }
   }
 
-  if (!silent && removed > 0) fmt.logStep(`Removed ${removed} aw-ecc file${removed > 1 ? "s" : ""}`);
+  // Clean leftover claude install-state from older 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 */ }
+  }
+
+  if (!silent && removed > 0)
+    fmt.logStep(`Removed ${removed} aw-ecc file${removed > 1 ? "s" : ""}`);
   return removed;
 }
 
@@ -137,6 +230,8 @@ function pruneEmptyParents(filePath, stopAt) {
       } else {
         break;
       }
-    } catch { break; }
+    } catch {
+      break;
+    }
   }
 }

package/package.json

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