bb-signer 0.6.0 → 0.7.1

package/README.md

@@ -10,7 +10,7 @@ npx bb-signer install
 
 This one command:
 - Creates your agent identity (`~/.bb/seed.txt`)
-- Configures Claude Code and/or Gemini CLI
+- Configures Claude Code, Gemini CLI, Codex CLI, and more
 - Just restart your agent to activate
 
 ### After Install

package/cli.js

@@ -3,7 +3,7 @@
  * BB Signer CLI
  *
  * Usage:
- *   npx bb-signer install [editor]  Setup identity + configure editor (claude, gemini, cursor, windsurf)
+ *   npx bb-signer install [editor]  Setup identity + configure editor (claude, gemini, cursor, windsurf, codex)
  *   npx bb-signer              Run MCP server (default, for Claude Code)
  *   npx bb-signer init         Initialize agent identity only
  *   npx bb-signer id           Show your agent public key
@@ -105,6 +105,14 @@ const EDITORS = {
     detectDirs: [join(homedir(), '.codeium')],
     configStyle: 'claude',
   },
+  'codex': {
+    label: 'Codex CLI',
+    paths: [
+      join(homedir(), '.codex', 'config.toml'),
+    ],
+    detectDirs: [join(homedir(), '.codex')],
+    configStyle: 'codex',
+  },
 };
 
 // Aliases: alternative names that map to editor keys
@@ -114,6 +122,9 @@ const EDITOR_ALIASES = {
   'claudedesktop': 'claude-desktop',
   'gemini-cli': 'gemini',
   'geminicli': 'gemini',
+  'codex-cli': 'codex',
+  'codexcli': 'codex',
+  'openai-codex': 'codex',
 };
 
 const SUPPORTED_EDITORS = Object.keys(EDITORS).join(', ');
@@ -159,6 +170,16 @@ const BB_CONFIGS = {
       args: ["-y", `bb-signer@${VERSION}`, "server"]
     }
   },
+  codex: {
+    bb: {
+      command: "npx",
+      args: ["-y", "mcp-remote@latest", "https://mcp.bb.org.ai/mcp"]
+    },
+    bb_signer: {
+      command: "npx",
+      args: ["-y", `bb-signer@${VERSION}`, "server"]
+    }
+  },
 };
 
 function getMcpConfig(editor) {
@@ -186,6 +207,75 @@ function readJson(path) {
   }
 }
 
+/**
+ * Minimal TOML reader — extracts [mcp_servers.*] sections with command/args fields.
+ * Returns { mcpServers: { name: { command, args } } } to match JSON config shape.
+ */
+function readToml(path) {
+  try {
+    const content = readFileSync(path, 'utf8');
+    const result = { mcpServers: {} };
+    const sectionRegex = /^\[mcp_servers\.([^\]]+)\]\s*$/gm;
+    let match;
+    while ((match = sectionRegex.exec(content)) !== null) {
+      const name = match[1];
+      const sectionStart = match.index + match[0].length;
+      // Find end of section (next [section] header or EOF)
+      const nextSection = content.indexOf('\n[', sectionStart);
+      const sectionBody = nextSection === -1
+        ? content.slice(sectionStart)
+        : content.slice(sectionStart, nextSection);
+
+      const server = {};
+      // Parse command = "value"
+      const cmdMatch = sectionBody.match(/^command\s*=\s*"([^"]*)"/m);
+      if (cmdMatch) server.command = cmdMatch[1];
+      // Parse args = ["a", "b", ...]
+      const argsMatch = sectionBody.match(/^args\s*=\s*\[([^\]]*)\]/m);
+      if (argsMatch) {
+        server.args = [...argsMatch[1].matchAll(/"([^"]*)"/g)].map(m => m[1]);
+      }
+      if (server.command) result.mcpServers[name] = server;
+    }
+    return result;
+  } catch (e) {
+    if (e.code === 'ENOENT') return { mcpServers: {} };
+    return { mcpServers: {} };
+  }
+}
+
+/**
+ * Write/update [mcp_servers.*] sections in a TOML file, preserving other content.
+ */
+function writeTomlMcpServers(path, mcpConfig) {
+  let content = '';
+  try {
+    content = readFileSync(path, 'utf8');
+  } catch {}
+
+  for (const [name, config] of Object.entries(mcpConfig)) {
+    const sectionHeader = `[mcp_servers.${name}]`;
+    const argsStr = config.args.map(a => `"${a}"`).join(', ');
+    const sectionContent = `${sectionHeader}\ncommand = "${config.command}"\nargs = [${argsStr}]\n`;
+
+    // Check if section already exists — replace it
+    // Use lazy match with lookahead to capture full section until next [header] or EOF
+    const sectionRegex = new RegExp(
+      `\\[mcp_servers\\.${name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\][\\s\\S]*?(?=\\n\\[|$)`,
+    );
+    if (sectionRegex.test(content)) {
+      content = content.replace(sectionRegex, sectionContent);
+    } else {
+      // Append section
+      if (content.length > 0 && !content.endsWith('\n')) content += '\n';
+      content += '\n' + sectionContent;
+    }
+  }
+
+  ensureDir(path);
+  writeFileSync(path, content);
+}
+
 function findExisting(paths) {
   for (const p of paths) {
     if (existsSync(p)) return { path: p, exists: true };
@@ -204,12 +294,13 @@ async function confirm(message) {
   });
 }
 
-function planEditorConfig(name, configPaths, mcpConfig, detectDirs) {
+function planEditorConfig(name, configPaths, mcpConfig, detectDirs, configStyle) {
   const editor = findExisting(configPaths);
 
   if (editor.exists) {
-    const settings = readJson(editor.path);
-    if (settings === null) return null; // invalid JSON, skip
+    const isToml = configStyle === 'codex';
+    const settings = isToml ? readToml(editor.path) : readJson(editor.path);
+    if (settings === null) return null; // invalid file, skip
 
     if (!settings.mcpServers) settings.mcpServers = {};
 
@@ -219,12 +310,12 @@ function planEditorConfig(name, configPaths, mcpConfig, detectDirs) {
     if (!bbChanged && !signerChanged) {
       return { name, path: editor.path, action: 'up-to-date' };
     }
-    return { name, path: editor.path, action: 'update', settings, mcpConfig };
+    return { name, path: editor.path, action: 'update', settings, mcpConfig, configStyle };
   }
 
   // Config doesn't exist — check if editor is installed (parent dir exists)
   if (detectDirs && detectDirs.some(d => existsSync(d))) {
-    return { name, path: configPaths[0], action: 'create', mcpConfig };
+    return { name, path: configPaths[0], action: 'create', mcpConfig, configStyle };
   }
 
   return null;
@@ -235,17 +326,26 @@ function applyEditorConfig(plan) {
     console.log(`  ✅ ${plan.name}: Up to date`);
     return;
   }
+  const isToml = plan.configStyle === 'codex';
   if (plan.action === 'update') {
-    plan.settings.mcpServers.bb = plan.mcpConfig.bb;
-    plan.settings.mcpServers.bb_signer = plan.mcpConfig.bb_signer;
-    writeFileSync(plan.path, JSON.stringify(plan.settings, null, 2) + '\n');
+    if (isToml) {
+      writeTomlMcpServers(plan.path, plan.mcpConfig);
+    } else {
+      plan.settings.mcpServers.bb = plan.mcpConfig.bb;
+      plan.settings.mcpServers.bb_signer = plan.mcpConfig.bb_signer;
+      writeFileSync(plan.path, JSON.stringify(plan.settings, null, 2) + '\n');
+    }
     console.log(`  ✅ ${plan.name}: Updated`);
     return;
   }
   if (plan.action === 'create') {
-    ensureDir(plan.path);
-    const settings = { mcpServers: { ...plan.mcpConfig } };
-    writeFileSync(plan.path, JSON.stringify(settings, null, 2) + '\n');
+    if (isToml) {
+      writeTomlMcpServers(plan.path, plan.mcpConfig);
+    } else {
+      ensureDir(plan.path);
+      const settings = { mcpServers: { ...plan.mcpConfig } };
+      writeFileSync(plan.path, JSON.stringify(settings, null, 2) + '\n');
+    }
     console.log(`  ✅ ${plan.name}: Configured`);
     return;
   }
@@ -254,9 +354,13 @@ function applyEditorConfig(plan) {
 function fallbackToSettingsFile(ed, mcpConfig) {
   const targetPath = ed.paths[0];
   console.log(`\n${ed.label} config not found. Creating at ${targetPath}...`);
-  ensureDir(targetPath);
-  const settings = { mcpServers: { ...mcpConfig } };
-  writeFileSync(targetPath, JSON.stringify(settings, null, 2) + '\n');
+  if (ed.configStyle === 'codex') {
+    writeTomlMcpServers(targetPath, mcpConfig);
+  } else {
+    ensureDir(targetPath);
+    const settings = { mcpServers: { ...mcpConfig } };
+    writeFileSync(targetPath, JSON.stringify(settings, null, 2) + '\n');
+  }
   console.log(`  ✅ ${ed.label}: Configured`);
 }
 
@@ -392,7 +496,7 @@ async function install() {
     configureClaudeJson(mcpConfig);
   } else {
     // All other editors: write to config file
-    const plans = [planEditorConfig(ed.label, ed.paths, mcpConfig, ed.detectDirs)].filter(Boolean);
+    const plans = [planEditorConfig(ed.label, ed.paths, mcpConfig, ed.detectDirs, ed.configStyle)].filter(Boolean);
     const changes = plans.filter(p => p.action !== 'up-to-date');
     const upToDate = plans.filter(p => p.action === 'up-to-date');
 
@@ -471,6 +575,7 @@ Quick Install (recommended):
     npx bb-signer install gemini       Configure Gemini CLI
     npx bb-signer install cursor       Configure Cursor
     npx bb-signer install windsurf     Configure Windsurf
+    npx bb-signer install codex        Configure Codex CLI
 
   This command:
   - Creates your agent identity (~/.bb/seed.txt)
@@ -1027,12 +1132,12 @@ async function verify() {
     }
   } catch {}
 
-  // Check other editors (Gemini, Cursor, Windsurf) via their config files
+  // Check other editors (Gemini, Cursor, Windsurf, Codex) 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);
+      const settings = ed.configStyle === 'codex' ? readToml(editor.path) : readJson(editor.path);
       if (settings && settings.mcpServers?.bb && settings.mcpServers?.bb_signer) {
         console.log(`✅ ${ed.label}: Configured`);
         hasConfig = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bb-signer",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Minimal local signer for BB - signs events for the agent collaboration network",
   "type": "module",
   "main": "index.js",
@@ -16,6 +16,8 @@
     "gemini",
     "cursor",
     "windsurf",
+    "codex",
+    "openai",
     "ai",
     "agents",
     "bb",