@mycadet/cli 0.12.8 → 0.12.9-dev.202610131620.d833e01

package/node_modules/@mycadet/assistant-api/events/show-cloud-login.ts

@@ -1,5 +1,5 @@
 /**
- * `show_platform_login` SSE event.
+ * `show_cloud_login` SSE event.
  *
  * Emitted by the cloud-connect route when no cloud credentials are
  * stored yet, signalling connected clients to surface the cloud login UI.
@@ -12,7 +12,7 @@
 import { z } from "zod";
 
 export const ShowCloudLoginEventSchema = z.object({
-  type: z.literal("show_platform_login"),
+  type: z.literal("show_cloud_login"),
 });
 
 export type ShowCloudLoginEvent = z.infer<typeof ShowCloudLoginEventSchema>;

package/node_modules/@mycadet/assistant-api/node_modules/@mycadet/service-contracts/package.json

@@ -40,6 +40,6 @@
   },
   "devDependencies": {
     "@types/bun": "1.2.4",
-    "typescript": "5.7.3"
+    "typescript": "5.9.3"
   }
 }

package/node_modules/@mycadet/local-mode/node_modules/@mycadet/service-contracts/package.json

@@ -40,6 +40,6 @@
   },
   "devDependencies": {
     "@types/bun": "1.2.4",
-    "typescript": "5.7.3"
+    "typescript": "5.9.3"
   }
 }

package/node_modules/@mycadet/service-contracts/package.json

@@ -40,6 +40,6 @@
   },
   "devDependencies": {
     "@types/bun": "1.2.4",
-    "typescript": "5.7.3"
+    "typescript": "5.9.3"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mycadet/cli",
-  "version": "0.12.8",
+  "version": "0.12.9-dev.202610131620.d833e01",
   "description": "CLI tools for mycadet",
   "type": "module",
   "exports": {
@@ -15,7 +15,7 @@
     "./src/commands/*": "./src/commands/*.ts"
   },
   "bin": {
-    "cadet": "./src/index.ts"
+    "cadet-dev": "./src/index.ts"
   },
   "scripts": {
     "format": "prettier --write .",
@@ -24,7 +24,7 @@
     "lint:unused": "knip --include files,dependencies,unlisted",
     "compile:check": "bun build --compile src/index.ts --outfile /dev/null",
     "test": "bun run scripts/run-tests.ts",
-    "typecheck": "bunx tsc --noEmit"
+    "typecheck": "bunx tsgo --noEmit"
   },
   "author": "Cadet AI",
   "license": "MIT",
@@ -57,6 +57,7 @@
     "@types/bun": "1.3.11",
     "@types/qrcode-terminal": "0.12.2",
     "@types/react": "19.2.14",
+    "@typescript/native-preview": "7.0.0-dev.20260624.1",
     "eslint": "10.1.0",
     "knip": "5.88.1",
     "prettier": "3.8.1",

package/src/__tests__/client-web-config.test.ts

@@ -13,7 +13,6 @@ import { buildWebInterfaceConfig } from "../commands/client.js";
 const BASE = {
   webUrl: "https://app.example.com",
   cloudUrl: "https://platform.example.com",
-  disableCloud: true,
 };
 
 describe("cadet client web __config", () => {

package/src/__tests__/cloud-releases.test.ts

@@ -7,7 +7,11 @@ import {
   resolveOwnImageRefs,
 } from "../lib/cloud-releases.js";
 import { dockerhubImages } from "../lib/docker.js";
-import { isDevVersion, isLocalVersion, isStagingVersion } from "../lib/version-compat.js";
+import {
+  isDevVersion,
+  isLocalVersion,
+  isStagingVersion,
+} from "../lib/version-compat.js";
 
 const originalFetch = globalThis.fetch;
 
@@ -79,12 +83,12 @@ describe("fetchReleases", () => {
 });
 
 describe("resolveImageRefs", () => {
-  test("released CLI resolves un-suffixed repos tagged with the target version", () => {
+  test("released CLI resolves un-suffixed repos tagged with the bare version", () => {
     const tags = resolveImageRefs("v0.12.6", "0.12.6");
-    expect(tags.assistant).toBe("mycadet/mycadet-assistant:v0.12.6");
-    expect(tags.gateway).toBe("mycadet/mycadet-gateway:v0.12.6");
+    expect(tags.assistant).toBe("mycadet/mycadet-assistant:0.12.6");
+    expect(tags.gateway).toBe("mycadet/mycadet-gateway:0.12.6");
     expect(tags["credential-executor"]).toBe(
-      "mycadet/mycadet-credential-executor:v0.12.6",
+      "mycadet/mycadet-credential-executor:0.12.6",
     );
   });
 
@@ -94,31 +98,32 @@ describe("resolveImageRefs", () => {
       "0.12.6-dev.202610081023.3a27b77",
     );
     expect(tags.assistant).toBe(
-      "mycadet/mycadet-assistant-dev:v0.12.6-dev.202610081023.3a27b77",
+      "mycadet/mycadet-assistant-dev:0.12.6-dev.202610081023.3a27b77",
     );
     expect(tags.gateway).toBe(
-      "mycadet/mycadet-gateway-dev:v0.12.6-dev.202610081023.3a27b77",
+      "mycadet/mycadet-gateway-dev:0.12.6-dev.202610081023.3a27b77",
     );
     expect(tags["credential-executor"]).toBe(
-      "mycadet/mycadet-credential-executor-dev:v0.12.6-dev.202610081023.3a27b77",
+      "mycadet/mycadet-credential-executor-dev:0.12.6-dev.202610081023.3a27b77",
     );
   });
 
   test("repo suffix follows the CLI version, tag follows the target", () => {
     const tags = resolveImageRefs("v0.12.5", "0.12.6-dev.202610081023.3a27b77");
-    expect(tags.assistant).toBe("mycadet/mycadet-assistant-dev:v0.12.5");
+    expect(tags.assistant).toBe("mycadet/mycadet-assistant-dev:0.12.5");
   });
 
   test("does not consult the network", async () => {
     mockFetchError();
     const tags = resolveImageRefs("v0.12.6", "0.12.6");
-    expect(tags.assistant).toContain(":v0.12.6");
+    expect(tags.assistant).toContain(":0.12.6");
   });
 
-  test("normalizes the v-prefix on the tag", () => {
+  test("normalizes the v-prefix off the tag", () => {
     const withoutPrefix = resolveImageRefs("0.12.6", "0.12.6");
     const withPrefix = resolveImageRefs("v0.12.6", "0.12.6");
-    expect(withoutPrefix.assistant).toBe(withPrefix.assistant);
+    expect(withoutPrefix.assistant).toBe("mycadet/mycadet-assistant:0.12.6");
+    expect(withPrefix.assistant).toBe(withoutPrefix.assistant);
   });
 });
 
@@ -126,9 +131,14 @@ describe("resolveOwnImageRefs", () => {
   test("uses the CLI's own version for both tag and repo suffix", () => {
     const tags = resolveOwnImageRefs("0.12.6-dev.202610081023.3a27b77");
     expect(tags.assistant).toBe(
-      "mycadet/mycadet-assistant-dev:v0.12.6-dev.202610081023.3a27b77",
+      "mycadet/mycadet-assistant-dev:0.12.6-dev.202610081023.3a27b77",
     );
   });
+
+  test("falls back to the literal latest tag when the CLI version is unknown", () => {
+    const tags = resolveOwnImageRefs("");
+    expect(tags.assistant).toBe("mycadet/mycadet-assistant:latest");
+  });
 });
 
 describe("dockerhubImages", () => {

package/src/__tests__/ensure-binary.test.ts

@@ -0,0 +1,182 @@
+import { describe, expect, test } from "bun:test";
+import { Readable, Writable } from "node:stream";
+
+import { ensureBinaryInstalled, readLineText } from "../lib/ensure-binary.js";
+
+/** A real Writable capturing everything written, as a test output stream. */
+function makeOutput(): { writable: Writable; text(): string } {
+  const captured: string[] = [];
+  const writable = new Writable({
+    write(chunk, _encoding, callback) {
+      captured.push(chunk.toString());
+      callback();
+    },
+  });
+  return { writable, text: () => captured.join("") };
+}
+
+describe("ensureBinaryInstalled", () => {
+  test("returns the existing probe result without prompting", async () => {
+    const output = makeOutput();
+    const version = await ensureBinaryInstalled({
+      binary: "nginx",
+      purpose: "the tunnel edge",
+      packages: { brew: ["brew", "install", "nginx"] },
+      manualHint: "install nginx",
+      probe: () => "nginx version 1.2",
+      confirmInstall: () => {
+        throw new Error("must not prompt for a present binary");
+      },
+      streams: { output: output.writable },
+    });
+    expect(version).toBe("nginx version 1.2");
+    expect(output.text()).toBe("");
+  });
+
+  test("offers to install and runs the first available package manager", async () => {
+    const output = makeOutput();
+    const installed: string[][] = [];
+    let probeCalls = 0;
+    const version = await ensureBinaryInstalled({
+      binary: "nginx",
+      purpose: "the tunnel edge",
+      packages: {
+        brew: ["brew", "install", "nginx"],
+        "apt-get": ["sudo", "apt-get", "install", "-y", "nginx"],
+      },
+      manualHint: "install nginx yourself",
+      probe: () => (++probeCalls > 1 ? "nginx version 1.2" : null),
+      pmAvailable: (pm) => pm === "apt-get",
+      runInstall: (argv) => {
+        installed.push(argv);
+        return true;
+      },
+      confirmInstall: async () => true,
+      streams: { output: output.writable },
+    });
+    expect(version).toBe("nginx version 1.2");
+    expect(installed).toEqual([["sudo", "apt-get", "install", "-y", "nginx"]]);
+    expect(output.text()).toContain("isn't installed");
+    expect(output.text()).not.toContain("apt-get install");
+  });
+
+  test("the default confirm takes Enter as yes", async () => {
+    const output = makeOutput();
+    const input = Object.assign(new Readable({ read() {} }), {
+      isTTY: true,
+    });
+    const installed: string[][] = [];
+    let probeCalls = 0;
+    const pending = ensureBinaryInstalled({
+      binary: "nginx",
+      purpose: "the tunnel edge",
+      packages: { brew: ["brew", "install", "nginx"] },
+      manualHint: "install nginx yourself",
+      probe: () => (++probeCalls > 1 ? "nginx version 1.2" : null),
+      pmAvailable: () => true,
+      runInstall: (argv) => {
+        installed.push(argv);
+        return true;
+      },
+      streams: { input, output: output.writable },
+    });
+    input.emit("data", "\n");
+    expect(await pending).toBe("nginx version 1.2");
+    expect(installed).toEqual([["brew", "install", "nginx"]]);
+    expect(output.text()).toContain("Install nginx now?");
+  });
+
+  test("a declined offer prints the manual hint and installs nothing", async () => {
+    const output = makeOutput();
+    let ran = false;
+    const version = await ensureBinaryInstalled({
+      binary: "ngrok",
+      purpose: "the ngrok tunnel",
+      packages: { brew: ["brew", "install", "ngrok/ngrok/ngrok"] },
+      manualHint: "get ngrok from ngrok.com",
+      probe: () => null,
+      runInstall: () => {
+        ran = true;
+        return true;
+      },
+      confirmInstall: async () => false,
+      streams: { output: output.writable },
+    });
+    expect(version).toBe(null);
+    expect(ran).toBe(false);
+    expect(output.text()).toContain("get ngrok from ngrok.com");
+  });
+
+  test("a failed install falls back to the manual hint", async () => {
+    const output = makeOutput();
+    const version = await ensureBinaryInstalled({
+      binary: "nginx",
+      purpose: "the tunnel edge",
+      packages: { brew: ["brew", "install", "nginx"] },
+      manualHint: "install nginx yourself",
+      probe: () => null,
+      runInstall: () => false,
+      confirmInstall: async () => true,
+      streams: { output: output.writable },
+    });
+    expect(version).toBe(null);
+    expect(output.text()).toContain("install nginx yourself");
+  });
+
+  test("no matching package manager prints the hint", async () => {
+    const output = makeOutput();
+    let ran = false;
+    const version = await ensureBinaryInstalled({
+      binary: "cloudflared",
+      purpose: "the cloudflare tunnel",
+      packages: { brew: ["brew", "install", "cloudflared"] },
+      manualHint: "cloudflared install docs",
+      probe: () => null,
+      pmAvailable: () => false,
+      runInstall: () => {
+        ran = true;
+        return true;
+      },
+      confirmInstall: async () => true,
+      streams: { output: output.writable },
+    });
+    expect(version).toBe(null);
+    expect(ran).toBe(false);
+    expect(output.text()).toContain("cloudflared install docs");
+  });
+
+  test("a non-interactive terminal declines instead of hanging", async () => {
+    const version = await ensureBinaryInstalled({
+      binary: "nginx",
+      purpose: "the tunnel edge",
+      packages: { brew: ["brew", "install", "nginx"] },
+      manualHint: "install nginx yourself",
+      probe: () => null,
+      confirmInstall: async () => {
+        throw new Error("Install confirm requires an interactive terminal.");
+      },
+    });
+    expect(version).toBe(null);
+  });
+});
+
+describe("readLineText", () => {
+  test("resolves the first line and ignores the rest", async () => {
+    const output = makeOutput();
+    const input = new Readable({ read() {} });
+    const pending = readLineText("token: ", {
+      input,
+      output: output.writable,
+    });
+    input.emit("data", "abc123\nsecond line\n");
+    expect(await pending).toBe("abc123");
+    expect(output.text()).toBe("token: ");
+  });
+
+  test("resolves an empty line on an immediate newline", async () => {
+    const input = new Readable({ read() {} });
+    const pending = readLineText("[Y/n] ", { input });
+    input.emit("data", "\n");
+    expect(await pending).toBe("");
+  });
+});

package/src/__tests__/nginx-ingress.test.ts

@@ -160,7 +160,6 @@ describe("buildIngressNginxConfig", () => {
       config: {
         remote: "docker",
         apiBaseUrl: "/v1",
-        cloudDisabled: true,
       },
     },
   });
@@ -330,7 +329,7 @@ describe("buildIngressNginxConfig", () => {
     expect(remoteConf).toContain("default_type application/json;");
     expect(remoteConf).toContain('add_header Cache-Control "no-store";');
     expect(remoteConf).toContain(
-      'return 200 "{\\"remote\\":\\"docker\\",\\"apiBaseUrl\\":\\"/v1\\",\\"cloudDisabled\\":true,\\"disableCloud\\":true}";',
+      'return 200 "{\\"remote\\":\\"docker\\",\\"apiBaseUrl\\":\\"/v1\\"}";',
     );
     expect(remoteConf).not.toContain("assistantId");
   });
@@ -347,7 +346,7 @@ describe("buildIngressNginxConfig", () => {
       },
     });
     expect(named).toContain(
-      'return 200 "{\\"remote\\":\\"custom\\",\\"apiBaseUrl\\":\\"/v1\\",\\"cloudDisabled\\":true,\\"disableCloud\\":true,\\"assistantName\\":\\"Homelab\\",\\"assistantId\\":\\"assistant-1\\",\\"hubUrl\\":\\"https://mycadet.ai/assistant\\"}";',
+      'return 200 "{\\"remote\\":\\"custom\\",\\"apiBaseUrl\\":\\"/v1\\",\\"assistantName\\":\\"Homelab\\",\\"assistantId\\":\\"assistant-1\\",\\"hubUrl\\":\\"https://mycadet.ai/assistant\\"}";',
     );
   });
 
@@ -449,14 +448,13 @@ describe("buildRemoteWebIndexHtml", () => {
     const result = buildRemoteWebIndexHtml(html, {
       remote: "docker",
       apiBaseUrl: "/v1",
-      disableCloud: true,
     });
 
     expect(result).toContain(
       'window.__CADET_CONFIG__={"webUrl":"https://mycadet.ai"}',
     );
     expect(result).toContain(
-      'window.__CADET_CONFIG__={"remote":"docker","apiBaseUrl":"/v1","disableCloud":true}',
+      'window.__CADET_CONFIG__={"remote":"docker","apiBaseUrl":"/v1"}',
     );
     expect(result.indexOf('"webUrl"')).toBeLessThan(
       result.indexOf('"docker"'),
@@ -864,8 +862,6 @@ function spaConfigHash(
         config: {
           remote: "custom",
           apiBaseUrl: "/v1",
-          cloudDisabled: true,
-          disableCloud: true,
           ...(opts.assistantName ? { assistantName: opts.assistantName } : {}),
           ...(opts.assistantId ? { assistantId: opts.assistantId } : {}),
           hubUrl: PRODUCTION_HUB_URL,
@@ -1354,8 +1350,6 @@ describe("startRemoteWebIngress", () => {
           config: {
             remote: "custom",
             apiBaseUrl: "/v1",
-            cloudDisabled: true,
-            disableCloud: true,
             hubUrl: PRODUCTION_HUB_URL,
           },
         }),
@@ -2095,8 +2089,9 @@ describe("ensureTunnelEdge", () => {
       gatewayPort: 7830,
     });
 
-    await expect(promise).rejects.toThrow("brew install nginx");
-    await expect(promise).rejects.toThrow("apt install nginx");
+    await expect(promise).rejects.toThrow(
+      "See https://nginx.org/en/docs/install.html for how to install",
+    );
     await expect(promise).rejects.toThrow("NGINX_BIN");
     expect(spawnMock).not.toHaveBeenCalled();
   });

package/src/__tests__/ngrok-spawn.test.ts

@@ -0,0 +1,49 @@
+import { describe, expect, test } from "bun:test";
+
+import { buildNgrokSpawnArgs, isNgrokAuthError } from "../lib/tunnels/ngrok.js";
+
+describe("buildNgrokSpawnArgs", () => {
+  test("spawns a plain http agent against the loopback edge", () => {
+    expect(buildNgrokSpawnArgs(7830)).toEqual([
+      "http",
+      "127.0.0.1:7830",
+      "--log=stdout",
+    ]);
+  });
+
+  test("never passes --config so the default (authtoken-bearing) config loads", () => {
+    const args = buildNgrokSpawnArgs(7830, "me.ngrok.app");
+    expect(args.some((arg) => arg.startsWith("--config"))).toBe(false);
+  });
+
+  test("binds a reserved domain when given", () => {
+    expect(buildNgrokSpawnArgs(7830, "my-assistant.ngrok.app")).toEqual([
+      "http",
+      "127.0.0.1:7830",
+      "--log=stdout",
+      "--domain=my-assistant.ngrok.app",
+    ]);
+  });
+});
+
+describe("isNgrokAuthError", () => {
+  test("recognizes the free-account authtoken requirement", () => {
+    expect(
+      isNgrokAuthError(
+        "FATAL: authentication failed: Usage of ngrok requires a free authtoken. ERR_NGROK_105",
+      ),
+    ).toBe(true);
+  });
+
+  test("recognizes an unauthorized token", () => {
+    expect(isNgrokAuthError("unauthorized authtoken ERR_NGROK_401")).toBe(true);
+  });
+
+  test("does not claim other startup failures are auth errors", () => {
+    expect(
+      isNgrokAuthError(
+        "creating tunnel session failed: dial tcp 3.219.x.x:443: connection refused",
+      ),
+    ).toBe(false);
+  });
+});