Adversarial review of the branch produced findings across four areas. This addresses them, plus the Windows CI environment. Secrets. commit_container_snapshot baked the container's full env into the per-project snapshot image, so the shared OAuth token — and the AWS keys, git token and gateway master key — outlived revocation and were readable via docker inspect. Verified against Engine 29.6 that a commit body's config merges over the container's: keys cannot be dropped but can be overwritten, so all of them now commit as KEY=. clear_claude_token additionally rewrites images from earlier builds and reports honestly when a tag could not be rewritten. The recommendation to move the token out of env entirely was not taken, with reasoning: apiKeyHelper is a different auth method that outranks CLAUDE_CODE_OAUTH_TOKEN rather than a transport for it, and no file-based delivery exists. The durable exposure — the image — is what is closed here. Separately noted, not fixed: entrypoint.sh captures the token into the scheduler's .env inside the persisted volume. URL spoofing. Three call sites reached openUrl with container-controlled strings, one of which the review missed (the WebLinksAddon handler). The sign-in URL was scraped from container output with a longest-match tie-break and no userinfo check, so claude.ai@evil.tld rendered as "claude.ai…" in a truncating element. There is now one sanitizer in front of every sink — scheme allowlist, no userinfo, C0/C1 and quote rejection, host allowlist for the sign-in case, first-match — and the origin renders un-truncated. The toast is keyed so a changed URL remounts, closing a bait-and-switch where the user read one URL and clicked another. Migration. The rollback pin was best-effort: a tag failure was logged and the migration continued past remove_container, after which the final commit overwrote the only copy of the old system layer. It now aborts before anything destructive and reads the tag back. /var was destroyed while the ordinary recreate path preserves it — making the "safe" alternative to Reset more destructive than Reset's alternative; data-bearing subtrees are now detected and disclosed in the pre-flight rather than copied, since tarring a live database onto a different base's packages is a corruption risk. resume_migration now verifies the migration-state label instead of reporting success for a container that never swapped. dismiss actually resolves the record rather than leaving the feature permanently refusing to migrate. Start and Reset are guarded while a migration is live. Lifecycle. The gateway no longer publishes on 0.0.0.0 — bind address and advertised URL are derived together so they cannot drift. Disabling it now stops it. App exit runs teardown concurrently under a budget with a visible shutting-down state instead of blocking for minutes. Auto-starts retry when Docker is not up yet, and the polling-recovery path now reconciles, so interrupted migrations are still recovered. Auth-bridge forwards are capped, closing a container-driven fd exhaustion. Windows CI. build-windows failed on this branch with "linker link.exe not found". The runner had no MSVC build tools and the workflow assumed a hand-provisioned machine, so a bare runner registers, accepts jobs and fails at link time after downloading the whole crate graph. The job now installs the VC++ workload when vswhere cannot find it, matching how it already conditionally installs Rust and Node. 192 Rust tests, 274 frontend tests, both builds clean, zero warnings. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
357 lines
13 KiB
TypeScript
357 lines
13 KiB
TypeScript
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|
import { act, renderHook, waitFor } from "@testing-library/react";
|
|
import { useContainerMigration } from "./useContainerMigration";
|
|
import type {
|
|
ContainerStaleness,
|
|
MigrationReport,
|
|
MigrationState,
|
|
Project,
|
|
} from "../lib/types";
|
|
|
|
const getContainerStaleness = vi.fn();
|
|
const getMigrationState = vi.fn();
|
|
const migrateProjectToBase = vi.fn();
|
|
const confirmMigration = vi.fn();
|
|
const rollbackMigration = vi.fn();
|
|
const pushToast = vi.fn();
|
|
let progress: string | undefined;
|
|
|
|
vi.mock("../lib/tauri-commands", () => ({
|
|
getContainerStaleness: (...a: unknown[]) => getContainerStaleness(...a),
|
|
getMigrationState: (...a: unknown[]) => getMigrationState(...a),
|
|
migrateProjectToBase: (...a: unknown[]) => migrateProjectToBase(...a),
|
|
confirmMigration: (...a: unknown[]) => confirmMigration(...a),
|
|
rollbackMigration: (...a: unknown[]) => rollbackMigration(...a),
|
|
}));
|
|
|
|
vi.mock("../store/appState", () => ({
|
|
useAppState: Object.assign(
|
|
(selector: (s: unknown) => unknown) =>
|
|
selector({ pushToast, containerProgress: { p1: progress } }),
|
|
{
|
|
getState: () => ({ setContainerProgress: () => {} }),
|
|
},
|
|
),
|
|
}));
|
|
|
|
const STALE: ContainerStaleness = {
|
|
stale: true,
|
|
known: true,
|
|
base_image_id: "sha256:aaa",
|
|
current_base_image_id: "sha256:bbb",
|
|
snapshot_created_at: "2026-03-01T09:00:00Z",
|
|
missing_paths: ["/usr/bin/socat"],
|
|
missing_features: ["Auth bridge tunnel (socat)"],
|
|
apt_delta: ["socat"],
|
|
npm_global_delta: [],
|
|
verbatim_paths: [],
|
|
unpreserved_data: [],
|
|
outdated_package_count: 61,
|
|
probe_error: null,
|
|
};
|
|
|
|
const FRESH: ContainerStaleness = {
|
|
...STALE,
|
|
stale: false,
|
|
base_image_id: "sha256:bbb",
|
|
missing_paths: [],
|
|
missing_features: [],
|
|
apt_delta: [],
|
|
outdated_package_count: 0,
|
|
};
|
|
|
|
const CLEAN: MigrationReport = {
|
|
phase: "succeeded",
|
|
packages_requested: ["socat"],
|
|
packages_installed: ["socat"],
|
|
packages_failed: [],
|
|
paths_copied: [],
|
|
features_restored: ["Auth bridge tunnel (socat)"],
|
|
rollback_available: true,
|
|
message: "",
|
|
};
|
|
|
|
const OPTIONS = {
|
|
replay_packages: true,
|
|
copy_paths: false,
|
|
keep_rollback: true,
|
|
};
|
|
|
|
function state(overrides: Partial<MigrationState> = {}): MigrationState {
|
|
return {
|
|
phase: "in-progress",
|
|
from_image_id: "sha256:aaa",
|
|
to_base_id: "sha256:bbb",
|
|
started_at: "2026-08-09T10:00:00Z",
|
|
report: null,
|
|
rollback_image: "triple-c-snapshot-p1:pre-migration-1754733600",
|
|
staging_path: null,
|
|
options: OPTIONS,
|
|
plan: null,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
const project = { id: "p1", name: "api-server", container_id: "c1", status: "stopped" } as Project;
|
|
|
|
describe("useContainerMigration", () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
progress = undefined;
|
|
getContainerStaleness.mockResolvedValue(STALE);
|
|
getMigrationState.mockResolvedValue(null);
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.useRealTimers();
|
|
});
|
|
|
|
it("probes staleness for a container that exists", async () => {
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.staleness).toEqual(STALE));
|
|
expect(getContainerStaleness).toHaveBeenCalledWith("p1");
|
|
});
|
|
|
|
it("does not probe a project whose container was never created", async () => {
|
|
renderHook(() =>
|
|
useContainerMigration({ ...project, container_id: null } as Project),
|
|
);
|
|
await waitFor(() => expect(getMigrationState).toHaveBeenCalled());
|
|
expect(getContainerStaleness).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("shows an absent banner rather than an error one when the probe fails", async () => {
|
|
getContainerStaleness.mockRejectedValue(new Error("no such container"));
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.probing).toBe(false));
|
|
expect(result.current.staleness).toBeNull();
|
|
});
|
|
|
|
it("passes the options through and keeps the report", async () => {
|
|
migrateProjectToBase.mockResolvedValue(CLEAN);
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.staleness).toEqual(STALE));
|
|
|
|
getContainerStaleness.mockResolvedValue(FRESH);
|
|
await act(async () => {
|
|
await result.current.start({
|
|
replay_packages: true,
|
|
copy_paths: false,
|
|
keep_rollback: true,
|
|
});
|
|
});
|
|
|
|
expect(migrateProjectToBase).toHaveBeenCalledWith("p1", {
|
|
replay_packages: true,
|
|
copy_paths: false,
|
|
keep_rollback: true,
|
|
});
|
|
expect(result.current.report).toEqual(CLEAN);
|
|
expect(result.current.running).toBe(false);
|
|
});
|
|
|
|
it("turns a rejected migrate call into a failed report, not a silent nothing", async () => {
|
|
migrateProjectToBase.mockRejectedValue(new Error("docker daemon went away"));
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await act(async () => {
|
|
await result.current.start({
|
|
replay_packages: true,
|
|
copy_paths: false,
|
|
keep_rollback: true,
|
|
});
|
|
});
|
|
expect(result.current.report?.phase).toBe("failed");
|
|
expect(result.current.report?.message).toMatch(/docker daemon went away/);
|
|
expect(result.current.report?.rollback_available).toBe(false);
|
|
});
|
|
|
|
it("clears the report and re-probes once the migration is kept", async () => {
|
|
migrateProjectToBase.mockResolvedValue(CLEAN);
|
|
confirmMigration.mockResolvedValue(undefined);
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await act(async () => {
|
|
await result.current.start({
|
|
replay_packages: true,
|
|
copy_paths: false,
|
|
keep_rollback: true,
|
|
});
|
|
});
|
|
getContainerStaleness.mockResolvedValue(FRESH);
|
|
await act(async () => {
|
|
await result.current.keep();
|
|
});
|
|
expect(confirmMigration).toHaveBeenCalledWith("p1");
|
|
expect(result.current.report).toBeNull();
|
|
await waitFor(() => expect(result.current.staleness).toEqual(FRESH));
|
|
});
|
|
|
|
it("says out loud that a rollback left the volumes alone", async () => {
|
|
rollbackMigration.mockResolvedValue(undefined);
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await act(async () => {
|
|
await result.current.rollback();
|
|
});
|
|
expect(rollbackMigration).toHaveBeenCalledWith("p1");
|
|
expect(pushToast).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
kind: "success",
|
|
detail: expect.stringMatching(/Volumes were not touched/i),
|
|
}),
|
|
);
|
|
});
|
|
|
|
it("resolves the record when a report is dismissed, not just the local state", async () => {
|
|
// Dismiss is the *only* action offered when `rollback_available` is false.
|
|
// As local state it left an `awaiting-confirmation` record on disk that
|
|
// came back on the next mount and made every future migration refuse with
|
|
// "already has a finished migration waiting for a decision" — unrecoverable
|
|
// without deleting JSON by hand.
|
|
confirmMigration.mockResolvedValue(undefined);
|
|
migrateProjectToBase.mockResolvedValue({ ...CLEAN, rollback_available: false });
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await act(async () => {
|
|
await result.current.start(OPTIONS);
|
|
});
|
|
expect(result.current.report).not.toBeNull();
|
|
|
|
await act(async () => {
|
|
await result.current.dismiss();
|
|
});
|
|
expect(confirmMigration).toHaveBeenCalledWith("p1");
|
|
expect(result.current.report).toBeNull();
|
|
});
|
|
|
|
it("keeps the report on screen when dismissing it could not be recorded", async () => {
|
|
confirmMigration.mockRejectedValue(new Error("disk is read-only"));
|
|
migrateProjectToBase.mockResolvedValue({ ...CLEAN, rollback_available: false });
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await act(async () => {
|
|
await result.current.start(OPTIONS);
|
|
});
|
|
await act(async () => {
|
|
await result.current.dismiss();
|
|
});
|
|
expect(result.current.report).not.toBeNull();
|
|
expect(pushToast).toHaveBeenCalledWith(
|
|
expect.objectContaining({ kind: "error" }),
|
|
);
|
|
});
|
|
|
|
it("reports the probe as settled only once it has actually landed", async () => {
|
|
// Everything downstream reads an unlanded probe's empty arrays as "nothing
|
|
// found", so "settled" has to be a distinct signal from "not probing".
|
|
getContainerStaleness.mockResolvedValue({
|
|
...STALE,
|
|
probe_error: "could not exec in the container",
|
|
});
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.probing).toBe(false));
|
|
expect(result.current.probeSettled).toBe(false);
|
|
|
|
getContainerStaleness.mockResolvedValue(STALE);
|
|
await act(async () => {
|
|
await result.current.refresh();
|
|
});
|
|
expect(result.current.probeSettled).toBe(true);
|
|
});
|
|
|
|
describe("crash recovery", () => {
|
|
it("adopts a run that was still in progress, and polls it to a report", async () => {
|
|
getMigrationState.mockResolvedValue(state());
|
|
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.running).toBe(true));
|
|
expect(result.current.recovered).toBe(true);
|
|
|
|
getMigrationState.mockResolvedValue(
|
|
state({ phase: "awaiting-confirmation", report: CLEAN }),
|
|
);
|
|
await waitFor(() => expect(result.current.report).toEqual(CLEAN), {
|
|
timeout: 5000,
|
|
});
|
|
expect(result.current.running).toBe(false);
|
|
});
|
|
|
|
it("surfaces a finished migration that was never acknowledged", async () => {
|
|
getMigrationState.mockResolvedValue(
|
|
state({ phase: "awaiting-confirmation", report: CLEAN }),
|
|
);
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.report).toEqual(CLEAN));
|
|
expect(result.current.running).toBe(false);
|
|
});
|
|
|
|
it("surfaces an interrupted migration instead of leaving it invisible", async () => {
|
|
getMigrationState.mockResolvedValue(state({ phase: "interrupted" }));
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.interrupted).not.toBeNull());
|
|
// Nothing is driving it, so it is not "running" and has no report.
|
|
expect(result.current.running).toBe(false);
|
|
expect(result.current.report).toBeNull();
|
|
});
|
|
|
|
it("resumes an interrupted migration with the options it was given", async () => {
|
|
getMigrationState.mockResolvedValue(state({ phase: "interrupted" }));
|
|
migrateProjectToBase.mockResolvedValue(CLEAN);
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.interrupted).not.toBeNull());
|
|
|
|
// The resume worked, so the backend cleared the record.
|
|
getMigrationState.mockResolvedValue(state({ phase: "awaiting-confirmation" }));
|
|
await act(async () => {
|
|
await result.current.resume();
|
|
});
|
|
// The deltas cannot be recomputed after the swap, so the recorded plan's
|
|
// options are replayed verbatim rather than re-derived.
|
|
expect(migrateProjectToBase).toHaveBeenCalledWith("p1", OPTIONS);
|
|
expect(result.current.interrupted).toBeNull();
|
|
expect(result.current.report).toEqual(CLEAN);
|
|
});
|
|
|
|
it("keeps a mid-swap container visible when the resume itself fails", async () => {
|
|
// The old behaviour nulled `interrupted` at the top of `start` and never
|
|
// looked again, so a failed resume hid a half-migrated container for the
|
|
// rest of the session — leaving Keep as the only offered action over it.
|
|
getMigrationState.mockResolvedValue(state({ phase: "interrupted" }));
|
|
migrateProjectToBase.mockRejectedValue(new Error("docker daemon went away"));
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.interrupted).not.toBeNull());
|
|
|
|
await act(async () => {
|
|
await result.current.resume();
|
|
});
|
|
expect(result.current.report?.phase).toBe("failed");
|
|
expect(result.current.interrupted?.phase).toBe("interrupted");
|
|
});
|
|
|
|
it("adopts the interrupted record a failed fresh run leaves behind", async () => {
|
|
// `commit_container_snapshot` failing after the swap returns a report and
|
|
// writes `interrupted`. Both have to reach the UI, or Keep is offered
|
|
// over a container the app can no longer reason about.
|
|
getMigrationState.mockResolvedValue(null);
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.staleness).toEqual(STALE));
|
|
|
|
migrateProjectToBase.mockResolvedValue({
|
|
...CLEAN,
|
|
phase: "failed",
|
|
message: "saving it failed. Resume it, or roll back.",
|
|
});
|
|
getMigrationState.mockResolvedValue(state({ phase: "interrupted" }));
|
|
await act(async () => {
|
|
await result.current.start(OPTIONS);
|
|
});
|
|
expect(result.current.interrupted?.phase).toBe("interrupted");
|
|
});
|
|
|
|
it("ignores an unrecognised phase from a future build rather than crashing", async () => {
|
|
getMigrationState.mockResolvedValue(state({ phase: "quantum-tunnelling" }));
|
|
const { result } = renderHook(() => useContainerMigration(project));
|
|
await waitFor(() => expect(result.current.staleness).toEqual(STALE));
|
|
expect(result.current.running).toBe(false);
|
|
expect(result.current.interrupted).toBeNull();
|
|
expect(result.current.report).toBeNull();
|
|
});
|
|
});
|
|
});
|