@ghl-ai/aw 0.1.35-beta.17 → 0.1.35-beta.18

package/ecc.mjs

@@ -1,7 +1,7 @@
 import { execSync } from "node:child_process";
 import {
-  cpSync, existsSync, mkdirSync, readFileSync, readdirSync,
-  renameSync, rmSync, writeFileSync,
+  existsSync, readFileSync, readdirSync, renameSync,
+  mkdirSync, rmSync, writeFileSync,
 } from "node:fs";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
@@ -9,18 +9,16 @@ 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.1.0";
+const AW_ECC_TAG = "v1.2.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 MARKETPLACE_NAME = "aw-marketplace";
+const PLUGIN_KEY = `aw@${MARKETPLACE_NAME}`;
 
-const FILE_COPY_TARGETS = ["cursor", "claude", "codex"];
+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" },
 };
 
@@ -36,64 +34,20 @@ 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 */ }
+// Claude Code: register marketplace + install plugin via CLI
+function installClaudePlugin(repoDir) {
+  try {
+    run(`claude plugin marketplace add ${repoDir} --scope user`);
+  } catch {
+    // marketplace may already exist — update it instead
+    try { run(`claude plugin marketplace update ${MARKETPLACE_NAME}`); } catch { /* ok */ }
   }
-
-  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));
+  run(`claude plugin install ${PLUGIN_KEY} --scope user`);
 }
 
-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 uninstallClaudePlugin() {
+  try { run(`claude plugin uninstall ${PLUGIN_KEY} --scope user`); } catch { /* not installed */ }
+  try { run(`claude plugin marketplace remove ${MARKETPLACE_NAME}`); } catch { /* not registered */ }
 }
 
 function namespaceCommands(target) {
@@ -142,12 +96,16 @@ export async function installAwEcc(
   try {
     cloneRepo(AW_ECC_TAG, TMP_DIR);
 
-    // Claude Code: register as plugin (proper agent dispatch)
+    // Claude Code: proper plugin install via marketplace CLI
     if (targets.includes("claude")) {
-      registerClaudePlugin(TMP_DIR);
+      try {
+        installClaudePlugin(TMP_DIR);
+      } catch (err) {
+        if (!silent) fmt.logWarn(`Claude plugin install skipped: ${err.message}`);
+      }
     }
 
-    // Cursor + Codex: file-copy approach + namespace commands into /aw:
+    // Cursor + Codex: file-copy via install-apply.js + namespace commands
     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", {
@@ -176,14 +134,16 @@ export function uninstallAwEcc({ silent = false } = {}) {
   const HOME = homedir();
   let removed = 0;
 
-  // Claude Code: unregister plugin + remove cache
-  unregisterClaudePlugin();
-  removed++;
+  // 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);
-    const ideDir = join(HOME, cfg.state.split("/")[0]);
+    const ideDir = join(HOME, "." + cfg.state.split("/")[0].replace(".", ""));
     if (!existsSync(statePath)) continue;
 
     try {
@@ -192,15 +152,15 @@ export function uninstallAwEcc({ silent = false } = {}) {
         if (op.destinationPath && existsSync(op.destinationPath)) {
           rmSync(op.destinationPath, { recursive: true, force: true });
           removed++;
-          pruneEmptyParents(op.destinationPath, ideDir);
+          pruneEmptyParents(op.destinationPath, join(HOME, cfg.state.split("/")[0]));
         }
       }
       rmSync(statePath, { force: true });
-      pruneEmptyParents(statePath, ideDir);
+      pruneEmptyParents(statePath, join(HOME, cfg.state.split("/")[0]));
     } catch { /* corrupted state — skip */ }
   }
 
-  // Clean leftover claude install-state from older versions
+  // Clean leftover claude install-state from older file-copy versions
   const claudeState = join(HOME, ".claude", "ecc", "install-state.json");
   if (existsSync(claudeState)) {
     try {
@@ -216,6 +176,13 @@ export function uninstallAwEcc({ silent = false } = {}) {
     } 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++;
+  }
+
   if (!silent && removed > 0)
     fmt.logStep(`Removed ${removed} aw-ecc file${removed > 1 ? "s" : ""}`);
   return removed;

package/package.json

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