@arbidocs/cli 0.3.10 → 0.3.11

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.3.11
+
+[compare changes](https://github.com/arbicity/ARBI-frontend/compare/v0.3.10...HEAD)
+
+### 🩹 Fixes
+
+- Extract conversation documents from last user message instead of leaf ([#434](https://github.com/arbicity/ARBI-frontend/pull/434))
+- Extract metadata from response.completed SSE event ([#435](https://github.com/arbicity/ARBI-frontend/pull/435))
+
 ## v0.3.10
 
 [compare changes](https://github.com/arbicity/ARBI-frontend/compare/v0.3.8...HEAD)

package/dist/index.js

@@ -3502,7 +3502,7 @@ function getLatestVersion(skipCache = false) {
   }
 }
 function getCurrentVersion() {
-  return "0.3.10";
+  return "0.3.11";
 }
 function readChangelog(fromVersion, toVersion) {
   try {
@@ -3555,17 +3555,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.11") 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.11"} \u2192 ${latest}). Updating...`);
       child_process.execSync("npm install -g @arbidocs/cli@latest", { stdio: "inherit" });
-      showChangelog("0.3.10", latest);
+      showChangelog("0.3.11", 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.11"} \u2192 ${latest}).
 Run "arbi update" to upgrade, or "arbi update auto" to always stay up to date.`
       );
     }
@@ -3575,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.10") {
+    if (cached && cached.latest !== "0.3.11") {
       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.11"} \u2192 ${cached.latest}). Run "arbi update".`
       );
     }
   } catch {
@@ -3595,30 +3595,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) {
@@ -3771,6 +3773,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 +3781,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)}`);
@@ -3890,13 +3894,25 @@ process.on("SIGINT", () => {
 });
 
 // src/helpers.ts
+function formatCliError(err) {
+  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);
     }
@@ -4028,6 +4044,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 +4227,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(chalk__default.default.red(`
+\u26A0 ${docId} processing failed: ${reason}`));
+          } else {
+            console.error(
+              chalk__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,28 +4307,19 @@ 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));
     })()
@@ -4319,34 +4347,64 @@ function registerUploadCommand(program2) {
         }
         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 || files.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 +4451,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 +4471,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({
@@ -4441,7 +4504,8 @@ 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) {
@@ -4463,6 +4527,10 @@ function registerWatchCommand(program2) {
     (opts) => runAction(async () => {
       const { config, accessToken, workspaceId } = await resolveWorkspace(opts.workspace);
       console.log(`Watching workspace ${workspaceId}... (Ctrl+C to stop)`);
+      let onDone;
+      const done = new Promise((r) => {
+        onDone = r;
+      });
       await sdk.connectWebSocket({
         baseUrl: config.baseUrl,
         accessToken,
@@ -4475,8 +4543,10 @@ function registerWatchCommand(program2) {
             chalk__default.default.yellow(`
 Connection closed (code ${code}${reason ? ": " + reason : ""})`)
           );
+          onDone();
         }
       });
+      await done;
     })()
   );
 }
@@ -5313,7 +5383,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.11");
 registerConfigCommand(program);
 registerLoginCommand(program);
 registerRegisterCommand(program);