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

package/src/commands/rollback.ts

@@ -1,4 +1,4 @@
-import { isManagedCloud } from "../lib/managed-cloud.js";
+import { isCloudHome } from "../lib/cloud-values.js";
 import {
   findAssistantByName,
   getActiveAssistant,
@@ -7,7 +7,6 @@ import {
   type AssistantEntry,
 } from "../lib/assistant-config";
 import {
-  captureImageRefs,
   GATEWAY_INTERNAL_PORT,
   ASSISTANT_INTERNAL_PORT,
   dockerResourceNames,
@@ -17,9 +16,9 @@ import {
 import type { ServiceName } from "../lib/docker";
 import { emitCliError, categorizeUpgradeError } from "../lib/cli-error.js";
 import {
-  readPlatformToken,
-  rollbackPlatformAssistant,
-} from "../lib/platform-client.js";
+  readCloudToken,
+  rollbackCloudAssistant,
+} from "../lib/cloud-client.js";
 import {
   broadcastUpgradeEvent,
   buildCompleteEvent,
@@ -47,17 +46,17 @@ function parseArgs(): { name: string | null; version: string | null } {
       console.log("Usage: cadet rollback [<name>] [--version <version>]");
       console.log("");
       console.log(
-        "Roll back a Docker or managed assistant to a previous version.",
+        "Roll back a Docker or cloud assistant to a previous version.",
       );
       console.log("");
       console.log("Arguments:");
       console.log(
-        "  <name>               Name of the assistant (default: active or only assistant)",
+        "  <name>               Name of the assistant, defaults to active or only assistant",
       );
       console.log("");
       console.log("Options:");
       console.log(
-        "  --version <version>  Target version (optional for managed — omit to roll back to previous)",
+        "  --version <version>  Target version, optional for managed — omit to roll back to previous",
       );
       console.log("");
       console.log("Examples:");
@@ -136,7 +135,7 @@ async function rollbackPlatformViaEndpoint(
   version?: string,
 ): Promise<void> {
   // Step 1 — Authenticate
-  const token = readPlatformToken();
+  const token = readCloudToken();
   if (!token) {
     const msg =
       "Error: Not logged in. Run `cadet login --token <token>` first.";
@@ -157,7 +156,7 @@ async function rollbackPlatformViaEndpoint(
 
   let result: { detail: string; version: string | null };
   try {
-    result = await rollbackPlatformAssistant(
+    result = await rollbackCloudAssistant(
       token,
       entry.assistantId,
       version,
@@ -225,14 +224,14 @@ export const rollback = Object.assign(
   }
 
   // ---------- Managed (Cadet Cloud) rollback ----------
-  if (isManagedCloud(cloud)) {
+  if (isCloudHome(cloud)) {
     await rollbackPlatformViaEndpoint(entry, version ?? undefined);
     return;
   }
 
   // ---------- Unsupported topologies ----------
   if (cloud !== "docker") {
-    const msg = "Rollback is only supported for Docker and managed assistants.";
+    const msg = "Rollback is only supported for Docker and cloud assistants.";
     console.error(msg);
     emitCliError("UNSUPPORTED_TOPOLOGY", msg);
     process.exit(1);
@@ -273,21 +272,23 @@ export const rollback = Object.assign(
     process.exit(1);
   }
 
-  // Verify all three digest fields are present
+  // Roll back to the previous images. Older entries recorded per-service
+  // digests (the image sha captured at upgrade time) — those are gone from
+  // the contract now; the recorded image refs are the rollback target.
   const prev = entry.previousContainerInfo;
-  if (!prev.assistantDigest || !prev.gatewayDigest || !prev.cesDigest) {
+  if (!prev.assistantImage || !prev.gatewayImage || !prev.cesImage) {
     const msg =
-      "Incomplete rollback state. Previous container digests are missing.";
+      "Incomplete rollback state. Previous container image refs are missing.";
     console.error(msg);
     emitCliError("ROLLBACK_NO_STATE", msg);
     process.exit(1);
   }
 
-  // Build image refs from the previous digests
+  // Build image refs from the previous record
   const previousImageRefs: Record<ServiceName, string> = {
-    assistant: prev.assistantDigest,
-    "credential-executor": prev.cesDigest,
-    gateway: prev.gatewayDigest,
+    assistant: prev.assistantImage,
+    "credential-executor": prev.cesImage,
+    gateway: prev.gatewayImage,
   };
 
   const instanceName = entry.assistantId;
@@ -398,9 +399,6 @@ export const rollback = Object.assign(
     const ready = await waitForReady(entry.runtimeUrl);
 
     if (ready) {
-      // Capture new digests from the rolled-back containers
-      const newDigests = await captureImageRefs(res);
-
       // Swap current/previous state to enable "rollback the rollback"
       const updatedEntry: AssistantEntry = {
         ...entry,
@@ -408,10 +406,6 @@ export const rollback = Object.assign(
           assistantImage: prev.assistantImage ?? previousImageRefs.assistant,
           gatewayImage: prev.gatewayImage ?? previousImageRefs.gateway,
           cesImage: prev.cesImage ?? previousImageRefs["credential-executor"],
-          assistantDigest: newDigests?.assistant,
-          gatewayDigest: newDigests?.gateway,
-          cesDigest: newDigests?.["credential-executor"],
-          networkName: res.network,
           assistantPort,
         },
         previousContainerInfo: entry.containerInfo,

package/src/commands/setup.ts

@@ -48,7 +48,7 @@ function parseDefaultProviderResponse(value: unknown): DefaultProviderResponse {
  * Ask the active assistant which provider it routes by default
  * (`GET /v1/config/llm/default-provider`), so `cadet setup` without
  * `--provider` configures the connection the assistant actually uses —
- * e.g. the keyless Cadet Cloud managed connection picked at hatch —
+ * e.g. the keyless Cadet Cloud cloud connection picked at hatch —
  * instead of blindly prompting for an API key. Falls back to cadet
  * when the runtime is unreachable or predates the endpoint; the
  * returned warning says why, for the caller to render.
@@ -184,7 +184,7 @@ export const setup = Object.assign(
 
   // Respect the assistant's configured default provider (e.g. Cadet Cloud
   // chosen at hatch) unless the caller named one explicitly — the runtime's
-  // keyless managed connection should not be greeted by an API-key prompt.
+  // keyless cloud connection should not be greeted by an API-key prompt.
   let provider = parsed.provider;
   if (!provider) {
     const resolved = await resolveDefaultProvider(gatewayUrl, bearerToken);

package/src/commands/sleep.ts

@@ -71,7 +71,7 @@ export const sleep = Object.assign(
     console.log("");
     console.log("Arguments:");
     console.log(
-      "  <name>    Name of the assistant to stop (default: active or only local)",
+      "  <name>    Name of the assistant to stop, defaults to active or only local",
     );
     console.log("");
     console.log("Options:");
@@ -88,7 +88,7 @@ export const sleep = Object.assign(
       "            schedules) to finish before stopping. Waits as long as it",
     );
     console.log(
-      "            takes by default; pass a duration (e.g. --wait 90s, --wait 10m)",
+      "            takes by default; pass a duration, e.g. --wait 90s or --wait 10m",
     );
     console.log(
       "            to bound the wait. Ctrl-C cancels and leaves the assistant running.",