@openbat/cli 0.2.1 → 0.2.3

package/dist/index.js

@@ -163,7 +163,7 @@ function configPath() {
 
 // src/api-client.ts
 var import_node_url = require("url");
-var CLI_VERSION = "0.1.1";
+var CLI_VERSION = "0.2.3";
 var KEY_REGEX = /ob_(?:live|read|admin|pat)_[0-9a-f]{32}/g;
 function redact(s) {
   return s.replace(KEY_REGEX, (k) => `${k.slice(0, 16)}\u2026<hidden>`);
@@ -213,7 +213,7 @@ var ApiClient = class {
       const msg = err instanceof Error ? err.message : String(err);
       throw new Error(`Request to ${redact(url)} failed: ${redact(msg)}`);
     }
-    return parseResponse(res, url);
+    return parseResponse(res, url, "GET");
   }
   /** Issue a POST with a JSON body. */
   async post(path, body) {
@@ -275,12 +275,12 @@ mutate_fn = async function(method, path, body) {
     const msg = err instanceof Error ? err.message : String(err);
     throw new Error(`Request to ${redact(url)} failed: ${redact(msg)}`);
   }
-  return parseResponse(res, url);
+  return parseResponse(res, url, method);
 };
-async function parseResponse(res, url) {
+async function parseResponse(res, url, method) {
   if (res.status === 401) {
     throw new Error(
-      "Unauthorized. The API key was rejected (invalid, wrong kind for this endpoint, expired, or revoked)."
+      "Unauthorized. The API key was rejected (invalid, wrong kind for this endpoint, expired, or revoked). Run `openbat login` to refresh credentials."
     );
   }
   if (res.status === 403) {
@@ -301,7 +301,7 @@ async function parseResponse(res, url) {
     } catch {
     }
     throw new Error(
-      `GET ${redact(url)} \u2192 ${res.status} ${res.statusText}${errBody?.error ? `: ${redact(errBody.error)}` : ""}`
+      `${method} ${redact(url)} \u2192 ${res.status} ${res.statusText}${errBody?.error ? `: ${redact(errBody.error)}` : ""}`
     );
   }
   try {
@@ -388,7 +388,9 @@ function configCommand() {
   const cmd = new import_commander.Command("config").description(
     "Manage the CLI's ~/.openbatrc settings"
   );
-  cmd.command("set-key").description("Store your Read API key in ~/.openbatrc").option("--from-stdin", "Read the key from stdin (default and recommended)", true).option(
+  cmd.command("set-key").description(
+    "Store your API key in ~/.openbatrc. Reads from stdin by default; use --value to pass inline (discouraged \u2014 leaks into shell history)."
+  ).option(
     "--value <key>",
     "Pass the key inline. Discouraged \u2014 leaks into shell history."
   ).action(async (opts) => {
@@ -404,13 +406,13 @@ function configCommand() {
         key = Buffer.concat(chunks).toString("utf8").trim();
         if (!key) {
           fatal(
-            "No key on stdin. Try: echo 'ob_read_...' | openbat config set-key --from-stdin"
+            "No key on stdin. Try: echo 'ob_read_...' | openbat config set-key"
           );
         }
       }
       await setApiKey(key);
       process.stdout.write(
-        `Saved Read key to ${configPath()} (mode 0600).
+        `Saved key to ${configPath()} (mode 0600).
 `
       );
     } catch (err) {
@@ -529,7 +531,9 @@ async function resolveChatbotId(api, chatbotFlag) {
   );
   const chatbots = list.chatbots ?? [];
   if (chatbots.length === 0) {
-    fatal("This API key authorizes no chatbots.");
+    fatal(
+      "No chatbots yet. Run `openbat chatbots create --name <name>`, or ask an org owner to invite you."
+    );
   }
   if (chatbotFlag) {
     if (UUID_RE2.test(chatbotFlag)) {
@@ -714,18 +718,6 @@ function exportCommand() {
 
 // src/commands/auth.ts
 var import_commander3 = require("commander");
-async function client2(globals) {
-  const cfg = await resolveConfig({
-    apiKeyFlag: globals.apiKey ?? null,
-    baseUrlFlag: globals.baseUrl ?? null
-  });
-  if (!cfg.apiKey) {
-    fatal(
-      "No API key configured. Run `openbat config set-key`, pass --api-key, or set OPENBAT_API_KEY."
-    );
-  }
-  return new ApiClient({ apiKey: cfg.apiKey, baseUrl: cfg.baseUrl });
-}
 function detectKind(apiKey) {
   if (apiKey.startsWith("ob_read_")) return "read";
   if (apiKey.startsWith("ob_admin_")) return "admin";
@@ -777,17 +769,6 @@ function authCommand() {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  cmd.command("audit-log").description("Show recent audit-log entries for the current user").option("--days <n>", "Look-back window in days", "7").action(async function() {
-    try {
-      process.stderr.write(
-        "audit-log: endpoint not yet exposed via HTTP \u2014 query `select * from api_audit_log` in Supabase Studio for now.\n"
-      );
-      const _c = await client2(this.optsWithGlobals());
-      void _c;
-    } catch (err) {
-      fatal(err instanceof Error ? err.message : String(err));
-    }
-  });
   return cmd;
 }
 
@@ -1074,7 +1055,15 @@ async function pickDefaultChatbot(token, baseUrl) {
     return;
   }
   if (chatbots.length === 0) {
-    process.stdout.write("\nNo chatbots reachable yet. Create one from the dashboard.\n");
+    process.stdout.write(
+      [
+        "",
+        "No chatbots yet. To get one:",
+        "  \u2022 Create one:  openbat chatbots create --name <name>",
+        "  \u2022 Or ask an org owner to invite you, then run `openbat login` again",
+        ""
+      ].join("\n")
+    );
     return;
   }
   if (chatbots.length === 1) {
@@ -1142,7 +1131,7 @@ function logoutCommand() {
         }
       } else {
         process.stderr.write(
-          "Note: read/admin keys can't self-revoke. Visit the dashboard to revoke; this command will just clear the local config.\n"
+          "Note: read/admin keys can't self-revoke server-side. Revoke them in the dashboard if needed; clearing local config only.\n"
         );
       }
       await clearApiKey();
@@ -1155,7 +1144,7 @@ function logoutCommand() {
 
 // src/commands/org.ts
 var import_commander6 = require("commander");
-async function client3(globals) {
+async function client2(globals) {
   const cfg = await resolveConfig({
     apiKeyFlag: globals.apiKey ?? null,
     baseUrlFlag: globals.baseUrl ?? null
@@ -1175,7 +1164,7 @@ function orgCommand() {
   cmd.command("list").description("List orgs the current PAT's user belongs to").action(async function() {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client3(globals);
+      const c = await client2(globals);
       const result = await c.get("/api/v1/orgs");
       emit(result.orgs, { json: !!globals.json });
     } catch (err) {
@@ -1185,7 +1174,7 @@ function orgCommand() {
   cmd.command("show").description("Show the active org (id, name, members)").action(async function() {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client3(globals);
+      const c = await client2(globals);
       const result = await c.get(
         "/api/v1/orgs/active"
       );
@@ -1200,7 +1189,7 @@ function orgCommand() {
   cmd.command("rename").description("Rename an org (owner only)").requiredOption("--id <orgId>", "Org id").requiredOption("--name <name>", "New name").action(async function(opts) {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client3(globals);
+      const c = await client2(globals);
       await c.patch(`/api/v1/orgs/${opts.id}`, { name: opts.name });
       emit({ ok: true, renamed: opts.id }, { json: !!globals.json });
     } catch (err) {
@@ -1211,7 +1200,7 @@ function orgCommand() {
   members.command("list").requiredOption("--id <orgId>", "Org id").action(async function(opts) {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client3(globals);
+      const c = await client2(globals);
       const result = await c.get(
         `/api/v1/orgs/${opts.id}/members`
       );
@@ -1223,7 +1212,7 @@ function orgCommand() {
   members.command("invite").requiredOption("--id <orgId>", "Org id").requiredOption("--email <email>", "Invitee email").option("--role <role>", "member | admin", "member").action(async function(opts) {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client3(globals);
+      const c = await client2(globals);
       const result = await c.post(
         `/api/v1/orgs/${opts.id}/members`,
         { email: opts.email, role: opts.role }
@@ -1241,7 +1230,7 @@ function orgCommand() {
   members.command("set-role").requiredOption("--id <orgId>", "Org id").requiredOption("--member <memberId>", "Member id").requiredOption("--role <role>", "admin | member").action(async function(opts) {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client3(globals);
+      const c = await client2(globals);
       await c.patch(`/api/v1/orgs/${opts.id}/members/${opts.member}`, {
         role: opts.role
       });
@@ -1253,7 +1242,7 @@ function orgCommand() {
   members.command("remove").requiredOption("--id <orgId>", "Org id").requiredOption("--member <memberId>", "Member id").action(async function(opts) {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client3(globals);
+      const c = await client2(globals);
       await c.delete(`/api/v1/orgs/${opts.id}/members/${opts.member}`);
       emit({ ok: true }, { json: !!globals.json });
     } catch (err) {
@@ -1264,7 +1253,7 @@ function orgCommand() {
   invitations.command("list").requiredOption("--id <orgId>", "Org id").action(async function(opts) {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client3(globals);
+      const c = await client2(globals);
       const result = await c.get(
         `/api/v1/orgs/${opts.id}/invitations`
       );
@@ -1278,7 +1267,7 @@ function orgCommand() {
 
 // src/commands/write.ts
 var import_commander7 = require("commander");
-async function client4(globals) {
+async function client3(globals) {
   const cfg = await resolveConfig({
     apiKeyFlag: globals.apiKey ?? null,
     baseUrlFlag: globals.baseUrl ?? null
@@ -1288,6 +1277,15 @@ async function client4(globals) {
   }
   return new ApiClient({ apiKey: cfg.apiKey, baseUrl: cfg.baseUrl });
 }
+function requireChatbotId(cmd) {
+  const globals = cmd.optsWithGlobals();
+  if (!globals.chatbot) {
+    fatal(
+      "--chatbot <id> is required. Pass it inline or set a default with `openbat use <id>`."
+    );
+  }
+  return globals.chatbot;
+}
 function surfacePlaintext(plaintext, label) {
   process.stderr.write(
     `
@@ -1307,7 +1305,7 @@ function chatbotsCommand() {
   cmd.command("list").description("List every chatbot the credential can reach").action(async function() {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const result = await c.get(
         "/api/v1/chatbots"
       );
@@ -1319,7 +1317,7 @@ function chatbotsCommand() {
   cmd.command("create").description("Create a new chatbot (PAT scope required)").requiredOption("--name <name>", "Chatbot name").option("--website <url>").option("--docs-url <url>").option("--mcp-url <url>").option("--language <code>", "Primary language code (default: en)", "en").action(async function(opts) {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const result = await c.post("/api/v1/chatbots", {
         name: opts.name,
         websiteUrl: opts.website,
@@ -1339,7 +1337,7 @@ function chatbotsCommand() {
   cmd.command("delete <chatbotId>").description("Delete a chatbot (irreversible \u2014 cascade-deletes everything)").action(async function(chatbotId) {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       await c.delete(`/api/v1/chatbots/${chatbotId}`);
       emit({ ok: true, deleted: chatbotId }, { json: !!globals.json });
     } catch (err) {
@@ -1350,23 +1348,25 @@ function chatbotsCommand() {
 }
 function webhooksCommand() {
   const cmd = new import_commander7.Command("webhooks").description("Manage webhooks for a chatbot");
-  cmd.command("list").requiredOption("--chatbot <id>", "Chatbot id").action(async function(opts) {
+  cmd.command("list").action(async function() {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const result = await c.get(
-        `/api/v1/chatbots/${opts.chatbot}/webhooks`
+        `/api/v1/chatbots/${chatbotId}/webhooks`
       );
       emit(result.webhooks, { json: !!globals.json });
     } catch (err) {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  cmd.command("create").requiredOption("--chatbot <id>", "Chatbot id").requiredOption("--name <name>").requiredOption("--url <url>").option("--type <type>", "discord | slack | custom", "custom").action(async function(opts) {
+  cmd.command("create").requiredOption("--name <name>").requiredOption("--url <url>").option("--type <type>", "discord | slack | custom", "custom").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
-      const result = await c.post(`/api/v1/chatbots/${opts.chatbot}/webhooks`, {
+      const c = await client3(globals);
+      const result = await c.post(`/api/v1/chatbots/${chatbotId}/webhooks`, {
         name: opts.name,
         url: opts.url,
         type: opts.type
@@ -1377,11 +1377,12 @@ function webhooksCommand() {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  cmd.command("delete").requiredOption("--chatbot <id>", "Chatbot id").requiredOption("--webhook <id>", "Webhook id").action(async function(opts) {
+  cmd.command("delete").requiredOption("--webhook <id>", "Webhook id").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
-      await c.delete(`/api/v1/chatbots/${opts.chatbot}/webhooks/${opts.webhook}`);
+      const c = await client3(globals);
+      await c.delete(`/api/v1/chatbots/${chatbotId}/webhooks/${opts.webhook}`);
       emit({ ok: true, deleted: opts.webhook }, { json: !!globals.json });
     } catch (err) {
       fatal(err instanceof Error ? err.message : String(err));
@@ -1394,12 +1395,13 @@ function settingsCommand() {
     "Manage chatbot settings + per-chatbot keys"
   );
   const keys = cmd.command("keys").description("Manage API keys for a chatbot");
-  keys.command("rotate-ingest").requiredOption("--chatbot <id>", "Chatbot id").action(async function(opts) {
+  keys.command("rotate-ingest").action(async function() {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const result = await c.post(
-        `/api/v1/chatbots/${opts.chatbot}/keys/ingest/rotate`,
+        `/api/v1/chatbots/${chatbotId}/keys/ingest/rotate`,
         {}
       );
       surfacePlaintext(result.plaintext, "New ingest key (ob_live_*)");
@@ -1408,12 +1410,13 @@ function settingsCommand() {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  keys.command("generate-read").requiredOption("--chatbot <id>", "Chatbot id").action(async function(opts) {
+  keys.command("generate-read").action(async function() {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const result = await c.post(
-        `/api/v1/chatbots/${opts.chatbot}/keys/read`,
+        `/api/v1/chatbots/${chatbotId}/keys/read`,
         {}
       );
       surfacePlaintext(result.plaintext, "New read key (ob_read_*)");
@@ -1422,11 +1425,12 @@ function settingsCommand() {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  keys.command("generate-admin").requiredOption("--chatbot <id>", "Chatbot id").requiredOption("--name <name>", "Human-friendly name (e.g. 'CI key')").option("--expires-in-days <n>", "Auto-expire after N days").action(async function(opts) {
+  keys.command("generate-admin").requiredOption("--name <name>", "Human-friendly name (e.g. 'CI key')").option("--expires-in-days <n>", "Auto-expire after N days").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
-      const result = await c.post(`/api/v1/chatbots/${opts.chatbot}/admin-keys`, {
+      const c = await client3(globals);
+      const result = await c.post(`/api/v1/chatbots/${chatbotId}/admin-keys`, {
         name: opts.name,
         expiresInDays: opts.expiresInDays ? Number(opts.expiresInDays) : void 0
       });
@@ -1436,30 +1440,33 @@ function settingsCommand() {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  keys.command("list-admin").requiredOption("--chatbot <id>", "Chatbot id").action(async function(opts) {
+  keys.command("list-admin").action(async function() {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const result = await c.get(
-        `/api/v1/chatbots/${opts.chatbot}/admin-keys`
+        `/api/v1/chatbots/${chatbotId}/admin-keys`
       );
       emit(result.keys, { json: !!globals.json });
     } catch (err) {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  keys.command("revoke-admin").requiredOption("--chatbot <id>", "Chatbot id").requiredOption("--key <keyId>", "Admin key id").action(async function(opts) {
+  keys.command("revoke-admin").requiredOption("--key <keyId>", "Admin key id").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
-      await c.delete(`/api/v1/chatbots/${opts.chatbot}/admin-keys/${opts.key}`);
+      const c = await client3(globals);
+      await c.delete(`/api/v1/chatbots/${chatbotId}/admin-keys/${opts.key}`);
       emit({ ok: true, revoked: opts.key }, { json: !!globals.json });
     } catch (err) {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  cmd.command("update").description("Patch a chatbot's settings JSONB").requiredOption("--chatbot <id>", "Chatbot id").option("--description <text>").option("--website-url <url>").option("--language <code>").action(async function(opts) {
+  cmd.command("update").description("Patch a chatbot's settings JSONB").option("--description <text>").option("--website-url <url>").option("--language <code>").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const settings = {};
       if (opts.description) settings.description = opts.description;
       if (opts.websiteUrl) settings.website_url = opts.websiteUrl;
@@ -1468,8 +1475,8 @@ function settingsCommand() {
         fatal("Provide at least one setting to update.");
       }
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
-      await c.patch(`/api/v1/chatbots/${opts.chatbot}/settings`, { settings });
+      const c = await client3(globals);
+      await c.patch(`/api/v1/chatbots/${chatbotId}/settings`, { settings });
       emit({ ok: true }, { json: !!globals.json });
     } catch (err) {
       fatal(err instanceof Error ? err.message : String(err));
@@ -1479,19 +1486,20 @@ function settingsCommand() {
 }
 function workflowsCommand() {
   const cmd = new import_commander7.Command("workflows").description("Manage workflows");
-  cmd.command("list").requiredOption("--chatbot <id>", "Chatbot id").action(async function(opts) {
+  cmd.command("list").action(async function() {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const result = await c.get(
-        `/api/v1/chatbots/${opts.chatbot}/workflows`
+        `/api/v1/chatbots/${chatbotId}/workflows`
       );
       emit(result.workflows, { json: !!globals.json });
     } catch (err) {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  cmd.command("create").description("Create a workflow from a built-in template").requiredOption("--chatbot <id>", "Chatbot id").requiredOption("--name <name>").requiredOption(
+  cmd.command("create").description("Create a workflow from a built-in template").requiredOption("--name <name>").requiredOption(
     "--template <name>",
     "flag-to-webhook | outcome-to-webhook | sentiment-drop-to-webhook"
   ).requiredOption(
@@ -1499,9 +1507,10 @@ function workflowsCommand() {
     "Flag value / outcome value / sentiment threshold"
   ).requiredOption("--webhook <id>", "Webhook id to fire").option("--message <tpl>", "Message template (supports {{user.id}}, etc.)").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
-      const result = await c.post(`/api/v1/chatbots/${opts.chatbot}/workflows`, {
+      const c = await client3(globals);
+      const result = await c.post(`/api/v1/chatbots/${chatbotId}/workflows`, {
         name: opts.name,
         template: opts.template,
         triggerValue: opts.triggerValue,
@@ -1517,23 +1526,25 @@ function workflowsCommand() {
 }
 function reportsCommand() {
   const cmd = new import_commander7.Command("reports").description("Manage AI reports");
-  cmd.command("list").requiredOption("--chatbot <id>", "Chatbot id").action(async function(opts) {
+  cmd.command("list").action(async function() {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const result = await c.get(
-        `/api/v1/chatbots/${opts.chatbot}/reports`
+        `/api/v1/chatbots/${chatbotId}/reports`
       );
       emit(result.reports, { json: !!globals.json });
     } catch (err) {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  cmd.command("create").description("Create a new AI report; returns the org-private dashboard URL").requiredOption("--chatbot <id>", "Chatbot id").option("--name <name>", "Report name", "Untitled Report").action(async function(opts) {
+  cmd.command("create").description("Create a new AI report; returns the org-private dashboard URL").option("--name <name>", "Report name", "Untitled Report").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
-      const result = await c.post(`/api/v1/chatbots/${opts.chatbot}/reports`, { name: opts.name });
+      const c = await client3(globals);
+      const result = await c.post(`/api/v1/chatbots/${chatbotId}/reports`, { name: opts.name });
       process.stderr.write(
         `
 Created report. View it (org members only):
@@ -1553,30 +1564,32 @@ Created report. View it (org members only):
 }
 function analysisCommand() {
   const cmd = new import_commander7.Command("analysis").description("Manage analysis definitions");
-  cmd.command("list").requiredOption("--chatbot <id>", "Chatbot id").option("--type <t>", "intent | flag | assistant_outcome | assistant_issue").option("--pending", "Include pending suggestions").action(async function(opts) {
+  cmd.command("list").option("--type <t>", "intent | flag | assistant_outcome | assistant_issue").option("--pending", "Include pending suggestions").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const qs = new URLSearchParams();
       if (opts.type) qs.set("type", opts.type);
       if (opts.pending) qs.set("pending", "true");
       const result = await c.get(
-        `/api/v1/chatbots/${opts.chatbot}/analysis-definitions${qs.size ? `?${qs}` : ""}`
+        `/api/v1/chatbots/${chatbotId}/analysis-definitions${qs.size ? `?${qs}` : ""}`
       );
       emit(result.definitions, { json: !!globals.json });
     } catch (err) {
       fatal(err instanceof Error ? err.message : String(err));
     }
   });
-  cmd.command("add").requiredOption("--chatbot <id>", "Chatbot id").requiredOption(
+  cmd.command("add").requiredOption(
     "--type <t>",
     "intent | flag | assistant_outcome | assistant_issue"
   ).requiredOption("--name <slug>", "snake_case slug").requiredOption("--display-name <text>").requiredOption("--description <text>").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const result = await c.post(
-        `/api/v1/chatbots/${opts.chatbot}/analysis-definitions`,
+        `/api/v1/chatbots/${chatbotId}/analysis-definitions`,
         {
           analysisType: opts.type,
           name: opts.name,
@@ -1595,10 +1608,11 @@ function usersCommand() {
   const cmd = new import_commander7.Command("users").description(
     "List external users (chatbot customers) with health metrics"
   );
-  cmd.command("list").requiredOption("--chatbot <id>", "Chatbot id").option("--from <iso>").option("--to <iso>").option("--days <n>", "Convenience: last N days").option("--search <q>").option("--limit <n>", "Page size", "20").action(async function(opts) {
+  cmd.command("list").option("--from <iso>").option("--to <iso>").option("--days <n>", "Convenience: last N days").option("--search <q>").option("--limit <n>", "Page size", "20").action(async function(opts) {
     try {
+      const chatbotId = requireChatbotId(this);
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
+      const c = await client3(globals);
       const qs = new URLSearchParams();
       let from = opts.from;
       if (!from && opts.days) {
@@ -1611,7 +1625,7 @@ function usersCommand() {
       if (opts.search) qs.set("search", opts.search);
       qs.set("limit", opts.limit);
       const result = await c.get(
-        `/api/v1/chatbots/${opts.chatbot}/external-users?${qs}`
+        `/api/v1/chatbots/${chatbotId}/external-users?${qs}`
       );
       emit(result.users, { json: !!globals.json });
       process.stderr.write(`
@@ -1629,7 +1643,7 @@ function sdkCommand() {
   );
   cmd.command("install-instructions").description("Print markdown the calling agent can follow").option(
     "--framework <name>",
-    "next | node | vercel-ai-sdk (default: next)",
+    "next | vercel-ai-sdk (default: next)",
     "next"
   ).option("--chatbot <id>", "Chatbot id (for the example snippet)").action(async function(opts) {
     const chatbotId = opts.chatbot ?? "<chatbotId>";
@@ -1686,27 +1700,43 @@ function sdkCommand() {
     const out = opts.framework === "vercel-ai-sdk" ? snippetWrapper : snippetNext;
     process.stdout.write(out);
   });
-  cmd.command("verify").description("Check whether any event has arrived for the chatbot yet").requiredOption("--chatbot <id>", "Chatbot id").option("--timeout <n>", "Seconds to wait (default: 60)", "60").action(async function(opts) {
+  cmd.command("verify").description("Check whether any event has arrived for the chatbot yet").option("--timeout <n>", "Seconds to wait (default: 60)", "60").action(async function(opts) {
     try {
       const globals = this.optsWithGlobals();
-      const c = await client4(globals);
-      const deadline = Date.now() + Number(opts.timeout) * 1e3;
+      const chatbotId = globals.chatbot;
+      if (!chatbotId) {
+        fatal("--chatbot <id> is required (also accepts the persisted active chatbot).");
+      }
+      const c = await client3(globals);
+      const timeoutSec = Number(opts.timeout);
+      const deadline = Date.now() + timeoutSec * 1e3;
+      const params = new URLSearchParams({
+        chatbotId,
+        limit: "1"
+      });
+      process.stderr.write(
+        `Waiting for first event on chatbot ${chatbotId} (timeout ${timeoutSec}s)\u2026
+`
+      );
+      let lastTick = Date.now();
       while (Date.now() < deadline) {
-        try {
-          const result = await c.get(`/api/v1/conversations?limit=1`);
-          if (result.total > 0) {
-            process.stderr.write(
-              `\u2713 First event detected. ${result.total} conversation(s) ingested.
+        const result = await c.get(`/api/v1/conversations?${params}`);
+        if (result.total > 0) {
+          process.stderr.write(
+            `First event detected. ${result.total} conversation(s) ingested.
 `
-            );
-            return;
-          }
-        } catch {
+          );
+          return;
+        }
+        if (Date.now() - lastTick >= 5e3) {
+          process.stderr.write(".");
+          lastTick = Date.now();
         }
         await new Promise((r) => setTimeout(r, 2e3));
       }
       process.stderr.write(
-        `Timed out after ${opts.timeout}s \u2014 no events yet. Confirm OPENBAT_API_KEY and that recordMessages is being called.
+        `
+Timed out after ${timeoutSec}s \u2014 no events yet. Confirm OPENBAT_API_KEY and that recordMessages is being called.
 `
       );
       process.exit(2);
@@ -1721,7 +1751,7 @@ function sdkCommand() {
 var program = new import_commander8.Command();
 program.name("openbat").description(
   "Query OpenBat chatbot data \u2014 conversations, sentiment, analytics, exports."
-).version("0.2.1").option("--api-key <key>", "Override the stored Read API key (footgun \u2014 leaks into shell history)").option(
+).version("0.2.3").option("--api-key <key>", "Override the stored Read API key (footgun \u2014 leaks into shell history)").option(
   "--base-url <url>",
   "Override the OpenBat API base URL (defaults to ~/.openbatrc or https://openbat.dev)"
 ).option(