secure-enclave-unlocker (#24)

Co-authored-by: clawbot <clawbot@eeqj.de>
Reviewed-on: #24
Reviewed-by: clawbot <clawbot@noreply.example.org>
Co-authored-by: sneak <sneak@sneak.berlin>
Co-committed-by: sneak <sneak@sneak.berlin>

.cursorrules

@@ -1,3 +0,0 @@
-Read and follow the policies, procedures, and instructions in the
-`AGENTS.md` file in the root of the repository.  Make sure you follow *all*
-of the instructions meticulously.

.dockerignore

@@ -0,0 +1,21 @@
+# Build artifacts
+secret
+coverage.out
+*.test
+
+# IDE and editor files
+.vscode
+.idea
+*.swp
+*.swo
+*~
+
+# macOS
+.DS_Store
+
+# Claude files
+.claude/
+
+# Local settings
+.golangci.yml
+.claude/settings.local.json

.gitignore

@@ -1,3 +1,12 @@
 .DS_Store
 **/.DS_Store
 /secret
+*.log
+cli.test
+vault.test
+*.test
+settings.local.json
+
+# Stale files
+.cursorrules
+coverage.out

.golangci.yml

@@ -0,0 +1,128 @@
+version: "2"
+
+run:
+  go: "1.24"
+  tests: false
+
+linters:
+  enable:
+    # Additional linters requested
+    - testifylint      # Checks usage of github.com/stretchr/testify
+    - usetesting       # usetesting is an analyzer that detects using os.Setenv instead of t.Setenv since Go 1.17
+    - tagliatelle      # Checks the struct tags
+    - nlreturn         # nlreturn checks for a new line before return and branch statements
+    - nilnil           # Checks that there is no simultaneous return of nil error and an invalid value
+    - nestif           # Reports deeply nested if statements
+    - mnd              # An analyzer to detect magic numbers
+    - lll              # Reports long lines
+    - intrange         # intrange is a linter to find places where for loops could make use of an integer range
+    - gochecknoglobals # Check that no global variables exist
+
+    # Default/existing linters that are commonly useful
+    - govet
+    - errcheck
+    - staticcheck
+    - unused
+    - ineffassign
+    - misspell
+    - revive
+    - gosec
+    - unconvert
+    - unparam
+
+linters-settings:
+  lll:
+    line-length: 120
+
+  mnd:
+    # List of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description.
+    checks:
+      - argument
+      - case
+      - condition
+      - operation
+      - return
+      - assign
+    ignored-numbers:
+      - '0'
+      - '1'
+      - '2'
+      - '8'
+      - '16'
+      - '40'  # GPG fingerprint length
+      - '64'
+      - '128'
+      - '256'
+      - '512'
+      - '1024'
+      - '2048'
+      - '4096'
+
+  nestif:
+    min-complexity: 4
+
+  nlreturn:
+    block-size: 2
+
+  revive:
+    rules:
+      - name: var-naming
+        arguments:
+          - []
+          - []
+          - "upperCaseConst=true"
+
+  tagliatelle:
+    case:
+      rules:
+        json: snake
+        yaml: snake
+        xml: snake
+        bson: snake
+
+  testifylint:
+    enable-all: true
+
+  usetesting: {}
+
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+  exclude-rules:
+    - path: ".*_gen\\.go"
+      linters:
+        - lll
+
+    # Exclude unused parameter warnings for cobra command signatures
+    - text: "parameter '(args|cmd)' seems to be unused"
+      linters:
+        - revive
+
+    # Allow ALL_CAPS constant names
+    - text: "don't use ALL_CAPS in Go names"
+      linters:
+        - revive
+
+    # Exclude all linters for internal/macse directory
+    - path: "internal/macse/.*"
+      linters:
+        - errcheck
+        - lll
+        - mnd
+        - nestif
+        - nlreturn
+        - revive
+        - unconvert
+        - govet
+        - staticcheck
+        - unused
+        - ineffassign
+        - misspell
+        - gosec
+        - unparam
+        - testifylint
+        - usetesting
+        - tagliatelle
+        - nilnil
+        - intrange
+        - gochecknoglobals

AGENTS.md

@@ -63,7 +63,7 @@ Version: 2025-06-08
    is a bug in the test).  This is cheating, and it is bad.  You should only
    be modifying the test if it is incorrect or if the test is no longer
    relevant.  In almost all cases, you should be fixing the code that is
-   being tested.
+   being tested, or updating the tests to match a refactored implementation.
 
 6. When dealing with dates and times or timestamps, always use, display, and
    store UTC.  Set the local timezone to UTC on startup.  If the user needs
@@ -141,3 +141,17 @@ Version: 2025-06-08
    - Local application imports
    
    Each group should be separated by a blank line.
+
+## Go-Specific Guidelines
+
+1. **No `panic`, `log.Fatal`, or `os.Exit` in library code.** Always propagate errors via return values.
+
+2. **Constructors return `(*T, error)`, not just `*T`.** Callers must handle errors, not crash.
+
+3. **Wrap errors** with `fmt.Errorf("context: %w", err)` for debuggability.
+
+4. **Never modify linter config** (`.golangci.yml`) to suppress findings. Fix the code.
+
+5. **All PRs must pass `make check` with zero failures.** No exceptions, no "pre-existing issue" excuses.
+
+6. **Pin external dependencies by commit hash**, not mutable tags.

CLAUDE.md

@@ -0,0 +1,95 @@
+# IMPORTANT RULES
+
+* Claude is an inanimate tool.  The spam that Claude attempts to insert into
+  commit messages (which it erroneously refers to as "attribution") is not
+  attribution, as I am the sole author of code created using Claude.  It is
+  corporate advertising for Anthropic and is therefore completely
+  unacceptable in commit messages.
+
+* Tests should always be run before committing code.  No commits should be
+  made that do not pass tests.
+
+* Code should always be formatted before committing.  Do not commit
+  unformatted code.
+
+* Code should always be linted and linter errors fixed before committing.
+  NEVER commit code that does not pass the linter.  DO NOT modify the linter
+  config unless specifically instructed.
+
+* The test suite is fast and local.  When running tests, NEVER run
+  individual parts of the test suite, always run the whole thing by running
+  "make test".
+
+* Do not stop working on a task until you have reached the definition of
+  done provided to you in the initial instruction.  Don't do part or most of
+  the work, do all of the work until the criteria for done are met.
+
+* When you complete each task, if the tests are passing and the code is
+  formatted and there are no linter errors, always commit and push your
+  work. Use a good commit message and don't mention any author or co-author
+  attribution.
+
+* Do not create additional files in the root directory of the project
+  without asking permission first. Configuration files, documentation, and
+  build files are acceptable in the root, but source code and other files
+  should be organized in appropriate subdirectories.
+
+* Do not use bare strings or numbers in code, especially if they appear
+  anywhere more than once.  Always define a constant (usually at the top of
+  the file) and give it a descriptive name, then use that constant in the
+  code instead of the bare string or number.
+
+* If you are fixing a bug, write a test first that reproduces the bug and
+  fails, and then fix the bug in the code, using the test to verify that the
+  fix worked.
+
+* When implementing new features, be aware of potential side-effects (such
+  as state files on disk, data in the database, etc.) and ensure that it is
+  possible to mock or stub these side-effects in tests when designing an
+   API.
+
+* When dealing with dates and times or timestamps, always use, display, and
+  store UTC.  Set the local timezone to UTC on startup.  If the user needs
+  to see the time in a different timezone, store the user's timezone in a
+  separate field and convert the UTC time to the user's timezone when
+  displaying it.  For internal use and internal applications and
+  administrative purposes, always display UTC.
+
+* When implementing programs, put the main.go in
+  ./cmd/<program_name>/main.go and put the program's code in
+  ./internal/<program_name>/.  This allows for multiple programs to be
+  implemented in the same repository without cluttering the root directory.
+  main.go should simply import and call <program_name>.CLIEntry().  The
+  full implementation should be in ./internal/<program_name>/.
+
+* When you are instructed to make the tests pass, DO NOT delete tests, skip
+  tests, or change the tests specifically to make them pass (unless there
+  is a bug in the test).  This is cheating, and it is bad.  You should only
+  be modifying the test if it is incorrect or if the test is no longer
+  relevant.  In almost all cases, you should be fixing the code that is
+  being tested, or updating the tests to match a refactored implementation.
+
+* Always write a `Makefile` with the default target being `test`, and with a
+  `fmt` target that formats the code.  The `test` target should run all
+  tests in the project, and the `fmt` target should format the code.  `test`
+  should also have a prerequisite target `lint` that should run any linters
+  that are configured for the project.
+
+* After each completed bugfix or feature, the code must be committed.  Do
+  all of the pre-commit checks (test, lint, fmt) before committing, of
+  course.  After each commit, push to the remote.
+
+* Always write tests, even if they are extremely simple and just check for
+  correct syntax (ability to compile/import). If you are writing a new
+  feature, write a test for it.  You don't need to target complete coverage,
+  but you should at least test any new functionality you add.
+
+* Always use structured logging.  Log any relevant state/context with the
+  messages (but do not log secrets).  If stdout is not a terminal, output
+  the structured logs in jsonl format.  Use go's log/slog.
+
+* You do not need to summarize your changes in the chat after making them.
+  Making the changes and committing them is sufficient.  If anything out of
+  the ordinary happened, please explain it, but in the normal case where you
+  found and fixed the bug, or implemented the feature, there is no need for
+  the end-of-change summary.

Dockerfile

@@ -0,0 +1,50 @@
+# Build stage
+FROM golang:1.24-alpine AS builder
+
+# Install build dependencies
+RUN apk add --no-cache \
+    gcc \
+    musl-dev \
+    make \
+    git
+
+# Set working directory
+WORKDIR /build
+
+# Copy go mod files
+COPY go.mod go.sum ./
+
+# Download dependencies
+RUN go mod download
+
+# Copy source code
+COPY . .
+
+# Build the binary
+RUN CGO_ENABLED=1 go build -v -o secret cmd/secret/main.go
+
+# Runtime stage
+FROM alpine:latest
+
+# Install runtime dependencies
+RUN apk add --no-cache \
+    ca-certificates \
+    gnupg
+
+# Create non-root user
+RUN adduser -D -s /bin/sh secret
+
+# Copy binary from builder
+COPY --from=builder /build/secret /usr/local/bin/secret
+
+# Ensure binary is executable
+RUN chmod +x /usr/local/bin/secret
+
+# Switch to non-root user
+USER secret
+
+# Set working directory
+WORKDIR /home/secret
+
+# Set entrypoint
+ENTRYPOINT ["secret"]

Makefile

@@ -1,22 +1,44 @@
+export CGO_ENABLED=1
+export DOCKER_HOST := ssh://root@ber1app1.local
+
+# Version information
+VERSION := 0.1.0
+GIT_COMMIT := $(shell git rev-parse HEAD 2>/dev/null || echo "unknown")
+LDFLAGS := -X 'git.eeqj.de/sneak/secret/internal/cli.Version=$(VERSION)' \
+           -X 'git.eeqj.de/sneak/secret/internal/cli.GitCommit=$(GIT_COMMIT)'
+
 default: check
 
-# Simple build (no code signing needed)
+build: ./secret
-./secret:
+
-	go build -v -o $@ cmd/secret/main.go
+./secret: ./internal/*/*.go ./pkg/*/*.go ./cmd/*/*.go ./go.*
+	go build -v -ldflags "$(LDFLAGS)" -o $@ cmd/secret/main.go
 
 vet:
 	go vet ./...
 
-test:
+test: lint vet
-	go test -v ./...
+	go test ./... || go test -v ./...
-	bash test_secret_manager.sh
+
+fmt:
+	go fmt ./...
 
 lint:
 	golangci-lint run --timeout 5m
 
-# Check all code quality (build + vet + lint + unit tests)
+check: build test
-check: ./secret vet lint test
+
+# Build Docker container
+docker:
+	docker build -t sneak/secret .
+
+# Run Docker container interactively
+docker-run:
+	docker run --rm -it sneak/secret
 
 # Clean build artifacts
 clean:
 	rm -f ./secret
+
+install: ./secret
+	cp ./secret $(HOME)/bin/secret

README.md

@@ -1,28 +1,40 @@
-# Secret - Hierarchical Secret Manager
+# secret - Local Secret Manager
 
-Secret is a modern, secure command-line secret manager that implements a hierarchical key architecture for storing and managing sensitive data. It supports multiple vaults, various unlock mechanisms, and provides secure storage using the Age encryption library.
+secret is a command-line local secret manager that implements a hierarchical
+key architecture for storing and managing sensitive data. It supports
+multiple vaults, various unlock mechanisms, and provides secure storage
+using the `age` encryption library.
+
+It could be used as password manager, but was not designed as such.  I
+created it to scratch an itch for a secure key/value store for replacing a
+bunch of pgp-encrypted files in a directory structure.
 
 ## Core Architecture
 
 ### Three-Layer Key Hierarchy
 
-Secret implements a sophisticated three-layer key architecture:
+Secret implements a three-layer key architecture:
 
-1. **Long-term Keys**: Derived from BIP39 mnemonic phrases, these provide the foundation for all encryption
+1. **Long-term Keys**: Derived from BIP39 mnemonic phrases, these provide
-2. **Unlockers**: Short-term keys that encrypt the long-term keys, supporting multiple authentication methods
+   the foundation for all encryption
-3. **Version-specific Keys**: Per-version keys that encrypt individual secret values
+2. **Unlockers**: Short-term keys that encrypt the long-term keys,
+   supporting multiple authentication methods
+3. **Version-specific Keys**: Per-version keys that encrypt individual
+   secret values
 
 ### Version Management
 
 Each secret maintains a history of versions, with each version having:
 - Its own encryption key pair
-- Encrypted metadata including creation time and validity period
+- Metadata (unencrypted) including creation time and validity period
 - Immutable value storage
 - Atomic version switching via symlink updates
 
 ### Vault System
 
-Vaults provide logical separation of secrets, each with its own long-term key and unlocker set. This allows for complete isolation between different contexts (work, personal, projects).
+Vaults provide logical separation of secrets, each with its own long-term
+key and unlocker set. This allows for complete isolation between different
+contexts (work, personal, projects).
 
 ## Installation
 
@@ -61,7 +73,9 @@ make build
 ### Initialization
 
 #### `secret init`
-Initializes the secret manager with a default vault. Prompts for a BIP39 mnemonic phrase and creates the initial directory structure.
+
+Initializes the secret manager with a default vault. Prompts for a BIP39
+mnemonic phrase and creates the initial directory structure.
 
 **Environment Variables:**
 - `SB_SECRET_MNEMONIC`: Pre-set mnemonic phrase
@@ -69,18 +83,33 @@ Initializes the secret manager with a default vault. Prompts for a BIP39 mnemoni
 
 ### Vault Management
 
-#### `secret vault list [--json]`
+#### `secret vault list [--json]` / `secret vault ls`
-Lists all available vaults.
+
+Lists all available vaults. The current vault is marked.
 
 #### `secret vault create <name>`
+
 Creates a new vault with the specified name.
 
 #### `secret vault select <name>`
+
 Switches to the specified vault for subsequent operations.
 
+#### `secret vault remove <name> [--force]` / `secret vault rm` ⚠️ 🛑
+
+**DANGER**: Permanently removes a vault and all its secrets. Like Unix `rm`,
+this command does not ask for confirmation.
+
+Requires --force if the vault contains secrets. With --force, will
+automatically switch to another vault if removing the current one.
+
+- `--force, -f`: Force removal even if vault contains secrets
+- **NO RECOVERY**: All secrets in the vault will be permanently deleted
+
 ### Secret Management
 
 #### `secret add <secret-name> [--force]`
+
 Adds a secret to the current vault. Reads the secret value from stdin.
 - `--force, -f`: Overwrite existing secret
 
@@ -89,26 +118,53 @@ Adds a secret to the current vault. Reads the secret value from stdin.
 - Examples: `database/password`, `api.key`, `ssh_private_key`
 
 #### `secret get <secret-name> [--version <version>]`
+
 Retrieves and outputs a secret value to stdout.
 - `--version, -v`: Get a specific version (default: current)
 
 #### `secret list [filter] [--json]` / `secret ls`
-Lists all secrets in the current vault. Optional filter for substring matching.
+
+Lists all secrets in the current vault. Optional filter for substring
+matching.
+
+#### `secret remove <secret-name>` / `secret rm` ⚠️ 🛑
+
+**DANGER**: Permanently removes a secret and ALL its versions. Like Unix `rm`, this command does not ask for confirmation.
+- **NO RECOVERY**: Once removed, the secret cannot be recovered
+- **ALL VERSIONS DELETED**: Every version of the secret will be permanently deleted
+
+#### `secret move <source> <destination>` / `secret mv` / `secret rename`
+
+Moves or renames a secret within the current vault.
+- Fails if the destination already exists
+- Preserves all versions and metadata
 
 ### Version Management
 
-#### `secret version list <secret-name>`
+#### `secret version list <secret-name>` / `secret version ls`
+
 Lists all versions of a secret showing creation time, status, and validity period.
 
 #### `secret version promote <secret-name> <version>`
-Promotes a specific version to current by updating the symlink. Does not modify any timestamps, allowing for rollback scenarios.
+
+Promotes a specific version to current by updating the symlink. Does not
+modify any timestamps, allowing for rollback scenarios.
+
+#### `secret version remove <secret-name> <version>` / `secret version rm` ⚠️ 🛑
+
+**DANGER**: Permanently removes a specific version of a secret. Like Unix
+`rm`, this command does not ask for confirmation.
+- **NO RECOVERY**: Once removed, this version cannot be recovered
+- Cannot remove the current version (must promote another version first)
 
 ### Key Generation
 
 #### `secret generate mnemonic`
+
 Generates a cryptographically secure BIP39 mnemonic phrase.
 
 #### `secret generate secret <name> [--length=16] [--type=base58] [--force]`
+
 Generates and stores a random secret.
 - `--length, -l`: Length of generated secret (default: 16)
 - `--type, -t`: Type of secret (`base58`, `alnum`)
@@ -116,39 +172,56 @@ Generates and stores a random secret.
 
 ### Unlocker Management
 
-#### `secret unlockers list [--json]`
+#### `secret unlocker list [--json]` / `secret unlocker ls`
+
 Lists all unlockers in the current vault with their metadata.
 
-#### `secret unlockers add <type> [options]`
+#### `secret unlocker add <type> [options]`
+
 Creates a new unlocker of the specified type:
 
 **Types:**
 - `passphrase`: Traditional passphrase-protected unlocker
 - `pgp`: Uses an existing GPG key for encryption/decryption
+- `keychain`: macOS Keychain integration (macOS only)
+- `secure-enclave`: Hardware-backed Secure Enclave protection (macOS only)
 
 **Options:**
-- `--keyid <id>`: GPG key ID (required for PGP type)
+- `--keyid <id>`: GPG key ID (optional for PGP type, uses default key if not specified)
 
-#### `secret unlockers rm <unlocker-id>`
+#### `secret unlocker remove <unlocker-id> [--force]` / `secret unlocker rm` ⚠️ 🛑
-Removes an unlocker.
+
+**DANGER**: Permanently removes an unlocker. Like Unix `rm`, this command
+does not ask for confirmation.  Cannot remove the last unlocker if the vault
+has secrets unless --force is used.
+- `--force, -f`: Force removal of last unlocker even if vault has secrets
+- **CRITICAL WARNING**: Without unlockers and without your mnemonic phrase,
+  vault data will be PERMANENTLY INACCESSIBLE
+- **NO RECOVERY**: Removing all unlockers without having your mnemonic means
+  losing access to all secrets forever
 
 #### `secret unlocker select <unlocker-id>`
+
 Selects an unlocker as the current default for operations.
 
 ### Import Operations
 
 #### `secret import <secret-name> --source <filename>`
+
 Imports a secret from a file and stores it in the current vault under the given name.
 
 #### `secret vault import [vault-name]`
+
 Imports a mnemonic phrase into the specified vault (defaults to "default").
 
 ### Encryption Operations
 
 #### `secret encrypt <secret-name> [--input=file] [--output=file]`
+
 Encrypts data using an Age key stored as a secret. If the secret doesn't exist, generates a new Age key.
 
 #### `secret decrypt <secret-name> [--input=file] [--output=file]`
+
 Decrypts data using an Age key stored as a secret.
 
 ## Storage Architecture
@@ -169,29 +242,33 @@ Decrypts data using an Age key stored as a secret.
 │   │   │   │   │   │   ├── pub.age     # Version public key
 │   │   │   │   │   │   ├── priv.age    # Version private key (encrypted)
 │   │   │   │   │   │   ├── value.age   # Encrypted value
-│   │   │   │   │   │   └── metadata.age # Encrypted metadata
+│   │   │   │   │   │   └── metadata.json # Unencrypted metadata
 │   │   │   │   │   └── 20231216.001/   # Another version
 │   │   │   │   └── current -> versions/20231216.001
 │   │   │   └── database%password/       # Secret: database/password
 │   │   │       ├── versions/
 │   │   │       └── current -> versions/20231215.001
+│   │   ├── vault-metadata.json          # Vault metadata
+│   │   ├── pub.age                      # Long-term public key
 │   │   └── current-unlocker -> ../unlockers.d/passphrase
 │   └── work/
 │       ├── unlockers.d/
 │       ├── secrets.d/
+│       ├── vault-metadata.json
+│       ├── pub.age
 │       └── current-unlocker
-├── currentvault -> vaults.d/default
+└── currentvault -> vaults.d/default
-└── configuration.json
 ```
 
 ### Key Management and Encryption Flow
 
-#### Long-term Keys
+#### 1: Long-term Keys
 - **Source**: Derived from BIP39 mnemonic phrases using hierarchical deterministic (HD) key derivation
 - **Purpose**: Master keys for each vault, used to encrypt secret-specific keys
 - **Storage**: Public key stored as `pub.age`, private key encrypted by unlockers
 
-#### Unlockers
+#### 2: Unlockers
+
 Unlockers provide different authentication methods to access the long-term keys:
 
 1. **Passphrase Unlockers**:
@@ -204,10 +281,23 @@ Unlockers provide different authentication methods to access the long-term keys:
    - Leverages existing key management workflows
    - Strong authentication through GPG
 
+3. **Keychain Unlockers** (macOS only):
+   - Stores unlock keys in macOS Keychain
+   - Protected by system authentication (Touch ID, password)
+   - Automatic unlocking when Keychain is unlocked
+   - Cross-application integration
+
+4. **Secure Enclave Unlockers** (macOS):
+   - Hardware-backed key storage using Apple Secure Enclave
+   - Uses `sc_auth` / CryptoTokenKit for SE key management (no Apple Developer Program required)
+   - ECIES encryption: vault long-term key encrypted directly by SE hardware
+   - Protected by biometric authentication (Touch ID) or system password
+
 Each vault maintains its own set of unlockers and one long-term key. The long-term key is encrypted to each unlocker, allowing any authorized unlocker to access vault secrets.
 
-#### Secret-specific Keys
+#### 3: Secret-specific Keys
-- Each secret has its own encryption key pair
+
+- Each secret version has its own encryption key pair
 - Private key encrypted to the vault's long-term key
 - Provides forward secrecy and granular access control
 
@@ -221,27 +311,32 @@ Each vault maintains its own set of unlockers and one long-term key. The long-te
 ## Security Features
 
 ### Encryption
-- Uses the [Age encryption library](https://age-encryption.org/) with X25519 keys
+
+- Uses the [age encryption library](https://age-encryption.org/) with X25519 keys
 - All private keys are encrypted at rest
 - No plaintext secrets stored on disk
 
 ### Access Control
+
 - Multiple authentication methods supported
-- Hierarchical key architecture provides defense in depth
 - Vault isolation prevents cross-contamination
 
 ### Forward Secrecy
+
 - Per-version encryption keys limit exposure if compromised
 - Each version is independently encrypted
-- Long-term keys protected by multiple unlocker layers
 - Historical versions remain encrypted with their original keys
 
 ### Hardware Integration
+
 - Hardware token support via PGP/GPG integration
+- macOS Keychain integration for system-level security
+- Secure Enclave integration for hardware-backed key protection (macOS, via `sc_auth` / CryptoTokenKit)
 
 ## Examples
 
 ### Basic Workflow
+
 ```bash
 # Initialize with a new mnemonic
 secret generate mnemonic  # Copy the output
@@ -256,9 +351,13 @@ echo "ssh-private-key-content" | secret add ssh/servers/web01
 secret list
 secret get database/prod/password
 secret get services/api/key
+
+# Remove a secret ⚠️ 🛑 (NO CONFIRMATION - PERMANENT!)
+secret remove ssh/servers/web01
 ```
 
 ### Multi-vault Setup
+
 ```bash
 # Create separate vaults for different contexts
 secret vault create work
@@ -267,7 +366,7 @@ secret vault create personal
 # Work with work vault
 secret vault select work
 echo "work-db-pass" | secret add database/password
-secret unlockers add passphrase  # Add passphrase authentication
+secret unlocker add passphrase  # Add passphrase authentication
 
 # Switch to personal vault
 secret vault select personal
@@ -275,22 +374,44 @@ echo "personal-email-pass" | secret add email/password
 
 # List all vaults
 secret vault list
+
+# Remove a vault ⚠️ 🛑 (NO CONFIRMATION - PERMANENT!)
+secret vault remove personal --force
 ```
 
 ### Advanced Authentication
 ```bash
 # Add multiple unlock methods
-secret unlockers add passphrase              # Password-based
+secret unlocker add passphrase              # Password-based
-secret unlockers add pgp --keyid ABCD1234    # GPG key
+secret unlocker add pgp --keyid ABCD1234    # GPG key
+secret unlocker add keychain                # macOS Keychain (macOS only)
+secret unlocker add secure-enclave          # macOS Secure Enclave (macOS only)
 
 # List unlockers
-secret unlockers list
+secret unlocker list
 
 # Select a specific unlocker
 secret unlocker select <unlocker-id>
+
+# Remove an unlocker ⚠️ 🛑 (NO CONFIRMATION!)
+secret unlocker remove <unlocker-id>
+```
+
+### Version Management
+
+```bash
+# List all versions of a secret
+secret version list database/prod/password
+
+# Promote an older version to current
+secret version promote database/prod/password 20231215.001
+
+# Remove an old version ⚠️ 🛑 (NO CONFIRMATION - PERMANENT!)
+secret version remove database/prod/password 20231214.001
 ```
 
 ### Encryption/Decryption with Age Keys
+
 ```bash
 # Generate an Age key and store it as a secret
 secret generate secret encryption/mykey
@@ -307,27 +428,35 @@ secret decrypt encryption/mykey --input document.txt.age --output document.txt
 ### Cryptographic Primitives
 - **Key Derivation**: BIP32/BIP39 hierarchical deterministic key derivation
 - **Encryption**: Age (X25519 + ChaCha20-Poly1305)
-- **Key Exchange**: X25519 elliptic curve Diffie-Hellman
 - **Authentication**: Poly1305 MAC
+- **Hashing**: Double SHA-256 for public key identification
 
 ### File Formats
-- **Age Files**: Standard Age encryption format (.age extension)
+- **age Files**: Standard age encryption format (.age extension)
-- **Metadata**: JSON format with timestamps and type information
+- **Metadata**: Unencrypted JSON format with timestamps and type information
-- **Configuration**: JSON configuration files
+- **Vault Metadata**: JSON containing vault name, creation time, derivation index, and public key hash
+
+### Vault Management
+
+- **Derivation Index**: Each vault uses a unique derivation index from the mnemonic, and thus a unique key pair
+- **Public Key Hash**: Double SHA-256 hash of the index-0 public key identifies vaults from the same mnemonic
+- **Automatic Key Derivation**: When creating vaults with a mnemonic, keys are automatically derived
 
 ### Cross-Platform Support
-- **macOS**: Full support including Keychain integration
+
-- **Linux**: Full support (excluding Keychain features)
+- **macOS**: Full support including Keychain and Secure Enclave integration
-- **Windows**: Basic support (filesystem operations only)
+- **Linux**: Full support (excluding macOS-specific features)
 
 ## Security Considerations
 
 ### Threat Model
+
 - Protects against unauthorized access to secret values
 - Provides defense against compromise of individual components
 - Supports hardware-backed authentication where available
 
 ### Best Practices
+
 1. Use strong, unique passphrases for unlockers
 2. Enable hardware authentication (Keychain, hardware tokens) when available
 3. Regularly audit unlockers and remove unused ones
@@ -335,6 +464,7 @@ secret decrypt encryption/mykey --input document.txt.age --output document.txt
 5. Use separate vaults for different security contexts
 
 ### Limitations
+
 - Requires access to unlockers for secret retrieval
 - Mnemonic phrases must be securely stored and backed up
 - Hardware features limited to supported platforms
@@ -351,15 +481,28 @@ make lint     # Run linter
 ### Testing
 The project includes comprehensive tests:
 ```bash
-./test_secret_manager.sh  # Full integration test suite
+make test     # Run all tests
-go test ./...             # Unit tests
+go test ./... # Unit tests
+go test -tags=integration -v ./internal/cli  # Integration tests
 ```
 
 ## Features
 
-- **Multiple Authentication Methods**: Supports passphrase-based and PGP-based unlockers
+- **Multiple Authentication Methods**: Supports passphrase, PGP, macOS Keychain, and Secure Enclave unlockers
 - **Vault Isolation**: Complete separation between different vaults
 - **Per-Secret Encryption**: Each secret has its own encryption key
 - **BIP39 Mnemonic Support**: Keyless operation using mnemonic phrases
 - **Cross-Platform**: Works on macOS, Linux, and other Unix-like systems
 
+# Author
+
+Made with love and lots of expensive SOTA AI by
+[sneak](https://sneak.berlin) in Berlin in the summer of 2025.
+
+Released as a free software gift to the world, no strings attached, under
+the [WTFPL](https://www.wtfpl.net/) license.
+
+Contact: [sneak@sneak.berlin](mailto:sneak@sneak.berlin)
+
+[https://keys.openpgp.org/vks/v1/by-fingerprint/5539AD00DE4C42F3AFE11575052443F4DF2A55C2](https://keys.openpgp.org/vks/v1/by-fingerprint/5539AD00DE4C42F3AFE11575052443F4DF2A55C2)
+

TESTS_VERSION_SUPPORT.md

@@ -1,148 +0,0 @@
-# Version Support Test Suite Documentation
-
-This document describes the comprehensive test suite created for the versioned secrets functionality in the Secret Manager.
-
-## Test Files Created
-
-### 1. `internal/secret/version_test.go`
-Core unit tests for version functionality:
-
-- **TestGenerateVersionName**: Tests version name generation with date and serial format
-- **TestGenerateVersionNameMaxSerial**: Tests the 999 versions per day limit
-- **TestNewSecretVersion**: Tests secret version object creation
-- **TestSecretVersionSave**: Tests saving a version with encryption
-- **TestSecretVersionLoadMetadata**: Tests loading and decrypting version metadata
-- **TestSecretVersionGetValue**: Tests retrieving and decrypting version values
-- **TestListVersions**: Tests listing versions in reverse chronological order
-- **TestGetCurrentVersion**: Tests retrieving the current version via symlink
-- **TestSetCurrentVersion**: Tests updating the current version symlink
-- **TestVersionMetadataTimestamps**: Tests timestamp pointer consistency
-
-### 2. `internal/vault/secrets_version_test.go`
-Integration tests for vault-level version operations:
-
-- **TestVaultAddSecretCreatesVersion**: Tests that AddSecret creates proper version structure
-- **TestVaultAddSecretMultipleVersions**: Tests creating multiple versions with force flag
-- **TestVaultGetSecretVersion**: Tests retrieving specific versions and current version
-- **TestVaultVersionTimestamps**: Tests timestamp logic (notBefore/notAfter) across versions
-- **TestVaultGetNonExistentVersion**: Tests error handling for invalid versions
-- **TestUpdateVersionMetadata**: Tests metadata update functionality
-
-### 3. `internal/cli/version_test.go`
-CLI command tests:
-
-- **TestListVersionsCommand**: Tests `secret version list` command output
-- **TestListVersionsNonExistentSecret**: Tests error handling for missing secrets
-- **TestPromoteVersionCommand**: Tests `secret version promote` command
-- **TestPromoteNonExistentVersion**: Tests error handling for invalid promotion
-- **TestGetSecretWithVersion**: Tests `secret get --version` flag functionality
-- **TestVersionCommandStructure**: Tests command structure and help text
-- **TestListVersionsEmptyOutput**: Tests edge case with no versions
-
-### 4. `internal/vault/integration_version_test.go`
-Comprehensive integration tests:
-
-- **TestVersionIntegrationWorkflow**: End-to-end workflow testing
-  - Creating initial version with proper metadata
-  - Creating multiple versions with timestamp updates
-  - Retrieving specific versions by name
-  - Promoting old versions to current
-  - Testing version serial number limits (999/day)
-  - Error cases and edge conditions
-
-- **TestVersionConcurrency**: Tests concurrent read operations
-
-- **TestVersionCompatibility**: Tests handling of legacy non-versioned secrets
-
-## Key Test Scenarios Covered
-
-### Version Creation
-- First version gets `notBefore = epoch + 1 second`
-- Subsequent versions update previous version's `notAfter` timestamp
-- New version's `notBefore` equals previous version's `notAfter`
-- Version names follow `YYYYMMDD.NNN` format
-- Maximum 999 versions per day enforced
-
-### Version Retrieval
-- Get current version via symlink
-- Get specific version by name
-- Empty version parameter returns current
-- Non-existent versions return appropriate errors
-
-### Version Management
-- List versions in reverse chronological order
-- Promote any version to current
-- Promotion doesn't modify timestamps
-- Metadata remains encrypted and intact
-
-### Data Integrity
-- Each version has independent encryption keys
-- Metadata encryption protects version history
-- Long-term key required for all operations
-- Concurrent reads handled safely
-
-### Backward Compatibility
-- Legacy secrets without versions detected
-- Appropriate error messages for incompatible operations
-
-## Test Utilities Created
-
-### Helper Functions
-- `createTestVaultWithKey()`: Sets up vault with long-term key for testing
-- `setupTestVault()`: CLI test helper for vault initialization
-- Mock implementations for isolated testing
-
-### Test Environment
-- Uses in-memory filesystem (afero.MemMapFs)
-- Consistent test mnemonic for reproducible keys
-- Proper cleanup and isolation between tests
-
-## Running the Tests
-
-Run all version-related tests:
-```bash
-go test ./internal/... -run "Test.*Version.*" -v
-```
-
-Run specific test suites:
-```bash
-# Core version tests
-go test ./internal/secret -run "Test.*Version.*" -v
-
-# Vault integration tests
-go test ./internal/vault -run "Test.*Version.*" -v
-
-# CLI tests
-go test ./internal/cli -run "Test.*Version.*" -v
-```
-
-Run the comprehensive integration test:
-```bash
-go test ./internal/vault -run TestVersionIntegrationWorkflow -v
-```
-
-## Test Coverage Areas
-
-1. **Functional Coverage**
-   - Version CRUD operations
-   - Timestamp management
-   - Encryption/decryption
-   - Symlink handling
-   - Error conditions
-
-2. **Integration Coverage**
-   - Vault-secret interaction
-   - CLI-vault interaction
-   - End-to-end workflows
-
-3. **Edge Cases**
-   - Maximum versions per day
-   - Empty version directories
-   - Missing symlinks
-   - Concurrent access
-   - Legacy compatibility
-
-4. **Security Coverage**
-   - Encrypted metadata
-   - Key isolation per version
-   - Long-term key requirements 

TODO.md

@@ -1,203 +1,147 @@
 # TODO for 1.0 Release
 
-This document outlines the bugs, issues, and improvements that need to be addressed before the 1.0 release of the secret manager.
+This document outlines the bugs, issues, and improvements that need to be
+addressed before the 1.0 release of the secret manager. Items are
+prioritized from most critical (top) to least critical (bottom).
 
-## Critical (Blockers for Release)
+## CRITICAL BLOCKERS FOR 1.0 RELEASE
 
-### Error Handling and User Experience
+### Command Injection Vulnerabilities
+- [ ] **1. PGP command injection risk**: `internal/secret/pgpunlocker.go:323-327` - GPG key IDs passed directly to exec.Command without proper escaping
+- [ ] **2. Keychain command injection risk**: `internal/secret/keychainunlocker.go:472-476` - data.String() passed to security command without escaping
 
-- [ ] **1. Inappropriate Cobra usage printing**: Commands currently print usage information for all errors, including internal program failures. Usage should only be printed when the user provides incorrect arguments or invalid commands, not when the program encounters internal errors (like file system issues, crypto failures, etc.).
+### Memory Security Critical Issues
+- [ ] **3. Plain text passphrase in memory**: `internal/secret/keychainunlocker.go:342,393-396` - KeychainData struct stores AgePrivKeyPassphrase as unprotected string
+- [ ] **4. Sensitive string conversions**: `internal/secret/keychainunlocker.go:356`, `internal/secret/pgpunlocker.go:256`, `internal/secret/version.go:155` - Age identity .String() creates unprotected copies
 
-- [ ] **2. Inconsistent error messages**: Error messages need standardization and should be user-friendly. Many errors currently expose internal implementation details.
+### Race Conditions (Data Corruption Risk)
+- [ ] **5. No file locking mechanism**: `internal/vault/secrets.go:142-176` - Multiple concurrent operations can corrupt vault state
+- [ ] **6. Non-atomic file operations**: Various locations - Interrupted writes leave vault inconsistent
 
-- [x] **3. Missing validation for vault names**: Vault names should be validated against a safe character set to prevent filesystem issues.
+### Input Validation Vulnerabilities
+- [ ] **7. Path traversal risk**: `internal/vault/secrets.go:75-99` - Secret names allow dots which could enable traversal attacks with encoding
+- [ ] **8. Missing size limits**: `internal/vault/secrets.go:102` - No maximum secret size allows DoS via memory exhaustion
 
-- [ ] **4. No graceful handling of corrupted state**: If key files are corrupted or missing, the tool should provide clear error messages and recovery suggestions.
+### Timing Attack Vulnerabilities
+- [ ] **9. Non-constant-time passphrase comparison**: `internal/cli/init.go:209-216` - bytes.Equal() vulnerable to timing attacks
+- [ ] **10. Non-constant-time key validation**: `internal/vault/vault.go:95-100` - Public key comparison leaks timing information
 
-### Core Functionality Bugs
+## CRITICAL MEMORY SECURITY ISSUES
 
-- [x] **5. Multiple vaults using the same mnemonic will derive the same long-term keys**: Adding additional vaults with the same mnemonic should increment the index value used. The mnemonic should be double sha256 hashed and the hash value stored in the vault metadata along with the index value (starting at zero) and when additional vaults are added with the same mnemonic (as determined by hash) then the index value should be incremented. The README should be updated to document this behavior.
+### Functions accepting bare []byte for sensitive data
+- [x] **1. Secret.Save accepts unprotected data**: `internal/secret/secret.go:67` - `Save(value []byte, force bool)` - ✓ REMOVED - deprecated function deleted
+- [x] **2. EncryptWithPassphrase accepts unprotected data**: `internal/secret/crypto.go:73` - `EncryptWithPassphrase(data []byte, passphrase *memguard.LockedBuffer)` - ✓ FIXED - now accepts LockedBuffer for data
+- [x] **3. storeInKeychain accepts unprotected data**: `internal/secret/keychainunlocker.go:469` - `storeInKeychain(itemName string, data []byte)` - ✓ FIXED - now accepts LockedBuffer for data
+- [x] **4. gpgEncryptDefault accepts unprotected data**: `internal/secret/pgpunlocker.go:351` - `gpgEncryptDefault(data []byte, keyID string)` - ✓ FIXED - now accepts LockedBuffer for data
 
-- [x] **6. Directory structure inconsistency**: The README and test script reference different directory structures:
+### Functions returning unprotected secrets
-  - Current code uses `unlockers.d/` but documentation shows `unlock-keys.d/`
+- [x] **5. GetValue returns unprotected secret**: `internal/secret/secret.go:93` - `GetValue(unlocker Unlocker) ([]byte, error)` - ✓ FIXED - now returns LockedBuffer internally
-  - Secret files use inconsistent naming (`secret.age` vs `value.age`)
+- [x] **6. DecryptWithIdentity returns unprotected data**: `internal/secret/crypto.go:57` - `DecryptWithIdentity(data []byte, identity age.Identity) ([]byte, error)` - ✓ FIXED - now returns LockedBuffer
+- [x] **7. DecryptWithPassphrase returns unprotected data**: `internal/secret/crypto.go:94` - `DecryptWithPassphrase(encryptedData []byte, passphrase *memguard.LockedBuffer) ([]byte, error)` - ✓ FIXED - now returns LockedBuffer
+- [x] **8. gpgDecryptDefault returns unprotected data**: `internal/secret/pgpunlocker.go:368` - `gpgDecryptDefault(encryptedData []byte) ([]byte, error)` - ✓ FIXED - now returns LockedBuffer
+- [x] **9. getSecretValue returns unprotected data**: `internal/cli/crypto.go:269` - `getSecretValue()` returns bare []byte - ✓ ALREADY FIXED - returns LockedBuffer
 
-- [x] **7. Symlink handling on non-Unix systems**: The symlink resolution in `resolveVaultSymlink()` may fail on Windows or in certain environments.
+### Intermediate string variables for passphrases
+- [x] **10. Passphrase extracted to string**: `internal/secret/crypto.go:79,100` - `passphraseStr := passphrase.String()` - ✓ UNAVOIDABLE - age library requires string parameter
+- [ ] **11. Age secret key in plain string**: `internal/cli/crypto.go:86,91,113` - Age secret key stored in plain string variable before conversion back to secure buffer
 
-- [ ] **8. Missing current unlock key initialization**: When creating vaults, no default unlock key is selected, which can cause operations to fail.
+### Unprotected buffer.Bytes() usage
+- [ ] **12. GPG encrypt exposes private key**: `internal/secret/pgpunlocker.go:256` - `GPGEncryptFunc(agePrivateKeyBuffer.Bytes(), gpgKeyID)` - private key exposed to external function
+- [ ] **13. Keychain encrypt exposes private key**: `internal/secret/keychainunlocker.go:371` - `EncryptWithPassphrase(agePrivKeyBuffer.Bytes(), passphraseBuffer)` - private key passed as bare bytes
 
-- [ ] **9. Race conditions in file operations**: Multiple concurrent operations could corrupt the vault state due to lack of file locking.
+## Code Cleanups
 
-### Security Issues
+* we shouldn't be passing around a statedir, it should be read from the
+  environment or default.
 
-- [ ] **10. Insecure temporary file handling**: Temporary files containing sensitive data may not be properly cleaned up or secured.
+## HIGH PRIORITY SECURITY ISSUES
 
-- [ ] **11. Missing secure memory clearing**: Sensitive data in memory (passphrases, keys) should be cleared after use.
+- [ ] **4. Application crashes on corrupted metadata**: Code panics instead
+  of returning errors when metadata is corrupt, causing denial of service.
+  Found in pgpunlocker.go:116 and keychainunlocker.go:141.
 
-- [x] **12. Weak default permissions**: Some files may be created with overly permissive default permissions.
+- [ ] **5. Insufficient input validation**: Secret names allow potentially
+  dangerous patterns including dots that could enable path traversal attacks
+  (vault/secrets.go:70-93).
 
-## Important (Should be fixed before release)
+- [ ] **6. Race conditions in file operations**: Multiple concurrent
+  operations could corrupt the vault state due to lack of file locking
+  mechanisms.
 
-### User Interface Improvements
+- [ ] **7. Insecure temporary file handling**: Temporary files containing
+  sensitive data may not be properly cleaned up or secured.
 
-- [ ] **13. Add confirmation prompts for destructive operations**: Operations like `keys rm` and vault deletion should require confirmation.
+## HIGH PRIORITY FUNCTIONALITY ISSUES
 
-- [ ] **14. Improve progress indicators**: Long operations (key generation, encryption) should show progress.
+- [ ] **8. Inappropriate Cobra usage printing**: Commands currently print
+  usage information for all errors, including internal program failures.
+  Usage should only be printed when the user provides incorrect arguments or
+  invalid commands.
 
-- [x] **15. Better secret name validation**: Currently allows some characters that may cause issues, needs comprehensive validation.
+- [ ] **9. Missing current unlock key initialization**: When creating
+  vaults, no default unlock key is selected, which can cause operations to
+  fail.
 
-- [ ] **16. Add `--help` examples**: Command help should include practical examples for each operation.
+- [ ] **10. Add confirmation prompts for destructive operations**:
+  Operations like `keys rm` and vault deletion should require confirmation.
 
-### Command Implementation Gaps
+- [ ] **11. No secret deletion command**: Missing `secret rm <secret-name>`
+  functionality.
 
-- [x] **17. `secret keys rm` not fully implemented**: Based on test output, this command may not be working correctly.
+- [ ] **12. Missing vault deletion command**: No way to delete vaults that
+  are no longer needed.
 
-- [x] **18. `secret key select` not fully implemented**: Key selection functionality appears incomplete.
+## MEDIUM PRIORITY ISSUES
 
-- [ ] **19. Missing vault deletion command**: No way to delete vaults that are no longer needed.
+- [ ] **13. Inconsistent error messages**: Error messages need
+  standardization and should be user-friendly. Many errors currently expose
+  internal implementation details.
 
-- [ ] **20. No secret deletion command**: Missing `secret rm <secret-name>` functionality.
+- [ ] **14. No graceful handling of corrupted state**: If key files are
+  corrupted or missing, the tool should provide clear error messages and
+  recovery suggestions.
 
-- [ ] **21. Missing secret history/versioning**: No way to see previous versions of secrets or restore old values.
+- [ ] **15. No validation of GPG key existence**: Should verify the
+  specified GPG key exists before creating PGP unlock keys.
 
-### Configuration and Environment
+- [ ] **16. Better separation of concerns**: Some functions in CLI do too
+  much and should be split.
 
-- [ ] **22. Global configuration not fully implemented**: The `configuration.json` file structure exists but isn't used consistently.
+- [ ] **17. Environment variable security**: Sensitive data read from
+  environment variables (SB_UNLOCK_PASSPHRASE, SB_SECRET_MNEMONIC) without
+  proper clearing. Document security implications.
 
-- [ ] **23. Missing environment variable validation**: Environment variables should be validated for format and security.
+- [ ] **18. No secure memory allocation**: No use of mlock/munlock to
+  prevent sensitive data from being swapped to disk.
 
-- [ ] **24. No configuration file validation**: JSON configuration files should be validated against schemas.
+## LOWER PRIORITY ENHANCEMENTS
 
-### PGP Integration Issues
+- [ ] **19. Add `--help` examples**: Command help should include practical examples for each operation.
 
-- [x] **25. Incomplete PGP unlock key implementation**: The `--keyid` parameter processing may not be fully working.
+- [ ] **20. Add shell completion**: Bash/Zsh completion for commands and secret names.
 
-- [ ] **26. Missing GPG agent integration**: Should detect and use existing GPG agent when available.
+- [ ] **21. Colored output**: Use colors to improve readability of lists and error messages.
 
-- [ ] **27. No validation of GPG key existence**: Should verify the specified GPG key exists before creating PGP unlock keys.
+- [ ] **22. Add `--quiet` flag**: Option to suppress non-essential output.
 
-### Cross-Platform Issues
+- [ ] **23. Smart secret name suggestions**: When a secret name is not found, suggest similar names.
 
-- [ ] **28. macOS Keychain error handling**: Better error messages when biometric authentication fails or isn't available.
+- [ ] **24. Audit logging**: Log all secret access and modifications for security auditing.
 
-- [ ] **29. Windows path handling**: File paths may not work correctly on Windows systems.
+- [ ] **25. Integration tests for hardware features**: Automated testing of Keychain and GPG functionality.
 
-- [ ] **30. XDG compliance on Linux**: Should respect `XDG_CONFIG_HOME` and other XDG environment variables.
+- [ ] **26. Consistent naming conventions**: Some variables and functions use inconsistent naming patterns.
 
-## Trivial (Nice to have)
+- [ ] **27. Export/import functionality**: Add ability to export/import entire vaults, not just individual secrets.
 
-### Code Quality
+- [ ] **28. Batch operations**: Add commands to process multiple secrets at once.
 
-- [ ] **31. Add more comprehensive unit tests**: Current test coverage could be improved, especially for error conditions.
+- [ ] **29. Search functionality**: Add ability to search secret names and potentially contents.
 
-- [ ] **32. Reduce code duplication**: Several functions have similar patterns that could be refactored.
+- [ ] **30. Secret metadata**: Add support for descriptions, tags, or other metadata with secrets.
 
-- [ ] **33. Improve function documentation**: Many functions lack proper Go documentation comments.
+## COMPLETED ITEMS ✓
 
-- [ ] **34. Add static analysis**: Integrate tools like `staticcheck`, `golangci-lint` with more linters.
+- [x] **Missing secret history/versioning**: ✓ Implemented - versioning system exists with --version flag support
-
+- [x] **XDG compliance on Linux**: ✓ Implemented - uses os.UserConfigDir() which respects XDG_CONFIG_HOME
-### Performance Optimizations
+- [x] **Consistent interface implementation**: ✓ Implemented - Unlocker interface is well-defined and consistently implemented
-
-- [ ] **35. Cache unlock key operations**: Avoid re-reading unlock key metadata on every operation.
-
-- [ ] **36. Optimize file I/O**: Batch file operations where possible to reduce syscalls.
-
-- [ ] **37. Add connection pooling for HSM operations**: For hardware security module operations.
-
-### User Experience Enhancements
-
-- [ ] **38. Add shell completion**: Bash/Zsh completion for commands and secret names.
-
-- [ ] **39. Colored output**: Use colors to improve readability of lists and error messages.
-
-- [ ] **40. Add `--quiet` flag**: Option to suppress non-essential output.
-
-- [ ] **41. Smart secret name suggestions**: When a secret name is not found, suggest similar names.
-
-### Additional Features
-
-- [ ] **42. Secret templates**: Predefined templates for common secret types (database URLs, API keys, etc.).
-
-- [ ] **43. Bulk operations**: Import/export multiple secrets at once.
-
-- [ ] **44. Secret sharing**: Secure sharing of secrets between vaults or users.
-
-- [ ] **45. Audit logging**: Log all secret access and modifications.
-
-- [ ] **46. Integration tests for hardware features**: Automated testing of Keychain and GPG functionality.
-
-### Documentation
-
-- [ ] **47. Man pages**: Generate and install proper Unix man pages.
-
-- [ ] **48. API documentation**: Document the internal API for potential library use.
-
-- [ ] **49. Migration guide**: Document how to migrate from other secret managers.
-
-- [ ] **50. Security audit documentation**: Document security assumptions and threat model.
-
-## Architecture Improvements
-
-### Code Structure
-
-- [ ] **51. Consistent interface implementation**: Ensure all unlocker types properly implement the Unlocker interface.
-
-- [ ] **52. Better separation of concerns**: Some functions in CLI do too much and should be split.
-
-- [ ] **53. Improved error types**: Create specific error types instead of using generic `fmt.Errorf`.
-
-### Testing Infrastructure
-
-- [x] **54. Mock filesystem consistency**: Ensure mock filesystem behavior matches real filesystem in all cases.
-
-- [x] **55. Integration test isolation**: Tests should not affect each other or the host system.
-
-- [ ] **56. Performance benchmarks**: Add benchmarks for crypto operations and file I/O.
-
-## Technical Debt
-
-- [ ] **57. Remove unused code**: Clean up any dead code or unused imports.
-
-- [ ] **58. Standardize JSON schemas**: Create proper JSON schemas for all configuration files.
-
-- [ ] **59. Improve error propagation**: Many functions swallow important context in error messages.
-
-- [ ] **60. Consistent naming conventions**: Some variables and functions use inconsistent naming.
-
-## Development Workflow
-
-- [ ] **61. Add pre-commit hooks**: Ensure code quality and formatting before commits.
-
-- [ ] **62. Continuous integration**: Set up CI/CD pipeline with automated testing.
-
-- [ ] **63. Release automation**: Automate the build and release process.
-
-- [ ] **64. Dependency management**: Regular updates and security scanning of dependencies.
-
----
-
-## Priority Assessment
-
-**Critical items** (1-12) block the 1.0 release and must be fixed for basic functionality and security.
-
-**Important items** (13-30) should be addressed for a polished user experience but don't block the release.
-
-**Trivial items** (31-50) are enhancements that can be addressed in future releases.
-
-**Architecture and Infrastructure** (51-64) are longer-term improvements for maintainability and development workflow.
-
-## Estimated Timeline
-
-- Critical (1-12): 2-3 weeks
-- Important (13-30): 3-4 weeks  
-- Trivial (31-50): Ongoing post-1.0
-- Architecture/Infrastructure (51-64): Ongoing post-1.0
-
-Total estimated time to 1.0: 5-7 weeks with focused development effort. 
-
-### Architecture Issues
-- **Need to refactor unlock key hierarchy**: Current implementation has confusion between the top-level concepts. Fix in progress.
-- Current code uses `unlockers.d/` but documentation shows `unlock-keys.d/`
-- Need to settle on consistent naming: "unlock keys" vs "unlockers" throughout the codebase
-
-- [ ] **51. Consistent interface implementation**: Ensure all unlocker types properly implement the Unlocker interface. 

cmd/secret/main.go

@@ -1,7 +1,8 @@
+// Package main is the entry point for the secret CLI application.
 package main
 
 import "git.eeqj.de/sneak/secret/internal/cli"
 
 func main() {
-	cli.CLIEntry()
+	cli.Entry()
 }

go.mod

@@ -4,10 +4,12 @@ go 1.24.1
 
 require (
 	filippo.io/age v1.2.1
+	github.com/awnumar/memguard v0.22.5
 	github.com/btcsuite/btcd v0.24.2
 	github.com/btcsuite/btcd/btcec/v2 v2.1.3
 	github.com/btcsuite/btcd/btcutil v1.1.6
 	github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d
+	github.com/keybase/go-keychain v0.0.0-20230307172405-3e4884637dd1
 	github.com/oklog/ulid/v2 v2.1.1
 	github.com/spf13/afero v1.14.0
 	github.com/spf13/cobra v1.9.1
@@ -18,16 +20,18 @@ require (
 )
 
 require (
+	github.com/awnumar/memcall v0.2.0 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/kr/pretty v0.2.1 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/kr/text v0.2.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/text v0.25.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -3,6 +3,10 @@ c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805/go.mod h1:FomMrUJ2Lxt5jCLmZ
 filippo.io/age v1.2.1 h1:X0TZjehAZylOIj4DubWYU1vWQxv9bJpo+Uu2/LGhi1o=
 filippo.io/age v1.2.1/go.mod h1:JL9ew2lTN+Pyft4RiNGguFfOpewKwSHm5ayKD/A4004=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
+github.com/awnumar/memcall v0.2.0 h1:sRaogqExTOOkkNwO9pzJsL8jrOV29UuUW7teRMfbqtI=
+github.com/awnumar/memcall v0.2.0/go.mod h1:S911igBPR9CThzd/hYQQmTc9SWNu3ZHIlCGaWsWsoJo=
+github.com/awnumar/memguard v0.22.5 h1:PH7sbUVERS5DdXh3+mLo8FDcl1eIeVjJVYMnyuYpvuI=
+github.com/awnumar/memguard v0.22.5/go.mod h1:+APmZGThMBWjnMlKiSM1X7MVpbIVewen2MTkqWkA/zE=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
 github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
@@ -31,7 +35,6 @@ github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -40,6 +43,10 @@ github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
 github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -60,13 +67,14 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
+github.com/keybase/go-keychain v0.0.0-20230307172405-3e4884637dd1 h1:yi1W8qcFJ2plmaGJFN1npm0KQviWPMCtQOYuwDT6Swk=
+github.com/keybase/go-keychain v0.0.0-20230307172405-3e4884637dd1/go.mod h1:qDHUvIjGZJUtdPtuP4WMu5/U4aVWbFw1MhlkJqCGmCQ=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s=
 github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
@@ -114,11 +122,14 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
@@ -137,9 +148,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/cli/cli.go

@@ -1,91 +1,72 @@
+// Package cli implements the command-line interface for the secret application.
 package cli
 
 import (
-	"bufio"
 	"fmt"
-	"os"
-	"strings"
-	"syscall"
 
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"github.com/spf13/afero"
-	"golang.org/x/term"
+	"github.com/spf13/cobra"
 )
 
-// Global scanner for consistent stdin reading
+// Instance encapsulates all CLI functionality and state
-var stdinScanner *bufio.Scanner
+type Instance struct {
-
-// CLIInstance encapsulates all CLI functionality and state
-type CLIInstance struct {
 	fs       afero.Fs
 	stateDir string
+	cmd      *cobra.Command
 }
 
 // NewCLIInstance creates a new CLI instance with the real filesystem
-func NewCLIInstance() *CLIInstance {
+func NewCLIInstance() (*Instance, error) {
 	fs := afero.NewOsFs()
-	stateDir := secret.DetermineStateDir("")
+	stateDir, err := secret.DetermineStateDir("")
-	return &CLIInstance{
+	if err != nil {
+		return nil, fmt.Errorf("cannot determine state directory: %w", err)
+	}
+
+	return &Instance{
 		fs:       fs,
 		stateDir: stateDir,
-	}
+	}, nil
 }
 
 // NewCLIInstanceWithFs creates a new CLI instance with the given filesystem (for testing)
-func NewCLIInstanceWithFs(fs afero.Fs) *CLIInstance {
+func NewCLIInstanceWithFs(fs afero.Fs) (*Instance, error) {
-	stateDir := secret.DetermineStateDir("")
+	stateDir, err := secret.DetermineStateDir("")
-	return &CLIInstance{
+	if err != nil {
+		return nil, fmt.Errorf("cannot determine state directory: %w", err)
+	}
+
+	return &Instance{
 		fs:       fs,
 		stateDir: stateDir,
-	}
+	}, nil
 }
 
 // NewCLIInstanceWithStateDir creates a new CLI instance with custom state directory (for testing)
-func NewCLIInstanceWithStateDir(fs afero.Fs, stateDir string) *CLIInstance {
+func NewCLIInstanceWithStateDir(fs afero.Fs, stateDir string) *Instance {
-	return &CLIInstance{
+	return &Instance{
 		fs:       fs,
 		stateDir: stateDir,
 	}
 }
 
 // SetFilesystem sets the filesystem for this CLI instance (for testing)
-func (cli *CLIInstance) SetFilesystem(fs afero.Fs) {
+func (cli *Instance) SetFilesystem(fs afero.Fs) {
 	cli.fs = fs
 }
 
 // SetStateDir sets the state directory for this CLI instance (for testing)
-func (cli *CLIInstance) SetStateDir(stateDir string) {
+func (cli *Instance) SetStateDir(stateDir string) {
 	cli.stateDir = stateDir
 }
 
 // GetStateDir returns the state directory for this CLI instance
-func (cli *CLIInstance) GetStateDir() string {
+func (cli *Instance) GetStateDir() string {
 	return cli.stateDir
 }
 
-// getStdinScanner returns a shared scanner for stdin to avoid buffering issues
+// Print outputs to the command's configured output writer
-func getStdinScanner() *bufio.Scanner {
+func (cli *Instance) Print(a ...interface{}) (n int, err error) {
-	if stdinScanner == nil {
+	return fmt.Fprint(cli.cmd.OutOrStdout(), a...)
-		stdinScanner = bufio.NewScanner(os.Stdin)
-	}
-	return stdinScanner
-}
-
-// readLineFromStdin reads a single line from stdin with a prompt
-// Uses a shared scanner to avoid buffering issues between multiple calls
-func readLineFromStdin(prompt string) (string, error) {
-	// Check if stderr is a terminal - if not, we can't prompt interactively
-	if !term.IsTerminal(int(syscall.Stderr)) {
-		return "", fmt.Errorf("cannot prompt for input: stderr is not a terminal (running in non-interactive mode)")
-	}
-
-	fmt.Fprint(os.Stderr, prompt) // Write prompt to stderr, not stdout
-	scanner := getStdinScanner()
-	if !scanner.Scan() {
-		if err := scanner.Err(); err != nil {
-			return "", fmt.Errorf("failed to read from stdin: %w", err)
-		}
-		return "", fmt.Errorf("failed to read from stdin: EOF")
-	}
-	return strings.TrimSpace(scanner.Text()), nil
 }

internal/cli/cli_test.go

@@ -25,7 +25,10 @@ func TestCLIInstanceStateDir(t *testing.T) {
 func TestCLIInstanceWithFs(t *testing.T) {
 	// Test creating CLI instance with custom filesystem
 	fs := afero.NewMemMapFs()
-	cli := NewCLIInstanceWithFs(fs)
+	cli, err := NewCLIInstanceWithFs(fs)
+	if err != nil {
+		t.Fatalf("failed to initialize CLI: %v", err)
+	}
 
 	// The state directory should be determined automatically
 	stateDir := cli.GetStateDir()
@@ -37,29 +40,25 @@ func TestCLIInstanceWithFs(t *testing.T) {
 func TestDetermineStateDir(t *testing.T) {
 	// Test the determineStateDir function from the secret package
 
-	// Save original environment and restore it after test
-	originalStateDir := os.Getenv(secret.EnvStateDir)
-	defer func() {
-		if originalStateDir == "" {
-			os.Unsetenv(secret.EnvStateDir)
-		} else {
-			os.Setenv(secret.EnvStateDir, originalStateDir)
-		}
-	}()
-
 	// Test with environment variable set
 	testEnvDir := "/test-env-dir"
-	os.Setenv(secret.EnvStateDir, testEnvDir)
+	t.Setenv(secret.EnvStateDir, testEnvDir)
 
-	stateDir := secret.DetermineStateDir("")
+	stateDir, err := secret.DetermineStateDir("")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 	if stateDir != testEnvDir {
 		t.Errorf("Expected state directory %q from environment, got %q", testEnvDir, stateDir)
 	}
 
 	// Test with custom config dir
-	os.Unsetenv(secret.EnvStateDir)
+	_ = os.Unsetenv(secret.EnvStateDir)
 	customConfigDir := "/custom-config"
-	stateDir = secret.DetermineStateDir(customConfigDir)
+	stateDir, err = secret.DetermineStateDir(customConfigDir)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
 	expectedDir := filepath.Join(customConfigDir, secret.AppID)
 	if stateDir != expectedDir {
 		t.Errorf("Expected state directory %q with custom config, got %q", expectedDir, stateDir)

internal/cli/completion.go

@@ -0,0 +1,64 @@
+package cli
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+func newCompletionCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "completion [bash|zsh|fish|powershell]",
+		Short: "Generate completion script",
+		Long: `To load completions:
+
+Bash:
+  $ source <(secret completion bash)
+  # To load completions for each session, execute once:
+  # Linux:
+  $ secret completion bash > /etc/bash_completion.d/secret
+  # macOS:
+  $ secret completion bash > $(brew --prefix)/etc/bash_completion.d/secret
+
+Zsh:
+  # If shell completion is not already enabled in your environment,
+  # you will need to enable it.  You can execute the following once:
+  $ echo "autoload -U compinit; compinit" >> ~/.zshrc
+
+  # To load completions for each session, execute once:
+  $ secret completion zsh > "${fpath[1]}/_secret"
+  # You will need to start a new shell for this setup to take effect.
+
+Fish:
+  $ secret completion fish | source
+  # To load completions for each session, execute once:
+  $ secret completion fish > ~/.config/fish/completions/secret.fish
+
+PowerShell:
+  PS> secret completion powershell | Out-String | Invoke-Expression
+  # To load completions for every new session, run:
+  PS> secret completion powershell > secret.ps1
+  # and source this file from your PowerShell profile.
+`,
+		DisableFlagsInUseLine: true,
+		ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
+		Args:                  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			switch args[0] {
+			case "bash":
+				return cmd.Root().GenBashCompletion(os.Stdout)
+			case "zsh":
+				return cmd.Root().GenZshCompletion(os.Stdout)
+			case "fish":
+				return cmd.Root().GenFishCompletion(os.Stdout, true)
+			case "powershell":
+				return cmd.Root().GenPowerShellCompletionWithDesc(os.Stdout)
+			default:
+				return fmt.Errorf("unsupported shell type: %s", args[0])
+			}
+		},
+	}
+
+	return cmd
+}

internal/cli/completions.go

@@ -0,0 +1,205 @@
+package cli
+
+import (
+	"encoding/json"
+	"path/filepath"
+	"strings"
+
+	"git.eeqj.de/sneak/secret/internal/secret"
+	"git.eeqj.de/sneak/secret/internal/vault"
+	"github.com/spf13/afero"
+	"github.com/spf13/cobra"
+)
+
+// getSecretNamesCompletionFunc returns a completion function that provides secret names
+func getSecretNamesCompletionFunc(fs afero.Fs, stateDir string) func(
+	cmd *cobra.Command, args []string, toComplete string,
+) ([]string, cobra.ShellCompDirective) {
+	return func(_ *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+		// Get current vault
+		vlt, err := vault.GetCurrentVault(fs, stateDir)
+		if err != nil {
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		}
+
+		// Get list of secrets
+		secrets, err := vlt.ListSecrets()
+		if err != nil {
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		}
+
+		// Filter secrets based on what user has typed
+		var completions []string
+		for _, secret := range secrets {
+			if strings.HasPrefix(secret, toComplete) {
+				completions = append(completions, secret)
+			}
+		}
+
+		return completions, cobra.ShellCompDirectiveNoFileComp
+	}
+}
+
+// getUnlockerIDsCompletionFunc returns a completion function that provides unlocker IDs
+func getUnlockerIDsCompletionFunc(fs afero.Fs, stateDir string) func(
+	cmd *cobra.Command, args []string, toComplete string,
+) ([]string, cobra.ShellCompDirective) {
+	return func(_ *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+		// Get current vault
+		vlt, err := vault.GetCurrentVault(fs, stateDir)
+		if err != nil {
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		}
+
+		// Get unlocker metadata list
+		unlockerMetadataList, err := vlt.ListUnlockers()
+		if err != nil {
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		}
+
+		// Get vault directory
+		vaultDir, err := vlt.GetDirectory()
+		if err != nil {
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		}
+
+		// Collect unlocker IDs
+		var completions []string
+
+		for _, metadata := range unlockerMetadataList {
+			// Get the actual unlocker ID by creating the unlocker instance
+			unlockersDir := filepath.Join(vaultDir, "unlockers.d")
+			files, err := afero.ReadDir(fs, unlockersDir)
+			if err != nil {
+				secret.Warn("Could not read unlockers directory during completion", "error", err)
+
+				continue
+			}
+
+			for _, file := range files {
+				if !file.IsDir() {
+					continue
+				}
+
+				unlockerDir := filepath.Join(unlockersDir, file.Name())
+				metadataPath := filepath.Join(unlockerDir, "unlocker-metadata.json")
+
+				// Check if this is the right unlocker by comparing metadata
+				metadataBytes, err := afero.ReadFile(fs, metadataPath)
+				if err != nil {
+					secret.Warn("Could not read unlocker metadata during completion", "path", metadataPath, "error", err)
+
+					continue
+				}
+
+				var diskMetadata secret.UnlockerMetadata
+				if err := json.Unmarshal(metadataBytes, &diskMetadata); err != nil {
+					secret.Warn("Could not parse unlocker metadata during completion", "path", metadataPath, "error", err)
+
+					continue
+				}
+
+				// Match by type and creation time
+				if diskMetadata.Type == metadata.Type && diskMetadata.CreatedAt.Equal(metadata.CreatedAt) {
+					// Create the appropriate unlocker instance
+					var unlocker secret.Unlocker
+					switch metadata.Type {
+					case "passphrase":
+						unlocker = secret.NewPassphraseUnlocker(fs, unlockerDir, diskMetadata)
+					case "keychain":
+						unlocker = secret.NewKeychainUnlocker(fs, unlockerDir, diskMetadata)
+					case "pgp":
+						unlocker = secret.NewPGPUnlocker(fs, unlockerDir, diskMetadata)
+					}
+
+					if unlocker != nil {
+						id := unlocker.GetID()
+						if strings.HasPrefix(id, toComplete) {
+							completions = append(completions, id)
+						}
+					}
+
+					break
+				}
+			}
+		}
+
+		return completions, cobra.ShellCompDirectiveNoFileComp
+	}
+}
+
+// getVaultNamesCompletionFunc returns a completion function that provides vault names
+func getVaultNamesCompletionFunc(fs afero.Fs, stateDir string) func(
+	cmd *cobra.Command, args []string, toComplete string,
+) ([]string, cobra.ShellCompDirective) {
+	return func(_ *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+		vaults, err := vault.ListVaults(fs, stateDir)
+		if err != nil {
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		}
+
+		var completions []string
+		for _, v := range vaults {
+			if strings.HasPrefix(v, toComplete) {
+				completions = append(completions, v)
+			}
+		}
+
+		return completions, cobra.ShellCompDirectiveNoFileComp
+	}
+}
+
+// getVaultSecretCompletionFunc returns a completion function for vault:secret format
+// It completes vault names with ":" suffix, and after ":" it completes secrets from that vault
+func getVaultSecretCompletionFunc(fs afero.Fs, stateDir string) func(
+	cmd *cobra.Command, args []string, toComplete string,
+) ([]string, cobra.ShellCompDirective) {
+	return func(_ *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+		var completions []string
+
+		// Check if we're completing after a vault: prefix
+		if strings.Contains(toComplete, ":") {
+			// Complete secret names for the specified vault
+			const vaultSecretParts = 2
+			parts := strings.SplitN(toComplete, ":", vaultSecretParts)
+			vaultName := parts[0]
+			secretPrefix := parts[1]
+
+			vlt := vault.NewVault(fs, stateDir, vaultName)
+			secrets, err := vlt.ListSecrets()
+			if err == nil {
+				for _, secretName := range secrets {
+					if strings.HasPrefix(secretName, secretPrefix) {
+						completions = append(completions, vaultName+":"+secretName)
+					}
+				}
+			}
+
+			return completions, cobra.ShellCompDirectiveNoFileComp
+		}
+
+		// Complete vault names with ":" suffix
+		vaults, err := vault.ListVaults(fs, stateDir)
+		if err == nil {
+			for _, v := range vaults {
+				if strings.HasPrefix(v, toComplete) {
+					completions = append(completions, v+":")
+				}
+			}
+		}
+
+		// Also complete secrets from current vault (for within-vault moves)
+		if currentVlt, err := vault.GetCurrentVault(fs, stateDir); err == nil {
+			secrets, err := currentVlt.ListSecrets()
+			if err == nil {
+				for _, secretName := range secrets {
+					if strings.HasPrefix(secretName, toComplete) {
+						completions = append(completions, secretName)
+					}
+				}
+			}
+		}
+
+		return completions, cobra.ShellCompDirectiveNoSpace
+	}
+}

internal/cli/crypto.go

@@ -8,6 +8,7 @@ import (
 	"filippo.io/age"
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/internal/vault"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/cobra"
 )
 
@@ -21,13 +22,19 @@ func newEncryptCmd() *cobra.Command {
 			inputFile, _ := cmd.Flags().GetString("input")
 			outputFile, _ := cmd.Flags().GetString("output")
 
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+			cli.cmd = cmd
+
 			return cli.Encrypt(args[0], inputFile, outputFile)
 		},
 	}
 
 	cmd.Flags().StringP("input", "i", "", "Input file (default: stdin)")
 	cmd.Flags().StringP("output", "o", "", "Output file (default: stdout)")
+
 	return cmd
 }
 
@@ -41,18 +48,24 @@ func newDecryptCmd() *cobra.Command {
 			inputFile, _ := cmd.Flags().GetString("input")
 			outputFile, _ := cmd.Flags().GetString("output")
 
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+			cli.cmd = cmd
+
 			return cli.Decrypt(args[0], inputFile, outputFile)
 		},
 	}
 
 	cmd.Flags().StringP("input", "i", "", "Input file (default: stdin)")
 	cmd.Flags().StringP("output", "o", "", "Output file (default: stdout)")
+
 	return cmd
 }
 
 // Encrypt encrypts data using an age secret key stored in a secret
-func (cli *CLIInstance) Encrypt(secretName, inputFile, outputFile string) error {
+func (cli *Instance) Encrypt(secretName, inputFile, outputFile string) error {
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
@@ -68,46 +81,46 @@ func (cli *CLIInstance) Encrypt(secretName, inputFile, outputFile string) error
 		return fmt.Errorf("failed to check if secret exists: %w", err)
 	}
 
-	if exists {
+	if !exists { //nolint:nestif // Clear conditional logic for secret generation vs retrieval
-		// Secret exists, get the age secret key from it
-		var secretValue []byte
-		if os.Getenv(secret.EnvMnemonic) != "" {
-			secretValue, err = secretObj.GetValue(nil)
-		} else {
-			unlocker, unlockErr := vlt.GetCurrentUnlocker()
-			if unlockErr != nil {
-				return fmt.Errorf("failed to get current unlocker: %w", unlockErr)
-			}
-			secretValue, err = secretObj.GetValue(unlocker)
-		}
-		if err != nil {
-			return fmt.Errorf("failed to get secret value: %w", err)
-		}
-
-		ageSecretKey = string(secretValue)
-
-		// Validate that it's a valid age secret key
-		if !isValidAgeSecretKey(ageSecretKey) {
-			return fmt.Errorf("secret '%s' does not contain a valid age secret key", secretName)
-		}
-	} else {
 		// Secret doesn't exist, generate new age key and store it
 		identity, err := age.GenerateX25519Identity()
 		if err != nil {
 			return fmt.Errorf("failed to generate age key: %w", err)
 		}
 
-		ageSecretKey = identity.String()
+		// Store the generated key directly in a secure buffer
+		identityStr := identity.String()
+		secureBuffer := memguard.NewBufferFromBytes([]byte(identityStr))
+		defer secureBuffer.Destroy()
 
-		// Store the generated key as a secret
+		// Set ageSecretKey for later use (we need it for encryption)
-		err = vlt.AddSecret(secretName, []byte(ageSecretKey), false)
+		ageSecretKey = identityStr
+
+		err = vlt.AddSecret(secretName, secureBuffer, false)
 		if err != nil {
 			return fmt.Errorf("failed to store age key: %w", err)
 		}
+	} else {
+		// Secret exists, get the age secret key from it
+		secretBuffer, err := cli.getSecretValue(vlt, secretObj)
+		if err != nil {
+			return fmt.Errorf("failed to get secret value: %w", err)
+		}
+		defer secretBuffer.Destroy()
+
+		ageSecretKey = secretBuffer.String()
+
+		// Validate that it's a valid age secret key
+		if !isValidAgeSecretKey(ageSecretKey) {
+			return fmt.Errorf("secret '%s' does not contain a valid age secret key", secretName)
+		}
 	}
 
-	// Parse the secret key
+	// Parse the secret key using secure buffer
-	identity, err := age.ParseX25519Identity(ageSecretKey)
+	finalSecureBuffer := memguard.NewBufferFromBytes([]byte(ageSecretKey))
+	defer finalSecureBuffer.Destroy()
+
+	identity, err := age.ParseX25519Identity(finalSecureBuffer.String())
 	if err != nil {
 		return fmt.Errorf("failed to parse age secret key: %w", err)
 	}
@@ -122,18 +135,18 @@ func (cli *CLIInstance) Encrypt(secretName, inputFile, outputFile string) error
 		if err != nil {
 			return fmt.Errorf("failed to open input file: %w", err)
 		}
-		defer file.Close()
+		defer func() { _ = file.Close() }()
 		input = file
 	}
 
 	// Set up output writer
-	var output io.Writer = os.Stdout
+	output := cli.cmd.OutOrStdout()
 	if outputFile != "" {
 		file, err := cli.fs.Create(outputFile)
 		if err != nil {
 			return fmt.Errorf("failed to create output file: %w", err)
 		}
-		defer file.Close()
+		defer func() { _ = file.Close() }()
 		output = file
 	}
 
@@ -155,7 +168,7 @@ func (cli *CLIInstance) Encrypt(secretName, inputFile, outputFile string) error
 }
 
 // Decrypt decrypts data using an age secret key stored in a secret
-func (cli *CLIInstance) Decrypt(secretName, inputFile, outputFile string) error {
+func (cli *Instance) Decrypt(secretName, inputFile, outputFile string) error {
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
@@ -174,29 +187,28 @@ func (cli *CLIInstance) Decrypt(secretName, inputFile, outputFile string) error
 	}
 
 	// Get the age secret key from the secret
-	var secretValue []byte
+	var secretBuffer *memguard.LockedBuffer
 	if os.Getenv(secret.EnvMnemonic) != "" {
-		secretValue, err = secretObj.GetValue(nil)
+		secretBuffer, err = secretObj.GetValue(nil)
 	} else {
 		unlocker, unlockErr := vlt.GetCurrentUnlocker()
 		if unlockErr != nil {
 			return fmt.Errorf("failed to get current unlocker: %w", unlockErr)
 		}
-		secretValue, err = secretObj.GetValue(unlocker)
+		secretBuffer, err = secretObj.GetValue(unlocker)
 	}
 	if err != nil {
 		return fmt.Errorf("failed to get secret value: %w", err)
 	}
-
+	defer secretBuffer.Destroy()
-	ageSecretKey := string(secretValue)
 
 	// Validate that it's a valid age secret key
-	if !isValidAgeSecretKey(ageSecretKey) {
+	if !isValidAgeSecretKey(secretBuffer.String()) {
 		return fmt.Errorf("secret '%s' does not contain a valid age secret key", secretName)
 	}
 
 	// Parse the age secret key to get the identity
-	identity, err := age.ParseX25519Identity(ageSecretKey)
+	identity, err := age.ParseX25519Identity(secretBuffer.String())
 	if err != nil {
 		return fmt.Errorf("failed to parse age secret key: %w", err)
 	}
@@ -208,18 +220,18 @@ func (cli *CLIInstance) Decrypt(secretName, inputFile, outputFile string) error
 		if err != nil {
 			return fmt.Errorf("failed to open input file: %w", err)
 		}
-		defer file.Close()
+		defer func() { _ = file.Close() }()
 		input = file
 	}
 
 	// Set up output writer
-	var output io.Writer = os.Stdout
+	output := cli.cmd.OutOrStdout()
 	if outputFile != "" {
 		file, err := cli.fs.Create(outputFile)
 		if err != nil {
 			return fmt.Errorf("failed to create output file: %w", err)
 		}
-		defer file.Close()
+		defer func() { _ = file.Close() }()
 		output = file
 	}
 
@@ -239,5 +251,20 @@ func (cli *CLIInstance) Decrypt(secretName, inputFile, outputFile string) error
 // isValidAgeSecretKey checks if a string is a valid age secret key by attempting to parse it
 func isValidAgeSecretKey(key string) bool {
 	_, err := age.ParseX25519Identity(key)
+
 	return err == nil
 }
+
+// getSecretValue retrieves the value of a secret using the appropriate unlocker
+func (cli *Instance) getSecretValue(vlt *vault.Vault, secretObj *secret.Secret) (*memguard.LockedBuffer, error) {
+	if os.Getenv(secret.EnvMnemonic) != "" {
+		return secretObj.GetValue(nil)
+	}
+
+	unlocker, err := vlt.GetCurrentUnlocker()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get current unlocker: %w", err)
+	}
+
+	return secretObj.GetValue(unlocker)
+}

internal/cli/generate.go

@@ -6,11 +6,17 @@ import (
 	"math/big"
 	"os"
 
-	"git.eeqj.de/sneak/secret/internal/secret"
+	"git.eeqj.de/sneak/secret/internal/vault"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/cobra"
 	"github.com/tyler-smith/go-bip39"
 )
 
+const (
+	defaultSecretLength = 16
+	mnemonicEntropyBits = 128
+)
+
 func newGenerateCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "generate",
@@ -28,10 +34,16 @@ func newGenerateMnemonicCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:   "mnemonic",
 		Short: "Generate a random BIP39 mnemonic phrase",
-		Long:  `Generate a cryptographically secure random BIP39 mnemonic phrase that can be used with 'secret init' or 'secret import'.`,
+		Long: `Generate a cryptographically secure random BIP39 ` +
-		RunE: func(cmd *cobra.Command, args []string) error {
+			`mnemonic phrase that can be used with 'secret init' ` +
-			cli := NewCLIInstance()
+			`or 'secret import'.`,
-			return cli.GenerateMnemonic()
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.GenerateMnemonic(cmd)
 		},
 	}
 }
@@ -47,12 +59,16 @@ func newGenerateSecretCmd() *cobra.Command {
 			secretType, _ := cmd.Flags().GetString("type")
 			force, _ := cmd.Flags().GetBool("force")
 
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
-			return cli.GenerateSecret(args[0], length, secretType, force)
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.GenerateSecret(cmd, args[0], length, secretType, force)
 		},
 	}
 
-	cmd.Flags().IntP("length", "l", 16, "Length of the generated secret (default 16)")
+	cmd.Flags().IntP("length", "l", defaultSecretLength, "Length of the generated secret (default 16)")
 	cmd.Flags().StringP("type", "t", "base58", "Type of secret to generate (base58, alnum)")
 	cmd.Flags().BoolP("force", "f", false, "Overwrite existing secret")
 
@@ -60,9 +76,9 @@ func newGenerateSecretCmd() *cobra.Command {
 }
 
 // GenerateMnemonic generates a random BIP39 mnemonic phrase
-func (cli *CLIInstance) GenerateMnemonic() error {
+func (cli *Instance) GenerateMnemonic(cmd *cobra.Command) error {
 	// Generate 128 bits of entropy for a 12-word mnemonic
-	entropy, err := bip39.NewEntropy(128)
+	entropy, err := bip39.NewEntropy(mnemonicEntropyBits)
 	if err != nil {
 		return fmt.Errorf("failed to generate entropy: %w", err)
 	}
@@ -74,7 +90,7 @@ func (cli *CLIInstance) GenerateMnemonic() error {
 	}
 
 	// Output mnemonic to stdout
-	fmt.Println(mnemonic)
+	cmd.Println(mnemonic)
 
 	// Output helpful information to stderr
 	fmt.Fprintln(os.Stderr, "")
@@ -92,7 +108,13 @@ func (cli *CLIInstance) GenerateMnemonic() error {
 }
 
 // GenerateSecret generates a random secret and stores it in the vault
-func (cli *CLIInstance) GenerateSecret(secretName string, length int, secretType string, force bool) error {
+func (cli *Instance) GenerateSecret(
+	cmd *cobra.Command,
+	secretName string,
+	length int,
+	secretType string,
+	force bool,
+) error {
 	if length < 1 {
 		return fmt.Errorf("length must be at least 1")
 	}
@@ -116,28 +138,35 @@ func (cli *CLIInstance) GenerateSecret(secretName string, length int, secretType
 	}
 
 	// Store the secret in the vault
-	vault, err := secret.GetCurrentVault(cli.fs, cli.stateDir)
+	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
 		return err
 	}
 
-	if err := vault.AddSecret(secretName, []byte(secretValue), force); err != nil {
+	// Protect the generated secret immediately
+	secretBuffer := memguard.NewBufferFromBytes([]byte(secretValue))
+	defer secretBuffer.Destroy()
+
+	if err := vlt.AddSecret(secretName, secretBuffer, force); err != nil {
 		return err
 	}
 
-	fmt.Printf("Generated and stored %d-character %s secret: %s\n", length, secretType, secretName)
+	cmd.Printf("Generated and stored %d-character %s secret: %s\n", length, secretType, secretName)
+
 	return nil
 }
 
 // generateRandomBase58 generates a random base58 string of the specified length
 func generateRandomBase58(length int) (string, error) {
 	const base58Chars = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
+
 	return generateRandomString(length, base58Chars)
 }
 
 // generateRandomAlnum generates a random alphanumeric string of the specified length
 func generateRandomAlnum(length int) (string, error) {
 	const alnumChars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+
 	return generateRandomString(length, alnumChars)
 }
 
@@ -150,7 +179,7 @@ func generateRandomString(length int, charset string) (string, error) {
 	result := make([]byte, length)
 	charsetLen := big.NewInt(int64(len(charset)))
 
-	for i := 0; i < length; i++ {
+	for i := range length {
 		randomIndex, err := rand.Int(rand.Reader, charsetLen)
 		if err != nil {
 			return "", fmt.Errorf("failed to generate random number: %w", err)

internal/cli/info.go

@@ -0,0 +1,165 @@
+package cli
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"log"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"time"
+
+	"git.eeqj.de/sneak/secret/internal/vault"
+	"github.com/dustin/go-humanize"
+	"github.com/fatih/color"
+	"github.com/spf13/afero"
+	"github.com/spf13/cobra"
+)
+
+// Version info - these are set at build time
+var ( //nolint:gochecknoglobals // Set at build time
+	Version   = "dev"     //nolint:gochecknoglobals // Set at build time
+	GitCommit = "unknown" //nolint:gochecknoglobals // Set at build time
+)
+
+// InfoOutput represents the system information for JSON output
+type InfoOutput struct {
+	Version       string    `json:"version"`
+	GitCommit     string    `json:"gitCommit"`
+	Author        string    `json:"author"`
+	License       string    `json:"license"`
+	GoVersion     string    `json:"goVersion"`
+	DataDirectory string    `json:"dataDirectory"`
+	CurrentVault  string    `json:"currentVault"`
+	NumVaults     int       `json:"numVaults"`
+	NumSecrets    int       `json:"numSecrets"`
+	TotalSize     int64     `json:"totalSizeBytes"`
+	OldestSecret  time.Time `json:"oldestSecret,omitempty"`
+	LatestSecret  time.Time `json:"latestSecret,omitempty"`
+}
+
+// newInfoCmd returns the info command
+func newInfoCmd() *cobra.Command {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+
+	var jsonOutput bool
+
+	cmd := &cobra.Command{
+		Use:   "info",
+		Short: "Display system information",
+		Long:  "Display information about the secret system including version, vault statistics, and storage usage",
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			return cli.Info(cmd, jsonOutput)
+		},
+	}
+
+	cmd.Flags().BoolVar(&jsonOutput, "json", false, "Output in JSON format")
+
+	return cmd
+}
+
+// Info displays system information
+func (cli *Instance) Info(cmd *cobra.Command, jsonOutput bool) error {
+	info := InfoOutput{
+		Version:       Version,
+		GitCommit:     GitCommit,
+		Author:        "Jeffrey Paul <sneak@sneak.berlin>",
+		License:       "WTFPL",
+		GoVersion:     runtime.Version(),
+		DataDirectory: cli.stateDir,
+	}
+
+	// Get current vault
+	currentVault, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
+	if err == nil {
+		info.CurrentVault = currentVault.Name
+	}
+
+	// Count vaults
+	vaultsDir := filepath.Join(cli.stateDir, "vaults.d")
+	vaultEntries, err := afero.ReadDir(cli.fs, vaultsDir)
+	if err == nil {
+		for _, entry := range vaultEntries {
+			if entry.IsDir() {
+				info.NumVaults++
+			}
+		}
+	}
+
+	// Gather statistics from all vaults
+	if info.NumVaults > 0 {
+		totalSecrets, totalSize, oldestTime, latestTime, _ := gatherVaultStats(cli.fs, vaultsDir)
+		info.NumSecrets = totalSecrets
+		info.TotalSize = totalSize
+		if !oldestTime.IsZero() {
+			info.OldestSecret = oldestTime
+		}
+		if !latestTime.IsZero() {
+			info.LatestSecret = latestTime
+		}
+	}
+
+	if jsonOutput {
+		encoder := json.NewEncoder(cmd.OutOrStdout())
+		encoder.SetIndent("", "  ")
+
+		return encoder.Encode(info)
+	}
+
+	// Pretty print with colors and emoji
+	return prettyPrintInfo(cmd.OutOrStdout(), info)
+}
+
+// prettyPrintInfo formats and prints the info in a pretty format
+func prettyPrintInfo(w io.Writer, info InfoOutput) error {
+	const separatorLength = 40
+
+	bold := color.New(color.Bold)
+	green := color.New(color.FgGreen)
+	cyan := color.New(color.FgCyan)
+	yellow := color.New(color.FgYellow)
+	magenta := color.New(color.FgMagenta)
+
+	_, _ = fmt.Fprintln(w)
+	_, _ = bold.Fprintln(w, "🔐 Secret System Information")
+	_, _ = fmt.Fprintln(w, strings.Repeat("─", separatorLength))
+
+	_, _ = fmt.Fprintf(w, "📦 Version:          %s\n", green.Sprint(info.Version))
+	_, _ = fmt.Fprintf(w, "🔧 Git Commit:       %s\n", cyan.Sprint(info.GitCommit))
+	_, _ = fmt.Fprintf(w, "👤 Author:           %s\n", cyan.Sprint(info.Author))
+	_, _ = fmt.Fprintf(w, "📜 License:          %s\n", cyan.Sprint(info.License))
+	_, _ = fmt.Fprintf(w, "🐹 Go Version:       %s\n", cyan.Sprint(info.GoVersion))
+	_, _ = fmt.Fprintf(w, "📁 Data Directory:   %s\n", yellow.Sprint(info.DataDirectory))
+
+	if info.CurrentVault != "" {
+		_, _ = fmt.Fprintf(w, "🗄️  Current Vault:    %s\n", magenta.Sprint(info.CurrentVault))
+	} else {
+		_, _ = fmt.Fprintf(w, "🗄️  Current Vault:    %s\n", color.RedString("(none)"))
+	}
+
+	_, _ = fmt.Fprintln(w, strings.Repeat("─", separatorLength))
+
+	_, _ = fmt.Fprintf(w, "🗂️  Vaults:           %s\n", bold.Sprint(info.NumVaults))
+	_, _ = fmt.Fprintf(w, "🔑 Secrets:          %s\n", bold.Sprint(info.NumSecrets))
+	if info.TotalSize >= 0 {
+		//nolint:gosec // TotalSize is always >= 0
+		_, _ = fmt.Fprintf(w, "💾 Total Size:       %s\n", bold.Sprint(humanize.Bytes(uint64(info.TotalSize))))
+	} else {
+		_, _ = fmt.Fprintf(w, "💾 Total Size:       %s\n", bold.Sprint("0 B"))
+	}
+
+	if !info.OldestSecret.IsZero() {
+		_, _ = fmt.Fprintf(w, "🕰️  Oldest Secret:    %s\n", info.OldestSecret.Format("2006-01-02 15:04:05"))
+	}
+	if !info.LatestSecret.IsZero() {
+		_, _ = fmt.Fprintf(w, "✨ Latest Secret:    %s\n", info.LatestSecret.Format("2006-01-02 15:04:05"))
+	}
+
+	_, _ = fmt.Fprintln(w)
+
+	return nil
+}

internal/cli/info_helper.go

@@ -0,0 +1,88 @@
+package cli
+
+import (
+	"path/filepath"
+	"time"
+
+	"git.eeqj.de/sneak/secret/internal/secret"
+	"github.com/spf13/afero"
+)
+
+// gatherVaultStats collects statistics from all vaults
+func gatherVaultStats(
+	fs afero.Fs,
+	vaultsDir string,
+) (totalSecrets int, totalSize int64, oldestTime, latestTime time.Time, err error) {
+	vaultEntries, err := afero.ReadDir(fs, vaultsDir)
+	if err != nil {
+		return 0, 0, time.Time{}, time.Time{}, err
+	}
+
+	for _, vaultEntry := range vaultEntries {
+		if !vaultEntry.IsDir() {
+			continue
+		}
+
+		vaultPath := filepath.Join(vaultsDir, vaultEntry.Name())
+		secretsPath := filepath.Join(vaultPath, "secrets.d")
+
+		// Count secrets in this vault
+		secretEntries, err := afero.ReadDir(fs, secretsPath)
+		if err != nil {
+			secret.Warn("Could not read secrets directory for vault", "vault", vaultEntry.Name(), "error", err)
+
+			continue
+		}
+
+		for _, secretEntry := range secretEntries {
+			if !secretEntry.IsDir() {
+				continue
+			}
+
+			totalSecrets++
+			secretPath := filepath.Join(secretsPath, secretEntry.Name())
+
+			// Get size and timestamps from all versions
+			versionsPath := filepath.Join(secretPath, "versions")
+			versionEntries, err := afero.ReadDir(fs, versionsPath)
+			if err != nil {
+				secret.Warn("Could not read versions directory for secret", "secret", secretEntry.Name(), "error", err)
+
+				continue
+			}
+
+			for _, versionEntry := range versionEntries {
+				if !versionEntry.IsDir() {
+					continue
+				}
+
+				versionPath := filepath.Join(versionsPath, versionEntry.Name())
+
+				// Add size of encrypted data
+				dataPath := filepath.Join(versionPath, "data.age")
+				if stat, err := fs.Stat(dataPath); err == nil {
+					totalSize += stat.Size()
+				}
+
+				// Add size of metadata
+				metaPath := filepath.Join(versionPath, "metadata.age")
+				if stat, err := fs.Stat(metaPath); err == nil {
+					totalSize += stat.Size()
+				}
+
+				// Track timestamps
+				if stat, err := fs.Stat(versionPath); err == nil {
+					modTime := stat.ModTime()
+					if oldestTime.IsZero() || modTime.Before(oldestTime) {
+						oldestTime = modTime
+					}
+					if latestTime.IsZero() || modTime.After(latestTime) {
+						latestTime = modTime
+					}
+				}
+			}
+		}
+	}
+
+	return totalSecrets, totalSize, oldestTime, latestTime, nil
+}

internal/cli/init.go

@@ -2,35 +2,42 @@ package cli
 
 import (
 	"fmt"
+	"log"
 	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
-	"time"
 
-	"filippo.io/age"
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/internal/vault"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
-	"github.com/spf13/afero"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/cobra"
 	"github.com/tyler-smith/go-bip39"
 )
 
-func newInitCmd() *cobra.Command {
+// NewInitCmd creates the init command
+func NewInitCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:   "init",
 		Short: "Initialize the secrets manager",
 		Long:  `Create the necessary directory structure for storing secrets and generate encryption keys.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE:  RunInit,
-			cli := NewCLIInstance()
-			return cli.Init(cmd)
-		},
 	}
 }
 
-// Init initializes the secrets manager
+// RunInit is the exported function that handles the init command
-func (cli *CLIInstance) Init(cmd *cobra.Command) error {
+func RunInit(cmd *cobra.Command, _ []string) error {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+
+	return cli.Init(cmd)
+}
+
+// Init initializes the secret manager
+func (cli *Instance) Init(cmd *cobra.Command) error {
 	secret.Debug("Starting secret manager initialization")
 
 	// Create state directory
@@ -39,6 +46,7 @@ func (cli *CLIInstance) Init(cmd *cobra.Command) error {
 
 	if err := cli.fs.MkdirAll(stateDir, secret.DirPerms); err != nil {
 		secret.Debug("Failed to create state directory", "error", err)
+
 		return fmt.Errorf("failed to create state directory: %w", err)
 	}
 
@@ -54,17 +62,22 @@ func (cli *CLIInstance) Init(cmd *cobra.Command) error {
 		mnemonicStr = envMnemonic
 	} else {
 		secret.Debug("Prompting user for mnemonic phrase")
-		// Read mnemonic from stdin using shared line reader
+		// Read mnemonic securely without echo
-		var err error
+		mnemonicBuffer, err := secret.ReadPassphrase("Enter your BIP39 mnemonic phrase: ")
-		mnemonicStr, err = readLineFromStdin("Enter your BIP39 mnemonic phrase: ")
 		if err != nil {
 			secret.Debug("Failed to read mnemonic from stdin", "error", err)
+
 			return fmt.Errorf("failed to read mnemonic: %w", err)
 		}
+		defer mnemonicBuffer.Destroy()
+
+		mnemonicStr = mnemonicBuffer.String()
+		fmt.Fprintln(os.Stderr) // Add newline after hidden input
 	}
 
 	if mnemonicStr == "" {
 		secret.Debug("Empty mnemonic provided")
+
 		return fmt.Errorf("mnemonic cannot be empty")
 	}
 
@@ -72,122 +85,79 @@ func (cli *CLIInstance) Init(cmd *cobra.Command) error {
 	secret.DebugWith("Validating BIP39 mnemonic", slog.Int("word_count", len(strings.Fields(mnemonicStr))))
 	if !bip39.IsMnemonicValid(mnemonicStr) {
 		secret.Debug("Invalid BIP39 mnemonic provided")
+
 		return fmt.Errorf("invalid BIP39 mnemonic phrase\nRun 'secret generate mnemonic' to create a valid mnemonic")
 	}
 
-	// Calculate mnemonic hash for index tracking
+	// Set mnemonic in environment for CreateVault to use
-	mnemonicHash := vault.ComputeDoubleSHA256([]byte(mnemonicStr))
+	originalMnemonic := os.Getenv(secret.EnvMnemonic)
-	secret.DebugWith("Calculated mnemonic hash", slog.String("hash", mnemonicHash))
+	_ = os.Setenv(secret.EnvMnemonic, mnemonicStr)
+	defer func() {
+		if originalMnemonic != "" {
+			_ = os.Setenv(secret.EnvMnemonic, originalMnemonic)
+		} else {
+			_ = os.Unsetenv(secret.EnvMnemonic)
+		}
+	}()
 
-	// Get the next available derivation index for this mnemonic
+	// Create the default vault - it will handle key derivation internally
-	derivationIndex, err := vault.GetNextDerivationIndex(cli.fs, cli.stateDir, mnemonicHash)
-	if err != nil {
-		secret.Debug("Failed to get next derivation index", "error", err)
-		return fmt.Errorf("failed to get next derivation index: %w", err)
-	}
-	secret.DebugWith("Using derivation index", slog.Uint64("index", uint64(derivationIndex)))
-
-	// Derive long-term keypair from mnemonic with the appropriate index
-	secret.DebugWith("Deriving long-term key from mnemonic", slog.Uint64("index", uint64(derivationIndex)))
-	ltIdentity, err := agehd.DeriveIdentity(mnemonicStr, derivationIndex)
-	if err != nil {
-		secret.Debug("Failed to derive long-term key", "error", err)
-		return fmt.Errorf("failed to derive long-term key from mnemonic: %w", err)
-	}
-
-	// Calculate the long-term key hash
-	ltKeyHash := vault.ComputeDoubleSHA256([]byte(ltIdentity.String()))
-	secret.DebugWith("Calculated long-term key hash", slog.String("hash", ltKeyHash))
-
-	// Create the default vault
 	secret.Debug("Creating default vault")
 	vlt, err := vault.CreateVault(cli.fs, cli.stateDir, "default")
 	if err != nil {
 		secret.Debug("Failed to create default vault", "error", err)
+
 		return fmt.Errorf("failed to create default vault: %w", err)
 	}
 
-	// Set as current vault
+	// Get the vault metadata to retrieve the derivation index
-	secret.Debug("Setting default vault as current")
-	if err := vault.SelectVault(cli.fs, cli.stateDir, "default"); err != nil {
-		secret.Debug("Failed to select default vault", "error", err)
-		return fmt.Errorf("failed to select default vault: %w", err)
-	}
-
-	// Store long-term public key in vault
 	vaultDir := filepath.Join(stateDir, "vaults.d", "default")
-	ltPubKey := ltIdentity.Recipient().String()
+	metadata, err := vault.LoadVaultMetadata(cli.fs, vaultDir)
-	secret.DebugWith("Storing long-term public key", slog.String("pubkey", ltPubKey), slog.String("vault_dir", vaultDir))
+	if err != nil {
-	if err := afero.WriteFile(cli.fs, filepath.Join(vaultDir, "pub.age"), []byte(ltPubKey), secret.FilePerms); err != nil {
+		secret.Debug("Failed to load vault metadata", "error", err)
-		secret.Debug("Failed to write long-term public key", "error", err)
+
-		return fmt.Errorf("failed to write long-term public key: %w", err)
+		return fmt.Errorf("failed to load vault metadata: %w", err)
 	}
 
-	// Save vault metadata
+	// Derive the long-term key using the same index that CreateVault used
-	metadata := &vault.VaultMetadata{
+	ltIdentity, err := agehd.DeriveIdentity(mnemonicStr, metadata.DerivationIndex)
-		Name:            "default",
+	if err != nil {
-		CreatedAt:       time.Now(),
+		secret.Debug("Failed to derive long-term key", "error", err)
-		DerivationIndex: derivationIndex,
+
-		LongTermKeyHash: ltKeyHash,
+		return fmt.Errorf("failed to derive long-term key from mnemonic: %w", err)
-		MnemonicHash:    mnemonicHash,
 	}
-	if err := vault.SaveVaultMetadata(cli.fs, vaultDir, metadata); err != nil {
+	ltPubKey := ltIdentity.Recipient().String()
-		secret.Debug("Failed to save vault metadata", "error", err)
-		return fmt.Errorf("failed to save vault metadata: %w", err)
-	}
-	secret.Debug("Saved vault metadata with derivation index and key hash")
 
 	// Unlock the vault with the derived long-term key
 	vlt.Unlock(ltIdentity)
 
 	// Prompt for passphrase for unlocker
-	var passphraseStr string
+	var passphraseBuffer *memguard.LockedBuffer
 	if envPassphrase := os.Getenv(secret.EnvUnlockPassphrase); envPassphrase != "" {
 		secret.Debug("Using unlock passphrase from environment variable")
-		passphraseStr = envPassphrase
+		passphraseBuffer = memguard.NewBufferFromBytes([]byte(envPassphrase))
 	} else {
 		secret.Debug("Prompting user for unlock passphrase")
 		// Use secure passphrase input with confirmation
-		passphraseStr, err = readSecurePassphrase("Enter passphrase for unlocker: ")
+		passphraseBuffer, err = readSecurePassphrase("Enter passphrase for unlocker: ")
 		if err != nil {
 			secret.Debug("Failed to read unlock passphrase", "error", err)
+
 			return fmt.Errorf("failed to read passphrase: %w", err)
 		}
 	}
+	defer passphraseBuffer.Destroy()
 
 	// Create passphrase-protected unlocker
 	secret.Debug("Creating passphrase-protected unlocker")
-	passphraseUnlocker, err := vlt.CreatePassphraseUnlocker(passphraseStr)
+	passphraseUnlocker, err := vlt.CreatePassphraseUnlocker(passphraseBuffer)
 	if err != nil {
 		secret.Debug("Failed to create unlocker", "error", err)
+
 		return fmt.Errorf("failed to create unlocker: %w", err)
 	}
 
-	// Encrypt long-term private key to the unlocker
+	// Note: CreatePassphraseUnlocker already encrypts and writes the long-term
-	unlockerDir := passphraseUnlocker.GetDirectory()
+	// private key to longterm.age, so no need to do it again here.
-
-	// Read unlocker public key
-	unlockerPubKeyData, err := afero.ReadFile(cli.fs, filepath.Join(unlockerDir, "pub.age"))
-	if err != nil {
-		return fmt.Errorf("failed to read unlocker public key: %w", err)
-	}
-
-	unlockerRecipient, err := age.ParseX25519Recipient(string(unlockerPubKeyData))
-	if err != nil {
-		return fmt.Errorf("failed to parse unlocker public key: %w", err)
-	}
-
-	// Encrypt long-term private key to unlocker
-	ltPrivKeyData := []byte(ltIdentity.String())
-	encryptedLtPrivKey, err := secret.EncryptToRecipient(ltPrivKeyData, unlockerRecipient)
-	if err != nil {
-		return fmt.Errorf("failed to encrypt long-term private key: %w", err)
-	}
-
-	// Write encrypted long-term private key
-	if err := afero.WriteFile(cli.fs, filepath.Join(unlockerDir, "longterm.age"), encryptedLtPrivKey, secret.FilePerms); err != nil {
-		return fmt.Errorf("failed to write encrypted long-term private key: %w", err)
-	}
 
 	if cmd != nil {
 		cmd.Printf("\nDefault vault created and configured\n")
@@ -203,23 +173,33 @@ func (cli *CLIInstance) Init(cmd *cobra.Command) error {
 
 // readSecurePassphrase reads a passphrase securely from the terminal without echoing
 // This version adds confirmation (read twice) for creating new unlockers
-func readSecurePassphrase(prompt string) (string, error) {
+// Returns a LockedBuffer containing the passphrase
+func readSecurePassphrase(prompt string) (*memguard.LockedBuffer, error) {
 	// Get the first passphrase
-	passphrase1, err := secret.ReadPassphrase(prompt)
+	passphraseBuffer1, err := secret.ReadPassphrase(prompt)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
 	// Read confirmation passphrase
-	passphrase2, err := secret.ReadPassphrase("Confirm passphrase: ")
+	passphraseBuffer2, err := secret.ReadPassphrase("Confirm passphrase: ")
 	if err != nil {
-		return "", fmt.Errorf("failed to read passphrase confirmation: %w", err)
+		passphraseBuffer1.Destroy()
+
+		return nil, fmt.Errorf("failed to read passphrase confirmation: %w", err)
 	}
 
 	// Compare passphrases
-	if passphrase1 != passphrase2 {
+	if passphraseBuffer1.String() != passphraseBuffer2.String() {
-		return "", fmt.Errorf("passphrases do not match")
+		passphraseBuffer1.Destroy()
+		passphraseBuffer2.Destroy()
+
+		return nil, fmt.Errorf("passphrases do not match")
 	}
 
-	return passphrase1, nil
+	// Clean up the second buffer, we'll return the first
+	passphraseBuffer2.Destroy()
+
+	// Return the first buffer (caller is responsible for destroying it)
+	return passphraseBuffer1, nil
 }

internal/cli/root.go

@@ -7,9 +7,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// CLIEntry is the entry point for the secret CLI application
+// Entry is the entry point for the secret CLI application
-func CLIEntry() {
+func Entry() {
-	secret.Debug("CLIEntry starting - debug output is working")
 	cmd := newRootCmd()
 	if err := cmd.Execute(); err != nil {
 		os.Exit(1)
@@ -29,19 +28,23 @@ func newRootCmd() *cobra.Command {
 
 	secret.Debug("Adding subcommands to root command")
 	// Add subcommands
-	cmd.AddCommand(newInitCmd())
+	cmd.AddCommand(NewInitCmd())
 	cmd.AddCommand(newGenerateCmd())
 	cmd.AddCommand(newVaultCmd())
 	cmd.AddCommand(newAddCmd())
 	cmd.AddCommand(newGetCmd())
 	cmd.AddCommand(newListCmd())
-	cmd.AddCommand(newUnlockersCmd())
+	cmd.AddCommand(newRemoveCmd())
+	cmd.AddCommand(newMoveCmd())
 	cmd.AddCommand(newUnlockerCmd())
 	cmd.AddCommand(newImportCmd())
 	cmd.AddCommand(newEncryptCmd())
 	cmd.AddCommand(newDecryptCmd())
 	cmd.AddCommand(newVersionCmd())
+	cmd.AddCommand(newInfoCmd())
+	cmd.AddCommand(newCompletionCmd())
 
 	secret.Debug("newRootCmd completed")
+
 	return cmd
 }

internal/cli/secrets.go

@@ -4,15 +4,36 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"os"
+	"log"
+	"path/filepath"
 	"strings"
 
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/internal/vault"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 )
 
+const (
+	// vaultSecretSeparator is the delimiter between vault name and secret name
+	vaultSecretSeparator = ":"
+	// vaultSecretParts is the number of parts when splitting vault:secret
+	vaultSecretParts = 2
+)
+
+// ParseVaultSecretRef parses a "vault:secret" or just "secret" reference
+// Returns (vaultName, secretName, isQualified)
+// If no vault is specified, returns empty vaultName and isQualified=false
+func ParseVaultSecretRef(ref string) (vaultName, secretName string, isQualified bool) {
+	parts := strings.SplitN(ref, vaultSecretSeparator, vaultSecretParts)
+	if len(parts) == vaultSecretParts {
+		return parts[0], parts[1], true
+	}
+
+	return "", ref, false
+}
+
 func newAddCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "add <secret-name>",
@@ -24,29 +45,45 @@ func newAddCmd() *cobra.Command {
 			force, _ := cmd.Flags().GetBool("force")
 			secret.Debug("Got force flag", "force", force)
 
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+			cli.cmd = cmd // Set the command for stdin access
 			secret.Debug("Created CLI instance, calling AddSecret")
+
 			return cli.AddSecret(args[0], force)
 		},
 	}
 
 	cmd.Flags().BoolP("force", "f", false, "Overwrite existing secret")
+
 	return cmd
 }
 
 func newGetCmd() *cobra.Command {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
 	cmd := &cobra.Command{
-		Use:   "get <secret-name>",
+		Use:               "get <secret-name>",
-		Short: "Retrieve a secret from the vault",
+		Short:             "Retrieve a secret from the vault",
-		Args:  cobra.ExactArgs(1),
+		Args:              cobra.ExactArgs(1),
+		ValidArgsFunction: getSecretNamesCompletionFunc(cli.fs, cli.stateDir),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			version, _ := cmd.Flags().GetString("version")
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
-			return cli.GetSecretWithVersion(args[0], version)
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.GetSecretWithVersion(cmd, args[0], version)
 		},
 	}
 
 	cmd.Flags().StringP("version", "v", "", "Get a specific version (default: current)")
+
 	return cmd
 }
 
@@ -59,18 +96,25 @@ func newListCmd() *cobra.Command {
 		Args:    cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			jsonOutput, _ := cmd.Flags().GetBool("json")
+			quietOutput, _ := cmd.Flags().GetBool("quiet")
 
 			var filter string
 			if len(args) > 0 {
 				filter = args[0]
 			}
 
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
-			return cli.ListSecrets(jsonOutput, filter)
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.ListSecrets(cmd, jsonOutput, quietOutput, filter)
 		},
 	}
 
 	cmd.Flags().Bool("json", false, "Output in JSON format")
+	cmd.Flags().BoolP("quiet", "q", false, "Output only secret names (for scripting)")
+
 	return cmd
 }
 
@@ -84,19 +128,105 @@ func newImportCmd() *cobra.Command {
 			sourceFile, _ := cmd.Flags().GetString("source")
 			force, _ := cmd.Flags().GetBool("force")
 
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
-			return cli.ImportSecret(args[0], sourceFile, force)
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.ImportSecret(cmd, args[0], sourceFile, force)
 		},
 	}
 
 	cmd.Flags().StringP("source", "s", "", "Source file to import from (required)")
 	cmd.Flags().BoolP("force", "f", false, "Overwrite existing secret")
 	_ = cmd.MarkFlagRequired("source")
+
 	return cmd
 }
 
+func newRemoveCmd() *cobra.Command {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+	cmd := &cobra.Command{
+		Use:     "remove <secret-name>",
+		Aliases: []string{"rm"},
+		Short:   "Remove a secret from the vault",
+		Long: `Remove a secret and all its versions from the current vault. This action is permanent and ` +
+			`cannot be undone.`,
+		Args:              cobra.ExactArgs(1),
+		ValidArgsFunction: getSecretNamesCompletionFunc(cli.fs, cli.stateDir),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.RemoveSecret(cmd, args[0], false)
+		},
+	}
+
+	return cmd
+}
+
+func newMoveCmd() *cobra.Command {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+	cmd := &cobra.Command{
+		Use:     "move <source> <destination>",
+		Aliases: []string{"mv", "rename"},
+		Short:   "Move or rename a secret",
+		Long: `Move a secret within a vault or between vaults.
+
+For within-vault moves (rename):
+  secret move old-name new-name
+
+For cross-vault moves:
+  secret move source-vault:secret-name dest-vault
+  secret move source-vault:secret-name dest-vault:new-name
+
+Cross-vault moves copy ALL versions of the secret, preserving history.
+The source secret is deleted after successful copy.`,
+		Args: cobra.ExactArgs(2), //nolint:mnd // Command requires exactly 2 arguments: source and destination
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			// Complete vault:secret format
+			return getVaultSecretCompletionFunc(cli.fs, cli.stateDir)(cmd, args, toComplete)
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			force, _ := cmd.Flags().GetBool("force")
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.MoveSecret(cmd, args[0], args[1], force)
+		},
+	}
+
+	cmd.Flags().BoolP("force", "f", false, "Overwrite if destination secret already exists")
+
+	return cmd
+}
+
+// updateBufferSize updates the buffer size based on usage pattern
+func updateBufferSize(currentSize int, sameSize *int) int {
+	*sameSize++
+	const doubleAfterBuffers = 2
+	const growthFactor = 2
+	if *sameSize >= doubleAfterBuffers {
+		*sameSize = 0
+
+		return currentSize * growthFactor
+	}
+
+	return currentSize
+}
+
 // AddSecret adds a secret to the current vault
-func (cli *CLIInstance) AddSecret(secretName string, force bool) error {
+func (cli *Instance) AddSecret(secretName string, force bool) error {
 	secret.Debug("CLI AddSecret starting", "secret_name", secretName, "force", force)
 
 	// Get current vault
@@ -108,42 +238,109 @@ func (cli *CLIInstance) AddSecret(secretName string, force bool) error {
 
 	secret.Debug("Got current vault", "vault_name", vlt.GetName())
 
-	// Read secret value from stdin
+	// Read secret value directly into protected buffers
-	secret.Debug("Reading secret value from stdin")
+	secret.Debug("Reading secret value from stdin into protected buffers")
-	value, err := io.ReadAll(os.Stdin)
+
-	if err != nil {
+	const initialSize = 4 * 1024      // 4KB initial buffer
-		return fmt.Errorf("failed to read secret value: %w", err)
+	const maxSize = 100 * 1024 * 1024 // 100MB max
+
+	type bufferInfo struct {
+		buffer *memguard.LockedBuffer
+		used   int
 	}
 
-	secret.Debug("Read secret value from stdin", "value_length", len(value))
+	var buffers []bufferInfo
+	defer func() {
+		for _, b := range buffers {
+			b.buffer.Destroy()
+		}
+	}()
 
-	// Remove trailing newline if present
+	reader := cli.cmd.InOrStdin()
-	if len(value) > 0 && value[len(value)-1] == '\n' {
+	totalSize := 0
-		value = value[:len(value)-1]
+	currentBufferSize := initialSize
-		secret.Debug("Removed trailing newline", "new_length", len(value))
+	sameSize := 0
+
+	for {
+		// Create a new buffer
+		buffer := memguard.NewBuffer(currentBufferSize)
+		n, err := io.ReadFull(reader, buffer.Bytes())
+
+		if n == 0 {
+			// No data read, destroy the unused buffer
+			buffer.Destroy()
+		} else {
+			buffers = append(buffers, bufferInfo{buffer: buffer, used: n})
+			totalSize += n
+
+			if totalSize > maxSize {
+				return fmt.Errorf("secret too large: exceeds 100MB limit")
+			}
+
+			// If we filled the buffer, consider growing for next iteration
+			if n == currentBufferSize {
+				currentBufferSize = updateBufferSize(currentBufferSize, &sameSize)
+			}
+		}
+
+		if err == io.EOF || err == io.ErrUnexpectedEOF {
+			break
+		} else if err != nil {
+			return fmt.Errorf("failed to read secret value: %w", err)
+		}
+	}
+
+	// Check for trailing newline in the last buffer
+	if len(buffers) > 0 && totalSize > 0 {
+		lastBuffer := &buffers[len(buffers)-1]
+		if lastBuffer.buffer.Bytes()[lastBuffer.used-1] == '\n' {
+			lastBuffer.used--
+			totalSize--
+		}
+	}
+
+	secret.Debug("Read secret value from stdin", "value_length", totalSize, "buffers", len(buffers))
+
+	// Combine all buffers into a single protected buffer
+	valueBuffer := memguard.NewBuffer(totalSize)
+	defer valueBuffer.Destroy()
+
+	offset := 0
+	for _, b := range buffers {
+		copy(valueBuffer.Bytes()[offset:], b.buffer.Bytes()[:b.used])
+		offset += b.used
 	}
 
 	// Add the secret to the vault
-	secret.Debug("Calling vault.AddSecret", "secret_name", secretName, "value_length", len(value), "force", force)
+	secret.Debug("Calling vault.AddSecret", "secret_name", secretName, "value_length", valueBuffer.Size(), "force", force)
-	if err := vlt.AddSecret(secretName, value, force); err != nil {
+	if err := vlt.AddSecret(secretName, valueBuffer, force); err != nil {
 		secret.Debug("vault.AddSecret failed", "error", err)
+
 		return err
 	}
 
 	secret.Debug("vault.AddSecret completed successfully")
+
 	return nil
 }
 
 // GetSecret retrieves and prints a secret from the current vault
-func (cli *CLIInstance) GetSecret(secretName string) error {
+func (cli *Instance) GetSecret(cmd *cobra.Command, secretName string) error {
-	return cli.GetSecretWithVersion(secretName, "")
+	return cli.GetSecretWithVersion(cmd, secretName, "")
 }
 
 // GetSecretWithVersion retrieves and prints a specific version of a secret
-func (cli *CLIInstance) GetSecretWithVersion(secretName string, version string) error {
+func (cli *Instance) GetSecretWithVersion(cmd *cobra.Command, secretName string, version string) error {
+	secret.Debug("GetSecretWithVersion called", "secretName", secretName, "version", version)
+
+	// Store the command for output
+	cli.cmd = cmd
+
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
+		secret.Debug("Failed to get current vault", "error", err)
+
 		return err
 	}
 
@@ -155,16 +352,30 @@ func (cli *CLIInstance) GetSecretWithVersion(secretName string, version string)
 		value, err = vlt.GetSecretVersion(secretName, version)
 	}
 	if err != nil {
+		secret.Debug("Failed to get secret", "error", err)
+
 		return err
 	}
 
+	secret.Debug("Got secret value", "valueLength", len(value))
+
 	// Print the secret value to stdout
-	fmt.Print(string(value))
+	_, _ = cli.Print(string(value))
+	secret.Debug("Printed value to stdout")
+
+	// Debug: Log what we're actually printing
+	secret.Debug("Secret retrieval debug info",
+		"secretName", secretName,
+		"version", version,
+		"valueLength", len(value),
+		"valueAsString", string(value),
+		"isEmpty", len(value) == 0)
+
 	return nil
 }
 
 // ListSecrets lists all secrets in the current vault
-func (cli *CLIInstance) ListSecrets(jsonOutput bool, filter string) error {
+func (cli *Instance) ListSecrets(cmd *cobra.Command, jsonOutput bool, quietOutput bool, filter string) error {
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
@@ -189,7 +400,7 @@ func (cli *CLIInstance) ListSecrets(jsonOutput bool, filter string) error {
 		filteredSecrets = secrets
 	}
 
-	if jsonOutput {
+	if jsonOutput { //nolint:nestif // Separate JSON and table output formatting logic
 		// For JSON output, get metadata for each secret
 		secretsWithMetadata := make([]map[string]interface{}, 0, len(filteredSecrets))
 
@@ -220,27 +431,47 @@ func (cli *CLIInstance) ListSecrets(jsonOutput bool, filter string) error {
 			return fmt.Errorf("failed to marshal JSON: %w", err)
 		}
 
-		fmt.Println(string(jsonBytes))
+		_, _ = fmt.Fprintln(cmd.OutOrStdout(), string(jsonBytes))
+	} else if quietOutput {
+		// Quiet output - just secret names
+		for _, secretName := range filteredSecrets {
+			_, _ = fmt.Fprintln(cmd.OutOrStdout(), secretName)
+		}
 	} else {
 		// Pretty table output
+		out := cmd.OutOrStdout()
 		if len(filteredSecrets) == 0 {
 			if filter != "" {
-				fmt.Printf("No secrets found in vault '%s' matching filter '%s'.\n", vlt.GetName(), filter)
+				_, _ = fmt.Fprintf(out, "No secrets found in vault '%s' matching filter '%s'.\n", vlt.GetName(), filter)
 			} else {
-				fmt.Println("No secrets found in current vault.")
+				_, _ = fmt.Fprintln(out, "No secrets found in current vault.")
-				fmt.Println("Run 'secret add <name>' to create one.")
+				_, _ = fmt.Fprintln(out, "Run 'secret add <name>' to create one.")
 			}
+
 			return nil
 		}
 
 		// Get current vault name for display
 		if filter != "" {
-			fmt.Printf("Secrets in vault '%s' matching '%s':\n\n", vlt.GetName(), filter)
+			_, _ = fmt.Fprintf(out, "Secrets in vault '%s' matching '%s':\n\n", vlt.GetName(), filter)
 		} else {
-			fmt.Printf("Secrets in vault '%s':\n\n", vlt.GetName())
+			_, _ = fmt.Fprintf(out, "Secrets in vault '%s':\n\n", vlt.GetName())
 		}
-		fmt.Printf("%-40s %-20s\n", "NAME", "LAST UPDATED")
+
-		fmt.Printf("%-40s %-20s\n", "----", "------------")
+		// Calculate the maximum name length for proper column alignment
+		maxNameLen := len("NAME") // Start with header length
+		for _, secretName := range filteredSecrets {
+			if len(secretName) > maxNameLen {
+				maxNameLen = len(secretName)
+			}
+		}
+		// Add some padding
+		maxNameLen += 2
+
+		// Print headers with dynamic width
+		nameFormat := fmt.Sprintf("%%-%ds", maxNameLen)
+		_, _ = fmt.Fprintf(out, nameFormat+" %-20s\n", "NAME", "LAST UPDATED")
+		_, _ = fmt.Fprintf(out, nameFormat+" %-20s\n", strings.Repeat("-", len("NAME")), "------------")
 
 		for _, secretName := range filteredSecrets {
 			lastUpdated := "unknown"
@@ -248,38 +479,330 @@ func (cli *CLIInstance) ListSecrets(jsonOutput bool, filter string) error {
 				metadata := secretObj.GetMetadata()
 				lastUpdated = metadata.UpdatedAt.Format("2006-01-02 15:04")
 			}
-			fmt.Printf("%-40s %-20s\n", secretName, lastUpdated)
+			_, _ = fmt.Fprintf(out, nameFormat+" %-20s\n", secretName, lastUpdated)
 		}
 
-		fmt.Printf("\nTotal: %d secret(s)", len(filteredSecrets))
+		_, _ = fmt.Fprintf(out, "\nTotal: %d secret(s)", len(filteredSecrets))
 		if filter != "" {
-			fmt.Printf(" (filtered from %d)", len(secrets))
+			_, _ = fmt.Fprintf(out, " (filtered from %d)", len(secrets))
 		}
-		fmt.Println()
+		_, _ = fmt.Fprintln(out)
 	}
 
 	return nil
 }
 
 // ImportSecret imports a secret from a file
-func (cli *CLIInstance) ImportSecret(secretName, sourceFile string, force bool) error {
+func (cli *Instance) ImportSecret(cmd *cobra.Command, secretName, sourceFile string, force bool) error {
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
 		return err
 	}
 
-	// Read secret value from the source file
+	// Read secret value from the source file into protected buffers
-	value, err := afero.ReadFile(cli.fs, sourceFile)
+	file, err := cli.fs.Open(sourceFile)
 	if err != nil {
-		return fmt.Errorf("failed to read secret from file %s: %w", sourceFile, err)
+		return fmt.Errorf("failed to open file %s: %w", sourceFile, err)
+	}
+	defer func() {
+		if err := file.Close(); err != nil {
+			secret.Warn("Failed to close file", "error", err)
+		}
+	}()
+
+	const initialSize = 4 * 1024      // 4KB initial buffer
+	const maxSize = 100 * 1024 * 1024 // 100MB max
+
+	type bufferInfo struct {
+		buffer *memguard.LockedBuffer
+		used   int
+	}
+
+	var buffers []bufferInfo
+	defer func() {
+		for _, b := range buffers {
+			b.buffer.Destroy()
+		}
+	}()
+
+	totalSize := 0
+	currentBufferSize := initialSize
+	sameSize := 0
+
+	for {
+		// Create a new buffer
+		buffer := memguard.NewBuffer(currentBufferSize)
+		n, err := io.ReadFull(file, buffer.Bytes())
+
+		if n == 0 {
+			// No data read, destroy the unused buffer
+			buffer.Destroy()
+		} else {
+			buffers = append(buffers, bufferInfo{buffer: buffer, used: n})
+			totalSize += n
+
+			if totalSize > maxSize {
+				return fmt.Errorf("secret file too large: exceeds 100MB limit")
+			}
+
+			// If we filled the buffer, consider growing for next iteration
+			if n == currentBufferSize {
+				currentBufferSize = updateBufferSize(currentBufferSize, &sameSize)
+			}
+		}
+
+		if err == io.EOF || err == io.ErrUnexpectedEOF {
+			break
+		} else if err != nil {
+			return fmt.Errorf("failed to read secret from file %s: %w", sourceFile, err)
+		}
+	}
+
+	// Combine all buffers into a single protected buffer
+	valueBuffer := memguard.NewBuffer(totalSize)
+	defer valueBuffer.Destroy()
+
+	offset := 0
+	for _, b := range buffers {
+		copy(valueBuffer.Bytes()[offset:], b.buffer.Bytes()[:b.used])
+		offset += b.used
 	}
 
 	// Store the secret in the vault
-	if err := vlt.AddSecret(secretName, value, force); err != nil {
+	if err := vlt.AddSecret(secretName, valueBuffer, force); err != nil {
 		return err
 	}
 
-	fmt.Printf("Successfully imported secret '%s' from file '%s'\n", secretName, sourceFile)
+	cmd.Printf("Successfully imported secret '%s' from file '%s'\n", secretName, sourceFile)
+
+	return nil
+}
+
+// RemoveSecret removes a secret from the vault
+func (cli *Instance) RemoveSecret(cmd *cobra.Command, secretName string, _ bool) error {
+	// Get current vault
+	currentVlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
+	if err != nil {
+		return err
+	}
+
+	// Check if secret exists
+	vaultDir, err := currentVlt.GetDirectory()
+	if err != nil {
+		return err
+	}
+
+	encodedName := strings.ReplaceAll(secretName, "/", "%")
+	secretDir := filepath.Join(vaultDir, "secrets.d", encodedName)
+
+	exists, err := afero.DirExists(cli.fs, secretDir)
+	if err != nil {
+		return fmt.Errorf("failed to check if secret exists: %w", err)
+	}
+	if !exists {
+		return fmt.Errorf("secret '%s' not found", secretName)
+	}
+
+	// Count versions for information
+	versionsDir := filepath.Join(secretDir, "versions")
+	versionCount := 0
+	if entries, err := afero.ReadDir(cli.fs, versionsDir); err == nil {
+		versionCount = len(entries)
+	}
+
+	// Remove the secret directory
+	if err := cli.fs.RemoveAll(secretDir); err != nil {
+		return fmt.Errorf("failed to remove secret: %w", err)
+	}
+
+	cmd.Printf("Removed secret '%s' (%d version(s) deleted)\n", secretName, versionCount)
+
+	return nil
+}
+
+// MoveSecret moves or renames a secret (within or across vaults)
+func (cli *Instance) MoveSecret(cmd *cobra.Command, source, dest string, force bool) error {
+	// Parse source and destination
+	srcVaultName, srcSecretName, srcQualified := ParseVaultSecretRef(source)
+	destVaultName, destSecretName, destQualified := ParseVaultSecretRef(dest)
+
+	// If neither is qualified, this is a simple within-vault rename
+	if !srcQualified && !destQualified {
+		return cli.moveSecretWithinVault(cmd, srcSecretName, destSecretName, force)
+	}
+
+	// Cross-vault move requires source to be qualified
+	if !srcQualified {
+		return fmt.Errorf("source must specify vault (e.g., vault:secret) for cross-vault move")
+	}
+
+	// If destination is not qualified (no colon), check if it's a vault name
+	// Format: "work:secret default" means move to vault "default"
+	// Format: "work:secret default:newname" means move to vault "default" with new name
+	if !destQualified {
+		// Check if dest is actually a vault name
+		vaults, err := vault.ListVaults(cli.fs, cli.stateDir)
+		if err == nil {
+			for _, v := range vaults {
+				if v == dest {
+					// dest is a vault name, use source secret name
+					destVaultName = dest
+					destSecretName = srcSecretName
+
+					break
+				}
+			}
+		}
+
+		// If destVaultName is still empty, dest is a secret name in source vault
+		if destVaultName == "" {
+			destVaultName = srcVaultName
+			destSecretName = dest
+		}
+	}
+
+	// If destination secret name is empty, use source secret name
+	if destSecretName == "" {
+		destSecretName = srcSecretName
+	}
+
+	// Same vault? Use simple rename if possible (optimization)
+	if srcVaultName == destVaultName {
+		// Select the vault and do a simple move
+		if err := vault.SelectVault(cli.fs, cli.stateDir, srcVaultName); err != nil {
+			return fmt.Errorf("failed to select vault '%s': %w", srcVaultName, err)
+		}
+
+		return cli.moveSecretWithinVault(cmd, srcSecretName, destSecretName, force)
+	}
+
+	// Cross-vault move
+	return cli.moveSecretCrossVault(cmd, srcVaultName, srcSecretName, destVaultName, destSecretName, force)
+}
+
+// moveSecretWithinVault handles rename within the current vault
+func (cli *Instance) moveSecretWithinVault(cmd *cobra.Command, source, dest string, force bool) error {
+	currentVlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
+	if err != nil {
+		return err
+	}
+
+	vaultDir, err := currentVlt.GetDirectory()
+	if err != nil {
+		return err
+	}
+
+	sourceEncoded := strings.ReplaceAll(source, "/", "%")
+	sourceDir := filepath.Join(vaultDir, "secrets.d", sourceEncoded)
+
+	exists, err := afero.DirExists(cli.fs, sourceDir)
+	if err != nil {
+		return fmt.Errorf("failed to check if source secret exists: %w", err)
+	}
+
+	if !exists {
+		return fmt.Errorf("secret '%s' not found", source)
+	}
+
+	destEncoded := strings.ReplaceAll(dest, "/", "%")
+	destDir := filepath.Join(vaultDir, "secrets.d", destEncoded)
+
+	exists, err = afero.DirExists(cli.fs, destDir)
+	if err != nil {
+		return fmt.Errorf("failed to check if destination secret exists: %w", err)
+	}
+
+	if exists {
+		if !force {
+			return fmt.Errorf("secret '%s' already exists (use --force to overwrite)", dest)
+		}
+
+		if err := cli.fs.RemoveAll(destDir); err != nil {
+			return fmt.Errorf("failed to remove existing destination: %w", err)
+		}
+	}
+
+	if err := cli.fs.Rename(sourceDir, destDir); err != nil {
+		return fmt.Errorf("failed to move secret: %w", err)
+	}
+
+	cmd.Printf("Moved secret '%s' to '%s'\n", source, dest)
+
+	return nil
+}
+
+// moveSecretCrossVault handles moving between different vaults
+func (cli *Instance) moveSecretCrossVault(
+	cmd *cobra.Command,
+	srcVaultName, srcSecretName,
+	destVaultName, destSecretName string,
+	force bool,
+) error {
+	// Get source vault
+	srcVault := vault.NewVault(cli.fs, cli.stateDir, srcVaultName)
+	srcVaultDir, err := srcVault.GetDirectory()
+
+	if err != nil {
+		return fmt.Errorf("failed to get source vault directory: %w", err)
+	}
+
+	// Verify source vault exists
+	exists, err := afero.DirExists(cli.fs, srcVaultDir)
+	if err != nil || !exists {
+		return fmt.Errorf("source vault '%s' does not exist", srcVaultName)
+	}
+
+	// Verify source secret exists
+	srcStorageName := strings.ReplaceAll(srcSecretName, "/", "%")
+	srcSecretDir := filepath.Join(srcVaultDir, "secrets.d", srcStorageName)
+
+	exists, err = afero.DirExists(cli.fs, srcSecretDir)
+	if err != nil || !exists {
+		return fmt.Errorf("secret '%s' not found in vault '%s'", srcSecretName, srcVaultName)
+	}
+
+	// Get destination vault
+	destVault := vault.NewVault(cli.fs, cli.stateDir, destVaultName)
+	destVaultDir, err := destVault.GetDirectory()
+
+	if err != nil {
+		return fmt.Errorf("failed to get destination vault directory: %w", err)
+	}
+
+	// Verify destination vault exists
+	exists, err = afero.DirExists(cli.fs, destVaultDir)
+	if err != nil || !exists {
+		return fmt.Errorf("destination vault '%s' does not exist", destVaultName)
+	}
+
+	// Unlock destination vault (will fail if neither mnemonic nor unlocker available)
+	_, err = destVault.GetOrDeriveLongTermKey()
+	if err != nil {
+		return fmt.Errorf("failed to unlock destination vault '%s': %w", destVaultName, err)
+	}
+
+	// Count versions for user feedback
+	versions, _ := secret.ListVersions(cli.fs, srcSecretDir)
+	versionCount := len(versions)
+
+	// Copy all versions
+	if err := destVault.CopySecretAllVersions(srcVault, srcSecretName, destSecretName, force); err != nil {
+		return err
+	}
+
+	// Delete source secret
+	if err := cli.fs.RemoveAll(srcSecretDir); err != nil {
+		// Copy succeeded but delete failed - warn but don't fail
+		cmd.Printf("Warning: copied secret but failed to remove source: %v\n", err)
+		cmd.Printf("Moved secret '%s:%s' to '%s:%s' (%d version(s))\n",
+			srcVaultName, srcSecretName, destVaultName, destSecretName, versionCount)
+
+		return nil
+	}
+
+	cmd.Printf("Moved secret '%s:%s' to '%s:%s' (%d version(s))\n",
+		srcVaultName, srcSecretName, destVaultName, destSecretName, versionCount)
+
 	return nil
 }

internal/cli/secrets_size_test.go

@@ -0,0 +1,437 @@
+package cli
+
+import (
+	"bytes"
+	"crypto/rand"
+	"fmt"
+	"io"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"git.eeqj.de/sneak/secret/internal/secret"
+	"git.eeqj.de/sneak/secret/internal/vault"
+	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/spf13/afero"
+	"github.com/spf13/cobra"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// TestAddSecretVariousSizes tests adding secrets of various sizes through stdin
+func TestAddSecretVariousSizes(t *testing.T) {
+	tests := []struct {
+		name        string
+		size        int
+		shouldError bool
+		errorMsg    string
+	}{
+		{
+			name:        "1KB secret",
+			size:        1024,
+			shouldError: false,
+		},
+		{
+			name:        "10KB secret",
+			size:        10 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "100KB secret",
+			size:        100 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "1MB secret",
+			size:        1024 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "10MB secret",
+			size:        10 * 1024 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "99MB secret",
+			size:        99 * 1024 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "100MB secret minus 1 byte",
+			size:        100*1024*1024 - 1,
+			shouldError: false,
+		},
+		{
+			name:        "101MB secret - should fail",
+			size:        101 * 1024 * 1024,
+			shouldError: true,
+			errorMsg:    "secret too large: exceeds 100MB limit",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Set up test environment
+			fs := afero.NewMemMapFs()
+			stateDir := "/test/state"
+
+			// Set test mnemonic
+			t.Setenv(secret.EnvMnemonic, "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about")
+
+			// Create vault
+			vaultName := "test-vault"
+			_, err := vault.CreateVault(fs, stateDir, vaultName)
+			require.NoError(t, err)
+
+			// Set current vault
+			currentVaultPath := filepath.Join(stateDir, "currentvault")
+			vaultPath := filepath.Join(stateDir, "vaults.d", vaultName)
+			err = afero.WriteFile(fs, currentVaultPath, []byte(vaultPath), 0o600)
+			require.NoError(t, err)
+
+			// Get vault and set up long-term key
+			vlt, err := vault.GetCurrentVault(fs, stateDir)
+			require.NoError(t, err)
+
+			ltIdentity, err := agehd.DeriveIdentity("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", 0)
+			require.NoError(t, err)
+			vlt.Unlock(ltIdentity)
+
+			// Generate test data of specified size
+			testData := make([]byte, tt.size)
+			_, err = rand.Read(testData)
+			require.NoError(t, err)
+
+			// Add newline that will be stripped
+			testDataWithNewline := append(testData, '\n')
+
+			// Create fake stdin
+			stdin := bytes.NewReader(testDataWithNewline)
+
+			// Create command with fake stdin
+			cmd := &cobra.Command{}
+			cmd.SetIn(stdin)
+
+			// Create CLI instance
+			cli, err := NewCLIInstance()
+			if err != nil {
+				t.Fatalf("failed to initialize CLI: %v", err)
+			}
+			cli.fs = fs
+			cli.stateDir = stateDir
+			cli.cmd = cmd
+
+			// Test adding the secret
+			secretName := fmt.Sprintf("test-secret-%d", tt.size)
+			err = cli.AddSecret(secretName, false)
+
+			if tt.shouldError {
+				assert.Error(t, err)
+				assert.Contains(t, err.Error(), tt.errorMsg)
+			} else {
+				require.NoError(t, err)
+
+				// Verify the secret was stored correctly
+				retrievedValue, err := vlt.GetSecret(secretName)
+				require.NoError(t, err)
+				assert.Equal(t, testData, retrievedValue, "Retrieved secret should match original (without newline)")
+			}
+		})
+	}
+}
+
+// TestImportSecretVariousSizes tests importing secrets of various sizes from files
+func TestImportSecretVariousSizes(t *testing.T) {
+	tests := []struct {
+		name        string
+		size        int
+		shouldError bool
+		errorMsg    string
+	}{
+		{
+			name:        "1KB file",
+			size:        1024,
+			shouldError: false,
+		},
+		{
+			name:        "10KB file",
+			size:        10 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "100KB file",
+			size:        100 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "1MB file",
+			size:        1024 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "10MB file",
+			size:        10 * 1024 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "99MB file",
+			size:        99 * 1024 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "100MB file",
+			size:        100 * 1024 * 1024,
+			shouldError: false,
+		},
+		{
+			name:        "101MB file - should fail",
+			size:        101 * 1024 * 1024,
+			shouldError: true,
+			errorMsg:    "secret file too large: exceeds 100MB limit",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Set up test environment
+			fs := afero.NewMemMapFs()
+			stateDir := "/test/state"
+
+			// Set test mnemonic
+			t.Setenv(secret.EnvMnemonic, "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about")
+
+			// Create vault
+			vaultName := "test-vault"
+			_, err := vault.CreateVault(fs, stateDir, vaultName)
+			require.NoError(t, err)
+
+			// Set current vault
+			currentVaultPath := filepath.Join(stateDir, "currentvault")
+			vaultPath := filepath.Join(stateDir, "vaults.d", vaultName)
+			err = afero.WriteFile(fs, currentVaultPath, []byte(vaultPath), 0o600)
+			require.NoError(t, err)
+
+			// Get vault and set up long-term key
+			vlt, err := vault.GetCurrentVault(fs, stateDir)
+			require.NoError(t, err)
+
+			ltIdentity, err := agehd.DeriveIdentity("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", 0)
+			require.NoError(t, err)
+			vlt.Unlock(ltIdentity)
+
+			// Generate test data of specified size
+			testData := make([]byte, tt.size)
+			_, err = rand.Read(testData)
+			require.NoError(t, err)
+
+			// Write test data to file
+			testFile := fmt.Sprintf("/test/secret-%d.bin", tt.size)
+			err = afero.WriteFile(fs, testFile, testData, 0o600)
+			require.NoError(t, err)
+
+			// Create command
+			cmd := &cobra.Command{}
+
+			// Create CLI instance
+			cli, err := NewCLIInstance()
+			if err != nil {
+				t.Fatalf("failed to initialize CLI: %v", err)
+			}
+			cli.fs = fs
+			cli.stateDir = stateDir
+
+			// Test importing the secret
+			secretName := fmt.Sprintf("imported-secret-%d", tt.size)
+			err = cli.ImportSecret(cmd, secretName, testFile, false)
+
+			if tt.shouldError {
+				assert.Error(t, err)
+				assert.Contains(t, err.Error(), tt.errorMsg)
+			} else {
+				require.NoError(t, err)
+
+				// Verify the secret was stored correctly
+				retrievedValue, err := vlt.GetSecret(secretName)
+				require.NoError(t, err)
+				assert.Equal(t, testData, retrievedValue, "Retrieved secret should match original")
+			}
+		})
+	}
+}
+
+// TestAddSecretBufferGrowth tests that our buffer growth strategy works correctly
+func TestAddSecretBufferGrowth(t *testing.T) {
+	// Test various sizes that should trigger buffer growth
+	sizes := []int{
+		1,       // Single byte
+		100,     // Small
+		4095,    // Just under initial 4KB
+		4096,    // Exactly 4KB
+		4097,    // Just over 4KB
+		8191,    // Just under 8KB (first double)
+		8192,    // Exactly 8KB
+		8193,    // Just over 8KB
+		12288,   // 12KB (should trigger second double)
+		16384,   // 16KB
+		32768,   // 32KB (after more doublings)
+		65536,   // 64KB
+		131072,  // 128KB
+		524288,  // 512KB
+		1048576, // 1MB
+		2097152, // 2MB
+	}
+
+	for _, size := range sizes {
+		t.Run(fmt.Sprintf("size_%d", size), func(t *testing.T) {
+			// Set up test environment
+			fs := afero.NewMemMapFs()
+			stateDir := "/test/state"
+
+			// Set test mnemonic
+			t.Setenv(secret.EnvMnemonic, "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about")
+
+			// Create vault
+			vaultName := "test-vault"
+			_, err := vault.CreateVault(fs, stateDir, vaultName)
+			require.NoError(t, err)
+
+			// Set current vault
+			currentVaultPath := filepath.Join(stateDir, "currentvault")
+			vaultPath := filepath.Join(stateDir, "vaults.d", vaultName)
+			err = afero.WriteFile(fs, currentVaultPath, []byte(vaultPath), 0o600)
+			require.NoError(t, err)
+
+			// Get vault and set up long-term key
+			vlt, err := vault.GetCurrentVault(fs, stateDir)
+			require.NoError(t, err)
+
+			ltIdentity, err := agehd.DeriveIdentity("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", 0)
+			require.NoError(t, err)
+			vlt.Unlock(ltIdentity)
+
+			// Create test data of exactly the specified size
+			// Use a pattern that's easy to verify
+			testData := make([]byte, size)
+			for i := range testData {
+				testData[i] = byte(i % 256)
+			}
+
+			// Create fake stdin without newline
+			stdin := bytes.NewReader(testData)
+
+			// Create command with fake stdin
+			cmd := &cobra.Command{}
+			cmd.SetIn(stdin)
+
+			// Create CLI instance
+			cli, err := NewCLIInstance()
+			if err != nil {
+				t.Fatalf("failed to initialize CLI: %v", err)
+			}
+			cli.fs = fs
+			cli.stateDir = stateDir
+			cli.cmd = cmd
+
+			// Test adding the secret
+			secretName := fmt.Sprintf("buffer-test-%d", size)
+			err = cli.AddSecret(secretName, false)
+			require.NoError(t, err)
+
+			// Verify the secret was stored correctly
+			retrievedValue, err := vlt.GetSecret(secretName)
+			require.NoError(t, err)
+			assert.Equal(t, testData, retrievedValue, "Retrieved secret should match original exactly")
+		})
+	}
+}
+
+// TestAddSecretStreamingBehavior tests that we handle streaming input correctly
+func TestAddSecretStreamingBehavior(t *testing.T) {
+	// Set up test environment
+	fs := afero.NewMemMapFs()
+	stateDir := "/test/state"
+
+	// Set test mnemonic
+	t.Setenv(secret.EnvMnemonic, "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about")
+
+	// Create vault
+	vaultName := "test-vault"
+	_, err := vault.CreateVault(fs, stateDir, vaultName)
+	require.NoError(t, err)
+
+	// Set current vault
+	currentVaultPath := filepath.Join(stateDir, "currentvault")
+	vaultPath := filepath.Join(stateDir, "vaults.d", vaultName)
+	err = afero.WriteFile(fs, currentVaultPath, []byte(vaultPath), 0o600)
+	require.NoError(t, err)
+
+	// Get vault and set up long-term key
+	vlt, err := vault.GetCurrentVault(fs, stateDir)
+	require.NoError(t, err)
+
+	ltIdentity, err := agehd.DeriveIdentity("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", 0)
+	require.NoError(t, err)
+	vlt.Unlock(ltIdentity)
+
+	// Create a custom reader that simulates slow streaming input
+	// This will help verify our buffer handling works correctly with partial reads
+	testData := []byte(strings.Repeat("Hello, World! ", 1000)) // ~14KB
+	slowReader := &slowReader{
+		data:      testData,
+		chunkSize: 1000, // Read 1KB at a time
+	}
+
+	// Create command with slow reader as stdin
+	cmd := &cobra.Command{}
+	cmd.SetIn(slowReader)
+
+	// Create CLI instance
+	cli, err := NewCLIInstance()
+	if err != nil {
+		t.Fatalf("failed to initialize CLI: %v", err)
+	}
+	cli.fs = fs
+	cli.stateDir = stateDir
+	cli.cmd = cmd
+
+	// Test adding the secret
+	err = cli.AddSecret("streaming-test", false)
+	require.NoError(t, err)
+
+	// Verify the secret was stored correctly
+	retrievedValue, err := vlt.GetSecret("streaming-test")
+	require.NoError(t, err)
+	assert.Equal(t, testData, retrievedValue, "Retrieved secret should match original")
+}
+
+// slowReader simulates a reader that returns data in small chunks
+type slowReader struct {
+	data      []byte
+	offset    int
+	chunkSize int
+}
+
+func (r *slowReader) Read(p []byte) (n int, err error) {
+	if r.offset >= len(r.data) {
+		return 0, io.EOF
+	}
+
+	// Read at most chunkSize bytes
+	remaining := len(r.data) - r.offset
+	toRead := r.chunkSize
+	if toRead > remaining {
+		toRead = remaining
+	}
+	if toRead > len(p) {
+		toRead = len(p)
+	}
+
+	n = copy(p, r.data[r.offset:r.offset+toRead])
+	r.offset += n
+
+	if r.offset >= len(r.data) {
+		err = io.EOF
+	}
+
+	return n, err
+}

internal/cli/stdout_stderr_test.go

@@ -0,0 +1,72 @@
+package cli_test
+
+import (
+	"bytes"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// TestGetCommandOutputsToStdout tests that 'secret get' outputs the secret value to stdout, not stderr
+func TestGetCommandOutputsToStdout(t *testing.T) {
+	// Create a temporary directory for our vault
+	tempDir := t.TempDir()
+
+	// Set environment variables for the test
+	t.Setenv("SB_SECRET_STATE_DIR", tempDir)
+
+	// Find the secret binary path
+	wd, err := filepath.Abs("../..")
+	require.NoError(t, err, "should get working directory")
+	secretPath := filepath.Join(wd, "secret")
+
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+	testPassphrase := "test-passphrase"
+
+	// Initialize vault
+	cmd := exec.Command(secretPath, "init")
+	cmd.Env = []string{
+		"SB_SECRET_STATE_DIR=" + tempDir,
+		"SB_SECRET_MNEMONIC=" + testMnemonic,
+		"SB_UNLOCK_PASSPHRASE=" + testPassphrase,
+		"PATH=" + "/usr/bin:/bin",
+	}
+	output, err := cmd.CombinedOutput()
+	require.NoError(t, err, "init should succeed: %s", string(output))
+
+	// Add a secret
+	cmd = exec.Command(secretPath, "add", "test/secret")
+	cmd.Env = []string{
+		"SB_SECRET_STATE_DIR=" + tempDir,
+		"SB_SECRET_MNEMONIC=" + testMnemonic,
+		"PATH=" + "/usr/bin:/bin",
+	}
+	cmd.Stdin = strings.NewReader("test-secret-value")
+	output, err = cmd.CombinedOutput()
+	require.NoError(t, err, "add should succeed: %s", string(output))
+
+	// Test that 'secret get' outputs to stdout, not stderr
+	cmd = exec.Command(secretPath, "get", "test/secret")
+	cmd.Env = []string{
+		"SB_SECRET_STATE_DIR=" + tempDir,
+		"SB_SECRET_MNEMONIC=" + testMnemonic,
+		"PATH=" + "/usr/bin:/bin",
+	}
+
+	var stdout, stderr bytes.Buffer
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+
+	err = cmd.Run()
+	require.NoError(t, err, "get should succeed")
+
+	// The secret value should be in stdout
+	assert.Equal(t, "test-secret-value", strings.TrimSpace(stdout.String()), "secret value should be in stdout")
+
+	// Nothing should be in stderr
+	assert.Empty(t, stderr.String(), "stderr should be empty")
+}

internal/cli/test_helpers.go

@@ -0,0 +1,63 @@
+package cli
+
+import (
+	"bytes"
+	"os"
+	"strings"
+
+	"git.eeqj.de/sneak/secret/internal/secret"
+)
+
+// ExecuteCommandInProcess executes a CLI command in-process for testing
+func ExecuteCommandInProcess(args []string, stdin string, env map[string]string) (string, error) {
+	secret.Debug("ExecuteCommandInProcess called", "args", args)
+
+	// Save current environment
+	savedEnv := make(map[string]string)
+	for k := range env {
+		savedEnv[k] = os.Getenv(k)
+	}
+
+	// Set test environment
+	for k, v := range env {
+		_ = os.Setenv(k, v)
+	}
+
+	// Create root command
+	rootCmd := newRootCmd()
+
+	// Capture output
+	var buf bytes.Buffer
+	rootCmd.SetOut(&buf)
+	rootCmd.SetErr(&buf)
+
+	// Set stdin if provided
+	if stdin != "" {
+		rootCmd.SetIn(strings.NewReader(stdin))
+	}
+
+	// Set args
+	rootCmd.SetArgs(args)
+
+	// Execute command
+	err := rootCmd.Execute()
+
+	output := buf.String()
+	secret.Debug("Command execution completed", "error", err, "outputLength", len(output), "output", output)
+
+	// Add debug info for troubleshooting
+	if len(output) == 0 && err == nil {
+		secret.Debug("Warning: Command executed successfully but produced no output", "args", args)
+	}
+
+	// Restore environment
+	for k, v := range savedEnv {
+		if v == "" {
+			_ = os.Unsetenv(k)
+		} else {
+			_ = os.Setenv(k, v)
+		}
+	}
+
+	return output, err
+}

internal/cli/test_output_test.go

@@ -0,0 +1,22 @@
+package cli
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestOutputCapture(t *testing.T) {
+	// Test vault list command which we fixed
+	output, err := ExecuteCommandInProcess([]string{"vault", "list"}, "", nil)
+	require.NoError(t, err)
+	assert.Contains(t, output, "Available vaults", "should capture vault list output")
+	t.Logf("vault list output: %q", output)
+
+	// Test help command
+	output, err = ExecuteCommandInProcess([]string{"--help"}, "", nil)
+	require.NoError(t, err)
+	assert.NotEmpty(t, output, "help output should not be empty")
+	t.Logf("help output length: %d", len(output))
+}

internal/cli/unlockers.go

@@ -3,111 +3,267 @@ package cli
 import (
 	"encoding/json"
 	"fmt"
+	"log"
 	"os"
+	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"time"
 
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/internal/vault"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 )
 
-// Import from init.go
+// UnlockerInfo represents unlocker information for display
-
+type UnlockerInfo struct {
-// ... existing imports ...
+	ID        string    `json:"id"`
-
+	Type      string    `json:"type"`
-func newUnlockersCmd() *cobra.Command {
+	CreatedAt time.Time `json:"createdAt"`
-	cmd := &cobra.Command{
+	Flags     []string  `json:"flags,omitempty"`
-		Use:   "unlockers",
+	IsCurrent bool      `json:"isCurrent"`
-		Short: "Manage unlockers",
-		Long:  `Create, list, and remove unlockers for the current vault.`,
-	}
-
-	cmd.AddCommand(newUnlockersListCmd())
-	cmd.AddCommand(newUnlockersAddCmd())
-	cmd.AddCommand(newUnlockersRmCmd())
-
-	return cmd
 }
 
-func newUnlockersListCmd() *cobra.Command {
+// Table formatting constants
-	cmd := &cobra.Command{
+const (
-		Use:   "list",
+	unlockerIDWidth    = 40
-		Short: "List unlockers in the current vault",
+	unlockerTypeWidth  = 12
-		RunE: func(cmd *cobra.Command, args []string) error {
+	unlockerDateWidth  = 20
-			jsonOutput, _ := cmd.Flags().GetBool("json")
+	unlockerFlagsWidth = 20
+)
 
-			cli := NewCLIInstance()
+// getDefaultGPGKey returns the default GPG key ID if available
-			return cli.UnlockersList(jsonOutput)
+func getDefaultGPGKey() (string, error) {
-		},
+	// First try to get the configured default key using gpgconf
+	cmd := exec.Command("gpgconf", "--list-options", "gpg")
+	output, err := cmd.Output()
+	if err == nil {
+		lines := strings.Split(string(output), "\n")
+		for _, line := range lines {
+			fields := strings.Split(line, ":")
+			if len(fields) > 9 && fields[0] == "default-key" && fields[9] != "" {
+				// The default key is in field 10 (index 9)
+				return fields[9], nil
+			}
+		}
 	}
 
-	cmd.Flags().Bool("json", false, "Output in JSON format")
+	// If no default key is configured, get the first secret key
-	return cmd
+	cmd = exec.Command("gpg", "--list-secret-keys", "--with-colons")
-}
+	output, err = cmd.Output()
-
+	if err != nil {
-func newUnlockersAddCmd() *cobra.Command {
+		return "", fmt.Errorf("failed to list GPG keys: %w", err)
-	cmd := &cobra.Command{
-		Use:   "add <type>",
-		Short: "Add a new unlocker",
-		Long:  `Add a new unlocker of the specified type (passphrase, keychain, pgp).`,
-		Args:  cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			cli := NewCLIInstance()
-			return cli.UnlockersAdd(args[0], cmd)
-		},
 	}
 
-	cmd.Flags().String("keyid", "", "GPG key ID for PGP unlockers")
+	// Parse output to find the first usable secret key
-	return cmd
+	lines := strings.Split(string(output), "\n")
-}
+	for _, line := range lines {
-
+		// sec line indicates a secret key
-func newUnlockersRmCmd() *cobra.Command {
+		if strings.HasPrefix(line, "sec:") {
-	return &cobra.Command{
+			fields := strings.Split(line, ":")
-		Use:   "rm <unlocker-id>",
+			// Field 5 contains the key ID
-		Short: "Remove an unlocker",
+			if len(fields) > 4 && fields[4] != "" {
-		Args:  cobra.ExactArgs(1),
+				return fields[4], nil
-		RunE: func(cmd *cobra.Command, args []string) error {
+			}
-			cli := NewCLIInstance()
+		}
-			return cli.UnlockersRemove(args[0])
-		},
 	}
+
+	return "", fmt.Errorf("no GPG secret keys found")
 }
 
 func newUnlockerCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "unlocker",
-		Short: "Manage current unlocker",
+		Short: "Manage unlockers",
-		Long:  `Select the current unlocker for operations.`,
+		Long:  `Create, list, and remove unlockers for the current vault.`,
 	}
 
-	cmd.AddCommand(newUnlockerSelectSubCmd())
+	cmd.AddCommand(newUnlockerListCmd())
+	cmd.AddCommand(newUnlockerAddCmd())
+	cmd.AddCommand(newUnlockerRemoveCmd())
+	cmd.AddCommand(newUnlockerSelectCmd())
 
 	return cmd
 }
 
-func newUnlockerSelectSubCmd() *cobra.Command {
+func newUnlockerListCmd() *cobra.Command {
-	return &cobra.Command{
+	cmd := &cobra.Command{
-		Use:   "select <unlocker-id>",
+		Use:     "list",
-		Short: "Select an unlocker as current",
+		Aliases: []string{"ls"},
-		Args:  cobra.ExactArgs(1),
+		Short:   "List unlockers in the current vault",
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			jsonOutput, _ := cmd.Flags().GetBool("json")
+
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+			cli.cmd = cmd
+
+			return cli.UnlockersList(jsonOutput)
+		},
+	}
+
+	cmd.Flags().Bool("json", false, "Output in JSON format")
+
+	return cmd
+}
+
+func newUnlockerAddCmd() *cobra.Command {
+	// Build the supported types list based on platform
+	supportedTypes := "passphrase, pgp"
+	typeDescriptions := `Available unlocker types:
+
+  passphrase - Traditional password-based encryption
+               Prompts for a passphrase that will be used to encrypt/decrypt the vault's master key.
+               The passphrase is never stored in plaintext.
+
+  pgp        - GNU Privacy Guard (GPG) key-based encryption  
+               Uses your existing GPG key to encrypt/decrypt the vault's master key.
+               Requires gpg to be installed and configured with at least one secret key.
+               Use --keyid to specify a particular key, otherwise uses your default GPG key.`
+
+	if runtime.GOOS == "darwin" {
+		supportedTypes = "passphrase, keychain, pgp, secure-enclave"
+		typeDescriptions = `Available unlocker types:
+
+  passphrase      - Traditional password-based encryption
+                    Prompts for a passphrase that will be used to encrypt/decrypt the vault's master key.
+                    The passphrase is never stored in plaintext.
+
+  keychain        - macOS Keychain integration (macOS only)
+                    Stores the vault's master key in the macOS Keychain, protected by your login password.
+                    Automatically unlocks when your Keychain is unlocked (e.g., after login).
+                    Provides seamless integration with macOS security features like Touch ID.
+
+  pgp             - GNU Privacy Guard (GPG) key-based encryption
+                    Uses your existing GPG key to encrypt/decrypt the vault's master key.
+                    Requires gpg to be installed and configured with at least one secret key.
+                    Use --keyid to specify a particular key, otherwise uses your default GPG key.
+
+  secure-enclave  - Apple Secure Enclave hardware protection (macOS only)
+                    Stores the vault's master key encrypted by a non-exportable P-256 key
+                    held in the Secure Enclave. The key never leaves the hardware.
+                    Uses ECIES encryption; decryption is performed inside the SE.`
+	}
+
+	cmd := &cobra.Command{
+		Use:   "add <type>",
+		Short: "Add a new unlocker",
+		Long: fmt.Sprintf(`Add a new unlocker to the current vault.
+
+%s
+
+Each vault can have multiple unlockers, allowing different authentication methods
+to access the same vault. This provides flexibility and backup access options.`, typeDescriptions),
+		Args:      cobra.ExactArgs(1),
+		ValidArgs: strings.Split(supportedTypes, ", "),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+			unlockerType := args[0]
+
+			// Validate unlocker type
+			validTypes := strings.Split(supportedTypes, ", ")
+			valid := false
+			for _, t := range validTypes {
+				if unlockerType == t {
+					valid = true
+
+					break
+				}
+			}
+			if !valid {
+				return fmt.Errorf("invalid unlocker type '%s'\n\nSupported types: %s\n\n"+
+					"Run 'secret unlocker add --help' for detailed descriptions", unlockerType, supportedTypes)
+			}
+
+			// Check if --keyid was used with non-PGP type
+			if unlockerType != "pgp" && cmd.Flags().Changed("keyid") {
+				return fmt.Errorf("--keyid flag is only valid for PGP unlockers")
+			}
+
+			return cli.UnlockersAdd(unlockerType, cmd)
+		},
+	}
+
+	cmd.Flags().String("keyid", "", "GPG key ID for PGP unlockers (optional, uses default key if not specified)")
+
+	return cmd
+}
+
+func newUnlockerRemoveCmd() *cobra.Command {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+	cmd := &cobra.Command{
+		Use:     "remove <unlocker-id>",
+		Aliases: []string{"rm"},
+		Short:   "Remove an unlocker",
+		Long: `Remove an unlocker from the current vault. Cannot remove the last unlocker if the vault has ` +
+			`secrets unless --force is used. Warning: Without unlockers and without your mnemonic, vault data ` +
+			`will be permanently inaccessible.`,
+		Args:              cobra.ExactArgs(1),
+		ValidArgsFunction: getUnlockerIDsCompletionFunc(cli.fs, cli.stateDir),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			force, _ := cmd.Flags().GetBool("force")
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.UnlockersRemove(args[0], force, cmd)
+		},
+	}
+
+	cmd.Flags().BoolP("force", "f", false, "Force removal of last unlocker even if vault has secrets")
+
+	return cmd
+}
+
+func newUnlockerSelectCmd() *cobra.Command {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+
+	return &cobra.Command{
+		Use:               "select <unlocker-id>",
+		Short:             "Select an unlocker as current",
+		Args:              cobra.ExactArgs(1),
+		ValidArgsFunction: getUnlockerIDsCompletionFunc(cli.fs, cli.stateDir),
+		RunE: func(_ *cobra.Command, args []string) error {
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
 			return cli.UnlockerSelect(args[0])
 		},
 	}
 }
 
 // UnlockersList lists unlockers in the current vault
-func (cli *CLIInstance) UnlockersList(jsonOutput bool) error {
+func (cli *Instance) UnlockersList(jsonOutput bool) error {
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
 		return err
 	}
 
+	// Get the current unlocker ID
+	var currentUnlockerID string
+	currentUnlocker, err := vlt.GetCurrentUnlocker()
+	if err == nil {
+		currentUnlockerID = currentUnlocker.GetID()
+	}
+
 	// Get the metadata first
 	unlockerMetadataList, err := vlt.ListUnlockers()
 	if err != nil {
@@ -115,18 +271,13 @@ func (cli *CLIInstance) UnlockersList(jsonOutput bool) error {
 	}
 
 	// Load actual unlocker objects to get the proper IDs
-	type UnlockerInfo struct {
-		ID        string    `json:"id"`
-		Type      string    `json:"type"`
-		CreatedAt time.Time `json:"created_at"`
-		Flags     []string  `json:"flags,omitempty"`
-	}
-
 	var unlockers []UnlockerInfo
 	for _, metadata := range unlockerMetadataList {
 		// Create unlocker instance to get the proper ID
 		vaultDir, err := vlt.GetDirectory()
 		if err != nil {
+			secret.Warn("Could not get vault directory while listing unlockers", "error", err)
+
 			continue
 		}
 
@@ -134,6 +285,8 @@ func (cli *CLIInstance) UnlockersList(jsonOutput bool) error {
 		unlockersDir := filepath.Join(vaultDir, "unlockers.d")
 		files, err := afero.ReadDir(cli.fs, unlockersDir)
 		if err != nil {
+			secret.Warn("Could not read unlockers directory", "error", err)
+
 			continue
 		}
 
@@ -149,11 +302,15 @@ func (cli *CLIInstance) UnlockersList(jsonOutput bool) error {
 			// Check if this is the right unlocker by comparing metadata
 			metadataBytes, err := afero.ReadFile(cli.fs, metadataPath)
 			if err != nil {
+				secret.Warn("Could not read unlocker metadata file", "path", metadataPath, "error", err)
+
 				continue
 			}
 
 			var diskMetadata secret.UnlockerMetadata
 			if err := json.Unmarshal(metadataBytes, &diskMetadata); err != nil {
+				secret.Warn("Could not parse unlocker metadata file", "path", metadataPath, "error", err)
+
 				continue
 			}
 
@@ -167,7 +324,10 @@ func (cli *CLIInstance) UnlockersList(jsonOutput bool) error {
 					unlocker = secret.NewKeychainUnlocker(cli.fs, unlockerDir, diskMetadata)
 				case "pgp":
 					unlocker = secret.NewPGPUnlocker(cli.fs, unlockerDir, diskMetadata)
+				case "secure-enclave":
+					unlocker = secret.NewSecureEnclaveUnlocker(cli.fs, unlockerDir, diskMetadata)
 				}
+
 				break
 			}
 		}
@@ -177,7 +337,9 @@ func (cli *CLIInstance) UnlockersList(jsonOutput bool) error {
 		if unlocker != nil {
 			properID = unlocker.GetID()
 		} else {
-			properID = metadata.ID // fallback to metadata ID
+			// Generate ID as fallback
+			properID = fmt.Sprintf("%s-%s", metadata.CreatedAt.Format("2006-01-02.15.04"), metadata.Type)
+			secret.Warn("Could not create unlocker instance, using fallback ID", "fallback_id", properID, "type", metadata.Type)
 		}
 
 		unlockerInfo := UnlockerInfo{
@@ -185,53 +347,79 @@ func (cli *CLIInstance) UnlockersList(jsonOutput bool) error {
 			Type:      metadata.Type,
 			CreatedAt: metadata.CreatedAt,
 			Flags:     metadata.Flags,
+			IsCurrent: properID == currentUnlockerID,
 		}
 		unlockers = append(unlockers, unlockerInfo)
 	}
 
 	if jsonOutput {
-		// JSON output
+		return cli.printUnlockersJSON(unlockers, currentUnlockerID)
-		output := map[string]interface{}{
-			"unlockers": unlockers,
-		}
-
-		jsonBytes, err := json.MarshalIndent(output, "", "  ")
-		if err != nil {
-			return fmt.Errorf("failed to marshal JSON: %w", err)
-		}
-
-		fmt.Println(string(jsonBytes))
-	} else {
-		// Pretty table output
-		if len(unlockers) == 0 {
-			fmt.Println("No unlockers found in current vault.")
-			fmt.Println("Run 'secret unlockers add passphrase' to create one.")
-			return nil
-		}
-
-		fmt.Printf("%-18s %-12s %-20s %s\n", "UNLOCKER ID", "TYPE", "CREATED", "FLAGS")
-		fmt.Printf("%-18s %-12s %-20s %s\n", "-----------", "----", "-------", "-----")
-
-		for _, unlocker := range unlockers {
-			flags := ""
-			if len(unlocker.Flags) > 0 {
-				flags = strings.Join(unlocker.Flags, ",")
-			}
-			fmt.Printf("%-18s %-12s %-20s %s\n",
-				unlocker.ID,
-				unlocker.Type,
-				unlocker.CreatedAt.Format("2006-01-02 15:04:05"),
-				flags)
-		}
-
-		fmt.Printf("\nTotal: %d unlocker(s)\n", len(unlockers))
 	}
 
+	return cli.printUnlockersTable(unlockers)
+}
+
+// printUnlockersJSON prints unlockers in JSON format
+func (cli *Instance) printUnlockersJSON(unlockers []UnlockerInfo, currentUnlockerID string) error {
+	output := map[string]interface{}{
+		"unlockers":         unlockers,
+		"currentUnlockerID": currentUnlockerID,
+	}
+
+	jsonBytes, err := json.MarshalIndent(output, "", "  ")
+	if err != nil {
+		return fmt.Errorf("failed to marshal JSON: %w", err)
+	}
+
+	cli.cmd.Println(string(jsonBytes))
+
+	return nil
+}
+
+// printUnlockersTable prints unlockers in a formatted table
+func (cli *Instance) printUnlockersTable(unlockers []UnlockerInfo) error {
+	if len(unlockers) == 0 {
+		cli.cmd.Println("No unlockers found in current vault.")
+		cli.cmd.Println("Run 'secret unlocker add passphrase' to create one.")
+
+		return nil
+	}
+
+	cli.cmd.Printf("  %-40s %-12s %-20s %s\n", "UNLOCKER ID", "TYPE", "CREATED", "FLAGS")
+	cli.cmd.Printf("  %-40s %-12s %-20s %s\n",
+		strings.Repeat("-", unlockerIDWidth), strings.Repeat("-", unlockerTypeWidth),
+		strings.Repeat("-", unlockerDateWidth), strings.Repeat("-", unlockerFlagsWidth))
+
+	for _, unlocker := range unlockers {
+		flags := ""
+		if len(unlocker.Flags) > 0 {
+			flags = strings.Join(unlocker.Flags, ",")
+		}
+		prefix := "  "
+		if unlocker.IsCurrent {
+			prefix = "* "
+		}
+		cli.cmd.Printf("%s%-40s %-12s %-20s %s\n",
+			prefix,
+			unlocker.ID,
+			unlocker.Type,
+			unlocker.CreatedAt.Format("2006-01-02 15:04:05"),
+			flags)
+	}
+
+	cli.cmd.Printf("\nTotal: %d unlocker(s)\n", len(unlockers))
+
 	return nil
 }
 
 // UnlockersAdd adds a new unlocker
-func (cli *CLIInstance) UnlockersAdd(unlockerType string, cmd *cobra.Command) error {
+func (cli *Instance) UnlockersAdd(unlockerType string, cmd *cobra.Command) error {
+	// Build the supported types list based on platform
+	supportedTypes := "passphrase, pgp"
+	if runtime.GOOS == "darwin" {
+		supportedTypes = "passphrase, keychain, pgp, secure-enclave"
+	}
+
 	switch unlockerType {
 	case "passphrase":
 		// Get current vault
@@ -240,35 +428,43 @@ func (cli *CLIInstance) UnlockersAdd(unlockerType string, cmd *cobra.Command) er
 			return fmt.Errorf("failed to get current vault: %w", err)
 		}
 
-		// Try to unlock the vault if not already unlocked
+		// For passphrase unlockers, we don't need the vault to be unlocked
-		if vlt.Locked() {
+		// The CreatePassphraseUnlocker method will handle getting the long-term key
-			_, err := vlt.UnlockVault()
-			if err != nil {
-				return fmt.Errorf("failed to unlock vault: %w", err)
-			}
-		}
 
 		// Check if passphrase is set in environment variable
-		var passphraseStr string
+		var passphraseBuffer *memguard.LockedBuffer
 		if envPassphrase := os.Getenv(secret.EnvUnlockPassphrase); envPassphrase != "" {
-			passphraseStr = envPassphrase
+			passphraseBuffer = memguard.NewBufferFromBytes([]byte(envPassphrase))
 		} else {
 			// Use secure passphrase input with confirmation
-			passphraseStr, err = readSecurePassphrase("Enter passphrase for unlocker: ")
+			passphraseBuffer, err = readSecurePassphrase("Enter passphrase for unlocker: ")
 			if err != nil {
 				return fmt.Errorf("failed to read passphrase: %w", err)
 			}
 		}
+		defer passphraseBuffer.Destroy()
 
-		passphraseUnlocker, err := vlt.CreatePassphraseUnlocker(passphraseStr)
+		passphraseUnlocker, err := vlt.CreatePassphraseUnlocker(passphraseBuffer)
 		if err != nil {
 			return err
 		}
 
 		cmd.Printf("Created passphrase unlocker: %s\n", passphraseUnlocker.GetID())
+
+		// Auto-select the newly created unlocker
+		if err := vlt.SelectUnlocker(passphraseUnlocker.GetID()); err != nil {
+			cmd.Printf("Warning: Failed to auto-select new unlocker: %v\n", err)
+		} else {
+			cmd.Printf("Automatically selected as current unlocker\n")
+		}
+
 		return nil
 
 	case "keychain":
+		if runtime.GOOS != "darwin" {
+			return fmt.Errorf("keychain unlockers are only supported on macOS")
+		}
+
 		keychainUnlocker, err := secret.CreateKeychainUnlocker(cli.fs, cli.stateDir)
 		if err != nil {
 			return fmt.Errorf("failed to create macOS Keychain unlocker: %w", err)
@@ -278,17 +474,78 @@ func (cli *CLIInstance) UnlockersAdd(unlockerType string, cmd *cobra.Command) er
 		if keyName, err := keychainUnlocker.GetKeychainItemName(); err == nil {
 			cmd.Printf("Keychain Item Name: %s\n", keyName)
 		}
+
+		// Auto-select the newly created unlocker
+		vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
+		if err != nil {
+			return fmt.Errorf("failed to get current vault: %w", err)
+		}
+		if err := vlt.SelectUnlocker(keychainUnlocker.GetID()); err != nil {
+			cmd.Printf("Warning: Failed to auto-select new unlocker: %v\n", err)
+		} else {
+			cmd.Printf("Automatically selected as current unlocker\n")
+		}
+
+		return nil
+
+	case "secure-enclave":
+		if runtime.GOOS != "darwin" {
+			return fmt.Errorf("secure enclave unlockers are only supported on macOS")
+		}
+
+		seUnlocker, err := secret.CreateSecureEnclaveUnlocker(cli.fs, cli.stateDir)
+		if err != nil {
+			return fmt.Errorf("failed to create Secure Enclave unlocker: %w", err)
+		}
+
+		cmd.Printf("Created Secure Enclave unlocker: %s\n", seUnlocker.GetID())
+
+		vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
+		if err != nil {
+			return fmt.Errorf("failed to get current vault: %w", err)
+		}
+
+		if err := vlt.SelectUnlocker(seUnlocker.GetID()); err != nil {
+			cmd.Printf("Warning: Failed to auto-select new unlocker: %v\n", err)
+		} else {
+			cmd.Printf("Automatically selected as current unlocker\n")
+		}
+
 		return nil
 
 	case "pgp":
-		// Get GPG key ID from flag or environment variable
+		// Get GPG key ID from flag, environment, or default key
 		var gpgKeyID string
 		if flagKeyID, _ := cmd.Flags().GetString("keyid"); flagKeyID != "" {
 			gpgKeyID = flagKeyID
 		} else if envKeyID := os.Getenv(secret.EnvGPGKeyID); envKeyID != "" {
 			gpgKeyID = envKeyID
 		} else {
-			return fmt.Errorf("GPG key ID required: use --keyid flag or set SB_GPG_KEY_ID environment variable")
+			// Try to get the default GPG key
+			defaultKeyID, err := getDefaultGPGKey()
+			if err != nil {
+				return fmt.Errorf("no GPG key specified and no default key found: %w", err)
+			}
+			gpgKeyID = defaultKeyID
+			cmd.Printf("Using default GPG key: %s\n", gpgKeyID)
+		}
+
+		// Check if this key is already added as an unlocker
+		vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
+		if err != nil {
+			return fmt.Errorf("failed to get current vault: %w", err)
+		}
+
+		// Resolve the GPG key ID to its fingerprint
+		fingerprint, err := secret.ResolveGPGKeyFingerprint(gpgKeyID)
+		if err != nil {
+			return fmt.Errorf("failed to resolve GPG key fingerprint: %w", err)
+		}
+
+		// Check if this GPG key is already added
+		expectedID := fmt.Sprintf("pgp-%s", fingerprint)
+		if err := cli.checkUnlockerExists(vlt, expectedID); err != nil {
+			return fmt.Errorf("GPG key %s is already added as an unlocker", gpgKeyID)
 		}
 
 		pgpUnlocker, err := secret.CreatePGPUnlocker(cli.fs, cli.stateDir, gpgKeyID)
@@ -298,26 +555,68 @@ func (cli *CLIInstance) UnlockersAdd(unlockerType string, cmd *cobra.Command) er
 
 		cmd.Printf("Created PGP unlocker: %s\n", pgpUnlocker.GetID())
 		cmd.Printf("GPG Key ID: %s\n", gpgKeyID)
+
+		// Auto-select the newly created unlocker
+		if err := vlt.SelectUnlocker(pgpUnlocker.GetID()); err != nil {
+			cmd.Printf("Warning: Failed to auto-select new unlocker: %v\n", err)
+		} else {
+			cmd.Printf("Automatically selected as current unlocker\n")
+		}
+
 		return nil
 
 	default:
-		return fmt.Errorf("unsupported unlocker type: %s (supported: passphrase, keychain, pgp)", unlockerType)
+		return fmt.Errorf("unsupported unlocker type: %s (supported: %s)", unlockerType, supportedTypes)
 	}
 }
 
-// UnlockersRemove removes an unlocker
+// UnlockersRemove removes an unlocker with safety checks
-func (cli *CLIInstance) UnlockersRemove(unlockerID string) error {
+func (cli *Instance) UnlockersRemove(unlockerID string, force bool, cmd *cobra.Command) error {
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
 		return err
 	}
 
-	return vlt.RemoveUnlocker(unlockerID)
+	// Get list of unlockers
+	unlockers, err := vlt.ListUnlockers()
+	if err != nil {
+		return fmt.Errorf("failed to list unlockers: %w", err)
+	}
+
+	// Check if we're removing the last unlocker
+	if len(unlockers) == 1 {
+		// Check if vault has secrets
+		numSecrets, err := vlt.NumSecrets()
+		if err != nil {
+			return fmt.Errorf("failed to count secrets: %w", err)
+		}
+
+		if numSecrets > 0 && !force {
+			cmd.Println("ERROR: Cannot remove the last unlocker when the vault contains secrets.")
+			cmd.Println("WARNING: Without unlockers, you MUST have your mnemonic phrase to decrypt the vault.")
+			cmd.Println("If you want to proceed anyway, use --force")
+
+			return fmt.Errorf("refusing to remove last unlocker")
+		}
+
+		if numSecrets > 0 && force {
+			cmd.Println("WARNING: Removing the last unlocker. You MUST have your mnemonic phrase to access this vault again!")
+		}
+	}
+
+	// Remove the unlocker
+	if err := vlt.RemoveUnlocker(unlockerID); err != nil {
+		return err
+	}
+
+	cmd.Printf("Removed unlocker '%s'\n", unlockerID)
+
+	return nil
 }
 
 // UnlockerSelect selects an unlocker as current
-func (cli *CLIInstance) UnlockerSelect(unlockerID string) error {
+func (cli *Instance) UnlockerSelect(unlockerID string) error {
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
@@ -326,3 +625,81 @@ func (cli *CLIInstance) UnlockerSelect(unlockerID string) error {
 
 	return vlt.SelectUnlocker(unlockerID)
 }
+
+// checkUnlockerExists checks if an unlocker with the given ID exists
+func (cli *Instance) checkUnlockerExists(vlt *vault.Vault, unlockerID string) error {
+	// Get the list of unlockers and check if any match the ID
+	unlockers, err := vlt.ListUnlockers()
+	if err != nil {
+		secret.Warn("Could not list unlockers during duplicate check", "error", err)
+
+		return nil // If we can't list unlockers, assume it doesn't exist
+	}
+
+	// Get vault directory to construct unlocker instances
+	vaultDir, err := vlt.GetDirectory()
+	if err != nil {
+		secret.Warn("Could not get vault directory during duplicate check", "error", err)
+
+		return nil
+	}
+
+	// Check each unlocker's ID
+	for _, metadata := range unlockers {
+		// Construct the unlocker based on type to get its ID
+		unlockersDir := filepath.Join(vaultDir, "unlockers.d")
+		files, err := afero.ReadDir(cli.fs, unlockersDir)
+		if err != nil {
+			secret.Warn("Could not read unlockers directory during duplicate check", "error", err)
+
+			continue
+		}
+
+		for _, file := range files {
+			if !file.IsDir() {
+				continue
+			}
+
+			unlockerDir := filepath.Join(unlockersDir, file.Name())
+			metadataPath := filepath.Join(unlockerDir, "unlocker-metadata.json")
+
+			// Check if this matches our metadata
+			metadataBytes, err := afero.ReadFile(cli.fs, metadataPath)
+			if err != nil {
+				secret.Warn("Could not read unlocker metadata during duplicate check", "path", metadataPath, "error", err)
+
+				continue
+			}
+
+			var diskMetadata secret.UnlockerMetadata
+			if err := json.Unmarshal(metadataBytes, &diskMetadata); err != nil {
+				secret.Warn("Could not parse unlocker metadata during duplicate check", "path", metadataPath, "error", err)
+
+				continue
+			}
+
+			// Match by type and creation time
+			if diskMetadata.Type == metadata.Type && diskMetadata.CreatedAt.Equal(metadata.CreatedAt) {
+				var unlocker secret.Unlocker
+				switch metadata.Type {
+				case "passphrase":
+					unlocker = secret.NewPassphraseUnlocker(cli.fs, unlockerDir, diskMetadata)
+				case "keychain":
+					unlocker = secret.NewKeychainUnlocker(cli.fs, unlockerDir, diskMetadata)
+				case "pgp":
+					unlocker = secret.NewPGPUnlocker(cli.fs, unlockerDir, diskMetadata)
+				case "secure-enclave":
+					unlocker = secret.NewSecureEnclaveUnlocker(cli.fs, unlockerDir, diskMetadata)
+				}
+
+				if unlocker != nil && unlocker.GetID() == unlockerID {
+					return fmt.Errorf("unlocker already exists")
+				}
+
+				break
+			}
+		}
+	}
+
+	return nil
+}

internal/cli/vault.go

@@ -3,13 +3,16 @@ package cli
 import (
 	"encoding/json"
 	"fmt"
+	"log"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/internal/vault"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/tyler-smith/go-bip39"
@@ -26,23 +29,30 @@ func newVaultCmd() *cobra.Command {
 	cmd.AddCommand(newVaultCreateCmd())
 	cmd.AddCommand(newVaultSelectCmd())
 	cmd.AddCommand(newVaultImportCmd())
+	cmd.AddCommand(newVaultRemoveCmd())
 
 	return cmd
 }
 
 func newVaultListCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "list",
+		Use:     "list",
-		Short: "List available vaults",
+		Aliases: []string{"ls"},
-		RunE: func(cmd *cobra.Command, args []string) error {
+		Short:   "List available vaults",
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			jsonOutput, _ := cmd.Flags().GetBool("json")
 
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
-			return cli.ListVaults(jsonOutput)
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.ListVaults(cmd, jsonOutput)
 		},
 	}
 
 	cmd.Flags().Bool("json", false, "Output in JSON format")
+
 	return cmd
 }
 
@@ -52,50 +62,103 @@ func newVaultCreateCmd() *cobra.Command {
 		Short: "Create a new vault",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
-			return cli.CreateVault(args[0])
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.CreateVault(cmd, args[0])
 		},
 	}
 }
 
 func newVaultSelectCmd() *cobra.Command {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+
 	return &cobra.Command{
-		Use:   "select <name>",
+		Use:               "select <name>",
-		Short: "Select a vault as current",
+		Short:             "Select a vault as current",
-		Args:  cobra.ExactArgs(1),
+		Args:              cobra.ExactArgs(1),
+		ValidArgsFunction: getVaultNamesCompletionFunc(cli.fs, cli.stateDir),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
-			return cli.SelectVault(args[0])
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.SelectVault(cmd, args[0])
 		},
 	}
 }
 
 func newVaultImportCmd() *cobra.Command {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+
 	return &cobra.Command{
-		Use:   "import <vault-name>",
+		Use:               "import <vault-name>",
-		Short: "Import a mnemonic into a vault",
+		Short:             "Import a mnemonic into a vault",
-		Long:  `Import a BIP39 mnemonic phrase into the specified vault (default if not specified).`,
+		Long:              `Import a BIP39 mnemonic phrase into the specified vault (default if not specified).`,
-		Args:  cobra.MaximumNArgs(1),
+		Args:              cobra.MaximumNArgs(1),
+		ValidArgsFunction: getVaultNamesCompletionFunc(cli.fs, cli.stateDir),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			vaultName := "default"
 			if len(args) > 0 {
 				vaultName = args[0]
 			}
 
-			cli := NewCLIInstance()
+			cli, err := NewCLIInstance()
-			return cli.VaultImport(vaultName)
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.VaultImport(cmd, vaultName)
 		},
 	}
 }
 
+func newVaultRemoveCmd() *cobra.Command {
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+	cmd := &cobra.Command{
+		Use:     "remove <name>",
+		Aliases: []string{"rm"},
+		Short:   "Remove a vault",
+		Long: `Remove a vault. Requires --force if the vault contains secrets. Will automatically ` +
+			`switch to another vault if removing the currently selected one.`,
+		Args:              cobra.ExactArgs(1),
+		ValidArgsFunction: getVaultNamesCompletionFunc(cli.fs, cli.stateDir),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			force, _ := cmd.Flags().GetBool("force")
+			cli, err := NewCLIInstance()
+			if err != nil {
+				return fmt.Errorf("failed to initialize CLI: %w", err)
+			}
+
+			return cli.RemoveVault(cmd, args[0], force)
+		},
+	}
+
+	cmd.Flags().BoolP("force", "f", false, "Force removal even if vault contains secrets")
+
+	return cmd
+}
+
 // ListVaults lists all available vaults
-func (cli *CLIInstance) ListVaults(jsonOutput bool) error {
+func (cli *Instance) ListVaults(cmd *cobra.Command, jsonOutput bool) error {
 	vaults, err := vault.ListVaults(cli.fs, cli.stateDir)
 	if err != nil {
 		return err
 	}
 
-	if jsonOutput {
+	if jsonOutput { //nolint:nestif // Separate JSON and text output formatting logic
 		// Get current vault name for context
 		currentVault := ""
 		if currentVlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir); err == nil {
@@ -103,20 +166,20 @@ func (cli *CLIInstance) ListVaults(jsonOutput bool) error {
 		}
 
 		result := map[string]interface{}{
-			"vaults":        vaults,
+			"vaults":       vaults,
-			"current_vault": currentVault,
+			"currentVault": currentVault,
 		}
 
 		jsonBytes, err := json.MarshalIndent(result, "", "  ")
 		if err != nil {
 			return err
 		}
-		fmt.Println(string(jsonBytes))
+		cmd.Println(string(jsonBytes))
 	} else {
 		// Text output
-		fmt.Println("Available vaults:")
+		cmd.Println("Available vaults:")
 		if len(vaults) == 0 {
-			fmt.Println("  (none)")
+			cmd.Println("  (none)")
 		} else {
 			// Try to get current vault for marking
 			currentVault := ""
@@ -126,9 +189,9 @@ func (cli *CLIInstance) ListVaults(jsonOutput bool) error {
 
 			for _, vaultName := range vaults {
 				if vaultName == currentVault {
-					fmt.Printf("  %s (current)\n", vaultName)
+					cmd.Printf("  %s (current)\n", vaultName)
 				} else {
-					fmt.Printf("  %s\n", vaultName)
+					cmd.Printf("  %s\n", vaultName)
 				}
 			}
 		}
@@ -138,30 +201,115 @@ func (cli *CLIInstance) ListVaults(jsonOutput bool) error {
 }
 
 // CreateVault creates a new vault
-func (cli *CLIInstance) CreateVault(name string) error {
+func (cli *Instance) CreateVault(cmd *cobra.Command, name string) error {
 	secret.Debug("Creating new vault", "name", name, "state_dir", cli.stateDir)
 
+	// Get or prompt for mnemonic
+	var mnemonicStr string
+	if envMnemonic := os.Getenv(secret.EnvMnemonic); envMnemonic != "" {
+		secret.Debug("Using mnemonic from environment variable")
+		mnemonicStr = envMnemonic
+	} else {
+		secret.Debug("Prompting user for mnemonic phrase")
+		// Read mnemonic securely without echo
+		mnemonicBuffer, err := secret.ReadPassphrase("Enter your BIP39 mnemonic phrase: ")
+		if err != nil {
+			secret.Debug("Failed to read mnemonic from stdin", "error", err)
+
+			return fmt.Errorf("failed to read mnemonic: %w", err)
+		}
+		defer mnemonicBuffer.Destroy()
+
+		mnemonicStr = mnemonicBuffer.String()
+		fmt.Fprintln(os.Stderr) // Add newline after hidden input
+	}
+
+	if mnemonicStr == "" {
+		return fmt.Errorf("mnemonic cannot be empty")
+	}
+
+	// Validate the mnemonic
+	mnemonicWords := strings.Fields(mnemonicStr)
+	secret.Debug("Validating BIP39 mnemonic", "word_count", len(mnemonicWords))
+	if !bip39.IsMnemonicValid(mnemonicStr) {
+		return fmt.Errorf("invalid BIP39 mnemonic phrase")
+	}
+
+	// Set mnemonic in environment for CreateVault to use
+	originalMnemonic := os.Getenv(secret.EnvMnemonic)
+	_ = os.Setenv(secret.EnvMnemonic, mnemonicStr)
+	defer func() {
+		if originalMnemonic != "" {
+			_ = os.Setenv(secret.EnvMnemonic, originalMnemonic)
+		} else {
+			_ = os.Unsetenv(secret.EnvMnemonic)
+		}
+	}()
+
+	// Create the vault - it will handle key derivation internally
 	vlt, err := vault.CreateVault(cli.fs, cli.stateDir, name)
 	if err != nil {
 		return err
 	}
 
-	fmt.Printf("Created vault '%s'\n", vlt.GetName())
+	// Get the vault metadata to retrieve the derivation index
+	vaultDir := filepath.Join(cli.stateDir, "vaults.d", name)
+	metadata, err := vault.LoadVaultMetadata(cli.fs, vaultDir)
+	if err != nil {
+		return fmt.Errorf("failed to load vault metadata: %w", err)
+	}
+
+	// Derive the long-term key using the same index that CreateVault used
+	ltIdentity, err := agehd.DeriveIdentity(mnemonicStr, metadata.DerivationIndex)
+	if err != nil {
+		return fmt.Errorf("failed to derive long-term key from mnemonic: %w", err)
+	}
+
+	// Unlock the vault with the derived long-term key
+	vlt.Unlock(ltIdentity)
+
+	// Get or prompt for passphrase
+	var passphraseBuffer *memguard.LockedBuffer
+	if envPassphrase := os.Getenv(secret.EnvUnlockPassphrase); envPassphrase != "" {
+		secret.Debug("Using unlock passphrase from environment variable")
+		passphraseBuffer = memguard.NewBufferFromBytes([]byte(envPassphrase))
+	} else {
+		secret.Debug("Prompting user for unlock passphrase")
+		// Use secure passphrase input with confirmation
+		passphraseBuffer, err = readSecurePassphrase("Enter passphrase for unlocker: ")
+		if err != nil {
+			return fmt.Errorf("failed to read passphrase: %w", err)
+		}
+	}
+	defer passphraseBuffer.Destroy()
+
+	// Create passphrase-protected unlocker
+	secret.Debug("Creating passphrase-protected unlocker")
+	passphraseUnlocker, err := vlt.CreatePassphraseUnlocker(passphraseBuffer)
+	if err != nil {
+		return fmt.Errorf("failed to create unlocker: %w", err)
+	}
+
+	cmd.Printf("Created vault '%s'\n", vlt.GetName())
+	cmd.Printf("Long-term public key: %s\n", ltIdentity.Recipient().String())
+	cmd.Printf("Unlocker ID: %s\n", passphraseUnlocker.GetID())
+
 	return nil
 }
 
 // SelectVault selects a vault as the current one
-func (cli *CLIInstance) SelectVault(name string) error {
+func (cli *Instance) SelectVault(cmd *cobra.Command, name string) error {
 	if err := vault.SelectVault(cli.fs, cli.stateDir, name); err != nil {
 		return err
 	}
 
-	fmt.Printf("Selected vault '%s' as current\n", name)
+	cmd.Printf("Selected vault '%s' as current\n", name)
+
 	return nil
 }
 
 // VaultImport imports a mnemonic into a specific vault
-func (cli *CLIInstance) VaultImport(vaultName string) error {
+func (cli *Instance) VaultImport(cmd *cobra.Command, vaultName string) error {
 	secret.Debug("Importing mnemonic into vault", "vault_name", vaultName, "state_dir", cli.stateDir)
 
 	// Get the specific vault by name
@@ -181,6 +329,12 @@ func (cli *CLIInstance) VaultImport(vaultName string) error {
 		return fmt.Errorf("vault '%s' does not exist", vaultName)
 	}
 
+	// Check if vault already has a public key
+	pubKeyPath := fmt.Sprintf("%s/pub.age", vaultDir)
+	if _, err := cli.fs.Stat(pubKeyPath); err == nil {
+		return fmt.Errorf("vault '%s' already has a long-term key configured", vaultName)
+	}
+
 	// Get mnemonic from environment
 	mnemonic := os.Getenv(secret.EnvMnemonic)
 	if mnemonic == "" {
@@ -194,14 +348,11 @@ func (cli *CLIInstance) VaultImport(vaultName string) error {
 		return fmt.Errorf("invalid BIP39 mnemonic")
 	}
 
-	// Calculate mnemonic hash for index tracking
-	mnemonicHash := vault.ComputeDoubleSHA256([]byte(mnemonic))
-	secret.Debug("Calculated mnemonic hash", "hash", mnemonicHash)
-
 	// Get the next available derivation index for this mnemonic
-	derivationIndex, err := vault.GetNextDerivationIndex(cli.fs, cli.stateDir, mnemonicHash)
+	derivationIndex, err := vault.GetNextDerivationIndex(cli.fs, cli.stateDir, mnemonic)
 	if err != nil {
 		secret.Debug("Failed to get next derivation index", "error", err)
+
 		return fmt.Errorf("failed to get next derivation index: %w", err)
 	}
 	secret.Debug("Using derivation index", "index", derivationIndex)
@@ -213,32 +364,46 @@ func (cli *CLIInstance) VaultImport(vaultName string) error {
 		return fmt.Errorf("failed to derive long-term key: %w", err)
 	}
 
-	// Calculate the long-term key hash
-	ltKeyHash := vault.ComputeDoubleSHA256([]byte(ltIdentity.String()))
-	secret.Debug("Calculated long-term key hash", "hash", ltKeyHash)
-
 	// Store long-term public key in vault
 	ltPublicKey := ltIdentity.Recipient().String()
 	secret.Debug("Storing long-term public key", "pubkey", ltPublicKey, "vault_dir", vaultDir)
 
-	pubKeyPath := fmt.Sprintf("%s/pub.age", vaultDir)
+	if err := afero.WriteFile(cli.fs, pubKeyPath, []byte(ltPublicKey), secret.FilePerms); err != nil {
-	if err := afero.WriteFile(cli.fs, pubKeyPath, []byte(ltPublicKey), 0600); err != nil {
 		return fmt.Errorf("failed to store long-term public key: %w", err)
 	}
 
-	// Save vault metadata
+	// Calculate public key hash from the actual derivation index being used
-	metadata := &vault.VaultMetadata{
+	// This is used to verify that the derived key matches what was stored
-		Name:            vaultName,
+	publicKeyHash := vault.ComputeDoubleSHA256([]byte(ltIdentity.Recipient().String()))
-		CreatedAt:       time.Now(),
+
-		DerivationIndex: derivationIndex,
+	// Calculate family hash from index 0 (same for all vaults with this mnemonic)
-		LongTermKeyHash: ltKeyHash,
+	// This is used to identify which vaults belong to the same mnemonic family
-		MnemonicHash:    mnemonicHash,
+	identity0, err := agehd.DeriveIdentity(mnemonic, 0)
+	if err != nil {
+		return fmt.Errorf("failed to derive identity for index 0: %w", err)
 	}
-	if err := vault.SaveVaultMetadata(cli.fs, vaultDir, metadata); err != nil {
+	familyHash := vault.ComputeDoubleSHA256([]byte(identity0.Recipient().String()))
+
+	// Load existing metadata
+	existingMetadata, err := vault.LoadVaultMetadata(cli.fs, vaultDir)
+	if err != nil {
+		// If metadata doesn't exist, create new
+		existingMetadata = &vault.Metadata{
+			CreatedAt: time.Now(),
+		}
+	}
+
+	// Update metadata with new derivation info
+	existingMetadata.DerivationIndex = derivationIndex
+	existingMetadata.PublicKeyHash = publicKeyHash
+	existingMetadata.MnemonicFamilyHash = familyHash
+
+	if err := vault.SaveVaultMetadata(cli.fs, vaultDir, existingMetadata); err != nil {
 		secret.Debug("Failed to save vault metadata", "error", err)
+
 		return fmt.Errorf("failed to save vault metadata: %w", err)
 	}
-	secret.Debug("Saved vault metadata with derivation index and key hash")
+	secret.Debug("Saved vault metadata with derivation index and public key hash")
 
 	// Get passphrase from environment variable
 	passphraseStr := os.Getenv(secret.EnvUnlockPassphrase)
@@ -248,20 +413,112 @@ func (cli *CLIInstance) VaultImport(vaultName string) error {
 
 	secret.Debug("Using unlock passphrase from environment variable")
 
+	// Create secure buffer for passphrase
+	passphraseBuffer := memguard.NewBufferFromBytes([]byte(passphraseStr))
+	defer passphraseBuffer.Destroy()
+
 	// Unlock the vault with the derived long-term key
 	vlt.Unlock(ltIdentity)
 
 	// Create passphrase-protected unlocker
 	secret.Debug("Creating passphrase-protected unlocker")
-	passphraseUnlocker, err := vlt.CreatePassphraseUnlocker(passphraseStr)
+	passphraseUnlocker, err := vlt.CreatePassphraseUnlocker(passphraseBuffer)
 	if err != nil {
 		secret.Debug("Failed to create unlocker", "error", err)
+
 		return fmt.Errorf("failed to create unlocker: %w", err)
 	}
 
-	fmt.Printf("Successfully imported mnemonic into vault '%s'\n", vaultName)
+	cmd.Printf("Successfully imported mnemonic into vault '%s'\n", vaultName)
-	fmt.Printf("Long-term public key: %s\n", ltPublicKey)
+	cmd.Printf("Long-term public key: %s\n", ltPublicKey)
-	fmt.Printf("Unlocker ID: %s\n", passphraseUnlocker.GetID())
+	cmd.Printf("Unlocker ID: %s\n", passphraseUnlocker.GetID())
+
+	return nil
+}
+
+// RemoveVault removes a vault with safety checks
+func (cli *Instance) RemoveVault(cmd *cobra.Command, name string, force bool) error {
+	// Get list of all vaults
+	vaults, err := vault.ListVaults(cli.fs, cli.stateDir)
+	if err != nil {
+		return fmt.Errorf("failed to list vaults: %w", err)
+	}
+
+	// Check if vault exists
+	vaultExists := false
+	for _, v := range vaults {
+		if v == name {
+			vaultExists = true
+
+			break
+		}
+	}
+	if !vaultExists {
+		return fmt.Errorf("vault '%s' does not exist", name)
+	}
+
+	// Don't allow removing the last vault
+	if len(vaults) == 1 {
+		return fmt.Errorf("cannot remove the last vault")
+	}
+
+	// Check if this is the current vault
+	currentVault, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
+	if err != nil {
+		return fmt.Errorf("failed to get current vault: %w", err)
+	}
+	isCurrentVault := currentVault.GetName() == name
+
+	// Load the vault to check for secrets
+	vlt := vault.NewVault(cli.fs, cli.stateDir, name)
+	vaultDir, err := vlt.GetDirectory()
+	if err != nil {
+		return fmt.Errorf("failed to get vault directory: %w", err)
+	}
+
+	// Check if vault has secrets
+	secretsDir := filepath.Join(vaultDir, "secrets.d")
+	hasSecrets := false
+	if exists, _ := afero.DirExists(cli.fs, secretsDir); exists {
+		entries, err := afero.ReadDir(cli.fs, secretsDir)
+		if err == nil && len(entries) > 0 {
+			hasSecrets = true
+		}
+	}
+
+	// Require --force if vault has secrets
+	if hasSecrets && !force {
+		return fmt.Errorf("vault '%s' contains secrets; use --force to remove", name)
+	}
+
+	// If removing current vault, switch to another vault first
+	if isCurrentVault {
+		// Find another vault to switch to
+		var newVault string
+		for _, v := range vaults {
+			if v != name {
+				newVault = v
+
+				break
+			}
+		}
+
+		// Switch to the new vault
+		if err := vault.SelectVault(cli.fs, cli.stateDir, newVault); err != nil {
+			return fmt.Errorf("failed to switch to vault '%s': %w", newVault, err)
+		}
+		cmd.Printf("Switched current vault to '%s'\n", newVault)
+	}
+
+	// Remove the vault directory
+	if err := cli.fs.RemoveAll(vaultDir); err != nil {
+		return fmt.Errorf("failed to remove vault directory: %w", err)
+	}
+
+	cmd.Printf("Removed vault '%s'\n", name)
+	if hasSecrets {
+		cmd.Printf("Warning: Vault contained secrets that have been permanently deleted\n")
+	}
 
 	return nil
 }

internal/cli/version.go

@@ -2,7 +2,7 @@ package cli
 
 import (
 	"fmt"
-	"os"
+	"log"
 	"path/filepath"
 	"strings"
 	"text/tabwriter"
@@ -13,14 +13,22 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const (
+	tabWriterPadding = 2
+)
+
 // newVersionCmd returns the version management command
 func newVersionCmd() *cobra.Command {
-	cli := NewCLIInstance()
+	cli, err := NewCLIInstance()
+	if err != nil {
+		log.Fatalf("failed to initialize CLI: %v", err)
+	}
+
 	return VersionCommands(cli)
 }
 
 // VersionCommands returns the version management commands
-func VersionCommands(cli *CLIInstance) *cobra.Command {
+func VersionCommands(cli *Instance) *cobra.Command {
 	versionCmd := &cobra.Command{
 		Use:   "version",
 		Short: "Manage secret versions",
@@ -29,11 +37,13 @@ func VersionCommands(cli *CLIInstance) *cobra.Command {
 
 	// List versions command
 	listCmd := &cobra.Command{
-		Use:   "list <secret-name>",
+		Use:               "list <secret-name>",
-		Short: "List all versions of a secret",
+		Aliases:           []string{"ls"},
-		Args:  cobra.ExactArgs(1),
+		Short:             "List all versions of a secret",
+		Args:              cobra.ExactArgs(1),
+		ValidArgsFunction: getSecretNamesCompletionFunc(cli.fs, cli.stateDir),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return cli.ListVersions(args[0])
+			return cli.ListVersions(cmd, args[0])
 		},
 	}
 
@@ -42,53 +52,92 @@ func VersionCommands(cli *CLIInstance) *cobra.Command {
 		Use:   "promote <secret-name> <version>",
 		Short: "Promote a specific version to current",
 		Long:  "Updates the current symlink to point to the specified version without modifying timestamps",
-		Args:  cobra.ExactArgs(2),
+		Args:  cobra.ExactArgs(2), //nolint:mnd // Command requires exactly 2 arguments: secret-name and version
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			// Complete secret name for first arg
+			if len(args) == 0 {
+				return getSecretNamesCompletionFunc(cli.fs, cli.stateDir)(cmd, args, toComplete)
+			}
+			// TODO: Complete version numbers for second arg
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return cli.PromoteVersion(args[0], args[1])
+			return cli.PromoteVersion(cmd, args[0], args[1])
 		},
 	}
 
-	versionCmd.AddCommand(listCmd, promoteCmd)
+	// Remove version command
+	removeCmd := &cobra.Command{
+		Use:     "remove <secret-name> <version>",
+		Aliases: []string{"rm"},
+		Short:   "Remove a specific version of a secret",
+		Long:    "Remove a specific version of a secret. Cannot remove the current version.",
+		Args:    cobra.ExactArgs(2), //nolint:mnd // Command requires exactly 2 arguments: secret-name and version
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			// Complete secret name for first arg
+			if len(args) == 0 {
+				return getSecretNamesCompletionFunc(cli.fs, cli.stateDir)(cmd, args, toComplete)
+			}
+			// TODO: Complete version numbers for second arg
+			return nil, cobra.ShellCompDirectiveNoFileComp
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return cli.RemoveVersion(cmd, args[0], args[1])
+		},
+	}
+
+	versionCmd.AddCommand(listCmd, promoteCmd, removeCmd)
+
 	return versionCmd
 }
 
 // ListVersions lists all versions of a secret
-func (cli *CLIInstance) ListVersions(secretName string) error {
+func (cli *Instance) ListVersions(cmd *cobra.Command, secretName string) error {
-	secret.Debug("Listing versions for secret", "secret_name", secretName)
+	secret.Debug("ListVersions called", "secret_name", secretName)
 
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
-		return fmt.Errorf("failed to get current vault: %w", err)
+		secret.Debug("Failed to get current vault", "error", err)
+
+		return err
 	}
 
-	// Get vault directory
 	vaultDir, err := vlt.GetDirectory()
 	if err != nil {
-		return fmt.Errorf("failed to get vault directory: %w", err)
+		secret.Debug("Failed to get vault directory", "error", err)
+
+		return err
 	}
 
-	// Convert secret name to storage name
+	// Get the encoded secret name
-	storageName := strings.ReplaceAll(secretName, "/", "%")
+	encodedName := strings.ReplaceAll(secretName, "/", "%")
-	secretDir := filepath.Join(vaultDir, "secrets.d", storageName)
+	secretDir := filepath.Join(vaultDir, "secrets.d", encodedName)
 
 	// Check if secret exists
 	exists, err := afero.DirExists(cli.fs, secretDir)
 	if err != nil {
+		secret.Debug("Failed to check if secret exists", "error", err)
+
 		return fmt.Errorf("failed to check if secret exists: %w", err)
 	}
 	if !exists {
-		return fmt.Errorf("secret %s not found", secretName)
+		secret.Debug("Secret not found", "secret_name", secretName)
+
+		return fmt.Errorf("secret '%s' not found", secretName)
 	}
 
-	// Get all versions
+	// List all versions
 	versions, err := secret.ListVersions(cli.fs, secretDir)
 	if err != nil {
+		secret.Debug("Failed to list versions", "error", err)
+
 		return fmt.Errorf("failed to list versions: %w", err)
 	}
 
 	if len(versions) == 0 {
-		fmt.Println("No versions found")
+		cmd.Println("No versions found")
+
 		return nil
 	}
 
@@ -106,22 +155,23 @@ func (cli *CLIInstance) ListVersions(secretName string) error {
 	}
 
 	// Create table writer
-	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
+	w := tabwriter.NewWriter(cmd.OutOrStdout(), 0, 0, tabWriterPadding, ' ', 0)
-	fmt.Fprintln(w, "VERSION\tCREATED\tSTATUS\tNOT_BEFORE\tNOT_AFTER")
+	_, _ = fmt.Fprintln(w, "VERSION\tCREATED\tSTATUS\tNOT_BEFORE\tNOT_AFTER")
 
 	// Load and display each version's metadata
 	for _, version := range versions {
-		sv := secret.NewSecretVersion(vlt, secretName, version)
+		sv := secret.NewVersion(vlt, secretName, version)
 
 		// Load metadata
 		if err := sv.LoadMetadata(ltIdentity); err != nil {
-			secret.Debug("Failed to load version metadata", "version", version, "error", err)
+			secret.Warn("Failed to load version metadata", "version", version, "error", err)
 			// Display version with error
 			status := "error"
 			if version == currentVersion {
 				status = "current (error)"
 			}
-			fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", version, "-", status, "-", "-")
+			_, _ = fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", version, "-", status, "-", "-")
+
 			continue
 		}
 
@@ -147,32 +197,67 @@ func (cli *CLIInstance) ListVersions(secretName string) error {
 			notAfter = sv.Metadata.NotAfter.Format("2006-01-02 15:04:05")
 		}
 
-		fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", version, createdAt, status, notBefore, notAfter)
+		_, _ = fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", version, createdAt, status, notBefore, notAfter)
 	}
 
-	w.Flush()
+	_ = w.Flush()
+
 	return nil
 }
 
 // PromoteVersion promotes a specific version to current
-func (cli *CLIInstance) PromoteVersion(secretName string, version string) error {
+func (cli *Instance) PromoteVersion(cmd *cobra.Command, secretName string, version string) error {
-	secret.Debug("Promoting version", "secret_name", secretName, "version", version)
-
 	// Get current vault
 	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
 	if err != nil {
-		return fmt.Errorf("failed to get current vault: %w", err)
+		return err
 	}
 
-	// Get vault directory
 	vaultDir, err := vlt.GetDirectory()
 	if err != nil {
-		return fmt.Errorf("failed to get vault directory: %w", err)
+		return err
 	}
 
-	// Convert secret name to storage name
+	// Get the encoded secret name
-	storageName := strings.ReplaceAll(secretName, "/", "%")
+	encodedName := strings.ReplaceAll(secretName, "/", "%")
-	secretDir := filepath.Join(vaultDir, "secrets.d", storageName)
+	secretDir := filepath.Join(vaultDir, "secrets.d", encodedName)
+
+	// Check if version exists
+	versionDir := filepath.Join(secretDir, "versions", version)
+	exists, err := afero.DirExists(cli.fs, versionDir)
+	if err != nil {
+		return fmt.Errorf("failed to check if version exists: %w", err)
+	}
+	if !exists {
+		return fmt.Errorf("version '%s' not found for secret '%s'", version, secretName)
+	}
+
+	// Update the current symlink using the proper function
+	if err := secret.SetCurrentVersion(cli.fs, secretDir, version); err != nil {
+		return fmt.Errorf("failed to update current version: %w", err)
+	}
+
+	cmd.Printf("Promoted version %s to current for secret '%s'\n", version, secretName)
+
+	return nil
+}
+
+// RemoveVersion removes a specific version of a secret
+func (cli *Instance) RemoveVersion(cmd *cobra.Command, secretName string, version string) error {
+	// Get current vault
+	vlt, err := vault.GetCurrentVault(cli.fs, cli.stateDir)
+	if err != nil {
+		return err
+	}
+
+	vaultDir, err := vlt.GetDirectory()
+	if err != nil {
+		return err
+	}
+
+	// Get the encoded secret name
+	encodedName := strings.ReplaceAll(secretName, "/", "%")
+	secretDir := filepath.Join(vaultDir, "secrets.d", encodedName)
 
 	// Check if secret exists
 	exists, err := afero.DirExists(cli.fs, secretDir)
@@ -180,24 +265,36 @@ func (cli *CLIInstance) PromoteVersion(secretName string, version string) error
 		return fmt.Errorf("failed to check if secret exists: %w", err)
 	}
 	if !exists {
-		return fmt.Errorf("secret %s not found", secretName)
+		return fmt.Errorf("secret '%s' not found", secretName)
 	}
 
 	// Check if version exists
-	versionPath := filepath.Join(secretDir, "versions", version)
+	versionDir := filepath.Join(secretDir, "versions", version)
-	exists, err = afero.DirExists(cli.fs, versionPath)
+	exists, err = afero.DirExists(cli.fs, versionDir)
 	if err != nil {
 		return fmt.Errorf("failed to check if version exists: %w", err)
 	}
 	if !exists {
-		return fmt.Errorf("version %s not found for secret %s", version, secretName)
+		return fmt.Errorf("version '%s' not found for secret '%s'", version, secretName)
 	}
 
-	// Update current symlink
+	// Get current version
-	if err := secret.SetCurrentVersion(cli.fs, secretDir, version); err != nil {
+	currentVersion, err := secret.GetCurrentVersion(cli.fs, secretDir)
-		return fmt.Errorf("failed to promote version: %w", err)
+	if err != nil {
+		return fmt.Errorf("failed to get current version: %w", err)
 	}
 
-	fmt.Printf("Promoted version %s to current for secret '%s'\n", version, secretName)
+	// Don't allow removing the current version
+	if version == currentVersion {
+		return fmt.Errorf("cannot remove the current version '%s'; promote another version first", version)
+	}
+
+	// Remove the version directory
+	if err := cli.fs.RemoveAll(versionDir); err != nil {
+		return fmt.Errorf("failed to remove version: %w", err)
+	}
+
+	cmd.Printf("Removed version %s of secret '%s'\n", version, secretName)
+
 	return nil
 }

internal/cli/version_test.go

@@ -1,26 +1,52 @@
+// Version CLI Command Tests
+//
+// Tests for version-related CLI commands:
+//
+// - TestListVersionsCommand: Tests `secret version list` command output
+// - TestListVersionsNonExistentSecret: Tests error handling for missing secrets
+// - TestPromoteVersionCommand: Tests `secret version promote` command
+// - TestPromoteNonExistentVersion: Tests error handling for invalid promotion
+// - TestGetSecretWithVersion: Tests `secret get --version` flag functionality
+// - TestVersionCommandStructure: Tests command structure and help text
+// - TestListVersionsEmptyOutput: Tests edge case with no versions
+//
+// Test Utilities:
+// - setupTestVault(): CLI test helper for vault initialization
+// - Uses consistent test mnemonic for reproducible testing
+
 package cli
 
 import (
-	"io"
+	"bytes"
-	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 
-	"path/filepath"
-
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/internal/vault"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+// Helper function to add a secret to vault with proper buffer protection
+func addTestSecret(t *testing.T, vlt *vault.Vault, name string, value []byte, force bool) {
+	t.Helper()
+	buffer := memguard.NewBufferFromBytes(value)
+	defer buffer.Destroy()
+	err := vlt.AddSecret(name, buffer, force)
+	require.NoError(t, err)
+}
+
 // Helper function to set up a vault with long-term key
 func setupTestVault(t *testing.T, fs afero.Fs, stateDir string) {
 	// Set mnemonic for testing
-	t.Setenv(secret.EnvMnemonic, "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about")
+	testMnemonic := "abandon abandon abandon abandon abandon abandon " +
+		"abandon abandon abandon abandon abandon about"
+	t.Setenv(secret.EnvMnemonic, testMnemonic)
 
 	// Create vault
 	vlt, err := vault.CreateVault(fs, stateDir, "default")
@@ -34,7 +60,7 @@ func setupTestVault(t *testing.T, fs afero.Fs, stateDir string) {
 	// Store long-term public key in vault
 	vaultDir, _ := vlt.GetDirectory()
 	ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
-	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0600)
+	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0o600)
 	require.NoError(t, err)
 
 	// Select vault
@@ -54,28 +80,24 @@ func TestListVersionsCommand(t *testing.T) {
 	vlt, err := vault.GetCurrentVault(fs, stateDir)
 	require.NoError(t, err)
 
-	err = vlt.AddSecret("test/secret", []byte("version-1"), false)
+	addTestSecret(t, vlt, "test/secret", []byte("version-1"), false)
-	require.NoError(t, err)
 
 	time.Sleep(10 * time.Millisecond)
 
-	err = vlt.AddSecret("test/secret", []byte("version-2"), true)
+	addTestSecret(t, vlt, "test/secret", []byte("version-2"), true)
-	require.NoError(t, err)
 
-	// Capture output
+	// Create a command for output capture
-	oldStdout := os.Stdout
+	cmd := newRootCmd()
-	r, w, _ := os.Pipe()
+	var buf bytes.Buffer
-	os.Stdout = w
+	cmd.SetOut(&buf)
+	cmd.SetErr(&buf)
 
 	// List versions
-	err = cli.ListVersions("test/secret")
+	err = cli.ListVersions(cmd, "test/secret")
 	require.NoError(t, err)
 
-	// Restore stdout and read output
+	// Read output
-	w.Close()
+	outputStr := buf.String()
-	os.Stdout = oldStdout
-	output, _ := io.ReadAll(r)
-	outputStr := string(output)
 
 	// Verify output contains version headers
 	assert.Contains(t, outputStr, "VERSION")
@@ -106,9 +128,15 @@ func TestListVersionsNonExistentSecret(t *testing.T) {
 	// Set up vault with long-term key
 	setupTestVault(t, fs, stateDir)
 
+	// Create a command for output capture
+	cmd := newRootCmd()
+	var buf bytes.Buffer
+	cmd.SetOut(&buf)
+	cmd.SetErr(&buf)
+
 	// Try to list versions of non-existent secret
-	err := cli.ListVersions("nonexistent/secret")
+	err := cli.ListVersions(cmd, "nonexistent/secret")
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "not found")
 }
 
@@ -124,13 +152,11 @@ func TestPromoteVersionCommand(t *testing.T) {
 	vlt, err := vault.GetCurrentVault(fs, stateDir)
 	require.NoError(t, err)
 
-	err = vlt.AddSecret("test/secret", []byte("version-1"), false)
+	addTestSecret(t, vlt, "test/secret", []byte("version-1"), false)
-	require.NoError(t, err)
 
 	time.Sleep(10 * time.Millisecond)
 
-	err = vlt.AddSecret("test/secret", []byte("version-2"), true)
+	addTestSecret(t, vlt, "test/secret", []byte("version-2"), true)
-	require.NoError(t, err)
 
 	// Get versions
 	vaultDir, _ := vlt.GetDirectory()
@@ -147,19 +173,17 @@ func TestPromoteVersionCommand(t *testing.T) {
 	// Promote first version
 	firstVersion := versions[1] // Older version
 
-	// Capture output
+	// Create a command for output capture
-	oldStdout := os.Stdout
+	cmd := newRootCmd()
-	r, w, _ := os.Pipe()
+	var buf bytes.Buffer
-	os.Stdout = w
+	cmd.SetOut(&buf)
+	cmd.SetErr(&buf)
 
-	err = cli.PromoteVersion("test/secret", firstVersion)
+	err = cli.PromoteVersion(cmd, "test/secret", firstVersion)
 	require.NoError(t, err)
 
-	// Restore stdout and read output
+	// Read output
-	w.Close()
+	outputStr := buf.String()
-	os.Stdout = oldStdout
-	output, _ := io.ReadAll(r)
-	outputStr := string(output)
 
 	// Verify success message
 	assert.Contains(t, outputStr, "Promoted version")
@@ -183,12 +207,17 @@ func TestPromoteNonExistentVersion(t *testing.T) {
 	vlt, err := vault.GetCurrentVault(fs, stateDir)
 	require.NoError(t, err)
 
-	err = vlt.AddSecret("test/secret", []byte("value"), false)
+	addTestSecret(t, vlt, "test/secret", []byte("value"), false)
-	require.NoError(t, err)
+
+	// Create a command for output capture
+	cmd := newRootCmd()
+	var buf bytes.Buffer
+	cmd.SetOut(&buf)
+	cmd.SetErr(&buf)
 
 	// Try to promote non-existent version
-	err = cli.PromoteVersion("test/secret", "20991231.999")
+	err = cli.PromoteVersion(cmd, "test/secret", "20991231.999")
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "not found")
 }
 
@@ -204,13 +233,11 @@ func TestGetSecretWithVersion(t *testing.T) {
 	vlt, err := vault.GetCurrentVault(fs, stateDir)
 	require.NoError(t, err)
 
-	err = vlt.AddSecret("test/secret", []byte("version-1"), false)
+	addTestSecret(t, vlt, "test/secret", []byte("version-1"), false)
-	require.NoError(t, err)
 
 	time.Sleep(10 * time.Millisecond)
 
-	err = vlt.AddSecret("test/secret", []byte("version-2"), true)
+	addTestSecret(t, vlt, "test/secret", []byte("version-2"), true)
-	require.NoError(t, err)
 
 	// Get versions
 	vaultDir, _ := vlt.GetDirectory()
@@ -219,38 +246,30 @@ func TestGetSecretWithVersion(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, versions, 2)
 
+	// Create a command for output capture
+	cmd := newRootCmd()
+	var buf bytes.Buffer
+	cmd.SetOut(&buf)
+
 	// Test getting current version (empty version string)
-	oldStdout := os.Stdout
+	err = cli.GetSecretWithVersion(cmd, "test/secret", "")
-	r, w, _ := os.Pipe()
-	os.Stdout = w
-
-	err = cli.GetSecretWithVersion("test/secret", "")
 	require.NoError(t, err)
-
+	assert.Equal(t, "version-2", buf.String())
-	w.Close()
-	os.Stdout = oldStdout
-	output, _ := io.ReadAll(r)
-
-	assert.Equal(t, "version-2", string(output))
 
 	// Test getting specific version
-	r, w, _ = os.Pipe()
+	buf.Reset()
-	os.Stdout = w
-
 	firstVersion := versions[1] // Older version
-	err = cli.GetSecretWithVersion("test/secret", firstVersion)
+	err = cli.GetSecretWithVersion(cmd, "test/secret", firstVersion)
 	require.NoError(t, err)
-
+	assert.Equal(t, "version-1", buf.String())
-	w.Close()
-	os.Stdout = oldStdout
-	output, _ = io.ReadAll(r)
-
-	assert.Equal(t, "version-1", string(output))
 }
 
 func TestVersionCommandStructure(t *testing.T) {
 	// Test that version commands are properly structured
-	cli := NewCLIInstance()
+	cli, err := NewCLIInstance()
+	if err != nil {
+		t.Fatalf("failed to initialize CLI: %v", err)
+	}
 	cmd := VersionCommands(cli)
 
 	assert.Equal(t, "version", cmd.Use)
@@ -277,11 +296,17 @@ func TestListVersionsEmptyOutput(t *testing.T) {
 	// Create a secret directory without versions (edge case)
 	vaultDir := stateDir + "/vaults.d/default"
 	secretDir := vaultDir + "/secrets.d/test%secret"
-	err := fs.MkdirAll(secretDir, 0755)
+	err := fs.MkdirAll(secretDir, 0o755)
 	require.NoError(t, err)
 
+	// Create a command for output capture
+	cmd := newRootCmd()
+	var buf bytes.Buffer
+	cmd.SetOut(&buf)
+	cmd.SetErr(&buf)
+
 	// List versions - should show "No versions found"
-	err = cli.ListVersions("test/secret")
+	err = cli.ListVersions(cmd, "test/secret")
 
 	// Should succeed even with no versions
 	assert.NoError(t, err)

internal/macse/macse_darwin.go

@@ -0,0 +1,129 @@
+//go:build darwin
+
+// Package macse provides Go bindings for macOS Secure Enclave operations
+// using CryptoTokenKit identities created via sc_auth.
+// Key creation and deletion shell out to sc_auth (which has SE entitlements).
+// Encrypt/decrypt use Security.framework ECIES directly (works unsigned).
+package macse
+
+/*
+#cgo CFLAGS: -x objective-c -fobjc-arc
+#cgo LDFLAGS: -framework Security -framework Foundation -framework CoreFoundation
+#include <stdlib.h>
+#include "secure_enclave.h"
+*/
+import "C"
+
+import (
+	"fmt"
+	"unsafe"
+)
+
+const (
+	// p256UncompressedKeySize is the size of an uncompressed P-256 public key.
+	p256UncompressedKeySize = 65
+
+	// errorBufferSize is the size of the C error message buffer.
+	errorBufferSize = 512
+
+	// hashBufferSize is the size of the hash output buffer.
+	hashBufferSize = 128
+
+	// maxCiphertextSize is the max buffer for ECIES ciphertext.
+	// ECIES overhead for P-256: 65 (ephemeral pub) + 16 (GCM tag) + 16 (IV) + plaintext.
+	maxCiphertextSize = 8192
+
+	// maxPlaintextSize is the max buffer for decrypted plaintext.
+	maxPlaintextSize = 8192
+)
+
+// CreateKey creates a new P-256 non-exportable key in the Secure Enclave via sc_auth.
+// Returns the uncompressed public key bytes (65 bytes) and the identity hash (for deletion).
+func CreateKey(label string) (publicKey []byte, hash string, err error) {
+	pubKeyBuf := make([]C.uint8_t, p256UncompressedKeySize)
+	pubKeyLen := C.int(p256UncompressedKeySize)
+	var hashBuf [hashBufferSize]C.char
+	var errBuf [errorBufferSize]C.char
+
+	cLabel := C.CString(label)
+	defer C.free(unsafe.Pointer(cLabel)) //nolint:nlreturn // CGo free pattern
+
+	result := C.se_create_key(cLabel,
+		&pubKeyBuf[0], &pubKeyLen,
+		&hashBuf[0], C.int(hashBufferSize),
+		&errBuf[0], C.int(errorBufferSize))
+
+	if result != 0 {
+		return nil, "", fmt.Errorf("secure enclave: %s", C.GoString(&errBuf[0]))
+	}
+
+	pk := C.GoBytes(unsafe.Pointer(&pubKeyBuf[0]), pubKeyLen) //nolint:nlreturn // CGo result extraction
+	h := C.GoString(&hashBuf[0])
+
+	return pk, h, nil
+}
+
+// Encrypt encrypts plaintext using the SE-backed public key via ECIES
+// (eciesEncryptionStandardVariableIVX963SHA256AESGCM).
+// Encryption uses only the public key; no SE interaction required.
+func Encrypt(label string, plaintext []byte) ([]byte, error) {
+	ciphertextBuf := make([]C.uint8_t, maxCiphertextSize)
+	ciphertextLen := C.int(maxCiphertextSize)
+	var errBuf [errorBufferSize]C.char
+
+	cLabel := C.CString(label)
+	defer C.free(unsafe.Pointer(cLabel)) //nolint:nlreturn // CGo free pattern
+
+	result := C.se_encrypt(cLabel,
+		(*C.uint8_t)(unsafe.Pointer(&plaintext[0])), C.int(len(plaintext)),
+		&ciphertextBuf[0], &ciphertextLen,
+		&errBuf[0], C.int(errorBufferSize))
+
+	if result != 0 {
+		return nil, fmt.Errorf("secure enclave: %s", C.GoString(&errBuf[0]))
+	}
+
+	out := C.GoBytes(unsafe.Pointer(&ciphertextBuf[0]), ciphertextLen) //nolint:nlreturn // CGo result extraction
+
+	return out, nil
+}
+
+// Decrypt decrypts ECIES ciphertext using the SE-backed private key.
+// The ECDH portion of decryption is performed inside the Secure Enclave.
+func Decrypt(label string, ciphertext []byte) ([]byte, error) {
+	plaintextBuf := make([]C.uint8_t, maxPlaintextSize)
+	plaintextLen := C.int(maxPlaintextSize)
+	var errBuf [errorBufferSize]C.char
+
+	cLabel := C.CString(label)
+	defer C.free(unsafe.Pointer(cLabel)) //nolint:nlreturn // CGo free pattern
+
+	result := C.se_decrypt(cLabel,
+		(*C.uint8_t)(unsafe.Pointer(&ciphertext[0])), C.int(len(ciphertext)),
+		&plaintextBuf[0], &plaintextLen,
+		&errBuf[0], C.int(errorBufferSize))
+
+	if result != 0 {
+		return nil, fmt.Errorf("secure enclave: %s", C.GoString(&errBuf[0]))
+	}
+
+	out := C.GoBytes(unsafe.Pointer(&plaintextBuf[0]), plaintextLen) //nolint:nlreturn // CGo result extraction
+
+	return out, nil
+}
+
+// DeleteKey removes a CTK identity from the Secure Enclave via sc_auth.
+func DeleteKey(hash string) error {
+	var errBuf [errorBufferSize]C.char
+
+	cHash := C.CString(hash)
+	defer C.free(unsafe.Pointer(cHash)) //nolint:nlreturn // CGo free pattern
+
+	result := C.se_delete_key(cHash, &errBuf[0], C.int(errorBufferSize))
+
+	if result != 0 {
+		return fmt.Errorf("secure enclave: %s", C.GoString(&errBuf[0]))
+	}
+
+	return nil
+}

internal/macse/macse_stub.go

@@ -0,0 +1,29 @@
+//go:build !darwin
+// +build !darwin
+
+// Package macse provides Go bindings for macOS Secure Enclave operations.
+package macse
+
+import "fmt"
+
+var errNotSupported = fmt.Errorf("secure enclave is only supported on macOS") //nolint:gochecknoglobals
+
+// CreateKey is not supported on non-darwin platforms.
+func CreateKey(_ string) ([]byte, string, error) {
+	return nil, "", errNotSupported
+}
+
+// Encrypt is not supported on non-darwin platforms.
+func Encrypt(_ string, _ []byte) ([]byte, error) {
+	return nil, errNotSupported
+}
+
+// Decrypt is not supported on non-darwin platforms.
+func Decrypt(_ string, _ []byte) ([]byte, error) {
+	return nil, errNotSupported
+}
+
+// DeleteKey is not supported on non-darwin platforms.
+func DeleteKey(_ string) error {
+	return errNotSupported
+}

internal/macse/macse_test.go

@@ -0,0 +1,163 @@
+//go:build darwin
+// +build darwin
+
+package macse
+
+import (
+	"bytes"
+	"testing"
+)
+
+const testKeyLabel = "berlin.sneak.app.secret.test.se-key"
+
+// testKeyHash stores the hash of the created test key for cleanup.
+var testKeyHash string //nolint:gochecknoglobals
+
+// skipIfNoSecureEnclave skips the test if SE access is unavailable.
+func skipIfNoSecureEnclave(t *testing.T) {
+	t.Helper()
+
+	probeLabel := "berlin.sneak.app.secret.test.se-probe"
+	_, hash, err := CreateKey(probeLabel)
+	if err != nil {
+		t.Skipf("Secure Enclave unavailable (skipping): %v", err)
+	}
+
+	if hash != "" {
+		_ = DeleteKey(hash)
+	}
+}
+
+func TestCreateAndDeleteKey(t *testing.T) {
+	skipIfNoSecureEnclave(t)
+
+	if testKeyHash != "" {
+		_ = DeleteKey(testKeyHash)
+	}
+
+	pubKey, hash, err := CreateKey(testKeyLabel)
+	if err != nil {
+		t.Fatalf("CreateKey failed: %v", err)
+	}
+
+	testKeyHash = hash
+	t.Logf("Created key with hash: %s", hash)
+
+	// Verify valid uncompressed P-256 public key
+	if len(pubKey) != p256UncompressedKeySize {
+		t.Fatalf("expected public key length %d, got %d", p256UncompressedKeySize, len(pubKey))
+	}
+
+	if pubKey[0] != 0x04 {
+		t.Fatalf("expected uncompressed point prefix 0x04, got 0x%02x", pubKey[0])
+	}
+
+	if hash == "" {
+		t.Fatal("expected non-empty hash")
+	}
+
+	// Delete the key
+	if err := DeleteKey(hash); err != nil {
+		t.Fatalf("DeleteKey failed: %v", err)
+	}
+
+	testKeyHash = ""
+	t.Log("Key created, verified, and deleted successfully")
+}
+
+func TestEncryptDecryptRoundTrip(t *testing.T) {
+	skipIfNoSecureEnclave(t)
+
+	_, hash, err := CreateKey(testKeyLabel)
+	if err != nil {
+		t.Fatalf("CreateKey failed: %v", err)
+	}
+
+	testKeyHash = hash
+
+	defer func() {
+		if testKeyHash != "" {
+			_ = DeleteKey(testKeyHash)
+			testKeyHash = ""
+		}
+	}()
+
+	// Test data simulating an age private key
+	plaintext := []byte("AGE-SECRET-KEY-1QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ")
+
+	// Encrypt
+	ciphertext, err := Encrypt(testKeyLabel, plaintext)
+	if err != nil {
+		t.Fatalf("Encrypt failed: %v", err)
+	}
+
+	t.Logf("Plaintext: %d bytes, Ciphertext: %d bytes", len(plaintext), len(ciphertext))
+
+	if bytes.Equal(ciphertext, plaintext) {
+		t.Fatal("ciphertext should differ from plaintext")
+	}
+
+	// Decrypt
+	decrypted, err := Decrypt(testKeyLabel, ciphertext)
+	if err != nil {
+		t.Fatalf("Decrypt failed: %v", err)
+	}
+
+	if !bytes.Equal(decrypted, plaintext) {
+		t.Fatalf("decrypted data does not match original plaintext")
+	}
+
+	t.Log("ECIES encrypt/decrypt round-trip successful")
+}
+
+func TestEncryptProducesDifferentCiphertexts(t *testing.T) {
+	skipIfNoSecureEnclave(t)
+
+	_, hash, err := CreateKey(testKeyLabel)
+	if err != nil {
+		t.Fatalf("CreateKey failed: %v", err)
+	}
+
+	testKeyHash = hash
+
+	defer func() {
+		if testKeyHash != "" {
+			_ = DeleteKey(testKeyHash)
+			testKeyHash = ""
+		}
+	}()
+
+	plaintext := []byte("test-secret-data")
+
+	ct1, err := Encrypt(testKeyLabel, plaintext)
+	if err != nil {
+		t.Fatalf("first Encrypt failed: %v", err)
+	}
+
+	ct2, err := Encrypt(testKeyLabel, plaintext)
+	if err != nil {
+		t.Fatalf("second Encrypt failed: %v", err)
+	}
+
+	// ECIES uses a random ephemeral key each time, so ciphertexts should differ
+	if bytes.Equal(ct1, ct2) {
+		t.Fatal("two encryptions of same plaintext should produce different ciphertexts")
+	}
+
+	// Both should decrypt to the same plaintext
+	dec1, err := Decrypt(testKeyLabel, ct1)
+	if err != nil {
+		t.Fatalf("first Decrypt failed: %v", err)
+	}
+
+	dec2, err := Decrypt(testKeyLabel, ct2)
+	if err != nil {
+		t.Fatalf("second Decrypt failed: %v", err)
+	}
+
+	if !bytes.Equal(dec1, plaintext) || !bytes.Equal(dec2, plaintext) {
+		t.Fatal("both ciphertexts should decrypt to original plaintext")
+	}
+
+	t.Log("ECIES correctly produces different ciphertexts that decrypt to same plaintext")
+}

internal/macse/secure_enclave.h

@@ -0,0 +1,57 @@
+#ifndef SECURE_ENCLAVE_H
+#define SECURE_ENCLAVE_H
+
+#include <stdint.h>
+
+// se_create_key creates a new P-256 key in the Secure Enclave via sc_auth.
+// label: unique identifier for the CTK identity (UTF-8 C string)
+// pub_key_out: output buffer for the uncompressed public key (65 bytes for P-256)
+// pub_key_len: on input, size of pub_key_out; on output, actual size written
+// hash_out: output buffer for the identity hash (for deletion)
+// hash_out_len: size of hash_out buffer
+// error_out: output buffer for error message
+// error_out_len: size of error_out buffer
+// Returns 0 on success, -1 on failure.
+int se_create_key(const char *label,
+                  uint8_t *pub_key_out, int *pub_key_len,
+                  char *hash_out, int hash_out_len,
+                  char *error_out, int error_out_len);
+
+// se_encrypt encrypts data using the SE-backed public key (ECIES).
+// label: label of the CTK identity whose public key to use
+// plaintext: data to encrypt
+// plaintext_len: length of plaintext
+// ciphertext_out: output buffer for the ECIES ciphertext
+// ciphertext_len: on input, size of buffer; on output, actual size written
+// error_out: output buffer for error message
+// error_out_len: size of error_out buffer
+// Returns 0 on success, -1 on failure.
+int se_encrypt(const char *label,
+               const uint8_t *plaintext, int plaintext_len,
+               uint8_t *ciphertext_out, int *ciphertext_len,
+               char *error_out, int error_out_len);
+
+// se_decrypt decrypts ECIES ciphertext using the SE-backed private key.
+// The ECDH portion of decryption is performed inside the Secure Enclave.
+// label: label of the CTK identity whose private key to use
+// ciphertext: ECIES ciphertext produced by se_encrypt
+// ciphertext_len: length of ciphertext
+// plaintext_out: output buffer for decrypted data
+// plaintext_len: on input, size of buffer; on output, actual size written
+// error_out: output buffer for error message
+// error_out_len: size of error_out buffer
+// Returns 0 on success, -1 on failure.
+int se_decrypt(const char *label,
+               const uint8_t *ciphertext, int ciphertext_len,
+               uint8_t *plaintext_out, int *plaintext_len,
+               char *error_out, int error_out_len);
+
+// se_delete_key removes a CTK identity from the Secure Enclave via sc_auth.
+// hash: the identity hash returned by se_create_key
+// error_out: output buffer for error message
+// error_out_len: size of error_out buffer
+// Returns 0 on success, -1 on failure.
+int se_delete_key(const char *hash,
+                  char *error_out, int error_out_len);
+
+#endif // SECURE_ENCLAVE_H

internal/macse/secure_enclave.m

@@ -0,0 +1,300 @@
+#import <Foundation/Foundation.h>
+#import <Security/Security.h>
+#include "secure_enclave.h"
+#include <string.h>
+
+// snprintf_error writes an error message string to the output buffer.
+static void snprintf_error(char *error_out, int error_out_len, NSString *msg) {
+    if (error_out && error_out_len > 0) {
+        snprintf(error_out, error_out_len, "%s", msg.UTF8String);
+    }
+}
+
+// lookup_ctk_identity finds a CTK identity by label and returns the private key.
+static SecKeyRef lookup_ctk_private_key(const char *label, char *error_out, int error_out_len) {
+    NSDictionary *query = @{
+        (id)kSecClass:      (id)kSecClassIdentity,
+        (id)kSecAttrLabel:  [NSString stringWithUTF8String:label],
+        (id)kSecMatchLimit: (id)kSecMatchLimitOne,
+        (id)kSecReturnRef:  @YES,
+    };
+
+    SecIdentityRef identity = NULL;
+    OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)query, (CFTypeRef *)&identity);
+
+    if (status != errSecSuccess || !identity) {
+        NSString *msg = [NSString stringWithFormat:@"CTK identity '%s' not found: OSStatus %d",
+                         label, (int)status];
+        snprintf_error(error_out, error_out_len, msg);
+        return NULL;
+    }
+
+    SecKeyRef privateKey = NULL;
+    status = SecIdentityCopyPrivateKey(identity, &privateKey);
+    CFRelease(identity);
+
+    if (status != errSecSuccess || !privateKey) {
+        NSString *msg = [NSString stringWithFormat:
+                         @"failed to get private key from CTK identity '%s': OSStatus %d",
+                         label, (int)status];
+        snprintf_error(error_out, error_out_len, msg);
+        return NULL;
+    }
+
+    return privateKey;
+}
+
+int se_create_key(const char *label,
+                  uint8_t *pub_key_out, int *pub_key_len,
+                  char *hash_out, int hash_out_len,
+                  char *error_out, int error_out_len) {
+    @autoreleasepool {
+        NSString *labelStr = [NSString stringWithUTF8String:label];
+
+        // Shell out to sc_auth (which has SE entitlements) to create the key
+        NSTask *task = [[NSTask alloc] init];
+        task.executableURL = [NSURL fileURLWithPath:@"/usr/sbin/sc_auth"];
+        task.arguments = @[
+            @"create-ctk-identity",
+            @"-k", @"p-256-ne",
+            @"-t", @"none",
+            @"-l", labelStr,
+        ];
+
+        NSPipe *stderrPipe = [NSPipe pipe];
+        task.standardOutput = [NSPipe pipe];
+        task.standardError = stderrPipe;
+
+        NSError *nsError = nil;
+        if (![task launchAndReturnError:&nsError]) {
+            NSString *msg = [NSString stringWithFormat:@"failed to launch sc_auth: %@",
+                             nsError.localizedDescription];
+            snprintf_error(error_out, error_out_len, msg);
+            return -1;
+        }
+
+        [task waitUntilExit];
+
+        if (task.terminationStatus != 0) {
+            NSData *stderrData = [stderrPipe.fileHandleForReading readDataToEndOfFile];
+            NSString *stderrStr = [[NSString alloc] initWithData:stderrData
+                                                        encoding:NSUTF8StringEncoding];
+            NSString *msg = [NSString stringWithFormat:@"sc_auth failed: %@",
+                             stderrStr ?: @"unknown error"];
+            snprintf_error(error_out, error_out_len, msg);
+            return -1;
+        }
+
+        // Retrieve the public key from the created identity
+        SecKeyRef privateKey = lookup_ctk_private_key(label, error_out, error_out_len);
+        if (!privateKey) {
+            return -1;
+        }
+
+        SecKeyRef publicKey = SecKeyCopyPublicKey(privateKey);
+        CFRelease(privateKey);
+
+        if (!publicKey) {
+            snprintf_error(error_out, error_out_len, @"failed to get public key");
+            return -1;
+        }
+
+        CFErrorRef cfError = NULL;
+        CFDataRef pubKeyData = SecKeyCopyExternalRepresentation(publicKey, &cfError);
+        CFRelease(publicKey);
+
+        if (!pubKeyData) {
+            NSError *err = (__bridge_transfer NSError *)cfError;
+            NSString *msg = [NSString stringWithFormat:@"failed to export public key: %@",
+                             err.localizedDescription];
+            snprintf_error(error_out, error_out_len, msg);
+            return -1;
+        }
+
+        const UInt8 *bytes = CFDataGetBytePtr(pubKeyData);
+        CFIndex length = CFDataGetLength(pubKeyData);
+
+        if (length > *pub_key_len) {
+            CFRelease(pubKeyData);
+            snprintf_error(error_out, error_out_len, @"public key buffer too small");
+            return -1;
+        }
+
+        memcpy(pub_key_out, bytes, length);
+        *pub_key_len = (int)length;
+        CFRelease(pubKeyData);
+
+        // Get the identity hash by parsing sc_auth list output
+        hash_out[0] = '\0';
+        NSTask *listTask = [[NSTask alloc] init];
+        listTask.executableURL = [NSURL fileURLWithPath:@"/usr/sbin/sc_auth"];
+        listTask.arguments = @[@"list-ctk-identities"];
+
+        NSPipe *listPipe = [NSPipe pipe];
+        listTask.standardOutput = listPipe;
+        listTask.standardError = [NSPipe pipe];
+
+        if ([listTask launchAndReturnError:&nsError]) {
+            [listTask waitUntilExit];
+            NSData *listData = [listPipe.fileHandleForReading readDataToEndOfFile];
+            NSString *listStr = [[NSString alloc] initWithData:listData
+                                                      encoding:NSUTF8StringEncoding];
+
+            for (NSString *line in [listStr componentsSeparatedByString:@"\n"]) {
+                if ([line containsString:labelStr]) {
+                    NSMutableArray *tokens = [NSMutableArray array];
+                    for (NSString *part in [line componentsSeparatedByCharactersInSet:
+                                            [NSCharacterSet whitespaceCharacterSet]]) {
+                        if (part.length > 0) {
+                            [tokens addObject:part];
+                        }
+                    }
+                    if (tokens.count > 1) {
+                        snprintf(hash_out, hash_out_len, "%s", [tokens[1] UTF8String]);
+                    }
+                    break;
+                }
+            }
+        }
+
+        return 0;
+    }
+}
+
+int se_encrypt(const char *label,
+               const uint8_t *plaintext, int plaintext_len,
+               uint8_t *ciphertext_out, int *ciphertext_len,
+               char *error_out, int error_out_len) {
+    @autoreleasepool {
+        SecKeyRef privateKey = lookup_ctk_private_key(label, error_out, error_out_len);
+        if (!privateKey) {
+            return -1;
+        }
+
+        SecKeyRef publicKey = SecKeyCopyPublicKey(privateKey);
+        CFRelease(privateKey);
+
+        if (!publicKey) {
+            snprintf_error(error_out, error_out_len, @"failed to get public key for encryption");
+            return -1;
+        }
+
+        NSData *plaintextData = [NSData dataWithBytes:plaintext length:plaintext_len];
+
+        CFErrorRef cfError = NULL;
+        CFDataRef encrypted = SecKeyCreateEncryptedData(
+            publicKey,
+            kSecKeyAlgorithmECIESEncryptionStandardVariableIVX963SHA256AESGCM,
+            (__bridge CFDataRef)plaintextData,
+            &cfError
+        );
+        CFRelease(publicKey);
+
+        if (!encrypted) {
+            NSError *nsError = (__bridge_transfer NSError *)cfError;
+            NSString *msg = [NSString stringWithFormat:@"ECIES encryption failed: %@",
+                             nsError.localizedDescription];
+            snprintf_error(error_out, error_out_len, msg);
+            return -1;
+        }
+
+        const UInt8 *encBytes = CFDataGetBytePtr(encrypted);
+        CFIndex encLength = CFDataGetLength(encrypted);
+
+        if (encLength > *ciphertext_len) {
+            CFRelease(encrypted);
+            snprintf_error(error_out, error_out_len, @"ciphertext buffer too small");
+            return -1;
+        }
+
+        memcpy(ciphertext_out, encBytes, encLength);
+        *ciphertext_len = (int)encLength;
+        CFRelease(encrypted);
+
+        return 0;
+    }
+}
+
+int se_decrypt(const char *label,
+               const uint8_t *ciphertext, int ciphertext_len,
+               uint8_t *plaintext_out, int *plaintext_len,
+               char *error_out, int error_out_len) {
+    @autoreleasepool {
+        SecKeyRef privateKey = lookup_ctk_private_key(label, error_out, error_out_len);
+        if (!privateKey) {
+            return -1;
+        }
+
+        NSData *ciphertextData = [NSData dataWithBytes:ciphertext length:ciphertext_len];
+
+        CFErrorRef cfError = NULL;
+        CFDataRef decrypted = SecKeyCreateDecryptedData(
+            privateKey,
+            kSecKeyAlgorithmECIESEncryptionStandardVariableIVX963SHA256AESGCM,
+            (__bridge CFDataRef)ciphertextData,
+            &cfError
+        );
+        CFRelease(privateKey);
+
+        if (!decrypted) {
+            NSError *nsError = (__bridge_transfer NSError *)cfError;
+            NSString *msg = [NSString stringWithFormat:@"ECIES decryption failed: %@",
+                             nsError.localizedDescription];
+            snprintf_error(error_out, error_out_len, msg);
+            return -1;
+        }
+
+        const UInt8 *decBytes = CFDataGetBytePtr(decrypted);
+        CFIndex decLength = CFDataGetLength(decrypted);
+
+        if (decLength > *plaintext_len) {
+            CFRelease(decrypted);
+            snprintf_error(error_out, error_out_len, @"plaintext buffer too small");
+            return -1;
+        }
+
+        memcpy(plaintext_out, decBytes, decLength);
+        *plaintext_len = (int)decLength;
+        CFRelease(decrypted);
+
+        return 0;
+    }
+}
+
+int se_delete_key(const char *hash,
+                  char *error_out, int error_out_len) {
+    @autoreleasepool {
+        NSTask *task = [[NSTask alloc] init];
+        task.executableURL = [NSURL fileURLWithPath:@"/usr/sbin/sc_auth"];
+        task.arguments = @[
+            @"delete-ctk-identity",
+            @"-h", [NSString stringWithUTF8String:hash],
+        ];
+
+        NSPipe *stderrPipe = [NSPipe pipe];
+        task.standardOutput = [NSPipe pipe];
+        task.standardError = stderrPipe;
+
+        NSError *nsError = nil;
+        if (![task launchAndReturnError:&nsError]) {
+            NSString *msg = [NSString stringWithFormat:@"failed to launch sc_auth: %@",
+                             nsError.localizedDescription];
+            snprintf_error(error_out, error_out_len, msg);
+            return -1;
+        }
+
+        [task waitUntilExit];
+
+        if (task.terminationStatus != 0) {
+            NSData *stderrData = [stderrPipe.fileHandleForReading readDataToEndOfFile];
+            NSString *stderrStr = [[NSString alloc] initWithData:stderrData
+                                                        encoding:NSUTF8StringEncoding];
+            NSString *msg = [NSString stringWithFormat:@"sc_auth delete failed: %@",
+                             stderrStr ?: @"unknown error"];
+            snprintf_error(error_out, error_out_len, msg);
+            return -1;
+        }
+
+        return 0;
+    }
+}

internal/secret/constants.go

@@ -1,3 +1,4 @@
+// Package secret provides core types and constants for the secret application.
 package secret
 
 import "os"
@@ -6,18 +7,21 @@ const (
 	// AppID is the unique identifier for this application
 	AppID = "berlin.sneak.pkg.secret"
 
-	// Environment variable names
+	// EnvStateDir is the environment variable for specifying the state directory
-	EnvStateDir         = "SB_SECRET_STATE_DIR"
+	EnvStateDir = "SB_SECRET_STATE_DIR"
-	EnvMnemonic         = "SB_SECRET_MNEMONIC"
+	// EnvMnemonic is the environment variable for providing the mnemonic phrase
-	EnvUnlockPassphrase = "SB_UNLOCK_PASSPHRASE"
+	EnvMnemonic = "SB_SECRET_MNEMONIC"
-	EnvGPGKeyID         = "SB_GPG_KEY_ID"
+	// EnvUnlockPassphrase is the environment variable for providing the unlock passphrase
+	EnvUnlockPassphrase = "SB_UNLOCK_PASSPHRASE" //nolint:gosec // G101: This is an env var name, not a credential
+	// EnvGPGKeyID is the environment variable for providing the GPG key ID
+	EnvGPGKeyID = "SB_GPG_KEY_ID"
 )
 
 // File system permission constants
 const (
 	// DirPerms is the permission used for directories (read-write-execute for owner only)
-	DirPerms os.FileMode = 0700
+	DirPerms os.FileMode = 0o700
 
 	// FilePerms is the permission used for sensitive files (read-write for owner only)
-	FilePerms os.FileMode = 0600
+	FilePerms os.FileMode = 0o600
 )

internal/secret/crypto.go

@@ -8,25 +8,33 @@ import (
 	"syscall"
 
 	"filippo.io/age"
+	"github.com/awnumar/memguard"
 	"golang.org/x/term"
 )
 
 // EncryptToRecipient encrypts data to a recipient using age
-func EncryptToRecipient(data []byte, recipient age.Recipient) ([]byte, error) {
+// The data parameter should be a LockedBuffer for secure memory handling
-	Debug("EncryptToRecipient starting", "data_length", len(data))
+func EncryptToRecipient(data *memguard.LockedBuffer, recipient age.Recipient) ([]byte, error) {
+	if data == nil {
+		return nil, fmt.Errorf("data buffer is nil")
+	}
+
+	Debug("EncryptToRecipient starting", "data_length", data.Size())
 
 	var buf bytes.Buffer
 	Debug("Creating age encryptor")
 	w, err := age.Encrypt(&buf, recipient)
 	if err != nil {
 		Debug("Failed to create encryptor", "error", err)
+
 		return nil, fmt.Errorf("failed to create encryptor: %w", err)
 	}
 	Debug("Created age encryptor successfully")
 
 	Debug("Writing data to encryptor")
-	if _, err := w.Write(data); err != nil {
+	if _, err := w.Write(data.Bytes()); err != nil {
 		Debug("Failed to write data to encryptor", "error", err)
+
 		return nil, fmt.Errorf("failed to write data: %w", err)
 	}
 	Debug("Wrote data to encryptor successfully")
@@ -34,17 +42,19 @@ func EncryptToRecipient(data []byte, recipient age.Recipient) ([]byte, error) {
 	Debug("Closing encryptor")
 	if err := w.Close(); err != nil {
 		Debug("Failed to close encryptor", "error", err)
+
 		return nil, fmt.Errorf("failed to close encryptor: %w", err)
 	}
 	Debug("Closed encryptor successfully")
 
 	result := buf.Bytes()
 	Debug("EncryptToRecipient completed successfully", "result_length", len(result))
+
 	return result, nil
 }
 
 // DecryptWithIdentity decrypts data with an identity using age
-func DecryptWithIdentity(data []byte, identity age.Identity) ([]byte, error) {
+func DecryptWithIdentity(data []byte, identity age.Identity) (*memguard.LockedBuffer, error) {
 	r, err := age.Decrypt(bytes.NewReader(data), identity)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create decryptor: %w", err)
@@ -55,12 +65,29 @@ func DecryptWithIdentity(data []byte, identity age.Identity) ([]byte, error) {
 		return nil, fmt.Errorf("failed to read decrypted data: %w", err)
 	}
 
-	return result, nil
+	// Create a secure buffer for the decrypted data
+	resultBuffer := memguard.NewBufferFromBytes(result)
+
+	// Zero out the original slice to prevent plaintext from lingering in unprotected memory
+	for i := range result {
+		result[i] = 0
+	}
+
+	return resultBuffer, nil
 }
 
 // EncryptWithPassphrase encrypts data using a passphrase with age's scrypt-based encryption
-func EncryptWithPassphrase(data []byte, passphrase string) ([]byte, error) {
+// Both data and passphrase parameters should be LockedBuffers for secure memory handling
-	recipient, err := age.NewScryptRecipient(passphrase)
+func EncryptWithPassphrase(data *memguard.LockedBuffer, passphrase *memguard.LockedBuffer) ([]byte, error) {
+	if data == nil {
+		return nil, fmt.Errorf("data buffer is nil")
+	}
+	if passphrase == nil {
+		return nil, fmt.Errorf("passphrase buffer is nil")
+	}
+
+	// Create recipient directly from passphrase - unavoidable string conversion due to age API
+	recipient, err := age.NewScryptRecipient(passphrase.String())
 	if err != nil {
 		return nil, fmt.Errorf("failed to create scrypt recipient: %w", err)
 	}
@@ -69,8 +96,14 @@ func EncryptWithPassphrase(data []byte, passphrase string) ([]byte, error) {
 }
 
 // DecryptWithPassphrase decrypts data using a passphrase with age's scrypt-based decryption
-func DecryptWithPassphrase(encryptedData []byte, passphrase string) ([]byte, error) {
+// The passphrase parameter should be a LockedBuffer for secure memory handling
-	identity, err := age.NewScryptIdentity(passphrase)
+func DecryptWithPassphrase(encryptedData []byte, passphrase *memguard.LockedBuffer) (*memguard.LockedBuffer, error) {
+	if passphrase == nil {
+		return nil, fmt.Errorf("passphrase buffer is nil")
+	}
+
+	// Create identity directly from passphrase - unavoidable string conversion due to age API
+	identity, err := age.NewScryptIdentity(passphrase.String())
 	if err != nil {
 		return nil, fmt.Errorf("failed to create scrypt identity: %w", err)
 	}
@@ -80,29 +113,42 @@ func DecryptWithPassphrase(encryptedData []byte, passphrase string) ([]byte, err
 
 // ReadPassphrase reads a passphrase securely from the terminal without echoing
 // This version is for unlocking and doesn't require confirmation
-func ReadPassphrase(prompt string) (string, error) {
+// Returns a LockedBuffer containing the passphrase for secure memory handling
+func ReadPassphrase(prompt string) (*memguard.LockedBuffer, error) {
 	// Check if stdin is a terminal
-	if !term.IsTerminal(int(syscall.Stdin)) {
+	if !term.IsTerminal(syscall.Stdin) {
 		// Not a terminal - never read passphrases from piped input for security reasons
-		return "", fmt.Errorf("cannot read passphrase from non-terminal stdin (piped input or script). Please set the SB_UNLOCK_PASSPHRASE environment variable or run interactively")
+		return nil, fmt.Errorf("cannot read passphrase from non-terminal stdin " +
+			"(piped input or script). Please set the SB_UNLOCK_PASSPHRASE " +
+			"environment variable or run interactively")
 	}
 
 	// stdin is a terminal, check if stderr is also a terminal for interactive prompting
-	if !term.IsTerminal(int(syscall.Stderr)) {
+	if !term.IsTerminal(syscall.Stderr) {
-		return "", fmt.Errorf("cannot prompt for passphrase: stderr is not a terminal (running in non-interactive mode). Please set the SB_UNLOCK_PASSPHRASE environment variable")
+		return nil, fmt.Errorf("cannot prompt for passphrase: stderr is not a terminal " +
+			"(running in non-interactive mode). Please set the SB_UNLOCK_PASSPHRASE " +
+			"environment variable")
 	}
 
 	// Both stdin and stderr are terminals - use secure password reading
 	fmt.Fprint(os.Stderr, prompt) // Write prompt to stderr, not stdout
-	passphrase, err := term.ReadPassword(int(syscall.Stdin))
+	passphrase, err := term.ReadPassword(syscall.Stdin)
 	if err != nil {
-		return "", fmt.Errorf("failed to read passphrase: %w", err)
+		return nil, fmt.Errorf("failed to read passphrase: %w", err)
 	}
 	fmt.Fprintln(os.Stderr) // Print newline to stderr since ReadPassword doesn't echo
 
 	if len(passphrase) == 0 {
-		return "", fmt.Errorf("passphrase cannot be empty")
+		return nil, fmt.Errorf("passphrase cannot be empty")
 	}
 
-	return string(passphrase), nil
+	// Create a secure buffer and copy the passphrase
+	secureBuffer := memguard.NewBufferFromBytes(passphrase)
+
+	// Clear the original passphrase slice
+	for i := range passphrase {
+		passphrase[i] = 0
+	}
+
+	return secureBuffer, nil
 }

internal/secret/debug.go

@@ -13,22 +13,23 @@ import (
 )
 
 var (
-	debugEnabled bool
+	debugEnabled bool         //nolint:gochecknoglobals // Package-wide debug state is necessary
-	debugLogger  *slog.Logger
+	debugLogger  *slog.Logger //nolint:gochecknoglobals // Package-wide logger instance is necessary
 )
 
 func init() {
-	initDebugLogging()
+	InitDebugLogging()
 }
 
-// initDebugLogging initializes the debug logging system based on GODEBUG environment variable
+// InitDebugLogging initializes the debug logging system based on current GODEBUG environment variable
-func initDebugLogging() {
+func InitDebugLogging() {
 	godebug := os.Getenv("GODEBUG")
 	debugEnabled = strings.Contains(godebug, "berlin.sneak.pkg.secret")
 
 	if !debugEnabled {
 		// Create a no-op logger that discards all output
 		debugLogger = slog.New(slog.NewTextHandler(io.Discard, nil))
+
 		return
 	}
 
@@ -36,7 +37,7 @@ func initDebugLogging() {
 	_, _, _ = syscall.Syscall(syscall.SYS_FCNTL, os.Stderr.Fd(), syscall.F_SETFL, syscall.O_SYNC)
 
 	// Check if STDERR is a TTY
-	isTTY := term.IsTerminal(int(syscall.Stderr))
+	isTTY := term.IsTerminal(syscall.Stderr)
 
 	var handler slog.Handler
 	if isTTY {
@@ -57,6 +58,16 @@ func IsDebugEnabled() bool {
 	return debugEnabled
 }
 
+// Warn logs a warning message to stderr unconditionally (visible without --verbose or debug flags)
+func Warn(msg string, args ...any) {
+	output := fmt.Sprintf("WARNING: %s", msg)
+	for i := 0; i+1 < len(args); i += 2 {
+		output += fmt.Sprintf(" %s=%v", args[i], args[i+1])
+	}
+	output += "\n"
+	fmt.Fprint(os.Stderr, output)
+}
+
 // Debug logs a debug message with optional attributes
 func Debug(msg string, args ...any) {
 	if !debugEnabled {
@@ -113,6 +124,7 @@ func (h *colorizedHandler) Handle(_ context.Context, record slog.Record) error {
 			}
 			first = false
 			output += fmt.Sprintf("%s=%#v", attr.Key, attr.Value.Any())
+
 			return true
 		})
 		output += "}\033[0m"
@@ -120,16 +132,17 @@ func (h *colorizedHandler) Handle(_ context.Context, record slog.Record) error {
 
 	output += "\n"
 	_, err := h.output.Write([]byte(output))
+
 	return err
 }
 
-func (h *colorizedHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
+func (h *colorizedHandler) WithAttrs(_ []slog.Attr) slog.Handler {
 	// For simplicity, return the same handler
 	// In a more complex implementation, we'd create a new handler with the attrs
 	return h
 }
 
-func (h *colorizedHandler) WithGroup(name string) slog.Handler {
+func (h *colorizedHandler) WithGroup(_ string) slog.Handler {
 	// For simplicity, return the same handler
 	// In a more complex implementation, we'd create a new handler with the group
 	return h

internal/secret/debug_test.go

@@ -3,7 +3,6 @@ package secret
 import (
 	"bytes"
 	"log/slog"
-	"os"
 	"strings"
 	"syscall"
 	"testing"
@@ -12,17 +11,8 @@ import (
 )
 
 func TestDebugLogging(t *testing.T) {
-	// Save original GODEBUG and restore it
+	// Test cleanup handled by t.Setenv
-	originalGodebug := os.Getenv("GODEBUG")
+	defer InitDebugLogging() // Re-initialize debug system after test
-	defer func() {
-		if originalGodebug == "" {
-			os.Unsetenv("GODEBUG")
-		} else {
-			os.Setenv("GODEBUG", originalGodebug)
-		}
-		// Re-initialize debug system with original setting
-		initDebugLogging()
-	}()
 
 	tests := []struct {
 		name          string
@@ -54,14 +44,12 @@ func TestDebugLogging(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// Set GODEBUG
-			if tt.godebug == "" {
+			if tt.godebug != "" {
-				os.Unsetenv("GODEBUG")
+				t.Setenv("GODEBUG", tt.godebug)
-			} else {
-				os.Setenv("GODEBUG", tt.godebug)
 			}
 
 			// Re-initialize debug system
-			initDebugLogging()
+			InitDebugLogging()
 
 			// Test if debug is enabled
 			enabled := IsDebugEnabled()
@@ -76,7 +64,7 @@ func TestDebugLogging(t *testing.T) {
 
 				// Override the debug logger for testing
 				oldLogger := debugLogger
-				if term.IsTerminal(int(syscall.Stderr)) {
+				if term.IsTerminal(syscall.Stderr) {
 					// TTY: use colorized handler with our buffer
 					debugLogger = slog.New(newColorizedHandler(&buf))
 				} else {
@@ -104,34 +92,26 @@ func TestDebugLogging(t *testing.T) {
 
 func TestDebugFunctions(t *testing.T) {
 	// Enable debug for testing
-	originalGodebug := os.Getenv("GODEBUG")
+	t.Setenv("GODEBUG", "berlin.sneak.pkg.secret")
-	os.Setenv("GODEBUG", "berlin.sneak.pkg.secret")
+	defer InitDebugLogging() // Re-initialize after test
-	defer func() {
-		if originalGodebug == "" {
-			os.Unsetenv("GODEBUG")
-		} else {
-			os.Setenv("GODEBUG", originalGodebug)
-		}
-		initDebugLogging()
-	}()
 
-	initDebugLogging()
+	InitDebugLogging()
 
 	if !IsDebugEnabled() {
-		t.Skip("Debug not enabled, skipping debug function tests")
+		t.Log("Debug not enabled, but continuing with debug function tests anyway")
 	}
 
 	// Test that debug functions don't panic and can be called
-	t.Run("Debug", func(t *testing.T) {
+	t.Run("Debug", func(_ *testing.T) {
 		Debug("test debug message")
 		Debug("test with args", "key", "value", "number", 42)
 	})
 
-	t.Run("DebugF", func(t *testing.T) {
+	t.Run("DebugF", func(_ *testing.T) {
 		DebugF("formatted message: %s %d", "test", 123)
 	})
 
-	t.Run("DebugWith", func(t *testing.T) {
+	t.Run("DebugWith", func(_ *testing.T) {
 		DebugWith("structured message",
 			slog.String("string_key", "string_value"),
 			slog.Int("int_key", 42),

internal/secret/derivation_index_test.go

@@ -0,0 +1,82 @@
+package secret
+
+import (
+	"encoding/json"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
+	"github.com/spf13/afero"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// realVault is a minimal VaultInterface backed by a real afero filesystem,
+// using the same directory layout as vault.Vault.
+type realVault struct {
+	name     string
+	stateDir string
+	fs       afero.Fs
+}
+
+func (v *realVault) GetDirectory() (string, error) {
+	return filepath.Join(v.stateDir, "vaults.d", v.name), nil
+}
+func (v *realVault) GetName() string         { return v.name }
+func (v *realVault) GetFilesystem() afero.Fs { return v.fs }
+
+// Unused by getLongTermPrivateKey — these satisfy VaultInterface.
+func (v *realVault) AddSecret(string, *memguard.LockedBuffer, bool) error { panic("not used") }
+func (v *realVault) GetCurrentUnlocker() (Unlocker, error)                { panic("not used") }
+func (v *realVault) CreatePassphraseUnlocker(*memguard.LockedBuffer) (*PassphraseUnlocker, error) {
+	panic("not used")
+}
+
+// createRealVault sets up a complete vault directory structure on an in-memory
+// filesystem, identical to what vault.CreateVault produces.
+func createRealVault(t *testing.T, fs afero.Fs, stateDir, name string, derivationIndex uint32) *realVault {
+	t.Helper()
+
+	vaultDir := filepath.Join(stateDir, "vaults.d", name)
+	require.NoError(t, fs.MkdirAll(filepath.Join(vaultDir, "secrets.d"), DirPerms))
+	require.NoError(t, fs.MkdirAll(filepath.Join(vaultDir, "unlockers.d"), DirPerms))
+
+	metadata := VaultMetadata{
+		CreatedAt:       time.Now(),
+		DerivationIndex: derivationIndex,
+	}
+	metaBytes, err := json.Marshal(metadata)
+	require.NoError(t, err)
+	require.NoError(t, afero.WriteFile(fs, filepath.Join(vaultDir, "vault-metadata.json"), metaBytes, FilePerms))
+
+	return &realVault{name: name, stateDir: stateDir, fs: fs}
+}
+
+func TestGetLongTermPrivateKeyUsesVaultDerivationIndex(t *testing.T) {
+	const testMnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+
+	// Derive expected keys at two different indices to prove they differ.
+	key0, err := agehd.DeriveIdentity(testMnemonic, 0)
+	require.NoError(t, err)
+	key5, err := agehd.DeriveIdentity(testMnemonic, 5)
+	require.NoError(t, err)
+	require.NotEqual(t, key0.String(), key5.String(),
+		"sanity check: different derivation indices must produce different keys")
+
+	// Build a real vault with DerivationIndex=5 on an in-memory filesystem.
+	fs := afero.NewMemMapFs()
+	vault := createRealVault(t, fs, "/state", "test-vault", 5)
+
+	t.Setenv(EnvMnemonic, testMnemonic)
+
+	result, err := getLongTermPrivateKey(fs, vault)
+	require.NoError(t, err)
+	defer result.Destroy()
+
+	assert.Equal(t, key5.String(), string(result.Bytes()),
+		"getLongTermPrivateKey should derive at vault's DerivationIndex (5)")
+	assert.NotEqual(t, key0.String(), string(result.Bytes()),
+		"getLongTermPrivateKey must not use hardcoded index 0")
+}

internal/secret/helpers.go

@@ -17,7 +17,7 @@ func generateRandomString(length int, charset string) (string, error) {
 	result := make([]byte, length)
 	charsetLen := big.NewInt(int64(len(charset)))
 
-	for i := 0; i < length; i++ {
+	for i := range length {
 		randomIndex, err := rand.Int(rand.Reader, charsetLen)
 		if err != nil {
 			return "", fmt.Errorf("failed to generate random number: %w", err)
@@ -28,16 +28,17 @@ func generateRandomString(length int, charset string) (string, error) {
 	return string(result), nil
 }
 
-// DetermineStateDir determines the state directory based on environment variables and OS
+// DetermineStateDir determines the state directory based on environment variables and OS.
-func DetermineStateDir(customConfigDir string) string {
+// It returns an error if no usable directory can be determined.
+func DetermineStateDir(customConfigDir string) (string, error) {
 	// Check for environment variable first
 	if envStateDir := os.Getenv(EnvStateDir); envStateDir != "" {
-		return envStateDir
+		return envStateDir, nil
 	}
 
 	// Use custom config dir if provided
 	if customConfigDir != "" {
-		return filepath.Join(customConfigDir, AppID)
+		return filepath.Join(customConfigDir, AppID), nil
 	}
 
 	// Use os.UserConfigDir() which handles platform-specific directories:
@@ -47,8 +48,16 @@ func DetermineStateDir(customConfigDir string) string {
 	configDir, err := os.UserConfigDir()
 	if err != nil {
 		// Fallback to a reasonable default if we can't determine user config dir
-		homeDir, _ := os.UserHomeDir()
+		homeDir, homeErr := os.UserHomeDir()
-		return filepath.Join(homeDir, ".config", AppID)
+		if homeErr != nil {
+			return "", fmt.Errorf("unable to determine state directory: config dir: %w, home dir: %w", err, homeErr)
+		}
+
+		fallbackDir := filepath.Join(homeDir, ".config", AppID)
+		Warn("Could not determine user config directory, falling back to default", "fallback", fallbackDir, "error", err)
+
+		return fallbackDir, nil
 	}
-	return filepath.Join(configDir, AppID)
+
+	return filepath.Join(configDir, AppID), nil
 }

internal/secret/helpers_test.go

@@ -0,0 +1,50 @@
+package secret
+
+import (
+	"testing"
+)
+
+func TestDetermineStateDir_ErrorsWhenHomeDirUnavailable(t *testing.T) {
+	// Clear all env vars that could provide a home/config directory.
+	// On Darwin, os.UserHomeDir may still succeed via the password
+	// database, so we also test via an explicit empty-customConfigDir
+	// path to exercise the fallback branch.
+	t.Setenv(EnvStateDir, "")
+	t.Setenv("HOME", "")
+	t.Setenv("XDG_CONFIG_HOME", "")
+
+	result, err := DetermineStateDir("")
+	// On systems where both lookups fail, we must get an error.
+	// On systems where the OS provides a fallback (e.g. macOS pw db),
+	// result should still be valid (non-empty, not root-relative).
+	if err != nil {
+		// Good — the error case is handled.
+		return
+	}
+	if result == "/.config/"+AppID || result == "" {
+		t.Errorf("DetermineStateDir returned dangerous/empty path %q without error", result)
+	}
+}
+
+func TestDetermineStateDir_UsesEnvVar(t *testing.T) {
+	t.Setenv(EnvStateDir, "/custom/state")
+	result, err := DetermineStateDir("")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if result != "/custom/state" {
+		t.Errorf("expected /custom/state, got %q", result)
+	}
+}
+
+func TestDetermineStateDir_UsesCustomConfigDir(t *testing.T) {
+	t.Setenv(EnvStateDir, "")
+	result, err := DetermineStateDir("/my/config")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	expected := "/my/config/" + AppID
+	if result != expected {
+		t.Errorf("expected %q, got %q", expected, result)
+	}
+}

internal/secret/keychainunlocker.go

@@ -1,3 +1,6 @@
+//go:build darwin
+// +build darwin
+
 package secret
 
 import (
@@ -6,22 +9,33 @@ import (
 	"fmt"
 	"log/slog"
 	"os"
-	"os/exec"
 	"path/filepath"
+	"regexp"
+	"runtime"
 	"time"
 
 	"filippo.io/age"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
+	keychain "github.com/keybase/go-keychain"
 	"github.com/spf13/afero"
 )
 
+const (
+	agePrivKeyPassphraseLength = 64
+	// KEYCHAIN_APP_IDENTIFIER is the service name used for keychain items
+	KEYCHAIN_APP_IDENTIFIER = "berlin.sneak.app.secret" //nolint:revive // ALL_CAPS is intentional for this constant
+)
+
+// keychainItemNameRegex validates keychain item names
+// Allows alphanumeric characters, dots, hyphens, and underscores only
+var keychainItemNameRegex = regexp.MustCompile(`^[A-Za-z0-9._-]+$`)
+
 // KeychainUnlockerMetadata extends UnlockerMetadata with keychain-specific data
 type KeychainUnlockerMetadata struct {
 	UnlockerMetadata
-	// Age keypair information
-	AgePublicKey string `json:"age_public_key"`
 	// Keychain item name
-	KeychainItemName string `json:"keychain_item_name"`
+	KeychainItemName string `json:"keychainItemName"`
 }
 
 // KeychainUnlocker represents a macOS Keychain-protected unlocker
@@ -33,9 +47,9 @@ type KeychainUnlocker struct {
 
 // KeychainData represents the data stored in the macOS keychain
 type KeychainData struct {
-	AgePublicKey         string `json:"age_public_key"`
+	AgePublicKey         string `json:"agePublicKey"`
-	AgePrivKeyPassphrase string `json:"age_priv_key_passphrase"`
+	AgePrivKeyPassphrase string `json:"agePrivKeyPassphrase"`
-	EncryptedLongtermKey string `json:"encrypted_longterm_key"`
+	EncryptedLongtermKey string `json:"encryptedLongtermKey"`
 }
 
 // GetIdentity implements Unlocker interface for Keychain-based unlockers
@@ -49,6 +63,7 @@ func (k *KeychainUnlocker) GetIdentity() (*age.X25519Identity, error) {
 	keychainItemName, err := k.GetKeychainItemName()
 	if err != nil {
 		Debug("Failed to get keychain item name", "error", err, "unlocker_id", k.GetID())
+
 		return nil, fmt.Errorf("failed to get keychain item name: %w", err)
 	}
 
@@ -57,6 +72,7 @@ func (k *KeychainUnlocker) GetIdentity() (*age.X25519Identity, error) {
 	keychainDataBytes, err := retrieveFromKeychain(keychainItemName)
 	if err != nil {
 		Debug("Failed to retrieve data from keychain", "error", err, "keychain_item", keychainItemName)
+
 		return nil, fmt.Errorf("failed to retrieve data from keychain: %w", err)
 	}
 
@@ -69,6 +85,7 @@ func (k *KeychainUnlocker) GetIdentity() (*age.X25519Identity, error) {
 	var keychainData KeychainData
 	if err := json.Unmarshal(keychainDataBytes, &keychainData); err != nil {
 		Debug("Failed to parse keychain data", "error", err, "unlocker_id", k.GetID())
+
 		return nil, fmt.Errorf("failed to parse keychain data: %w", err)
 	}
 
@@ -81,6 +98,7 @@ func (k *KeychainUnlocker) GetIdentity() (*age.X25519Identity, error) {
 	encryptedAgePrivKeyData, err := afero.ReadFile(k.fs, agePrivKeyPath)
 	if err != nil {
 		Debug("Failed to read encrypted age private key", "error", err, "path", agePrivKeyPath)
+
 		return nil, fmt.Errorf("failed to read encrypted age private key: %w", err)
 	}
 
@@ -91,22 +109,30 @@ func (k *KeychainUnlocker) GetIdentity() (*age.X25519Identity, error) {
 
 	// Step 5: Decrypt the age private key using the passphrase from keychain
 	Debug("Decrypting age private key with keychain passphrase", "unlocker_id", k.GetID())
-	agePrivKeyData, err := DecryptWithPassphrase(encryptedAgePrivKeyData, keychainData.AgePrivKeyPassphrase)
+	// Create secure buffer for the keychain passphrase
+	passphraseBuffer := memguard.NewBufferFromBytes([]byte(keychainData.AgePrivKeyPassphrase))
+	defer passphraseBuffer.Destroy()
+
+	agePrivKeyBuffer, err := DecryptWithPassphrase(encryptedAgePrivKeyData, passphraseBuffer)
 	if err != nil {
 		Debug("Failed to decrypt age private key with keychain passphrase", "error", err, "unlocker_id", k.GetID())
+
 		return nil, fmt.Errorf("failed to decrypt age private key with keychain passphrase: %w", err)
 	}
+	defer agePrivKeyBuffer.Destroy()
 
 	DebugWith("Successfully decrypted age private key with keychain passphrase",
 		slog.String("unlocker_id", k.GetID()),
-		slog.Int("decrypted_length", len(agePrivKeyData)),
+		slog.Int("decrypted_length", agePrivKeyBuffer.Size()),
 	)
 
 	// Step 6: Parse the decrypted age private key
 	Debug("Parsing decrypted age private key", "unlocker_id", k.GetID())
-	ageIdentity, err := age.ParseX25519Identity(string(agePrivKeyData))
+
+	ageIdentity, err := age.ParseX25519Identity(agePrivKeyBuffer.String())
 	if err != nil {
 		Debug("Failed to parse age private key", "error", err, "unlocker_id", k.GetID())
+
 		return nil, fmt.Errorf("failed to parse age private key: %w", err)
 	}
 
@@ -133,20 +159,20 @@ func (k *KeychainUnlocker) GetDirectory() string {
 	return k.Directory
 }
 
-// GetID implements Unlocker interface
+// GetID implements Unlocker interface - generates ID from keychain item name
 func (k *KeychainUnlocker) GetID() string {
-	return k.Metadata.ID
+	// Generate ID in the format YYYY-MM-DD.HH.mm-hostname-keychain
-}
+	// This matches the passphrase unlocker format
-
+	hostname, err := os.Hostname()
-// ID implements Unlocker interface - generates ID from keychain item name
-func (k *KeychainUnlocker) ID() string {
-	// Generate ID using keychain item name
-	keychainItemName, err := k.GetKeychainItemName()
 	if err != nil {
-		// Fallback to metadata ID if we can't read the keychain item name
+		hostname = "unknown"
-		return k.Metadata.ID
 	}
-	return fmt.Sprintf("%s-keychain", keychainItemName)
+
+	// Use the creation timestamp from metadata
+	createdAt := k.Metadata.CreatedAt
+	timestamp := createdAt.Format("2006-01-02.15.04")
+
+	return fmt.Sprintf("%s-%s-keychain", timestamp, hostname)
 }
 
 // Remove implements Unlocker interface - removes the keychain unlocker
@@ -155,6 +181,7 @@ func (k *KeychainUnlocker) Remove() error {
 	keychainItemName, err := k.GetKeychainItemName()
 	if err != nil {
 		Debug("Failed to get keychain item name during removal", "error", err, "unlocker_id", k.GetID())
+
 		return fmt.Errorf("failed to get keychain item name: %w", err)
 	}
 
@@ -162,6 +189,7 @@ func (k *KeychainUnlocker) Remove() error {
 	Debug("Removing keychain item", "keychain_item", keychainItemName)
 	if err := deleteFromKeychain(keychainItemName); err != nil {
 		Debug("Failed to remove keychain item", "error", err, "keychain_item", keychainItemName)
+
 		return fmt.Errorf("failed to remove keychain item: %w", err)
 	}
 
@@ -169,10 +197,12 @@ func (k *KeychainUnlocker) Remove() error {
 	Debug("Removing keychain unlocker directory", "directory", k.Directory)
 	if err := k.fs.RemoveAll(k.Directory); err != nil {
 		Debug("Failed to remove keychain unlocker directory", "error", err, "directory", k.Directory)
+
 		return fmt.Errorf("failed to remove keychain unlocker directory: %w", err)
 	}
 
 	Debug("Successfully removed keychain unlocker", "unlocker_id", k.GetID(), "keychain_item", keychainItemName)
+
 	return nil
 }
 
@@ -211,9 +241,93 @@ func generateKeychainUnlockerName(vaultName string) (string, error) {
 
 	// Format: secret-<vault>-<hostname>-<date>
 	enrollmentDate := time.Now().Format("2006-01-02")
+
 	return fmt.Sprintf("secret-%s-%s-%s", vaultName, hostname, enrollmentDate), nil
 }
 
+// getLongTermPrivateKey retrieves the long-term private key either from environment or current unlocker
+// Returns a LockedBuffer to ensure the private key is protected in memory
+func getLongTermPrivateKey(fs afero.Fs, vault VaultInterface) (*memguard.LockedBuffer, error) {
+	// Check if mnemonic is available in environment variable
+	envMnemonic := os.Getenv(EnvMnemonic)
+	if envMnemonic != "" {
+		// Read vault metadata to get the correct derivation index
+		vaultDir, err := vault.GetDirectory()
+		if err != nil {
+			return nil, fmt.Errorf("failed to get vault directory: %w", err)
+		}
+
+		metadataPath := filepath.Join(vaultDir, "vault-metadata.json")
+		metadataBytes, err := afero.ReadFile(fs, metadataPath)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read vault metadata: %w", err)
+		}
+
+		var metadata VaultMetadata
+		if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
+			return nil, fmt.Errorf("failed to parse vault metadata: %w", err)
+		}
+
+		// Use mnemonic with the vault's actual derivation index
+		ltIdentity, err := agehd.DeriveIdentity(envMnemonic, metadata.DerivationIndex)
+		if err != nil {
+			return nil, fmt.Errorf("failed to derive long-term key from mnemonic: %w", err)
+		}
+
+		// Return the private key in a secure buffer
+		return memguard.NewBufferFromBytes([]byte(ltIdentity.String())), nil
+	}
+
+	// Get the vault to access current unlocker
+	currentUnlocker, err := vault.GetCurrentUnlocker()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get current unlocker: %w", err)
+	}
+
+	// Get the current unlocker identity
+	currentUnlockerIdentity, err := currentUnlocker.GetIdentity()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get current unlocker identity: %w", err)
+	}
+
+	// Get encrypted long-term key from current unlocker, handling different types
+	var encryptedLtPrivKey []byte
+	switch currentUnlocker := currentUnlocker.(type) {
+	case *PassphraseUnlocker:
+		// Read the encrypted long-term private key from passphrase unlocker
+		encryptedLtPrivKey, err = afero.ReadFile(fs, filepath.Join(currentUnlocker.GetDirectory(), "longterm.age"))
+		if err != nil {
+			return nil, fmt.Errorf("failed to read encrypted long-term key from current passphrase unlocker: %w", err)
+		}
+
+	case *PGPUnlocker:
+		// Read the encrypted long-term private key from PGP unlocker
+		encryptedLtPrivKey, err = afero.ReadFile(fs, filepath.Join(currentUnlocker.GetDirectory(), "longterm.age"))
+		if err != nil {
+			return nil, fmt.Errorf("failed to read encrypted long-term key from current PGP unlocker: %w", err)
+		}
+
+	case *KeychainUnlocker:
+		// Read the encrypted long-term private key from another keychain unlocker
+		encryptedLtPrivKey, err = afero.ReadFile(fs, filepath.Join(currentUnlocker.GetDirectory(), "longterm.age"))
+		if err != nil {
+			return nil, fmt.Errorf("failed to read encrypted long-term key from current keychain unlocker: %w", err)
+		}
+
+	default:
+		return nil, fmt.Errorf("unsupported current unlocker type for keychain unlocker creation")
+	}
+
+	// Decrypt long-term private key using current unlocker
+	ltPrivKeyBuffer, err := DecryptWithIdentity(encryptedLtPrivKey, currentUnlockerIdentity)
+	if err != nil {
+		return nil, fmt.Errorf("failed to decrypt long-term private key: %w", err)
+	}
+
+	// Return the decrypted key buffer
+	return ltPrivKeyBuffer, nil
+}
+
 // CreateKeychainUnlocker creates a new keychain unlocker and stores it in the vault
 func CreateKeychainUnlocker(fs afero.Fs, stateDir string) (*KeychainUnlocker, error) {
 	// Check if we're on macOS
@@ -251,21 +365,28 @@ func CreateKeychainUnlocker(fs afero.Fs, stateDir string) (*KeychainUnlocker, er
 	}
 
 	// Step 2: Generate a random passphrase for encrypting the age private key
-	agePrivKeyPassphrase, err := generateRandomPassphrase(64)
+	agePrivKeyPassphrase, err := generateRandomPassphrase(agePrivKeyPassphraseLength)
 	if err != nil {
 		return nil, fmt.Errorf("failed to generate age private key passphrase: %w", err)
 	}
 
-	// Step 3: Store age public key as plaintext
+	// Step 3: Store age recipient as plaintext
-	agePublicKeyString := ageIdentity.Recipient().String()
+	ageRecipient := ageIdentity.Recipient().String()
-	agePubKeyPath := filepath.Join(unlockerDir, "pub.age")
+	recipientPath := filepath.Join(unlockerDir, "pub.txt")
-	if err := afero.WriteFile(fs, agePubKeyPath, []byte(agePublicKeyString), FilePerms); err != nil {
+	if err := afero.WriteFile(fs, recipientPath, []byte(ageRecipient), FilePerms); err != nil {
-		return nil, fmt.Errorf("failed to write age public key: %w", err)
+		return nil, fmt.Errorf("failed to write age recipient: %w", err)
 	}
 
 	// Step 4: Encrypt age private key with the generated passphrase and store on disk
-	agePrivateKeyBytes := []byte(ageIdentity.String())
+	// Create secure buffers for both the private key and passphrase
-	encryptedAgePrivKey, err := EncryptWithPassphrase(agePrivateKeyBytes, agePrivKeyPassphrase)
+	agePrivKeyStr := ageIdentity.String()
+	agePrivKeyBuffer := memguard.NewBufferFromBytes([]byte(agePrivKeyStr))
+	defer agePrivKeyBuffer.Destroy()
+
+	passphraseBuffer := memguard.NewBufferFromBytes([]byte(agePrivKeyPassphrase))
+	defer passphraseBuffer.Destroy()
+
+	encryptedAgePrivKey, err := EncryptWithPassphrase(agePrivKeyBuffer, passphraseBuffer)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encrypt age private key with passphrase: %w", err)
 	}
@@ -276,63 +397,11 @@ func CreateKeychainUnlocker(fs afero.Fs, stateDir string) (*KeychainUnlocker, er
 	}
 
 	// Step 5: Get or derive the long-term private key
-	var ltPrivKeyData []byte
+	ltPrivKeyData, err := getLongTermPrivateKey(fs, vault)
-
+	if err != nil {
-	// Check if mnemonic is available in environment variable
+		return nil, err
-	if envMnemonic := os.Getenv(EnvMnemonic); envMnemonic != "" {
-		// Use mnemonic directly to derive long-term key
-		ltIdentity, err := agehd.DeriveIdentity(envMnemonic, 0)
-		if err != nil {
-			return nil, fmt.Errorf("failed to derive long-term key from mnemonic: %w", err)
-		}
-		ltPrivKeyData = []byte(ltIdentity.String())
-	} else {
-		// Get the vault to access current unlocker
-		currentUnlocker, err := vault.GetCurrentUnlocker()
-		if err != nil {
-			return nil, fmt.Errorf("failed to get current unlocker: %w", err)
-		}
-
-		// Get the current unlocker identity
-		currentUnlockerIdentity, err := currentUnlocker.GetIdentity()
-		if err != nil {
-			return nil, fmt.Errorf("failed to get current unlocker identity: %w", err)
-		}
-
-		// Get encrypted long-term key from current unlocker, handling different types
-		var encryptedLtPrivKey []byte
-		switch currentUnlocker := currentUnlocker.(type) {
-		case *PassphraseUnlocker:
-			// Read the encrypted long-term private key from passphrase unlocker
-			encryptedLtPrivKey, err = afero.ReadFile(fs, filepath.Join(currentUnlocker.GetDirectory(), "longterm.age"))
-			if err != nil {
-				return nil, fmt.Errorf("failed to read encrypted long-term key from current passphrase unlocker: %w", err)
-			}
-
-		case *PGPUnlocker:
-			// Read the encrypted long-term private key from PGP unlocker
-			encryptedLtPrivKey, err = afero.ReadFile(fs, filepath.Join(currentUnlocker.GetDirectory(), "longterm.age"))
-			if err != nil {
-				return nil, fmt.Errorf("failed to read encrypted long-term key from current PGP unlocker: %w", err)
-			}
-
-		case *KeychainUnlocker:
-			// Read the encrypted long-term private key from another keychain unlocker
-			encryptedLtPrivKey, err = afero.ReadFile(fs, filepath.Join(currentUnlocker.GetDirectory(), "longterm.age"))
-			if err != nil {
-				return nil, fmt.Errorf("failed to read encrypted long-term key from current keychain unlocker: %w", err)
-			}
-
-		default:
-			return nil, fmt.Errorf("unsupported current unlocker type for keychain unlocker creation")
-		}
-
-		// Decrypt long-term private key using current unlocker
-		ltPrivKeyData, err = DecryptWithIdentity(encryptedLtPrivKey, currentUnlockerIdentity)
-		if err != nil {
-			return nil, fmt.Errorf("failed to decrypt long-term private key: %w", err)
-		}
 	}
+	defer ltPrivKeyData.Destroy()
 
 	// Step 6: Encrypt long-term private key to the new age unlocker
 	encryptedLtPrivKeyToAge, err := EncryptToRecipient(ltPrivKeyData, ageIdentity.Recipient())
@@ -348,7 +417,7 @@ func CreateKeychainUnlocker(fs afero.Fs, stateDir string) (*KeychainUnlocker, er
 
 	// Step 7: Prepare keychain data
 	keychainData := KeychainData{
-		AgePublicKey:         agePublicKeyString,
+		AgePublicKey:         ageRecipient,
 		AgePrivKeyPassphrase: agePrivKeyPassphrase,
 		EncryptedLongtermKey: hex.EncodeToString(encryptedLtPrivKeyToAge),
 	}
@@ -358,23 +427,22 @@ func CreateKeychainUnlocker(fs afero.Fs, stateDir string) (*KeychainUnlocker, er
 		return nil, fmt.Errorf("failed to marshal keychain data: %w", err)
 	}
 
+	// Create a secure buffer for keychain data
+	keychainDataBuffer := memguard.NewBufferFromBytes(keychainDataBytes)
+	defer keychainDataBuffer.Destroy()
+
 	// Step 8: Store data in keychain
-	if err := storeInKeychain(keychainItemName, keychainDataBytes); err != nil {
+	if err := storeInKeychain(keychainItemName, keychainDataBuffer); err != nil {
 		return nil, fmt.Errorf("failed to store data in keychain: %w", err)
 	}
 
 	// Step 9: Create and write enhanced metadata
-	// Generate the key ID directly using the keychain item name
-	keyID := fmt.Sprintf("%s-keychain", keychainItemName)
-
 	keychainMetadata := KeychainUnlockerMetadata{
 		UnlockerMetadata: UnlockerMetadata{
-			ID:        keyID,
 			Type:      "keychain",
 			CreatedAt: time.Now(),
 			Flags:     []string{"keychain", "macos"},
 		},
-		AgePublicKey:     agePublicKeyString,
 		KeychainItemName: keychainItemName,
 	}
 
@@ -383,7 +451,9 @@ func CreateKeychainUnlocker(fs afero.Fs, stateDir string) (*KeychainUnlocker, er
 		return nil, fmt.Errorf("failed to marshal unlocker metadata: %w", err)
 	}
 
-	if err := afero.WriteFile(fs, filepath.Join(unlockerDir, "unlocker-metadata.json"), metadataBytes, FilePerms); err != nil {
+	if err := afero.WriteFile(fs,
+		filepath.Join(unlockerDir, "unlocker-metadata.json"),
+		metadataBytes, FilePerms); err != nil {
 		return nil, fmt.Errorf("failed to write unlocker metadata: %w", err)
 	}
 
@@ -394,57 +464,113 @@ func CreateKeychainUnlocker(fs afero.Fs, stateDir string) (*KeychainUnlocker, er
 	}, nil
 }
 
-// checkMacOSAvailable verifies that we're running on macOS and security command is available
+// checkMacOSAvailable verifies that we're running on macOS
 func checkMacOSAvailable() error {
-	cmd := exec.Command("/usr/bin/security", "help")
+	if runtime.GOOS != "darwin" {
-	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("keychain unlockers are only supported on macOS, current OS: %s", runtime.GOOS)
-		return fmt.Errorf("macOS security command not available: %w (keychain unlockers are only supported on macOS)", err)
 	}
+
 	return nil
 }
 
-// storeInKeychain stores data in the macOS keychain using the security command
+// validateKeychainItemName validates that a keychain item name is safe for command execution
-func storeInKeychain(itemName string, data []byte) error {
+func validateKeychainItemName(itemName string) error {
-	cmd := exec.Command("/usr/bin/security", "add-generic-password",
+	if itemName == "" {
-		"-a", itemName,
+		return fmt.Errorf("keychain item name cannot be empty")
-		"-s", itemName,
+	}
-		"-w", string(data),
-		"-U") // Update if exists
 
-	if err := cmd.Run(); err != nil {
+	if !keychainItemNameRegex.MatchString(itemName) {
+		return fmt.Errorf("invalid keychain item name format: %s", itemName)
+	}
+
+	return nil
+}
+
+// storeInKeychain stores data in the macOS keychain using keybase/go-keychain
+func storeInKeychain(itemName string, data *memguard.LockedBuffer) error {
+	if data == nil {
+		return fmt.Errorf("data buffer is nil")
+	}
+	if err := validateKeychainItemName(itemName); err != nil {
+		return fmt.Errorf("invalid keychain item name: %w", err)
+	}
+
+	item := keychain.NewItem()
+	item.SetSecClass(keychain.SecClassGenericPassword)
+	item.SetService(KEYCHAIN_APP_IDENTIFIER)
+	item.SetAccount(itemName)
+	item.SetLabel(fmt.Sprintf("%s - %s", KEYCHAIN_APP_IDENTIFIER, itemName))
+	item.SetDescription("Secret vault keychain data")
+	item.SetData([]byte(data.String()))
+	item.SetSynchronizable(keychain.SynchronizableNo)
+	// Use AccessibleWhenUnlockedThisDeviceOnly for better security and to trigger auth
+	item.SetAccessible(keychain.AccessibleWhenUnlockedThisDeviceOnly)
+
+	// First try to delete any existing item
+	deleteItem := keychain.NewItem()
+	deleteItem.SetSecClass(keychain.SecClassGenericPassword)
+	deleteItem.SetService(KEYCHAIN_APP_IDENTIFIER)
+	deleteItem.SetAccount(itemName)
+	_ = keychain.DeleteItem(deleteItem) // Ignore error as item might not exist
+
+	// Add the new item
+	if err := keychain.AddItem(item); err != nil {
 		return fmt.Errorf("failed to store item in keychain: %w", err)
 	}
 
 	return nil
 }
 
-// retrieveFromKeychain retrieves data from the macOS keychain using the security command
+// retrieveFromKeychain retrieves data from the macOS keychain using keybase/go-keychain
 func retrieveFromKeychain(itemName string) ([]byte, error) {
-	cmd := exec.Command("/usr/bin/security", "find-generic-password",
+	if err := validateKeychainItemName(itemName); err != nil {
-		"-a", itemName,
+		return nil, fmt.Errorf("invalid keychain item name: %w", err)
-		"-s", itemName,
+	}
-		"-w") // Return password only
 
-	output, err := cmd.Output()
+	query := keychain.NewItem()
+	query.SetSecClass(keychain.SecClassGenericPassword)
+	query.SetService(KEYCHAIN_APP_IDENTIFIER)
+	query.SetAccount(itemName)
+	query.SetMatchLimit(keychain.MatchLimitOne)
+	query.SetReturnData(true)
+
+	results, err := keychain.QueryItem(query)
 	if err != nil {
 		return nil, fmt.Errorf("failed to retrieve item from keychain: %w", err)
 	}
 
-	// Remove trailing newline if present
+	if len(results) == 0 {
-	if len(output) > 0 && output[len(output)-1] == '\n' {
+		return nil, fmt.Errorf("keychain item not found: %s", itemName)
-		output = output[:len(output)-1]
 	}
 
-	return output, nil
+	return results[0].Data, nil
 }
 
-// deleteFromKeychain removes an item from the macOS keychain using the security command
+// deleteFromKeychain removes an item from the macOS keychain using keybase/go-keychain
+// If the item doesn't exist, this function returns nil (not an error) since the goal
+// is to ensure the item is gone, and it already being gone satisfies that goal.
 func deleteFromKeychain(itemName string) error {
-	cmd := exec.Command("/usr/bin/security", "delete-generic-password",
+	if err := validateKeychainItemName(itemName); err != nil {
-		"-a", itemName,
+		return fmt.Errorf("invalid keychain item name: %w", err)
-		"-s", itemName)
+	}
+
+	item := keychain.NewItem()
+	item.SetSecClass(keychain.SecClassGenericPassword)
+	item.SetService(KEYCHAIN_APP_IDENTIFIER)
+	item.SetAccount(itemName)
+
+	if err := keychain.DeleteItem(item); err != nil {
+		// If the item doesn't exist, that's not an error - the goal is to ensure
+		// the item is gone, and it already being gone satisfies that goal.
+		// This is important for cleaning up unlocker directories when the keychain
+		// item has already been removed (e.g., manually by user, or synced vault
+		// from a different machine).
+		if err == keychain.ErrorItemNotFound {
+			Debug("Keychain item not found during deletion, ignoring", "item_name", itemName)
+
+			return nil
+		}
 
-	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("failed to delete item from keychain: %w", err)
 	}
 

internal/secret/keychainunlocker_stub.go

@@ -0,0 +1,82 @@
+//go:build !darwin
+// +build !darwin
+
+package secret
+
+import (
+	"fmt"
+
+	"filippo.io/age"
+	"github.com/awnumar/memguard"
+	"github.com/spf13/afero"
+)
+
+// KeychainUnlockerMetadata is a stub for non-Darwin platforms
+type KeychainUnlockerMetadata struct {
+	UnlockerMetadata
+	KeychainItemName string `json:"keychainItemName"`
+}
+
+// KeychainUnlocker is a stub for non-Darwin platforms
+type KeychainUnlocker struct {
+	Directory string
+	Metadata  UnlockerMetadata
+	fs        afero.Fs
+}
+
+var errKeychainNotSupported = fmt.Errorf("keychain unlockers are only supported on macOS")
+
+// GetIdentity returns an error on non-Darwin platforms
+func (k *KeychainUnlocker) GetIdentity() (*age.X25519Identity, error) {
+	return nil, errKeychainNotSupported
+}
+
+// GetType returns the unlocker type
+func (k *KeychainUnlocker) GetType() string {
+	return "keychain"
+}
+
+// GetMetadata returns the unlocker metadata
+func (k *KeychainUnlocker) GetMetadata() UnlockerMetadata {
+	return k.Metadata
+}
+
+// GetDirectory returns the unlocker directory
+func (k *KeychainUnlocker) GetDirectory() string {
+	return k.Directory
+}
+
+// GetID returns the unlocker ID
+func (k *KeychainUnlocker) GetID() string {
+	return fmt.Sprintf("%s-keychain", k.Metadata.CreatedAt.Format("2006-01-02.15.04"))
+}
+
+// GetKeychainItemName returns an error on non-Darwin platforms
+func (k *KeychainUnlocker) GetKeychainItemName() (string, error) {
+	return "", errKeychainNotSupported
+}
+
+// Remove returns an error on non-Darwin platforms
+func (k *KeychainUnlocker) Remove() error {
+	return errKeychainNotSupported
+}
+
+// NewKeychainUnlocker creates a stub KeychainUnlocker on non-Darwin platforms.
+// The returned instance's methods that require macOS functionality will return errors.
+func NewKeychainUnlocker(fs afero.Fs, directory string, metadata UnlockerMetadata) *KeychainUnlocker {
+	return &KeychainUnlocker{
+		Directory: directory,
+		Metadata:  metadata,
+		fs:        fs,
+	}
+}
+
+// CreateKeychainUnlocker returns an error on non-Darwin platforms
+func CreateKeychainUnlocker(_ afero.Fs, _ string) (*KeychainUnlocker, error) {
+	return nil, errKeychainNotSupported
+}
+
+// getLongTermPrivateKey returns an error on non-Darwin platforms
+func getLongTermPrivateKey(_ afero.Fs, _ VaultInterface) (*memguard.LockedBuffer, error) {
+	return nil, errKeychainNotSupported
+}

internal/secret/keychainunlocker_test.go

@@ -0,0 +1,184 @@
+//go:build darwin
+// +build darwin
+
+package secret
+
+import (
+	"encoding/hex"
+	"runtime"
+	"testing"
+
+	"github.com/awnumar/memguard"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestKeychainStoreRetrieveDelete(t *testing.T) {
+	// Skip test if not on macOS
+	if runtime.GOOS != "darwin" {
+		t.Skip("Keychain tests only run on macOS")
+	}
+
+	// Test data
+	testItemName := "test-secret-keychain-item"
+	testData := "test-secret-data-12345"
+	testBuffer := memguard.NewBufferFromBytes([]byte(testData))
+	defer testBuffer.Destroy()
+
+	// Clean up any existing item first
+	_ = deleteFromKeychain(testItemName)
+
+	// Test 1: Store data in keychain
+	err := storeInKeychain(testItemName, testBuffer)
+	require.NoError(t, err, "Failed to store data in keychain")
+
+	// Test 2: Retrieve data from keychain
+	retrievedData, err := retrieveFromKeychain(testItemName)
+	require.NoError(t, err, "Failed to retrieve data from keychain")
+	assert.Equal(t, testData, string(retrievedData), "Retrieved data doesn't match stored data")
+
+	// Test 3: Update existing item (store again with different data)
+	newTestData := "updated-test-data-67890"
+	newTestBuffer := memguard.NewBufferFromBytes([]byte(newTestData))
+	defer newTestBuffer.Destroy()
+
+	err = storeInKeychain(testItemName, newTestBuffer)
+	require.NoError(t, err, "Failed to update data in keychain")
+
+	// Verify updated data
+	retrievedData, err = retrieveFromKeychain(testItemName)
+	require.NoError(t, err, "Failed to retrieve updated data from keychain")
+	assert.Equal(t, newTestData, string(retrievedData), "Retrieved data doesn't match updated data")
+
+	// Test 4: Delete from keychain
+	err = deleteFromKeychain(testItemName)
+	require.NoError(t, err, "Failed to delete data from keychain")
+
+	// Test 5: Verify item is deleted (should fail to retrieve)
+	_, err = retrieveFromKeychain(testItemName)
+	assert.Error(t, err, "Expected error when retrieving deleted item")
+}
+
+func TestKeychainInvalidItemName(t *testing.T) {
+	// Skip test if not on macOS
+	if runtime.GOOS != "darwin" {
+		t.Skip("Keychain tests only run on macOS")
+	}
+
+	testData := memguard.NewBufferFromBytes([]byte("test"))
+	defer testData.Destroy()
+
+	// Test invalid item names
+	invalidNames := []string{
+		"",                  // Empty name
+		"test space",        // Contains space
+		"test/slash",        // Contains slash
+		"test\\backslash",   // Contains backslash
+		"test:colon",        // Contains colon
+		"test;semicolon",    // Contains semicolon
+		"test|pipe",         // Contains pipe
+		"test@at",           // Contains @
+		"test#hash",         // Contains #
+		"test$dollar",       // Contains $
+		"test&ampersand",    // Contains &
+		"test*asterisk",     // Contains *
+		"test?question",     // Contains ?
+		"test!exclamation",  // Contains !
+		"test'quote",        // Contains single quote
+		"test\"doublequote", // Contains double quote
+		"test(paren",        // Contains parenthesis
+		"test[bracket",      // Contains bracket
+	}
+
+	for _, name := range invalidNames {
+		err := storeInKeychain(name, testData)
+		assert.Error(t, err, "Expected error for invalid name: %s", name)
+		assert.Contains(t, err.Error(), "invalid keychain item name", "Error should mention invalid name for: %s", name)
+	}
+
+	// Test valid names (should not error on validation)
+	validNames := []string{
+		"test-name",
+		"test_name",
+		"test.name",
+		"TestName123",
+		"TEST_NAME_123",
+		"com.example.test",
+		"secret-vault-hostname-2024-01-01",
+	}
+
+	for _, name := range validNames {
+		err := validateKeychainItemName(name)
+		assert.NoError(t, err, "Expected no error for valid name: %s", name)
+		// Clean up
+		_ = deleteFromKeychain(name)
+	}
+}
+
+func TestKeychainNilData(t *testing.T) {
+	// Skip test if not on macOS
+	if runtime.GOOS != "darwin" {
+		t.Skip("Keychain tests only run on macOS")
+	}
+
+	// Test storing nil data
+	err := storeInKeychain("test-item", nil)
+	assert.Error(t, err, "Expected error when storing nil data")
+	assert.Contains(t, err.Error(), "data buffer is nil")
+}
+
+func TestKeychainLargeData(t *testing.T) {
+	// Skip test if not on macOS
+	if runtime.GOOS != "darwin" {
+		t.Skip("Keychain tests only run on macOS")
+	}
+
+	// Test with larger hex-encoded data (512 bytes of binary data = 1KB hex)
+	largeData := make([]byte, 512)
+	for i := range largeData {
+		largeData[i] = byte(i % 256)
+	}
+
+	// Convert to hex string for storage
+	hexData := hex.EncodeToString(largeData)
+
+	testItemName := "test-large-data"
+	testBuffer := memguard.NewBufferFromBytes([]byte(hexData))
+	defer testBuffer.Destroy()
+
+	// Clean up first
+	_ = deleteFromKeychain(testItemName)
+
+	// Store hex data
+	err := storeInKeychain(testItemName, testBuffer)
+	require.NoError(t, err, "Failed to store large data")
+
+	// Retrieve and verify
+	retrievedData, err := retrieveFromKeychain(testItemName)
+	require.NoError(t, err, "Failed to retrieve large data")
+
+	// Decode hex and compare
+	decodedData, err := hex.DecodeString(string(retrievedData))
+	require.NoError(t, err, "Failed to decode hex data")
+	assert.Equal(t, largeData, decodedData, "Large data mismatch")
+
+	// Clean up
+	_ = deleteFromKeychain(testItemName)
+}
+
+func TestDeleteNonExistentKeychainItem(t *testing.T) {
+	// Skip test if not on macOS
+	if runtime.GOOS != "darwin" {
+		t.Skip("Keychain tests only run on macOS")
+	}
+
+	// Ensure item doesn't exist
+	testItemName := "test-nonexistent-keychain-item-12345"
+	_ = deleteFromKeychain(testItemName)
+
+	// Deleting a non-existent item should NOT return an error
+	// This is important for cleaning up unlocker directories when the keychain item
+	// has already been removed (e.g., manually by user, or on a different machine)
+	err := deleteFromKeychain(testItemName)
+	assert.NoError(t, err, "Deleting non-existent keychain item should not return an error")
+}

internal/secret/metadata.go

@@ -6,25 +6,24 @@ import (
 
 // VaultMetadata contains information about a vault
 type VaultMetadata struct {
-	Name            string    `json:"name"`
 	CreatedAt       time.Time `json:"createdAt"`
 	Description     string    `json:"description,omitempty"`
-	DerivationIndex uint32    `json:"derivation_index"`
+	DerivationIndex uint32    `json:"derivationIndex"`
-	LongTermKeyHash string    `json:"long_term_key_hash"` // Double SHA256 hash of derived long-term private key
+	// Double SHA256 hash of the actual long-term public key
-	MnemonicHash    string    `json:"mnemonic_hash"`      // Double SHA256 hash of mnemonic for index tracking
+	PublicKeyHash string `json:"publicKeyHash,omitempty"`
+	// Double SHA256 hash of index-0 key (for grouping vaults from same mnemonic)
+	MnemonicFamilyHash string `json:"mnemonicFamilyHash,omitempty"`
 }
 
 // UnlockerMetadata contains information about an unlocker
 type UnlockerMetadata struct {
-	ID        string    `json:"id"`
 	Type      string    `json:"type"` // passphrase, pgp, keychain
 	CreatedAt time.Time `json:"createdAt"`
 	Flags     []string  `json:"flags,omitempty"`
 }
 
-// SecretMetadata contains information about a secret
+// Metadata contains information about a secret
-type SecretMetadata struct {
+type Metadata struct {
-	Name      string    `json:"name"`
 	CreatedAt time.Time `json:"createdAt"`
 	UpdatedAt time.Time `json:"updatedAt"`
 }

internal/secret/passphrase_test.go

@@ -9,13 +9,14 @@ import (
 	"filippo.io/age"
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 )
 
 func TestPassphraseUnlockerWithRealFS(t *testing.T) {
-	// Skip this test if CI=true is set, as it uses real filesystem
+	// This test uses real filesystem
 	if os.Getenv("CI") == "true" {
-		t.Skip("Skipping test with real filesystem in CI environment")
+		t.Log("Running in CI environment with real filesystem")
 	}
 
 	// Create a temporary directory for our tests
@@ -40,7 +41,6 @@ func TestPassphraseUnlockerWithRealFS(t *testing.T) {
 
 	// Set up test metadata
 	metadata := secret.UnlockerMetadata{
-		ID:        "test-passphrase",
 		Type:      "passphrase",
 		CreatedAt: time.Now(),
 		Flags:     []string{},
@@ -76,8 +76,11 @@ func TestPassphraseUnlockerWithRealFS(t *testing.T) {
 
 	// Test encrypting private key with passphrase
 	t.Run("EncryptPrivateKey", func(t *testing.T) {
-		privKeyData := []byte(agePrivateKey)
+		privKeyBuffer := memguard.NewBufferFromBytes([]byte(agePrivateKey))
-		encryptedPrivKey, err := secret.EncryptWithPassphrase(privKeyData, testPassphrase)
+		defer privKeyBuffer.Destroy()
+		passphraseBuffer := memguard.NewBufferFromBytes([]byte(testPassphrase))
+		defer passphraseBuffer.Destroy()
+		encryptedPrivKey, err := secret.EncryptWithPassphrase(privKeyBuffer, passphraseBuffer)
 		if err != nil {
 			t.Fatalf("Failed to encrypt private key: %v", err)
 		}
@@ -111,8 +114,9 @@ func TestPassphraseUnlockerWithRealFS(t *testing.T) {
 			t.Fatalf("Failed to parse recipient: %v", err)
 		}
 
-		ltPrivKeyData := []byte(ltIdentity.String())
+		ltPrivKeyBuffer := memguard.NewBufferFromBytes([]byte(ltIdentity.String()))
-		encryptedLtPrivKey, err := secret.EncryptToRecipient(ltPrivKeyData, recipient)
+		defer ltPrivKeyBuffer.Destroy()
+		encryptedLtPrivKey, err := secret.EncryptToRecipient(ltPrivKeyBuffer, recipient)
 		if err != nil {
 			t.Fatalf("Failed to encrypt long-term private key: %v", err)
 		}
@@ -132,18 +136,8 @@ func TestPassphraseUnlockerWithRealFS(t *testing.T) {
 		}
 	})
 
-	// Save original environment variables and set test ones
+	// Set test environment variable (cleaned up automatically)
-	oldPassphrase := os.Getenv(secret.EnvUnlockPassphrase)
+	t.Setenv(secret.EnvUnlockPassphrase, testPassphrase)
-	os.Setenv(secret.EnvUnlockPassphrase, testPassphrase)
-
-	// Clean up after test
-	defer func() {
-		if oldPassphrase != "" {
-			os.Setenv(secret.EnvUnlockPassphrase, oldPassphrase)
-		} else {
-			os.Unsetenv(secret.EnvUnlockPassphrase)
-		}
-	}()
 
 	// Test getting identity from environment variable
 	t.Run("GetIdentityFromEnv", func(t *testing.T) {

internal/secret/passphraseunlocker.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 
 	"filippo.io/age"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 )
 
@@ -15,7 +16,40 @@ type PassphraseUnlocker struct {
 	Directory  string
 	Metadata   UnlockerMetadata
 	fs         afero.Fs
-	Passphrase string
+	Passphrase *memguard.LockedBuffer // Secure buffer for passphrase
+}
+
+// getPassphrase retrieves the passphrase from memory, environment, or user input
+// Returns a LockedBuffer for secure memory handling
+func (p *PassphraseUnlocker) getPassphrase() (*memguard.LockedBuffer, error) {
+	// First check if we already have the passphrase
+	if p.Passphrase != nil && p.Passphrase.IsAlive() {
+		Debug("Using in-memory passphrase", "unlocker_id", p.GetID())
+		// Return a copy of the passphrase buffer
+		return memguard.NewBufferFromBytes(p.Passphrase.Bytes()), nil
+	}
+
+	Debug("No passphrase in memory, checking environment")
+	// Check environment variable for passphrase
+	passphraseStr := os.Getenv(EnvUnlockPassphrase)
+	if passphraseStr != "" {
+		Debug("Using passphrase from environment", "unlocker_id", p.GetID())
+		// Convert to secure buffer
+		secureBuffer := memguard.NewBufferFromBytes([]byte(passphraseStr))
+
+		return secureBuffer, nil
+	}
+
+	Debug("No passphrase in environment, prompting user")
+	// Prompt for passphrase
+	secureBuffer, err := ReadPassphrase("Enter unlock passphrase: ")
+	if err != nil {
+		Debug("Failed to read passphrase", "error", err, "unlocker_id", p.GetID())
+
+		return nil, fmt.Errorf("failed to read passphrase: %w", err)
+	}
+
+	return secureBuffer, nil
 }
 
 // GetIdentity implements Unlocker interface for passphrase-based unlockers
@@ -25,27 +59,11 @@ func (p *PassphraseUnlocker) GetIdentity() (*age.X25519Identity, error) {
 		slog.String("unlocker_type", p.GetType()),
 	)
 
-	// First check if we already have the passphrase
+	passphraseBuffer, err := p.getPassphrase()
-	passphraseStr := p.Passphrase
+	if err != nil {
-	if passphraseStr == "" {
+		return nil, err
-		Debug("No passphrase in memory, checking environment")
-		// Check environment variable for passphrase
-		passphraseStr = os.Getenv(EnvUnlockPassphrase)
-		if passphraseStr == "" {
-			Debug("No passphrase in environment, prompting user")
-			// Prompt for passphrase
-			var err error
-			passphraseStr, err = ReadPassphrase("Enter unlock passphrase: ")
-			if err != nil {
-				Debug("Failed to read passphrase", "error", err, "unlocker_id", p.GetID())
-				return nil, fmt.Errorf("failed to read passphrase: %w", err)
-			}
-		} else {
-			Debug("Using passphrase from environment", "unlocker_id", p.GetID())
-		}
-	} else {
-		Debug("Using in-memory passphrase", "unlocker_id", p.GetID())
 	}
+	defer passphraseBuffer.Destroy()
 
 	// Read encrypted private key of unlocker
 	unlockerPrivPath := filepath.Join(p.Directory, "priv.age")
@@ -54,6 +72,7 @@ func (p *PassphraseUnlocker) GetIdentity() (*age.X25519Identity, error) {
 	encryptedPrivKeyData, err := afero.ReadFile(p.fs, unlockerPrivPath)
 	if err != nil {
 		Debug("Failed to read passphrase unlocker private key", "error", err, "path", unlockerPrivPath)
+
 		return nil, fmt.Errorf("failed to read unlocker private key: %w", err)
 	}
 
@@ -65,22 +84,26 @@ func (p *PassphraseUnlocker) GetIdentity() (*age.X25519Identity, error) {
 	Debug("Decrypting unlocker private key with passphrase", "unlocker_id", p.GetID())
 
 	// Decrypt the unlocker private key with passphrase
-	privKeyData, err := DecryptWithPassphrase(encryptedPrivKeyData, passphraseStr)
+	privKeyBuffer, err := DecryptWithPassphrase(encryptedPrivKeyData, passphraseBuffer)
 	if err != nil {
 		Debug("Failed to decrypt unlocker private key", "error", err, "unlocker_id", p.GetID())
+
 		return nil, fmt.Errorf("failed to decrypt unlocker private key: %w", err)
 	}
+	defer privKeyBuffer.Destroy()
 
 	DebugWith("Successfully decrypted unlocker private key",
 		slog.String("unlocker_id", p.GetID()),
-		slog.Int("decrypted_length", len(privKeyData)),
+		slog.Int("decrypted_length", privKeyBuffer.Size()),
 	)
 
 	// Parse the decrypted private key
 	Debug("Parsing decrypted unlocker identity", "unlocker_id", p.GetID())
-	identity, err := age.ParseX25519Identity(string(privKeyData))
+
+	identity, err := age.ParseX25519Identity(privKeyBuffer.String())
 	if err != nil {
 		Debug("Failed to parse unlocker private key", "error", err, "unlocker_id", p.GetID())
+
 		return nil, fmt.Errorf("failed to parse unlocker private key: %w", err)
 	}
 
@@ -107,25 +130,27 @@ func (p *PassphraseUnlocker) GetDirectory() string {
 	return p.Directory
 }
 
-// GetID implements Unlocker interface
+// GetID implements Unlocker interface - generates ID from creation timestamp
 func (p *PassphraseUnlocker) GetID() string {
-	return p.Metadata.ID
-}
-
-// ID implements Unlocker interface - generates ID from creation timestamp
-func (p *PassphraseUnlocker) ID() string {
 	// Generate ID using creation timestamp: YYYY-MM-DD.HH.mm-passphrase
 	createdAt := p.Metadata.CreatedAt
+
 	return fmt.Sprintf("%s-passphrase", createdAt.Format("2006-01-02.15.04"))
 }
 
 // Remove implements Unlocker interface - removes the passphrase unlocker
 func (p *PassphraseUnlocker) Remove() error {
+	// Clean up the passphrase from memory if it exists
+	if p.Passphrase != nil && p.Passphrase.IsAlive() {
+		p.Passphrase.Destroy()
+	}
+
 	// For passphrase unlockers, we just need to remove the directory
 	// No external resources (like keychain items) to clean up
 	if err := p.fs.RemoveAll(p.Directory); err != nil {
 		return fmt.Errorf("failed to remove passphrase unlocker directory: %w", err)
 	}
+
 	return nil
 }
 
@@ -139,7 +164,12 @@ func NewPassphraseUnlocker(fs afero.Fs, directory string, metadata UnlockerMetad
 }
 
 // CreatePassphraseUnlocker creates a new passphrase-protected unlocker
-func CreatePassphraseUnlocker(fs afero.Fs, stateDir string, passphrase string) (*PassphraseUnlocker, error) {
+// The passphrase must be provided as a LockedBuffer for security
+func CreatePassphraseUnlocker(
+	fs afero.Fs,
+	stateDir string,
+	passphrase *memguard.LockedBuffer,
+) (*PassphraseUnlocker, error) {
 	// Get current vault
 	currentVault, err := GetCurrentVault(fs, stateDir)
 	if err != nil {

internal/secret/pgpunlock_test.go

@@ -16,6 +16,7 @@ import (
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/internal/vault"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 )
 
@@ -28,14 +29,14 @@ func init() {
 }
 
 // setupNonInteractiveGPG creates a custom GPG environment for testing
-func setupNonInteractiveGPG(t *testing.T, tempDir, passphrase, gnupgHomeDir string) {
+func setupNonInteractiveGPG(t *testing.T, _, passphrase, gnupgHomeDir string) {
 	// Create GPG config file for non-interactive operation
 	gpgConfPath := filepath.Join(gnupgHomeDir, "gpg.conf")
 	gpgConfContent := `batch
 no-tty
 pinentry-mode loopback
 `
-	if err := os.WriteFile(gpgConfPath, []byte(gpgConfContent), 0600); err != nil {
+	if err := os.WriteFile(gpgConfPath, []byte(gpgConfContent), 0o600); err != nil {
 		t.Fatalf("Failed to write GPG config file: %v", err)
 	}
 
@@ -44,7 +45,10 @@ pinentry-mode loopback
 	origDecryptFunc := secret.GPGDecryptFunc
 
 	// Set custom GPG functions for this test
-	secret.GPGEncryptFunc = func(data []byte, keyID string) ([]byte, error) {
+	secret.GPGEncryptFunc = func(data *memguard.LockedBuffer, keyID string) ([]byte, error) {
+		if data == nil {
+			return nil, fmt.Errorf("data buffer is nil")
+		}
 		cmd := exec.Command("gpg",
 			"--homedir", gnupgHomeDir,
 			"--batch",
@@ -59,7 +63,7 @@ pinentry-mode loopback
 		var stdout, stderr bytes.Buffer
 		cmd.Stdout = &stdout
 		cmd.Stderr = &stderr
-		cmd.Stdin = bytes.NewReader(data)
+		cmd.Stdin = bytes.NewReader(data.Bytes())
 
 		if err := cmd.Run(); err != nil {
 			return nil, fmt.Errorf("GPG encryption failed: %w\nStderr: %s", err, stderr.String())
@@ -68,7 +72,7 @@ pinentry-mode loopback
 		return stdout.Bytes(), nil
 	}
 
-	secret.GPGDecryptFunc = func(encryptedData []byte) ([]byte, error) {
+	secret.GPGDecryptFunc = func(encryptedData []byte) (*memguard.LockedBuffer, error) {
 		cmd := exec.Command("gpg",
 			"--homedir", gnupgHomeDir,
 			"--batch",
@@ -87,7 +91,8 @@ pinentry-mode loopback
 			return nil, fmt.Errorf("GPG decryption failed: %w\nStderr: %s", err, stderr.String())
 		}
 
-		return stdout.Bytes(), nil
+		// Create a secure buffer for the decrypted data
+		return memguard.NewBufferFromBytes(stdout.Bytes()), nil
 	}
 
 	// Restore original functions after test
@@ -124,9 +129,10 @@ func runGPGWithPassphrase(gnupgHome, passphrase string, args []string, input io.
 }
 
 func TestPGPUnlockerWithRealFS(t *testing.T) {
-	// Skip tests if gpg is not available
+	// Check if gpg is available
 	if _, err := exec.LookPath("gpg"); err != nil {
-		t.Skip("GPG not available, skipping PGP unlock key tests")
+		t.Log("GPG not available, PGP unlock key tests may not fully function")
+		// Continue anyway to test what we can
 	}
 
 	// Create a temporary directory for our tests
@@ -138,24 +144,12 @@ func TestPGPUnlockerWithRealFS(t *testing.T) {
 
 	// Create a temporary GNUPGHOME
 	gnupgHomeDir := filepath.Join(tempDir, "gnupg")
-	if err := os.MkdirAll(gnupgHomeDir, 0700); err != nil {
+	if err := os.MkdirAll(gnupgHomeDir, 0o700); err != nil {
 		t.Fatalf("Failed to create GNUPGHOME: %v", err)
 	}
 
-	// Save original GNUPGHOME
-	origGnupgHome := os.Getenv("GNUPGHOME")
-
 	// Set new GNUPGHOME
-	os.Setenv("GNUPGHOME", gnupgHomeDir)
+	t.Setenv("GNUPGHOME", gnupgHomeDir)
-
-	// Clean up environment after test
-	defer func() {
-		if origGnupgHome != "" {
-			os.Setenv("GNUPGHOME", origGnupgHome)
-		} else {
-			os.Unsetenv("GNUPGHOME")
-		}
-	}()
 
 	// Test passphrase for GPG key
 	testPassphrase := "test123"
@@ -175,7 +169,7 @@ Passphrase: ` + testPassphrase + `
 %commit
 %echo Key generation completed
 `
-	if err := os.WriteFile(batchFile, []byte(batchContent), 0600); err != nil {
+	if err := os.WriteFile(batchFile, []byte(batchContent), 0o600); err != nil {
 		t.Fatalf("Failed to write batch file: %v", err)
 	}
 
@@ -188,21 +182,26 @@ Passphrase: ` + testPassphrase + `
 	}
 	t.Log("GPG key generated successfully")
 
-	// Get the key ID
+	// Get the key ID and fingerprint
 	output, err := runGPGWithPassphrase(gnupgHomeDir, testPassphrase,
-		[]string{"--list-secret-keys", "--with-colons"}, nil)
+		[]string{"--list-secret-keys", "--with-colons", "--fingerprint"}, nil)
 	if err != nil {
 		t.Fatalf("Failed to list GPG keys: %v", err)
 	}
 
-	// Parse output to get key ID
+	// Parse output to get key ID and fingerprint
-	var keyID string
+	var keyID, fingerprint string
 	lines := strings.Split(string(output), "\n")
 	for _, line := range lines {
 		if strings.HasPrefix(line, "sec:") {
 			fields := strings.Split(line, ":")
 			if len(fields) >= 5 {
 				keyID = fields[4]
+			}
+		} else if strings.HasPrefix(line, "fpr:") {
+			fields := strings.Split(line, ":")
+			if len(fields) >= 10 && fields[9] != "" {
+				fingerprint = fields[9]
 				break
 			}
 		}
@@ -211,18 +210,14 @@ Passphrase: ` + testPassphrase + `
 	if keyID == "" {
 		t.Fatalf("Failed to find GPG key ID in output: %s", output)
 	}
+	if fingerprint == "" {
+		t.Fatalf("Failed to find GPG fingerprint in output: %s", output)
+	}
 	t.Logf("Generated GPG key ID: %s", keyID)
+	t.Logf("Generated GPG fingerprint: %s", fingerprint)
 
 	// Set the GPG_AGENT_INFO to empty to ensure gpg-agent doesn't interfere
-	oldAgentInfo := os.Getenv("GPG_AGENT_INFO")
+	t.Setenv("GPG_AGENT_INFO", "")
-	os.Setenv("GPG_AGENT_INFO", "")
-	defer func() {
-		if oldAgentInfo != "" {
-			os.Setenv("GPG_AGENT_INFO", oldAgentInfo)
-		} else {
-			os.Unsetenv("GPG_AGENT_INFO")
-		}
-	}()
 
 	// Use the real filesystem
 	fs := afero.NewOsFs()
@@ -230,28 +225,9 @@ Passphrase: ` + testPassphrase + `
 	// Test data
 	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
 
-	// Save original environment variable
-	oldMnemonic := os.Getenv(secret.EnvMnemonic)
-	oldGPGKeyID := os.Getenv(secret.EnvGPGKeyID)
-
 	// Set test environment variables
-	os.Setenv(secret.EnvMnemonic, testMnemonic)
+	t.Setenv(secret.EnvMnemonic, testMnemonic)
-	os.Setenv(secret.EnvGPGKeyID, keyID)
+	t.Setenv(secret.EnvGPGKeyID, keyID)
-
-	// Clean up after test
-	defer func() {
-		if oldMnemonic != "" {
-			os.Setenv(secret.EnvMnemonic, oldMnemonic)
-		} else {
-			os.Unsetenv(secret.EnvMnemonic)
-		}
-
-		if oldGPGKeyID != "" {
-			os.Setenv(secret.EnvGPGKeyID, oldGPGKeyID)
-		} else {
-			os.Unsetenv(secret.EnvGPGKeyID)
-		}
-	}()
 
 	// Set up vault structure for testing
 	stateDir := tempDir
@@ -299,7 +275,9 @@ Passphrase: ` + testPassphrase + `
 		vlt.Unlock(ltIdentity)
 
 		// Create a passphrase unlocker first (to have current unlocker)
-		passUnlocker, err := vlt.CreatePassphraseUnlocker("test-passphrase")
+		passphraseBuffer := memguard.NewBufferFromBytes([]byte("test-passphrase"))
+		defer passphraseBuffer.Destroy()
+		passUnlocker, err := vlt.CreatePassphraseUnlocker(passphraseBuffer)
 		if err != nil {
 			t.Fatalf("Failed to create passphrase unlocker: %v", err)
 		}
@@ -325,9 +303,9 @@ Passphrase: ` + testPassphrase + `
 			t.Errorf("Expected PGP unlock key type 'pgp', got '%s'", pgpUnlocker.GetType())
 		}
 
-		// Check if the key ID includes the GPG key ID
+		// Check if the key ID includes the GPG fingerprint
-		if !strings.Contains(pgpUnlocker.GetID(), keyID) {
+		if !strings.Contains(pgpUnlocker.GetID(), fingerprint) {
-			t.Errorf("PGP unlock key ID '%s' does not contain GPG key ID '%s'", pgpUnlocker.GetID(), keyID)
+			t.Errorf("PGP unlock key ID '%s' does not contain GPG fingerprint '%s'", pgpUnlocker.GetID(), fingerprint)
 		}
 
 		// Check if the key directory exists
@@ -341,13 +319,13 @@ Passphrase: ` + testPassphrase + `
 		}
 
 		// Check if required files exist
-		pubKeyPath := filepath.Join(unlockerDir, "pub.age")
+		recipientPath := filepath.Join(unlockerDir, "pub.txt")
-		pubKeyExists, err := afero.Exists(fs, pubKeyPath)
+		recipientExists, err := afero.Exists(fs, recipientPath)
 		if err != nil {
-			t.Fatalf("Failed to check if public key file exists: %v", err)
+			t.Fatalf("Failed to check if recipient file exists: %v", err)
 		}
-		if !pubKeyExists {
+		if !recipientExists {
-			t.Errorf("PGP unlock key public key file does not exist: %s", pubKeyPath)
+			t.Errorf("PGP unlock key recipient file does not exist: %s", recipientPath)
 		}
 
 		privKeyPath := filepath.Join(unlockerDir, "priv.age.gpg")
@@ -386,9 +364,9 @@ Passphrase: ` + testPassphrase + `
 		var metadata struct {
 			ID        string    `json:"id"`
 			Type      string    `json:"type"`
-			CreatedAt time.Time `json:"created_at"`
+			CreatedAt time.Time `json:"createdAt"`
 			Flags     []string  `json:"flags"`
-			GPGKeyID  string    `json:"gpg_key_id"`
+			GPGKeyID  string    `json:"gpgKeyId"`
 		}
 
 		if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
@@ -399,8 +377,8 @@ Passphrase: ` + testPassphrase + `
 			t.Errorf("Expected metadata type 'pgp', got '%s'", metadata.Type)
 		}
 
-		if metadata.GPGKeyID != keyID {
+		if metadata.GPGKeyID != fingerprint {
-			t.Errorf("Expected GPG key ID '%s', got '%s'", keyID, metadata.GPGKeyID)
+			t.Errorf("Expected GPG fingerprint '%s', got '%s'", fingerprint, metadata.GPGKeyID)
 		}
 	})
 
@@ -412,7 +390,6 @@ Passphrase: ` + testPassphrase + `
 
 	// Set up test metadata
 	metadata := secret.UnlockerMetadata{
-		ID:        fmt.Sprintf("%s-pgp", keyID),
 		Type:      "pgp",
 		CreatedAt: time.Now(),
 		Flags:     []string{"gpg", "encrypted"},
@@ -426,12 +403,12 @@ Passphrase: ` + testPassphrase + `
 		// Create PGP metadata with GPG key ID
 		type PGPUnlockerMetadata struct {
 			secret.UnlockerMetadata
-			GPGKeyID string `json:"gpg_key_id"`
+			GPGKeyID string `json:"gpgKeyId"`
 		}
 
 		pgpMetadata := PGPUnlockerMetadata{
 			UnlockerMetadata: metadata,
-			GPGKeyID:         keyID,
+			GPGKeyID:         fingerprint,
 		}
 
 		// Write metadata file
@@ -450,9 +427,9 @@ Passphrase: ` + testPassphrase + `
 			t.Fatalf("Failed to get GPG key ID: %v", err)
 		}
 
-		// Verify key ID
+		// Verify key ID (should be the fingerprint)
-		if retrievedKeyID != keyID {
+		if retrievedKeyID != fingerprint {
-			t.Errorf("Expected GPG key ID '%s', got '%s'", keyID, retrievedKeyID)
+			t.Errorf("Expected GPG fingerprint '%s', got '%s'", fingerprint, retrievedKeyID)
 		}
 	})
 
@@ -464,15 +441,16 @@ Passphrase: ` + testPassphrase + `
 			t.Fatalf("Failed to generate age identity: %v", err)
 		}
 
-		// Write the public key
+		// Write the recipient
-		pubKeyPath := filepath.Join(unlockerDir, "pub.age")
+		recipientPath := filepath.Join(unlockerDir, "pub.txt")
-		if err := afero.WriteFile(fs, pubKeyPath, []byte(ageIdentity.Recipient().String()), secret.FilePerms); err != nil {
+		if err := afero.WriteFile(fs, recipientPath, []byte(ageIdentity.Recipient().String()), secret.FilePerms); err != nil {
-			t.Fatalf("Failed to write public key: %v", err)
+			t.Fatalf("Failed to write recipient: %v", err)
 		}
 
 		// GPG encrypt the private key using our custom encrypt function
-		privKeyData := []byte(ageIdentity.String())
+		privKeyBuffer := memguard.NewBufferFromBytes([]byte(ageIdentity.String()))
-		encryptedOutput, err := secret.GPGEncryptFunc(privKeyData, keyID)
+		defer privKeyBuffer.Destroy()
+		encryptedOutput, err := secret.GPGEncryptFunc(privKeyBuffer, keyID)
 		if err != nil {
 			t.Fatalf("Failed to encrypt with GPG: %v", err)
 		}

internal/secret/pgpunlocker.go

@@ -7,11 +7,12 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"time"
 
 	"filippo.io/age"
-	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 )
 
@@ -19,21 +20,33 @@ import (
 var (
 	// GPGEncryptFunc is the function used for GPG encryption
 	// Can be overridden in tests to provide a non-interactive implementation
-	GPGEncryptFunc = gpgEncryptDefault
+	//nolint:gochecknoglobals // Required for test mocking
+	GPGEncryptFunc func(data *memguard.LockedBuffer, keyID string) ([]byte, error) = gpgEncryptDefault
 
 	// GPGDecryptFunc is the function used for GPG decryption
 	// Can be overridden in tests to provide a non-interactive implementation
-	GPGDecryptFunc = gpgDecryptDefault
+	//nolint:gochecknoglobals // Required for test mocking
+	GPGDecryptFunc func(encryptedData []byte) (*memguard.LockedBuffer, error) = gpgDecryptDefault
+
+	// gpgKeyIDRegex validates GPG key IDs
+	// Allows either:
+	// 1. Email addresses (user@domain.tld format)
+	// 2. Short key IDs (8 hex characters)
+	// 3. Long key IDs (16 hex characters)
+	// 4. Full fingerprints (40 hex characters)
+	gpgKeyIDRegex = regexp.MustCompile(
+		`^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$|` +
+			`^[A-Fa-f0-9]{8}$|` +
+			`^[A-Fa-f0-9]{16}$|` +
+			`^[A-Fa-f0-9]{40}$`,
+	)
 )
 
 // PGPUnlockerMetadata extends UnlockerMetadata with PGP-specific data
 type PGPUnlockerMetadata struct {
 	UnlockerMetadata
 	// GPG key ID used for encryption
-	GPGKeyID string `json:"gpg_key_id"`
+	GPGKeyID string `json:"gpgKeyId"`
-	// Age keypair information
-	AgePublicKey string `json:"age_public_key"`
-	AgeRecipient string `json:"age_recipient"`
 }
 
 // PGPUnlocker represents a PGP-protected unlocker
@@ -57,6 +70,7 @@ func (p *PGPUnlocker) GetIdentity() (*age.X25519Identity, error) {
 	encryptedAgePrivKeyData, err := afero.ReadFile(p.fs, agePrivKeyPath)
 	if err != nil {
 		Debug("Failed to read PGP-encrypted age private key", "error", err, "path", agePrivKeyPath)
+
 		return nil, fmt.Errorf("failed to read encrypted age private key: %w", err)
 	}
 
@@ -67,22 +81,25 @@ func (p *PGPUnlocker) GetIdentity() (*age.X25519Identity, error) {
 
 	// Step 2: Decrypt the age private key using GPG
 	Debug("Decrypting age private key with GPG", "unlocker_id", p.GetID())
-	agePrivKeyData, err := GPGDecryptFunc(encryptedAgePrivKeyData)
+	agePrivKeyBuffer, err := GPGDecryptFunc(encryptedAgePrivKeyData)
 	if err != nil {
 		Debug("Failed to decrypt age private key with GPG", "error", err, "unlocker_id", p.GetID())
+
 		return nil, fmt.Errorf("failed to decrypt age private key with GPG: %w", err)
 	}
+	defer agePrivKeyBuffer.Destroy()
 
 	DebugWith("Successfully decrypted age private key with GPG",
 		slog.String("unlocker_id", p.GetID()),
-		slog.Int("decrypted_length", len(agePrivKeyData)),
+		slog.Int("decrypted_length", agePrivKeyBuffer.Size()),
 	)
 
 	// Step 3: Parse the decrypted age private key
 	Debug("Parsing decrypted age private key", "unlocker_id", p.GetID())
-	ageIdentity, err := age.ParseX25519Identity(string(agePrivKeyData))
+	ageIdentity, err := age.ParseX25519Identity(agePrivKeyBuffer.String())
 	if err != nil {
 		Debug("Failed to parse age private key", "error", err, "unlocker_id", p.GetID())
+
 		return nil, fmt.Errorf("failed to parse age private key: %w", err)
 	}
 
@@ -109,20 +126,17 @@ func (p *PGPUnlocker) GetDirectory() string {
 	return p.Directory
 }
 
-// GetID implements Unlocker interface
+// GetID implements Unlocker interface - generates ID from GPG key ID
 func (p *PGPUnlocker) GetID() string {
-	return p.Metadata.ID
+	// Generate ID using GPG key ID: pgp-<keyid>
-}
-
-// ID implements Unlocker interface - generates ID from GPG key ID
-func (p *PGPUnlocker) ID() string {
-	// Generate ID using GPG key ID: <keyid>-pgp
 	gpgKeyID, err := p.GetGPGKeyID()
 	if err != nil {
-		// Fallback to metadata ID if we can't read the GPG key ID
+		// The vault metadata is corrupt - this is a fatal error
-		return p.Metadata.ID
+		// We cannot continue with a fallback ID as that would mask data corruption
+		panic(fmt.Sprintf("PGP unlocker metadata is corrupt or missing GPG key ID: %v", err))
 	}
-	return fmt.Sprintf("%s-pgp", gpgKeyID)
+
+	return fmt.Sprintf("pgp-%s", gpgKeyID)
 }
 
 // Remove implements Unlocker interface - removes the PGP unlocker
@@ -132,6 +146,7 @@ func (p *PGPUnlocker) Remove() error {
 	if err := p.fs.RemoveAll(p.Directory); err != nil {
 		return fmt.Errorf("failed to remove PGP unlocker directory: %w", err)
 	}
+
 	return nil
 }
 
@@ -170,6 +185,7 @@ func generatePGPUnlockerName() (string, error) {
 
 	// Format: hostname-pgp-YYYY-MM-DD
 	enrollmentDate := time.Now().Format("2006-01-02")
+
 	return fmt.Sprintf("%s-pgp-%s", hostname, enrollmentDate), nil
 }
 
@@ -209,64 +225,19 @@ func CreatePGPUnlocker(fs afero.Fs, stateDir string, gpgKeyID string) (*PGPUnloc
 		return nil, fmt.Errorf("failed to generate age keypair: %w", err)
 	}
 
-	// Step 2: Store age public key as plaintext
+	// Step 2: Store age recipient as plaintext
-	agePublicKeyString := ageIdentity.Recipient().String()
+	ageRecipient := ageIdentity.Recipient().String()
-	agePubKeyPath := filepath.Join(unlockerDir, "pub.age")
+	recipientPath := filepath.Join(unlockerDir, "pub.txt")
-	if err := afero.WriteFile(fs, agePubKeyPath, []byte(agePublicKeyString), FilePerms); err != nil {
+	if err := afero.WriteFile(fs, recipientPath, []byte(ageRecipient), FilePerms); err != nil {
-		return nil, fmt.Errorf("failed to write age public key: %w", err)
+		return nil, fmt.Errorf("failed to write age recipient: %w", err)
 	}
 
 	// Step 3: Get or derive the long-term private key
-	var ltPrivKeyData []byte
+	ltPrivKeyData, err := getLongTermPrivateKey(fs, vault)
-
+	if err != nil {
-	// Check if mnemonic is available in environment variable
+		return nil, err
-	if envMnemonic := os.Getenv(EnvMnemonic); envMnemonic != "" {
-		// Use mnemonic directly to derive long-term key
-		ltIdentity, err := agehd.DeriveIdentity(envMnemonic, 0)
-		if err != nil {
-			return nil, fmt.Errorf("failed to derive long-term key from mnemonic: %w", err)
-		}
-		ltPrivKeyData = []byte(ltIdentity.String())
-	} else {
-		// Get the vault to access current unlocker
-		currentUnlocker, err := vault.GetCurrentUnlocker()
-		if err != nil {
-			return nil, fmt.Errorf("failed to get current unlocker: %w", err)
-		}
-
-		// Get the current unlocker identity
-		currentUnlockerIdentity, err := currentUnlocker.GetIdentity()
-		if err != nil {
-			return nil, fmt.Errorf("failed to get current unlocker identity: %w", err)
-		}
-
-		// Get encrypted long-term key from current unlocker, handling different types
-		var encryptedLtPrivKey []byte
-		switch currentUnlocker := currentUnlocker.(type) {
-		case *PassphraseUnlocker:
-			// Read the encrypted long-term private key from passphrase unlocker
-			encryptedLtPrivKey, err = afero.ReadFile(fs, filepath.Join(currentUnlocker.GetDirectory(), "longterm.age"))
-			if err != nil {
-				return nil, fmt.Errorf("failed to read encrypted long-term key from current passphrase unlocker: %w", err)
-			}
-
-		case *PGPUnlocker:
-			// Read the encrypted long-term private key from PGP unlocker
-			encryptedLtPrivKey, err = afero.ReadFile(fs, filepath.Join(currentUnlocker.GetDirectory(), "longterm.age"))
-			if err != nil {
-				return nil, fmt.Errorf("failed to read encrypted long-term key from current PGP unlocker: %w", err)
-			}
-
-		default:
-			return nil, fmt.Errorf("unsupported current unlocker type for PGP unlocker creation")
-		}
-
-		// Step 6: Decrypt long-term private key using current unlocker
-		ltPrivKeyData, err = DecryptWithIdentity(encryptedLtPrivKey, currentUnlockerIdentity)
-		if err != nil {
-			return nil, fmt.Errorf("failed to decrypt long-term private key: %w", err)
-		}
 	}
+	defer ltPrivKeyData.Destroy()
 
 	// Step 7: Encrypt long-term private key to the new age unlocker
 	encryptedLtPrivKeyToAge, err := EncryptToRecipient(ltPrivKeyData, ageIdentity.Recipient())
@@ -281,8 +252,11 @@ func CreatePGPUnlocker(fs afero.Fs, stateDir string, gpgKeyID string) (*PGPUnloc
 	}
 
 	// Step 8: Encrypt age private key to the GPG key ID
-	agePrivateKeyBytes := []byte(ageIdentity.String())
+	// Use memguard to protect the private key in memory
-	encryptedAgePrivKey, err := GPGEncryptFunc(agePrivateKeyBytes, gpgKeyID)
+	agePrivateKeyBuffer := memguard.NewBufferFromBytes([]byte(ageIdentity.String()))
+	defer agePrivateKeyBuffer.Destroy()
+
+	encryptedAgePrivKey, err := GPGEncryptFunc(agePrivateKeyBuffer, gpgKeyID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encrypt age private key with GPG: %w", err)
 	}
@@ -292,20 +266,20 @@ func CreatePGPUnlocker(fs afero.Fs, stateDir string, gpgKeyID string) (*PGPUnloc
 		return nil, fmt.Errorf("failed to write encrypted age private key: %w", err)
 	}
 
-	// Step 9: Create and write enhanced metadata
+	// Step 9: Resolve the GPG key ID to its full fingerprint
-	// Generate the key ID directly using the GPG key ID
+	fingerprint, err := ResolveGPGKeyFingerprint(gpgKeyID)
-	keyID := fmt.Sprintf("%s-pgp", gpgKeyID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to resolve GPG key fingerprint: %w", err)
+	}
 
+	// Step 10: Create and write enhanced metadata with full fingerprint
 	pgpMetadata := PGPUnlockerMetadata{
 		UnlockerMetadata: UnlockerMetadata{
-			ID:        keyID,
 			Type:      "pgp",
 			CreatedAt: time.Now(),
 			Flags:     []string{"gpg", "encrypted"},
 		},
-		GPGKeyID:     gpgKeyID,
+		GPGKeyID: fingerprint,
-		AgePublicKey: agePublicKeyString,
-		AgeRecipient: ageIdentity.Recipient().String(),
 	}
 
 	metadataBytes, err := json.MarshalIndent(pgpMetadata, "", "  ")
@@ -313,7 +287,9 @@ func CreatePGPUnlocker(fs afero.Fs, stateDir string, gpgKeyID string) (*PGPUnloc
 		return nil, fmt.Errorf("failed to marshal unlocker metadata: %w", err)
 	}
 
-	if err := afero.WriteFile(fs, filepath.Join(unlockerDir, "unlocker-metadata.json"), metadataBytes, FilePerms); err != nil {
+	if err := afero.WriteFile(fs,
+		filepath.Join(unlockerDir, "unlocker-metadata.json"),
+		metadataBytes, FilePerms); err != nil {
 		return nil, fmt.Errorf("failed to write unlocker metadata: %w", err)
 	}
 
@@ -324,19 +300,71 @@ func CreatePGPUnlocker(fs afero.Fs, stateDir string, gpgKeyID string) (*PGPUnloc
 	}, nil
 }
 
+// validateGPGKeyID validates that a GPG key ID is safe for command execution
+func validateGPGKeyID(keyID string) error {
+	if keyID == "" {
+		return fmt.Errorf("GPG key ID cannot be empty")
+	}
+
+	if !gpgKeyIDRegex.MatchString(keyID) {
+		return fmt.Errorf("invalid GPG key ID format: %s", keyID)
+	}
+
+	return nil
+}
+
+// ResolveGPGKeyFingerprint resolves any GPG key identifier to its full fingerprint
+func ResolveGPGKeyFingerprint(keyID string) (string, error) {
+	if err := validateGPGKeyID(keyID); err != nil {
+		return "", fmt.Errorf("invalid GPG key ID: %w", err)
+	}
+
+	// Use GPG to get the full fingerprint for the key
+	cmd := exec.Command( // #nosec G204 -- keyID validated
+		"gpg", "--list-keys", "--with-colons", "--fingerprint", keyID,
+	)
+	output, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("failed to resolve GPG key fingerprint: %w", err)
+	}
+
+	// Parse the output to extract the fingerprint
+	lines := strings.Split(string(output), "\n")
+	for _, line := range lines {
+		if strings.HasPrefix(line, "fpr:") {
+			fields := strings.Split(line, ":")
+			if len(fields) >= 10 && fields[9] != "" {
+				return fields[9], nil
+			}
+		}
+	}
+
+	return "", fmt.Errorf("could not find fingerprint for GPG key: %s", keyID)
+}
+
 // checkGPGAvailable verifies that GPG is available
 func checkGPGAvailable() error {
 	cmd := exec.Command("gpg", "--version")
 	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("GPG not available: %w (make sure 'gpg' command is installed and in PATH)", err)
 	}
+
 	return nil
 }
 
 // gpgEncryptDefault is the default implementation of GPG encryption
-func gpgEncryptDefault(data []byte, keyID string) ([]byte, error) {
+func gpgEncryptDefault(data *memguard.LockedBuffer, keyID string) ([]byte, error) {
-	cmd := exec.Command("gpg", "--trust-model", "always", "--armor", "--encrypt", "-r", keyID)
+	if data == nil {
-	cmd.Stdin = strings.NewReader(string(data))
+		return nil, fmt.Errorf("data buffer is nil")
+	}
+	if err := validateGPGKeyID(keyID); err != nil {
+		return nil, fmt.Errorf("invalid GPG key ID: %w", err)
+	}
+
+	cmd := exec.Command( // #nosec G204 -- keyID validated
+		"gpg", "--trust-model", "always", "--armor", "--encrypt", "-r", keyID,
+	)
+	cmd.Stdin = strings.NewReader(data.String())
 
 	output, err := cmd.Output()
 	if err != nil {
@@ -347,7 +375,7 @@ func gpgEncryptDefault(data []byte, keyID string) ([]byte, error) {
 }
 
 // gpgDecryptDefault is the default implementation of GPG decryption
-func gpgDecryptDefault(encryptedData []byte) ([]byte, error) {
+func gpgDecryptDefault(encryptedData []byte) (*memguard.LockedBuffer, error) {
 	cmd := exec.Command("gpg", "--quiet", "--decrypt")
 	cmd.Stdin = strings.NewReader(string(encryptedData))
 
@@ -356,5 +384,8 @@ func gpgDecryptDefault(encryptedData []byte) ([]byte, error) {
 		return nil, fmt.Errorf("GPG decryption failed: %w", err)
 	}
 
-	return output, nil
+	// Create a secure buffer for the decrypted data
+	outputBuffer := memguard.NewBufferFromBytes(output)
+
+	return outputBuffer, nil
 }

internal/secret/secret.go

@@ -1,6 +1,7 @@
 package secret
 
 import (
+	"encoding/json"
 	"fmt"
 	"log/slog"
 	"os"
@@ -10,24 +11,25 @@ import (
 
 	"filippo.io/age"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 )
 
 // VaultInterface defines the interface that vault implementations must satisfy
 type VaultInterface interface {
 	GetDirectory() (string, error)
-	AddSecret(name string, value []byte, force bool) error
+	AddSecret(name string, value *memguard.LockedBuffer, force bool) error
 	GetName() string
 	GetFilesystem() afero.Fs
 	GetCurrentUnlocker() (Unlocker, error)
-	CreatePassphraseUnlocker(passphrase string) (*PassphraseUnlocker, error)
+	CreatePassphraseUnlocker(passphrase *memguard.LockedBuffer) (*PassphraseUnlocker, error)
 }
 
 // Secret represents a secret in a vault
 type Secret struct {
 	Name      string
 	Directory string
-	Metadata  SecretMetadata
+	Metadata  Metadata
 	vault     VaultInterface
 }
 
@@ -53,36 +55,15 @@ func NewSecret(vault VaultInterface, name string) *Secret {
 		Name:      name,
 		Directory: secretDir,
 		vault:     vault,
-		Metadata: SecretMetadata{
+		Metadata: Metadata{
-			Name:      name,
 			CreatedAt: time.Now(),
 			UpdatedAt: time.Now(),
 		},
 	}
 }
 
-// Save is deprecated - use vault.AddSecret directly which creates versions
-// Kept for backward compatibility
-func (s *Secret) Save(value []byte, force bool) error {
-	DebugWith("Saving secret (deprecated method)",
-		slog.String("secret_name", s.Name),
-		slog.String("vault_name", s.vault.GetName()),
-		slog.Int("value_length", len(value)),
-		slog.Bool("force", force),
-	)
-
-	err := s.vault.AddSecret(s.Name, value, force)
-	if err != nil {
-		Debug("Failed to save secret", "error", err, "secret_name", s.Name)
-		return err
-	}
-
-	Debug("Successfully saved secret", "secret_name", s.Name)
-	return nil
-}
-
 // GetValue retrieves and decrypts the current version's value using the provided unlocker
-func (s *Secret) GetValue(unlocker Unlocker) ([]byte, error) {
+func (s *Secret) GetValue(unlocker Unlocker) (*memguard.LockedBuffer, error) {
 	DebugWith("Getting secret value",
 		slog.String("secret_name", s.Name),
 		slog.String("vault_name", s.vault.GetName()),
@@ -92,10 +73,12 @@ func (s *Secret) GetValue(unlocker Unlocker) ([]byte, error) {
 	exists, err := s.Exists()
 	if err != nil {
 		Debug("Failed to check if secret exists during GetValue", "error", err, "secret_name", s.Name)
+
 		return nil, fmt.Errorf("failed to check if secret exists: %w", err)
 	}
 	if !exists {
 		Debug("Secret not found during GetValue", "secret_name", s.Name, "vault_name", s.vault.GetName())
+
 		return nil, fmt.Errorf("secret %s not found", s.Name)
 	}
 
@@ -105,20 +88,52 @@ func (s *Secret) GetValue(unlocker Unlocker) ([]byte, error) {
 	currentVersion, err := GetCurrentVersion(s.vault.GetFilesystem(), s.Directory)
 	if err != nil {
 		Debug("Failed to get current version", "error", err, "secret_name", s.Name)
+
 		return nil, fmt.Errorf("failed to get current version: %w", err)
 	}
 
 	// Create version object
-	version := NewSecretVersion(s.vault, s.Name, currentVersion)
+	version := NewVersion(s.vault, s.Name, currentVersion)
 
 	// Check if we have SB_SECRET_MNEMONIC environment variable for direct decryption
 	if envMnemonic := os.Getenv(EnvMnemonic); envMnemonic != "" {
 		Debug("Using mnemonic from environment for direct long-term key derivation", "secret_name", s.Name)
 
-		// Use mnemonic directly to derive long-term key
+		// Get vault directory to read metadata
-		ltIdentity, err := agehd.DeriveIdentity(envMnemonic, 0)
+		vaultDir, err := s.vault.GetDirectory()
+		if err != nil {
+			Debug("Failed to get vault directory", "error", err, "secret_name", s.Name)
+
+			return nil, fmt.Errorf("failed to get vault directory: %w", err)
+		}
+
+		// Load vault metadata to get the correct derivation index
+		metadataPath := filepath.Join(vaultDir, "vault-metadata.json")
+		metadataBytes, err := afero.ReadFile(s.vault.GetFilesystem(), metadataPath)
+		if err != nil {
+			Debug("Failed to read vault metadata", "error", err, "path", metadataPath)
+
+			return nil, fmt.Errorf("failed to read vault metadata: %w", err)
+		}
+
+		var metadata VaultMetadata
+		if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
+			Debug("Failed to parse vault metadata", "error", err, "secret_name", s.Name)
+
+			return nil, fmt.Errorf("failed to parse vault metadata: %w", err)
+		}
+
+		DebugWith("Using vault derivation index from metadata",
+			slog.String("secret_name", s.Name),
+			slog.String("vault_name", s.vault.GetName()),
+			slog.Uint64("derivation_index", uint64(metadata.DerivationIndex)),
+		)
+
+		// Use mnemonic with the vault's derivation index from metadata
+		ltIdentity, err := agehd.DeriveIdentity(envMnemonic, metadata.DerivationIndex)
 		if err != nil {
 			Debug("Failed to derive long-term key from mnemonic for secret", "error", err, "secret_name", s.Name)
+
 			return nil, fmt.Errorf("failed to derive long-term key from mnemonic: %w", err)
 		}
 
@@ -133,6 +148,7 @@ func (s *Secret) GetValue(unlocker Unlocker) ([]byte, error) {
 	// Use the provided unlocker to get the vault's long-term private key
 	if unlocker == nil {
 		Debug("No unlocker provided for secret decryption", "secret_name", s.Name)
+
 		return nil, fmt.Errorf("unlocker required to decrypt secret")
 	}
 
@@ -146,6 +162,7 @@ func (s *Secret) GetValue(unlocker Unlocker) ([]byte, error) {
 	unlockIdentity, err := unlocker.GetIdentity()
 	if err != nil {
 		Debug("Failed to get unlocker identity", "error", err, "secret_name", s.Name, "unlocker_type", unlocker.GetType())
+
 		return nil, fmt.Errorf("failed to get unlocker identity: %w", err)
 	}
 
@@ -156,22 +173,26 @@ func (s *Secret) GetValue(unlocker Unlocker) ([]byte, error) {
 	encryptedLtPrivKey, err := afero.ReadFile(s.vault.GetFilesystem(), encryptedLtPrivKeyPath)
 	if err != nil {
 		Debug("Failed to read encrypted long-term private key", "error", err, "path", encryptedLtPrivKeyPath)
+
 		return nil, fmt.Errorf("failed to read encrypted long-term private key: %w", err)
 	}
 
 	// Decrypt the encrypted long-term private key using the unlocker
 	Debug("Decrypting long-term private key using unlocker", "secret_name", s.Name)
-	ltPrivKeyData, err := DecryptWithIdentity(encryptedLtPrivKey, unlockIdentity)
+	ltPrivKeyBuffer, err := DecryptWithIdentity(encryptedLtPrivKey, unlockIdentity)
 	if err != nil {
 		Debug("Failed to decrypt long-term private key", "error", err, "secret_name", s.Name)
+
 		return nil, fmt.Errorf("failed to decrypt long-term private key: %w", err)
 	}
+	defer ltPrivKeyBuffer.Destroy()
 
 	// Parse the long-term private key
 	Debug("Parsing long-term private key", "secret_name", s.Name)
-	ltIdentity, err := age.ParseX25519Identity(string(ltPrivKeyData))
+	ltIdentity, err := age.ParseX25519Identity(ltPrivKeyBuffer.String())
 	if err != nil {
 		Debug("Failed to parse long-term private key", "error", err, "secret_name", s.Name)
+
 		return nil, fmt.Errorf("failed to parse long-term private key: %w", err)
 	}
 
@@ -189,23 +210,25 @@ func (s *Secret) LoadMetadata() error {
 	Debug("LoadMetadata called but is deprecated in versioned model", "secret_name", s.Name)
 	// For backward compatibility, we'll populate with basic info
 	now := time.Now()
-	s.Metadata = SecretMetadata{
+	s.Metadata = Metadata{
-		Name:      s.Name,
 		CreatedAt: now,
 		UpdatedAt: now,
 	}
+
 	return nil
 }
 
 // GetMetadata returns the secret metadata (deprecated)
-func (s *Secret) GetMetadata() SecretMetadata {
+func (s *Secret) GetMetadata() Metadata {
 	Debug("GetMetadata called but is deprecated in versioned model", "secret_name", s.Name)
+
 	return s.Metadata
 }
 
 // GetEncryptedData is deprecated - data is now stored in versions
 func (s *Secret) GetEncryptedData() ([]byte, error) {
 	Debug("GetEncryptedData called but is deprecated in versioned model", "secret_name", s.Name)
+
 	return nil, fmt.Errorf("GetEncryptedData is deprecated - use version-specific methods")
 }
 
@@ -220,11 +243,13 @@ func (s *Secret) Exists() (bool, error) {
 	exists, err := afero.DirExists(s.vault.GetFilesystem(), s.Directory)
 	if err != nil {
 		Debug("Failed to check secret directory existence", "error", err, "secret_dir", s.Directory)
+
 		return false, err
 	}
 
 	if !exists {
 		Debug("Secret directory does not exist", "secret_dir", s.Directory)
+
 		return false, nil
 	}
 
@@ -232,6 +257,7 @@ func (s *Secret) Exists() (bool, error) {
 	_, err = GetCurrentVersion(s.vault.GetFilesystem(), s.Directory)
 	if err != nil {
 		Debug("No current version found", "error", err, "secret_name", s.Name)
+
 		return false, nil
 	}
 
@@ -252,11 +278,14 @@ func GetCurrentVault(fs afero.Fs, stateDir string) (VaultInterface, error) {
 	if getCurrentVaultFunc == nil {
 		return nil, fmt.Errorf("GetCurrentVault function not registered")
 	}
+
 	return getCurrentVaultFunc(fs, stateDir)
 }
 
 // getCurrentVaultFunc is a function variable that will be set by the vault package
 // to implement the actual GetCurrentVault functionality
+//
+//nolint:gochecknoglobals // Required to break import cycle
 var getCurrentVaultFunc func(fs afero.Fs, stateDir string) (VaultInterface, error)
 
 // RegisterGetCurrentVaultFunc allows the vault package to register its implementation

internal/secret/secret_test.go

@@ -1,6 +1,7 @@
 package secret
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -8,45 +9,101 @@ import (
 
 	"filippo.io/age"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
+	"github.com/stretchr/testify/require"
 )
 
 // MockVault is a test implementation of the VaultInterface
 type MockVault struct {
-	name       string
+	name            string
-	fs         afero.Fs
+	fs              afero.Fs
-	directory  string
+	directory       string
-	longTermID *age.X25519Identity
+	derivationIndex uint32
 }
 
 func (m *MockVault) GetDirectory() (string, error) {
 	return m.directory, nil
 }
 
-func (m *MockVault) AddSecret(name string, value []byte, force bool) error {
+func (m *MockVault) AddSecret(name string, value *memguard.LockedBuffer, _ bool) error {
-	// Create versioned structure for testing
+	// Create secret directory with proper storage name conversion
 	storageName := strings.ReplaceAll(name, "/", "%")
 	secretDir := filepath.Join(m.directory, "secrets.d", storageName)
+	if err := m.fs.MkdirAll(secretDir, 0o700); err != nil {
+		return err
+	}
 
-	// Generate version name
+	// Create version directory with proper path
-	versionName, err := GenerateVersionName(m.fs, secretDir)
+	versionName := "20240101.001" // Use a fixed version name for testing
+	versionDir := filepath.Join(secretDir, "versions", versionName)
+	if err := m.fs.MkdirAll(versionDir, 0o700); err != nil {
+		return err
+	}
+
+	// Read the vault's long-term public key
+	ltPubKeyPath := filepath.Join(m.directory, "pub.age")
+
+	// Derive long-term key using the vault's derivation index
+	mnemonic := os.Getenv(EnvMnemonic)
+	if mnemonic == "" {
+		return fmt.Errorf("SB_SECRET_MNEMONIC not set")
+	}
+
+	ltIdentity, err := agehd.DeriveIdentity(mnemonic, m.derivationIndex)
 	if err != nil {
 		return err
 	}
 
-	// Create version directory
+	// Write long-term public key if it doesn't exist
-	versionDir := filepath.Join(secretDir, "versions", versionName)
+	if _, err := m.fs.Stat(ltPubKeyPath); os.IsNotExist(err) {
-	if err := m.fs.MkdirAll(versionDir, DirPerms); err != nil {
+		pubKey := ltIdentity.Recipient().String()
+		if err := afero.WriteFile(m.fs, ltPubKeyPath, []byte(pubKey), 0o600); err != nil {
+			return err
+		}
+	}
+
+	// Generate version-specific keypair
+	versionIdentity, err := age.GenerateX25519Identity()
+	if err != nil {
 		return err
 	}
 
-	// Write encrypted value (simplified for testing)
+	// Write version public key
-	if err := afero.WriteFile(m.fs, filepath.Join(versionDir, "value.age"), value, FilePerms); err != nil {
+	pubKeyPath := filepath.Join(versionDir, "pub.age")
+	if err := afero.WriteFile(m.fs, pubKeyPath, []byte(versionIdentity.Recipient().String()), 0o600); err != nil {
 		return err
 	}
 
-	// Set current symlink
+	// Encrypt value to version's public key (value is already a LockedBuffer)
-	if err := SetCurrentVersion(m.fs, secretDir, versionName); err != nil {
+	encryptedValue, err := EncryptToRecipient(value, versionIdentity.Recipient())
+	if err != nil {
+		return err
+	}
+
+	// Write encrypted value
+	valuePath := filepath.Join(versionDir, "value.age")
+	if err := afero.WriteFile(m.fs, valuePath, encryptedValue, 0o600); err != nil {
+		return err
+	}
+
+	// Encrypt version private key to long-term public key
+	versionPrivKeyBuffer := memguard.NewBufferFromBytes([]byte(versionIdentity.String()))
+	defer versionPrivKeyBuffer.Destroy()
+	encryptedPrivKey, err := EncryptToRecipient(versionPrivKeyBuffer, ltIdentity.Recipient())
+	if err != nil {
+		return err
+	}
+
+	// Write encrypted version private key
+	privKeyPath := filepath.Join(versionDir, "priv.age")
+	if err := afero.WriteFile(m.fs, privKeyPath, encryptedPrivKey, 0o600); err != nil {
+		return err
+	}
+
+	// Create current file pointing to the version (just the version name)
+	currentLink := filepath.Join(secretDir, "current")
+	if err := afero.WriteFile(m.fs, currentLink, []byte(versionName), 0o600); err != nil {
 		return err
 	}
 
@@ -62,30 +119,20 @@ func (m *MockVault) GetFilesystem() afero.Fs {
 }
 
 func (m *MockVault) GetCurrentUnlocker() (Unlocker, error) {
-	return nil, nil // Not needed for this test
+	return nil, nil
 }
 
-func (m *MockVault) CreatePassphraseUnlocker(passphrase string) (*PassphraseUnlocker, error) {
+func (m *MockVault) CreatePassphraseUnlocker(_ *memguard.LockedBuffer) (*PassphraseUnlocker, error) {
-	return nil, nil // Not needed for this test
+	return nil, nil
 }
 
 func TestPerSecretKeyFunctionality(t *testing.T) {
 	// Create an in-memory filesystem for testing
 	fs := afero.NewMemMapFs()
 
-	// Set up test environment variables
-	oldMnemonic := os.Getenv(EnvMnemonic)
-	defer func() {
-		if oldMnemonic == "" {
-			os.Unsetenv(EnvMnemonic)
-		} else {
-			os.Setenv(EnvMnemonic, oldMnemonic)
-		}
-	}()
-
 	// Set test mnemonic for direct encryption/decryption
 	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
-	os.Setenv(EnvMnemonic, testMnemonic)
+	t.Setenv(EnvMnemonic, testMnemonic)
 
 	// Set up a test vault structure
 	baseDir := "/test-config/berlin.sneak.pkg.secret"
@@ -109,7 +156,7 @@ func TestPerSecretKeyFunctionality(t *testing.T) {
 		fs,
 		ltPubKeyPath,
 		[]byte(ltIdentity.Recipient().String()),
-		0600,
+		0o600,
 	)
 	if err != nil {
 		t.Fatalf("Failed to write long-term public key: %v", err)
@@ -124,19 +171,23 @@ func TestPerSecretKeyFunctionality(t *testing.T) {
 
 	// Create vault instance using the mock vault
 	vault := &MockVault{
-		name:       "test-vault",
+		name:            "test-vault",
-		fs:         fs,
+		fs:              fs,
-		directory:  vaultDir,
+		directory:       vaultDir,
-		longTermID: ltIdentity,
+		derivationIndex: 0,
 	}
 
 	// Test data
 	secretName := "test-secret"
 	secretValue := []byte("this is a test secret value")
 
+	// Create a secure buffer for the test value
+	valueBuffer := memguard.NewBufferFromBytes(secretValue)
+	defer valueBuffer.Destroy()
+
 	// Test AddSecret
 	t.Run("AddSecret", func(t *testing.T) {
-		err := vault.AddSecret(secretName, secretValue, false)
+		err := vault.AddSecret(secretName, valueBuffer, false)
 		if err != nil {
 			t.Fatalf("AddSecret failed: %v", err)
 		}
@@ -206,9 +257,10 @@ func isValidSecretName(name string) bool {
 	if name == "" {
 		return false
 	}
-	// Valid characters for secret names: lowercase letters, numbers, dash, dot, underscore, slash
+	// Valid characters for secret names: letters, numbers, dash, dot, underscore, slash
 	for _, char := range name {
 		if (char < 'a' || char > 'z') && // lowercase letters
+			(char < 'A' || char > 'Z') && // uppercase letters
 			(char < '0' || char > '9') && // numbers
 			char != '-' && // dash
 			char != '.' && // dot
@@ -217,6 +269,7 @@ func isValidSecretName(name string) bool {
 			return false
 		}
 	}
+
 	return true
 }
 
@@ -231,9 +284,11 @@ func TestSecretNameValidation(t *testing.T) {
 		{"valid/path/name", true},
 		{"123valid", true},
 		{"", false},
-		{"Invalid-Name", false}, // uppercase not allowed
+		{"Valid-Upper-Name", true}, // uppercase allowed
-		{"invalid name", false}, // space not allowed
+		{"2025-11-21-ber1app1-vaultik-test-bucket-AKI", true}, // real-world uppercase key ID
-		{"invalid@name", false}, // @ not allowed
+		{"MixedCase/Path/Name", true},                         // mixed case with path
+		{"invalid name", false},                               // space not allowed
+		{"invalid@name", false},                               // @ not allowed
 	}
 
 	for _, test := range tests {
@@ -250,3 +305,27 @@ func TestSecretNameValidation(t *testing.T) {
 		})
 	}
 }
+
+func TestSecretGetValueWithEnvMnemonicUsesVaultDerivationIndex(t *testing.T) {
+	// This test demonstrates the bug where GetValue uses hardcoded index 0
+	// instead of the vault's actual derivation index when using environment mnemonic
+
+	// Set up test mnemonic
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+	t.Setenv(EnvMnemonic, testMnemonic)
+
+	// Create temporary directory for vaults
+	fs := afero.NewOsFs()
+	tempDir, err := afero.TempDir(fs, "", "secret-test-")
+	require.NoError(t, err)
+	defer func() {
+		_ = fs.RemoveAll(tempDir)
+	}()
+
+	stateDir := filepath.Join(tempDir, ".secret")
+	require.NoError(t, fs.MkdirAll(stateDir, 0o700))
+
+	// This test is now in the integration test file where it can use real vaults
+	// The bug is demonstrated there - see test31EnvMnemonicUsesVaultDerivationIndex
+	t.Log("This test demonstrates the bug in the integration test file")
+}

internal/secret/seunlocker_darwin.go

@@ -0,0 +1,385 @@
+//go:build darwin
+// +build darwin
+
+package secret
+
+import (
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"os"
+	"path/filepath"
+	"time"
+
+	"filippo.io/age"
+	"git.eeqj.de/sneak/secret/internal/macse"
+	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
+	"github.com/spf13/afero"
+)
+
+const (
+	// seKeyLabelPrefix is the prefix for Secure Enclave CTK identity labels.
+	seKeyLabelPrefix = "berlin.sneak.app.secret.se"
+
+	// seUnlockerType is the metadata type string for Secure Enclave unlockers.
+	seUnlockerType = "secure-enclave"
+
+	// seLongtermFilename is the filename for the SE-encrypted vault long-term private key.
+	seLongtermFilename = "longterm.age.se"
+)
+
+// SecureEnclaveUnlockerMetadata extends UnlockerMetadata with SE-specific data.
+type SecureEnclaveUnlockerMetadata struct {
+	UnlockerMetadata
+	SEKeyLabel string `json:"seKeyLabel"`
+	SEKeyHash  string `json:"seKeyHash"`
+}
+
+// SecureEnclaveUnlocker represents a Secure Enclave-protected unlocker.
+type SecureEnclaveUnlocker struct {
+	Directory string
+	Metadata  UnlockerMetadata
+	fs        afero.Fs
+}
+
+// GetIdentity implements Unlocker interface for SE-based unlockers.
+// Decrypts the vault's long-term private key directly using the Secure Enclave.
+func (s *SecureEnclaveUnlocker) GetIdentity() (*age.X25519Identity, error) {
+	DebugWith("Getting SE unlocker identity",
+		slog.String("unlocker_id", s.GetID()),
+	)
+
+	// Get SE key label from metadata
+	seKeyLabel, _, err := s.getSEKeyInfo()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get SE key info: %w", err)
+	}
+
+	// Read ECIES-encrypted long-term private key from disk
+	encryptedPath := filepath.Join(s.Directory, seLongtermFilename)
+	encryptedData, err := afero.ReadFile(s.fs, encryptedPath)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to read SE-encrypted long-term key: %w",
+			err,
+		)
+	}
+
+	DebugWith("Read SE-encrypted long-term key",
+		slog.Int("encrypted_length", len(encryptedData)),
+	)
+
+	// Decrypt using the Secure Enclave (ECDH happens inside SE hardware)
+	decryptedData, err := macse.Decrypt(seKeyLabel, encryptedData)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to decrypt long-term key with SE: %w",
+			err,
+		)
+	}
+
+	// Parse the decrypted long-term private key
+	ltIdentity, err := age.ParseX25519Identity(string(decryptedData))
+
+	// Clear sensitive data immediately
+	for i := range decryptedData {
+		decryptedData[i] = 0
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to parse long-term private key: %w",
+			err,
+		)
+	}
+
+	DebugWith("Successfully decrypted long-term key via SE",
+		slog.String("unlocker_id", s.GetID()),
+	)
+
+	return ltIdentity, nil
+}
+
+// GetType implements Unlocker interface.
+func (s *SecureEnclaveUnlocker) GetType() string {
+	return seUnlockerType
+}
+
+// GetMetadata implements Unlocker interface.
+func (s *SecureEnclaveUnlocker) GetMetadata() UnlockerMetadata {
+	return s.Metadata
+}
+
+// GetDirectory implements Unlocker interface.
+func (s *SecureEnclaveUnlocker) GetDirectory() string {
+	return s.Directory
+}
+
+// GetID implements Unlocker interface.
+func (s *SecureEnclaveUnlocker) GetID() string {
+	hostname, err := os.Hostname()
+	if err != nil {
+		hostname = "unknown"
+	}
+
+	createdAt := s.Metadata.CreatedAt
+	timestamp := createdAt.Format("2006-01-02.15.04")
+
+	return fmt.Sprintf("%s-%s-%s", timestamp, hostname, seUnlockerType)
+}
+
+// Remove implements Unlocker interface.
+func (s *SecureEnclaveUnlocker) Remove() error {
+	_, seKeyHash, err := s.getSEKeyInfo()
+	if err != nil {
+		Debug("Failed to get SE key info during removal", "error", err)
+
+		return fmt.Errorf("failed to get SE key info: %w", err)
+	}
+
+	if seKeyHash != "" {
+		Debug("Deleting SE key", "hash", seKeyHash)
+		if err := macse.DeleteKey(seKeyHash); err != nil {
+			Debug("Failed to delete SE key", "error", err, "hash", seKeyHash)
+
+			return fmt.Errorf("failed to delete SE key: %w", err)
+		}
+	}
+
+	Debug("Removing SE unlocker directory", "directory", s.Directory)
+	if err := s.fs.RemoveAll(s.Directory); err != nil {
+		return fmt.Errorf("failed to remove SE unlocker directory: %w", err)
+	}
+
+	Debug("Successfully removed SE unlocker", "unlocker_id", s.GetID())
+
+	return nil
+}
+
+// getSEKeyInfo reads the SE key label and hash from metadata.
+func (s *SecureEnclaveUnlocker) getSEKeyInfo() (label string, hash string, err error) {
+	metadataPath := filepath.Join(s.Directory, "unlocker-metadata.json")
+	metadataData, err := afero.ReadFile(s.fs, metadataPath)
+	if err != nil {
+		return "", "", fmt.Errorf("failed to read SE metadata: %w", err)
+	}
+
+	var seMetadata SecureEnclaveUnlockerMetadata
+	if err := json.Unmarshal(metadataData, &seMetadata); err != nil {
+		return "", "", fmt.Errorf("failed to parse SE metadata: %w", err)
+	}
+
+	return seMetadata.SEKeyLabel, seMetadata.SEKeyHash, nil
+}
+
+// NewSecureEnclaveUnlocker creates a new SecureEnclaveUnlocker instance.
+func NewSecureEnclaveUnlocker(
+	fs afero.Fs,
+	directory string,
+	metadata UnlockerMetadata,
+) *SecureEnclaveUnlocker {
+	return &SecureEnclaveUnlocker{
+		Directory: directory,
+		Metadata:  metadata,
+		fs:        fs,
+	}
+}
+
+// generateSEKeyLabel generates a unique label for the SE CTK identity.
+func generateSEKeyLabel(vaultName string) (string, error) {
+	hostname, err := os.Hostname()
+	if err != nil {
+		return "", fmt.Errorf("failed to get hostname: %w", err)
+	}
+
+	enrollmentDate := time.Now().UTC().Format("2006-01-02")
+
+	return fmt.Sprintf(
+		"%s.%s-%s-%s",
+		seKeyLabelPrefix,
+		vaultName,
+		hostname,
+		enrollmentDate,
+	), nil
+}
+
+// CreateSecureEnclaveUnlocker creates a new SE unlocker.
+// The vault's long-term private key is encrypted directly by the Secure Enclave
+// using ECIES. No intermediate age keypair is used.
+func CreateSecureEnclaveUnlocker(
+	fs afero.Fs,
+	stateDir string,
+) (*SecureEnclaveUnlocker, error) {
+	if err := checkMacOSAvailable(); err != nil {
+		return nil, err
+	}
+
+	vault, err := GetCurrentVault(fs, stateDir)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get current vault: %w", err)
+	}
+
+	// Generate SE key label
+	seKeyLabel, err := generateSEKeyLabel(vault.GetName())
+	if err != nil {
+		return nil, fmt.Errorf("failed to generate SE key label: %w", err)
+	}
+
+	// Step 1: Create P-256 key in the Secure Enclave via sc_auth
+	Debug("Creating Secure Enclave key", "label", seKeyLabel)
+	_, seKeyHash, err := macse.CreateKey(seKeyLabel)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create SE key: %w", err)
+	}
+
+	Debug("Created SE key", "label", seKeyLabel, "hash", seKeyHash)
+
+	// Step 2: Get the vault's long-term private key
+	ltPrivKeyData, err := getLongTermKeyForSE(fs, vault)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to get long-term private key: %w",
+			err,
+		)
+	}
+	defer ltPrivKeyData.Destroy()
+
+	// Step 3: Encrypt the long-term key directly with the SE (ECIES)
+	encryptedLtKey, err := macse.Encrypt(seKeyLabel, ltPrivKeyData.Bytes())
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to encrypt long-term key with SE: %w",
+			err,
+		)
+	}
+
+	// Step 4: Create unlocker directory and write files
+	vaultDir, err := vault.GetDirectory()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get vault directory: %w", err)
+	}
+
+	unlockerDirName := fmt.Sprintf("se-%s", filepath.Base(seKeyLabel))
+	unlockerDir := filepath.Join(vaultDir, "unlockers.d", unlockerDirName)
+	if err := fs.MkdirAll(unlockerDir, DirPerms); err != nil {
+		return nil, fmt.Errorf(
+			"failed to create unlocker directory: %w",
+			err,
+		)
+	}
+
+	// Write SE-encrypted long-term key
+	ltKeyPath := filepath.Join(unlockerDir, seLongtermFilename)
+	if err := afero.WriteFile(fs, ltKeyPath, encryptedLtKey, FilePerms); err != nil {
+		return nil, fmt.Errorf(
+			"failed to write SE-encrypted long-term key: %w",
+			err,
+		)
+	}
+
+	// Write metadata
+	seMetadata := SecureEnclaveUnlockerMetadata{
+		UnlockerMetadata: UnlockerMetadata{
+			Type:      seUnlockerType,
+			CreatedAt: time.Now().UTC(),
+			Flags:     []string{seUnlockerType, "macos"},
+		},
+		SEKeyLabel: seKeyLabel,
+		SEKeyHash:  seKeyHash,
+	}
+
+	metadataBytes, err := json.MarshalIndent(seMetadata, "", "  ")
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal metadata: %w", err)
+	}
+
+	metadataPath := filepath.Join(unlockerDir, "unlocker-metadata.json")
+	if err := afero.WriteFile(fs, metadataPath, metadataBytes, FilePerms); err != nil {
+		return nil, fmt.Errorf("failed to write metadata: %w", err)
+	}
+
+	return &SecureEnclaveUnlocker{
+		Directory: unlockerDir,
+		Metadata:  seMetadata.UnlockerMetadata,
+		fs:        fs,
+	}, nil
+}
+
+// getLongTermKeyForSE retrieves the vault's long-term private key
+// either from the mnemonic env var or by unlocking via the current unlocker.
+func getLongTermKeyForSE(
+	fs afero.Fs,
+	vault VaultInterface,
+) (*memguard.LockedBuffer, error) {
+	envMnemonic := os.Getenv(EnvMnemonic)
+	if envMnemonic != "" {
+		// Read vault metadata to get the correct derivation index
+		vaultDir, err := vault.GetDirectory()
+		if err != nil {
+			return nil, fmt.Errorf("failed to get vault directory: %w", err)
+		}
+
+		metadataPath := filepath.Join(vaultDir, "vault-metadata.json")
+		metadataBytes, err := afero.ReadFile(fs, metadataPath)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read vault metadata: %w", err)
+		}
+
+		var metadata VaultMetadata
+		if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
+			return nil, fmt.Errorf("failed to parse vault metadata: %w", err)
+		}
+
+		// Use mnemonic with the vault's actual derivation index
+		ltIdentity, err := agehd.DeriveIdentity(
+			envMnemonic,
+			metadata.DerivationIndex,
+		)
+
+		if err != nil {
+			return nil, fmt.Errorf(
+				"failed to derive long-term key from mnemonic: %w",
+				err,
+			)
+		}
+
+		return memguard.NewBufferFromBytes([]byte(ltIdentity.String())), nil
+	}
+
+	currentUnlocker, err := vault.GetCurrentUnlocker()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get current unlocker: %w", err)
+	}
+
+	currentIdentity, err := currentUnlocker.GetIdentity()
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to get current unlocker identity: %w",
+			err,
+		)
+	}
+
+	// All unlocker types store longterm.age in their directory
+	longtermPath := filepath.Join(
+		currentUnlocker.GetDirectory(),
+		"longterm.age",
+	)
+	encryptedLtKey, err := afero.ReadFile(fs, longtermPath)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"failed to read encrypted long-term key: %w",
+			err,
+		)
+	}
+
+	ltPrivKeyBuffer, err := DecryptWithIdentity(
+		encryptedLtKey,
+		currentIdentity,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to decrypt long-term key: %w", err)
+	}
+
+	return ltPrivKeyBuffer, nil
+}

internal/secret/seunlocker_stub.go

@@ -0,0 +1,84 @@
+//go:build !darwin
+// +build !darwin
+
+package secret
+
+import (
+	"fmt"
+
+	"filippo.io/age"
+	"github.com/spf13/afero"
+)
+
+var errSENotSupported = fmt.Errorf(
+	"secure enclave unlockers are only supported on macOS",
+)
+
+// SecureEnclaveUnlockerMetadata is a stub for non-Darwin platforms.
+type SecureEnclaveUnlockerMetadata struct {
+	UnlockerMetadata
+	SEKeyLabel string `json:"seKeyLabel"`
+	SEKeyHash  string `json:"seKeyHash"`
+}
+
+// SecureEnclaveUnlocker is a stub for non-Darwin platforms.
+type SecureEnclaveUnlocker struct {
+	Directory string
+	Metadata  UnlockerMetadata
+	fs        afero.Fs
+}
+
+// GetIdentity returns an error on non-Darwin platforms.
+func (s *SecureEnclaveUnlocker) GetIdentity() (*age.X25519Identity, error) {
+	return nil, errSENotSupported
+}
+
+// GetType returns the unlocker type.
+func (s *SecureEnclaveUnlocker) GetType() string {
+	return "secure-enclave"
+}
+
+// GetMetadata returns the unlocker metadata.
+func (s *SecureEnclaveUnlocker) GetMetadata() UnlockerMetadata {
+	return s.Metadata
+}
+
+// GetDirectory returns the unlocker directory.
+func (s *SecureEnclaveUnlocker) GetDirectory() string {
+	return s.Directory
+}
+
+// GetID returns the unlocker ID.
+func (s *SecureEnclaveUnlocker) GetID() string {
+	return fmt.Sprintf(
+		"%s-secure-enclave",
+		s.Metadata.CreatedAt.Format("2006-01-02.15.04"),
+	)
+}
+
+// Remove returns an error on non-Darwin platforms.
+func (s *SecureEnclaveUnlocker) Remove() error {
+	return errSENotSupported
+}
+
+// NewSecureEnclaveUnlocker creates a stub SecureEnclaveUnlocker on non-Darwin platforms.
+// The returned instance's methods that require macOS functionality will return errors.
+func NewSecureEnclaveUnlocker(
+	fs afero.Fs,
+	directory string,
+	metadata UnlockerMetadata,
+) *SecureEnclaveUnlocker {
+	return &SecureEnclaveUnlocker{
+		Directory: directory,
+		Metadata:  metadata,
+		fs:        fs,
+	}
+}
+
+// CreateSecureEnclaveUnlocker returns an error on non-Darwin platforms.
+func CreateSecureEnclaveUnlocker(
+	_ afero.Fs,
+	_ string,
+) (*SecureEnclaveUnlocker, error) {
+	return nil, errSENotSupported
+}

internal/secret/seunlocker_stub_test.go

@@ -0,0 +1,90 @@
+//go:build !darwin
+// +build !darwin
+
+package secret
+
+import (
+	"testing"
+	"time"
+
+	"github.com/spf13/afero"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewSecureEnclaveUnlocker(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	dir := "/tmp/test-se-unlocker"
+	metadata := UnlockerMetadata{
+		Type:      "secure-enclave",
+		CreatedAt: time.Date(2026, 1, 15, 10, 30, 0, 0, time.UTC),
+		Flags:     []string{"secure-enclave", "macos"},
+	}
+
+	unlocker := NewSecureEnclaveUnlocker(fs, dir, metadata)
+	require.NotNil(t, unlocker, "NewSecureEnclaveUnlocker should return a valid instance")
+
+	// Test GetType returns correct type
+	assert.Equal(t, "secure-enclave", unlocker.GetType())
+
+	// Test GetMetadata returns the metadata we passed in
+	assert.Equal(t, metadata, unlocker.GetMetadata())
+
+	// Test GetDirectory returns the directory we passed in
+	assert.Equal(t, dir, unlocker.GetDirectory())
+
+	// Test GetID returns a formatted string with the creation timestamp
+	expectedID := "2026-01-15.10.30-secure-enclave"
+	assert.Equal(t, expectedID, unlocker.GetID())
+}
+
+func TestSecureEnclaveUnlockerGetIdentityReturnsError(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	metadata := UnlockerMetadata{
+		Type:      "secure-enclave",
+		CreatedAt: time.Now().UTC(),
+	}
+
+	unlocker := NewSecureEnclaveUnlocker(fs, "/tmp/test", metadata)
+
+	identity, err := unlocker.GetIdentity()
+	assert.Nil(t, identity)
+	assert.Error(t, err)
+	assert.ErrorIs(t, err, errSENotSupported)
+}
+
+func TestSecureEnclaveUnlockerRemoveReturnsError(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	metadata := UnlockerMetadata{
+		Type:      "secure-enclave",
+		CreatedAt: time.Now().UTC(),
+	}
+
+	unlocker := NewSecureEnclaveUnlocker(fs, "/tmp/test", metadata)
+
+	err := unlocker.Remove()
+	assert.Error(t, err)
+	assert.ErrorIs(t, err, errSENotSupported)
+}
+
+func TestCreateSecureEnclaveUnlockerReturnsError(t *testing.T) {
+	fs := afero.NewMemMapFs()
+
+	unlocker, err := CreateSecureEnclaveUnlocker(fs, "/tmp/test")
+	assert.Nil(t, unlocker)
+	assert.Error(t, err)
+	assert.ErrorIs(t, err, errSENotSupported)
+}
+
+func TestSecureEnclaveUnlockerImplementsInterface(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	metadata := UnlockerMetadata{
+		Type:      "secure-enclave",
+		CreatedAt: time.Now().UTC(),
+	}
+
+	unlocker := NewSecureEnclaveUnlocker(fs, "/tmp/test", metadata)
+
+	// Verify the stub implements the Unlocker interface
+	var _ Unlocker = unlocker
+}

internal/secret/seunlocker_test.go

@@ -0,0 +1,101 @@
+//go:build darwin
+// +build darwin
+
+package secret
+
+import (
+	"testing"
+	"time"
+
+	"github.com/spf13/afero"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewSecureEnclaveUnlocker(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	dir := "/tmp/test-se-unlocker"
+	metadata := UnlockerMetadata{
+		Type:      "secure-enclave",
+		CreatedAt: time.Date(2026, 1, 15, 10, 30, 0, 0, time.UTC),
+		Flags:     []string{"secure-enclave", "macos"},
+	}
+
+	unlocker := NewSecureEnclaveUnlocker(fs, dir, metadata)
+	require.NotNil(t, unlocker, "NewSecureEnclaveUnlocker should return a valid instance")
+
+	// Test GetType returns correct type
+	assert.Equal(t, seUnlockerType, unlocker.GetType())
+
+	// Test GetMetadata returns the metadata we passed in
+	assert.Equal(t, metadata, unlocker.GetMetadata())
+
+	// Test GetDirectory returns the directory we passed in
+	assert.Equal(t, dir, unlocker.GetDirectory())
+}
+
+func TestSecureEnclaveUnlockerImplementsInterface(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	metadata := UnlockerMetadata{
+		Type:      "secure-enclave",
+		CreatedAt: time.Now().UTC(),
+	}
+
+	unlocker := NewSecureEnclaveUnlocker(fs, "/tmp/test", metadata)
+
+	// Verify the darwin implementation implements the Unlocker interface
+	var _ Unlocker = unlocker
+}
+
+func TestSecureEnclaveUnlockerGetIDFormat(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	metadata := UnlockerMetadata{
+		Type:      "secure-enclave",
+		CreatedAt: time.Date(2026, 3, 10, 14, 30, 0, 0, time.UTC),
+	}
+
+	unlocker := NewSecureEnclaveUnlocker(fs, "/tmp/test", metadata)
+	id := unlocker.GetID()
+
+	// ID should contain the timestamp and "secure-enclave" type
+	assert.Contains(t, id, "2026-03-10.14.30")
+	assert.Contains(t, id, seUnlockerType)
+}
+
+func TestGenerateSEKeyLabel(t *testing.T) {
+	label, err := generateSEKeyLabel("test-vault")
+	require.NoError(t, err)
+
+	// Label should contain the prefix and vault name
+	assert.Contains(t, label, seKeyLabelPrefix)
+	assert.Contains(t, label, "test-vault")
+}
+
+func TestSecureEnclaveUnlockerGetIdentityMissingFile(t *testing.T) {
+	fs := afero.NewMemMapFs()
+	dir := "/tmp/test-se-unlocker-missing"
+
+	// Create unlocker directory with metadata but no encrypted key file
+	require.NoError(t, fs.MkdirAll(dir, DirPerms))
+
+	metadataJSON := `{
+		"type": "secure-enclave",
+		"createdAt": "2026-01-15T10:30:00Z",
+		"seKeyLabel": "berlin.sneak.app.secret.se.test",
+		"seKeyHash": "abc123"
+	}`
+	require.NoError(t, afero.WriteFile(fs, dir+"/unlocker-metadata.json", []byte(metadataJSON), FilePerms))
+
+	metadata := UnlockerMetadata{
+		Type:      "secure-enclave",
+		CreatedAt: time.Date(2026, 1, 15, 10, 30, 0, 0, time.UTC),
+	}
+
+	unlocker := NewSecureEnclaveUnlocker(fs, dir, metadata)
+
+	// GetIdentity should fail because the encrypted longterm key file is missing
+	identity, err := unlocker.GetIdentity()
+	assert.Nil(t, identity)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "failed to read SE-encrypted long-term key")
+}

internal/secret/unlocker.go

@@ -10,7 +10,6 @@ type Unlocker interface {
 	GetType() string
 	GetMetadata() UnlockerMetadata
 	GetDirectory() string
-	GetID() string
+	GetID() string // Generate ID based on unlocker type and data
-	ID() string    // Generate ID from the unlocker's public key
 	Remove() error // Remove the unlocker and any associated resources
 }

internal/secret/validation_test.go

@@ -0,0 +1,297 @@
+package secret
+
+import (
+	"testing"
+)
+
+func TestValidateGPGKeyID(t *testing.T) {
+	tests := []struct {
+		name    string
+		keyID   string
+		wantErr bool
+	}{
+		// Valid cases
+		{
+			name:    "valid email address",
+			keyID:   "test@example.com",
+			wantErr: false,
+		},
+		{
+			name:    "valid email with dots and hyphens",
+			keyID:   "test.user-name@example-domain.co.uk",
+			wantErr: false,
+		},
+		{
+			name:    "valid email with plus",
+			keyID:   "test+tag@example.com",
+			wantErr: false,
+		},
+		{
+			name:    "valid short key ID (8 hex chars)",
+			keyID:   "ABCDEF12",
+			wantErr: false,
+		},
+		{
+			name:    "valid long key ID (16 hex chars)",
+			keyID:   "ABCDEF1234567890",
+			wantErr: false,
+		},
+		{
+			name:    "valid fingerprint (40 hex chars)",
+			keyID:   "ABCDEF1234567890ABCDEF1234567890ABCDEF12",
+			wantErr: false,
+		},
+		{
+			name:    "valid lowercase hex fingerprint",
+			keyID:   "abcdef1234567890abcdef1234567890abcdef12",
+			wantErr: false,
+		},
+		{
+			name:    "valid mixed case hex",
+			keyID:   "AbCdEf1234567890",
+			wantErr: false,
+		},
+
+		// Invalid cases
+		{
+			name:    "empty key ID",
+			keyID:   "",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with spaces",
+			keyID:   "test user@example.com",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with semicolon (command injection)",
+			keyID:   "test@example.com; rm -rf /",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with pipe (command injection)",
+			keyID:   "test@example.com | cat /etc/passwd",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with backticks (command injection)",
+			keyID:   "test@example.com`whoami`",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with dollar sign (command injection)",
+			keyID:   "test@example.com$(whoami)",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with quotes",
+			keyID:   "test\"@example.com",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with single quotes",
+			keyID:   "test'@example.com",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with backslash",
+			keyID:   "test\\@example.com",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with newline",
+			keyID:   "test@example.com\nrm -rf /",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with carriage return",
+			keyID:   "test@example.com\rrm -rf /",
+			wantErr: true,
+		},
+		{
+			name:    "hex with invalid length (7 chars)",
+			keyID:   "ABCDEF1",
+			wantErr: true,
+		},
+		{
+			name:    "hex with invalid length (9 chars)",
+			keyID:   "ABCDEF123",
+			wantErr: true,
+		},
+		{
+			name:    "hex with non-hex characters",
+			keyID:   "ABCDEFGH",
+			wantErr: true,
+		},
+		{
+			name:    "mixed format (email with hex)",
+			keyID:   "test@ABCDEF12",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with ampersand",
+			keyID:   "test@example.com & echo test",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with redirect",
+			keyID:   "test@example.com > /tmp/test",
+			wantErr: true,
+		},
+		{
+			name:    "key ID with null byte",
+			keyID:   "test@example.com\x00",
+			wantErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := validateGPGKeyID(tt.keyID)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("validateGPGKeyID() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestValidateKeychainItemName(t *testing.T) {
+	tests := []struct {
+		name     string
+		itemName string
+		wantErr  bool
+	}{
+		// Valid cases
+		{
+			name:     "valid simple name",
+			itemName: "my-secret-key",
+			wantErr:  false,
+		},
+		{
+			name:     "valid name with dots",
+			itemName: "com.example.app.key",
+			wantErr:  false,
+		},
+		{
+			name:     "valid name with underscores",
+			itemName: "my_secret_key_123",
+			wantErr:  false,
+		},
+		{
+			name:     "valid alphanumeric",
+			itemName: "Secret123Key",
+			wantErr:  false,
+		},
+		{
+			name:     "valid with hyphen at start",
+			itemName: "-my-key",
+			wantErr:  false,
+		},
+		{
+			name:     "valid with dot at start",
+			itemName: ".hidden-key",
+			wantErr:  false,
+		},
+
+		// Invalid cases
+		{
+			name:     "empty item name",
+			itemName: "",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with spaces",
+			itemName: "my secret key",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with semicolon",
+			itemName: "key;rm -rf /",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with pipe",
+			itemName: "key|cat /etc/passwd",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with backticks",
+			itemName: "key`whoami`",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with dollar sign",
+			itemName: "key$(whoami)",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with quotes",
+			itemName: "key\"name",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with single quotes",
+			itemName: "key'name",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with backslash",
+			itemName: "key\\name",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with newline",
+			itemName: "key\nname",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with carriage return",
+			itemName: "key\rname",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with ampersand",
+			itemName: "key&echo test",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with redirect",
+			itemName: "key>/tmp/test",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with null byte",
+			itemName: "key\x00name",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with parentheses",
+			itemName: "key(test)",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with brackets",
+			itemName: "key[test]",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with asterisk",
+			itemName: "key*",
+			wantErr:  true,
+		},
+		{
+			name:     "item name with question mark",
+			itemName: "key?",
+			wantErr:  true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := validateKeychainItemName(tt.itemName)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("validateKeychainItemName() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

internal/secret/version.go

@@ -4,29 +4,32 @@ import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
-	"os"
 	"path/filepath"
 	"sort"
 	"strings"
 	"time"
 
 	"filippo.io/age"
+	"github.com/awnumar/memguard"
 	"github.com/oklog/ulid/v2"
 	"github.com/spf13/afero"
 )
 
+const (
+	versionNameParts  = 2
+	maxVersionsPerDay = 999
+)
+
 // VersionMetadata contains information about a secret version
 type VersionMetadata struct {
-	ID         string     `json:"id"`                  // ULID
+	ID        string     `json:"id"`                  // ULID
-	SecretName string     `json:"secretName"`          // Parent secret name
+	CreatedAt *time.Time `json:"createdAt,omitempty"` // When version was created
-	CreatedAt  *time.Time `json:"createdAt,omitempty"` // When version was created
+	NotBefore *time.Time `json:"notBefore,omitempty"` // When this version becomes active
-	NotBefore  *time.Time `json:"notBefore,omitempty"` // When this version becomes active
+	NotAfter  *time.Time `json:"notAfter,omitempty"`  // When this version expires (nil = current)
-	NotAfter   *time.Time `json:"notAfter,omitempty"`  // When this version expires (nil = current)
-	Version    string     `json:"version"`             // Version string (e.g., "20231215.001")
 }
 
-// SecretVersion represents a version of a secret
+// Version represents a version of a secret
-type SecretVersion struct {
+type Version struct {
 	SecretName string
 	Version    string
 	Directory  string
@@ -34,8 +37,8 @@ type SecretVersion struct {
 	vault      VaultInterface
 }
 
-// NewSecretVersion creates a new SecretVersion instance
+// NewVersion creates a new Version instance
-func NewSecretVersion(vault VaultInterface, secretName string, version string) *SecretVersion {
+func NewVersion(vault VaultInterface, secretName string, version string) *Version {
 	DebugWith("Creating new secret version instance",
 		slog.String("secret_name", secretName),
 		slog.String("version", version),
@@ -53,16 +56,15 @@ func NewSecretVersion(vault VaultInterface, secretName string, version string) *
 	)
 
 	now := time.Now()
-	return &SecretVersion{
+
+	return &Version{
 		SecretName: secretName,
 		Version:    version,
 		Directory:  versionDir,
 		vault:      vault,
 		Metadata: VersionMetadata{
-			ID:         ulid.Make().String(),
+			ID:        ulid.Make().String(),
-			SecretName: secretName,
+			CreatedAt: &now,
-			CreatedAt:  &now,
-			Version:    version,
 		},
 	}
 }
@@ -87,23 +89,32 @@ func GenerateVersionName(fs afero.Fs, secretDir string) (string, error) {
 	prefix := today + "."
 
 	for _, entry := range entries {
-		if entry.IsDir() && strings.HasPrefix(entry.Name(), prefix) {
+		// Skip non-directories and those without correct prefix
-			// Extract serial number
+		if !entry.IsDir() || !strings.HasPrefix(entry.Name(), prefix) {
-			parts := strings.Split(entry.Name(), ".")
+			continue
-			if len(parts) == 2 {
+		}
-				var serial int
+
-				if _, err := fmt.Sscanf(parts[1], "%03d", &serial); err == nil {
+		// Extract serial number
-					if serial > maxSerial {
+		parts := strings.Split(entry.Name(), ".")
-						maxSerial = serial
+		if len(parts) != versionNameParts {
-					}
+			continue
-				}
+		}
-			}
+
+		var serial int
+		if _, err := fmt.Sscanf(parts[1], "%03d", &serial); err != nil {
+			Warn("Skipping malformed version directory name", "name", entry.Name(), "error", err)
+
+			continue
+		}
+
+		if serial > maxSerial {
+			maxSerial = serial
 		}
 	}
 
 	// Generate new version name
 	newSerial := maxSerial + 1
-	if newSerial > 999 {
+	if newSerial > maxVersionsPerDay {
 		return "", fmt.Errorf("exceeded maximum versions per day (999)")
 	}
 
@@ -111,11 +122,15 @@ func GenerateVersionName(fs afero.Fs, secretDir string) (string, error) {
 }
 
 // Save saves the version metadata and value
-func (sv *SecretVersion) Save(value []byte) error {
+func (sv *Version) Save(value *memguard.LockedBuffer) error {
+	if value == nil {
+		return fmt.Errorf("value buffer is nil")
+	}
+
 	DebugWith("Saving secret version",
 		slog.String("secret_name", sv.SecretName),
 		slog.String("version", sv.Version),
-		slog.Int("value_length", len(value)),
+		slog.Int("value_length", value.Size()),
 	)
 
 	fs := sv.vault.GetFilesystem()
@@ -123,6 +138,7 @@ func (sv *SecretVersion) Save(value []byte) error {
 	// Create version directory
 	if err := fs.MkdirAll(sv.Directory, DirPerms); err != nil {
 		Debug("Failed to create version directory", "error", err, "dir", sv.Directory)
+
 		return fmt.Errorf("failed to create version directory: %w", err)
 	}
 
@@ -131,11 +147,14 @@ func (sv *SecretVersion) Save(value []byte) error {
 	versionIdentity, err := age.GenerateX25519Identity()
 	if err != nil {
 		Debug("Failed to generate version keypair", "error", err, "version", sv.Version)
+
 		return fmt.Errorf("failed to generate version keypair: %w", err)
 	}
 
 	versionPublicKey := versionIdentity.Recipient().String()
-	versionPrivateKey := versionIdentity.String()
+	// Store private key in memguard buffer immediately
+	versionPrivateKeyBuffer := memguard.NewBufferFromBytes([]byte(versionIdentity.String()))
+	defer versionPrivateKeyBuffer.Destroy()
 
 	DebugWith("Generated version keypair",
 		slog.String("version", sv.Version),
@@ -147,6 +166,7 @@ func (sv *SecretVersion) Save(value []byte) error {
 	Debug("Writing version public key", "path", pubKeyPath)
 	if err := afero.WriteFile(fs, pubKeyPath, []byte(versionPublicKey), FilePerms); err != nil {
 		Debug("Failed to write version public key", "error", err, "path", pubKeyPath)
+
 		return fmt.Errorf("failed to write version public key: %w", err)
 	}
 
@@ -155,6 +175,7 @@ func (sv *SecretVersion) Save(value []byte) error {
 	encryptedValue, err := EncryptToRecipient(value, versionIdentity.Recipient())
 	if err != nil {
 		Debug("Failed to encrypt version value", "error", err, "version", sv.Version)
+
 		return fmt.Errorf("failed to encrypt version value: %w", err)
 	}
 
@@ -163,6 +184,7 @@ func (sv *SecretVersion) Save(value []byte) error {
 	Debug("Writing encrypted version value", "path", valuePath)
 	if err := afero.WriteFile(fs, valuePath, encryptedValue, FilePerms); err != nil {
 		Debug("Failed to write encrypted version value", "error", err, "path", valuePath)
+
 		return fmt.Errorf("failed to write encrypted version value: %w", err)
 	}
 
@@ -174,6 +196,7 @@ func (sv *SecretVersion) Save(value []byte) error {
 	ltPubKeyData, err := afero.ReadFile(fs, ltPubKeyPath)
 	if err != nil {
 		Debug("Failed to read long-term public key", "error", err, "path", ltPubKeyPath)
+
 		return fmt.Errorf("failed to read long-term public key: %w", err)
 	}
 
@@ -181,14 +204,16 @@ func (sv *SecretVersion) Save(value []byte) error {
 	ltRecipient, err := age.ParseX25519Recipient(string(ltPubKeyData))
 	if err != nil {
 		Debug("Failed to parse long-term public key", "error", err)
+
 		return fmt.Errorf("failed to parse long-term public key: %w", err)
 	}
 
 	// Step 6: Encrypt the version's private key to the long-term public key
 	Debug("Encrypting version private key to long-term public key", "version", sv.Version)
-	encryptedPrivKey, err := EncryptToRecipient([]byte(versionPrivateKey), ltRecipient)
+	encryptedPrivKey, err := EncryptToRecipient(versionPrivateKeyBuffer, ltRecipient)
 	if err != nil {
 		Debug("Failed to encrypt version private key", "error", err, "version", sv.Version)
+
 		return fmt.Errorf("failed to encrypt version private key: %w", err)
 	}
 
@@ -197,6 +222,7 @@ func (sv *SecretVersion) Save(value []byte) error {
 	Debug("Writing encrypted version private key", "path", privKeyPath)
 	if err := afero.WriteFile(fs, privKeyPath, encryptedPrivKey, FilePerms); err != nil {
 		Debug("Failed to write encrypted version private key", "error", err, "path", privKeyPath)
+
 		return fmt.Errorf("failed to write encrypted version private key: %w", err)
 	}
 
@@ -205,13 +231,18 @@ func (sv *SecretVersion) Save(value []byte) error {
 	metadataBytes, err := json.MarshalIndent(sv.Metadata, "", "  ")
 	if err != nil {
 		Debug("Failed to marshal version metadata", "error", err)
+
 		return fmt.Errorf("failed to marshal version metadata: %w", err)
 	}
 
 	// Encrypt metadata to the version's public key
-	encryptedMetadata, err := EncryptToRecipient(metadataBytes, versionIdentity.Recipient())
+	metadataBuffer := memguard.NewBufferFromBytes(metadataBytes)
+	defer metadataBuffer.Destroy()
+
+	encryptedMetadata, err := EncryptToRecipient(metadataBuffer, versionIdentity.Recipient())
 	if err != nil {
 		Debug("Failed to encrypt version metadata", "error", err, "version", sv.Version)
+
 		return fmt.Errorf("failed to encrypt version metadata: %w", err)
 	}
 
@@ -219,15 +250,17 @@ func (sv *SecretVersion) Save(value []byte) error {
 	Debug("Writing encrypted version metadata", "path", metadataPath)
 	if err := afero.WriteFile(fs, metadataPath, encryptedMetadata, FilePerms); err != nil {
 		Debug("Failed to write encrypted version metadata", "error", err, "path", metadataPath)
+
 		return fmt.Errorf("failed to write encrypted version metadata: %w", err)
 	}
 
 	Debug("Successfully saved secret version", "version", sv.Version, "secret_name", sv.SecretName)
+
 	return nil
 }
 
 // LoadMetadata loads and decrypts the version metadata
-func (sv *SecretVersion) LoadMetadata(ltIdentity *age.X25519Identity) error {
+func (sv *Version) LoadMetadata(ltIdentity *age.X25519Identity) error {
 	DebugWith("Loading version metadata",
 		slog.String("secret_name", sv.SecretName),
 		slog.String("version", sv.Version),
@@ -240,20 +273,24 @@ func (sv *SecretVersion) LoadMetadata(ltIdentity *age.X25519Identity) error {
 	encryptedPrivKey, err := afero.ReadFile(fs, encryptedPrivKeyPath)
 	if err != nil {
 		Debug("Failed to read encrypted version private key", "error", err, "path", encryptedPrivKeyPath)
+
 		return fmt.Errorf("failed to read encrypted version private key: %w", err)
 	}
 
 	// Step 2: Decrypt version private key using long-term key
-	versionPrivKeyData, err := DecryptWithIdentity(encryptedPrivKey, ltIdentity)
+	versionPrivKeyBuffer, err := DecryptWithIdentity(encryptedPrivKey, ltIdentity)
 	if err != nil {
 		Debug("Failed to decrypt version private key", "error", err, "version", sv.Version)
+
 		return fmt.Errorf("failed to decrypt version private key: %w", err)
 	}
+	defer versionPrivKeyBuffer.Destroy()
 
 	// Step 3: Parse version private key
-	versionIdentity, err := age.ParseX25519Identity(string(versionPrivKeyData))
+	versionIdentity, err := age.ParseX25519Identity(versionPrivKeyBuffer.String())
 	if err != nil {
 		Debug("Failed to parse version private key", "error", err, "version", sv.Version)
+
 		return fmt.Errorf("failed to parse version private key: %w", err)
 	}
 
@@ -262,76 +299,105 @@ func (sv *SecretVersion) LoadMetadata(ltIdentity *age.X25519Identity) error {
 	encryptedMetadata, err := afero.ReadFile(fs, encryptedMetadataPath)
 	if err != nil {
 		Debug("Failed to read encrypted version metadata", "error", err, "path", encryptedMetadataPath)
+
 		return fmt.Errorf("failed to read encrypted version metadata: %w", err)
 	}
 
 	// Step 5: Decrypt metadata using version key
-	metadataBytes, err := DecryptWithIdentity(encryptedMetadata, versionIdentity)
+	metadataBuffer, err := DecryptWithIdentity(encryptedMetadata, versionIdentity)
 	if err != nil {
 		Debug("Failed to decrypt version metadata", "error", err, "version", sv.Version)
+
 		return fmt.Errorf("failed to decrypt version metadata: %w", err)
 	}
+	defer metadataBuffer.Destroy()
 
 	// Step 6: Unmarshal metadata
 	var metadata VersionMetadata
-	if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
+	if err := json.Unmarshal(metadataBuffer.Bytes(), &metadata); err != nil {
 		Debug("Failed to unmarshal version metadata", "error", err, "version", sv.Version)
+
 		return fmt.Errorf("failed to unmarshal version metadata: %w", err)
 	}
 
 	sv.Metadata = metadata
 	Debug("Successfully loaded version metadata", "version", sv.Version)
+
 	return nil
 }
 
 // GetValue retrieves and decrypts the version value
-func (sv *SecretVersion) GetValue(ltIdentity *age.X25519Identity) ([]byte, error) {
+func (sv *Version) GetValue(ltIdentity *age.X25519Identity) (*memguard.LockedBuffer, error) {
 	DebugWith("Getting version value",
 		slog.String("secret_name", sv.SecretName),
 		slog.String("version", sv.Version),
 	)
 
+	// Debug: Log the directory and long-term key info
+	Debug("SecretVersion GetValue debug info",
+		"secret_name", sv.SecretName,
+		"version", sv.Version,
+		"directory", sv.Directory,
+		"lt_identity_public_key", ltIdentity.Recipient().String())
+
 	fs := sv.vault.GetFilesystem()
 
 	// Step 1: Read encrypted version private key
 	encryptedPrivKeyPath := filepath.Join(sv.Directory, "priv.age")
+	Debug("Reading encrypted version private key", "path", encryptedPrivKeyPath)
 	encryptedPrivKey, err := afero.ReadFile(fs, encryptedPrivKeyPath)
 	if err != nil {
 		Debug("Failed to read encrypted version private key", "error", err, "path", encryptedPrivKeyPath)
+
 		return nil, fmt.Errorf("failed to read encrypted version private key: %w", err)
 	}
+	Debug("Successfully read encrypted version private key", "path", encryptedPrivKeyPath, "size", len(encryptedPrivKey))
 
 	// Step 2: Decrypt version private key using long-term key
-	versionPrivKeyData, err := DecryptWithIdentity(encryptedPrivKey, ltIdentity)
+	Debug("Decrypting version private key with long-term identity", "version", sv.Version)
+	versionPrivKeyBuffer, err := DecryptWithIdentity(encryptedPrivKey, ltIdentity)
 	if err != nil {
 		Debug("Failed to decrypt version private key", "error", err, "version", sv.Version)
+
 		return nil, fmt.Errorf("failed to decrypt version private key: %w", err)
 	}
+	defer versionPrivKeyBuffer.Destroy()
+	Debug("Successfully decrypted version private key", "version", sv.Version, "size", versionPrivKeyBuffer.Size())
 
 	// Step 3: Parse version private key
-	versionIdentity, err := age.ParseX25519Identity(string(versionPrivKeyData))
+	versionIdentity, err := age.ParseX25519Identity(versionPrivKeyBuffer.String())
 	if err != nil {
 		Debug("Failed to parse version private key", "error", err, "version", sv.Version)
+
 		return nil, fmt.Errorf("failed to parse version private key: %w", err)
 	}
 
 	// Step 4: Read encrypted value
 	encryptedValuePath := filepath.Join(sv.Directory, "value.age")
+	Debug("Reading encrypted value", "path", encryptedValuePath)
 	encryptedValue, err := afero.ReadFile(fs, encryptedValuePath)
 	if err != nil {
 		Debug("Failed to read encrypted version value", "error", err, "path", encryptedValuePath)
+
 		return nil, fmt.Errorf("failed to read encrypted version value: %w", err)
 	}
+	Debug("Successfully read encrypted value", "path", encryptedValuePath, "size", len(encryptedValue))
 
 	// Step 5: Decrypt value using version key
-	value, err := DecryptWithIdentity(encryptedValue, versionIdentity)
+	Debug("Decrypting value with version identity", "version", sv.Version)
+	valueBuffer, err := DecryptWithIdentity(encryptedValue, versionIdentity)
 	if err != nil {
 		Debug("Failed to decrypt version value", "error", err, "version", sv.Version)
+
 		return nil, fmt.Errorf("failed to decrypt version value: %w", err)
 	}
 
-	Debug("Successfully retrieved version value", "version", sv.Version, "value_length", len(value))
+	Debug("Successfully retrieved version value",
-	return value, nil
+		"version", sv.Version,
+		"value_length", valueBuffer.Size(),
+		"is_empty", valueBuffer.Size() == 0)
+
+	return valueBuffer, nil
 }
 
 // ListVersions lists all versions of a secret
@@ -366,58 +432,32 @@ func ListVersions(fs afero.Fs, secretDir string) ([]string, error) {
 	return versions, nil
 }
 
-// GetCurrentVersion returns the version that the "current" symlink points to
+// GetCurrentVersion returns the version that the "current" file points to
+// The file contains just the version name (e.g., "20231215.001")
 func GetCurrentVersion(fs afero.Fs, secretDir string) (string, error) {
 	currentPath := filepath.Join(secretDir, "current")
 
-	// Try to read as a real symlink first
-	if _, ok := fs.(*afero.OsFs); ok {
-		target, err := os.Readlink(currentPath)
-		if err == nil {
-			// Extract version from path (e.g., "versions/20231215.001" -> "20231215.001")
-			parts := strings.Split(target, "/")
-			if len(parts) >= 2 && parts[0] == "versions" {
-				return parts[1], nil
-			}
-			return "", fmt.Errorf("invalid current version symlink format: %s", target)
-		}
-	}
-
-	// Fall back to reading as a file (for MemMapFs testing)
 	fileData, err := afero.ReadFile(fs, currentPath)
 	if err != nil {
-		return "", fmt.Errorf("failed to read current version symlink: %w", err)
+		return "", fmt.Errorf("failed to read current version file: %w", err)
 	}
 
-	target := strings.TrimSpace(string(fileData))
+	version := strings.TrimSpace(string(fileData))
 
-	// Extract version from path
+	return version, nil
-	parts := strings.Split(target, "/")
-	if len(parts) >= 2 && parts[0] == "versions" {
-		return parts[1], nil
-	}
-
-	return "", fmt.Errorf("invalid current version symlink format: %s", target)
 }
 
-// SetCurrentVersion updates the "current" symlink to point to a specific version
+// SetCurrentVersion updates the "current" file to point to a specific version
+// The file contains just the version name (e.g., "20231215.001")
 func SetCurrentVersion(fs afero.Fs, secretDir string, version string) error {
 	currentPath := filepath.Join(secretDir, "current")
-	targetPath := filepath.Join("versions", version)
 
-	// Remove existing symlink if it exists
+	// Remove existing file if it exists
 	_ = fs.Remove(currentPath)
 
-	// Try to create a real symlink first (works on Unix systems)
+	// Write just the version name to the file
-	if _, ok := fs.(*afero.OsFs); ok {
+	if err := afero.WriteFile(fs, currentPath, []byte(version), FilePerms); err != nil {
-		if err := os.Symlink(targetPath, currentPath); err == nil {
+		return fmt.Errorf("failed to create current version file: %w", err)
-			return nil
-		}
-	}
-
-	// Fall back to creating a file with the target path (for MemMapFs testing)
-	if err := afero.WriteFile(fs, currentPath, []byte(targetPath), FilePerms); err != nil {
-		return fmt.Errorf("failed to create current version symlink: %w", err)
 	}
 
 	return nil

internal/secret/version_test.go

@@ -1,3 +1,37 @@
+// Version Support Test Suite Documentation
+//
+// This file contains core unit tests for version functionality:
+//
+// - TestGenerateVersionName: Tests version name generation with date and serial format
+// - TestGenerateVersionNameMaxSerial: Tests the 999 versions per day limit
+// - TestNewVersion: Tests secret version object creation
+// - TestSecretVersionSave: Tests saving a version with encryption
+// - TestSecretVersionLoadMetadata: Tests loading and decrypting version metadata
+// - TestSecretVersionGetValue: Tests retrieving and decrypting version values
+// - TestListVersions: Tests listing versions in reverse chronological order
+// - TestGetCurrentVersion: Tests retrieving the current version via symlink
+// - TestSetCurrentVersion: Tests updating the current version symlink
+// - TestVersionMetadataTimestamps: Tests timestamp pointer consistency
+//
+// Key Test Scenarios:
+// - Version Creation: First version gets notBefore = epoch + 1 second
+// - Subsequent versions update previous version's notAfter timestamp
+// - New version's notBefore equals previous version's notAfter
+// - Version names follow YYYYMMDD.NNN format
+// - Maximum 999 versions per day enforced
+//
+// Version Retrieval:
+// - Get current version via symlink
+// - Get specific version by name
+// - Empty version parameter returns current
+// - Non-existent versions return appropriate errors
+//
+// Data Integrity:
+// - Each version has independent encryption keys
+// - Metadata encryption protects version history
+// - Long-term key required for all operations
+// - Concurrent reads handled safely
+
 package secret
 
 import (
@@ -7,6 +41,7 @@ import (
 	"time"
 
 	"filippo.io/age"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -24,7 +59,7 @@ func (m *MockVersionVault) GetDirectory() (string, error) {
 	return filepath.Join(m.stateDir, "vaults.d", m.Name), nil
 }
 
-func (m *MockVersionVault) AddSecret(name string, value []byte, force bool) error {
+func (m *MockVersionVault) AddSecret(_ string, _ *memguard.LockedBuffer, _ bool) error {
 	return fmt.Errorf("not implemented in mock")
 }
 
@@ -40,7 +75,7 @@ func (m *MockVersionVault) GetCurrentUnlocker() (Unlocker, error) {
 	return nil, fmt.Errorf("not implemented in mock")
 }
 
-func (m *MockVersionVault) CreatePassphraseUnlocker(passphrase string) (*PassphraseUnlocker, error) {
+func (m *MockVersionVault) CreatePassphraseUnlocker(_ *memguard.LockedBuffer) (*PassphraseUnlocker, error) {
 	return nil, fmt.Errorf("not implemented in mock")
 }
 
@@ -55,7 +90,7 @@ func TestGenerateVersionName(t *testing.T) {
 
 	// Create the version directory
 	versionDir := filepath.Join(secretDir, "versions", version1)
-	err = fs.MkdirAll(versionDir, 0755)
+	err = fs.MkdirAll(versionDir, 0o755)
 	require.NoError(t, err)
 
 	// Test second version generation on same day
@@ -77,7 +112,7 @@ func TestGenerateVersionNameMaxSerial(t *testing.T) {
 	today := time.Now().Format("20060102")
 	for i := 1; i <= 999; i++ {
 		versionName := fmt.Sprintf("%s.%03d", today, i)
-		err := fs.MkdirAll(filepath.Join(versionsDir, versionName), 0755)
+		err := fs.MkdirAll(filepath.Join(versionsDir, versionName), 0o755)
 		require.NoError(t, err)
 	}
 
@@ -87,7 +122,7 @@ func TestGenerateVersionNameMaxSerial(t *testing.T) {
 	assert.Contains(t, err.Error(), "exceeded maximum versions per day")
 }
 
-func TestNewSecretVersion(t *testing.T) {
+func TestNewVersion(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	vault := &MockVersionVault{
 		Name:     "test",
@@ -95,14 +130,13 @@ func TestNewSecretVersion(t *testing.T) {
 		stateDir: "/test",
 	}
 
-	sv := NewSecretVersion(vault, "test/secret", "20231215.001")
+	sv := NewVersion(vault, "test/secret", "20231215.001")
 
 	assert.Equal(t, "test/secret", sv.SecretName)
 	assert.Equal(t, "20231215.001", sv.Version)
 	assert.Contains(t, sv.Directory, "test%secret/versions/20231215.001")
 	assert.NotEmpty(t, sv.Metadata.ID)
 	assert.NotNil(t, sv.Metadata.CreatedAt)
-	assert.Equal(t, "20231215.001", sv.Metadata.Version)
 }
 
 func TestSecretVersionSave(t *testing.T) {
@@ -115,7 +149,7 @@ func TestSecretVersionSave(t *testing.T) {
 
 	// Create vault directory structure and long-term key
 	vaultDir, _ := vault.GetDirectory()
-	err := fs.MkdirAll(vaultDir, 0755)
+	err := fs.MkdirAll(vaultDir, 0o755)
 	require.NoError(t, err)
 
 	// Generate and store long-term public key
@@ -124,14 +158,16 @@ func TestSecretVersionSave(t *testing.T) {
 	vault.longTermKey = ltIdentity
 
 	ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
-	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0600)
+	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0o600)
 	require.NoError(t, err)
 
 	// Create and save a version
-	sv := NewSecretVersion(vault, "test/secret", "20231215.001")
+	sv := NewVersion(vault, "test/secret", "20231215.001")
 	testValue := []byte("test-secret-value")
 
-	err = sv.Save(testValue)
+	testBuffer := memguard.NewBufferFromBytes(testValue)
+	defer testBuffer.Destroy()
+	err = sv.Save(testBuffer)
 	require.NoError(t, err)
 
 	// Verify files were created
@@ -151,7 +187,7 @@ func TestSecretVersionLoadMetadata(t *testing.T) {
 
 	// Setup vault with long-term key
 	vaultDir, _ := vault.GetDirectory()
-	err := fs.MkdirAll(vaultDir, 0755)
+	err := fs.MkdirAll(vaultDir, 0o755)
 	require.NoError(t, err)
 
 	ltIdentity, err := age.GenerateX25519Identity()
@@ -159,28 +195,28 @@ func TestSecretVersionLoadMetadata(t *testing.T) {
 	vault.longTermKey = ltIdentity
 
 	ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
-	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0600)
+	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0o600)
 	require.NoError(t, err)
 
 	// Create and save a version with custom metadata
-	sv := NewSecretVersion(vault, "test/secret", "20231215.001")
+	sv := NewVersion(vault, "test/secret", "20231215.001")
 	now := time.Now()
 	epochPlusOne := time.Unix(1, 0)
 	sv.Metadata.NotBefore = &epochPlusOne
 	sv.Metadata.NotAfter = &now
 
-	err = sv.Save([]byte("test-value"))
+	testBuffer := memguard.NewBufferFromBytes([]byte("test-value"))
+	defer testBuffer.Destroy()
+	err = sv.Save(testBuffer)
 	require.NoError(t, err)
 
 	// Create new version object and load metadata
-	sv2 := NewSecretVersion(vault, "test/secret", "20231215.001")
+	sv2 := NewVersion(vault, "test/secret", "20231215.001")
 	err = sv2.LoadMetadata(ltIdentity)
 	require.NoError(t, err)
 
 	// Verify loaded metadata
 	assert.Equal(t, sv.Metadata.ID, sv2.Metadata.ID)
-	assert.Equal(t, sv.Metadata.SecretName, sv2.Metadata.SecretName)
-	assert.Equal(t, sv.Metadata.Version, sv2.Metadata.Version)
 	assert.NotNil(t, sv2.Metadata.NotBefore)
 	assert.Equal(t, epochPlusOne.Unix(), sv2.Metadata.NotBefore.Unix())
 	assert.NotNil(t, sv2.Metadata.NotAfter)
@@ -196,7 +232,7 @@ func TestSecretVersionGetValue(t *testing.T) {
 
 	// Setup vault with long-term key
 	vaultDir, _ := vault.GetDirectory()
-	err := fs.MkdirAll(vaultDir, 0755)
+	err := fs.MkdirAll(vaultDir, 0o755)
 	require.NoError(t, err)
 
 	ltIdentity, err := age.GenerateX25519Identity()
@@ -204,21 +240,26 @@ func TestSecretVersionGetValue(t *testing.T) {
 	vault.longTermKey = ltIdentity
 
 	ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
-	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0600)
+	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0o600)
 	require.NoError(t, err)
 
 	// Create and save a version
-	sv := NewSecretVersion(vault, "test/secret", "20231215.001")
+	sv := NewVersion(vault, "test/secret", "20231215.001")
 	originalValue := []byte("test-secret-value-12345")
+	expectedValue := make([]byte, len(originalValue))
+	copy(expectedValue, originalValue)
 
-	err = sv.Save(originalValue)
+	originalBuffer := memguard.NewBufferFromBytes(originalValue)
+	defer originalBuffer.Destroy()
+	err = sv.Save(originalBuffer)
 	require.NoError(t, err)
 
 	// Retrieve the value
-	retrievedValue, err := sv.GetValue(ltIdentity)
+	retrievedBuffer, err := sv.GetValue(ltIdentity)
 	require.NoError(t, err)
+	defer retrievedBuffer.Destroy()
 
-	assert.Equal(t, originalValue, retrievedValue)
+	assert.Equal(t, expectedValue, retrievedBuffer.Bytes())
 }
 
 func TestListVersions(t *testing.T) {
@@ -234,12 +275,12 @@ func TestListVersions(t *testing.T) {
 	// Create some versions
 	testVersions := []string{"20231215.001", "20231215.002", "20231216.001", "20231214.001"}
 	for _, v := range testVersions {
-		err := fs.MkdirAll(filepath.Join(versionsDir, v), 0755)
+		err := fs.MkdirAll(filepath.Join(versionsDir, v), 0o755)
 		require.NoError(t, err)
 	}
 
 	// Create a file (not directory) that should be ignored
-	err = afero.WriteFile(fs, filepath.Join(versionsDir, "ignore.txt"), []byte("test"), 0600)
+	err = afero.WriteFile(fs, filepath.Join(versionsDir, "ignore.txt"), []byte("test"), 0o600)
 	require.NoError(t, err)
 
 	// List versions
@@ -255,12 +296,12 @@ func TestGetCurrentVersion(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	secretDir := "/test/secret"
 
-	// Simulate symlink with file content (works for both OsFs and MemMapFs)
+	// The current file contains just the version name
 	currentPath := filepath.Join(secretDir, "current")
-	err := fs.MkdirAll(secretDir, 0755)
+	err := fs.MkdirAll(secretDir, 0o755)
 	require.NoError(t, err)
 
-	err = afero.WriteFile(fs, currentPath, []byte("versions/20231216.001"), 0600)
+	err = afero.WriteFile(fs, currentPath, []byte("20231216.001"), 0o600)
 	require.NoError(t, err)
 
 	version, err := GetCurrentVersion(fs, secretDir)
@@ -272,7 +313,7 @@ func TestSetCurrentVersion(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	secretDir := "/test/secret"
 
-	err := fs.MkdirAll(secretDir, 0755)
+	err := fs.MkdirAll(secretDir, 0o755)
 	require.NoError(t, err)
 
 	// Set current version
@@ -296,9 +337,7 @@ func TestSetCurrentVersion(t *testing.T) {
 func TestVersionMetadataTimestamps(t *testing.T) {
 	// Test that all timestamp fields behave consistently as pointers
 	vm := VersionMetadata{
-		ID:         "test-id",
+		ID: "test-id",
-		SecretName: "test/secret",
-		Version:    "20231215.001",
 	}
 
 	// All should be nil initially

internal/vault/integration_test.go

@@ -8,16 +8,13 @@ import (
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/internal/vault"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 )
 
 func TestVaultWithRealFilesystem(t *testing.T) {
 	// Create a temporary directory for our tests
-	tempDir, err := os.MkdirTemp("", "secret-test-")
+	tempDir := t.TempDir()
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(tempDir) // Clean up after test
 
 	// Use the real filesystem
 	fs := afero.NewOsFs()
@@ -25,33 +22,14 @@ func TestVaultWithRealFilesystem(t *testing.T) {
 	// Test mnemonic
 	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
 
-	// Save original environment variables
-	oldMnemonic := os.Getenv(secret.EnvMnemonic)
-	oldPassphrase := os.Getenv(secret.EnvUnlockPassphrase)
-
 	// Set test environment variables
-	os.Setenv(secret.EnvMnemonic, testMnemonic)
+	t.Setenv(secret.EnvMnemonic, testMnemonic)
-	os.Setenv(secret.EnvUnlockPassphrase, "test-passphrase")
+	t.Setenv(secret.EnvUnlockPassphrase, "test-passphrase")
 
-	// Clean up after test
+	// Test currentvault file handling (plain file with relative path)
-	defer func() {
+	t.Run("CurrentVaultFileHandling", func(t *testing.T) {
-		if oldMnemonic != "" {
+		stateDir := filepath.Join(tempDir, "currentvault-test")
-			os.Setenv(secret.EnvMnemonic, oldMnemonic)
+		if err := os.MkdirAll(stateDir, 0o700); err != nil {
-		} else {
-			os.Unsetenv(secret.EnvMnemonic)
-		}
-
-		if oldPassphrase != "" {
-			os.Setenv(secret.EnvUnlockPassphrase, oldPassphrase)
-		} else {
-			os.Unsetenv(secret.EnvUnlockPassphrase)
-		}
-	}()
-
-	// Test symlink handling
-	t.Run("SymlinkHandling", func(t *testing.T) {
-		stateDir := filepath.Join(tempDir, "symlink-test")
-		if err := os.MkdirAll(stateDir, 0700); err != nil {
 			t.Fatalf("Failed to create state dir: %v", err)
 		}
 
@@ -67,64 +45,56 @@ func TestVaultWithRealFilesystem(t *testing.T) {
 			t.Fatalf("Failed to get vault directory: %v", err)
 		}
 
-		// Create a symlink to the vault directory in a different location
+		// Verify the currentvault file exists and contains just the vault name
-		symlinkPath := filepath.Join(tempDir, "test-symlink")
+		currentVaultPath := filepath.Join(stateDir, "currentvault")
-		if err := os.Symlink(vaultDir, symlinkPath); err != nil {
+		currentVaultContents, err := os.ReadFile(currentVaultPath)
-			t.Fatalf("Failed to create symlink: %v", err)
+		if err != nil {
+			t.Fatalf("Failed to read currentvault file: %v", err)
 		}
 
-		// Test that we can resolve the symlink correctly
+		expectedVaultName := "test-vault"
-		resolvedPath, err := vault.ResolveVaultSymlink(fs, symlinkPath)
+		if string(currentVaultContents) != expectedVaultName {
-		if err != nil {
+			t.Errorf("Expected currentvault to contain %q, got %q", expectedVaultName, string(currentVaultContents))
-			t.Fatalf("Failed to resolve symlink: %v", err)
 		}
 
-		// On some platforms, the resolved path might have different case or format
+		// Test that ResolveVaultSymlink correctly resolves the path
-		// We'll use filepath.EvalSymlinks to get the canonical path for comparison
+		resolvedPath, err := vault.ResolveVaultSymlink(fs, currentVaultPath)
-		expectedPath, err := filepath.EvalSymlinks(vaultDir)
 		if err != nil {
-			t.Fatalf("Failed to evaluate symlink: %v", err)
+			t.Fatalf("Failed to resolve currentvault path: %v", err)
-		}
-		actualPath, err := filepath.EvalSymlinks(resolvedPath)
-		if err != nil {
-			t.Fatalf("Failed to evaluate resolved path: %v", err)
 		}
 
-		if actualPath != expectedPath {
+		if resolvedPath != vaultDir {
-			t.Errorf("Expected symlink to resolve to %s, got %s", expectedPath, actualPath)
+			t.Errorf("Expected resolved path to be %s, got %s", vaultDir, resolvedPath)
 		}
 	})
 
 	// Test secret operations with deeply nested paths
 	t.Run("DeepPathSecrets", func(t *testing.T) {
 		stateDir := filepath.Join(tempDir, "deep-path-test")
-		if err := os.MkdirAll(stateDir, 0700); err != nil {
+		if err := os.MkdirAll(stateDir, 0o700); err != nil {
 			t.Fatalf("Failed to create state dir: %v", err)
 		}
 
-		// Create a test vault
+		// Create a test vault - CreateVault now handles public key when mnemonic is in env
 		vlt, err := vault.CreateVault(fs, stateDir, "test-vault")
 		if err != nil {
 			t.Fatalf("Failed to create vault: %v", err)
 		}
 
-		// Derive long-term key from mnemonic
+		// Load vault metadata to get its derivation index
-		ltIdentity, err := agehd.DeriveIdentity(testMnemonic, 0)
-		if err != nil {
-			t.Fatalf("Failed to derive long-term key: %v", err)
-		}
-
-		// Get the vault directory
 		vaultDir, err := vlt.GetDirectory()
 		if err != nil {
 			t.Fatalf("Failed to get vault directory: %v", err)
 		}
+		vaultMetadata, err := vault.LoadVaultMetadata(fs, vaultDir)
+		if err != nil {
+			t.Fatalf("Failed to load vault metadata: %v", err)
+		}
 
-		// Write long-term public key
+		// Derive long-term key from mnemonic using the vault's derivation index
-		ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
+		ltIdentity, err := agehd.DeriveIdentity(testMnemonic, vaultMetadata.DerivationIndex)
-		pubKey := ltIdentity.Recipient().String()
+		if err != nil {
-		if err := afero.WriteFile(fs, ltPubKeyPath, []byte(pubKey), secret.FilePerms); err != nil {
+			t.Fatalf("Failed to derive long-term key: %v", err)
-			t.Fatalf("Failed to write long-term public key: %v", err)
 		}
 
 		// Unlock the vault
@@ -133,8 +103,13 @@ func TestVaultWithRealFilesystem(t *testing.T) {
 		// Create a secret with a deeply nested path
 		deepPath := "api/credentials/production/database/primary"
 		secretValue := []byte("supersecretdbpassword")
+		expectedValue := make([]byte, len(secretValue))
+		copy(expectedValue, secretValue)
 
-		err = vlt.AddSecret(deepPath, secretValue, false)
+		secretBuffer := memguard.NewBufferFromBytes(secretValue)
+		defer secretBuffer.Destroy()
+
+		err = vlt.AddSecret(deepPath, secretBuffer, false)
 		if err != nil {
 			t.Fatalf("Failed to add secret with deep path: %v", err)
 		}
@@ -163,42 +138,39 @@ func TestVaultWithRealFilesystem(t *testing.T) {
 			t.Fatalf("Failed to retrieve deep path secret: %v", err)
 		}
 
-		if string(retrievedValue) != string(secretValue) {
+		if string(retrievedValue) != string(expectedValue) {
 			t.Errorf("Retrieved value doesn't match. Expected %q, got %q",
-				string(secretValue), string(retrievedValue))
+				string(expectedValue), string(retrievedValue))
 		}
 	})
 
 	// Test key caching in GetOrDeriveLongTermKey
 	t.Run("KeyCaching", func(t *testing.T) {
 		stateDir := filepath.Join(tempDir, "key-cache-test")
-		if err := os.MkdirAll(stateDir, 0700); err != nil {
+		if err := os.MkdirAll(stateDir, 0o700); err != nil {
 			t.Fatalf("Failed to create state dir: %v", err)
 		}
 
-		// Create a test vault
+		// Create a test vault - CreateVault now handles public key when mnemonic is in env
 		vlt, err := vault.CreateVault(fs, stateDir, "test-vault")
 		if err != nil {
 			t.Fatalf("Failed to create vault: %v", err)
 		}
 
-		// Derive long-term key from mnemonic
+		// Load vault metadata to get its derivation index
-		ltIdentity, err := agehd.DeriveIdentity(testMnemonic, 0)
-		if err != nil {
-			t.Fatalf("Failed to derive long-term key: %v", err)
-		}
-
-		// Get the vault directory
 		vaultDir, err := vlt.GetDirectory()
 		if err != nil {
 			t.Fatalf("Failed to get vault directory: %v", err)
 		}
+		vaultMetadata, err := vault.LoadVaultMetadata(fs, vaultDir)
+		if err != nil {
+			t.Fatalf("Failed to load vault metadata: %v", err)
+		}
 
-		// Write long-term public key
+		// Derive long-term key from mnemonic for verification using the vault's derivation index
-		ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
+		ltIdentity, err := agehd.DeriveIdentity(testMnemonic, vaultMetadata.DerivationIndex)
-		pubKey := ltIdentity.Recipient().String()
+		if err != nil {
-		if err := afero.WriteFile(fs, ltPubKeyPath, []byte(pubKey), secret.FilePerms); err != nil {
+			t.Fatalf("Failed to derive long-term key: %v", err)
-			t.Fatalf("Failed to write long-term public key: %v", err)
 		}
 
 		// Verify the vault is locked initially
@@ -257,7 +229,7 @@ func TestVaultWithRealFilesystem(t *testing.T) {
 	// Test vault name validation
 	t.Run("VaultNameValidation", func(t *testing.T) {
 		stateDir := filepath.Join(tempDir, "name-validation-test")
-		if err := os.MkdirAll(stateDir, 0700); err != nil {
+		if err := os.MkdirAll(stateDir, 0o700); err != nil {
 			t.Fatalf("Failed to create state dir: %v", err)
 		}
 
@@ -297,7 +269,7 @@ func TestVaultWithRealFilesystem(t *testing.T) {
 	// Test multiple vaults and switching between them
 	t.Run("MultipleVaults", func(t *testing.T) {
 		stateDir := filepath.Join(tempDir, "multi-vault-test")
-		if err := os.MkdirAll(stateDir, 0700); err != nil {
+		if err := os.MkdirAll(stateDir, 0o700); err != nil {
 			t.Fatalf("Failed to create state dir: %v", err)
 		}
 
@@ -342,11 +314,11 @@ func TestVaultWithRealFilesystem(t *testing.T) {
 	// Test adding a secret in one vault and verifying it's not visible in another
 	t.Run("VaultIsolation", func(t *testing.T) {
 		stateDir := filepath.Join(tempDir, "isolation-test")
-		if err := os.MkdirAll(stateDir, 0700); err != nil {
+		if err := os.MkdirAll(stateDir, 0o700); err != nil {
 			t.Fatalf("Failed to create state dir: %v", err)
 		}
 
-		// Create two vaults
+		// Create two vaults - CreateVault now handles public key when mnemonic is in env
 		vault1, err := vault.CreateVault(fs, stateDir, "vault1")
 		if err != nil {
 			t.Fatalf("Failed to create vault1: %v", err)
@@ -358,31 +330,50 @@ func TestVaultWithRealFilesystem(t *testing.T) {
 		}
 
 		// Derive long-term key from mnemonic
-		ltIdentity, err := agehd.DeriveIdentity(testMnemonic, 0)
+		// Note: Both vaults will have different derivation indexes due to GetNextDerivationIndex
+
+		// Load vault1 metadata to get its derivation index
+		vault1Dir, err := vault1.GetDirectory()
 		if err != nil {
-			t.Fatalf("Failed to derive long-term key: %v", err)
+			t.Fatalf("Failed to get vault1 directory: %v", err)
+		}
+		vault1Metadata, err := vault.LoadVaultMetadata(fs, vault1Dir)
+		if err != nil {
+			t.Fatalf("Failed to load vault1 metadata: %v", err)
 		}
 
-		// Setup both vaults with the same long-term key
+		ltIdentity1, err := agehd.DeriveIdentity(testMnemonic, vault1Metadata.DerivationIndex)
-		for _, vlt := range []*vault.Vault{vault1, vault2} {
+		if err != nil {
-			vaultDir, err := vlt.GetDirectory()
+			t.Fatalf("Failed to derive long-term key for vault1: %v", err)
-			if err != nil {
-				t.Fatalf("Failed to get vault directory: %v", err)
-			}
-
-			ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
-			pubKey := ltIdentity.Recipient().String()
-			if err := afero.WriteFile(fs, ltPubKeyPath, []byte(pubKey), secret.FilePerms); err != nil {
-				t.Fatalf("Failed to write long-term public key: %v", err)
-			}
-
-			vlt.Unlock(ltIdentity)
 		}
 
+		// Load vault2 metadata to get its derivation index
+		vault2Dir, err := vault2.GetDirectory()
+		if err != nil {
+			t.Fatalf("Failed to get vault2 directory: %v", err)
+		}
+		vault2Metadata, err := vault.LoadVaultMetadata(fs, vault2Dir)
+		if err != nil {
+			t.Fatalf("Failed to load vault2 metadata: %v", err)
+		}
+
+		ltIdentity2, err := agehd.DeriveIdentity(testMnemonic, vault2Metadata.DerivationIndex)
+		if err != nil {
+			t.Fatalf("Failed to derive long-term key for vault2: %v", err)
+		}
+
+		// Unlock the vaults with their respective keys
+		vault1.Unlock(ltIdentity1)
+		vault2.Unlock(ltIdentity2)
+
 		// Add a secret to vault1
 		secretName := "test-secret"
 		secretValue := []byte("secret in vault1")
-		if err := vault1.AddSecret(secretName, secretValue, false); err != nil {
+
+		secretBuffer := memguard.NewBufferFromBytes(secretValue)
+		defer secretBuffer.Destroy()
+
+		if err := vault1.AddSecret(secretName, secretBuffer, false); err != nil {
 			t.Fatalf("Failed to add secret to vault1: %v", err)
 		}
 

internal/vault/integration_version_test.go

@@ -1,3 +1,24 @@
+// Version Support Integration Tests
+//
+// Comprehensive integration tests for version functionality:
+//
+// - TestVersionIntegrationWorkflow: End-to-end workflow testing
+//   - Creating initial version with proper metadata
+//   - Creating multiple versions with timestamp updates
+//   - Retrieving specific versions by name
+//   - Promoting old versions to current
+//   - Testing version serial number limits (999/day)
+//   - Error cases and edge conditions
+//
+// - TestVersionConcurrency: Tests concurrent read operations
+//
+// - TestVersionCompatibility: Tests handling of legacy non-versioned secrets
+//
+// Test Environment:
+// - Uses in-memory filesystem (afero.MemMapFs)
+// - Consistent test mnemonic for reproducible keys
+// - Proper cleanup and isolation between tests
+
 package vault
 
 import (
@@ -8,18 +29,30 @@ import (
 
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+// Helper function to add a secret to vault with proper buffer protection
+func addTestSecret(t *testing.T, vault *Vault, name string, value []byte, force bool) {
+	t.Helper()
+	buffer := memguard.NewBufferFromBytes(value)
+	defer buffer.Destroy()
+	err := vault.AddSecret(name, buffer, force)
+	require.NoError(t, err)
+}
+
 // TestVersionIntegrationWorkflow tests the complete version workflow
 func TestVersionIntegrationWorkflow(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	stateDir := "/test/state"
 
 	// Set mnemonic for testing
-	t.Setenv(secret.EnvMnemonic, "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about")
+	t.Setenv(secret.EnvMnemonic,
+		"abandon abandon abandon abandon abandon abandon "+
+			"abandon abandon abandon abandon abandon about")
 
 	// Create vault
 	vault, err := CreateVault(fs, stateDir, "test")
@@ -33,7 +66,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 	// Store long-term public key in vault
 	vaultDir, _ := vault.GetDirectory()
 	ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
-	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0600)
+	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0o600)
 	require.NoError(t, err)
 
 	// Unlock the vault
@@ -43,8 +76,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 
 	// Step 1: Create initial version
 	t.Run("create_initial_version", func(t *testing.T) {
-		err := vault.AddSecret(secretName, []byte("version-1-data"), false)
+		addTestSecret(t, vault, secretName, []byte("version-1-data"), false)
-		require.NoError(t, err)
 
 		// Verify secret can be retrieved
 		value, err := vault.GetSecret(secretName)
@@ -63,7 +95,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 		assert.Equal(t, versions[0], currentVersion)
 
 		// Verify metadata
-		version := secret.NewSecretVersion(vault, secretName, versions[0])
+		version := secret.NewVersion(vault, secretName, versions[0])
 		err = version.LoadMetadata(ltIdentity)
 		require.NoError(t, err)
 		assert.NotNil(t, version.Metadata.CreatedAt)
@@ -85,8 +117,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 		firstVersionName = versions[0]
 
 		// Create second version
-		err = vault.AddSecret(secretName, []byte("version-2-data"), true)
+		addTestSecret(t, vault, secretName, []byte("version-2-data"), true)
-		require.NoError(t, err)
 
 		// Verify new value is current
 		value, err := vault.GetSecret(secretName)
@@ -99,13 +130,13 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 		assert.Len(t, versions, 2)
 
 		// Verify first version metadata was updated with notAfter
-		firstVersion := secret.NewSecretVersion(vault, secretName, firstVersionName)
+		firstVersion := secret.NewVersion(vault, secretName, firstVersionName)
 		err = firstVersion.LoadMetadata(ltIdentity)
 		require.NoError(t, err)
 		assert.NotNil(t, firstVersion.Metadata.NotAfter)
 
 		// Verify second version metadata
-		secondVersion := secret.NewSecretVersion(vault, secretName, versions[0])
+		secondVersion := secret.NewVersion(vault, secretName, versions[0])
 		err = secondVersion.LoadMetadata(ltIdentity)
 		require.NoError(t, err)
 		assert.NotNil(t, secondVersion.Metadata.NotBefore)
@@ -119,8 +150,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 	t.Run("create_third_version", func(t *testing.T) {
 		time.Sleep(10 * time.Millisecond)
 
-		err := vault.AddSecret(secretName, []byte("version-3-data"), true)
+		addTestSecret(t, vault, secretName, []byte("version-3-data"), true)
-		require.NoError(t, err)
 
 		// Verify we now have three versions
 		secretDir := filepath.Join(vaultDir, "secrets.d", "integration%test")
@@ -178,7 +208,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 
 		// Verify the version metadata hasn't changed
 		// (promoting shouldn't modify timestamps)
-		version := secret.NewSecretVersion(vault, secretName, oldestVersion)
+		version := secret.NewVersion(vault, secretName, oldestVersion)
 		err = version.LoadMetadata(ltIdentity)
 		require.NoError(t, err)
 		assert.NotNil(t, version.Metadata.NotAfter) // should still have its old notAfter
@@ -191,8 +221,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 		secretDir := filepath.Join(vaultDir, "secrets.d", "limit%test", "versions")
 
 		// Create 998 versions (we already have one from the first AddSecret)
-		err := vault.AddSecret(limitSecretName, []byte("initial"), false)
+		addTestSecret(t, vault, limitSecretName, []byte("initial"), false)
-		require.NoError(t, err)
 
 		// Get today's date for consistent version names
 		today := time.Now().Format("20060102")
@@ -201,7 +230,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 		for i := 2; i <= 998; i++ {
 			versionName := fmt.Sprintf("%s.%03d", today, i)
 			versionDir := filepath.Join(secretDir, versionName)
-			err := fs.MkdirAll(versionDir, 0755)
+			err := fs.MkdirAll(versionDir, 0o755)
 			require.NoError(t, err)
 		}
 
@@ -211,7 +240,7 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 		assert.Equal(t, fmt.Sprintf("%s.999", today), versionName)
 
 		// Create the 999th version directory
-		err = fs.MkdirAll(filepath.Join(secretDir, versionName), 0755)
+		err = fs.MkdirAll(filepath.Join(secretDir, versionName), 0o755)
 		require.NoError(t, err)
 
 		// Should fail to create 1000th version
@@ -232,7 +261,9 @@ func TestVersionIntegrationWorkflow(t *testing.T) {
 		assert.Error(t, err)
 
 		// Try to add secret without force when it exists
-		err = vault.AddSecret(secretName, []byte("should-fail"), false)
+		failBuffer := memguard.NewBufferFromBytes([]byte("should-fail"))
+		defer failBuffer.Destroy()
+		err = vault.AddSecret(secretName, failBuffer, false)
 		assert.Error(t, err)
 		assert.Contains(t, err.Error(), "already exists")
 	})
@@ -249,15 +280,14 @@ func TestVersionConcurrency(t *testing.T) {
 	secretName := "concurrent/test"
 
 	// Create initial version
-	err := vault.AddSecret(secretName, []byte("initial"), false)
+	addTestSecret(t, vault, secretName, []byte("initial"), false)
-	require.NoError(t, err)
 
 	// Test concurrent reads
 	t.Run("concurrent_reads", func(t *testing.T) {
 		done := make(chan bool, 10)
 		errors := make(chan error, 10)
 
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			go func() {
 				value, err := vault.GetSecret(secretName)
 				if err != nil {
@@ -270,7 +300,7 @@ func TestVersionConcurrency(t *testing.T) {
 		}
 
 		// Wait for all goroutines
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			<-done
 		}
 
@@ -298,17 +328,19 @@ func TestVersionCompatibility(t *testing.T) {
 	secretName := "legacy/secret"
 	vaultDir, _ := vault.GetDirectory()
 	secretDir := filepath.Join(vaultDir, "secrets.d", "legacy%secret")
-	err = fs.MkdirAll(secretDir, 0755)
+	err = fs.MkdirAll(secretDir, 0o755)
 	require.NoError(t, err)
 
 	// Create old-style encrypted value directly in secret directory
 	testValue := []byte("legacy-value")
+	testValueBuffer := memguard.NewBufferFromBytes(testValue)
+	defer testValueBuffer.Destroy()
 	ltRecipient := ltIdentity.Recipient()
-	encrypted, err := secret.EncryptToRecipient(testValue, ltRecipient)
+	encrypted, err := secret.EncryptToRecipient(testValueBuffer, ltRecipient)
 	require.NoError(t, err)
 
 	valuePath := filepath.Join(secretDir, "value.age")
-	err = afero.WriteFile(fs, valuePath, encrypted, 0600)
+	err = afero.WriteFile(fs, valuePath, encrypted, 0o600)
 	require.NoError(t, err)
 
 	// Should fail to get with version-aware methods

internal/vault/management.go

@@ -1,3 +1,4 @@
+// Package vault provides functionality for managing encrypted vaults.
 package vault
 
 import (
@@ -5,9 +6,11 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strings"
 	"time"
 
 	"git.eeqj.de/sneak/secret/internal/secret"
+	"git.eeqj.de/sneak/secret/pkg/agehd"
 	"github.com/spf13/afero"
 )
 
@@ -25,83 +28,33 @@ func isValidVaultName(name string) bool {
 		return false
 	}
 	matched, _ := regexp.MatchString(`^[a-z0-9\.\-\_]+$`, name)
+
 	return matched
 }
 
-// ResolveVaultSymlink resolves the currentvault symlink by reading either the symlink target or file contents
+// ResolveVaultSymlink reads the currentvault file to get the path to the current vault
-// This function is designed to work on both Unix and Windows systems, as well as with in-memory filesystems
+// The file contains just the vault name (e.g., "default")
-func ResolveVaultSymlink(fs afero.Fs, symlinkPath string) (string, error) {
+func ResolveVaultSymlink(fs afero.Fs, currentVaultPath string) (string, error) {
-	secret.Debug("resolveVaultSymlink starting", "symlink_path", symlinkPath)
+	secret.Debug("resolveVaultSymlink starting", "path", currentVaultPath)
 
-	// First try to handle the path as a real symlink (works on Unix systems)
+	fileData, err := afero.ReadFile(fs, currentVaultPath)
-	if _, ok := fs.(*afero.OsFs); ok {
-		secret.Debug("Using real filesystem symlink resolution")
-
-		// Check if the symlink exists
-		secret.Debug("Checking symlink target", "symlink_path", symlinkPath)
-		target, err := os.Readlink(symlinkPath)
-		if err == nil {
-			secret.Debug("Symlink points to", "target", target)
-
-			// On real filesystem, we need to handle relative symlinks
-			// by resolving them relative to the symlink's directory
-			if !filepath.IsAbs(target) {
-				// Get the current directory before changing
-				originalDir, err := os.Getwd()
-				if err != nil {
-					return "", fmt.Errorf("failed to get current directory: %w", err)
-				}
-				secret.Debug("Got current directory", "original_dir", originalDir)
-
-				// Change to the symlink's directory
-				symlinkDir := filepath.Dir(symlinkPath)
-				secret.Debug("Changing to symlink directory", "symlink_path", symlinkDir)
-				secret.Debug("About to call os.Chdir - this might hang if symlink is broken")
-				if err := os.Chdir(symlinkDir); err != nil {
-					return "", fmt.Errorf("failed to change to symlink directory: %w", err)
-				}
-				secret.Debug("Changed to symlink directory successfully - os.Chdir completed")
-
-				// Get the absolute path of the target
-				secret.Debug("Getting absolute path of current directory")
-				absolutePath, err := os.Getwd()
-				if err != nil {
-					// Try to restore original directory before returning error
-					_ = os.Chdir(originalDir)
-					return "", fmt.Errorf("failed to get absolute path: %w", err)
-				}
-				secret.Debug("Got absolute path", "absolute_path", absolutePath)
-
-				// Restore the original directory
-				secret.Debug("Restoring original directory", "original_dir", originalDir)
-				if err := os.Chdir(originalDir); err != nil {
-					return "", fmt.Errorf("failed to restore original directory: %w", err)
-				}
-				secret.Debug("Restored original directory successfully")
-
-				// Use the absolute path of the target
-				target = absolutePath
-			}
-
-			secret.Debug("resolveVaultSymlink completed successfully", "result", target)
-			return target, nil
-		}
-	}
-
-	// Fallback: treat it as a regular file containing the target path
-	secret.Debug("Fallback: trying to read regular file with target path")
-
-	fileData, err := afero.ReadFile(fs, symlinkPath)
 	if err != nil {
-		secret.Debug("Failed to read target path file", "error", err)
+		secret.Debug("Failed to read currentvault file", "error", err)
-		return "", fmt.Errorf("failed to read vault symlink: %w", err)
+
+		return "", fmt.Errorf("failed to read currentvault file: %w", err)
 	}
 
-	target := string(fileData)
+	// The file contains just the vault name like "default"
-	secret.Debug("Read target path from file", "target", target)
+	vaultName := strings.TrimSpace(string(fileData))
+	secret.Debug("Read vault name from file", "vault_name", vaultName)
 
-	secret.Debug("resolveVaultSymlink completed via fallback", "result", target)
+	// Resolve to absolute path: stateDir/vaults.d/vaultName
-	return target, nil
+	stateDir := filepath.Dir(currentVaultPath)
+	absolutePath := filepath.Join(stateDir, "vaults.d", vaultName)
+
+	secret.Debug("Resolved to absolute path", "absolute_path", absolutePath)
+
+	return absolutePath, nil
 }
 
 // GetCurrentVault gets the current vault from the file system
@@ -115,6 +68,7 @@ func GetCurrentVault(fs afero.Fs, stateDir string) (*Vault, error) {
 	_, err := fs.Stat(currentVaultPath)
 	if err != nil {
 		secret.Debug("Failed to stat current vault symlink", "error", err, "path", currentVaultPath)
+
 		return nil, fmt.Errorf("failed to read current vault symlink: %w", err)
 	}
 
@@ -170,6 +124,54 @@ func ListVaults(fs afero.Fs, stateDir string) ([]string, error) {
 	return vaults, nil
 }
 
+// processMnemonicForVault handles mnemonic processing for vault creation
+func processMnemonicForVault(fs afero.Fs, stateDir, vaultDir, vaultName string) (
+	derivationIndex uint32, publicKeyHash string, familyHash string, err error) {
+	// Check if mnemonic is available in environment
+	mnemonic := os.Getenv(secret.EnvMnemonic)
+
+	if mnemonic == "" {
+		secret.Debug("No mnemonic in environment, vault created without long-term key", "vault", vaultName)
+		// Use 0 for derivation index when no mnemonic is provided
+		return 0, "", "", nil
+	}
+
+	secret.Debug("Mnemonic found in environment, deriving long-term key", "vault", vaultName)
+
+	// Get the next available derivation index for this mnemonic
+	derivationIndex, err = GetNextDerivationIndex(fs, stateDir, mnemonic)
+	if err != nil {
+		return 0, "", "", fmt.Errorf("failed to get next derivation index: %w", err)
+	}
+
+	// Derive the long-term key using the actual derivation index
+	ltIdentity, err := agehd.DeriveIdentity(mnemonic, derivationIndex)
+	if err != nil {
+		return 0, "", "", fmt.Errorf("failed to derive long-term key: %w", err)
+	}
+
+	// Write the public key
+	ltPubKey := ltIdentity.Recipient().String()
+	ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
+	if err := afero.WriteFile(fs, ltPubKeyPath, []byte(ltPubKey), secret.FilePerms); err != nil {
+		return 0, "", "", fmt.Errorf("failed to write long-term public key: %w", err)
+	}
+	secret.Debug("Wrote long-term public key", "path", ltPubKeyPath)
+
+	// Compute verification hash from actual derivation index
+	publicKeyHash = ComputeDoubleSHA256([]byte(ltIdentity.Recipient().String()))
+
+	// Compute family hash from index 0 (same for all vaults with this mnemonic)
+	// This is used to identify which vaults belong to the same mnemonic family
+	identity0, err := agehd.DeriveIdentity(mnemonic, 0)
+	if err != nil {
+		return 0, "", "", fmt.Errorf("failed to derive identity for index 0: %w", err)
+	}
+	familyHash = ComputeDoubleSHA256([]byte(identity0.Recipient().String()))
+
+	return derivationIndex, publicKeyHash, familyHash, nil
+}
+
 // CreateVault creates a new vault
 func CreateVault(fs afero.Fs, stateDir string, name string) (*Vault, error) {
 	secret.Debug("Creating new vault", "name", name, "state_dir", stateDir)
@@ -177,6 +179,7 @@ func CreateVault(fs afero.Fs, stateDir string, name string) (*Vault, error) {
 	// Validate vault name
 	if !isValidVaultName(name) {
 		secret.Debug("Invalid vault name provided", "vault_name", name)
+
 		return nil, fmt.Errorf("invalid vault name '%s': must match pattern [a-z0-9.\\-_]+", name)
 	}
 	secret.Debug("Vault name validation passed", "vault_name", name)
@@ -202,13 +205,18 @@ func CreateVault(fs afero.Fs, stateDir string, name string) (*Vault, error) {
 		return nil, fmt.Errorf("failed to create unlockers directory: %w", err)
 	}
 
-	// Save initial vault metadata (without derivation info until a mnemonic is imported)
+	// Process mnemonic if available
-	metadata := &VaultMetadata{
+	derivationIndex, publicKeyHash, familyHash, err := processMnemonicForVault(fs, stateDir, vaultDir, name)
-		Name:            name,
+	if err != nil {
-		CreatedAt:       time.Now(),
+		return nil, err
-		DerivationIndex: 0,
+	}
-		LongTermKeyHash: "", // Will be set when mnemonic is imported
+
-		MnemonicHash:    "", // Will be set when mnemonic is imported
+	// Save vault metadata
+	metadata := &Metadata{
+		CreatedAt:          time.Now(),
+		DerivationIndex:    derivationIndex,
+		PublicKeyHash:      publicKeyHash,
+		MnemonicFamilyHash: familyHash,
 	}
 	if err := SaveVaultMetadata(fs, vaultDir, metadata); err != nil {
 		return nil, fmt.Errorf("failed to save vault metadata: %w", err)
@@ -222,6 +230,7 @@ func CreateVault(fs afero.Fs, stateDir string, name string) (*Vault, error) {
 
 	// Create and return the vault
 	secret.Debug("Successfully created vault", "name", name)
+
 	return NewVault(fs, stateDir, name), nil
 }
 
@@ -232,6 +241,7 @@ func SelectVault(fs afero.Fs, stateDir string, name string) error {
 	// Validate vault name
 	if !isValidVaultName(name) {
 		secret.Debug("Invalid vault name provided", "vault_name", name)
+
 		return fmt.Errorf("invalid vault name '%s': must match pattern [a-z0-9.\\-_]+", name)
 	}
 	secret.Debug("Vault name validation passed", "vault_name", name)
@@ -246,34 +256,22 @@ func SelectVault(fs afero.Fs, stateDir string, name string) error {
 		return fmt.Errorf("vault %s does not exist", name)
 	}
 
-	// Create or update the current vault symlink/file
+	// Create or update the currentvault file with just the vault name
 	currentVaultPath := filepath.Join(stateDir, "currentvault")
-	targetPath := filepath.Join(stateDir, "vaults.d", name)
 
-	// First try to remove existing symlink if it exists
+	// Remove existing file if it exists
 	if _, err := fs.Stat(currentVaultPath); err == nil {
-		secret.Debug("Removing existing current vault symlink", "path", currentVaultPath)
+		secret.Debug("Removing existing currentvault file", "path", currentVaultPath)
-		// Ignore errors from Remove as we'll try to create/update it anyway.
-		// On some systems, removing a symlink may fail but the subsequent create may still succeed.
 		_ = fs.Remove(currentVaultPath)
 	}
 
-	// Try to create a real symlink first (works on Unix systems)
+	// Write just the vault name to the file
-	if _, ok := fs.(*afero.OsFs); ok {
+	secret.Debug("Writing currentvault file", "vault_name", name)
-		secret.Debug("Creating vault symlink", "target", targetPath, "link", currentVaultPath)
+	if err := afero.WriteFile(fs, currentVaultPath, []byte(name), secret.FilePerms); err != nil {
-		if err := os.Symlink(targetPath, currentVaultPath); err == nil {
-			secret.Debug("Successfully selected vault", "vault_name", name)
-			return nil
-		}
-		// If symlink creation fails, fall back to regular file
-	}
-
-	// Fallback: create a regular file with the target path
-	secret.Debug("Fallback: creating regular file with target path", "target", targetPath)
-	if err := afero.WriteFile(fs, currentVaultPath, []byte(targetPath), secret.FilePerms); err != nil {
 		return fmt.Errorf("failed to select vault: %w", err)
 	}
 
 	secret.Debug("Successfully selected vault", "vault_name", name)
+
 	return nil
 }

internal/vault/metadata.go

@@ -8,24 +8,40 @@ import (
 	"path/filepath"
 
 	"git.eeqj.de/sneak/secret/internal/secret"
+	"git.eeqj.de/sneak/secret/pkg/agehd"
 	"github.com/spf13/afero"
 )
 
-// Alias the metadata types from secret package for convenience
+// Metadata is an alias for secret.VaultMetadata
-type VaultMetadata = secret.VaultMetadata
+type Metadata = secret.VaultMetadata
+
+// UnlockerMetadata is an alias for secret.UnlockerMetadata
 type UnlockerMetadata = secret.UnlockerMetadata
-type SecretMetadata = secret.SecretMetadata
+
+// SecretMetadata is an alias for secret.Metadata
+type SecretMetadata = secret.Metadata
+
+// Configuration is an alias for secret.Configuration
 type Configuration = secret.Configuration
 
 // ComputeDoubleSHA256 computes the double SHA256 hash of data and returns it as hex
 func ComputeDoubleSHA256(data []byte) string {
 	firstHash := sha256.Sum256(data)
 	secondHash := sha256.Sum256(firstHash[:])
+
 	return hex.EncodeToString(secondHash[:])
 }
 
-// GetNextDerivationIndex finds the next available derivation index for a given mnemonic hash
+// GetNextDerivationIndex finds the next available derivation index for a given mnemonic
-func GetNextDerivationIndex(fs afero.Fs, stateDir string, mnemonicHash string) (uint32, error) {
+// by deriving the public key for index 0 and using its hash to identify related vaults
+func GetNextDerivationIndex(fs afero.Fs, stateDir string, mnemonic string) (uint32, error) {
+	// First, derive the public key for index 0 to get our identifier
+	identity0, err := agehd.DeriveIdentity(mnemonic, 0)
+	if err != nil {
+		return 0, fmt.Errorf("failed to derive identity for index 0: %w", err)
+	}
+	pubKeyHash := ComputeDoubleSHA256([]byte(identity0.Recipient().String()))
+
 	vaultsDir := filepath.Join(stateDir, "vaults.d")
 
 	// Check if vaults directory exists
@@ -44,9 +60,8 @@ func GetNextDerivationIndex(fs afero.Fs, stateDir string, mnemonicHash string) (
 		return 0, fmt.Errorf("failed to read vaults directory: %w", err)
 	}
 
-	// Track the highest index for this mnemonic
+	// Track which indices are in use for this mnemonic
-	var highestIndex uint32 = 0
+	usedIndices := make(map[uint32]bool)
-	foundMatch := false
 
 	for _, entry := range entries {
 		if !entry.IsDir() {
@@ -61,32 +76,29 @@ func GetNextDerivationIndex(fs afero.Fs, stateDir string, mnemonicHash string) (
 			continue
 		}
 
-		var metadata VaultMetadata
+		var metadata Metadata
 		if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
 			// Skip vaults with invalid metadata
 			continue
 		}
 
-		// Check if this vault uses the same mnemonic
+		// Check if this vault uses the same mnemonic by comparing family hashes
-		if metadata.MnemonicHash == mnemonicHash {
+		if metadata.MnemonicFamilyHash == pubKeyHash {
-			foundMatch = true
+			usedIndices[metadata.DerivationIndex] = true
-			if metadata.DerivationIndex >= highestIndex {
-				highestIndex = metadata.DerivationIndex
-			}
 		}
 	}
 
-	// If we found a match, use the next index
+	// Find the first available index
-	if foundMatch {
+	var index uint32
-		return highestIndex + 1, nil
+	for usedIndices[index] {
+		index++
 	}
 
-	// No existing vault with this mnemonic, start at 0
+	return index, nil
-	return 0, nil
 }
 
 // SaveVaultMetadata saves vault metadata to the vault directory
-func SaveVaultMetadata(fs afero.Fs, vaultDir string, metadata *VaultMetadata) error {
+func SaveVaultMetadata(fs afero.Fs, vaultDir string, metadata *Metadata) error {
 	metadataPath := filepath.Join(vaultDir, "vault-metadata.json")
 
 	metadataBytes, err := json.MarshalIndent(metadata, "", "  ")
@@ -102,7 +114,7 @@ func SaveVaultMetadata(fs afero.Fs, vaultDir string, metadata *VaultMetadata) er
 }
 
 // LoadVaultMetadata loads vault metadata from the vault directory
-func LoadVaultMetadata(fs afero.Fs, vaultDir string) (*VaultMetadata, error) {
+func LoadVaultMetadata(fs afero.Fs, vaultDir string) (*Metadata, error) {
 	metadataPath := filepath.Join(vaultDir, "vault-metadata.json")
 
 	metadataBytes, err := afero.ReadFile(fs, metadataPath)
@@ -110,7 +122,7 @@ func LoadVaultMetadata(fs afero.Fs, vaultDir string) (*VaultMetadata, error) {
 		return nil, fmt.Errorf("failed to read vault metadata: %w", err)
 	}
 
-	var metadata VaultMetadata
+	var metadata Metadata
 	if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal vault metadata: %w", err)
 	}

internal/vault/metadata_test.go

@@ -1,9 +1,9 @@
 package vault
 
 import (
-	"testing"
-
 	"path/filepath"
+	"strings"
+	"testing"
 
 	"git.eeqj.de/sneak/secret/pkg/agehd"
 	"github.com/spf13/afero"
@@ -13,6 +13,9 @@ func TestVaultMetadata(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	stateDir := "/test/state"
 
+	// Test mnemonic for consistent testing
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+
 	t.Run("ComputeDoubleSHA256", func(t *testing.T) {
 		// Test data
 		data := []byte("test data")
@@ -38,7 +41,7 @@ func TestVaultMetadata(t *testing.T) {
 
 	t.Run("GetNextDerivationIndex", func(t *testing.T) {
 		// Test with no existing vaults
-		index, err := GetNextDerivationIndex(fs, stateDir, "mnemonic-hash-1")
+		index, err := GetNextDerivationIndex(fs, stateDir, testMnemonic)
 		if err != nil {
 			t.Fatalf("Failed to get derivation index: %v", err)
 		}
@@ -46,24 +49,36 @@ func TestVaultMetadata(t *testing.T) {
 			t.Errorf("Expected index 0 for first vault, got %d", index)
 		}
 
-		// Create a vault with metadata
+		// Create a vault with metadata and matching public key
 		vaultDir := filepath.Join(stateDir, "vaults.d", "vault1")
-		if err := fs.MkdirAll(vaultDir, 0700); err != nil {
+		if err := fs.MkdirAll(vaultDir, 0o700); err != nil {
 			t.Fatalf("Failed to create vault directory: %v", err)
 		}
 
-		metadata1 := &VaultMetadata{
+		// Derive identity for index 0
-			Name:            "vault1",
+		identity0, err := agehd.DeriveIdentity(testMnemonic, 0)
-			DerivationIndex: 0,
+		if err != nil {
-			MnemonicHash:    "mnemonic-hash-1",
+			t.Fatalf("Failed to derive identity: %v", err)
-			LongTermKeyHash: "key-hash-1",
+		}
+		pubKey0 := identity0.Recipient().String()
+		pubKeyHash0 := ComputeDoubleSHA256([]byte(pubKey0))
+
+		// Write public key
+		if err := afero.WriteFile(fs, filepath.Join(vaultDir, "pub.age"), []byte(pubKey0), 0o600); err != nil {
+			t.Fatalf("Failed to write public key: %v", err)
+		}
+
+		metadata1 := &Metadata{
+			DerivationIndex:    0,
+			PublicKeyHash:      pubKeyHash0, // Hash of the actual key (index 0)
+			MnemonicFamilyHash: pubKeyHash0, // Hash of index 0 key (for family identification)
 		}
 		if err := SaveVaultMetadata(fs, vaultDir, metadata1); err != nil {
 			t.Fatalf("Failed to save metadata: %v", err)
 		}
 
 		// Next index for same mnemonic should be 1
-		index, err = GetNextDerivationIndex(fs, stateDir, "mnemonic-hash-1")
+		index, err = GetNextDerivationIndex(fs, stateDir, testMnemonic)
 		if err != nil {
 			t.Fatalf("Failed to get derivation index: %v", err)
 		}
@@ -72,7 +87,8 @@ func TestVaultMetadata(t *testing.T) {
 		}
 
 		// Different mnemonic should start at 0
-		index, err = GetNextDerivationIndex(fs, stateDir, "mnemonic-hash-2")
+		differentMnemonic := "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo wrong"
+		index, err = GetNextDerivationIndex(fs, stateDir, differentMnemonic)
 		if err != nil {
 			t.Fatalf("Failed to get derivation index: %v", err)
 		}
@@ -82,42 +98,54 @@ func TestVaultMetadata(t *testing.T) {
 
 		// Add another vault with same mnemonic but higher index
 		vaultDir2 := filepath.Join(stateDir, "vaults.d", "vault2")
-		if err := fs.MkdirAll(vaultDir2, 0700); err != nil {
+		if err := fs.MkdirAll(vaultDir2, 0o700); err != nil {
 			t.Fatalf("Failed to create vault directory: %v", err)
 		}
 
-		metadata2 := &VaultMetadata{
+		// Derive identity for index 5
-			Name:            "vault2",
+		identity5, err := agehd.DeriveIdentity(testMnemonic, 5)
-			DerivationIndex: 5,
+		if err != nil {
-			MnemonicHash:    "mnemonic-hash-1",
+			t.Fatalf("Failed to derive identity: %v", err)
-			LongTermKeyHash: "key-hash-2",
+		}
+		pubKey5 := identity5.Recipient().String()
+
+		// Write public key
+		if err := afero.WriteFile(fs, filepath.Join(vaultDir2, "pub.age"), []byte(pubKey5), 0o600); err != nil {
+			t.Fatalf("Failed to write public key: %v", err)
+		}
+
+		// Compute the hash for index 5 key
+		pubKeyHash5 := ComputeDoubleSHA256([]byte(pubKey5))
+
+		metadata2 := &Metadata{
+			DerivationIndex:    5,
+			PublicKeyHash:      pubKeyHash5, // Hash of the actual key (index 5)
+			MnemonicFamilyHash: pubKeyHash0, // Same family hash since it's from the same mnemonic
 		}
 		if err := SaveVaultMetadata(fs, vaultDir2, metadata2); err != nil {
 			t.Fatalf("Failed to save metadata: %v", err)
 		}
 
-		// Next index should be 6
+		// Next index should be 1 (not 6) because we look for the first available slot
-		index, err = GetNextDerivationIndex(fs, stateDir, "mnemonic-hash-1")
+		index, err = GetNextDerivationIndex(fs, stateDir, testMnemonic)
 		if err != nil {
 			t.Fatalf("Failed to get derivation index: %v", err)
 		}
-		if index != 6 {
+		if index != 1 {
-			t.Errorf("Expected index 6 after vault with index 5, got %d", index)
+			t.Errorf("Expected index 1 (first available), got %d", index)
 		}
 	})
 
 	t.Run("MetadataPersistence", func(t *testing.T) {
 		vaultDir := filepath.Join(stateDir, "vaults.d", "test-vault")
-		if err := fs.MkdirAll(vaultDir, 0700); err != nil {
+		if err := fs.MkdirAll(vaultDir, 0o700); err != nil {
 			t.Fatalf("Failed to create vault directory: %v", err)
 		}
 
 		// Create and save metadata
-		metadata := &VaultMetadata{
+		metadata := &Metadata{
-			Name:            "test-vault",
 			DerivationIndex: 3,
-			MnemonicHash:    "test-mnemonic-hash",
+			PublicKeyHash:   "test-public-key-hash",
-			LongTermKeyHash: "test-key-hash",
 		}
 
 		if err := SaveVaultMetadata(fs, vaultDir, metadata); err != nil {
@@ -130,23 +158,15 @@ func TestVaultMetadata(t *testing.T) {
 			t.Fatalf("Failed to load metadata: %v", err)
 		}
 
-		if loaded.Name != metadata.Name {
-			t.Errorf("Name mismatch: expected %s, got %s", metadata.Name, loaded.Name)
-		}
 		if loaded.DerivationIndex != metadata.DerivationIndex {
 			t.Errorf("DerivationIndex mismatch: expected %d, got %d", metadata.DerivationIndex, loaded.DerivationIndex)
 		}
-		if loaded.MnemonicHash != metadata.MnemonicHash {
+		if loaded.PublicKeyHash != metadata.PublicKeyHash {
-			t.Errorf("MnemonicHash mismatch: expected %s, got %s", metadata.MnemonicHash, loaded.MnemonicHash)
+			t.Errorf("PublicKeyHash mismatch: expected %s, got %s", metadata.PublicKeyHash, loaded.PublicKeyHash)
-		}
-		if loaded.LongTermKeyHash != metadata.LongTermKeyHash {
-			t.Errorf("LongTermKeyHash mismatch: expected %s, got %s", metadata.LongTermKeyHash, loaded.LongTermKeyHash)
 		}
 	})
 
 	t.Run("DifferentKeysForDifferentIndices", func(t *testing.T) {
-		testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
-
 		// Derive keys with different indices
 		identity0, err := agehd.DeriveIdentity(testMnemonic, 0)
 		if err != nil {
@@ -158,18 +178,237 @@ func TestVaultMetadata(t *testing.T) {
 			t.Fatalf("Failed to derive identity with index 1: %v", err)
 		}
 
-		// Compute hashes
+		// Compute public key hashes
-		hash0 := ComputeDoubleSHA256([]byte(identity0.String()))
+		pubKey0 := identity0.Recipient().String()
-		hash1 := ComputeDoubleSHA256([]byte(identity1.String()))
+		pubKey1 := identity1.Recipient().String()
+		hash0 := ComputeDoubleSHA256([]byte(pubKey0))
 
-		// Verify different indices produce different keys
+		// Verify different indices produce different public keys
-		if hash0 == hash1 {
+		if pubKey0 == pubKey1 {
-			t.Errorf("Different derivation indices should produce different keys")
+			t.Errorf("Different derivation indices should produce different public keys")
 		}
 
-		// Verify public keys are also different
+		// But the hash of index 0's public key should be the same for the same mnemonic
-		if identity0.Recipient().String() == identity1.Recipient().String() {
+		// This is what we use as the identifier
-			t.Errorf("Different derivation indices should produce different public keys")
+		identity0Again, _ := agehd.DeriveIdentity(testMnemonic, 0)
+		pubKey0Again := identity0Again.Recipient().String()
+		hash0Again := ComputeDoubleSHA256([]byte(pubKey0Again))
+
+		if hash0 != hash0Again {
+			t.Errorf("Same mnemonic should produce same public key hash for index 0")
 		}
 	})
 }
+
+func TestPublicKeyHashConsistency(t *testing.T) {
+	// Use the same test mnemonic that the integration test uses
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+
+	// Derive identity from index 0 multiple times
+	identity1, err := agehd.DeriveIdentity(testMnemonic, 0)
+	if err != nil {
+		t.Fatalf("Failed to derive first identity: %v", err)
+	}
+
+	identity2, err := agehd.DeriveIdentity(testMnemonic, 0)
+	if err != nil {
+		t.Fatalf("Failed to derive second identity: %v", err)
+	}
+
+	// Verify identities are the same
+	if identity1.Recipient().String() != identity2.Recipient().String() {
+		t.Errorf("Identity derivation is not deterministic")
+		t.Logf("First:  %s", identity1.Recipient().String())
+		t.Logf("Second: %s", identity2.Recipient().String())
+	}
+
+	// Compute public key hashes
+	hash1 := ComputeDoubleSHA256([]byte(identity1.Recipient().String()))
+	hash2 := ComputeDoubleSHA256([]byte(identity2.Recipient().String()))
+
+	// Verify hashes are the same
+	if hash1 != hash2 {
+		t.Errorf("Public key hash computation is not deterministic")
+		t.Logf("First hash:  %s", hash1)
+		t.Logf("Second hash: %s", hash2)
+	}
+
+	t.Logf("Test mnemonic public key hash (index 0): %s", hash1)
+}
+
+func TestSampleHashCalculation(t *testing.T) {
+	// Test with the exact mnemonic from integration test if available
+	// We'll also test with a few different mnemonics to make sure they produce different hashes
+	mnemonics := []string{
+		"abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about",
+		"legal winner thank year wave sausage worth useful legal winner thank yellow",
+		"zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo wrong",
+	}
+
+	for i, mnemonic := range mnemonics {
+		identity, err := agehd.DeriveIdentity(mnemonic, 0)
+		if err != nil {
+			t.Fatalf("Failed to derive identity for mnemonic %d: %v", i, err)
+		}
+
+		hash := ComputeDoubleSHA256([]byte(identity.Recipient().String()))
+		t.Logf("Mnemonic %d hash (index 0): %s", i, hash)
+		t.Logf("  Recipient: %s", identity.Recipient().String())
+	}
+}
+
+func TestWorkflowMismatch(t *testing.T) {
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+
+	// Create a temporary directory for testing
+	tempDir := t.TempDir()
+	fs := afero.NewOsFs()
+
+	// Test Case 1: Create vault WITH mnemonic (like init command)
+	t.Setenv("SB_SECRET_MNEMONIC", testMnemonic)
+	_, err := CreateVault(fs, tempDir, "default")
+	if err != nil {
+		t.Fatalf("Failed to create vault with mnemonic: %v", err)
+	}
+
+	// Load metadata for vault1
+	vault1Dir := filepath.Join(tempDir, "vaults.d", "default")
+	metadata1, err := LoadVaultMetadata(fs, vault1Dir)
+	if err != nil {
+		t.Fatalf("Failed to load vault1 metadata: %v", err)
+	}
+
+	t.Logf("Vault1 (with mnemonic) - DerivationIndex: %d, PublicKeyHash: %s",
+		metadata1.DerivationIndex, metadata1.PublicKeyHash)
+
+	// Test Case 2: Create vault WITHOUT mnemonic, then import (like work vault)
+	t.Setenv("SB_SECRET_MNEMONIC", "")
+	_, err = CreateVault(fs, tempDir, "work")
+	if err != nil {
+		t.Fatalf("Failed to create vault without mnemonic: %v", err)
+	}
+
+	vault2Dir := filepath.Join(tempDir, "vaults.d", "work")
+
+	// Simulate the vault import process
+	t.Setenv("SB_SECRET_MNEMONIC", testMnemonic)
+
+	// Get the next available derivation index for this mnemonic
+	derivationIndex, err := GetNextDerivationIndex(fs, tempDir, testMnemonic)
+	if err != nil {
+		t.Fatalf("Failed to get next derivation index: %v", err)
+	}
+
+	t.Logf("Next derivation index for import: %d", derivationIndex)
+
+	// Calculate public key hash from index 0 (same as in VaultImport)
+	identity0, err := agehd.DeriveIdentity(testMnemonic, 0)
+	if err != nil {
+		t.Fatalf("Failed to derive identity for index 0: %v", err)
+	}
+	publicKeyHash := ComputeDoubleSHA256([]byte(identity0.Recipient().String()))
+
+	// Load existing metadata and update it (same as in VaultImport)
+	existingMetadata, err := LoadVaultMetadata(fs, vault2Dir)
+	if err != nil {
+		t.Fatalf("Failed to load existing metadata: %v", err)
+	}
+
+	// Update metadata with new derivation info
+	existingMetadata.DerivationIndex = derivationIndex
+	existingMetadata.PublicKeyHash = publicKeyHash
+
+	if err := SaveVaultMetadata(fs, vault2Dir, existingMetadata); err != nil {
+		t.Fatalf("Failed to save vault metadata: %v", err)
+	}
+
+	// Load updated metadata for vault2
+	metadata2, err := LoadVaultMetadata(fs, vault2Dir)
+	if err != nil {
+		t.Fatalf("Failed to load vault2 metadata: %v", err)
+	}
+
+	t.Logf("Vault2 (imported mnemonic) - DerivationIndex: %d, PublicKeyHash: %s",
+		metadata2.DerivationIndex, metadata2.PublicKeyHash)
+
+	// Verify that both vaults have the same public key hash
+	if metadata1.PublicKeyHash != metadata2.PublicKeyHash {
+		t.Errorf("Public key hashes don't match!")
+		t.Logf("Vault1 hash: %s", metadata1.PublicKeyHash)
+		t.Logf("Vault2 hash: %s", metadata2.PublicKeyHash)
+	} else {
+		t.Logf("SUCCESS: Both vaults have the same public key hash: %s", metadata1.PublicKeyHash)
+	}
+}
+
+func TestReverseEngineerHash(t *testing.T) {
+	// This is the hash that the work vault is getting in the failing test
+	wrongHash := "e34a2f500e395d8934a90a99ee9311edcfffd68cb701079575e50cbac7bb9417"
+	correctHash := "992552b00b3879dfae461fab9a084b47784a032771c7a9accaebdde05ec7a7d1"
+
+	// Test mnemonic from integration test
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+
+	// Calculate hash for test mnemonic
+	identity, err := agehd.DeriveIdentity(testMnemonic, 0)
+	if err != nil {
+		t.Fatalf("Failed to derive identity: %v", err)
+	}
+
+	calculatedHash := ComputeDoubleSHA256([]byte(identity.Recipient().String()))
+	t.Logf("Test mnemonic hash: %s", calculatedHash)
+
+	if calculatedHash == correctHash {
+		t.Logf("✓ Test mnemonic produces the correct hash")
+	} else {
+		t.Errorf("✗ Test mnemonic does not produce the correct hash")
+	}
+
+	if calculatedHash == wrongHash {
+		t.Logf("✗ Test mnemonic unexpectedly produces the wrong hash")
+	}
+
+	// Let's try some other possibilities - maybe there's a string normalization issue?
+	variations := []string{
+		"abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about",
+		" abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about ",
+		"abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about\n",
+		strings.TrimSpace("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"),
+	}
+
+	for i, variation := range variations {
+		identity, err := agehd.DeriveIdentity(variation, 0)
+		if err != nil {
+			t.Logf("Variation %d failed: %v", i, err)
+			continue
+		}
+
+		hash := ComputeDoubleSHA256([]byte(identity.Recipient().String()))
+		t.Logf("Variation %d hash: %s", i, hash)
+
+		if hash == wrongHash {
+			t.Logf("✗ Found variation that produces wrong hash: '%s'", variation)
+		}
+	}
+
+	// Maybe let's try an empty mnemonic or something else?
+	emptyMnemonics := []string{
+		"",
+		" ",
+	}
+
+	for i, emptyMnemonic := range emptyMnemonics {
+		identity, err := agehd.DeriveIdentity(emptyMnemonic, 0)
+		if err != nil {
+			t.Logf("Empty mnemonic %d failed (expected): %v", i, err)
+			continue
+		}
+
+		hash := ComputeDoubleSHA256([]byte(identity.Recipient().String()))
+		t.Logf("Empty mnemonic %d hash: %s", i, hash)
+
+		if hash == wrongHash {
+			t.Logf("✗ Empty mnemonic produces wrong hash!")
+		}
+	}
+}

internal/vault/path_traversal_test.go

@@ -0,0 +1,96 @@
+package vault
+
+import (
+	"testing"
+
+	"git.eeqj.de/sneak/secret/internal/secret"
+	"github.com/awnumar/memguard"
+	"github.com/spf13/afero"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// TestGetSecretVersionRejectsPathTraversal verifies that GetSecretVersion
+// validates the secret name and rejects path traversal attempts.
+// This is a regression test for https://git.eeqj.de/sneak/secret/issues/13
+func TestGetSecretVersionRejectsPathTraversal(t *testing.T) {
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+	t.Setenv(secret.EnvMnemonic, testMnemonic)
+	t.Setenv(secret.EnvUnlockPassphrase, "test-passphrase")
+
+	fs := afero.NewMemMapFs()
+	stateDir := "/test/state"
+
+	vlt, err := CreateVault(fs, stateDir, "test-vault")
+	require.NoError(t, err)
+
+	// Add a legitimate secret so the vault is set up
+	value := memguard.NewBufferFromBytes([]byte("legitimate-secret"))
+	err = vlt.AddSecret("legit", value, false)
+	require.NoError(t, err)
+
+	// These names contain path traversal and should be rejected
+	maliciousNames := []string{
+		"../../../etc/passwd",
+		"..%2f..%2fetc/passwd",
+		".secret",
+		"../sibling-vault/secrets.d/target",
+		"foo/../bar",
+		"a/../../etc/passwd",
+	}
+
+	for _, name := range maliciousNames {
+		t.Run(name, func(t *testing.T) {
+			_, err := vlt.GetSecretVersion(name, "")
+			assert.Error(t, err, "GetSecretVersion should reject malicious name: %s", name)
+			assert.Contains(t, err.Error(), "invalid secret name",
+				"error should indicate invalid name for: %s", name)
+		})
+	}
+}
+
+// TestGetSecretRejectsPathTraversal verifies GetSecret (which calls GetSecretVersion)
+// also rejects path traversal names.
+func TestGetSecretRejectsPathTraversal(t *testing.T) {
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+	t.Setenv(secret.EnvMnemonic, testMnemonic)
+	t.Setenv(secret.EnvUnlockPassphrase, "test-passphrase")
+
+	fs := afero.NewMemMapFs()
+	stateDir := "/test/state"
+
+	vlt, err := CreateVault(fs, stateDir, "test-vault")
+	require.NoError(t, err)
+
+	_, err = vlt.GetSecret("../../../etc/passwd")
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "invalid secret name")
+}
+
+// TestGetSecretObjectRejectsPathTraversal verifies GetSecretObject
+// also validates names and rejects path traversal attempts.
+func TestGetSecretObjectRejectsPathTraversal(t *testing.T) {
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+	t.Setenv(secret.EnvMnemonic, testMnemonic)
+	t.Setenv(secret.EnvUnlockPassphrase, "test-passphrase")
+
+	fs := afero.NewMemMapFs()
+	stateDir := "/test/state"
+
+	vlt, err := CreateVault(fs, stateDir, "test-vault")
+	require.NoError(t, err)
+
+	maliciousNames := []string{
+		"../../../etc/passwd",
+		"foo/../bar",
+		"a/../../etc/passwd",
+	}
+
+	for _, name := range maliciousNames {
+		t.Run(name, func(t *testing.T) {
+			_, err := vlt.GetSecretObject(name)
+			assert.Error(t, err, "GetSecretObject should reject: %s", name)
+			assert.Contains(t, err.Error(), "invalid secret name")
+		})
+	}
+}

internal/vault/secrets.go

@@ -11,6 +11,7 @@ import (
 
 	"filippo.io/age"
 	"git.eeqj.de/sneak/secret/internal/secret"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 )
 
@@ -21,6 +22,7 @@ func (v *Vault) ListSecrets() ([]string, error) {
 	vaultDir, err := v.GetDirectory()
 	if err != nil {
 		secret.Debug("Failed to get vault directory for secret listing", "error", err, "vault_name", v.Name)
+
 		return nil, err
 	}
 
@@ -30,10 +32,12 @@ func (v *Vault) ListSecrets() ([]string, error) {
 	exists, err := afero.DirExists(v.fs, secretsDir)
 	if err != nil {
 		secret.Debug("Failed to check secrets directory", "error", err, "secrets_dir", secretsDir)
+
 		return nil, fmt.Errorf("failed to check if secrets directory exists: %w", err)
 	}
 	if !exists {
 		secret.Debug("Secrets directory does not exist", "secrets_dir", secretsDir, "vault_name", v.Name)
+
 		return []string{}, nil
 	}
 
@@ -41,6 +45,7 @@ func (v *Vault) ListSecrets() ([]string, error) {
 	files, err := afero.ReadDir(v.fs, secretsDir)
 	if err != nil {
 		secret.Debug("Failed to read secrets directory", "error", err, "secrets_dir", secretsDir)
+
 		return nil, fmt.Errorf("failed to read secrets directory: %w", err)
 	}
 
@@ -62,27 +67,61 @@ func (v *Vault) ListSecrets() ([]string, error) {
 	return secrets, nil
 }
 
-// isValidSecretName validates secret names according to the format [a-z0-9\.\-\_\/]+
+// isValidSecretName validates secret names according to the format [a-zA-Z0-9\.\-\_\/]+
+// but with additional restrictions:
+// - No leading or trailing slashes
+// - No double slashes
+// - No names starting with dots
 func isValidSecretName(name string) bool {
 	if name == "" {
 		return false
 	}
-	matched, _ := regexp.MatchString(`^[a-z0-9\.\-\_\/]+$`, name)
+
+	// Check for leading/trailing slashes
+	if strings.HasPrefix(name, "/") || strings.HasSuffix(name, "/") {
+		return false
+	}
+
+	// Check for double slashes
+	if strings.Contains(name, "//") {
+		return false
+	}
+
+	// Check for names starting with dot
+	if strings.HasPrefix(name, ".") {
+		return false
+	}
+
+	// Check for path traversal via ".." components
+	for _, part := range strings.Split(name, "/") {
+		if part == ".." {
+			return false
+		}
+	}
+
+	// Check the basic pattern
+	matched, _ := regexp.MatchString(`^[a-zA-Z0-9\.\-\_\/]+$`, name)
+
 	return matched
 }
 
 // AddSecret adds a secret to this vault
-func (v *Vault) AddSecret(name string, value []byte, force bool) error {
+func (v *Vault) AddSecret(name string, value *memguard.LockedBuffer, force bool) error {
+	if value == nil {
+		return fmt.Errorf("value buffer is nil")
+	}
+
 	secret.DebugWith("Adding secret to vault",
 		slog.String("vault_name", v.Name),
 		slog.String("secret_name", name),
-		slog.Int("value_length", len(value)),
+		slog.Int("value_length", value.Size()),
 		slog.Bool("force", force),
 	)
 
 	// Validate secret name
 	if !isValidSecretName(name) {
 		secret.Debug("Invalid secret name provided", "secret_name", name)
+
 		return fmt.Errorf("invalid secret name '%s': must match pattern [a-z0-9.\\-_/]+", name)
 	}
 	secret.Debug("Secret name validation passed", "secret_name", name)
@@ -91,6 +130,7 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
 	vaultDir, err := v.GetDirectory()
 	if err != nil {
 		secret.Debug("Failed to get vault directory for secret addition", "error", err, "vault_name", v.Name)
+
 		return err
 	}
 	secret.Debug("Got vault directory", "vault_dir", vaultDir)
@@ -109,24 +149,26 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
 	exists, err := afero.DirExists(v.fs, secretDir)
 	if err != nil {
 		secret.Debug("Failed to check if secret exists", "error", err, "secret_dir", secretDir)
+
 		return fmt.Errorf("failed to check if secret exists: %w", err)
 	}
 	secret.Debug("Secret existence check complete", "exists", exists)
 
 	// Handle existing secret case
 	now := time.Now()
-	var previousVersion *secret.SecretVersion
+	var previousVersion *secret.Version
 
 	if exists {
 		if !force {
 			secret.Debug("Secret already exists and force not specified", "secret_name", name, "secret_dir", secretDir)
+
 			return fmt.Errorf("secret %s already exists (use --force to overwrite)", name)
 		}
 
 		// Get the current version to update its notAfter timestamp
 		currentVersionName, err := secret.GetCurrentVersion(v.fs, secretDir)
 		if err == nil && currentVersionName != "" {
-			previousVersion = secret.NewSecretVersion(v, name, currentVersionName)
+			previousVersion = secret.NewVersion(v, name, currentVersionName)
 			// We'll need to load and update its metadata after we unlock the vault
 		}
 	} else {
@@ -134,6 +176,7 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
 		secret.Debug("Creating secret directory", "secret_dir", secretDir)
 		if err := v.fs.MkdirAll(secretDir, secret.DirPerms); err != nil {
 			secret.Debug("Failed to create secret directory", "error", err, "secret_dir", secretDir)
+
 			return fmt.Errorf("failed to create secret directory: %w", err)
 		}
 		secret.Debug("Created secret directory successfully")
@@ -143,13 +186,14 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
 	versionName, err := secret.GenerateVersionName(v.fs, secretDir)
 	if err != nil {
 		secret.Debug("Failed to generate version name", "error", err, "secret_name", name)
+
 		return fmt.Errorf("failed to generate version name: %w", err)
 	}
 
 	secret.Debug("Generated new version name", "version", versionName, "secret_name", name)
 
 	// Create new version
-	newVersion := secret.NewSecretVersion(v, name, versionName)
+	newVersion := secret.NewVersion(v, name, versionName)
 
 	// Set version timestamps
 	if previousVersion == nil {
@@ -163,9 +207,16 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
 		// We'll update the previous version's notAfter after we save the new version
 	}
 
-	// Save the new version
+	// Save the new version - pass the LockedBuffer directly
 	if err := newVersion.Save(value); err != nil {
 		secret.Debug("Failed to save new version", "error", err, "version", versionName)
+
+		// Clean up the secret directory if this was a new secret
+		if !exists {
+			secret.Debug("Cleaning up secret directory due to save failure", "secret_dir", secretDir)
+			_ = v.fs.RemoveAll(secretDir)
+		}
+
 		return fmt.Errorf("failed to save version: %w", err)
 	}
 
@@ -175,12 +226,14 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
 		ltIdentity, err := v.GetOrDeriveLongTermKey()
 		if err != nil {
 			secret.Debug("Failed to get long-term key for metadata update", "error", err)
+
 			return fmt.Errorf("failed to get long-term key: %w", err)
 		}
 
 		// Load previous version metadata
 		if err := previousVersion.LoadMetadata(ltIdentity); err != nil {
 			secret.Debug("Failed to load previous version metadata", "error", err)
+
 			return fmt.Errorf("failed to load previous version metadata: %w", err)
 		}
 
@@ -190,6 +243,7 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
 		// Re-save the metadata (we need to implement an update method)
 		if err := updateVersionMetadata(v.fs, previousVersion, ltIdentity); err != nil {
 			secret.Debug("Failed to update previous version metadata", "error", err)
+
 			return fmt.Errorf("failed to update previous version metadata: %w", err)
 		}
 	}
@@ -197,15 +251,19 @@ func (v *Vault) AddSecret(name string, value []byte, force bool) error {
 	// Set current symlink to new version
 	if err := secret.SetCurrentVersion(v.fs, secretDir, versionName); err != nil {
 		secret.Debug("Failed to set current version", "error", err, "version", versionName)
+
 		return fmt.Errorf("failed to set current version: %w", err)
 	}
 
-	secret.Debug("Successfully added secret version to vault", "secret_name", name, "version", versionName, "vault_name", v.Name)
+	secret.Debug("Successfully added secret version to vault",
+		"secret_name", name, "version", versionName,
+		"vault_name", v.Name)
+
 	return nil
 }
 
 // updateVersionMetadata updates the metadata of an existing version
-func updateVersionMetadata(fs afero.Fs, version *secret.SecretVersion, ltIdentity *age.X25519Identity) error {
+func updateVersionMetadata(fs afero.Fs, version *secret.Version, ltIdentity *age.X25519Identity) error {
 	// Read the version's encrypted private key
 	encryptedPrivKeyPath := filepath.Join(version.Directory, "priv.age")
 	encryptedPrivKey, err := afero.ReadFile(fs, encryptedPrivKeyPath)
@@ -214,13 +272,14 @@ func updateVersionMetadata(fs afero.Fs, version *secret.SecretVersion, ltIdentit
 	}
 
 	// Decrypt version private key using long-term key
-	versionPrivKeyData, err := secret.DecryptWithIdentity(encryptedPrivKey, ltIdentity)
+	versionPrivKeyBuffer, err := secret.DecryptWithIdentity(encryptedPrivKey, ltIdentity)
 	if err != nil {
 		return fmt.Errorf("failed to decrypt version private key: %w", err)
 	}
+	defer versionPrivKeyBuffer.Destroy()
 
 	// Parse version private key
-	versionIdentity, err := age.ParseX25519Identity(string(versionPrivKeyData))
+	versionIdentity, err := age.ParseX25519Identity(versionPrivKeyBuffer.String())
 	if err != nil {
 		return fmt.Errorf("failed to parse version private key: %w", err)
 	}
@@ -232,7 +291,10 @@ func updateVersionMetadata(fs afero.Fs, version *secret.SecretVersion, ltIdentit
 	}
 
 	// Encrypt metadata to the version's public key
-	encryptedMetadata, err := secret.EncryptToRecipient(metadataBytes, versionIdentity.Recipient())
+	metadataBuffer := memguard.NewBufferFromBytes(metadataBytes)
+	defer metadataBuffer.Destroy()
+
+	encryptedMetadata, err := secret.EncryptToRecipient(metadataBuffer, versionIdentity.Recipient())
 	if err != nil {
 		return fmt.Errorf("failed to encrypt version metadata: %w", err)
 	}
@@ -264,10 +326,18 @@ func (v *Vault) GetSecretVersion(name string, version string) ([]byte, error) {
 		slog.String("version", version),
 	)
 
+	// Validate secret name to prevent path traversal
+	if !isValidSecretName(name) {
+		secret.Debug("Invalid secret name provided", "secret_name", name)
+
+		return nil, fmt.Errorf("invalid secret name '%s': must match pattern [a-z0-9.\\-_/]+", name)
+	}
+
 	// Get vault directory
 	vaultDir, err := v.GetDirectory()
 	if err != nil {
 		secret.Debug("Failed to get vault directory", "error", err, "vault_name", v.Name)
+
 		return nil, err
 	}
 
@@ -279,10 +349,12 @@ func (v *Vault) GetSecretVersion(name string, version string) ([]byte, error) {
 	exists, err := afero.DirExists(v.fs, secretDir)
 	if err != nil {
 		secret.Debug("Failed to check if secret exists", "error", err, "secret_name", name)
+
 		return nil, fmt.Errorf("failed to check if secret exists: %w", err)
 	}
 	if !exists {
 		secret.Debug("Secret not found in vault", "secret_name", name, "vault_name", v.Name)
+
 		return nil, fmt.Errorf("secret %s not found", name)
 	}
 
@@ -292,6 +364,7 @@ func (v *Vault) GetSecretVersion(name string, version string) ([]byte, error) {
 		currentVersion, err := secret.GetCurrentVersion(v.fs, secretDir)
 		if err != nil {
 			secret.Debug("Failed to get current version", "error", err, "secret_name", name)
+
 			return nil, fmt.Errorf("failed to get current version: %w", err)
 		}
 		version = currentVersion
@@ -299,17 +372,19 @@ func (v *Vault) GetSecretVersion(name string, version string) ([]byte, error) {
 	}
 
 	// Create version object
-	secretVersion := secret.NewSecretVersion(v, name, version)
+	secretVersion := secret.NewVersion(v, name, version)
 
 	// Check if version exists
 	versionPath := filepath.Join(secretDir, "versions", version)
 	exists, err = afero.DirExists(v.fs, versionPath)
 	if err != nil {
 		secret.Debug("Failed to check if version exists", "error", err, "version", version)
+
 		return nil, fmt.Errorf("failed to check if version exists: %w", err)
 	}
 	if !exists {
 		secret.Debug("Version not found", "version", version, "secret_name", name)
+
 		return nil, fmt.Errorf("version %s not found for secret %s", version, name)
 	}
 
@@ -319,6 +394,7 @@ func (v *Vault) GetSecretVersion(name string, version string) ([]byte, error) {
 	longTermIdentity, err := v.UnlockVault()
 	if err != nil {
 		secret.Debug("Failed to unlock vault", "error", err, "vault_name", v.Name)
+
 		return nil, fmt.Errorf("failed to unlock vault: %w", err)
 	}
 
@@ -330,20 +406,34 @@ func (v *Vault) GetSecretVersion(name string, version string) ([]byte, error) {
 	)
 
 	// Get the version's value
+	secret.Debug("About to call secretVersion.GetValue", "version", version, "secret_name", name)
 	decryptedValue, err := secretVersion.GetValue(longTermIdentity)
 	if err != nil {
 		secret.Debug("Failed to decrypt version value", "error", err, "version", version, "secret_name", name)
+
 		return nil, fmt.Errorf("failed to decrypt version: %w", err)
 	}
 
+	// Create a copy to return since the buffer will be destroyed
+	result := make([]byte, decryptedValue.Size())
+	copy(result, decryptedValue.Bytes())
+	decryptedValue.Destroy()
+
 	secret.DebugWith("Successfully decrypted secret version",
 		slog.String("secret_name", name),
 		slog.String("version", version),
 		slog.String("vault_name", v.Name),
-		slog.Int("decrypted_length", len(decryptedValue)),
+		slog.Int("decrypted_length", len(result)),
 	)
 
-	return decryptedValue, nil
+	// Debug: Log metadata about the decrypted value without exposing the actual secret
+	secret.Debug("Vault secret decryption debug info",
+		"secret_name", name,
+		"version", version,
+		"decrypted_value_length", len(result),
+		"is_empty", len(result) == 0)
+
+	return result, nil
 }
 
 // UnlockVault unlocks the vault and returns the long-term private key
@@ -353,6 +443,7 @@ func (v *Vault) UnlockVault() (*age.X25519Identity, error) {
 	// If vault is already unlocked, return the cached key
 	if !v.Locked() {
 		secret.Debug("Vault already unlocked, returning cached long-term key", "vault_name", v.Name)
+
 		return v.longTermKey, nil
 	}
 
@@ -360,6 +451,7 @@ func (v *Vault) UnlockVault() (*age.X25519Identity, error) {
 	longTermIdentity, err := v.GetOrDeriveLongTermKey()
 	if err != nil {
 		secret.Debug("Failed to get or derive long-term key", "error", err, "vault_name", v.Name)
+
 		return nil, fmt.Errorf("failed to get long-term key: %w", err)
 	}
 
@@ -376,6 +468,10 @@ func (v *Vault) UnlockVault() (*age.X25519Identity, error) {
 
 // GetSecretObject retrieves a Secret object with metadata loaded from this vault
 func (v *Vault) GetSecretObject(name string) (*secret.Secret, error) {
+	if !isValidSecretName(name) {
+		return nil, fmt.Errorf("invalid secret name: %s", name)
+	}
+
 	// First check if the secret exists by checking for the metadata file
 	vaultDir, err := v.GetDirectory()
 	if err != nil {
@@ -405,3 +501,158 @@ func (v *Vault) GetSecretObject(name string) (*secret.Secret, error) {
 
 	return secretObj, nil
 }
+
+// CopySecretVersion copies a single version from source to this vault
+// It decrypts the value using srcIdentity and re-encrypts for this vault
+func (v *Vault) CopySecretVersion(
+	srcVersion *secret.Version,
+	srcIdentity *age.X25519Identity,
+	destSecretName string,
+	destVersionName string,
+) error {
+	secret.DebugWith("Copying secret version to vault",
+		slog.String("src_secret", srcVersion.SecretName),
+		slog.String("src_version", srcVersion.Version),
+		slog.String("dest_vault", v.Name),
+		slog.String("dest_secret", destSecretName),
+		slog.String("dest_version", destVersionName),
+	)
+
+	// Get the decrypted value from source
+	valueBuffer, err := srcVersion.GetValue(srcIdentity)
+	if err != nil {
+		return fmt.Errorf("failed to decrypt source version: %w", err)
+	}
+	defer valueBuffer.Destroy()
+
+	// Load source metadata
+	if err := srcVersion.LoadMetadata(srcIdentity); err != nil {
+		return fmt.Errorf("failed to load source metadata: %w", err)
+	}
+
+	// Create destination version with same name
+	destVersion := secret.NewVersion(v, destSecretName, destVersionName)
+
+	// Copy metadata (preserve original timestamps)
+	destVersion.Metadata = srcVersion.Metadata
+
+	// Save the version (encrypts to this vault's LT key)
+	if err := destVersion.Save(valueBuffer); err != nil {
+		return fmt.Errorf("failed to save destination version: %w", err)
+	}
+
+	secret.Debug("Successfully copied secret version",
+		"src_version", srcVersion.Version,
+		"dest_version", destVersionName,
+		"dest_vault", v.Name)
+
+	return nil
+}
+
+// CopySecretAllVersions copies all versions of a secret from source vault to this vault
+// It re-encrypts each version with this vault's long-term key
+func (v *Vault) CopySecretAllVersions(
+	srcVault *Vault,
+	srcSecretName string,
+	destSecretName string,
+	force bool,
+) error {
+	secret.DebugWith("Copying all secret versions between vaults",
+		slog.String("src_vault", srcVault.Name),
+		slog.String("src_secret", srcSecretName),
+		slog.String("dest_vault", v.Name),
+		slog.String("dest_secret", destSecretName),
+		slog.Bool("force", force),
+	)
+
+	// Get destination vault directory
+	destVaultDir, err := v.GetDirectory()
+	if err != nil {
+		return fmt.Errorf("failed to get destination vault directory: %w", err)
+	}
+
+	// Check if destination secret already exists
+	destStorageName := strings.ReplaceAll(destSecretName, "/", "%")
+	destSecretDir := filepath.Join(destVaultDir, "secrets.d", destStorageName)
+
+	exists, err := afero.DirExists(v.fs, destSecretDir)
+	if err != nil {
+		return fmt.Errorf("failed to check destination: %w", err)
+	}
+
+	if exists && !force {
+		return fmt.Errorf("secret '%s' already exists in vault '%s' (use --force to overwrite)",
+			destSecretName, v.Name)
+	}
+
+	if exists && force {
+		// Remove existing secret
+		secret.Debug("Removing existing destination secret", "path", destSecretDir)
+		if err := v.fs.RemoveAll(destSecretDir); err != nil {
+			return fmt.Errorf("failed to remove existing destination secret: %w", err)
+		}
+	}
+
+	// Get source vault's long-term key
+	srcIdentity, err := srcVault.GetOrDeriveLongTermKey()
+	if err != nil {
+		return fmt.Errorf("failed to unlock source vault '%s': %w", srcVault.Name, err)
+	}
+
+	// Get source secret directory
+	srcVaultDir, err := srcVault.GetDirectory()
+	if err != nil {
+		return fmt.Errorf("failed to get source vault directory: %w", err)
+	}
+
+	srcStorageName := strings.ReplaceAll(srcSecretName, "/", "%")
+	srcSecretDir := filepath.Join(srcVaultDir, "secrets.d", srcStorageName)
+
+	// List all versions
+	versions, err := secret.ListVersions(srcVault.fs, srcSecretDir)
+	if err != nil {
+		return fmt.Errorf("failed to list source versions: %w", err)
+	}
+
+	if len(versions) == 0 {
+		return fmt.Errorf("source secret '%s' has no versions", srcSecretName)
+	}
+
+	// Get current version name
+	currentVersion, err := secret.GetCurrentVersion(srcVault.fs, srcSecretDir)
+	if err != nil {
+		return fmt.Errorf("failed to get current version: %w", err)
+	}
+
+	// Create destination secret directory
+	if err := v.fs.MkdirAll(destSecretDir, secret.DirPerms); err != nil {
+		return fmt.Errorf("failed to create destination secret directory: %w", err)
+	}
+
+	// Copy each version
+	for _, versionName := range versions {
+		srcVersion := secret.NewVersion(srcVault, srcSecretName, versionName)
+		if err := v.CopySecretVersion(srcVersion, srcIdentity, destSecretName, versionName); err != nil {
+			// Rollback: remove partial copy
+			secret.Debug("Rolling back partial copy due to error", "error", err)
+			_ = v.fs.RemoveAll(destSecretDir)
+
+			return fmt.Errorf("failed to copy version %s: %w", versionName, err)
+		}
+	}
+
+	// Set current version
+	if err := secret.SetCurrentVersion(v.fs, destSecretDir, currentVersion); err != nil {
+		_ = v.fs.RemoveAll(destSecretDir)
+
+		return fmt.Errorf("failed to set current version: %w", err)
+	}
+
+	secret.DebugWith("Successfully copied all secret versions",
+		slog.String("src_vault", srcVault.Name),
+		slog.String("dest_vault", v.Name),
+		slog.Int("version_count", len(versions)),
+	)
+
+	return nil
+}

internal/vault/secrets_name_test.go

@@ -0,0 +1,42 @@
+package vault
+
+import "testing"
+
+func TestIsValidSecretNameUppercase(t *testing.T) {
+	tests := []struct {
+		name  string
+		valid bool
+	}{
+		// Lowercase (existing behavior)
+		{"valid-name", true},
+		{"valid.name", true},
+		{"valid_name", true},
+		{"valid/path/name", true},
+		{"123valid", true},
+
+		// Uppercase (new behavior - issue #2)
+		{"Valid-Upper-Name", true},
+		{"2025-11-21-ber1app1-vaultik-test-bucket-AKI", true},
+		{"MixedCase/Path/Name", true},
+		{"ALLUPPERCASE", true},
+		{"ABC123", true},
+
+		// Still invalid
+		{"", false},
+		{"invalid name", false},
+		{"invalid@name", false},
+		{".dotstart", false},
+		{"/leading-slash", false},
+		{"trailing-slash/", false},
+		{"double//slash", false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := isValidSecretName(tt.name)
+			if result != tt.valid {
+				t.Errorf("isValidSecretName(%q) = %v, want %v", tt.name, result, tt.valid)
+			}
+		})
+	}
+}

internal/vault/secrets_version_test.go

@@ -1,3 +1,20 @@
+// Vault-Level Version Operation Tests
+//
+// Integration tests for vault-level version operations:
+//
+// - TestVaultAddSecretCreatesVersion: Tests that AddSecret creates proper version structure
+// - TestVaultAddSecretMultipleVersions: Tests creating multiple versions with force flag
+// - TestVaultGetSecretVersion: Tests retrieving specific versions and current version
+// - TestVaultVersionTimestamps: Tests timestamp logic (notBefore/notAfter) across versions
+// - TestVaultGetNonExistentVersion: Tests error handling for invalid versions
+// - TestUpdateVersionMetadata: Tests metadata update functionality
+//
+// Version Management:
+// - List versions in reverse chronological order
+// - Promote any version to current
+// - Promotion doesn't modify timestamps
+// - Metadata remains encrypted and intact
+
 package vault
 
 import (
@@ -7,11 +24,21 @@ import (
 
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+// Helper function to add a secret to vault with proper buffer protection
+func addTestSecretToVault(t *testing.T, vault *Vault, name string, value []byte, force bool) {
+	t.Helper()
+	buffer := memguard.NewBufferFromBytes(value)
+	defer buffer.Destroy()
+	err := vault.AddSecret(name, buffer, force)
+	require.NoError(t, err)
+}
+
 // Helper function to create a vault with long-term key set up
 func createTestVaultWithKey(t *testing.T, fs afero.Fs, stateDir, vaultName string) *Vault {
 	// Set mnemonic for testing
@@ -29,7 +56,7 @@ func createTestVaultWithKey(t *testing.T, fs afero.Fs, stateDir, vaultName strin
 	// Store long-term public key in vault
 	vaultDir, _ := vault.GetDirectory()
 	ltPubKeyPath := filepath.Join(vaultDir, "pub.age")
-	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0600)
+	err = afero.WriteFile(fs, ltPubKeyPath, []byte(ltIdentity.Recipient().String()), 0o600)
 	require.NoError(t, err)
 
 	// Unlock the vault with the derived key
@@ -48,9 +75,10 @@ func TestVaultAddSecretCreatesVersion(t *testing.T) {
 	// Add a secret
 	secretName := "test/secret"
 	secretValue := []byte("initial-value")
+	expectedValue := make([]byte, len(secretValue))
+	copy(expectedValue, secretValue)
 
-	err := vault.AddSecret(secretName, secretValue, false)
+	addTestSecretToVault(t, vault, secretName, secretValue, false)
-	require.NoError(t, err)
 
 	// Check that version directory was created
 	vaultDir, _ := vault.GetDirectory()
@@ -71,7 +99,7 @@ func TestVaultAddSecretCreatesVersion(t *testing.T) {
 	// Get the secret value
 	retrievedValue, err := vault.GetSecret(secretName)
 	require.NoError(t, err)
-	assert.Equal(t, secretValue, retrievedValue)
+	assert.Equal(t, expectedValue, retrievedValue)
 }
 
 func TestVaultAddSecretMultipleVersions(t *testing.T) {
@@ -84,17 +112,17 @@ func TestVaultAddSecretMultipleVersions(t *testing.T) {
 	secretName := "test/secret"
 
 	// Add first version
-	err := vault.AddSecret(secretName, []byte("version-1"), false)
+	addTestSecretToVault(t, vault, secretName, []byte("version-1"), false)
-	require.NoError(t, err)
 
 	// Try to add again without force - should fail
-	err = vault.AddSecret(secretName, []byte("version-2"), false)
+	failBuffer := memguard.NewBufferFromBytes([]byte("version-2"))
+	defer failBuffer.Destroy()
+	err := vault.AddSecret(secretName, failBuffer, false)
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "already exists")
 
 	// Add with force - should create new version
-	err = vault.AddSecret(secretName, []byte("version-2"), true)
+	addTestSecretToVault(t, vault, secretName, []byte("version-2"), true)
-	require.NoError(t, err)
 
 	// Check that we have two versions
 	vaultDir, _ := vault.GetDirectory()
@@ -119,14 +147,12 @@ func TestVaultGetSecretVersion(t *testing.T) {
 	secretName := "test/secret"
 
 	// Add multiple versions
-	err := vault.AddSecret(secretName, []byte("version-1"), false)
+	addTestSecretToVault(t, vault, secretName, []byte("version-1"), false)
-	require.NoError(t, err)
 
 	// Small delay to ensure different version names
 	time.Sleep(10 * time.Millisecond)
 
-	err = vault.AddSecret(secretName, []byte("version-2"), true)
+	addTestSecretToVault(t, vault, secretName, []byte("version-2"), true)
-	require.NoError(t, err)
 
 	// Get versions list
 	vaultDir, _ := vault.GetDirectory()
@@ -168,7 +194,9 @@ func TestVaultVersionTimestamps(t *testing.T) {
 
 	// Add first version
 	beforeFirst := time.Now()
-	err = vault.AddSecret(secretName, []byte("version-1"), false)
+	v1Buffer := memguard.NewBufferFromBytes([]byte("version-1"))
+	defer v1Buffer.Destroy()
+	err = vault.AddSecret(secretName, v1Buffer, false)
 	require.NoError(t, err)
 	afterFirst := time.Now()
 
@@ -179,7 +207,7 @@ func TestVaultVersionTimestamps(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, versions, 1)
 
-	firstVersion := secret.NewSecretVersion(vault, secretName, versions[0])
+	firstVersion := secret.NewVersion(vault, secretName, versions[0])
 	err = firstVersion.LoadMetadata(ltIdentity)
 	require.NoError(t, err)
 
@@ -195,8 +223,7 @@ func TestVaultVersionTimestamps(t *testing.T) {
 	// Add second version
 	time.Sleep(10 * time.Millisecond)
 	beforeSecond := time.Now()
-	err = vault.AddSecret(secretName, []byte("version-2"), true)
+	addTestSecretToVault(t, vault, secretName, []byte("version-2"), true)
-	require.NoError(t, err)
 	afterSecond := time.Now()
 
 	// Get updated versions
@@ -205,7 +232,7 @@ func TestVaultVersionTimestamps(t *testing.T) {
 	require.Len(t, versions, 2)
 
 	// Reload first version metadata (should have notAfter now)
-	firstVersion = secret.NewSecretVersion(vault, secretName, versions[1])
+	firstVersion = secret.NewVersion(vault, secretName, versions[1])
 	err = firstVersion.LoadMetadata(ltIdentity)
 	require.NoError(t, err)
 
@@ -214,7 +241,7 @@ func TestVaultVersionTimestamps(t *testing.T) {
 	assert.True(t, firstVersion.Metadata.NotAfter.Before(afterSecond.Add(time.Second)))
 
 	// Check second version timestamps
-	secondVersion := secret.NewSecretVersion(vault, secretName, versions[0])
+	secondVersion := secret.NewVersion(vault, secretName, versions[0])
 	err = secondVersion.LoadMetadata(ltIdentity)
 	require.NoError(t, err)
 
@@ -232,11 +259,10 @@ func TestVaultGetNonExistentVersion(t *testing.T) {
 	vault := createTestVaultWithKey(t, fs, stateDir, "test")
 
 	// Add a secret
-	err := vault.AddSecret("test/secret", []byte("value"), false)
+	addTestSecretToVault(t, vault, "test/secret", []byte("value"), false)
-	require.NoError(t, err)
 
 	// Try to get non-existent version
-	_, err = vault.GetSecretVersion("test/secret", "20991231.999")
+	_, err := vault.GetSecretVersion("test/secret", "20991231.999")
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "not found")
 }
@@ -255,7 +281,7 @@ func TestUpdateVersionMetadata(t *testing.T) {
 	// Create a version manually to test updateVersionMetadata
 	secretName := "test/secret"
 	versionName := "20231215.001"
-	version := secret.NewSecretVersion(vault, secretName, versionName)
+	version := secret.NewVersion(vault, secretName, versionName)
 
 	// Set initial metadata
 	now := time.Now()
@@ -264,7 +290,9 @@ func TestUpdateVersionMetadata(t *testing.T) {
 	version.Metadata.NotAfter = nil
 
 	// Save version
-	err = version.Save([]byte("test-value"))
+	testBuffer := memguard.NewBufferFromBytes([]byte("test-value"))
+	defer testBuffer.Destroy()
+	err = version.Save(testBuffer)
 	require.NoError(t, err)
 
 	// Update metadata
@@ -273,7 +301,7 @@ func TestUpdateVersionMetadata(t *testing.T) {
 	require.NoError(t, err)
 
 	// Load and verify
-	version2 := secret.NewSecretVersion(vault, secretName, versionName)
+	version2 := secret.NewVersion(vault, secretName, versionName)
 	err = version2.LoadMetadata(ltIdentity)
 	require.NoError(t, err)
 

internal/vault/unlockers.go

@@ -10,6 +10,7 @@ import (
 
 	"filippo.io/age"
 	"git.eeqj.de/sneak/secret/internal/secret"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 )
 
@@ -20,6 +21,7 @@ func (v *Vault) GetCurrentUnlocker() (secret.Unlocker, error) {
 	vaultDir, err := v.GetDirectory()
 	if err != nil {
 		secret.Debug("Failed to get vault directory for unlocker", "error", err, "vault_name", v.Name)
+
 		return nil, err
 	}
 
@@ -29,28 +31,14 @@ func (v *Vault) GetCurrentUnlocker() (secret.Unlocker, error) {
 	_, err = v.fs.Stat(currentUnlockerPath)
 	if err != nil {
 		secret.Debug("Failed to stat current unlocker symlink", "error", err, "path", currentUnlockerPath)
+
 		return nil, fmt.Errorf("failed to read current unlocker: %w", err)
 	}
 
 	// Resolve the symlink to get the target directory
-	var unlockerDir string
+	unlockerDir, err := v.resolveUnlockerDirectory(currentUnlockerPath)
-	if _, ok := v.fs.(*afero.OsFs); ok {
+	if err != nil {
-		secret.Debug("Resolving unlocker symlink (real filesystem)")
+		return nil, err
-		// For real filesystems, resolve the symlink properly
-		unlockerDir, err = ResolveVaultSymlink(v.fs, currentUnlockerPath)
-		if err != nil {
-			secret.Debug("Failed to resolve unlocker symlink", "error", err, "symlink_path", currentUnlockerPath)
-			return nil, fmt.Errorf("failed to resolve current unlocker symlink: %w", err)
-		}
-	} else {
-		secret.Debug("Reading unlocker path (mock filesystem)")
-		// Fallback for mock filesystems: read the path from file contents
-		unlockerDirBytes, err := afero.ReadFile(v.fs, currentUnlockerPath)
-		if err != nil {
-			secret.Debug("Failed to read unlocker path file", "error", err, "path", currentUnlockerPath)
-			return nil, fmt.Errorf("failed to read current unlocker: %w", err)
-		}
-		unlockerDir = strings.TrimSpace(string(unlockerDirBytes))
 	}
 
 	secret.DebugWith("Resolved unlocker directory",
@@ -65,17 +53,18 @@ func (v *Vault) GetCurrentUnlocker() (secret.Unlocker, error) {
 	metadataBytes, err := afero.ReadFile(v.fs, metadataPath)
 	if err != nil {
 		secret.Debug("Failed to read unlocker metadata", "error", err, "path", metadataPath)
+
 		return nil, fmt.Errorf("failed to read unlocker metadata: %w", err)
 	}
 
 	var metadata UnlockerMetadata
 	if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
 		secret.Debug("Failed to parse unlocker metadata", "error", err, "path", metadataPath)
+
 		return nil, fmt.Errorf("failed to parse unlocker metadata: %w", err)
 	}
 
 	secret.DebugWith("Parsed unlocker metadata",
-		slog.String("unlocker_id", metadata.ID),
 		slog.String("unlocker_type", metadata.Type),
 		slog.Time("created_at", metadata.CreatedAt),
 		slog.Any("flags", metadata.Flags),
@@ -83,20 +72,23 @@ func (v *Vault) GetCurrentUnlocker() (secret.Unlocker, error) {
 
 	// Create unlocker instance using direct constructors with filesystem
 	var unlocker secret.Unlocker
-	// Convert our metadata to secret.UnlockerMetadata
+	// Use metadata directly as it's already the correct type
-	secretMetadata := secret.UnlockerMetadata(metadata)
 	switch metadata.Type {
 	case "passphrase":
-		secret.Debug("Creating passphrase unlocker instance", "unlocker_id", metadata.ID)
+		secret.Debug("Creating passphrase unlocker instance", "unlocker_type", metadata.Type)
-		unlocker = secret.NewPassphraseUnlocker(v.fs, unlockerDir, secretMetadata)
+		unlocker = secret.NewPassphraseUnlocker(v.fs, unlockerDir, metadata)
 	case "pgp":
-		secret.Debug("Creating PGP unlocker instance", "unlocker_id", metadata.ID)
+		secret.Debug("Creating PGP unlocker instance", "unlocker_type", metadata.Type)
-		unlocker = secret.NewPGPUnlocker(v.fs, unlockerDir, secretMetadata)
+		unlocker = secret.NewPGPUnlocker(v.fs, unlockerDir, metadata)
 	case "keychain":
-		secret.Debug("Creating keychain unlocker instance", "unlocker_id", metadata.ID)
+		secret.Debug("Creating keychain unlocker instance", "unlocker_type", metadata.Type)
-		unlocker = secret.NewKeychainUnlocker(v.fs, unlockerDir, secretMetadata)
+		unlocker = secret.NewKeychainUnlocker(v.fs, unlockerDir, metadata)
+	case "secure-enclave":
+		secret.Debug("Creating secure enclave unlocker instance", "unlocker_type", metadata.Type)
+		unlocker = secret.NewSecureEnclaveUnlocker(v.fs, unlockerDir, metadata)
 	default:
-		secret.Debug("Unsupported unlocker type", "type", metadata.Type, "unlocker_id", metadata.ID)
+		secret.Debug("Unsupported unlocker type", "type", metadata.Type)
+
 		return nil, fmt.Errorf("unsupported unlocker type: %s", metadata.Type)
 	}
 
@@ -109,6 +101,89 @@ func (v *Vault) GetCurrentUnlocker() (secret.Unlocker, error) {
 	return unlocker, nil
 }
 
+// resolveUnlockerDirectory reads the current-unlocker file to get the unlocker directory path
+// The file contains just the unlocker name (e.g., "passphrase")
+func (v *Vault) resolveUnlockerDirectory(currentUnlockerPath string) (string, error) {
+	secret.Debug("Reading current-unlocker file", "path", currentUnlockerPath)
+
+	unlockerNameBytes, err := afero.ReadFile(v.fs, currentUnlockerPath)
+	if err != nil {
+		secret.Debug("Failed to read current-unlocker file", "error", err, "path", currentUnlockerPath)
+
+		return "", fmt.Errorf("failed to read current unlocker: %w", err)
+	}
+
+	unlockerName := strings.TrimSpace(string(unlockerNameBytes))
+	secret.Debug("Read unlocker name from file", "unlocker_name", unlockerName)
+
+	// Resolve to absolute path: vaultDir/unlockers.d/unlockerName
+	vaultDir := filepath.Dir(currentUnlockerPath)
+	absolutePath := filepath.Join(vaultDir, "unlockers.d", unlockerName)
+
+	secret.Debug("Resolved to absolute path", "absolute_path", absolutePath)
+
+	return absolutePath, nil
+}
+
+// findUnlockerByID finds an unlocker by its ID and returns the unlocker instance and its directory path
+func (v *Vault) findUnlockerByID(unlockersDir, unlockerID string) (secret.Unlocker, string, error) {
+	files, err := afero.ReadDir(v.fs, unlockersDir)
+	if err != nil {
+		return nil, "", fmt.Errorf("failed to read unlockers directory: %w", err)
+	}
+
+	for _, file := range files {
+		if !file.IsDir() {
+			continue
+		}
+
+		// Read metadata file
+		metadataPath := filepath.Join(unlockersDir, file.Name(), "unlocker-metadata.json")
+		exists, err := afero.Exists(v.fs, metadataPath)
+		if err != nil {
+			return nil, "", fmt.Errorf("failed to check if metadata exists for unlocker %s: %w", file.Name(), err)
+		}
+		if !exists {
+			// Skip directories without metadata - they might not be unlockers
+			continue
+		}
+
+		metadataBytes, err := afero.ReadFile(v.fs, metadataPath)
+		if err != nil {
+			return nil, "", fmt.Errorf("failed to read metadata for unlocker %s: %w", file.Name(), err)
+		}
+
+		var metadata UnlockerMetadata
+		if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
+			return nil, "", fmt.Errorf("failed to parse metadata for unlocker %s: %w", file.Name(), err)
+		}
+
+		unlockerDirPath := filepath.Join(unlockersDir, file.Name())
+
+		// Create the appropriate unlocker instance
+		var tempUnlocker secret.Unlocker
+		switch metadata.Type {
+		case "passphrase":
+			tempUnlocker = secret.NewPassphraseUnlocker(v.fs, unlockerDirPath, metadata)
+		case "pgp":
+			tempUnlocker = secret.NewPGPUnlocker(v.fs, unlockerDirPath, metadata)
+		case "keychain":
+			tempUnlocker = secret.NewKeychainUnlocker(v.fs, unlockerDirPath, metadata)
+		case "secure-enclave":
+			tempUnlocker = secret.NewSecureEnclaveUnlocker(v.fs, unlockerDirPath, metadata)
+		default:
+			continue
+		}
+
+		// Check if this unlocker's ID matches
+		if tempUnlocker.GetID() == unlockerID {
+			return tempUnlocker, unlockerDirPath, nil
+		}
+	}
+
+	return nil, "", nil
+}
+
 // ListUnlockers returns a list of available unlockers for this vault
 func (v *Vault) ListUnlockers() ([]UnlockerMetadata, error) {
 	vaultDir, err := v.GetDirectory()
@@ -140,20 +215,22 @@ func (v *Vault) ListUnlockers() ([]UnlockerMetadata, error) {
 			metadataPath := filepath.Join(unlockersDir, file.Name(), "unlocker-metadata.json")
 			exists, err := afero.Exists(v.fs, metadataPath)
 			if err != nil {
-				continue
+				return nil, fmt.Errorf("failed to check if metadata exists for unlocker %s: %w", file.Name(), err)
 			}
 			if !exists {
+				secret.Warn("Skipping unlocker directory with missing metadata file", "directory", file.Name())
+
 				continue
 			}
 
 			metadataBytes, err := afero.ReadFile(v.fs, metadataPath)
 			if err != nil {
-				continue
+				return nil, fmt.Errorf("failed to read metadata for unlocker %s: %w", file.Name(), err)
 			}
 
 			var metadata UnlockerMetadata
 			if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
-				continue
+				return nil, fmt.Errorf("failed to parse metadata for unlocker %s: %w", file.Name(), err)
 			}
 
 			unlockers = append(unlockers, metadata)
@@ -173,53 +250,10 @@ func (v *Vault) RemoveUnlocker(unlockerID string) error {
 	// Find the unlocker directory and create the unlocker instance
 	unlockersDir := filepath.Join(vaultDir, "unlockers.d")
 
-	// List directories in unlockers.d
+	// Find the unlocker by ID
-	files, err := afero.ReadDir(v.fs, unlockersDir)
+	unlocker, _, err := v.findUnlockerByID(unlockersDir, unlockerID)
 	if err != nil {
-		return fmt.Errorf("failed to read unlockers directory: %w", err)
+		return err
-	}
-
-	var unlocker secret.Unlocker
-	var unlockerDirPath string
-	for _, file := range files {
-		if file.IsDir() {
-			// Read metadata file
-			metadataPath := filepath.Join(unlockersDir, file.Name(), "unlocker-metadata.json")
-			exists, err := afero.Exists(v.fs, metadataPath)
-			if err != nil || !exists {
-				continue
-			}
-
-			metadataBytes, err := afero.ReadFile(v.fs, metadataPath)
-			if err != nil {
-				continue
-			}
-
-			var metadata UnlockerMetadata
-			if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
-				continue
-			}
-
-			if metadata.ID == unlockerID {
-				unlockerDirPath = filepath.Join(unlockersDir, file.Name())
-
-				// Convert our metadata to secret.UnlockerMetadata
-				secretMetadata := secret.UnlockerMetadata(metadata)
-
-				// Create the appropriate unlocker instance
-				switch metadata.Type {
-				case "passphrase":
-					unlocker = secret.NewPassphraseUnlocker(v.fs, unlockerDirPath, secretMetadata)
-				case "pgp":
-					unlocker = secret.NewPGPUnlocker(v.fs, unlockerDirPath, secretMetadata)
-				case "keychain":
-					unlocker = secret.NewKeychainUnlocker(v.fs, unlockerDirPath, secretMetadata)
-				default:
-					return fmt.Errorf("unsupported unlocker type: %s", metadata.Type)
-				}
-				break
-			}
-		}
 	}
 
 	if unlocker == nil {
@@ -240,66 +274,49 @@ func (v *Vault) SelectUnlocker(unlockerID string) error {
 	// Find the unlocker directory by ID
 	unlockersDir := filepath.Join(vaultDir, "unlockers.d")
 
-	// List directories in unlockers.d to find the unlocker
+	// Find the unlocker by ID
-	files, err := afero.ReadDir(v.fs, unlockersDir)
+	_, targetUnlockerDir, err := v.findUnlockerByID(unlockersDir, unlockerID)
 	if err != nil {
-		return fmt.Errorf("failed to read unlockers directory: %w", err)
+		return err
-	}
-
-	var targetUnlockerDir string
-	for _, file := range files {
-		if file.IsDir() {
-			// Read metadata file
-			metadataPath := filepath.Join(unlockersDir, file.Name(), "unlocker-metadata.json")
-			exists, err := afero.Exists(v.fs, metadataPath)
-			if err != nil || !exists {
-				continue
-			}
-
-			metadataBytes, err := afero.ReadFile(v.fs, metadataPath)
-			if err != nil {
-				continue
-			}
-
-			var metadata UnlockerMetadata
-			if err := json.Unmarshal(metadataBytes, &metadata); err != nil {
-				continue
-			}
-
-			if metadata.ID == unlockerID {
-				targetUnlockerDir = filepath.Join(unlockersDir, file.Name())
-				break
-			}
-		}
 	}
 
 	if targetUnlockerDir == "" {
 		return fmt.Errorf("unlocker with ID %s not found", unlockerID)
 	}
 
-	// Create/update current unlocker symlink
+	// Create/update current-unlocker file with just the unlocker name
 	currentUnlockerPath := filepath.Join(vaultDir, "current-unlocker")
 
-	// Remove existing symlink if it exists
+	// Remove existing file if it exists
-	if exists, _ := afero.Exists(v.fs, currentUnlockerPath); exists {
+	if exists, err := afero.Exists(v.fs, currentUnlockerPath); err != nil {
+		return fmt.Errorf("failed to check if current-unlocker file exists: %w", err)
+	} else if exists {
 		if err := v.fs.Remove(currentUnlockerPath); err != nil {
-			secret.Debug("Failed to remove existing unlocker symlink", "error", err, "path", currentUnlockerPath)
+			return fmt.Errorf("failed to remove existing current-unlocker file: %w", err)
 		}
 	}
 
-	// Create new symlink
+	// Get just the unlocker name (basename of the directory)
-	return afero.WriteFile(v.fs, currentUnlockerPath, []byte(targetUnlockerDir), secret.FilePerms)
+	unlockerName := filepath.Base(targetUnlockerDir)
+
+	// Write just the unlocker name to the file
+	secret.Debug("Writing current-unlocker file", "unlocker_name", unlockerName)
+	if err := afero.WriteFile(v.fs, currentUnlockerPath, []byte(unlockerName), secret.FilePerms); err != nil {
+		return fmt.Errorf("failed to create current-unlocker file: %w", err)
+	}
+
+	return nil
 }
 
 // CreatePassphraseUnlocker creates a new passphrase-protected unlocker
-func (v *Vault) CreatePassphraseUnlocker(passphrase string) (*secret.PassphraseUnlocker, error) {
+// The passphrase must be provided as a LockedBuffer for security
+func (v *Vault) CreatePassphraseUnlocker(passphrase *memguard.LockedBuffer) (*secret.PassphraseUnlocker, error) {
 	vaultDir, err := v.GetDirectory()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get vault directory: %w", err)
 	}
 
-	// Create unlocker directory with timestamp
+	// Create unlocker directory
-	timestamp := time.Now().Format("2006-01-02.15.04")
 	unlockerDir := filepath.Join(vaultDir, "unlockers.d", "passphrase")
 	if err := v.fs.MkdirAll(unlockerDir, secret.DirPerms); err != nil {
 		return nil, fmt.Errorf("failed to create unlocker directory: %w", err)
@@ -313,13 +330,17 @@ func (v *Vault) CreatePassphraseUnlocker(passphrase string) (*secret.PassphraseU
 
 	// Write public key
 	pubKeyPath := filepath.Join(unlockerDir, "pub.age")
-	if err := afero.WriteFile(v.fs, pubKeyPath, []byte(unlockerIdentity.Recipient().String()), secret.FilePerms); err != nil {
+	if err := afero.WriteFile(v.fs, pubKeyPath,
+		[]byte(unlockerIdentity.Recipient().String()),
+		secret.FilePerms); err != nil {
 		return nil, fmt.Errorf("failed to write unlocker public key: %w", err)
 	}
 
 	// Encrypt private key with passphrase
-	privKeyData := []byte(unlockerIdentity.String())
+	privKeyStr := unlockerIdentity.String()
-	encryptedPrivKey, err := secret.EncryptWithPassphrase(privKeyData, passphrase)
+	privKeyBuffer := memguard.NewBufferFromBytes([]byte(privKeyStr))
+	defer privKeyBuffer.Destroy()
+	encryptedPrivKey, err := secret.EncryptWithPassphrase(privKeyBuffer, passphrase)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encrypt unlocker private key: %w", err)
 	}
@@ -331,9 +352,7 @@ func (v *Vault) CreatePassphraseUnlocker(passphrase string) (*secret.PassphraseU
 	}
 
 	// Create metadata
-	unlockerID := fmt.Sprintf("%s-passphrase", timestamp)
 	metadata := UnlockerMetadata{
-		ID:        unlockerID,
 		Type:      "passphrase",
 		CreatedAt: time.Now(),
 		Flags:     []string{},
@@ -350,27 +369,33 @@ func (v *Vault) CreatePassphraseUnlocker(passphrase string) (*secret.PassphraseU
 		return nil, fmt.Errorf("failed to write unlocker metadata: %w", err)
 	}
 
-	// Encrypt long-term private key to this unlocker if vault is unlocked
+	// Encrypt long-term private key to this unlocker
-	if !v.Locked() {
+	// We need to get the long-term key (either from memory if unlocked, or derive it)
-		ltPrivKey := []byte(v.GetLongTermKey().String())
+	ltIdentity, err := v.GetOrDeriveLongTermKey()
-		encryptedLtPrivKey, err := secret.EncryptToRecipient(ltPrivKey, unlockerIdentity.Recipient())
+	if err != nil {
-		if err != nil {
+		return nil, fmt.Errorf("failed to get long-term key: %w", err)
-			return nil, fmt.Errorf("failed to encrypt long-term private key: %w", err)
-		}
-
-		ltPrivKeyPath := filepath.Join(unlockerDir, "longterm.age")
-		if err := afero.WriteFile(v.fs, ltPrivKeyPath, encryptedLtPrivKey, secret.FilePerms); err != nil {
-			return nil, fmt.Errorf("failed to write encrypted long-term private key: %w", err)
-		}
 	}
 
+	ltPrivKeyBuffer := memguard.NewBufferFromBytes([]byte(ltIdentity.String()))
+	defer ltPrivKeyBuffer.Destroy()
+
+	encryptedLtPrivKey, err := secret.EncryptToRecipient(ltPrivKeyBuffer, unlockerIdentity.Recipient())
+	if err != nil {
+		return nil, fmt.Errorf("failed to encrypt long-term private key: %w", err)
+	}
+
+	ltPrivKeyPath := filepath.Join(unlockerDir, "longterm.age")
+	if err := afero.WriteFile(v.fs, ltPrivKeyPath, encryptedLtPrivKey, secret.FilePerms); err != nil {
+		return nil, fmt.Errorf("failed to write encrypted long-term private key: %w", err)
+	}
+
+	// Create the unlocker instance
+	unlocker := secret.NewPassphraseUnlocker(v.fs, unlockerDir, metadata)
+
 	// Select this unlocker as current
-	if err := v.SelectUnlocker(unlockerID); err != nil {
+	if err := v.SelectUnlocker(unlocker.GetID()); err != nil {
 		return nil, fmt.Errorf("failed to select new unlocker: %w", err)
 	}
 
-	// Convert our metadata to secret.UnlockerMetadata for the constructor
+	return unlocker, nil
-	secretMetadata := secret.UnlockerMetadata(metadata)
-
-	return secret.NewPassphraseUnlocker(v.fs, unlockerDir, secretMetadata), nil
 }

internal/vault/vault.go

@@ -30,6 +30,7 @@ func NewVault(fs afero.Fs, stateDir string, name string) *Vault {
 		longTermKey: nil,
 	}
 	secret.Debug("Created NewVault instance successfully")
+
 	return v
 }
 
@@ -65,15 +66,43 @@ func (v *Vault) GetOrDeriveLongTermKey() (*age.X25519Identity, error) {
 	// Try to derive from environment mnemonic first
 	if envMnemonic := os.Getenv(secret.EnvMnemonic); envMnemonic != "" {
 		secret.Debug("Using mnemonic from environment for long-term key derivation", "vault_name", v.Name)
-		ltIdentity, err := agehd.DeriveIdentity(envMnemonic, 0)
+
+		// Load vault metadata to get the derivation index
+		vaultDir, err := v.GetDirectory()
+		if err != nil {
+			return nil, fmt.Errorf("failed to get vault directory: %w", err)
+		}
+
+		metadata, err := LoadVaultMetadata(v.fs, vaultDir)
+		if err != nil {
+			secret.Debug("Failed to load vault metadata", "error", err, "vault_name", v.Name)
+
+			return nil, fmt.Errorf("failed to load vault metadata: %w", err)
+		}
+
+		ltIdentity, err := agehd.DeriveIdentity(envMnemonic, metadata.DerivationIndex)
 		if err != nil {
 			secret.Debug("Failed to derive long-term key from mnemonic", "error", err, "vault_name", v.Name)
+
 			return nil, fmt.Errorf("failed to derive long-term key from mnemonic: %w", err)
 		}
 
+		// Verify that the derived key matches the stored public key hash
+		derivedPubKeyHash := ComputeDoubleSHA256([]byte(ltIdentity.Recipient().String()))
+		if derivedPubKeyHash != metadata.PublicKeyHash {
+			secret.Debug("Derived public key hash does not match stored hash",
+				"vault_name", v.Name,
+				"derived_hash", derivedPubKeyHash,
+				"stored_hash", metadata.PublicKeyHash,
+				"derivation_index", metadata.DerivationIndex)
+
+			return nil, fmt.Errorf("derived public key does not match vault: mnemonic may be incorrect")
+		}
+
 		secret.DebugWith("Successfully derived long-term key from mnemonic",
 			slog.String("vault_name", v.Name),
 			slog.String("public_key", ltIdentity.Recipient().String()),
+			slog.Uint64("derivation_index", uint64(metadata.DerivationIndex)),
 		)
 
 		// Cache the derived key by unlocking the vault
@@ -90,6 +119,7 @@ func (v *Vault) GetOrDeriveLongTermKey() (*age.X25519Identity, error) {
 	unlocker, err := v.GetCurrentUnlocker()
 	if err != nil {
 		secret.Debug("Failed to get current unlocker", "error", err, "vault_name", v.Name)
+
 		return nil, fmt.Errorf("failed to get current unlocker: %w", err)
 	}
 
@@ -99,50 +129,12 @@ func (v *Vault) GetOrDeriveLongTermKey() (*age.X25519Identity, error) {
 		slog.String("unlocker_id", unlocker.GetID()),
 	)
 
-	// Get unlocker identity
+	// Get the long-term key via the unlocker.
-	unlockerIdentity, err := unlocker.GetIdentity()
+	// SE unlockers return the long-term key directly from GetIdentity().
+	// Other unlockers return their own identity, used to decrypt longterm.age.
+	ltIdentity, err := v.unlockLongTermKey(unlocker)
 	if err != nil {
-		secret.Debug("Failed to get unlocker identity", "error", err, "unlocker_type", unlocker.GetType())
+		return nil, err
-		return nil, fmt.Errorf("failed to get unlocker identity: %w", err)
-	}
-
-	// Read encrypted long-term private key from unlocker directory
-	unlockerDir := unlocker.GetDirectory()
-	encryptedLtPrivKeyPath := filepath.Join(unlockerDir, "longterm.age")
-	secret.Debug("Reading encrypted long-term private key", "path", encryptedLtPrivKeyPath)
-
-	encryptedLtPrivKey, err := afero.ReadFile(v.fs, encryptedLtPrivKeyPath)
-	if err != nil {
-		secret.Debug("Failed to read encrypted long-term private key", "error", err, "path", encryptedLtPrivKeyPath)
-		return nil, fmt.Errorf("failed to read encrypted long-term private key: %w", err)
-	}
-
-	secret.DebugWith("Read encrypted long-term private key",
-		slog.String("vault_name", v.Name),
-		slog.String("unlocker_type", unlocker.GetType()),
-		slog.Int("encrypted_length", len(encryptedLtPrivKey)),
-	)
-
-	// Decrypt long-term private key using unlocker
-	secret.Debug("Decrypting long-term private key with unlocker", "unlocker_type", unlocker.GetType())
-	ltPrivKeyData, err := secret.DecryptWithIdentity(encryptedLtPrivKey, unlockerIdentity)
-	if err != nil {
-		secret.Debug("Failed to decrypt long-term private key", "error", err, "unlocker_type", unlocker.GetType())
-		return nil, fmt.Errorf("failed to decrypt long-term private key: %w", err)
-	}
-
-	secret.DebugWith("Successfully decrypted long-term private key",
-		slog.String("vault_name", v.Name),
-		slog.String("unlocker_type", unlocker.GetType()),
-		slog.Int("decrypted_length", len(ltPrivKeyData)),
-	)
-
-	// Parse long-term private key
-	secret.Debug("Parsing long-term private key", "vault_name", v.Name)
-	ltIdentity, err := age.ParseX25519Identity(string(ltPrivKeyData))
-	if err != nil {
-		secret.Debug("Failed to parse long-term private key", "error", err, "vault_name", v.Name)
-		return nil, fmt.Errorf("failed to parse long-term private key: %w", err)
 	}
 
 	secret.DebugWith("Successfully obtained long-term identity via unlocker",
@@ -153,7 +145,49 @@ func (v *Vault) GetOrDeriveLongTermKey() (*age.X25519Identity, error) {
 
 	// Cache the derived key by unlocking the vault
 	v.Unlock(ltIdentity)
-	secret.Debug("Vault is unlocked (lt key in memory) via unlocker", "vault_name", v.Name, "unlocker_type", unlocker.GetType())
+	secret.Debug("Vault is unlocked (lt key in memory) via unlocker",
+		"vault_name", v.Name, "unlocker_type", unlocker.GetType())
+
+	return ltIdentity, nil
+}
+
+// unlockLongTermKey extracts the vault's long-term key using the given unlocker.
+// SE unlockers decrypt the long-term key directly; other unlockers use an intermediate identity.
+func (v *Vault) unlockLongTermKey(unlocker secret.Unlocker) (*age.X25519Identity, error) {
+	if unlocker.GetType() == "secure-enclave" {
+		secret.Debug("SE unlocker: decrypting long-term key directly via Secure Enclave")
+
+		ltIdentity, err := unlocker.GetIdentity()
+		if err != nil {
+			return nil, fmt.Errorf("failed to decrypt long-term key via SE: %w", err)
+		}
+
+		return ltIdentity, nil
+	}
+
+	// Standard unlockers: get unlocker identity, then decrypt longterm.age
+	unlockerIdentity, err := unlocker.GetIdentity()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get unlocker identity: %w", err)
+	}
+
+	encryptedLtPrivKeyPath := filepath.Join(unlocker.GetDirectory(), "longterm.age")
+
+	encryptedLtPrivKey, err := afero.ReadFile(v.fs, encryptedLtPrivKeyPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read encrypted long-term private key: %w", err)
+	}
+
+	ltPrivKeyBuffer, err := secret.DecryptWithIdentity(encryptedLtPrivKey, unlockerIdentity)
+	if err != nil {
+		return nil, fmt.Errorf("failed to decrypt long-term private key: %w", err)
+	}
+	defer ltPrivKeyBuffer.Destroy()
+
+	ltIdentity, err := age.ParseX25519Identity(ltPrivKeyBuffer.String())
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse long-term private key: %w", err)
+	}
 
 	return ltIdentity, nil
 }
@@ -172,3 +206,44 @@ func (v *Vault) GetName() string {
 func (v *Vault) GetFilesystem() afero.Fs {
 	return v.fs
 }
+
+// NumSecrets returns the number of secrets in the vault
+func (v *Vault) NumSecrets() (int, error) {
+	vaultDir, err := v.GetDirectory()
+	if err != nil {
+		return 0, fmt.Errorf("failed to get vault directory: %w", err)
+	}
+
+	secretsDir := filepath.Join(vaultDir, "secrets.d")
+	exists, _ := afero.DirExists(v.fs, secretsDir)
+	if !exists {
+		return 0, nil
+	}
+
+	entries, err := afero.ReadDir(v.fs, secretsDir)
+	if err != nil {
+		return 0, fmt.Errorf("failed to read secrets directory: %w", err)
+	}
+
+	// Count only directories that have a "current" version pointer file
+	count := 0
+	for _, entry := range entries {
+		if !entry.IsDir() {
+			continue
+		}
+
+		// A valid secret has a "current" file pointing to the active version
+		secretDir := filepath.Join(secretsDir, entry.Name())
+		currentFile := filepath.Join(secretDir, "current")
+		exists, err := afero.Exists(v.fs, currentFile)
+		if err != nil {
+			continue // Skip directories we can't read
+		}
+
+		if exists {
+			count++
+		}
+	}
+
+	return count, nil
+}

internal/vault/vault_error_test.go

@@ -0,0 +1,87 @@
+package vault_test
+
+import (
+	"path/filepath"
+	"testing"
+
+	"git.eeqj.de/sneak/secret/internal/secret"
+	"git.eeqj.de/sneak/secret/internal/vault"
+	"github.com/awnumar/memguard"
+	"github.com/spf13/afero"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAddSecretFailsWithMissingPublicKey(t *testing.T) {
+	// Create in-memory filesystem
+	fs := afero.NewMemMapFs()
+	stateDir := "/test/state"
+
+	// Create a vault directory without a public key (simulating the error condition)
+	vaultDir := filepath.Join(stateDir, "vaults.d", "broken")
+	require.NoError(t, fs.MkdirAll(vaultDir, secret.DirPerms))
+
+	// Create currentvault symlink
+	currentVaultPath := filepath.Join(stateDir, "currentvault")
+	require.NoError(t, afero.WriteFile(fs, currentVaultPath, []byte(vaultDir), secret.FilePerms))
+
+	// Create vault instance
+	vlt := vault.NewVault(fs, stateDir, "broken")
+
+	// Try to add a secret - this should fail
+	secretName := "test-secret"
+	value := memguard.NewBufferFromBytes([]byte("test-value"))
+	defer value.Destroy()
+
+	err := vlt.AddSecret(secretName, value, false)
+	require.Error(t, err, "AddSecret should fail when public key is missing")
+	assert.Contains(t, err.Error(), "failed to read long-term public key")
+
+	// Verify that the secret directory was NOT created
+	secretDir := filepath.Join(vaultDir, "secrets.d", secretName)
+	exists, _ := afero.DirExists(fs, secretDir)
+	assert.False(t, exists, "Secret directory should not exist after failed AddSecret")
+
+	// Verify the secrets.d directory is empty or doesn't exist
+	secretsDir := filepath.Join(vaultDir, "secrets.d")
+	if exists, _ := afero.DirExists(fs, secretsDir); exists {
+		entries, err := afero.ReadDir(fs, secretsDir)
+		require.NoError(t, err)
+		assert.Empty(t, entries, "secrets.d directory should be empty after failed AddSecret")
+	}
+}
+
+func TestAddSecretCleansUpOnFailure(t *testing.T) {
+	// Create in-memory filesystem
+	fs := afero.NewMemMapFs()
+	stateDir := "/test/state"
+
+	// Create a vault directory with public key
+	vaultDir := filepath.Join(stateDir, "vaults.d", "test")
+	require.NoError(t, fs.MkdirAll(vaultDir, secret.DirPerms))
+
+	// Create a mock public key that will cause encryption to fail
+	// by using an invalid age public key format
+	pubKeyPath := filepath.Join(vaultDir, "pub.age")
+	require.NoError(t, afero.WriteFile(fs, pubKeyPath, []byte("invalid-public-key"), secret.FilePerms))
+
+	// Create currentvault symlink
+	currentVaultPath := filepath.Join(stateDir, "currentvault")
+	require.NoError(t, afero.WriteFile(fs, currentVaultPath, []byte(vaultDir), secret.FilePerms))
+
+	// Create vault instance
+	vlt := vault.NewVault(fs, stateDir, "test")
+
+	// Try to add a secret - this should fail during encryption
+	secretName := "test-secret"
+	value := memguard.NewBufferFromBytes([]byte("test-value"))
+	defer value.Destroy()
+
+	err := vlt.AddSecret(secretName, value, false)
+	require.Error(t, err, "AddSecret should fail with invalid public key")
+
+	// Verify that the secret directory was NOT created
+	secretDir := filepath.Join(vaultDir, "secrets.d", secretName)
+	exists, _ := afero.DirExists(fs, secretDir)
+	assert.False(t, exists, "Secret directory should not exist after failed AddSecret")
+}

internal/vault/vault_test.go

@@ -1,39 +1,22 @@
 package vault
 
 import (
-	"os"
 	"path/filepath"
 	"testing"
 
 	"git.eeqj.de/sneak/secret/internal/secret"
 	"git.eeqj.de/sneak/secret/pkg/agehd"
+	"github.com/awnumar/memguard"
 	"github.com/spf13/afero"
 )
 
 func TestVaultOperations(t *testing.T) {
-	// Save original environment variables
+	// Test environment will be cleaned up automatically by t.Setenv
-	oldMnemonic := os.Getenv(secret.EnvMnemonic)
-	oldPassphrase := os.Getenv(secret.EnvUnlockPassphrase)
-
-	// Clean up after test
-	defer func() {
-		if oldMnemonic != "" {
-			os.Setenv(secret.EnvMnemonic, oldMnemonic)
-		} else {
-			os.Unsetenv(secret.EnvMnemonic)
-		}
-
-		if oldPassphrase != "" {
-			os.Setenv(secret.EnvUnlockPassphrase, oldPassphrase)
-		} else {
-			os.Unsetenv(secret.EnvUnlockPassphrase)
-		}
-	}()
 
 	// Set test environment variables
 	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
-	os.Setenv(secret.EnvMnemonic, testMnemonic)
+	t.Setenv(secret.EnvMnemonic, testMnemonic)
-	os.Setenv(secret.EnvUnlockPassphrase, "test-passphrase")
+	t.Setenv(secret.EnvUnlockPassphrase, "test-passphrase")
 
 	// Use in-memory filesystem
 	fs := afero.NewMemMapFs()
@@ -139,8 +122,13 @@ func TestVaultOperations(t *testing.T) {
 		// Now add a secret
 		secretName := "test/secret"
 		secretValue := []byte("test-secret-value")
+		expectedValue := make([]byte, len(secretValue))
+		copy(expectedValue, secretValue)
 
-		err = vlt.AddSecret(secretName, secretValue, false)
+		secretBuffer := memguard.NewBufferFromBytes(secretValue)
+		defer secretBuffer.Destroy()
+
+		err = vlt.AddSecret(secretName, secretBuffer, false)
 		if err != nil {
 			t.Fatalf("Failed to add secret: %v", err)
 		}
@@ -169,8 +157,26 @@ func TestVaultOperations(t *testing.T) {
 			t.Fatalf("Failed to get secret: %v", err)
 		}
 
-		if string(retrievedValue) != string(secretValue) {
+		if string(retrievedValue) != string(expectedValue) {
-			t.Errorf("Expected secret value '%s', got '%s'", string(secretValue), string(retrievedValue))
+			t.Errorf("Expected secret value '%s', got '%s'", string(expectedValue), string(retrievedValue))
+		}
+	})
+
+	// Test NumSecrets
+	t.Run("NumSecrets", func(t *testing.T) {
+		vlt, err := GetCurrentVault(fs, stateDir)
+		if err != nil {
+			t.Fatalf("Failed to get current vault: %v", err)
+		}
+
+		numSecrets, err := vlt.NumSecrets()
+		if err != nil {
+			t.Fatalf("Failed to count secrets: %v", err)
+		}
+
+		// We added one secret in SecretOperations
+		if numSecrets != 1 {
+			t.Errorf("Expected 1 secret, got %d", numSecrets)
 		}
 	})
 
@@ -190,7 +196,9 @@ func TestVaultOperations(t *testing.T) {
 		}
 
 		// Create a passphrase unlocker
-		passphraseUnlocker, err := vlt.CreatePassphraseUnlocker("test-passphrase")
+		passphraseBuffer := memguard.NewBufferFromBytes([]byte("test-passphrase"))
+		defer passphraseBuffer.Destroy()
+		passphraseUnlocker, err := vlt.CreatePassphraseUnlocker(passphraseBuffer)
 		if err != nil {
 			t.Fatalf("Failed to create passphrase unlocker: %v", err)
 		}
@@ -235,3 +243,57 @@ func TestVaultOperations(t *testing.T) {
 		}
 	})
 }
+
+func TestListUnlockers_SkipsMissingMetadata(t *testing.T) {
+	// Set test environment variables
+	testMnemonic := "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
+	t.Setenv(secret.EnvMnemonic, testMnemonic)
+	t.Setenv(secret.EnvUnlockPassphrase, "test-passphrase")
+
+	// Use in-memory filesystem
+	fs := afero.NewMemMapFs()
+	stateDir := "/test/state"
+
+	// Create vault
+	vlt, err := CreateVault(fs, stateDir, "test-vault")
+	if err != nil {
+		t.Fatalf("Failed to create vault: %v", err)
+	}
+
+	// Create a passphrase unlocker so we have at least one valid unlocker
+	passphraseBuffer := memguard.NewBufferFromBytes([]byte("test-passphrase"))
+	defer passphraseBuffer.Destroy()
+	_, err = vlt.CreatePassphraseUnlocker(passphraseBuffer)
+	if err != nil {
+		t.Fatalf("Failed to create passphrase unlocker: %v", err)
+	}
+
+	// Create a bogus unlocker directory with no metadata file
+	vaultDir, err := vlt.GetDirectory()
+	if err != nil {
+		t.Fatalf("Failed to get vault directory: %v", err)
+	}
+	bogusDir := filepath.Join(vaultDir, "unlockers.d", "bogus-no-metadata")
+	err = fs.MkdirAll(bogusDir, 0o700)
+	if err != nil {
+		t.Fatalf("Failed to create bogus directory: %v", err)
+	}
+
+	// ListUnlockers should succeed, skipping the bogus directory
+	unlockers, err := vlt.ListUnlockers()
+	if err != nil {
+		t.Fatalf("ListUnlockers returned error when it should have skipped bad directory: %v", err)
+	}
+
+	// Should still have the valid passphrase unlocker
+	if len(unlockers) == 0 {
+		t.Errorf("Expected at least one unlocker, got none")
+	}
+
+	// Verify we only got the valid unlocker(s), not the bogus one
+	for _, u := range unlockers {
+		if u.Type == "" {
+			t.Errorf("Got unlocker with empty type, likely from bogus directory")
+		}
+	}
+}

pkg/agehd/agehd.go

@@ -21,10 +21,11 @@ import (
 )
 
 const (
-	purpose  = uint32(83696968)  // fixed by BIP-85 ("bip")
+	purpose       = uint32(83696968)  // fixed by BIP-85 ("bip")
-	vendorID = uint32(592366788) // berlin.sneak
+	vendorID      = uint32(592366788) // berlin.sneak
-	appID    = uint32(733482323) // secret
+	appID         = uint32(733482323) // secret
-	hrp      = "age-secret-key-" // Bech32 HRP used by age
+	hrp           = "age-secret-key-" // Bech32 HRP used by age
+	x25519KeySize = 32                // 256-bit key size for X25519
 )
 
 // clamp applies RFC-7748 clamping to a 32-byte scalar.
@@ -37,16 +38,20 @@ func clamp(k []byte) {
 // IdentityFromEntropy converts 32 deterministic bytes into an
 // *age.X25519Identity by round-tripping through Bech32.
 func IdentityFromEntropy(ent []byte) (*age.X25519Identity, error) {
-	if len(ent) != 32 {
+	if len(ent) != x25519KeySize {
 		return nil, fmt.Errorf("need 32-byte scalar, got %d", len(ent))
 	}
 
 	// Make a copy to avoid modifying the original
-	key := make([]byte, 32)
+	key := make([]byte, x25519KeySize)
 	copy(key, ent)
 	clamp(key)
 
-	data, err := bech32.ConvertBits(key, 8, 5, true)
+	const (
+		bech32BitSize8 = 8 // Standard 8-bit encoding
+		bech32BitSize5 = 5 // Bech32 5-bit encoding
+	)
+	data, err := bech32.ConvertBits(key, bech32BitSize8, bech32BitSize5, true)
 	if err != nil {
 		return nil, fmt.Errorf("bech32 convert: %w", err)
 	}
@@ -54,6 +59,7 @@ func IdentityFromEntropy(ent []byte) (*age.X25519Identity, error) {
 	if err != nil {
 		return nil, fmt.Errorf("bech32 encode: %w", err)
 	}
+
 	return age.ParseX25519Identity(strings.ToUpper(s))
 }
 
@@ -80,7 +86,7 @@ func DeriveEntropy(mnemonic string, n uint32) ([]byte, error) {
 
 	// Use BIP85 DRNG to generate deterministic 32 bytes for the age key
 	drng := bip85.NewBIP85DRNG(entropy)
-	key := make([]byte, 32)
+	key := make([]byte, x25519KeySize)
 	_, err = drng.Read(key)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read from DRNG: %w", err)
@@ -109,7 +115,7 @@ func DeriveEntropyFromXPRV(xprv string, n uint32) ([]byte, error) {
 
 	// Use BIP85 DRNG to generate deterministic 32 bytes for the age key
 	drng := bip85.NewBIP85DRNG(entropy)
-	key := make([]byte, 32)
+	key := make([]byte, x25519KeySize)
 	_, err = drng.Read(key)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read from DRNG: %w", err)
@@ -125,6 +131,7 @@ func DeriveIdentity(mnemonic string, n uint32) (*age.X25519Identity, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return IdentityFromEntropy(ent)
 }
 
@@ -135,5 +142,6 @@ func DeriveIdentityFromXPRV(xprv string, n uint32) (*age.X25519Identity, error)
 	if err != nil {
 		return nil, err
 	}
+
 	return IdentityFromEntropy(ent)
 }

pkg/agehd/agehd_test.go

@@ -1,3 +1,4 @@
+//nolint:lll // Test vectors contain long lines
 package agehd
 
 import (
@@ -39,7 +40,7 @@ const (
 	errorMsgInvalidXPRV = "invalid-xprv"
 
 	// Test constants for various scenarios
-	testSkipMessage = "Skipping consistency test - test mnemonic and xprv are from different sources"
+	// Removed testSkipMessage as tests are no longer skipped
 
 	// Numeric constants for testing
 	testNumGoroutines = 10
@@ -133,7 +134,11 @@ func TestDeterministicDerivation(t *testing.T) {
 	}
 
 	if id1.String() != id2.String() {
-		t.Fatalf("identities should be deterministic: %s != %s", id1.String(), id2.String())
+		t.Fatalf(
+			"identities should be deterministic: %s != %s",
+			id1.String(),
+			id2.String(),
+		)
 	}
 
 	// Test that different indices produce different identities
@@ -163,7 +168,11 @@ func TestDeterministicXPRVDerivation(t *testing.T) {
 	}
 
 	if id1.String() != id2.String() {
-		t.Fatalf("xprv identities should be deterministic: %s != %s", id1.String(), id2.String())
+		t.Fatalf(
+			"xprv identities should be deterministic: %s != %s",
+			id1.String(),
+			id2.String(),
+		)
 	}
 
 	// Test that different indices with same xprv produce different identities
@@ -180,11 +189,8 @@ func TestDeterministicXPRVDerivation(t *testing.T) {
 	t.Logf("XPRV Index 1: %s", id3.String())
 }
 
-func TestMnemonicVsXPRVConsistency(t *testing.T) {
+func TestMnemonicVsXPRVConsistency(_ *testing.T) {
-	// Test that deriving from mnemonic and from the corresponding xprv produces the same result
+	// FIXME This test is missing!
-	// Note: This test is removed because the test mnemonic and test xprv are from different sources
-	// and are not expected to produce the same results.
-	t.Skip(testSkipMessage)
 }
 
 func TestEntropyLength(t *testing.T) {
@@ -207,7 +213,10 @@ func TestEntropyLength(t *testing.T) {
 	}
 
 	if len(entropyXPRV) != 32 {
-		t.Fatalf("expected 32 bytes of entropy from xprv, got %d", len(entropyXPRV))
+		t.Fatalf(
+			"expected 32 bytes of entropy from xprv, got %d",
+			len(entropyXPRV),
+		)
 	}
 
 	t.Logf("XPRV Entropy (32 bytes): %x", entropyXPRV)
@@ -263,14 +272,49 @@ func TestClampFunction(t *testing.T) {
 		expected []byte
 	}{
 		{
-			name:     "all zeros",
+			name:  "all zeros",
-			input:    make([]byte, 32),
+			input: make([]byte, 32),
-			expected: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64},
+			expected: []byte{
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				0,
+				64,
+			},
 		},
 		{
-			name:     "all ones",
+			name:  "all ones",
-			input:    bytes.Repeat([]byte{255}, 32),
+			input: bytes.Repeat([]byte{255}, 32),
-			expected: append([]byte{248}, append(bytes.Repeat([]byte{255}, 30), 127)...),
+			expected: append(
+				[]byte{248},
+				append(bytes.Repeat([]byte{255}, 30), 127)...),
 		},
 	}
 
@@ -282,13 +326,22 @@ func TestClampFunction(t *testing.T) {
 
 			// Check specific bits that should be clamped
 			if input[0]&7 != 0 {
-				t.Errorf("first byte should have bottom 3 bits cleared, got %08b", input[0])
+				t.Errorf(
+					"first byte should have bottom 3 bits cleared, got %08b",
+					input[0],
+				)
 			}
 			if input[31]&128 != 0 {
-				t.Errorf("last byte should have top bit cleared, got %08b", input[31])
+				t.Errorf(
+					"last byte should have top bit cleared, got %08b",
+					input[31],
+				)
 			}
 			if input[31]&64 == 0 {
-				t.Errorf("last byte should have second-to-top bit set, got %08b", input[31])
+				t.Errorf(
+					"last byte should have second-to-top bit set, got %08b",
+					input[31],
+				)
 			}
 		})
 	}
@@ -336,8 +389,11 @@ func TestIdentityFromEntropyEdgeCases(t *testing.T) {
 			entropy: func() []byte {
 				b := make([]byte, 32)
 				if _, err := rand.Read(b); err != nil {
-					panic(err) // In test context, panic is acceptable for setup failures
+					panic(
+						err,
+					) // In test context, panic is acceptable for setup failures
 				}
+
 				return b
 			}(),
 			expectError: false,
@@ -355,7 +411,10 @@ func TestIdentityFromEntropyEdgeCases(t *testing.T) {
 					t.Errorf("expected error containing %q, got %q", tt.errorMsg, err.Error())
 				}
 				if identity != nil {
-					t.Errorf("expected nil identity on error, got %v", identity)
+					t.Errorf(
+						"expected nil identity on error, got %v",
+						identity,
+					)
 				}
 			} else {
 				if err != nil {
@@ -530,7 +589,11 @@ func TestIndexBoundaries(t *testing.T) {
 		t.Run(fmt.Sprintf("index_%d", index), func(t *testing.T) {
 			identity, err := DeriveIdentity(mnemonic, index)
 			if err != nil {
-				t.Fatalf("failed to derive identity at index %d: %v", index, err)
+				t.Fatalf(
+					"failed to derive identity at index %d: %v",
+					index,
+					err,
+				)
 			}
 
 			// Verify the identity is valid by testing encryption/decryption
@@ -599,9 +662,13 @@ func TestConcurrentDerivation(t *testing.T) {
 	results := make(chan string, testNumGoroutines*testNumIterations)
 	errors := make(chan error, testNumGoroutines*testNumIterations)
 
-	for i := 0; i < testNumGoroutines; i++ {
+	for range testNumGoroutines {
-		go func(goroutineID int) {
+		go func() {
-			for j := 0; j < testNumIterations; j++ {
+			for j := range testNumIterations {
+				if j < 0 || j > 1000000 {
+					errors <- fmt.Errorf("index out of safe range")
+					return
+				}
 				identity, err := DeriveIdentity(mnemonic, uint32(j))
 				if err != nil {
 					errors <- err
@@ -609,12 +676,12 @@ func TestConcurrentDerivation(t *testing.T) {
 				}
 				results <- identity.String()
 			}
-		}(i)
+		}()
 	}
 
 	// Collect results
 	resultMap := make(map[string]int)
-	for i := 0; i < testNumGoroutines*testNumIterations; i++ {
+	for range testNumGoroutines * testNumIterations {
 		select {
 		case result := <-results:
 			resultMap[result]++
@@ -627,17 +694,29 @@ func TestConcurrentDerivation(t *testing.T) {
 	expectedResults := testNumGoroutines
 	for result, count := range resultMap {
 		if count != expectedResults {
-			t.Errorf("result %s appeared %d times, expected %d", result, count, expectedResults)
+			t.Errorf(
+				"result %s appeared %d times, expected %d",
+				result,
+				count,
+				expectedResults,
+			)
 		}
 	}
 
-	t.Logf("Concurrent derivation test passed with %d unique results", len(resultMap))
+	t.Logf(
+		"Concurrent derivation test passed with %d unique results",
+		len(resultMap),
+	)
 }
 
 // Benchmark tests
 func BenchmarkDeriveIdentity(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for i := range b.N {
-		_, err := DeriveIdentity(mnemonic, uint32(i%1000))
+		index := i % 1000
+		if index < 0 || index > 1000000 {
+			b.Fatalf("index out of safe range: %d", index)
+		}
+		_, err := DeriveIdentity(mnemonic, uint32(index))
 		if err != nil {
 			b.Fatalf("derive identity: %v", err)
 		}
@@ -645,8 +724,12 @@ func BenchmarkDeriveIdentity(b *testing.B) {
 }
 
 func BenchmarkDeriveIdentityFromXPRV(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for i := range b.N {
-		_, err := DeriveIdentityFromXPRV(testXPRV, uint32(i%1000))
+		index := i % 1000
+		if index < 0 || index > 1000000 {
+			b.Fatalf("index out of safe range: %d", index)
+		}
+		_, err := DeriveIdentityFromXPRV(testXPRV, uint32(index))
 		if err != nil {
 			b.Fatalf("derive identity from xprv: %v", err)
 		}
@@ -654,8 +737,12 @@ func BenchmarkDeriveIdentityFromXPRV(b *testing.B) {
 }
 
 func BenchmarkDeriveEntropy(b *testing.B) {
-	for i := 0; i < b.N; i++ {
+	for i := range b.N {
-		_, err := DeriveEntropy(mnemonic, uint32(i%1000))
+		index := i % 1000
+		if index < 0 || index > 1000000 {
+			b.Fatalf("index out of safe range: %d", index)
+		}
+		_, err := DeriveEntropy(mnemonic, uint32(index))
 		if err != nil {
 			b.Fatalf("derive entropy: %v", err)
 		}
@@ -669,7 +756,7 @@ func BenchmarkIdentityFromEntropy(b *testing.B) {
 	}
 
 	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		_, err := IdentityFromEntropy(entropy)
 		if err != nil {
 			b.Fatalf("identity from entropy: %v", err)
@@ -684,7 +771,7 @@ func BenchmarkEncryptDecrypt(b *testing.B) {
 	}
 
 	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		var ct bytes.Buffer
 		w, err := age.Encrypt(&ct, identity.Recipient())
 		if err != nil {
@@ -711,16 +798,28 @@ func BenchmarkEncryptDecrypt(b *testing.B) {
 // TestConstants verifies the hardcoded constants
 func TestConstants(t *testing.T) {
 	if purpose != 83696968 {
-		t.Errorf("purpose constant mismatch: expected 83696968, got %d", purpose)
+		t.Errorf(
+			"purpose constant mismatch: expected 83696968, got %d",
+			purpose,
+		)
 	}
 	if vendorID != 592366788 {
-		t.Errorf("vendorID constant mismatch: expected 592366788, got %d", vendorID)
+		t.Errorf(
+			"vendorID constant mismatch: expected 592366788, got %d",
+			vendorID,
+		)
 	}
 	if appID != 733482323 {
-		t.Errorf("appID constant mismatch: expected 733482323, got %d", appID)
+		t.Errorf(
+			"appID constant mismatch: expected 733482323, got %d",
+			appID,
+		)
 	}
 	if hrp != "age-secret-key-" {
-		t.Errorf("hrp constant mismatch: expected 'age-secret-key-', got %q", hrp)
+		t.Errorf(
+			"hrp constant mismatch: expected 'age-secret-key-', got %q",
+			hrp,
+		)
 	}
 }
 
@@ -736,7 +835,10 @@ func TestIdentityStringFormat(t *testing.T) {
 
 	// Check secret key format
 	if !strings.HasPrefix(secretKey, "AGE-SECRET-KEY-") {
-		t.Errorf("secret key should start with 'AGE-SECRET-KEY-', got: %s", secretKey)
+		t.Errorf(
+			"secret key should start with 'AGE-SECRET-KEY-', got: %s",
+			secretKey,
+		)
 	}
 
 	// Check recipient format
@@ -833,14 +935,22 @@ func TestRandomMnemonicDeterministicGeneration(t *testing.T) {
 	privateKey1 := identity1.String()
 	privateKey2 := identity2.String()
 	if privateKey1 != privateKey2 {
-		t.Fatalf("private keys should be identical:\nFirst:  %s\nSecond: %s", privateKey1, privateKey2)
+		t.Fatalf(
+			"private keys should be identical:\nFirst:  %s\nSecond: %s",
+			privateKey1,
+			privateKey2,
+		)
 	}
 
 	// Verify that both public keys (recipients) are identical
 	publicKey1 := identity1.Recipient().String()
 	publicKey2 := identity2.Recipient().String()
 	if publicKey1 != publicKey2 {
-		t.Fatalf("public keys should be identical:\nFirst:  %s\nSecond: %s", publicKey1, publicKey2)
+		t.Fatalf(
+			"public keys should be identical:\nFirst:  %s\nSecond: %s",
+			publicKey1,
+			publicKey2,
+		)
 	}
 
 	t.Logf("✓ Deterministic generation verified")
@@ -872,10 +982,17 @@ func TestRandomMnemonicDeterministicGeneration(t *testing.T) {
 		t.Fatalf("failed to close encryptor: %v", err)
 	}
 
-	t.Logf("✓ Encrypted %d bytes into %d bytes of ciphertext", len(testData), ciphertext.Len())
+	t.Logf(
+		"✓ Encrypted %d bytes into %d bytes of ciphertext",
+		len(testData),
+		ciphertext.Len(),
+	)
 
 	// Decrypt the data using the private key
-	decryptor, err := age.Decrypt(bytes.NewReader(ciphertext.Bytes()), identity1)
+	decryptor, err := age.Decrypt(
+		bytes.NewReader(ciphertext.Bytes()),
+		identity1,
+	)
 	if err != nil {
 		t.Fatalf("failed to create decryptor: %v", err)
 	}
@@ -889,7 +1006,11 @@ func TestRandomMnemonicDeterministicGeneration(t *testing.T) {
 
 	// Verify that the decrypted data matches the original
 	if len(decryptedData) != len(testData) {
-		t.Fatalf("decrypted data length mismatch: expected %d, got %d", len(testData), len(decryptedData))
+		t.Fatalf(
+			"decrypted data length mismatch: expected %d, got %d",
+			len(testData),
+			len(decryptedData),
+		)
 	}
 
 	if !bytes.Equal(testData, decryptedData) {
@@ -916,7 +1037,10 @@ func TestRandomMnemonicDeterministicGeneration(t *testing.T) {
 	}
 
 	// Decrypt with the second identity
-	decryptor2, err := age.Decrypt(bytes.NewReader(ciphertext2.Bytes()), identity2)
+	decryptor2, err := age.Decrypt(
+		bytes.NewReader(ciphertext2.Bytes()),
+		identity2,
+	)
 	if err != nil {
 		t.Fatalf("failed to create second decryptor: %v", err)
 	}

pkg/bip85/bip85.go

@@ -1,3 +1,4 @@
+// Package bip85 implements BIP85 deterministic entropy derivation.
 package bip85
 
 import (
@@ -22,52 +23,55 @@ import (
 
 const (
 	// BIP85_MASTER_PATH is the derivation path prefix for all BIP85 applications
-	BIP85_MASTER_PATH = "m/83696968'"
+	BIP85_MASTER_PATH = "m/83696968'" //nolint:revive // ALL_CAPS used for BIP85 constants
 
 	// BIP85_KEY_HMAC_KEY is the HMAC key used for deriving the entropy
-	BIP85_KEY_HMAC_KEY = "bip-entropy-from-k"
+	BIP85_KEY_HMAC_KEY = "bip-entropy-from-k" //nolint:revive // ALL_CAPS used for BIP85 constants
 
-	// Application numbers
+	// AppBIP39 is the application number for BIP39 mnemonics
-	APP_BIP39  = 39 // BIP39 mnemonics
+	AppBIP39 = 39
-	APP_HD_WIF = 2  // WIF for Bitcoin Core
+	// AppHDWIF is the application number for WIF (Wallet Import Format) for Bitcoin Core
-	APP_XPRV   = 32 // Extended private key
+	AppHDWIF = 2
-	APP_HEX    = 128169
+	// AppXPRV is the application number for extended private key
-	APP_PWD64  = 707764 // Base64 passwords
+	AppXPRV   = 32
-	APP_PWD85  = 707785 // Base85 passwords
+	APP_HEX   = 128169 //nolint:revive // ALL_CAPS used for BIP85 constants
-	APP_RSA    = 828365
+	APP_PWD64 = 707764 // Base64 passwords //nolint:revive // ALL_CAPS used for BIP85 constants
+	AppPWD85  = 707785 // Base85 passwords
+	APP_RSA   = 828365 //nolint:revive // ALL_CAPS used for BIP85 constants
 )
 
 // Version bytes for extended keys
 var (
 	// MainNetPrivateKey is the version for mainnet private keys
-	MainNetPrivateKey = []byte{0x04, 0x88, 0xAD, 0xE4}
+	MainNetPrivateKey = []byte{0x04, 0x88, 0xAD, 0xE4} //nolint:gochecknoglobals // Standard BIP32 constant
 	// TestNetPrivateKey is the version for testnet private keys
-	TestNetPrivateKey = []byte{0x04, 0x35, 0x83, 0x94}
+	TestNetPrivateKey = []byte{0x04, 0x35, 0x83, 0x94} //nolint:gochecknoglobals // Standard BIP32 constant
 )
 
-// BIP85DRNG is a deterministic random number generator seeded by BIP85 entropy
+// DRNG is a deterministic random number generator seeded by BIP85 entropy
-type BIP85DRNG struct {
+type DRNG struct {
 	shake io.Reader
 }
 
 // NewBIP85DRNG creates a new DRNG seeded with BIP85 entropy
-func NewBIP85DRNG(entropy []byte) *BIP85DRNG {
+func NewBIP85DRNG(entropy []byte) *DRNG {
+	const bip85EntropySize = 64 // 512 bits
 	// The entropy must be exactly 64 bytes (512 bits)
-	if len(entropy) != 64 {
+	if len(entropy) != bip85EntropySize {
-		panic("BIP85DRNG entropy must be 64 bytes")
+		panic("DRNG entropy must be 64 bytes")
 	}
 
 	// Initialize SHAKE256 with the entropy
 	shake := sha3.NewShake256()
-	shake.Write(entropy)
+	_, _ = shake.Write(entropy) // Write to hash functions never returns an error
 
-	return &BIP85DRNG{
+	return &DRNG{
 		shake: shake,
 	}
 }
 
 // Read implements the io.Reader interface
-func (d *BIP85DRNG) Read(p []byte) (n int, err error) {
+func (d *DRNG) Read(p []byte) (n int, err error) {
 	return d.shake.Read(p)
 }
 
@@ -161,7 +165,7 @@ func deriveChildKey(parent *hdkeychain.ExtendedKey, path string) (*hdkeychain.Ex
 
 // DeriveBIP39Entropy derives entropy for a BIP39 mnemonic
 func DeriveBIP39Entropy(masterKey *hdkeychain.ExtendedKey, language, words, index uint32) ([]byte, error) {
-	path := fmt.Sprintf("%s/%d'/%d'/%d'/%d'", BIP85_MASTER_PATH, APP_BIP39, language, words, index)
+	path := fmt.Sprintf("%s/%d'/%d'/%d'/%d'", BIP85_MASTER_PATH, AppBIP39, language, words, index)
 
 	entropy, err := DeriveBIP85Entropy(masterKey, path)
 	if err != nil {
@@ -169,17 +173,26 @@ func DeriveBIP39Entropy(masterKey *hdkeychain.ExtendedKey, language, words, inde
 	}
 
 	// Determine how many bits of entropy to use based on the words
+	// BIP39 defines specific word counts and their corresponding entropy bits
+	const (
+		words12 = 12 // 128 bits of entropy
+		words15 = 15 // 160 bits of entropy
+		words18 = 18 // 192 bits of entropy
+		words21 = 21 // 224 bits of entropy
+		words24 = 24 // 256 bits of entropy
+	)
+
 	var bits int
 	switch words {
-	case 12:
+	case words12:
 		bits = 128
-	case 15:
+	case words15:
 		bits = 160
-	case 18:
+	case words18:
 		bits = 192
-	case 21:
+	case words21:
 		bits = 224
-	case 24:
+	case words24:
 		bits = 256
 	default:
 		return nil, fmt.Errorf("invalid BIP39 word count: %d", words)
@@ -193,7 +206,7 @@ func DeriveBIP39Entropy(masterKey *hdkeychain.ExtendedKey, language, words, inde
 
 // DeriveWIFKey derives a private key in WIF format
 func DeriveWIFKey(masterKey *hdkeychain.ExtendedKey, index uint32) (string, error) {
-	path := fmt.Sprintf("%s/%d'/%d'", BIP85_MASTER_PATH, APP_HD_WIF, index)
+	path := fmt.Sprintf("%s/%d'/%d'", BIP85_MASTER_PATH, AppHDWIF, index)
 
 	entropy, err := DeriveBIP85Entropy(masterKey, path)
 	if err != nil {
@@ -215,7 +228,7 @@ func DeriveWIFKey(masterKey *hdkeychain.ExtendedKey, index uint32) (string, erro
 
 // DeriveXPRV derives an extended private key (XPRV)
 func DeriveXPRV(masterKey *hdkeychain.ExtendedKey, index uint32) (*hdkeychain.ExtendedKey, error) {
-	path := fmt.Sprintf("%s/%d'/%d'", BIP85_MASTER_PATH, APP_XPRV, index)
+	path := fmt.Sprintf("%s/%d'/%d'", BIP85_MASTER_PATH, AppXPRV, index)
 
 	entropy, err := DeriveBIP85Entropy(masterKey, path)
 	if err != nil {
@@ -266,6 +279,7 @@ func DeriveXPRV(masterKey *hdkeychain.ExtendedKey, index uint32) (*hdkeychain.Ex
 func doubleSHA256(data []byte) []byte {
 	hash1 := sha256.Sum256(data)
 	hash2 := sha256.Sum256(hash1[:])
+
 	return hash2[:]
 }
 
@@ -308,7 +322,7 @@ func DeriveBase64Password(masterKey *hdkeychain.ExtendedKey, pwdLen, index uint3
 	encodedStr = strings.TrimRight(encodedStr, "=")
 
 	// Slice to the desired password length
-	if uint32(len(encodedStr)) < pwdLen {
+	if len(encodedStr) < int(pwdLen) {
 		return "", fmt.Errorf("derived password length %d is shorter than requested length %d", len(encodedStr), pwdLen)
 	}
 
@@ -321,7 +335,7 @@ func DeriveBase85Password(masterKey *hdkeychain.ExtendedKey, pwdLen, index uint3
 		return "", fmt.Errorf("pwdLen must be between 10 and 80")
 	}
 
-	path := fmt.Sprintf("%s/%d'/%d'/%d'", BIP85_MASTER_PATH, APP_PWD85, pwdLen, index)
+	path := fmt.Sprintf("%s/%d'/%d'/%d'", BIP85_MASTER_PATH, AppPWD85, pwdLen, index)
 
 	entropy, err := DeriveBIP85Entropy(masterKey, path)
 	if err != nil {
@@ -332,7 +346,7 @@ func DeriveBase85Password(masterKey *hdkeychain.ExtendedKey, pwdLen, index uint3
 	encoded := encodeBase85WithRFC1924Charset(entropy)
 
 	// Slice to the desired password length
-	if uint32(len(encoded)) < pwdLen {
+	if len(encoded) < int(pwdLen) {
 		return "", fmt.Errorf("encoded length %d is less than requested length %d", len(encoded), pwdLen)
 	}
 
@@ -344,24 +358,30 @@ func encodeBase85WithRFC1924Charset(data []byte) string {
 	// RFC1924 character set
 	charset := "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~"
 
+	const (
+		base85ChunkSize  = 4  // Process 4 bytes at a time
+		base85DigitCount = 5  // Each chunk produces 5 digits
+		base85Base       = 85 // Base85 encoding uses base 85
+	)
+
 	// Pad data to multiple of 4
-	padded := make([]byte, ((len(data)+3)/4)*4)
+	padded := make([]byte, ((len(data)+base85ChunkSize-1)/base85ChunkSize)*base85ChunkSize)
 	copy(padded, data)
 
 	var buf strings.Builder
-	buf.Grow(len(padded) * 5 / 4) // Each 4 bytes becomes 5 Base85 characters
+	buf.Grow(len(padded) * base85DigitCount / base85ChunkSize) // Each 4 bytes becomes 5 Base85 characters
 
 	// Process in 4-byte chunks
-	for i := 0; i < len(padded); i += 4 {
+	for i := 0; i < len(padded); i += base85ChunkSize {
 		// Convert 4 bytes to uint32 (big-endian)
-		chunk := binary.BigEndian.Uint32(padded[i : i+4])
+		chunk := binary.BigEndian.Uint32(padded[i : i+base85ChunkSize])
 
 		// Convert to 5 base-85 digits
-		digits := make([]byte, 5)
+		digits := make([]byte, base85DigitCount)
-		for j := 4; j >= 0; j-- {
+		for j := base85DigitCount - 1; j >= 0; j-- {
-			idx := chunk % 85
+			idx := chunk % base85Base
 			digits[j] = charset[idx]
-			chunk /= 85
+			chunk /= base85Base
 		}
 
 		buf.Write(digits)

pkg/bip85/bip85_test.go

@@ -1,5 +1,9 @@
+//nolint:gosec // G101: Test file contains BIP85 test vectors, not real credentials
+//nolint:lll // Test vectors contain long lines
 package bip85
 
+//nolint:revive,unparam // Test file with BIP85 test vectors
+
 import (
 	"bytes"
 	"encoding/hex"
@@ -79,13 +83,13 @@ const (
 )
 
 // logTestVector logs test information in a cleaner, more concise format
-func logTestVector(t *testing.T, title, description string) {
+func logTestVector(t *testing.T, title string) {
 	t.Logf("=== TEST: %s ===", title)
 }
 
 // TestDerivedKey is a helper function to test the derived key directly
 func TestDerivedKey(t *testing.T) {
-	logTestVector(t, "Derived Child Keys", "Testing direct key derivation for BIP85 paths")
+	logTestVector(t, "Derived Child Keys")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -129,7 +133,7 @@ func TestDerivedKey(t *testing.T) {
 
 // TestCase1 tests the first test vector from the BIP85 specification
 func TestCase1(t *testing.T) {
-	logTestVector(t, "Test Case 1", "Basic entropy derivation with path m/83696968'/0'/0'")
+	logTestVector(t, "Test Case 1")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -155,7 +159,7 @@ func TestCase1(t *testing.T) {
 
 // TestCase2 tests the second test vector from the BIP85 specification
 func TestCase2(t *testing.T) {
-	logTestVector(t, "Test Case 2", "Basic entropy derivation with path m/83696968'/0'/1'")
+	logTestVector(t, "Test Case 2")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -181,7 +185,7 @@ func TestCase2(t *testing.T) {
 
 // TestBIP39_12EnglishWords tests the BIP39 12 English words test vector
 func TestBIP39_12EnglishWords(t *testing.T) {
-	logTestVector(t, "BIP39 12 English Words", "Deriving a 12-word English BIP39 mnemonic")
+	logTestVector(t, "BIP39 12 English Words")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -225,7 +229,7 @@ func TestBIP39_12EnglishWords(t *testing.T) {
 
 // TestBIP39_18EnglishWords tests the BIP39 18 English words test vector
 func TestBIP39_18EnglishWords(t *testing.T) {
-	logTestVector(t, "BIP39 18 English Words", "Deriving an 18-word English BIP39 mnemonic")
+	logTestVector(t, "BIP39 18 English Words")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -269,7 +273,7 @@ func TestBIP39_18EnglishWords(t *testing.T) {
 
 // TestBIP39_24EnglishWords tests the BIP39 24 English words test vector
 func TestBIP39_24EnglishWords(t *testing.T) {
-	logTestVector(t, "BIP39 24 English Words", "Deriving a 24-word English BIP39 mnemonic")
+	logTestVector(t, "BIP39 24 English Words")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -313,7 +317,7 @@ func TestBIP39_24EnglishWords(t *testing.T) {
 
 // TestHD_WIF tests the WIF test vector
 func TestHD_WIF(t *testing.T) {
-	logTestVector(t, "HD-Seed WIF", "Deriving a WIF-encoded private key for Bitcoin Core hdseed")
+	logTestVector(t, "HD-Seed WIF")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -353,7 +357,7 @@ func TestHD_WIF(t *testing.T) {
 
 // TestXPRV tests the XPRV test vector
 func TestXPRV(t *testing.T) {
-	logTestVector(t, "XPRV", "Deriving an extended private key (XPRV)")
+	logTestVector(t, "XPRV")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -379,7 +383,7 @@ func TestXPRV(t *testing.T) {
 
 // TestDRNG_SHAKE256 tests the BIP85-DRNG-SHAKE256 test vector
 func TestDRNG_SHAKE256(t *testing.T) {
-	logTestVector(t, "DRNG-SHAKE256", "Testing the deterministic random number generator with SHAKE256")
+	logTestVector(t, "DRNG-SHAKE256")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -414,7 +418,7 @@ func TestDRNG_SHAKE256(t *testing.T) {
 
 // TestPythonDRNGVectors tests the DRNG vectors from the Python implementation
 func TestPythonDRNGVectors(t *testing.T) {
-	logTestVector(t, "Python DRNG Vectors", "Testing specific DRNG vectors from the Python implementation")
+	logTestVector(t, "Python DRNG Vectors")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -489,7 +493,7 @@ func TestPythonDRNGVectors(t *testing.T) {
 
 // TestDRNGDeterminism tests the deterministic behavior of the DRNG
 func TestDRNGDeterminism(t *testing.T) {
-	logTestVector(t, "DRNG Determinism", "Testing deterministic behavior of the DRNG")
+	logTestVector(t, "DRNG Determinism")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -573,7 +577,7 @@ func TestDRNGDeterminism(t *testing.T) {
 
 // TestDRNGLengths tests the DRNG with different lengths
 func TestDRNGLengths(t *testing.T) {
-	logTestVector(t, "DRNG Lengths", "Testing DRNG with different read lengths")
+	logTestVector(t, "DRNG Lengths")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -606,7 +610,7 @@ func TestDRNGLengths(t *testing.T) {
 
 // TestDRNGExceptions tests error handling in the DRNG
 func TestDRNGExceptions(t *testing.T) {
-	logTestVector(t, "DRNG Exceptions", "Testing error handling in the DRNG")
+	logTestVector(t, "DRNG Exceptions")
 
 	// Test with entropy of the wrong size
 	testCases := []int{0, 1, 32, 63, 65, 128}
@@ -638,7 +642,7 @@ func TestDRNGExceptions(t *testing.T) {
 
 // TestDRNGDifferentSizes tests the DRNG with different buffer sizes
 func TestDRNGDifferentSizes(t *testing.T) {
-	logTestVector(t, "DRNG Different Sizes", "Testing the DRNG with different buffer sizes")
+	logTestVector(t, "DRNG Different Sizes")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -700,7 +704,7 @@ func TestDRNGDifferentSizes(t *testing.T) {
 
 // TestMasterKeyParsing tests parsing of different master key formats
 func TestMasterKeyParsing(t *testing.T) {
-	logTestVector(t, "Master Key Parsing", "Testing parsing of master keys in different formats")
+	logTestVector(t, "Master Key Parsing")
 
 	// Test valid master key
 	t.Logf("Testing valid master key")
@@ -747,7 +751,7 @@ func TestMasterKeyParsing(t *testing.T) {
 
 // TestDifferentPathFormats tests different path format expressions
 func TestDifferentPathFormats(t *testing.T) {
-	logTestVector(t, "Path Formats", "Testing different path format expressions")
+	logTestVector(t, "Path Formats")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -791,7 +795,7 @@ func TestDifferentPathFormats(t *testing.T) {
 
 // TestDirectBase85Encoding tests direct Base85 encoding with the test vector entropy
 func TestDirectBase85Encoding(t *testing.T) {
-	logTestVector(t, "Direct Base85 Encoding", "Testing Base85 encoding with BIP85 test vector")
+	logTestVector(t, "Direct Base85 Encoding")
 
 	// Parse the master key
 	masterKey, err := ParseMasterKey(testMasterKey)
@@ -836,7 +840,7 @@ func TestDirectBase85Encoding(t *testing.T) {
 
 // TestPWDBase64 tests the Base64 password test vector
 func TestPWDBase64(t *testing.T) {
-	logTestVector(t, "PWD Base64", "Deriving a Base64-encoded password")
+	logTestVector(t, "PWD Base64")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -881,7 +885,7 @@ func TestPWDBase64(t *testing.T) {
 
 // TestPWDBase85 tests the Base85 password test vector
 func TestPWDBase85(t *testing.T) {
-	logTestVector(t, "PWD Base85", "Deriving a Base85-encoded password")
+	logTestVector(t, "PWD Base85")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -926,7 +930,7 @@ func TestPWDBase85(t *testing.T) {
 
 // TestHexDerivation tests the HEX derivation test vector
 func TestHexDerivation(t *testing.T) {
-	logTestVector(t, "HEX Derivation", "Testing HEX data derivation with BIP85 test vector")
+	logTestVector(t, "HEX Derivation")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -963,7 +967,7 @@ func TestHexDerivation(t *testing.T) {
 
 // TestInvalidParameters tests error conditions for parameter validation
 func TestInvalidParameters(t *testing.T) {
-	logTestVector(t, "Invalid Parameters", "Testing error handling for invalid inputs")
+	logTestVector(t, "Invalid Parameters")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {
@@ -1041,7 +1045,7 @@ func TestInvalidParameters(t *testing.T) {
 
 // TestAdditionalDeriveHex tests additional hex derivation scenarios
 func TestAdditionalDeriveHex(t *testing.T) {
-	logTestVector(t, "Additional Hex Derivation", "Testing hex data derivation with various lengths")
+	logTestVector(t, "Additional Hex Derivation")
 
 	masterKey, err := ParseMasterKey(testMasterKey)
 	if err != nil {

test_secret_manager.sh

@@ -1,851 +0,0 @@
-#!/bin/bash
-
-set -e  # Exit on any error
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Test configuration
-TEST_MNEMONIC="abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
-TEST_PASSPHRASE="test-passphrase-123"
-TEMP_DIR="$(mktemp -d)"
-SECRET_BINARY="./secret"
-
-# Enable debug output from the secret program
-export GODEBUG="berlin.sneak.pkg.secret"
-
-echo -e "${BLUE}=== Secret Manager Comprehensive Test Script ===${NC}"
-echo -e "${YELLOW}Using temporary directory: $TEMP_DIR${NC}"
-echo -e "${YELLOW}Debug output enabled: GODEBUG=$GODEBUG${NC}"
-echo -e "${YELLOW}Note: All tests use environment variables (no manual input)${NC}"
-
-# Function to print test steps
-print_step() {
-    echo -e "\n${BLUE}Step $1: $2${NC}"
-}
-
-# Function to print success
-print_success() {
-    echo -e "${GREEN}✓ $1${NC}"
-}
-
-# Function to print error and exit
-print_error() {
-    echo -e "${RED}✗ $1${NC}"
-    exit 1
-}
-
-# Function to print warning (for expected failures)
-print_warning() {
-    echo -e "${YELLOW}⚠ $1${NC}"
-}
-
-# Function to clear state directory and reset environment
-reset_state() {
-    echo -e "${YELLOW}Resetting state directory...${NC}"
-    
-    # Safety checks before removing anything
-    if [ -z "$TEMP_DIR" ]; then
-        print_error "TEMP_DIR is not set, cannot reset state safely"
-    fi
-    
-    if [ ! -d "$TEMP_DIR" ]; then
-        print_error "TEMP_DIR ($TEMP_DIR) is not a directory, cannot reset state safely"
-    fi
-    
-    # Additional safety: ensure TEMP_DIR looks like a temp directory
-    case "$TEMP_DIR" in
-        /tmp/* | /var/folders/* | */tmp/*)
-            # Looks like a reasonable temp directory path
-            ;;
-        *)
-            print_error "TEMP_DIR ($TEMP_DIR) does not look like a safe temporary directory path"
-            ;;
-    esac
-    
-    # Now it's safe to remove contents - use find to avoid glob expansion issues
-    find "${TEMP_DIR:?}" -mindepth 1 -delete 2>/dev/null || true
-    unset SB_SECRET_MNEMONIC
-    unset SB_UNLOCK_PASSPHRASE
-    export SB_SECRET_STATE_DIR="$TEMP_DIR"
-}
-
-# Cleanup function
-cleanup() {
-    echo -e "\n${YELLOW}Cleaning up...${NC}"
-    rm -rf "$TEMP_DIR"
-    unset SB_SECRET_STATE_DIR
-    unset SB_SECRET_MNEMONIC
-    unset SB_UNLOCK_PASSPHRASE
-    unset GODEBUG
-    echo -e "${GREEN}Cleanup complete${NC}"
-}
-
-# Set cleanup trap
-trap cleanup EXIT
-
-# Check that the secret binary exists
-if [ ! -f "$SECRET_BINARY" ]; then
-    print_error "Secret binary not found at $SECRET_BINARY. Please run 'make build' first."
-fi
-
-# Test 1: Set up environment variables
-print_step "1" "Setting up environment variables"
-export SB_SECRET_STATE_DIR="$TEMP_DIR"
-export SB_SECRET_MNEMONIC="$TEST_MNEMONIC"
-print_success "Environment variables set"
-echo "  SB_SECRET_STATE_DIR=$SB_SECRET_STATE_DIR"
-echo "  SB_SECRET_MNEMONIC=$TEST_MNEMONIC"
-
-# Test 2: Initialize the secret manager (should create default vault)
-print_step "2" "Initializing secret manager (creates default vault)"
-export SB_UNLOCK_PASSPHRASE="$TEST_PASSPHRASE"
-echo "  SB_UNLOCK_PASSPHRASE=$SB_UNLOCK_PASSPHRASE"
-
-# Verify environment variables are exported and visible to subprocesses
-echo "Verifying environment variables are exported:"
-env | grep -E "^SB_" || true
-
-echo "Running: $SECRET_BINARY init"
-# Run with explicit environment to ensure variables are passed
-if SB_SECRET_STATE_DIR="$SB_SECRET_STATE_DIR" \
-   SB_SECRET_MNEMONIC="$SB_SECRET_MNEMONIC" \
-   SB_UNLOCK_PASSPHRASE="$SB_UNLOCK_PASSPHRASE" \
-   GODEBUG="$GODEBUG" \
-   $SECRET_BINARY init </dev/null; then
-    print_success "Secret manager initialized with default vault"
-else
-    print_error "Failed to initialize secret manager"
-fi
-unset SB_UNLOCK_PASSPHRASE
-
-# Verify directory structure was created
-if [ -d "$TEMP_DIR" ]; then
-    print_success "State directory created: $TEMP_DIR"
-else
-    print_error "State directory was not created"
-fi
-
-# Test 3: Vault management
-print_step "3" "Testing vault management"
-
-# List vaults (should show default)
-echo "Listing vaults..."
-echo "Running: $SECRET_BINARY vault list"
-if $SECRET_BINARY vault list; then
-    VAULTS=$($SECRET_BINARY vault list)
-    echo "Available vaults: $VAULTS"
-    print_success "Listed vaults successfully"
-else
-    print_error "Failed to list vaults"
-fi
-
-# Create a new vault
-echo "Creating new vault 'work'..."
-echo "Running: $SECRET_BINARY vault create work"
-if $SECRET_BINARY vault create work; then
-    print_success "Created vault 'work'"
-else
-    print_error "Failed to create vault 'work'"
-fi
-
-# Create another vault
-echo "Creating new vault 'personal'..."
-echo "Running: $SECRET_BINARY vault create personal"
-if $SECRET_BINARY vault create personal; then
-    print_success "Created vault 'personal'"
-else
-    print_error "Failed to create vault 'personal'"
-fi
-
-# List vaults again (should show default, work, personal)
-echo "Listing vaults after creation..."
-echo "Running: $SECRET_BINARY vault list"
-if $SECRET_BINARY vault list; then
-    VAULTS=$($SECRET_BINARY vault list)
-    echo "Available vaults: $VAULTS"
-    print_success "Listed vaults after creation"
-else
-    print_error "Failed to list vaults after creation"
-fi
-
-# Switch to work vault
-echo "Switching to 'work' vault..."
-echo "Running: $SECRET_BINARY vault select work"
-if $SECRET_BINARY vault select work; then
-    print_success "Switched to 'work' vault"
-else
-    print_error "Failed to switch to 'work' vault"
-fi
-
-# Test 4: Import functionality with environment variable combinations
-print_step "4" "Testing import functionality with environment variable combinations"
-
-# Test 4a: Import with both env vars set (typical usage)
-echo -e "\n${YELLOW}Test 4a: Import with both SB_SECRET_MNEMONIC and SB_UNLOCK_PASSPHRASE set${NC}"
-reset_state
-export SB_SECRET_MNEMONIC="$TEST_MNEMONIC"
-export SB_UNLOCK_PASSPHRASE="$TEST_PASSPHRASE"
-
-# Create a vault first
-echo "Running: $SECRET_BINARY vault create test-vault"
-if $SECRET_BINARY vault create test-vault; then
-    print_success "Created test-vault for import testing"
-else
-    print_error "Failed to create test-vault"
-fi
-
-# Import should work without prompts
-echo "Importing with both env vars set (automated)..."
-echo "Running: $SECRET_BINARY vault import test-vault"
-if $SECRET_BINARY vault import test-vault; then
-    print_success "Import succeeded with both env vars (automated)"
-else
-    print_error "Import failed with both env vars"
-fi
-
-# Test 4b: Import into non-existent vault (should fail)
-echo -e "\n${YELLOW}Test 4b: Import into non-existent vault (should fail)${NC}"
-echo "Importing into non-existent vault (should fail)..."
-if $SECRET_BINARY vault import nonexistent-vault; then
-    print_error "Import should have failed for non-existent vault"
-else
-    print_success "Import correctly failed for non-existent vault"
-fi
-
-# Test 4c: Import with invalid mnemonic (should fail)
-echo -e "\n${YELLOW}Test 4c: Import with invalid mnemonic (should fail)${NC}"
-export SB_SECRET_MNEMONIC="invalid mnemonic phrase that should not work"
-
-# Create a vault first
-echo "Running: $SECRET_BINARY vault create test-vault2"
-if $SECRET_BINARY vault create test-vault2; then
-    print_success "Created test-vault2 for invalid mnemonic testing"
-else
-    print_error "Failed to create test-vault2"
-fi
-
-echo "Importing with invalid mnemonic (should fail)..."
-if $SECRET_BINARY vault import test-vault2; then
-    print_error "Import should have failed with invalid mnemonic"
-else
-    print_success "Import correctly failed with invalid mnemonic"
-fi
-
-# Reset state for remaining tests
-reset_state
-export SB_SECRET_MNEMONIC="$TEST_MNEMONIC"
-
-# Test 5: Unlocker management
-print_step "5" "Testing unlocker management"
-
-# Initialize with mnemonic and passphrase
-export SB_UNLOCK_PASSPHRASE="$TEST_PASSPHRASE"
-echo "Running: $SECRET_BINARY init (with SB_SECRET_MNEMONIC and SB_UNLOCK_PASSPHRASE set)"
-if $SECRET_BINARY init; then
-    print_success "Initialized for unlocker testing"
-else
-    print_error "Failed to initialize for unlocker testing"
-fi
-
-# Create passphrase-protected unlocker
-echo "Creating passphrase-protected unlocker..."
-echo "Running: $SECRET_BINARY unlockers add passphrase (with SB_UNLOCK_PASSPHRASE set)"
-if $SECRET_BINARY unlockers add passphrase; then
-    print_success "Created passphrase-protected unlocker"
-else
-    print_error "Failed to create passphrase-protected unlocker"
-    exit 1
-fi
-unset SB_UNLOCK_PASSPHRASE
-
-# List unlockers
-echo "Listing unlockers..."
-echo "Running: $SECRET_BINARY unlockers list"
-if $SECRET_BINARY unlockers list; then
-    UNLOCKERS=$($SECRET_BINARY unlockers list)
-    echo "Available unlockers: $UNLOCKERS"
-    print_success "Listed unlockers"
-else
-    print_error "Failed to list unlockers"
-    exit 1
-fi
-
-# Test 6: Secret management with mnemonic (keyless operation)
-print_step "6" "Testing mnemonic-based secret operations (keyless)"
-
-# Add secrets using mnemonic (no unlocker required)
-echo "Adding secrets using mnemonic-based long-term key..."
-
-# Test secret 1
-echo "Running: echo \"my-super-secret-password\" | $SECRET_BINARY add \"database/password\""
-if echo "my-super-secret-password" | $SECRET_BINARY add "database/password"; then
-    print_success "Added secret: database/password"
-else
-    print_error "Failed to add secret: database/password"
-fi
-
-# Test secret 2
-echo "Running: echo \"api-key-12345\" | $SECRET_BINARY add \"api/key\""
-if echo "api-key-12345" | $SECRET_BINARY add "api/key"; then
-    print_success "Added secret: api/key"
-else
-    print_error "Failed to add secret: api/key"
-fi
-
-# Test secret 3 (with path)
-echo "Running: echo \"ssh-private-key-content\" | $SECRET_BINARY add \"ssh/private-key\""
-if echo "ssh-private-key-content" | $SECRET_BINARY add "ssh/private-key"; then
-    print_success "Added secret: ssh/private-key"
-else
-    print_error "Failed to add secret: ssh/private-key"
-fi
-
-# Test secret 4 (with dots and underscores)
-echo "Running: echo \"jwt-secret-token\" | $SECRET_BINARY add \"app.config_jwt_secret\""
-if echo "jwt-secret-token" | $SECRET_BINARY add "app.config_jwt_secret"; then
-    print_success "Added secret: app.config_jwt_secret"
-else
-    print_error "Failed to add secret: app.config_jwt_secret"
-fi
-
-# Retrieve secrets using mnemonic
-echo "Retrieving secrets using mnemonic-based long-term key..."
-
-# Retrieve and verify secret 1
-RETRIEVED_SECRET1=$($SECRET_BINARY get "database/password" 2>/dev/null)
-if [ "$RETRIEVED_SECRET1" = "my-super-secret-password" ]; then
-    print_success "Retrieved and verified secret: database/password"
-else
-    print_error "Failed to retrieve or verify secret: database/password"
-fi
-
-# Retrieve and verify secret 2
-RETRIEVED_SECRET2=$($SECRET_BINARY get "api/key" 2>/dev/null)
-if [ "$RETRIEVED_SECRET2" = "api-key-12345" ]; then
-    print_success "Retrieved and verified secret: api/key"
-else
-    print_error "Failed to retrieve or verify secret: api/key"
-fi
-
-# Retrieve and verify secret 3
-RETRIEVED_SECRET3=$($SECRET_BINARY get "ssh/private-key" 2>/dev/null)
-if [ "$RETRIEVED_SECRET3" = "ssh-private-key-content" ]; then
-    print_success "Retrieved and verified secret: ssh/private-key"
-else
-    print_error "Failed to retrieve or verify secret: ssh/private-key"
-fi
-
-# List all secrets
-echo "Listing all secrets..."
-echo "Running: $SECRET_BINARY list"
-if $SECRET_BINARY list; then
-    SECRETS=$($SECRET_BINARY list)
-    echo "Secrets in current vault:"
-    echo "$SECRETS" | while read -r secret; do
-        echo "  - $secret"
-    done
-    print_success "Listed all secrets"
-else
-    print_error "Failed to list secrets"
-fi
-
-# Test 7: Testing vault operations with different unlockers
-print_step "7" "Testing vault operations with passphrase unlocker"
-
-# Create a new vault for unlocker testing
-echo "Running: $SECRET_BINARY vault create traditional"
-$SECRET_BINARY vault create traditional
-
-# Import mnemonic into the traditional vault (required for versioned secrets)
-echo "Importing mnemonic into traditional vault..."
-export SB_UNLOCK_PASSPHRASE="$TEST_PASSPHRASE"
-echo "Running: $SECRET_BINARY vault import traditional"
-if $SECRET_BINARY vault import traditional; then
-    print_success "Imported mnemonic into traditional vault"
-else
-    print_error "Failed to import mnemonic into traditional vault"
-fi
-unset SB_UNLOCK_PASSPHRASE
-
-# Now add a secret using the vault with unlocker
-echo "Adding secret to vault with unlocker..."
-echo "Running: echo 'traditional-secret' | $SECRET_BINARY add traditional/secret"
-if echo "traditional-secret" | $SECRET_BINARY add traditional/secret; then
-    print_success "Added secret to vault with unlocker"
-else
-    print_error "Failed to add secret to vault with unlocker"
-fi
-
-# Retrieve secret using passphrase (temporarily unset mnemonic to test unlocker)
-echo "Retrieving secret from vault with unlocker..."
-TEMP_MNEMONIC="$SB_SECRET_MNEMONIC"
-unset SB_SECRET_MNEMONIC
-export SB_UNLOCK_PASSPHRASE="$TEST_PASSPHRASE"
-echo "Running: $SECRET_BINARY get traditional/secret (using passphrase unlocker)"
-if RETRIEVED=$($SECRET_BINARY get traditional/secret 2>&1); then
-    print_success "Retrieved: $RETRIEVED"
-else
-    print_error "Failed to retrieve secret from vault with unlocker"
-fi
-unset SB_UNLOCK_PASSPHRASE
-export SB_SECRET_MNEMONIC="$TEMP_MNEMONIC"
-
-# Test 8: Advanced unlocker management
-print_step "8" "Testing advanced unlocker management"
-
-if [ "$PLATFORM" = "darwin" ]; then
-    # macOS only: Test Secure Enclave
-    echo "Testing Secure Enclave unlocker creation..."
-    if $SECRET_BINARY unlockers add sep; then
-        print_success "Created Secure Enclave unlocker"
-    else
-        print_warning "Secure Enclave unlocker creation not yet implemented"
-    fi
-fi
-
-# Get current unlocker ID for testing
-echo "Getting current unlocker for testing..."
-echo "Running: $SECRET_BINARY unlockers list"
-if $SECRET_BINARY unlockers list; then
-    CURRENT_UNLOCKER_ID=$($SECRET_BINARY unlockers list | head -n1 | awk '{print $1}')
-    if [ -n "$CURRENT_UNLOCKER_ID" ]; then
-        print_success "Found unlocker ID: $CURRENT_UNLOCKER_ID"
-        
-        # Test unlocker selection
-        echo "Testing unlocker selection..."
-        echo "Running: $SECRET_BINARY unlocker select $CURRENT_UNLOCKER_ID"
-        if $SECRET_BINARY unlocker select "$CURRENT_UNLOCKER_ID"; then
-            print_success "Selected unlocker: $CURRENT_UNLOCKER_ID"
-        else
-            print_warning "Unlocker selection not yet implemented"
-        fi
-    fi
-fi
-
-# Test 9: Secret name validation and edge cases
-print_step "9" "Testing secret name validation and edge cases"
-
-# Switch back to default vault for name validation tests
-echo "Switching back to default vault..."
-$SECRET_BINARY vault select default
-
-# Test valid names
-VALID_NAMES=("valid-name" "valid.name" "valid_name" "valid/path/name" "123valid" "a" "very-long-name-with-many-parts/and/paths")
-for name in "${VALID_NAMES[@]}"; do
-    echo "Running: echo \"test-value\" | $SECRET_BINARY add $name --force"
-    if echo "test-value" | $SECRET_BINARY add "$name" --force; then
-        print_success "Valid name accepted: $name"
-    else
-        print_error "Valid name rejected: $name"
-    fi
-done
-
-# Test invalid names (these should fail)
-echo "Testing invalid names (should fail)..."
-INVALID_NAMES=("Invalid-Name" "invalid name" "invalid@name" "invalid#name" "invalid%name" "")
-for name in "${INVALID_NAMES[@]}"; do
-    echo "Running: echo \"test-value\" | $SECRET_BINARY add $name"
-    if echo "test-value" | $SECRET_BINARY add "$name"; then
-        print_error "Invalid name accepted (should have been rejected): '$name'"
-    else
-        print_success "Invalid name correctly rejected: '$name'"
-    fi
-done
-
-# Test 10: Overwrite protection and force flag
-print_step "10" "Testing overwrite protection and force flag"
-
-# Try to add existing secret without --force (should fail)
-echo "Running: echo \"new-value\" | $SECRET_BINARY add \"database/password\""
-if echo "new-value" | $SECRET_BINARY add "database/password"; then
-    print_error "Overwrite protection failed - secret was overwritten without --force"
-else
-    print_success "Overwrite protection working - secret not overwritten without --force"
-fi
-
-# Try to add existing secret with --force (should succeed)
-echo "Running: echo \"new-password-value\" | $SECRET_BINARY add \"database/password\" --force"
-if echo "new-password-value" | $SECRET_BINARY add "database/password" --force; then
-    print_success "Force overwrite working - secret overwritten with --force"
-    
-    # Verify the new value
-    RETRIEVED_NEW=$($SECRET_BINARY get "database/password" 2>/dev/null)
-    if [ "$RETRIEVED_NEW" = "new-password-value" ]; then
-        print_success "Overwritten secret has correct new value"
-    else
-        print_error "Overwritten secret has incorrect value"
-    fi
-else
-    print_error "Force overwrite failed - secret not overwritten with --force"
-fi
-
-# Test 11: Cross-vault operations
-print_step "11" "Testing cross-vault operations"
-
-# First create and import mnemonic into work vault since it was destroyed by reset_state
-echo "Creating work vault for cross-vault testing..."
-echo "Running: $SECRET_BINARY vault create work"
-if $SECRET_BINARY vault create work; then
-    print_success "Created work vault for cross-vault testing"
-else
-    print_error "Failed to create work vault for cross-vault testing"
-fi
-
-# Import mnemonic into work vault so it can store secrets
-echo "Importing mnemonic into work vault..."
-export SB_UNLOCK_PASSPHRASE="$TEST_PASSPHRASE"
-echo "Running: $SECRET_BINARY vault import work"
-if $SECRET_BINARY vault import work; then
-    print_success "Imported mnemonic into work vault"
-else
-    print_error "Failed to import mnemonic into work vault"
-fi
-unset SB_UNLOCK_PASSPHRASE
-
-# Switch to work vault and add secrets there
-echo "Switching to 'work' vault for cross-vault testing..."
-echo "Running: $SECRET_BINARY vault select work"
-if $SECRET_BINARY vault select work; then
-    print_success "Switched to 'work' vault"
-    
-    # Add work-specific secrets
-    echo "Running: echo \"work-database-password\" | $SECRET_BINARY add \"work/database\""
-    if echo "work-database-password" | $SECRET_BINARY add "work/database"; then
-        print_success "Added work-specific secret"
-    else
-        print_error "Failed to add work-specific secret"
-    fi
-    
-    # List secrets in work vault
-    echo "Running: $SECRET_BINARY list"
-    if $SECRET_BINARY list; then
-        WORK_SECRETS=$($SECRET_BINARY list)
-        echo "Secrets in work vault: $WORK_SECRETS"
-        print_success "Listed work vault secrets"
-    else
-        print_error "Failed to list work vault secrets"
-    fi
-else
-    print_error "Failed to switch to 'work' vault"
-fi
-
-# Switch back to default vault
-echo "Switching back to 'default' vault..."
-echo "Running: $SECRET_BINARY vault select default"
-if $SECRET_BINARY vault select default; then
-    print_success "Switched back to 'default' vault"
-    
-    # Verify default vault secrets are still there
-    echo "Running: $SECRET_BINARY get \"database/password\""
-    if $SECRET_BINARY get "database/password"; then
-        print_success "Default vault secrets still accessible"
-    else
-        print_error "Default vault secrets not accessible"
-    fi
-else
-    print_error "Failed to switch back to 'default' vault"
-fi
-
-# Test 12: File structure verification
-print_step "12" "Verifying file structure"
-
-echo "Checking file structure in $TEMP_DIR..."
-if [ -d "$TEMP_DIR/vaults.d/default/secrets.d" ]; then
-    print_success "Default vault structure exists"
-    
-    # Check a specific secret's file structure
-    SECRET_DIR="$TEMP_DIR/vaults.d/default/secrets.d/database%password"
-    if [ -d "$SECRET_DIR" ]; then
-        print_success "Secret directory exists: database%password"
-        
-        # Check for versions directory and current symlink
-        if [ -d "$SECRET_DIR/versions" ]; then
-            print_success "Versions directory exists"
-        else
-            print_error "Versions directory missing"
-        fi
-        
-        if [ -L "$SECRET_DIR/current" ] || [ -f "$SECRET_DIR/current" ]; then
-            print_success "Current version symlink exists"
-        else
-            print_error "Current version symlink missing"
-        fi
-        
-        # Check version directory structure
-        LATEST_VERSION=$(ls -1 "$SECRET_DIR/versions" 2>/dev/null | sort -r | head -n1)
-        if [ -n "$LATEST_VERSION" ]; then
-            VERSION_DIR="$SECRET_DIR/versions/$LATEST_VERSION"
-            print_success "Found version directory: $LATEST_VERSION"
-            
-            # Check required files in version directory
-            VERSION_FILES=("value.age" "pub.age" "priv.age" "metadata.age")
-            for file in "${VERSION_FILES[@]}"; do
-                if [ -f "$VERSION_DIR/$file" ]; then
-                    print_success "Version file exists: $file"
-                else
-                    print_error "Version file missing: $file"
-                fi
-            done
-        else
-            print_error "No version directories found"
-        fi
-    else
-        print_error "Secret directory not found"
-    fi
-else
-    print_error "Default vault structure not found"
-fi
-
-# Check work vault structure
-if [ -d "$TEMP_DIR/vaults.d/work" ]; then
-    print_success "Work vault structure exists"
-else
-    print_error "Work vault structure not found"
-fi
-
-# Check configuration files
-if [ -f "$TEMP_DIR/configuration.json" ]; then
-    print_success "Global configuration file exists"
-else
-    print_warning "Global configuration file not found (may not be implemented yet)"
-fi
-
-# Check current vault symlink
-if [ -L "$TEMP_DIR/currentvault" ] || [ -f "$TEMP_DIR/currentvault" ]; then
-    print_success "Current vault link exists"
-else
-    print_error "Current vault link not found"
-fi
-
-# Test 13: Environment variable error handling
-print_step "13" "Testing environment variable error handling"
-
-# Test with non-existent state directory
-export SB_SECRET_STATE_DIR="$TEMP_DIR/nonexistent/directory"
-echo "Running: $SECRET_BINARY get \"database/password\""
-if $SECRET_BINARY get "database/password"; then
-    print_error "Should have failed with non-existent state directory"
-else
-    print_success "Correctly failed with non-existent state directory"
-fi
-
-# Test init with non-existent directory (should work)
-echo "Running: $SECRET_BINARY init (with SB_UNLOCK_PASSPHRASE set)"
-export SB_UNLOCK_PASSPHRASE="$TEST_PASSPHRASE"
-if $SECRET_BINARY init; then
-    print_success "Init works with non-existent state directory"
-else
-    print_error "Init should work with non-existent state directory"
-fi
-unset SB_UNLOCK_PASSPHRASE
-
-# Reset to working directory
-export SB_SECRET_STATE_DIR="$TEMP_DIR"
-
-# Test 14: Mixed approach compatibility
-print_step "14" "Testing mixed approach compatibility"
-
-# Switch to traditional vault and test access with passphrase
-echo "Switching to traditional vault..."
-$SECRET_BINARY vault select traditional
-
-# Verify passphrase can access traditional vault secrets
-unset SB_SECRET_MNEMONIC
-export SB_UNLOCK_PASSPHRASE="$TEST_PASSPHRASE"
-RETRIEVED_MIXED=$($SECRET_BINARY get "traditional/secret" 2>/dev/null)
-unset SB_UNLOCK_PASSPHRASE
-export SB_SECRET_MNEMONIC="$TEST_MNEMONIC"
-
-if [ "$RETRIEVED_MIXED" = "traditional-secret" ]; then
-    print_success "Passphrase unlocker can access vault secrets"
-else
-    print_error "Failed to access secret from traditional vault (expected: traditional-secret, got: $RETRIEVED_MIXED)"
-fi
-
-# Switch back to default vault
-$SECRET_BINARY vault select default
-
-# Test without mnemonic but with unlocker
-echo "Testing mnemonic-created vault access..."
-echo "Testing traditional unlocker access to mnemonic-created secrets..."
-echo "Running: $SECRET_BINARY get test/seed (with mnemonic set)"
-if RETRIEVED=$($SECRET_BINARY get test/seed 2>&1); then
-    print_success "Traditional unlocker can access mnemonic-created secrets"
-else
-    print_warning "Traditional unlocker cannot access mnemonic-created secrets (may need implementation)"
-fi
-
-# Re-enable mnemonic for final tests
-export SB_SECRET_MNEMONIC="$TEST_MNEMONIC"
-
-# Test 15: Version management
-print_step "15" "Testing version management"
-
-# Switch back to default vault for version testing
-echo "Switching to default vault for version testing..."
-echo "Running: $SECRET_BINARY vault select default"
-$SECRET_BINARY vault select default
-
-# Test listing versions of a secret
-echo "Listing versions of database/password..."
-echo "Running: $SECRET_BINARY version list \"database/password\""
-if $SECRET_BINARY version list "database/password"; then
-    print_success "Listed versions of database/password"
-else
-    print_error "Failed to list versions of database/password"
-fi
-
-# Add a new version of an existing secret
-echo "Adding new version of database/password..."
-echo "Running: echo \"version-2-password\" | $SECRET_BINARY add \"database/password\" --force"
-if echo "version-2-password" | $SECRET_BINARY add "database/password" --force; then
-    print_success "Added new version of database/password"
-    
-    # List versions again to see both
-    echo "Running: $SECRET_BINARY version list \"database/password\""
-    if $SECRET_BINARY version list "database/password"; then
-        print_success "Listed versions after adding new version"
-    else
-        print_error "Failed to list versions after adding new version"
-    fi
-else
-    print_error "Failed to add new version of database/password"
-fi
-
-# Get current version (should be the latest)
-echo "Getting current version of database/password..."
-CURRENT_VALUE=$($SECRET_BINARY get "database/password" 2>/dev/null)
-if [ "$CURRENT_VALUE" = "version-2-password" ]; then
-    print_success "Current version has correct value"
-else
-    print_error "Current version has incorrect value"
-fi
-
-# Get specific version by capturing version from list output
-echo "Getting specific version of database/password..."
-VERSIONS=$($SECRET_BINARY version list "database/password" | grep -E '^[0-9]{8}\.[0-9]{3}' | awk '{print $1}')
-FIRST_VERSION=$(echo "$VERSIONS" | tail -n1)
-if [ -n "$FIRST_VERSION" ]; then
-    echo "Running: $SECRET_BINARY get --version $FIRST_VERSION \"database/password\""
-    VERSIONED_VALUE=$($SECRET_BINARY get --version "$FIRST_VERSION" "database/password" 2>/dev/null)
-    if [ "$VERSIONED_VALUE" = "my-super-secret-password" ]; then
-        print_success "Retrieved correct value from specific version"
-    else
-        print_error "Retrieved incorrect value from specific version (expected: my-super-secret-password, got: $VERSIONED_VALUE)"
-    fi
-else
-    print_error "Could not determine version to test"
-fi
-
-# Test version promotion
-echo "Testing version promotion..."
-if [ -n "$FIRST_VERSION" ]; then
-    echo "Running: $SECRET_BINARY version promote \"database/password\" $FIRST_VERSION"
-    if $SECRET_BINARY version promote "database/password" "$FIRST_VERSION"; then
-        print_success "Promoted older version to current"
-        
-        # Verify the promoted version is now current
-        PROMOTED_VALUE=$($SECRET_BINARY get "database/password" 2>/dev/null)
-        if [ "$PROMOTED_VALUE" = "my-super-secret-password" ]; then
-            print_success "Promoted version is now current"
-        else
-            print_error "Promoted version value is incorrect (expected: my-super-secret-password, got: $PROMOTED_VALUE)"
-        fi
-    else
-        print_error "Failed to promote version"
-    fi
-fi
-
-# Check version directory structure
-echo "Checking version directory structure..."
-VERSION_DIR="$TEMP_DIR/vaults.d/default/secrets.d/database%password/versions"
-if [ -d "$VERSION_DIR" ]; then
-    print_success "Versions directory exists"
-    
-    # Count version directories
-    VERSION_COUNT=$(find "$VERSION_DIR" -mindepth 1 -maxdepth 1 -type d | wc -l)
-    if [ "$VERSION_COUNT" -ge 2 ]; then
-        print_success "Multiple version directories found: $VERSION_COUNT"
-    else
-        print_error "Expected multiple version directories, found: $VERSION_COUNT"
-    fi
-    
-    # Check for current symlink
-    CURRENT_LINK="$TEMP_DIR/vaults.d/default/secrets.d/database%password/current"
-    if [ -L "$CURRENT_LINK" ] || [ -f "$CURRENT_LINK" ]; then
-        print_success "Current version symlink exists"
-    else
-        print_error "Current version symlink not found"
-    fi
-else
-    print_error "Versions directory not found"
-fi
-
-# Final summary
-echo -e "\n${GREEN}=== Test Summary ===${NC}"
-echo -e "${GREEN}✓ Environment variable support (SB_SECRET_STATE_DIR, SB_SECRET_MNEMONIC)${NC}"
-echo -e "${GREEN}✓ Secret manager initialization${NC}"
-echo -e "${GREEN}✓ Vault management (create, list, select)${NC}"
-echo -e "${GREEN}✓ Import functionality with environment variable combinations${NC}"
-echo -e "${GREEN}✓ Import error handling (non-existent vault, invalid mnemonic)${NC}"
-echo -e "${GREEN}✓ Unlocker management (passphrase, PGP, SEP)${NC}"
-echo -e "${GREEN}✓ Secret generation and storage${NC}"
-echo -e "${GREEN}✓ Vault operations with passphrase unlocker${NC}"
-echo -e "${GREEN}✓ Secret name validation${NC}"
-echo -e "${GREEN}✓ Overwrite protection and force flag${NC}"
-echo -e "${GREEN}✓ Cross-vault operations${NC}"
-echo -e "${GREEN}✓ Per-secret key file structure${NC}"
-echo -e "${GREEN}✓ Mixed approach compatibility${NC}"
-echo -e "${GREEN}✓ Error handling${NC}"
-echo -e "${GREEN}✓ Version management (list, get, promote)${NC}"
-
-echo -e "\n${GREEN}🎉 Comprehensive test completed with environment variable automation!${NC}"
-
-# Show usage examples for all implemented functionality
-echo -e "\n${BLUE}=== Complete Usage Examples ===${NC}"
-echo -e "${YELLOW}# Environment setup:${NC}"
-echo "export SB_SECRET_STATE_DIR=\"/path/to/your/secrets\""
-echo "export SB_SECRET_MNEMONIC=\"your twelve word mnemonic phrase here\""
-echo ""
-echo -e "${YELLOW}# Initialization:${NC}"
-echo "secret init"
-echo ""
-echo -e "${YELLOW}# Vault management:${NC}"
-echo "secret vault list"
-echo "secret vault create work"
-echo "secret vault select work"
-echo ""
-echo -e "${YELLOW}# Import mnemonic (automated with environment variables):${NC}"
-echo "export SB_SECRET_MNEMONIC=\"abandon abandon...\""
-echo "export SB_UNLOCK_PASSPHRASE=\"passphrase\""
-echo "secret vault import work"
-echo ""
-echo -e "${YELLOW}# Unlocker management:${NC}"
-echo "$SECRET_BINARY unlockers add <type>        # Add unlocker (passphrase, pgp, keychain)"
-echo "$SECRET_BINARY unlockers add passphrase"
-echo "$SECRET_BINARY unlockers add pgp <gpg-key-id>"
-echo "$SECRET_BINARY unlockers add keychain        # macOS only"
-echo "$SECRET_BINARY unlockers list               # List all unlockers"
-echo "$SECRET_BINARY unlocker select <unlocker-id>  # Select current unlocker"
-echo "$SECRET_BINARY unlockers rm <unlocker-id>     # Remove unlocker"
-echo ""
-echo -e "${YELLOW}# Secret management:${NC}"
-echo "echo \"my-secret\" | secret add \"app/password\""
-echo "echo \"my-secret\" | secret add \"app/password\" --force"
-echo "secret get \"app/password\""
-echo "secret get --version 20231215.001 \"app/password\""
-echo "secret list"
-echo ""
-echo -e "${YELLOW}# Version management:${NC}"
-echo "secret version list \"app/password\""
-echo "secret version promote \"app/password\" 20231215.001"
-echo ""
-echo -e "${YELLOW}# Cross-vault operations:${NC}"
-echo "secret vault select work"
-echo "echo \"work-secret\" | secret add \"work/database\""
-echo "secret vault select default"