@arbidocs/cli 0.3.8 → 0.3.10

package/dist/index.js

@@ -5,11 +5,11 @@ var commander = require('commander');
 var fs = require('fs');
 var os = require('os');
 var path = require('path');
-var core = require('@arbidocs/core');
+var sdk = require('@arbidocs/sdk');
 var chalk = require('chalk');
 var prompts = require('@inquirer/prompts');
 var child_process = require('child_process');
-var sdk = require('@arbidocs/sdk');
+var client = require('@arbidocs/client');
 var module$1 = require('module');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
@@ -20,7 +20,7 @@ var os__default = /*#__PURE__*/_interopDefault(os);
 var path__default = /*#__PURE__*/_interopDefault(path);
 var chalk__default = /*#__PURE__*/_interopDefault(chalk);
 
-var store = new core.FileConfigStore();
+var store = new sdk.FileConfigStore();
 function getConfig() {
   return store.getConfig();
 }
@@ -31,7 +31,7 @@ function requireConfig() {
   try {
     return store.requireConfig();
   } catch (err) {
-    if (err instanceof core.ArbiError) {
+    if (err instanceof sdk.ArbiError) {
       console.error(err.message);
       process.exit(1);
     }
@@ -3502,7 +3502,7 @@ function getLatestVersion(skipCache = false) {
   }
 }
 function getCurrentVersion() {
-  return "0.3.8";
+  return "0.3.10";
 }
 function readChangelog(fromVersion, toVersion) {
   try {
@@ -3518,9 +3518,11 @@ function extractSections(changelog, fromVersion, toVersion) {
   const lines = changelog.split("\n");
   const sections = [];
   let capturing = false;
+  let skipSection = false;
   for (const line of lines) {
     const match = line.match(/^## v(.+)/);
     if (match) {
+      skipSection = false;
       const version = match[1].trim();
       if (version === fromVersion) {
         break;
@@ -3529,11 +3531,19 @@ function extractSections(changelog, fromVersion, toVersion) {
         capturing = true;
       }
     }
-    if (capturing) {
-      sections.push(line);
+    if (!capturing) continue;
+    if (line.match(/^\[compare changes\]/)) continue;
+    if (line.match(/^### .*(Chore|Contributors)/)) {
+      skipSection = true;
+      continue;
     }
+    if (skipSection && line.match(/^### /)) {
+      skipSection = false;
+    }
+    if (skipSection) continue;
+    sections.push(line);
   }
-  const result = sections.join("\n").trim();
+  const result = sections.join("\n").replace(/\n{3,}/g, "\n\n").trim();
   return result || null;
 }
 function showChangelog(fromVersion, toVersion) {
@@ -3545,17 +3555,17 @@ function showChangelog(fromVersion, toVersion) {
 async function checkForUpdates(autoUpdate) {
   try {
     const latest = getLatestVersion();
-    if (!latest || latest === "0.3.8") return;
+    if (!latest || latest === "0.3.10") return;
     if (autoUpdate) {
       warn(`
-Your arbi version is out of date (${"0.3.8"} \u2192 ${latest}). Updating...`);
+Your arbi version is out of date (${"0.3.10"} \u2192 ${latest}). Updating...`);
       child_process.execSync("npm install -g @arbidocs/cli@latest", { stdio: "inherit" });
-      showChangelog("0.3.8", latest);
+      showChangelog("0.3.10", latest);
       console.log(`Updated to ${latest}.`);
     } else {
       warn(
         `
-Your arbi version is out of date (${"0.3.8"} \u2192 ${latest}).
+Your arbi version is out of date (${"0.3.10"} \u2192 ${latest}).
 Run "arbi update" to upgrade, or "arbi update auto" to always stay up to date.`
       );
     }
@@ -3565,9 +3575,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.8") {
+    if (cached && cached.latest !== "0.3.10") {
       warn(
-        `Your arbi version is out of date (${"0.3.8"} \u2192 ${cached.latest}). Run "arbi update".`
+        `Your arbi version is out of date (${"0.3.10"} \u2192 ${cached.latest}). Run "arbi update".`
       );
     }
   } catch {
@@ -3581,8 +3591,9 @@ function registerLoginCommand(program2) {
     const email = opts.email || process.env.ARBI_EMAIL || await promptInput("Email");
     const pw = opts.password || process.env.ARBI_PASSWORD || await promptPassword("Password");
     try {
-      const { arbi } = await core.performPasswordLogin(config, email, pw, store);
-      const { data: workspaces2 } = await arbi.fetch.GET("/api/user/workspaces");
+      const { arbi } = await sdk.performPasswordLogin(config, email, pw, store);
+      clearChatSession();
+      const { data: workspaces2 } = await arbi.fetch.GET("/v1/user/workspaces");
       const wsList = workspaces2 || [];
       success(`Logged in as ${email}`);
       if (wsList.length === 0) {
@@ -3604,14 +3615,14 @@ function registerLoginCommand(program2) {
         success(`Workspace: ${wsList[0].name} (${ref(wsList[0].external_id)})`);
         return;
       }
-      const choices = core.formatWorkspaceChoices(wsList);
+      const choices = sdk.formatWorkspaceChoices(wsList);
       const selected = await promptSelect("Select workspace", choices);
       updateConfig({ selectedWorkspaceId: selected });
       const ws = wsList.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) {
-      error(`Login failed: ${core.getErrorMessage(err)}`);
+      error(`Login failed: ${sdk.getErrorMessage(err)}`);
       process.exit(1);
     } finally {
       await checkForUpdates(getConfig()?.autoUpdate);
@@ -3646,7 +3657,7 @@ function registerRegisterCommand(program2) {
 }
 async function smartRegister(config, opts) {
   const email = opts.email || process.env.ARBI_EMAIL || await promptInput("Email");
-  const arbi = sdk.createArbiClient({
+  const arbi = client.createArbiClient({
     baseUrl: config.baseUrl,
     deploymentDomain: config.deploymentDomain,
     credentials: "omit"
@@ -3664,7 +3675,7 @@ async function smartRegister(config, opts) {
       verificationCode = await promptInput("Invitation code");
     } else {
       console.log("Sending verification email...");
-      const verifyResponse = await arbi.fetch.POST("/api/user/verify-email", {
+      const verifyResponse = await arbi.fetch.POST("/v1/user/verify-email", {
         body: { email }
       });
       if (verifyResponse.error) {
@@ -3701,7 +3712,7 @@ async function smartRegister(config, opts) {
     success(`
 Registered successfully as ${email}`);
   } catch (err) {
-    error(`Registration failed: ${core.getErrorMessage(err)}`);
+    error(`Registration failed: ${sdk.getErrorMessage(err)}`);
     process.exit(1);
   }
   const allFlagsProvided = !!(opts.email || process.env.ARBI_EMAIL) && !!(opts.password || process.env.ARBI_PASSWORD) && !!opts.verificationCode;
@@ -3722,7 +3733,7 @@ async function nonInteractiveRegister(config, opts) {
     error("Password required. Use --password <password> or set ARBI_PASSWORD");
     process.exit(1);
   }
-  const arbi = sdk.createArbiClient({
+  const arbi = client.createArbiClient({
     baseUrl: config.baseUrl,
     deploymentDomain: config.deploymentDomain,
     credentials: "omit"
@@ -3738,7 +3749,7 @@ async function nonInteractiveRegister(config, opts) {
       );
       process.exit(1);
     }
-    const verifyResponse = await arbi.fetch.POST("/api/user/verify-email", {
+    const verifyResponse = await arbi.fetch.POST("/v1/user/verify-email", {
       body: { email }
     });
     if (verifyResponse.error) {
@@ -3757,19 +3768,19 @@ async function nonInteractiveRegister(config, opts) {
     });
     success(`Registered: ${email}`);
   } catch (err) {
-    error(`Registration failed: ${core.getErrorMessage(err)}`);
+    error(`Registration failed: ${sdk.getErrorMessage(err)}`);
     process.exit(1);
   }
 }
 async function loginAfterRegister(config, email, password2) {
   try {
-    const { arbi } = await core.performPasswordLogin(config, email, password2, store);
+    const { arbi } = await sdk.performPasswordLogin(config, email, password2, store);
     success(`Logged in as ${email}`);
-    const { data: workspaces2 } = await arbi.fetch.GET("/api/user/workspaces");
+    const { data: workspaces2 } = await arbi.fetch.GET("/v1/user/workspaces");
     const wsList = workspaces2 || [];
     if (wsList.length === 0) {
       console.log("Creating your first workspace...");
-      const ws2 = await core.workspaces.createWorkspace(arbi, "My 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;
@@ -3779,13 +3790,13 @@ async function loginAfterRegister(config, email, password2) {
       success(`Workspace: ${wsList[0].name} (${ref(wsList[0].external_id)})`);
       return;
     }
-    const choices = core.formatWorkspaceChoices(wsList);
+    const choices = sdk.formatWorkspaceChoices(wsList);
     const selected = await promptSelect("Select workspace", choices);
     updateConfig({ selectedWorkspaceId: selected });
     const ws = wsList.find((w) => w.external_id === selected);
     success(`Workspace: ${ws.name} (${ref(selected)})`);
   } catch (err) {
-    error(`Login failed: ${core.getErrorMessage(err)}`);
+    error(`Login failed: ${sdk.getErrorMessage(err)}`);
     error("You can log in later with: arbi login");
   }
 }
@@ -3794,6 +3805,7 @@ async function loginAfterRegister(config, email, password2) {
 function registerLogoutCommand(program2) {
   program2.command("logout").description("Log out of ARBI").action(() => {
     deleteCredentials();
+    clearChatSession();
     updateConfig({ selectedWorkspaceId: void 0 });
     success("Logged out.");
   });
@@ -3834,11 +3846,11 @@ function colorize(level, text) {
 async function startBackgroundNotifications(baseUrl, accessToken) {
   if (activeConnection) return;
   try {
-    activeConnection = await core.connectWithReconnect({
+    activeConnection = await sdk.connectWithReconnect({
       baseUrl,
       accessToken,
       onMessage: (msg) => {
-        const { text, level } = core.formatWsMessage(msg);
+        const { text, level } = sdk.formatWsMessage(msg);
         process.stderr.write(`
 ${colorize(level, `[${timestamp()}] ${text}`)}
 `);
@@ -3882,8 +3894,9 @@ function runAction(fn) {
   return async () => {
     try {
       await fn();
+      process.exit(0);
     } catch (err) {
-      error(`Error: ${core.getErrorMessage(err)}`);
+      error(`Error: ${sdk.getErrorMessage(err)}`);
       hintUpdateOnError();
       process.exit(1);
     }
@@ -3891,9 +3904,9 @@ function runAction(fn) {
 }
 async function resolveAuth() {
   try {
-    return await core.resolveAuth(store);
+    return await sdk.resolveAuth(store);
   } catch (err) {
-    if (err instanceof core.ArbiError) {
+    if (err instanceof sdk.ArbiError) {
       error(err.message);
       process.exit(1);
     }
@@ -3902,14 +3915,14 @@ async function resolveAuth() {
 }
 async function resolveWorkspace(workspaceOpt) {
   try {
-    const ctx = await core.resolveWorkspace(store, workspaceOpt);
+    const ctx = await sdk.resolveWorkspace(store, workspaceOpt);
     if (getConfig()?.notifications) {
       startBackgroundNotifications(ctx.config.baseUrl, ctx.accessToken).catch(() => {
       });
     }
     return ctx;
   } catch (err) {
-    if (err instanceof core.ArbiError) {
+    if (err instanceof sdk.ArbiError) {
       error(err.message);
       process.exit(1);
     }
@@ -3941,7 +3954,7 @@ function registerWorkspacesCommand(program2) {
   program2.command("workspaces").description("List workspaces").action(
     runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.workspaces.listWorkspaces(arbi);
+      const data = await sdk.workspaces.listWorkspaces(arbi);
       if (data.length === 0) {
         console.log("No workspaces found.");
         return;
@@ -3969,7 +3982,7 @@ function registerWorkspacesCommand(program2) {
   workspace.command("select [id]").description("Select active workspace (interactive picker if no ID given)").action(
     (id) => runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.workspaces.listWorkspaces(arbi);
+      const data = await sdk.workspaces.listWorkspaces(arbi);
       if (data.length === 0) {
         console.log("No workspaces found.");
         return;
@@ -3985,10 +3998,11 @@ function registerWorkspacesCommand(program2) {
         }
         selectedId = id;
       } else {
-        const choices = core.formatWorkspaceChoices(data);
+        const choices = sdk.formatWorkspaceChoices(data);
         selectedId = await promptSelect("Select workspace", choices);
       }
       updateConfig({ selectedWorkspaceId: selectedId });
+      clearChatSession();
       const ws = data.find((w) => w.external_id === selectedId);
       success(`Selected: ${ws.name} (${ref(selectedId)})`);
     })()
@@ -3996,7 +4010,7 @@ function registerWorkspacesCommand(program2) {
   workspace.command("create <name>").description("Create a new workspace").option("-d, --description <text>", "Workspace description").option("--public", "Make workspace public", false).action(
     (name, opts) => runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.workspaces.createWorkspace(
+      const data = await sdk.workspaces.createWorkspace(
         arbi,
         name,
         opts.description,
@@ -4005,25 +4019,30 @@ function registerWorkspacesCommand(program2) {
       success(`Created: ${data.name} (${ref(data.external_id)})`);
     })()
   );
-  workspace.command("delete <id>").description("Delete a workspace").action(
+  workspace.command("delete [id]").description("Delete a workspace (defaults to selected workspace)").action(
     (id) => runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.workspaces.deleteWorkspace(arbi, id);
-      success(data?.detail ?? `Deleted workspace ${id}`);
+      const targetId = id ?? getConfig()?.selectedWorkspaceId;
+      if (!targetId) {
+        error("No workspace ID given and no workspace selected. Run: arbi workspace select");
+        process.exit(1);
+      }
+      await sdk.workspaces.deleteWorkspaces(arbi, [targetId]);
+      success(`Deleted workspace ${targetId}`);
     })()
   );
   workspace.command("update <id> <json>").description("Update workspace properties (pass JSON)").action(
     (id, json) => runAction(async () => {
       const body = parseJsonArg(json, `arbi workspace update wrk-123 '{"name": "New Name"}'`);
       const { arbi } = await resolveWorkspace(id);
-      const data = await core.workspaces.updateWorkspace(arbi, id, body);
+      const data = await sdk.workspaces.updateWorkspace(arbi, body);
       success(`Updated: ${data.name} (${ref(data.external_id)})`);
     })()
   );
   workspace.command("users").description("List users in the active workspace").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").action(
     (opts) => runAction(async () => {
       const { arbi, workspaceId } = await resolveWorkspace(opts.workspace);
-      const data = await core.workspaces.listWorkspaceUsers(arbi, workspaceId);
+      const data = await sdk.workspaces.listWorkspaceUsers(arbi);
       if (data.length === 0) {
         console.log("No users found.");
         return;
@@ -4060,23 +4079,22 @@ function registerWorkspacesCommand(program2) {
     (emails, opts) => runAction(async () => {
       const { arbi, workspaceId } = await resolveWorkspace(opts.workspace);
       const role = opts.role ?? "collaborator";
-      const data = await core.workspaces.addWorkspaceUsers(arbi, workspaceId, emails, role);
+      const data = await sdk.workspaces.addWorkspaceUsers(arbi, emails, role);
       for (const u of data) success(`Added: ${u.user.email} as ${u.role}`);
     })()
   );
   workspace.command("remove-user <user-ids...>").description("Remove users from the active workspace").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").action(
     (userIds, opts) => runAction(async () => {
       const { arbi, workspaceId } = await resolveWorkspace(opts.workspace);
-      await core.workspaces.removeWorkspaceUsers(arbi, workspaceId, userIds);
+      await sdk.workspaces.removeWorkspaceUsers(arbi, userIds);
       success(`Removed ${userIds.length} user(s).`);
     })()
   );
   workspace.command("set-role <role> <user-ids...>").description("Update user roles (owner, collaborator, guest)").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").action(
     (role, userIds, opts) => runAction(async () => {
       const { arbi, workspaceId } = await resolveWorkspace(opts.workspace);
-      const data = await core.workspaces.setUserRole(
+      const data = await sdk.workspaces.setUserRole(
         arbi,
-        workspaceId,
         userIds,
         role
       );
@@ -4085,8 +4103,21 @@ function registerWorkspacesCommand(program2) {
   );
   workspace.command("copy <target-workspace-id> <doc-ids...>").description("Copy documents to another workspace").option("-w, --workspace <id>", "Source workspace ID (defaults to selected workspace)").action(
     (targetId, docIds, opts) => runAction(async () => {
-      const { arbi, workspaceId } = await resolveWorkspace(opts.workspace);
-      const data = await core.workspaces.copyDocuments(arbi, workspaceId, targetId, docIds);
+      const { arbi, loginResult } = await resolveWorkspace(opts.workspace);
+      const signingPrivateKeyBase64 = arbi.crypto.bytesToBase64(loginResult.signingPrivateKey);
+      const wsList = await sdk.workspaces.listWorkspaces(arbi);
+      const targetWs = wsList.find((w) => w.external_id === targetId);
+      if (!targetWs || !targetWs.wrapped_key) {
+        error(`Target workspace ${targetId} not found or has no encryption key`);
+        process.exit(1);
+      }
+      const targetKey = await sdk.generateEncryptedWorkspaceKey(
+        arbi,
+        targetWs.wrapped_key,
+        loginResult.serverSessionKey,
+        signingPrivateKeyBase64
+      );
+      const data = await sdk.workspaces.copyDocuments(arbi, targetId, docIds, targetKey);
       success(`${data.detail} (${data.documents_copied} document(s) copied)`);
     })()
   );
@@ -4110,7 +4141,7 @@ function statusSymbol(status2) {
   }
 }
 async function fetchDocChoices(arbi, workspaceId) {
-  const data = await core.documents.listDocuments(arbi, workspaceId);
+  const data = await sdk.documents.listDocuments(arbi);
   if (data.length === 0) {
     console.log("No documents found.");
     process.exit(0);
@@ -4125,7 +4156,7 @@ function registerDocsCommand(program2) {
   program2.command("docs").description("List documents in the active workspace").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").action(
     (opts) => runAction(async () => {
       const { arbi, workspaceId } = await resolveWorkspace(opts.workspace);
-      const data = await core.documents.listDocuments(arbi, workspaceId);
+      const data = await sdk.documents.listDocuments(arbi);
       if (data.length === 0) {
         console.log("No documents found.");
         return;
@@ -4174,7 +4205,7 @@ function registerDocsCommand(program2) {
         if (selected.length === 0) return;
         docIds = selected;
       }
-      const data = await core.documents.getDocuments(arbi, docIds);
+      const data = await sdk.documents.getDocuments(arbi, docIds);
       console.log(JSON.stringify(data, null, 2));
     })()
   );
@@ -4188,7 +4219,7 @@ function registerDocsCommand(program2) {
         if (selected.length === 0) return;
         docIds = selected;
       }
-      await core.documents.deleteDocuments(arbi, docIds);
+      await sdk.documents.deleteDocuments(arbi, docIds);
       success(`Deleted ${docIds.length} document(s).`);
     })()
   );
@@ -4198,7 +4229,7 @@ function registerDocsCommand(program2) {
         const parsed = parseJsonArg(json, `arbi doc update '[{"external_id": "doc-123", "shared": true}]'`);
         const docs = Array.isArray(parsed) ? parsed : parsed.documents;
         const { arbi } = await resolveWorkspace();
-        const data = await core.documents.updateDocuments(arbi, docs);
+        const data = await sdk.documents.updateDocuments(arbi, docs);
         success(`Updated ${data.length} document(s).`);
       } else {
         const { arbi, workspaceId } = await resolveWorkspace();
@@ -4222,7 +4253,7 @@ function registerDocsCommand(program2) {
         } else {
           value = await promptInput(`${field.charAt(0).toUpperCase() + field.slice(1)}`);
         }
-        const data = await core.documents.updateDocuments(arbi, [
+        const data = await sdk.documents.updateDocuments(arbi, [
           { external_id: docId, [field]: value }
         ]);
         success(`Updated ${data.length} document(s).`);
@@ -4232,7 +4263,7 @@ function registerDocsCommand(program2) {
   doc.command("upload-url <urls...>").description("Upload documents from URLs").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").option("--shared", "Make documents shared", false).action(
     (urls, opts) => runAction(async () => {
       const { arbi, workspaceId } = await resolveWorkspace(opts.workspace);
-      const data = await core.documents.uploadUrl(arbi, urls, workspaceId, opts.shared ?? false);
+      const data = await sdk.documents.uploadUrl(arbi, urls, workspaceId, opts.shared ?? false);
       success(`Uploaded: ${data.doc_ext_ids.join(", ")}`);
       if (data.duplicates && data.duplicates.length > 0) {
         warn(`Duplicates: ${data.duplicates.join(", ")}`);
@@ -4257,7 +4288,7 @@ function registerDocsCommand(program2) {
         error(`Invalid stage: ${stage}. Must be one of: ${validStages.join(", ")}`);
         process.exit(1);
       }
-      const data = await core.documents.getParsedContent(
+      const data = await sdk.documents.getParsedContent(
         { baseUrl: config.baseUrl, accessToken, workspaceKeyHeader },
         docId,
         stage
@@ -4281,7 +4312,7 @@ function registerUploadCommand(program2) {
       const uploadedDocs = /* @__PURE__ */ new Map();
       const auth = { baseUrl: config.baseUrl, accessToken, workspaceKeyHeader };
       for (const filePath of files) {
-        const result = await core.documents.uploadLocalFile(auth, workspaceId, filePath);
+        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(", ")}`);
@@ -4292,11 +4323,11 @@ function registerUploadCommand(program2) {
         const pending = new Set(uploadedDocs.keys());
         console.log(`
 Watching ${pending.size} document(s)...`);
-        const conn = await core.connectWebSocket({
+        const conn = await sdk.connectWebSocket({
           baseUrl: config.baseUrl,
           accessToken,
           onMessage: (msg) => {
-            if (sdk.isMessageType(msg, "task_update")) {
+            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}%)`
@@ -4325,7 +4356,7 @@ function registerDownloadCommand(program2) {
     (docId, opts) => runAction(async () => {
       const { arbi, config, accessToken, workspaceKeyHeader, workspaceId } = await resolveWorkspace(opts.workspace);
       if (!docId) {
-        const data = await core.documents.listDocuments(arbi, workspaceId);
+        const data = await sdk.documents.listDocuments(arbi);
         if (data.length === 0) {
           console.log("No documents found.");
           return;
@@ -4337,7 +4368,7 @@ function registerDownloadCommand(program2) {
         }));
         docId = await promptSearch("Select document to download", choices);
       }
-      const res = await core.documents.downloadDocument(
+      const res = await sdk.documents.downloadDocument(
         { baseUrl: config.baseUrl, accessToken, workspaceKeyHeader },
         docId
       );
@@ -4366,23 +4397,40 @@ function registerAskCommand(program2) {
         clearChatSession();
         session.lastMessageExtId = null;
       }
-      const docs = await core.documents.listDocuments(arbi, workspaceId);
+      const docs = await sdk.documents.listDocuments(arbi);
       const docIds = docs.map((d) => d.external_id);
-      const res = await core.assistant.queryAssistant({
-        baseUrl: config.baseUrl,
-        accessToken,
-        workspaceKeyHeader,
-        workspaceId,
-        question,
-        docIds,
-        parentMessageExtId: session.lastMessageExtId,
-        configExtId: opts.config
-      });
-      const result = await core.streamSSE(res, {
+      let res;
+      try {
+        res = await sdk.assistant.queryAssistant({
+          baseUrl: config.baseUrl,
+          accessToken,
+          workspaceKeyHeader,
+          workspaceId,
+          question,
+          docIds,
+          previousResponseId: session.lastMessageExtId,
+          model: opts.config
+        });
+      } catch (err) {
+        const isStaleParent = session.lastMessageExtId && err instanceof Error && err.message.includes("Parent message not found");
+        if (!isStaleParent) throw err;
+        clearChatSession();
+        res = await sdk.assistant.queryAssistant({
+          baseUrl: config.baseUrl,
+          accessToken,
+          workspaceKeyHeader,
+          workspaceId,
+          question,
+          docIds,
+          previousResponseId: null,
+          model: opts.config
+        });
+      }
+      const result = await sdk.streamSSE(res, {
         onToken: (content) => process.stdout.write(content),
         onAgentStep: (data) => {
           if (opts.verbose) {
-            const focus = data.focus || data.status || "";
+            const focus = data.focus || data.step || "";
             console.error(chalk__default.default.dim(`
 [agent] ${focus}`));
           }
@@ -4415,11 +4463,11 @@ function registerWatchCommand(program2) {
     (opts) => runAction(async () => {
       const { config, accessToken, workspaceId } = await resolveWorkspace(opts.workspace);
       console.log(`Watching workspace ${workspaceId}... (Ctrl+C to stop)`);
-      await core.connectWebSocket({
+      await sdk.connectWebSocket({
         baseUrl: config.baseUrl,
         accessToken,
         onMessage: (msg) => {
-          const { text, level } = core.formatWsMessage(msg);
+          const { text, level } = sdk.formatWsMessage(msg);
           console.log(colorize2(level, text));
         },
         onClose: (code, reason) => {
@@ -4437,7 +4485,7 @@ function registerContactsCommand(program2) {
   contacts.command("list").description("List all contacts").action(
     runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.contacts.listContacts(arbi);
+      const data = await sdk.contacts.listContacts(arbi);
       if (data.length === 0) {
         console.log("No contacts found.");
         return;
@@ -4448,7 +4496,7 @@ function registerContactsCommand(program2) {
           {
             header: "NAME",
             width: 20,
-            value: (r) => core.formatUserName(r.user)
+            value: (r) => sdk.formatUserName(r.user)
           },
           { header: "EMAIL", width: 30, value: (r) => r.email },
           { header: "STATUS", width: 18, value: (r) => r.status }
@@ -4465,7 +4513,7 @@ function registerContactsCommand(program2) {
         emails = input2.split(",").map((e) => e.trim()).filter(Boolean);
         if (emails.length === 0) return;
       }
-      const data = await core.contacts.addContacts(arbi, emails);
+      const data = await sdk.contacts.addContacts(arbi, emails);
       for (const c of data) {
         success(`Added: ${c.email} (${c.external_id}) \u2014 ${c.status}`);
       }
@@ -4476,7 +4524,7 @@ function registerContactsCommand(program2) {
       const { arbi } = await resolveAuth();
       let contactIds = ids && ids.length > 0 ? ids : void 0;
       if (!contactIds) {
-        const data = await core.contacts.listContacts(arbi);
+        const data = await sdk.contacts.listContacts(arbi);
         if (data.length === 0) {
           console.log("No contacts found.");
           return;
@@ -4484,7 +4532,7 @@ function registerContactsCommand(program2) {
         contactIds = await promptCheckbox(
           "Select contacts to remove",
           data.map((c) => {
-            const name = core.formatUserName(c.user);
+            const name = sdk.formatUserName(c.user);
             return {
               name: name ? `${name} (${c.email})` : c.email,
               value: c.external_id
@@ -4493,7 +4541,7 @@ function registerContactsCommand(program2) {
         );
         if (contactIds.length === 0) return;
       }
-      await core.contacts.removeContacts(arbi, contactIds);
+      await sdk.contacts.removeContacts(arbi, contactIds);
       success(`Removed ${contactIds.length} contact(s).`);
     })()
   );
@@ -4506,7 +4554,7 @@ function registerDmCommand(program2) {
   dm.command("list").description("List all DMs and notifications").action(
     runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.dm.listDMs(arbi);
+      const data = await sdk.dm.listDMs(arbi);
       if (data.length === 0) {
         console.log("No messages found.");
         return;
@@ -4520,7 +4568,7 @@ function registerDmCommand(program2) {
             width: 22,
             value: (r) => {
               const s = r.sender;
-              return core.formatUserName(s) || s?.email || "";
+              return sdk.formatUserName(s) || s?.email || "";
             }
           },
           { header: "READ", width: 6, value: (r) => r.read ? "yes" : "no" },
@@ -4534,7 +4582,7 @@ function registerDmCommand(program2) {
     (recipient, content) => runAction(async () => {
       const { arbi } = await resolveAuth();
       if (!recipient) {
-        const contacts = await core.contacts.listContacts(arbi);
+        const contacts = await sdk.contacts.listContacts(arbi);
         if (contacts.length === 0) {
           error("No contacts found. Add contacts first: arbi contacts add <email>");
           process.exit(1);
@@ -4543,7 +4591,7 @@ function registerDmCommand(program2) {
           "Send to",
           contacts.map((c) => {
             const u = c.user;
-            const name = core.formatUserName(u);
+            const name = sdk.formatUserName(u);
             return {
               name: name ? `${name} (${c.email})` : c.email,
               value: u?.external_id ?? c.external_id,
@@ -4557,7 +4605,7 @@ function registerDmCommand(program2) {
       }
       let recipientExtId = recipient;
       if (recipient.includes("@")) {
-        const contacts = await core.contacts.listContacts(arbi);
+        const contacts = await sdk.contacts.listContacts(arbi);
         const match = contacts.find((c) => c.email === recipient);
         if (!match) {
           error(`No contact found with email: ${recipient}`);
@@ -4566,7 +4614,7 @@ function registerDmCommand(program2) {
         }
         recipientExtId = match.user?.external_id ?? match.external_id;
       }
-      const data = await core.dm.sendDM(arbi, [{ recipient_ext_id: recipientExtId, content }]);
+      const data = await sdk.dm.sendDM(arbi, [{ recipient_ext_id: recipientExtId, content }]);
       for (const n of data) {
         success(`Sent: ${n.external_id} \u2192 ${n.recipient.email}`);
       }
@@ -4577,7 +4625,7 @@ function registerDmCommand(program2) {
       const { arbi } = await resolveAuth();
       let msgIds = ids && ids.length > 0 ? ids : void 0;
       if (!msgIds) {
-        const data2 = await core.dm.listDMs(arbi);
+        const data2 = await sdk.dm.listDMs(arbi);
         const unread = data2.filter((m) => !m.read);
         if (unread.length === 0) {
           console.log("No unread messages.");
@@ -4587,7 +4635,7 @@ function registerDmCommand(program2) {
           "Select messages to mark as read",
           unread.map((m) => {
             const s = m.sender;
-            const from = core.formatUserName(s) || s?.email || "";
+            const from = sdk.formatUserName(s) || s?.email || "";
             return {
               name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
               value: m.external_id
@@ -4596,7 +4644,7 @@ function registerDmCommand(program2) {
         );
         if (msgIds.length === 0) return;
       }
-      const data = await core.dm.markRead(arbi, msgIds);
+      const data = await sdk.dm.markRead(arbi, msgIds);
       success(`Marked ${data.length} message(s) as read.`);
     })()
   );
@@ -4605,7 +4653,7 @@ function registerDmCommand(program2) {
       const { arbi } = await resolveAuth();
       let msgIds = ids && ids.length > 0 ? ids : void 0;
       if (!msgIds) {
-        const data = await core.dm.listDMs(arbi);
+        const data = await sdk.dm.listDMs(arbi);
         if (data.length === 0) {
           console.log("No messages found.");
           return;
@@ -4614,7 +4662,7 @@ function registerDmCommand(program2) {
           "Select messages to delete",
           data.map((m) => {
             const s = m.sender;
-            const from = core.formatUserName(s) || s?.email || "";
+            const from = sdk.formatUserName(s) || s?.email || "";
             return {
               name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
               value: m.external_id
@@ -4623,7 +4671,7 @@ function registerDmCommand(program2) {
         );
         if (msgIds.length === 0) return;
       }
-      await core.dm.deleteDMs(arbi, msgIds);
+      await sdk.dm.deleteDMs(arbi, msgIds);
       success(`Deleted ${msgIds.length} message(s).`);
     })()
   );
@@ -4632,7 +4680,7 @@ function registerDmCommand(program2) {
   });
 }
 async function fetchTagChoices(arbi, workspaceId) {
-  const data = await core.tags.listTags(arbi, workspaceId);
+  const data = await sdk.tags.listTags(arbi);
   if (data.length === 0) {
     console.log("No tags found.");
     process.exit(0);
@@ -4651,7 +4699,7 @@ function registerTagsCommand(program2) {
   tags.command("list").description("List tags in the active workspace").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").action(
     (opts) => runAction(async () => {
       const { arbi, workspaceId } = await resolveWorkspace(opts.workspace);
-      const data = await core.tags.listTags(arbi, workspaceId);
+      const data = await sdk.tags.listTags(arbi);
       if (data.length === 0) {
         console.log("No tags found.");
         return;
@@ -4695,9 +4743,8 @@ function registerTagsCommand(program2) {
       ]);
       const instruction = interactive ? opts.instruction ?? (await promptInput("Instruction (optional)", false) || null) : opts.instruction ?? null;
       const shared = interactive ? opts.shared || await promptConfirm("Shared?", false) : opts.shared ?? false;
-      const data = await core.tags.createTag(arbi, {
+      const data = await sdk.tags.createTag(arbi, {
         name,
-        workspaceId,
         tagType: { type: tagType, options: [] },
         instruction,
         shared
@@ -4712,7 +4759,7 @@ function registerTagsCommand(program2) {
         const { choices } = await fetchTagChoices(arbi, workspaceId);
         id = await promptSelect("Select tag to delete", choices);
       }
-      const data = await core.tags.deleteTag(arbi, id);
+      const data = await sdk.tags.deleteTag(arbi, id);
       success(data?.detail ?? `Deleted tag ${id}`);
     })()
   );
@@ -4738,7 +4785,7 @@ function registerTagsCommand(program2) {
           body = { [field]: await promptInput(field.charAt(0).toUpperCase() + field.slice(1)) };
         }
       }
-      const data = await core.tags.updateTag(arbi, id, body);
+      const data = await sdk.tags.updateTag(arbi, id, body);
       success(`Updated: ${data.name} (${ref(data.external_id)})`);
     })()
   );
@@ -4747,7 +4794,7 @@ function registerTagsCommand(program2) {
   });
 }
 async function pickTag(arbi, workspaceId, message = "Select tag") {
-  const data = await core.tags.listTags(arbi, workspaceId);
+  const data = await sdk.tags.listTags(arbi);
   if (data.length === 0) {
     console.log("No tags found.");
     process.exit(0);
@@ -4762,7 +4809,7 @@ async function pickTag(arbi, workspaceId, message = "Select tag") {
   );
 }
 async function pickDocs(arbi, workspaceId, message = "Select documents") {
-  const data = await core.documents.listDocuments(arbi, workspaceId);
+  const data = await sdk.documents.listDocuments(arbi);
   if (data.length === 0) {
     console.log("No documents found.");
     process.exit(0);
@@ -4784,7 +4831,7 @@ function registerDoctagsCommand(program2) {
       if (!docIds || docIds.length === 0)
         docIds = await pickDocs(arbi, workspaceId, "Select documents to tag");
       if (docIds.length === 0) return;
-      const data = await core.doctags.assignDocTags(arbi, tagId, docIds, opts?.note);
+      const data = await sdk.doctags.assignDocTags(arbi, tagId, docIds, opts?.note);
       success(`Created ${data.length} doctag(s) for tag ${tagId}.`);
     })()
   );
@@ -4795,7 +4842,7 @@ function registerDoctagsCommand(program2) {
       if (!docIds || docIds.length === 0)
         docIds = await pickDocs(arbi, workspaceId, "Select documents to untag");
       if (docIds.length === 0) return;
-      await core.doctags.removeDocTags(arbi, tagId, docIds);
+      await sdk.doctags.removeDocTags(arbi, tagId, docIds);
       success(`Removed tag ${tagId} from ${docIds.length} document(s).`);
     })()
   );
@@ -4806,7 +4853,7 @@ function registerDoctagsCommand(program2) {
       if (opts.tags) {
         tagIds = opts.tags.split(",").map((s) => s.trim());
       } else {
-        const data2 = await core.tags.listTags(arbi, workspaceId);
+        const data2 = await sdk.tags.listTags(arbi);
         if (data2.length === 0) {
           console.log("No tags found.");
           return;
@@ -4827,7 +4874,7 @@ function registerDoctagsCommand(program2) {
         docIds = await pickDocs(arbi, workspaceId, "Select documents for AI tagging");
         if (docIds.length === 0) return;
       }
-      const data = await core.doctags.generateDocTags(arbi, tagIds, docIds);
+      const data = await sdk.doctags.generateDocTags(arbi, tagIds, docIds);
       console.log(
         `Generating doctags for ${data.doc_ext_ids.length} doc(s) with ${data.tag_ext_ids.length} tag(s).`
       );
@@ -4835,7 +4882,7 @@ function registerDoctagsCommand(program2) {
   );
 }
 async function pickConversation(arbi, workspaceId, message = "Select conversation") {
-  const data = await core.conversations.listConversations(arbi, workspaceId);
+  const data = await sdk.conversations.listConversations(arbi);
   if (data.length === 0) {
     console.log("No conversations found.");
     process.exit(0);
@@ -4854,7 +4901,7 @@ function registerConversationsCommand(program2) {
   conv.command("list").description("List conversations in the active workspace").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").action(
     (opts) => runAction(async () => {
       const { arbi, workspaceId } = await resolveWorkspace(opts.workspace);
-      const data = await core.conversations.listConversations(arbi, workspaceId);
+      const data = await sdk.conversations.listConversations(arbi);
       if (data.length === 0) {
         console.log("No conversations found.");
         return;
@@ -4874,7 +4921,7 @@ function registerConversationsCommand(program2) {
     (conversationId) => runAction(async () => {
       const { arbi, workspaceId } = await resolveWorkspace();
       if (!conversationId) conversationId = await pickConversation(arbi, workspaceId);
-      const data = await core.conversations.getConversationThreads(arbi, conversationId);
+      const data = await sdk.conversations.getConversationThreads(arbi, conversationId);
       console.log(JSON.stringify(data, null, 2));
     })()
   );
@@ -4887,7 +4934,7 @@ function registerConversationsCommand(program2) {
           workspaceId,
           "Select conversation to delete"
         );
-      const data = await core.conversations.deleteConversation(arbi, conversationId);
+      const data = await sdk.conversations.deleteConversation(arbi, conversationId);
       success(data?.detail ?? `Deleted conversation ${conversationId}`);
     })()
   );
@@ -4896,7 +4943,7 @@ function registerConversationsCommand(program2) {
       const { arbi, workspaceId } = await resolveWorkspace();
       if (!conversationId)
         conversationId = await pickConversation(arbi, workspaceId, "Select conversation to share");
-      const data = await core.conversations.shareConversation(arbi, conversationId);
+      const data = await sdk.conversations.shareConversation(arbi, conversationId);
       success(data?.detail ?? `Shared conversation ${conversationId}`);
     })()
   );
@@ -4905,39 +4952,21 @@ function registerConversationsCommand(program2) {
       const { arbi, workspaceId } = await resolveWorkspace();
       if (!conversationId) conversationId = await pickConversation(arbi, workspaceId);
       if (!title) title = await promptInput("New title");
-      const data = await core.conversations.updateConversationTitle(arbi, conversationId, title);
+      const data = await sdk.conversations.updateConversationTitle(arbi, conversationId, title);
       success(data?.detail ?? `Updated title to: ${title}`);
     })()
   );
-  conv.command("add-user [conversation-id] [user-id]").description("Add a user to a conversation (interactive if no args)").action(
-    (conversationId, userId) => runAction(async () => {
-      const { arbi, workspaceId } = await resolveWorkspace();
-      if (!conversationId) conversationId = await pickConversation(arbi, workspaceId);
-      if (!userId) userId = await promptInput("User ext_id or email");
-      const data = await core.conversations.addConversationUser(arbi, conversationId, userId);
-      success(data?.detail ?? `Added user ${userId} to conversation`);
-    })()
-  );
-  conv.command("remove-user [conversation-id] [user-id]").description("Remove a user from a conversation (interactive if no args)").action(
-    (conversationId, userId) => runAction(async () => {
-      const { arbi, workspaceId } = await resolveWorkspace();
-      if (!conversationId) conversationId = await pickConversation(arbi, workspaceId);
-      if (!userId) userId = await promptInput("User ext_id");
-      const data = await core.conversations.removeConversationUser(arbi, conversationId, userId);
-      success(data?.detail ?? `Removed user ${userId} from conversation`);
-    })()
-  );
   conv.command("message <message-id>").description("Get message details").action(
     (messageId) => runAction(async () => {
       const { arbi } = await resolveWorkspace();
-      const data = await core.conversations.getMessage(arbi, messageId);
+      const data = await sdk.conversations.getMessage(arbi, messageId);
       console.log(JSON.stringify(data, null, 2));
     })()
   );
   conv.command("delete-message <message-id>").description("Delete a message and its descendants").action(
     (messageId) => runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.conversations.deleteMessage(arbi, messageId);
+      const data = await sdk.conversations.deleteMessage(arbi, messageId);
       success(data?.detail ?? `Deleted message ${messageId}`);
     })()
   );
@@ -4950,7 +4979,7 @@ function registerSettingsCommand(program2) {
   settings.command("get").description("Show current user settings").action(
     runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.settings.getSettings(arbi);
+      const data = await sdk.settings.getSettings(arbi);
       console.log(JSON.stringify(data, null, 2));
     })
   );
@@ -4958,7 +4987,7 @@ function registerSettingsCommand(program2) {
     (json) => runAction(async () => {
       const body = parseJsonArg(json, `arbi settings set '{"hide_online_status": true}'`);
       const { arbi } = await resolveAuth();
-      await core.settings.updateSettings(arbi, body);
+      await sdk.settings.updateSettings(arbi, body);
       success("Settings updated.");
     })()
   );
@@ -4976,7 +5005,7 @@ var MODEL_SECTIONS = [
   "ArtifactLLM"
 ];
 async function pickConfig(arbi, message = "Select configuration") {
-  const data = await core.agentconfig.listConfigs(arbi);
+  const data = await sdk.agentconfig.listConfigs(arbi);
   if (data.versions.length === 0) {
     console.log("No saved configurations found.");
     process.exit(0);
@@ -4991,7 +5020,7 @@ async function pickConfig(arbi, message = "Select configuration") {
   );
 }
 async function fetchModels(arbi) {
-  const data = await core.agentconfig.getModels(arbi);
+  const data = await sdk.agentconfig.getModels(arbi);
   return data.models.map((m) => ({
     name: `${m.model_name} (${m.provider ?? m.api_type})`,
     value: m.model_name,
@@ -5113,7 +5142,7 @@ function registerAgentconfigCommand(program2) {
   ac.command("list").description("List saved configuration versions").action(
     runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.agentconfig.listConfigs(arbi);
+      const data = await sdk.agentconfig.listConfigs(arbi);
       if (data.versions.length === 0) {
         console.log("No saved configurations.");
         return;
@@ -5144,7 +5173,7 @@ function registerAgentconfigCommand(program2) {
           configId = await pickConfig(arbi);
         }
       }
-      const data = await core.agentconfig.getConfig(arbi, configId);
+      const data = await sdk.agentconfig.getConfig(arbi, configId);
       console.log(JSON.stringify(data, null, 2));
     })()
   );
@@ -5163,7 +5192,7 @@ function registerAgentconfigCommand(program2) {
       }
       if (opts?.tag) body.tag_ext_id = opts.tag;
       if (opts?.message) body.parent_message_ext_id = opts.message;
-      const data = await core.agentconfig.saveConfig(arbi, body);
+      const data = await sdk.agentconfig.saveConfig(arbi, body);
       success(`Saved: ${data.title || "(untitled)"} (${ref(data.external_id)})`);
     })()
   );
@@ -5171,14 +5200,14 @@ function registerAgentconfigCommand(program2) {
     (configId) => runAction(async () => {
       const { arbi } = await resolveAuth();
       if (!configId) configId = await pickConfig(arbi, "Select configuration to delete");
-      const data = await core.agentconfig.deleteConfig(arbi, configId);
+      const data = await sdk.agentconfig.deleteConfig(arbi, configId);
       success(data.detail);
     })()
   );
   ac.command("schema").description("Show JSON schema for all configuration models").action(
     runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.agentconfig.getSchema(arbi);
+      const data = await sdk.agentconfig.getSchema(arbi);
       console.log(JSON.stringify(data, null, 2));
     })
   );
@@ -5190,7 +5219,7 @@ function registerHealthCommand(program2) {
   program2.command("health").description("Show server health status").action(
     runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.health.getHealth(arbi);
+      const data = await sdk.health.getHealth(arbi);
       label("Status:", status(data.status));
       if (data.backend_git_hash) label("Backend:", data.backend_git_hash);
       if (data.frontend_docker_version) label("Frontend:", data.frontend_docker_version);
@@ -5212,7 +5241,7 @@ Models (${data.models_health.application}):`);
   program2.command("models").description("List available AI models").action(
     runAction(async () => {
       const { arbi } = await resolveAuth();
-      const data = await core.health.getHealthModels(arbi);
+      const data = await sdk.health.getHealthModels(arbi);
       if (data.models.length === 0) {
         console.log("No models available.");
         return;
@@ -5284,7 +5313,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.8");
+program.name("arbi").description("ARBI CLI \u2014 interact with ARBI from the terminal").version("0.3.10");
 registerConfigCommand(program);
 registerLoginCommand(program);
 registerRegisterCommand(program);