apiblaze 0.20.26 → 0.20.31

package/dist/index.js

@@ -1024,7 +1024,7 @@ var import_commander = require("commander");
 var import_chalk54 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.20.26";
+var version = "0.20.31";
 
 // src/index.ts
 init_types();
@@ -2414,7 +2414,7 @@ function claudeOneShot(spec2, prompt) {
   return { argv, status: r.status };
 }
 function claudeInteractive(spec2, prompt) {
-  const argv = ["claude", prompt, "--allowedTools", `mcp__${spec2.name}__*`];
+  const argv = ["claude", prompt, "--allowedTools", `mcp__${spec2.name}__*`, "--append-system-prompt", claudeSystemHint(spec2)];
   const r = run(argv[0], argv.slice(1), { interactive: true });
   return { argv, status: r.status };
 }
@@ -2492,17 +2492,92 @@ function installIntoCodex(spec2) {
     return { ok: false, error: err instanceof Error ? err.message : String(err), path: file };
   }
 }
+function codexSiblingApiblazeServers(keepName) {
+  try {
+    const text = fs5.readFileSync(codexConfigPath(), "utf-8");
+    const lines = text.split("\n");
+    const out = [];
+    const header = /^\[mcp_servers\.(?:"([^"]+)"|([^\]]+))\]\s*(#.*)?$/;
+    const anyHeader = /^\s*\[[^\]]+\]\s*(#.*)?$/;
+    for (let i = 0; i < lines.length; i++) {
+      const m = lines[i].match(header);
+      if (!m) continue;
+      const name = m[1] ?? m[2];
+      let end = lines.length;
+      for (let j = i + 1; j < lines.length; j++) {
+        if (anyHeader.test(lines[j])) {
+          end = j;
+          break;
+        }
+      }
+      const body = lines.slice(i, end).join("\n");
+      const url = body.match(/^\s*url\s*=\s*"([^"]*)"/m)?.[1];
+      if (name && name !== keepName && url && OURS.test(url)) out.push(name);
+      i = end - 1;
+    }
+    return out;
+  } catch {
+    return [];
+  }
+}
+async function mcpEndpointIsDead(url) {
+  try {
+    const res = await fetch(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "tools/list" }),
+      signal: AbortSignal.timeout(8e3)
+    });
+    if (res.status === 401 || res.status === 403) return false;
+    if (res.status === 404 || res.status >= 500) return true;
+    return false;
+  } catch {
+    return false;
+  }
+}
+function codexServerUrl(name) {
+  try {
+    const lines = fs5.readFileSync(codexConfigPath(), "utf-8").split("\n");
+    const ranges = codexSectionRanges(lines, name);
+    if (!ranges.length) return null;
+    const body = lines.slice(ranges[0].start, ranges[0].end).join("\n");
+    return body.match(/^\s*url\s*=\s*"([^"]*)"/m)?.[1] ?? null;
+  } catch {
+    return null;
+  }
+}
+function removeCodexServer(name) {
+  try {
+    const file = codexConfigPath();
+    const lines = fs5.readFileSync(file, "utf-8").split("\n");
+    const ranges = codexSectionRanges(lines, name);
+    if (!ranges.length) return false;
+    for (const r of [...ranges].reverse()) lines.splice(r.start, r.end - r.start);
+    const tmp = `${file}.tmp-${process.pid}`;
+    fs5.writeFileSync(tmp, lines.join("\n"), { encoding: "utf-8", mode: 384 });
+    fs5.renameSync(tmp, file);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function codexOneShot(_spec, prompt) {
   const argv = ["codex", "exec", "--skip-git-repo-check", prompt];
   const r = run(argv[0], argv.slice(1), { inherit: true });
   return { argv, status: r.status };
 }
 function codexInteractive(_spec, prompt) {
-  const argv = ["codex", "--skip-git-repo-check", prompt];
+  const argv = ["codex", prompt];
   const r = run(argv[0], argv.slice(1), { interactive: true });
   return { argv, status: r.status };
 }
 var shellQuote = (s) => `"${s.replace(/(["\\$`])/g, "\\$1")}"`;
+function directedPrompt(spec2, question) {
+  return `Use the "${spec2.name}" MCP server (it exposes this API's tools) to answer: ${question}`;
+}
+function claudeSystemHint(spec2) {
+  return `You are connected to the "${spec2.name}" MCP server, which exposes the ${spec2.projectLabel} API as tools (mcp__${spec2.name}__*). For any question about this API, call those tools rather than answering from memory or asking the user for data the API can provide.`;
+}
 function renderCommand(argv) {
   return argv.map((a, i) => i === 0 || /^[A-Za-z0-9_@%+=:,./-]+$/.test(a) ? a : shellQuote(a)).join(" ");
 }
@@ -2560,7 +2635,7 @@ async function installAndDemo(cli, spec2, getQuestion, log = console.log) {
   const abilities = `What are the tool abilities of the MCP server "${spec2.name}"? List them briefly.`;
   log(`
   ${import_chalk12.default.dim("Checking what the API can do\u2026")}`);
-  log(`  ${import_chalk12.default.dim("$")} ${renderCommand(cli.kind === "claude" ? ["claude", "-p", abilities, "--allowedTools", `mcp__${spec2.name}__*`] : ["codex", "exec", abilities])}
+  log(`  ${import_chalk12.default.dim("$")} ${renderCommand(cli.kind === "claude" ? ["claude", "-p", abilities, "--allowedTools", `mcp__${spec2.name}__*`] : ["codex", "exec", "--skip-git-repo-check", abilities])}
 `);
   const check = oneShot(spec2, abilities);
   if (check.status !== 0) {
@@ -2575,10 +2650,11 @@ async function installAndDemo(cli, spec2, getQuestion, log = console.log) {
     const ask = handoff ? cli.kind === "claude" ? claudeInteractive : codexInteractive : oneShot;
     log(`
   ${import_chalk12.default.dim(handoff ? `Opening ${cli.label} with your question \u2014 you'll stay in that session:` : `Your question, through ${cli.label}:`)}`);
-    const shown = cli.kind === "claude" ? handoff ? ["claude", question, "--allowedTools", `mcp__${spec2.name}__*`] : ["claude", "-p", question, "--allowedTools", `mcp__${spec2.name}__*`] : handoff ? ["codex", "--skip-git-repo-check", question] : ["codex", "exec", "--skip-git-repo-check", question];
+    const directed = directedPrompt(spec2, question);
+    const shown = cli.kind === "claude" ? handoff ? ["claude", directed, "--allowedTools", `mcp__${spec2.name}__*`, "--append-system-prompt", "\u2026"] : ["claude", "-p", directed, "--allowedTools", `mcp__${spec2.name}__*`] : handoff ? ["codex", directed] : ["codex", "exec", "--skip-git-repo-check", directed];
     log(`  ${import_chalk12.default.dim("$")} ${renderCommand(shown)}
 `);
-    const ans = ask(spec2, question);
+    const ans = ask(spec2, directedPrompt(spec2, question));
     if (ans.status !== 0) log(import_chalk12.default.yellow(`
   ${cli.label} exited with ${ans.status ?? "no status"} \u2014 the MCP stays installed.`));
   }
@@ -4160,12 +4236,47 @@ async function maybeInstallExternalCli(p, opts) {
   const ran = await installAndDemo(pick2, buildInstallSpec(p), () => resolveQuestion(opts));
   if (ran) {
     rememberCliOffer(p, pick2.kind, "installed");
+    if (pick2.kind === "codex") await offerToPruneCodexSiblings(p.projectId);
     if (p.anon) {
       console.log(import_chalk14.default.dim(`  Anonymous workspace \u2014 run \`apiblaze apichat ${p.projectId}\` and /claim to keep it (and this MCP) beyond 30 days.`));
     }
   }
   return ran;
 }
+async function offerToPruneCodexSiblings(keepName) {
+  const siblings = codexSiblingApiblazeServers(keepName);
+  if (siblings.length === 0) return;
+  const alive = [];
+  for (const name of siblings) {
+    const url = codexServerUrl(name);
+    if (url && await mcpEndpointIsDead(url)) {
+      if (removeCodexServer(name)) {
+        console.log(import_chalk14.default.dim(`  Removed ${import_chalk14.default.bold(name)} from ~/.codex/config.toml \u2014 that proxy no longer exists.`));
+        continue;
+      }
+    }
+    alive.push(name);
+  }
+  if (alive.length === 0) return;
+  const siblingsLabel = alive;
+  console.log(import_chalk14.default.yellow(`
+  Codex also has ${siblingsLabel.length} other APIblaze MCP server${siblingsLabel.length > 1 ? "s" : ""} configured: ${import_chalk14.default.bold(siblingsLabel.join(", "))}.`));
+  console.log(import_chalk14.default.dim('  Codex tries every one at startup and reports "MCP startup incomplete" for any that is not signed in.'));
+  if (!process.stdin.isTTY) {
+    console.log(import_chalk14.default.dim(`  Remove the ones you don't use:  apiblaze apichat <name> --install-mcp codex   (or edit ~/.codex/config.toml)`));
+    return;
+  }
+  const { default: inquirer3 } = await import("inquirer");
+  const { drop } = await inquirer3.prompt([{
+    type: "checkbox",
+    name: "drop",
+    message: "Remove any you no longer use? (space to select, enter to confirm)",
+    choices: siblingsLabel.map((n) => ({ name: n, value: n }))
+  }]);
+  for (const n of drop ?? []) {
+    console.log(removeCodexServer(n) ? `  ${import_chalk14.default.green("\u2714")} Removed ${import_chalk14.default.bold(n)} from ~/.codex/config.toml.` : import_chalk14.default.red(`  Could not remove ${n}.`));
+  }
+}
 async function authorizeClientRegistration(p, cliLabel) {
   if (!p.consumerAuth) return;
   const teamId = p.teamId ?? loadCredentials()?.teamId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.20.26",
+  "version": "0.20.31",
   "description": "APIblaze CLI — Chat with your APIs, Manage your API keys, users and groups with the APIblaze serverless proxy",
   "keywords": [
     "apiblaze",