fix(secrets): wizard expands ~ and re-prompts for the offline-copy directory #146

Merged

jfraeys merged 4 commits from jfraeys/fix/wizard-offline-dir-prompt into main 2026-10-14 10:49:19 -04:00

Conversation 0 Commits 4 Files changed 3 +26 -12

jfraeys commented 2026-10-14 10:29:05 -04:00

Owner

Copy link

Found on the first real run of scripts/project-keys-wizard.sh: entering ~/Documents/recovery_codes was rejected (not a directory) because read does not expand ~, and the stage then exited the whole wizard.

• Expand a leading ~ to $HOME.
• Loop on an invalid path instead of exiting; blank still skips.

Re-running was already safe (existing Keychain/Bitwarden items are not overwritten; their public keys are derived), so nothing was lost.

🤖 Generated with Claude Code

https://claude.ai/code/session_01Ge5tovcwdEUBtPwUktsZZZ

Found on the first real run of `scripts/project-keys-wizard.sh`: entering `~/Documents/recovery_codes` was rejected (`not a directory`) because `read` does not expand `~`, and the stage then exited the whole wizard. - Expand a leading `~` to `$HOME`. - Loop on an invalid path instead of exiting; blank still skips. Re-running was already safe (existing Keychain/Bitwarden items are not overwritten; their public keys are derived), so nothing was lost. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01Ge5tovcwdEUBtPwUktsZZZ

jfraeys added 1 commit 2026-10-14 10:29:05 -04:00

fix(secrets): wizard expands ~ and re-prompts for the offline-copy directory ... 998a5af7cb

read does not expand a leading ~, so "~/Documents/x" was rejected as "not a
directory" and the whole wizard exited. Expand it, and loop on a bad path
instead of exiting (blank still skips).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Ge5tovcwdEUBtPwUktsZZZ

jfraeys added 1 commit 2026-10-14 10:34:39 -04:00

fix(secrets): wizard reads bare KEY names from .env.example ... f78320520c

forge-agent's .env.example lists bare names (no "="), which the parser skipped,
so it emitted nothing and sops failed with "Error unmarshalling file: EOF".
Accept bare names, KEY=..., export KEY=..., and trailing comments; fail with a
clear message when no names are found.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Ge5tovcwdEUBtPwUktsZZZ

jfraeys added 1 commit 2026-10-14 10:36:56 -04:00

fix(secrets): wizard keeps an existing offline copy of the recovery key on re-run ... 1567fc29dc

A re-run hit "already exists; refusing to overwrite" after the first run had
written the file. Never overwrite it, but keep it when its public key matches
the recovery key, and refuse with a clear message when it does not.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Ge5tovcwdEUBtPwUktsZZZ

jfraeys added 1 commit 2026-10-14 10:40:57 -04:00

fix(secrets): sops exec-env takes one quoted command, not "-- cmd args" ... b03e8d23ef

exec-env requires exactly two arguments (file, command string) and has no "--"
handling, so "sops exec-env FILE -- go run ./dev integration" fails with the
misleading "error: missing file to decrypt" (cmd/sops/main.go: c.NArg() != 2).
Found on the first real wizard run. Fix the wizard (run + printed command + the
recovery doc it writes) and the two docs that recommended the "--" form.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Ge5tovcwdEUBtPwUktsZZZ

jfraeys merged commit 403118da23 into main 2026-10-14 10:49:19 -04:00

jfraeys referenced this pull request from a commit 2026-10-14 10:49:20 -04:00

Merge pull request 'fix(secrets): wizard expands ~ and re-prompts for the offline-copy directory' (#146) from jfraeys/fix/wizard-offline-dir-prompt into main

jfraeys referenced this pull request 2026-10-14 10:54:40 -04:00

P7: project secrets keys and drills (forge-agent, app-skeleton) #118

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

jfraeys/infra!146

No description provided.