@lotics/cli 0.8.0 → 0.10.0

package/README.md

@@ -25,27 +25,27 @@ The CLI checks for updates once per day and prompts when a new version is availa
 
 ## Authentication
 
-**`lotics signup`** — Creates a new Lotics account, organization, workspace, and API key in one step. Sends a magic link email so you can access the web app.
+**`lotics auth signup`** — Creates a new Lotics account, organization, workspace, and API key in one step. Sends a magic link email so you can access the web app.
 
 ```bash
-lotics signup                                        # interactive prompts
-lotics signup --email a@b.com --name "Agent"         # non-interactive
+lotics auth signup                                   # interactive prompts
+lotics auth signup a@b.com --name "Agent"            # non-interactive
 ```
 
-**`lotics login`** — Send a magic link email to access the web app (requires prior signup or setup).
+**`lotics auth web`** — Send a magic link email to access the web app (requires prior signup or setup).
 
 ```bash
-lotics login
+lotics auth web
 ```
 
-**`lotics setup`** — Saves an existing API key directly (e.g. one created in the Lotics web app).
+**`lotics auth api-key`** — Saves an existing API key directly (e.g. one created in the Lotics web app).
 
 ```bash
-lotics setup                    # interactive prompt
-lotics setup ltk_...            # non-interactive
+lotics auth api-key                  # interactive prompt
+lotics auth api-key ltk_...          # non-interactive
 ```
 
-API key is saved to `~/.lotics/config.json`. Run `lotics logout` to remove saved credentials.
+API key is saved to `~/.lotics/config.json`. Run `lotics auth logout` to remove saved credentials.
 
 Auth priority: `--api-key` flag > `LOTICS_API_KEY` env > `~/.lotics/config.json`.
 

package/dist/src/cli.js

@@ -15,23 +15,11 @@ Lotics is an AI-powered operations platform. Through this CLI you can:
   - Create and manage apps, knowledge docs, and files
 
 AUTHENTICATION
-  lotics signup                        Create account, org, workspace, and API key
-  lotics login                         Send a magic link email to access the web app
-  lotics setup [api_key]               Save an existing API key (e.g. from the web app)
-  lotics whoami                        Show the email of the current account
-  lotics logout                        Remove saved credentials
-
-  Signup flags:
-    --email <email>        Email (required; prompted if omitted)
-    --name <name>          Display name (defaults to email prefix)
-    --timezone <timezone>  Workspace timezone (defaults to UTC, e.g. Asia/Ho_Chi_Minh)
-
-  Signup sends a magic link email so you can access the Lotics web app.
-  Use lotics login to request a new magic link at any time.
-  Setup priority: --api-key flag > LOTICS_API_KEY env > saved config.
+  lotics auth                          Show auth help
+  lotics auth signup <email>           Create account (run "lotics auth" for details)
 
 USAGE
-  1. lotics signup (or lotics setup)   Create account or set up API key
+  1. lotics auth signup <email>        Create account or authenticate
   2. lotics workspace                  Check current workspace (auto-selects if only one)
   3. lotics tools                      List available tools by category
   4. lotics tools <name>               Show tool description and full input schema
@@ -81,6 +69,23 @@ STDIN
 
     echo '{"table_id":"tbl_..."}' | lotics run query_records`);
 }
+function printAuthHelp() {
+    console.log(`Authentication commands:
+
+  lotics auth signup <email>           Create account, org, workspace, and API key
+  lotics auth api-key [key]            Save an existing API key (e.g. from the web app)
+  lotics auth web                      Send a magic link email to access the web app
+  lotics auth whoami                   Show the email of the current account
+  lotics auth logout                   Remove saved credentials
+
+Signup flags:
+  --name <name>          Display name (defaults to email prefix)
+  --timezone <timezone>  Workspace timezone (defaults to UTC, e.g. Asia/Ho_Chi_Minh)
+
+Signup sends a magic link email so you can access the Lotics web app.
+Use lotics auth web to request a new magic link at any time.
+Auth priority: --api-key flag > LOTICS_API_KEY env > saved config.`);
+}
 function parseArgs(argv) {
     const flags = {
         json: false,
@@ -88,7 +93,6 @@ function parseArgs(argv) {
         output: undefined,
         as: undefined,
         apiKey: undefined,
-        email: undefined,
         name: undefined,
         timezone: undefined,
         version: false,
@@ -118,9 +122,6 @@ function parseArgs(argv) {
             case "--api-key":
                 flags.apiKey = argv[++i];
                 break;
-            case "--email":
-                flags.email = argv[++i];
-                break;
             case "--name":
                 flags.name = argv[++i];
                 break;
@@ -183,10 +184,10 @@ async function publicPost(path, body) {
     const data = await response.json();
     return { ok: response.ok, status: response.status, data };
 }
-async function handleSignup(flags) {
-    const email = flags.email ?? (process.stdin.isTTY ? await prompt("Email: ") : "");
+async function handleSignup(positionalEmail, flags) {
+    const email = positionalEmail ?? (process.stdin.isTTY ? await prompt("Email: ") : "");
     if (!email) {
-        console.error("Email is required. Use --email or run interactively.");
+        console.error("Email is required. Usage: lotics auth signup <email>");
         process.exit(1);
     }
     const name = flags.name ?? (process.stdin.isTTY ? await prompt("Name (enter to use email): ") : undefined);
@@ -198,7 +199,7 @@ async function handleSignup(flags) {
     const { ok, status, data } = await publicPost("/v1/cli/signup", body);
     if (!ok) {
         if (status === 409) {
-            console.error("An account with this email already exists. Use: lotics setup");
+            console.error("An account with this email already exists. Use: lotics auth api-key");
         }
         else if (status === 429) {
             console.error("Too many signup attempts. Try again later.");
@@ -218,7 +219,7 @@ async function handleSignup(flags) {
     console.error(`Account created. You can now use the CLI.`);
     console.error(`  Email: ${data.email}`);
     console.error(`\nCheck your email for a magic link to access the Lotics web app.`);
-    console.error(`Run "lotics login" to request a new link at any time.`);
+    console.error(`Run "lotics auth web" to request a new link at any time.`);
 }
 async function handleSetup(providedKey) {
     const apiKey = providedKey ?? await prompt("Enter your API key: ");
@@ -260,7 +261,7 @@ async function handleSetup(providedKey) {
 function requireClient(flags) {
     const auth = resolveAuth(flags);
     if (!auth) {
-        console.error('Not authenticated. Run "lotics setup" or set LOTICS_API_KEY.');
+        console.error('Not authenticated. Run "lotics auth signup" or set LOTICS_API_KEY.');
         process.exit(1);
     }
     const config = loadConfig();
@@ -334,51 +335,58 @@ async function main() {
         console.log(VERSION);
         return;
     }
-    // --- Commands that don't require auth ---
-    if (command === "signup") {
-        await handleSignup(flags);
-        return;
-    }
-    if (command === "setup") {
-        await handleSetup(subcommand ?? flags.apiKey);
-        return;
-    }
-    if (command === "whoami") {
-        const config = loadConfig();
-        if (config?.email) {
-            console.log(config.email);
+    // --- lotics auth <subcommand> ---
+    if (command === "auth") {
+        if (subcommand === "signup") {
+            await handleSignup(toolArgs, flags);
             return;
         }
-        // No email cached — try fetching from API
-        const auth = resolveAuth(flags);
-        if (!auth) {
-            console.error('Not authenticated. Run "lotics setup" or set LOTICS_API_KEY.');
-            process.exit(1);
+        if (subcommand === "api-key") {
+            await handleSetup(toolArgs ?? flags.apiKey);
+            return;
         }
-        const client = new LoticsClient({ apiKey: auth.apiKey });
-        try {
-            const info = await client.whoami();
-            // Cache for next time
-            const existing = loadConfig() ?? {};
-            saveConfig({ ...existing, email: info.email });
-            console.log(info.email);
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            console.error(`Failed to fetch account info: ${message}`);
-            process.exit(1);
+        if (subcommand === "whoami") {
+            const config = loadConfig();
+            if (config?.email) {
+                console.log(config.email);
+                return;
+            }
+            // No email cached — try fetching from API
+            const auth = resolveAuth(flags);
+            if (!auth) {
+                console.error('Not authenticated. Run "lotics auth signup" or set LOTICS_API_KEY.');
+                process.exit(1);
+            }
+            const client = new LoticsClient({ apiKey: auth.apiKey });
+            try {
+                const info = await client.whoami();
+                // Cache for next time
+                const existing = loadConfig() ?? {};
+                saveConfig({ ...existing, email: info.email });
+                console.log(info.email);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                console.error(`Failed to fetch account info: ${message}`);
+                process.exit(1);
+            }
+            return;
         }
-        return;
-    }
-    if (command === "logout") {
-        deleteConfig();
-        console.error("Logged out. Credentials removed.");
-        return;
-    }
-    if (command === "login") {
-        const client = requireClient(flags);
-        const { email } = await client.login();
-        console.error(`Magic link sent to ${email}. Check your email to access the Lotics web app.`);
+        if (subcommand === "logout") {
+            deleteConfig();
+            console.error("Logged out. Credentials removed.");
+            return;
+        }
+        if (subcommand === "web") {
+            const client = requireClient(flags);
+            const { email } = await client.login();
+            console.error(`Magic link sent to ${email}. Check your email to access the Lotics web app.`);
+            return;
+        }
+        if (subcommand) {
+            console.error(`Unknown auth subcommand: ${subcommand}\n`);
+        }
+        printAuthHelp();
         return;
     }
     // --- Validate command before auth ---
@@ -554,8 +562,13 @@ async function main() {
         // Always request text format so model_output is available; --json only affects CLI output
         const result = await client.execute(toolName, args, { format: "text", timeoutMs });
         if (result.error) {
-            console.error(result.error);
-            console.error(`\nHint: run "lotics tools ${toolName}" to see the expected input schema.`);
+            if (flags.json) {
+                console.log(JSON.stringify({ error: result.error }, null, 2));
+            }
+            else {
+                console.error(result.error);
+                console.error(`\nHint: run "lotics tools ${toolName}" to see the expected input schema.`);
+            }
             process.exit(1);
         }
         if (flags.json) {

package/dist/src/client.js

@@ -45,7 +45,7 @@ export class LoticsClient {
     }
     buildHeaders() {
         const headers = {
-            "x-api-key": this.apiKey,
+            "Authorization": `Bearer ${this.apiKey}`,
         };
         if (this.workspaceId) {
             headers["x-workspace-id"] = this.workspaceId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lotics/cli",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Lotics SDK and CLI for AI agents",
   "type": "module",
   "bin": {