@exagone313/dsh-podman 0.2.0-rc.4 → 0.2.0

package/dist/project-path.test.js

@@ -31,6 +31,20 @@ test("confineToRoot clamps a directory to the projects root", () => {
     assert.equal(confineToRoot("/projects", ""), "/projects");
     assert.equal(confineToRoot("/projects", "/projects/web/"), "/projects/web", "trailing slashes are ignored");
 });
+test("project paths resolve their dots and never escape the root", () => {
+    // A ".." that stays inside the root is resolved.
+    assert.equal(confineToRoot("/projects", "/projects/a/../b"), "/projects/b");
+    assert.equal(hostPathForProjectName("/projects", "a/../b"), "/projects/b");
+    // A ".." that would climb above the root clamps to the root, on both the
+    // path-building and the path-clamping helper.
+    assert.equal(confineToRoot("/projects", "/projects/../etc"), "/projects");
+    assert.equal(confineToRoot("/projects", "/projects/a/../../etc"), "/projects");
+    assert.equal(hostPathForProjectName("/projects", "../etc"), "/projects");
+    assert.equal(hostPathForProjectName("/projects", "a/../../etc"), "/projects");
+    assert.equal(hostPathForProjectName("/projects", "/../etc"), "/projects");
+    // A "." segment is dropped, not kept as a directory name.
+    assert.equal(hostPathForProjectName("/projects", "./web"), "/projects/web");
+});
 test("parentDirectory never climbs above the projects root", () => {
     assert.equal(parentDirectory("/projects", "/projects/web/sub"), "/projects/web");
     assert.equal(parentDirectory("/projects", "/projects/web"), "/projects");

package/dist/prompts.d.ts

@@ -7,7 +7,3 @@ export declare function podmanRuntimeSection(ctx: any): {
         scope?: unknown;
     }) => string;
 };
-export declare const PODMAN_OPS_PRESET_YML = "name: Podman operator mode\ndescription: Podman-focused container operations \u2014 manage images, containers, volumes, mounts, secrets, and daemons. Inspections and lifecycle run directly; commands, container file edits, daemon starts, and secret changes ask for approval; supports web research.\norder: 2\n";
-export declare const PODMAN_OPS_AGENT_CORDIS_YML = "- id: persona\n  name: '@deepseek-ai/dsh-persona'\n  config:\n    suffix: Your working directory is {{cwd}}.\n    prefix: >-\n      You are a Podman container-operations agent powered by the {{model}} model.\n\n      You manage container infrastructure through the dsh-podman tools: images\n      (image_list, image_get, image_build, image_rebuild, image_rebuild_all,\n      image_remove), containers (container_list, container_start,\n      container_recreate, container_remove), mounts (container_mount_list,\n      container_mount_add, container_mount_remove, container_mount_update),\n      PATH additions (container_path_set, container_path_add,\n      container_path_remove), volumes (volume_list,\n      volume_create, volume_remove), secrets (secret_list, secret_create,\n      secret_remove, container_secret_add, container_secret_remove), daemons\n      (daemon_list, daemon_start, daemon_stop, daemon_restart, daemon_logs),\n      and container inspection (container_read, container_glob,\n      container_grep).\n\n      Inspection and lifecycle operations run directly. Running commands inside\n      a container (container_bash, container_exec), editing container files\n      (container_write, container_edit), starting daemons (daemon_start),\n      exposing or removing secret environment variables (container_secret_add,\n      container_secret_remove), removing secrets (secret_remove), and\n      rebuilding all images (image_rebuild_all) require the user's approval.\n      Use web_search to research images and documentation. Use\n      ask_user_question for user decisions and todo_write to track work.\n- id: tool-ask-user\n  name: '@deepseek-ai/dsh-tool-ask-user'\n- id: tool-todo\n  name: '@deepseek-ai/dsh-tool-todo'\n  config:\n    allowParallelInProgress: true\n- id: tool-web\n  name: '@deepseek-ai/dsh-tool-web'\n  config:\n    fetch: false\n    searchTimeoutMs: 60000\n";
-export declare function ensurePodmanOpsPreset(ctx: any, dir?: string): void;
-export declare function homePresetsRoot(): string;

package/dist/prompts.js

@@ -1,10 +1,6 @@
 // SPDX-FileCopyrightText: 2026 Elouan Martinet <exa@elou.world>
 //
 // SPDX-License-Identifier: MIT
-import { PODMAN_OPS_PRESET } from "./approval.js";
-import { mkdirSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
 // Prompt section the harness registers to name its own on-disk checkout.
 // Mirrors @deepseek-ai/dsh-app-boot's HARNESS_SOURCE_SECTION.
 export const HARNESS_SOURCE_SECTION = "harness:source";
@@ -50,6 +46,19 @@ const RUNTIME_CONTAINER_ONLY = "This dsh session's container tools run in a Podm
     "not exist. Containers share the host kernel, so `uname -a`, `uname -r`, " +
     "and `/proc/version` do report the host kernel; the container's own identity " +
     "shows in `hostname`, `/etc/os-release`, and `/proc/1/cmdline`.";
+// Storage guidance both runtime wordings carry. It names only tools that exist
+// in every agent composition (`image_build`, `container_start`,
+// `container_recreate`, volume mounts), so it is safe to append verbatim to the
+// wording for an agent with or without the built-in tools.
+const RUNTIME_STORAGE_NOTES = " To install software, prefer building a custom image with `image_build` (a " +
+    "short name, a base or custom parent image, and the packages to add) and " +
+    "then running containers from it with `container_start` or " +
+    "`container_recreate` (`image`); an install into a running container does " +
+    "not survive a recreate, while an image change does. For data that must " +
+    "outlive a recreate, mount a named `volume` (auto-created on first use) " +
+    "instead of a `tmpfs`, including the container's `/tmp` — a tool call that " +
+    "recreates the container (a mount or secret change, `container_recreate`, a " +
+    "read-only remount) clears tmpfs contents.";
 // Correct the model's host/container mental model: the built-in shell and
 // filesystem tools are container-backed too, so there is no host shell. It sits
 // just before the tool sections so the correction lands next to the tool
@@ -64,86 +73,8 @@ export function podmanRuntimeSection(ctx) {
     return {
         name: "podman:runtime",
         order: 950,
-        text: ({ scope } = {}) => BUILTIN_TOOLS.some((name) => ctx.tools.get(name, scope) !== undefined)
+        text: ({ scope } = {}) => (BUILTIN_TOOLS.some((name) => ctx.tools.get(name, scope) !== undefined)
             ? RUNTIME_WITH_BUILTINS
-            : RUNTIME_CONTAINER_ONLY,
+            : RUNTIME_CONTAINER_ONLY) + RUNTIME_STORAGE_NOTES,
     };
 }
-// The "Podman operator mode" preset metadata, shipped verbatim into the
-// harness's user-presets root.
-export const PODMAN_OPS_PRESET_YML = `name: Podman operator mode
-description: Podman-focused container operations — manage images, containers, volumes, mounts, secrets, and daemons. Inspections and lifecycle run directly; commands, container file edits, daemon starts, and secret changes ask for approval; supports web research.
-order: 2
-`;
-// The "Podman operator mode" agent composition: a Podman-focused persona plus
-// the built-in task and web tools. The plugin's own container tools are global
-// and need no rows; the command/file/daemon/secret tools stay available but
-// gated by the pre-execute policy (PODMAN_OPS_APPROVAL_TOOLS + global flags).
-export const PODMAN_OPS_AGENT_CORDIS_YML = `- id: persona
-  name: '@deepseek-ai/dsh-persona'
-  config:
-    suffix: Your working directory is {{cwd}}.
-    prefix: >-
-      You are a Podman container-operations agent powered by the {{model}} model.
-
-      You manage container infrastructure through the dsh-podman tools: images
-      (image_list, image_get, image_build, image_rebuild, image_rebuild_all,
-      image_remove), containers (container_list, container_start,
-      container_recreate, container_remove), mounts (container_mount_list,
-      container_mount_add, container_mount_remove, container_mount_update),
-      PATH additions (container_path_set, container_path_add,
-      container_path_remove), volumes (volume_list,
-      volume_create, volume_remove), secrets (secret_list, secret_create,
-      secret_remove, container_secret_add, container_secret_remove), daemons
-      (daemon_list, daemon_start, daemon_stop, daemon_restart, daemon_logs),
-      and container inspection (container_read, container_glob,
-      container_grep).
-
-      Inspection and lifecycle operations run directly. Running commands inside
-      a container (container_bash, container_exec), editing container files
-      (container_write, container_edit), starting daemons (daemon_start),
-      exposing or removing secret environment variables (container_secret_add,
-      container_secret_remove), removing secrets (secret_remove), and
-      rebuilding all images (image_rebuild_all) require the user's approval.
-      Use web_search to research images and documentation. Use
-      ask_user_question for user decisions and todo_write to track work.
-- id: tool-ask-user
-  name: '@deepseek-ai/dsh-tool-ask-user'
-- id: tool-todo
-  name: '@deepseek-ai/dsh-tool-todo'
-  config:
-    allowParallelInProgress: true
-- id: tool-web
-  name: '@deepseek-ai/dsh-tool-web'
-  config:
-    fetch: false
-    searchTimeoutMs: 60000
-`;
-// Install the "Podman operator mode" agent preset into the harness's
-// user-presets root (~/.dsh/.agent-presets/<id>). The plugin owns the preset
-// content and (re)writes it on every load, so a local copy is always brought
-// back to the shipped composition. Best-effort — a failure only logs.
-export function ensurePodmanOpsPreset(ctx, dir) {
-    const log = (message, ...args) => {
-        try {
-            ctx?.logger?.warn?.(message, ...args);
-        }
-        catch {
-            // Logger failure must not abort preset installation.
-        }
-    };
-    try {
-        const target = dir ?? join(homePresetsRoot(), PODMAN_OPS_PRESET);
-        mkdirSync(target, { recursive: true });
-        writeFileSync(join(target, "preset.yml"), PODMAN_OPS_PRESET_YML);
-        writeFileSync(join(target, "agent.cordis.yml"), PODMAN_OPS_AGENT_CORDIS_YML);
-        log(`[dsh-podman] wrote the "${PODMAN_OPS_PRESET}" agent preset to %s`, target);
-    }
-    catch (error) {
-        log(`[dsh-podman] could not install the "${PODMAN_OPS_PRESET}" agent preset: %o`, error);
-    }
-}
-// The harness user-presets root ($DSH_HOME or ~/.dsh, plus .agent-presets).
-export function homePresetsRoot() {
-    return join(process.env.DSH_HOME ?? join(homedir(), ".dsh"), ".agent-presets");
-}

package/dist/read-only-shell.js

@@ -65,7 +65,9 @@ export function createReadOnlyShellGate(deps) {
 // plugin's tools, the default container for the built-in ones.
 function containerOf(exec) {
     const container = exec?.arguments?.container;
-    return typeof container === "string" && container !== "" ? container : "default";
+    return typeof container === "string" && container !== ""
+        ? container
+        : "default";
 }
 // Whether a mount kind carries a mode: project and volume mounts do; tmpfs is
 // always read-write and secret mounts take none.

package/dist/read-only-shell.test.js

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 import test from "node:test";
 import assert from "node:assert/strict";
-import { READ_ONLY_GATED_TOOLS, REMOUNT_TOOL_NAME, createReadOnlyShellGate, } from "./index.js";
+import { createReadOnlyShellGate, READ_ONLY_GATED_TOOLS, REMOUNT_TOOL_NAME, } from "./index.js";
 import { WORKSPACE_ID } from "./test-support.js";
 const EXEC = {
     name: "bash",
@@ -22,17 +22,15 @@ function gateFixture(mounts, options = {}) {
         async control(method, request) {
             controlCalls.push([method, request]);
             if (method === "listContainers") {
-                return mounts === undefined
-                    ? { containers: [] }
-                    : {
-                        containers: [
-                            {
-                                workspaceSlug: WORKSPACE_ID,
-                                containerName,
-                                mounts,
-                            },
-                        ],
-                    };
+                return mounts === undefined ? { containers: [] } : {
+                    containers: [
+                        {
+                            workspaceSlug: WORKSPACE_ID,
+                            containerName,
+                            mounts,
+                        },
+                    ],
+                };
             }
             return {};
         },
@@ -68,9 +66,21 @@ test("the gate covers the shell, file, and daemon tools", () => {
 });
 test("all mounts read-only allows the tool without a prompt", async () => {
     const { gate, controlCalls, approvals } = gateFixture([
-        { projectName: "team", kind: "MOUNT_KIND_PROJECT", mode: "MOUNT_MODE_READ_ONLY" },
-        { kind: "MOUNT_KIND_TMPFS", destination: "/scratch", mode: "MOUNT_MODE_READ_WRITE" },
-        { kind: "MOUNT_KIND_SECRET", secret: "tls", destination: "/run/secrets/tls" },
+        {
+            projectName: "team",
+            kind: "MOUNT_KIND_PROJECT",
+            mode: "MOUNT_MODE_READ_ONLY",
+        },
+        {
+            kind: "MOUNT_KIND_TMPFS",
+            destination: "/scratch",
+            mode: "MOUNT_MODE_READ_WRITE",
+        },
+        {
+            kind: "MOUNT_KIND_SECRET",
+            secret: "tls",
+            destination: "/run/secrets/tls",
+        },
     ]);
     assert.deepEqual(await gate(EXEC, "en"), { kind: "allow" });
     assert.deepEqual(approvals, []);
@@ -78,10 +88,27 @@ test("all mounts read-only allows the tool without a prompt", async () => {
 });
 test("a read-write mount prompts and then remounts read-only", async () => {
     const { gate, controlCalls, approvals } = gateFixture([
-        { projectName: "team", kind: "MOUNT_KIND_PROJECT", mode: "MOUNT_MODE_READ_WRITE" },
-        { kind: "MOUNT_KIND_VOLUME", volume: "data", destination: "/data", mode: "MOUNT_MODE_READ_WRITE" },
-        { kind: "MOUNT_KIND_TMPFS", destination: "/scratch", mode: "MOUNT_MODE_READ_WRITE" },
-        { kind: "MOUNT_KIND_SECRET", secret: "tls", destination: "/run/secrets/tls" },
+        {
+            projectName: "team",
+            kind: "MOUNT_KIND_PROJECT",
+            mode: "MOUNT_MODE_READ_WRITE",
+        },
+        {
+            kind: "MOUNT_KIND_VOLUME",
+            volume: "data",
+            destination: "/data",
+            mode: "MOUNT_MODE_READ_WRITE",
+        },
+        {
+            kind: "MOUNT_KIND_TMPFS",
+            destination: "/scratch",
+            mode: "MOUNT_MODE_READ_WRITE",
+        },
+        {
+            kind: "MOUNT_KIND_SECRET",
+            secret: "tls",
+            destination: "/run/secrets/tls",
+        },
     ]);
     assert.deepEqual(await gate(EXEC, "en"), { kind: "allow" });
     assert.equal(approvals.length, 1);
@@ -95,15 +122,39 @@ test("a read-write mount prompts and then remounts read-only", async () => {
         workspaceSlug: WORKSPACE_ID,
         container: "default",
         mounts: [
-            { projectName: "team", kind: "MOUNT_KIND_PROJECT", mode: "MOUNT_MODE_READ_ONLY" },
-            { projectName: "", kind: "MOUNT_KIND_VOLUME", mode: "MOUNT_MODE_READ_ONLY", destination: "/data", volume: "data" },
-            { projectName: "", kind: "MOUNT_KIND_TMPFS", mode: "MOUNT_MODE_READ_WRITE", destination: "/scratch" },
-            { projectName: "", kind: "MOUNT_KIND_SECRET", destination: "/run/secrets/tls", secret: "tls" },
+            {
+                projectName: "team",
+                kind: "MOUNT_KIND_PROJECT",
+                mode: "MOUNT_MODE_READ_ONLY",
+            },
+            {
+                projectName: "",
+                kind: "MOUNT_KIND_VOLUME",
+                mode: "MOUNT_MODE_READ_ONLY",
+                destination: "/data",
+                volume: "data",
+            },
+            {
+                projectName: "",
+                kind: "MOUNT_KIND_TMPFS",
+                mode: "MOUNT_MODE_READ_WRITE",
+                destination: "/scratch",
+            },
+            {
+                projectName: "",
+                kind: "MOUNT_KIND_SECRET",
+                destination: "/run/secrets/tls",
+                secret: "tls",
+            },
         ],
     });
 });
 test("a declined prompt denies without remounting", async () => {
-    const { gate, controlCalls, approvals } = gateFixture([{ projectName: "team", kind: "MOUNT_KIND_PROJECT", mode: "MOUNT_MODE_READ_WRITE" }], { approve: false });
+    const { gate, controlCalls, approvals } = gateFixture([{
+            projectName: "team",
+            kind: "MOUNT_KIND_PROJECT",
+            mode: "MOUNT_MODE_READ_WRITE",
+        }], { approve: false });
     const decision = (await gate(EXEC, "en"));
     assert.equal(decision.kind, "deny");
     assert.match(decision.reason, /mounts were not remounted/);
@@ -116,7 +167,11 @@ test("an unreadable container falls through to the plain denial", async () => {
     assert.deepEqual(approvals, []);
 });
 test("a plugin tool targets its own container", async () => {
-    const { gate, controlCalls } = gateFixture([{ projectName: "team", kind: "MOUNT_KIND_PROJECT", mode: "MOUNT_MODE_READ_ONLY" }], { containerName: "web" });
+    const { gate, controlCalls } = gateFixture([{
+            projectName: "team",
+            kind: "MOUNT_KIND_PROJECT",
+            mode: "MOUNT_MODE_READ_ONLY",
+        }], { containerName: "web" });
     const exec = {
         name: "container_bash",
         arguments: { container: "web" },

package/dist/runtime-client.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/runtime-client.test.js

@@ -0,0 +1,53 @@
+// SPDX-FileCopyrightText: 2026 Elouan Martinet <exa@elou.world>
+//
+// SPDX-License-Identifier: MIT
+import test from "node:test";
+import assert from "node:assert/strict";
+import { abortError, closeClients, controlClient, guestClient, unary, } from "./grpc/runtime-client.js";
+test("clients are reused per socket and a close drops the cache", () => {
+    const first = controlClient("/run/dsh-podman/orchestrator.sock");
+    const second = controlClient("/run/dsh-podman/orchestrator.sock");
+    assert.equal(second, first, "the same socket must reuse one channel");
+    assert.notEqual(controlClient("/tmp/other.sock"), first, "a different socket gets its own channel");
+    const guest = guestClient("/run/dsh-podman/w/guest.sock");
+    closeClients();
+    assert.notEqual(controlClient("/run/dsh-podman/orchestrator.sock"), first, "a disposed client is not served from the cache");
+    assert.notEqual(guestClient("/run/dsh-podman/w/guest.sock"), guest);
+    closeClients();
+});
+test("unary rejects a pre-aborted call without invoking the client", async () => {
+    const controller = new AbortController();
+    controller.abort();
+    let called = false;
+    const client = {
+        method: () => {
+            called = true;
+        },
+    };
+    await assert.rejects(() => unary(client, "method", {}, undefined, controller.signal), (error) => error.code === "ABORTED");
+    assert.equal(called, false);
+});
+test("unary cancels a pending call when the signal aborts", async () => {
+    const controller = new AbortController();
+    let cancelled = false;
+    let settle;
+    const client = {
+        method: (_request, _metadata, callback) => {
+            settle = callback;
+            return {
+                cancel: () => {
+                    cancelled = true;
+                    // grpc-js settles a cancelled call with a CANCELLED status.
+                    settle?.(Object.assign(new Error("cancelled"), { code: 1 }));
+                },
+            };
+        },
+    };
+    const pending = unary(client, "method", {}, undefined, controller.signal);
+    controller.abort();
+    await assert.rejects(pending, (error) => error.code === "ABORTED");
+    assert.equal(cancelled, true);
+});
+test("abortError carries a stable code", () => {
+    assert.equal(abortError("exec").code, "ABORTED");
+});

package/dist/secrets.test.js

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MIT
 import test from "node:test";
 import assert from "node:assert/strict";
-import { MOUNT_EXEC, SECRET_TOOLS, WORKSPACE_ID, mountRequestRecorder } from "./test-support.js";
-import { READ_ONLY_TOOLS, TOOLS, toolHandlers } from "./index.js";
+import { MOUNT_EXEC, mountRequestRecorder, SECRET_TOOLS, WORKSPACE_ID, } from "./test-support.js";
+import { READ_ONLY_TOOLS, toolHandlers, TOOLS } from "./index.js";
 test("secret tools are registered with the expected schemas", () => {
     assert.ok(READ_ONLY_TOOLS.has("secret_list"), "secret_list must be read-only");
     const listTool = TOOLS.find((entry) => entry.name === "secret_list");
@@ -29,7 +29,11 @@ test("secret tools are registered with the expected schemas", () => {
     const addTool = TOOLS.find((entry) => entry.name === "container_secret_add");
     assert.ok(addTool, "container_secret_add registered");
     assert.equal(addTool.approval, true, "container_secret_add must require approval");
-    assert.deepEqual(addTool.parameters.required, ["container", "env", "secret"]);
+    assert.deepEqual(addTool.parameters.required, [
+        "container",
+        "env",
+        "secret",
+    ]);
     assert.equal(addTool.parameters.properties.secret.type, "string");
     assert.equal(addTool.parameters.properties.env.type, "string");
     const removeEnvTool = TOOLS.find((entry) => entry.name === "container_secret_remove");
@@ -86,15 +90,26 @@ test("secret mount kinds forward the secret to the orchestrator", async () => {
 });
 test("mount tools reject a read-write secret mount", async () => {
     const { requests, resolver } = mountRequestRecorder();
-    await assert.rejects(() => toolHandlers.container_mount_add(resolver, { container: "web", kind: "secret", secret: "tls", destination: "/run/secrets/tls", mode: "read_write" }, MOUNT_EXEC), /secret mounts are read-only/);
+    await assert.rejects(() => toolHandlers.container_mount_add(resolver, {
+        container: "web",
+        kind: "secret",
+        secret: "tls",
+        destination: "/run/secrets/tls",
+        mode: "read_write",
+    }, MOUNT_EXEC), /secret mounts are read-only/);
     await assert.rejects(() => toolHandlers.container_start(resolver, {
         container: "web",
         image: "img1",
-        mounts: [{ kind: "secret", secret: "tls", destination: "/run/secrets/tls", mode: "read_write" }],
+        mounts: [{
+                kind: "secret",
+                secret: "tls",
+                destination: "/run/secrets/tls",
+                mode: "read_write",
+            }],
     }, MOUNT_EXEC), /secret mounts are read-only/);
     assert.deepEqual(requests, [], "a rejected mount must not reach the orchestrator");
 });
-test("container_list returns secret_env maps on container rows", async () => {
+test("container_list returns secretEnv maps on container rows", async () => {
     const resolver = {
         registry: {
             resolveByPath: async () => ({ id: WORKSPACE_ID }),

package/dist/settings-commands.test.js

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 import { test } from "node:test";
 import { strict as assert } from "node:assert";
-import { fakeScope, fakeContext, baseValue, installedMountScope, mountCommand, } from "./card-test-support.js";
+import { baseValue, fakeContext, fakeScope, installedMountScope, mountCommand, } from "./card-test-support.js";
 import { installCardCommandDriver } from "./card-test-support.js";
 test("remove command drives removeContainer and clears the command", async () => {
     const scope = fakeScope(baseValue());
@@ -65,27 +65,50 @@ test("cache_clean command drives cleanCaches, maps the mode, and reports the res
                 return { containers: [] };
             if (method === "listImages")
                 return { images: [] };
-            if (method === "cleanCaches")
+            if (method === "cleanCaches") {
                 return { removedFiles: 2, removedBytes: "2048" };
+            }
             if (method === "listCaches") {
-                return { caches: [{ manager: "pacman", path: "/cache", files: 1, bytes: "1024" }] };
+                return {
+                    caches: [{
+                            manager: "pacman",
+                            path: "/cache",
+                            files: 1,
+                            bytes: "1024",
+                        }],
+                };
             }
             return {};
         },
     };
     await installCardCommandDriver(fakeContext(scope), resolver);
     await scope.update({
-        command: { op: "cache_clean", workspace: "", image: "", at: 3, cacheMode: "all" },
+        command: {
+            op: "cache_clean",
+            workspace: "",
+            image: "",
+            at: 3,
+            cacheMode: "all",
+        },
     });
     await new Promise((resolve) => setImmediate(resolve));
     await scope.update({
-        command: { op: "cache_clean", workspace: "", image: "", at: 4, cacheMode: "keep-latest" },
+        command: {
+            op: "cache_clean",
+            workspace: "",
+            image: "",
+            at: 4,
+            cacheMode: "keep-latest",
+        },
     });
     await new Promise((resolve) => setImmediate(resolve));
     const modes = calls
         .filter(([method]) => method === "cleanCaches")
         .map(([, request]) => request.mode);
-    assert.deepEqual(modes, ["CACHE_CLEAN_MODE_ALL", "CACHE_CLEAN_MODE_KEEP_LATEST"]);
+    assert.deepEqual(modes, [
+        "CACHE_CLEAN_MODE_ALL",
+        "CACHE_CLEAN_MODE_KEEP_LATEST",
+    ]);
     assert.equal(scope.value.command, null);
     assert.equal(scope.value.notice, "removed 2 cached files");
     const caches = scope.value.caches;
@@ -173,7 +196,14 @@ test("secret_remove command drives removeSecret with the name", async () => {
     };
     await installCardCommandDriver(fakeContext(scope), resolver);
     await scope.update({
-        command: { op: "secret_remove", workspace: "db-pass", image: "", at: 7, mounts: [], value: "" },
+        command: {
+            op: "secret_remove",
+            workspace: "db-pass",
+            image: "",
+            at: 7,
+            mounts: [],
+            value: "",
+        },
     });
     await new Promise((resolve) => setImmediate(resolve));
     const removeCall = calls.find(([method]) => method === "removeSecret");
@@ -203,7 +233,14 @@ test("secret_set command drives writeSecretValue with the name and value", async
     };
     await installCardCommandDriver(fakeContext(scope), resolver);
     await scope.update({
-        command: { op: "secret_set", workspace: "db-pass", image: "", at: 8, mounts: [], value: "s3cr3t" },
+        command: {
+            op: "secret_set",
+            workspace: "db-pass",
+            image: "",
+            at: 8,
+            mounts: [],
+            value: "s3cr3t",
+        },
     });
     await new Promise((resolve) => setImmediate(resolve));
     const setCall = calls.find(([method]) => method === "writeSecretValue");
@@ -293,7 +330,12 @@ test("image_base_rebuild command drives rebuildBaseImage with the name", async (
     };
     await installCardCommandDriver(fakeContext(scope), resolver);
     await scope.update({
-        command: { op: "image_base_rebuild", workspace: "archlinux", image: "", at: 21 },
+        command: {
+            op: "image_base_rebuild",
+            workspace: "archlinux",
+            image: "",
+            at: 21,
+        },
     });
     await new Promise((resolve) => setImmediate(resolve));
     const rebuildCall = calls.find(([method]) => method === "rebuildBaseImage");
@@ -323,7 +365,12 @@ test("image_base_pull command drives pullBaseImage with the name", async () => {
     };
     await installCardCommandDriver(fakeContext(scope), resolver);
     await scope.update({
-        command: { op: "image_base_pull", workspace: "archlinux", image: "", at: 22 },
+        command: {
+            op: "image_base_pull",
+            workspace: "archlinux",
+            image: "",
+            at: 22,
+        },
     });
     await new Promise((resolve) => setImmediate(resolve));
     const pullCall = calls.find(([method]) => method === "pullBaseImage");
@@ -398,7 +445,7 @@ test("container_secret_add command drives addContainerSecret with env and secret
             workspace: "w",
             container: "web",
             secret: "tok",
-            secretEnv: "TOKEN",
+            secretEnvName: "TOKEN",
             image: "",
             at: 16,
         },
@@ -441,7 +488,7 @@ test("container_secret_add command uses the default container when omitted", asy
             workspace: "w",
             container: "",
             secret: "tok",
-            secretEnv: "TOKEN",
+            secretEnvName: "TOKEN",
             image: "",
             at: 17,
         },
@@ -483,7 +530,7 @@ test("container_secret_remove command drives removeContainerSecret with the defa
             op: "container_secret_remove",
             workspace: "w",
             container: "",
-            secretEnv: "TOKEN",
+            secretEnvName: "TOKEN",
             image: "",
             at: 18,
         },
@@ -520,7 +567,7 @@ test("unset kind and mode strings map to project and read_only", async () => {
                 }],
             env: {},
             container: "",
-            secretEnvMap: {},
+            secretEnv: {},
             mount: null,
         },
     });