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

package/dist/card-route.test.js

@@ -5,7 +5,6 @@ import { test } from "node:test";
 import { strict as assert } from "node:assert";
 import { CARD_PATH } from "./client/card-protocol.js";
 import { registerCardRoute } from "./card-route.js";
-import { installContainerPreferences } from "./preferences.js";
 function fakeResolver() {
     const calls = [];
     const resolver = {
@@ -19,8 +18,9 @@ function fakeResolver() {
             calls.push([method, request]);
             if (method === "getVersion")
                 return { version: "9.9.9", commit: "abc" };
-            if (method === "listContainers")
+            if (method === "listContainers") {
                 return { containers: [{ containerName: "c1" }] };
+            }
             if (method === "listImages")
                 return { images: [{ imageId: "img1" }] };
             if (method === "listWorkspaces")
@@ -29,8 +29,9 @@ function fakeResolver() {
                 return { volumes: [{ name: "data" }] };
             if (method === "listSecrets")
                 return { secrets: [{ name: "s1" }] };
-            if (method === "listCaches")
+            if (method === "listCaches") {
                 return { caches: [{ manager: "pacman", files: 1, bytes: "1024" }] };
+            }
             if (method === "cleanCaches")
                 return { removedFiles: 2 };
             if (method === "removeContainer")
@@ -44,7 +45,7 @@ function fakeRouteContext() {
     const routes = [];
     const ctx = {
         inject(deps, callback) {
-            assert.deepEqual(deps, ["connection", "settings"]);
+            assert.deepEqual(deps, ["connection"]);
             callback({
                 connection: {
                     fetch: {
@@ -59,10 +60,6 @@ function fakeRouteContext() {
                         },
                     },
                 },
-                settings: {
-                    register: () => ({ watch: () => () => { } }),
-                    get: () => undefined,
-                },
             });
         },
     };
@@ -94,7 +91,15 @@ test("the card route serves the live snapshot on GET", async () => {
     assert.deepEqual(snapshot.volumes, [{ name: "data" }]);
     assert.deepEqual(snapshot.secrets, [{ name: "s1" }]);
     assert.equal(snapshot.caches[0].bytes, 1024);
-    assert.deepEqual(calls.map(([method]) => method), ["getVersion", "listContainers", "listImages", "listWorkspaces", "listVolumes", "listSecrets", "listCaches"]);
+    assert.deepEqual(calls.map(([method]) => method), [
+        "getVersion",
+        "listContainers",
+        "listImages",
+        "listWorkspaces",
+        "listVolumes",
+        "listSecrets",
+        "listCaches",
+    ]);
     assert.equal(typeof snapshot.dshVersion, "string");
     assert.equal(snapshot.orchestratorVersion, "9.9.9");
     assert.equal(snapshot.versionState, "major-mismatch", "a differing major is surfaced on the card");
@@ -129,9 +134,51 @@ test("the card route runs one command per POST and returns its notice", async ()
     }));
     assert.equal(remove.status, 200);
     assert.deepEqual(await remove.json(), {});
-    assert.deepEqual(calls.find(([method]) => method === "removeContainer")?.[1], {
+    // A command that names no container keeps the orchestrator's default; one that
+    // names a container must reach it, or a row's Remove would hit another one.
+    const removeNamed = await routes[0].fetch(cardRequest({
+        method: "POST",
+        body: JSON.stringify({
+            command: { op: "remove", workspace: "w1", container: "foo" },
+        }),
+    }));
+    assert.equal(removeNamed.status, 200);
+    const removeCalls = calls.filter(([method]) => method === "removeContainer");
+    assert.deepEqual(removeCalls[0]?.[1], { workspaceSlug: "w1" });
+    assert.deepEqual(removeCalls[1]?.[1], {
+        workspaceSlug: "w1",
+        container: "foo",
+    });
+    const recreate = await routes[0].fetch(cardRequest({
+        method: "POST",
+        body: JSON.stringify({
+            command: {
+                op: "recreate",
+                workspace: "w1",
+                container: "foo",
+                image: "img1",
+            },
+        }),
+    }));
+    assert.equal(recreate.status, 200);
+    assert.deepEqual(calls.find(([method]) => method === "recreateContainer")?.[1], {
         workspaceSlug: "w1",
+        container: "foo",
+        imageId: "img1",
     });
+    const detach = await routes[0].fetch(cardRequest({
+        method: "POST",
+        body: JSON.stringify({
+            command: {
+                op: "container_secret_remove",
+                workspace: "w1",
+                container: "foo",
+                secretEnvName: "TOKEN",
+            },
+        }),
+    }));
+    assert.equal(detach.status, 200);
+    assert.deepEqual(calls.find(([method]) => method === "removeContainerSecret")?.[1], { workspaceSlug: "w1", container: "foo", env: "TOKEN" });
     const clean = await routes[0].fetch(cardRequest({
         method: "POST",
         body: JSON.stringify({ command: { op: "cache_clean", cacheMode: "all" } }),
@@ -170,37 +217,7 @@ test("the card route reports a failed command as an error", async () => {
         body: JSON.stringify({ command: { op: "remove", workspace: "w1" } }),
     }));
     assert.equal(response.status, 500);
-    assert.deepEqual(await response.json(), { error: "control plane unavailable" });
-});
-test("installContainerPreferences seeds the base and syncs the resolver config", () => {
-    let base;
-    let watcher;
-    const ctx = {
-        inject(deps, callback) {
-            assert.deepEqual(deps, ["settings"]);
-            callback({
-                settings: {
-                    register(_ns, _schema, options) {
-                        base = options.base;
-                        return {
-                            watch(callback) {
-                                watcher = callback;
-                                return () => { };
-                            },
-                        };
-                    },
-                },
-            });
-        },
-    };
-    const configs = [];
-    const resolver = {
-        getConfig: () => ({ defaultImage: "archlinux", socketsRoot: "/run/dsh-podman" }),
-        setConfig: (patch) => configs.push(patch),
-    };
-    installContainerPreferences(ctx, resolver);
-    assert.deepEqual(base, { defaultImage: "archlinux", socketsRoot: "/run/dsh-podman" });
-    assert.ok(watcher !== undefined);
-    watcher({ defaultImage: "ubuntu", socketsRoot: "/run/other" });
-    assert.deepEqual(configs, [{ defaultImage: "ubuntu", socketsRoot: "/run/other" }]);
+    assert.deepEqual(await response.json(), {
+        error: "control plane unavailable",
+    });
 });

package/dist/card-test-support.js

@@ -6,8 +6,6 @@
 // `runCommand` and folds the real `cardSnapshot` back into the fake scope, so
 // the command tests stay focused on the command-to-control mapping. The HTTP
 // layer itself is covered by card-route.test.ts.
-import { strict as assert } from "node:assert";
-import { CONTAINER_NS, settingsSchema } from "./settings-schema.js";
 import { cardSnapshot, runCommand } from "./card-route.js";
 export function fakeScope(initial) {
     const scope = {
@@ -30,26 +28,14 @@ export function fakeScope(initial) {
     return scope;
 }
 export function fakeContext(scope) {
-    return {
-        inject(deps, callback) {
-            assert.deepEqual(deps, ["settings"]);
-            callback({
-                settings: {
-                    register() {
-                        return scope;
-                    },
-                    get() {
-                        return undefined;
-                    },
-                },
-            });
-        },
-    };
+    // The host half no longer registers a settings namespace: the card's
+    // preferences are volatile plugin-config fields, so the fake document is
+    // handed to the driver directly.
+    return { fakeScope: scope };
 }
 export function baseValue() {
     return {
         defaultImage: "archlinux",
-        socketsRoot: "/run/dsh-podman",
         uiLocale: "",
         notice: "",
         command: null,
@@ -61,62 +47,49 @@ export function baseValue() {
         caches: [],
     };
 }
-// installCardCommandDriver wires a fake settings scope to the real command
+// installCardCommandDriver wires a fake settings document to the real command
 // runner and snapshot builder, standing in for the browser transport: it
 // mirrors what the card does per request — run the command, then refresh the
 // live snapshot and record the notice.
 export function installCardCommandDriver(ctx, resolver, registry) {
-    let installed = Promise.resolve();
-    ctx.inject(["settings"], (sctx) => {
-        const scope = sctx.settings.register(CONTAINER_NS, settingsSchema, {
-            base: {
-                defaultImage: resolver.getConfig().defaultImage,
-                socketsRoot: resolver.getConfig().socketsRoot,
-            },
-        });
-        const refresh = async (notice = "") => {
-            let view = {};
+    const scope = ctx.fakeScope;
+    const refresh = async (notice = "") => {
+        let view = {};
+        try {
+            const snapshot = await cardSnapshot(resolver, registry);
+            view = {
+                workspaces: snapshot.workspaces,
+                containers: snapshot.containers,
+                images: snapshot.images,
+                volumes: snapshot.volumes,
+                secrets: snapshot.secrets,
+                caches: snapshot.caches,
+            };
+        }
+        catch {
+            // Command tests do not always stub every list call.
+        }
+        await scope.update({ ...view, notice });
+    };
+    scope.watch((next) => {
+        const command = next.command;
+        if (command === null || command === undefined)
+            return;
+        void (async () => {
+            // Clear the command before running it, so the refresh below cannot
+            // re-deliver it.
+            await scope.update({ command: null });
+            let notice = "";
             try {
-                const snapshot = await cardSnapshot(resolver, registry);
-                view = {
-                    workspaces: snapshot.workspaces,
-                    containers: snapshot.containers,
-                    images: snapshot.images,
-                    volumes: snapshot.volumes,
-                    secrets: snapshot.secrets,
-                    caches: snapshot.caches,
-                };
+                notice = await runCommand(ctx, resolver, registry, command);
             }
-            catch {
-                // Command tests do not always stub every list call.
+            catch (error) {
+                notice = error instanceof Error ? error.message : String(error);
             }
-            await scope.update({ ...view, notice });
-        };
-        scope.watch((next) => {
-            resolver.setConfig({
-                defaultImage: next.defaultImage,
-                socketsRoot: next.socketsRoot,
-            });
-            const command = next.command;
-            if (command === null || command === undefined)
-                return;
-            void (async () => {
-                // Clear the command before running it, so the refresh below cannot
-                // re-deliver it.
-                await scope.update({ command: null });
-                let notice = "";
-                try {
-                    notice = await runCommand(sctx, resolver, registry, command);
-                }
-                catch (error) {
-                    notice = error instanceof Error ? error.message : String(error);
-                }
-                await refresh(notice);
-            })();
-        });
-        installed = refresh();
+            await refresh(notice);
+        })();
     });
-    return installed;
+    return refresh();
 }
 export async function installedMountScope() {
     const scope = fakeScope(baseValue());

package/dist/client/ContainerCard.d.ts

@@ -2,5 +2,5 @@ import { type ContainerCardFace } from "./container-card-controller.js";
 import { NS } from "./locales.js";
 import { type InjectFace, type PropsLocale, type PropsRuntime } from "@deepseek-ai/dsh-client-ui-slots";
 import { type ReactNode } from "react";
-export type ContainerCardProps = PropsRuntime<"settings.plugin.item"> & PropsLocale<typeof NS> & InjectFace<ContainerCardFace>;
+export type ContainerCardProps = PropsRuntime<"plugins.bundle.config"> & PropsLocale<typeof NS> & InjectFace<ContainerCardFace>;
 export declare function ContainerCard(props: ContainerCardProps): ReactNode;

package/dist/client/ContainerCard.js

@@ -2,22 +2,21 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 // SPDX-FileCopyrightText: 2026 Elouan Martinet <exa@elou.world>
 //
 // SPDX-License-Identifier: MIT
-import { BaseImageRow, ImageBuildModal, ImageItem } from "./container-card-images.js";
+import { BaseImageRow, ImageBuildModal, ImageItem, } from "./container-card-images.js";
 import { CachesSection } from "./container-card-caches.js";
+import { DefaultEnvironmentSection } from "./container-card-default-env.js";
 import { SecretsSection } from "./container-card-secrets.js";
-import { CardChevron, ConfigField, ConfirmButton } from "./container-card-shared.js";
-import { banner, cardBodyStyle, cardDescriptionStyle, cardHeadTextStyle, cardHeaderStyle, cardHoverStyle, cardNameStyle, cardOpenStyle, cardStyle, footerRow, hint, imageSelect, sectionTitle, } from "./container-card-styles.js";
+import { ConfirmButton } from "./container-card-shared.js";
+import { banner, footerRow, hint, imageSelect, sectionTitle, } from "./container-card-styles.js";
 import { VolumesSection } from "./container-card-volumes.js";
 import { WorkspaceSection } from "./container-card-workspace.js";
-import { Button, Input, Modal, writeClipboard, } from "@deepseek-ai/dsh-client-ui-primitives";
-import { useEffect, useId, useRef, useState, } from "react";
+import { Button, Modal, writeClipboard, } from "@deepseek-ai/dsh-client-ui-primitives";
+import { useEffect, useRef, useState } from "react";
 // The labels of the version lines, emphasised against their values.
 const versionLabel = { fontWeight: 600 };
 export function ContainerCard(props) {
     const { t } = props;
     const state = props.useContainerCard((snapshot) => snapshot);
-    const [open, setOpen] = useState(false);
-    const [hovered, setHovered] = useState(false);
     const [buildOpen, setBuildOpen] = useState(false);
     const [imageId, setImageId] = useState("");
     const [parent, setParent] = useState("");
@@ -26,7 +25,6 @@ export function ContainerCard(props) {
     const [defaultImage, setDefaultImage] = useState(state.defaultImage);
     const [copyState, setCopyState] = useState("idle");
     const copyResetTimer = useRef();
-    const projectsRootId = useId();
     // Copies the version lines as displayed, so a user can paste them into a bug
     // report without transcribing anything.
     const copyVersions = async () => {
@@ -36,17 +34,31 @@ export function ContainerCard(props) {
             `${t("orchestrator")} ${state.orchestratorVersion || t("versionUnknown")}`,
         ];
         setCopyState((await writeClipboard(lines.join("\n"))) ? "copied" : "failed");
-        if (copyResetTimer.current !== undefined)
+        if (copyResetTimer.current !== undefined) {
             clearTimeout(copyResetTimer.current);
+        }
         copyResetTimer.current = setTimeout(() => setCopyState("idle"), 1500);
     };
-    // The card mounts with the settings panel, so this re-reads the live state
-    // every time the Plugins section is opened: a workspace created since the
-    // last read shows up without pressing Reload this view.
-    // biome-ignore lint/correctness/useExhaustiveDependencies: mount-only refresh
-    useEffect(() => {
-        props.reload();
+    // The reset timer is cancelled on unmount, so it cannot fire against an
+    // unmounted component.
+    useEffect(() => () => {
+        if (copyResetTimer.current !== undefined) {
+            clearTimeout(copyResetTimer.current);
+        }
     }, []);
+    // The Plugins page renders a one-liner in its list and this component again
+    // as the entry's page, so the orchestrator snapshot is only fetched for the
+    // page. Re-reading on every page view keeps a workspace created since the
+    // last visit visible without pressing Reload.
+    // biome-ignore lint/correctness/useExhaustiveDependencies: refresh per page view
+    useEffect(() => {
+        if (props.view === "page")
+            props.reload();
+    }, [props.view]);
+    // The list shows only the one-liner; the page heading already carries the
+    // plugin's title and description.
+    if (props.view === "summary")
+        return t("cardDescription");
     const baseImages = state.images.filter((image) => image.isBase);
     const customImages = state.images.filter((image) => !image.isBase);
     const defaultCandidates = [
@@ -54,62 +66,56 @@ export function ContainerCard(props) {
         ...customImages.map((image) => image.imageId),
     ];
     if (!state.available) {
-        return (_jsx("p", { style: { padding: "8px 0", fontSize: "13px", opacity: 0.8 }, children: t("unavailable") }));
+        return (_jsxs("div", { style: { padding: "8px 0", fontSize: "13px", opacity: 0.8 }, children: [_jsx("p", { style: { margin: 0 }, children: t("unavailable") }), state.notice === ""
+                    ? null
+                    : (_jsxs("p", { style: { margin: "4px 0 0" }, role: "status", children: [t("notice"), ": ", state.notice] })), _jsx("div", { style: { marginTop: "8px" }, children: _jsx(Button, { variant: "outline", size: "sm", disabled: state.busy, onClick: props.reload, children: state.busy ? t("busy") : t("reload") }) })] }));
     }
-    return (_jsxs("li", { style: {
-            ...cardStyle,
-            ...(open ? cardOpenStyle : {}),
-            ...(hovered && !open ? cardHoverStyle : {}),
-        }, onPointerEnter: () => setHovered(true), onPointerLeave: () => setHovered(false), children: [_jsxs("button", { type: "button", style: cardHeaderStyle, "aria-expanded": open, onClick: () => setOpen(!open), children: [_jsxs("span", { style: cardHeadTextStyle, children: [_jsx("span", { style: cardNameStyle, children: t("cardTitle") }), _jsx("span", { style: cardDescriptionStyle, children: t("cardDescription") })] }), _jsx(CardChevron, { open: open })] }), open ? (_jsxs("div", { style: cardBodyStyle, children: [state.notice === "" ? null : (_jsxs("div", { style: banner, role: "status", children: [t("notice"), ": ", state.notice] })), state.versionState === "ok" ? null : (_jsx("div", { style: state.versionState === "major-mismatch"
-                            ? { ...banner, borderColor: "var(--dsw-alias-state-error-primary)" }
-                            : banner, role: state.versionState === "major-mismatch" ? "alert" : "status", children: t(state.versionState === "major-mismatch"
-                            ? "versionMismatchMajor"
-                            : "versionMismatchMinor") })), _jsx("div", { style: sectionTitle, children: t("workspacesTitle") }), state.workspaces.length === 0 ? (_jsx("p", { style: hint, children: t("none") })) : (state.workspaces.map((workspace) => (_jsx(WorkspaceSection, { t: t, workspace: workspace, containers: state.containers.filter((container) => container.workspaceSlug === workspace.workspaceSlug), images: state.images, volumes: state.volumes, secrets: state.secrets, busy: state.busy, defaultImage: state.defaultImage, projectsRoot: state.projectsRoot, directoryPicker: state.directoryPicker, onRemove: props.remove, onRemoveWorkspace: props.removeWorkspace, onRecreate: props.recreate, onCreate: props.createContainer, onStartContainer: props.startContainer, onAddContainerMount: props.addContainerMount, onRemoveContainerMount: props.removeContainerMount, onUpdateContainerMount: props.updateContainerMount, onSetContainerPaths: props.setContainerPaths, onAddContainerSecret: props.addContainerSecret, onRemoveContainerSecret: props.removeContainerSecret }, workspace.workspaceSlug)))), _jsxs("div", { style: {
-                            display: "flex",
-                            flexWrap: "wrap",
-                            alignItems: "center",
-                            gap: "8px",
-                        }, children: [_jsx("div", { style: { ...sectionTitle, flex: 1 }, children: t("imagesTitle") }), _jsx(Button, { variant: "outline", size: "sm", disabled: state.busy, onClick: () => {
-                                    setDefaultImage(state.defaultImage);
-                                    setDefaultOpen(true);
-                                }, children: t("setDefaultImage") }), _jsx(Button, { variant: "outline", size: "sm", disabled: state.busy, onClick: () => {
-                                    setImageId("");
-                                    setParent(baseImages[0]?.imageId ?? customImages[0]?.imageId ?? "");
-                                    setPackages([]);
-                                    setBuildOpen(true);
-                                }, children: t("buildImage") }), _jsx(ConfirmButton, { t: t, label: t("rebuildAllImages"), title: t("confirmTitle"), description: t("confirmRebuildAllImages"), disabled: state.busy, onConfirm: props.rebuildAllImages })] }), _jsx("div", { style: sectionTitle, children: t("baseImagesTitle") }), baseImages.length === 0 ? (_jsx("p", { style: hint, children: t("none") })) : (baseImages.map((image) => (_jsx(BaseImageRow, { t: t, image: image, busy: state.busy, defaultImage: state.defaultImage, onRebuild: props.rebuildBaseImage, onPull: props.pullBaseImage, onSetDefault: props.setDefaultImage }, image.imageId)))), _jsx("div", { style: sectionTitle, children: t("customImagesTitle") }), customImages.length === 0 ? (_jsx("p", { style: hint, children: t("none") })) : (customImages.map((image) => (_jsx(ImageItem, { t: t, image: image, busy: state.busy, defaultImage: state.defaultImage, onRemove: props.removeImage, onRebuild: props.rebuildImage, onSetDefault: props.setDefaultImage }, image.imageId)))), _jsx(ImageBuildModal, { t: t, images: state.images, open: buildOpen, imageId: imageId, parent: parent, packages: packages, onImageId: setImageId, onParent: setParent, onPackages: setPackages, onClose: () => setBuildOpen(false), onBuild: () => {
-                            props.buildImage(imageId.trim(), parent.trim(), packages);
+    return (_jsxs("div", { children: [state.notice === "" ? null : (_jsxs("div", { style: banner, role: "status", children: [t("notice"), ": ", state.notice] })), state.versionState === "ok" ? null : (_jsx("div", { style: state.versionState === "major-mismatch"
+                    ? { ...banner, borderColor: "var(--dsw-alias-state-error-primary)" }
+                    : banner, role: state.versionState === "major-mismatch" ? "alert" : "status", children: t(state.versionState === "major-mismatch"
+                    ? "versionMismatchMajor"
+                    : "versionMismatchMinor") })), _jsx("div", { style: sectionTitle, children: t("workspacesTitle") }), state.workspaces.length === 0 ? _jsx("p", { style: hint, children: t("none") }) : (state.workspaces.map((workspace) => (_jsx(WorkspaceSection, { t: t, workspace: workspace, containers: state.containers.filter((container) => container.workspaceSlug === workspace.workspaceSlug), images: state.images, volumes: state.volumes, secrets: state.secrets, busy: state.busy, defaultImage: state.defaultImage, projectsRoot: state.projectsRoot, directoryPicker: state.directoryPicker, onRemove: props.remove, onRemoveWorkspace: props.removeWorkspace, onRecreate: props.recreate, onCreate: props.createContainer, onStartContainer: props.startContainer, onAddContainerMount: props.addContainerMount, onRemoveContainerMount: props.removeContainerMount, onUpdateContainerMount: props.updateContainerMount, onSetContainerPaths: props.setContainerPaths, onAddContainerSecret: props.addContainerSecret, onRemoveContainerSecret: props.removeContainerSecret, onSyncDefaults: props.syncDefaultEnv, defaultEnvCount: Object.keys(state.containerEnv).length }, workspace.workspaceSlug)))), _jsxs("div", { style: {
+                    display: "flex",
+                    flexWrap: "wrap",
+                    alignItems: "center",
+                    gap: "8px",
+                }, children: [_jsx("div", { style: { ...sectionTitle, flex: 1 }, children: t("imagesTitle") }), _jsx(Button, { variant: "outline", size: "sm", disabled: state.busy, onClick: () => {
+                            setDefaultImage(state.defaultImage);
+                            setDefaultOpen(true);
+                        }, children: t("setDefaultImage") }), _jsx(Button, { variant: "outline", size: "sm", disabled: state.busy, onClick: () => {
                             setImageId("");
-                            setParent("");
+                            setParent(baseImages[0]?.imageId ?? customImages[0]?.imageId ?? "");
                             setPackages([]);
-                            setBuildOpen(false);
-                        } }), _jsx(Modal, { open: defaultOpen, onClose: () => setDefaultOpen(false), title: t("setDefaultImageTitle"), closeLabel: t("cancel"), footer: _jsxs(_Fragment, { children: [_jsx(Button, { variant: "outline", size: "sm", onClick: () => setDefaultOpen(false), children: t("cancel") }), _jsx(Button, { variant: "primary", size: "sm", disabled: defaultImage === "", onClick: () => {
-                                        props.setDefaultImage(defaultImage);
-                                        setDefaultOpen(false);
-                                    }, children: t("setDefaultImage") })] }), children: _jsxs("select", { style: imageSelect, value: defaultImage, onChange: (event) => setDefaultImage(event.target.value), children: [defaultCandidates.length === 0 ? (_jsx("option", { value: "", children: t("none") })) : null, defaultCandidates.map((name) => (_jsx("option", { value: name, children: name }, name)))] }) }), _jsx(CachesSection, { t: t, caches: state.caches, busy: state.busy, onClean: props.cleanCaches }), _jsx(VolumesSection, { t: t, volumes: state.volumes, busy: state.busy, writable: state.writable, onCreate: props.createVolume, onRemove: props.removeVolume }), _jsx(SecretsSection, { t: t, secrets: state.secrets, busy: state.busy, writable: state.writable, onCreate: props.createSecret, onRemove: props.removeSecret, onSet: props.setSecret }), _jsx("div", { style: sectionTitle, children: t("configTitle") }), _jsxs("div", { style: {
-                            display: "flex",
-                            flexWrap: "wrap",
-                            alignItems: "center",
-                            gap: "8px",
-                            padding: "8px 0",
-                        }, children: [_jsx("label", { htmlFor: projectsRootId, style: {
-                                    fontSize: "13px",
-                                    color: "var(--dsw-alias-label-secondary)",
-                                    minWidth: "110px",
-                                }, children: t("projectsRoot") }), _jsx(Input, { id: projectsRootId, value: state.projectsRoot, disabled: true, style: { width: "200px" } })] }), _jsx(ConfigField, { t: t, label: t("socketsRoot"), value: state.socketsRootDraft, current: state.socketsRoot, writable: state.writable, onChange: props.editSocketsRoot, onSave: props.saveSocketsRoot, onDiscard: props.discardSocketsRoot }), _jsxs("div", { style: {
-                            display: "flex",
-                            flexWrap: "wrap",
-                            alignItems: "center",
-                            gap: "8px",
-                        }, children: [_jsx("div", { style: { ...sectionTitle, flex: 1 }, children: t("versionsTitle") }), _jsx(Button, { variant: "outline", size: "sm", onClick: () => void copyVersions(), children: copyState === "copied"
-                                    ? t("copied")
-                                    : copyState === "failed"
-                                        ? t("copyFailed")
-                                        : t("copyVersions") })] }), _jsxs("div", { style: {
-                            ...hint,
-                            display: "flex",
-                            flexDirection: "column",
-                            gap: "2px",
-                            margin: 0,
-                        }, children: [_jsxs("span", { children: [_jsx("span", { style: versionLabel, children: t("dsh") }), state.dshVersion ? (` ${state.dshVersion}`) : (_jsxs(_Fragment, { children: [" ", _jsx("span", { style: { color: "var(--dsw-alias-state-error-primary)" }, children: t("versionUnknown") })] }))] }), _jsxs("span", { children: [_jsx("span", { style: versionLabel, children: t("cardTitle") }), state.version ? ` ${state.version}` : "", state.commit ? ` · ${state.commit}` : ""] }), _jsxs("span", { children: [_jsx("span", { style: versionLabel, children: t("orchestrator") }), state.orchestratorVersion ? (` ${state.orchestratorVersion}`) : (_jsxs(_Fragment, { children: [" ", _jsx("span", { style: { color: "var(--dsw-alias-state-error-primary)" }, children: t("versionUnknown") })] }))] })] }), _jsx("div", { style: footerRow, children: _jsx(Button, { variant: "outline", size: "sm", disabled: state.busy, onClick: props.reload, children: state.busy ? t("busy") : t("reload") }) })] })) : null] }));
+                            setBuildOpen(true);
+                        }, children: t("buildImage") }), _jsx(ConfirmButton, { t: t, label: t("rebuildAllImages"), title: t("confirmTitle"), description: t("confirmRebuildAllImages"), disabled: state.busy, onConfirm: props.rebuildAllImages })] }), _jsx("div", { style: sectionTitle, children: t("baseImagesTitle") }), baseImages.length === 0 ? _jsx("p", { style: hint, children: t("none") }) : (baseImages.map((image) => (_jsx(BaseImageRow, { t: t, image: image, busy: state.busy, defaultImage: state.defaultImage, onRebuild: props.rebuildBaseImage, onPull: props.pullBaseImage, onSetDefault: props.setDefaultImage }, image.imageId)))), _jsx("div", { style: sectionTitle, children: t("customImagesTitle") }), customImages.length === 0 ? _jsx("p", { style: hint, children: t("none") }) : (customImages.map((image) => (_jsx(ImageItem, { t: t, image: image, busy: state.busy, defaultImage: state.defaultImage, onRemove: props.removeImage, onRebuild: props.rebuildImage, onSetDefault: props.setDefaultImage }, image.imageId)))), _jsx(ImageBuildModal, { t: t, images: state.images, open: buildOpen, imageId: imageId, parent: parent, packages: packages, onImageId: setImageId, onParent: setParent, onPackages: setPackages, onClose: () => setBuildOpen(false), onBuild: () => {
+                    props.buildImage(imageId.trim(), parent.trim(), packages);
+                    setImageId("");
+                    setParent("");
+                    setPackages([]);
+                    setBuildOpen(false);
+                } }), _jsxs(Modal, { open: defaultOpen, onClose: () => setDefaultOpen(false), title: t("setDefaultImageTitle"), closeLabel: t("cancel"), footer: _jsxs(_Fragment, { children: [_jsx(Button, { variant: "outline", size: "sm", onClick: () => setDefaultOpen(false), children: t("cancel") }), _jsx(Button, { variant: "primary", size: "sm", disabled: defaultImage === "", onClick: () => {
+                                props.setDefaultImage(defaultImage);
+                                setDefaultOpen(false);
+                            }, children: t("setDefaultImage") })] }), children: [_jsxs("select", { style: imageSelect, value: defaultImage, onChange: (event) => setDefaultImage(event.target.value), children: [defaultCandidates.length === 0
+                                ? _jsx("option", { value: "", children: t("none") })
+                                : null, defaultCandidates.map((name) => (_jsx("option", { value: name, children: name }, name)))] }), _jsx("p", { style: hint, children: t("defaultImageHint") })] }), _jsx(CachesSection, { t: t, caches: state.caches, busy: state.busy, onClean: props.cleanCaches }), _jsx(VolumesSection, { t: t, volumes: state.volumes, busy: state.busy, writable: state.writable, onCreate: props.createVolume, onRemove: props.removeVolume }), _jsx(SecretsSection, { t: t, secrets: state.secrets, busy: state.busy, writable: state.writable, onCreate: props.createSecret, onRemove: props.removeSecret, onSet: props.setSecret }), _jsx(DefaultEnvironmentSection, { t: t, env: state.containerEnv, busy: state.busy, writable: state.writable, onSave: props.saveContainerEnv, onSync: props.syncDefaultEnv }), _jsxs("div", { style: {
+                    display: "flex",
+                    flexWrap: "wrap",
+                    alignItems: "center",
+                    gap: "8px",
+                }, children: [_jsx("div", { style: { ...sectionTitle, flex: 1 }, children: t("versionsTitle") }), _jsx(Button, { variant: "outline", size: "sm", onClick: () => void copyVersions(), children: copyState === "copied"
+                            ? t("copied")
+                            : copyState === "failed"
+                                ? t("copyFailed")
+                                : t("copyVersions") })] }), _jsxs("div", { style: {
+                    ...hint,
+                    display: "flex",
+                    flexDirection: "column",
+                    gap: "2px",
+                    margin: 0,
+                }, children: [_jsxs("span", { children: [_jsx("span", { style: versionLabel, children: t("dsh") }), state.dshVersion
+                                ? (` ${state.dshVersion}`)
+                                : (_jsxs(_Fragment, { children: [" ", _jsx("span", { style: { color: "var(--dsw-alias-state-error-primary)" }, children: t("versionUnknown") })] }))] }), _jsxs("span", { children: [_jsx("span", { style: versionLabel, children: t("cardTitle") }), state.version ? ` ${state.version}` : "", state.commit ? ` · ${state.commit}` : ""] }), _jsxs("span", { children: [_jsx("span", { style: versionLabel, children: t("orchestrator") }), state.orchestratorVersion
+                                ? (` ${state.orchestratorVersion}`)
+                                : (_jsxs(_Fragment, { children: [" ", _jsx("span", { style: { color: "var(--dsw-alias-state-error-primary)" }, children: t("versionUnknown") })] }))] })] }), _jsx("div", { style: footerRow, children: _jsx(Button, { variant: "outline", size: "sm", disabled: state.busy, onClick: props.reload, children: state.busy ? t("busy") : t("reload") }) })] }));
 }

package/dist/client/card-protocol.d.ts

@@ -7,7 +7,7 @@ export interface MountInput {
     volume: string;
     secret: string;
 }
-export type CommandOp = "remove" | "workspace_remove" | "recreate" | "create" | "volume_create" | "volume_remove" | "image_remove" | "secret_create" | "secret_remove" | "secret_set" | "image_rebuild" | "image_rebuild_all" | "image_build" | "image_base_rebuild" | "image_base_pull" | "container_secret_add" | "container_secret_remove" | "container_mount_add" | "container_mount_remove" | "container_mount_update" | "container_path_set" | "cache_clean";
+export type CommandOp = "remove" | "workspace_remove" | "recreate" | "create" | "volume_create" | "volume_remove" | "image_remove" | "secret_create" | "secret_remove" | "secret_set" | "image_rebuild" | "image_rebuild_all" | "image_build" | "image_base_rebuild" | "image_base_pull" | "container_secret_add" | "container_secret_remove" | "container_mount_add" | "container_mount_remove" | "container_mount_update" | "container_path_set" | "default_env_sync" | "cache_clean";
 export interface CommandRequest {
     op: CommandOp;
     workspace: string;
@@ -19,11 +19,11 @@ export interface CommandRequest {
     env: Record<string, string>;
     container: string;
     secret: string;
-    secretEnv: string;
+    secretEnvName: string;
     length: number;
     charset: string;
     packages: string[];
-    secretEnvMap: Record<string, string>;
+    secretEnv: Record<string, string>;
     cacheMode: string;
     mount: MountInput | null;
 }

package/dist/client/container-card-caches.js

@@ -22,10 +22,15 @@ function formatBytes(bytes) {
 export function CachesSection(props) {
     const { t, caches, busy, onClean } = props;
     const disabled = busy || caches.length === 0;
-    return (_jsxs(_Fragment, { children: [_jsx("div", { style: sectionTitle, children: t("cachesTitle") }), _jsxs("div", { style: wsBody, children: [caches.length === 0 ? (_jsx("p", { style: { ...hint, margin: 0 }, children: t("noCaches") })) : (caches.map((cache) => (_jsxs("div", { style: {
-                            display: "flex",
-                            flexWrap: "wrap",
-                            alignItems: "center",
-                            gap: "8px",
-                        }, children: [_jsx("strong", { style: { color: "var(--dsw-alias-label-primary)" }, children: cache.manager }), _jsx("span", { style: hint, children: t("cacheUsage", { size: formatBytes(cache.bytes), n: cache.files }) })] }, cache.manager)))), _jsxs("div", { style: { display: "flex", flexWrap: "wrap", gap: "8px" }, children: [_jsx(ConfirmButton, { t: t, label: t("cacheKeepLatest"), title: t("confirmTitle"), description: t("confirmCacheKeepLatest"), disabled: disabled, onConfirm: () => onClean("keep-latest") }), _jsx(ConfirmButton, { t: t, label: t("cacheRemoveAll"), title: t("confirmTitle"), description: t("confirmCacheRemoveAll"), disabled: disabled, onConfirm: () => onClean("all") })] })] })] }));
+    return (_jsxs(_Fragment, { children: [_jsx("div", { style: sectionTitle, children: t("cachesTitle") }), _jsxs("div", { style: wsBody, children: [caches.length === 0
+                        ? _jsx("p", { style: { ...hint, margin: 0 }, children: t("noCaches") })
+                        : (caches.map((cache) => (_jsxs("div", { style: {
+                                display: "flex",
+                                flexWrap: "wrap",
+                                alignItems: "center",
+                                gap: "8px",
+                            }, children: [_jsx("strong", { style: { color: "var(--dsw-alias-label-primary)" }, children: cache.manager }), _jsx("span", { style: hint, children: t("cacheUsage", {
+                                        size: formatBytes(cache.bytes),
+                                        n: cache.files,
+                                    }) })] }, cache.manager)))), _jsxs("div", { style: { display: "flex", flexWrap: "wrap", gap: "8px" }, children: [_jsx(ConfirmButton, { t: t, label: t("cacheKeepLatest"), title: t("confirmTitle"), description: t("confirmCacheKeepLatest"), disabled: disabled, onConfirm: () => onClean("keep-latest") }), _jsx(ConfirmButton, { t: t, label: t("cacheRemoveAll"), title: t("confirmTitle"), description: t("confirmCacheRemoveAll"), disabled: disabled, onConfirm: () => onClean("all") })] })] })] }));
 }