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

package/src/commands/uninstall.ts

@@ -1,19 +1,46 @@
 import { existsSync, readFileSync, renameSync, rmSync, unlinkSync } from "fs";
-import { basename, dirname, join } from "path";
+import { basename, dirname, join, sep } from "path";
 import { fileURLToPath } from "url";
 
-import { loadAllAssistants } from "../lib/assistant-config.js";
+import {
+  getDaemonPidPath,
+  loadAllAssistants,
+  type AssistantEntry,
+} from "../lib/assistant-config.js";
 import {
   canPromptForConfirmation,
   confirmAction,
 } from "../lib/confirm-action.js";
+import { retireDocker } from "../lib/docker.js";
 import {
   getConfigDirs,
-  getInputHistoryPath,
   getLogDir,
+  getSharedStateDir,
   getStateDir,
 } from "../lib/environments/paths.js";
 import { getCurrentEnvironment } from "../lib/environments/resolve.js";
+import { stopProcessByPidFile } from "../lib/process";
+
+/**
+ * The per-assistant teardown uninstall performs before deleting the data:
+ * docker assistants keep containers, volumes, and a network in docker that
+ * the filesystem sweep never reaches, and local assistants keep processes.
+ * Everything on-disk is deleted by the sweep regardless — this is the part
+ * uninstall could NOT do before it refused.
+ */
+async function retireAssistantData(entry: AssistantEntry): Promise<void> {
+  if (entry.cloud === "docker") {
+    await retireDocker(entry.assistantId);
+    return;
+  }
+  const resources = entry.resources;
+  if (!resources) return;
+  await stopProcessByPidFile(
+    join(resources.instanceDir, "gateway.pid"),
+    "gateway",
+  );
+  await stopProcessByPidFile(getDaemonPidPath(resources), "assistant");
+}
 
 /** A directory (or file) scheduled for deletion, with what it holds. */
 interface DeleteTarget {
@@ -71,62 +98,84 @@ function findInstalledPackageRoot(startDir: string): string | null {
   return null;
 }
 
+/** The CLI's own install location, when it can be deleted. */
+interface SelfDeleteTarget {
+  path: string;
+  description: string;
+}
+
 /**
- * Remove the running CLI. Handles the two real install shapes:
- *   - the compiled `cadet` binary (process.execPath IS the install)
- *   - a global package install (bun install -g mycadet / npm install -g)
- * Under a source checkout or a bare runtime (bun/node), nothing is deleted —
- * the runtime binary must never be a deletion target.
+ * Where this CLI is running from, when that is an INSTALL we can remove:
+ * the compiled `cadet` binary (process.execPath IS the install) or a global
+ * package install (bun install -g mycadet / npm install -g mycadet). Under
+ * a source checkout or a bare runtime (bun/node), null — the runtime binary
+ * must never be a deletion target. The uninstall prompt lists the same
+ * target it later deletes, so both share this resolver.
  */
-function selfDelete(): void {
+function resolveSelfDeleteTarget(): SelfDeleteTarget | null {
   const execPath = process.execPath;
   const execBase = basename(execPath);
   if (execBase === "cadet" || execBase === "cadet.exe") {
+    return { path: execPath, description: "the Cadet executable" };
+  }
+  const runningFile = fileURLToPath(import.meta.url);
+  const pkgRoot = findInstalledPackageRoot(dirname(runningFile));
+  if (pkgRoot) {
+    return { path: pkgRoot, description: "the installed Cadet CLI package" };
+  }
+  return null;
+}
+
+/**
+ * Delete the install {@link resolveSelfDeleteTarget} found. The two shapes
+ * delete differently — the running binary needs the win32 rename dance, a
+ * package dir is a plain recursive delete — and the bin symlinks the
+ * package manager planted (e.g. ~/.bun/bin/cadet, the npm global bin) are
+ * left dangling — say so.
+ */
+function selfDelete(): void {
+  const target = resolveSelfDeleteTarget();
+  if (!target) {
+    console.log(
+      "Cadet is running from a source checkout — skipping self-removal.",
+    );
+    console.log(
+      "Remove the installed copy with `bun remove -g mycadet` or `npm uninstall -g mycadet`.",
+    );
+    return;
+  }
+  const execBase = basename(target.path);
+  const isCompiledBinary = execBase === "cadet" || execBase === "cadet.exe";
+  if (isCompiledBinary) {
     try {
       if (process.platform === "win32") {
         // Windows refuses to unlink a running executable — stage it under a
         // junk name and delete that.
-        const stale = `${execPath}.uninstalled`;
-        renameSync(execPath, stale);
+        const stale = `${target.path}.uninstalled`;
+        renameSync(target.path, stale);
         rmSync(stale, { force: true, recursive: true });
       } else {
-        unlinkSync(execPath);
+        unlinkSync(target.path);
       }
-      console.log(`Removed ${execPath}.`);
-      return;
+      console.log(`Removed ${target.path}.`);
     } catch (err) {
       console.warn(
-        `⚠️  Could not remove ${execPath}: ${
+        `⚠️  Could not remove ${target.path}: ${
           err instanceof Error ? err.message : String(err)
         } — remove it by hand.`,
       );
-      return;
     }
-  }
-
-  // Package-manager install: remove the package directory we are running
-  // from, best-effort. Bin symlinks the package manager planted (e.g.
-  // ~/.bun/bin/cadet, the npm global bin) are left dangling — say so.
-  const runningFile = fileURLToPath(import.meta.url);
-  const pkgRoot = findInstalledPackageRoot(dirname(runningFile));
-  if (!pkgRoot) {
-    console.log(
-      "Cadet is running from a source checkout — skipping self-removal.",
-    );
-    console.log(
-      "Remove the installed copy with `bun remove -g mycadet` (or `npm uninstall -g mycadet`).",
-    );
     return;
   }
   try {
-    rmSync(pkgRoot, { recursive: true, force: true });
-    console.log(`Removed ${pkgRoot}.`);
+    rmSync(target.path, { recursive: true, force: true });
+    console.log(`Removed ${target.path}.`);
     console.log(
       "The `cadet` command on your PATH is now stale — remove it if your package manager didn't (`bun remove -g mycadet` or `npm uninstall -g mycadet`).",
     );
   } catch (err) {
     console.warn(
-      `⚠️  Could not remove ${pkgRoot}: ${
+      `⚠️  Could not remove ${target.path}: ${
         err instanceof Error ? err.message : String(err)
       } — remove it with \`bun remove -g mycadet\` (or \`npm uninstall -g mycadet\`).`,
     );
@@ -146,10 +195,24 @@ function collectDeleteTargets(env = getCurrentEnvironment()): DeleteTarget[] {
     { path: getLogDir(env), description: "logs" },
     // Not environment-scoped: deleting it affects every cadet CLI on the
     // machine — called out in the prompt, not hidden.
-    { path: getInputHistoryPath(), description: "shared terminal input history" },
+    {
+      path: getSharedStateDir(),
+      description: "shared state, including the terminal input history",
+    },
   ];
   // Only targets that exist — the prompt lists what will actually go.
-  return targets.filter((t) => existsSync(t.path));
+  const existing = targets.filter((t) => existsSync(t.path));
+  // The log dir lives INSIDE a listed target (the config dir on
+  // macOS/Linux, the state dir on Windows) and goes with its parent's
+  // recursive delete — never list a path twice.
+  const deduped: DeleteTarget[] = [];
+  for (const t of existing) {
+    const covered = deduped.some(
+      (k) => t.path === k.path || t.path.startsWith(k.path + sep),
+    );
+    if (!covered) deduped.push(t);
+  }
+  return deduped;
 }
 
 function rmrf(target: string): void {
@@ -163,42 +226,48 @@ export const uninstall = Object.assign(
       console.log("Usage: cadet uninstall [--yes]");
       console.log("");
       console.log(
-        "Remove Cadet entirely: delete every location it uses for this environment (assistant state, retired archives, config, logs) and then delete the executable itself.",
+        "Remove Cadet entirely: retire any remaining assistants, delete every location it uses for this environment (assistant state, retired archives, config, logs), and remove the Cadet installation itself.",
       );
       process.exit(0);
     }
     const yes = args.includes("--yes");
 
-    // Retire tears down an assistant AND archives its data. Uninstall assumes
-    // an empty rack: retiring first is the way to keep an archive.
-    if (loadAllAssistants().length > 0) {
-      console.error(
-        "Error: You still have assistants. Retire them first (`cadet retire <name>`) — retiring archives their data before removing it.",
-      );
-      process.exit(1);
-    }
-
     const env = getCurrentEnvironment();
     const envLabel = env.name ?? "production";
+    const existing = loadAllAssistants();
     const targets = collectDeleteTargets(env);
-    const execPath = process.execPath;
+    const selfTarget = resolveSelfDeleteTarget();
 
     console.log(
       `This removes Cadet entirely for the '${envLabel}' environment and cannot be undone.`,
     );
-    if (targets.length === 0) {
+
+    // Assistants still on the rack are retired — with their data deleted —
+    // as part of the uninstall, and retiring happens only AFTER the
+    // confirmation below: it is part of what the prompt describes, never a
+    // side effect of running the command. Uninstall deletes every location
+    // cadet uses INCLUDING the retired archives, so retiring first (which
+    // archives) only matters for the teardown it performs: docker
+    // assistants keep containers, volumes, and a network in docker that
+    // the filesystem sweep below never reaches. A warning, not a refusal
+    // (v0.0.10 run feedback: the hard error just blocked the uninstall).
+    if (existing.length > 0) {
+      console.warn(
+        `\n⚠️  ${existing.length} ${existing.length === 1 ? "assistant still exists" : "assistants still exist"}: ${existing.map((a) => a.assistantId).join(", ")}`,
+      );
+      console.warn(
+        "   They will be retired as part of this uninstall — their data (and any retired archives) will be permanently deleted.",
+      );
+    }
+
+    if (targets.length === 0 && selfTarget === null) {
       console.log("No Cadet data directories found to delete.");
     } else {
       console.log("It will permanently delete:");
-      for (const t of targets) {
-        console.log(`  - ${t.path}  (${t.description})`);
+      for (const t of selfTarget ? [...targets, selfTarget] : targets) {
+        console.log(`  - ${t.path}  — ${t.description}`);
       }
     }
-    const execBase = basename(execPath);
-    const isCompiledBinary = execBase === "cadet" || execBase === "cadet.exe";
-    if (isCompiledBinary) {
-      console.log(`It will then remove the Cadet executable at ${execPath}.`);
-    }
 
     if (!yes) {
       if (!canPromptForConfirmation()) {
@@ -217,6 +286,20 @@ export const uninstall = Object.assign(
       }
     }
 
+    for (const entry of existing) {
+      if (entry.cloud === "apple-container" || entry.cloud === "paired") {
+        console.log(`   Skipping '${entry.assistantId}' on ${entry.cloud} — its lifecycle is managed elsewhere.`);
+        continue;
+      }
+      try {
+        await retireAssistantData(entry);
+      } catch (err) {
+        console.error(
+          `   Warning: could not fully retire '${entry.assistantId}': ${err instanceof Error ? err.message : String(err)}`,
+        );
+      }
+    }
+
     for (const t of targets) {
       rmrf(t.path);
       console.log(`Deleted ${t.path}.`);

package/src/commands/unpair.ts

@@ -4,7 +4,7 @@
  * Forget a pairing imported from another machine via `cadet connect import`:
  * remove its lockfile entry and stored guardian token from THIS machine. Only
  * paired assistants (`cloud: "paired"`) can be unpaired — `cadet retire` owns
- * local and managed assistants.
+ * local and cloud assistants.
  *
  * This is client-side only: it forgets the connection here but does not revoke
  * the device on the host. (Host-side revocation is `cadet devices`.)
@@ -37,7 +37,7 @@ OPTIONS:
 
 Removes the local connection (lockfile entry + stored token). Only paired
 assistants (imported via 'cadet connect import') can be unpaired; use
-'cadet retire' for local or managed assistants.
+'cadet retire' for local or cloud assistants.
 
 EXAMPLES:
     cadet unpair paired-desk
@@ -72,7 +72,7 @@ export const unpair = Object.assign(
 
   if (entry.cloud !== "paired") {
     console.error(
-      `Error: '${name}' is not a paired assistant. Use \`cadet retire\` to remove a local or managed assistant.`,
+      `Error: '${name}' is not a paired assistant. Use \`cadet retire\` to remove a local or cloud assistant.`,
     );
     process.exit(1);
   }

package/src/commands/upgrade.ts

@@ -1,7 +1,6 @@
 import { resolveExistingLocalSigningKey } from "@mycadet/local-mode";
-import { isManagedCloud } from "../lib/managed-cloud.js";
+import { isCloudHome } from "../lib/cloud-values.js";
 import { spawnSync } from "child_process";
-import { writeFileSync } from "fs";
 import { join } from "path";
 
 import cliPkg from "../../package.json";
@@ -20,6 +19,7 @@ import {
   GATEWAY_INTERNAL_PORT,
   ASSISTANT_INTERNAL_PORT,
   dockerResourceNames,
+  pullImage,
   startContainers,
   stopContainers,
 } from "../lib/docker";
@@ -27,14 +27,14 @@ import {
   fetchLatestStableVersion,
   fetchReleases,
   resolveImageRefs,
-} from "../lib/platform-releases";
+} from "../lib/cloud-releases";
 import {
   authHeaders,
   fetchAssistantDetail,
   fetchUpgradeInProgress,
-  getPlatformUrl,
-  readPlatformToken,
-} from "../lib/platform-client";
+  getCloudUrl,
+  readCloudToken,
+} from "../lib/cloud-client";
 import { checkManagedHealth } from "../lib/health-check.js";
 import {
   evaluateUpgradePoll,
@@ -47,7 +47,6 @@ import {
 } from "../lib/backup-ops.js";
 import { emitCliError, categorizeUpgradeError } from "../lib/cli-error.js";
 import { parseAssistantTargetArg } from "../lib/assistant-target-args.js";
-import { exec } from "../lib/step-runner.js";
 import {
   broadcastUpgradeEvent,
   attemptFailedStateRestore,
@@ -77,7 +76,7 @@ import {
   startLocalDaemon,
   stopLocalProcesses,
 } from "../lib/local.js";
-import { restoreTunnelEdgeAndAutoTunnel } from "../lib/tunnel-edge.js";
+import { restoreTunnelEdgeAndAutoTunnel } from "../lib/tunnel.js";
 import {
   leaseGuardianToken,
   resetGuardianBootstrap,
@@ -119,12 +118,12 @@ function parseArgs(): UpgradeArgs {
       console.log("");
       console.log("Arguments:");
       console.log(
-        "  <name>               Name of the assistant to upgrade (default: active or only assistant)",
+        "  <name>               Name of the assistant to upgrade, defaults to active or only assistant",
       );
       console.log("");
       console.log("Options:");
       console.log(
-        "  --version <version>  Target version to upgrade to (default: CLI version)",
+        "  --version <version>  Target version to upgrade to, defaults to the CLI version",
       );
       console.log(
         "  --latest             Upgrade to the latest stable release, updating the CLI first if needed",
@@ -317,7 +316,7 @@ async function upgradeDocker(
       );
       return;
     }
-    console.log(`🔁 Reinstalling ${versionTag} (--force)...\n`);
+    console.log(`🔁 Reinstalling ${versionTag} with --force...\n`);
   }
 
   console.log("🔍 Resolving image references...");
@@ -407,7 +406,7 @@ async function upgradeDocker(
   try {
     for (const [service, image] of pullImages) {
       console.log(`   Pulling ${service}: ${image}`);
-      await exec("docker", ["pull", image]);
+      await pullImage(image);
     }
   } catch (pullErr) {
     const detail = pullErr instanceof Error ? pullErr.message : String(pullErr);
@@ -454,7 +453,7 @@ async function upgradeDocker(
     // Clean up old pre-upgrade backups, keep last 3
     pruneOldBackups(entry.assistantId, 3);
   } else {
-    console.warn("⚠️  Pre-upgrade backup failed (continuing with upgrade)\n");
+    console.warn("⚠️  Pre-upgrade backup failed, continuing with upgrade\n");
   }
 
   // Persist the backup path so `cadet rollback` can restore the exact backup
@@ -502,17 +501,12 @@ async function upgradeDocker(
   const ready = await waitForReady(entry.runtimeUrl);
   if (ready) {
     // Update lockfile with new service group topology
-    const newDigests = await captureImageRefs(res);
     const updatedEntry: AssistantEntry = {
       ...entry,
       containerInfo: {
         assistantImage: imageTags.assistant,
         gatewayImage: imageTags.gateway,
         cesImage: imageTags["credential-executor"],
-        assistantDigest: newDigests?.assistant,
-        gatewayDigest: newDigests?.gateway,
-        cesDigest: newDigests?.["credential-executor"],
-        networkName: res.network,
         assistantPort,
       },
       previousContainerInfo: entry.containerInfo,
@@ -668,13 +662,9 @@ async function upgradeDocker(
             );
           }
 
-          // Capture fresh digests from the now-running rolled-back containers.
-          const rollbackDigests = await captureImageRefs(res);
-
           // Restore previous container info in lockfile after rollback.
-          // The *Image fields hold human-readable image:tag names from the
-          // pre-upgrade containerInfo; *Digest fields get fresh values from
-          // the running containers (or fall back to previousImageRefs).
+          // The recorded image refs are the rollback record now (digests are
+          // gone from the contract).
           const rolledBackEntry: AssistantEntry = {
             ...entry,
             containerInfo: {
@@ -686,14 +676,6 @@ async function upgradeDocker(
               cesImage:
                 entry.containerInfo?.cesImage ??
                 previousImageRefs["credential-executor"],
-              assistantDigest:
-                rollbackDigests?.assistant ?? previousImageRefs.assistant,
-              gatewayDigest:
-                rollbackDigests?.gateway ?? previousImageRefs.gateway,
-              cesDigest:
-                rollbackDigests?.["credential-executor"] ??
-                previousImageRefs["credential-executor"],
-              networkName: res.network,
               assistantPort,
             },
             previousContainerInfo: undefined,
@@ -909,7 +891,7 @@ async function upgradeLocal(
       );
       return;
     }
-    console.log(`🔁 Reinstalling ${targetVersion} (--force)...\n`);
+    console.log(`🔁 Reinstalling ${targetVersion} with --force...\n`);
   }
 
   console.log(
@@ -951,7 +933,7 @@ async function upgradeLocal(
     console.log(`   Backup saved: ${backupPath}\n`);
     pruneOldBackups(entry.assistantId, 3);
   } else {
-    console.warn("⚠️  Pre-upgrade backup failed (continuing with upgrade)\n");
+    console.warn("⚠️  Pre-upgrade backup failed, continuing with upgrade\n");
   }
 
   let bootstrapSecret = entry.guardianBootstrapSecret;
@@ -1035,17 +1017,11 @@ async function upgradeLocal(
   console.log("✅ Local assistant processes started\n");
 
   const workspaceDir = join(entry.resources.instanceDir, "workspace");
-  const ngrokChild = await restoreTunnelEdgeAndAutoTunnel(
+  await restoreTunnelEdgeAndAutoTunnel(
     entry.assistantId,
     entry.resources.gatewayPort,
     workspaceDir,
   );
-  if (ngrokChild?.pid) {
-    writeFileSync(
-      join(entry.resources.instanceDir, "ngrok.pid"),
-      String(ngrokChild.pid),
-    );
-  }
 
   console.log("Waiting for assistant to become ready...");
   const ready = await waitForReady(adminUrl);
@@ -1113,7 +1089,7 @@ function sleep(ms: number): Promise<void> {
 }
 
 /**
- * Poll the platform until the upgrade completes, then confirm health.
+ * Poll the cloud until the upgrade completes, then confirm health.
  * Mirrors the web UI's Software Updates flow (poll the DB-backed
  * `current_release_version` rather than the gateway, which bounces while
  * the service group restarts).
@@ -1163,7 +1139,7 @@ async function waitForPlatformUpgrade(
       const healthDeadline = Date.now() + PLATFORM_HEALTH_CONFIRM_TIMEOUT_MS;
       while (Date.now() < healthDeadline) {
         const health = await checkManagedHealth(
-          entry.runtimeUrl || getPlatformUrl(),
+          entry.runtimeUrl || getCloudUrl(),
           entry.assistantId,
         );
         if (health.status === "healthy") {
@@ -1187,7 +1163,7 @@ async function waitForPlatformUpgrade(
 
   const timeoutMin = Math.round(timeoutMs / 60_000);
   console.warn(
-    `⚠️  Upgrade request was accepted but completion was not confirmed within ${timeoutMin} minutes. The platform may still be working — check \`cadet ps\` or the web settings page.`,
+    `⚠️  Upgrade request was accepted but completion was not confirmed within ${timeoutMin} minutes. The cloud may still be working — check \`cadet ps\` or the web settings page.`,
   );
 }
 
@@ -1197,10 +1173,10 @@ async function upgradePlatform(
   wait: boolean,
 ): Promise<void> {
   console.log(
-    `🔄 Upgrading platform-hosted assistant '${entry.assistantId}'...\n`,
+    `🔄 Upgrading cloud-hosted assistant '${entry.assistantId}'...\n`,
   );
 
-  const token = readPlatformToken();
+  const token = readCloudToken();
   if (!token) {
     const msg =
       "Error: Not logged in. Run `cadet login --token <token>` first.";
@@ -1214,7 +1190,7 @@ async function upgradePlatform(
   // downgrades before POSTing, and bail if an upgrade is already running.
   const [assistantDetail, health] = await Promise.all([
     fetchAssistantDetail(token, entry.assistantId, entry.runtimeUrl),
-    checkManagedHealth(entry.runtimeUrl || getPlatformUrl(), entry.assistantId),
+    checkManagedHealth(entry.runtimeUrl || getCloudUrl(), entry.assistantId),
   ]);
   // Health probe first, DB-backed field as the sleeping-assistant fallback.
   const currentVersion =
@@ -1225,7 +1201,7 @@ async function upgradePlatform(
   // platform may differ from the active lockfile default.
   const releases = await fetchReleases({
     channel: releaseChannel,
-    platformUrl: entry.runtimeUrl,
+    cloudUrl: entry.runtimeUrl,
   });
 
   const resolution = resolveUpgradeTarget({
@@ -1276,7 +1252,7 @@ async function upgradePlatform(
 
   const headers = await authHeaders(token, entry.runtimeUrl);
 
-  const url = `${entry.runtimeUrl || getPlatformUrl()}/v1/assistants/${encodeURIComponent(entry.assistantId)}/upgrade/`;
+  const url = `${entry.runtimeUrl || getCloudUrl()}/v1/assistants/${encodeURIComponent(entry.assistantId)}/upgrade/`;
   const body: { version?: string } = {};
   if (version) {
     body.version = version;
@@ -1345,11 +1321,11 @@ async function upgradePlatform(
   }
 
   // NOTE: We intentionally do NOT broadcast a "complete" event here.
-  // The platform API returning 200 only means "upgrade request accepted" —
+  // The cloud API returning 200 only means "upgrade request accepted" —
   // the service group has not yet restarted with the new version.  The
   // completion signal will come from the client's health-check
   // version-change detection (DaemonConnection.swift) once the new
-  // version actually appears after the platform restarts the service group.
+  // version actually appears after the cloud restarts the service group.
 
   console.log(`✅ ${result.detail}`);
   if (result.version) {
@@ -1483,7 +1459,7 @@ async function resolveLatestStableTag(): Promise<string> {
     );
     emitCliError(
       "UNKNOWN",
-      "Could not determine the latest stable release from the platform API",
+      "Could not determine the latest stable release from the cloud API",
     );
     process.exit(1);
   }
@@ -1560,7 +1536,7 @@ export const upgrade = Object.assign(
     return;
   }
 
-  // When --latest is passed, resolve the target from the platform API and
+  // When --latest is passed, resolve the target from the cloud API and
   // self-update the CLI if it's behind.  The resolved version is then used
   // as the explicit target for the rest of the upgrade flow.
   let effectiveVersion = version;
@@ -1586,7 +1562,7 @@ export const upgrade = Object.assign(
       return;
     }
 
-    if (isManagedCloud(cloud)) {
+    if (isCloudHome(cloud)) {
       await upgradePlatform(entry, effectiveVersion, !noWait);
       return;
     }

package/src/commands/use.ts

@@ -38,7 +38,7 @@ export const use = Object.assign(
           `Active assistant: ${formatAssistantReference(result.entry)}`,
         );
       } else {
-        console.log(`Active assistant: ${active} (not found in lockfile)`);
+        console.log(`Active assistant: ${active} — not found in lockfile`);
       }
     } else {
       console.log("No active assistant set.");