apiblaze 0.20.17 → 0.20.20

package/dist/index.js

@@ -1024,7 +1024,7 @@ var import_commander = require("commander");
 var import_chalk53 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.20.17";
+var version = "0.20.20";
 
 // src/index.ts
 init_types();
@@ -2390,11 +2390,34 @@ function installIntoClaude(spec2) {
   if (r.status === 0) return { ok: true };
   return { ok: false, error: (r.stderr || r.stdout || `exit ${r.status}`).trim().slice(0, 400) };
 }
+function claudeServerStatus(name) {
+  const r = run("claude", ["mcp", "get", name]);
+  const out = `${r.stdout || ""}${r.stderr || ""}`;
+  const line = out.split("\n").find((l) => l.includes("Status:")) ?? "";
+  if (/connected/i.test(line)) return "connected";
+  if (/needs auth/i.test(line)) return "needs-auth";
+  if (/failed|error|unreachable/i.test(line)) return "failed";
+  return "unknown";
+}
+function waitForClaudeConnection(name, timeoutMs = 12e3) {
+  const deadline = Date.now() + timeoutMs;
+  let last = "unknown";
+  for (; ; ) {
+    last = claudeServerStatus(name);
+    if (last === "connected" || Date.now() >= deadline) return last;
+    (0, import_child_process.spawnSync)(process.execPath, ["-e", "setTimeout(()=>{},1200)"], { timeout: 3e3 });
+  }
+}
 function claudeOneShot(spec2, prompt) {
   const argv = ["claude", "-p", prompt, "--allowedTools", `mcp__${spec2.name}__*`];
   const r = run(argv[0], argv.slice(1), { inherit: true });
   return { argv, status: r.status };
 }
+function claudeInteractive(spec2, prompt) {
+  const argv = ["claude", prompt, "--allowedTools", `mcp__${spec2.name}__*`];
+  const r = run(argv[0], argv.slice(1), { interactive: true });
+  return { argv, status: r.status };
+}
 function codexConfigPath() {
   return path4.join(process.env.CODEX_HOME || path4.join(os3.homedir(), ".codex"), "config.toml");
 }
@@ -2474,6 +2497,11 @@ function codexOneShot(_spec, prompt) {
   const r = run(argv[0], argv.slice(1), { inherit: true });
   return { argv, status: r.status };
 }
+function codexInteractive(_spec, 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 renderCommand(argv) {
   return argv.map((a, i) => i === 0 || /^[A-Za-z0-9_@%+=:,./-]+$/.test(a) ? a : shellQuote(a)).join(" ");
@@ -2508,10 +2536,25 @@ async function installAndDemo(cli, spec2, getQuestion, log = console.log) {
     log(`  ${import_chalk12.default.dim("$")} ${renderCommand(loginArgv)}`);
     const r = run(loginArgv[0], loginArgv.slice(1), { interactive: true });
     if (r.status !== 0) {
-      log(import_chalk12.default.yellow(`  Sign-in didn't complete (exit ${r.status ?? "?"}). Run \`${renderCommand(loginArgv)}\` yourself, then chat away.`));
-      return true;
+      log(import_chalk12.default.yellow(`  Sign-in didn't complete (exit ${r.status ?? "?"}). Run \`${renderCommand(loginArgv)}\` yourself to finish it.`));
+    } else {
+      log(`  ${import_chalk12.default.green("\u2714")} Signed in.`);
     }
-    log(`  ${import_chalk12.default.green("\u2714")} Signed in.`);
+  }
+  if (cli.kind === "claude") {
+    const status = waitForClaudeConnection(spec2.name);
+    if (status !== "connected") {
+      log(import_chalk12.default.yellow(`
+  ${cli.label} has the MCP configured, but reports: ${status === "needs-auth" ? "needs authentication" : status === "failed" ? "failed to connect" : "unknown status"}.`));
+      if (status === "needs-auth") {
+        log(import_chalk12.default.dim(`  Finish the sign-in with:  claude mcp login ${spec2.name}`));
+      } else {
+        log(import_chalk12.default.dim(`  Check it with:  claude mcp get ${spec2.name}   (or /mcp inside Claude Code)`));
+      }
+      log(import_chalk12.default.dim("  Chatting here instead so you still get an answer."));
+      return false;
+    }
+    log(`  ${import_chalk12.default.green("\u2714")} ${cli.label} reports the server connected.`);
   }
   const oneShot = cli.kind === "claude" ? claudeOneShot : codexOneShot;
   const abilities = `What are the tool abilities of the MCP server "${spec2.name}"? List them briefly.`;
@@ -2528,14 +2571,16 @@ async function installAndDemo(cli, spec2, getQuestion, log = console.log) {
   }
   const question = await getQuestion();
   if (question) {
+    const handoff = !!process.stdin.isTTY;
+    const ask = handoff ? cli.kind === "claude" ? claudeInteractive : codexInteractive : oneShot;
     log(`
-  ${import_chalk12.default.dim("Your question, through " + cli.label + ":")}`);
-    const shown = cli.kind === "claude" ? ["claude", "-p", question, "--allowedTools", `mcp__${spec2.name}__*`] : ["codex", "exec", question];
+  ${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", question];
     log(`  ${import_chalk12.default.dim("$")} ${renderCommand(shown)}
 `);
-    const ans = oneShot(spec2, question);
+    const ans = ask(spec2, question);
     if (ans.status !== 0) log(import_chalk12.default.yellow(`
-  ${cli.label} exited with ${ans.status ?? "no status"} on that one \u2014 the MCP stays installed.`));
+  ${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.`)}`);
@@ -4015,22 +4060,27 @@ async function maybeInstallExternalCli(p, opts) {
       refreshInstall(c.kind, buildInstallSpec(p));
     }
   }
-  const fresh = clis.filter((c) => !offer[c.kind]);
-  if (fresh.length === 0) return false;
+  const pending = clis.filter((c) => !offer[c.kind]);
+  if (pending.length === 0) return false;
   const { default: inquirer3 } = await import("inquirer");
-  const names = fresh.map((c) => c.label).join(" and ");
-  const targetName = fresh.length > 1 ? "one of them" : fresh[0].label;
+  const names = clis.map((c) => c.label).join(" and ");
+  const targetName = clis.length > 1 ? "one of them" : clis[0].label;
   const { pick: pick2 } = await inquirer3.prompt([{
     type: "list",
     name: "pick",
-    message: `I see ${names} ${fresh.length > 1 ? "are" : "is"} installed on this computer. Do you want to add the MCP for this proxy to ${targetName} so you can chat with your API from there directly, or chat here directly?`,
+    message: `I see ${names} ${clis.length > 1 ? "are" : "is"} installed on this computer. Do you want to add the MCP for this proxy to ${targetName} so you can chat with your API from there directly, or chat here directly?`,
     choices: [
-      ...fresh.map((c) => ({ name: c.label, value: c })),
+      ...clis.map((c) => ({
+        // An already-wired client stays selectable: picking it re-installs
+        // (fresh key, moved host) and re-runs the check.
+        name: offer[c.kind] === "installed" ? `${c.label} ${import_chalk13.default.dim("(already added \u2014 re-add)")}` : c.label,
+        value: c
+      })),
       { name: "Chat here directly", value: "here" }
     ]
   }]);
   if (pick2 === "here") {
-    for (const c of fresh) rememberCliOffer(p, c.kind, "declined");
+    for (const c of pending) rememberCliOffer(p, c.kind, "declined");
     if (p.consumerAuth && p.teamId && p.tenant) {
       try {
         await ensureConsumerLogin(p.teamId, p.tenant, p.version);

package/package.json

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