Skip to content

armgit / avibe

Public Imported from GitHub
0

Make your computer a home for your AI partner. Avibe is the local-first Agent OS: Vibey, its built-in AI partner, works out of the box, and Claude Code, Codex & OpenCode run unchanged beside it — reach them from your browser, phone, or any chat app.

feat(vaults): redesign the secret field editor as a compact list (#2621)

Call White9b8ba9a388e8
diff --git a/docs/plans/2026-10-13-vault-multi-field-secrets.md b/docs/plans/2026-10-13-vault-multi-field-secrets.md
index 3b0a807a2..e8d6226c1 100644
--- a/docs/plans/2026-10-13-vault-multi-field-secrets.md
+++ b/docs/plans/2026-10-13-vault-multi-field-secrets.md
@@ -222,12 +222,17 @@ also receives this hint when the original request had no field spec.
- Create: a static secret looks the same as today until the user adds a field.
Then the value becomes a list of field rows (name and value), with exactly one
- default. A Login template fills `username`, `password` (default), and `totp`.
- File upload stays available only for a single-value standard secret.
+ default. The template menu offers Login (`username`, `password`) and Login +
+ 2FA (`username`, `password`, `totp`), both defaulting to `password`, which
+ receives any value already typed. File upload stays available only for a
+ single-value standard secret. Each row reports its own naming error, and a
+ preview lists the `NAME.field` references an agent can use.
+ Visual reference: `assets/vault-fields-redesign/`.
- A protected create seals every field in the same sandbox session and sends
one create request. Vault establishment fields are sent once.
- Edit: replace any field's value, add or remove extra fields, and rename the
- default field. Name, kind, and protection stay read-only. After mount the
+ default field. A row shows Save once it changes; on the default row Save
+ renames first and then writes a typed value under the renamed record. Name, kind, and protection stay read-only. After mount the
editor owns current server metadata and drafts: own-write responses or
sequenced authoritative refetches update truth, while changed parent props
and Vault events trigger refetches rather than directly replacing it. Only
diff --git a/docs/plans/assets/vault-fields-redesign/create-multi-invalid-1280.png b/docs/plans/assets/vault-fields-redesign/create-multi-invalid-1280.png
new file mode 100644
index 000000000..9da10971a
Binary files /dev/null and b/docs/plans/assets/vault-fields-redesign/create-multi-invalid-1280.png differ
diff --git a/docs/plans/assets/vault-fields-redesign/create-multi-invalid-390.png b/docs/plans/assets/vault-fields-redesign/create-multi-invalid-390.png
new file mode 100644
index 000000000..fabca9359
Binary files /dev/null and b/docs/plans/assets/vault-fields-redesign/create-multi-invalid-390.png differ
diff --git a/docs/plans/assets/vault-fields-redesign/create-protected-1280.png b/docs/plans/assets/vault-fields-redesign/create-protected-1280.png
new file mode 100644
index 000000000..bdda6ff85
Binary files /dev/null and b/docs/plans/assets/vault-fields-redesign/create-protected-1280.png differ
diff --git a/docs/plans/assets/vault-fields-redesign/create-protected-390.png b/docs/plans/assets/vault-fields-redesign/create-protected-390.png
new file mode 100644
index 000000000..7a55d17d9
Binary files /dev/null and b/docs/plans/assets/vault-fields-redesign/create-protected-390.png differ
diff --git a/docs/plans/assets/vault-fields-redesign/create-single-template-1280.png b/docs/plans/assets/vault-fields-redesign/create-single-template-1280.png
new file mode 100644
index 000000000..ce1190f5d
Binary files /dev/null and b/docs/plans/assets/vault-fields-redesign/create-single-template-1280.png differ
diff --git a/docs/plans/assets/vault-fields-redesign/create-single-template-390.png b/docs/plans/assets/vault-fields-redesign/create-single-template-390.png
new file mode 100644
index 000000000..c87144909
Binary files /dev/null and b/docs/plans/assets/vault-fields-redesign/create-single-template-390.png differ
diff --git a/docs/plans/assets/vault-fields-redesign/edit-dirty-1280.png b/docs/plans/assets/vault-fields-redesign/edit-dirty-1280.png
new file mode 100644
index 000000000..d43473150
Binary files /dev/null and b/docs/plans/assets/vault-fields-redesign/edit-dirty-1280.png differ
diff --git a/docs/plans/assets/vault-fields-redesign/edit-dirty-390.png b/docs/plans/assets/vault-fields-redesign/edit-dirty-390.png
new file mode 100644
index 000000000..c7e4fa5ce
Binary files /dev/null and b/docs/plans/assets/vault-fields-redesign/edit-dirty-390.png differ
diff --git a/ui/src/components/ui/vault-field-list.tsx b/ui/src/components/ui/vault-field-list.tsx
new file mode 100644
index 000000000..c60a8330c
--- /dev/null
+++ b/ui/src/components/ui/vault-field-list.tsx
@@ -0,0 +1,404 @@
+import { useId, useRef, useState, type ReactNode } from 'react';
+import { ChevronDown, Eye, EyeOff, LayoutTemplate, MoreHorizontal, Plus, X } from 'lucide-react';
+import { Trans, useTranslation } from 'react-i18next';
+
+import { cn } from '@/lib/utils';
+import type { VaultFieldNameIssue } from '@/lib/vaultFields';
+import { Badge } from './badge';
+import { badgeVariants } from './badge-variants';
+import { Button } from './button';
+import { Input } from './input';
+import { Popover, PopoverContent, PopoverTrigger } from './popover';
+import { ResponsiveMenu } from './responsive-menu';
+
+// The field list shared by secret creation and editing. Rows lay out by the list's own width
+// (`@container/fields`), not the viewport, so a narrow dialog stacks them the same way a phone
+// does. Tailwind needs whole class names, so the 25rem breakpoint is spelled out in each one.
+
+/** Field names whose values are identifiers rather than secrets, so they start revealed. */
+const REVEALED_BY_DEFAULT = new Set(['username', 'email']);
+
+const MENU_ITEM = 'flex w-full flex-col items-start gap-0.5 rounded-md px-3 py-2 text-left transition-colors hover:bg-foreground/[0.04] disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:bg-transparent';
+
+export function VaultFieldsHeader({ count, note }: { count: number; note?: ReactNode }) {
+ const { t } = useTranslation();
+ return (
+ <div className="flex flex-wrap items-center justify-between gap-x-3 gap-y-1">
+ <span className="flex items-center gap-2 text-[13px] font-medium text-foreground">
+ {t('vaults.fields.title')}
+ <span className="rounded-md bg-surface-3 px-1.5 text-[11px] font-semibold tabular-nums text-muted">{count}</span>
+ </span>
+ {note ? <span className="text-xs text-muted">{note}</span> : null}
+ </div>
+ );
+}
+
+/** One bordered list with hairline dividers; adding a field is its last row. */
+export function VaultFieldList({ children, onAdd, addDisabled }: {
+ children: ReactNode;
+ onAdd: () => void;
+ addDisabled?: boolean;
+}) {
+ const { t } = useTranslation();
+ return (
+ <div className="@container/fields overflow-hidden rounded-xl border border-border bg-card">
+ <div className="divide-y divide-border">{children}</div>
+ <button
+ type="button"
+ onClick={onAdd}
+ disabled={addDisabled}
+ className="flex w-full items-center gap-1.5 border-t border-dashed border-border-strong px-4 py-2.5 text-[13px] font-medium text-mint-ink transition-colors hover:bg-mint-soft focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:bg-transparent"
+ >
+ <Plus className="size-4" />
+ {t('vaults.fields.add')}
+ </button>
+ </div>
+ );
+}
+
+type FieldNameSpec =
+ | {
+ editable: true;
+ value: string;
+ label: string;
+ onChange: (value: string) => void;
+ onFocus?: () => void;
+ onBlur?: () => void;
+ autoFocus?: boolean;
+ }
+ | { editable: false; title: string };
+
+type FieldValueSpec = {
+ value: string;
+ label: string;
+ placeholder: string;
+ onChange: (value: string) => void;
+ onBlur?: () => void;
+ autoFocus?: boolean;
+};
+
+type FieldRemoveSpec = {
+ label: string;
+ /** Removing waits for this inline confirmation; omit it for a row that holds nothing saved. */
+ confirm?: ReactNode;
+ onRemove: () => unknown;
+ /** Keeps the remove control in place but inert, and says why. */
+ blockedReason?: string;
+};
+
+export function VaultFieldRow({
+ field, name, isDefault, value, action, onSetDefault, remove, issue, disabled,
+}: {
+ /** The row's current name, used in labels and the phone menu's title. */
+ field: string;
+ name: FieldNameSpec;
+ isDefault: boolean;
+ value: FieldValueSpec;
+ /** Trailing control beside the value, such as a row's Save button. */
+ action?: ReactNode;
+ onSetDefault?: () => void;
+ remove?: FieldRemoveSpec;
+ /** What keeps this row from saving; the parent decides when a blank one is worth showing. */
+ issue?: VaultFieldNameIssue | 'valueRequired' | null;
+ disabled?: boolean;
+}) {
+ const { t } = useTranslation();
+ // A name issue concerns the name as typed (a pending rename may differ from `field`), and
+ // each issue marks only the input it is about.
+ const typedName = name.editable ? name.value : field;
+ const error = issue === 'nameRequired' ? t('vaults.fields.nameRequired')
+ : issue === 'nameInvalid' ? t('vaults.fields.nameInvalid')
+ : issue === 'nameTaken' ? t('vaults.fields.nameTaken', { field: typedName })
+ : issue === 'valueRequired' ? t('vaults.fields.valueRequired')
+ : null;
+ const errorId = useId();
+ const [confirming, setConfirming] = useState(false);
+ const [removing, setRemoving] = useState(false);
+ const [menuOpen, setMenuOpen] = useState(false);
+ const nameInvalid = Boolean(issue) && issue !== 'valueRequired';
+ const valueInvalid = issue === 'valueRequired';
+ const canSetDefault = !isDefault && Boolean(onSetDefault);
+
+ const requestRemove = () => {
+ if (!remove || remove.blockedReason) return;
+ if (remove.confirm) setConfirming(true);
+ else void remove.onRemove();
+ };
+ const confirmRemove = async () => {
+ if (!remove) return;
+ setRemoving(true);
+ try {
+ await remove.onRemove();
+ } finally {
+ setRemoving(false);
+ setConfirming(false);
+ }
+ };
+
+ if (confirming && remove?.confirm) {
+ return (
+ <div className="flex flex-wrap items-center gap-2 bg-destructive/[0.06] px-3 py-2.5">
+ <span className="min-w-0 text-[13px] text-destructive-ink wrap-anywhere">{remove.confirm}</span>
+ <span className="ml-auto flex gap-1">
+ <Button type="button" variant="ghost" size="xs" autoFocus disabled={removing} onClick={() => setConfirming(false)}>
+ {t('vaults.dialog.cancel')}
+ </Button>
+ <Button type="button" variant="destructive" size="xs" disabled={removing || disabled} onClick={() => void confirmRemove()}>
+ {t('vaults.fields.confirmRemove')}
+ </Button>
+ </span>
+ </div>
+ );
+ }
+
+ return (
+ <div className={cn('group/field px-2.5 py-2 transition-colors', error && 'bg-destructive/[0.04]')}>
+ <div className="flex flex-col gap-1.5 @[25rem]/fields:flex-row @[25rem]/fields:items-center @[25rem]/fields:gap-2">
+ <div className="flex min-w-0 items-center gap-1.5 @[25rem]/fields:w-[38%] @[25rem]/fields:shrink-0">
+ {name.editable ? (
+ <Input
+ variant="bare"
+ value={name.value}
+ onChange={(event) => name.onChange(event.target.value)}
+ onFocus={name.onFocus}
+ onBlur={name.onBlur}
+ autoFocus={name.autoFocus}
+ aria-label={name.label}
+ aria-invalid={nameInvalid || undefined}
+ aria-describedby={nameInvalid ? errorId : undefined}
+ placeholder={t('vaults.fields.namePlaceholder')}
+ maxLength={64}
+ spellCheck={false}
+ autoComplete="off"
+ disabled={disabled}
+ className={cn(
+ 'h-8 min-w-0 flex-1 rounded-md border border-transparent px-2 font-mono text-[13px] transition-colors hover:border-input focus:bg-background focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring',
+ nameInvalid && 'border-destructive/50 hover:border-destructive/50',
+ )}
+ />
+ ) : (
+ <span title={name.title} className="min-w-0 flex-1 truncate px-2 font-mono text-[13px] leading-8 text-foreground">{field}</span>
+ )}
+ {isDefault ? (
+ <Badge variant="success" className="shrink-0 px-2">{t('vaults.fields.default')}</Badge>
+ ) : canSetDefault ? (
+ <button
+ type="button"
+ onClick={onSetDefault}
+ disabled={disabled}
+ aria-label={t('vaults.fields.setDefaultNamed', { field })}
+ className={cn(
+ badgeVariants({ variant: 'outline' }),
+ 'hidden shrink-0 border-dashed px-2 font-medium tracking-normal text-muted opacity-0 hover:border-mint hover:text-mint-ink focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-ring group-focus-within/field:opacity-100 group-hover/field:opacity-100 disabled:opacity-0 @[25rem]/fields:inline-flex',
+ )}
+ >
+ {t('vaults.fields.setDefault')}
+ </button>
+ ) : null}
+ {canSetDefault || remove ? (
+ <div className="ml-auto shrink-0 @[25rem]/fields:hidden">
+ <ResponsiveMenu
+ open={menuOpen}
+ onOpenChange={setMenuOpen}
+ sheetTitle={field}
+ className="w-56"
+ trigger={(
+ <Button type="button" variant="ghost" size="icon" disabled={disabled}
+ aria-label={t('vaults.fields.rowActions', { field })}
+ className="size-8 text-muted hover:text-foreground">
+ <MoreHorizontal className="size-4" />
+ </Button>
+ )}
+ >
+ {canSetDefault ? (
+ <button type="button" role="menuitem" className={MENU_ITEM}
+ onClick={() => { setMenuOpen(false); onSetDefault?.(); }}>
+ <span className="text-[13px] text-foreground">{t('vaults.fields.setDefault')}</span>
+ </button>
+ ) : null}
+ {remove ? (
+ <button type="button" role="menuitem" className={MENU_ITEM} disabled={Boolean(remove.blockedReason)}
+ onClick={() => { setMenuOpen(false); requestRemove(); }}>
+ <span className="text-[13px] text-destructive-ink">{t('vaults.fields.removeField')}</span>
+ {remove.blockedReason ? <span className="text-[11px] text-muted">{remove.blockedReason}</span> : null}
+ </button>
+ ) : null}
+ </ResponsiveMenu>
+ </div>
+ ) : null}
+ </div>
+ <div className="flex min-w-0 flex-1 items-center gap-1.5">
+ <VaultFieldValueInput field={field} {...value} disabled={disabled} invalid={valueInvalid}
+ describedBy={valueInvalid ? errorId : undefined} />
+ {action}
+ {remove ? (
+ <Button
+ type="button"
+ variant="ghost"
+ size="icon"
+ disabled={disabled}
+ aria-label={remove.label}
+ aria-disabled={remove.blockedReason ? true : undefined}
+ title={remove.blockedReason}
+ onClick={requestRemove}
+ className={cn(
+ 'hidden size-7 shrink-0 text-muted opacity-0 focus-visible:opacity-100 @[25rem]/fields:inline-flex',
+ remove.blockedReason
+ ? 'cursor-not-allowed hover:bg-transparent group-focus-within/field:opacity-40 group-hover/field:opacity-40'
+ : 'hover:bg-destructive/10 hover:text-destructive-ink group-focus-within/field:opacity-100 group-hover/field:opacity-100',
+ )}
+ >
+ <X className="size-4" />
+ </Button>
+ ) : (
+ <span aria-hidden className="hidden size-7 shrink-0 @[25rem]/fields:block" />
+ )}
+ </div>
+ </div>
+ {error ? <p id={errorId} className="mt-1 px-2 text-xs text-destructive-ink wrap-anywhere">{error}</p> : null}
+ </div>
+ );
+}
+
+function VaultFieldValueInput({
+ field, value, label, placeholder, onChange, onBlur, autoFocus, disabled, invalid, describedBy,
+}: FieldValueSpec & { field: string; disabled?: boolean; invalid?: boolean; describedBy?: string }) {
+ const { t } = useTranslation();
+ // Unset until the user toggles, so a row renamed to `username` follows its new name.
+ const [reveal, setReveal] = useState<boolean | null>(null);
+ const revealed = reveal ?? REVEALED_BY_DEFAULT.has(field);
+ return (
+ <div className="relative min-w-0 flex-1">
+ <Input
+ type={revealed ? 'text' : 'password'}
+ value={value}
+ onChange={(event) => onChange(event.target.value)}
+ onBlur={onBlur}
+ autoFocus={autoFocus}
+ aria-label={label}
+ aria-invalid={invalid || undefined}
+ aria-describedby={describedBy}
+ placeholder={placeholder}
+ autoComplete="off"
+ spellCheck={false}
+ disabled={disabled}
+ className={cn('pr-9', invalid && 'border-destructive/50')}
+ />
+ <Button
+ type="button"
+ variant="ghost"
+ size="icon"
+ disabled={disabled}
+ onClick={() => setReveal(!revealed)}
+ aria-label={revealed ? t('vaults.fields.hideNamed', { field }) : t('vaults.fields.showNamed', { field })}
+ className="absolute right-1 top-1/2 size-7 -translate-y-1/2 text-muted hover:text-foreground"
+ >
+ {revealed ? <EyeOff className="size-4" /> : <Eye className="size-4" />}
+ </Button>
+ </div>
+ );
+}
+
+/** How an agent names each field, so the default field's bare-name shorthand is visible. */
+export function VaultFieldReferences({ secretName, fields, defaultField }: {
+ secretName: string;
+ fields: string[];
+ defaultField: string;
+}) {
+ const { t } = useTranslation();
+ if (fields.length === 0) return null;
+ const name = secretName || t('vaults.fields.referenceName');
+ return (
+ <div className="flex flex-col gap-1.5 rounded-lg bg-background px-3 py-2.5 text-xs text-muted">
+ <div className="flex flex-wrap items-center gap-1.5">
+ <span className="mr-0.5">{t('vaults.fields.references')}</span>
+ {fields.map((field) => (
+ <code
+ key={field}
+ className={cn(
+ 'min-w-0 rounded-md px-1.5 py-0.5 font-mono text-[11px] ring-1 wrap-anywhere',
+ field === defaultField ? 'bg-mint-soft text-mint-ink ring-mint/30' : 'bg-card text-foreground ring-border',
+ )}
+ >
+ {name}.{field}
+ </code>
+ ))}
+ </div>
+ {fields.includes(defaultField) ? (
+ <span className="wrap-anywhere">
+ <Trans
+ i18nKey="vaults.fields.referenceDefault"
+ components={{
+ name: <code className="font-mono text-[11px] text-foreground">{name}</code>,
+ field: <code className="font-mono text-[11px] text-mint-ink">{defaultField}</code>,
+ }}
+ />
+ </span>
+ ) : null}
+ </div>
+ );
+}
+
+/** Inline removal copy with the field name set in mono. */
+export function VaultFieldRemoveConfirm({ field, revokesGrants }: { field: string; revokesGrants: boolean }) {
+ const code = <code className="font-mono">{field}</code>;
+ return revokesGrants
+ ? <Trans i18nKey="vaults.fields.removeConfirmSaved" components={{ field: code }} />
+ : <Trans i18nKey="vaults.fields.removeConfirm" components={{ field: code }} />;
+}
+
+/** Field presets for a single value; the value already typed moves into the default field. */
+export function VaultFieldTemplateMenu({ disabled, onApply }: {
+ disabled?: boolean;
+ onApply: (fields: string[], defaultField: string) => void;
+}) {
+ const { t } = useTranslation();
+ const [open, setOpen] = useState(false);
+ const menuId = useId();
+ // The trigger unmounts once a template applies, so focus goes to the new rows instead.
+ const appliedRef = useRef(false);
+ const templates = [
+ { label: t('vaults.fields.templateLogin'), fields: ['username', 'password'] },
+ { label: t('vaults.fields.templateLogin2fa'), fields: ['username', 'password', 'totp'] },
+ ];
+ return (
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
+ <Button type="button" variant="ghost" size="xs" disabled={disabled} aria-haspopup="menu"
+ className="px-2.5 text-[13px] text-muted hover:text-foreground">
+ <LayoutTemplate />
+ {t('vaults.fields.useTemplate')}
+ <ChevronDown className="opacity-60" />
+ </Button>
+ </PopoverTrigger>
+ <PopoverContent
+ align="start"
+ className="w-64 p-1"
+ role="menu"
+ onCloseAutoFocus={(event) => {
+ if (appliedRef.current) event.preventDefault();
+ appliedRef.current = false;
+ }}
+ >
+ {templates.map((template, index) => (
+ <button
+ key={template.fields.join('.')}
+ type="button"
+ role="menuitem"
+ aria-label={template.label}
+ aria-describedby={`${menuId}-${index}`}
+ className={MENU_ITEM}
+ onClick={() => {
+ appliedRef.current = true;
+ setOpen(false);
+ onApply(template.fields, 'password');
+ }}
+ >
+ <span className="text-sm font-medium text-foreground">{template.label}</span>
+ <span id={`${menuId}-${index}`} className="font-mono text-[11px] text-muted">{template.fields.join(' · ')}</span>
+ </button>
+ ))}
+ </PopoverContent>
+ </Popover>
+ );
+}
diff --git a/ui/src/components/ui/vault-secret-dialog.tsx b/ui/src/components/ui/vault-secret-dialog.tsx
index 3c623cff5..ac0911932 100644
--- a/ui/src/components/ui/vault-secret-dialog.tsx
+++ b/ui/src/components/ui/vault-secret-dialog.tsx
@@ -96,7 +96,7 @@ export const VaultSecretDialog: React.FC<{
</span>
<div className="flex flex-col gap-0.5">
<span className="text-[15px] font-semibold text-foreground">{title}</span>
- <span className="text-xs text-muted-foreground">{subtitle}</span>
+ <span className="text-xs text-muted">{subtitle}</span>
</div>
</div>
{notice ?? (
diff --git a/ui/src/components/ui/vault-secret-fields-editor.test.tsx b/ui/src/components/ui/vault-secret-fields-editor.test.tsx
index 95dfb334f..14ba32a00 100644
--- a/ui/src/components/ui/vault-secret-fields-editor.test.tsx
+++ b/ui/src/components/ui/vault-secret-fields-editor.test.tsx
@@ -113,7 +113,7 @@ it('updates envelope versions after replacing a field and renaming the default l
);
api.updateVaultSecret.mockResolvedValue({ ok: true, secret: { ...secret, default_field: 'credential', fields: ['credential', 'username'], updated_at: 'version-2' } });
change('Default field name', 'credential');
- fireEvent.click(screen.getByRole('button', { name: 'Rename' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Save password' }));
await screen.findByLabelText('Value for credential');
expect(api.updateVaultSecret).toHaveBeenCalledWith('LOGIN', { default_field: 'credential' }, { handleError: false });
rendered.rerender(
@@ -133,17 +133,32 @@ it('updates envelope versions after replacing a field and renaming the default l
]);
});
-it('moves a typed default value when its label is renamed', async () => {
- api.updateVaultSecret.mockResolvedValue({
- ok: true,
- secret: { ...secret, default_field: 'credential', fields: ['credential', 'username'], updated_at: 'version-1' },
- });
+// A row has one Save. On the default row it renames first (metadata only) and then seals the typed
+// value under the renamed field's bare record; sealing against the pre-rename metadata would fail
+// the field check and write nothing. Only the default field's name is editable.
+it('renames the default field and then saves its typed value under the new name', async () => {
+ const renamed = { ...secret, default_field: 'credential', fields: ['credential', 'username'], updated_at: 'version-2' };
+ api.updateVaultSecret.mockResolvedValue({ ok: true, secret: renamed });
+ api.updateVaultSecretField.mockResolvedValue({ ok: true, secret: { ...renamed, updated_at: 'version-3' } });
renderEditor();
+ expect(screen.getAllByRole('textbox').filter((input) => input.getAttribute('aria-label') === 'Default field name')).toHaveLength(1);
+ expect(screen.getByTitle(en.vaults.fields.extraNotRenamable).textContent).toBe('username');
+ expect(screen.queryByRole('button', { name: 'Save password' })).toBeNull();
+ // A pending rename onto a sibling names the sibling it collides with, not the saved label.
+ change('Default field name', 'username');
+ expect(screen.getByText("There's already a username field")).toBeTruthy();
+ expect((screen.getByRole('button', { name: 'Save password' }) as HTMLButtonElement).disabled).toBe(true);
change('Value for password', 'typed-default');
change('Default field name', 'credential');
- fireEvent.click(screen.getByRole('button', { name: 'Rename' }));
- await waitFor(() => expect(screen.getByLabelText('Value for credential')).toBeTruthy());
- expect((screen.getByLabelText('Value for credential') as HTMLInputElement).value).toBe('typed-default');
+ fireEvent.click(screen.getByRole('button', { name: 'Save password' }));
+ await waitFor(() => expect(api.updateVaultSecretField).toHaveBeenCalledWith(
+ 'LOGIN', 'credential', { record: 'LOGIN', blind_box: box, expected_updated_at: 'version-2' }, { handleError: false },
+ ));
+ expect(api.updateVaultSecret).toHaveBeenCalledWith('LOGIN', { default_field: 'credential' }, { handleError: false });
+ expect(api.updateVaultSecret.mock.invocationCallOrder[0]).toBeLessThan(api.updateVaultSecretField.mock.invocationCallOrder[0]);
+ expect(sealBlindBox).toHaveBeenCalledWith('typed-default', { public_key: 'public' }, { purpose: 'seal', name: 'LOGIN' });
+ await waitFor(() => expect((screen.getByLabelText('Value for credential') as HTMLInputElement).value).toBe(''));
+ expect(screen.queryByRole('button', { name: 'Save credential' })).toBeNull();
});
it('keeps a typed default label when saving another field', async () => {
@@ -163,10 +178,11 @@ it('accepts a server refetch after a legitimate quick rename back before parent
const renamedByUser = { ...secret, default_field: 'password', fields: ['password', 'username'] };
const renamedBackExternally = { ...secret, default_field: 'value', fields: ['value', 'username'] };
api.updateVaultSecret.mockResolvedValueOnce({ ok: true, secret: renamedByUser });
- const rendered = renderEditor();
+ const rendered = renderEditor({ ...renamedBackExternally });
change('Default field name', 'password');
- fireEvent.click(screen.getByRole('button', { name: 'Rename' }));
- await waitFor(() => expect((screen.getByLabelText('Default field name') as HTMLInputElement).value).toBe('password'));
+ fireEvent.click(screen.getByRole('button', { name: 'Save value' }));
+ await waitFor(() => expect(api.updateVaultSecret).toHaveBeenCalledWith('LOGIN', { default_field: 'password' }, { handleError: false }));
+ await waitFor(() => expect(screen.getByLabelText('Value for password')).toBeTruthy());
api.listVaultSecrets.mockResolvedValueOnce({ ok: true, secrets: [renamedBackExternally] });
rendered.rerender(
@@ -269,10 +285,10 @@ it.each(['constructor', 'tostring', 'valueof'])('treats %s as a normal field key
});
renderEditor(entry);
const value = screen.getByLabelText(`Value for ${field}`) as HTMLInputElement;
- const save = screen.getByRole('button', { name: `Save ${field}` }) as HTMLButtonElement;
expect(value.value).toBe('');
- expect(save.disabled).toBe(true);
+ expect(screen.queryByRole('button', { name: `Save ${field}` })).toBeNull();
fireEvent.change(value, { target: { value: 'typed-value' } });
+ const save = screen.getByRole('button', { name: `Save ${field}` }) as HTMLButtonElement;
expect(save.disabled).toBe(false);
fireEvent.click(save);
await waitFor(() => expect(api.updateVaultSecretField).toHaveBeenCalledWith(
@@ -314,8 +330,8 @@ it('warns and disables field mutations when field metadata is corrupt', () => {
expect(screen.getByRole('alert').textContent).toBe(en.errors.fields_corrupt);
expect((screen.getByLabelText('Default field name') as HTMLInputElement).disabled).toBe(true);
expect((screen.getByLabelText('Value for password') as HTMLInputElement).disabled).toBe(true);
- expect((screen.getByRole('button', { name: 'Rename' }) as HTMLButtonElement).disabled).toBe(true);
- expect((screen.getByRole('button', { name: 'Save password' }) as HTMLButtonElement).disabled).toBe(true);
+ expect((screen.getByLabelText('Value for username') as HTMLInputElement).disabled).toBe(true);
+ expect(screen.queryByRole('button', { name: /^Save / })).toBeNull();
expect((screen.getByRole('button', { name: 'Remove username' }) as HTMLButtonElement).disabled).toBe(true);
expect((screen.getByRole('button', { name: 'Add field' }) as HTMLButtonElement).disabled).toBe(true);
});
@@ -332,7 +348,7 @@ it('adopts a same-version corruption state from refreshed metadata', async () =>
</I18nextProvider>,
);
await waitFor(() => expect(screen.getByRole('alert').textContent).toBe(en.errors.fields_corrupt));
- expect((screen.getByRole('button', { name: 'Save password' }) as HTMLButtonElement).disabled).toBe(true);
+ expect((screen.getByLabelText('Value for password') as HTMLInputElement).disabled).toBe(true);
});
it('requires a unique populated extra field, saves it under its record name, and confirms removal', async () => {
@@ -340,17 +356,20 @@ it('requires a unique populated extra field, saves it under its record name, and
fireEvent.click(screen.getByRole('button', { name: 'Add field' }));
change('New field name', 'username');
change('New field value', 'seed');
- expect((screen.getByRole('button', { name: 'Save field' }) as HTMLButtonElement).disabled).toBe(true);
+ expect(screen.getByText("There's already a username field")).toBeTruthy();
+ expect((screen.getByRole('button', { name: 'Save new field' }) as HTMLButtonElement).disabled).toBe(true);
change('New field name', 'totp');
api.updateVaultSecretField.mockResolvedValue({ ok: true, secret: { ...secret, fields: ['password', 'username', 'totp'], updated_at: 'version-2' } });
- fireEvent.click(screen.getByRole('button', { name: 'Save field' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Save new field' }));
await screen.findByLabelText('Value for totp');
+ expect(screen.queryByLabelText('New field name')).toBeNull();
expect(sealBlindBox).toHaveBeenCalledWith('seed', { public_key: 'public' }, { purpose: 'seal', name: 'LOGIN.totp' });
expect(screen.queryByRole('button', { name: 'Remove password' })).toBeNull();
fireEvent.click(screen.getByRole('button', { name: 'Remove totp' }));
+ expect(screen.getByText(/and its value\?/).textContent).toBe('Remove totp and its value? Existing grants will expire.');
expect(api.deleteVaultSecretField).not.toHaveBeenCalled();
api.deleteVaultSecretField.mockResolvedValue({ ok: true, secret: { ...secret, updated_at: 'version-3' } });
- fireEvent.click(screen.getByRole('button', { name: en.vaults.delete }));
+ fireEvent.click(screen.getByRole('button', { name: en.vaults.fields.confirmRemove }));
await waitFor(() => expect(api.deleteVaultSecretField).toHaveBeenCalledWith('LOGIN', 'totp', { expected_updated_at: 'version-2' }));
await waitFor(() => expect(screen.queryByLabelText('Value for totp')).toBeNull());
});
@@ -360,13 +379,13 @@ it('refreshes a stale delete version without removing the newer field or retryin
api.listVaultSecrets.mockResolvedValueOnce({ ok: true, secrets: [{ ...secret, updated_at: 'version-8' }] });
renderEditor();
fireEvent.click(screen.getByRole('button', { name: 'Remove username' }));
- fireEvent.click(screen.getByRole('button', { name: en.vaults.delete }));
+ fireEvent.click(screen.getByRole('button', { name: en.vaults.fields.confirmRemove }));
expect((await screen.findByRole('alert')).textContent).toBe(en.vaults.fields.secretConflict);
expect(api.deleteVaultSecretField).toHaveBeenCalledOnce();
expect(screen.getByLabelText('Value for username')).toBeTruthy();
api.deleteVaultSecretField.mockResolvedValueOnce({ ok: true, secret: { ...secret, fields: ['password'], updated_at: 'version-9' } });
fireEvent.click(screen.getByRole('button', { name: 'Remove username' }));
- fireEvent.click(screen.getByRole('button', { name: en.vaults.delete }));
+ fireEvent.click(screen.getByRole('button', { name: en.vaults.fields.confirmRemove }));
await waitFor(() => expect(screen.queryByLabelText('Value for username')).toBeNull());
expect(api.deleteVaultSecretField.mock.calls).toEqual([
['LOGIN', 'username', { expected_updated_at: 'version-1' }],
@@ -517,7 +536,7 @@ it('does not report a dropped draft when its field is cleared before own removal
change('Value for username', 'temporary');
change('Value for username', '');
fireEvent.click(screen.getByRole('button', { name: 'Remove username' }));
- fireEvent.click(screen.getByRole('button', { name: en.vaults.delete }));
+ fireEvent.click(screen.getByRole('button', { name: en.vaults.fields.confirmRemove }));
await waitFor(() => expect(screen.queryByLabelText('Value for username')).toBeNull());
expect(screen.queryByText(en.vaults.fields.draftsDropped.replace('{{fields}}', 'username'))).toBeNull();
});
diff --git a/ui/src/components/ui/vault-secret-fields-editor.tsx b/ui/src/components/ui/vault-secret-fields-editor.tsx
index 39c3e772c..ad985c123 100644
--- a/ui/src/components/ui/vault-secret-fields-editor.tsx
+++ b/ui/src/components/ui/vault-secret-fields-editor.tsx
@@ -1,16 +1,20 @@
import { useCallback, useEffect, useRef, useState } from 'react';
-import { Loader2, Plus, X } from 'lucide-react';
+import { Loader2 } from 'lucide-react';
import { useTranslation } from 'react-i18next';
import { useApi, type VaultFieldValuePayload, type VaultSecret } from '@/context/ApiContext';
import { sealBlindBox, standardCreateBlindBoxContext } from '@/lib/vaultCrypto';
import { vaultErrorMessage } from '@/lib/vaultErrors';
import { useProtectedVault } from '@/lib/useProtectedVault';
import { openVaultsInBrowser } from '@/lib/vaultBrowserHandoff';
-import { MAX_VAULT_FIELDS, VAULT_FIELD_PATTERN, vaultDefaultField, vaultFieldNames, vaultRecordName } from '@/lib/vaultFields';
-import { Badge } from './badge';
+import { MAX_VAULT_FIELDS, vaultDefaultField, vaultFieldNameIssue, vaultFieldNames, vaultRecordName } from '@/lib/vaultFields';
import { Button } from './button';
-import { ConfirmDialog } from './confirm-dialog';
-import { Input } from './input';
+import {
+ VaultFieldList,
+ VaultFieldReferences,
+ VaultFieldRemoveConfirm,
+ VaultFieldRow,
+ VaultFieldsHeader,
+} from './vault-field-list';
import { VaultProtectedUnlock } from './vault-protected-unlock';
type DraftReconciliation = {
@@ -61,10 +65,11 @@ export function VaultSecretFieldsEditor({
const defaultLabelDirtyRef = useRef(false);
const [newField, setNewField] = useState<string | null>(null);
const [newValue, setNewValue] = useState('');
+ const [newNameTouched, setNewNameTouched] = useState(false);
+ const [focusedName, setFocusedName] = useState<'default' | 'new' | null>(null);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
const [saved, setSaved] = useState(false);
- const [removeField, setRemoveField] = useState<string | null>(null);
const [draftNotice, setDraftNotice] = useState<string | null>(null);
const fields = vaultFieldNames(current);
const defaultField = vaultDefaultField(current);
@@ -161,14 +166,16 @@ export function VaultSecretFieldsEditor({
refetchSequenceRef.current += 1;
}, []);
+ /** Resolves true once the server accepted the write and its result became the editor's truth. */
const mutate = async (
operation: () => Promise<{ ok: boolean; secret?: VaultSecret; message?: string; code?: string }>,
renamed = false,
operationRefetched: () => boolean = () => false,
- ) => {
- if (locked) return;
+ ): Promise<boolean> => {
+ if (locked) return false;
const writeStartTruthRevision = truthRevisionRef.current;
const writeStartSequence = refetchSequenceRef.current;
+ let accepted = false;
setBusy(true);
onBusyChange(true);
setError(null);
@@ -187,6 +194,7 @@ export function VaultSecretFieldsEditor({
invalidatePendingRefetches();
applyTruth(next, renamed);
setSaved(true);
+ accepted = true;
if (needsCatchup) {
try {
const refreshed = await refetch();
@@ -216,6 +224,7 @@ export function VaultSecretFieldsEditor({
setBusy(false);
onBusyChange(false);
}
+ return accepted;
};
const saveValue = (field: string, value: string, adding = false) => {
@@ -226,6 +235,7 @@ export function VaultSecretFieldsEditor({
const clear = (targetField = field) => {
if (adding) {
setNewValue('');
+ setNewNameTouched(false);
return;
}
const next = new Map(draftsRef.current);
@@ -263,9 +273,12 @@ export function VaultSecretFieldsEditor({
let refetchedForRetry = false;
void mutate(async () => {
try {
- const wasDefault = field === defaultField;
+ // Read the latest truth rather than this render's: a value saved right after its
+ // field's rename must be sealed under the renamed record.
+ const latest = currentRef.current;
+ const wasDefault = field === vaultDefaultField(latest);
let savedField = field;
- let result = await sealAndWrite(current, field, wasDefault);
+ let result = await sealAndWrite(latest, field, wasDefault);
if (hasErrorCode(result, 'record_mismatch')) {
refetchedForRetry = true;
const refreshed = await refetch();
@@ -288,101 +301,142 @@ export function VaultSecretFieldsEditor({
}, false, () => refetchedForRetry);
};
+ // One Save per row: the default row renames (metadata only) and then writes a typed value
+ // under the renamed record; any other row writes its value.
+ const saveRow = async (field: string) => {
+ const value = draftsRef.current.get(field) ?? '';
+ if (field === defaultField && defaultLabel !== defaultField) {
+ const renamed = await mutate(
+ () => api.updateVaultSecret(current.name, { default_field: defaultLabel }, { handleError: false }),
+ true,
+ );
+ // The rename carried the typed value over to the new label (reconcileDrafts).
+ if (renamed && value) saveValue(vaultDefaultField(currentRef.current), value);
+ return;
+ }
+ if (value) saveValue(field, value);
+ };
+ const removeSavedField = async (field: string) => {
+ if (fieldsCorrupt) return;
+ await mutate(() => api.deleteVaultSecretField(current.name, field, { expected_updated_at: current.updated_at }));
+ };
+ const discardNewField = () => {
+ setNewField(null);
+ setNewValue('');
+ setNewNameTouched(false);
+ };
+
+ const labelIssue = vaultFieldNameIssue(defaultLabel, fields.filter((field) => field !== defaultField));
+ const newIssue = newField === null ? null : vaultFieldNameIssue(newField, fields);
+ const focusedIssue = focusedName === 'default' ? labelIssue : focusedName === 'new' ? newIssue : null;
+ const showNameRule = focusedName !== null && focusedIssue !== 'nameInvalid' && focusedIssue !== 'nameTaken';
+
return (
- <div className="flex flex-col gap-3" onKeyDown={(event) => {
+ <div className="flex flex-col gap-2" onKeyDown={(event) => {
// These inputs save through their field buttons, not the enclosing metadata form.
if (event.key === 'Enter' && event.target instanceof HTMLInputElement) event.preventDefault();
}}>
- <span className="text-[13px] font-medium">{t('vaults.fields.title')}</span>
- <p className="text-[11px] text-muted-foreground">{t('vaults.fields.editHelp')}</p>
+ <VaultFieldsHeader count={fields.length + (newField === null ? 0 : 1)} note={t('vaults.fields.editHelp')} />
{draftNotice && (
- <p role="status" className="text-xs text-muted-foreground">{draftNotice}</p>
+ <p role="status" className="text-xs text-muted">{draftNotice}</p>
)}
{fieldsCorrupt && (
<p role="alert" className="text-xs text-destructive-ink">{t('errors.fields_corrupt')}</p>
)}
- {fields.map((field) => (
- <div key={field} className="flex flex-col gap-2 rounded-lg border border-border p-3">
- <div className="flex items-center gap-2">
- {field === defaultField ? (
- <>
- <Input value={defaultLabel} disabled={fieldMutationLocked}
- aria-label={t('vaults.fields.defaultName')}
- onChange={(event) => {
- defaultLabelDirtyRef.current = true;
- setDefaultLabel(event.target.value);
- }}
- className="min-w-0 font-mono" />
- <Badge variant="secondary">{t('vaults.fields.default')}</Badge>
- <Button type="button" size="sm" variant="ghost"
- disabled={fieldMutationLocked || defaultLabel === defaultField || !VAULT_FIELD_PATTERN.test(defaultLabel) || fields.includes(defaultLabel)}
- onClick={() => void mutate(
- () => api.updateVaultSecret(current.name, { default_field: defaultLabel }, { handleError: false }),
- true,
- )}>
- {t('vaults.fields.rename')}
+ <VaultFieldList
+ onAdd={() => setNewField('')}
+ addDisabled={fieldMutationLocked || newField !== null || fields.length >= MAX_VAULT_FIELDS}
+ >
+ {fields.map((field) => {
+ const isDefault = field === defaultField;
+ const draft = drafts.get(field) ?? '';
+ const renaming = isDefault && defaultLabel !== defaultField;
+ return (
+ <VaultFieldRow
+ key={field}
+ field={field}
+ isDefault={isDefault}
+ name={isDefault ? {
+ editable: true,
+ value: defaultLabel,
+ label: t('vaults.fields.defaultName'),
+ onChange: (next) => {
+ defaultLabelDirtyRef.current = true;
+ setDefaultLabel(next);
+ },
+ onFocus: () => setFocusedName('default'),
+ onBlur: () => setFocusedName(null),
+ } : { editable: false, title: t('vaults.fields.extraNotRenamable') }}
+ value={{
+ value: draft,
+ label: t('vaults.fields.value', { field }),
+ placeholder: t('vaults.fields.replacePlaceholder'),
+ onChange: (next) => {
+ const nextDrafts = new Map(draftsRef.current);
+ nextDrafts.set(field, next);
+ updateDrafts(nextDrafts);
+ },
+ }}
+ action={draft || renaming ? (
+ <Button type="button" size="xs"
+ aria-label={t('vaults.fields.saveNamed', { field })}
+ disabled={fieldMutationLocked || (renaming && labelIssue !== null) || (Boolean(draft) && !canWriteValue)}
+ onClick={() => void saveRow(field)}>
+ {t('vaults.fields.save')}
</Button>
- </>
- ) : (
- <>
- <span className="min-w-0 flex-1 break-all font-mono text-xs">{field}</span>
- <Button type="button" size="icon" variant="ghost" disabled={fieldMutationLocked}
- aria-label={t('vaults.fields.remove', { field })} onClick={() => setRemoveField(field)}>
- <X className="size-4" />
- </Button>
- </>
+ ) : null}
+ remove={isDefault ? undefined : {
+ label: t('vaults.fields.remove', { field }),
+ confirm: <VaultFieldRemoveConfirm field={field} revokesGrants />,
+ onRemove: () => removeSavedField(field),
+ }}
+ issue={isDefault && renaming ? labelIssue : null}
+ disabled={fieldMutationLocked}
+ />
+ );
+ })}
+ {newField !== null && (
+ <VaultFieldRow
+ field={newField || t('vaults.fields.newName')}
+ isDefault={false}
+ name={{
+ editable: true,
+ value: newField,
+ label: t('vaults.fields.newName'),
+ onChange: setNewField,
+ onFocus: () => setFocusedName('new'),
+ onBlur: () => {
+ setFocusedName(null);
+ setNewNameTouched(true);
+ },
+ autoFocus: true,
+ }}
+ value={{
+ value: newValue,
+ label: t('vaults.fields.newValue'),
+ placeholder: t('vaults.dialog.valuePlaceholder'),
+ onChange: setNewValue,
+ }}
+ action={(
+ <Button type="button" size="xs" aria-label={t('vaults.fields.saveNew')}
+ disabled={fieldMutationLocked || !canWriteValue || !newValue || newIssue !== null}
+ onClick={() => saveValue(newField, newValue, true)}>
+ {t('vaults.fields.save')}
+ </Button>
)}
- </div>
- <div className="flex items-center gap-2">
- <Input type="password" value={drafts.get(field) ?? ''} autoComplete="off" disabled={fieldMutationLocked}
- aria-label={t('vaults.fields.value', { field })}
- placeholder={t('vaults.fields.replacePlaceholder')}
- onChange={(event) => {
- const next = new Map(draftsRef.current);
- next.set(field, event.target.value);
- updateDrafts(next);
- }} />
- <Button type="button" variant="secondary" size="sm"
- aria-label={t('vaults.fields.saveNamed', { field })}
- disabled={fieldMutationLocked || !canWriteValue || !drafts.get(field)}
- onClick={() => saveValue(field, drafts.get(field) ?? '')}>{t('vaults.fields.save')}</Button>
- </div>
- </div>
- ))}
- {newField !== null ? (
- <div className="flex flex-col gap-2 rounded-lg border border-border p-3">
- <Input value={newField} disabled={fieldMutationLocked} aria-label={t('vaults.fields.newName')}
- placeholder={t('vaults.fields.namePlaceholder')} onChange={(event) => setNewField(event.target.value)} />
- <Input type="password" value={newValue} autoComplete="off" disabled={fieldMutationLocked}
- aria-label={t('vaults.fields.newValue')} placeholder={t('vaults.dialog.valuePlaceholder')}
- onChange={(event) => setNewValue(event.target.value)} />
- <div className="flex justify-end gap-2">
- <Button type="button" variant="ghost" size="sm" disabled={locked}
- onClick={() => { setNewField(null); setNewValue(''); }}>{t('vaults.dialog.cancel')}</Button>
- <Button type="button" size="sm"
- disabled={fieldMutationLocked || !canWriteValue || !newValue || !VAULT_FIELD_PATTERN.test(newField) || fields.includes(newField)}
- onClick={() => saveValue(newField, newValue, true)}>{t('vaults.fields.save')}</Button>
- </div>
- <span className="text-[11px] text-muted-foreground">{t('vaults.fields.namesHelp')}</span>
- </div>
- ) : (
- <Button type="button" variant="ghost" size="sm" className="self-start" disabled={fieldMutationLocked || fields.length >= MAX_VAULT_FIELDS}
- onClick={() => setNewField('')}><Plus className="size-3.5" />{t('vaults.fields.add')}</Button>
- )}
+ remove={{ label: t('vaults.fields.discardNew'), onRemove: discardNewField }}
+ issue={newIssue === 'nameRequired' && !newNameTouched && !newValue ? null : newIssue}
+ disabled={fieldMutationLocked}
+ />
+ )}
+ </VaultFieldList>
+ {showNameRule ? <span className="text-[11px] text-muted">{t('vaults.fields.nameRule')}</span> : null}
+ <VaultFieldReferences secretName={current.name} fields={fields} defaultField={defaultField} />
{isProtected && <VaultProtectedUnlock vault={vault} secretName={current.name}
onContinueInBrowser={() => openVaultsInBrowser({ kind: 'edit', secretName: current.name })} />}
{busy && <Loader2 className="size-4 animate-spin text-muted" />}
{saved && <p role="status" className="text-xs text-mint-ink">{t('vaults.fields.saved')}</p>}
{error && <p role="alert" className="text-xs text-destructive-ink">{error}</p>}
- <ConfirmDialog open={removeField !== null} onOpenChange={(open) => { if (!open) setRemoveField(null); }}
- title={t('vaults.fields.remove', { field: removeField })}
- description={t('vaults.fields.removeConfirm')}
- confirmLabel={t('vaults.delete')} cancelLabel={t('vaults.dialog.cancel')} destructive
- onConfirm={async () => {
- if (!removeField || fieldsCorrupt) return;
- await mutate(() => api.deleteVaultSecretField(current.name, removeField, { expected_updated_at: current.updated_at }));
- setRemoveField(null);
- }} />
</div>
);
}
diff --git a/ui/src/components/ui/vault-secret-form.test.tsx b/ui/src/components/ui/vault-secret-form.test.tsx
index e20494d35..5e3c47707 100644
--- a/ui/src/components/ui/vault-secret-form.test.tsx
+++ b/ui/src/components/ui/vault-secret-form.test.tsx
@@ -38,6 +38,15 @@ void i18n.use(initReactI18next).init({
});
const form = (element: ReactElement) => <I18nextProvider i18n={i18n}>{element}</I18nextProvider>;
const change = (label: string, value: string) => fireEvent.change(screen.getByLabelText(label), { target: { value } });
+const applyTemplate = (label: string) => {
+ fireEvent.click(screen.getByRole('button', { name: en.vaults.fields.useTemplate }));
+ fireEvent.click(screen.getByRole('menuitem', { name: label }));
+};
+const nameInputs = () => [1, 2, 3, 4].flatMap((index) => {
+ const input = screen.queryByLabelText(`Field ${index} name`) as HTMLInputElement | null;
+ return input ? [input.value] : [];
+});
+const submitButton = () => screen.getByRole('button', { name: 'Save & let the agent continue' }) as HTMLButtonElement;
beforeEach(() => {
api.listDependencies.mockResolvedValue({ ok: true, deps: [{ id: 'avault', status: 'ready', version: '0.1.6' }] });
api.createVaultSecret.mockResolvedValue({ ok: true });
@@ -60,7 +69,7 @@ it('checks only avault when the secret form opens, without creating a secret', a
it.each(['standard', 'protected'] as const)('creates a complete %s login with canonical record names and no plaintext payload', async (protection) => {
const onCreated = vi.fn();
render(form(<VaultSecretForm fixedName="GITHUB_LOGIN" defaultProtection={protection} onCancel={vi.fn()} onCreated={onCreated} />));
- fireEvent.click(screen.getByRole('button', { name: 'Login template' }));
+ applyTemplate('Login + 2FA');
expect(screen.queryByRole('radio', { name: 'File' })).toBeNull();
const submit = screen.getByRole('button', { name: 'Save & let the agent continue' }) as HTMLButtonElement;
change('Value for username', '张三');
@@ -116,7 +125,7 @@ it('preserves a selected file instead of silently switching it to empty field ro
fireEvent.change(container.querySelector('input[type="file"]')!, { target: { files: [file] } });
expect(screen.getByText('credential.bin')).toBeTruthy();
const add = screen.getByRole('button', { name: 'Add field' }) as HTMLButtonElement;
- const template = screen.getByRole('button', { name: 'Login template' }) as HTMLButtonElement;
+ const template = screen.getByRole('button', { name: en.vaults.fields.useTemplate }) as HTMLButtonElement;
expect(add.disabled).toBe(true);
expect(template.disabled).toBe(true);
fireEvent.click(add);
@@ -173,3 +182,101 @@ it('does not overwrite edited metadata when a refreshed secret object arrives',
rerender(form(<VaultSecretForm {...props} editSecret={refreshed} />));
expect((screen.getByLabelText('Description') as HTMLInputElement).value).toBe('local unsaved description');
});
+
+// A template decides the field shape and where an already-typed single value lands. The payload
+// test above starts from an empty value, so it cannot catch the value moving to the wrong row.
+it.each([
+ ['Login', ['username', 'password']],
+ ['Login + 2FA', ['username', 'password', 'totp']],
+] as const)('applies the %s template with the typed value in its default password field', (label, fields) => {
+ render(form(<VaultSecretForm fixedName="LOGIN" onCancel={vi.fn()} onCreated={vi.fn()} />));
+ fireEvent.change(screen.getByPlaceholderText(en.vaults.dialog.valuePlaceholder), { target: { value: 'typed-secret' } });
+ applyTemplate(label);
+ expect(nameInputs()).toEqual(fields);
+ expect(fields.map((field) => (screen.getByLabelText(`Value for ${field}`) as HTMLInputElement).value))
+ .toEqual(fields.map((field) => (field === 'password' ? 'typed-secret' : '')));
+ expect(screen.queryByRole('button', { name: 'Set password as default' })).toBeNull();
+ expect(screen.getByRole('button', { name: 'Set username as default' })).toBeTruthy();
+});
+
+// Set default decides which field owns the bare secret record, and the default row stays put.
+it('moves the bare record to the field set as default and keeps the default row', async () => {
+ render(form(<VaultSecretForm fixedName="LOGIN" onCancel={vi.fn()} onCreated={vi.fn()} />));
+ applyTemplate('Login');
+ change('Value for username', 'alice');
+ change('Value for password', 'secret');
+ fireEvent.click(screen.getByRole('button', { name: 'Set username as default' }));
+ const removeDefault = screen.getByRole('button', { name: 'Remove username' });
+ expect(removeDefault.getAttribute('aria-disabled')).toBe('true');
+ expect(removeDefault.getAttribute('title')).toBe(en.vaults.fields.defaultNotRemovable);
+ fireEvent.click(removeDefault);
+ fireEvent.click(screen.getByRole('button', { name: 'Actions for username' }));
+ expect((screen.getByRole('menuitem', { name: new RegExp(en.vaults.fields.removeField) }) as HTMLButtonElement).disabled).toBe(true);
+ expect(nameInputs()).toEqual(['username', 'password']);
+ await waitFor(() => expect(submitButton().disabled).toBe(false));
+ fireEvent.click(submitButton());
+ await waitFor(() => expect(api.createVaultSecret).toHaveBeenCalledOnce());
+ const payload = api.createVaultSecret.mock.calls[0][0];
+ expect(payload.default_field).toBe('username');
+ expect(payload.fields).toEqual([{ name: 'password', record: 'LOGIN.password', blind_box: blindBox }]);
+});
+
+// A row holding a value asks inside the row, from either the desktop × or the phone menu.
+it('confirms removing a filled row inline', () => {
+ render(form(<VaultSecretForm fixedName="LOGIN" onCancel={vi.fn()} onCreated={vi.fn()} />));
+ applyTemplate('Login + 2FA');
+ change('Value for totp', 'seed');
+ fireEvent.click(screen.getByRole('button', { name: 'Remove totp' }));
+ expect(screen.getByText(/and its value\?/).textContent).toBe('Remove totp and its value?');
+ expect(screen.queryByRole('dialog')).toBeNull();
+ fireEvent.click(screen.getByRole('button', { name: en.vaults.dialog.cancel }));
+ expect((screen.getByLabelText('Value for totp') as HTMLInputElement).value).toBe('seed');
+ fireEvent.click(screen.getByRole('button', { name: 'Actions for totp' }));
+ fireEvent.click(screen.getByRole('menuitem', { name: en.vaults.fields.removeField }));
+ fireEvent.click(screen.getByRole('button', { name: en.vaults.fields.confirmRemove }));
+ expect(screen.queryByLabelText('Value for totp')).toBeNull();
+ expect(nameInputs()).toEqual(['username', 'password']);
+});
+
+// Each rule is reported under the row that breaks it; a blank row waits until it was visited.
+it('reports field problems on the offending row', () => {
+ render(form(<VaultSecretForm fixedName="LOGIN" onCancel={vi.fn()} onCreated={vi.fn()} />));
+ applyTemplate('Login');
+ fireEvent.click(screen.getByRole('button', { name: 'Add field' }));
+ const added = screen.getByLabelText('Field 3 name');
+ fireEvent.focus(added);
+ expect(screen.getByText(en.vaults.fields.nameRule)).toBeTruthy();
+ expect(screen.queryByText(en.vaults.fields.nameRequired)).toBeNull();
+ fireEvent.blur(added);
+ expect(screen.queryByText(en.vaults.fields.nameRule)).toBeNull();
+ expect(screen.getByText(en.vaults.fields.nameRequired).id).toBe(added.getAttribute('aria-describedby'));
+ change('Field 3 name', 'TOTP');
+ expect(screen.getByText(en.vaults.fields.nameInvalid)).toBeTruthy();
+ change('Field 3 name', 'username');
+ expect(screen.getAllByText("There's already a username field")).toHaveLength(2);
+ change('Field 3 name', 'totp');
+ expect(screen.queryByText("There's already a username field")).toBeNull();
+ const totpValue = screen.getByLabelText('Value for totp');
+ fireEvent.blur(totpValue);
+ expect(document.getElementById(totpValue.getAttribute('aria-describedby')!)!.textContent).toBe(en.vaults.fields.valueRequired);
+ // A value problem marks the value input, not the valid name beside it.
+ expect(totpValue.getAttribute('aria-invalid')).toBe('true');
+ expect(added.hasAttribute('aria-invalid')).toBe(false);
+ expect(added.hasAttribute('aria-describedby')).toBe(false);
+ expect(submitButton().disabled).toBe(true);
+});
+
+// The preview lists exactly what an agent can reference: valid fields, and the bare name for the default.
+it('previews agent references for valid fields and the default shorthand', () => {
+ render(form(<VaultSecretForm onCancel={vi.fn()} onCreated={vi.fn()} />));
+ applyTemplate('Login + 2FA');
+ const preview = () => screen.getByText(en.vaults.fields.references).parentElement!.parentElement!;
+ expect(preview().textContent).toBe(
+ 'Agent referencesNAME.usernameNAME.passwordNAME.totpNAME alone resolves to the default field, password.',
+ );
+ fireEvent.change(screen.getByLabelText(/^Name/), { target: { value: 'GITHUB_LOGIN' } });
+ change('Field 3 name', 'TOTP');
+ expect(preview().textContent).toBe(
+ 'Agent referencesGITHUB_LOGIN.usernameGITHUB_LOGIN.passwordGITHUB_LOGIN alone resolves to the default field, password.',
+ );
+});
diff --git a/ui/src/components/ui/vault-secret-form.tsx b/ui/src/components/ui/vault-secret-form.tsx
index b54706ba7..c89a1a407 100644
--- a/ui/src/components/ui/vault-secret-form.tsx
+++ b/ui/src/components/ui/vault-secret-form.tsx
@@ -42,7 +42,7 @@ import {
} from '@/lib/vaultCrypto';
import { vaultErrorMessage } from '@/lib/vaultErrors';
import { useProtectedVault } from '@/lib/useProtectedVault';
-import { MAX_VAULT_FIELDS, VAULT_FIELD_PATTERN, vaultRecordName } from '@/lib/vaultFields';
+import { MAX_VAULT_FIELDS, VAULT_FIELD_PATTERN, vaultFieldNameIssue, vaultRecordName } from '@/lib/vaultFields';
import { openVaultsInBrowser } from '@/lib/vaultBrowserHandoff';
import { Badge } from './badge';
import { Button } from './button';
@@ -52,13 +52,25 @@ import { SigningAddressList } from './signing-address-list';
import { Switch } from './switch';
import { TagInput } from './tag-input';
import { Textarea } from './textarea';
+import {
+ VaultFieldList,
+ VaultFieldReferences,
+ VaultFieldRemoveConfirm,
+ VaultFieldRow,
+ VaultFieldsHeader,
+ VaultFieldTemplateMenu,
+} from './vault-field-list';
import { VaultProtectedUnlock } from './vault-protected-unlock';
import { VaultSecretFieldsEditor } from './vault-secret-fields-editor';
type VaultKind = 'static' | 'keypair';
type FetchAuthMode = 'bearer' | 'header' | 'query';
type StaticSecretSource = 'text' | 'file';
-type FieldDraft = { name: string; value: string };
+/** A create-form field row. Touched flags hold back blank-field errors until the user has been there. */
+type FieldDraft = { id: number; name: string; value: string; nameTouched?: boolean; valueTouched?: boolean };
+
+let nextFieldDraftId = 0;
+const fieldDraft = (name: string, value = ''): FieldDraft => ({ id: nextFieldDraftId++, name, value });
const AVAULT_P2_MIN_VERSION = '0.1.3';
const MAX_SECRET_FILE_BYTES = 1024 * 1024;
@@ -163,6 +175,9 @@ export const VaultSecretForm: React.FC<{
const [value, setValue] = useState('');
const [fieldRows, setFieldRows] = useState<FieldDraft[] | null>(null);
const [defaultFieldIndex, setDefaultFieldIndex] = useState(0);
+ // The input that should take focus when its row first mounts (after Add field or a template).
+ const [focusField, setFocusField] = useState<{ id: number; part: 'name' | 'value' } | null>(null);
+ const [focusedNameId, setFocusedNameId] = useState<number | null>(null);
const [fieldEditBusy, setFieldEditBusy] = useState(false);
const staticValueRef = useRef('');
const setStaticValue = useCallback((next: string) => {
@@ -299,7 +314,7 @@ export const VaultSecretForm: React.FC<{
if (requestSpec.policy?.auth?.type) setFetchAuthMode(requestSpec.policy.auth.type);
if (requestSpec.policy?.auth?.name) setFetchAuthName(requestSpec.policy.auth.name);
if (requestSpec.fields?.length) {
- setFieldRows(requestSpec.fields.map((field) => ({ name: field, value: '' })));
+ setFieldRows(requestSpec.fields.map((field) => fieldDraft(field)));
setDefaultFieldIndex(Math.max(0, requestSpec.fields.indexOf(requestSpec.default_field ?? requestSpec.fields[0])));
}
}, [requestSpec, provisionRequestId]);
@@ -854,67 +869,112 @@ export const VaultSecretForm: React.FC<{
</div>
);
- const staticFields = (
+ // Leaving the single value turns it into rows. Its value moves to the default row (`value`
+ // for Add field, `password` for a template), and a selected file is dropped because file
+ // uploads hold one value only.
+ const leaveSingleValue = () => {
+ setStaticValue('');
+ setStaticSource('text');
+ clearSelectedFile();
+ };
+ const addFieldRow = () => {
+ const added = fieldDraft('');
+ setFieldRows((rows) => [...(rows ?? [fieldDraft('value', value)]), added]);
+ setFocusField({ id: added.id, part: 'name' });
+ leaveSingleValue();
+ };
+ const applyFieldTemplate = (fields: string[], defaultField: string) => {
+ const rows = fields.map((field) => fieldDraft(field, field === defaultField ? value : ''));
+ setFieldRows(rows);
+ setDefaultFieldIndex(fields.indexOf(defaultField));
+ setFocusField({ id: (rows.find((row) => !row.value) ?? rows[0]).id, part: 'value' });
+ leaveSingleValue();
+ };
+ const patchFieldRow = (id: number, patch: Partial<FieldDraft>) =>
+ setFieldRows((rows) => rows?.map((row) => (row.id === id ? { ...row, ...patch } : row)) ?? null);
+ const removeFieldRow = (index: number) => {
+ setFieldRows((rows) => rows?.filter((_, i) => i !== index) ?? null);
+ setDefaultFieldIndex((current) => (index < current ? current - 1 : current));
+ };
+
+ const fieldNames = fieldRows?.map((row) => row.name) ?? [];
+ const fieldNameIssues = fieldNames.map((fieldName, index) =>
+ vaultFieldNameIssue(fieldName, fieldNames.filter((_, i) => i !== index)));
+ const focusedNameIssue = fieldNameIssues[fieldRows?.findIndex((row) => row.id === focusedNameId) ?? -1];
+ const showNameRule = focusedNameId !== null && focusedNameIssue !== 'nameInvalid' && focusedNameIssue !== 'nameTaken';
+
+ const staticFields = fieldRows ? (
<div className="flex flex-col gap-2">
- {fieldRows ? (
- <div className="flex flex-col gap-3">
- {fieldRows.map((field, index) => (
- <div key={index} className="flex flex-col gap-2 rounded-lg border border-border p-3">
- <div className="flex items-center gap-2">
- <Input
- value={field.name}
- onChange={(event) => setFieldRows((rows) => rows!.map((row, i) => i === index ? { ...row, name: event.target.value } : row))}
- aria-label={t('vaults.fields.name', { index: index + 1 })}
- placeholder={t('vaults.fields.namePlaceholder')}
- pattern={VAULT_FIELD_PATTERN.source}
- maxLength={64}
- required
- disabled={submitting}
- className="min-w-0 font-mono"
- />
- <label className="flex shrink-0 items-center gap-1 text-xs text-muted">
- <input type="radio" name="default-field" checked={index === defaultFieldIndex} disabled={submitting}
- onChange={() => setDefaultFieldIndex(index)} />
- {t('vaults.fields.default')}
- </label>
- <Button type="button" variant="ghost" size="icon" disabled={submitting || index === defaultFieldIndex}
- aria-label={t('vaults.fields.remove', { field: field.name })}
- onClick={() => {
- setFieldRows((rows) => rows!.filter((_, i) => i !== index));
- if (index < defaultFieldIndex) setDefaultFieldIndex(defaultFieldIndex - 1);
- }}>
- <X className="size-4" />
- </Button>
- </div>
- <Input type="password" value={field.value} autoComplete="off" spellCheck={false} required disabled={submitting}
- aria-label={t('vaults.fields.value', { field: field.name || index + 1 })}
- placeholder={t('vaults.dialog.valuePlaceholder')}
- onChange={(event) => setFieldRows((rows) => rows!.map((row, i) => i === index ? { ...row, value: event.target.value } : row))} />
- </div>
- ))}
- <span className="text-[11px] text-muted-foreground">{t('vaults.fields.namesHelp')}</span>
- </div>
- ) : valueField}
- <div className="flex gap-2">
- <Button type="button" variant="ghost" size="sm" disabled={submitting || staticSource === 'file' || (fieldRows?.length ?? 1) >= MAX_VAULT_FIELDS}
- onClick={() => {
- setFieldRows((rows) => [...(rows ?? [{ name: 'value', value }]), { name: '', value: '' }]);
- setStaticValue('');
- setStaticSource('text');
- clearSelectedFile();
- }}>
- <Plus className="size-3.5" />{t('vaults.fields.add')}
+ <VaultFieldsHeader count={fieldRows.length} />
+ <VaultFieldList onAdd={addFieldRow} addDisabled={submitting || fieldRows.length >= MAX_VAULT_FIELDS}>
+ {fieldRows.map((row, index) => {
+ const label = row.name || String(index + 1);
+ const nameIssue = fieldNameIssues[index];
+ // A blank name or value only counts as an error once the user has been there.
+ const issue = nameIssue === 'nameRequired'
+ ? (row.nameTouched || row.value ? nameIssue : null)
+ : nameIssue ?? (row.valueTouched && !row.value ? 'valueRequired' : null);
+ return (
+ <VaultFieldRow
+ key={row.id}
+ field={label}
+ isDefault={index === defaultFieldIndex}
+ name={{
+ editable: true,
+ value: row.name,
+ label: t('vaults.fields.name', { index: index + 1 }),
+ onChange: (next) => patchFieldRow(row.id, { name: next }),
+ onFocus: () => setFocusedNameId(row.id),
+ onBlur: () => {
+ setFocusedNameId(null);
+ patchFieldRow(row.id, { nameTouched: true });
+ },
+ autoFocus: focusField?.id === row.id && focusField.part === 'name',
+ }}
+ value={{
+ value: row.value,
+ label: t('vaults.fields.value', { field: label }),
+ placeholder: row.name ? t('vaults.fields.value', { field: row.name }) : t('vaults.dialog.valuePlaceholder'),
+ onChange: (next) => patchFieldRow(row.id, { value: next }),
+ onBlur: () => patchFieldRow(row.id, { valueTouched: true }),
+ autoFocus: focusField?.id === row.id && focusField.part === 'value',
+ }}
+ onSetDefault={() => setDefaultFieldIndex(index)}
+ remove={{
+ label: t('vaults.fields.remove', { field: label }),
+ // Only a row that holds a value has something to lose.
+ confirm: row.value ? <VaultFieldRemoveConfirm field={label} revokesGrants={false} /> : undefined,
+ onRemove: () => removeFieldRow(index),
+ blockedReason: index === defaultFieldIndex ? t('vaults.fields.defaultNotRemovable') : undefined,
+ }}
+ issue={issue}
+ disabled={submitting}
+ />
+ );
+ })}
+ </VaultFieldList>
+ {showNameRule ? <span className="text-[11px] text-muted">{t('vaults.fields.nameRule')}</span> : null}
+ <VaultFieldReferences
+ secretName={secretName}
+ fields={fieldNames.filter((_, index) => fieldNameIssues[index] === null)}
+ defaultField={fieldNames[defaultFieldIndex] ?? ''}
+ />
+ </div>
+ ) : (
+ <div className="flex flex-col gap-1.5">
+ <span className={FIELD_LABEL}>{t('vaults.dialog.value')}</span>
+ {valueField}
+ <div className="-ml-2.5 flex flex-wrap items-center gap-0.5">
+ <Button type="button" variant="ghost" size="xs" className="px-2.5 text-[13px] text-muted hover:text-foreground"
+ disabled={submitting || staticSource === 'file'} onClick={addFieldRow}>
+ <Plus />
+ {t('vaults.fields.add')}
</Button>
- {!fieldRows && <Button type="button" variant="ghost" size="sm" disabled={submitting || staticSource === 'file'}
- onClick={() => {
- setFieldRows([{ name: 'username', value: '' }, { name: 'password', value }, { name: 'totp', value: '' }]);
- setDefaultFieldIndex(1);
- setStaticValue('');
- setStaticSource('text');
- clearSelectedFile();
- }}>{t('vaults.fields.loginTemplate')}</Button>}
+ <VaultFieldTemplateMenu disabled={submitting || staticSource === 'file'} onApply={applyFieldTemplate} />
</div>
- {staticSource === 'file' && <span className="text-[11px] text-muted-foreground">{t('vaults.fields.singleFile')}</span>}
+ <span className="text-[11px] text-muted">
+ {staticSource === 'file' ? t('vaults.fields.singleFile') : t('vaults.fields.multiHint')}
+ </span>
</div>
);
@@ -943,7 +1003,7 @@ export const VaultSecretForm: React.FC<{
/>
)}
</div>
- <span className="text-[11px] text-muted-foreground">{t('vaults.dialog.fetchAuthHelp')}</span>
+ <span className="text-[11px] text-muted">{t('vaults.dialog.fetchAuthHelp')}</span>
</div>
);
@@ -963,7 +1023,7 @@ export const VaultSecretForm: React.FC<{
removeLabel={(value) => t('vaults.dialog.removeChip', { value })}
onPendingChange={setTagsPending}
/>
- <span className="text-[11px] text-muted-foreground">{t('vaults.dialog.tagsHelp')}</span>
+ <span className="text-[11px] text-muted">{t('vaults.dialog.tagsHelp')}</span>
</div>
);
@@ -981,7 +1041,7 @@ export const VaultSecretForm: React.FC<{
removeLabel={(value) => t('vaults.dialog.removeChip', { value })}
onPendingChange={setHostsPending}
/>
- <span className="text-[11px] text-muted-foreground">{t('vaults.dialog.allowHostsHelp')}</span>
+ <span className="text-[11px] text-muted">{t('vaults.dialog.allowHostsHelp')}</span>
</div>
);
@@ -1018,7 +1078,7 @@ export const VaultSecretForm: React.FC<{
<span className="flex-1 text-[13.5px] font-semibold text-foreground">{title}</span>
{selected && <Check className="size-4 text-mint-ink" />}
</span>
- <span className="text-[11.5px] leading-snug text-muted-foreground">{desc}</span>
+ <span className="text-[11.5px] leading-snug text-muted">{desc}</span>
</button>
);
})}
@@ -1034,7 +1094,7 @@ export const VaultSecretForm: React.FC<{
<div className="flex items-start gap-3 rounded-[10px] border border-border bg-surface-2 px-3 py-3">
<div className="flex min-w-0 flex-1 flex-col gap-1">
<span className="text-[13px] font-semibold text-foreground">{t('vaults.dialog.alwaysAskSign')}</span>
- <span className="text-[11.5px] leading-snug text-muted-foreground">{t('vaults.dialog.alwaysAskSignHelp')}</span>
+ <span className="text-[11.5px] leading-snug text-muted">{t('vaults.dialog.alwaysAskSignHelp')}</span>
</div>
<Switch
checked={alwaysAsk}
@@ -1135,7 +1195,7 @@ export const VaultSecretForm: React.FC<{
</div>
</div>
</div>
- <p className="flex items-center gap-1.5 text-[11px] text-muted-foreground">
+ <p className="flex items-center gap-1.5 text-[11px] text-muted">
<Lock className="size-3 shrink-0" />
{t('vaults.edit.lockedHint')}
</p>
@@ -1190,9 +1250,8 @@ export const VaultSecretForm: React.FC<{
{!isKeypair && (
<div className="flex flex-col gap-1.5">
- <span className={FIELD_LABEL}>{t('vaults.dialog.value')}</span>
{staticFields}
- <span className="text-[11px] text-muted-foreground">{t('vaults.dialog.provisionValueHelp')}</span>
+ <span className="text-[11px] text-muted">{t('vaults.dialog.provisionValueHelp')}</span>
</div>
)}
@@ -1282,20 +1341,15 @@ export const VaultSecretForm: React.FC<{
required
className="font-mono"
/>
- <span className="text-[11px] text-muted-foreground">{t('vaults.dialog.nameHint')}</span>
+ <span className="text-[11px] text-muted">{t('vaults.dialog.nameHint')}</span>
</label>
{/* Value (static) or signing-key builder (keypair) */}
- {!isKeypair && (
- <div className="flex flex-col gap-1.5">
- <span className={FIELD_LABEL}>{t('vaults.dialog.value')}</span>
- {staticFields}
- </div>
- )}
+ {!isKeypair && staticFields}
{isKeypair && protection === 'standard' && (
<div className="flex flex-col gap-2.5 rounded-[10px] border border-border bg-surface-2 px-3 py-3">
- <span className="text-xs text-muted-foreground">{t('vaults.dialog.signingKeyHelp')}</span>
+ <span className="text-xs text-muted">{t('vaults.dialog.signingKeyHelp')}</span>
<div className="grid grid-cols-2 gap-2">
{(['generate', 'import'] as const).map((src) => (
<Button
@@ -1365,7 +1419,7 @@ export const VaultSecretForm: React.FC<{
{signingKey && (
<div className="flex min-w-0 flex-col gap-1.5">
- <span className="text-xs font-medium text-muted-foreground">{t('vaults.dialog.signingAddresses')}</span>
+ <span className="text-xs font-medium text-muted">{t('vaults.dialog.signingAddresses')}</span>
{addressesLoading ? (
<span className="flex items-center gap-1.5 text-xs text-muted">
<Loader2 className="size-3.5 animate-spin" />
@@ -1374,9 +1428,9 @@ export const VaultSecretForm: React.FC<{
) : signingAddresses ? (
<SigningAddressList addresses={signingAddresses} />
) : (
- <span className="text-xs text-muted-foreground">{t('vaults.dialog.signingAddressesUnavailable')}</span>
+ <span className="text-xs text-muted">{t('vaults.dialog.signingAddressesUnavailable')}</span>
)}
- <span className="text-xs text-muted-foreground">{t('vaults.dialog.signingAddressesHint')}</span>
+ <span className="text-xs text-muted">{t('vaults.dialog.signingAddressesHint')}</span>
</div>
)}
@@ -1396,7 +1450,7 @@ export const VaultSecretForm: React.FC<{
the locked case. No import option — generate is the single path. */}
{isKeypair && protection === 'protected' && protectedCreateReady && (
<div className="flex flex-col gap-2.5 rounded-[10px] border border-border bg-surface-2 px-3 py-3">
- <span className="text-xs text-muted-foreground">{t('vaults.dialog.signingKeyProtectedHelp')}</span>
+ <span className="text-xs text-muted">{t('vaults.dialog.signingKeyProtectedHelp')}</span>
<Button
type="button"
variant="secondary"
@@ -1408,13 +1462,13 @@ export const VaultSecretForm: React.FC<{
</Button>
{protectedKeypair && (
<div className="flex min-w-0 flex-col gap-1.5">
- <span className="text-xs font-medium text-muted-foreground">{t('vaults.dialog.signingAddresses')}</span>
+ <span className="text-xs font-medium text-muted">{t('vaults.dialog.signingAddresses')}</span>
{protectedKeypair.addresses ? (
<SigningAddressList addresses={protectedKeypair.addresses} />
) : (
- <span className="text-xs text-muted-foreground">{t('vaults.dialog.signingAddressesUnavailable')}</span>
+ <span className="text-xs text-muted">{t('vaults.dialog.signingAddressesUnavailable')}</span>
)}
- <span className="text-xs text-muted-foreground">{t('vaults.dialog.signingKeyProtectedBornHint')}</span>
+ <span className="text-xs text-muted">{t('vaults.dialog.signingKeyProtectedBornHint')}</span>
</div>
)}
{keypairError && <span className="text-xs text-destructive-ink">{keypairError}</span>}
diff --git a/ui/src/i18n/en.json b/ui/src/i18n/en.json
index e7ca31cf7..02d650a03 100644
--- a/ui/src/i18n/en.json
+++ b/ui/src/i18n/en.json
@@ -5267,21 +5267,42 @@
"newName": "New field name",
"newValue": "New field value",
"add": "Add field",
- "loginTemplate": "Login template",
+ "useTemplate": "Use template",
+ "templateLogin": "Login",
+ "templateLogin2fa": "Login + 2FA",
+ "multiHint": "One secret can hold several fields, like an account's username, password, and 2FA code.",
+ "setDefault": "Set default",
+ "setDefaultNamed": "Set {{field}} as default",
+ "rowActions": "Actions for {{field}}",
+ "showNamed": "Show {{field}}",
+ "hideNamed": "Hide {{field}}",
"remove": "Remove {{field}}",
- "removeConfirm": "Remove this field and its value? Existing grants will expire.",
- "rename": "Rename",
- "save": "Save field",
+ "removeField": "Remove field",
+ "removeConfirm": "Remove <field/> and its value?",
+ "removeConfirmSaved": "Remove <field/> and its value? Existing grants will expire.",
+ "confirmRemove": "Remove",
+ "defaultNotRemovable": "The default field can't be removed. Set another field as default first.",
+ "extraNotRenamable": "Extra fields can't be renamed",
+ "discardNew": "Discard new field",
+ "save": "Save",
"saveNamed": "Save {{field}}",
+ "saveNew": "Save new field",
"saved": "Field saved",
"draftsDropped": "Drafts for fields removed elsewhere were dropped: {{fields}}.",
"recordConflict": "This field changed while you were saving. The value was not written; reload the secret and try again.",
"secretConflict": "This secret changed while you were saving. Its fields are now refreshed; review them and save again. Your value was not written.",
- "replacePlaceholder": "Enter a replacement value",
+ "replacePlaceholder": "Saved · type to replace",
"revealField": "Field to reveal",
- "namesHelp": "Use lowercase letters, digits and underscores; start with a letter. Each field needs a unique name and a value.",
+ "nameRequired": "Enter a field name",
+ "nameInvalid": "Use lowercase letters, digits, and underscores, starting with a letter",
+ "nameTaken": "There's already a {{field}} field",
+ "valueRequired": "Enter a value for this field",
+ "nameRule": "Field names: lowercase letters, digits, and underscores, starting with a letter.",
+ "references": "Agent references",
+ "referenceName": "NAME",
+ "referenceDefault": "<name/> alone resolves to the default field, <field/>.",
"singleFile": "File upload supports one value. Switch to Text before adding fields.",
- "editHelp": "Changes save immediately. Adding, replacing or removing values expires grants; renaming the default field does not. Leave a value blank to keep it. Extra field names cannot be changed."
+ "editHelp": "Save each row after editing · blank values stay unchanged"
},
"protectedUnlock": {
"checking": "Checking your protected vault…",
diff --git a/ui/src/i18n/zh.json b/ui/src/i18n/zh.json
index 6229733af..2e35852c4 100644
--- a/ui/src/i18n/zh.json
+++ b/ui/src/i18n/zh.json
@@ -5267,21 +5267,42 @@
"newName": "新字段名称",
"newValue": "新字段值",
"add": "添加字段",
- "loginTemplate": "登录模板",
+ "useTemplate": "用模板",
+ "templateLogin": "登录",
+ "templateLogin2fa": "登录 + 两步验证",
+ "multiHint": "一条密钥可以存多个字段,比如一个账号的用户名、密码和两步验证码。",
+ "setDefault": "设为默认",
+ "setDefaultNamed": "将 {{field}} 设为默认",
+ "rowActions": "{{field}} 的操作",
+ "showNamed": "显示 {{field}}",
+ "hideNamed": "隐藏 {{field}}",
"remove": "移除 {{field}}",
- "removeConfirm": "移除此字段及其值?已有授权将失效。",
- "rename": "改名",
- "save": "保存字段",
+ "removeField": "移除字段",
+ "removeConfirm": "移除 <field/> 和它的值?",
+ "removeConfirmSaved": "移除 <field/> 和它的值?已有授权会失效。",
+ "confirmRemove": "移除",
+ "defaultNotRemovable": "默认字段不能移除,先把别的字段设为默认",
+ "extraNotRenamable": "额外字段不能改名",
+ "discardNew": "放弃新字段",
+ "save": "保存",
"saveNamed": "保存 {{field}}",
+ "saveNew": "保存新字段",
"saved": "字段已保存",
"draftsDropped": "其他位置已移除字段,已丢弃这些草稿:{{fields}}。",
"recordConflict": "保存期间字段记录发生变化。值未写入,请重新加载 Secret 后再试。",
"secretConflict": "保存期间此密钥发生变化,字段已刷新。请检查后重新保存;你的值尚未写入。",
- "replacePlaceholder": "输入替换值",
+ "replacePlaceholder": "已保存 · 输入即替换",
"revealField": "要显示的字段",
- "namesHelp": "使用小写字母、数字和下划线,以字母开头。每个字段的名称必须唯一且必须填写值。",
+ "nameRequired": "填写字段名",
+ "nameInvalid": "字段名只能用小写字母、数字和下划线,以字母开头",
+ "nameTaken": "已经有一个 {{field}} 字段",
+ "valueRequired": "填写这个字段的值",
+ "nameRule": "字段名:小写字母、数字和下划线,以字母开头。",
+ "references": "Agent 引用",
+ "referenceName": "NAME",
+ "referenceDefault": "只写 <name/> 时,取默认字段 <field/>。",
"singleFile": "文件上传仅支持单值。添加字段前请先切换到文本模式。",
- "editHelp": "修改立即保存。添加、替换或移除值会使授权失效;默认字段改名不会。值留空则保留原值。额外字段不能改名。"
+ "editHelp": "改完一行点保存 · 留空的保持原值"
},
"protectedUnlock": {
"checking": "正在检查你的保护层…",
diff --git a/ui/src/lib/vaultFields.ts b/ui/src/lib/vaultFields.ts
index a22615148..509904e68 100644
--- a/ui/src/lib/vaultFields.ts
+++ b/ui/src/lib/vaultFields.ts
@@ -3,6 +3,15 @@ import type { VaultSecret } from '@/context/ApiContext';
export const VAULT_FIELD_PATTERN = /^[a-z][a-z0-9_]{0,63}$/;
export const MAX_VAULT_FIELDS = 32;
+export type VaultFieldNameIssue = 'nameRequired' | 'nameInvalid' | 'nameTaken';
+
+/** The first naming rule `name` breaks beside its sibling field names, or null. */
+export function vaultFieldNameIssue(name: string, siblings: readonly string[]): VaultFieldNameIssue | null {
+ if (!name) return 'nameRequired';
+ if (!VAULT_FIELD_PATTERN.test(name)) return 'nameInvalid';
+ return siblings.includes(name) ? 'nameTaken' : null;
+}
+
export function vaultDefaultField(secret: Pick<VaultSecret, 'default_field'>): string {
return secret.default_field && VAULT_FIELD_PATTERN.test(secret.default_field) ? secret.default_field : 'value';
}