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

package/dist/client/container-card-controller.d.ts

@@ -1,13 +1,13 @@
 import { type SnapshotStore } from "@deepseek-ai/dsh-client-store";
-import type { SettingsScope, SettingsScopeSnapshot } from "@deepseek-ai/dsh-client-ui-settings/client";
+import type { ConfigForm, ConfigFormSnapshot } from "@deepseek-ai/dsh-client-ui-settings/client";
 import type { CacheView, ContainerView, ImageView, MountInput, SecretView, VolumeView, WorkspaceView } from "./card-protocol.js";
 import { type CardClient } from "./card-client.js";
 import { type DirectoryPickerFace } from "./directory-picker.js";
 export declare const CONTAINER_NS = "podman";
 export interface ContainerSettings {
     defaultImage: string;
-    socketsRoot: string;
     uiLocale?: string;
+    containerEnv?: Record<string, string>;
 }
 export interface ProjectMountView {
     projectName: string;
@@ -36,9 +36,7 @@ export interface CardState {
     orchestratorVersion: string;
     versionState: "ok" | "minor-mismatch" | "major-mismatch";
     defaultImage: string;
-    defaultImageDraft: string;
-    socketsRoot: string;
-    socketsRootDraft: string;
+    containerEnv: Record<string, string>;
     projectsRoot: string;
     directoryPicker?: DirectoryPickerFace;
     workspaces: readonly WorkspaceView[];
@@ -53,10 +51,10 @@ export interface ContainerCardFace {
         containerCard: SnapshotStore<CardState>;
     };
     reload: () => void;
-    remove: (workspace: string) => void;
+    remove: (workspace: string, container: string) => void;
     cleanCaches: (mode: string) => void;
     removeWorkspace: (workspace: string) => void;
-    recreate: (workspace: string, image: string, env?: Record<string, string>) => void;
+    recreate: (workspace: string, container: string, image: string, env?: Record<string, string>) => void;
     createContainer: (workspace: WorkspaceView, config?: ContainerCreateConfig) => void;
     startContainer: (workspace: WorkspaceView, container: string, config?: ContainerCreateConfig) => void;
     addContainerMount: (workspace: string, container: string, mount: MountInput) => void;
@@ -75,14 +73,10 @@ export interface ContainerCardFace {
     createSecret: (name: string, length?: number, charset?: string) => void;
     removeSecret: (name: string) => void;
     setSecret: (name: string, value: string) => void;
-    addContainerSecret: (workspace: string, envVar: string, secret: string) => void;
-    removeContainerSecret: (workspace: string, envVar: string) => void;
-    editDefaultImage: (text: string) => void;
-    saveDefaultImage: () => void;
-    discardDefaultImage: () => void;
-    editSocketsRoot: (text: string) => void;
-    saveSocketsRoot: () => void;
-    discardSocketsRoot: () => void;
+    addContainerSecret: (workspace: string, container: string, envVar: string, secret: string) => void;
+    removeContainerSecret: (workspace: string, container: string, envVar: string) => void;
+    saveContainerEnv: (env: Record<string, string>) => void;
+    syncDefaultEnv: (workspace: string) => void;
 }
 export declare class ContainerCardController {
     private readonly scope;
@@ -90,10 +84,11 @@ export declare class ContainerCardController {
     private readonly drafts;
     private readonly client;
     private snapshot;
-    private busy;
+    private pending;
+    private generation;
     private notice;
     private directoryPicker;
-    constructor(scope: SettingsScope<ContainerSettings>, client?: CardClient);
+    constructor(scope: ConfigForm<ContainerSettings>, client?: CardClient);
     private draft;
     private project;
     private publish;
@@ -107,4 +102,4 @@ export declare class ContainerCardController {
     inject(): ContainerCardFace;
     private defaultImage;
 }
-export type { SettingsScopeSnapshot };
+export type { ConfigFormSnapshot };

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

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2026 Elouan Martinet <exa@elou.world>
 //
 // SPDX-License-Identifier: MIT
-import { createSnapshotStore } from "@deepseek-ai/dsh-client-store";
+import { createSnapshotStore, } from "@deepseek-ai/dsh-client-store";
 import { createCardClient } from "./card-client.js";
 export const CONTAINER_NS = "podman";
 const EMPTY_SNAPSHOT = {
@@ -27,7 +27,10 @@ export class ContainerCardController {
     drafts = new Map();
     client;
     snapshot = EMPTY_SNAPSHOT;
-    busy = false;
+    // Counts in-flight commands, so overlapping ones cannot clear the busy state
+    // early; generation makes a superseded response drop its stale snapshot.
+    pending = 0;
+    generation = 0;
     notice = "";
     directoryPicker;
     constructor(scope, client = createCardClient()) {
@@ -48,7 +51,7 @@ export class ContainerCardController {
         return {
             available: snapshot.status === "ready" && value !== undefined,
             writable: snapshot.writable,
-            busy: this.busy,
+            busy: this.pending > 0,
             notice: this.notice,
             version: this.snapshot.version,
             commit: this.snapshot.commit,
@@ -56,9 +59,7 @@ export class ContainerCardController {
             orchestratorVersion: this.snapshot.orchestratorVersion,
             versionState: this.snapshot.versionState,
             defaultImage: value?.defaultImage ?? "",
-            defaultImageDraft: this.draft("defaultImage", value?.defaultImage ?? ""),
-            socketsRoot: value?.socketsRoot ?? "",
-            socketsRootDraft: this.draft("socketsRoot", value?.socketsRoot ?? ""),
+            containerEnv: value?.containerEnv ?? {},
             projectsRoot: this.snapshot.projectsRoot,
             ...(this.directoryPicker === undefined
                 ? {}
@@ -92,43 +93,62 @@ export class ContainerCardController {
             env: extra.env ?? {},
             container: extra.container ?? "",
             secret: extra.secret ?? "",
-            secretEnv: extra.secretEnv ?? "",
+            secretEnvName: extra.secretEnvName ?? "",
             length: extra.length ?? 0,
             charset: extra.charset ?? "",
             packages: extra.packages ?? [],
-            secretEnvMap: extra.secretEnvMap ?? {},
+            secretEnv: extra.secretEnv ?? {},
             cacheMode: extra.cacheMode ?? "",
             mount: extra.mount ?? null,
         });
     }
     async dispatch(request) {
-        this.busy = true;
+        const generation = ++this.generation;
+        this.pending++;
         this.notice = "";
         this.publish();
         try {
             const result = await this.client.command(request);
+            const snapshot = await this.client.snapshot();
+            // A reload (or another command) started after this one wins: applying
+            // this response would overwrite the fresher state with a stale snapshot.
+            if (generation !== this.generation)
+                return;
             this.notice = result.notice ?? "";
-            this.snapshot = await this.client.snapshot();
+            this.snapshot = snapshot;
         }
         catch (error) {
-            this.notice = error instanceof Error ? error.message : String(error);
+            if (generation === this.generation) {
+                this.notice = error instanceof Error ? error.message : String(error);
+            }
         }
         finally {
-            this.busy = false;
+            this.pending--;
             this.publish();
         }
     }
     async reload() {
+        const generation = ++this.generation;
+        this.pending++;
+        this.publish();
         try {
-            this.snapshot = await this.client.snapshot();
+            const snapshot = await this.client.snapshot();
+            if (generation !== this.generation)
+                return;
+            this.snapshot = snapshot;
             // A refresh clears the previous action's notice, so reopening the
             // settings does not replay feedback from an earlier session.
             this.notice = "";
         }
         catch (error) {
-            this.notice = error instanceof Error ? error.message : String(error);
+            if (generation === this.generation) {
+                this.notice = error instanceof Error ? error.message : String(error);
+            }
+        }
+        finally {
+            this.pending--;
+            this.publish();
         }
-        this.publish();
     }
     edit(field, text) {
         this.drafts.set(field, text);
@@ -150,27 +170,55 @@ export class ContainerCardController {
             reload: () => {
                 void this.reload();
             },
-            remove: (workspace) => this.command("remove", workspace, ""),
+            remove: (workspace, container) => this.command("remove", workspace, "", { container }),
             cleanCaches: (mode) => this.command("cache_clean", "", "", { cacheMode: mode }),
             removeWorkspace: (workspace) => this.command("workspace_remove", workspace, ""),
-            recreate: (workspace, image, env) => this.command("recreate", workspace, image, { ...(env ? { env } : {}) }),
+            recreate: (workspace, container, image, env) => this.command("recreate", workspace, image, {
+                container,
+                ...(env ? { env } : {}),
+            }),
             createContainer: (workspace, config) => this.command("create", workspace.workspaceSlug, config?.image ?? (workspace.imageId || this.defaultImage() || ""), {
                 projectName: workspace.projectName,
-                ...(config?.mounts && config.mounts.length > 0 ? { mounts: config.mounts } : {}),
-                ...(config?.env && Object.keys(config.env).length > 0 ? { env: config.env } : {}),
-                ...(config?.paths && config.paths.length > 0 ? { paths: config.paths } : {}),
-                ...(config?.secretEnv && Object.keys(config.secretEnv).length > 0 ? { secretEnvMap: config.secretEnv } : {}),
+                ...(config?.mounts && config.mounts.length > 0
+                    ? { mounts: config.mounts }
+                    : {}),
+                ...(config?.env && Object.keys(config.env).length > 0
+                    ? { env: config.env }
+                    : {}),
+                ...(config?.paths && config.paths.length > 0
+                    ? { paths: config.paths }
+                    : {}),
+                ...(config?.secretEnv && Object.keys(config.secretEnv).length > 0
+                    ? { secretEnv: config.secretEnv }
+                    : {}),
             }),
             startContainer: (workspace, container, config) => this.command("create", workspace.workspaceSlug, config?.image ?? (workspace.imageId || this.defaultImage() || ""), {
                 container,
-                ...(config?.mounts && config.mounts.length > 0 ? { mounts: config.mounts } : {}),
-                ...(config?.env && Object.keys(config.env).length > 0 ? { env: config.env } : {}),
-                ...(config?.paths && config.paths.length > 0 ? { paths: config.paths } : {}),
-                ...(config?.secretEnv && Object.keys(config.secretEnv).length > 0 ? { secretEnvMap: config.secretEnv } : {}),
+                ...(config?.mounts && config.mounts.length > 0
+                    ? { mounts: config.mounts }
+                    : {}),
+                ...(config?.env && Object.keys(config.env).length > 0
+                    ? { env: config.env }
+                    : {}),
+                ...(config?.paths && config.paths.length > 0
+                    ? { paths: config.paths }
+                    : {}),
+                ...(config?.secretEnv && Object.keys(config.secretEnv).length > 0
+                    ? { secretEnv: config.secretEnv }
+                    : {}),
+            }),
+            addContainerMount: (workspace, container, mount) => this.command("container_mount_add", workspace, "", {
+                container,
+                mount,
+            }),
+            removeContainerMount: (workspace, container, mount) => this.command("container_mount_remove", workspace, "", {
+                container,
+                mount,
+            }),
+            updateContainerMount: (workspace, container, mount) => this.command("container_mount_update", workspace, "", {
+                container,
+                mount,
             }),
-            addContainerMount: (workspace, container, mount) => this.command("container_mount_add", workspace, "", { container, mount }),
-            removeContainerMount: (workspace, container, mount) => this.command("container_mount_remove", workspace, "", { container, mount }),
-            updateContainerMount: (workspace, container, mount) => this.command("container_mount_update", workspace, "", { container, mount }),
             setContainerPaths: (workspace, container, paths) => this.command("container_path_set", workspace, "", { container, paths }),
             createVolume: (name) => this.command("volume_create", name, ""),
             removeVolume: (name) => this.command("volume_remove", name, ""),
@@ -190,21 +238,19 @@ export class ContainerCardController {
             }),
             removeSecret: (name) => this.command("secret_remove", name, ""),
             setSecret: (name, value) => this.command("secret_set", name, "", { value }),
-            addContainerSecret: (workspace, envVar, secret) => this.command("container_secret_add", workspace, "", {
-                container: "default",
-                secretEnv: envVar,
+            addContainerSecret: (workspace, container, envVar, secret) => this.command("container_secret_add", workspace, "", {
+                container,
+                secretEnvName: envVar,
                 secret,
             }),
-            removeContainerSecret: (workspace, envVar) => this.command("container_secret_remove", workspace, "", {
-                container: "default",
-                secretEnv: envVar,
+            removeContainerSecret: (workspace, container, envVar) => this.command("container_secret_remove", workspace, "", {
+                container,
+                secretEnvName: envVar,
             }),
-            editDefaultImage: (text) => this.edit("defaultImage", text),
-            saveDefaultImage: () => this.save("defaultImage"),
-            discardDefaultImage: () => this.discard("defaultImage"),
-            editSocketsRoot: (text) => this.edit("socketsRoot", text),
-            saveSocketsRoot: () => this.save("socketsRoot"),
-            discardSocketsRoot: () => this.discard("socketsRoot"),
+            saveContainerEnv: (env) => {
+                void this.scope.set("containerEnv", env);
+            },
+            syncDefaultEnv: (workspace) => this.command("default_env_sync", workspace, ""),
         };
     }
     defaultImage() {

package/dist/client/container-card-create-modal.d.ts

@@ -1,9 +1,9 @@
 import { type ContainerCreateConfig, type ImageView, type WorkspaceView } from "./container-card-controller.js";
 import { type DirectoryPickerFace } from "./directory-picker.js";
-import { type ContainerPluginKey } from "./locales.js";
+import type { Translate } from "./locales.js";
 import { type ReactNode } from "react";
 export declare function CreateContainerModal(props: {
-    t: (key: ContainerPluginKey) => string;
+    t: Translate;
     workspace: WorkspaceView;
     images: readonly ImageView[];
     volumes: readonly {

package/dist/client/container-card-create-modal.js

@@ -2,7 +2,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 import { EnvEditor, MountsEditor } from "./container-card-editors.js";
 import { PathsList } from "./container-card-paths.js";
 import { Field, namePattern, sanitizeName } from "./container-card-shared.js";
-import { greyId, hint, imageSelect, sectionTitle } from "./container-card-styles.js";
+import { greyId, hint, imageSelect, sectionTitle, } from "./container-card-styles.js";
 import { Button, Input, Modal } from "@deepseek-ai/dsh-client-ui-primitives";
 import { useEffect, useId, useState } from "react";
 export function CreateContainerModal(props) {
@@ -81,9 +81,15 @@ export function CreateContainerModal(props) {
                 display: "flex",
                 flexDirection: "column",
                 gap: "12px",
-            }, children: [_jsx(Field, { label: t("image"), htmlFor: imageLabel, children: _jsxs("select", { id: imageLabel, style: imageSelect, value: image, disabled: busy, onChange: (event) => setImage(event.target.value), children: [candidates.length === 0 ? (_jsx("option", { value: "", children: t("none") })) : null, candidates.map((imageId) => (_jsx("option", { value: imageId, children: imageId }, imageId)))] }) }), named ? (_jsxs(Field, { label: t("containerName"), htmlFor: nameLabel, children: [_jsx(Input, { id: nameLabel, value: name, disabled: busy, onChange: (event) => setName(sanitizeName(event.target.value)) }), name !== "" && !validName ? (_jsx("p", { style: { ...hint, margin: 0 }, children: nameTaken
-                                ? t("containerNameTaken")
-                                : t("invalidContainerName") })) : null] })) : null, _jsx("div", { style: sectionTitle, children: t("envTitle") }), _jsx(EnvEditor, { t: t, env: env, busy: busy, onChange: setEnv }), _jsx("div", { style: sectionTitle, children: t("mountsTitle") }), _jsx(MountsEditor, { t: t, mounts: mounts, volumes: volumes, secrets: secrets, busy: busy, enabled: !busy, projectsRoot: projectsRoot, directoryPicker: directoryPicker, modeControl: "select", onAdd: (mount) => setMounts([...mounts, mount]), onRemove: (mount) => setMounts(mounts.filter((item) => item !== mount)), onUpdate: (updated, index) => setMounts(mounts.map((item, at) => (at === index ? updated : item))) }), _jsx("div", { style: sectionTitle, children: t("pathsTitle") }), _jsx(PathsList, { t: t, entries: paths, busy: busy, onChange: setPaths }), _jsx("div", { style: sectionTitle, children: t("containerSecretsTitle") }), Object.entries(secretEnv).map(([envVar, secretName]) => (_jsxs("div", { style: {
+            }, children: [_jsx(Field, { label: t("image"), htmlFor: imageLabel, children: _jsxs("select", { id: imageLabel, style: imageSelect, value: image, disabled: busy, onChange: (event) => setImage(event.target.value), children: [candidates.length === 0
+                                ? _jsx("option", { value: "", children: t("none") })
+                                : null, candidates.map((imageId) => (_jsx("option", { value: imageId, children: imageId }, imageId)))] }) }), named
+                    ? (_jsxs(Field, { label: t("containerName"), htmlFor: nameLabel, children: [_jsx(Input, { id: nameLabel, value: name, disabled: busy, onChange: (event) => setName(sanitizeName(event.target.value)) }), name !== "" && !validName
+                                ? (_jsx("p", { style: { ...hint, margin: 0 }, children: nameTaken
+                                        ? t("containerNameTaken")
+                                        : t("invalidContainerName") }))
+                                : null] }))
+                    : null, _jsx("div", { style: sectionTitle, children: t("envTitle") }), _jsx(EnvEditor, { t: t, env: env, busy: busy, onChange: setEnv }), _jsx("div", { style: sectionTitle, children: t("mountsTitle") }), _jsx(MountsEditor, { t: t, mounts: mounts, volumes: volumes, secrets: secrets, busy: busy, enabled: !busy, projectsRoot: projectsRoot, directoryPicker: directoryPicker, modeControl: "select", onAdd: (mount) => setMounts([...mounts, mount]), onRemove: (mount) => setMounts(mounts.filter((item) => item !== mount)), onUpdate: (updated, index) => setMounts(mounts.map((item, at) => (at === index ? updated : item))) }), _jsx("div", { style: sectionTitle, children: t("pathsTitle") }), _jsx(PathsList, { t: t, entries: paths, busy: busy, onChange: setPaths }), _jsx("div", { style: sectionTitle, children: t("containerSecretsTitle") }), Object.entries(secretEnv).map(([envVar, secretName]) => (_jsxs("div", { style: {
                         display: "flex",
                         flexWrap: "wrap",
                         alignItems: "center",
@@ -102,7 +108,9 @@ export function CreateContainerModal(props) {
                         flexWrap: "wrap",
                         alignItems: "center",
                         gap: "8px",
-                    }, children: [_jsxs("select", { style: imageSelect, value: attachSecret, disabled: busy, onChange: (event) => setAttachSecret(event.target.value), "aria-label": t("attachSecret"), children: [secrets.length === 0 ? (_jsx("option", { value: "", children: t("none") })) : null, secrets.map((secret) => (_jsx("option", { value: secret.name, children: secret.name }, secret.name)))] }), _jsx(Input, { value: attachVar, disabled: busy, placeholder: t("secretEnvName"), onChange: (event) => setAttachVar(event.target.value), onKeyDown: (event) => {
+                    }, children: [_jsxs("select", { style: imageSelect, value: attachSecret, disabled: busy, onChange: (event) => setAttachSecret(event.target.value), "aria-label": t("attachSecret"), children: [secrets.length === 0
+                                    ? _jsx("option", { value: "", children: t("none") })
+                                    : null, secrets.map((secret) => (_jsx("option", { value: secret.name, children: secret.name }, secret.name)))] }), _jsx(Input, { value: attachVar, disabled: busy, placeholder: t("secretEnvName"), onChange: (event) => setAttachVar(event.target.value), onKeyDown: (event) => {
                                 if (event.key === "Enter")
                                     attach();
                             }, style: { width: "200px" } }), _jsx(Button, { variant: "outline", size: "sm", disabled: busy || attachVar.trim() === "" || attachSecret === "", onClick: attach, children: t("attachSecret") })] })] }) }));

package/dist/client/container-card-default-env.d.ts

@@ -0,0 +1,10 @@
+import type { Translate } from "./locales.js";
+import { type ReactNode } from "react";
+export declare function DefaultEnvironmentSection(props: {
+    t: Translate;
+    env: Record<string, string>;
+    busy: boolean;
+    writable: boolean;
+    onSave: (env: Record<string, string>) => void;
+    onSync: (workspace: string) => void;
+}): ReactNode;

package/dist/client/container-card-default-env.js

@@ -0,0 +1,69 @@
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+// SPDX-FileCopyrightText: 2026 Elouan Martinet <exa@elou.world>
+//
+// SPDX-License-Identifier: MIT
+// The default container environment: the map seeded into every new container,
+// edited with the same EnvEditor a container row uses. The setting is
+// persisted, so the draft is committed with Save, and the git shortcut fills
+// the four identity variables in that same draft.
+import { EnvEditor } from "./container-card-editors.js";
+import { ConfirmButton, Field } from "./container-card-shared.js";
+import { hint, sectionTitle, wsBody } from "./container-card-styles.js";
+import { commitIdentityAction, readGitIdentity, setGitIdentity, } from "../container-env.js";
+import { Button, Input, Modal } from "@deepseek-ai/dsh-client-ui-primitives";
+import { useEffect, useId, useState } from "react";
+export function DefaultEnvironmentSection(props) {
+    const { t, env, busy, writable, onSave, onSync } = props;
+    const [draft, setDraft] = useState(env);
+    const [gitOpen, setGitOpen] = useState(false);
+    const [gitName, setGitName] = useState("");
+    const [gitEmail, setGitEmail] = useState("");
+    const nameId = useId();
+    const emailId = useId();
+    // An external settings change resyncs the draft; an unrelated refresh does
+    // not, so an edit in progress is never clobbered. Same rule as a container
+    // row's environment editor.
+    const serverEnv = JSON.stringify(env);
+    useEffect(() => {
+        setDraft(env);
+    }, [serverEnv]);
+    const dirty = JSON.stringify(draft) !== serverEnv;
+    const disabled = busy || !writable;
+    // The identity popup applies into the draft; when the draft's only drift from
+    // the saved environment is inside the identity keys, it commits straight, so
+    // a name/email edit is not left unsaved behind an easy-to-miss Save click.
+    // When the popup restores the saved identity exactly, its pending change is
+    // discarded and the editor falls back to the persisted defaults, instead of
+    // keeping the stale identity (a no-op save would not resync the draft, since
+    // the server value did not change).
+    const commitIdentity = (next) => {
+        const action = commitIdentityAction(env, draft, next);
+        if (action === "save") {
+            onSave(next);
+        }
+        else if (action === "discard") {
+            setDraft(env);
+        }
+        else {
+            setDraft(next);
+        }
+    };
+    const openGit = () => {
+        const identity = readGitIdentity(draft);
+        setGitName(identity.name);
+        setGitEmail(identity.email);
+        setGitOpen(true);
+    };
+    return (_jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "8px" }, children: [_jsx("div", { style: sectionTitle, children: t("defaultEnvironment") }), _jsx("div", { style: wsBody, children: _jsx(EnvEditor, { t: t, env: draft, busy: disabled, onChange: setDraft }) }), _jsxs("div", { style: {
+                    display: "flex",
+                    flexWrap: "wrap",
+                    alignItems: "center",
+                    gap: "8px",
+                }, children: [_jsx(Button, { variant: "outline", size: "sm", disabled: disabled, onClick: openGit, children: t("gitIdentity") }), _jsx(Button, { variant: "primary", size: "sm", disabled: disabled || !dirty, onClick: () => onSave(draft), children: t("save") }), _jsx(Button, { variant: "ghost", size: "sm", disabled: busy || !dirty, onClick: () => setDraft(env), children: t("discard") })] }), _jsx("div", { children: _jsx(ConfirmButton, { t: t, label: t("applyDefaults"), title: t("confirmTitle"), description: t("confirmApplyDefaults"), disabled: disabled || dirty || Object.keys(env).length === 0, onConfirm: () => onSync("") }) }), _jsx("p", { style: { ...hint, margin: 0 }, children: t("defaultEnvironmentHint") }), _jsx(Modal, { open: gitOpen, onClose: () => setGitOpen(false), title: t("gitIdentity"), closeLabel: t("cancel"), footer: _jsxs(_Fragment, { children: [_jsx(Button, { variant: "outline", size: "sm", disabled: busy || readGitIdentity(draft).name === "", onClick: () => {
+                                commitIdentity(setGitIdentity(draft, "", ""));
+                                setGitOpen(false);
+                            }, children: t("clear") }), _jsx(Button, { variant: "outline", size: "sm", onClick: () => setGitOpen(false), children: t("cancel") }), _jsx(Button, { variant: "primary", size: "sm", disabled: busy || gitName === "" || gitEmail === "", onClick: () => {
+                                commitIdentity(setGitIdentity(draft, gitName, gitEmail));
+                                setGitOpen(false);
+                            }, children: t("apply") })] }), children: _jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "12px" }, children: [_jsx(Field, { label: t("gitName"), htmlFor: nameId, children: _jsx(Input, { id: nameId, value: gitName, disabled: busy, onChange: (event) => setGitName(event.target.value) }) }), _jsx(Field, { label: t("gitEmail"), htmlFor: emailId, children: _jsx(Input, { id: emailId, value: gitEmail, disabled: busy, onChange: (event) => setGitEmail(event.target.value) }) }), _jsx("p", { style: { ...hint, margin: 0 }, children: t("gitIdentityHint") })] }) })] }));
+}

package/dist/client/container-card-directory.d.ts

@@ -1,8 +1,8 @@
 import { type DirectoryPickerFace } from "./directory-picker.js";
-import { type ContainerPluginKey } from "./locales.js";
+import type { Translate } from "./locales.js";
 import { type ReactNode } from "react";
 export declare function DirectoryPickerModal(props: {
-    t: (key: ContainerPluginKey) => string;
+    t: Translate;
     open: boolean;
     root: string;
     start: string;

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

@@ -1,7 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DIRECTORY_CLASS } from "./container-card-directory-styles.js";
-import { confineToRoot, crumbLabel, rootCrumbs, } from "../project-path.js";
-import { Button, IconCheckOutline16, IconChevronRightOutline14, IconFolderClose16, IconFolderOpen16, Modal, } from "@deepseek-ai/dsh-client-ui-primitives";
+import { confineToRoot, crumbLabel, rootCrumbs } from "../project-path.js";
+import { Button, IconCheckOutlineRegular, IconChevronRightOutlineRegular, IconFolderCloseRegular, IconFolderOpenRegular, Modal, } from "@deepseek-ai/dsh-client-ui-primitives";
 import { useEffect, useRef, useState } from "react";
 // How long a listing may take before the browser admits it is still loading.
 const SLOW_SCAN_DELAY_MS = 300;
@@ -128,13 +128,21 @@ export function DirectoryPickerModal(props) {
     const crumbs = rootCrumbs(root, path);
     const visible = (entries) => entries.filter((entry) => showHidden || !entry.hidden);
     const truncated = level?.truncated === true || child?.truncated === true;
-    return (_jsx(Modal, { open: open, onClose: onClose, title: t("browseTitle"), className: DIRECTORY_CLASS, headless: true, children: _jsxs("div", { className: "dsh-podman-directory-scope", children: [_jsxs("div", { className: "dsh-podman-directory-header", children: [_jsx("h2", { className: "dsh-podman-directory-title", children: t("browseTitle") }), _jsx("div", { className: "dsh-podman-directory-crumbbar", children: _jsxs("nav", { ref: trailRef, className: "dsh-podman-directory-crumbs", "aria-label": t("browseTitle"), children: [_jsx("span", { className: "dsh-podman-directory-crumbseat", children: _jsx("button", { type: "button", className: "dsh-podman-directory-crumb", disabled: busy, onClick: () => navigate(root), children: crumbLabel(root) }) }), crumbs.map((crumb) => (_jsxs("span", { className: "dsh-podman-directory-crumbseat", children: [_jsx(IconChevronRightOutline14, { size: 12, className: "dsh-podman-directory-crumbchevron" }), _jsx("button", { type: "button", className: "dsh-podman-directory-crumb", disabled: busy, onClick: () => navigate(crumb), children: crumbLabel(crumb) })] }, crumb)))] }) })] }), _jsxs("div", { className: "dsh-podman-directory-content", children: [_jsxs("div", { className: "dsh-podman-directory-miller", children: [_jsx("ul", { className: "dsh-podman-directory-column", children: (level?.entries ?? []).length === 0 ? null : (visible(level?.entries ?? []).map((entry) => (_jsx(DirectoryRow, { entry: entry, selected: selected?.path === entry.path, busy: busy, onPick: select }, entry.path)))) }), selected === null ? null : (_jsxs(_Fragment, { children: [_jsx("span", { className: "dsh-podman-directory-divider" }), _jsx("ul", { className: "dsh-podman-directory-column", children: visible(child?.entries ?? []).map((entry) => (_jsx(DirectoryRow, { entry: entry, selected: false, busy: busy, onPick: advance }, entry.path))) })] }))] }), error === "" ? null : (_jsx("p", { className: "dsh-podman-directory-error", role: "alert", children: error })), error === "" && truncated ? (_jsx("p", { className: "dsh-podman-directory-status", role: "status", children: t("browseTruncated") })) : null, slow ? (_jsx("span", { className: "dsh-podman-directory-loading", role: "status", children: t("browseLoading") })) : null] }), _jsxs("div", { className: "dsh-podman-directory-footer", children: [_jsxs("button", { type: "button", className: "dsh-podman-directory-toggle", "aria-pressed": showHidden, disabled: busy, onClick: () => setShowHidden((previous) => !previous), children: [t("browseHidden"), showHidden ? _jsx(IconCheckOutline16, { size: 14 }) : null] }), _jsx("span", { className: "dsh-podman-directory-gap" }), _jsx(Button, { variant: "outline", className: "dsh-podman-directory-action", disabled: busy, onClick: onClose, children: t("cancel") }), _jsx(Button, { variant: "primary", className: "dsh-podman-directory-action", disabled: busy || error !== "", onClick: () => onSelect(selected?.path ?? path), children: t("browseSelect") })] })] }) }));
+    return (_jsx(Modal, { open: open, onClose: onClose, title: t("browseTitle"), className: DIRECTORY_CLASS, headless: true, children: _jsxs("div", { className: "dsh-podman-directory-scope", children: [_jsxs("div", { className: "dsh-podman-directory-header", children: [_jsx("h2", { className: "dsh-podman-directory-title", children: t("browseTitle") }), _jsx("div", { className: "dsh-podman-directory-crumbbar", children: _jsxs("nav", { ref: trailRef, className: "dsh-podman-directory-crumbs", "aria-label": t("browseTitle"), children: [_jsx("span", { className: "dsh-podman-directory-crumbseat", children: _jsx("button", { type: "button", className: "dsh-podman-directory-crumb", disabled: busy, onClick: () => navigate(root), children: crumbLabel(root) }) }), crumbs.map((crumb) => (_jsxs("span", { className: "dsh-podman-directory-crumbseat", children: [_jsx(IconChevronRightOutlineRegular, { size: 12, className: "dsh-podman-directory-crumbchevron" }), _jsx("button", { type: "button", className: "dsh-podman-directory-crumb", disabled: busy, onClick: () => navigate(crumb), children: crumbLabel(crumb) })] }, crumb)))] }) })] }), _jsxs("div", { className: "dsh-podman-directory-content", children: [_jsxs("div", { className: "dsh-podman-directory-miller", children: [_jsx("ul", { className: "dsh-podman-directory-column", children: (level?.entries ?? []).length === 0 ? null : (visible(level?.entries ?? []).map((entry) => (_jsx(DirectoryRow, { entry: entry, selected: selected?.path === entry.path, busy: busy, onPick: select }, entry.path)))) }), selected === null ? null : (_jsxs(_Fragment, { children: [_jsx("span", { className: "dsh-podman-directory-divider" }), _jsx("ul", { className: "dsh-podman-directory-column", children: visible(child?.entries ?? []).map((entry) => (_jsx(DirectoryRow, { entry: entry, selected: false, busy: busy, onPick: advance }, entry.path))) })] }))] }), error === ""
+                            ? null
+                            : (_jsx("p", { className: "dsh-podman-directory-error", role: "alert", children: error })), error === "" && truncated
+                            ? (_jsx("p", { className: "dsh-podman-directory-status", role: "status", children: t("browseTruncated") }))
+                            : null, slow
+                            ? (_jsx("span", { className: "dsh-podman-directory-loading", role: "status", children: t("browseLoading") }))
+                            : null] }), _jsxs("div", { className: "dsh-podman-directory-footer", children: [_jsxs("button", { type: "button", className: "dsh-podman-directory-toggle", "aria-pressed": showHidden, disabled: busy, onClick: () => setShowHidden((previous) => !previous), children: [t("browseHidden"), showHidden ? _jsx(IconCheckOutlineRegular, { size: 14 }) : null] }), _jsx("span", { className: "dsh-podman-directory-gap" }), _jsx(Button, { variant: "outline", className: "dsh-podman-directory-action", disabled: busy, onClick: onClose, children: t("cancel") }), _jsx(Button, { variant: "primary", className: "dsh-podman-directory-action", disabled: busy || error !== "", onClick: () => onSelect(selected?.path ?? path), children: t("browseSelect") })] })] }) }));
 }
 function DirectoryRow(props) {
     const { entry, selected, busy, onPick } = props;
     return (_jsx("li", { className: "dsh-podman-directory-seat", children: _jsxs("button", { type: "button", className: selected
                 ? "dsh-podman-directory-row dsh-podman-directory-row-selected"
-                : "dsh-podman-directory-row", "aria-current": selected ? true : undefined, disabled: busy, onClick: () => onPick(entry), children: [selected ? (_jsx(IconFolderOpen16, { size: 16, className: "dsh-podman-directory-rowicon-selected" })) : (_jsx(IconFolderClose16, { size: 16, className: "dsh-podman-directory-rowicon" })), _jsx("span", { className: "dsh-podman-directory-rowname", children: entry.name }), _jsx(IconChevronRightOutline14, { size: 12, className: "dsh-podman-directory-rowchevron" })] }) }));
+                : "dsh-podman-directory-row", "aria-current": selected ? true : undefined, disabled: busy, onClick: () => onPick(entry), children: [selected
+                    ? (_jsx(IconFolderOpenRegular, { size: 16, className: "dsh-podman-directory-rowicon-selected" }))
+                    : (_jsx(IconFolderCloseRegular, { size: 16, className: "dsh-podman-directory-rowicon" })), _jsx("span", { className: "dsh-podman-directory-rowname", children: entry.name }), _jsx(IconChevronRightOutlineRegular, { size: 12, className: "dsh-podman-directory-rowchevron" })] }) }));
 }
 function toLevel(listing) {
     return {

package/dist/client/container-card-editors.d.ts

@@ -1,15 +1,15 @@
 import { type MountInput } from "./container-card-controller.js";
 import { type DirectoryPickerFace } from "./directory-picker.js";
-import { type ContainerPluginKey } from "./locales.js";
+import type { Translate } from "./locales.js";
 import { type ReactNode } from "react";
 export declare function EnvEditor(props: {
-    t: (key: ContainerPluginKey) => string;
+    t: Translate;
     env: Record<string, string>;
     busy: boolean;
     onChange: (env: Record<string, string>) => void;
 }): ReactNode;
 export declare function MountsEditor(props: {
-    t: (key: ContainerPluginKey) => string;
+    t: Translate;
     mounts: readonly MountInput[];
     volumes: readonly {
         name: string;