Stop an untouched secret field from deleting the stored credential

Making `null` actually clear a secret — which it had to, since a blanked
token was previously never revoked — turned the config editors into a
credential shredder. Secrets are `#[serde(skip_serializing)]`, so the
inputs always render empty whether or not one is stored, and the blur
handlers sent `value || null` unconditionally. Focusing the Git token
field and tabbing away deleted it, with nothing shown and no undo.

`useSecretField` encodes the rule: only a field the user typed in may
speak about a secret. Untouched, `patch()` contributes no key at all, and
Rust already distinguishes an absent key from an explicit null.

`withoutUntouchedSecrets` covers the structural half. `saveBedrock`
spreads `{ ...bedrock, ...patch }`, and when that falls back to
DEFAULT_BEDROCK_CONFIG the literal spells every secret out as `null` — so
editing the AWS region would have wiped the credentials as a side effect.

Also here: `WorkspaceSection` no longer saves a half-filled folder row,
which `update_project`'s new validation would refuse on every keystroke
between the two inputs; `snapshots_skipped` is declared on the wire type
rather than widened locally; and `#[must_use]` on `ProjectGuard` and
`ScrubOutcome` — which immediately caught the migration path discarding
its scrub outcome, the one scrub whose silence is expensive because the
layer it declined to clean is about to be committed.

The capability test reads the real file and is mutation-verified: adding
`core:default` back makes it fail. That grant pulls in an unscoped
`std::fs::read` of any host path and went unnoticed for months, because
nothing in the suite read the file at all.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GBq2rGum6GX7xXgsas1fDc
This commit is contained in:
2026-08-23 13:23:00 -07:00
co-authored by Claude Opus 5
parent 7bbb699e4e
commit 6a8972980d
11 changed files with 354 additions and 49 deletions
@@ -1,4 +1,5 @@
import { useEffect, useState } from "react";
import { useSecretField } from "../../../../hooks/useSecretField";
import { open } from "@tauri-apps/plugin-dialog";
import type { Project } from "../../../../lib/types";
import Button from "../../../ui/Button";
@@ -24,14 +25,15 @@ export default function AccessSection({
const [caCertPath, setCaCertPath] = useState(project.ca_cert_path ?? "");
const [gitName, setGitName] = useState(project.git_user_name ?? "");
const [gitEmail, setGitEmail] = useState(project.git_user_email ?? "");
const [gitToken, setGitToken] = useState(project.git_token ?? "");
// Never seeded from `project` — the backend does not serialize secrets, so
// the box is always empty and only an edit may speak about the stored value.
const gitToken = useSecretField(project.id);
useEffect(() => {
setSshKeyPath(project.ssh_key_path ?? "");
setCaCertPath(project.ca_cert_path ?? "");
setGitName(project.git_user_name ?? "");
setGitEmail(project.git_user_email ?? "");
setGitToken(project.git_token ?? "");
}, [project]);
return (
@@ -101,15 +103,19 @@ export default function AccessSection({
<Field
label="Git HTTPS token"
hint="A personal access token (e.g. a GitHub PAT) for HTTPS git operations inside the container."
hint={
gitToken.edited
? "Saved when you click away. Clearing the box removes the stored token."
: "A personal access token (e.g. a GitHub PAT) for HTTPS git operations inside the container. A stored token is not shown; leave this empty to keep it."
}
>
{(id) => (
<input
id={id}
type="password"
value={gitToken}
onChange={(e) => setGitToken(e.target.value)}
onBlur={() => save({ git_token: gitToken || null })}
value={gitToken.value}
onChange={(e) => gitToken.setValue(e.target.value)}
onBlur={() => save({ ...gitToken.patch("git_token") })}
placeholder="ghp_…"
disabled={disabled}
className={inputClass}