@arbidocs/tui 0.1.3 → 0.3.1

package/dist/index.cjs

@@ -6,8 +6,8 @@ var core = require('@arbidocs/core');
 var piTui = require('@mariozechner/pi-tui');
 var chalk = require('chalk');
 require('fake-indexeddb/auto');
-var prompts = require('@inquirer/prompts');
 var sdk = require('@arbidocs/sdk');
+var prompts = require('@inquirer/prompts');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -148,6 +148,13 @@ var ChatLog = class extends piTui.Container {
     this.addChild(new UserMessage(text));
     this.addChild(new piTui.Spacer(1));
   }
+  /** Add a complete assistant message (non-streaming, e.g. for history restoration). */
+  addAssistant(text) {
+    const msg = new AssistantMessage();
+    msg.setText(text);
+    this.addChild(msg);
+    this.addChild(new piTui.Spacer(1));
+  }
   /** Add a system/info/error message. */
   addSystem(message, level = "info") {
     this.addChild(new SystemMessage(message, level));
@@ -310,9 +317,14 @@ var commands = [
   { name: "contacts", description: "List contacts (type @name to DM)" },
   { name: "invite", description: "Invite a contact: /invite user@example.com" },
   { name: "docs", description: "List documents in current workspace" },
+  { name: "upload", description: "Upload a file: /upload <path>" },
+  { name: "delete", description: "Delete a document: /delete <doc-id>" },
   { name: "conversations", description: "List conversations" },
   { name: "new", description: "Start fresh conversation (clear threading)" },
+  { name: "models", description: "List available AI models" },
+  { name: "health", description: "Show system health status" },
   { name: "status", description: "Show auth/workspace/connection status" },
+  { name: "logout", description: "Log out and clear credentials" },
   { name: "exit", description: "Exit TUI" },
   { name: "quit", description: "Exit TUI" }
 ];
@@ -334,78 +346,52 @@ function formatHelpText() {
     "  Escape \u2014 Abort streaming"
   ].join("\n");
 }
-async function interactiveLogin(store) {
-  const config = store.requireConfig();
-  const email = await prompts.input({ message: "Email", validate: (v) => v.trim() ? true : "Required" });
-  const pw = await prompts.password({
-    message: "Password",
+async function promptSelect(message, choices) {
+  return prompts.select({ message, choices });
+}
+async function promptInput(message, required = true) {
+  return prompts.input({
+    message,
+    validate: required ? (v) => v.trim() ? true : "Required" : void 0
+  });
+}
+async function promptPassword(message) {
+  return prompts.password({
+    message,
     mask: "*",
     validate: (v) => v ? true : "Required"
   });
-  const arbi = sdk.createArbiClient({
-    baseUrl: config.baseUrl,
-    deploymentDomain: config.deploymentDomain,
-    credentials: "omit"
-  });
-  await arbi.crypto.initSodium();
-  const loginResult = await arbi.auth.login({ email, password: pw });
-  store.saveCredentials({
-    email,
-    signingPrivateKeyBase64: arbi.crypto.bytesToBase64(loginResult.signingPrivateKey),
-    serverSessionKeyBase64: arbi.crypto.bytesToBase64(loginResult.serverSessionKey)
-  });
+}
+async function promptConfirm(message, defaultValue = true) {
+  return prompts.confirm({ message, default: defaultValue });
+}
+
+// src/auth.ts
+async function interactiveLogin(store) {
+  const config = store.requireConfig();
+  const email = await promptInput("Email");
+  const pw = await promptPassword("Password");
+  const authContext = await core.performPasswordLogin(config, email, pw, store);
   console.info(`Logged in as ${email}`);
-  const { data: workspaces3 } = await arbi.fetch.GET("/api/user/workspaces");
-  const wsList = workspaces3 || [];
-  let selectedWorkspaceId;
-  let selectedWorkspaceName;
-  if (wsList.length === 1) {
-    selectedWorkspaceId = wsList[0].external_id;
-    selectedWorkspaceName = wsList[0].name;
-    store.updateConfig({ selectedWorkspaceId });
-    console.info(`Workspace: ${wsList[0].name}`);
-  } 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
-      };
-    });
-    selectedWorkspaceId = await prompts.select({ message: "Select workspace", choices });
-    const ws = wsList.find((w) => w.external_id === selectedWorkspaceId);
-    selectedWorkspaceName = ws?.name;
-    store.updateConfig({ selectedWorkspaceId });
-    console.info(`Workspace: ${selectedWorkspaceName}`);
-  } else {
-    console.info("No workspaces found.");
-  }
-  const authContext = await core.resolveAuth(store);
-  return { authContext, selectedWorkspaceId, selectedWorkspaceName };
+  const result = await selectOrCreateWorkspace(authContext, store);
+  return { authContext, ...result };
 }
 async function interactiveRegister(store) {
   const config = store.requireConfig();
-  const email = await prompts.input({ message: "Email", validate: (v) => v.trim() ? true : "Required" });
+  const email = await promptInput("Email");
   const arbi = sdk.createArbiClient({
     baseUrl: config.baseUrl,
     deploymentDomain: config.deploymentDomain,
     credentials: "omit"
   });
   await arbi.crypto.initSodium();
-  const codeMethod = await prompts.select({
-    message: "Verification method",
-    choices: [
-      { name: "I have an invitation code", value: "code" },
-      { name: "Send me a verification email", value: "email" }
-    ]
-  });
+  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 prompts.input({
-      message: "Invitation code",
-      validate: (v) => v.trim() ? true : "Required"
-    });
+    verificationCode = await promptInput("Invitation code");
   } else {
     console.info("Sending verification email...");
     const verifyResponse = await arbi.fetch.POST("/api/user/verify-email", {
@@ -415,26 +401,15 @@ async function interactiveRegister(store) {
       throw new Error(`Failed to send verification email: ${JSON.stringify(verifyResponse.error)}`);
     }
     console.info("Verification email sent. Check your inbox.");
-    verificationCode = await prompts.input({
-      message: "Verification code",
-      validate: (v) => v.trim() ? true : "Required"
-    });
+    verificationCode = await promptInput("Verification code");
   }
-  const pw = await prompts.password({
-    message: "Password",
-    mask: "*",
-    validate: (v) => v ? true : "Required"
-  });
-  const confirmPw = await prompts.password({
-    message: "Confirm password",
-    mask: "*",
-    validate: (v) => v ? true : "Required"
-  });
+  const pw = await promptPassword("Password");
+  const confirmPw = await promptPassword("Confirm password");
   if (pw !== confirmPw) {
     throw new Error("Passwords do not match.");
   }
-  const firstName = await prompts.input({ message: "First name (optional)" }) || "User";
-  const lastName = await prompts.input({ message: "Last name (optional)" }) || "";
+  const firstName = await promptInput("First name (optional)", false) || "User";
+  const lastName = await promptInput("Last name (optional)", false) || "";
   await arbi.auth.register({
     email,
     password: pw,
@@ -444,11 +419,37 @@ async function interactiveRegister(store) {
   });
   console.info(`
 Registered successfully as ${email}`);
-  const doLogin = await prompts.confirm({ message: "Log in now?", default: true });
-  if (doLogin) {
-    return interactiveLogin(store);
+  console.info("Logging in...");
+  const authContext = await core.performPasswordLogin(config, email, pw, store);
+  console.info(`Logged in as ${email}`);
+  const result = await selectOrCreateWorkspace(authContext, store);
+  return { authContext, ...result };
+}
+async function selectOrCreateWorkspace(authContext, store) {
+  const wsList = await core.workspaces.listWorkspaces(authContext.arbi);
+  if (wsList.length === 1) {
+    store.updateConfig({ selectedWorkspaceId: wsList[0].external_id });
+    console.info(`Workspace: ${wsList[0].name}`);
+    return { selectedWorkspaceId: wsList[0].external_id, selectedWorkspaceName: wsList[0].name };
   }
-  return null;
+  if (wsList.length > 1) {
+    const choices = core.formatWorkspaceChoices(wsList);
+    const selectedWorkspaceId = await promptSelect("Select workspace", choices);
+    const ws = wsList.find((w) => w.external_id === selectedWorkspaceId);
+    store.updateConfig({ selectedWorkspaceId });
+    console.info(`Workspace: ${ws?.name}`);
+    return { selectedWorkspaceId, selectedWorkspaceName: ws?.name };
+  }
+  console.info("No workspaces found.");
+  const shouldCreate = await promptConfirm("Create a new workspace?");
+  if (shouldCreate) {
+    const name = await promptInput("Workspace name");
+    const ws = await core.workspaces.createWorkspace(authContext.arbi, name.trim());
+    store.updateConfig({ selectedWorkspaceId: ws.external_id });
+    console.info(`Created workspace: ${ws.name}`);
+    return { selectedWorkspaceId: ws.external_id, selectedWorkspaceName: ws.name };
+  }
+  return {};
 }
 async function ensureAuthenticated(store) {
   try {
@@ -460,26 +461,75 @@ async function ensureAuthenticated(store) {
     };
   } catch {
     console.info("Not authenticated.\n");
-    const action = await prompts.select({
-      message: "What would you like to do?",
-      choices: [
-        { name: "Log in", value: "login" },
-        { name: "Register a new account", value: "register" },
-        { name: "Exit", value: "exit" }
-      ]
-    });
+  }
+  while (true) {
+    const action = await promptSelect("What would you like to do?", [
+      { name: "Log in", value: "login" },
+      { name: "Register a new account", value: "register" },
+      { name: "Exit", value: "exit" }
+    ]);
     if (action === "exit") {
       process.exit(0);
     }
-    if (action === "register") {
-      const result = await interactiveRegister(store);
-      if (!result) {
-        console.info("Registration complete. Please restart to log in.");
-        process.exit(0);
+    try {
+      if (action === "register") {
+        return await interactiveRegister(store);
       }
-      return result;
+      return await interactiveLogin(store);
+    } catch (err) {
+      console.error(`
+${core.getErrorMessage(err)}
+`);
     }
-    return interactiveLogin(store);
+  }
+}
+function requireAuth(tui, message = "Not authenticated. Use /login first.") {
+  if (tui.authContext) return true;
+  showMessage(tui, message, "error");
+  return false;
+}
+function showMessage(tui, message, level) {
+  tui.chatLog.addSystem(message, level);
+  tui.requestRender();
+}
+async function switchWorkspace(tui, workspaceId) {
+  if (!tui.authContext) return null;
+  try {
+    const ws = await core.selectWorkspaceById(
+      tui.authContext.arbi,
+      workspaceId,
+      tui.authContext.loginResult.serverSessionKey,
+      tui.store.requireCredentials().signingPrivateKeyBase64
+    );
+    tui.state.workspaceId = ws.external_id;
+    tui.state.workspaceName = ws.name;
+    tui.state.conversationMessageId = null;
+    tui.store.clearChatSession();
+    tui.store.updateConfig({ selectedWorkspaceId: ws.external_id });
+    await tui.refreshWorkspaceContext();
+    return ws;
+  } catch (err) {
+    showMessage(tui, `Failed to switch workspace: ${core.getErrorMessage(err)}`, "error");
+    return null;
+  }
+}
+async function applyWorkspaceSelection(tui, workspaceId, workspaceName) {
+  if (!workspaceId) return;
+  const wsCtx = await core.resolveWorkspace(tui.store, workspaceId);
+  tui.setWorkspaceContext(wsCtx);
+  tui.state.workspaceName = workspaceName ?? null;
+}
+async function runInteractiveFlow(tui, pauseMessage, action, errorPrefix) {
+  showMessage(tui, pauseMessage);
+  tui.stopTui();
+  try {
+    const result = await action();
+    tui.restartTui();
+    return result;
+  } catch (err) {
+    tui.restartTui();
+    showMessage(tui, `${errorPrefix}: ${core.getErrorMessage(err)}`, "error");
+    return null;
   }
 }
 
@@ -492,8 +542,7 @@ async function handleCommand(tui, input2) {
   const args = parts.slice(1);
   switch (cmd) {
     case "help":
-      tui.chatLog.addSystem(formatHelpText());
-      tui.requestRender();
+      showMessage(tui, formatHelpText());
       return true;
     case "login":
       await handleLogin(tui);
@@ -519,284 +568,202 @@ async function handleCommand(tui, input2) {
     case "docs":
       await handleListDocs(tui);
       return true;
+    case "upload":
+      await handleUpload(tui, args.join(" "));
+      return true;
+    case "delete":
+      await handleDelete(tui, args[0]);
+      return true;
     case "conversations":
       await handleListConversations(tui);
       return true;
     case "new":
       handleNewConversation(tui);
       return true;
+    case "models":
+      await handleModels(tui);
+      return true;
+    case "health":
+      await handleHealth(tui);
+      return true;
     case "status":
       handleStatus(tui);
       return true;
+    case "logout":
+      handleLogout(tui);
+      return true;
     case "exit":
     case "quit":
       tui.shutdown();
       return true;
     default:
-      tui.chatLog.addSystem(
-        `Unknown command: /${cmd}. Type /help for available commands.`,
-        "warning"
-      );
-      tui.requestRender();
+      showMessage(tui, `Unknown command: /${cmd}. Type /help for available commands.`, "warning");
       return true;
   }
 }
 async function handleLogin(tui) {
-  tui.chatLog.addSystem("Pausing TUI for login...");
-  tui.requestRender();
-  tui.stopTui();
-  try {
-    const result = await interactiveLogin(tui.store);
+  const result = await runInteractiveFlow(
+    tui,
+    "Pausing TUI for login...",
+    () => interactiveLogin(tui.store),
+    "Login failed"
+  );
+  if (result) {
     tui.setAuthContext(result.authContext);
-    if (result.selectedWorkspaceId) {
-      const wsCtx = await core.resolveWorkspace(tui.store, result.selectedWorkspaceId);
-      tui.setWorkspaceContext(wsCtx);
-      tui.state.workspaceName = result.selectedWorkspaceName ?? null;
-    }
-    tui.restartTui();
-    tui.chatLog.addSystem("Logged in successfully.");
-    tui.requestRender();
-  } catch (err) {
-    tui.restartTui();
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Login failed: ${msg}`, "error");
-    tui.requestRender();
+    await applyWorkspaceSelection(tui, result.selectedWorkspaceId, result.selectedWorkspaceName);
+    showMessage(tui, "Logged in successfully.");
   }
 }
 async function handleRegister(tui) {
-  tui.chatLog.addSystem("Pausing TUI for registration...");
-  tui.requestRender();
-  tui.stopTui();
-  try {
-    const result = await interactiveRegister(tui.store);
-    if (result) {
-      tui.setAuthContext(result.authContext);
-      if (result.selectedWorkspaceId) {
-        const wsCtx = await core.resolveWorkspace(tui.store, result.selectedWorkspaceId);
-        tui.setWorkspaceContext(wsCtx);
-        tui.state.workspaceName = result.selectedWorkspaceName ?? null;
-      }
-    }
-    tui.restartTui();
-    tui.chatLog.addSystem(
-      result ? "Registered and logged in." : "Registered. Use /login to log in."
-    );
-    tui.requestRender();
-  } catch (err) {
-    tui.restartTui();
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Registration failed: ${msg}`, "error");
-    tui.requestRender();
+  const result = await runInteractiveFlow(
+    tui,
+    "Pausing TUI for registration...",
+    () => interactiveRegister(tui.store),
+    "Registration failed"
+  );
+  if (result) {
+    tui.setAuthContext(result.authContext);
+    await applyWorkspaceSelection(tui, result.selectedWorkspaceId, result.selectedWorkspaceName);
+    showMessage(tui, "Registered and logged in.");
   }
 }
 async function handleCreateWorkspace(tui, name) {
-  if (!tui.authContext) {
-    tui.chatLog.addSystem("Not authenticated. Use /login first.", "error");
-    tui.requestRender();
-    return;
-  }
+  if (!requireAuth(tui)) return;
   if (!name.trim()) {
-    tui.chatLog.addSystem("Usage: /create <workspace name>", "warning");
-    tui.requestRender();
+    showMessage(tui, "Usage: /create <workspace name>", "warning");
     return;
   }
   try {
-    tui.chatLog.addSystem(`Creating workspace "${name}"...`);
-    tui.requestRender();
+    showMessage(tui, `Creating workspace "${name}"...`);
     const ws = await core.workspaces.createWorkspace(tui.authContext.arbi, name.trim());
-    const { selectWorkspaceById } = await import('@arbidocs/core');
-    const selected = await selectWorkspaceById(
-      tui.authContext.arbi,
-      ws.external_id,
-      tui.authContext.loginResult.serverSessionKey,
-      tui.store.requireCredentials().signingPrivateKeyBase64
-    );
-    tui.state.workspaceId = selected.external_id;
-    tui.state.workspaceName = selected.name;
-    tui.state.conversationMessageId = null;
-    tui.store.updateConfig({ selectedWorkspaceId: selected.external_id });
-    await tui.refreshWorkspaceContext();
-    tui.chatLog.addSystem(`Created and switched to workspace: ${colors.accentBold(selected.name)}`);
-    tui.requestRender();
+    const selected = await switchWorkspace(tui, ws.external_id);
+    if (selected) {
+      showMessage(tui, `Created and switched to workspace: ${colors.accentBold(selected.name)}`);
+    }
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to create workspace: ${msg}`, "error");
-    tui.requestRender();
+    showMessage(tui, `Failed to create workspace: ${core.getErrorMessage(err)}`, "error");
   }
 }
 async function handleWorkspaceSwitch(tui, workspaceId) {
-  if (!tui.authContext) {
-    tui.chatLog.addSystem("Not authenticated. Please restart and log in.", "error");
-    tui.requestRender();
-    return;
-  }
+  if (!requireAuth(tui, "Not authenticated. Please restart and log in.")) return;
   if (!workspaceId) {
     await handleListWorkspaces(tui);
-    tui.chatLog.addSystem("Use /workspace <id> to switch.");
-    tui.requestRender();
+    showMessage(tui, "Use /workspace <id> to switch.");
     return;
   }
-  try {
-    tui.chatLog.addSystem(`Switching to workspace ${workspaceId}...`);
-    tui.requestRender();
-    const { selectWorkspaceById } = await import('@arbidocs/core');
-    const ws = await selectWorkspaceById(
-      tui.authContext.arbi,
-      workspaceId,
-      tui.authContext.loginResult.serverSessionKey,
-      tui.store.requireCredentials().signingPrivateKeyBase64
-    );
-    tui.state.workspaceId = ws.external_id;
-    tui.state.workspaceName = ws.name;
-    tui.state.conversationMessageId = null;
-    tui.store.updateConfig({ selectedWorkspaceId: ws.external_id });
-    await tui.refreshWorkspaceContext();
-    tui.chatLog.addSystem(`Switched to workspace: ${colors.accentBold(ws.name)}`);
-    tui.requestRender();
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to switch workspace: ${msg}`, "error");
-    tui.requestRender();
+  showMessage(tui, `Switching to workspace ${workspaceId}...`);
+  const ws = await switchWorkspace(tui, workspaceId);
+  if (ws) {
+    showMessage(tui, `Switched to workspace: ${colors.accentBold(ws.name)}`);
   }
 }
 async function handleListWorkspaces(tui) {
-  if (!tui.authContext) {
-    tui.chatLog.addSystem("Not authenticated.", "error");
-    tui.requestRender();
-    return;
-  }
+  if (!requireAuth(tui, "Not authenticated.")) return;
   try {
     const wsList = await core.workspaces.listWorkspaces(tui.authContext.arbi);
     const lines = wsList.map((ws) => {
       const current = ws.external_id === tui.state.workspaceId ? colors.accent(" (current)") : "";
       return `  ${ws.external_id}  ${ws.name}${current}`;
     });
-    tui.chatLog.addSystem(["Workspaces:", "", ...lines].join("\n"));
-    tui.requestRender();
+    showMessage(tui, ["Workspaces:", "", ...lines].join("\n"));
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to list workspaces: ${msg}`, "error");
-    tui.requestRender();
+    showMessage(tui, `Failed to list workspaces: ${core.getErrorMessage(err)}`, "error");
   }
 }
 async function handleListDocs(tui) {
   if (!tui.authContext || !tui.state.workspaceId) {
-    tui.chatLog.addSystem("No workspace selected. Use /workspace <id> first.", "warning");
-    tui.requestRender();
+    showMessage(tui, "No workspace selected. Use /workspace <id> first.", "warning");
     return;
   }
   try {
     const docs = await core.documents.listDocuments(tui.authContext.arbi, tui.state.workspaceId);
     if (docs.length === 0) {
-      tui.chatLog.addSystem("No documents in this workspace.");
+      showMessage(tui, "No documents in this workspace.");
     } else {
       const lines = docs.map((d) => `  ${d.external_id}  ${d.file_name ?? "(unnamed)"}`);
-      tui.chatLog.addSystem([`Documents (${docs.length}):`, "", ...lines].join("\n"));
+      showMessage(tui, [`Documents (${docs.length}):`, "", ...lines].join("\n"));
     }
-    tui.requestRender();
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to list documents: ${msg}`, "error");
-    tui.requestRender();
+    showMessage(tui, `Failed to list documents: ${core.getErrorMessage(err)}`, "error");
   }
 }
 async function handleListContacts(tui) {
-  if (!tui.authContext) {
-    tui.chatLog.addSystem("Not authenticated. Use /login first.", "error");
-    tui.requestRender();
-    return;
-  }
+  if (!requireAuth(tui)) return;
   try {
     const contactList = await core.contacts.listContacts(tui.authContext.arbi);
-    const registered = contactList.filter((c) => c.status === "registered");
-    const invited = contactList.filter((c) => c.status !== "registered");
-    if (registered.length === 0 && invited.length === 0) {
-      tui.chatLog.addSystem("No contacts. Use the web app to add contacts.");
+    const { registered, pending } = core.contacts.groupContactsByStatus(contactList);
+    if (registered.length === 0 && pending.length === 0) {
+      showMessage(tui, "No contacts. Use the web app to add contacts.");
     } else {
       const lines = [];
       if (registered.length > 0) {
         lines.push(`Contacts (${registered.length}):`, "");
         for (const c of registered) {
-          const name = c.user ? `${c.user.given_name} ${c.user.family_name}`.trim() : "";
+          const name = core.formatUserName(c.user);
           const nameStr = name ? colors.muted(` (${name})`) : "";
           lines.push(`  ${c.email}${nameStr}`);
         }
       }
-      if (invited.length > 0) {
+      if (pending.length > 0) {
         if (lines.length > 0) lines.push("");
-        lines.push(`Pending invitations (${invited.length}):`);
-        for (const c of invited) {
+        lines.push(`Pending invitations (${pending.length}):`);
+        for (const c of pending) {
           lines.push(`  ${c.email} \u2014 ${colors.muted(c.status)}`);
         }
       }
       lines.push("", colors.muted("Type @name to start a DM with a registered contact."));
-      tui.chatLog.addSystem(lines.join("\n"));
+      showMessage(tui, lines.join("\n"));
     }
-    tui.requestRender();
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to list contacts: ${msg}`, "error");
-    tui.requestRender();
+    showMessage(tui, `Failed to list contacts: ${core.getErrorMessage(err)}`, "error");
   }
 }
 async function handleInviteContact(tui, email) {
-  if (!tui.authContext) {
-    tui.chatLog.addSystem("Not authenticated. Use /login first.", "error");
-    tui.requestRender();
-    return;
-  }
+  if (!requireAuth(tui)) return;
   if (!email?.trim()) {
-    tui.chatLog.addSystem("Usage: /invite user@example.com", "warning");
-    tui.requestRender();
+    showMessage(tui, "Usage: /invite user@example.com", "warning");
     return;
   }
   try {
-    tui.chatLog.addSystem(`Inviting ${email}...`);
-    tui.requestRender();
+    showMessage(tui, `Inviting ${email}...`);
     const result = await core.contacts.addContacts(tui.authContext.arbi, [email.trim()]);
     const contact = result[0];
     if (contact?.status === "registered") {
-      tui.chatLog.addSystem(
+      showMessage(
+        tui,
         `${colors.success("Added")} ${email} \u2014 already registered. You can DM them with @${email.split("@")[0]}`
       );
     } else {
-      tui.chatLog.addSystem(
+      showMessage(
+        tui,
         `${colors.success("Invited")} ${email} \u2014 invitation sent. They'll appear in /contacts once they register.`
       );
     }
-    tui.requestRender();
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to invite contact: ${msg}`, "error");
-    tui.requestRender();
+    showMessage(tui, `Failed to invite contact: ${core.getErrorMessage(err)}`, "error");
   }
 }
 async function handleListConversations(tui) {
   if (!tui.authContext || !tui.state.workspaceId) {
-    tui.chatLog.addSystem("No workspace selected. Use /workspace <id> first.", "warning");
-    tui.requestRender();
+    showMessage(tui, "No workspace selected. Use /workspace <id> first.", "warning");
     return;
   }
   try {
     const convs = await core.conversations.listConversations(tui.authContext.arbi, tui.state.workspaceId);
     if (convs.length === 0) {
-      tui.chatLog.addSystem("No conversations in this workspace.");
+      showMessage(tui, "No conversations in this workspace.");
     } else {
       const lines = convs.map((c) => `  ${c.external_id}  ${c.title ?? "(untitled)"}`);
-      tui.chatLog.addSystem([`Conversations (${convs.length}):`, "", ...lines].join("\n"));
+      showMessage(tui, [`Conversations (${convs.length}):`, "", ...lines].join("\n"));
     }
-    tui.requestRender();
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to list conversations: ${msg}`, "error");
-    tui.requestRender();
+    showMessage(tui, `Failed to list conversations: ${core.getErrorMessage(err)}`, "error");
   }
 }
 function handleNewConversation(tui) {
   tui.state.conversationMessageId = null;
   tui.store.clearChatSession();
-  tui.chatLog.addSystem("Started new conversation.");
-  tui.requestRender();
+  showMessage(tui, "Started new conversation.");
 }
 function handleStatus(tui) {
   const { state } = tui;
@@ -808,8 +775,112 @@ function handleStatus(tui) {
     `Status: ${state.activityStatus}`,
     `WebSocket: ${tui.wsConnected ? colors.success("connected") : colors.muted("disconnected")}`
   ];
-  tui.chatLog.addSystem(lines.join("\n"));
-  tui.requestRender();
+  showMessage(tui, lines.join("\n"));
+}
+async function handleUpload(tui, filePath) {
+  const wsCtx = tui.wsContext;
+  if (!wsCtx) {
+    showMessage(tui, "No workspace selected. Use /workspace <id> first.", "warning");
+    return;
+  }
+  if (!filePath.trim()) {
+    showMessage(tui, "Usage: /upload <file-path>", "warning");
+    return;
+  }
+  try {
+    showMessage(tui, `Uploading ${filePath.trim()}...`);
+    const result = await core.documents.uploadLocalFile(
+      {
+        baseUrl: wsCtx.config.baseUrl,
+        accessToken: wsCtx.accessToken,
+        workspaceKeyHeader: wsCtx.workspaceKeyHeader
+      },
+      wsCtx.workspaceId,
+      filePath.trim()
+    );
+    const ids = result.doc_ext_ids.join(", ");
+    showMessage(tui, `${colors.success("Uploaded")} ${result.fileName} \u2014 doc ID(s): ${ids}`);
+    if (result.duplicates && result.duplicates.length > 0) {
+      showMessage(tui, `Duplicates detected: ${result.duplicates.join(", ")}`, "warning");
+    }
+  } catch (err) {
+    showMessage(tui, `Failed to upload: ${core.getErrorMessage(err)}`, "error");
+  }
+}
+async function handleDelete(tui, docId) {
+  if (!requireAuth(tui)) return;
+  if (!docId?.trim()) {
+    showMessage(tui, "Usage: /delete <doc-id>  (use /docs to list document IDs)", "warning");
+    return;
+  }
+  try {
+    showMessage(tui, `Deleting document ${docId}...`);
+    await core.documents.deleteDocuments(tui.authContext.arbi, [docId.trim()]);
+    showMessage(tui, `${colors.success("Deleted")} document ${docId}`);
+  } catch (err) {
+    showMessage(tui, `Failed to delete document: ${core.getErrorMessage(err)}`, "error");
+  }
+}
+function handleLogout(tui) {
+  tui.store.deleteCredentials();
+  tui.store.updateConfig({ selectedWorkspaceId: void 0 });
+  tui.store.clearChatSession();
+  tui.authContext = null;
+  tui.state.isAuthenticated = false;
+  tui.state.workspaceId = null;
+  tui.state.workspaceName = null;
+  tui.state.conversationMessageId = null;
+  showMessage(tui, "Logged out. Use /login to authenticate again.");
+}
+async function handleHealth(tui) {
+  if (!requireAuth(tui)) return;
+  try {
+    const data = await core.health.getHealth(tui.authContext.arbi);
+    const lines = ["System Health:", ""];
+    const status = data.status;
+    if (status) {
+      const statusColor = status === "healthy" ? colors.success(status) : colors.warning(status);
+      lines.push(`  Status: ${statusColor}`);
+    }
+    const services = data.services;
+    if (services) {
+      lines.push("", "  Services:");
+      for (const [name, info] of Object.entries(services)) {
+        const svc = info;
+        const svcStatus = svc.status;
+        const statusStr = svcStatus ? svcStatus === "healthy" ? colors.success(svcStatus) : colors.error(svcStatus) : colors.muted("unknown");
+        lines.push(`    ${name}: ${statusStr}`);
+      }
+    }
+    showMessage(tui, lines.join("\n"));
+  } catch (err) {
+    showMessage(tui, `Failed to fetch health status: ${core.getErrorMessage(err)}`, "error");
+  }
+}
+async function handleModels(tui) {
+  if (!requireAuth(tui)) return;
+  try {
+    const data = await core.health.getHealthModels(tui.authContext.arbi);
+    const models = Array.isArray(data) ? data : data.data ?? [];
+    if (models.length === 0) {
+      showMessage(tui, "No models available.");
+      return;
+    }
+    const lines = [`Models (${models.length}):`, ""];
+    for (const m of models) {
+      const model = m;
+      const name = model.model_name ?? model.name ?? "unknown";
+      const provider = model.provider ?? "";
+      const apiType = model.api_type ?? "";
+      const parts = [colors.accent(name)];
+      if (provider) parts.push(`provider: ${provider}`);
+      if (apiType) parts.push(`api: ${apiType}`);
+      lines.push(`  ${parts.join("  ")}`);
+    }
+    showMessage(tui, lines.join("\n"));
+  } catch (err) {
+    showMessage(tui, `Failed to fetch models: ${core.getErrorMessage(err)}`, "error");
+  }
 }
 async function streamResponse(tui, response) {
   tui.chatLog.startAssistant();
@@ -848,8 +919,7 @@ async function streamResponse(tui, response) {
   } catch (err) {
     tui.chatLog.finalizeAssistant();
     tui.state.activityStatus = "error";
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Streaming failed: ${msg}`, "error");
+    tui.chatLog.addSystem(`Streaming failed: ${core.getErrorMessage(err)}`, "error");
     tui.requestRender();
     throw err;
   }
@@ -864,8 +934,7 @@ function deriveEncryptionKeypair(signingPrivateKeyBase64) {
 }
 async function resolveRecipient(tui, query) {
   if (!tui.authContext) {
-    tui.chatLog.addSystem("Not authenticated. Use /login first.", "error");
-    tui.requestRender();
+    showMessage(tui, "Not authenticated. Use /login first.", "error");
     return null;
   }
   const queryLower = query.toLowerCase();
@@ -880,21 +949,17 @@ async function resolveRecipient(tui, query) {
       return emailPrefix === queryLower || givenName === queryLower;
     });
     if (matches.length === 0) {
-      tui.chatLog.addSystem(
+      showMessage(
+        tui,
         `No registered contact matching "${query}". Use /contacts to see available contacts.`,
         "warning"
       );
-      tui.requestRender();
       return null;
     }
     if (matches.length > 1) {
       const names = matches.map((c) => `  ${c.email} (${c.user?.given_name ?? ""} ${c.user?.family_name ?? ""})`).join("\n");
-      tui.chatLog.addSystem(
-        `Ambiguous match for "${query}". Be more specific:
-${names}`,
-        "warning"
-      );
-      tui.requestRender();
+      showMessage(tui, `Ambiguous match for "${query}". Be more specific:
+${names}`, "warning");
       return null;
     }
     const contact = matches[0];
@@ -907,17 +972,14 @@ ${names}`,
       family_name: user.family_name
     };
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to resolve contact: ${msg}`, "error");
-    tui.requestRender();
+    showMessage(tui, `Failed to resolve contact: ${core.getErrorMessage(err)}`, "error");
     return null;
   }
 }
 async function handleChannelSwitch(tui, input2) {
   const query = input2.slice(1).trim();
   if (!query) {
-    tui.chatLog.addSystem("Usage: @username to switch to DM, @arbi to switch back.", "warning");
-    tui.requestRender();
+    showMessage(tui, "Usage: @username to switch to DM, @arbi to switch back.", "warning");
     return;
   }
   if (query.toLowerCase() === "arbi") {
@@ -930,30 +992,24 @@ async function handleChannelSwitch(tui, input2) {
 }
 async function switchToDmChannel(tui, user) {
   if (!tui.authContext || !tui.encryptionKeys) {
-    tui.chatLog.addSystem("Not authenticated or encryption not initialized.", "error");
-    tui.requestRender();
+    showMessage(tui, "Not authenticated or encryption not initialized.", "error");
     return;
   }
   tui.currentDmChannel = { user };
   tui.updateHeader();
   tui.chatLog.clearMessages();
-  tui.chatLog.addSystem(
-    `Switched to DM with ${colors.accent(user.email)}. Type @arbi to switch back.`
-  );
-  tui.requestRender();
+  showMessage(tui, `Switched to DM with ${colors.accent(user.email)}. Type @arbi to switch back.`);
   await loadDmHistory(tui, user);
 }
 function switchToArbi(tui) {
   if (!tui.currentDmChannel) {
-    tui.chatLog.addSystem("Already in AI chat mode.", "info");
-    tui.requestRender();
+    showMessage(tui, "Already in AI chat mode.", "info");
     return;
   }
   tui.currentDmChannel = null;
   tui.updateHeader();
   tui.chatLog.clearMessages();
-  tui.chatLog.addSystem("Switched back to AI chat.");
-  tui.requestRender();
+  showMessage(tui, "Switched back to AI chat.");
 }
 async function loadDmHistory(tui, user) {
   if (!tui.authContext || !tui.encryptionKeys) return;
@@ -963,9 +1019,7 @@ async function loadDmHistory(tui, user) {
     const conversation = allDms.filter(
       (msg) => msg.type === "user_message" && (msg.sender.external_id === user.external_id && msg.recipient.external_id === myExtId || msg.sender.external_id === myExtId && msg.recipient.external_id === user.external_id)
     );
-    conversation.sort(
-      (a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime()
-    );
+    conversation.sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
     const unreadIds = conversation.filter((msg) => !msg.read && msg.sender.external_id === user.external_id).map((msg) => msg.external_id);
     if (unreadIds.length > 0) {
       core.dm.markRead(tui.authContext.arbi, unreadIds).catch(() => {
@@ -980,15 +1034,12 @@ async function loadDmHistory(tui, user) {
     }
     tui.requestRender();
   } catch (err) {
-    const errMsg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to load DM history: ${errMsg}`, "error");
-    tui.requestRender();
+    showMessage(tui, `Failed to load DM history: ${core.getErrorMessage(err)}`, "error");
   }
 }
 async function sendEncryptedDm(tui, plaintext) {
   if (!tui.authContext || !tui.encryptionKeys || !tui.currentDmChannel) {
-    tui.chatLog.addSystem("Cannot send DM \u2014 not in a DM channel.", "error");
-    tui.requestRender();
+    showMessage(tui, "Cannot send DM \u2014 not in a DM channel.", "error");
     return;
   }
   const recipient = tui.currentDmChannel.user;
@@ -1004,9 +1055,7 @@ async function sendEncryptedDm(tui, plaintext) {
     displayDmMessage(tui, plaintext, true, recipient.email);
     tui.requestRender();
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    tui.chatLog.addSystem(`Failed to send DM: ${msg}`, "error");
-    tui.requestRender();
+    showMessage(tui, `Failed to send DM: ${core.getErrorMessage(err)}`, "error");
   }
 }
 async function handleIncomingDm(tui, msg) {
@@ -1097,12 +1146,21 @@ function handleBatchComplete(msg, toasts) {
 async function connectTuiWebSocket(options) {
   const { baseUrl, accessToken, toasts, tui } = options;
   try {
-    const connection = await core.connectWebSocket({
+    const connection = await core.connectWithReconnect({
       baseUrl,
       accessToken,
       onMessage: (msg) => handleMessage(msg, toasts, tui ?? null),
       onClose: (_code, _reason) => {
         toasts.show("WebSocket disconnected", "warning", DURATION_DEFAULT);
+      },
+      onReconnecting: (attempt, maxRetries) => {
+        toasts.show(`Reconnecting... (${attempt}/${maxRetries})`, "warning", DURATION_DEFAULT);
+      },
+      onReconnected: () => {
+        toasts.show("WebSocket reconnected", "success", DURATION_DEFAULT);
+      },
+      onReconnectFailed: () => {
+        toasts.show("WebSocket reconnection failed", "error", DURATION_LONG);
       }
     });
     return connection;
@@ -1150,14 +1208,7 @@ var ArbiTui = class {
     this.chatLog = new ChatLog();
     this.toastContainer = new ToastContainer();
     this.toastContainer.setRenderCallback(() => this.tui.requestRender());
-    this.editor = new ArbiEditor(this.tui);
-    this.editor.setAutocompleteProvider(new piTui.CombinedAutocompleteProvider(commands));
-    this.editor.onSubmit = (text) => this.handleSubmit(text);
-    this.editor.onEscape = () => this.handleAbort();
-    this.editor.onCtrlC = () => this.shutdown();
-    this.editor.onCtrlD = () => this.shutdown();
-    this.editor.onCtrlW = () => this.handleSubmit("/workspaces");
-    this.editor.onCtrlN = () => this.handleSubmit("/new");
+    this.editor = this.createEditor();
     this.tui.addChild(this.header);
     this.tui.addChild(new piTui.Spacer(1));
     this.tui.addChild(this.toastContainer);
@@ -1198,20 +1249,25 @@ var ArbiTui = class {
     this.tui.addChild(new piTui.Spacer(1));
     this.tui.addChild(this.toastContainer);
     this.tui.addChild(this.chatLog);
-    this.editor = new ArbiEditor(this.tui);
-    this.editor.setAutocompleteProvider(new piTui.CombinedAutocompleteProvider(commands));
-    this.editor.onSubmit = (text) => this.handleSubmit(text);
-    this.editor.onEscape = () => this.handleAbort();
-    this.editor.onCtrlC = () => this.shutdown();
-    this.editor.onCtrlD = () => this.shutdown();
-    this.editor.onCtrlW = () => this.handleSubmit("/workspaces");
-    this.editor.onCtrlN = () => this.handleSubmit("/new");
+    this.editor = this.createEditor();
     this.tui.addChild(this.editor);
     this.tui.setFocus(this.editor);
     this.tui.start();
     this.updateHeader();
     this.tui.requestRender();
   }
+  /** Create and wire a new editor instance. */
+  createEditor() {
+    const editor = new ArbiEditor(this.tui);
+    editor.setAutocompleteProvider(new piTui.CombinedAutocompleteProvider(commands));
+    editor.onSubmit = (text) => this.handleSubmit(text);
+    editor.onEscape = () => this.handleAbort();
+    editor.onCtrlC = () => this.shutdown();
+    editor.onCtrlD = () => this.shutdown();
+    editor.onCtrlW = () => this.handleSubmit("/workspaces");
+    editor.onCtrlN = () => this.handleSubmit("/new");
+    return editor;
+  }
   /** Request a render update. */
   requestRender() {
     this.tui.requestRender();
@@ -1241,6 +1297,10 @@ var ArbiTui = class {
     this.workspaceContext = ctx;
     this.updateHeader();
   }
+  /** Public accessor for workspace context (used by command handlers). */
+  get wsContext() {
+    return this.workspaceContext;
+  }
   /** Whether the WebSocket is currently connected. */
   get wsConnected() {
     return this.wsConnection !== null;
@@ -1318,12 +1378,18 @@ var ArbiTui = class {
       const result = await streamResponse(this, response);
       if (result.assistantMessageExtId) {
         this.state.conversationMessageId = result.assistantMessageExtId;
-        this.store.updateChatSession({ lastMessageExtId: result.assistantMessageExtId });
+        const sessionUpdate = {
+          lastMessageExtId: result.assistantMessageExtId
+        };
+        const conversationExtId = result.userMessage?.conversation_ext_id ?? result.metadata?.conversation_ext_id;
+        if (conversationExtId) {
+          sessionUpdate.conversationExtId = conversationExtId;
+        }
+        this.store.updateChatSession(sessionUpdate);
       }
     } catch (err) {
       this.state.activityStatus = "error";
-      const msg = err instanceof Error ? err.message : String(err);
-      this.chatLog.addSystem(`Error: ${msg}`, "error");
+      this.chatLog.addSystem(`Error: ${core.getErrorMessage(err)}`, "error");
     }
     this.state.activityStatus = "idle";
     this.updateHeader();
@@ -1388,8 +1454,7 @@ program.name("arbi-tui").description("Interactive terminal UI for ARBI \u2014 ch
         }
       }
     } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      tui.chatLog.addSystem(`Failed to load workspace: ${msg}`, "warning");
+      tui.chatLog.addSystem(`Failed to load workspace: ${core.getErrorMessage(err)}`, "warning");
       tui.chatLog.addSystem("Use /workspaces to list and /workspace <id> to select.");
     }
   } else {
@@ -1401,6 +1466,29 @@ program.name("arbi-tui").description("Interactive terminal UI for ARBI \u2014 ch
   if (session.lastMessageExtId) {
     tui.state.conversationMessageId = session.lastMessageExtId;
   }
+  if (session.conversationExtId && session.lastMessageExtId && tui.authContext) {
+    try {
+      const threads = await core.conversations.getConversationThreads(
+        tui.authContext.arbi,
+        session.conversationExtId
+      );
+      const threadList = threads.threads ?? [];
+      const thread = threadList.find(
+        (t) => t.leaf_message_ext_id === session.lastMessageExtId
+      );
+      if (thread?.history && thread.history.length > 0) {
+        for (const msg of thread.history) {
+          if (msg.role === "user") {
+            tui.chatLog.addUser(msg.content);
+          } else if (msg.role === "assistant") {
+            tui.chatLog.addAssistant(msg.content);
+          }
+        }
+        tui.chatLog.addSystem("--- restored from previous session ---");
+      }
+    } catch {
+    }
+  }
   tui.chatLog.addSystem(
     "Type a question to chat with the ARBI assistant. Use /help for commands."
   );