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

package/src/commands/wake.ts

@@ -2,16 +2,23 @@ import {
   SigningKeyContinuityError,
   resolveExistingLocalSigningKey,
 } from "@mycadet/local-mode";
-import { writeFileSync } from "fs";
 import { join } from "path";
 
 import {
   getDaemonPidPath,
+  loadAllAssistants,
   resolveTargetAssistant,
   saveAssistantEntry,
 } from "../lib/assistant-config.js";
-import { dockerResourceNames, wakeContainers } from "../lib/docker.js";
+import type { AssistantEntry } from "../lib/assistant-config.js";
 import {
+  dockerResourceNames,
+  isNoSuchContainerError,
+  recreateDockerContainers,
+  wakeContainers,
+} from "../lib/docker.js";
+import {
+  GuardianLeasePermanentError,
   leaseGuardianToken,
   resetGuardianBootstrap,
   seedGuardianTokenFromSiblingEnv,
@@ -39,22 +46,25 @@ import {
   DOCKER_GATEWAY_READY_TIMEOUT_MS,
   restoreContainerTunnelEdge,
   restoreTunnelEdgeAndAutoTunnel,
-} from "../lib/tunnel-edge.js";
+} from "../lib/tunnel.js";
 
 export const wake = Object.assign(
   async function wake(): Promise<void> {
   const args = process.argv.slice(3);
   if (args.includes("--help") || args.includes("-h")) {
-    console.log("Usage: cadet wake [<name>] [options]");
+    console.log("Usage: cadet wake [<name> | --all] [options]");
     console.log("");
     console.log("Start the assistant and gateway processes.");
     console.log("");
     console.log("Arguments:");
     console.log(
-      "  <name>    Name of the assistant to start (default: active or only local)",
+      "  <name>    Name of the assistant to start, defaults to active or only local",
     );
     console.log("");
     console.log("Options:");
+    console.log(
+      "  --all          Start every assistant across all remotes instead of one",
+    );
     console.log(
       "  --watch        Run assistant and gateway in watch mode (hot reload on source changes)",
     );
@@ -80,7 +90,122 @@ export const wake = Object.assign(
   // recovered deliberately via `cadet wake <id> --repair-guardian`.
   const repairGuardian = args.includes("--repair-guardian");
   const nameArg = args.find((a) => !a.startsWith("-"));
+  const all = args.includes("--all");
+
+  if (all && nameArg) {
+    console.error("Error: --all cannot be combined with an assistant name.");
+    process.exit(1);
+  }
+  if (all && (foreground || repairGuardian)) {
+    console.error(
+      "Error: --all cannot be combined with --foreground or --repair-guardian.",
+    );
+    process.exit(1);
+  }
+
+  if (all) {
+    await wakeAll({ watch });
+    return;
+  }
+
   const entry = resolveTargetAssistant(nameArg);
+  try {
+    await wakeAssistant(entry, { watch, foreground, repairGuardian });
+  } catch (err) {
+    if (err instanceof WakeExit) {
+      console.error(`Error: ${err.message}`);
+      process.exit(1);
+    }
+    throw err;
+  }
+
+  // Foreground blocking is a single-assistant concern (--all refuses the
+  // flag), and the docker path already warned that foreground is ignored.
+  if (foreground && entry.cloud !== "docker") {
+    console.log("Running in the foreground, Ctrl+C to stop...\n");
+    // Block forever — the daemon is running with inherited stdio so its
+    // output streams to this terminal. When the user hits Ctrl+C, SIGINT
+    // propagates to the daemon child and both exit.
+    await new Promise<void>((resolve) => {
+      process.on("SIGINT", () => {
+        console.log("\nShutting down...");
+        resolve();
+      });
+      process.on("SIGTERM", () => resolve());
+    });
+  }
+},
+  { description: "Start the assistant and gateway" },
+);
+
+/**
+ * Start every assistant this CLI's environment knows about — `--all`. The
+ * CLI only ever reaches one environment, so this is the current env's
+ * lockfile. Same per-assistant wake as the single path, but one assistant's
+ * failure never blocks the others; failures only decide the exit code.
+ */
+async function wakeAll(opts: { watch: boolean }): Promise<void> {
+  const entries = loadAllAssistants();
+  if (entries.length === 0) {
+    console.error("Error: no assistants found. Run 'cadet hatch' first.");
+    process.exit(1);
+  }
+
+  let failures = 0;
+  const seen = new Set<string>();
+  for (const entry of entries) {
+    if (seen.has(entry.assistantId)) continue;
+    seen.add(entry.assistantId);
+    if (entry.cloud === "apple-container" || entry.cloud === "paired") {
+      console.log(
+        `Skipping '${entry.assistantId}' (${entry.cloud}) — its lifecycle is managed elsewhere.`,
+      );
+      continue;
+    }
+    try {
+      await wakeAssistant(entry, {
+        watch: opts.watch,
+        foreground: false,
+        repairGuardian: false,
+      });
+    } catch (err) {
+      failures++;
+      console.error(
+        `Error: failed to wake '${entry.assistantId}': ${
+          err instanceof Error ? err.message : String(err)
+        }`,
+      );
+    }
+  }
+  if (failures > 0) {
+    process.exit(1);
+  }
+}
+
+type WakeAssistantOptions = {
+  watch: boolean;
+  foreground: boolean;
+  repairGuardian: boolean;
+};
+
+/**
+ * Marks a deliberate per-assistant refusal (an unmanageable runtime, missing
+ * resources, a daemon that died during startup). The single-assistant path
+ * renders it as the same "Error: …" + exit 1 the command always printed;
+ * `--all` treats it as one entry's failure and keeps waking the rest.
+ */
+class WakeExit extends Error {}
+
+/**
+ * Start one assistant and its gateway. Throws WakeExit on deliberate
+ * refusals so the caller decides between exiting (single path) and
+ * continuing to the next entry (`--all`).
+ */
+async function wakeAssistant(
+  entry: AssistantEntry,
+  opts: WakeAssistantOptions,
+): Promise<void> {
+  const { watch, foreground, repairGuardian } = opts;
 
   if (entry.cloud === "docker") {
     if (watch || foreground) {
@@ -88,11 +213,23 @@ export const wake = Object.assign(
         .filter(Boolean)
         .join(" and ");
       console.warn(
-        `Warning: ${ignored} ignored for Docker instances (not supported).`,
+        `Warning: ${ignored} ignored for Docker instances.`,
       );
     }
     const res = dockerResourceNames(entry.assistantId);
-    await wakeContainers(res);
+    try {
+      await wakeContainers(res);
+    } catch (err) {
+      // A migrated install has data in the volumes but containers that were
+      // never created (v0.0.10 run feedback: "No such container"). Recreate
+      // the service group from the entry's recorded images; anything else
+      // is a real wake failure.
+      if (!isNoSuchContainerError(err)) throw err;
+      console.log(
+        `Containers for '${entry.assistantId}' don't exist yet — recreating from the recorded images...`,
+      );
+      await recreateDockerContainers(entry);
+    }
     console.log("Docker containers started.");
     await restoreContainerTunnelEdge(entry, DOCKER_GATEWAY_READY_TIMEOUT_MS);
     console.log("Wake complete.");
@@ -100,31 +237,27 @@ export const wake = Object.assign(
   }
 
   if (entry.cloud === "apple-container") {
-    console.error(
-      `Error: '${entry.assistantId}' uses the Apple Containers runtime. Its lifecycle is managed by the macOS app — use the app to start it.`,
+    throw new WakeExit(
+      `'${entry.assistantId}' uses the Apple Containers runtime. Its lifecycle is managed by the macOS app — use the app to start it.`,
     );
-    process.exit(1);
   }
 
   if (entry.cloud === "paired") {
-    console.error(
-      `Error: '${entry.assistantId}' is a remote assistant paired from another machine — its lifecycle is managed on its host machine, not here. Use \`cadet client ${entry.assistantId}\` to chat with it.`,
+    throw new WakeExit(
+      `'${entry.assistantId}' is a remote assistant paired from another machine — its lifecycle is managed on its host machine, not here. Use \`cadet client ${entry.assistantId}\` to chat with it.`,
     );
-    process.exit(1);
   }
 
   if (entry.cloud && entry.cloud !== "local") {
-    console.error(
-      `Error: 'cadet wake' only works with local and docker assistants. '${entry.assistantId}' is a ${entry.cloud} instance.`,
+    throw new WakeExit(
+      `'cadet wake' only works with local and docker assistants. '${entry.assistantId}' is a ${entry.cloud} instance.`,
     );
-    process.exit(1);
   }
 
   if (!entry.resources) {
-    console.error(
-      `Error: Local assistant '${entry.assistantId}' is missing resource configuration. Re-hatch to fix.`,
+    throw new WakeExit(
+      `Local assistant '${entry.assistantId}' is missing resource configuration. Re-hatch to fix.`,
     );
-    process.exit(1);
   }
   const resources = entry.resources;
   let signingKey: string;
@@ -231,7 +364,7 @@ export const wake = Object.assign(
       daemonMigrationsFailed = daemonState.status === "migration_failed";
       if (watch) {
         console.log(
-          `Assistant running (pid ${daemonState.pid}) — watch mode not available (no source files). Keeping existing process.`,
+          `Assistant running (pid ${daemonState.pid}) — watch mode not available, no source files. Keeping existing process.`,
         );
       } else if (daemonMigrationsFailed) {
         console.log(
@@ -275,10 +408,9 @@ export const wake = Object.assign(
     // first and fail the command instead of reporting a successful wake for
     // an assistant that is not running.
     if (!isProcessAlive(pidFile).alive) {
-      console.error(
-        `Error: the assistant exited during startup and is not running. Its runtime HTTP port ${resources.daemonPort} may be held by another process (check \`lsof -i :${resources.daemonPort}\`); the daemon log records the startup error it reported.`,
+      throw new WakeExit(
+        `the assistant exited during startup and is not running. Its runtime HTTP port ${resources.daemonPort} may be held by another process (check \`lsof -i :${resources.daemonPort}\`); the daemon log records the startup error it reported.`,
       );
-      process.exit(1);
     }
     // startLocalDaemon's post-spawn wait is bounded (60s), and a longer
     // migration outlives it. Classify the fresh spawn the same way the
@@ -356,7 +488,7 @@ export const wake = Object.assign(
       } else {
         if (watch) {
           console.log(
-            `Gateway running (pid ${gatewayState.pid}) — watch mode not available (no source files). Keeping existing process.`,
+            `Gateway running (pid ${gatewayState.pid}) — watch mode not available, no source files. Keeping existing process.`,
           );
         } else {
           console.log(`Gateway already running (pid ${gatewayState.pid}).`);
@@ -430,11 +562,14 @@ export const wake = Object.assign(
         console.log("   Re-provisioned guardian token.");
         break;
       } catch (err) {
-        if (attempt < maxAttempts) {
+        if (
+          attempt < maxAttempts &&
+          !(err instanceof GuardianLeasePermanentError)
+        ) {
           await new Promise((r) => setTimeout(r, 2000 * 2 ** (attempt - 1)));
         } else {
           console.warn(
-            `   Guardian token re-provision failed after ${maxAttempts} attempts: ${err}`,
+            `   Guardian token re-provision failed${err instanceof GuardianLeasePermanentError ?", not retrying — a malformed 200 will not fix itself" : ` after ${maxAttempts} attempts`}: ${err}`,
           );
           // The user explicitly confirmed this destructive repair — a
           // success exit here would make callers (the web recovery flow)
@@ -446,18 +581,15 @@ export const wake = Object.assign(
     }
   }
 
-  // Restore the nginx edge and point the webhook auto-tunnel at it. Non-fatal:
-  // a down edge is a degraded remote-web/webhook path, not a broken assistant.
+  // Restore the nginx edge and point the auto-tunnel at it. The spawned agent
+  // records itself in the root lockfile under `tunnel`. Non-fatal: a down
+  // edge is a degraded remote-web/webhook path, not a broken assistant.
   const workspaceDir = join(resources.instanceDir, "workspace");
-  const ngrokChild = await restoreTunnelEdgeAndAutoTunnel(
+  await restoreTunnelEdgeAndAutoTunnel(
     entry.assistantId,
     resources.gatewayPort,
     workspaceDir,
   );
-  if (ngrokChild?.pid) {
-    const ngrokPidFile = join(resources.instanceDir, "ngrok.pid");
-    writeFileSync(ngrokPidFile, String(ngrokChild.pid));
-  }
 
   if (daemonMigrationsFailed) {
     console.log(
@@ -469,21 +601,5 @@ export const wake = Object.assign(
     );
   }
   console.log("Wake complete.");
-
-  if (foreground) {
-    console.log("Running in foreground (Ctrl+C to stop)...\n");
-    // Block forever — the daemon is running with inherited stdio so its
-    // output streams to this terminal. When the user hits Ctrl+C, SIGINT
-    // propagates to the daemon child and both exit.
-    await new Promise<void>((resolve) => {
-      process.on("SIGINT", () => {
-        console.log("\nShutting down...");
-        resolve();
-      });
-      process.on("SIGTERM", () => resolve());
-    });
-  }
-},
-  { description: "Start the assistant and gateway" },
-);
+}
 

package/src/index.ts

@@ -14,6 +14,7 @@ import cliPkg from "../package.json";
 import { backup } from "./commands/backup";
 import { clean } from "./commands/clean";
 import { client } from "./commands/client";
+import { completeCadet, completions } from "./commands/completions";
 import { confirm } from "./commands/confirm";
 import { connect } from "./commands/connect";
 import { devices } from "./commands/devices";
@@ -27,14 +28,12 @@ import { logs } from "./commands/logs";
 import { message } from "./commands/message";
 import { pair } from "./commands/pair";
 import { ps } from "./commands/ps";
-import { recover } from "./commands/recover";
 import { restore } from "./commands/restore";
-import { roadmap } from "./commands/roadmap";
 import { retire } from "./commands/retire";
+import { restart } from "./commands/restart";
 import { rollback } from "./commands/rollback";
 import { setup } from "./commands/setup";
 import { sleep } from "./commands/sleep";
-import { ssh } from "./commands/ssh";
 import { debug } from "./commands/debug";
 import { teleport } from "./commands/teleport";
 import { terminal } from "./commands/terminal";
@@ -45,7 +44,6 @@ import { upgrade } from "./commands/upgrade";
 import { use } from "./commands/use";
 import { voice } from "./commands/voice";
 import { wake } from "./commands/wake";
-import { workflows } from "./commands/workflows";
 import { red } from "./lib/color";
 import { resolveAssistant, setActiveAssistant } from "./lib/assistant-config";
 import { loadGuardianToken } from "./lib/guardian-token";
@@ -56,6 +54,7 @@ const commands = {
   backup,
   clean,
   client,
+  completions,
   confirm,
   connect,
   debug,
@@ -66,19 +65,17 @@ const commands = {
   gateway,
   hatch,
   login,
-  logout,
   logs,
+  logout,
   message,
   pair,
   ps,
-  recover,
   restore,
   retire,
-  roadmap,
+  restart,
   rollback,
   setup,
   sleep,
-  ssh,
   teleport,
   terminal,
   tunnel,
@@ -89,7 +86,6 @@ const commands = {
   voice,
   wake,
   whoami,
-  workflows,
 };
 
 type CommandName = keyof typeof commands;
@@ -237,6 +233,19 @@ async function main() {
     process.exit(0);
   }
 
+  // Hidden completion hook: the bash completion script calls
+  // `cadet __complete <words-up-to-cursor>` and filters the printed
+  // candidates against the word under the cursor. Deliberately unlisted in
+  // the command map so it never shows up in help.
+  if (commandName === "__complete") {
+    const candidates = completeCadet(
+      process.argv.slice(3),
+      Object.keys(commands),
+    );
+    console.log(candidates.join("\n"));
+    process.exit(0);
+  }
+
   const command = commands[commandName as CommandName];
 
   if (!command) {

package/src/lib/__tests__/{platform-client-signed-url.test.ts → cloud-client-signed-url.test.ts}

@@ -2,10 +2,10 @@ import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
 
 import {
   platformPollJobStatus,
-  platformRequestSignedUrl,
+  cloudRequestSignedUrl,
   VersionMismatchError,
   type UnifiedJobStatus,
-} from "../platform-client.js";
+} from "../cloud-client.js";
 
 const PLATFORM_URL = "https://platform.example.test";
 const VAK_TOKEN = "vak_test_1234567890"; // API-key path skips org-ID fetch.
@@ -69,7 +69,7 @@ afterEach(() => {
   globalThis.fetch = originalFetch;
 });
 
-describe("platformRequestSignedUrl", () => {
+describe("cloudRequestSignedUrl", () => {
   test("upload operation with just operation → posts correct body and parses response", async () => {
     const { calls, fetchMock } = captureFetch(() => {
       return new Response(
@@ -83,7 +83,7 @@ describe("platformRequestSignedUrl", () => {
     });
     globalThis.fetch = fetchMock;
 
-    const result = await platformRequestSignedUrl(
+    const result = await cloudRequestSignedUrl(
       { operation: "upload" },
       VAK_TOKEN,
       PLATFORM_URL,
@@ -117,7 +117,7 @@ describe("platformRequestSignedUrl", () => {
     });
     globalThis.fetch = fetchMock;
 
-    const result = await platformRequestSignedUrl(
+    const result = await cloudRequestSignedUrl(
       {
         operation: "upload",
         contentType: "application/octet-stream",
@@ -148,7 +148,7 @@ describe("platformRequestSignedUrl", () => {
     });
     globalThis.fetch = fetchMock;
 
-    const result = await platformRequestSignedUrl(
+    const result = await cloudRequestSignedUrl(
       { operation: "download", bundleKey: "bundles/xyz.tar.gz" },
       VAK_TOKEN,
       PLATFORM_URL,
@@ -182,7 +182,7 @@ describe("platformRequestSignedUrl", () => {
     });
     globalThis.fetch = fetchMock;
 
-    const result = await platformRequestSignedUrl(
+    const result = await cloudRequestSignedUrl(
       { operation: "upload" },
       VAK_TOKEN,
       PLATFORM_URL,
@@ -263,7 +263,7 @@ describe("platformRequestSignedUrl", () => {
     );
     globalThis.fetch = fetchMock as unknown as typeof globalThis.fetch;
 
-    const result = await platformRequestSignedUrl(
+    const result = await cloudRequestSignedUrl(
       { operation: "upload" },
       SESSION_TOKEN,
       PLATFORM_URL,
@@ -305,7 +305,7 @@ describe("platformRequestSignedUrl", () => {
     });
     globalThis.fetch = fetchMock;
 
-    await platformRequestSignedUrl(
+    await cloudRequestSignedUrl(
       {
         operation: "upload",
         minRuntimeVersion: "1.2.3",
@@ -335,7 +335,7 @@ describe("platformRequestSignedUrl", () => {
     });
     globalThis.fetch = fetchMock;
 
-    await platformRequestSignedUrl(
+    await cloudRequestSignedUrl(
       {
         operation: "download",
         bundleKey: "bundles/dl-v.tar.gz",
@@ -370,7 +370,7 @@ describe("platformRequestSignedUrl", () => {
 
     let caught: unknown;
     try {
-      await platformRequestSignedUrl(
+      await cloudRequestSignedUrl(
         {
           operation: "download",
           bundleKey: "bundles/foo.tar.gz",
@@ -414,7 +414,7 @@ describe("platformRequestSignedUrl", () => {
 
     let caught: unknown;
     try {
-      await platformRequestSignedUrl(
+      await cloudRequestSignedUrl(
         {
           operation: "download",
           bundleKey: "bundles/foo.tar.gz",
@@ -444,7 +444,7 @@ describe("platformRequestSignedUrl", () => {
 
     let caught: unknown;
     try {
-      await platformRequestSignedUrl(
+      await cloudRequestSignedUrl(
         { operation: "download", bundleKey: "bundles/foo.tar.gz" },
         VAK_TOKEN,
         PLATFORM_URL,
@@ -483,7 +483,7 @@ describe("platformRequestSignedUrl", () => {
 
     let caught: unknown;
     try {
-      await platformRequestSignedUrl(
+      await cloudRequestSignedUrl(
         {
           operation: "download",
           bundleKey: "bundles/foo.tar.gz",
@@ -513,7 +513,7 @@ describe("platformRequestSignedUrl", () => {
     });
     globalThis.fetch = fetchMock;
 
-    const result = await platformRequestSignedUrl(
+    const result = await cloudRequestSignedUrl(
       { operation: "download", bundleKey: "bundles/xyz.tar.gz" },
       VAK_TOKEN,
       PLATFORM_URL,
@@ -535,7 +535,7 @@ describe("platformRequestSignedUrl", () => {
     globalThis.fetch = fetchMock;
 
     await expect(
-      platformRequestSignedUrl(
+      cloudRequestSignedUrl(
         { operation: "upload" },
         VAK_TOKEN,
         PLATFORM_URL,