@arbidocs/cli 0.3.10 → 0.3.13

package/dist/index.js

@@ -5,8 +5,8 @@ var commander = require('commander');
 var fs = require('fs');
 var os = require('os');
 var path = require('path');
+var chalk2 = require('chalk');
 var sdk = require('@arbidocs/sdk');
-var chalk = require('chalk');
 var prompts = require('@inquirer/prompts');
 var child_process = require('child_process');
 var client = require('@arbidocs/client');
@@ -18,7 +18,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var os__default = /*#__PURE__*/_interopDefault(os);
 var path__default = /*#__PURE__*/_interopDefault(path);
-var chalk__default = /*#__PURE__*/_interopDefault(chalk);
+var chalk2__default = /*#__PURE__*/_interopDefault(chalk2);
 
 var store = new sdk.FileConfigStore();
 function getConfig() {
@@ -38,6 +38,13 @@ function requireConfig() {
     throw err;
   }
 }
+function resolveConfig() {
+  const { config, source } = store.resolveConfigWithFallbacks();
+  if (source !== "config") {
+    console.error(chalk2__default.default.dim(`Using server URL from ${source}: ${config.baseUrl}`));
+  }
+  return config;
+}
 function getCredentials() {
   return store.getCredentials();
 }
@@ -54,32 +61,32 @@ function clearChatSession() {
   store.clearChatSession();
 }
 function success(msg) {
-  console.log(chalk__default.default.green(msg));
+  console.log(chalk2__default.default.green(msg));
 }
 function error(msg) {
-  console.error(chalk__default.default.red(msg));
+  console.error(chalk2__default.default.red(msg));
 }
 function warn(msg) {
-  console.error(chalk__default.default.yellow(msg));
+  console.error(chalk2__default.default.yellow(msg));
 }
 function label(key, value) {
-  console.log(`${chalk__default.default.bold(key)} ${value}`);
+  console.log(`${chalk2__default.default.bold(key)} ${value}`);
 }
 function dim(msg) {
-  console.log(chalk__default.default.dim(msg));
+  console.log(chalk2__default.default.dim(msg));
 }
 function bold(msg) {
-  console.log(chalk__default.default.bold(msg));
+  console.log(chalk2__default.default.bold(msg));
 }
 function status(s) {
   const lower = s.toLowerCase();
-  if (["healthy", "completed", "available", "online", "on"].includes(lower)) return chalk__default.default.green(s);
-  if (["failed", "error", "unavailable", "offline"].includes(lower)) return chalk__default.default.red(s);
-  if (["processing", "pending", "degraded", "warning"].includes(lower)) return chalk__default.default.yellow(s);
+  if (["healthy", "completed", "available", "online", "on"].includes(lower)) return chalk2__default.default.green(s);
+  if (["failed", "error", "unavailable", "offline"].includes(lower)) return chalk2__default.default.red(s);
+  if (["processing", "pending", "degraded", "warning"].includes(lower)) return chalk2__default.default.yellow(s);
   return s;
 }
 function ref(s) {
-  return chalk__default.default.cyan(s);
+  return chalk2__default.default.cyan(s);
 }
 
 // src/commands/config-cmd.ts
@@ -3502,7 +3509,7 @@ function getLatestVersion(skipCache = false) {
   }
 }
 function getCurrentVersion() {
-  return "0.3.10";
+  return "0.3.13";
 }
 function readChangelog(fromVersion, toVersion) {
   try {
@@ -3555,17 +3562,17 @@ function showChangelog(fromVersion, toVersion) {
 async function checkForUpdates(autoUpdate) {
   try {
     const latest = getLatestVersion();
-    if (!latest || latest === "0.3.10") return;
+    if (!latest || latest === "0.3.13") return;
     if (autoUpdate) {
       warn(`
-Your arbi version is out of date (${"0.3.10"} \u2192 ${latest}). Updating...`);
+Your arbi version is out of date (${"0.3.13"} \u2192 ${latest}). Updating...`);
       child_process.execSync("npm install -g @arbidocs/cli@latest", { stdio: "inherit" });
-      showChangelog("0.3.10", latest);
+      showChangelog("0.3.13", latest);
       console.log(`Updated to ${latest}.`);
     } else {
       warn(
         `
-Your arbi version is out of date (${"0.3.10"} \u2192 ${latest}).
+Your arbi version is out of date (${"0.3.13"} \u2192 ${latest}).
 Run "arbi update" to upgrade, or "arbi update auto" to always stay up to date.`
       );
     }
@@ -3575,9 +3582,9 @@ Run "arbi update" to upgrade, or "arbi update auto" to always stay up to date.`
 function hintUpdateOnError() {
   try {
     const cached = readCache();
-    if (cached && cached.latest !== "0.3.10") {
+    if (cached && cached.latest !== "0.3.13") {
       warn(
-        `Your arbi version is out of date (${"0.3.10"} \u2192 ${cached.latest}). Run "arbi update".`
+        `Your arbi version is out of date (${"0.3.13"} \u2192 ${cached.latest}). Run "arbi update".`
       );
     }
   } catch {
@@ -3595,30 +3602,32 @@ function registerLoginCommand(program2) {
       clearChatSession();
       const { data: workspaces2 } = await arbi.fetch.GET("/v1/user/workspaces");
       const wsList = workspaces2 || [];
-      success(`Logged in as ${email}`);
-      if (wsList.length === 0) {
-        console.log("No workspaces found.");
+      const memberWorkspaces = wsList.filter((ws2) => ws2.users?.some((u) => u.email === email));
+      if (memberWorkspaces.length === 0) {
+        console.log("No workspaces found. Create one with: arbi workspace create <name>");
         return;
       }
       if (opts.workspace) {
-        const ws2 = wsList.find((w) => w.external_id === opts.workspace);
+        const ws2 = memberWorkspaces.find((w) => w.external_id === opts.workspace);
         if (!ws2) {
-          error(`Workspace ${opts.workspace} not found.`);
+          error(`Workspace ${opts.workspace} not found or you don't have access.`);
           process.exit(1);
         }
         updateConfig({ selectedWorkspaceId: ws2.external_id });
         success(`Workspace: ${ws2.name} (${ref(ws2.external_id)})`);
         return;
       }
-      if (wsList.length === 1) {
-        updateConfig({ selectedWorkspaceId: wsList[0].external_id });
-        success(`Workspace: ${wsList[0].name} (${ref(wsList[0].external_id)})`);
+      if (memberWorkspaces.length === 1) {
+        updateConfig({ selectedWorkspaceId: memberWorkspaces[0].external_id });
+        success(
+          `Workspace: ${memberWorkspaces[0].name} (${ref(memberWorkspaces[0].external_id)})`
+        );
         return;
       }
-      const choices = sdk.formatWorkspaceChoices(wsList);
+      const choices = sdk.formatWorkspaceChoices(memberWorkspaces);
       const selected = await promptSelect("Select workspace", choices);
       updateConfig({ selectedWorkspaceId: selected });
-      const ws = wsList.find((w) => w.external_id === selected);
+      const ws = memberWorkspaces.find((w) => w.external_id === selected);
       success(`Workspace: ${ws.name} (${ref(selected)})`);
       dim('\nTip: Run "arbi config alias" to use A as a shortcut for "arbi ask"');
     } catch (err) {
@@ -3656,7 +3665,11 @@ function registerRegisterCommand(program2) {
   });
 }
 async function smartRegister(config, opts) {
-  const email = opts.email || process.env.ARBI_EMAIL || await promptInput("Email");
+  let email = opts.email || process.env.ARBI_EMAIL || await promptInput("Email");
+  if ((opts.email || process.env.ARBI_EMAIL) && !email.includes("@")) {
+    email = `${email}@${config.deploymentDomain}`;
+    console.log(`Using email: ${email}`);
+  }
   const arbi = client.createArbiClient({
     baseUrl: config.baseUrl,
     deploymentDomain: config.deploymentDomain,
@@ -3722,13 +3735,17 @@ Registered successfully as ${email}`);
   }
 }
 async function nonInteractiveRegister(config, opts) {
-  const email = opts.email || process.env.ARBI_EMAIL;
+  let email = opts.email || process.env.ARBI_EMAIL;
   const password2 = opts.password || process.env.ARBI_PASSWORD;
   const supportApiKey = process.env.SUPPORT_API_KEY;
   if (!email) {
     error("Email required. Use --email <email> or set ARBI_EMAIL");
     process.exit(1);
   }
+  if (!email.includes("@")) {
+    email = `${email}@${config.deploymentDomain}`;
+    console.log(`Using email: ${email}`);
+  }
   if (!password2) {
     error("Password required. Use --password <password> or set ARBI_PASSWORD");
     process.exit(1);
@@ -3771,6 +3788,7 @@ async function nonInteractiveRegister(config, opts) {
     error(`Registration failed: ${sdk.getErrorMessage(err)}`);
     process.exit(1);
   }
+  await loginAfterRegister(config, email, password2);
 }
 async function loginAfterRegister(config, email, password2) {
   try {
@@ -3778,22 +3796,23 @@ async function loginAfterRegister(config, email, password2) {
     success(`Logged in as ${email}`);
     const { data: workspaces2 } = await arbi.fetch.GET("/v1/user/workspaces");
     const wsList = workspaces2 || [];
-    if (wsList.length === 0) {
+    const memberWorkspaces = wsList.filter((ws2) => ws2.users?.some((u) => u.email === email));
+    if (memberWorkspaces.length === 0) {
       console.log("Creating your first workspace...");
       const ws2 = await sdk.workspaces.createWorkspace(arbi, "My First Workspace");
       updateConfig({ selectedWorkspaceId: ws2.external_id });
       success(`Workspace: ${ws2.name} (${ref(ws2.external_id)})`);
       return;
     }
-    if (wsList.length === 1) {
-      updateConfig({ selectedWorkspaceId: wsList[0].external_id });
-      success(`Workspace: ${wsList[0].name} (${ref(wsList[0].external_id)})`);
+    if (memberWorkspaces.length === 1) {
+      updateConfig({ selectedWorkspaceId: memberWorkspaces[0].external_id });
+      success(`Workspace: ${memberWorkspaces[0].name} (${ref(memberWorkspaces[0].external_id)})`);
       return;
     }
-    const choices = sdk.formatWorkspaceChoices(wsList);
+    const choices = sdk.formatWorkspaceChoices(memberWorkspaces);
     const selected = await promptSelect("Select workspace", choices);
     updateConfig({ selectedWorkspaceId: selected });
-    const ws = wsList.find((w) => w.external_id === selected);
+    const ws = memberWorkspaces.find((w) => w.external_id === selected);
     success(`Workspace: ${ws.name} (${ref(selected)})`);
   } catch (err) {
     error(`Login failed: ${sdk.getErrorMessage(err)}`);
@@ -3838,9 +3857,9 @@ function timestamp() {
   return (/* @__PURE__ */ new Date()).toLocaleTimeString("en-GB", { hour12: false });
 }
 function colorize(level, text) {
-  if (level === "success") return chalk__default.default.green(text);
-  if (level === "error") return chalk__default.default.red(text);
-  if (level === "warning") return chalk__default.default.yellow(text);
+  if (level === "success") return chalk2__default.default.green(text);
+  if (level === "error") return chalk2__default.default.red(text);
+  if (level === "warning") return chalk2__default.default.yellow(text);
   return text;
 }
 async function startBackgroundNotifications(baseUrl, accessToken) {
@@ -3861,18 +3880,18 @@ ${colorize(level, `[${timestamp()}] ${text}`)}
       onReconnecting: (attempt, maxRetries) => {
         process.stderr.write(
           `
-${chalk__default.default.yellow(`[${timestamp()}] Reconnecting... (${attempt}/${maxRetries})`)}
+${chalk2__default.default.yellow(`[${timestamp()}] Reconnecting... (${attempt}/${maxRetries})`)}
 `
         );
       },
       onReconnected: () => {
         process.stderr.write(`
-${chalk__default.default.green(`[${timestamp()}] Reconnected`)}
+${chalk2__default.default.green(`[${timestamp()}] Reconnected`)}
 `);
       },
       onReconnectFailed: () => {
         process.stderr.write(`
-${chalk__default.default.red(`[${timestamp()}] Reconnection failed`)}
+${chalk2__default.default.red(`[${timestamp()}] Reconnection failed`)}
 `);
       }
     });
@@ -3890,13 +3909,49 @@ process.on("SIGINT", () => {
 });
 
 // src/helpers.ts
+var CONNECTION_ERROR_HINTS = {
+  ECONNREFUSED: "Connection refused. Is the backend running?",
+  ECONNRESET: "Connection reset by server. The backend may have restarted.",
+  ENOTFOUND: "DNS resolution failed. Check the server URL.",
+  ETIMEDOUT: "Connection timed out. Check network connectivity.",
+  UNABLE_TO_VERIFY_LEAF_SIGNATURE: "TLS certificate cannot be verified. The cert may be expired or self-signed.",
+  CERT_HAS_EXPIRED: "TLS certificate has expired. Renew with manage-deployment.",
+  ERR_TLS_CERT_ALTNAME_INVALID: "TLS certificate hostname mismatch. Check the server URL.",
+  DEPTH_ZERO_SELF_SIGNED_CERT: "Self-signed TLS certificate. The cert may need to be renewed.",
+  SELF_SIGNED_CERT_IN_CHAIN: "Self-signed certificate in chain. The cert may need to be renewed."
+};
+function diagnoseConnectionError(err) {
+  const code = sdk.getErrorCode(err);
+  if (code && code in CONNECTION_ERROR_HINTS) {
+    return CONNECTION_ERROR_HINTS[code];
+  }
+  const msg = err instanceof Error ? err.message : "";
+  if (msg === "fetch failed" || msg.includes("fetch failed")) {
+    return "Network error connecting to the server. Run `arbi health` to diagnose.";
+  }
+  return void 0;
+}
+function formatCliError(err) {
+  const connectionHint = diagnoseConnectionError(err);
+  if (connectionHint) return connectionHint;
+  if (err instanceof sdk.ArbiApiError && err.apiError && typeof err.apiError === "object") {
+    const base = err.message;
+    const apiErr = err.apiError;
+    const detail = apiErr.detail ?? apiErr.message ?? apiErr.error;
+    if (typeof detail === "string" && detail && !base.includes(detail)) {
+      return `${base} \u2014 ${detail}`;
+    }
+    return base;
+  }
+  return sdk.getErrorMessage(err);
+}
 function runAction(fn) {
   return async () => {
     try {
       await fn();
       process.exit(0);
     } catch (err) {
-      error(`Error: ${sdk.getErrorMessage(err)}`);
+      error(`Error: ${formatCliError(err)}`);
       hintUpdateOnError();
       process.exit(1);
     }
@@ -3904,6 +3959,7 @@ function runAction(fn) {
 }
 async function resolveAuth() {
   try {
+    resolveConfig();
     return await sdk.resolveAuth(store);
   } catch (err) {
     if (err instanceof sdk.ArbiError) {
@@ -3915,6 +3971,7 @@ async function resolveAuth() {
 }
 async function resolveWorkspace(workspaceOpt) {
   try {
+    resolveConfig();
     const ctx = await sdk.resolveWorkspace(store, workspaceOpt);
     if (getConfig()?.notifications) {
       startBackgroundNotifications(ctx.config.baseUrl, ctx.accessToken).catch(() => {
@@ -3930,7 +3987,7 @@ async function resolveWorkspace(workspaceOpt) {
   }
 }
 function printTable(columns, rows) {
-  console.log(chalk__default.default.bold(columns.map((c) => c.header.padEnd(c.width)).join("")));
+  console.log(chalk2__default.default.bold(columns.map((c) => c.header.padEnd(c.width)).join("")));
   for (const row of rows) {
     console.log(
       columns.map((c) => {
@@ -4028,6 +4085,10 @@ function registerWorkspacesCommand(program2) {
         process.exit(1);
       }
       await sdk.workspaces.deleteWorkspaces(arbi, [targetId]);
+      const session = getChatSession();
+      if (session.workspaceId === targetId) {
+        clearChatSession();
+      }
       success(`Deleted workspace ${targetId}`);
     })()
   );
@@ -4207,6 +4268,23 @@ function registerDocsCommand(program2) {
       }
       const data = await sdk.documents.getDocuments(arbi, docIds);
       console.log(JSON.stringify(data, null, 2));
+      const docs = Array.isArray(data) ? data : [data];
+      for (const d of docs) {
+        const raw = d;
+        if (raw.status === "failed") {
+          const reason = raw.error_reason || raw.status_details || raw.error || null;
+          const docId = raw.external_id;
+          if (reason) {
+            console.error(chalk2__default.default.red(`
+\u26A0 ${docId} processing failed: ${reason}`));
+          } else {
+            console.error(
+              chalk2__default.default.red(`
+\u26A0 ${docId} processing failed (no error details available)`)
+            );
+          }
+        }
+      }
     })()
   );
   doc.command("delete [ids...]").description("Delete documents (interactive picker if no IDs given)").action(
@@ -4270,39 +4348,30 @@ function registerDocsCommand(program2) {
       }
     })()
   );
-  doc.command("parsed [doc-id] [stage]").description("Get parsed document content (stage: marker, subchunk, final)").action(
+  doc.command("parsed <doc-id> [stage]").description("Get parsed document content (stage: marker, subchunk, final; default: final)").action(
     (docId, stage) => runAction(async () => {
-      const { arbi, accessToken, workspaceKeyHeader, workspaceId, config } = await resolveWorkspace();
-      if (!docId) {
-        const choices = await fetchDocChoices(arbi, workspaceId);
-        docId = await promptSearch("Select document", choices);
-      }
+      const { accessToken, workspaceKeyHeader, config } = await resolveWorkspace();
       const validStages = ["marker", "subchunk", "final"];
-      if (!stage) {
-        stage = await promptSelect("Parsing stage", [
-          { name: "Final (processed)", value: "final" },
-          { name: "Subchunk", value: "subchunk" },
-          { name: "Marker (raw)", value: "marker" }
-        ]);
-      } else if (!validStages.includes(stage)) {
-        error(`Invalid stage: ${stage}. Must be one of: ${validStages.join(", ")}`);
+      const selectedStage = stage ?? "final";
+      if (!validStages.includes(selectedStage)) {
+        error(`Invalid stage: ${selectedStage}. Must be one of: ${validStages.join(", ")}`);
         process.exit(1);
       }
       const data = await sdk.documents.getParsedContent(
         { baseUrl: config.baseUrl, accessToken, workspaceKeyHeader },
         docId,
-        stage
+        selectedStage
       );
       console.log(JSON.stringify(data, null, 2));
     })()
   );
 }
 function registerUploadCommand(program2) {
-  program2.command("upload <files...>").description("Upload documents to the active workspace").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").option("-W, --watch", "Watch document processing progress after upload").action(
-    (files, opts) => runAction(async () => {
-      for (const f of files) {
-        if (!fs__default.default.existsSync(f)) {
-          error(`File not found: ${f}`);
+  program2.command("upload <paths...>").description("Upload files, directories, or zip archives to the active workspace").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").option("-W, --watch", "Watch document processing progress after upload").action(
+    (paths, opts) => runAction(async () => {
+      for (const p of paths) {
+        if (!fs__default.default.existsSync(p)) {
+          error(`Path not found: ${p}`);
           process.exit(1);
         }
       }
@@ -4311,42 +4380,109 @@ function registerUploadCommand(program2) {
       );
       const uploadedDocs = /* @__PURE__ */ new Map();
       const auth = { baseUrl: config.baseUrl, accessToken, workspaceKeyHeader };
-      for (const filePath of files) {
-        const result = await sdk.documents.uploadLocalFile(auth, workspaceId, filePath);
-        success(`Uploaded: ${result.fileName} (${result.doc_ext_ids.join(", ")})`);
-        if (result.duplicates && result.duplicates.length > 0) {
-          warn(`  Duplicates: ${result.duplicates.join(", ")}`);
+      for (const filePath of paths) {
+        const stat = fs__default.default.statSync(filePath);
+        if (stat.isDirectory()) {
+          const result = await sdk.documentsNode.uploadDirectory(auth, workspaceId, filePath);
+          if (result.doc_ext_ids.length === 0) {
+            warn(`No supported files found in directory: ${filePath}`);
+            continue;
+          }
+          for (const [folder, info] of result.folders) {
+            success(
+              `  ${folder}: ${info.fileCount} file(s) \u2192 ${info.doc_ext_ids.length} uploaded`
+            );
+            if (info.duplicates.length > 0) {
+              warn(`    Duplicates: ${info.duplicates.join(", ")}`);
+            }
+          }
+          success(
+            `Uploaded directory: ${filePath} (${result.doc_ext_ids.length} document(s) total)`
+          );
+          for (const id of result.doc_ext_ids) uploadedDocs.set(id, filePath);
+        } else if (filePath.toLowerCase().endsWith(".zip")) {
+          const result = await sdk.documentsNode.uploadZip(auth, workspaceId, filePath);
+          if (result.doc_ext_ids.length === 0) {
+            warn(`No supported files found in zip: ${filePath}`);
+            continue;
+          }
+          for (const [folder, info] of result.folders) {
+            success(
+              `  ${folder}: ${info.fileCount} file(s) \u2192 ${info.doc_ext_ids.length} uploaded`
+            );
+            if (info.duplicates.length > 0) {
+              warn(`    Duplicates: ${info.duplicates.join(", ")}`);
+            }
+          }
+          success(`Uploaded zip: ${filePath} (${result.doc_ext_ids.length} document(s) total)`);
+          for (const id of result.doc_ext_ids) uploadedDocs.set(id, filePath);
+        } else {
+          const result = await sdk.documentsNode.uploadLocalFile(auth, workspaceId, filePath);
+          success(`Uploaded: ${result.fileName} (${result.doc_ext_ids.join(", ")})`);
+          if (result.duplicates && result.duplicates.length > 0) {
+            warn(`  Duplicates: ${result.duplicates.join(", ")}`);
+          }
+          for (const id of result.doc_ext_ids) uploadedDocs.set(id, result.fileName);
         }
-        for (const id of result.doc_ext_ids) uploadedDocs.set(id, result.fileName);
       }
-      if (opts.watch && uploadedDocs.size > 0) {
+      const isInteractive = process.stdout.isTTY === true;
+      const shouldWatch = opts.watch === true || paths.length === 1 && isInteractive;
+      if (shouldWatch && uploadedDocs.size > 0) {
         const pending = new Set(uploadedDocs.keys());
+        const failed = /* @__PURE__ */ new Map();
         console.log(`
 Watching ${pending.size} document(s)...`);
+        let onDone;
+        const done = new Promise((r) => {
+          onDone = r;
+        });
         const conn = await sdk.connectWebSocket({
           baseUrl: config.baseUrl,
           accessToken,
           onMessage: (msg) => {
             if (client.isMessageType(msg, "task_update")) {
               if (!pending.has(msg.doc_ext_id)) return;
-              console.log(
-                `  ${uploadedDocs.get(msg.doc_ext_id) || msg.file_name}: ${status(msg.status)} (${msg.progress}%)`
-              );
-              if (msg.status === "completed" || msg.status === "failed") {
+              const docName = uploadedDocs.get(msg.doc_ext_id) || msg.file_name;
+              const extra = msg;
+              if (msg.status === "failed") {
+                const reason = extra.error_reason || extra.status_details || extra.detail || "Unknown error";
+                failed.set(msg.doc_ext_id, reason);
+                console.log(`  ${docName}: ${status(msg.status)} \u2014 ${reason}`);
                 pending.delete(msg.doc_ext_id);
-                if (pending.size === 0) {
-                  success("\nAll documents processed.");
-                  conn.close();
+              } else {
+                console.log(`  ${docName}: ${status(msg.status)} (${msg.progress}%)`);
+                if (msg.status === "completed") {
+                  pending.delete(msg.doc_ext_id);
                 }
               }
+              if (pending.size === 0) {
+                conn.close();
+              }
             }
           },
           onClose: () => {
-            if (pending.size > 0)
+            if (failed.size > 0) {
+              error(`
+${failed.size} document(s) failed to process:`);
+              for (const [docId, reason] of failed) {
+                error(`  ${uploadedDocs.get(docId) || docId}: ${reason}`);
+              }
+            }
+            if (pending.size > 0) {
               warn(`
 Connection closed. ${pending.size} document(s) still processing.`);
+              dim('Run "arbi watch" to continue monitoring, or "arbi docs" to check status.');
+            } else if (failed.size === 0 && uploadedDocs.size > 0) {
+              success("\nAll documents processed successfully.");
+            }
+            onDone();
           }
         });
+        await done;
+      } else if (uploadedDocs.size > 0 && !shouldWatch) {
+        dim(
+          'Tip: Use -W/--watch to monitor processing progress, or run "arbi docs" to check status.'
+        );
       }
     })()
   );
@@ -4393,9 +4529,14 @@ function registerAskCommand(program2) {
       const question = words.join(" ");
       const { arbi, accessToken, workspaceKeyHeader, workspaceId, config } = await resolveWorkspace(opts.workspace);
       const session = getChatSession();
+      const workspaceChanged = session.lastMessageExtId && session.workspaceId && session.workspaceId !== workspaceId;
+      let previousResponseId = null;
       if (opts.new) {
         clearChatSession();
-        session.lastMessageExtId = null;
+      } else if (workspaceChanged) {
+        clearChatSession();
+      } else if (session.lastMessageExtId) {
+        previousResponseId = session.lastMessageExtId;
       }
       const docs = await sdk.documents.listDocuments(arbi);
       const docIds = docs.map((d) => d.external_id);
@@ -4408,11 +4549,11 @@ function registerAskCommand(program2) {
           workspaceId,
           question,
           docIds,
-          previousResponseId: session.lastMessageExtId,
+          previousResponseId,
           model: opts.config
         });
       } catch (err) {
-        const isStaleParent = session.lastMessageExtId && err instanceof Error && err.message.includes("Parent message not found");
+        const isStaleParent = previousResponseId && err instanceof Error && (err.message.includes("404") || err.message.includes("Parent message not found"));
         if (!isStaleParent) throw err;
         clearChatSession();
         res = await sdk.assistant.queryAssistant({
@@ -4430,18 +4571,19 @@ function registerAskCommand(program2) {
         onToken: (content) => process.stdout.write(content),
         onAgentStep: (data) => {
           if (opts.verbose) {
-            const focus = data.focus || data.step || "";
-            console.error(chalk__default.default.dim(`
-[agent] ${focus}`));
+            const label2 = sdk.formatAgentStepLabel(data);
+            if (label2) console.error(chalk2__default.default.dim(`
+[agent] ${label2}`));
           }
         },
-        onError: (message) => console.error(chalk__default.default.red(`
+        onError: (message) => console.error(chalk2__default.default.red(`
 Error: ${message}`))
       });
       process.stdout.write("\n");
       if (result.assistantMessageExtId) {
         const updates = {
-          lastMessageExtId: result.assistantMessageExtId
+          lastMessageExtId: result.assistantMessageExtId,
+          workspaceId
         };
         const conversationExtId = result.userMessage?.conversation_ext_id ?? result.metadata?.conversation_ext_id;
         if (conversationExtId) {
@@ -4453,30 +4595,73 @@ Error: ${message}`))
   );
 }
 function colorize2(level, text) {
-  if (level === "success") return chalk__default.default.green(text);
-  if (level === "error") return chalk__default.default.red(text);
-  if (level === "warning") return chalk__default.default.yellow(text);
+  if (level === "success") return chalk2__default.default.green(text);
+  if (level === "error") return chalk2__default.default.red(text);
+  if (level === "warning") return chalk2__default.default.yellow(text);
   return text;
 }
 function registerWatchCommand(program2) {
-  program2.command("watch").description("Watch workspace activity in real time").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").action(
+  program2.command("watch").description("Watch workspace activity in real time").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").option("-t, --timeout <seconds>", "Auto-close after N seconds").option("-n, --count <n>", "Stop after N messages").option("--json", "Output NDJSON (one JSON object per line)").action(
     (opts) => runAction(async () => {
       const { config, accessToken, workspaceId } = await resolveWorkspace(opts.workspace);
-      console.log(`Watching workspace ${workspaceId}... (Ctrl+C to stop)`);
-      await sdk.connectWebSocket({
+      const timeoutSec = opts.timeout ? parseInt(opts.timeout, 10) : void 0;
+      const maxCount = opts.count ? parseInt(opts.count, 10) : void 0;
+      const jsonMode = opts.json ?? false;
+      if (!jsonMode) {
+        const parts = [`Watching workspace ${workspaceId}...`];
+        if (timeoutSec) parts.push(`(timeout: ${timeoutSec}s)`);
+        if (maxCount) parts.push(`(max: ${maxCount} messages)`);
+        parts.push("(Ctrl+C to stop)");
+        console.log(parts.join(" "));
+      }
+      let messageCount = 0;
+      let onDone;
+      const done = new Promise((r) => {
+        onDone = r;
+      });
+      const conn = await sdk.connectWebSocket({
         baseUrl: config.baseUrl,
         accessToken,
         onMessage: (msg) => {
-          const { text, level } = sdk.formatWsMessage(msg);
-          console.log(colorize2(level, text));
+          messageCount++;
+          if (jsonMode) {
+            console.log(JSON.stringify(msg));
+          } else {
+            const { text, level } = sdk.formatWsMessage(msg);
+            console.log(colorize2(level, text));
+          }
+          if (maxCount && messageCount >= maxCount) {
+            if (!jsonMode) console.log(chalk2__default.default.dim(`
+Reached ${maxCount} messages, closing.`));
+            conn.close();
+          }
         },
         onClose: (code, reason) => {
-          console.log(
-            chalk__default.default.yellow(`
+          if (!jsonMode) {
+            console.log(
+              chalk2__default.default.yellow(`
 Connection closed (code ${code}${reason ? ": " + reason : ""})`)
-          );
+            );
+          }
+          onDone();
         }
       });
+      let timer;
+      if (timeoutSec) {
+        timer = setTimeout(() => {
+          if (!jsonMode) console.log(chalk2__default.default.dim(`
+Timeout (${timeoutSec}s), closing.`));
+          conn.close();
+        }, timeoutSec * 1e3);
+      }
+      const sigintHandler = () => {
+        if (timer) clearTimeout(timer);
+        conn.close();
+      };
+      process.on("SIGINT", sigintHandler);
+      await done;
+      if (timer) clearTimeout(timer);
+      process.removeListener("SIGINT", sigintHandler);
     })()
   );
 }
@@ -5303,6 +5488,229 @@ Updated to ${latest}.`);
     success("Auto-update enabled. ARBI CLI will update automatically on login.");
   });
 }
+function registerQuickstartCommand(program2) {
+  program2.command("quickstart").description("Interactive setup wizard \u2014 configure, register/login, and select a workspace").argument("[url]", "Server URL (auto-detected if omitted)").action(async (url) => {
+    console.log("\nWelcome to ARBI CLI setup!\n");
+    const { config, source } = store.resolveConfigWithFallbacks();
+    if (url) {
+      const domain = new URL(url).hostname;
+      config.baseUrl = url.replace(/\/$/, "");
+      config.deploymentDomain = domain;
+      store.saveConfig(config);
+    }
+    const useDetected = await promptConfirm(`Use server ${config.baseUrl}?`, true);
+    if (!useDetected) {
+      const customUrl = await promptInput("Server URL");
+      try {
+        const domain = new URL(customUrl).hostname;
+        config.baseUrl = customUrl.replace(/\/$/, "");
+        config.deploymentDomain = domain;
+        store.saveConfig(config);
+      } catch {
+        error("Invalid URL");
+        process.exit(1);
+      }
+    } else if (source !== "config") {
+      store.saveConfig(config);
+    }
+    dim(`Server: ${config.baseUrl}`);
+    const action = await promptSelect("Do you have an account?", [
+      { name: "Yes, log me in", value: "login" },
+      { name: "No, register a new account", value: "register" }
+    ]);
+    const arbiClient = client.createArbiClient({
+      baseUrl: config.baseUrl,
+      deploymentDomain: config.deploymentDomain,
+      credentials: "omit"
+    });
+    await arbiClient.crypto.initSodium();
+    let email;
+    let password2;
+    if (action === "register") {
+      email = await promptInput("Email");
+      password2 = await promptPassword("Password");
+      const confirmPw = await promptPassword("Confirm password");
+      if (password2 !== confirmPw) {
+        error("Passwords do not match.");
+        process.exit(1);
+      }
+      const codeMethod = await promptSelect("Verification method", [
+        { name: "I have an invitation code", value: "code" },
+        { name: "Send me a verification email", value: "email" }
+      ]);
+      let verificationCode;
+      if (codeMethod === "code") {
+        verificationCode = await promptInput("Invitation code");
+      } else {
+        console.log("Sending verification email...");
+        const verifyResponse = await arbiClient.fetch.POST("/v1/user/verify-email", {
+          body: { email }
+        });
+        if (verifyResponse.error) {
+          error(`Failed to send verification email: ${JSON.stringify(verifyResponse.error)}`);
+          process.exit(1);
+        }
+        success("Verification email sent. Check your inbox.");
+        verificationCode = await promptInput("Verification code");
+      }
+      try {
+        const firstName = await promptInput("First name", false) || "User";
+        const lastName = await promptInput("Last name", false) || "";
+        await arbiClient.auth.register({
+          email,
+          password: password2,
+          verificationCode,
+          firstName,
+          lastName
+        });
+        success(`Registered as ${email}`);
+      } catch (err) {
+        error(`Registration failed: ${sdk.getErrorMessage(err)}`);
+        process.exit(1);
+      }
+    } else {
+      email = await promptInput("Email");
+      password2 = await promptPassword("Password");
+    }
+    try {
+      const { arbi } = await sdk.performPasswordLogin(config, email, password2, store);
+      success(`Logged in as ${email}`);
+      const { data: workspaces2 } = await arbi.fetch.GET("/v1/user/workspaces");
+      const wsList = workspaces2 || [];
+      const memberWorkspaces = wsList.filter((ws) => ws.users?.some((u) => u.email === email));
+      let workspaceId;
+      let workspaceName;
+      if (memberWorkspaces.length === 0) {
+        console.log("Creating your first workspace...");
+        const ws = await sdk.workspaces.createWorkspace(arbi, "My Workspace");
+        workspaceId = ws.external_id;
+        workspaceName = ws.name;
+      } else {
+        const choices = [
+          ...sdk.formatWorkspaceChoices(memberWorkspaces),
+          { name: "+ Create new workspace", value: "__new__", description: "" }
+        ];
+        const selected = await promptSelect("Select workspace", choices);
+        if (selected === "__new__") {
+          const name = await promptInput("Workspace name", false) || "My Workspace";
+          const ws = await sdk.workspaces.createWorkspace(arbi, name);
+          workspaceId = ws.external_id;
+          workspaceName = ws.name;
+        } else {
+          workspaceId = selected;
+          workspaceName = memberWorkspaces.find((w) => w.external_id === selected)?.name || "";
+        }
+      }
+      updateConfig({ selectedWorkspaceId: workspaceId });
+      console.log("");
+      success("Setup complete!");
+      console.log("");
+      console.log(`  Server:    ${ref(config.baseUrl)}`);
+      console.log(`  Account:   ${ref(email)}`);
+      console.log(`  Workspace: ${workspaceName} (${ref(workspaceId)})`);
+      console.log("");
+      dim('Try: arbi ask "hello"');
+    } catch (err) {
+      error(`Login failed: ${sdk.getErrorMessage(err)}`);
+      process.exit(1);
+    }
+  });
+}
+var CENTRAL_API_URL2 = "https://central.arbi.work";
+var DEFAULT_PASSWORD = "agent-dev-1234";
+async function getVerificationCode2(email, apiKey) {
+  const params = new URLSearchParams({ email });
+  const res = await fetch(`${CENTRAL_API_URL2}/license-management/verify-ci?${params.toString()}`, {
+    method: "GET",
+    headers: { "x-api-key": apiKey }
+  });
+  if (!res.ok) {
+    const body = await res.text().catch(() => "");
+    throw new Error(`Failed to get verification code: ${res.status} ${body}`);
+  }
+  const data = await res.json();
+  const words = data?.verification_words ?? data?.verification_code ?? null;
+  if (!words) throw new Error("No verification code in response");
+  return Array.isArray(words) ? words.join(" ") : String(words);
+}
+function registerAgentCreateCommand(program2) {
+  program2.command("agent-create").description("Create a bot/test account (requires SUPPORT_API_KEY)").argument("[url]", "Server URL (auto-detected if omitted)").option("-p, --password <password>", "Account password", DEFAULT_PASSWORD).option("--workspace-name <name>", "Workspace name", "Agent Workspace").option("--email <email>", "Custom email (default: agent-{timestamp}@{domain})").action(
+    async (url, opts) => {
+      const { config, source } = store.resolveConfigWithFallbacks();
+      if (url) {
+        const domain = new URL(url).hostname;
+        config.baseUrl = url.replace(/\/$/, "");
+        config.deploymentDomain = domain;
+        store.saveConfig(config);
+        dim(`Server: ${config.baseUrl}`);
+      } else {
+        dim(`Server: ${config.baseUrl} (from ${source})`);
+      }
+      const supportApiKey = process.env.SUPPORT_API_KEY;
+      if (!supportApiKey) {
+        error(
+          "SUPPORT_API_KEY is required.\nSet it with: export SUPPORT_API_KEY=<key>\nOr source from .env: source .env && arbi agent-create"
+        );
+        process.exit(1);
+      }
+      const timestamp2 = Date.now();
+      let email = opts.email || `agent-${timestamp2}@${config.deploymentDomain}`;
+      if (!email.includes("@")) {
+        email = `${email}@${config.deploymentDomain}`;
+      }
+      dim(`Email: ${email}`);
+      const arbiClient = client.createArbiClient({
+        baseUrl: config.baseUrl,
+        deploymentDomain: config.deploymentDomain,
+        credentials: "omit"
+      });
+      await arbiClient.crypto.initSodium();
+      const verifyResponse = await arbiClient.fetch.POST("/v1/user/verify-email", {
+        body: { email }
+      });
+      if (verifyResponse.error) {
+        error(`verify-email failed: ${JSON.stringify(verifyResponse.error)}`);
+        process.exit(1);
+      }
+      let verificationCode;
+      try {
+        verificationCode = await getVerificationCode2(email, supportApiKey);
+      } catch (err) {
+        error(`Failed to get verification code: ${sdk.getErrorMessage(err)}`);
+        process.exit(1);
+      }
+      try {
+        await arbiClient.auth.register({
+          email,
+          password: opts.password,
+          verificationCode,
+          firstName: "Agent",
+          lastName: `${timestamp2}`
+        });
+      } catch (err) {
+        error(`Registration failed: ${sdk.getErrorMessage(err)}`);
+        process.exit(1);
+      }
+      try {
+        const { arbi } = await sdk.performPasswordLogin(config, email, opts.password, store);
+        const ws = await sdk.workspaces.createWorkspace(arbi, opts.workspaceName);
+        updateConfig({ selectedWorkspaceId: ws.external_id });
+        console.log("");
+        success("Agent account created!");
+        console.log("");
+        console.log(`  Email:     ${ref(email)}`);
+        console.log(`  Password:  ${ref(opts.password)}`);
+        console.log(`  Workspace: ${ws.name} (${ref(ws.external_id)})`);
+        console.log(`  Server:    ${ref(config.baseUrl)}`);
+        console.log("");
+        dim('Ready to use: arbi ask "hello"');
+      } catch (err) {
+        error(`Post-registration setup failed: ${sdk.getErrorMessage(err)}`);
+        process.exit(1);
+      }
+    }
+  );
+}
 
 // src/index.ts
 console.debug = () => {
@@ -5313,7 +5721,7 @@ console.info = (...args) => {
   _origInfo(...args);
 };
 var program = new commander.Command();
-program.name("arbi").description("ARBI CLI \u2014 interact with ARBI from the terminal").version("0.3.10");
+program.name("arbi").description("ARBI CLI \u2014 interact with ARBI from the terminal").version("0.3.13");
 registerConfigCommand(program);
 registerLoginCommand(program);
 registerRegisterCommand(program);
@@ -5335,6 +5743,8 @@ registerAgentconfigCommand(program);
 registerHealthCommand(program);
 registerTuiCommand(program);
 registerUpdateCommand(program);
+registerQuickstartCommand(program);
+registerAgentCreateCommand(program);
 program.parse();
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map