@thingd/cli 0.49.9 → 0.50.0

package/dist/interactive.js

@@ -7,8 +7,9 @@ import readline from "node:readline";
 import { ThingD } from "@thingd/sdk";
 import pc from "picocolors";
 import { listInstances, listProjects } from "./lib/cloud-api.js";
-import { readCloudConfig } from "./lib/cloud-config.js";
+import { readCloudConfig, removeCloudConfig, resolveCloudUrl, writeCloudConfig, } from "./lib/cloud-config.js";
 import { logoText } from "./logo.js";
+import { defaultThingdDbPath } from "./paths.js";
 // ── Helpers ──────────────────────────────────────────────────────────
 function highlightJson(val) {
     const str = JSON.stringify(val, null, 2);
@@ -77,6 +78,8 @@ let totalObjects = 0;
 let totalEventsCount = 0;
 let totalActiveJobsCount = 0;
 let totalDeadJobsCount = 0;
+let totalLinksCount = 0;
+let cloudError = null;
 let objectsHistory = [];
 let eventsHistory = [];
 let activeJobsHistory = [];
@@ -91,7 +94,7 @@ let loadTimer = null;
 let pollTimer = null;
 let keypressHandler = null;
 let formState = null;
-function openForm(title, fields, onSubmit) {
+function openForm(title, fields, onSubmit, keepViewer) {
     formState = {
         active: true,
         title,
@@ -126,6 +129,10 @@ function openForm(title, fields, onSubmit) {
             try {
                 await onSubmit(vals);
                 formState = null;
+                if (keepViewer) {
+                    draw();
+                    return;
+                }
                 viewerLines = [];
                 loadedItemId = ""; // Force reload
                 await fetchResources();
@@ -190,12 +197,13 @@ function formatUptime(ms) {
     return `${h}h ${m % 60}m`;
 }
 async function fetchResourcesFallback() {
+    cloudError = null;
     try {
         const nativeCollections = await db.listCollections();
         const nativeStreams = await db.listStreams();
         // Maintain default collections/streams for UI if none exist
-        const defaultCols = new Set(["decisions", "load-test"]);
-        const defaultStrs = new Set(["project:thingd", "load-events", "activity-log"]);
+        const defaultCols = new Set();
+        const defaultStrs = new Set();
         for (const c of nativeCollections) {
             defaultCols.add(c);
         }
@@ -210,10 +218,16 @@ async function fetchResourcesFallback() {
         totalActiveJobsCount = await db.countActiveJobs();
         totalDeadJobsCount = await db.countDeadJobs();
     }
-    catch {
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        cloudError = `Failed to load resources: ${msg}`;
         collections = [];
         streams = [];
         totalObjects = 0;
+        // Show error in viewer if it's currently showing the default message
+        if (viewerLines.length === 1 && viewerLines[0] === "Select an item to view details.") {
+            viewerLines = [pc.yellow(cloudError), pc.dim("Press 'r' to retry or 's' to switch driver.")];
+        }
     }
     // Queues
     try {
@@ -221,18 +235,37 @@ async function fetchResourcesFallback() {
         queues = (listed ?? []).sort();
     }
     catch {
-        queues = ["embed", "load-queue", "worker-queue"];
+        queues = [];
+    }
+    // Link count
+    try {
+        totalLinksCount = await db.countLinks();
+    }
+    catch {
+        totalLinksCount = 0;
+    }
+    // Populate objectsByCollection from live data
+    objectsByCollection.clear();
+    for (const col of collections) {
+        try {
+            const list = await db.listObjects(col);
+            objectsByCollection.set(col, list.map((o) => o.id));
+        }
+        catch {
+            objectsByCollection.set(col, []);
+        }
     }
 }
 async function fetchResources() {
     if (driver === "native" && dbPath) {
         try {
             // Override the tracked totals with the actual exact DB count!
-            const [objCount, evtCount, activeCount, deadCount, nativeCollections, nativeStreams, nativeQueues,] = await Promise.all([
+            const [objCount, evtCount, activeCount, deadCount, linkCount, nativeCollections, nativeStreams, nativeQueues,] = await Promise.all([
                 db.countObjects(),
                 db.countEvents(),
                 db.countActiveJobs(),
                 db.countDeadJobs(),
+                db.countLinks(),
                 db.listCollections(),
                 db.listStreams(),
                 db.listQueues?.() ?? Promise.resolve([]),
@@ -243,12 +276,10 @@ async function fetchResources() {
                 Number.isNaN(activeCount) || activeCount === 0 ? totalActiveJobsCount : activeCount;
             totalDeadJobsCount =
                 Number.isNaN(deadCount) || deadCount === 0 ? totalDeadJobsCount : deadCount;
-            collections = nativeCollections.length > 0 ? nativeCollections : ["decisions", "load-test"];
-            streams =
-                nativeStreams.length > 0
-                    ? nativeStreams
-                    : ["project:thingd", "load-events", "activity-log"];
-            queues = nativeQueues.length > 0 ? nativeQueues : ["embed", "load-queue", "worker-queue"];
+            totalLinksCount = Number.isNaN(linkCount) ? totalLinksCount : linkCount;
+            collections = nativeCollections.length > 0 ? nativeCollections : [];
+            streams = nativeStreams.length > 0 ? nativeStreams : [];
+            queues = nativeQueues.length > 0 ? nativeQueues : [];
         }
         catch {
             // Fallback if sqlite3 fails
@@ -258,6 +289,17 @@ async function fetchResources() {
     else {
         await fetchResourcesFallback();
     }
+    // Populate objectsByCollection from live data
+    objectsByCollection.clear();
+    for (const col of collections) {
+        try {
+            const list = await db.listObjects(col);
+            objectsByCollection.set(col, list.map((o) => o.id));
+        }
+        catch {
+            objectsByCollection.set(col, []);
+        }
+    }
     // Calculate Deltas for Operations Throughput Rates
     const prevObjects = objectsHistory.length > 0
         ? (objectsHistory[objectsHistory.length - 1] ?? totalObjects)
@@ -532,7 +574,7 @@ function buildTree() {
         depth: 0,
         expandable: true,
         children: [
-            { id: "maintenance:integrity", label: "Run Integrity Check" },
+            { id: "maintenance:integrity", label: "Run Health Check" },
             { id: "maintenance:checkpoint", label: "WAL Checkpoint" },
             { id: "maintenance:backup", label: "Create Backup" },
         ],
@@ -675,12 +717,18 @@ async function loadContent(node) {
             content += ` ${pc.bold("Capacity & Storage")}\n`;
             content += ` ${pc.dim("Objects".padEnd(14))} ${pc.cyan(String(totalObjects).padEnd(6))} ${pc.dim("total")}\n`;
             content += ` ${pc.dim("Events".padEnd(14))} ${pc.green(String(totalEventsCount).padEnd(6))} ${pc.dim("total")}\n`;
+            content += ` ${pc.dim("Links".padEnd(14))} ${pc.blue(String(totalLinksCount).padEnd(6))} ${pc.dim("total")}\n`;
             content += ` ${pc.dim("Active Jobs".padEnd(14))} ${pc.yellow(String(totalActiveJobsCount).padEnd(6))} ${pc.dim("in flight")}\n`;
             content += ` ${pc.dim("Dead Jobs".padEnd(14))} ${pc.red(String(totalDeadJobsCount).padEnd(6))} ${pc.dim("failed")}\n\n`;
             content += ` ${pc.bold("Connection")}\n`;
             content += ` ${pc.dim("Driver".padEnd(14))} ${driverName}\n`;
             content += ` ${pc.dim("Path".padEnd(14))} ${dbPath || ":memory:"}\n`;
-            content += ` ${pc.dim("Size".padEnd(14))} ${dbSizeStr}\n\n`;
+            content += ` ${pc.dim("Size".padEnd(14))} ${dbSizeStr}\n`;
+            if (driver === "native") {
+                const sizeSpark = drawSparkline(dbSizeHistory, 5, Math.max(10, viewW - 55));
+                content += ` ${pc.dim("Size History".padEnd(14))} ${pc.cyan(sizeSpark)}\n`;
+            }
+            content += `\n`;
             // ── Throughput & Activity Metrics
             const currentWrite = objectWriteRateHistory[objectWriteRateHistory.length - 1] ?? 0;
             const currentAppend = eventAppendRateHistory[eventAppendRateHistory.length - 1] ?? 0;
@@ -832,7 +880,7 @@ function draw() {
         help = ` ${pc.dim("↑↓")} nav  ${pc.dim("enter")} connect  ${pc.dim("q")} quit `;
     }
     else {
-        help = ` ${pc.dim("↑↓")} nav  ${pc.dim("←→")} toggle  ${pc.dim("c")} create  ${pc.dim("e")} edit  ${pc.dim("d")} delete  ${pc.dim("/")} search  ${pc.dim("i")} info  ${pc.dim("r")} refresh  ${pc.dim("s")} switch  ${pc.dim("q")} quit `;
+        help = ` ${pc.dim("↑↓")} nav  ${pc.dim("←→")} toggle  ${pc.dim("c")} create  ${pc.dim("e")} edit  ${pc.dim("d")} delete  ${pc.dim("/")} search  ${pc.dim("i")} info  ${pc.dim("r")} refresh  ${pc.dim("s")} switch  ${pc.dim("l")} logout  ${pc.dim("q")} quit `;
     }
     buf += `${pc.dim("─".repeat(W))}\n`;
     buf += padToWidth(help, W);
@@ -1127,7 +1175,10 @@ async function handleDelete(selected) {
             if ((vals.confirm || "").toLowerCase() !== "yes") {
                 throw new Error("Canceled");
             }
-            await db.delete(ref.collection, ref.id);
+            const result = await db.delete(ref.collection, ref.id);
+            if (result && !result.deleted) {
+                throw new Error(`Object '${ref.id}' not found in collection '${ref.collection}'`);
+            }
         });
     }
     else if (selected.type === "queue" && selected.ref) {
@@ -1188,7 +1239,7 @@ async function handleSearch() {
             }),
         ];
         loadedItemId = "search_results";
-    });
+    }, true);
 }
 async function handleInfo() {
     const lines = [
@@ -1241,7 +1292,7 @@ async function handleInfo() {
 }
 async function handleMaintenance() {
     // Cycle through maintenance operations with each press of 'm'
-    const operations = ["integrity", "checkpoint", "backup"];
+    const operations = ["health", "checkpoint", "backup"];
     const idx = maintenanceCursor % operations.length;
     maintenanceCursor = (maintenanceCursor + 1) % operations.length;
     const op = operations[idx];
@@ -1285,18 +1336,25 @@ async function handleMaintenance() {
         }
     }
     else {
+        // Health check — verify read path
         try {
             if (typeof db !== "undefined" && typeof db.countObjects === "function") {
-                await db.countObjects();
-                viewerLines = [` Integrity check passed`, ``];
+                const objCount = await db.countObjects();
+                const evtCount = await db.countEvents();
+                const jobCount = typeof db.countActiveJobs === "function" ? await db.countActiveJobs() : 0;
+                viewerLines = [
+                    ` Health check passed`,
+                    ` Objects: ${objCount}, Events: ${evtCount}, Active jobs: ${jobCount}`,
+                    ``,
+                ];
             }
             else {
-                viewerLines = [` Integrity check not available`, ``];
+                viewerLines = [` Health check not available`, ``];
             }
         }
         catch (err) {
             viewerLines = [
-                ` Integrity check failed: ${err instanceof Error ? err.message : String(err)}`,
+                ` Health check failed: ${err instanceof Error ? err.message : String(err)}`,
                 ``,
             ];
         }
@@ -1530,6 +1588,9 @@ function setupKeypress() {
             else if (str === "m" || str === "M") {
                 await handleMaintenance();
             }
+            else if (str === "l" || str === "L") {
+                await handleLogout();
+            }
         }
     };
     process.stdin.on("keypress", keypressHandler);
@@ -1563,27 +1624,61 @@ async function handleConnect(node) {
         return;
     }
     const selectedDriver = node.ref.driver;
-    // Cloud with saved credentials — fetch projects/instances and connect
+    // Cloud with saved credentials — fetch projects/instances and let user pick
     if (selectedDriver === "cloud") {
         const cloudCfg = readCloudConfig();
-        if (cloudCfg?.token && cloudCfg?.url) {
+        if (cloudCfg?.token) {
             try {
                 const { projects } = await listProjects(cloudCfg);
+                const instanceOptions = [];
                 for (const project of projects) {
                     try {
                         const { instances } = await listInstances(cloudCfg, project.id);
-                        if (instances.length > 0) {
-                            const instance = instances[0];
-                            if (instance?.mcpUrl) {
-                                await connectToDriver("cloud", instance.mcpUrl, instance.mcpUrl, cloudCfg.token);
-                                return;
+                        for (const inst of instances) {
+                            if (inst.mcpUrl) {
+                                instanceOptions.push({
+                                    label: `${project.slug}/${inst.slug}`,
+                                    mcpUrl: inst.mcpUrl,
+                                    projectSlug: project.slug,
+                                    instanceSlug: inst.slug,
+                                });
                             }
                         }
                     }
                     catch {
-                        // Try next project
+                        // Skip projects that fail to list instances
                     }
                 }
+                if (instanceOptions.length > 0) {
+                    // Pre-select the saved instance if it exists
+                    const savedIdx = cloudCfg.instanceUrl
+                        ? instanceOptions.findIndex((o) => o.mcpUrl === cloudCfg.instanceUrl)
+                        : -1;
+                    const defaultVal = savedIdx >= 0 ? instanceOptions[savedIdx]?.label : instanceOptions[0]?.label;
+                    openForm("Connect to Cloud", [
+                        {
+                            id: "instance",
+                            label: "Instance",
+                            value: defaultVal ?? "",
+                            options: instanceOptions.map((o) => o.label),
+                        },
+                    ], async (vals) => {
+                        const selected = instanceOptions.find((o) => o.label === vals.instance);
+                        if (!selected) {
+                            viewerLines = [pc.red("No instance selected.")];
+                            draw();
+                            return;
+                        }
+                        // Save selection to cloud config
+                        cloudCfg.instanceUrl = selected.mcpUrl;
+                        cloudCfg.projectSlug = selected.projectSlug;
+                        cloudCfg.instanceSlug = selected.instanceSlug;
+                        writeCloudConfig(cloudCfg);
+                        await connectToDriver("cloud", selected.mcpUrl, selected.mcpUrl, cloudCfg.token);
+                    });
+                    return;
+                }
+                // No instances found — fall through to manual form
                 viewerLines = [
                     pc.yellow("No cloud instances found."),
                     pc.dim("Create one at https://thingd.cloud, or enter the Cloud URL manually."),
@@ -1641,18 +1736,39 @@ async function handleConnect(node) {
                     {
                         id: "path",
                         label: "Database Path",
-                        value: path.join(os.homedir(), "Downloads", "data.db"),
+                        value: defaultThingdDbPath(),
                     },
                 ]),
         ], async (vals) => {
             let cloudUrl;
             if (selectedDriver === "cloud") {
                 if (isCloudWithConfig) {
+                    if (!vals.project || !vals.instance) {
+                        viewerLines = [pc.red("Project and instance slugs are required.")];
+                        draw();
+                        return;
+                    }
                     // Construct URL from project + instance slugs
-                    cloudUrl = `${baseUrl}/mcp/${encodeURIComponent(vals.project || "")}/${encodeURIComponent(vals.instance || "")}`;
+                    cloudUrl = `${baseUrl}/mcp/${encodeURIComponent(vals.project)}/${encodeURIComponent(vals.instance)}`;
+                    // Save selection to cloud config
+                    const cfg = cloudCfg ?? { token: vals.token, url: baseUrl };
+                    cfg.instanceUrl = cloudUrl;
+                    cfg.projectSlug = vals.project;
+                    cfg.instanceSlug = vals.instance;
+                    if (vals.token) {
+                        cfg.token = vals.token;
+                    }
+                    writeCloudConfig(cfg);
                 }
                 else {
-                    cloudUrl = vals.url || "";
+                    if (!vals.url) {
+                        viewerLines = [pc.red("Cloud URL is required.")];
+                        draw();
+                        return;
+                    }
+                    cloudUrl = vals.url;
+                    // Save manual credentials to cloud config
+                    writeCloudConfig({ token: vals.token || "", url: cloudUrl });
                 }
                 await connectToDriver(selectedDriver, cloudUrl, cloudUrl, vals.token);
             }
@@ -1722,6 +1838,39 @@ async function handleSwitch() {
         scheduleLoad(first);
     }
 }
+async function handleLogout() {
+    // Close current connection if any
+    if (connected && db) {
+        try {
+            await db.close();
+        }
+        catch {
+            // ignore close errors
+        }
+    }
+    // Remove cloud credentials from disk
+    removeCloudConfig();
+    // Reset state
+    connected = false;
+    driver = "";
+    dbPath = "";
+    authToken = "";
+    cloudError = null;
+    collections = [];
+    streams = [];
+    queues = [];
+    objectsByCollection = new Map();
+    cursorIndex = 0;
+    scrollOffset = 0;
+    loadedItemId = "";
+    viewerLines = [pc.green("Logged out."), pc.dim("Select an environment to connect.")];
+    draw();
+    const tree = buildTree();
+    const first = tree[cursorIndex];
+    if (first) {
+        scheduleLoad(first);
+    }
+}
 // ── Entry Point ──────────────────────────────────────────────────────
 export async function runInteractiveCli() {
     // Go straight into the TUI — no pre-prompts
@@ -1741,12 +1890,20 @@ export async function runInteractiveCli() {
     }
     // Auto-connect to cloud if credentials exist
     const cloudCfg = readCloudConfig();
-    if (cloudCfg?.token && cloudCfg?.url) {
-        try {
-            await connectToDriver("cloud", cloudCfg.url, cloudCfg.url, cloudCfg.token);
-        }
-        catch {
-            // Auto-connect failed — fall through to environment selection
+    if (cloudCfg?.token) {
+        const cloudUrl = resolveCloudUrl(cloudCfg);
+        if (cloudUrl) {
+            try {
+                await connectToDriver("cloud", cloudUrl, cloudUrl, cloudCfg.token);
+            }
+            catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                viewerLines = [
+                    pc.yellow(`Auto-connect failed: ${msg}`),
+                    pc.dim("Select an environment to connect, or press 'r' to retry."),
+                ];
+                draw();
+            }
         }
     }
     setupKeypress();

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

@@ -87,4 +87,14 @@ export declare function pollCliAuth(config: CloudConfig, code: string): Promise<
 } | {
     status: string;
 }>;
+export type ResolvedInstance = {
+    mcpUrl: string;
+    projectSlug: string;
+    instanceSlug: string;
+};
+/**
+ * Fetch the first available cloud instance for the logged-in user.
+ * Returns null if no projects or instances exist.
+ */
+export declare function resolveFirstInstance(config: CloudConfig): Promise<ResolvedInstance | null>;
 //# 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":"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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,3 +99,32 @@ export async function startCliAuth(config) {
 export async function pollCliAuth(config, code) {
     return requestUnauthenticated(config.url ?? DEFAULT_API_URL, "/auth/cli/poll", { code });
 }
+/**
+ * Fetch the first available cloud instance for the logged-in user.
+ * Returns null if no projects or instances exist.
+ */
+export async function resolveFirstInstance(config) {
+    try {
+        const { projects } = await listProjects(config);
+        for (const project of projects) {
+            try {
+                const { instances } = await listInstances(config, project.id);
+                const instance = instances[0];
+                if (instance?.mcpUrl) {
+                    return {
+                        mcpUrl: instance.mcpUrl,
+                        projectSlug: project.slug,
+                        instanceSlug: instance.slug,
+                    };
+                }
+            }
+            catch {
+                // Skip projects that fail to list instances
+            }
+        }
+    }
+    catch {
+        // API unreachable or token invalid
+    }
+    return null;
+}

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

@@ -4,9 +4,20 @@ export type CloudConfig = {
     url?: string;
     /** Currently active organization context (set by `thingd cloud org use`). */
     organizationId?: string;
+    /** Resolved MCP URL for the active cloud instance (auto-discovered or set by `thingd cloud instance use`). */
+    instanceUrl?: string;
+    /** Active project slug (set when instanceUrl is resolved). */
+    projectSlug?: string;
+    /** Active instance slug (set when instanceUrl is resolved). */
+    instanceSlug?: string;
 };
 export declare function cloudConfigPath(): string;
 export declare function readCloudConfig(): CloudConfig | null;
 export declare function writeCloudConfig(config: CloudConfig): void;
+/**
+ * Returns the best available cloud MCP URL from saved config.
+ * Priority: instanceUrl > url (with /mcp appended if bare).
+ */
+export declare function resolveCloudUrl(config: CloudConfig): string | undefined;
 export declare function removeCloudConfig(): void;
 //# sourceMappingURL=cloud-config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cloud-config.d.ts","sourceRoot":"","sources":["../../src/lib/cloud-config.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,eAAe,IAAI,WAAW,GAAG,IAAI,CAUpD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAG1D;AAED,wBAAgB,iBAAiB,IAAI,IAAI,CAMxC"}
+{"version":3,"file":"cloud-config.d.ts","sourceRoot":"","sources":["../../src/lib/cloud-config.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,8GAA8G;IAC9G,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8DAA8D;IAC9D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,eAAe,IAAI,WAAW,GAAG,IAAI,CAUpD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAG1D;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAYvE;AAED,wBAAgB,iBAAiB,IAAI,IAAI,CAMxC"}

package/dist/lib/cloud-config.js

@@ -21,6 +21,23 @@ export function writeCloudConfig(config) {
     ensureThingdDir();
     writeFileSync(cloudConfigPath(), JSON.stringify(config, null, 2), "utf-8");
 }
+/**
+ * Returns the best available cloud MCP URL from saved config.
+ * Priority: instanceUrl > url (with /mcp appended if bare).
+ */
+export function resolveCloudUrl(config) {
+    if (config.instanceUrl) {
+        return config.instanceUrl;
+    }
+    if (config.url) {
+        const u = new URL(config.url);
+        if (u.pathname === "" || u.pathname === "/") {
+            u.pathname = "/mcp";
+        }
+        return u.toString();
+    }
+    return undefined;
+}
 export function removeCloudConfig() {
     try {
         unlinkSync(cloudConfigPath());

package/package.json

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