@ghl-ai/aw 0.1.35-beta.24 → 0.1.35-beta.26

package/commands/init.mjs

@@ -19,7 +19,6 @@ import { generateCommands, copyInstructions, initAwDocs } from '../integrate.mjs
 import { setupMcp } from '../mcp.mjs';
 import { autoUpdate, promptUpdate } from '../update.mjs';
 import { installGlobalHooks } from '../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,7 +200,6 @@ 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);
@@ -282,7 +280,6 @@ 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);

package/commands/nuke.mjs

@@ -9,7 +9,6 @@ import { execSync } from 'node:child_process';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { removeGlobalHooks } from '../hooks.mjs';
-import { uninstallAwEcc } from '../ecc.mjs';
 
 const HOME = homedir();
 const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
@@ -244,31 +243,28 @@ export function nukeCommand(args) {
   // 2. Remove IDE symlinks (only those pointing to .aw_registry)
   removeIdeSymlinks();
 
-  // 3. Remove aw-ecc installed files (agents, commands, rules, skills, hooks)
-  uninstallAwEcc();
-
-  // 4. Remove .aw_registry symlinks from ALL project directories
+  // 3. Remove .aw_registry symlinks from ALL project directories
   removeProjectSymlinks();
 
-  // 5. Remove git hooks (core.hooksPath + legacy template)
+  // 4. Remove git hooks (core.hooksPath + legacy template)
   removeGitHooks(manifest);
 
-  // 6. Remove IDE auto-init tasks
+  // 5. Remove IDE auto-init tasks
   removeIdeTasks();
 
-  // Remove upgrade lock/log (inside .aw_registry, must happen before dir removal)
+  // 5b. 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 */ }
   }
 
-  // 7. Remove ~/.aw_docs/
+  // 6. Remove ~/.aw_docs/
   const awDocs = join(HOME, '.aw_docs');
   if (existsSync(awDocs)) {
     rmSync(awDocs, { recursive: true, force: true });
     fmt.logStep('Removed ~/.aw_docs/');
   }
 
-  // 8. Remove any manual `aw` symlinks (e.g. ~/.local/bin/aw)
+  // 7. Remove any manual `aw` symlinks (e.g. ~/.local/bin/aw)
   const manualBins = [
     join(HOME, '.local', 'bin', 'aw'),
     join(HOME, 'bin', 'aw'),
@@ -282,7 +278,7 @@ export function nukeCommand(args) {
     } catch { /* doesn't exist */ }
   }
 
-  // 9. Uninstall npm global package (skip if already in npm uninstall lifecycle)
+  // 8. 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 +286,7 @@ export function nukeCommand(args) {
     } catch { /* not installed via npm or no permissions */ }
   }
 
-  // 10. Remove ~/.aw_registry/ itself (source of truth — last!)
+  // 9. Remove ~/.aw_registry/ itself (source of truth — last!)
   rmSync(GLOBAL_AW_DIR, { recursive: true, force: true });
   fmt.logStep('Removed ~/.aw_registry/');
 
@@ -299,7 +295,6 @@ 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/integrate.mjs

@@ -56,13 +56,11 @@ function findFiles(dir, typeName) {
 }
 
 /**
- * Copy AGENTS.md to project root.
- * CLAUDE.md is intentionally NOT generated — its routing rule hijacks plugin
- * commands like /aw:plan, preventing proper agent dispatch.
+ * Copy CLAUDE.md and AGENTS.md to project root.
  */
 export function copyInstructions(cwd, tempDir, namespace) {
   const createdFiles = [];
-  for (const file of ['AGENTS.md']) {
+  for (const file of ['CLAUDE.md', 'AGENTS.md']) {
     const dest = join(cwd, file);
     if (existsSync(dest)) continue;
 
@@ -80,7 +78,9 @@ export function copyInstructions(cwd, tempDir, namespace) {
       }
     }
 
-    const content = generateAgentsMd(cwd, namespace);
+    const content = file === 'CLAUDE.md'
+      ? generateClaudeMd(cwd, namespace)
+      : generateAgentsMd(cwd, namespace);
     if (content) {
       writeFileSync(dest, content);
       fmt.logSuccess(`Created ${file}`);
@@ -100,9 +100,7 @@ Team: ${team} | Local-first orchestration via \`.aw_docs/\` | MCPs: \`memory/*\`
 
 > **Every non-trivial task MUST call \`Skill(skill: "platform-ai-task-router")\` BEFORE any response.**
 >
-> **Exempt from routing (execute directly):**
-> - **Plugin commands**: any \`/aw:*\` slash command — these have their own agent dispatch via the plugin system. Execute the plugin command as-is, do NOT re-route through the task router.
-> - **Trivial tasks**: typo fixes, single-line edits, git ops, file exploration, factual code questions.
+> **Trivial** (do directly): typo fixes, single-line edits, git ops, file exploration, factual code questions.
 >
 > Everything else — including tasks phrased as questions, suggestions, or discussions — routes first.
 > **No conversational responses first. No planning first. Route first.**

package/mcp.mjs

@@ -3,6 +3,7 @@
 
 import { existsSync, writeFileSync, readFileSync, mkdirSync } from 'node:fs';
 import { execSync } from 'node:child_process';
+import { createInterface } from 'node:readline';
 import { join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import * as fmt from './fmt.mjs';
@@ -111,12 +112,69 @@ function resolveGitHubUser(token) {
   }
 }
 
+/**
+ * Resolve ClickUp personal API token. Opens browser to ClickUp settings page
+ * and prompts the user to paste their token.
+ *
+ * Resolution chain:
+ *   1. $CLICKUP_API_TOKEN env var (already set)
+ *   2. Open browser + prompt user (one-time)
+ *   3. null (skip ClickUp — other MCP tools still work)
+ */
+async function resolveClickUpToken() {
+  // 1. Environment variable
+  if (process.env.CLICKUP_API_TOKEN) {
+    fmt.logStep('Using CLICKUP_API_TOKEN from environment');
+    return process.env.CLICKUP_API_TOKEN;
+  }
+
+  // 2. Open browser and prompt
+  fmt.logStep('ClickUp API token needed for per-user task attribution');
+  fmt.logStep('Opening ClickUp settings page — copy your API token from there...');
+
+  try {
+    const openCmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
+    execSync(`${openCmd} "https://app.clickup.com/settings/apps"`, { stdio: 'ignore', timeout: 5000 });
+  } catch { /* browser open failed — user can navigate manually */ }
+
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  const token = await new Promise((resolve) => {
+    rl.question('  Paste your ClickUp API Token (pk_...): ', (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+
+  if (!token || !token.startsWith('pk_')) {
+    fmt.logWarn('No valid ClickUp token provided — skipping (ClickUp tools will use shared token)');
+    return null;
+  }
+
+  // Validate token
+  try {
+    const res = execSync(`curl -sf -H "Authorization: ${token}" "https://api.clickup.com/api/v2/team"`, {
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 10000,
+    });
+    const data = JSON.parse(res);
+    const teamName = data.teams?.[0]?.name;
+    if (teamName) {
+      fmt.logSuccess(`ClickUp token valid — workspace: ${fmt.chalk.cyan(teamName)}`);
+    }
+  } catch {
+    fmt.logWarn('ClickUp token validation failed — using it anyway');
+  }
+
+  return token;
+}
+
 /**
  * Setup MCP configs globally for Claude Code and Cursor.
  * Merges ghl-ai server into existing configs without overwriting other servers.
  * Returns list of file paths that were created or updated.
  */
-export function setupMcp(cwd, namespace) {
+export async function setupMcp(cwd, namespace) {
   const paths = detectPaths();
   const updatedFiles = [];
 
@@ -131,11 +189,19 @@ export function setupMcp(cwd, namespace) {
     }
   }
 
-  // Server config with resolved token for local IDE configs (not committed, safe)
+  // Resolve ClickUp token for per-user attribution
+  const clickupToken = await resolveClickUpToken();
+
+  // Server config with resolved tokens for local IDE configs (not committed, safe)
+  const headers = { Authorization: `Bearer ${ghToken || '${GITHUB_TOKEN}'}` };
+  if (clickupToken) {
+    headers['X-ClickUp-Token'] = clickupToken;
+  }
+
   const ghlAiServerLocal = {
     type: 'http',
     url: mcpUrl,
-    headers: { Authorization: `Bearer ${ghToken || '${GITHUB_TOKEN}'}` },
+    headers,
   };
 
   const gitJenkinsServer = paths.gitJenkinsPath

package/package.json

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

package/ecc.mjs

@@ -1,180 +0,0 @@
-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.2";
-
-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;
-    }
-  }
-}