@mycadet/cli 0.12.7 → 0.12.9

package/src/commands/restore.ts

@@ -1,7 +1,18 @@
-import { isManagedCloud } from "../lib/managed-cloud.js";
-import { existsSync, readFileSync } from "fs";
-
-import { findAssistantByName } from "../lib/assistant-config.js";
+import { isCloudHome } from "../lib/cloud-values.js";
+import {
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  renameSync,
+  unlinkSync,
+} from "fs";
+import { basename, dirname, join } from "path";
+
+import { resolveExistingLocalSigningKey } from "@mycadet/local-mode";
+import {
+  findAssistantByName,
+  saveAssistantEntry,
+} from "../lib/assistant-config.js";
 import type { AssistantEntry } from "../lib/assistant-config.js";
 import {
   bundleFileSizeBytes,
@@ -16,23 +27,37 @@ import {
   leaseGuardianToken,
 } from "../lib/guardian-token.js";
 import {
-  readPlatformToken,
-  rollbackPlatformAssistant,
-  platformRequestSignedUrl,
+  generateLocalSigningKey,
+  startCes,
+  startLocalDaemon,
+  startGateway,
+} from "../lib/local.js";
+import { getArchivePath, getMetadataPath } from "../lib/retire-archive.js";
+import { exec } from "../lib/step-runner.js";
+import {
+  readCloudToken,
+  rollbackCloudAssistant,
+  cloudRequestSignedUrl,
   platformUploadToSignedUrl,
   platformImportPreflightFromGcs,
   platformImportBundleFromGcs,
   platformPollJobStatus,
-} from "../lib/platform-client.js";
+} from "../lib/cloud-client.js";
 import { performDockerRollback } from "../lib/upgrade-lifecycle.js";
 import { loopbackSafeFetch } from "../lib/loopback-fetch.js";
 
 function printUsage(): void {
   console.log(
-    "Usage: cadet restore <name> --from <path> [--version <version>] [--dry-run]",
+    "Usage: cadet restore <name> [--from <path>] [--version <version>] [--dry-run]",
   );
   console.log("");
   console.log("Restore data from a .vbundle backup into an assistant.");
+  console.log(
+    "Without --from, recovers a retired assistant from its archive in",
+  );
+  console.log(
+    "$XDG_DATA_HOME/cadet/retired/ and starts it again.",
+  );
   console.log(
     "With --version, also rolls back to the specified version first.",
   );
@@ -50,6 +75,7 @@ function printUsage(): void {
   );
   console.log("");
   console.log("Examples:");
+  console.log("  cadet restore my-retired-assistant");
   console.log("  cadet restore my-assistant --from backup.vbundle");
   console.log(
     "  cadet restore my-assistant --from backup.vbundle --version v1.2.3",
@@ -188,7 +214,7 @@ async function restorePlatform(
   opts: { version?: string; dryRun: boolean },
 ): Promise<void> {
   // Step 1 — Authenticate
-  const token = readPlatformToken();
+  const token = readCloudToken();
   if (!token) {
     console.error("Not logged in. Run 'cadet login' first.");
     process.exit(1);
@@ -198,10 +224,10 @@ async function restorePlatform(
   // We deliberately omit min/max runtime version here: restore uploads an
   // arbitrary .vbundle from disk (often produced by a different runtime
   // than the one we'd query right now), and the bundle's own manifest is
-  // the authority on its compatibility band. The platform skips the
+  // the authority on its compatibility band. The cloud skips the
   // version gate when these fields are absent and re-derives compat from
   // the manifest when it processes the import.
-  const { url: uploadUrl, bundleKey } = await platformRequestSignedUrl(
+  const { url: uploadUrl, bundleKey } = await cloudRequestSignedUrl(
     { operation: "upload" },
     token,
     entry.runtimeUrl,
@@ -245,7 +271,7 @@ async function restorePlatform(
 
     if (preflightResult.statusCode === 404) {
       console.error(
-        "No managed assistant found. Ensure your assistant is running.",
+        "No cloud assistant found. Ensure your assistant is running.",
       );
       process.exit(1);
     }
@@ -335,7 +361,7 @@ async function restorePlatform(
     );
 
     try {
-      await rollbackPlatformAssistant(
+      await rollbackCloudAssistant(
         token,
         entry.assistantId,
         opts.version,
@@ -381,7 +407,7 @@ async function restorePlatform(
 
   if (importResult.statusCode === 404) {
     console.error(
-      "No managed assistant found. Ensure your assistant is running.",
+      "No cloud assistant found. Ensure your assistant is running.",
     );
     process.exit(1);
   }
@@ -448,7 +474,7 @@ async function restorePlatform(
           }
         }
         // Transient error (5xx, network) — retry
-        console.warn(`Polling failed, retrying... (${msg})`);
+        console.warn(`Polling failed: ${msg}. Retrying...`);
         continue;
       }
 
@@ -515,6 +541,86 @@ async function restorePlatform(
   }
 }
 
+/**
+ * Recover a previously retired local assistant from its archive: extract the
+ * archived workspace data back to its original location, restore the lockfile
+ * entry, and start the assistant and gateway. Archives live in
+ * $XDG_DATA_HOME/cadet/retired/ (default: ~/.local/share/cadet/retired/).
+ */
+async function recoverFromArchive(name: string): Promise<void> {
+  const archivePath = getArchivePath(name);
+  const metadataPath = getMetadataPath(name);
+
+  // Verify the archive exists
+  if (!existsSync(archivePath) || !existsSync(metadataPath)) {
+    console.error(`No retired archive found for '${name}'.`);
+    process.exit(1);
+  }
+
+  // Read and validate metadata before any side effects
+  const entry: AssistantEntry = JSON.parse(readFileSync(metadataPath, "utf-8"));
+  if (!entry.resources) {
+    throw new Error(
+      `Retired assistant '${name}' is missing resource configuration. ` +
+        `Fix the archive metadata at ${metadataPath} and retry, ` +
+        `or run 'cadet hatch' to re-provision with proper resource allocation.`,
+    );
+  }
+
+  // Check that the recovering entry's own target directory is free.
+  const target = entry.resources.instanceDir;
+  if (existsSync(target)) {
+    console.error(
+      `Error: ${target} already exists (owned by ${entry.assistantId}). ` +
+        `Retire the current assistant first.`,
+    );
+    process.exit(1);
+  }
+
+  // Extract and rename.
+  //
+  // retireLocal archives the full instanceDir. The directory is staged under
+  // `<archive>.staging` inside the retired dir before being packed with
+  // `tar -C <retiredDir> <stagingBasename>`, so the top-level entry inside
+  // the tarball is always `<name>.tar.gz.staging`.
+  //
+  // Correct restoration: extract to retiredDir, then rename the staging entry
+  // back to the original target path. Using homedir() as the -C target was
+  // wrong for any instance stored outside the home directory.
+  const targetDir = entry.resources.instanceDir;
+  const retiredDir = dirname(archivePath);
+  const extractedPath = join(retiredDir, basename(archivePath) + ".staging");
+
+  await exec("tar", ["xzf", archivePath, "-C", retiredDir]);
+  // Validate the staged identity before occupying the destination or updating
+  // the registry. A failed validation leaves the archive available for retry.
+  const signingKey = resolveExistingLocalSigningKey(
+    entry.resources,
+    extractedPath,
+  );
+  const bootstrapSecret =
+    entry.guardianBootstrapSecret ?? generateLocalSigningKey();
+  entry.resources = { ...entry.resources, signingKey };
+  entry.guardianBootstrapSecret = bootstrapSecret;
+  mkdirSync(dirname(targetDir), { recursive: true });
+  renameSync(extractedPath, targetDir);
+  saveAssistantEntry(entry);
+
+  // Start CES sibling + daemon + gateway in parallel, the way the
+  // Docker topology brings its sibling processes up together. startCes
+  // always launches the CES sibling.
+  await Promise.all([
+    startCes(false, entry.resources),
+    startLocalDaemon(false, entry.resources, { signingKey }),
+    startGateway(false, entry.resources, { signingKey, bootstrapSecret }),
+  ]);
+
+  unlinkSync(archivePath);
+  unlinkSync(metadataPath);
+
+  console.log(`✅ Recovered assistant '${name}'.`);
+}
+
 export const restore = Object.assign(
   async function restore(): Promise<void> {
   const { name, fromPath, version, dryRun, help } = parseArgs(process.argv);
@@ -540,13 +646,25 @@ export const restore = Object.assign(
     process.exit(1);
   }
 
-  if (!name || !fromPath) {
-    console.error("Error: Both <name> and --from <path> are required.");
+  if (!name) {
+    console.error("Error: <name> is required.");
     console.error("");
     printUsage();
     process.exit(1);
   }
 
+  // Without --from: recover a retired assistant from its retire archive.
+  if (!fromPath) {
+    if (dryRun) {
+      console.error(
+        "Dry-run is only supported with --from. Recovery replays the retired assistant's archive directly.",
+      );
+      process.exit(1);
+    }
+    await recoverFromArchive(name);
+    return;
+  }
+
   // Look up the instance
   const entry = findAssistantByName(name);
   if (!entry) {
@@ -562,7 +680,7 @@ export const restore = Object.assign(
   }
 
   const sizeMB = formatBundleSizeMb(bundleFileSizeBytes(fromPath));
-  console.log(`Reading ${fromPath} (${sizeMB} MB)...`);
+  console.log(`Reading ${fromPath} — ${sizeMB} MB...`);
 
   // Detect topology and route platform assistants through Django import
   const cloud =
@@ -575,7 +693,7 @@ export const restore = Object.assign(
     process.exit(1);
   }
 
-  if (isManagedCloud(cloud)) {
+  if (isCloudHome(cloud)) {
     const bundleData = readFileSync(fromPath);
     await restorePlatform(entry, name, bundleData, { version, dryRun });
     return;
@@ -583,7 +701,7 @@ export const restore = Object.assign(
 
   if (version && cloud !== "docker") {
     console.error(
-      "Restore with --version is only supported for Docker and managed assistants.",
+      "Restore with --version is only supported for Docker and cloud assistants.",
     );
     process.exit(1);
   }
@@ -625,7 +743,7 @@ export const restore = Object.assign(
     }
   }
 },
-  { description: "Restore data (and optionally version) from a .vbundle backup" },
+  { description: "Restore a .vbundle backup, or recover a retired assistant" },
 );
 
 

package/src/commands/retire.ts

@@ -1,4 +1,4 @@
-import { isManagedCloud } from "../lib/managed-cloud.js";
+import { isCloudHome } from "../lib/cloud-values.js";
 import { existsSync, unlinkSync } from "fs";
 import { join } from "path";
 
@@ -24,10 +24,9 @@ import { printInstanceDetails } from "../lib/instance-details.js";
 import {
   authHeaders,
   authHeadersForKnownOrganization,
-  getPlatformUrl,
-  readGatewayCredential,
-  readPlatformToken,
-} from "../lib/platform-client.js";
+  getCloudUrl,
+  readCloudToken,
+} from "../lib/cloud-client.js";
 import { retireDocker, dockerResourceNames } from "../lib/docker.js";
 import { retireInstance as retireAwsInstance } from "../lib/aws.js";
 import { retireInstance as retireGcpInstance } from "../lib/gcp.js";
@@ -51,44 +50,15 @@ interface RetireArgs {
   yes: boolean;
 }
 
-interface SelfHostedPlatformRegistration {
-  platformAssistantId: string;
-  platformBaseUrl: string | null;
-  organizationId: string | null;
-}
-
-const PLATFORM_TOKEN_ENV = "CADET_PLATFORM_TOKEN";
+const CLOUD_TOKEN_ENV = "CADET_CLOUD_TOKEN";
+const LEGACY_CLOUD_TOKEN_ENV = "CADET_PLATFORM_TOKEN";
 
 function readPlatformRetireToken(): string | null {
-  const envToken = process.env[PLATFORM_TOKEN_ENV]?.trim();
+  const envToken = (
+    process.env[CLOUD_TOKEN_ENV] ?? process.env[LEGACY_CLOUD_TOKEN_ENV]
+  )?.trim();
   if (envToken) return envToken;
-  return readPlatformToken();
-}
-
-function platformOrigin(platformUrl: string): string | null {
-  try {
-    return new URL(platformUrl).origin;
-  } catch {
-    return null;
-  }
-}
-
-function resolveTrustedSelfHostedPlatformUrl(
-  storedPlatformUrl: string | null,
-): string | null {
-  const configuredPlatformUrl = getPlatformUrl();
-  if (!storedPlatformUrl) return configuredPlatformUrl;
-
-  const storedOrigin = platformOrigin(storedPlatformUrl);
-  const configuredOrigin = platformOrigin(configuredPlatformUrl);
-  if (storedOrigin && configuredOrigin && storedOrigin === configuredOrigin) {
-    return configuredPlatformUrl;
-  }
-
-  console.warn(
-    "⚠️  Stored platform URL does not match the configured platform URL; skipping platform unregister.",
-  );
-  return null;
+  return readCloudToken();
 }
 
 function nonEmptyString(value: string | null | undefined): string | null {
@@ -96,35 +66,22 @@ function nonEmptyString(value: string | null | undefined): string | null {
   return trimmed ? trimmed : null;
 }
 
-function lockfileSelfHostedPlatformRegistration(
-  entry: AssistantEntry,
-): SelfHostedPlatformRegistration | null {
-  const platformAssistantId = nonEmptyString(entry.platformAssistantId);
-  if (!platformAssistantId) return null;
-
-  return {
-    platformAssistantId,
-    platformBaseUrl: nonEmptyString(entry.platformBaseUrl),
-    organizationId: nonEmptyString(entry.platformOrganizationId),
-  };
-}
-
-async function deletePlatformAssistant(
+async function deleteCloudAssistant(
   assistantId: string,
   options: {
     token: string;
-    platformUrl?: string;
+    cloudUrl?: string;
     organizationId?: string;
     label: string;
     successMessage: string;
     alreadyGoneMessage: string;
   },
 ): Promise<void> {
-  const platformUrl = options.platformUrl || getPlatformUrl();
-  const url = `${platformUrl}/v1/assistants/${encodeURIComponent(assistantId)}/retire/`;
+  const cloudUrl = options.cloudUrl || getCloudUrl();
+  const url = `${cloudUrl}/v1/assistants/${encodeURIComponent(assistantId)}/retire/`;
   const headers = options.organizationId
     ? authHeadersForKnownOrganization(options.token, options.organizationId)
-    : await authHeaders(options.token, platformUrl);
+    : await authHeaders(options.token, cloudUrl);
 
   const response = await loopbackSafeFetch(url, {
     method: "DELETE",
@@ -143,85 +100,23 @@ async function deletePlatformAssistant(
   }
 }
 
-async function readSelfHostedPlatformRegistration(
-  entry: AssistantEntry,
-): Promise<SelfHostedPlatformRegistration | null> {
-  const fallback = lockfileSelfHostedPlatformRegistration(entry);
-  const gatewayUrl = entry.localUrl ?? entry.runtimeUrl;
-  const platformAssistant = await readGatewayCredential(
-    gatewayUrl,
-    "cadet:platform_assistant_id",
-    entry.bearerToken,
-  );
-  if (platformAssistant.unreachable) {
-    if (fallback) {
-      console.warn(
-        "\u26a0\ufe0f  Could not read platform registration from the local assistant; using saved platform registration.",
-      );
-      return fallback;
-    }
-    console.warn(
-      "\u26a0\ufe0f  Could not read platform registration from the local assistant and no saved platform registration is available; skipping platform unregister.",
-    );
-    return null;
-  }
-
-  const platformAssistantId =
-    nonEmptyString(platformAssistant.value) ?? fallback?.platformAssistantId;
-  if (!platformAssistantId) return null;
-
-  const [platformBaseUrl, organizationId] = await Promise.all([
-    readGatewayCredential(
-      gatewayUrl,
-      "cadet:platform_base_url",
-      entry.bearerToken,
-    ),
-    readGatewayCredential(
-      gatewayUrl,
-      "cadet:platform_organization_id",
-      entry.bearerToken,
-    ),
-  ]);
-
-  return {
-    platformAssistantId,
-    platformBaseUrl:
-      nonEmptyString(platformBaseUrl.value) ??
-      fallback?.platformBaseUrl ??
-      null,
-    organizationId:
-      nonEmptyString(organizationId.value) ?? fallback?.organizationId ?? null,
-  };
-}
-
 async function unregisterSelfHostedLocalPlatformRecord(
   entry: AssistantEntry,
 ): Promise<void> {
   const token = readPlatformRetireToken();
   if (!token) return;
 
-  const registration = await readSelfHostedPlatformRegistration(entry);
-  if (!registration) return;
-
-  const platformUrl = resolveTrustedSelfHostedPlatformUrl(
-    registration.platformBaseUrl,
-  );
-  if (!platformUrl) return;
-  if (!registration.organizationId) {
-    console.warn(
-      "⚠️  Could not read platform organization ID from the local assistant; skipping platform unregister.",
-    );
-    return;
-  }
+  const cloudAssistantId = nonEmptyString(entry.cloudAssistantId);
+  if (!cloudAssistantId) return;
 
-  await deletePlatformAssistant(registration.platformAssistantId, {
+  await deleteCloudAssistant(cloudAssistantId, {
     token,
-    platformUrl,
-    organizationId: registration.organizationId,
+    cloudUrl: getCloudUrl(),
+    organizationId: nonEmptyString(entry.cloudOrganizationId) ?? undefined,
     label: "Platform self-hosted unregister",
-    successMessage: "\u2705 Platform self-hosted registration unregistered.",
+    successMessage: "✅ Platform self-hosted registration unregistered.",
     alreadyGoneMessage:
-      "\u2705 Platform self-hosted registration already unregistered (404).",
+      "✅ Platform self-hosted registration already unregistered (404).",
   });
 }
 
@@ -275,9 +170,9 @@ async function retireCadet(
   }
 
   try {
-    await deletePlatformAssistant(assistantId, {
+    await deleteCloudAssistant(assistantId, {
       token,
-      platformUrl: runtimeUrl,
+      cloudUrl: runtimeUrl,
       label: "Platform retire",
       successMessage: "\u2705 Platform-hosted instance retired.",
       alreadyGoneMessage:
@@ -324,8 +219,8 @@ function printRetireTarget(entry: AssistantEntry, cloud: string): void {
         : {}),
       ...(entry.cloud === "docker"
         ? {
-            container:
-              dockerResourceNames(entry.assistantId).assistantContainer,
+            container: dockerResourceNames(entry.assistantId)
+              .assistantContainer,
           }
         : {}),
     },
@@ -366,37 +261,38 @@ function teeConsoleToLogFile(fd: number | "ignore"): void {
 
 export const retire = Object.assign(
   async function retire(): Promise<void> {
-  if (process.env.CADET_DESKTOP_APP) {
-    resetLogFile("retire.log");
-  }
-  const logFd = process.env.CADET_DESKTOP_APP
-    ? openLogFile("retire.log")
-    : "ignore";
-  teeConsoleToLogFile(logFd);
+    if (process.env.CADET_DESKTOP_APP) {
+      resetLogFile("retire.log");
+    }
+    const logFd = process.env.CADET_DESKTOP_APP
+      ? openLogFile("retire.log")
+      : "ignore";
+    teeConsoleToLogFile(logFd);
 
-  try {
-    await retireInner();
-  } finally {
-    closeLogFile(logFd);
-  }
-},
+    try {
+      await retireInner();
+    } finally {
+      closeLogFile(logFd);
+    }
+  },
   { description: "Delete an assistant instance" },
 );
 
-
 async function retireInner(): Promise<void> {
   const args = process.argv.slice(3);
   if (args.includes("--help") || args.includes("-h")) {
-    console.log("Usage: cadet retire [<name-or-id>] [--source <source>] [--yes]");
+    console.log(
+      "Usage: cadet retire [<name-or-id>] [--source <source>] [--yes]",
+    );
     console.log("");
     console.log("Delete an assistant instance and archive its data.");
     console.log(
-      "With no name or ID, retires the active assistant (see `cadet use`). By default, retire prints the assistant name, ID, cloud, and runtime before asking for confirmation.",
+      "With no name or ID, retires the active assistant — see `cadet use`. By default, retire prints the assistant name, ID, cloud, and runtime before asking for confirmation.",
     );
     console.log("");
     console.log("Arguments:");
     console.log(
-      "  <name-or-id>         Assistant display name or ID to retire (defaults to the active assistant)",
+      "  <name-or-id>         Assistant display name or ID to retire, defaults to the active assistant",
     );
     console.log("");
     console.log("Options:");
@@ -415,7 +311,9 @@ async function retireInner(): Promise<void> {
     console.error(
       "Error: No assistant specified and no active assistant. Pass a name or ID, or pick one with `cadet use <name>`.",
     );
-    console.error("Usage: cadet retire <name-or-id> [--source <source>] [--yes]");
+    console.error(
+      "Usage: cadet retire <name-or-id> [--source <source>] [--yes]",
+    );
     process.exit(1);
   }
 
@@ -498,7 +396,7 @@ async function retireInner(): Promise<void> {
     await retireLocal(assistantId, entry);
   } else if (cloud === "custom") {
     await retireCustom(entry);
-  } else if (isManagedCloud(cloud)) {
+  } else if (isCloudHome(cloud)) {
     await retireCadet(assistantId, entry.runtimeUrl);
   } else {
     console.error(`Error: Unknown cloud type '${cloud}'.`);