bb-signer 0.3.10 → 0.4.0

package/cli.js

@@ -241,6 +241,58 @@ function fallbackToSettingsFile(ed, mcpConfig) {
   console.log(`  ✅ ${ed.label}: Configured`);
 }
 
+function configureClaudeJson() {
+  // Claude Code stores MCP servers per-project in ~/.claude.json
+  // Format: { projects: { "/path/to/cwd": { mcpServers: { ... } } } }
+  // The bb server uses HTTP transport (direct URL, no mcp-remote needed).
+  // The bb_signer server uses stdio transport (local process).
+  const claudeJsonPath = join(homedir(), '.claude.json');
+  const cwd = process.cwd();
+
+  console.log('\nConfiguring Claude Code...');
+
+  let claudeJson = {};
+  try {
+    claudeJson = JSON.parse(readFileSync(claudeJsonPath, 'utf8'));
+  } catch {
+    // File doesn't exist or invalid JSON — start fresh
+  }
+
+  if (!claudeJson.projects) claudeJson.projects = {};
+  if (!claudeJson.projects[cwd]) claudeJson.projects[cwd] = {};
+  if (!claudeJson.projects[cwd].mcpServers) claudeJson.projects[cwd].mcpServers = {};
+
+  // HTTP transport for the remote proxy (no mcp-remote wrapper needed)
+  claudeJson.projects[cwd].mcpServers.bb = {
+    type: "http",
+    url: "https://mcp.bb.org.ai/mcp"
+  };
+
+  // Stdio transport for the local signer
+  claudeJson.projects[cwd].mcpServers.bb_signer = {
+    type: "stdio",
+    command: "npx",
+    args: ["-y", `bb-signer@${VERSION}`, "server"],
+    env: {}
+  };
+
+  // Also register for user scope (mcpServers at top level) so it works from ANY directory
+  if (!claudeJson.mcpServers) claudeJson.mcpServers = {};
+  claudeJson.mcpServers.bb = {
+    type: "http",
+    url: "https://mcp.bb.org.ai/mcp"
+  };
+  claudeJson.mcpServers.bb_signer = {
+    type: "stdio",
+    command: "npx",
+    args: ["-y", `bb-signer@${VERSION}`, "server"],
+    env: {}
+  };
+
+  writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2) + '\n');
+  console.log(`  ✅ Claude Code: Configured (${cwd})`);
+}
+
 async function resolveEditorFilter() {
   // Look for a non-flag argument after "install", e.g. `install gemini --yes`
   const installIdx = process.argv.indexOf('install');
@@ -312,24 +364,12 @@ async function install() {
   const ed = EDITORS[editorFilter];
   const mcpConfig = getMcpConfig(ed);
 
-  // For Claude Code: try `claude mcp add`, always also write settings.json as fallback.
-  // `claude mcp add` can hang when run from within a Claude Code bash session,
-  // so the settings.json write ensures config is always persisted.
-  if (ed.usesCli && hasClaude()) {
-    console.log('\nConfiguring via Claude CLI...');
-    try {
-      installViaClaude(mcpConfig);
-      console.log(`  ✅ ${ed.label}: Configured via \`claude mcp add\``);
-    } catch (e) {
-      console.error(`  ⚠️  \`claude mcp add\` failed: ${e.message}`);
-    }
-    // Always also write settings.json — belt and suspenders
-    const plan = planEditorConfig(ed.label, ed.paths, mcpConfig, ed.detectDirs);
-    if (plan) {
-      applyEditorConfig(plan);
-    } else {
-      fallbackToSettingsFile(ed, mcpConfig);
-    }
+  // For Claude Code: write directly to ~/.claude.json (the actual config file).
+  // Claude Code stores MCP servers per-project in ~/.claude.json under projects[cwd].mcpServers.
+  // ~/.claude/settings.json does NOT configure MCP servers (common misconception).
+  // `claude mcp add` can't run from within a nested Claude Code session.
+  if (editorFilter === 'claude') {
+    configureClaudeJson(mcpConfig);
   } else {
     // All other editors: write to config file
     const plans = [planEditorConfig(ed.label, ed.paths, mcpConfig, ed.detectDirs)].filter(Boolean);
@@ -911,16 +951,36 @@ async function verify() {
 
   // Check 2: At least one editor is configured
   let hasConfig = false;
-  const editorChecks = Object.entries(EDITORS).map(([key, ed]) => [ed.label, ed.paths]);
-  for (const [name, paths] of editorChecks) {
-    const editor = findExisting(paths);
+
+  // Check ~/.claude.json (Claude Code's actual config)
+  const claudeJsonPath = join(homedir(), '.claude.json');
+  try {
+    const claudeJson = JSON.parse(readFileSync(claudeJsonPath, 'utf8'));
+    // Check user-level mcpServers
+    if (claudeJson.mcpServers?.bb) {
+      console.log(`✅ Claude Code: Configured (user scope)`);
+      hasConfig = true;
+    }
+    // Check project-level for current directory
+    const cwd = process.cwd();
+    const projServers = claudeJson.projects?.[cwd]?.mcpServers;
+    if (projServers?.bb) {
+      console.log(`✅ Claude Code: Configured (project: ${cwd})`);
+      hasConfig = true;
+    }
+  } catch {}
+
+  // Check other editors (Gemini, Cursor, Windsurf) via their config files
+  const otherEditors = Object.entries(EDITORS).filter(([key]) => key !== 'claude' && key !== 'claude-desktop');
+  for (const [key, ed] of otherEditors) {
+    const editor = findExisting(ed.paths);
     if (editor.exists) {
       const settings = readJson(editor.path);
       if (settings && settings.mcpServers?.bb && settings.mcpServers?.bb_signer) {
-        console.log(`✅ ${name}: Configured`);
+        console.log(`✅ ${ed.label}: Configured`);
         hasConfig = true;
       } else if (settings && (settings.mcpServers?.bb || settings.mcpServers?.bb_signer)) {
-        console.log(`⚠️  ${name}: Incomplete config (missing bb or bb_signer)`);
+        console.log(`⚠️  ${ed.label}: Incomplete config (missing bb or bb_signer)`);
         warnings++;
         hasConfig = true;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bb-signer",
-  "version": "0.3.10",
+  "version": "0.4.0",
   "description": "Minimal local signer for BB - signs events for the agent collaboration network",
   "type": "module",
   "main": "index.js",