@thingd/cli 0.51.2 → 0.51.4

package/dist/interactive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../src/interactive.ts"],"names":[],"mappings":"AAmiEA,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAoDvD"}
+{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../src/interactive.ts"],"names":[],"mappings":"AAmkEA,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAoDvD"}

package/dist/interactive.js

@@ -6,7 +6,7 @@ import * as path from "node:path";
 import readline from "node:readline";
 import { ThingD } from "@thingd/sdk";
 import pc from "picocolors";
-import { listInstances, listProjects } from "./lib/cloud-api.js";
+import { deriveRestUrl, listInstances, listProjects } from "./lib/cloud-api.js";
 import { readCloudConfig, removeCloudConfig, resolveCloudUrl, writeCloudConfig, } from "./lib/cloud-config.js";
 import { logoText } from "./logo.js";
 import { defaultThingdDbPath } from "./paths.js";
@@ -234,7 +234,9 @@ async function fetchResourcesFallback() {
         const listed = await db.listQueues();
         queues = (listed ?? []).sort();
     }
-    catch {
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        cloudError = cloudError ?? `Failed to load queues: ${msg}`;
         queues = [];
     }
     // Link count
@@ -740,6 +742,9 @@ async function loadContent(node) {
             content += ` ${pc.dim("Writes".padEnd(14))} ${pc.cyan(wLine)}  ${pc.cyan(String(currentWrite).padEnd(4))} ${pc.dim(`w/s`)}\n`;
             content += ` ${pc.dim("Appends".padEnd(14))} ${pc.green(apLine)}  ${pc.green(String(currentAppend).padEnd(4))} ${pc.dim(`e/s`)}\n\n`;
             content += ` ${pc.dim("Shortcuts:")} ${pc.bold("[c]")} Create  ${pc.bold("[r]")} Refresh  ${pc.bold("[/]")} Search\n`;
+            if (cloudError) {
+                content += `\n ${pc.yellow("⚠")} ${pc.dim(cloudError)}\n`;
+            }
         }
         else if (node.type === "category") {
             content = pc.dim("Expand to browse items.");
@@ -1253,34 +1258,61 @@ async function handleInfo() {
             const baseUrl = dbPath.startsWith("thingd://")
                 ? `http://${dbPath.slice("thingd://".length)}`
                 : dbPath;
-            const urlObj = new URL(baseUrl);
-            if (urlObj.pathname === "/mcp") {
-                urlObj.pathname = "/";
-            }
+            const apiRoot = baseUrl.replace(/\/+$/, "");
             const fetchJson = async (p) => {
-                const u = new URL(p, urlObj.toString());
+                const u = `${apiRoot}${p}`;
                 const headers = {};
                 if (authToken) {
                     headers.Authorization = `Bearer ${authToken}`;
                 }
                 const res = await fetch(u, { headers });
+                const json = await res.json();
                 if (!res.ok) {
-                    throw new Error(`HTTP ${res.status}`);
+                    const detail = json?.error?.detail ?? json?.error?.message ?? `HTTP ${res.status}`;
+                    throw new Error(`${res.status}: ${detail}`);
                 }
-                return res.json();
+                return json;
             };
-            const health = await fetchJson("/healthz");
-            const cluster = await fetchJson("/cluster/status");
-            lines.push("");
-            lines.push(` ${pc.bold("Cloud Health")}`);
-            lines.push(...JSON.stringify(health, null, 2)
-                .split("\n")
-                .map((l) => ` ${pc.dim(l)}`));
+            // Health check
+            let healthError = null;
+            let health = null;
+            try {
+                health = await fetchJson("/v1/health");
+            }
+            catch (err) {
+                healthError = err instanceof Error ? err.message : String(err);
+            }
+            // Collections check
+            let collectionsResult = null;
+            if (!healthError) {
+                try {
+                    const colResp = await fetchJson("/v1/collections");
+                    collectionsResult = colResp?.data ?? null;
+                }
+                catch {
+                    // collections endpoint may not be available on all setups
+                }
+            }
             lines.push("");
-            lines.push(` ${pc.bold("Cloud Cluster")}`);
-            lines.push(...JSON.stringify(cluster, null, 2)
-                .split("\n")
-                .map((l) => ` ${pc.dim(l)}`));
+            lines.push(` ${pc.bold("Cloud REST API")}`);
+            if (healthError) {
+                lines.push(` ${pc.red("Health check failed:")} ${healthError}`);
+                lines.push(` ${pc.dim("API URL:")} ${apiRoot}/v1/...`);
+                lines.push(` ${pc.dim("Auth:")} ${authToken ? pc.green("Bearer token set") : pc.red("No token")}`);
+            }
+            else {
+                const h = health;
+                const status = h?.data?.status ?? h?.status ?? "ok";
+                lines.push(` ${pc.dim("Status:")} ${pc.green(String(status))}`);
+                lines.push(` ${pc.dim("Collections:")} ${collectionsResult ? pc.cyan(String(collectionsResult.length)) : pc.yellow("unknown")}`);
+                if (collectionsResult && collectionsResult.length > 0) {
+                    lines.push(` ${pc.dim("Names:")} ${collectionsResult.join(", ")}`);
+                }
+            }
+            if (cloudError) {
+                lines.push("");
+                lines.push(` ${pc.yellow("⚠ Recent error:")} ${cloudError}`);
+            }
         }
         catch (err) {
             const errMsg = err instanceof Error ? err.message : String(err);
@@ -1674,13 +1706,14 @@ async function handleConnect(node) {
                         cloudCfg.projectSlug = selected.projectSlug;
                         cloudCfg.instanceSlug = selected.instanceSlug;
                         writeCloudConfig(cloudCfg);
-                        await connectToDriver("cloud", selected.mcpUrl, selected.mcpUrl, cloudCfg.token);
+                        await connectToDriver("cloud", deriveRestUrl(selected.mcpUrl), deriveRestUrl(selected.mcpUrl), cloudCfg.token);
                     });
                     return;
                 }
                 // No instances found — try saved URL or show error
                 if (cloudCfg.instanceUrl) {
-                    await connectToDriver("cloud", cloudCfg.instanceUrl, cloudCfg.instanceUrl, cloudCfg.token);
+                    const restUrl = deriveRestUrl(cloudCfg.instanceUrl);
+                    await connectToDriver("cloud", restUrl, restUrl, cloudCfg.token);
                     return;
                 }
                 viewerLines = [
@@ -1692,7 +1725,8 @@ async function handleConnect(node) {
             }
             catch {
                 if (cloudCfg.instanceUrl) {
-                    await connectToDriver("cloud", cloudCfg.instanceUrl, cloudCfg.instanceUrl, cloudCfg.token);
+                    const restUrl = deriveRestUrl(cloudCfg.instanceUrl);
+                    await connectToDriver("cloud", restUrl, restUrl, cloudCfg.token);
                     return;
                 }
                 viewerLines = [
@@ -1769,6 +1803,8 @@ async function handleConnect(node) {
                         cfg.token = vals.token;
                     }
                     writeCloudConfig(cfg);
+                    // Connect via REST (derive base URL from MCP URL)
+                    cloudUrl = deriveRestUrl(cloudUrl);
                 }
                 else {
                     if (!vals.url) {

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

@@ -92,6 +92,12 @@ export type ResolvedInstance = {
     projectSlug: string;
     instanceSlug: string;
 };
+/**
+ * Derive the REST base URL from an MCP gateway URL.
+ * 'https://api.thingd.cloud/mcp/proj/inst' → 'https://api.thingd.cloud'
+ * 'https://api.thingd.cloud' → 'https://api.thingd.cloud' (idempotent)
+ */
+export declare function deriveRestUrl(mcpUrl: string): string;
 /**
  * Fetch the first available cloud instance for the logged-in user.
  * Returns null if no projects or instances exist.

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":"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"}
+{"version":3,"file":"cloud-api.d.ts","sourceRoot":"","sources":["../../src/lib/cloud-api.ts"],"names":[],"mappings":"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"}

package/dist/lib/cloud-api.js

@@ -99,6 +99,14 @@ export async function startCliAuth(config) {
 export async function pollCliAuth(config, code) {
     return requestUnauthenticated(config.url ?? DEFAULT_API_URL, "/auth/cli/poll", { code });
 }
+/**
+ * Derive the REST base URL from an MCP gateway URL.
+ * 'https://api.thingd.cloud/mcp/proj/inst' → 'https://api.thingd.cloud'
+ * 'https://api.thingd.cloud' → 'https://api.thingd.cloud' (idempotent)
+ */
+export function deriveRestUrl(mcpUrl) {
+    return new URL(mcpUrl).origin;
+}
 /**
  * Fetch the first available cloud instance for the logged-in user.
  * Returns null if no projects or instances exist.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thingd/cli",
-  "version": "0.51.2",
+  "version": "0.51.4",
   "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.51.2"
+    "@thingd/sdk": "0.51.4"
   },
   "engines": {
     "node": ">=24.0.0"