@mycadet/cli 0.12.7 → 0.12.9

package/src/commands/completions.ts

@@ -0,0 +1,87 @@
+import { loadAllAssistants } from "../lib/assistant-config.js";
+
+/**
+ * Commands whose first positional argument is an assistant name — completing
+ * their first word offers the names of known assistants (from the lockfile)
+ * instead of falling through to shell file completion.
+ */
+const ASSISTANT_NAME_COMMANDS = new Set([
+  "exec",
+  "logs",
+  "message",
+  "restart",
+  "restore",
+  "retire",
+  "rollback",
+  "sleep",
+  "teleport",
+  "terminal",
+  "tunnel",
+  "unpair",
+  "upgrade",
+  "use",
+  "wake",
+]);
+
+/** Assistant names known to this CLI's lockfile; [] when the lockfile is unreadable. */
+function assistantNames(): string[] {
+  try {
+    return loadAllAssistants()
+      .map((entry) => entry.assistantId)
+      .sort();
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Resolve completion candidates for the word the cursor is on.
+ *
+ * `words` carries every command-line word after `cadet` up to the cursor,
+ * INCLUDING the (possibly empty) word being completed — the same shape bash
+ * passes via `COMP_WORDS[@]:1`. The returned list is UNFILTERED: the shell
+ * (`compgen -W`) does the prefix filtering, so the CLI only decides WHAT
+ * KIND of thing completes here.
+ */
+export function completeCadet(
+  input: string[],
+  commandNames: readonly string[],
+): string[] {
+  const words = [...input];
+  const toComplete = words.pop() ?? "";
+  const preceding = words;
+
+  // Completing the command word itself (or nothing typed yet).
+  if (preceding.length === 0) {
+    return [...commandNames].sort();
+  }
+
+  // First positional of an assistant-name command: offer instance names.
+  // Flag prefixes fall through to shell default (no flag completion yet).
+  if (
+    preceding.length === 1 &&
+    ASSISTANT_NAME_COMMANDS.has(preceding[0]) &&
+    !toComplete.startsWith("-")
+  ) {
+    return assistantNames();
+  }
+
+  return [];
+}
+
+const BASH_COMPLETION_SCRIPT = `# bash completion for the cadet CLI — load with:  eval "$(cadet completions)"
+_cadet_completions() {
+  local candidates
+  candidates=$(cadet __complete "\${COMP_WORDS[@]:1}" 2>/dev/null)
+  COMPREPLY=($(compgen -W "$candidates" -- "\${COMP_WORDS[COMP_CWORD]}"))
+}
+complete -F _cadet_completions cadet`;
+
+// ── Entry point ─────────────────────────────────────────────────
+
+export const completions = Object.assign(
+  async function completions(): Promise<void> {
+    console.log(BASH_COMPLETION_SCRIPT);
+  },
+  { description: `Print bash completion setup (eval "$(cadet completions)")` },
+);

package/src/commands/debug.ts

@@ -3,15 +3,15 @@
  *
  * Send Cadet staff a debug bundle of a self-hosted assistant: the
  * workspace, its logs, and the gateway's own database, with no credentials.
- * Staff open it on a throwaway debug clone. The platform only hands out the
+ * Staff open it on a throwaway debug clone. The cloud only hands out the
  * upload URL while "Allow Staff Access" is on, and the bundle is deleted
  * after seven days.
  *
- * Steps: the daemon is checked for the debug profile, the platform mints
+ * Steps: the daemon is checked for the debug profile, the cloud mints
  * the upload URL, the daemon exports with the debug profile, and this
  * command waits for the job so the result is real.
  */
-import { isManagedCloud } from "../lib/managed-cloud.js";
+import { isCloudHome } from "../lib/cloud-values.js";
 import {
   formatAssistantReference,
   resolveTargetAssistant,
@@ -29,9 +29,9 @@ import { loopbackSafeFetch } from "../lib/loopback-fetch.js";
 import {
   authHeaders,
   authHeadersForKnownOrganization,
-  getPlatformUrl,
-  readPlatformToken,
-} from "../lib/platform-client.js";
+  getCloudUrl,
+  readCloudToken,
+} from "../lib/cloud-client.js";
 import { compareVersions } from "../lib/version-compat.js";
 
 // Matches the daemon's own upload deadline (EXPORT_TO_GCS_PUT_TIMEOUT_MS in
@@ -60,7 +60,7 @@ Arguments:
 Requirements:
   - 'Allow Staff Access' is on for the assistant (Settings > Privacy).
   - You are logged in ('cadet login'), which also registers the
-    assistant with the platform.
+    assistant with the cloud.
   - The assistant runs version ${DEBUG_PROFILE_MIN_VERSION} or newer.
   - The assistant is self-hosted. Cadet-hosted assistants need no bundle;
     staff clone them directly.
@@ -88,30 +88,30 @@ export const debug = Object.assign(
 
   const entry = resolveTargetAssistant(parseAssistantTargetArg(args));
   const reference = formatAssistantReference(entry);
-  if (isManagedCloud(entry.cloud)) {
+  if (isCloudHome(entry.cloud)) {
     console.error(
       `${reference} is hosted by Cadet, so staff can clone it directly. No bundle is needed.`,
     );
     process.exit(1);
   }
 
-  const platformToken = readPlatformToken();
-  if (!platformToken) {
+  const cloudToken = readCloudToken();
+  if (!cloudToken) {
     console.error("Not logged in. Run 'cadet login' first.");
     process.exit(1);
   }
-  const platformAssistantId = entry.platformAssistantId?.trim();
-  if (!platformAssistantId) {
+  const cloudAssistantId = entry.cloudAssistantId?.trim();
+  if (!cloudAssistantId) {
     console.error(
-      `${reference} is not registered with the platform yet. Run 'cadet login' and retry.`,
+      `${reference} is not registered with the cloud yet. Run 'cadet login' and retry.`,
     );
     process.exit(1);
   }
-  const platformUrl = entry.platformBaseUrl?.trim() || getPlatformUrl();
-  const organizationId = entry.platformOrganizationId?.trim();
+  const cloudUrl = entry.cloudBaseUrl?.trim() || getCloudUrl();
+  const organizationId = entry.cloudOrganizationId?.trim();
 
   // Step 1: a guardian token for the daemon, and a check that the daemon
-  // knows the debug profile. This comes before the platform call so a
+  // knows the debug profile. This comes before the cloud call so a
   // daemon that would export credentials is refused before any URL exists.
   let accessToken = await daemonAccessToken(entry, reference, false);
   const { version } = await localRuntimeIdentity(entry, accessToken);
@@ -123,13 +123,13 @@ export const debug = Object.assign(
     process.exit(1);
   }
 
-  // Step 2: the platform mints the upload URL, and refuses unless the
+  // Step 2: the cloud mints the upload URL, and refuses unless the
   // owner's staff access grant is active.
   const headers = organizationId
-    ? authHeadersForKnownOrganization(platformToken, organizationId)
-    : await authHeaders(platformToken, platformUrl);
+    ? authHeadersForKnownOrganization(cloudToken, organizationId)
+    : await authHeaders(cloudToken, cloudUrl);
   const urlResponse = await loopbackSafeFetch(
-    `${platformUrl}/v1/assistants/${encodeURIComponent(platformAssistantId)}/debug-bundle-upload-url/`,
+    `${cloudUrl}/v1/assistants/${encodeURIComponent(cloudAssistantId)}/debug-bundle-upload-url/`,
     { method: "POST", headers },
   );
   if (urlResponse.status === 403) {

package/src/commands/exec.ts

@@ -1,7 +1,7 @@
 import { existsSync } from "fs";
 import { join } from "path";
 
-import { isManagedCloud } from "../lib/managed-cloud.js";
+import { isCloudHome } from "../lib/cloud-values.js";
 import { spawn } from "child_process";
 import { red } from "../lib/color";
 
@@ -9,7 +9,7 @@ import { resolveAssistant } from "../lib/assistant-config";
 import { dockerResourceNames } from "../lib/docker";
 import type { ServiceName } from "../lib/docker";
 import { execAppleContainer } from "../lib/exec-apple-container";
-import { getPlatformUrl, readPlatformToken } from "../lib/platform-client";
+import { getCloudUrl, readCloudToken } from "../lib/cloud-client";
 import { sshAppleContainer } from "../lib/ssh-apple-container";
 import {
   interactiveSession,
@@ -75,28 +75,28 @@ export const exec = Object.assign(
     console.log("");
     console.log("Arguments:");
     console.log(
-      "  <name>              Name of the assistant (defaults to active)",
+      "  <name>              Name of the assistant, defaults to active",
     );
     console.log(
       "  <command...>        Command and arguments to run (after --)",
     );
     console.log("");
     console.log("Options:");
-    console.log("  --service <svc>     Target service (default: assistant)");
+    console.log("  --service <svc>     Target service, defaults to assistant");
     console.log(
       "  -it                 Interactive mode with TTY (like docker exec -it)",
     );
     console.log(
-      "  --timeout <secs>    Timeout in seconds (default: 30, 0 = no timeout)",
+      "  --timeout <secs>    Timeout in seconds — default 30, 0 = no timeout",
     );
     console.log(
-      "  --verbose           Show debug output (SSE events, sentinel parsing)",
+      "  --verbose           Show debug output",
     );
     console.log("");
     console.log("Services:");
-    console.log("  assistant (or mycadet)");
-    console.log("  gateway (or cadet-gateway)");
-    console.log("  credential-executor (or cadet-credential-executor)");
+    console.log("  assistant");
+    console.log("  gateway");
+    console.log("  credential-executor");
     console.log("");
     console.log("Examples:");
     console.log("  cadet exec -- ls -la /workspace");
@@ -243,8 +243,8 @@ export const exec = Object.assign(
     return;
   }
 
-  if (isManagedCloud(cloud)) {
-    const token = readPlatformToken();
+  if (isCloudHome(cloud)) {
+    const token = readCloudToken();
     if (!token) {
       console.error(
         red("Not logged in. Run `cadet login` first to authenticate with Cadet Cloud."),
@@ -255,7 +255,7 @@ export const exec = Object.assign(
     const assistant = {
       assistantId: entry.assistantId,
       token,
-      platformUrl: getPlatformUrl(),
+      cloudUrl: getCloudUrl(),
     };
 
     const serviceParam = service === "assistant" ? undefined : service;

package/src/commands/flags.ts

@@ -59,7 +59,7 @@ function printFlagTable(flags: FeatureFlagEntry[]): void {
     console.log(formatRow(row));
   }
   console.log("");
-  console.log("* = overridden (differs from default)");
+  console.log("* = overridden");
 }
 
 function printHelp(): void {
@@ -67,7 +67,7 @@ function printHelp(): void {
   console.log("");
   console.log("Show and toggle feature flags for the active assistant.");
   console.log(
-    "Reads from the gateway's merged flag state (persisted overrides > remote > defaults).",
+    "Reads from the gateway's merged flag state.",
   );
   console.log("");
   console.log("Subcommands:");

package/src/commands/hatch.ts

@@ -1,5 +1,5 @@
 // Direct import — bun embeds this at compile time so it works in compiled binaries.
-import { isManagedCloud } from "../lib/managed-cloud.js";
+import { isCloudHome } from "../lib/cloud-values.js";
 import cliPkg from "../../package.json";
 
 import {
@@ -12,10 +12,10 @@ import { hatchDocker } from "../lib/docker";
 import { parseFeatureFlagArgs, readAmbientFlagEnvVars } from "../lib/flag-args";
 import { hatchLocal } from "../lib/hatch-local";
 import {
-  getPlatformUrl,
+  getCloudUrl,
   hatchAssistant,
-  readPlatformToken,
-} from "../lib/platform-client";
+  readCloudToken,
+} from "../lib/cloud-client";
 import { validateAssistantName } from "../lib/retire-archive";
 
 const DEFAULT_REMOTE: RemoteHost = "local";
@@ -30,7 +30,7 @@ interface HatchArgs {
   configValues: Record<string, string>;
   flagEnvVars: Record<string, string>;
   analyze: boolean;
-  disablePlatform: boolean;
+  disableCloud: boolean;
   netnsContainer: string | null;
   gatewayPort: number | null;
   assistantCaCert: string | null;
@@ -41,10 +41,10 @@ function parseArgs(): HatchArgs {
     process.argv.slice(3),
   );
   const flagEnvVars = { ...readAmbientFlagEnvVars(), ...cliFlagVars };
-  const disablePlatformAmbient =
-    process.env.CADET_DISABLE_PLATFORM?.trim().toLowerCase();
-  let disablePlatform =
-    disablePlatformAmbient === "true" || disablePlatformAmbient === "1";
+  const disableCloudAmbient =
+    process.env.CADET_DISABLE_CLOUD?.trim().toLowerCase();
+  let disableCloud =
+    disableCloudAmbient === "true" || disableCloudAmbient === "1";
   let verbose = false;
   let keepAlive = false;
   let name: string | null = null;
@@ -76,7 +76,7 @@ function parseArgs(): HatchArgs {
         "  --watch                   Run assistant and gateway in watch mode (hot reload on source changes)",
       );
       console.log(
-        "  --source <path>           Build images from a local source tree at <path> (no watcher). Useful for callers (e.g. evals) that want each run to pick up local CLI changes.",
+        "  --source <path>           Build images from a local source tree at <path>. Useful for callers that want each run to pick up local CLI changes.",
       );
       console.log(
         "  --keep-alive              Stay alive after hatch, exit when gateway stops",
@@ -91,7 +91,7 @@ function parseArgs(): HatchArgs {
         "  --analyze                 Emit a structured hatch-timing log line on stdout",
       );
       console.log(
-        "  --disable-platform        Suppress all outbound platform API calls",
+        "  --disable-cloud        Suppress all outbound platform API calls",
       );
       console.log(
         "  --netns-container <name>  Join an existing container's network namespace (docker target only) instead of creating a per-instance network. The namespace owner publishes host ports, so --gateway-port is required.",
@@ -162,8 +162,8 @@ function parseArgs(): HatchArgs {
       const value = next.slice(eqIndex + 1);
       configValues[key] = value;
       i++;
-    } else if (arg === "--disable-platform") {
-      disablePlatform = true;
+    } else if (arg === "--disable-cloud") {
+      disableCloud = true;
     } else if (arg === "--netns-container") {
       const next = args[i + 1];
       if (!next || next.startsWith("-")) {
@@ -193,7 +193,7 @@ function parseArgs(): HatchArgs {
       i++;
     } else {
       console.error(
-        `Error: Unknown argument '${arg}'. Valid options: -v, --verbose, --watch, --source <path>, --keep-alive, --name <name>, --remote <${VALID_REMOTE_HOSTS.join("|")}>, --config <key=value>, --flag <key=value>, --analyze, --disable-platform, --netns-container <name>, --gateway-port <port>, --assistant-ca-cert <path>`,
+        `Error: Unknown argument '${arg}'. Valid options: -v, --verbose, --watch, --source <path>, --keep-alive, --name <name>, --remote <${VALID_REMOTE_HOSTS.join("|")}>, --config <key=value>, --flag <key=value>, --analyze, --disable-cloud, --netns-container <name>, --gateway-port <port>, --assistant-ca-cert <path>`,
       );
       process.exit(1);
     }
@@ -209,7 +209,7 @@ function parseArgs(): HatchArgs {
     configValues,
     flagEnvVars,
     analyze,
-    disablePlatform,
+    disableCloud,
     netnsContainer,
     gatewayPort,
     assistantCaCert,
@@ -237,15 +237,15 @@ export const hatch = Object.assign(
     configValues,
     flagEnvVars,
     analyze,
-    disablePlatform,
+    disableCloud,
     netnsContainer,
     gatewayPort,
     assistantCaCert,
   } = parseArgs();
 
-  if (disablePlatform) {
-    process.env.CADET_DISABLE_PLATFORM = "true";
-    flagEnvVars.CADET_DISABLE_PLATFORM = "true";
+  if (disableCloud) {
+    process.env.CADET_DISABLE_CLOUD = "true";
+    flagEnvVars.CADET_DISABLE_CLOUD = "true";
   }
 
   if (watch && remote !== "local" && remote !== "docker") {
@@ -308,7 +308,7 @@ export const hatch = Object.assign(
     return;
   }
 
-  if (isManagedCloud(remote)) {
+  if (isCloudHome(remote)) {
     await hatchCadetPlatform();
     return;
   }
@@ -321,7 +321,7 @@ export const hatch = Object.assign(
 
 
 async function hatchCadetPlatform(): Promise<void> {
-  const token = readPlatformToken();
+  const token = readCloudToken();
   if (!token) {
     console.error("Not logged in. Run `cadet login --token <token>` first.");
     process.exit(1);
@@ -337,11 +337,11 @@ async function hatchCadetPlatform(): Promise<void> {
 
   const { assistant: result } = await hatchAssistant(token);
 
-  const platformUrl = getPlatformUrl();
+  const cloudUrl = getCloudUrl();
 
   saveAssistantEntry({
     assistantId: result.id,
-    runtimeUrl: platformUrl,
+    runtimeUrl: cloudUrl,
     cloud: "cloud",
     hatchedAt: new Date().toISOString(),
   });

package/src/commands/login.ts

@@ -1,4 +1,4 @@
-import { isManagedCloud } from "../lib/managed-cloud.js";
+import { isCloudHome } from "../lib/cloud-values.js";
 
 import {
   getActiveAssistant,
@@ -7,18 +7,18 @@ import {
   setActiveAssistant,
 } from "../lib/assistant-config";
 import {
-  clearPlatformToken,
+  clearCloudToken,
   fetchCurrentUser,
-  fetchPlatformAssistants,
-  readPlatformToken,
-  savePlatformToken,
-} from "../lib/platform-client";
+  fetchCloudAssistants,
+  readCloudToken,
+  saveCloudToken,
+} from "../lib/cloud-client";
 import {
   describeLoginError,
   registerLocalAssistantWithPlatform,
   workosPkceLogin,
 } from "../lib/cloud-login.js";
-import { getPlatformUrl } from "../lib/platform-client";
+import { getCloudUrl } from "../lib/cloud-client";
 import { syncCloudAssistants } from "../lib/sync-cloud-assistants";
 
 
@@ -34,7 +34,7 @@ export const login = Object.assign(
     console.log("By default, opens a browser window for authentication.");
     console.log("Alternatively, pass a session token directly with --token.");
     console.log("");
-    console.log("On success, syncs cloud-managed assistants to the local");
+    console.log("On success, syncs cloud assistants to the local");
     console.log("lockfile so they appear in `cadet ps`.");
     console.log("");
     console.log("Options:");
@@ -66,7 +66,7 @@ export const login = Object.assign(
 
   // Block if already authenticated (unless --force)
   if (!forceFlag && !token) {
-    const existingToken = readPlatformToken();
+    const existingToken = readCloudToken();
     if (existingToken) {
       try {
         const existingUser = await fetchCurrentUser(existingToken);
@@ -83,7 +83,7 @@ export const login = Object.assign(
   // If no --token flag, use app-held WorkOS PKCE login.
   if (!token) {
     try {
-      token = await workosPkceLogin(getPlatformUrl());
+      token = await workosPkceLogin(getCloudUrl());
     } catch (error) {
       console.error(`❌ ${describeLoginError(error)}`);
       process.exit(1);
@@ -94,10 +94,10 @@ export const login = Object.assign(
 
   try {
     const user = await fetchCurrentUser(token);
-    savePlatformToken(token);
+    saveCloudToken(token);
     console.log(`✅ Logged in as ${user.email}`);
 
-    // Register the local assistant with the platform (non-fatal).
+    // Register the local assistant with the cloud (non-fatal).
     // Mirrors the desktop app's LocalAssistantBootstrapService flow.
     try {
       await registerLocalAssistantWithPlatform(token, user);
@@ -105,8 +105,8 @@ export const login = Object.assign(
       // Non-fatal — login succeeded even if registration fails
     }
 
-    // Sync cloud assistants from the platform into the local lockfile.
-    // This ensures `cadet ps` shows managed assistants immediately
+    // Sync cloud assistants from the cloud into the local lockfile.
+    // This ensures `cadet ps` shows cloud assistants immediately
     // after login (e.g. after a retire-and-rehatch cycle). We've just
     // saved this token, so it's guaranteed non-empty here.
     try {
@@ -122,9 +122,9 @@ export const login = Object.assign(
 
       // If no active assistant is set, activate the first cloud one.
       if (!getActiveAssistant()) {
-        const platformAssistants = await fetchPlatformAssistants(token);
-        if (platformAssistants.length > 0) {
-          setActiveAssistant(platformAssistants[0].id);
+        const cloudAssistants = await fetchCloudAssistants(token);
+        if (cloudAssistants.length > 0) {
+          setActiveAssistant(cloudAssistants[0].id);
         }
       }
     } catch {
@@ -148,13 +148,13 @@ export const logout = Object.assign(
     console.log("Usage: cadet logout");
     console.log("");
     console.log("Log out of Cadet Cloud, remove the stored session token,");
-    console.log("and remove cloud-managed assistants from the local lockfile.");
+    console.log("and remove cloud assistants from the local lockfile.");
     process.exit(0);
   }
 
-  // Remove cloud-managed assistants from the lockfile.
+  // Remove cloud assistants from the lockfile.
   const cloudAssistants = loadAllAssistants().filter((a) =>
-    isManagedCloud(a.cloud),
+    isCloudHome(a.cloud),
   );
   for (const a of cloudAssistants) {
     removeAssistantEntry(a.assistantId);
@@ -165,7 +165,7 @@ export const logout = Object.assign(
     );
   }
 
-  clearPlatformToken();
+  clearCloudToken();
   console.log("Logged out. Cadet Cloud token removed.");
 },
   { description: "Log out of Cadet Cloud" },
@@ -182,7 +182,7 @@ export const whoami = Object.assign(
     process.exit(0);
   }
 
-  const token = readPlatformToken();
+  const token = readCloudToken();
   if (!token) {
     console.error("Not logged in. Run `cadet login` first.");
     process.exit(1);

package/src/commands/logs.ts

@@ -32,19 +32,19 @@ function printHelp(): void {
   console.log("");
   console.log("Arguments:");
   console.log(
-    "  <name>                Name of the assistant (defaults to latest)",
+    "  <name>                Name of the assistant, defaults to latest",
   );
   console.log("");
   console.log("Options:");
-  console.log("  -f, --follow          Follow log output (stream new lines)");
-  console.log("  -n, --tail <N>        Show last N lines (default: all)");
+  console.log("  -f, --follow          Follow log output");
+  console.log("  -n, --tail <N>        Show last N lines");
   console.log("  -t, --timestamps      Show timestamps on each line");
   console.log(
-    "  --since <time>        Show logs since timestamp or relative (e.g. 10m, 2h)",
+    "  --since <time>        Show logs since timestamp or relative, e.g. 10m or 2h",
   );
   console.log("  --until <time>        Show logs until timestamp or relative");
   console.log(
-    "  -s, --service <name>  Filter to a specific service (e.g. assistant, gateway)",
+    "  -s, --service <name>  Filter to a specific service",
   );
   console.log("  -h, --help            Show this help");
 }
@@ -186,13 +186,13 @@ async function showLocalLogs(
 
   if (opts.since && !sinceDate) {
     console.error(
-      `Error: Could not parse --since value '${opts.since}'. Use relative (e.g. 10m, 2h) or ISO format.`,
+      `Error: Could not parse --since value '${opts.since}'. Use a relative value such as 10m or 2h, or ISO format.`,
     );
     process.exit(1);
   }
   if (opts.until && !untilDate) {
     console.error(
-      `Error: Could not parse --until value '${opts.until}'. Use relative (e.g. 10m, 2h) or ISO format.`,
+      `Error: Could not parse --until value '${opts.until}'. Use a relative value such as 10m or 2h, or ISO format.`,
     );
     process.exit(1);
   }
@@ -623,7 +623,7 @@ export const logs = Object.assign(
 
     case "cadet":
       console.error(
-        "Logs for Cadet-managed instances are not yet supported.\n" +
+        "Logs for Cadet Cloud instances are not yet supported.\n" +
           "View logs in the Cadet Cloud dashboard.",
       );
       process.exit(1);