@mycadet/cli 0.12.7 → 0.12.8

package/src/__tests__/retire.test.ts

@@ -21,7 +21,7 @@ import { join } from "node:path";
 import type { AssistantEntry } from "../lib/assistant-config.js";
 import { loadAllAssistants } from "../lib/assistant-config.js";
 import * as loopbackFetchModule from "../lib/loopback-fetch.js";
-import * as platformClientModule from "../lib/platform-client.js";
+import * as cloudClientModule from "../lib/cloud-client.js";
 import * as retireLocalModule from "../lib/retire-local.js";
 
 const testDir = mkdtempSync(join(tmpdir(), "cli-retire-test-"));
@@ -35,11 +35,11 @@ const originalStdinIsRaw = process.stdin.isRaw;
 const originalSetRawMode = process.stdin.setRawMode;
 const originalStdoutWrite = process.stdout.write;
 const realRetireLocalModule = { ...retireLocalModule };
-const realPlatformClientModule = { ...platformClientModule };
+const realCloudClientModule = { ...cloudClientModule };
 const realLoopbackFetchModule = { ...loopbackFetchModule };
 
 const retireLocalMock = mock(async () => {});
-const readPlatformTokenMock = mock((): string | null => null);
+const readCloudTokenMock = mock((): string | null => null);
 const authHeadersMock = mock(async () => ({
   "Content-Type": "application/json",
   "X-Session-Token": "session-token",
@@ -51,7 +51,7 @@ const authHeadersForKnownOrganizationMock = mock(
     "Cadet-Organization-Id": organizationId,
   }),
 );
-const getPlatformUrlMock = mock(() => "https://platform.example.com");
+const getCloudUrlMock = mock(() => "https://platform.example.com");
 const readGatewayCredentialMock = mock(
   async (
     _gatewayUrl: string,
@@ -71,12 +71,12 @@ mock.module("../lib/retire-local.js", () => ({
   retireLocal: retireLocalMock,
 }));
 
-mock.module("../lib/platform-client.js", () => ({
+mock.module("../lib/cloud-client.js", () => ({
   authHeaders: authHeadersMock,
   authHeadersForKnownOrganization: authHeadersForKnownOrganizationMock,
-  getPlatformUrl: getPlatformUrlMock,
+  getCloudUrl: getCloudUrlMock,
   readGatewayCredential: readGatewayCredentialMock,
-  readPlatformToken: readPlatformTokenMock,
+  readCloudToken: readCloudTokenMock,
 }));
 
 mock.module("../lib/loopback-fetch.js", () => ({
@@ -168,7 +168,11 @@ describe("cadet retire", () => {
   beforeEach(() => {
     process.env.CADET_LOCKFILE_DIR = testDir;
     delete process.env.CADET_PLATFORM_TOKEN;
-    for (const name of ["lockfile.json", ".cadet.lock.json", ".cadet.lockfile.json"]) {
+    for (const name of [
+      "lockfile.json",
+      ".cadet.lock.json",
+      ".cadet.lockfile.json",
+    ]) {
       rmSync(join(testDir, name), { force: true });
     }
     process.argv = ["bun", "cadet", "retire"];
@@ -177,8 +181,8 @@ describe("cadet retire", () => {
     }) as typeof process.exit;
     retireLocalMock.mockReset();
     retireLocalMock.mockResolvedValue(undefined);
-    readPlatformTokenMock.mockReset();
-    readPlatformTokenMock.mockReturnValue(null);
+    readCloudTokenMock.mockReset();
+    readCloudTokenMock.mockReturnValue(null);
     authHeadersMock.mockReset();
     authHeadersMock.mockResolvedValue({
       "Content-Type": "application/json",
@@ -192,8 +196,8 @@ describe("cadet retire", () => {
         "Cadet-Organization-Id": organizationId,
       }),
     );
-    getPlatformUrlMock.mockReset();
-    getPlatformUrlMock.mockReturnValue("https://platform.example.com");
+    getCloudUrlMock.mockReset();
+    getCloudUrlMock.mockReturnValue("https://platform.example.com");
     readGatewayCredentialMock.mockReset();
     readGatewayCredentialMock.mockResolvedValue({
       value: null,
@@ -220,7 +224,7 @@ describe("cadet retire", () => {
 
   afterAll(() => {
     mock.module("../lib/retire-local.js", () => realRetireLocalModule);
-    mock.module("../lib/platform-client.js", () => realPlatformClientModule);
+    mock.module("../lib/cloud-client.js", () => realCloudClientModule);
     mock.module("../lib/loopback-fetch.js", () => realLoopbackFetchModule);
     if (originalLockfileDir === undefined) {
       delete process.env.CADET_LOCKFILE_DIR;
@@ -252,35 +256,25 @@ describe("cadet retire", () => {
     );
   });
 
-  test("local retire unregisters the self-hosted platform record first", async () => {
-    const entry = makeEntry("assistant-1", { name: "Example Assistant" });
-    writeLockfile([entry]);
-    readPlatformTokenMock.mockReturnValue("session-token");
-    getPlatformUrlMock.mockReturnValue("https://platform.example.test/api");
-    readGatewayCredentialMock.mockImplementation(async (_gatewayUrl, name) => {
-      if (name === "cadet:platform_assistant_id") {
-        return { value: "platform-assistant-1", unreachable: false };
-      }
-      if (name === "cadet:platform_base_url") {
-        return { value: "https://platform.example.test", unreachable: false };
-      }
-      if (name === "cadet:platform_organization_id") {
-        return { value: "org-123", unreachable: false };
-      }
-      return { value: null, unreachable: false };
+  test("local retire unregisters the cloud record straight from the lockfile entry", async () => {
+    const entry = makeEntry("assistant-1", {
+      name: "Example Assistant",
+      localUrl: "http://127.0.0.1:7831",
+      cloudAssistantId: "cloud-asst-1",
+      cloudOrganizationId: "org-123",
     });
+    writeLockfile([entry]);
+    readCloudTokenMock.mockReturnValue("session-token");
+    getCloudUrlMock.mockReturnValue("https://platform.example.test");
     process.argv = ["bun", "cadet", "retire", "assistant-1", "--yes"];
 
     await retire();
 
-    expect(readGatewayCredentialMock).toHaveBeenCalledWith(
-      entry.localUrl ?? entry.runtimeUrl,
-      "cadet:platform_assistant_id",
-      entry.bearerToken,
-    );
-    expect(authHeadersMock).not.toHaveBeenCalled();
+    // The cloud record resolves from the entry + env — the local gateway
+    // credential store is never consulted.
+    expect(readGatewayCredentialMock).not.toHaveBeenCalled();
     expect(loopbackSafeFetchMock).toHaveBeenCalledWith(
-      "https://platform.example.test/api/v1/assistants/platform-assistant-1/retire/",
+      "https://platform.example.test/v1/assistants/cloud-asst-1/retire/",
       {
         method: "DELETE",
         headers: {
@@ -294,194 +288,67 @@ describe("cadet retire", () => {
     expect(loadAllAssistants()).toEqual([]);
   });
 
-  test("local retire reads platform registration through the loopback gateway URL", async () => {
-    const localGatewayUrl = "http://127.0.0.1:7831";
-    const entry = makeEntry("assistant-1", {
-      name: "Example Assistant",
-      runtimeUrl: "http://assistant-1.local:7831",
-      localUrl: localGatewayUrl,
-    });
-    writeLockfile([entry]);
-    readPlatformTokenMock.mockReturnValue("session-token");
-    getPlatformUrlMock.mockReturnValue("https://platform.example.test");
-    readGatewayCredentialMock.mockImplementation(async (gatewayUrl, name) => {
-      expect(gatewayUrl).toBe(localGatewayUrl);
-      if (name === "cadet:platform_assistant_id") {
-        return { value: "platform-assistant-1", unreachable: false };
-      }
-      if (name === "cadet:platform_base_url") {
-        return { value: "https://platform.example.test", unreachable: false };
-      }
-      if (name === "cadet:platform_organization_id") {
-        return { value: "org-123", unreachable: false };
-      }
-      return { value: null, unreachable: false };
-    });
-    process.argv = ["bun", "cadet", "retire", "assistant-1", "--yes"];
-
-    await retire();
-
-    expect(readGatewayCredentialMock).toHaveBeenCalledWith(
-      localGatewayUrl,
-      "cadet:platform_assistant_id",
-      entry.bearerToken,
-    );
-    expect(readGatewayCredentialMock).toHaveBeenCalledWith(
-      localGatewayUrl,
-      "cadet:platform_base_url",
-      entry.bearerToken,
-    );
-    expect(readGatewayCredentialMock).toHaveBeenCalledWith(
-      localGatewayUrl,
-      "cadet:platform_organization_id",
-      entry.bearerToken,
-    );
-    expect(loopbackSafeFetchMock).toHaveBeenCalledWith(
-      "https://platform.example.test/v1/assistants/platform-assistant-1/retire/",
-      expect.any(Object),
-    );
-    expect(retireLocalMock).toHaveBeenCalledWith("assistant-1", entry);
-  });
-
-  test("local retire uses saved platform registration when local credentials are unreachable", async () => {
+  test("local retire resolves the organization via the cloud when the entry omits it", async () => {
     const entry = makeEntry("assistant-1", {
       name: "Example Assistant",
-      platformAssistantId: "platform-assistant-1",
-      platformBaseUrl: "https://platform.example.test",
-      platformOrganizationId: "org-123",
+      cloudAssistantId: "cloud-asst-1",
     });
     writeLockfile([entry]);
-    readPlatformTokenMock.mockReturnValue("session-token");
-    getPlatformUrlMock.mockReturnValue("https://platform.example.test");
-    readGatewayCredentialMock.mockResolvedValue({
-      value: null,
-      unreachable: true,
-    });
+    readCloudTokenMock.mockReturnValue("session-token");
+    getCloudUrlMock.mockReturnValue("https://platform.example.test");
     process.argv = ["bun", "cadet", "retire", "assistant-1", "--yes"];
 
     await retire();
 
-    expect(readGatewayCredentialMock).toHaveBeenCalledWith(
-      entry.localUrl ?? entry.runtimeUrl,
-      "cadet:platform_assistant_id",
-      entry.bearerToken,
+    expect(authHeadersMock).toHaveBeenCalledWith(
+      "session-token",
+      "https://platform.example.test",
     );
+    expect(authHeadersForKnownOrganizationMock).not.toHaveBeenCalled();
     expect(loopbackSafeFetchMock).toHaveBeenCalledWith(
-      "https://platform.example.test/v1/assistants/platform-assistant-1/retire/",
+      "https://platform.example.test/v1/assistants/cloud-asst-1/retire/",
       {
         method: "DELETE",
         headers: {
           "Content-Type": "application/json",
           "X-Session-Token": "session-token",
-          "Cadet-Organization-Id": "org-123",
         },
       },
     );
-    expect(consoleWarnSpy.mock.calls.flat().join("\n")).toContain(
-      "using saved platform registration",
-    );
     expect(retireLocalMock).toHaveBeenCalledWith("assistant-1", entry);
     expect(loadAllAssistants()).toEqual([]);
   });
 
-  test("local retire continues when local credentials are unreachable and no saved platform registration exists", async () => {
+  test("local retire skips the cloud unregister when no assistant id is bound", async () => {
     const entry = makeEntry("assistant-1", { name: "Example Assistant" });
     writeLockfile([entry]);
-    readPlatformTokenMock.mockReturnValue("session-token");
-    readGatewayCredentialMock.mockResolvedValue({
-      value: null,
-      unreachable: true,
-    });
+    readCloudTokenMock.mockReturnValue("session-token");
+    getCloudUrlMock.mockReturnValue("https://platform.example.test");
     process.argv = ["bun", "cadet", "retire", "assistant-1", "--yes"];
 
     await retire();
 
     expect(loopbackSafeFetchMock).not.toHaveBeenCalled();
-    expect(consoleWarnSpy.mock.calls.flat().join("\n")).toContain(
-      "no saved platform registration is available",
-    );
-    expect(retireLocalMock).toHaveBeenCalledWith("assistant-1", entry);
-    expect(loadAllAssistants()).toEqual([]);
-  });
-
-  test("local retire skips platform unregister when stored platform URL origin mismatches", async () => {
-    const entry = makeEntry("assistant-1", { name: "Example Assistant" });
-    writeLockfile([entry]);
-    readPlatformTokenMock.mockReturnValue("session-token");
-    getPlatformUrlMock.mockReturnValue("https://platform.example.com");
-    readGatewayCredentialMock.mockImplementation(async (_gatewayUrl, name) => {
-      if (name === "cadet:platform_assistant_id") {
-        return { value: "platform-assistant-1", unreachable: false };
-      }
-      if (name === "cadet:platform_base_url") {
-        return { value: "https://malicious.example.test", unreachable: false };
-      }
-      if (name === "cadet:platform_organization_id") {
-        return { value: "org-123", unreachable: false };
-      }
-      return { value: null, unreachable: false };
-    });
-    process.argv = ["bun", "cadet", "retire", "assistant-1", "--yes"];
-
-    await retire();
-
-    expect(loopbackSafeFetchMock).not.toHaveBeenCalled();
-    expect(consoleWarnSpy.mock.calls.flat().join("\n")).toContain(
-      "Stored platform URL does not match the configured platform URL",
-    );
-    expect(retireLocalMock).toHaveBeenCalledWith("assistant-1", entry);
-  });
-
-  test("local retire skips platform unregister when stored organization ID is missing", async () => {
-    const entry = makeEntry("assistant-1", { name: "Example Assistant" });
-    writeLockfile([entry]);
-    readPlatformTokenMock.mockReturnValue("session-token");
-    getPlatformUrlMock.mockReturnValue("https://platform.example.test");
-    readGatewayCredentialMock.mockImplementation(async (_gatewayUrl, name) => {
-      if (name === "cadet:platform_assistant_id") {
-        return { value: "platform-assistant-1", unreachable: false };
-      }
-      if (name === "cadet:platform_base_url") {
-        return { value: "https://platform.example.test", unreachable: false };
-      }
-      return { value: null, unreachable: false };
-    });
-    process.argv = ["bun", "cadet", "retire", "assistant-1", "--yes"];
-
-    await retire();
-
-    expect(loopbackSafeFetchMock).not.toHaveBeenCalled();
-    expect(consoleWarnSpy.mock.calls.flat().join("\n")).toContain(
-      "Could not read platform organization ID",
-    );
     expect(retireLocalMock).toHaveBeenCalledWith("assistant-1", entry);
     expect(loadAllAssistants()).toEqual([]);
   });
 
   test("local retire uses injected platform token from the app host", async () => {
-    const entry = makeEntry("assistant-1", { name: "Example Assistant" });
+    const entry = makeEntry("assistant-1", {
+      name: "Example Assistant",
+      cloudAssistantId: "cloud-asst-1",
+      cloudOrganizationId: "org-123",
+    });
     writeLockfile([entry]);
     process.env.CADET_PLATFORM_TOKEN = "host-session-token";
-    readPlatformTokenMock.mockReturnValue(null);
-    getPlatformUrlMock.mockReturnValue("https://platform.example.test");
-    readGatewayCredentialMock.mockImplementation(async (_gatewayUrl, name) => {
-      if (name === "cadet:platform_assistant_id") {
-        return { value: "platform-assistant-1", unreachable: false };
-      }
-      if (name === "cadet:platform_base_url") {
-        return { value: "https://platform.example.test", unreachable: false };
-      }
-      if (name === "cadet:platform_organization_id") {
-        return { value: "org-123", unreachable: false };
-      }
-      return { value: null, unreachable: false };
-    });
+    readCloudTokenMock.mockReturnValue(null);
+    getCloudUrlMock.mockReturnValue("https://platform.example.test");
     process.argv = ["bun", "cadet", "retire", "assistant-1", "--yes"];
 
     await retire();
 
     expect(loopbackSafeFetchMock).toHaveBeenCalledWith(
-      "https://platform.example.test/v1/assistants/platform-assistant-1/retire/",
+      "https://platform.example.test/v1/assistants/cloud-asst-1/retire/",
       {
         method: "DELETE",
         headers: {
@@ -494,23 +361,15 @@ describe("cadet retire", () => {
     expect(retireLocalMock).toHaveBeenCalledWith("assistant-1", entry);
   });
 
-  test("local retire continues when self-hosted platform unregister fails", async () => {
-    const entry = makeEntry("assistant-1", { name: "Example Assistant" });
-    writeLockfile([entry]);
-    readPlatformTokenMock.mockReturnValue("session-token");
-    getPlatformUrlMock.mockReturnValue("https://platform.example.test");
-    readGatewayCredentialMock.mockImplementation(async (_gatewayUrl, name) => {
-      if (name === "cadet:platform_assistant_id") {
-        return { value: "platform-assistant-1", unreachable: false };
-      }
-      if (name === "cadet:platform_base_url") {
-        return { value: "https://platform.example.test", unreachable: false };
-      }
-      if (name === "cadet:platform_organization_id") {
-        return { value: "org-123", unreachable: false };
-      }
-      return { value: null, unreachable: false };
+  test("local retire continues when the cloud unregister fails", async () => {
+    const entry = makeEntry("assistant-1", {
+      name: "Example Assistant",
+      cloudAssistantId: "cloud-asst-1",
+      cloudOrganizationId: "org-123",
     });
+    writeLockfile([entry]);
+    readCloudTokenMock.mockReturnValue("session-token");
+    getCloudUrlMock.mockReturnValue("https://platform.example.test");
     loopbackSafeFetchMock.mockResolvedValue(
       new Response("platform unavailable", { status: 503 }),
     );

package/src/__tests__/root-process-lockfile.test.ts

@@ -0,0 +1,99 @@
+import { mkdirSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import { z } from "zod";
+
+import {
+  clearRootProcess,
+  readRootProcesses,
+  stampRootProcess,
+} from "../lib/assistant-config.js";
+
+// Create a temp directory and set CADET_LOCKFILE_DIR so the real lockfile
+// helpers resolve inside it (the sleep.test.ts fixture pattern).
+let testDir: string;
+
+beforeEach(() => {
+  testDir = mkdtempSync(join(tmpdir(), "cadet-root-process-test-"));
+  mkdirSync(join(testDir, "config"), { recursive: true });
+  process.env.CADET_LOCKFILE_DIR = join(testDir, "config");
+});
+
+afterEach(() => {
+  delete process.env.CADET_LOCKFILE_DIR;
+  rmSync(testDir, { recursive: true, force: true });
+});
+
+describe("root process lockfile entries", () => {
+  test("a tunnel record stamps at the root, reads back, and clears", () => {
+    stampRootProcess("tunnel", {
+      pid: 4242,
+      provider: "ngrok",
+      startedAt: "2026-10-11T00:00:00.000Z",
+    });
+
+    expect(readRootProcesses().tunnel).toMatchObject({
+      pid: 4242,
+      provider: "ngrok",
+    });
+
+    clearRootProcess("tunnel");
+    expect(readRootProcesses().tunnel).toBeUndefined();
+  });
+
+  test("tunnel and app entries stamp and clear independently", () => {
+    stampRootProcess("app", { pid: 77, startedAt: "2026-10-11T00:00:00.000Z" });
+    stampRootProcess("tunnel", {
+      pid: 78,
+      provider: "cloudflare",
+      startedAt: "2026-10-11T00:00:00.000Z",
+    });
+
+    expect(readRootProcesses().app?.pid).toBe(77);
+    expect(readRootProcesses().tunnel?.provider).toBe("cloudflare");
+
+    clearRootProcess("app");
+    expect(readRootProcesses().app).toBeUndefined();
+    // The sibling entry survives.
+    expect(readRootProcesses().tunnel?.pid).toBe(78);
+  });
+
+  test("a record can name the assistant it fronts, for `cadet ps` nesting", () => {
+    stampRootProcess("tunnel", {
+      pid: 4242,
+      provider: "ngrok",
+      startedAt: "2026-10-11T00:00:00.000Z",
+      assistantId: "assistant-1",
+    });
+
+    expect(readRootProcesses().tunnel).toMatchObject({
+      pid: 4242,
+      provider: "ngrok",
+      assistantId: "assistant-1",
+    });
+  });
+
+  test("the records live at the lockfile root under their kind keys", () => {
+    stampRootProcess("app", { pid: 1, startedAt: "t" });
+
+    const raw = z
+      .object({
+        app: z.object({ pid: z.number(), startedAt: z.string() }),
+      })
+      .parse(
+        JSON.parse(
+          readFileSync(
+            join(process.env.CADET_LOCKFILE_DIR!, "lockfile.json"),
+            "utf-8",
+          ),
+        ),
+      );
+    expect(raw.app).toEqual({ pid: 1, startedAt: "t" });
+  });
+
+  test("clearing an absent entry is a no-op", () => {
+    clearRootProcess("tunnel");
+    expect(readRootProcesses()).toEqual({});
+  });
+});

package/src/__tests__/sleep.test.ts

@@ -7,6 +7,7 @@ import {
   spyOn,
   test,
 } from "bun:test";
+import type { GuardianTokenData } from "../lib/guardian-token.js";
 import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -49,10 +50,8 @@ mock.module("../lib/drain.js", () => ({
 
 const realGuardianToken = { ...(await import("../lib/guardian-token.js")) };
 const loadGuardianTokenMock = mock(
-  (_assistantId: string) =>
-    ({ accessToken: "test-guardian-token" }) as unknown as ReturnType<
-      typeof realGuardianToken.loadGuardianToken
-    >,
+  (_assistantId: string): GuardianTokenData | null =>
+    makeGuardianTokenData({ accessToken: "test-guardian-token" }),
 );
 mock.module("../lib/guardian-token.js", () => ({
   ...realGuardianToken,
@@ -92,6 +91,7 @@ import {
   DEFAULT_GATEWAY_PORT,
   DEFAULT_QDRANT_PORT,
 } from "../lib/constants.js";
+import { makeGuardianTokenData } from "./helpers/guardian-token.js";
 
 // Write a lockfile entry so the real resolveTargetAssistant() finds our test
 // assistant without needing to mock the entire assistant-config module.
@@ -153,9 +153,9 @@ describe("sleep command", () => {
     drainAssistantMock.mockReset();
     drainAssistantMock.mockResolvedValue("drained");
     loadGuardianTokenMock.mockReset();
-    loadGuardianTokenMock.mockReturnValue({
-      accessToken: "test-guardian-token",
-    } as unknown as ReturnType<typeof realGuardianToken.loadGuardianToken>);
+    loadGuardianTokenMock.mockReturnValue(
+      makeGuardianTokenData({ accessToken: "test-guardian-token" }),
+    );
     resolveFreshBearerTokenMock.mockReset();
     resolveFreshBearerTokenMock.mockImplementation(
       async (_url, _id, bearerToken, _cloud) => bearerToken,
@@ -180,11 +180,11 @@ describe("sleep command", () => {
     process.argv = ["bun", "cadet", "sleep", "sleep-test"];
 
     const consoleError = spyOn(console, "error").mockImplementation(() => {});
-    const exitMock = mock((code?: number) => {
+    const exitMock = mock((code?: number | string | undefined): never => {
       throw new Error(`process.exit:${code}`);
     });
     const originalExit = process.exit;
-    process.exit = exitMock as unknown as typeof process.exit;
+    process.exit = exitMock;
 
     try {
       await expect(sleep()).rejects.toThrow("process.exit:1");
@@ -300,11 +300,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "sleep-test", "--wait"];
 
       const consoleLog = spyOn(console, "log").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
       try {
         await expect(sleep()).rejects.toThrow("process.exit:130");
       } finally {
@@ -350,11 +350,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "sleep-test", "--wait=abc"];
 
       const consoleError = spyOn(console, "error").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
       try {
         await expect(sleep()).rejects.toThrow("process.exit:1");
         expect(consoleError).toHaveBeenCalledWith(
@@ -484,11 +484,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "--all"];
 
       const consoleError = spyOn(console, "error").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
 
       try {
         await expect(sleep()).rejects.toThrow("process.exit:1");
@@ -511,11 +511,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "--all"];
 
       const consoleError = spyOn(console, "error").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
 
       try {
         await expect(sleep()).rejects.toThrow("process.exit:1");
@@ -532,11 +532,11 @@ describe("sleep command", () => {
       process.argv = ["bun", "cadet", "sleep", "sleep-test", "--all"];
 
       const consoleError = spyOn(console, "error").mockImplementation(() => {});
-      const exitMock = mock((code?: number) => {
+      const exitMock = mock((code?: number | string | undefined): never => {
         throw new Error(`process.exit:${code}`);
       });
       const originalExit = process.exit;
-      process.exit = exitMock as unknown as typeof process.exit;
+      process.exit = exitMock;
 
       try {
         await expect(sleep()).rejects.toThrow("process.exit:1");

package/src/__tests__/statefulset.test.ts

@@ -35,7 +35,7 @@ describe("getBuilderManagedEnvKeys", () => {
       expect(always.has(key)).toBe(true);
     }
 
-    expect(always.has("CADET_DISABLE_PLATFORM")).toBe(false);
+    expect(always.has("CADET_DISABLE_CLOUD")).toBe(false);
     expect(always.has("CADET_DEVICE_ID")).toBe(false);
   });
 
@@ -60,8 +60,8 @@ describe("getBuilderManagedEnvKeys", () => {
       a.name.localeCompare(b.name),
     );
     expect(sorted).toEqual([
+      { name: "CADET_CLOUD_URL", hostVar: "CADET_CLOUD_URL" },
       { name: "CADET_ENVIRONMENT", hostVar: "CADET_ENVIRONMENT" },
-      { name: "CADET_PLATFORM_URL", hostVar: "CADET_PLATFORM_URL" },
       { name: "TUNNEL_BASE_URL", hostVar: "TUNNEL_BASE_URL" },
     ]);
   });
@@ -76,8 +76,8 @@ describe("getBuilderManagedEnvKeys", () => {
       expect(hostForwarded).toContainEqual({ name: envVar, hostVar: envVar });
     }
     expect(hostForwarded).toContainEqual({
-      name: "CADET_PLATFORM_URL",
-      hostVar: "CADET_PLATFORM_URL",
+      name: "CADET_CLOUD_URL",
+      hostVar: "CADET_CLOUD_URL",
     });
   });
 
@@ -126,7 +126,7 @@ describe("buildServiceRunArgs extra env routing", () => {
       gatewayContainer: "test-gateway",
       network: "test-net",
     },
-    extraGatewayEnv: { CADET_DISABLE_PLATFORM: "1" },
+    extraGatewayEnv: { CADET_DISABLE_CLOUD: "1" },
     extraAssistantEnv: { FOO: "bar" },
   };
 
@@ -134,19 +134,19 @@ describe("buildServiceRunArgs extra env routing", () => {
 
   test("extraGatewayEnv lands only in gateway args", () => {
     const gatewayArgs = runArgs.gateway();
-    expect(gatewayArgs).toContain("CADET_DISABLE_PLATFORM=1");
+    expect(gatewayArgs).toContain("CADET_DISABLE_CLOUD=1");
     expect(gatewayArgs).not.toContain("FOO=bar");
   });
 
   test("extraAssistantEnv lands only in assistant args", () => {
     const assistantArgs = runArgs.assistant();
     expect(assistantArgs).toContain("FOO=bar");
-    expect(assistantArgs).not.toContain("CADET_DISABLE_PLATFORM=1");
+    expect(assistantArgs).not.toContain("CADET_DISABLE_CLOUD=1");
   });
 
   test("credential-executor args get neither extra env map", () => {
     const cesArgs = runArgs["credential-executor"]();
-    expect(cesArgs).not.toContain("CADET_DISABLE_PLATFORM=1");
+    expect(cesArgs).not.toContain("CADET_DISABLE_CLOUD=1");
     expect(cesArgs).not.toContain("FOO=bar");
   });