multiagents 0.1.1 → 0.1.2

package/cli/install-mcp.ts

@@ -20,11 +20,12 @@ const MCP_JSON = path.join(CLAUDE_DIR, ".mcp.json");
 const SETTINGS_JSON = path.join(CLAUDE_DIR, "settings.json");
 
 function findBinary(name: string): string {
-  const which = Bun.spawnSync(["which", name]);
-  const found = new TextDecoder().decode(which.stdout).trim();
-  if (found) return found;
+  try {
+    const which = Bun.spawnSync(["which", name]);
+    const found = new TextDecoder().decode(which.stdout).trim();
+    if (found) return found;
+  } catch { /* ok */ }
 
-  // Fallback to common locations
   const candidates = [
     path.join(HOME, ".bun", "bin", name),
     `/usr/local/bin/${name}`,
@@ -33,20 +34,16 @@ function findBinary(name: string): string {
   for (const c of candidates) {
     if (fs.existsSync(c)) return c;
   }
-  return name; // hope it's in PATH at runtime
+  return name;
 }
 
-export async function installMcp(): Promise<void> {
-  console.log("\n\x1b[1m\x1b[36m  multiagents install-mcp\x1b[0m");
-  console.log("\x1b[90m  Configure MCP servers for Claude Code\x1b[0m\n");
-
+/** Core logic — configures .mcp.json + settings.json. Returns log lines. */
+function configureMcp(): string[] {
+  const logs: string[] = [];
   const serverBin = findBinary("multiagents-server");
   const orchBin = findBinary("multiagents-orch");
 
-  console.log(`  Server binary: ${serverBin}`);
-  console.log(`  Orchestrator binary: ${orchBin}\n`);
-
-  // --- Step 1: Write ~/.claude/.mcp.json ---
+  // Step 1: Write ~/.claude/.mcp.json
   if (!fs.existsSync(CLAUDE_DIR)) {
     fs.mkdirSync(CLAUDE_DIR, { recursive: true });
   }
@@ -59,57 +56,49 @@ export async function installMcp(): Promise<void> {
     } catch {
       fs.copyFileSync(MCP_JSON, MCP_JSON + ".bak");
       mcpConfig = { mcpServers: {} };
-      console.log("  \x1b[33m!\x1b[0m Existing .mcp.json was corrupted — backed up and recreated");
+      logs.push("  \x1b[33m!\x1b[0m Existing .mcp.json was corrupted — backed up and recreated");
     }
   }
 
-  mcpConfig.mcpServers["multiagents"] = {
-    command: serverBin,
-    args: [],
-  };
-  mcpConfig.mcpServers["multiagents-orch"] = {
-    command: orchBin,
-    args: [],
-  };
-
+  mcpConfig.mcpServers["multiagents"] = { command: serverBin, args: [] };
+  mcpConfig.mcpServers["multiagents-orch"] = { command: orchBin, args: [] };
   fs.writeFileSync(MCP_JSON, JSON.stringify(mcpConfig, null, 2) + "\n");
-  console.log("  \x1b[32m✔\x1b[0m Wrote ~/.claude/.mcp.json");
+  logs.push("  \x1b[32m✔\x1b[0m Global MCP configured (~/.claude/.mcp.json)");
 
-  // --- Step 2: Enable in ~/.claude/settings.json ---
+  // Step 2: Enable in ~/.claude/settings.json
   let settings: Record<string, unknown> = {};
   if (fs.existsSync(SETTINGS_JSON)) {
     try {
       settings = JSON.parse(fs.readFileSync(SETTINGS_JSON, "utf-8"));
     } catch {
-      console.log("  \x1b[33m!\x1b[0m Could not parse settings.json — skipping auto-enable");
-      printDone();
-      return;
+      logs.push("  \x1b[33m!\x1b[0m Could not parse settings.json — skipping auto-enable");
+      return logs;
     }
   }
 
-  // Ensure enabledMcpjsonServers includes our servers
-  let enabled = (settings.enabledMcpjsonServers as string[]) ?? [];
+  const enabled = (settings.enabledMcpjsonServers as string[]) ?? [];
   let changed = false;
-  if (!enabled.includes("multiagents")) {
-    enabled.push("multiagents");
-    changed = true;
-  }
-  if (!enabled.includes("multiagents-orch")) {
-    enabled.push("multiagents-orch");
-    changed = true;
-  }
+  if (!enabled.includes("multiagents")) { enabled.push("multiagents"); changed = true; }
+  if (!enabled.includes("multiagents-orch")) { enabled.push("multiagents-orch"); changed = true; }
   if (changed) {
     settings.enabledMcpjsonServers = enabled;
     fs.writeFileSync(SETTINGS_JSON, JSON.stringify(settings, null, 2) + "\n");
-    console.log("  \x1b[32m✔\x1b[0m Enabled in ~/.claude/settings.json");
+    logs.push("  \x1b[32m✔\x1b[0m Enabled in ~/.claude/settings.json");
   } else {
-    console.log("  \x1b[32m✔\x1b[0m Already enabled in settings.json");
+    logs.push("  \x1b[32m✔\x1b[0m Already enabled in settings.json");
   }
 
-  printDone();
+  return logs;
 }
 
-function printDone(): void {
+/** Verbose version — standalone `multiagents install-mcp` command. */
+export async function installMcp(): Promise<void> {
+  console.log("\n\x1b[1m\x1b[36m  multiagents install-mcp\x1b[0m");
+  console.log("\x1b[90m  Configure MCP servers for Claude Code\x1b[0m\n");
+
+  const logs = configureMcp();
+  for (const line of logs) console.log(line);
+
   console.log(`
 \x1b[1m\x1b[32mDone!\x1b[0m MCP servers configured.
 
@@ -128,3 +117,9 @@ And add to ~/.claude/settings.json:
 \x1b[90m  "enabledMcpjsonServers": ["multiagents", "multiagents-orch"]\x1b[0m
 `);
 }
+
+/** Quiet version — called from `setup` flow, prints compact output. */
+export async function installMcpSilent(): Promise<void> {
+  const logs = configureMcp();
+  for (const line of logs) console.log(line);
+}

package/cli/setup.ts

@@ -9,6 +9,7 @@ import type { AgentType, SessionFile } from "../shared/types.ts";
 import * as readline from "node:readline";
 import * as path from "node:path";
 import * as fs from "node:fs";
+import * as os from "node:os";
 
 const BROKER_PORT = parseInt(process.env.MULTIAGENTS_PORT ?? String(DEFAULT_BROKER_PORT), 10);
 const BROKER_URL = `http://${BROKER_HOSTNAME}:${BROKER_PORT}`;
@@ -26,17 +27,66 @@ function prompt(question: string, defaultValue?: string): Promise<string> {
   });
 }
 
-function detectAgent(name: string): { available: boolean; version?: string } {
+/** Known install locations per agent type, checked as fallbacks when `which` fails. */
+const KNOWN_PATHS: Record<string, string[]> = {
+  claude: [
+    path.join(os.homedir(), ".local", "bin", "claude"),
+    path.join(os.homedir(), ".claude", "bin", "claude"),
+    "/usr/local/bin/claude",
+    "/opt/homebrew/bin/claude",
+  ],
+  codex: [
+    "/usr/local/bin/codex",
+    path.join(os.homedir(), ".local", "bin", "codex"),
+    path.join(os.homedir(), ".npm-global", "bin", "codex"),
+    "/opt/homebrew/bin/codex",
+  ],
+  gemini: [
+    path.join(os.homedir(), ".local", "bin", "gemini"),
+    "/usr/local/bin/gemini",
+    "/opt/homebrew/bin/gemini",
+    path.join(os.homedir(), ".npm-global", "bin", "gemini"),
+  ],
+};
+
+function detectAgent(name: string): { available: boolean; version?: string; resolvedPath?: string } {
+  // 1. Try `which`
+  let agentPath: string | null = null;
   try {
     const which = Bun.spawnSync(["which", name]);
-    if (which.exitCode !== 0) return { available: false };
+    if (which.exitCode === 0) {
+      agentPath = new TextDecoder().decode(which.stdout).trim();
+    }
+  } catch { /* which failed */ }
+
+  // 2. Fallback: check known paths
+  if (!agentPath) {
+    const candidates = KNOWN_PATHS[name] ?? [];
+    for (const p of candidates) {
+      if (fs.existsSync(p)) {
+        agentPath = p;
+        break;
+      }
+    }
+  }
+
+  if (!agentPath) return { available: false };
 
-    const ver = Bun.spawnSync([name, "--version"]);
-    const version = new TextDecoder().decode(ver.stdout).trim().split("\n")[0];
-    return { available: true, version: version || undefined };
+  // 3. Get version (with timeout protection — some CLIs hang)
+  let version: string | undefined;
+  try {
+    const ver = Bun.spawnSync([agentPath, "--version"], {
+      timeout: 5000, // 5s timeout
+    });
+    if (ver.exitCode === 0) {
+      version = new TextDecoder().decode(ver.stdout).trim().split("\n")[0] || undefined;
+    }
   } catch {
-    return { available: false };
+    // Version check failed — agent exists but version unknown
+    version = undefined;
   }
+
+  return { available: true, version, resolvedPath: agentPath };
 }
 
 export async function setup(): Promise<void> {
@@ -104,8 +154,13 @@ export async function setup(): Promise<void> {
   const sessionName = await prompt("Session name", dirName);
   const sessionId = slugify(sessionName);
 
-  // 6. Configure each selected agent's MCP server
-  console.log("\n\x1b[1mConfiguring MCP servers...\x1b[0m\n");
+  // 6. Install global MCP config (Claude Code + settings.json)
+  console.log("\n\x1b[1mConfiguring global MCP...\x1b[0m\n");
+  const { installMcpSilent } = await import("./install-mcp.ts");
+  await installMcpSilent();
+
+  // 7. Configure per-agent MCP
+  console.log("\x1b[1mConfiguring per-agent MCP...\x1b[0m\n");
 
   const cliPath = path.resolve(import.meta.dir, "..");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multiagents",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Multi-agent orchestration platform for Claude Code, Codex CLI, and Gemini CLI",
   "module": "index.ts",
   "type": "module",

package/scripts/postinstall.ts

@@ -1,105 +1,16 @@
 #!/usr/bin/env bun
 /**
  * Post-install script: auto-configures MCP servers for Claude Code.
- *
- * Adds multiagents and multiagents-orch to ~/.claude/.mcp.json
- * so Claude Code can discover the tools without manual configuration.
- *
- * Safe: only adds entries if they don't already exist. Never overwrites.
+ * Delegates to the same logic as `multiagents install-mcp`.
+ * If it fails, prints fallback instructions — never breaks the install.
  */
 
-import * as fs from "node:fs";
-import * as path from "node:path";
-import * as os from "node:os";
-
-const HOME = os.homedir();
-const CLAUDE_DIR = path.join(HOME, ".claude");
-const MCP_JSON = path.join(CLAUDE_DIR, ".mcp.json");
-
-// Use installed binary names — works regardless of install location
-function findBinary(name: string): string {
-  try {
-    const which = Bun.spawnSync(["which", name]);
-    const found = new TextDecoder().decode(which.stdout).trim();
-    if (found) return found;
-  } catch { /* ok */ }
-  const defaultPath = path.join(HOME, ".bun", "bin", name);
-  if (fs.existsSync(defaultPath)) return defaultPath;
-  return name; // fallback
-}
-
-const SERVER_BIN = findBinary("multiagents-server");
-const ORCH_BIN = findBinary("multiagents-orch");
-
 try {
-  // Ensure ~/.claude/ exists
-  if (!fs.existsSync(CLAUDE_DIR)) {
-    fs.mkdirSync(CLAUDE_DIR, { recursive: true });
-  }
-
-  // Read or create .mcp.json
-  let config: { mcpServers: Record<string, unknown> } = { mcpServers: {} };
-  if (fs.existsSync(MCP_JSON)) {
-    try {
-      config = JSON.parse(fs.readFileSync(MCP_JSON, "utf-8"));
-      if (!config.mcpServers) config.mcpServers = {};
-    } catch {
-      // Corrupted file — back up and recreate
-      fs.copyFileSync(MCP_JSON, MCP_JSON + ".bak");
-      config = { mcpServers: {} };
-    }
-  }
-
-  let changed = false;
-
-  // Add multiagents MCP server (using installed binary names)
-  if (!config.mcpServers["multiagents"]) {
-    config.mcpServers["multiagents"] = {
-      command: SERVER_BIN,
-      args: [],
-    };
-    changed = true;
-  }
-
-  // Add orchestrator MCP server
-  if (!config.mcpServers["multiagents-orch"]) {
-    config.mcpServers["multiagents-orch"] = {
-      command: ORCH_BIN,
-      args: [],
-    };
-    changed = true;
-  }
-
-  if (changed) {
-    fs.writeFileSync(MCP_JSON, JSON.stringify(config, null, 2) + "\n");
-    console.log("[multiagents] MCP servers configured in ~/.claude/.mcp.json");
-  } else {
-    console.log("[multiagents] MCP servers already configured in .mcp.json");
-  }
-
-  // Also enable in settings.json
-  const SETTINGS_JSON = path.join(CLAUDE_DIR, "settings.json");
-  if (fs.existsSync(SETTINGS_JSON)) {
-    try {
-      const settings = JSON.parse(fs.readFileSync(SETTINGS_JSON, "utf-8"));
-      const enabled: string[] = settings.enabledMcpjsonServers ?? [];
-      let settingsChanged = false;
-      if (!enabled.includes("multiagents")) { enabled.push("multiagents"); settingsChanged = true; }
-      if (!enabled.includes("multiagents-orch")) { enabled.push("multiagents-orch"); settingsChanged = true; }
-      if (settingsChanged) {
-        settings.enabledMcpjsonServers = enabled;
-        fs.writeFileSync(SETTINGS_JSON, JSON.stringify(settings, null, 2) + "\n");
-        console.log("[multiagents] Enabled in ~/.claude/settings.json");
-      }
-    } catch {
-      // Don't fail install over settings.json
-    }
-  }
-
+  const { installMcpSilent } = await import("../cli/install-mcp.ts");
+  await installMcpSilent();
   console.log("[multiagents] Restart Claude Code to pick up the new tools.");
   console.log("[multiagents] If tools don't appear, run: multiagents install-mcp");
 } catch (e) {
-  // Postinstall should never fail the install
   console.error(`[multiagents] postinstall warning: ${e instanceof Error ? e.message : String(e)}`);
   console.error("[multiagents] Run 'multiagents install-mcp' to configure manually.");
 }