@mycadet/cli 0.12.7 → 0.12.9-dev.202610131452.9acab64

package/src/lib/cloud-login.ts

@@ -10,7 +10,7 @@ import { randomBytes } from "crypto";
 import { createServer } from "http";
 import type { AddressInfo } from "net";
 
-import { isManagedCloud } from "./managed-cloud.js";
+import { isCloudHome } from "./cloud-values.js";
 import {
   resolveAssistant,
   saveAssistantEntry,
@@ -22,11 +22,11 @@ import {
   fetchCurrentUser,
   fetchOrganizationId,
   ensureSelfHostedLocalRegistration,
-  getPlatformUrl,
+  getCloudUrl,
   injectCredentialsIntoAssistant,
-  readPlatformToken,
-  savePlatformToken,
-} from "./platform-client.js";
+  readCloudToken,
+  saveCloudToken,
+} from "./cloud-client.js";
 import { fetchAssistantIngressUrl, fetchCurrentVersion } from "./upgrade-lifecycle.js";
 import {
   CALLBACK_PATH,
@@ -257,8 +257,8 @@ export function startLoopbackListener(
 }
 
 /** App-held WorkOS PKCE login */
-export async function workosPkceLogin(platformUrl: string): Promise<string> {
-  const clientId = await fetchWorkosClientId(platformUrl);
+export async function workosPkceLogin(cloudUrl: string): Promise<string> {
+  const clientId = await fetchWorkosClientId(cloudUrl);
   const { verifier, challenge } = generatePkcePair();
   const state = randomBytes(32).toString("hex");
 
@@ -286,7 +286,7 @@ export async function workosPkceLogin(platformUrl: string): Promise<string> {
       verifier,
     });
     return await exchangeAccessTokenForSession(
-      platformUrl,
+      cloudUrl,
       clientId,
       accessToken,
     );
@@ -307,7 +307,7 @@ export interface CloudLoginSession {
  * validates the resulting token, and persists it.
  */
 export async function ensureCloudLoginInteractive(): Promise<CloudLoginSession> {
-  const existingToken = readPlatformToken();
+  const existingToken = readCloudToken();
   if (existingToken) {
     try {
       const user = await fetchCurrentUser(existingToken);
@@ -317,16 +317,16 @@ export async function ensureCloudLoginInteractive(): Promise<CloudLoginSession>
     }
   }
 
-  const token = await workosPkceLogin(getPlatformUrl());
+  const token = await workosPkceLogin(getCloudUrl());
   const user = await fetchCurrentUser(token);
-  savePlatformToken(token);
+  saveCloudToken(token);
   return { token, user };
 }
 
 /**
  * TLS failures surface as opaque messages like "unknown certificate
  * verification error" from Bun's fetch. Translate the recognizable ones into
- * something actionable — most commonly the platform host's managed
+ * something actionable — most commonly the cloud host's managed
  * certificate is still provisioning.
  */
 export function describeLoginError(error: unknown): string {
@@ -335,13 +335,13 @@ export function describeLoginError(error: unknown): string {
   if (!tlsish) return raw;
   return (
     `Cadet Cloud is unreachable (${raw}). This usually means ` +
-    `${getPlatformUrl()}'s TLS certificate is missing or still provisioning. ` +
-    "Retry in a few minutes, or point CADET_PLATFORM_URL at a reachable host."
+    `${getCloudUrl()}'s TLS certificate is missing or still provisioning. ` +
+    "Retry in a few minutes, or point CADET_CLOUD_URL at a reachable host."
   );
 }
 
 /**
- * Register the active self-hosted assistant with the platform and inject
+ * Register the active self-hosted assistant with the cloud and inject
  * cloud credentials into its runtime — the post-login half of the desktop
  * app's LocalAssistantBootstrapService flow. Extracted so `cadet hatch` can
  * complete the same flow right after an interactive login on the Cadet Cloud
@@ -355,8 +355,8 @@ export async function registerLocalAssistantWithPlatform(
   const log = options.log ?? console.log;
   const entry = resolveAssistant();
 
-  // Skip managed ("cadet") assistants — they are handled by the platform.
-  if (!entry || isManagedCloud(entry.cloud)) return;
+  // Skip managed ("cadet") assistants — they are handled by the cloud.
+  if (!entry || isCloudHome(entry.cloud)) return;
 
   const orgId = await fetchOrganizationId(token);
   const clientInstallationId = computeDeviceId();
@@ -364,7 +364,7 @@ export async function registerLocalAssistantWithPlatform(
     fetchCurrentVersion(entry.runtimeUrl),
     fetchAssistantIngressUrl(entry.runtimeUrl, options.bearerToken ?? entry.bearerToken),
   ]);
-  const platformUrl = getPlatformUrl();
+  const cloudUrl = getCloudUrl();
   const registration = await ensureSelfHostedLocalRegistration(
     token,
     orgId,
@@ -372,14 +372,14 @@ export async function registerLocalAssistantWithPlatform(
     entry.assistantId,
     "cli",
     assistantVersion,
-    platformUrl,
+    cloudUrl,
     ingressUrl,
   );
   saveAssistantEntry({
     ...entry,
-    platformAssistantId: registration.assistant.id,
-    platformBaseUrl: platformUrl,
-    platformOrganizationId: orgId,
+    cloudAssistantId: registration.assistant.id,
+    cloudBaseUrl: cloudUrl,
+    cloudOrganizationId: orgId,
   });
   log(
     `Registered assistant: ${registration.assistant.name} (${registration.assistant.id})`,
@@ -408,8 +408,7 @@ export async function registerLocalAssistantWithPlatform(
     gatewayUrl: entry.runtimeUrl,
     bearerToken: options.bearerToken ?? entry.bearerToken,
     assistantApiKey,
-    platformAssistantId: registration.assistant.id,
-    platformBaseUrl: platformUrl,
+    cloudAssistantId: registration.assistant.id,
     organizationId: orgId,
     userId: user.id,
     webhookSecret: registration.webhook_secret,

package/src/lib/{platform-releases.ts → cloud-releases.ts}

@@ -1,4 +1,4 @@
-import { getPlatformUrl } from "./platform-client.js";
+import { getCloudUrl } from "./cloud-client.js";
 import { dockerhubImages } from "./docker.js";
 import type { ServiceName } from "./docker.js";
 import { loopbackSafeFetch } from "./loopback-fetch.js";
@@ -40,20 +40,20 @@ const RELEASES_FETCH_LIMIT = 100;
 /**
  * Fetch the releases list from Cadet Cloud, optionally filtered by channel
  * (the `channel` param takes precedence over `stable` server-side).
- * `platformUrl` overrides the lockfile/env-resolved default — pass the
+ * `cloudUrl` overrides the lockfile/env-resolved default — pass the
  * target assistant's platform URL when it may differ from the active one.
  * Returns `null` when Cadet Cloud is unreachable or responds non-OK —
  * distinct from `[]` (it answered, no releases).
  */
 export async function fetchReleases(opts?: {
   channel?: "stable" | "preview";
-  platformUrl?: string;
+  cloudUrl?: string;
 }): Promise<ReleaseListItem[] | null> {
   try {
-    const platformUrl = opts?.platformUrl || getPlatformUrl();
+    const cloudUrl = opts?.cloudUrl || getCloudUrl();
     const filter = opts?.channel ? `channel=${opts.channel}` : "stable=true";
     const response = await loopbackSafeFetch(
-      `${platformUrl}/v1/releases/?${filter}&limit=${RELEASES_FETCH_LIMIT}`,
+      `${cloudUrl}/v1/releases/?${filter}&limit=${RELEASES_FETCH_LIMIT}`,
       { signal: AbortSignal.timeout(10_000) },
     );
     if (!response.ok) return null;
@@ -85,7 +85,9 @@ export async function fetchLatestStableVersion(): Promise<string | null> {
 }
 
 /**
- * Image refs for a target version: the tag is the target version, the repo
+ * Image refs for a target version: the tag is the target version exactly as
+ * the release workflows push it — bare ("0.12.8", "0.12.8-dev…"); a
+ * git-tag-style "v" prefix on the input is tolerated and stripped. The repo
  * follows the CLI's own version shape (dev CLI → `-dev` repos).
  */
 export function resolveImageRefs(
@@ -93,8 +95,8 @@ export function resolveImageRefs(
   cliVersion: string,
 ): Record<ServiceName, string> {
   const versionTag = targetVersion.startsWith("v")
-    ? targetVersion
-    : `v${targetVersion}`;
+    ? targetVersion.slice(1)
+    : targetVersion;
   const images = dockerhubImages(cliVersion);
   return {
     assistant: `${images.assistant}:${versionTag}`,
@@ -107,5 +109,5 @@ export function resolveImageRefs(
 export function resolveOwnImageRefs(
   cliVersion: string,
 ): Record<ServiceName, string> {
-  return resolveImageRefs(cliVersion ? `v${cliVersion}` : "latest", cliVersion);
+  return resolveImageRefs(cliVersion || "latest", cliVersion);
 }

package/src/lib/cloud-values.ts

@@ -0,0 +1,3 @@
+export function isCloudHome(cloud: unknown): boolean {
+  return cloud === "cloud" || cloud === "cadet";
+}

package/src/lib/color.ts

@@ -14,3 +14,7 @@ export function red(text: string, stream?: NodeJS.WriteStream): string {
 export function yellow(text: string, stream?: NodeJS.WriteStream): string {
   return colorize("\x1b[33m", text, stream);
 }
+
+export function green(text: string, stream?: NodeJS.WriteStream): string {
+  return colorize("\x1b[32m", text, stream);
+}

package/src/lib/config-utils.ts

@@ -34,7 +34,7 @@ export function buildNestedConfig(
 
 /**
  * Ensure hatch always provides enough initial LLM config for the assistant to
- * detect a fresh off-platform hatch and seed BYOK profiles.
+ * detect a fresh off-cloud hatch and seed BYOK profiles.
  *
  * @deprecated Part of the workspace-config overlay path — a CLI→Assistant
  * side channel that bypasses the Assistant's public APIs and has no

package/src/lib/detached-process.ts

@@ -6,7 +6,7 @@ import { isCompiledCli } from "./local.js";
 import { getLogDir, openLogFile, resetLogFile } from "./xdg-log.js";
 
 export interface RelaunchDetachedOptions {
-  /** argv for the re-invoked CLI command, e.g. ["tunnel", "--provider", "ngrok"]. */
+  /** argv for the re-invoked CLI command, e.g. ["tunnel", "--provider", "cloudflare"]. */
   args: string[];
   /** Log file basename under the XDG log dir; truncated before spawn. */
   logFile: string;