@arbidocs/cli 0.3.41 → 0.3.43

package/dist/index.js

@@ -3641,7 +3641,7 @@ function getLatestVersion(skipCache = false) {
   }
 }
 function getCurrentVersion() {
-  return "0.3.41";
+  return "0.3.43";
 }
 function readChangelog(fromVersion, toVersion) {
   try {
@@ -3694,17 +3694,17 @@ function showChangelog(fromVersion, toVersion) {
 async function checkForUpdates(autoUpdate) {
   try {
     const latest = getLatestVersion();
-    if (!latest || latest === "0.3.41") return;
+    if (!latest || latest === "0.3.43") return;
     if (autoUpdate) {
       warn(`
-Your arbi version is out of date (${"0.3.41"} \u2192 ${latest}). Updating...`);
+Your arbi version is out of date (${"0.3.43"} \u2192 ${latest}). Updating...`);
       child_process.execSync("npm install -g @arbidocs/cli@latest", { stdio: "inherit" });
-      showChangelog("0.3.41", latest);
+      showChangelog("0.3.43", latest);
       console.log(`Updated to ${latest}.`);
     } else {
       warn(
         `
-Your arbi version is out of date (${"0.3.41"} \u2192 ${latest}).
+Your arbi version is out of date (${"0.3.43"} \u2192 ${latest}).
 Run "arbi update" to upgrade, or "arbi update auto" to always stay up to date.`
       );
     }
@@ -3714,9 +3714,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.41") {
+    if (cached && cached.latest !== "0.3.43") {
       warn(
-        `Your arbi version is out of date (${"0.3.41"} \u2192 ${cached.latest}). Run "arbi update".`
+        `Your arbi version is out of date (${"0.3.43"} \u2192 ${cached.latest}). Run "arbi update".`
       );
     }
   } catch {
@@ -4101,14 +4101,29 @@ function registerListenCommand(program2) {
 
 // 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("-k, --signing-key <key>", "Signing key (base64) for agent recovery login").option("-w, --workspace <id>", "Workspace ID to select after login").option("--sso", "Log in with Auth0 SSO (device flow)").option("--agent <name>", "Agent backend to configure (claude, openclaw)").option("--listen", "Start DM listener after login").action(
+  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("-k, --signing-key <key>", "Signing key (base64) for agent recovery login").option("-w, --workspace <id>", "Workspace ID to select after login").option("--sso", "Log in with Auth0 SSO (device flow)").option("--agent <name>", "Agent backend to configure (claude, openclaw)").option("--listen", "Start DM listener after login").option("--json", "Emit a single JSON object on success (scripting)").action(
     (opts) => runAction(async () => {
       const config = store.requireConfig();
-      const email = opts.email || process.env.ARBI_EMAIL || await promptInput("Email");
+      const isTty = process.stdin.isTTY;
+      const emailFromFlagOrEnv = opts.email || process.env.ARBI_EMAIL;
+      if (!isTty && !emailFromFlagOrEnv) {
+        const msg = "Email is required when stdin is not a TTY. Use --email <email> or set ARBI_EMAIL.";
+        if (opts.json) console.log(JSON.stringify({ ok: false, error: msg }));
+        else error(msg);
+        process.exit(1);
+      }
+      const passwordFromFlagOrEnv = opts.password || process.env.ARBI_PASSWORD;
+      if (!isTty && !passwordFromFlagOrEnv && !opts.signingKey) {
+        const msg = "Password is required when stdin is not a TTY. Use --password <password> or set ARBI_PASSWORD.";
+        if (opts.json) console.log(JSON.stringify({ ok: false, error: msg }));
+        else error(msg);
+        process.exit(1);
+      }
+      const email = emailFromFlagOrEnv || await promptInput("Email");
       try {
         let ssoPolling = false;
         const { arbi } = opts.signingKey ? await sdk.performSigningKeyLogin(config, email, opts.signingKey, store) : opts.sso ? await (async () => {
-          const pw = opts.password || process.env.ARBI_PASSWORD || await promptPassword("Password");
+          const pw = passwordFromFlagOrEnv || await promptPassword("Password");
           const result = await sdk.performSsoDeviceFlowLogin(config, email, pw, store, {
             onUserCode: (userCode, verificationUri) => {
               console.log(`
@@ -4127,9 +4142,10 @@ Open this URL in your browser:
           if (ssoPolling) console.log("\n");
           return result;
         })() : await (async () => {
-          const pw = opts.password || process.env.ARBI_PASSWORD || await promptPassword("Password");
+          const pw = passwordFromFlagOrEnv || await promptPassword("Password");
           return sdk.performPasswordLogin(config, email, pw, store);
         })();
+        if (!opts.json) success(`Logged in as ${email}`);
         clearChatSession();
         const { data: workspaces3 } = await arbi.fetch.GET("/v1/user/workspaces");
         const wsList = workspaces3 || [];
@@ -4137,26 +4153,39 @@ Open this URL in your browser:
         const memberWorkspaces = wsList.filter(
           (ws) => ws.users?.some((u) => u.user.email === email)
         );
+        let selectedWorkspace;
         if (memberWorkspaces.length === 0) {
-          console.log("No workspaces found. Create one with: arbi workspace create <name>");
+          if (!opts.json) {
+            console.log("No workspaces found. Create one with: arbi workspace create <name>");
+          }
         } else if (opts.workspace) {
           const ws = memberWorkspaces.find((w) => w.external_id === opts.workspace);
           if (!ws) {
-            error(`Workspace ${opts.workspace} not found or you don't have access.`);
+            const msg = `Workspace ${opts.workspace} not found or you don't have access.`;
+            if (opts.json) console.log(JSON.stringify({ ok: false, error: msg }));
+            else error(msg);
             process.exit(1);
           }
           updateConfig({ selectedWorkspaceId: ws.external_id });
-          success(`Workspace: ${ws.name} (${ref(ws.external_id)})`);
+          selectedWorkspace = { external_id: ws.external_id, name: ws.name };
+          if (!opts.json) success(`Workspace: ${ws.name} (${ref(ws.external_id)})`);
         } else if (memberWorkspaces.length === 1) {
           updateConfig({ selectedWorkspaceId: memberWorkspaces[0].external_id });
-          success(
-            `Workspace: ${memberWorkspaces[0].name} (${ref(memberWorkspaces[0].external_id)})`
-          );
+          selectedWorkspace = {
+            external_id: memberWorkspaces[0].external_id,
+            name: memberWorkspaces[0].name
+          };
+          if (!opts.json)
+            success(
+              `Workspace: ${memberWorkspaces[0].name} (${ref(memberWorkspaces[0].external_id)})`
+            );
+        } else if (opts.json) {
         } else {
           const choices = sdk.formatWorkspaceChoices(memberWorkspaces);
           const selected = await promptSelect("Select workspace", choices);
           updateConfig({ selectedWorkspaceId: selected });
           const ws = memberWorkspaces.find((w) => w.external_id === selected);
+          selectedWorkspace = { external_id: selected, name: ws.name };
           success(`Workspace: ${ws.name} (${ref(selected)})`);
           dim('\nTip: Run "arbi config alias" to use A as a shortcut for "arbi ask"');
         }
@@ -4166,8 +4195,21 @@ Open this URL in your browser:
             await startListening(opts.agent, config);
           }
         }
+        if (opts.json) {
+          console.log(
+            JSON.stringify({
+              ok: true,
+              email,
+              server: config.baseUrl,
+              workspace: selectedWorkspace ?? null,
+              workspaces_available: memberWorkspaces.length
+            })
+          );
+        }
       } catch (err) {
-        error(`Login failed: ${formatCliError(err)}`);
+        const msg = formatCliError(err);
+        if (opts.json) console.log(JSON.stringify({ ok: false, error: msg }));
+        else error(`Login failed: ${msg}`);
         process.exit(1);
       } finally {
         await checkForUpdates(getConfig()?.autoUpdate);
@@ -4176,7 +4218,19 @@ Open this URL in your browser:
   );
 }
 var CENTRAL_API_URL = "https://central.arbi.work";
-async function getVerificationCode(email, apiKey) {
+var RegisterHintError = class extends Error {
+  constructor(message, kind) {
+    super(message);
+    this.kind = kind;
+    this.name = "RegisterHintError";
+  }
+  kind;
+};
+function looksLikeAgentEmail(email) {
+  const local = email.split("@")[0] ?? "";
+  return local.toLowerCase().startsWith("agent-");
+}
+async function getVerificationCode(email, apiKey, deploymentDomain) {
   const params = new URLSearchParams({ email });
   const res = await fetch(`${CENTRAL_API_URL}/license-management/verify-ci?${params.toString()}`, {
     method: "GET",
@@ -4184,6 +4238,24 @@ async function getVerificationCode(email, apiKey) {
   });
   if (!res.ok) {
     const body = await res.text().catch(() => "");
+    if (res.status === 403 && /agent-\*/i.test(body)) {
+      throw new RegisterHintError(
+        `This SUPPORT_API_KEY is a deployment key that can only register agent-*@${deploymentDomain} emails. Prefix your email with "agent-" (e.g. agent-<id>@${deploymentDomain}) or use a superuser key.`,
+        "agent-email-required"
+      );
+    }
+    if (res.status === 403 && /Invalid API Key/i.test(body)) {
+      throw new RegisterHintError(
+        "SUPPORT_API_KEY was rejected by central. Check the key value.",
+        "bad-api-key"
+      );
+    }
+    if (res.status === 404 && /No verification record/i.test(body)) {
+      throw new RegisterHintError(
+        `No pending verification for ${email}. The email may already be registered \u2014 try: arbi login --email ${email}`,
+        "already-registered"
+      );
+    }
     throw new Error(`Failed to get verification code: ${res.status} ${body}`);
   }
   const data = await res.json();
@@ -4192,7 +4264,7 @@ async function getVerificationCode(email, apiKey) {
   return Array.isArray(words) ? words.join(" ") : String(words);
 }
 function registerRegisterCommand(program2) {
-  program2.command("register").description("Register a new ARBI account").option("--non-interactive", "CI/automation mode (requires SUPPORT_API_KEY env var)").option("-e, --email <email>", "Email address (or ARBI_EMAIL env var)").option("-p, --password <password>", "Password (or ARBI_PASSWORD env var)").option("-c, --verification-code <code>", "Verification code (skip prompt)").option("--first-name <name>", "First name").option("--last-name <name>", "Last name").action(
+  program2.command("register").description("Register a new ARBI account").option("--non-interactive", "CI/automation mode (requires SUPPORT_API_KEY env var)").option("-e, --email <email>", "Email address (or ARBI_EMAIL env var)").option("-p, --password <password>", "Password (or ARBI_PASSWORD env var)").option("-c, --verification-code <code>", "Verification code (skip prompt)").option("--first-name <name>", "First name").option("--last-name <name>", "Last name").option("-y, --yes", 'Skip the post-register "Log in now?" confirmation').option("--json", "Emit a single JSON object on success (scripting)").action(
     (opts) => runAction(async () => {
       const config = requireConfig();
       if (opts.nonInteractive) {
@@ -4207,7 +4279,7 @@ async function smartRegister(config, opts) {
   let email = opts.email || process.env.ARBI_EMAIL || await promptInput("Email");
   if ((opts.email || process.env.ARBI_EMAIL) && !email.includes("@")) {
     email = `${email}@${config.deploymentDomain}`;
-    console.log(`Using email: ${email}`);
+    if (!opts.json) console.log(`Using email: ${email}`);
   }
   const arbi = client.createArbiClient({
     baseUrl: config.baseUrl,
@@ -4261,16 +4333,22 @@ async function smartRegister(config, opts) {
       firstName,
       lastName
     });
-    success(`
+    if (!opts.json) success(`
 Registered successfully as ${email}`);
   } catch (err) {
-    error(`Registration failed: ${formatCliError(err)}`);
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, stage: "register", error: formatCliError(err) }));
+    } else {
+      error(`Registration failed: ${formatCliError(err)}`);
+    }
     process.exit(1);
   }
   const allFlagsProvided = !!(opts.email || process.env.ARBI_EMAIL) && !!(opts.password || process.env.ARBI_PASSWORD) && !!opts.verificationCode;
-  const doLogin = allFlagsProvided || await promptConfirm("Log in now?");
+  const doLogin = allFlagsProvided || opts.yes || await promptConfirm("Log in now?");
   if (doLogin) {
-    await loginAfterRegister(config, email, pw);
+    await loginAfterRegister(config, email, pw, { json: opts.json });
+  } else if (opts.json) {
+    console.log(JSON.stringify({ ok: true, email, server: config.baseUrl, logged_in: false }));
   }
 }
 async function nonInteractiveRegister(config, opts) {
@@ -4283,12 +4361,18 @@ async function nonInteractiveRegister(config, opts) {
   }
   if (!email.includes("@")) {
     email = `${email}@${config.deploymentDomain}`;
-    console.log(`Using email: ${email}`);
+    if (!opts.json) console.log(`Using email: ${email}`);
   }
   if (!password2) {
     error("Password required. Use --password <password> or set ARBI_PASSWORD");
     process.exit(1);
   }
+  if (supportApiKey && !opts.verificationCode && !looksLikeAgentEmail(email)) {
+    const hint = `Email "${email}" does not start with "agent-". SUPPORT_API_KEY deployment keys only accept agent-*@${config.deploymentDomain} emails. If your key is a superuser key this may still succeed \u2014 proceeding...`;
+    if (!opts.json) {
+      console.error(`Warning: ${hint}`);
+    }
+  }
   const arbi = client.createArbiClient({
     baseUrl: config.baseUrl,
     deploymentDomain: config.deploymentDomain,
@@ -4309,10 +4393,37 @@ async function nonInteractiveRegister(config, opts) {
       body: { email }
     });
     if (verifyResponse.error) {
-      error(`verify-email failed: ${JSON.stringify(verifyResponse.error)}`);
+      if (opts.json) {
+        console.log(
+          JSON.stringify({
+            ok: false,
+            stage: "verify-email",
+            error: JSON.stringify(verifyResponse.error)
+          })
+        );
+      } else {
+        error(`verify-email failed: ${JSON.stringify(verifyResponse.error)}`);
+      }
+      process.exit(1);
+    }
+    try {
+      verificationCode = await getVerificationCode(email, supportApiKey, config.deploymentDomain);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      if (opts.json) {
+        console.log(
+          JSON.stringify({
+            ok: false,
+            stage: "verify-ci",
+            error: msg,
+            kind: err instanceof RegisterHintError ? err.kind : void 0
+          })
+        );
+      } else {
+        error(`Error: ${msg}`);
+      }
       process.exit(1);
     }
-    verificationCode = await getVerificationCode(email, supportApiKey);
   }
   try {
     await arbi.auth.register({
@@ -4322,60 +4433,93 @@ async function nonInteractiveRegister(config, opts) {
       firstName: opts.firstName ?? "Test",
       lastName: opts.lastName ?? "User"
     });
-    success(`Registered: ${email}`);
+    if (!opts.json) success(`Registered: ${email}`);
   } catch (err) {
-    error(`Registration failed: ${formatCliError(err)}`);
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: false, stage: "register", error: formatCliError(err) }));
+    } else {
+      error(`Registration failed: ${formatCliError(err)}`);
+    }
     process.exit(1);
   }
-  await loginAfterRegister(config, email, password2);
+  await loginAfterRegister(config, email, password2, { json: opts.json });
 }
-async function loginAfterRegister(config, email, password2) {
+async function loginAfterRegister(config, email, password2, { json = false } = {}) {
   try {
     const { arbi, loginResult } = await sdk.performPasswordLogin(config, email, password2, store);
-    success(`Logged in as ${email}`);
+    if (!json) success(`Logged in as ${email}`);
     const { data: workspaces3 } = await arbi.fetch.GET("/v1/user/workspaces");
     const wsList = workspaces3 || [];
     updateCompletionCache(wsList);
-    const memberWorkspaces = wsList.filter((ws2) => ws2.users?.some((u) => u.user.email === email));
+    const memberWorkspaces = wsList.filter((ws) => ws.users?.some((u) => u.user.email === email));
+    let selectedWorkspace;
     if (memberWorkspaces.length === 0) {
-      console.log("Creating your first workspace...");
+      if (!json) console.log("Creating your first workspace...");
       const userProjects = await sdk.projects.listProjects(arbi);
       const defaultProjectExtId = userProjects[0]?.external_id;
       if (!defaultProjectExtId) throw new Error("No projects found for user");
       const encryptedKey = await sdk.generateNewWorkspaceKey(arbi, loginResult.serverSessionKey);
-      const ws2 = await sdk.workspaces.createWorkspace(
+      const ws = await sdk.workspaces.createWorkspace(
         arbi,
         "My First Workspace",
         encryptedKey,
         defaultProjectExtId
       );
-      updateConfig({ selectedWorkspaceId: ws2.external_id });
-      success(`Workspace: ${ws2.name} (${ref(ws2.external_id)})`);
-      return;
-    }
-    if (memberWorkspaces.length === 1) {
+      updateConfig({ selectedWorkspaceId: ws.external_id });
+      selectedWorkspace = { external_id: ws.external_id, name: ws.name };
+      if (!json) success(`Workspace: ${ws.name} (${ref(ws.external_id)})`);
+    } else if (memberWorkspaces.length === 1) {
       updateConfig({ selectedWorkspaceId: memberWorkspaces[0].external_id });
-      success(`Workspace: ${memberWorkspaces[0].name} (${ref(memberWorkspaces[0].external_id)})`);
-      return;
+      selectedWorkspace = {
+        external_id: memberWorkspaces[0].external_id,
+        name: memberWorkspaces[0].name
+      };
+      if (!json)
+        success(`Workspace: ${memberWorkspaces[0].name} (${ref(memberWorkspaces[0].external_id)})`);
+    } else if (json) {
+    } else {
+      const choices = sdk.formatWorkspaceChoices(memberWorkspaces);
+      const selected = await promptSelect("Select workspace", choices);
+      updateConfig({ selectedWorkspaceId: selected });
+      const ws = memberWorkspaces.find((w) => w.external_id === selected);
+      selectedWorkspace = { external_id: selected, name: ws.name };
+      success(`Workspace: ${ws.name} (${ref(selected)})`);
+    }
+    if (json) {
+      console.log(
+        JSON.stringify({
+          ok: true,
+          email,
+          server: config.baseUrl,
+          logged_in: true,
+          workspace: selectedWorkspace ?? null,
+          workspaces_available: memberWorkspaces.length
+        })
+      );
     }
-    const choices = sdk.formatWorkspaceChoices(memberWorkspaces);
-    const selected = await promptSelect("Select workspace", choices);
-    updateConfig({ selectedWorkspaceId: selected });
-    const ws = memberWorkspaces.find((w) => w.external_id === selected);
-    success(`Workspace: ${ws.name} (${ref(selected)})`);
   } catch (err) {
-    error(`Login failed: ${formatCliError(err)}`);
-    error("You can log in later with: arbi login");
+    if (json) {
+      console.log(
+        JSON.stringify({ ok: false, stage: "post-register-login", error: formatCliError(err) })
+      );
+    } else {
+      error(`Login failed: ${formatCliError(err)}`);
+      error("You can log in later with: arbi login");
+    }
   }
 }
 
 // src/commands/logout.ts
 function registerLogoutCommand(program2) {
-  program2.command("logout").description("Log out of ARBI").action(() => {
+  program2.command("logout").description("Log out of ARBI").option("--json", "Emit a single JSON object on success (scripting)").action((opts) => {
     deleteCredentials();
     clearChatSession();
     updateConfig({ selectedWorkspaceId: void 0 });
-    success("Logged out.");
+    if (opts.json) {
+      console.log(JSON.stringify({ ok: true }));
+    } else {
+      success("Logged out.");
+    }
   });
 }
 
@@ -4417,12 +4561,49 @@ function registerStatusCommand(program2) {
     }
   });
 }
+function resolveWorkspaceSelector(list, selector) {
+  const byId = list.find((w) => w.external_id === selector);
+  if (byId) return { ok: true, id: byId.external_id, ws: byId };
+  const lower = selector.toLowerCase();
+  const byName = list.filter((w) => (w.name ?? "").toLowerCase() === lower);
+  if (byName.length === 1) return { ok: true, id: byName[0].external_id, ws: byName[0] };
+  if (byName.length > 1) return { ok: false, reason: "ambiguous", matches: byName };
+  return { ok: false, reason: "not-found" };
+}
+function printResolveError(list, selector, res) {
+  if (res.ok) return;
+  if (res.reason === "ambiguous") {
+    error(`Workspace name "${selector}" is ambiguous \u2014 multiple matches:`);
+    for (const w of res.matches ?? []) error(`  ${w.external_id}  ${w.name}`);
+    error("Use the workspace ID instead.");
+    return;
+  }
+  error(`Workspace ${selector} not found.`);
+  error("Available workspaces:");
+  for (const w of list) error(`  ${w.external_id}  ${w.name}`);
+}
 function registerWorkspacesCommand(program2) {
-  program2.command("workspaces").description("List workspaces").action(
-    runAction(async () => {
+  program2.command("workspaces").description("List workspaces").option("--json", "Output as JSON").option("--ids", "Output only workspace IDs (one per line)").action(
+    (opts) => runAction(async () => {
       const { arbi } = await resolveAuth();
       const data = await sdk.workspaces.listWorkspaces(arbi);
       updateCompletionCache(data);
+      if (opts.ids) {
+        for (const w of data) console.log(w.external_id);
+        return;
+      }
+      if (opts.json) {
+        const selectedId = getConfig()?.selectedWorkspaceId ?? null;
+        const out = data.map((w) => ({
+          id: w.external_id,
+          name: w.name,
+          docs: w.shared_document_count + w.private_document_count,
+          role: w.users?.[0]?.role ?? null,
+          is_selected: w.external_id === selectedId
+        }));
+        console.log(JSON.stringify(out, null, 2));
+        return;
+      }
       if (data.length === 0) {
         console.log("No workspaces found.");
         return;
@@ -4444,11 +4625,51 @@ function registerWorkspacesCommand(program2) {
         ],
         data
       );
-    })
+    })()
   );
   const workspace = program2.command("workspace").description("Workspace management");
-  workspace.command("select [id]").description("Select active workspace (interactive picker if no ID given)").action(
-    (id) => runAction(async () => {
+  workspace.command("current").description("Print the currently selected workspace ID (empty string if none)").option("--json", "Output full details as JSON").action(
+    (opts) => runAction(async () => {
+      const selectedId = getConfig()?.selectedWorkspaceId ?? "";
+      if (!opts.json) {
+        console.log(selectedId);
+        return;
+      }
+      if (!selectedId) {
+        console.log(JSON.stringify({ id: null, name: null, docs: 0, role: null }, null, 2));
+        return;
+      }
+      const { arbi } = await resolveAuth();
+      const data = await sdk.workspaces.listWorkspaces(arbi);
+      const ws = data.find((w) => w.external_id === selectedId);
+      if (!ws) {
+        console.log(
+          JSON.stringify(
+            { id: selectedId, name: null, docs: 0, role: null, stale: true },
+            null,
+            2
+          )
+        );
+        return;
+      }
+      console.log(
+        JSON.stringify(
+          {
+            id: ws.external_id,
+            name: ws.name,
+            docs: ws.shared_document_count + ws.private_document_count,
+            role: ws.users?.[0]?.role ?? null
+          },
+          null,
+          2
+        )
+      );
+    })()
+  );
+  workspace.command("select [id-or-name]").description(
+    "Select active workspace (accepts ID or unique name; interactive picker if nothing given)"
+  ).action(
+    (idOrName) => runAction(async () => {
       const { arbi } = await resolveAuth();
       const data = await sdk.workspaces.listWorkspaces(arbi);
       updateCompletionCache(data);
@@ -4457,15 +4678,13 @@ function registerWorkspacesCommand(program2) {
         return;
       }
       let selectedId;
-      if (id) {
-        const ws2 = data.find((w) => w.external_id === id);
-        if (!ws2) {
-          error(`Workspace ${id} not found.`);
-          error("Available workspaces:");
-          for (const w of data) error(`  ${w.external_id}  ${w.name}`);
+      if (idOrName) {
+        const res = resolveWorkspaceSelector(data, idOrName);
+        if (!res.ok) {
+          printResolveError(data, idOrName, res);
           process.exit(1);
         }
-        selectedId = id;
+        selectedId = res.id;
       } else {
         const choices = sdk.formatWorkspaceChoices(data);
         selectedId = await promptSelect("Select workspace", choices);
@@ -4476,7 +4695,7 @@ function registerWorkspacesCommand(program2) {
       success(`Selected: ${ws.name} (${ref(selectedId)})`);
     })()
   );
-  workspace.command("create <name>").description("Create a new workspace").option("-d, --description <text>", "Workspace description").option("--public", "Make workspace public", false).action(
+  workspace.command("create <name>").description("Create a new workspace").option("-d, --description <text>", "Workspace description").option("--public", "Make workspace public", false).option("--select", "Set the new workspace as the active selection", false).option("--json", "Output the new workspace as JSON").action(
     (name, opts) => runAction(async () => {
       const { arbi, loginResult } = await resolveAuth();
       const userProjects = await sdk.projects.listProjects(arbi);
@@ -4491,37 +4710,114 @@ function registerWorkspacesCommand(program2) {
         opts.description,
         opts.public ?? false
       );
+      if (opts.select) {
+        updateConfig({ selectedWorkspaceId: data.external_id });
+        clearChatSession();
+      }
+      if (opts.json) {
+        console.log(
+          JSON.stringify(
+            {
+              id: data.external_id,
+              name: data.name,
+              selected: opts.select ?? false
+            },
+            null,
+            2
+          )
+        );
+        return;
+      }
       success(`Created: ${data.name} (${ref(data.external_id)})`);
+      if (opts.select) success(`Selected: ${data.name} (${ref(data.external_id)})`);
     })()
   );
-  workspace.command("delete [id]").description("Delete a workspace (defaults to selected workspace)").action(
-    (id) => runAction(async () => {
+  workspace.command("delete [id-or-name]").description("Delete a workspace (defaults to selected workspace)").option("-y, --yes", "Skip confirmation prompt (required in non-interactive shells)", false).option("--json", "Output the result as JSON").action(
+    (idOrName, opts) => runAction(async () => {
       const { arbi } = await resolveAuth();
-      const targetId = id ?? getConfig()?.selectedWorkspaceId;
-      if (!targetId) {
-        error("No workspace ID given and no workspace selected. Run: arbi workspace select");
-        process.exit(1);
+      const config = getConfig();
+      let targetId;
+      let targetName;
+      if (idOrName) {
+        const data = await sdk.workspaces.listWorkspaces(arbi);
+        const res = resolveWorkspaceSelector(data, idOrName);
+        if (!res.ok) {
+          printResolveError(data, idOrName, res);
+          process.exit(1);
+        }
+        targetId = res.id;
+        targetName = res.ws.name;
+      } else {
+        targetId = config?.selectedWorkspaceId;
+        if (!targetId) {
+          error("No workspace ID given and no workspace selected. Run: arbi workspace select");
+          process.exit(1);
+        }
+      }
+      const isInteractive = process.stdin.isTTY === true && process.stdout.isTTY === true;
+      if (!opts.yes) {
+        if (!isInteractive) {
+          error(
+            `Refusing to delete ${targetId} without confirmation. Re-run with --yes (non-interactive shell).`
+          );
+          process.exit(1);
+        }
+        const label2 = targetName ? `"${targetName}" (${targetId})` : targetId;
+        const confirmed = await promptConfirm(
+          `Delete workspace ${label2}? This removes all documents, conversations, and tags in it.`,
+          false
+        );
+        if (!confirmed) {
+          console.log("Cancelled.");
+          return;
+        }
       }
       await sdk.workspaces.deleteWorkspaces(arbi, [targetId]);
+      if (config?.selectedWorkspaceId === targetId) {
+        updateConfig({ selectedWorkspaceId: void 0 });
+      }
       const session = getChatSession();
       if (session.workspaceId === targetId) {
         clearChatSession();
       }
+      if (opts.json) {
+        console.log(JSON.stringify({ id: targetId, deleted: true }, null, 2));
+        return;
+      }
       success(`Deleted workspace ${targetId}`);
     })()
   );
-  workspace.command("update <json>").description("Update workspace properties (pass JSON)").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").action(
+  workspace.command("update <json>").description("Update workspace properties (pass JSON)").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").option("--json", "Output the updated workspace as JSON").action(
     (json, opts) => runAction(async () => {
       const body = parseJsonArg(json, `arbi workspace update '{"name": "New Name"}'`);
       const { arbi } = await resolveWorkspace(opts.workspace);
       const data = await sdk.workspaces.updateWorkspace(arbi, body);
+      if (opts.json) {
+        console.log(JSON.stringify({ id: data.external_id, name: data.name }, null, 2));
+        return;
+      }
       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(
+  workspace.command("users").description("List users in the active workspace").option("-w, --workspace <id>", "Workspace ID (defaults to selected workspace)").option("--json", "Output as JSON").action(
     (opts) => runAction(async () => {
       const { arbi } = await resolveWorkspace(opts.workspace);
       const data = await sdk.workspaces.listWorkspaceUsers(arbi);
+      if (opts.json) {
+        const out = data.map((r) => {
+          const u = r.user ?? {};
+          return {
+            user_id: u.external_id ?? null,
+            email: u.email ?? null,
+            name: [u.given_name, u.family_name].filter(Boolean).join(" ") || null,
+            role: r.role,
+            document_count: r.document_count,
+            conversation_count: r.conversation_count
+          };
+        });
+        console.log(JSON.stringify(out, null, 2));
+        return;
+      }
       if (data.length === 0) {
         console.log("No users found.");
         return;
@@ -4598,7 +4894,18 @@ function registerWorkspacesCommand(program2) {
         signingPrivateKeyBase64
       );
       const data = await sdk.workspaces.copyDocuments(arbi, targetId, docIds, targetKey);
-      success(`${data.detail} (${data.documents_copied} document(s) copied)`);
+      const copied = data.documents_copied ?? 0;
+      const requested = docIds.length;
+      if (copied === 0) {
+        error(`Copied 0 of ${requested} document(s). ${data.detail ?? ""}`.trim());
+        error("Hint: documents must be fully indexed before they can be copied.");
+        process.exit(1);
+      }
+      if (copied < requested) {
+        error(`Copied ${copied} of ${requested} document(s). ${data.detail ?? ""}`.trim());
+        return;
+      }
+      success(`Copied ${copied} document(s) to ${targetId}`);
     })()
   );
 }
@@ -8299,7 +8606,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.41");
+program.name("arbi").description("ARBI CLI \u2014 interact with ARBI from the terminal").version("0.3.43");
 registerConfigCommand(program);
 registerLoginCommand(program);
 registerRegisterCommand(program);