@mycadet/cli 0.12.11 → 0.13.0-dev.202610171626.d97b8b8

package/src/__tests__/tunnel.test.ts

@@ -91,7 +91,12 @@ mock.module("../lib/tunnels/gateway-notify.js", () => ({
 const EDGE_PORT = 18080;
 
 const ensureTunnelEdgeMock = mock<typeof nginxIngress.ensureTunnelEdge>(
-  async () => ({ port: EDGE_PORT, started: true, includesWebApp: true }),
+  async () => ({
+    port: EDGE_PORT,
+    started: true,
+    includesWebApp: true,
+    shellMode: "web",
+  }),
 );
 const getNginxVersionMock = mock<typeof nginxIngress.getNginxVersion>(
   () => "nginx version (test)",
@@ -132,7 +137,7 @@ function makeCloudEntry(assistantId = "cloud-1"): AssistantEntry {
   return {
     assistantId,
     runtimeUrl: `https://runtime.example.com/${assistantId}`,
-    cloud: "cadet",
+    cloud: "cloud",
   };
 }
 
@@ -289,6 +294,7 @@ describe("tunnel edge targeting", () => {
       port: EDGE_PORT,
       started: true,
       includesWebApp: true,
+      shellMode: "web",
     });
   });
 
@@ -803,6 +809,7 @@ describe("tunnel edge targeting", () => {
       port: EDGE_PORT,
       started: false,
       includesWebApp: false,
+      shellMode: "web",
     });
 
     const logs = await runTunnelCapturingLogs();
@@ -1744,6 +1751,7 @@ describe("tunnel background mode", () => {
       port: EDGE_PORT,
       started: true,
       includesWebApp: true,
+      shellMode: "web",
     });
     const configHome = mkdtempSync(join(tmpdir(), "cadet-tunnel-xdg-"));
     tempDirs.push(configHome);

package/src/__tests__/upgrade-local.test.ts

@@ -55,7 +55,7 @@ mock.module("../lib/assistant-config", () => ({
 }));
 
 const createBackupMock = mock<typeof backupOps.createBackup>(
-  async () => "/tmp/local-pre-upgrade.vbundle",
+  async () => "/tmp/local-pre-upgrade.tar.gz",
 );
 const pruneOldBackupsMock = mock<typeof backupOps.pruneOldBackups>(() => {});
 const restoreBackupMock = mock<typeof backupOps.restoreBackup>(
@@ -238,7 +238,7 @@ beforeEach(() => {
   loadAllAssistantsMock.mockReturnValue([entry]);
   saveAssistantEntryMock.mockReset();
   createBackupMock.mockReset();
-  createBackupMock.mockResolvedValue("/tmp/local-pre-upgrade.vbundle");
+  createBackupMock.mockResolvedValue("/tmp/local-pre-upgrade.tar.gz");
   pruneOldBackupsMock.mockReset();
   pruneOldBackupsMock.mockReturnValue(undefined);
   restoreBackupMock.mockReset();
@@ -372,7 +372,7 @@ describe("cadet upgrade local", () => {
     await upgrade();
 
     expect(loopbackSafeFetchMock).toHaveBeenCalledWith(
-      "http://127.0.0.1:7830/healthz?include=migrations",
+      "http://127.0.0.1:7830/healthz",
       expect.any(Object),
     );
     expect(createBackupMock).toHaveBeenCalledWith(
@@ -382,14 +382,6 @@ describe("cadet upgrade local", () => {
         prefix: "local-assistant-pre-upgrade",
       }),
     );
-    expect(saveAssistantEntryMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        previousVersion: "v0.8.11",
-        previousDbMigrationVersion: 12,
-        previousWorkspaceMigrationId: "011-test",
-        preUpgradeBackupPath: "/tmp/local-pre-upgrade.vbundle",
-      }),
-    );
     expect(stopLocalProcessesMock).toHaveBeenCalledWith(
       expect.objectContaining({
         instanceDir: tempDir,
@@ -446,6 +438,24 @@ describe("cadet upgrade local", () => {
     expect(consoleLogSpy.mock.calls.flat().join("\n")).toContain("upgraded to");
   });
 
+  test("failed safety backup aborts before runtime installation or service replacement", async () => {
+    createBackupMock.mockResolvedValue(null);
+    await expect(upgrade()).rejects.toThrow("process.exit(1)");
+    expect(ensureLocalRuntimeMock).not.toHaveBeenCalled();
+    expect(stopLocalProcessesMock).not.toHaveBeenCalled();
+    expect(startLocalDaemonMock).not.toHaveBeenCalled();
+  });
+
+  test("failed target startup restores prior runtime selection and all roots before restarting", async () => {
+    startLocalDaemonMock.mockRejectedValueOnce(new Error("target startup failed"));
+    await expect(upgrade()).rejects.toThrow("process.exit(1)");
+    expect(restoreBackupMock).toHaveBeenCalledWith("http://127.0.0.1:7830", "local-assistant", "/tmp/local-pre-upgrade.tar.gz", { resume: false });
+    expect(startLocalDaemonMock).toHaveBeenCalledTimes(2);
+    expect(startCesMock).toHaveBeenCalledTimes(2);
+    expect(stopLocalProcessesMock).toHaveBeenCalledTimes(2);
+    expect(waitForReadyMock).toHaveBeenCalled();
+  });
+
   test("skips restart when the local assistant is already on the target version", async () => {
     loopbackSafeFetchMock.mockResolvedValue({
       ok: true,

package/src/__tests__/upgrade-replay-env.test.ts

@@ -156,10 +156,10 @@ describe("buildReplayState", () => {
     expect(state.signingKey).toBe("sign-key");
   });
 
-  test("generates fresh secrets when missing from captured env", () => {
+  test("generates a service token but preserves file-backed signing identity when env is absent", () => {
     const state = buildReplayState({}, {});
     expect(state.bootstrapSecret).toBeUndefined();
     expect(state.cesServiceToken).toMatch(/^[0-9a-f]{64}$/);
-    expect(state.signingKey).toMatch(/^[0-9a-f]{64}$/);
+    expect(state.signingKey).toBeUndefined();
   });
 });

package/src/__tests__/upgrade-root-recovery.test.ts

@@ -0,0 +1,185 @@
+import { afterAll, beforeEach, expect, spyOn, test } from "bun:test";
+import * as backups from "../lib/backup-ops.js";
+import * as docker from "../lib/docker.js";
+import * as lifecycle from "../lib/upgrade-lifecycle.js";
+import * as config from "../lib/assistant-config.js";
+import { mockCommands } from "./commands-mock.js";
+import * as loopback from "../lib/loopback-fetch.js";
+
+const capture = spyOn(backups, "createBackup");
+const images = spyOn(docker, "captureImageRefs");
+const pull = spyOn(docker, "pullImage");
+const wake = spyOn(docker, "wakeContainers");
+const save = spyOn(config, "saveAssistantEntry");
+const restore = spyOn(backups, "restoreBackup");
+const sleep = spyOn(docker, "sleepContainers");
+const stop = spyOn(docker, "stopContainers");
+const start = spyOn(docker, "startContainers");
+const fetch = spyOn(loopback, "loopbackSafeFetch");
+const res = docker.dockerResourceNames("recovery");
+const containerOptions = {
+  gatewayPort: 7830,
+  assistantPort: 3001,
+  imageTags: {
+    assistant: "assistant:old",
+    gateway: "gateway:old",
+    "credential-executor": "ces:old",
+  },
+  instanceName: "recovery",
+  res,
+};
+const events: string[] = [];
+beforeEach(() => {
+  events.length = 0;
+  capture.mockReset();
+  images.mockReset();
+  pull.mockReset();
+  wake.mockReset();
+  save.mockReset();
+  save.mockImplementation(() => {});
+  restore.mockReset();
+  sleep.mockReset();
+  stop.mockReset();
+  start.mockReset();
+  fetch.mockReset();
+  restore.mockImplementation(async () => {
+    events.push("restore-roots");
+    return true;
+  });
+  sleep.mockImplementation(async () => {
+    events.push("sleep");
+  });
+  stop.mockImplementation(async () => {
+    events.push("remove");
+  });
+  start.mockImplementation(async () => {
+    events.push("start-old-version");
+  });
+  fetch.mockImplementation(async () => {
+    events.push("check-ready");
+    return Response.json({ ready: true });
+  });
+});
+afterAll(() => {
+  for (const spy of [
+    restore,
+    sleep,
+    stop,
+    start,
+    fetch,
+    capture,
+    images,
+    pull,
+    wake,
+    save,
+  ])
+    spy.mockRestore();
+});
+
+test("failed-state recovery restores tar roots while stopped before restarting old services", async () => {
+  expect(
+    await lifecycle.attemptFailedStateRestore({
+      runtimeUrl: "http://127.0.0.1:1",
+      assistantId: "recovery",
+      backupPath: "pre-upgrade.tar.gz",
+      backupLabel: "pre-upgrade",
+      res,
+      containerOptions,
+    }),
+  ).toEqual({ restored: true, ready: true });
+  expect(restore).toHaveBeenCalledWith(
+    "http://127.0.0.1:1",
+    "recovery",
+    "pre-upgrade.tar.gz",
+    { resume: false },
+  );
+  expect(events).toEqual([
+    "restore-roots",
+    "sleep",
+    "remove",
+    "start-old-version",
+    "check-ready",
+  ]);
+});
+
+test("failed root restore does not restart a partial installation", async () => {
+  restore.mockResolvedValue(false);
+  expect(
+    await lifecycle.attemptFailedStateRestore({
+      runtimeUrl: "http://127.0.0.1:1",
+      assistantId: "recovery",
+      backupPath: "pre-upgrade.tar.gz",
+      backupLabel: "pre-upgrade",
+      res,
+      containerOptions,
+    }),
+  ).toEqual({ restored: false, ready: false });
+  expect(start).not.toHaveBeenCalled();
+  expect(stop).not.toHaveBeenCalled();
+  expect(fetch).not.toHaveBeenCalled();
+});
+
+test("versioned restore installs roots into stopped target containers before first startup", async () => {
+  const commands = mockCommands();
+  commands.on(
+    "docker",
+    (args) => args[0] === "inspect",
+    () => ({
+      stdout: JSON.stringify(["ACTOR_TOKEN_SIGNING_KEY=" + "01".repeat(32)]),
+    }),
+  );
+  const entry: config.AssistantEntry = {
+    assistantId: "recovery",
+    cloud: "docker",
+    runtimeUrl: "http://127.0.0.1:1",
+  };
+  capture.mockImplementation(async () => {
+    events.push("capture-safety");
+    return "/tmp/pre-rollback.tar.gz";
+  });
+  images.mockResolvedValue({
+    assistant: "assistant:current",
+    gateway: "gateway:current",
+    "credential-executor": "ces:current",
+  });
+  pull.mockResolvedValue(undefined);
+  start.mockImplementation(async (options) => {
+    expect(options.createOnly).toBe(true);
+    events.push("create-stopped-target");
+  });
+  wake.mockImplementation(async () => {
+    events.push("wake-restored-target");
+  });
+  fetch.mockImplementation(async (url) => {
+    if (String(url).includes("/healthz"))
+      return Response.json({ version: "0.12.11" });
+    if (String(url).includes("/readyz")) {
+      events.push("check-ready");
+      return Response.json({ ready: true });
+    }
+    return Response.json({});
+  });
+  try {
+    await lifecycle.performDockerRollback(entry, {
+      targetVersion: "0.12.10",
+      backupPath: "/tmp/source.tar.gz",
+    });
+    expect(restore).toHaveBeenCalledWith(
+      entry.runtimeUrl,
+      entry.assistantId,
+      "/tmp/source.tar.gz",
+      { resume: false },
+    );
+    expect(events).toEqual([
+      "capture-safety",
+      "sleep",
+      "remove",
+      "create-stopped-target",
+      "restore-roots",
+      "wake-restored-target",
+      "check-ready",
+    ]);
+  } finally {
+    commands.restore();
+  }
+});

package/src/__tests__/wake.test.ts

@@ -173,7 +173,7 @@ mock.module("../lib/ingress-config.js", () => ({
 }));
 
 const ensureTunnelEdgeMock = mock<typeof nginxIngress.ensureTunnelEdge>(
-  async () => ({ port: 7840, started: true, includesWebApp: true }),
+  async () => ({ port: 7840, started: true, includesWebApp: true, shellMode: "web" }),
 );
 const isIngressRunningMock = mock<typeof nginxIngress.isIngressRunning>(
   () => false,
@@ -305,6 +305,7 @@ beforeEach(() => {
     port: 7840,
     started: true,
     includesWebApp: true,
+    shellMode: "web",
   });
   isIngressRunningMock.mockReset();
   isIngressRunningMock.mockReturnValue(false);
@@ -1073,6 +1074,7 @@ describe("cadet wake — tunnel edge restore", () => {
       port: 7840,
       started: false,
       includesWebApp: true,
+      shellMode: "web",
     });
     process.argv = ["bun", "cadet", "wake", "docker-1"];
 
@@ -1579,6 +1581,7 @@ describe("cadet wake — tunnel edge restore", () => {
       port: 7841,
       started: false,
       includesWebApp: true,
+      shellMode: "web",
     });
 
     await wake();

package/src/__tests__/windows-lifecycle.test.ts

@@ -227,3 +227,28 @@ test("preserves PID tracking when process termination fails", async () => {
   expect(isProcessAlive(pidFile)).toEqual({ alive: true, pid: process.pid });
   rmSync(dir, { recursive: true, force: true });
 });
+
+test("graceful-only stop times out without SIGKILL or losing PID identity", async () => {
+  const originalKill = process.kill;
+  const calls: Array<NodeJS.Signals | number | undefined> = [];
+  process.kill = ((_pid: number, signal?: NodeJS.Signals | number) => {
+    calls.push(signal);
+    return true;
+  }) as typeof process.kill;
+  try {
+    expect(
+      await stopProcess(
+        4812,
+        "backup service",
+        0,
+        "linux",
+        undefined,
+        () => "cadet-daemon",
+        true,
+      ),
+    ).toBe(false);
+    expect(calls).toEqual([0, "SIGTERM", 0]);
+  } finally {
+    process.kill = originalKill;
+  }
+});