@ghl-ai/aw 0.1.47-beta.5 → 0.1.47-beta.6

package/integrations.mjs

@@ -107,7 +107,10 @@ export const INTEGRATIONS = {
     type: 'python-cli',
     label: 'Graphify (Knowledge Graph)',
     description: 'Builds a queryable knowledge graph of your codebase + docs',
-    pipPackage: 'graphifyy',
+    // mcp,pdf,office,svg,sql covers all practical codebase-analysis needs.
+    // Excluded: leiden (Python <3.13 only — breaks on newer Python), video (heavy whisper/yt-dlp),
+    // openai/gemini/ollama/bedrock (AI inference — users have their own setup), neo4j (specialized).
+    pipPackage: 'graphifyy[mcp,pdf,office,svg,sql]',
     cliCommand: 'graphify',
     minPython: { major: 3, minor: 10 },
     postInstall: [
@@ -116,10 +119,10 @@ export const INTEGRATIONS = {
     perProjectInstall: [
       // IDE wiring — only runs if that IDE's config dir exists on this machine.
       // Each command writes the IDE-specific CLAUDE.md/AGENTS.md section + hook.
-      { args: ['claude',  'install'], requiresGit: false, requiresIde: '.claude' },
-      { args: ['codex',   'install'], requiresGit: false, requiresIde: '.codex'  },
-      { args: ['cursor',  'install'], requiresGit: false, requiresIde: '.cursor' },
-      { args: ['gemini',  'install'], requiresGit: false, requiresIde: '.gemini' },
+      { args: ['claude',  'install'], requiresGit: false, requiresIde: '.claude', requiresFile: 'graphify-out/graph.json' },
+      { args: ['codex',   'install'], requiresGit: false, requiresIde: '.codex',  requiresFile: 'graphify-out/graph.json' },
+      { args: ['cursor',  'install'], requiresGit: false, requiresIde: '.cursor', requiresFile: 'graphify-out/graph.json' },
+      { args: ['gemini',  'install'], requiresGit: false, requiresIde: '.gemini', requiresFile: 'graphify-out/graph.json' },
       // Git hooks — post-commit AST rebuild + post-checkout sync + merge driver
       { args: ['hook',    'install'], requiresGit: true },
       // If a graph already exists, register it into the global graph immediately.
@@ -302,12 +305,16 @@ export function installGraphifyGlobalAddHook(homeDir) {
     e => e?.description !== MARKER,
   );
 
-  // Always use `python -m graphify` (never the bare binary) so the hook is safe
-  // across future shell sessions where an old graphify binary might shadow the
-  // currently-installed version via PATH. Derived fresh here rather than baking
-  // in the cli token resolved at install time.
-  const pythonExe = IS_WINDOWS ? 'python' : 'python3';
-  const cmd = `[ -f graphify-out/graph.json ] && ${pythonExe} -m graphify global add graphify-out/graph.json --as "$(basename "$PWD")" > /dev/null 2>&1 || true`;
+  // On Windows: bash syntax ([ -f ], $(basename), || true) does not work in cmd.exe/PS.
+  // graphify.exe is on PATH via ~/.local/bin (placed there by uv tool install).
+  // On POSIX: use python3 -m graphify so the module is always resolved from the
+  // correct interpreter regardless of which graphify binary is first on PATH.
+  let cmd;
+  if (IS_WINDOWS) {
+    cmd = `powershell -NoProfile -NonInteractive -Command "if (Test-Path 'graphify-out/graph.json') { graphify global add 'graphify-out/graph.json' --as (Split-Path -Leaf (Get-Location)); graphify claude install }"`;
+  } else {
+    cmd = `[ -f graphify-out/graph.json ] && { python3 -m graphify global add graphify-out/graph.json --as "$(basename "$PWD")" > /dev/null 2>&1; graphify claude install > /dev/null 2>&1; } || true`;
+  }
 
   settings.hooks.SessionStart.push({
     description: MARKER,
@@ -318,38 +325,133 @@ export function installGraphifyGlobalAddHook(homeDir) {
   writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
 }
 
-// Write the graphify-global MCP server entry to ~/.claude/settings.json so Claude Code
-// auto-starts it on launch. Uses `python -m graphify.serve` to avoid PATH issues with
-// stale graphify.exe binaries that may shadow the currently installed version.
-//
-// The command is a single stable token — `python` on Windows, `python3` on POSIX —
-// so the JSON args array is always parseable (py.cmd can be `py -3` which has a space
-// and would break if used directly as the command field).
-export function installGraphifyMcpServer(homeDir) {
-  const claudeDir = join(homeDir, '.claude');
-  if (!existsSync(claudeDir)) return;
+// Write a global sessionStart hook to ~/.cursor/hooks.json so Cursor auto-wires
+// graphify IDE context on session open whenever a built graph exists in the project.
+export function installGraphifyCursorGlobalHook(homeDir) {
+  const cursorDir = join(homeDir, '.cursor');
+  if (!existsSync(cursorDir)) return;
 
-  const settingsPath = join(claudeDir, 'settings.json');
-  let settings = {};
-  if (existsSync(settingsPath)) {
-    try { settings = JSON.parse(readFileSync(settingsPath, 'utf8')); } catch { /* corrupt — start fresh */ }
+  const hooksPath = join(cursorDir, 'hooks.json');
+  let hooks = { version: 1, hooks: {} };
+  if (existsSync(hooksPath)) {
+    try { hooks = JSON.parse(readFileSync(hooksPath, 'utf8')); } catch { /* corrupt — start fresh */ }
+  }
+
+  if (!hooks.hooks) hooks.hooks = {};
+  if (!Array.isArray(hooks.hooks.sessionStart)) hooks.hooks.sessionStart = [];
+
+  const MARKER = 'graphify-cursor-install';
+  hooks.hooks.sessionStart = hooks.hooks.sessionStart.filter(
+    e => e?.description !== MARKER,
+  );
+
+  let cmd;
+  if (IS_WINDOWS) {
+    cmd = `powershell -NoProfile -NonInteractive -Command "if (Test-Path 'graphify-out/graph.json') { graphify global add 'graphify-out/graph.json' --as (Split-Path -Leaf (Get-Location)); graphify cursor install }"`;
+  } else {
+    cmd = `[ -f graphify-out/graph.json ] && { graphify global add graphify-out/graph.json --as "$(basename "$PWD")" > /dev/null 2>&1; graphify cursor install > /dev/null 2>&1; } || true`;
+  }
+
+  hooks.hooks.sessionStart.push({ description: MARKER, command: cmd });
+  writeFileSync(hooksPath, JSON.stringify(hooks, null, 2) + '\n');
+}
+
+// Write a global SessionStart hook to ~/.codex/hooks.json so Codex auto-wires
+// graphify IDE context on session open whenever a built graph exists in the project.
+export function installGraphifyCodexGlobalHook(homeDir) {
+  const codexDir = join(homeDir, '.codex');
+  if (!existsSync(codexDir)) return;
+
+  const hooksPath = join(codexDir, 'hooks.json');
+  let hooks = { hooks: {} };
+  if (existsSync(hooksPath)) {
+    try { hooks = JSON.parse(readFileSync(hooksPath, 'utf8')); } catch { /* corrupt — start fresh */ }
   }
 
-  if (!settings.mcpServers) settings.mcpServers = {};
+  if (!hooks.hooks) hooks.hooks = {};
+  if (!Array.isArray(hooks.hooks.SessionStart)) hooks.hooks.SessionStart = [];
 
-  // Use join() so the path uses OS-correct separators on all platforms.
+  const MARKER = 'graphify-codex-install';
+  hooks.hooks.SessionStart = hooks.hooks.SessionStart.filter(
+    e => e?.description !== MARKER,
+  );
+
+  let cmd;
+  if (IS_WINDOWS) {
+    cmd = `powershell -NoProfile -NonInteractive -Command "if (Test-Path 'graphify-out/graph.json') { graphify global add 'graphify-out/graph.json' --as (Split-Path -Leaf (Get-Location)); graphify codex install }"`;
+  } else {
+    cmd = `[ -f graphify-out/graph.json ] && { graphify global add graphify-out/graph.json --as "$(basename "$PWD")" > /dev/null 2>&1; graphify codex install > /dev/null 2>&1; } || true`;
+  }
+
+  hooks.hooks.SessionStart.push({
+    description: MARKER,
+    hooks: [{ type: 'command', command: cmd }],
+  });
+  writeFileSync(hooksPath, JSON.stringify(hooks, null, 2) + '\n');
+}
+
+// Build the platform-correct MCP server config object for graphify-global.
+function buildGraphifyMcpConfig(homeDir) {
   const globalGraphPath = join(homeDir, '.graphify', 'global-graph.json');
-  // `python` on Windows (Microsoft Store + standard installer both put it on PATH),
-  // `python3` on macOS/Linux (standard convention; `python` may not exist).
-  const pythonExe = IS_WINDOWS ? 'python' : 'python3';
+  if (IS_WINDOWS) {
+    const uvToolPython = join(homeDir, 'AppData', 'Roaming', 'uv', 'tools', 'graphifyy', 'Scripts', 'python.exe');
+    const command = existsSync(uvToolPython) ? uvToolPython : 'graphify';
+    const args = existsSync(uvToolPython)
+      ? ['-m', 'graphify.serve', globalGraphPath]
+      : ['serve', globalGraphPath];
+    return { command, args };
+  }
+  return { command: 'python3', args: ['-m', 'graphify.serve', globalGraphPath] };
+}
 
-  settings.mcpServers['graphify-global'] = {
-    command: pythonExe,
-    args: ['-m', 'graphify.serve', globalGraphPath],
-  };
+// Add a stdio MCP server block to a Codex config.toml (idempotent).
+function addToTomlStdioMcp(filePath, serverName, command, args) {
+  mkdirSync(join(filePath, '..'), { recursive: true });
+  let content = existsSync(filePath) ? readFileSync(filePath, 'utf8') : '';
+  // Remove existing block — regex consumes lines that don't START with '[' (handles
+  // args = [...] which contains '[' mid-line but not at line start).
+  const escapedName = serverName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const blockRegex = new RegExp(`\\[mcp_servers\\.${escapedName}\\](?:\\n(?!\\[)[^\\n]*)*\\n?`, 'g');
+  content = content.replace(blockRegex, '');
+  // TOML: single-quote command path to avoid backslash escaping issues on Windows.
+  // JSON.stringify for args — JSON array syntax is valid TOML inline array.
+  const argsToml = JSON.stringify(args);
+  content += `[mcp_servers.${serverName}]\ncommand = '${command}'\nargs = ${argsToml}\n\n`;
+  writeFileSync(filePath, content);
+}
 
-  mkdirSync(claudeDir, { recursive: true });
-  writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
+// Write the graphify-global MCP server entry to ~/.claude.json, ~/.cursor/mcp.json,
+// and ~/.codex/config.toml so the global graph is accessible in all three IDEs.
+export function installGraphifyMcpServer(homeDir) {
+  const mcpConfig = buildGraphifyMcpConfig(homeDir);
+
+  // Claude Code: ~/.claude.json (user-level MCP config surfaced in /mcp UI)
+  const claudeJsonPath = join(homeDir, '.claude.json');
+  try {
+    let settings = {};
+    if (existsSync(claudeJsonPath)) {
+      try { settings = JSON.parse(readFileSync(claudeJsonPath, 'utf8')); } catch { /* corrupt */ }
+    }
+    if (!settings.mcpServers) settings.mcpServers = {};
+    settings.mcpServers['graphify-global'] = mcpConfig;
+    writeFileSync(claudeJsonPath, JSON.stringify(settings, null, 2) + '\n');
+  } catch { /* best effort */ }
+
+  // Cursor: ~/.cursor/mcp.json (same JSON mcpServers format, supports stdio)
+  const cursorMcpPath = join(homeDir, '.cursor', 'mcp.json');
+  if (existsSync(join(homeDir, '.cursor'))) {
+    try {
+      addToJsonMcp(cursorMcpPath, 'graphify-global', mcpConfig);
+    } catch { /* best effort */ }
+  }
+
+  // Codex: ~/.codex/config.toml (TOML, supports stdio via command + args)
+  const codexConfigPath = join(homeDir, '.codex', 'config.toml');
+  if (existsSync(join(homeDir, '.codex'))) {
+    try {
+      addToTomlStdioMcp(codexConfigPath, 'graphify-global', mcpConfig.command, mcpConfig.args);
+    } catch { /* best effort */ }
+  }
 }
 
 // After pip install, the CLI binary may not be on PATH (pip --user puts it in a Scripts
@@ -434,8 +536,21 @@ async function runPythonCli(integration, key, { silent = false } = {}) {
   //     The graph itself is built manually via `/graphify .` — graphify's own per-IDE
   //     install (step 6 below) writes the CLAUDE.md / AGENTS.md sections for that.
   if (integration.cliCommand === 'graphify') {
+    // Bootstrap global-graph.json now if a graph exists in cwd — graphify.serve requires
+    // the file to exist on startup, but only creates it on first `global add` call.
+    const cwdGraph = join(process.cwd(), 'graphify-out', 'graph.json');
+    if (existsSync(cwdGraph) && process.cwd() !== HOME) {
+      try {
+        await execAsync(
+          `${cli} global add graphify-out/graph.json --as ${basename(process.cwd())}`,
+          { cwd: process.cwd(), timeout: 30 * 1000 },
+        );
+      } catch { /* best effort — non-fatal if already registered */ }
+    }
     installGraphifyMcpServer(HOME);
     installGraphifyGlobalAddHook(HOME);
+    installGraphifyCursorGlobalHook(HOME);
+    installGraphifyCodexGlobalHook(HOME);
   }
 
   // 6. Run per-project hooks if cwd looks like a real project (not HOME).
@@ -762,14 +877,134 @@ export async function removeIntegration(key, { silent = false } = {}) {
 
       if (!silent) fmt.logSuccess(`${integration.label} removed from MCP servers`);
     } else if (integration.type === 'python-cli') {
-      // PYTHON CLI: only remove the manifest entry — leave the pip package installed
-      // because the user may use the CLI outside of `aw`. Print manual cleanup hints.
+      // PYTHON CLI: remove global hooks + MCP wired by aw, leave pip package installed.
+      if (integration.cliCommand === 'graphify') {
+        // Remove SessionStart hook from ~/.claude/settings.json
+        const settingsPath = join(HOME, '.claude', 'settings.json');
+        try {
+          if (existsSync(settingsPath)) {
+            const s = JSON.parse(readFileSync(settingsPath, 'utf8'));
+            if (Array.isArray(s.hooks?.SessionStart)) {
+              s.hooks.SessionStart = s.hooks.SessionStart.filter(
+                e => e?.description !== 'graphify-global-add',
+              );
+            }
+            writeFileSync(settingsPath, JSON.stringify(s, null, 2) + '\n');
+            if (!silent) fmt.logStep('Removed graphify SessionStart hook from ~/.claude/settings.json');
+          }
+        } catch { /* best effort */ }
+
+        // Remove graphify-global MCP from ~/.claude.json
+        const claudeJsonPath = join(HOME, '.claude.json');
+        try {
+          if (existsSync(claudeJsonPath)) {
+            const c = JSON.parse(readFileSync(claudeJsonPath, 'utf8'));
+            if (c.mcpServers?.['graphify-global']) {
+              delete c.mcpServers['graphify-global'];
+              writeFileSync(claudeJsonPath, JSON.stringify(c, null, 2) + '\n');
+              if (!silent) fmt.logStep('Removed graphify-global MCP from ~/.claude.json');
+            }
+          }
+        } catch { /* best effort */ }
+
+        // Remove graphify-global MCP from ~/.cursor/mcp.json
+        const cursorMcpPath = join(HOME, '.cursor', 'mcp.json');
+        try {
+          if (existsSync(cursorMcpPath)) {
+            const c = JSON.parse(readFileSync(cursorMcpPath, 'utf8'));
+            if (c.mcpServers?.['graphify-global']) {
+              delete c.mcpServers['graphify-global'];
+              writeFileSync(cursorMcpPath, JSON.stringify(c, null, 2) + '\n');
+              if (!silent) fmt.logStep('Removed graphify-global MCP from ~/.cursor/mcp.json');
+            }
+          }
+        } catch { /* best effort */ }
+
+        // Remove graphify-global block from ~/.codex/config.toml
+        const codexConfigPath = join(HOME, '.codex', 'config.toml');
+        try {
+          if (existsSync(codexConfigPath)) {
+            let content = readFileSync(codexConfigPath, 'utf8');
+            // Regex consumes lines that don't START with '[' — handles args = [...]
+            // which contains '[' mid-line but not at line start.
+            const blockRegex = /\[mcp_servers\.graphify-global\](?:\n(?!\[)[^\n]*)*\n?/g;
+            content = content.replace(blockRegex, '');
+            writeFileSync(codexConfigPath, content);
+            if (!silent) fmt.logStep('Removed graphify-global MCP from ~/.codex/config.toml');
+          }
+        } catch { /* best effort */ }
+
+        // Remove sessionStart hook from ~/.cursor/hooks.json
+        const cursorHooksPath = join(HOME, '.cursor', 'hooks.json');
+        try {
+          if (existsSync(cursorHooksPath)) {
+            const h = JSON.parse(readFileSync(cursorHooksPath, 'utf8'));
+            if (Array.isArray(h.hooks?.sessionStart)) {
+              h.hooks.sessionStart = h.hooks.sessionStart.filter(
+                e => e?.description !== 'graphify-cursor-install',
+              );
+              writeFileSync(cursorHooksPath, JSON.stringify(h, null, 2) + '\n');
+              if (!silent) fmt.logStep('Removed graphify sessionStart hook from ~/.cursor/hooks.json');
+            }
+          }
+        } catch { /* best effort */ }
+
+        // Remove SessionStart hook from ~/.codex/hooks.json
+        const codexHooksPath = join(HOME, '.codex', 'hooks.json');
+        try {
+          if (existsSync(codexHooksPath)) {
+            const h = JSON.parse(readFileSync(codexHooksPath, 'utf8'));
+            if (Array.isArray(h.hooks?.SessionStart)) {
+              h.hooks.SessionStart = h.hooks.SessionStart.filter(
+                e => e?.description !== 'graphify-codex-install',
+              );
+              writeFileSync(codexHooksPath, JSON.stringify(h, null, 2) + '\n');
+              if (!silent) fmt.logStep('Removed graphify SessionStart hook from ~/.codex/hooks.json');
+            }
+          }
+        } catch { /* best effort */ }
+
+        // Per-project cleanup: uninstall IDE wiring + git hooks + deregister from global graph.
+        // Mirrors perProjectInstall in reverse. Runs best-effort — non-fatal if graphify not on PATH.
+        const cwd = process.cwd();
+        const isHome = cwd === HOME;
+        const hasGit = existsSync(join(cwd, '.git'));
+        const hasGraph = existsSync(join(cwd, 'graphify-out', 'graph.json'));
+        if (!isHome) {
+          const ideUninstalls = [
+            { cmd: 'graphify claude uninstall',  requiresIde: '.claude'  },
+            { cmd: 'graphify codex uninstall',   requiresIde: '.codex'   },
+            { cmd: 'graphify cursor uninstall',  requiresIde: '.cursor'  },
+            { cmd: 'graphify gemini uninstall',  requiresIde: '.gemini'  },
+          ];
+          for (const step of ideUninstalls) {
+            if (!existsSync(join(HOME, step.requiresIde))) continue;
+            try {
+              await execAsync(step.cmd, { cwd, timeout: 30 * 1000 });
+              if (!silent) fmt.logStep(`Ran: ${step.cmd}`);
+            } catch { /* best effort */ }
+          }
+          if (hasGit) {
+            try {
+              await execAsync('graphify hook uninstall', { cwd, timeout: 30 * 1000 });
+              if (!silent) fmt.logStep('Ran: graphify hook uninstall');
+            } catch { /* best effort */ }
+          }
+          if (hasGraph) {
+            try {
+              await execAsync(`graphify global remove --as ${basename(cwd)}`, { cwd, timeout: 30 * 1000 });
+              if (!silent) fmt.logStep(`Deregistered ${basename(cwd)} from global graph`);
+            } catch { /* best effort */ }
+          }
+        }
+      }
+
       if (!silent) {
         fmt.logWarn(
-          `Removed ${integration.label} from the aw manifest. The Python package was left installed.\n` +
-          `  To fully remove, run in each project: \`${integration.cliCommand} claude uninstall\` and \`${integration.cliCommand} hook uninstall\`\n` +
-          `  Then uninstall the package: \`pip uninstall ${integration.pipPackage.split(/[<>=]/)[0]}\` (or \`uv tool uninstall\` / \`pipx uninstall\`)`,
-          'Manual Cleanup',
+          `The Python package was left installed (use outside of aw is possible).\n` +
+          `  To fully remove: \`uv tool uninstall graphifyy\` (or \`pipx uninstall\` / \`pip uninstall graphifyy\`)\n` +
+          `  To remove per-project wiring: \`${integration.cliCommand} claude uninstall\` inside each project`,
+          'Note',
         );
       }
     } else if (integration.type === 'universal-installer') {

package/package.json

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