@thingd/cli 0.40.2 → 0.40.3

package/dist/commands/cloud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["../../src/commands/cloud.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,aAAa,CAAC;AAiBvF,wBAAsB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BjE"}
+{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["../../src/commands/cloud.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,UAAU,EAA6B,MAAM,aAAa,CAAC;AAuDzE,wBAAsB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BjE"}

package/dist/commands/cloud.js

@@ -1,7 +1,43 @@
+import { execSync } from "node:child_process";
+import { setTimeout as sleep } from "node:timers/promises";
 import pc from "picocolors";
-import { requiredFlag, requiredToken, stringFlag } from "../index.js";
-import { CloudApiError, createApiKey, createInstance, createProject, getMe, listInstances, listProjects, } from "../lib/cloud-api.js";
+import { requiredToken, stringFlag } from "../index.js";
+import { CloudApiError, createApiKey, createInstance, createProject, getMe, listInstances, listProjects, pollCliAuth, startCliAuth, } from "../lib/cloud-api.js";
 import { readCloudConfig, removeCloudConfig, writeCloudConfig, } from "../lib/cloud-config.js";
+const POLL_INTERVAL_MS = 2_000;
+const POLL_TIMEOUT_MS = 5 * 60 * 1_000;
+function cliApiUrl(context) {
+    return stringFlag(context.parsed, "url") ?? process.env.THINGD_URL ?? "https://api.thingd.cloud";
+}
+function buildWebUrl(apiUrl) {
+    if (apiUrl.includes("//api.") || apiUrl.startsWith("api.")) {
+        return apiUrl.replace("api.", "");
+    }
+    if (apiUrl.includes("localhost:8787") || apiUrl.includes("127.0.0.1:8787")) {
+        return "http://localhost:5173";
+    }
+    return apiUrl;
+}
+function openBrowser(url) {
+    try {
+        const platform = process.platform;
+        if (platform === "darwin") {
+            execSync(`open "${url}"`, { timeout: 5_000 });
+        }
+        else if (platform === "win32") {
+            execSync(`start "" "${url}"`, { timeout: 5_000 });
+        }
+        else {
+            execSync(`xdg-open "${url}"`, { timeout: 5_000 });
+        }
+    }
+    catch {
+        // browser open is best-effort
+    }
+}
+function makeBaseConfig(context) {
+    return { token: "", url: cliApiUrl(context) };
+}
 export async function runCloud(context) {
     const sub = requiredToken(context.parsed, 1, "subcommand");
     switch (sub) {
@@ -29,30 +65,75 @@ export async function runCloud(context) {
     }
 }
 async function runLogin(context) {
-    const code = context.parsed.tokens[2] ?? requiredFlag(context.parsed, "code");
+    const code = context.parsed.tokens[2] ?? stringFlag(context.parsed, "code");
     const token = context.parsed.tokens[3] ?? stringFlag(context.parsed, "token");
-    if (!token) {
-        context.stdout.write(`First, open this URL in your browser:\n\n` +
-            `  ${pc.cyan(`https://thingd.cloud/cli/auth?code=${code}`)}\n\n` +
-            `Then paste the token shown after logging in:\n\n` +
-            `  ${pc.dim("$ thingd cloud login --code <code> --token <token>")}\n`);
+    // ── Manual --code --token flow (fallback) ─────────────────────────
+    if (code && token) {
+        const config = { token, url: cliApiUrl(context) };
+        try {
+            const { user } = await getMe(config);
+            writeCloudConfig({ ...config, email: user.email });
+            context.stdout.write(pc.green(`✓ Logged in as ${user.email}\n`));
+        }
+        catch (err) {
+            if (err instanceof CloudApiError && err.status === 401) {
+                context.stderr.write(pc.red("Invalid token. Please try again.\n"));
+            }
+            else {
+                context.stderr.write(pc.red(`Failed to verify token: ${err}\n`));
+            }
+        }
         return;
     }
-    // Verify token by calling /api/users/me
-    const config = { token };
+    // ── Auto device-code flow ─────────────────────────────────────────
+    const baseConfig = makeBaseConfig(context);
+    let deviceCode;
     try {
-        const { user } = await getMe(config);
-        writeCloudConfig({ ...config, email: user.email });
-        context.stdout.write(pc.green(`✓ Logged in as ${user.email}\n`));
+        const result = await startCliAuth(baseConfig);
+        deviceCode = result.code;
     }
     catch (err) {
-        if (err instanceof CloudApiError && err.status === 401) {
-            context.stderr.write(pc.red("Invalid token. Please try again.\n"));
+        context.stderr.write(pc.red(`Failed to start CLI auth: ${err}\n`));
+        return;
+    }
+    const webUrl = buildWebUrl(cliApiUrl(context));
+    const authUrl = `${webUrl}/cli/auth?code=${deviceCode}`;
+    context.stdout.write(`\n  ${pc.cyan("Opening browser...")}\n` +
+        `  ${pc.dim("If the browser doesn't open, visit:")}\n` +
+        `  ${pc.dim(authUrl)}\n\n`);
+    openBrowser(authUrl);
+    // Poll for token
+    const deadline = Date.now() + POLL_TIMEOUT_MS;
+    let dots = 0;
+    while (Date.now() < deadline) {
+        await sleep(POLL_INTERVAL_MS);
+        try {
+            const result = await pollCliAuth(baseConfig, deviceCode);
+            if ("token" in result) {
+                const tokenConfig = { token: result.token, url: cliApiUrl(context) };
+                try {
+                    const { user } = await getMe(tokenConfig);
+                    writeCloudConfig({ ...tokenConfig, email: user.email });
+                    context.stdout.write(pc.green(`\r✓ Logged in as ${user.email}\n`));
+                    return;
+                }
+                catch {
+                    context.stderr.write(pc.red("\rToken received but verification failed. Try again.\n"));
+                    return;
+                }
+            }
+            // Show spinner
+            dots = (dots + 1) % 4;
+            context.stdout.write(`\r  ${pc.dim(`Waiting for browser login${".".repeat(dots)}${" ".repeat(3 - dots)}`)}`);
         }
-        else {
-            context.stderr.write(pc.red(`Failed to verify token: ${err}\n`));
+        catch (err) {
+            if (err instanceof CloudApiError && err.status === 410) {
+                context.stderr.write(pc.red("\nCode expired. Run `thingd cloud login` again.\n"));
+                return;
+            }
         }
     }
+    context.stderr.write(pc.red("\nTimed out. Run `thingd cloud login` again.\n"));
 }
 async function runLogout(context) {
     removeCloudConfig();
@@ -108,7 +189,6 @@ async function runInstance(context) {
     const action = requiredToken(context.parsed, 2, "action");
     if (action === "list") {
         const projectSlug = requiredToken(context.parsed, 3, "project");
-        // Resolve project slug to ID by listing all projects
         const { projects } = await listProjects(config);
         const project = projects.find((p) => p.slug === projectSlug || p.id === projectSlug);
         if (!project) {

package/dist/lib/cloud-api.d.ts

@@ -46,4 +46,12 @@ export declare function createInstance(config: CloudConfig, projectId: string, n
 export declare function createApiKey(config: CloudConfig, projectId: string, name?: string): Promise<{
     key: CloudApiKey;
 }>;
+export declare function startCliAuth(config: CloudConfig): Promise<{
+    code: string;
+}>;
+export declare function pollCliAuth(config: CloudConfig, code: string): Promise<{
+    token: string;
+} | {
+    status: string;
+}>;
 //# sourceMappingURL=cloud-api.d.ts.map

package/dist/lib/cloud-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloud-api.d.ts","sourceRoot":"","sources":["../../src/lib/cloud-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AASrD,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,qBAAa,aAAc,SAAQ,KAAK;IACtC,MAAM,EAAE,MAAM,CAAC;gBAEH,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAK5C;AA0BD,wBAAsB,KAAK,CACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC;IAAE,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,CAE9E;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;CAAE,CAAC,CAE7F;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAEpC;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,SAAS,EAAE,aAAa,EAAE,CAAA;CAAE,CAAC,CAEzC;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,CAAC,CAKtC;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC;IAAE,GAAG,EAAE,WAAW,CAAA;CAAE,CAAC,CAK/B"}
+{"version":3,"file":"cloud-api.d.ts","sourceRoot":"","sources":["../../src/lib/cloud-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AASrD,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,qBAAa,aAAc,SAAQ,KAAK;IACtC,MAAM,EAAE,MAAM,CAAC;gBAEH,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAK5C;AA0BD,wBAAsB,KAAK,CACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC;IAAE,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,CAE9E;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;CAAE,CAAC,CAE7F;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAEpC;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,SAAS,EAAE,aAAa,EAAE,CAAA;CAAE,CAAC,CAEzC;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,CAAC,CAKtC;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC;IAAE,GAAG,EAAE,WAAW,CAAA;CAAE,CAAC,CAK/B;AAkBD,wBAAsB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAEjF;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAEjD"}

package/dist/lib/cloud-api.js

@@ -51,3 +51,23 @@ export async function createApiKey(config, projectId, name) {
         body: { name: name ?? "CLI key" },
     });
 }
+// ── CLI device code auth (unauthenticated) ──────────────────────────
+async function requestUnauthenticated(apiUrl, path, body) {
+    const url = `${apiUrl}${path}`;
+    const res = await fetch(url, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify(body),
+    });
+    if (!res.ok) {
+        const errBody = await res.json().catch(() => ({ message: res.statusText }));
+        throw new CloudApiError(res.status, errBody.message ?? res.statusText);
+    }
+    return res.json();
+}
+export async function startCliAuth(config) {
+    return requestUnauthenticated(config.url ?? DEFAULT_API_URL, "/api/auth/cli/start", {});
+}
+export async function pollCliAuth(config, code) {
+    return requestUnauthenticated(config.url ?? DEFAULT_API_URL, "/api/auth/cli/poll", { code });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thingd/cli",
-  "version": "0.40.2",
+  "version": "0.40.3",
   "description": "CLI, Interactive TUI Dashboard, and MCP server for thingd — a fast object-first data engine for applications and AI agents.",
   "type": "module",
   "homepage": "https://engine.thingd.cloud",
@@ -45,7 +45,7 @@
     "cli-table3": "^0.6.5",
     "picocolors": "^1.1.1",
     "zod": "^4.4.3",
-    "@thingd/sdk": "0.40.2"
+    "@thingd/sdk": "0.40.3"
   },
   "engines": {
     "node": ">=24.0.0"