@arbidocs/cli 0.1.3 → 0.3.0

package/dist/index.cjs

@@ -3,10 +3,10 @@
 
 var commander = require('commander');
 var core = require('@arbidocs/core');
-var sdk = require('@arbidocs/sdk');
 var prompts = require('@inquirer/prompts');
+var sdk = require('@arbidocs/sdk');
 var fs = require('fs');
-var path2 = require('path');
+var path = require('path');
 var child_process = require('child_process');
 var module$1 = require('module');
 
@@ -14,7 +14,7 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var fs__default = /*#__PURE__*/_interopDefault(fs);
-var path2__default = /*#__PURE__*/_interopDefault(path2);
+var path__default = /*#__PURE__*/_interopDefault(path);
 
 var store = new core.FileConfigStore();
 function getConfig() {
@@ -37,9 +37,6 @@ function requireConfig() {
 function getCredentials() {
   return store.getCredentials();
 }
-function saveCredentials(creds) {
-  store.saveCredentials(creds);
-}
 function deleteCredentials() {
   store.deleteCredentials();
 }
@@ -3385,22 +3382,11 @@ async function promptConfirm(message, defaultValue = true) {
 // src/commands/login.ts
 function registerLoginCommand(program2) {
   program2.command("login").description("Log in to ARBI").option("-e, --email <email>", "Email address (or ARBI_EMAIL env var)").option("-p, --password <password>", "Password (or ARBI_PASSWORD env var)").option("-w, --workspace <id>", "Workspace ID to select after login").action(async (opts) => {
-    const config = requireConfig();
+    const config = store.requireConfig();
     const email = opts.email || process.env.ARBI_EMAIL || await promptInput("Email");
     const pw = opts.password || process.env.ARBI_PASSWORD || await promptPassword("Password");
-    const arbi = sdk.createArbiClient({
-      baseUrl: config.baseUrl,
-      deploymentDomain: config.deploymentDomain,
-      credentials: "omit"
-    });
-    await arbi.crypto.initSodium();
     try {
-      const result = await arbi.auth.login({ email, password: pw });
-      saveCredentials({
-        email,
-        signingPrivateKeyBase64: arbi.crypto.bytesToBase64(result.signingPrivateKey),
-        serverSessionKeyBase64: arbi.crypto.bytesToBase64(result.serverSessionKey)
-      });
+      const { arbi } = await core.performPasswordLogin(config, email, pw, store);
       const { data: workspaces2 } = await arbi.fetch.GET("/api/user/workspaces");
       const wsList = workspaces2 || [];
       console.log(`Logged in as ${email}`);
@@ -3423,21 +3409,13 @@ function registerLoginCommand(program2) {
         console.log(`Workspace: ${wsList[0].name} (${wsList[0].external_id})`);
         return;
       }
-      const choices = wsList.map((ws2) => {
-        const totalDocs = ws2.shared_document_count + ws2.private_document_count;
-        return {
-          name: `${ws2.name} (${totalDocs} docs)`,
-          value: ws2.external_id,
-          description: ws2.external_id
-        };
-      });
+      const choices = core.formatWorkspaceChoices(wsList);
       const selected = await promptSelect("Select workspace", choices);
       updateConfig({ selectedWorkspaceId: selected });
       const ws = wsList.find((w) => w.external_id === selected);
       console.log(`Workspace: ${ws.name} (${selected})`);
     } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      console.error(`Login failed: ${msg}`);
+      console.error(`Login failed: ${core.getErrorMessage(err)}`);
       process.exit(1);
     }
   });
@@ -3516,42 +3494,28 @@ async function interactiveRegister(config, opts) {
     console.log(`
 Registered successfully as ${email}`);
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    console.error(`Registration failed: ${msg}`);
+    console.error(`Registration failed: ${core.getErrorMessage(err)}`);
     process.exit(1);
   }
   const doLogin = await promptConfirm("Log in now?");
   if (doLogin) {
     try {
-      const loginResult = await arbi.auth.login({ email, password: password2 });
-      saveCredentials({
-        email,
-        signingPrivateKeyBase64: arbi.crypto.bytesToBase64(loginResult.signingPrivateKey),
-        serverSessionKeyBase64: arbi.crypto.bytesToBase64(loginResult.serverSessionKey)
-      });
-      const { data: workspaces2 } = await arbi.fetch.GET("/api/user/workspaces");
+      const { arbi: loggedInArbi } = await core.performPasswordLogin(config, email, password2, store);
+      const { data: workspaces2 } = await loggedInArbi.fetch.GET("/api/user/workspaces");
       const wsList = workspaces2 || [];
       console.log(`Logged in as ${email}`);
       if (wsList.length === 1) {
         updateConfig({ selectedWorkspaceId: wsList[0].external_id });
         console.log(`Workspace: ${wsList[0].name} (${wsList[0].external_id})`);
       } else if (wsList.length > 1) {
-        const choices = wsList.map((ws2) => {
-          const totalDocs = ws2.shared_document_count + ws2.private_document_count;
-          return {
-            name: `${ws2.name} (${totalDocs} docs)`,
-            value: ws2.external_id,
-            description: ws2.external_id
-          };
-        });
+        const choices = core.formatWorkspaceChoices(wsList);
         const selected = await promptSelect("Select workspace", choices);
         updateConfig({ selectedWorkspaceId: selected });
         const ws = wsList.find((w) => w.external_id === selected);
         console.log(`Workspace: ${ws.name} (${selected})`);
       }
     } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      console.error(`Login failed: ${msg}`);
+      console.error(`Login failed: ${core.getErrorMessage(err)}`);
       console.error("You can log in later with: arbi login");
     }
   }
@@ -3596,8 +3560,7 @@ async function nonInteractiveRegister(config, opts) {
     });
     console.log(`Registered: ${email}`);
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    console.error(`Registration failed: ${msg}`);
+    console.error(`Registration failed: ${core.getErrorMessage(err)}`);
     process.exit(1);
   }
 }
@@ -3638,8 +3601,7 @@ function runAction(fn) {
     try {
       await fn();
     } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      console.error(`Error: ${msg}`);
+      console.error(`Error: ${core.getErrorMessage(err)}`);
       process.exit(1);
     }
   };
@@ -3735,14 +3697,7 @@ function registerWorkspacesCommand(program2) {
         }
         selectedId = id;
       } else {
-        const choices = data.map((ws2) => {
-          const totalDocs = ws2.shared_document_count + ws2.private_document_count;
-          return {
-            name: `${ws2.name} (${totalDocs} docs)`,
-            value: ws2.external_id,
-            description: ws2.external_id
-          };
-        });
+        const choices = core.formatWorkspaceChoices(data);
         selectedId = await promptSelect("Select workspace", choices);
       }
       updateConfig({ selectedWorkspaceId: selectedId });
@@ -3848,11 +3803,23 @@ function registerWorkspacesCommand(program2) {
     })()
   );
 }
-function formatSize(bytes) {
-  if (!bytes) return "-";
-  if (bytes < 1024) return `${bytes} B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
-  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+function statusSymbol(status) {
+  switch (status) {
+    case "completed":
+      return "\u2713";
+    // ✓
+    case "failed":
+      return "\u2717";
+    // ✗
+    case "skipped":
+      return "\u2013";
+    // –
+    case "queued":
+      return "\u25CB";
+    // ○
+    default:
+      return "\u25CF";
+  }
 }
 async function fetchDocChoices(arbi, workspaceId) {
   const data = await core.documents.listDocuments(arbi, workspaceId);
@@ -3878,9 +3845,31 @@ function registerDocsCommand(program2) {
       printTable(
         [
           { header: "ID", width: 24, value: (r) => r.external_id },
-          { header: "NAME", width: 36, value: (r) => r.file_name ?? "Unnamed" },
-          { header: "STATUS", width: 14, value: (r) => r.status ?? "" },
-          { header: "SIZE", width: 10, value: (r) => formatSize(r.file_size) }
+          { header: "S", width: 2, value: (r) => statusSymbol(r.status) },
+          {
+            header: "TITLE",
+            width: 34,
+            value: (r) => {
+              const meta = r.doc_metadata;
+              return meta?.title ?? r.file_name ?? "Unnamed";
+            }
+          },
+          {
+            header: "DATE",
+            width: 12,
+            value: (r) => {
+              const meta = r.doc_metadata;
+              return meta?.doc_date ?? "-";
+            }
+          },
+          {
+            header: "SUMMARY",
+            width: 50,
+            value: (r) => {
+              const meta = r.doc_metadata;
+              return meta?.doc_subject ?? "-";
+            }
+          }
         ],
         data
       );
@@ -3981,9 +3970,7 @@ function registerDocsCommand(program2) {
         process.exit(1);
       }
       const data = await core.documents.getParsedContent(
-        config.baseUrl,
-        accessToken,
-        workspaceKeyHeader,
+        { baseUrl: config.baseUrl, accessToken, workspaceKeyHeader },
         docId,
         stage
       );
@@ -4004,22 +3991,14 @@ function registerUploadCommand(program2) {
         opts.workspace
       );
       const uploadedDocs = /* @__PURE__ */ new Map();
+      const auth = { baseUrl: config.baseUrl, accessToken, workspaceKeyHeader };
       for (const filePath of files) {
-        const fileBuffer = fs__default.default.readFileSync(filePath);
-        const fileName = path2__default.default.basename(filePath);
-        const result = await core.documents.uploadFile(
-          config.baseUrl,
-          accessToken,
-          workspaceKeyHeader,
-          workspaceId,
-          new Blob([fileBuffer]),
-          fileName
-        );
-        console.log(`Uploaded: ${fileName} (${result.doc_ext_ids.join(", ")})`);
+        const result = await core.documents.uploadLocalFile(auth, workspaceId, filePath);
+        console.log(`Uploaded: ${result.fileName} (${result.doc_ext_ids.join(", ")})`);
         if (result.duplicates && result.duplicates.length > 0) {
           console.log(`  Duplicates: ${result.duplicates.join(", ")}`);
         }
-        for (const id of result.doc_ext_ids) uploadedDocs.set(id, fileName);
+        for (const id of result.doc_ext_ids) uploadedDocs.set(id, result.fileName);
       }
       if (opts.watch && uploadedDocs.size > 0) {
         const pending = new Set(uploadedDocs.keys());
@@ -4071,9 +4050,7 @@ function registerDownloadCommand(program2) {
         docId = await promptSearch("Select document to download", choices);
       }
       const res = await core.documents.downloadDocument(
-        config.baseUrl,
-        accessToken,
-        workspaceKeyHeader,
+        { baseUrl: config.baseUrl, accessToken, workspaceKeyHeader },
         docId
       );
       let filename = `${docId}`;
@@ -4082,18 +4059,19 @@ function registerDownloadCommand(program2) {
         const match = disposition.match(/filename[*]?=(?:UTF-8''|"?)([^";]+)/i);
         if (match) filename = decodeURIComponent(match[1].replace(/"/g, ""));
       }
-      const outputPath = opts.output || path2__default.default.join(process.cwd(), filename);
+      const outputPath = opts.output || path__default.default.join(process.cwd(), filename);
       const buffer = Buffer.from(await res.arrayBuffer());
       fs__default.default.writeFileSync(outputPath, buffer);
       console.log(
-        `Downloaded: ${path2__default.default.basename(outputPath)} (${(buffer.length / (1024 * 1024)).toFixed(1)} MB)`
+        `Downloaded: ${path__default.default.basename(outputPath)} (${(buffer.length / (1024 * 1024)).toFixed(1)} MB)`
       );
     })()
   );
 }
 function registerAskCommand(program2) {
-  program2.command("ask <question>").description("Ask the RAG assistant a question").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").option("-c, --config <id>", "Config ext_id to use (e.g. cfg-xxx)").option("-n, --new", "Start a new conversation (ignore previous context)").option("-v, --verbose", "Show agent steps and tool calls").action(
-    (question, opts) => runAction(async () => {
+  program2.command("ask <question...>").description("Ask the RAG assistant a question (no quotes needed)").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").option("-c, --config <id>", "Config ext_id to use (e.g. cfg-xxx)").option("-n, --new", "Start a new conversation (ignore previous context)").option("-v, --verbose", "Show agent steps and tool calls").action(
+    (words, opts) => runAction(async () => {
+      const question = words.join(" ");
       const { arbi, accessToken, workspaceKeyHeader, workspaceId, config } = await resolveWorkspace(opts.workspace);
       const session = getChatSession();
       if (opts.new) {
@@ -4112,7 +4090,7 @@ function registerAskCommand(program2) {
         parentMessageExtId: session.lastMessageExtId,
         configExtId: opts.config
       });
-      const { assistantMessageExtId } = await core.streamSSE(res, {
+      const result = await core.streamSSE(res, {
         onToken: (content) => process.stdout.write(content),
         onAgentStep: (data) => {
           if (opts.verbose) {
@@ -4125,8 +4103,15 @@ function registerAskCommand(program2) {
 Error: ${message}`)
       });
       process.stdout.write("\n");
-      if (assistantMessageExtId) {
-        updateChatSession({ lastMessageExtId: assistantMessageExtId });
+      if (result.assistantMessageExtId) {
+        const updates = {
+          lastMessageExtId: result.assistantMessageExtId
+        };
+        const conversationExtId = result.userMessage?.conversation_ext_id ?? result.metadata?.conversation_ext_id;
+        if (conversationExtId) {
+          updates.conversationExtId = conversationExtId;
+        }
+        updateChatSession(updates);
       }
     })()
   );
@@ -4181,10 +4166,7 @@ function registerContactsCommand(program2) {
           {
             header: "NAME",
             width: 20,
-            value: (r) => {
-              const u = r.user;
-              return u ? [u.given_name, u.family_name].filter(Boolean).join(" ") : "";
-            }
+            value: (r) => core.formatUserName(r.user)
           },
           { header: "EMAIL", width: 30, value: (r) => r.email },
           { header: "STATUS", width: 18, value: (r) => r.status }
@@ -4220,8 +4202,7 @@ function registerContactsCommand(program2) {
         contactIds = await promptCheckbox(
           "Select contacts to remove",
           data.map((c) => {
-            const u = c.user;
-            const name = u ? [u.given_name, u.family_name].filter(Boolean).join(" ") : "";
+            const name = core.formatUserName(c.user);
             return {
               name: name ? `${name} (${c.email})` : c.email,
               value: c.external_id
@@ -4257,9 +4238,7 @@ function registerDmCommand(program2) {
             width: 22,
             value: (r) => {
               const s = r.sender;
-              if (!s) return "";
-              const name = [s.given_name, s.family_name].filter(Boolean).join(" ");
-              return name || s.email || "";
+              return core.formatUserName(s) || s?.email || "";
             }
           },
           { header: "READ", width: 6, value: (r) => r.read ? "yes" : "no" },
@@ -4282,7 +4261,7 @@ function registerDmCommand(program2) {
           "Send to",
           contacts.map((c) => {
             const u = c.user;
-            const name = u ? [u.given_name, u.family_name].filter(Boolean).join(" ") : "";
+            const name = core.formatUserName(u);
             return {
               name: name ? `${name} (${c.email})` : c.email,
               value: u?.external_id ?? c.external_id,
@@ -4326,7 +4305,7 @@ function registerDmCommand(program2) {
           "Select messages to mark as read",
           unread.map((m) => {
             const s = m.sender;
-            const from = s ? [s.given_name, s.family_name].filter(Boolean).join(" ") || s.email || "" : "";
+            const from = core.formatUserName(s) || s?.email || "";
             return {
               name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
               value: m.external_id
@@ -4353,7 +4332,7 @@ function registerDmCommand(program2) {
           "Select messages to delete",
           data.map((m) => {
             const s = m.sender;
-            const from = s ? [s.given_name, s.family_name].filter(Boolean).join(" ") || s.email || "" : "";
+            const from = core.formatUserName(s) || s?.email || "";
             return {
               name: `${from}: ${(m.content ?? "").slice(0, 50)}`,
               value: m.external_id