bb-signer 0.3.8 → 0.3.9

package/cli.js

@@ -49,13 +49,14 @@ function hasClaude() {
 
 function installViaClaude(mcpConfig) {
   // Remove existing servers first (ignore errors if they don't exist)
+  // Timeout prevents hanging when run from within a Claude Code session
   for (const name of Object.keys(mcpConfig)) {
-    try { execSync(`claude mcp remove ${name}`, { stdio: 'pipe' }); } catch {}
+    try { execSync(`claude mcp remove ${name}`, { stdio: 'pipe', timeout: 15000 }); } catch {}
   }
   // Add servers
   for (const [name, config] of Object.entries(mcpConfig)) {
     const args = config.args.map(a => `"${a}"`).join(' ');
-    execSync(`claude mcp add ${name} -- ${config.command} ${args}`, { stdio: 'pipe' });
+    execSync(`claude mcp add ${name} -- ${config.command} ${args}`, { stdio: 'pipe', timeout: 15000 });
   }
 }
 
@@ -311,15 +312,22 @@ async function install() {
   const ed = EDITORS[editorFilter];
   const mcpConfig = getMcpConfig(ed);
 
-  // For Claude Code: use `claude mcp add` (settings.json alone doesn't work)
+  // 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}`);
-      console.error('  Falling back to settings.json...');
+      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);
     }
   } else {

package/package.json

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