apiblaze 0.20.28 → 0.20.34

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.28";
+var version = "0.20.33";
 
 // src/index.ts
 init_types();
@@ -2102,6 +2102,7 @@ function suggestTenantName(projectSlug, taken) {
 var fs8 = __toESM(require("fs"));
 var path6 = __toESM(require("path"));
 var crypto2 = __toESM(require("crypto"));
+var import_child_process3 = require("child_process");
 var import_chalk14 = __toESM(require("chalk"));
 var import_ora4 = __toESM(require("ora"));
 var import_yaml2 = require("yaml");
@@ -2414,7 +2415,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,6 +2493,75 @@ 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 });
@@ -2503,6 +2573,73 @@ function codexInteractive(_spec, prompt) {
   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 agentInstructionFile(cli, dir = process.cwd()) {
+  return path4.join(dir, cli === "claude" ? "CLAUDE.md" : "AGENTS.md");
+}
+var marker = (name) => ({
+  start: `<!-- apiblaze:mcp:${name} -->`,
+  end: `<!-- /apiblaze:mcp:${name} -->`
+});
+function stripMarkedBlock(text, name) {
+  const m = marker(name);
+  for (; ; ) {
+    const i = text.indexOf(m.start);
+    if (i < 0) return text;
+    const j = text.indexOf(m.end, i);
+    if (j < 0) return text.slice(0, i);
+    let k = j + m.end.length;
+    if (text[k] === "\n") k++;
+    text = text.slice(0, i) + text.slice(k);
+  }
+}
+function writeAgentInstruction(cli, spec2, dir = process.cwd()) {
+  try {
+    const file = agentInstructionFile(cli, dir);
+    const m = marker(spec2.name);
+    const block = [
+      m.start,
+      `## ${spec2.projectLabel} API \u2014 use the "${spec2.name}" MCP server`,
+      "",
+      `This directory is connected to the \`${spec2.name}\` MCP server, which exposes the`,
+      `${spec2.projectLabel} API as tools. For any question about this API \u2014 its data, its`,
+      "records, what it can do \u2014 call those tools rather than answering from memory or",
+      "asking for data the API can provide.",
+      "",
+      `_Added by \`apiblaze apichat\`. Remove this block, or run \`npx apiblaze apichat ${spec2.name} --remove-mcp ${cli}\`._`,
+      m.end,
+      ""
+    ].join("\n");
+    let text = "";
+    try {
+      text = fs5.readFileSync(file, "utf-8");
+    } catch {
+    }
+    const cleaned = stripMarkedBlock(text, spec2.name);
+    const sep = cleaned.length && !cleaned.endsWith("\n\n") ? cleaned.endsWith("\n") ? "\n" : "\n\n" : "";
+    fs5.writeFileSync(file, cleaned + sep + block, "utf-8");
+    return file;
+  } catch {
+    return null;
+  }
+}
+function removeAgentInstruction(cli, name, dir = process.cwd()) {
+  try {
+    const file = agentInstructionFile(cli, dir);
+    const text = fs5.readFileSync(file, "utf-8");
+    const cleaned = stripMarkedBlock(text, name);
+    if (cleaned === text) return false;
+    fs5.writeFileSync(file, cleaned.replace(/\n{3,}/g, "\n\n"), "utf-8");
+    return true;
+  } catch {
+    return false;
+  }
+}
+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(" ");
 }
@@ -2575,15 +2712,28 @@ 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", 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.`));
   }
-  log(`
-  ${import_chalk12.default.bold(`Your ${cli.label} is now able to talk to the ${spec2.projectLabel} API.`)}`);
+  const instructionFile = writeAgentInstruction(cli.kind, spec2);
+  const off = `npx apiblaze apichat ${spec2.name} --remove-mcp ${cli.kind}`;
+  const mdName = cli.kind === "claude" ? "CLAUDE.md" : "AGENTS.md";
+  log("");
+  log(import_chalk12.default.bgRed.white.bold(`  ${cli.label} will launch with your MCP to ${spec2.projectLabel} enabled from now on.  `));
+  log(import_chalk12.default.red.bold(`  Every ${cli.label} session in this directory can call your API's tools.`));
+  if (instructionFile) {
+    log(import_chalk12.default.red(`  We added a "use this MCP" block to your ${import_chalk12.default.bold(mdName)} \u2014 that is what makes it stick:`));
+    log(import_chalk12.default.red(`    ${instructionFile}`));
+  } else {
+    log(import_chalk12.default.red(`  (Could not write ${mdName} here, so this applies only to sessions apichat starts.)`));
+  }
+  log(import_chalk12.default.red(`  Turn it off (removes the MCP server AND the ${mdName} block):`));
+  log(import_chalk12.default.red(`    ${import_chalk12.default.bold(off)}`));
   return true;
 }
 
@@ -4160,12 +4310,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;
@@ -4223,6 +4408,23 @@ async function startChat(p, messages, opts) {
   }
   await runRepl(p, messages);
 }
+async function removeExternalMcp(projectId, cliKind) {
+  const kind = cliKind.toLowerCase();
+  if (kind !== "claude" && kind !== "codex") fail3(`--remove-mcp takes "claude" or "codex", not "${cliKind}".`);
+  const label3 = kind === "claude" ? "Claude CLI" : "Codex CLI";
+  let removed = false;
+  if (kind === "claude") {
+    const r = (0, import_child_process3.spawnSync)("claude", ["mcp", "remove", projectId], { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"], timeout: 15e3 });
+    removed = r.status === 0;
+  } else {
+    removed = removeCodexServer(projectId);
+  }
+  console.log(removed ? `  ${import_chalk14.default.green("\u2714")} Removed the ${import_chalk14.default.bold(projectId)} MCP server from ${label3}.` : import_chalk14.default.dim(`  ${label3} had no ${projectId} MCP server configured.`));
+  const hadNote = removeAgentInstruction(kind, projectId);
+  console.log(hadNote ? `  ${import_chalk14.default.green("\u2714")} Removed the standing instruction from ${agentInstructionFile(kind)}.` : import_chalk14.default.dim(`  No standing instruction found in ${agentInstructionFile(kind)}.`));
+  console.log(import_chalk14.default.dim(`
+  ${label3} will no longer launch with your API's tools in this directory.`));
+}
 async function runApichat(opts) {
   setVerbose(opts.verbose === true);
   console.log(import_chalk14.default.bold("\napichat \u2014 turn any API into a chat\n"));
@@ -4235,6 +4437,11 @@ async function runApichat(opts) {
       opts.target = void 0;
     }
   }
+  if (opts.removeMcp) {
+    if (!opts.project) fail3("Name the proxy: apiblaze apichat <project> --remove-mcp claude|codex");
+    await removeExternalMcp(opts.project, opts.removeMcp);
+    return;
+  }
   if (opts.project) {
     const opened = await openDirectProject(opts.project, opts);
     if (await maybeInstallExternalCli(opened.p, opts)) return;
@@ -11584,7 +11791,7 @@ agent.command("authz").description("Chat to design and turn on access rules for
 program.command("rule").description("Author an object-level access rule in plain English, in one shot (billed per turn)").argument("<rule>", 'The rule in plain English, e.g. "users see only their own rows"').argument("<project>", "Project name or id").option("--enforce", "Turn enforcement on immediately (default: shadow-publish only)").option("--apiversion <version>", "API version (defaults to the project's)").action(action((rule, project, opts) => runRule(rule, project, opts)));
 agent.command("openapi").description("Chat to build your API spec from real traffic").argument("<project>", "Project name or id").argument("[apiVersion]", "API version (defaults to the project's)").action(action((project, apiVersion) => runOpenapi(project, apiVersion)));
 agent.command("mcp").description("Chat to build an MCP server for an API").argument("<project>", "Project name or id").argument("[apiVersion]", "API version (defaults to the project's)").option("--environment <env>", "Environment to publish (default: prod)").action(action((project, apiVersion, opts) => runMcp(project, apiVersion, opts)));
-program.command("apichat [project]").description("Turn any API into a chat: point at an OpenAPI spec \u2014 or chat an EXISTING proxy by name (no login needed)").option("--target <url|file>", "What to chat with \u2014 pass ANY of: a target server base URL (spec auto-discovered at /openapi.json etc.), a local OpenAPI file (./openapi.yaml), or a remote OpenAPI URL (https://acme.com/openapi.yaml)").addOption(new import_commander.Option("--openapi <file|url>", "Deprecated alias \u2014 --target now detects spec files/URLs itself").hideHelp()).addOption(new import_commander.Option("--openapispec <file|url>", "Deprecated alias for --openapi").hideHelp()).option("--name <name>", "Proxy name (defaults to the target host)").option("--apiversion <version>", "API version to create (e.g. 1.0.0)").option("--environment <env>", "Environment to chat against (default: prod anonymous / dev logged-in)").option("--access <mode>", 'Who can call this API once connected (e.g. via Claude): "open" = anyone who signs in, "invite" = only you + emails you pre-approve. Default: invite when logged in, open when anonymous.').option("--target-auth-env <ENV_VAR>", "Read the upstream credential from this env var (CI-safe; required when there is no TTY and the API needs auth)").option("--force", "Proceed even if the API uses oauth2/openIdConnect target auth (you configure target auth yourself later)").option("-y, --yes", "Skip confirmation prompts").option("--tenant <slug>", "Tenant (consumer namespace: portal, login, users) for the new proxy; omit to be asked").option("--apikey <key>", "Use this API key for the proxy's door (api_key proxies). Without it, apichat detects the door and asks \u2014 or runs the consumer login for OAuth doors.").option("--xenduserid <id>", "Assert this end-user id (X-End-User-Id) \u2014 required by proxies with identified/pre-approved enforcement; you are asked for one when the proxy demands it.").option("--verbose", "Show the per-turn proxy curl trace (hidden by default)").option("-p, --prompt <question>", "One-shot question: answered through the external agent CLI after an MCP install, or by apichat itself (exits after answering when there is no TTY)").option("--install-mcp <cli>", "Install this proxy's MCP into an external agent CLI without asking: claude | codex. Also re-offers after an earlier decline.").action(action((project, opts) => runApichat({ ...opts, project, openapispec: opts.openapispec ?? opts.openapi })));
+program.command("apichat [project]").description("Turn any API into a chat: point at an OpenAPI spec \u2014 or chat an EXISTING proxy by name (no login needed)").option("--target <url|file>", "What to chat with \u2014 pass ANY of: a target server base URL (spec auto-discovered at /openapi.json etc.), a local OpenAPI file (./openapi.yaml), or a remote OpenAPI URL (https://acme.com/openapi.yaml)").addOption(new import_commander.Option("--openapi <file|url>", "Deprecated alias \u2014 --target now detects spec files/URLs itself").hideHelp()).addOption(new import_commander.Option("--openapispec <file|url>", "Deprecated alias for --openapi").hideHelp()).option("--name <name>", "Proxy name (defaults to the target host)").option("--apiversion <version>", "API version to create (e.g. 1.0.0)").option("--environment <env>", "Environment to chat against (default: prod anonymous / dev logged-in)").option("--access <mode>", 'Who can call this API once connected (e.g. via Claude): "open" = anyone who signs in, "invite" = only you + emails you pre-approve. Default: invite when logged in, open when anonymous.').option("--target-auth-env <ENV_VAR>", "Read the upstream credential from this env var (CI-safe; required when there is no TTY and the API needs auth)").option("--force", "Proceed even if the API uses oauth2/openIdConnect target auth (you configure target auth yourself later)").option("-y, --yes", "Skip confirmation prompts").option("--tenant <slug>", "Tenant (consumer namespace: portal, login, users) for the new proxy; omit to be asked").option("--apikey <key>", "Use this API key for the proxy's door (api_key proxies). Without it, apichat detects the door and asks \u2014 or runs the consumer login for OAuth doors.").option("--xenduserid <id>", "Assert this end-user id (X-End-User-Id) \u2014 required by proxies with identified/pre-approved enforcement; you are asked for one when the proxy demands it.").option("--verbose", "Show the per-turn proxy curl trace (hidden by default)").option("-p, --prompt <question>", "One-shot question: answered through the external agent CLI after an MCP install, or by apichat itself (exits after answering when there is no TTY)").option("--install-mcp <cli>", "Install this proxy's MCP into an external agent CLI without asking: claude | codex. Also re-offers after an earlier decline.").option("--remove-mcp <cli>", "Disconnect this proxy from an external agent CLI (claude | codex): removes the MCP server and the standing instruction").action(action((project, opts) => runApichat({ ...opts, project, openapispec: opts.openapispec ?? opts.openapi })));
 var llm = program.command("llm").description("Manage a local LLM provider key for chat (optional \u2014 lifts model quality, bills your key)");
 llm.command("set-key").description("Store an LLM provider key locally (OpenRouter/Anthropic/DeepSeek/OpenAI)").argument("[key]", "The API key (omit to enter it hidden at a prompt)").option("--model <id>", "Model id to use with this key (e.g. anthropic/claude-haiku-4.5)").action(action((key, opts) => runLlmSetKey(key, opts)));
 llm.command("show").description("Show the locally stored LLM key (masked)").action(action(() => runLlmShow()));

package/package.json

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