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

package/src/lib/{tailscale-tunnel.ts → tunnels/tailscale.ts}

@@ -1,7 +1,10 @@
+import type { ProviderMeta, ProviderTunnelResult } from "../tunnel.js";
+
 import { spawnSync } from "node:child_process";
 import { win32 } from "node:path";
 
-import { GATEWAY_PORT } from "./constants.js";
+import { GATEWAY_PORT } from "../constants.js";
+import { ensureBinaryInstalled } from "../ensure-binary.js";
 import {
   clearIngressUrl,
   getDefaultWorkspaceDir,
@@ -9,7 +12,7 @@ import {
   saveIngressUrl,
   savePairingTunnel,
   stampLockfileIngressUrl,
-} from "./ingress-config.js";
+} from "../ingress-config.js";
 
 // ── Tailscale CLI discovery + invocation ────────────────────────────────────
 
@@ -52,7 +55,7 @@ export function getTailscaleInstallMessage(
     hostPlatform === "win32"
       ? "  Windows: winget install Tailscale.Tailscale"
       : hostPlatform === "darwin"
-        ? "  macOS:  brew install tailscale   (or install the Tailscale app)"
+        ? "  macOS:  brew install tailscale, or install the Tailscale app"
         : "  Linux:  https://tailscale.com/download/linux";
   return [
     "Tailscale is not installed or could not be found.",
@@ -77,12 +80,12 @@ export interface TailscaleCommandResult {
  */
 export interface TailscaleDeps {
   /** Locate the tailscale CLI; returns the invocable path, null if absent. */
-  findBinary(): string | null;
+  findBinary(): Promise<string | null>;
   /** Run `<bin> <args>` synchronously (spawnSync semantics). */
   run(bin: string, args: string[]): TailscaleCommandResult;
 }
 
-function realFindBinary(): string | null {
+function probeTailscaleBinary(): string | null {
   for (const candidate of getTailscaleBinaryCandidates()) {
     const res = spawnSync(candidate, ["version"], {
       encoding: "utf-8",
@@ -97,6 +100,35 @@ function realFindBinary(): string | null {
   return null;
 }
 
+/**
+ * The real binary finder offers to install tailscale when it is missing
+ * (prompt-install via the shared helper; no-op hint on a non-interactive
+ * terminal) and re-probes after.
+ */
+async function realFindBinary(): Promise<string | null> {
+  const found = probeTailscaleBinary();
+  if (found) return found;
+  await ensureBinaryInstalled({
+    binary: "tailscale",
+    purpose: "the tailscale tunnel",
+    packages: {
+      brew: ["brew", "install", "tailscale"],
+      winget: [
+        "winget",
+        "install",
+        "--silent",
+        "--accept-package-agreements",
+        "--accept-source-agreements",
+        "Tailscale.Tailscale",
+      ],
+      choco: ["choco", "install", "-y", "tailscale"],
+    },
+    manualHint: getTailscaleInstallMessage(),
+    probe: () => probeTailscaleBinary(),
+  });
+  return probeTailscaleBinary();
+}
+
 function realRun(bin: string, args: string[]): TailscaleCommandResult {
   const res = spawnSync(bin, args, {
     encoding: "utf-8",
@@ -290,7 +322,7 @@ export async function startTailscaleServe(
   opts: RunTailscaleTunnelOptions = {},
   deps: TailscaleDeps = realTailscaleDeps(),
 ): Promise<TailscaleServeInfo> {
-  const binary = deps.findBinary();
+  const binary = await deps.findBinary();
   if (!binary) {
     throw new Error(getTailscaleInstallMessage());
   }
@@ -351,7 +383,7 @@ export function stopTailscaleServe(
  */
 export async function runTailscaleTunnel(
   opts: RunTailscaleTunnelOptions = {},
-): Promise<void> {
+): Promise<ProviderTunnelResult> {
   const deps = realTailscaleDeps();
   // What this run publishes, and therefore what Ctrl+C takes back.
   const publishedLabel = opts.preserveIngressUrl
@@ -375,7 +407,7 @@ export async function runTailscaleTunnel(
     "This URL is reachable only from devices signed in to your tailnet.",
   );
   console.log(
-    "For public webhook ingress, use --provider ngrok or --provider cloudflare.",
+    "For public webhook ingress, run `cadet tunnel --help` to see the public providers.",
   );
   console.log("");
   console.log(
@@ -429,5 +461,17 @@ export async function runTailscaleTunnel(
   // Hold the process open until a signal fires. The serve itself lives in
   // tailscaled, so there is no child process to await — the registered signal
   // listeners keep the event loop alive.
-  await new Promise<void>(() => {});
+  const waitForExit = new Promise<void>(() => {});
+  return { publicUrl, waitForExit };
 }
+
+/** Per-provider copy `cadet tunnel`'s help renders for tailscale. */
+export const TAILSCALE_TUNNEL_META: ProviderMeta = {
+  reach: "Tailnet-only tunnel, reachable from your own devices",
+  install: "install: https://tailscale.com/download, then run `tailscale up`",
+  notes: [
+    "When webhook integrations are configured it records its URL for device",
+    "pairing only, leaving the saved webhook callback base as it is.",
+  ],
+  supportsReservedDomain: false,
+};

package/src/lib/upgrade-lifecycle.ts

@@ -17,6 +17,7 @@ import {
   dockerResourceNames,
   GATEWAY_INTERNAL_PORT,
   ASSISTANT_INTERNAL_PORT,
+  pullImage,
   startContainers,
   stopContainers,
 } from "./docker.js";
@@ -24,7 +25,7 @@ import { getStateDir } from "./environments/paths.js";
 import { getCurrentEnvironment } from "./environments/resolve.js";
 import { loadGuardianToken } from "./guardian-token.js";
 import { classifyReadyzResponse } from "./http-client.js";
-import { fetchReleases, resolveImageRefs } from "./platform-releases.js";
+import { fetchReleases, resolveImageRefs } from "./cloud-releases.js";
 import { z } from "zod";
 
 const GatewayHealthSchema = z.object({
@@ -40,7 +41,7 @@ import {
   type DockerStatefulSetSpec,
   type ServiceName,
 } from "./statefulset.js";
-import { exec, execOutput } from "./step-runner.js";
+import { execOutput } from "./step-runner.js";
 import { compareVersions, stripVersionPrefix } from "./version-compat.js";
 import { loopbackSafeFetch } from "./loopback-fetch.js";
 
@@ -332,7 +333,7 @@ export async function fetchAssistantIngressUrl(
         publicBaseUrl?: string;
         managedCallbacks?: boolean;
       };
-      // Ignore managed-callback URLs — those belong to the platform, not the
+      // Ignore managed-callback URLs — those belong to the cloud, not the
       // self-hosted assistant's own ingress.
       if (body.managedCallbacks) return undefined;
       return body.publicBaseUrl || undefined;
@@ -348,7 +349,7 @@ export async function fetchAssistantIngressUrl(
  *
  * Checks (in order):
  *  1. `entry.previousVersion` (saved by the upgrade flow from health).
- *  2. The releases list from the platform API — finds the version
+ *  2. The releases list from the cloud API — finds the version
  *     immediately before `currentVersion`.
  *
  * Returns `undefined` when neither source yields a result.
@@ -418,7 +419,7 @@ export async function waitForReady(runtimeUrl: string): Promise<boolean> {
       const parts = [body?.status].filter(Boolean);
       if (body?.upstream != null) parts.push(`upstream=${body.upstream}`);
       const detail = parts.length > 0 ? ` — ${parts.join(", ")}` : "";
-      console.log(`Readiness check: ${resp.status}${detail} (retrying...)`);
+      console.log(`Readiness check: ${resp.status}${detail}, retrying...`);
     } catch {
       // Connection refused / timeout — not up yet
     }
@@ -754,7 +755,7 @@ export async function performDockerRollback(
     console.log(`   Backup saved: ${preRollbackBackupPath}\n`);
     pruneOldBackups(entry.assistantId, 3);
   } else {
-    console.warn("⚠️  Pre-rollback backup failed (continuing with rollback)\n");
+    console.warn("⚠️  Pre-rollback backup failed, continuing with rollback\n");
   }
 
   const {
@@ -806,7 +807,7 @@ export async function performDockerRollback(
   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);
@@ -869,8 +870,6 @@ export async function performDockerRollback(
     );
 
     // 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,
@@ -878,10 +877,6 @@ export async function performDockerRollback(
         assistantImage: targetImageTags.assistant,
         gatewayImage: targetImageTags.gateway,
         cesImage: targetImageTags["credential-executor"],
-        assistantDigest: newDigests?.assistant,
-        gatewayDigest: newDigests?.gateway,
-        cesDigest: newDigests?.["credential-executor"],
-        networkName: res.network,
         assistantPort,
       },
       previousContainerInfo: entry.containerInfo,
@@ -1030,7 +1025,6 @@ export async function performDockerRollback(
           }
 
           // Restore lockfile state
-          const revertDigests = await captureImageRefs(res);
           const revertedEntry: AssistantEntry = {
             ...entry,
             containerInfo: {
@@ -1042,13 +1036,6 @@ export async function performDockerRollback(
               cesImage:
                 entry.containerInfo?.cesImage ??
                 currentImageRefs["credential-executor"],
-              assistantDigest:
-                revertDigests?.assistant ?? currentImageRefs.assistant,
-              gatewayDigest: revertDigests?.gateway ?? currentImageRefs.gateway,
-              cesDigest:
-                revertDigests?.["credential-executor"] ??
-                currentImageRefs["credential-executor"],
-              networkName: res.network,
               assistantPort,
             },
             previousContainerInfo: undefined,

package/src/lib/upgrade-preflight.ts

@@ -1,4 +1,4 @@
-import type { ReleaseListItem } from "./platform-releases.js";
+import type { ReleaseListItem } from "./cloud-releases.js";
 import { compareVersions, versionsEqual } from "./version-compat.js";
 
 export interface UpgradeTargetResolution {
@@ -88,7 +88,7 @@ export interface UpgradePollState {
 }
 
 /**
- * Completion predicate for the platform upgrade poll loop. Pure.
+ * Completion predicate for the cloud upgrade poll loop. Pure.
  *
  * The primary signal is the DB-backed `current_release_version` (works while
  * the service group restarts or the assistant sleeps); the upgrade-status

package/src/lib/workos-pkce.ts

@@ -103,9 +103,9 @@ export function selectWorkosClientId(
 }
 
 export async function fetchWorkosClientId(
-  platformUrl: string,
+  cloudUrl: string,
 ): Promise<string> {
-  const url = `${new URL(platformUrl).origin}/_allauth/app/v1/config`;
+  const url = `${new URL(cloudUrl).origin}/_allauth/app/v1/config`;
   const response = await loopbackSafeFetch(url);
   if (!response.ok) {
     throw new Error(`Failed to fetch auth config (${response.status})`);
@@ -157,13 +157,13 @@ export async function exchangeCodeWithWorkos(options: {
   return parsed.data.access_token;
 }
 
-/** Exchange the WorkOS access token for a platform session token. */
+/** Exchange the WorkOS access token for a cloud session token. */
 export async function exchangeAccessTokenForSession(
-  platformUrl: string,
+  cloudUrl: string,
   clientId: string,
   accessToken: string,
 ): Promise<string> {
-  const url = `${new URL(platformUrl).origin}/_allauth/app/v1/auth/provider/token`;
+  const url = `${new URL(cloudUrl).origin}/_allauth/app/v1/auth/provider/token`;
   const response = await loopbackSafeFetch(url, {
     method: "POST",
     headers: { "Content-Type": "application/json" },

package/node_modules/@mycadet/assistant-api/events/platform-disconnected.ts

@@ -1,21 +0,0 @@
-/**
- * `platform_disconnected` SSE event.
- *
- * Emitted by the platform-disconnect route after stored platform
- * credentials are deleted, notifying connected clients that the platform
- * connection is gone.
- *
- * Canonical wire-contract source. Daemon code imports the type
- * directly from this file; external consumers import via
- * `@mycadet/assistant-api`.
- */
-
-import { z } from "zod";
-
-export const PlatformDisconnectedEventSchema = z.object({
-  type: z.literal("platform_disconnected"),
-});
-
-export type PlatformDisconnectedEvent = z.infer<
-  typeof PlatformDisconnectedEventSchema
->;

package/node_modules/@mycadet/assistant-api/events/show-platform-login.ts

@@ -1,20 +0,0 @@
-/**
- * `show_platform_login` SSE event.
- *
- * Emitted by the platform-connect route when no cloud credentials are
- * stored yet, signalling connected clients to surface the cloud login UI.
- *
- * Canonical wire-contract source. Daemon code imports the type
- * directly from this file; external consumers import via
- * `@mycadet/assistant-api`.
- */
-
-import { z } from "zod";
-
-export const ShowPlatformLoginEventSchema = z.object({
-  type: z.literal("show_platform_login"),
-});
-
-export type ShowPlatformLoginEvent = z.infer<
-  typeof ShowPlatformLoginEventSchema
->;

package/src/commands/recover.ts

@@ -1,131 +0,0 @@
-import { resolveExistingLocalSigningKey } from "@mycadet/local-mode";
-import {
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  renameSync,
-  unlinkSync,
-} from "fs";
-import { basename, dirname, join } from "path";
-
-import { saveAssistantEntry } from "../lib/assistant-config";
-import type { AssistantEntry } from "../lib/assistant-config";
-import {
-  generateLocalSigningKey,
-  startCes,
-  startLocalDaemon,
-  startGateway,
-} from "../lib/local";
-import { getArchivePath, getMetadataPath } from "../lib/retire-archive";
-import { exec } from "../lib/step-runner";
-
-export const recover = Object.assign(
-  async function recover(): Promise<void> {
-  const args = process.argv.slice(3);
-  if (args.includes("--help") || args.includes("-h")) {
-    console.log("Usage: cadet recover <name>");
-    console.log("");
-    console.log(
-      "Restore a previously retired local assistant from its archive.",
-    );
-    console.log("");
-    console.log(
-      "Extracts the archived workspace data back to its original location,",
-    );
-    console.log(
-      "restores the lockfile entry, and starts the assistant and gateway.",
-    );
-    console.log(
-      "Archives are stored in $XDG_DATA_HOME/cadet/retired/ (default: ~/.local/share/cadet/retired/).",
-    );
-    console.log("");
-    console.log("Arguments:");
-    console.log("  <name>    Name of the retired assistant to recover");
-    console.log("");
-    console.log("Examples:");
-    console.log("  $ cadet recover my-assistant");
-    console.log("  $ cadet recover aria-7f3a");
-    process.exit(0);
-  }
-
-  const name = process.argv[3];
-  if (!name) {
-    console.error("Usage: cadet recover <name>");
-    process.exit(1);
-  }
-
-  const archivePath = getArchivePath(name);
-  const metadataPath = getMetadataPath(name);
-
-  // 1. Verify archive exists
-  if (!existsSync(archivePath) || !existsSync(metadataPath)) {
-    console.error(`No retired archive found for '${name}'.`);
-    process.exit(1);
-  }
-
-  // 2. 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.`,
-    );
-  }
-
-  // 3. 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);
-  }
-
-  // 4. Determine the original target directory, then 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);
-
-  // 7. 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}'.`);
-},
-  { description: "Restore a previously retired local assistant" },
-);
-