@reeledge/agent-tools 0.1.2 → 0.1.4

package/dist/apps/claude-code.js

@@ -1,20 +1,75 @@
+import fs from 'node:fs';
 import path from 'node:path';
-import { claudeMcpAddArgs } from '../mcp.js';
+import { claudeMcpAddArgs, mcpEndpoint } from '../mcp.js';
 import { writeSkillTree } from '../skills.js';
 import { APP_LABELS, CONNECTOR_NAME, } from './types.js';
-/**
- * Claude Code adapter. Skills are per-skill `SKILL.md` directories under
- * `~/.claude/skills/` (overridable via `--skills-dir`); the MCP connector is
- * registered by spawning `claude mcp add --transport http …` (the documented
- * Claude Code path), which embeds the bearer token in an `Authorization` header.
- */
 /** Resolve the skills dir: explicit override, else `~/.claude/skills`. */
 function claudeSkillsDir(env) {
     return env.skillsDirOverride ?? path.join(env.homeDir, '.claude', 'skills');
 }
+/**
+ * Absolute path to the Claude Desktop config file, or `null` on platforms where
+ * Claude Desktop doesn't ship (so the caller skips the desktop surface). Pure —
+ * `homeDir` + `platform` in, path out:
+ *   - darwin → `<homeDir>/Library/Application Support/Claude/claude_desktop_config.json`
+ *   - win32  → `<%APPDATA% or homeDir/AppData/Roaming>/Claude/claude_desktop_config.json`
+ *   - else   → null
+ */
+export function claudeDesktopConfigPath(homeDir, platform) {
+    if (platform === 'darwin') {
+        return path.join(homeDir, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
+    }
+    if (platform === 'win32') {
+        const appData = process.env.APPDATA ?? path.join(homeDir, 'AppData', 'Roaming');
+        return path.join(appData, 'Claude', 'claude_desktop_config.json');
+    }
+    return null;
+}
+/**
+ * The `mcp-remote` bridge entry for Claude Desktop. The header value lives in an
+ * `env` var and is referenced as `Authorization:${AUTH_HEADER}` (NO space):
+ * Claude Desktop splits each arg on spaces, so an inline `Bearer <token>` would
+ * be torn apart — keeping it in env is the supported escape hatch.
+ */
+export function claudeDesktopEntry(endpoint, token) {
+    return {
+        command: 'npx',
+        args: ['-y', 'mcp-remote', endpoint, '--header', 'Authorization:${AUTH_HEADER}'],
+        env: { AUTH_HEADER: `Bearer ${token}` },
+    };
+}
+/**
+ * Merge a server entry into an existing `claude_desktop_config.json` body (or
+ * `undefined` when no file exists). Malformed JSON is replaced with a fresh file
+ * (mirroring how the CLI's own config loader tolerates corruption). Other servers
+ * + top-level keys are preserved. Returns pretty-printed JSON + trailing newline.
+ */
+export function mergeClaudeDesktopConfig(existing, name, entry) {
+    let root = {};
+    if (existing && existing.trim() !== '') {
+        try {
+            const parsed = JSON.parse(existing);
+            if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+                root = parsed;
+            }
+        }
+        catch {
+            root = {};
+        }
+    }
+    const servers = root.mcpServers && typeof root.mcpServers === 'object' && !Array.isArray(root.mcpServers)
+        ? root.mcpServers
+        : {};
+    servers[name] = entry;
+    root.mcpServers = servers;
+    return `${JSON.stringify(root, null, 2)}\n`;
+}
 /** Construct the Claude Code adapter for the given environment. */
 export function makeClaudeCodeAdapter(env) {
     const skillsDir = () => claudeSkillsDir(env);
+    const platform = () => env.platform ?? process.platform;
+    const log = (line) => env.log?.(line);
+    const desktopPath = () => claudeDesktopConfigPath(env.homeDir, platform());
     return {
         id: 'claude-code',
         label: APP_LABELS['claude-code'],
@@ -23,7 +78,30 @@ export function makeClaudeCodeAdapter(env) {
             return skills.flatMap((s) => writeSkillTree(skillsDir(), s.slug, s.files));
         },
         async configureMcp(serverUrl, token) {
-            await env.exec('claude', claudeMcpAddArgs(CONNECTOR_NAME, serverUrl, token));
+            // 1. Claude Code CLI — best-effort and FULLY ISOLATED: a CLI failure must
+            //    never block the desktop step below. A spawn ENOENT = not installed;
+            //    "already exists" (a re-run / `update`, exit 1) or any other failure is
+            //    logged as skipped, NOT thrown — the connector is already in place, and
+            //    the desktop bridge still gets written.
+            try {
+                await env.exec('claude', claudeMcpAddArgs(CONNECTOR_NAME, serverUrl, token));
+                log(`Configured Claude Code CLI (${CONNECTOR_NAME})`);
+            }
+            catch (err) {
+                log(err.code === 'ENOENT'
+                    ? 'Claude Code CLI not found — skipped'
+                    : `Claude Code CLI not configured — skipped (${err.message})`);
+            }
+            // 2. Claude Desktop — macOS/Windows only; ALWAYS runs, independent of the CLI.
+            const cfgPath = desktopPath();
+            if (cfgPath !== null) {
+                const entry = claudeDesktopEntry(mcpEndpoint(serverUrl), token);
+                const existing = fs.existsSync(cfgPath) ? fs.readFileSync(cfgPath, 'utf8') : undefined;
+                const merged = mergeClaudeDesktopConfig(existing, CONNECTOR_NAME, entry);
+                fs.mkdirSync(path.dirname(cfgPath), { recursive: true });
+                fs.writeFileSync(cfgPath, merged, 'utf8');
+                log('Configured Claude Desktop (claude_desktop_config.json)');
+            }
         },
         dryRunPlan(serverUrl, token, skills) {
             const lines = [];
@@ -34,6 +112,14 @@ export function makeClaudeCodeAdapter(env) {
             }
             const args = claudeMcpAddArgs(CONNECTOR_NAME, serverUrl, token);
             lines.push(`would run: claude ${args.join(' ')}`);
+            const cfgPath = desktopPath();
+            if (cfgPath !== null) {
+                const entry = claudeDesktopEntry(mcpEndpoint(serverUrl), token);
+                lines.push(`would write ${cfgPath} with mcpServers.${CONNECTOR_NAME}:`);
+                for (const l of JSON.stringify(entry, null, 2).split('\n')) {
+                    lines.push(`    ${l}`);
+                }
+            }
             return lines;
         },
     };

package/dist/install.js

@@ -98,6 +98,8 @@ async function run(opts, deps, mode, allowedSkills) {
         homeDir: deps.homeDir ?? os.homedir(),
         exec: deps.exec,
         skillsDirOverride: opts.skillsDir,
+        platform: process.platform,
+        log: deps.log,
     };
     const adapters = (deps.makeAdapters ?? defaultMakeAdapters)(appIds, env);
     // 1. Fetch the catalog. This is the first authenticated call — only once it

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reeledge/agent-tools",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "private": false,
   "description": "Reel Edge agent-tools installer CLI — installs/updates the Reel Edge MCP connector + skills for Claude Code / Codex / Droid.",
   "type": "module",