feat: init command.

.envrc

@@ -1 +1,4 @@
 use flake
+
+ROOT="/home/spencer/github.com/envr-zig"
+export PATH=".:${ROOT}/deps/zig:${ROOT}/deps/zls:$PATH"

.github/workflows/go.yml

@@ -0,0 +1,28 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Go
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.24.6'
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Test
+      run: go test -v ./...

.github/workflows/odin.yml

@@ -1,32 +0,0 @@
-name: Odin
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libsodium-dev sqlite3 libsqlite3-dev libsodium-dev
-
-      - name: Install Odin
-        run: |
-          git clone https://github.com/odin-lang/Odin.git /opt/odin
-          cd /opt/odin
-          ./build_odin.sh release
-          echo "/opt/odin" >> "$GITHUB_PATH"
-
-      - name: Build
-        run: |
-          odin build . -o:speed -out:envr
-
-      - name: Test
-        run: odin test .

.github/workflows/release-please.yml

@@ -2,8 +2,6 @@ on:
   push:
     branches:
       - main
-      - dev
-      - odin
 
 permissions:
   contents: write
@@ -16,7 +14,7 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
-      - uses: googleapis/release-please-action@v5
+      - uses: googleapis/release-please-action@v4
         with:
           # this assumes that you have created a personal access token
           # (PAT) and configured it as a GitHub action secret named
@@ -24,4 +22,4 @@ jobs:
           token: ${{ secrets.MY_RELEASE_PLEASE_TOKEN }}
           # this is a built-in strategy in release-please, see "Action Inputs"
           # for more options
-          release-type: simple
+          release-type: go

.gitignore

@@ -1,14 +1,18 @@
 # dev env
 .direnv
+/.env
 
-list.json
+# dependencies
+deps
+vendor
 
 # docs
 man 
 
 # build artifacts
+.zig-cache
 builds
 envr
 envr-go
 result
-version.odin
+zig-pkg

Makefile

@@ -4,6 +4,7 @@
 APP_NAME := envr
 VERSION := $(shell grep 'version = ' flake.nix | head -1 | sed 's/.*version = "\(.*\)";/\1/')
 BUILD_DIR := builds
+LDFLAGS := -X github.com/sbrow/envr/cmd.version=v$(VERSION) -s -w
 
 # Binary names
 LINUX_AMD64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-amd64
@@ -22,23 +23,23 @@ $(BUILD_DIR):
 # Build Linux AMD64
 $(LINUX_AMD64_BIN): $(BUILD_DIR)
 	@echo "Building for Linux AMD64..."
-	odin build . -target:linux_amd64 -o:speed -out:$(LINUX_AMD64_BIN)
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o $(LINUX_AMD64_BIN) .
 	@echo "Built $(LINUX_AMD64_BIN)"
 
 # Build Linux ARM64
 $(LINUX_ARM64_BIN): $(BUILD_DIR)
 	@echo "Building for Linux ARM64..."
-	odin build . -target:linux_arm64 -o:speed -out:$(LINUX_ARM64_BIN)
+	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o $(LINUX_ARM64_BIN) .
 	@echo "Built $(LINUX_ARM64_BIN)"
 
 # Build Darwin ARM64 (Mac)
 $(DARWIN_ARM64_BIN): $(BUILD_DIR)
 	@echo "Building for Darwin ARM64..."
-	odin build . -target:darwin_arm64 -o:speed -out:$(DARWIN_ARM64_BIN)
+	GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -o $(DARWIN_ARM64_BIN) .
 	@echo "Built $(DARWIN_ARM64_BIN)"
 
 # Build all binaries
-build-linux: $(LINUX_AMD64_BIN) # $(LINUX_ARM64_BIN)
+build-linux: $(LINUX_AMD64_BIN) $(LINUX_ARM64_BIN)
 build-darwin: $(DARWIN_ARM64_BIN)
 
 # Compress Linux artifacts with gzip
@@ -57,12 +58,11 @@ $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64.zip: $(DARWIN_ARM64_BIN)
 
 # Compress all artifacts
 compress: $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-amd64.tar.gz \
-          # $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-arm64.tar.gz \
-          # $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64.zip
+          $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-arm64.tar.gz \
+          $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64.zip
 
 # Build and compress all release artifacts
-# release: build-linux build-darwin compress
-release: build-linux compress
+release: build-linux build-darwin compress
 	@echo "Release artifacts created:"
 	@ls -la $(BUILD_DIR)/*.tar.gz $(BUILD_DIR)/*.zip 2>/dev/null || echo "No compressed artifacts found"
 

README.md

@@ -3,6 +3,10 @@
 Have you ever wanted to back up all your .env files in case your hard drive gets
 nuked? `envr` makes it easier.
 
+> [!CAUTION]
+> The Zig community is quite anti-AI. Please read the [AI Disclaimer](#ai-disclaimer)
+> before wasting your time.
+
 `envr` is a binary application that tracks your `.env` files
 in an encyrpted sqlite database. Changes can be effortlessly synced with
 `envr sync`, and restored with `envr restore`.
@@ -13,7 +17,7 @@ the tool [of your choosing](#backup-options).
 ## Features
 
 - 🔐 **Encrypted Storage**: All `.env` files are encrypted using your ssh key and
-[libsodium](https://github.com/jedisct1/libsodium) encryption.
+[age](https://github.com/FiloSottile/age) encryption.
 - 🔄 **Automatic Sync**: Update the database with one command, which can easily
 be run on a cron.
 - 🔍 **Smart Scanning**: Automatically discover and import `.env` files in your
@@ -37,13 +41,12 @@ repositories.
 
 ## Installation
 
-### With Odin
+### With Go
 
-If you already have `odin` installed:
+If you already have `go` installed:
 
 ```bash
-# You'll need libsodium and sqlite
-odin build -o:speed
+go install github.com/sbrow/envr
 envr init
 ```
 
@@ -105,18 +108,18 @@ The configuration file is created during initialization:
 ## Backup Options
 
 `envr` merely gathers your `.env` files in one local place. It is up to you to
-back up the database (found at `~/.envr/data.envr`) to a *secure* and *remote*
+back up the database (found at `~/.envr/data.age`) to a *secure* and *remote*
 location.
 
 ### Git
 
 `envr` preserves inodes when updating the database, so you can safely hardlink
-`~/.envr/data.envr` into your [GNU Stow](https://www.gnu.org/software/stow/),
+`~/.envr/data.age` into your [GNU Stow](https://www.gnu.org/software/stow/),
 [Home Manager](https://github.com/nix-community/home-manager), or
 [NixOS](https://nixos.wiki/wiki/flakes) repository.
 
 > [!CAUTION]
-> For **maximum security**, only save your `data.envr` file to a local
+> For **maximum security**, only save your `data.age` file to a local
 (i.e. non-cloud) git server that **you personally control**.
 >
 > I take no responsibility if you push all your secrets to a public GitHub repo.
@@ -133,3 +136,13 @@ This project is licensed under the [MIT License](./LICENSE).
 
 For issues, feature requests, or questions, please
 [open an issue](https://github.com/sbrow/envr/issues).
+
+## AI Disclaimer
+
+Unless noted here, you can be assured that I have personally written and reviewed
+every line of code in this software.
+
+- Many compiler errors that couldn't be solved with a quick google search were
+solved by passing errors to AI and transcribing the suggestions.
+- The "Pre-Zig" version of this readme was written by AI and then edited by me.
+- The Go code was mostly written using opencode, and manually tested by me.

TABLE_IMPROVEMENT_PLAN.md

@@ -1,268 +0,0 @@
-# Table Rendering Memory Optimization Plan
-
-## Executive Summary
-
-This plan outlines improvements to eliminate excessive memory allocations and copies in the Odin table rendering system. The current implementation makes 10+ allocations per row, while the Zig equivalent makes zero allocations for rendering. This optimization will reduce memory usage, improve performance, and align with the project's efficiency goals.
-
-## Current State Analysis
-
-### Zig Version (Reference Implementation)
-- **Allocations**: 1 (data only)
-- **Data copies**: 0
-- **String allocation**: 0
-- **Column widths**: Stack array
-- **Output**: Direct to writer
-
-### Odin Version (Current Implementation)
-- **Allocations**: 10+ per row
-- **Data copies**: Multiple per row
-- **String allocation**: 2+ per row (concatenate + slice)
-- **Column widths**: Heap allocated
-- **Output**: Builder → stdout
-
-### Current Issues Identified
-
-1. **Table Infrastructure** (`table.odin`)
-   - Uses `strings.Builder` which allocates per-line memory
-   - Heap-allocated `[dynamic]int` for column widths
-   - Multiple `strings.concatenate()` calls creating new strings
-
-2. **Command Implementations**
-   - `cmd_list`: Creates intermediate `[]string` slices per row, allocates new strings via `strings.concatenate()`
-   - `cmd_sync`: Creates `SyncEntry` structs with cloned strings, allocates dynamic arrays
-   - `cmd_deps`: Allocates dynamic rows array unnecessarily
-
-3. **Memory Pattern**
-   - Each command allocates `[][]string` for table data
-   - Manual struct-to-row transformation creates copies
-   - Duplicate code across all table-using commands
-
-## Proposed Solutions
-
-### Phase 1: Core Table Infrastructure Overhaul
-
-#### 1.1 Direct Writer-Based Rendering
-**Current:**
-```odin
-b: strings.Builder
-strings.builder_init(&b)
-// ... build table in builder
-fmt.println(strings.to_string(b))
-```
-
-**Proposed:**
-```odin
-render_table :: proc(writer: io.Writer, headers: []string, rows: [][]string)
-```
-- Replace `strings.Builder` with `io.Writer` output
-- Eliminate intermediate string allocations
-- Write table components directly to output stream
-
-#### 1.2 Stack-Based Column Widths
-**Current:**
-```odin
-col_widths := make([dynamic]int, 0, len(headers))
-```
-
-**Proposed:**
-- Use fixed stack arrays for reasonable column counts
-- Implement small buffer optimization (SBO) for variable column counts
-- Only allocate for tables exceeding threshold (e.g., 16 columns)
-
-#### 1.3 Zero-Copy String Handling
-**Current:**
-```odin
-dir_str := strings.concatenate({row.Dir, "/"}, context.temp_allocator)
-```
-
-**Proposed:**
-- Replace `strings.concatenate()` with string slicing
-- Work directly with `EnvFile.Path` and `EnvFile.Dir` fields
-- Use `filepath.base()` and `filepath.dir()` without allocation where possible
-
-### Phase 2: Generic Table Interface
-
-#### 2.1 Field-Based Table Renderer
-```odin
-Table_Field :: struct {
-    name: string,
-    value: string,  // String view, no allocation
-    alignment: Alignment,
-}
-
-Table_Config :: struct {
-    writer: io.Writer,
-    fields: []Table_Field,
-    col_widths: []int,
-}
-
-render_row :: proc(cfg: Table_Config, row_data: any)
-```
-- Accept struct fields directly without intermediate arrays
-- Support field selection (show only specific fields)
-- Alignment options (left/center/right)
-
-#### 2.2 Field Extraction Procs
-- Generate field extraction helpers for each struct type
-- Avoid string allocation by returning string views
-- Cache computed values (like formatted status strings)
-
-#### 2.3 Streaming Table Processing
-- Process rows one at a time without collecting all rows
-- Reduce peak memory usage from O(N × strings) to O(table_structure)
-- Enable early termination if needed
-
-### Phase 3: Command-Specific Optimizations
-
-#### 3.1 Eliminate Intermediate Structs
-**Current (cmd_sync):**
-```odin
-for &file in files {
-    // ... processing
-    path_str, _ := strings.clone(file.Path)
-    status_str, _ := strings.clone(status)
-    append(&results, SyncEntry{Path = path_str, Status = status_str})
-}
-```
-
-**Proposed:**
-```odin
-for &file in files {
-    result, err_msg := db_sync(&db, &file)
-    // Direct rendering with zero-copy
-    render_sync_row(writer, file, result, err_msg)
-}
-```
-- `cmd_sync`: Work directly with `EnvFile` + `SyncFlagEnum`
-- `cmd_list`: Use `EnvFile` fields directly, no `ListEntry`
-- Generate table content on-the-fly
-
-#### 3.2 In-Place Status Computation
-```odin
-get_sync_status :: proc(result: SyncFlag, err_msg: string) -> string {
-    switch {
-    case .Error in result: return if len(err_msg) > 0 then err_msg else "error"
-    case .BackedUp in result: return "Backed Up"
-    case .Restored in result: return "Restored"
-    case .DirUpdated in result: return "Moved"
-    case: return "OK"
-    }
-}
-```
-- Compute status strings without allocation (use static lookup)
-- Cache formatted status values if needed
-- Reduce allocation count from N to 0 or 1
-
-#### 3.3 Batch Processing
-- Reduce allocation count by pooling small allocations
-- Use `context.temp_allocator` more effectively
-- Pre-allocate buffers for expected sizes
-
-### Phase 4: JSON Output Separation
-
-#### 4.1 Unified JSON Rendering
-```odin
-render_json_rows :: proc(writer: io.Writer, rows: any, field_names: []string)
-```
-- Create centralized JSON rendering helper
-- Work with same structs as table rendering
-- Use reflection or explicit field marshaling
-
-#### 4.2 Format-Agnostic Interface
-- Commands generate data → renderers handle format
-- Table renderer focuses only on ASCII/Unicode output
-- Keep terminal detection in command layer
-
-## Expected Improvements
-
-| Metric | Current | Target | Improvement |
-|--------|---------|--------|-------------|
-| **Allocations** | 10+ per row | 0-1 per table | 10x+ reduction |
-| **Memory copies** | 2-3 per row | 0 | 100% reduction |
-| **Peak memory** | O(N × strings) | O(table_structure) | Constant factor |
-| **Throughput** | Baseline | 2-3x faster | Performance boost |
-
-## Implementation Strategy
-
-### High-Priority Changes
-1. Replace `strings.Builder` with direct `io.Writer` output
-2. Convert column widths to stack-based allocation
-3. Eliminate intermediate struct allocations in commands
-
-### Medium-Priority Changes
-1. Create generic field-based table interface
-2. Implement streaming table processing
-3. Centralize JSON rendering logic
-
-### Low-Priority Changes
-1. Add alignment options beyond left-aligned
-2. Implement comprehensive field introspection
-3. Add advanced table formatting features
-
-## Tradeoff Questions
-
-Before implementation begins, we need to resolve these architectural questions:
-
-### 1. Generality vs. Performance
-**Question:** Should we create a fully generic table renderer (similar to Zig's `Table(T)`) or focus on optimizing the current 3 use cases first?
-
-**Options:**
-- **Generic approach**: Higher development cost, future-proof, may have some overhead
-- **Specific optimization**: Faster implementation, maximum performance for current use cases, less flexible
-
-**Recommendation:** Start with specific optimizations for current use cases, then generalize patterns that emerge.
-
-### 2. Alignment Support
-**Question:** Does the project need left/center/right alignment support, or is left-alignment sufficient?
-
-**Context:** Zig supports alignment options, but current Odin implementation only left-aligns. Most CLI tables work fine with left alignment.
-
-**Recommendation:** Start with left-alignment only, add alignment if specific use cases demand it.
-
-### 3. API Compatibility
-**Question:** Should we maintain the current `render_table()` API signature, or are breaking changes acceptable?
-
-**Current API:**
-```odin
-render_table :: proc(headers: []string, rows: [][]string)
-```
-
-**Options:**
-- **Maintain API**: Slower to implement, backward compatible, may need adapter layers
-- **Break API**: Faster implementation, cleaner code, requires updates to all callers
-
-**Recommendation:** Breaking changes are acceptable since this is an optimization-focused effort and callers are limited to 3 commands.
-
-### 4. Odin Capabilities
-**Question:** What runtime reflection or field introspection capabilities does Odin provide?
-
-**Context:** Zig uses `@typeInfo()` and comptime field iteration. We need to understand Odin's equivalent capabilities to design the optimal solution.
-
-**Recommendation:** Investigate Odin's runtime type information capabilities before finalizing the generic table interface design.
-
-### 5. Testing Strategy
-**Question:** Should we add comprehensive tests for new table rendering before optimizing commands, or optimize incrementally with tests added afterwards?
-
-**Options:**
-- **Test-first**: More robust, catches regressions early, slower initial development
-- **Optimize-first**: Faster development, may miss edge cases, requires retroactive testing
-
-**Recommendation:** Hybrid approach - add basic tests for core infrastructure, then optimize incrementally with additional tests for each command.
-
-## Next Steps
-
-1. **Research Phase**: Investigate Odin's type system and reflection capabilities
-2. **Prototype Phase**: Create minimal working prototype of zero-allocation table renderer
-3. **Refactor Phase**: Incrementally update commands to use new infrastructure
-4. **Test Phase**: Add comprehensive tests and verify memory improvements
-5. **Benchmark Phase**: Measure performance improvements and memory usage
-
-## Success Criteria
-
-- [ ] Zero allocations for table rendering (excluding initial data)
-- [ ] Zero string copies in the happy path
-- [ ] All 3 commands (`list`, `sync`, `deps`) use new infrastructure
-- [ ] Performance improvement of 2x or more
-- [ ] Memory usage reduction of 50% or more
-- [ ] No regression in table formatting quality
-- [ ] Backward compatibility with JSON output format

TEST_PLAN.md

@@ -1,70 +0,0 @@
-# Test Coverage Plan
-
-## Current State
-
-- 104 tests, all passing
-- Strong coverage: crypto, ssh, db CRUD + env_file + update_dir, config save/load + paths, scan, features, cant_scan, parse_args, `-c`/`--config-file` flag
-- Misleading test files: `cmd_check_test`, `cmd_list_test`, `cmd_nushell_completion_test` don't test their namesake procs
-- Biggest remaining gap: all `cmd_*` handlers untested
-
-## Command handler tests
-
-Stdout will be captured by redirecting `os.stdout` to a pipe.
-
-### `cmd_version` (cmd_version.odin)
-- Test default output (prints VERSION)
-
-### `cmd_list` (cmd_list.odin)
-- Test TTY path: fixture DB with rows, capture table output
-- Test non-TTY path: capture JSON output, unmarshal and verify keys/values
-- Test empty DB: verify clean output (empty table or `[]`)
-
-### `cmd_backup` (cmd_backup.odin)
-- Test successful backup: valid path, verify `db_insert` called
-- Test missing file: verify error message
-- Test duplicate backup: verify rejection or update behavior
-
-### `cmd_remove` (cmd_remove.odin)
-- Test successful removal: existing entry, verify `db_delete` called
-- Test removal of non-existent entry: verify error or no-op
-
-### `cmd_restore` (cmd_restore.odin)
-- Test successful restore: entry exists in DB, verify file written to correct path
-- Test restore of missing entry: verify error
-- Test directory creation: restore to path with missing parent dirs
-
-## Hard to test (interactive / external deps)
-
-### `cmd_deps` (cmd_deps.odin)
-- Needs `git` and/or `fd` in PATH
-- Test TTY and non-TTY paths
-- Skip if dependencies not available (with `#assert` like TODO 28 suggests)
-
-### `cmd_scan` (cmd_scan.odin)
-- Needs `fd` installed
-- Test with fixture git repo containing `.env` files
-- Test `find_unbacked` integration (already partially tested in `cmd_check_test.odin`)
-- Non-TTY JSON output path
-
-### `cmd_edit_config` (cmd_edit_config.odin)
-- Needs refactoring: extract `$EDITOR` parsing into testable helper (TODO 12)
-- Test multi-word editor values (`"code -w"`)
-- Test missing `$EDITOR`
-
-### `cmd_init` (cmd_init.odin)
-- Interactive prompt makes this hard
-- Needs refactoring: extract SSH key discovery and config generation into testable procs
-- Test `--force` flag behavior
-
-### `prompt.odin`
-- Needs refactoring to be testable
-- `render_options` could be tested if it accepted an `io.Writer`
-- `read_key` could be tested with a pipe/redirect instead of raw stdin
-- `multi_select` is end-to-end interactive, likely integration test only
-
-## Notes
-
-- DB integration tests should use in-memory SQLite (`:memory:`) where possible.
-- Temp dir fixtures should follow the pattern in `scan_test.odin`.
-- External dependency tests (`fd`, `git`) should use `#assert` to ensure the dependency is present rather than silently skipping (TODO 28).
-- Tests that manipulate the `HOME` env var must use a mutex to prevent races with parallel test execution.

TODOS.md

@@ -4,91 +4,66 @@ Note: These todos can wait until all the subcommands have been ported.
 
 ## HIGH
 
-1. **db.odin:380-383, 405, 446** — `sqlite.bind_text` return values overwritten but never checked. A failed bind means `sqlite.step` operates on unbound params.
+1. [x] **table.odin:74-89** — Hand-rolled JSON output doesn't escape `"`, `\`, newlines. Reimplements `json.marshal` which is already imported in `cmd_list.odin`. Replace with `json.marshal`.
+
+2. **db.odin:380-383, 405, 446** — `sqlite.bind_text` return values overwritten but never checked. A failed bind means `sqlite.step` operates on unbound params.
+
+3. **config.odin:52-54** — `os.user_home_dir` error silently ignored. If it fails, `home` is `""` and all paths become relative (`".envr"` instead of `"~/.envr"`).
+
+30. **cmd_sync.odin:46-50, 64-68** — Double `db_insert` when `BackedUp`: first insert on line 48, then `db_update_required` is also true for `BackedUp` so second insert runs on line 65. Redundant and wasteful.
 
 ## MEDIUM
 
-2. **db.odin:324-327** — Map iteration (`remote_set`) is non-deterministic. Same file can produce different JSON on each backup, causing spurious DB diffs. Sort remotes before storing.
+4. **db.odin:29-35** — `make_temp_path` never calls `strings.builder_destroy`. Leaks builder buffer every call.
 
-3. **db.odin:135, 250** — String interpolation into SQL (`VACUUM INTO '%s'`, `ATTACH DATABASE '%s'`). Currently safe because input is controlled, but fragile.
+5. **db.odin:324-327** — Map iteration (`remote_set`) is non-deterministic. Same file can produce different JSON on each backup, causing spurious DB diffs. Sort remotes before storing.
 
-4. **features.odin:30-41** — `find_binary` uses `strings.join` instead of `filepath.join`, uses `os.stat` instead of checking executability, hardcodes `:` as PATH separator (wrong on Windows).
+6. **db.odin:470-473** — `string_to_cstring` allocates via `strings.clone_to_cstring` and never frees. Called dozens of times across db operations.
 
-5. **cmd_restore.odin:20-30 & cmd_remove.odin:19-29** — Identical path-resolution block copy-pasted. `is_abs` guard is redundant since `filepath.abs` is a no-op on absolute paths. Extract a helper.
+7. **db.odin:470, 462** — Both `string_to_cstring` and `cstring_to_string` ignore allocation errors. A nil cstring gets passed to SQLite (UB).
 
-6. **cmd_restore.odin:44** — `os.mkdir_all` error silently discarded. Subsequent write failure will be confusing.
+8. **db.odin:135, 250** — String interpolation into SQL (`VACUUM INTO '%s'`, `ATTACH DATABASE '%s'`). Currently safe because input is controlled, but fragile.
 
-7. **cmd_edit_config.odin:27** — `$EDITOR` used as single binary name. Breaks for multi-word values like `"code -w"`. Needs `strings.fields()`.
+9. **features.odin:30-41** — `find_binary` uses `strings.join` instead of `filepath.join`, uses `os.stat` instead of checking executability, hardcodes `:` as PATH separator (wrong on Windows).
 
-8. **config.odin:178** — `search_paths` silently ignores `os.user_home_dir` error. If home is empty, `~` isn't expanded. Same class of bug as issue 3.
+10. **cmd_restore.odin:20-30 & cmd_remove.odin:19-29** — Identical path-resolution block copy-pasted. `is_abs` guard is redundant since `filepath.abs` is a no-op on absolute paths. Extract a helper.
 
-9. **prompt.odin:124** — `make([dynamic]bool, len(options))` creates N zero-initialized elements. Works because `false` is the default, but same footgun as original issue 1. Should be `make([dynamic]bool, 0, len(options))`.
+11. **cmd_restore.odin:44** — `os.mkdir_all` error silently discarded. Subsequent write failure will be confusing.
+
+12. **cmd_edit_config.odin:27** — `$EDITOR` used as single binary name. Breaks for multi-word values like `"code -w"`. Needs `strings.fields()`.
+
+33. **config.odin:178** — `search_paths` silently ignores `os.user_home_dir` error. If home is empty, `~` isn't expanded. Same class of bug as issue 3.
+
+35. **prompt.odin:124** — `make([dynamic]bool, len(options))` creates N zero-initialized elements. Works because `false` is the default, but same footgun as original issue 1. Should be `make([dynamic]bool, 0, len(options))`.
 
 ## LOW
 
-10. **db.odin:115** — `json.unmarshal_string` error not checked. Malformed JSON silently produces empty/partial data.
+14. [x] **db.odin:338-341** — Unnecessary `strings.clone` before `filepath.dir` (which already returns a slice into the input).
 
-11. **db.odin:352-353** — `hex.encode` error ignored. `string(hex_bytes)` aliases the byte slice.
+15. **db.odin:115** — `json.unmarshal_string` error not checked. Malformed JSON silently produces empty/partial data.
 
-12. **cmd_sync.odin:80, cmd_list.odin:33, cmd_deps.odin:9** — `make([]string, 2)` for table rows never freed. Leaks per row. Defer to memory pass.
+16. **db.odin:352-353** — `hex.encode` error ignored. `string(hex_bytes)` aliases the byte slice.
+
+18. **config.odin:51-60** — `envr_dir` recomputes home dir on every call. Could cache.
+
+37. **cmd_sync.odin:80, cmd_list.odin:33, cmd_deps.odin:9** — `make([]string, 2)` for table rows never freed. Leaks per row. Defer to memory pass.
 
 ## REFACTOR
 
-13. **cmd_list.odin** — Non-TTY branch builds `ListEntry` structs and marshals JSON separately. Now that `render_json_rows` (issue 1) accepts an `io.Writer` and uses `json.marshal`, unify both branches to use it. Note: will change JSON keys from `"directory"/"path"` to `"Directory"/"Path"`.
+20. **cmd_list.odin** — Non-TTY branch builds `ListEntry` structs and marshals JSON separately. Now that `render_json_rows` (issue 1) accepts an `io.Writer` and uses `json.marshal`, unify both branches to use it. Note: will change JSON keys from `"directory"/"path"` to `"Directory"/"Path"`.
 
-14. Check for prealloc opportunities. i.e. `make([dynamic]string)` -> `make([dynamic]string, 5)`.
+21. Check for prealloc opportunities. i.e. `make([dynamic]string)` -> `make([dynamic]string, 5)`.
 
-15. Add a text filter to the multi_select.
+22. Replace is_tty with terminal.is_terminal
 
-16. Create backup / fallback fd.
+23. Add a text filter to the multi_select.
 
-17. Add tests for untested commands.
+24. Create backup / fallback fd.
 
-18. 2 scan tests silently skip when fd isn't installed, tests pass without actually testing anything. These should use #assert to be sure that fd is in path.
+25. Add tests for untested commands.
 
-19. Try to do all encryption / decryption in memory - only read / write encrypted data to disk.
+26. Add a global --config -c flag to use an alternate config.
 
-20. add --format -f flag to commands that draw tables.
+27. version --long Odin only prints version; Go also prints commit hash and build date
 
-21. Replace `testing.expect` calls with `testing.expect_value` calls where appropriate.
-
-22. Change struct field names from PascalCase to snake_case.
-
-## Double-check AI output
-
-- [ ] cli.odin
-- [ ] cli_test.odin
-- [x] cmd_backup.odin
-- [x] cmd_check.odin
-- [ ] cmd_check_test.odin
-- [x] cmd_deps.odin
-- [ ] cmd_edit_config.odin
-- [x] cmd_init.odin
-- [x] cmd_list.odin
-- [ ] cmd_list_test.odin
-- [x] cmd_nushell_completion.odin
-- [x] cmd_nushell_completion_test.odin
-- [x] cmd_remove.odin
-- [x] cmd_restore.odin
-- [x] cmd_scan.odin
-- [x] cmd_sync.odin
-- [x] cmd_version.odin
-- [ ] config.odin
-- [ ] config_test.odin
-- [ ] crypto.odin
-- [ ] crypto_test.odin
-- [ ] db.odin
-- [ ] db_integration_test.odin
-- [ ] db_test.odin
-- [x] features.odin
-- [x] features_test.odin
-- [x] main.odin
-- [x] prompt.odin
-- [ ] scan.odin
-- [ ] scan_test.odin
-- [ ] sodium.odin
-- [ ] sqlite/sqlite.odin
-- [ ] ssh.odin
-- [ ] ssh_test.odin
-- [ ] table.odin
-- [ ] table_test.odin
+28. 2 scan tests silently skip	Low	When fd isn't installed, tests pass without actually testing anything. These should use #assert to be sure that fd is in path.

app/config.go

@@ -0,0 +1,267 @@
+package app
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"filippo.io/age"
+	"filippo.io/age/agessh"
+)
+
+type Config struct {
+	Keys       []SshKeyPair `json:"keys"`
+	ScanConfig scanConfig   `json:"scan"`
+}
+
+// Used by age to encrypt and decrypt the database.
+type SshKeyPair struct {
+	Private string `json:"private"` // Path to the private key file
+	Public  string `json:"public"`  // Path to the public key file
+}
+
+type scanConfig struct {
+	// TODO: Support multiple matchers
+	Matcher string   `json:"matcher"`
+	Exclude []string `json:"exclude"`
+	Include []string `json:"include"`
+}
+
+// Create a fresh config with sensible defaults.
+func NewConfig(privateKeyPaths []string) Config {
+	var keys = []SshKeyPair{}
+
+	for _, priv := range privateKeyPaths {
+		var key = SshKeyPair{
+			Private: priv,
+			Public:  priv + ".pub",
+		}
+
+		keys = append(keys, key)
+	}
+
+	return Config{
+		Keys: keys,
+		ScanConfig: scanConfig{
+			Matcher: "\\.env",
+			Exclude: []string{
+				"*\\.envrc",
+				"\\.local",
+				"node_modules",
+				"vendor",
+			},
+			Include: []string{"~"},
+		},
+	}
+}
+
+// Read the Config from disk.
+func LoadConfig() (*Config, error) {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return nil, err
+	}
+
+	configPath := filepath.Join(homeDir, ".envr", "config.json")
+
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			return nil, fmt.Errorf("No config file found. Please run `envr init` to generate one.")
+		} else {
+			return nil, err
+		}
+	}
+
+	var config Config
+	if err := json.Unmarshal(data, &config); err != nil {
+		return nil, err
+	}
+
+	return &config, nil
+}
+
+// Write the Config to disk.
+func (c *Config) Save() error {
+	// Create the ~/.envr directory
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return err
+	}
+	configDir := filepath.Join(homeDir, ".envr")
+	if err := os.MkdirAll(configDir, 0755); err != nil {
+		return err
+	}
+
+	configPath := filepath.Join(configDir, "config.json")
+
+	// Check if file exists and is not empty
+	if info, err := os.Stat(configPath); err == nil {
+		if info.Size() > 0 {
+			return os.ErrExist
+		}
+	}
+
+	data, err := json.MarshalIndent(c, "", "  ")
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(configPath, data, 0644)
+}
+
+// buildFdArgs builds the fd command arguments with multiple exclude patterns
+func (c Config) buildFdArgs(searchPath string, includeIgnored bool) []string {
+	args := []string{"-a", c.ScanConfig.Matcher}
+
+	// Add exclude patterns
+	for _, exclude := range c.ScanConfig.Exclude {
+		args = append(args, "-E", exclude)
+	}
+
+	if includeIgnored {
+		args = append(args, "-HI")
+	} else {
+		args = append(args, "-H")
+	}
+
+	args = append(args, searchPath)
+	return args
+}
+
+// Use fd to find all ignored .env files that match the config's parameters
+func (c Config) scan() (paths []string, err error) {
+	searchPaths, err := c.searchPaths()
+	if err != nil {
+		return []string{}, err
+	}
+
+	for _, searchPath := range searchPaths {
+		// Find all files (including ignored ones)
+		fmt.Printf("Searching for all files in \"%s\"...\n", searchPath)
+		allCmd := exec.Command("fd", c.buildFdArgs(searchPath, true)...)
+		allOutput, err := allCmd.Output()
+		if err != nil {
+			return paths, err
+		}
+
+		allFiles := strings.Split(strings.TrimSpace(string(allOutput)), "\n")
+		if len(allFiles) == 1 && allFiles[0] == "" {
+			allFiles = []string{}
+		}
+
+		// Find unignored files
+		fmt.Printf("Search for unignored fies in \"%s\"...\n", searchPath)
+		unignoredCmd := exec.Command("fd", c.buildFdArgs(searchPath, false)...)
+		unignoredOutput, err := unignoredCmd.Output()
+		if err != nil {
+			return []string{}, err
+		}
+
+		unignoredFiles := strings.Split(strings.TrimSpace(string(unignoredOutput)), "\n")
+		if len(unignoredFiles) == 1 && unignoredFiles[0] == "" {
+			unignoredFiles = []string{}
+		}
+
+		// Create a map for faster lookup
+		unignoredMap := make(map[string]bool)
+		for _, file := range unignoredFiles {
+			unignoredMap[file] = true
+		}
+
+		// Filter to get only ignored files
+		var ignoredFiles []string
+		for _, file := range allFiles {
+			if !unignoredMap[file] {
+				ignoredFiles = append(ignoredFiles, file)
+			}
+		}
+
+		paths = append(paths, ignoredFiles...)
+	}
+
+	return paths, nil
+}
+
+func (c Config) searchPaths() (paths []string, err error) {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return paths, err
+	}
+
+	includes := c.ScanConfig.Include
+
+	for _, include := range includes {
+		path := strings.Replace(include, "~", homeDir, 1)
+		absPath, err := filepath.Abs(path)
+		if err != nil {
+			return paths, err
+		}
+
+		paths = append(paths, absPath)
+	}
+
+	return paths, nil
+}
+
+func (s SshKeyPair) identity() (age.Identity, error) {
+	sshKey, err := os.ReadFile(s.Private)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read SSH key: %w", err)
+	}
+
+	id, err := agessh.ParseIdentity(sshKey)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse SSH identity: %w", err)
+	}
+
+	return id, nil
+}
+
+func (s SshKeyPair) recipient() (age.Recipient, error) {
+	sshKey, err := os.ReadFile(s.Public)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read SSH key: %w", err)
+	}
+
+	id, err := agessh.ParseRecipient(string(sshKey))
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse SSH identity: %w", err)
+	}
+
+	return id, nil
+}
+
+// Use fd to find all git roots in the config's search paths
+func (c Config) findGitRoots() (paths []string, err error) {
+	searchPaths, err := c.searchPaths()
+	if err != nil {
+		return []string{}, err
+	}
+
+	for _, searchPath := range searchPaths {
+		allCmd := exec.Command("fd", "-H", "-t", "d", "^\\.git$", searchPath)
+		allOutput, err := allCmd.Output()
+		if err != nil {
+			return paths, err
+		}
+
+		allFiles := strings.Split(strings.TrimSpace(string(allOutput)), "\n")
+		if len(allFiles) == 1 && allFiles[0] == "" {
+			allFiles = []string{}
+		}
+
+		for i, file := range allFiles {
+			allFiles[i] = path.Dir(path.Clean(file))
+		}
+
+		paths = append(paths, allFiles...)
+	}
+
+	return paths, nil
+}

app/db.go

@@ -0,0 +1,421 @@
+package app
+
+// TODO: app/db.go should be reviewed.
+import (
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"slices"
+
+	"filippo.io/age"
+	_ "modernc.org/sqlite"
+)
+
+type Db struct {
+	db       *sql.DB
+	cfg      Config
+	features *AvailableFeatures
+	// If true, the database will be saved to disk before closing
+	changed bool
+}
+
+func Open() (*Db, error) {
+	cfg, err := LoadConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	if _, err := os.Stat("/home/spencer/.envr/data.age"); err != nil {
+		// Create a new DB
+		db, err := newDb()
+		return &Db{db, *cfg, nil, true}, err
+	} else {
+		// Open the existing DB
+		tmpFile, err := os.CreateTemp("", "envr-*.db")
+		if err != nil {
+			return nil, fmt.Errorf("failed to create temp file: %w", err)
+		}
+		defer tmpFile.Close()
+		defer os.Remove(tmpFile.Name())
+
+		err = decryptDb(tmpFile.Name(), (*cfg).Keys)
+		if err != nil {
+			return nil, fmt.Errorf("failed to decrypt database: %w", err)
+		}
+
+		memDb, err := newDb()
+		if err != nil {
+			return nil, fmt.Errorf("failed to open temp database: %w", err)
+		}
+
+		restoreDB(tmpFile.Name(), memDb)
+
+		return &Db{memDb, *cfg, nil, false}, nil
+	}
+}
+
+// Creates the database for the first time
+func newDb() (*sql.DB, error) {
+	db, err := sql.Open("sqlite", ":memory:")
+
+	if err != nil {
+		return nil, err
+	} else {
+		_, err := db.Exec(`create table envr_env_files (
+      path text primary key not null
+    , remotes text -- JSON
+    , sha256 text not null
+    , contents text not null
+  );`)
+		if err != nil {
+			return nil, err
+		} else {
+			return db, err
+		}
+	}
+}
+
+// Decrypt the database from the age file into a temp sqlite file.
+func decryptDb(tmpFilePath string, keys []SshKeyPair) error {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return fmt.Errorf("failed to get user home directory: %w", err)
+	}
+
+	tmpFile, err := os.OpenFile(tmpFilePath, os.O_WRONLY, 0)
+	if err != nil {
+		return fmt.Errorf("failed to open temp file: %w", err)
+	}
+	defer tmpFile.Close()
+
+	ageFilePath := filepath.Join(homeDir, ".envr", "data.age")
+	ageFile, err := os.Open(ageFilePath)
+	if err != nil {
+		return fmt.Errorf("failed to open age file: %w", err)
+	}
+	defer ageFile.Close()
+
+	identities := make([]age.Identity, 0, len(keys))
+
+	for _, key := range keys {
+		id, err := key.identity()
+
+		if err != nil {
+			return err
+		}
+
+		identities = append(identities, id)
+	}
+
+	reader, err := age.Decrypt(ageFile, identities[:]...)
+	if err != nil {
+		return fmt.Errorf("failed to decrypt age file: %w", err)
+	}
+
+	_, err = io.Copy(tmpFile, reader)
+	if err != nil {
+		return fmt.Errorf("failed to copy decrypted content: %w", err)
+	}
+
+	return nil
+}
+
+// Restore the database from a file into memory
+func restoreDB(path string, destDB *sql.DB) error {
+	// Attach the source database
+	_, err := destDB.Exec("ATTACH DATABASE ? AS source", path)
+	if err != nil {
+		return fmt.Errorf("failed to attach database: %w", err)
+	}
+	defer destDB.Exec("DETACH DATABASE source")
+
+	// Copy data from source to destination
+	_, err = destDB.Exec("INSERT INTO main.envr_env_files SELECT * FROM source.envr_env_files")
+	if err != nil {
+		return fmt.Errorf("failed to copy data: %w", err)
+	}
+
+	return nil
+}
+
+// Returns all the EnvFiles present in the database.
+func (db *Db) List() (results []EnvFile, err error) {
+	rows, err := db.db.Query("select path, remotes, sha256, contents from envr_env_files")
+
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		var envFile EnvFile
+		var remotesJson []byte
+		err := rows.Scan(&envFile.Path, &remotesJson, &envFile.Sha256, &envFile.contents)
+		if err != nil {
+			return nil, err
+		}
+
+		// Populate Dir from Path
+		envFile.Dir = filepath.Dir(envFile.Path)
+
+		if err := json.Unmarshal(remotesJson, &envFile.Remotes); err != nil {
+			return nil, err
+		}
+
+		results = append(results, envFile)
+	}
+
+	if err = rows.Err(); err != nil {
+		return nil, err
+	}
+
+	return results, nil
+}
+
+func (db *Db) Close() error {
+	defer db.db.Close()
+
+	if db.changed {
+		// Create tmp file
+		tmpFile, err := os.CreateTemp("", "envr-*.db")
+		if err != nil {
+			return fmt.Errorf("failed to create temp file: %w", err)
+		}
+		defer tmpFile.Close()
+		defer os.Remove(tmpFile.Name())
+
+		if err := backupDb(db.db, tmpFile.Name()); err != nil {
+			return err
+		}
+
+		if err := encryptDb(tmpFile.Name(), db.cfg.Keys); err != nil {
+			return err
+		}
+
+		db.changed = false
+	}
+
+	return nil
+}
+
+// Save the in-memory database to a tmp file.
+func backupDb(memDb *sql.DB, tmpFilePath string) error {
+	_, err := memDb.Exec("VACUUM INTO ?", tmpFilePath)
+	if err != nil {
+		return fmt.Errorf("failed to vacuum database to file: %w", err)
+	}
+
+	return nil
+}
+
+// Encrypt the database from the temp sqlite file into an age file.
+func encryptDb(tmpFilePath string, keys []SshKeyPair) error {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return fmt.Errorf("failed to get user home directory: %w", err)
+	}
+	ageFilePath := filepath.Join(homeDir, ".envr", "data.age")
+
+	// Ensure .envr directory exists
+	err = os.MkdirAll(filepath.Dir(ageFilePath), 0755)
+	if err != nil {
+		return fmt.Errorf("failed to create .envr directory: %w", err)
+	}
+
+	// Open temp file for reading
+	tmpFile, err := os.Open(tmpFilePath)
+	if err != nil {
+		return fmt.Errorf("failed to open temp file: %w", err)
+	}
+	defer tmpFile.Close()
+
+	// Open/create age file for writing (this preserves hardlinks)
+	ageFile, err := os.OpenFile(ageFilePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
+	if err != nil {
+		return fmt.Errorf("failed to open age file: %w", err)
+	}
+	defer ageFile.Close()
+
+	recipients := make([]age.Recipient, 0, len(keys))
+	for _, key := range keys {
+		recipient, err := key.recipient()
+
+		if err != nil {
+			return err
+		}
+
+		recipients = append(recipients, recipient)
+	}
+
+	writer, err := age.Encrypt(ageFile, recipients...)
+	if err != nil {
+		return fmt.Errorf("failed to create age writer: %w", err)
+	}
+
+	_, err = io.Copy(writer, tmpFile)
+	if err != nil {
+		return fmt.Errorf("failed to encrypt and write data: %w", err)
+	}
+
+	err = writer.Close()
+	if err != nil {
+		return fmt.Errorf("failed to close age writer: %w", err)
+	}
+
+	return nil
+}
+
+func (db *Db) Insert(file EnvFile) error {
+	// Marshal remotes to JSON
+	remotesJSON, err := json.Marshal(file.Remotes)
+	if err != nil {
+		return fmt.Errorf("failed to marshal remotes: %w", err)
+	}
+
+	// Insert into database
+	_, err = db.db.Exec(`
+		INSERT OR REPLACE INTO envr_env_files (path, remotes, sha256, contents)
+		VALUES (?, ?, ?, ?)
+	`, file.Path, string(remotesJSON), file.Sha256, file.contents)
+
+	if err != nil {
+		return fmt.Errorf("failed to insert env file: %w", err)
+	}
+
+	db.changed = true
+
+	return nil
+}
+
+// Select a single EnvFile from the database.
+func (db *Db) Fetch(path string) (envFile EnvFile, err error) {
+	var remotesJSON string
+
+	row := db.db.QueryRow("SELECT path, remotes, sha256, contents FROM envr_env_files WHERE path = ?", path)
+	err = row.Scan(&envFile.Path, &remotesJSON, &envFile.Sha256, &envFile.contents)
+	if err != nil {
+		return EnvFile{}, fmt.Errorf("failed to fetch env file: %w", err)
+	}
+
+	// Populate Dir from Path
+	envFile.Dir = filepath.Dir(envFile.Path)
+
+	if err = json.Unmarshal([]byte(remotesJSON), &envFile.Remotes); err != nil {
+		return EnvFile{}, fmt.Errorf("failed to unmarshal remotes: %w", err)
+	}
+
+	return envFile, nil
+}
+
+// Removes a file from the database, if present.
+func (db *Db) Delete(path string) error {
+	result, err := db.db.Exec("DELETE FROM envr_env_files WHERE path = ?", path)
+	if err != nil {
+		return fmt.Errorf("failed to delete env file: %w", err)
+	}
+
+	rowsAffected, err := result.RowsAffected()
+	if err != nil {
+		return fmt.Errorf("failed to get rows affected: %w", err)
+	}
+
+	if rowsAffected == 0 {
+		return fmt.Errorf("no file found with path: %s", path)
+	}
+
+	db.changed = true
+
+	return nil
+}
+
+// Finds .env files in the filesystem that aren't present in the database.
+// path overrides the already configured
+func (db *Db) Scan(paths []string) ([]string, error) {
+	cfg := db.cfg
+
+	if paths != nil {
+		cfg.ScanConfig.Include = paths
+	}
+
+	all_paths, err := cfg.scan()
+	if err != nil {
+		return []string{}, err
+	}
+
+	untracked_paths := make([]string, 0, len(all_paths)/2)
+	env_files, err := db.List()
+
+	if err != nil {
+		return untracked_paths, err
+	}
+
+	for _, path := range all_paths {
+		backed_up := slices.ContainsFunc(env_files, func(e EnvFile) bool {
+			return e.Path == path
+		})
+
+		if backed_up {
+			continue
+		} else {
+			untracked_paths = append(untracked_paths, path)
+		}
+	}
+
+	return untracked_paths, nil
+}
+
+// Determine the available features on the installed system.
+func (db *Db) Features() AvailableFeatures {
+	if db.features == nil {
+		feats := checkFeatures()
+		db.features = &feats
+	}
+
+	return *db.features
+}
+
+// Returns nil if [Db.Scan] is safe to use, null otherwise.
+func (db *Db) CanScan() error {
+	if db.Features()&Fd == 0 {
+		return fmt.Errorf(
+			"please install fd to use the scan function (https://github.com/sharkdp/fd)",
+		)
+	} else {
+		return nil
+	}
+}
+
+// If true, [Db.Insert] should be called on the [EnvFile] that generated
+// the given result
+func (db Db) UpdateRequired(status EnvFileSyncResult) bool {
+	return status&(BackedUp|DirUpdated) != 0
+}
+
+func (db *Db) Sync(file *EnvFile) (result EnvFileSyncResult, err error) {
+	// TODO: This results in findMovedDirs being called multiple times.
+	return file.sync(TrustFilesystem, db)
+}
+
+// Looks for git directories that share one or more git remotes with
+// the given file.
+func (db Db) findMovedDirs(file *EnvFile) (movedDirs []string, err error) {
+	if err = db.Features().validateFeatures(Fd, Git); err != nil {
+		return movedDirs, err
+	}
+
+	gitRoots, err := db.cfg.findGitRoots()
+	if err != nil {
+		return movedDirs, err
+	} else {
+		for _, dir := range gitRoots {
+			if file.sharesRemote(getGitRemotes(dir)) {
+				movedDirs = append(movedDirs, dir)
+			}
+		}
+
+		return movedDirs, nil
+	}
+}

app/env_file.go

@@ -0,0 +1,244 @@
+package app
+
+import (
+	"crypto/sha256"
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"strings"
+)
+
+type EnvFile struct {
+	// TODO: Should use FileName in the struct and derive from the path.
+	Path string
+	// Dir is derived from Path, and is not stored in the database.
+	Dir      string
+	Remotes  []string // []string
+	Sha256   string
+	contents string
+}
+
+// The result returned by [EnvFile.Sync]
+type EnvFileSyncResult int
+
+const (
+	// The filesystem contents matches the struct
+	// no further action is required.
+	Noop EnvFileSyncResult = 0
+	// The directory changed, but the file contents matched.
+	// The database must be updated.
+	DirUpdated EnvFileSyncResult = 1
+	// The filesystem has been restored to match the struct
+	// no further action is required.
+	Restored EnvFileSyncResult = 1 << 1
+	// The filesystem has been restored to match the struct.
+	// The directory changed, so the database must be updated
+	RestoredAndDirUpdated EnvFileSyncResult = Restored | DirUpdated
+	// The struct has been updated from the filesystem
+	// and should be updated in the database.
+	BackedUp EnvFileSyncResult = 1 << 2
+	Error    EnvFileSyncResult = 1 << 3
+)
+
+// Determines the source of truth when calling [EnvFile.Sync] or [EnvFile.Restore]
+type syncDirection int
+
+const (
+	TrustDatabase syncDirection = iota
+	TrustFilesystem
+)
+
+func NewEnvFile(path string) EnvFile {
+	// Get absolute path and directory
+	absPath, err := filepath.Abs(path)
+	if err != nil {
+		panic(fmt.Errorf("failed to get absolute path: %w", err))
+	}
+	dir := filepath.Dir(absPath)
+
+	// Get git remotes
+	remotes := getGitRemotes(dir)
+
+	// Read the file contents
+	contents, err := os.ReadFile(path)
+	if err != nil {
+		panic(fmt.Errorf("failed to read file %s: %w", path, err))
+	}
+
+	// Calculate SHA256 hash
+	hash := sha256.Sum256(contents)
+	sha256Hash := fmt.Sprintf("%x", hash)
+
+	return EnvFile{
+		Path:     absPath,
+		Dir:      dir,
+		Remotes:  remotes,
+		Sha256:   sha256Hash,
+		contents: string(contents),
+	}
+}
+
+func getGitRemotes(dir string) []string {
+	// TODO: Check for Git flag and change behaviour if unset.
+	cmd := exec.Command("git", "remote", "-v")
+	cmd.Dir = dir
+
+	output, err := cmd.Output()
+	if err != nil {
+		// Not a git repository or git command failed
+		return []string{}
+	}
+
+	lines := strings.Split(strings.TrimSpace(string(output)), "\n")
+	remoteSet := make(map[string]bool)
+
+	for _, line := range lines {
+		if line == "" {
+			continue
+		}
+		parts := strings.Fields(line)
+		if len(parts) >= 2 {
+			remoteSet[parts[1]] = true
+		}
+	}
+
+	remotes := make([]string, 0, len(remoteSet))
+	for remote := range remoteSet {
+		remotes = append(remotes, remote)
+	}
+
+	return remotes
+}
+
+// Reconcile the state of the database with the state of the filesystem, using
+// dir to determine which side to use a the source of truth.
+func (f *EnvFile) sync(dir syncDirection, db *Db) (result EnvFileSyncResult, err error) {
+	if result != Noop {
+		panic("Invalid state")
+	}
+
+	if _, err := os.Stat(f.Dir); err != nil {
+		// Directory doesn't exist
+
+		var movedDirs []string
+
+		if db != nil {
+			movedDirs, err = db.findMovedDirs(f)
+		}
+		if err != nil {
+			return Error, err
+		} else {
+			switch len(movedDirs) {
+			case 0:
+				return Error, fmt.Errorf("directory missing")
+			case 1:
+				f.updateDir(movedDirs[0])
+				result |= DirUpdated
+			default:
+				return Error, fmt.Errorf("multiple directories found")
+			}
+		}
+	}
+
+	if _, err := os.Stat(f.Path); err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			if err := os.WriteFile(f.Path, []byte(f.contents), 0644); err != nil {
+				return Error, fmt.Errorf("failed to write file: %w", err)
+			}
+
+			return result | Restored, nil
+		} else {
+			return Error, err
+		}
+	} else {
+		// File exists, check its hash
+		contents, err := os.ReadFile(f.Path)
+		if err != nil {
+			return Error, fmt.Errorf("failed to read file for SHA comparison: %w", err)
+		}
+
+		hash := sha256.Sum256(contents)
+		currentSha := fmt.Sprintf("%x", hash)
+
+		// Compare the hashes
+		if currentSha == f.Sha256 {
+			// No op, or DirUpdated
+			return result, nil
+		} else {
+			switch dir {
+			case TrustDatabase:
+				if err := os.WriteFile(f.Path, []byte(f.contents), 0644); err != nil {
+					return Error, fmt.Errorf("failed to write file: %w", err)
+				}
+
+				return result | Restored, nil
+			case TrustFilesystem:
+				// Overwrite the database
+				if err = f.Backup(); err != nil {
+					return Error, err
+				} else {
+					return BackedUp, nil
+				}
+			default:
+				panic("unknown sync direction")
+			}
+		}
+	}
+}
+
+func (f *EnvFile) sharesRemote(remotes []string) bool {
+	rMap := make(map[string]bool)
+	for _, remote := range f.Remotes {
+		rMap[remote] = true
+	}
+
+	for _, remote := range remotes {
+		if rMap[remote] {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (f *EnvFile) updateDir(newDir string) {
+	f.Dir = newDir
+	f.Path = path.Join(newDir, path.Base(f.Path))
+	f.Remotes = getGitRemotes(newDir)
+}
+
+// Try to reconcile the EnvFile with the filesystem.
+//
+// If Updated is returned, [Db.Insert] should be called on file.
+func (file *EnvFile) Sync() (result EnvFileSyncResult, err error) {
+	return file.sync(TrustFilesystem, nil)
+}
+
+// Install the file into the file system. If the file already exists,
+// it will be overwritten.
+func (file EnvFile) Restore() error {
+	_, err := file.sync(TrustDatabase, nil)
+
+	return err
+}
+
+// Update the EnvFile using the file system.
+func (file *EnvFile) Backup() error {
+	// Read the contents of the file
+	contents, err := os.ReadFile(file.Path)
+	if err != nil {
+		return fmt.Errorf("failed to read file %s: %w", file.Path, err)
+	}
+
+	// Update file.contents to match
+	file.contents = string(contents)
+
+	// Update file.sha256
+	hash := sha256.Sum256(contents)
+	file.Sha256 = fmt.Sprintf("%x", hash)
+
+	return nil
+}

app/features.go

@@ -0,0 +1,60 @@
+package app
+
+import (
+	"fmt"
+	"os/exec"
+)
+
+type MissingFeatureError struct {
+	feature AvailableFeatures
+}
+
+func (m *MissingFeatureError) Error() string {
+	return fmt.Sprintf("Missing \"%s\" feature", m.feature)
+}
+
+// TODO: Features should really be renamed to Binaries
+
+// Represents which binaries are present in $PATH.
+// Used to fail safely when required features are unavailable
+type AvailableFeatures int
+
+const (
+	Git AvailableFeatures = 1
+	// fd
+	Fd AvailableFeatures = 2
+	// All features are present
+	All AvailableFeatures = Git | Fd
+)
+
+// Checks for available features.
+func checkFeatures() (feats AvailableFeatures) {
+	// Check for git binary
+	if _, err := exec.LookPath("git"); err == nil {
+		feats |= Git
+	}
+
+	// Check for fd binary
+	if _, err := exec.LookPath("fd"); err == nil {
+		feats |= Fd
+	}
+
+	return feats
+}
+
+// Returns a MissingFeature error if the given features aren't present.
+func (a AvailableFeatures) validateFeatures(features ...AvailableFeatures) error {
+	var missing AvailableFeatures
+
+	for _, feat := range features {
+		if a&feat == 0 {
+			missing |= feat
+		}
+	}
+
+	if missing == 0 {
+		return nil
+	} else {
+		return &MissingFeatureError{missing}
+	}
+}

build.zig

@@ -0,0 +1,179 @@
+const std = @import("std");
+
+// Although this function looks imperative, it does not perform the build
+// directly and instead it mutates the build graph (`b`) that will be then
+// executed by an external runner. The functions in `std.Build` implement a DSL
+// for defining build steps and express dependencies between them, allowing the
+// build runner to parallelize the build automatically (and the cache system to
+// know when a step doesn't need to be re-run).
+pub fn build(b: *std.Build) void {
+    // Standard target options allow the person running `zig build` to choose
+    // what target to build for. Here we do not override the defaults, which
+    // means any target is allowed, and the default is native. Other options
+    // for restricting supported target set are available.
+    const target = b.standardTargetOptions(.{});
+    // Standard optimization options allow the person running `zig build` to select
+    // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
+    // set a preferred release mode, allowing the user to decide how to optimize.
+    const optimize = b.standardOptimizeOption(.{});
+    // It's also possible to define more custom flags to toggle optional features
+    // of this build script using `b.option()`. All defined flags (including
+    // target and optimize options) will be listed when running `zig build --help`
+    // in this directory.
+
+    const comma = b.addModule("comma", .{
+        .root_source_file = b.path("src/comma.zig"),
+        .target = target,
+    });
+
+    const sqlite = b.dependency("sqlite", .{
+        .target = target,
+        .optimize = optimize,
+    });
+
+    // This creates a module, which represents a collection of source files alongside
+    // some compilation options, such as optimization mode and linked system libraries.
+    // Zig modules are the preferred way of making Zig code available to consumers.
+    // addModule defines a module that we intend to make available for importing
+    // to our consumers. We must give it a name because a Zig package can expose
+    // multiple modules and consumers will need to be able to specify which
+    // module they want to access.
+    const mod = b.addModule("envr", .{
+        // The root source file is the "entry point" of this module. Users of
+        // this module will only be able to access public declarations contained
+        // in this file, which means that if you have declarations that you
+        // intend to expose to consumers that were defined in other files part
+        // of this module, you will have to make sure to re-export them from
+        // the root file.
+        .root_source_file = b.path("src/root.zig"),
+        // Later on we'll use this module as the root module of a test executable
+        // which requires us to specify a target.
+        .target = target,
+        .imports = &.{
+            .{ .name = "comma", .module = comma },
+        },
+    });
+
+    mod.addImport("sqlite", sqlite.module("sqlite"));
+
+    // Here we define an executable. An executable needs to have a root module
+    // which needs to expose a `main` function. While we could add a main function
+    // to the module defined above, it's sometimes preferable to split business
+    // logic and the CLI into two separate modules.
+    //
+    // If your goal is to create a Zig library for others to use, consider if
+    // it might benefit from also exposing a CLI tool. A parser library for a
+    // data serialization format could also bundle a CLI syntax checker, for example.
+    //
+    // If instead your goal is to create an executable, consider if users might
+    // be interested in also being able to embed the core functionality of your
+    // program in their own executable in order to avoid the overhead involved in
+    // subprocessing your CLI tool.
+    //
+    // If neither case applies to you, feel free to delete the declaration you
+    // don't need and to put everything under a single module.
+    const exe = b.addExecutable(.{
+        .name = "envr",
+        .root_module = b.createModule(.{
+            // b.createModule defines a new module just like b.addModule but,
+            // unlike b.addModule, it does not expose the module to consumers of
+            // this package, which is why in this case we don't have to give it a name.
+            .root_source_file = b.path("src/main.zig"),
+            // Target and optimization levels must be explicitly wired in when
+            // defining an executable or library (in the root module), and you
+            // can also hardcode a specific target for an executable or library
+            // definition if desireable (e.g. firmware for embedded devices).
+            .target = target,
+            .optimize = optimize,
+            // List of modules available for import in source files part of the
+            // root module.
+            .imports = &.{
+                // Here "envr" is the name you will use in your source code to
+                // import this module (e.g. `@import("envr")`). The name is
+                // repeated because you are allowed to rename your imports, which
+                // can be extremely useful in case of collisions (which can happen
+                // importing modules from different packages).
+                .{ .name = "comma", .module = comma },
+                .{ .name = "envr", .module = mod },
+            },
+        }),
+    });
+
+    const version = b.option([]const u8, "version", "application version string") orelse "dev";
+
+    const options = b.addOptions();
+    options.addOption([]const u8, "version", version);
+
+    exe.root_module.addOptions("config", options);
+
+    // This declares intent for the executable to be installed into the
+    // install prefix when running `zig build` (i.e. when executing the default
+    // step). By default the install prefix is `zig-out/` but can be overridden
+    // by passing `--prefix` or `-p`.
+    b.installArtifact(exe);
+
+    // This creates a top level step. Top level steps have a name and can be
+    // invoked by name when running `zig build` (e.g. `zig build run`).
+    // This will evaluate the `run` step rather than the default step.
+    // For a top level step to actually do something, it must depend on other
+    // steps (e.g. a Run step, as we will see in a moment).
+    const run_step = b.step("run", "Run the app");
+
+    // This creates a RunArtifact step in the build graph. A RunArtifact step
+    // invokes an executable compiled by Zig. Steps will only be executed by the
+    // runner if invoked directly by the user (in the case of top level steps)
+    // or if another step depends on it, so it's up to you to define when and
+    // how this Run step will be executed. In our case we want to run it when
+    // the user runs `zig build run`, so we create a dependency link.
+    const run_cmd = b.addRunArtifact(exe);
+    run_step.dependOn(&run_cmd.step);
+
+    // By making the run step depend on the default step, it will be run from the
+    // installation directory rather than directly from within the cache directory.
+    run_cmd.step.dependOn(b.getInstallStep());
+
+    // This allows the user to pass arguments to the application in the build
+    // command itself, like this: `zig build run -- arg1 arg2 etc`
+    if (b.args) |args| {
+        run_cmd.addArgs(args);
+    }
+
+    // Creates an executable that will run `test` blocks from the provided module.
+    // Here `mod` needs to define a target, which is why earlier we made sure to
+    // set the releative field.
+    const mod_tests = b.addTest(.{
+        .root_module = mod,
+    });
+
+    // A run step that will run the test executable.
+    const run_mod_tests = b.addRunArtifact(mod_tests);
+
+    // Creates an executable that will run `test` blocks from the executable's
+    // root module. Note that test executables only test one module at a time,
+    // hence why we have to create two separate ones.
+    const exe_tests = b.addTest(.{
+        .root_module = exe.root_module,
+    });
+
+    // A run step that will run the second test executable.
+    const run_exe_tests = b.addRunArtifact(exe_tests);
+
+    // A top level step for running all tests. dependOn can be called multiple
+    // times and since the two run steps do not depend on one another, this will
+    // make the two of them run in parallel.
+    const test_step = b.step("test", "Run tests");
+    test_step.dependOn(&run_mod_tests.step);
+    test_step.dependOn(&run_exe_tests.step);
+
+    // Just like flags, top level steps are also listed in the `--help` menu.
+    //
+    // The Zig build system is entirely implemented in userland, which means
+    // that it cannot hook into private compiler APIs. All compilation work
+    // orchestrated by the build system will result in other Zig compiler
+    // subcommands being invoked with the right flags defined. You can observe
+    // these invocations when one fails (or you pass a flag to increase
+    // verbosity) to validate assumptions and diagnose problems.
+    //
+    // Lastly, the Zig build system is relatively simple and self-contained,
+    // and reading its source code will allow you to master it.
+}

build.zig.zon

@@ -0,0 +1,84 @@
+.{
+    // This is the default name used by packages depending on this one. For
+    // example, when a user runs `zig fetch --save <url>`, this field is used
+    // as the key in the `dependencies` table. Although the user can choose a
+    // different name, most users will stick with this provided value.
+    //
+    // It is redundant to include "zig" in this name because it is already
+    // within the Zig package namespace.
+    .name = .envr,
+    // This is a [Semantic Version](https://semver.org/).
+    // In a future version of Zig it will be used for package deduplication.
+    .version = "0.3.0",
+    // Together with name, this represents a globally unique package
+    // identifier. This field is generated by the Zig toolchain when the
+    // package is first created, and then *never changes*. This allows
+    // unambiguous detection of one package being an updated version of
+    // another.
+    //
+    // When forking a Zig project, this id should be regenerated (delete the
+    // field and run `zig build`) if the upstream project is still maintained.
+    // Otherwise, the fork is *hostile*, attempting to take control over the
+    // original project's identity. Thus it is recommended to leave the comment
+    // on the following line intact, so that it shows up in code reviews that
+    // modify the field.
+    .fingerprint = 0xa89bf067266a3e10, // Changing this has security and trust implications.
+    // Tracks the earliest Zig version that the package considers to be a
+    // supported use case.
+    .minimum_zig_version = "0.16.0",
+    // This field is optional.
+    // Each dependency must either provide a `url` and `hash`, or a `path`.
+    // `zig build --fetch` can be used to fetch all dependencies of a package, recursively.
+    // Once all dependencies are fetched, `zig build` no longer requires
+    // internet connectivity.
+    .dependencies = .{
+        // .age = .{ .path = "zig-vendor/age-ffi/zig" },
+        .sqlite = .{ .path = "zig-vendor/zig-sqlite" },
+
+        // See `zig fetch --save <url>` for a command-line interface for adding dependencies.
+        //.example = .{
+        //    // When updating this field to a new URL, be sure to delete the corresponding
+        //    // `hash`, otherwise you are communicating that you expect to find the old hash at
+        //    // the new URL. If the contents of a URL change this will result in a hash mismatch
+        //    // which will prevent zig from using it.
+        //    .url = "https://example.com/foo.tar.gz",
+        //
+        //    // This is computed from the file contents of the directory of files that is
+        //    // obtained after fetching `url` and applying the inclusion rules given by
+        //    // `paths`.
+        //    //
+        //    // This field is the source of truth; packages do not come from a `url`; they
+        //    // come from a `hash`. `url` is just one of many possible mirrors for how to
+        //    // obtain a package matching this `hash`.
+        //    //
+        //    // Uses the [multihash](https://multiformats.io/multihash/) format.
+        //    .hash = "...",
+        //
+        //    // When this is provided, the package is found in a directory relative to the
+        //    // build root. In this case the package's hash is irrelevant and therefore not
+        //    // computed. This field and `url` are mutually exclusive.
+        //    .path = "foo",
+        //
+        //    // When this is set to `true`, a package is declared to be lazily
+        //    // fetched. This makes the dependency only get fetched if it is
+        //    // actually used.
+        //    .lazy = false,
+        //},
+    },
+    // Specifies the set of files and directories that are included in this package.
+    // Only files and directories listed here are included in the `hash` that
+    // is computed for this package. Only files listed here will remain on disk
+    // when using the zig package manager. As a rule of thumb, one should list
+    // files required for compilation plus any license(s).
+    // Paths are relative to the build root. Use the empty string (`""`) to refer to
+    // the build root itself.
+    // A directory listed here means that all files within, recursively, are included.
+    .paths = .{
+        "build.zig",
+        "build.zig.zon",
+        "src",
+        // For example...
+        //"LICENSE",
+        //"README.md",
+    },
+}

cli.odin

@@ -3,6 +3,7 @@ package main
 import "core:bufio"
 import "core:fmt"
 import "core:io"
+import "core:mem"
 import "core:os"
 import "core:strings"
 
@@ -11,10 +12,6 @@ Command :: struct {
 	args:     [dynamic]string,
 	flags:    map[string]string,
 	bool_set: map[string]bool,
-	config_path: string,
-	out_buf:     ^bufio.Writer,
-	out:         io.Writer,
-	err:         io.Writer,
 }
 
 CommandInfo :: struct {
@@ -30,10 +27,7 @@ COMMANDS := []CommandInfo {
 		"init",
 		"envr init",
 		"Set up envr",
-		`The init command generates your initial config and saves it to
-~/.envr/config in JSON format.\n\nDuring setup, you will be prompted to select one or more ssh keys with which to
-encrypt your databse. **Make 100% sure** that you have **a remote copy** of this
-key somewhere, otherwise your data could be lost forever.`,
+		"The init command generates your initial config and saves it to\n~/.envr/config in JSON format.\n\nDuring setup, you will be prompted to select one or more ssh keys with which to\nencrypt your databse. **Make 100% sure** that you have **a remote copy** of this\nkey somewhere, otherwise your data could be lost forever.",
 		{},
 	},
 	{"scan", "envr scan", "Find and select .env files for backup", "", {}},
@@ -52,40 +46,23 @@ key somewhere, otherwise your data could be lost forever.`,
 	},
 	{"version", "envr version", "Show envr's version", "", {}},
 	{"edit-config", "envr edit-config", "Edit your config with your default editor", "", {}},
-	{
-		"nushell-completion",
-		"envr nushell-completion",
-		"Generate custom completions for nushell",
-		"",
-		{},
-	},
+	{"nushell-completion", "envr nushell-completion", "Generate custom completions for nushell", "", {}},
 }
 
-delete_command :: proc(cmd: ^Command) {
-	delete(cmd.args)
-	delete(cmd.flags)
-	delete(cmd.bool_set)
-	bufio.writer_destroy(cmd.out_buf)
-	free(cmd.out_buf)
-}
-
-// Caller is responsible for calling delete_command(cmd).
-// FIXME: Works in kinda a wonky and awkward way.
-parse_args :: proc(args: []string, out: io.Stream, err: io.Stream) -> (cmd: Command, ok: bool) {
-	{
-		cmd.out_buf = new(bufio.Writer)
-		bufio.writer_init(cmd.out_buf, out)
-		cmd.out = bufio.writer_to_writer(cmd.out_buf)
-		cmd.err = err
-	}
-
-	if len(args) < 2 || args[1] == "--help" || args[1] == "-h" {
-		write_usage(cmd.out)
-		return cmd, false
+parse_args :: proc() -> (cmd: Command, ok: bool) {
+	args := os.args
+	if len(args) < 2 {
+		print_usage()
+		return Command{}, false
 	}
 
 	cmd.name = args[1]
 
+	if cmd.name == "--help" || cmd.name == "-h" {
+		print_usage()
+		return Command{}, false
+	}
+
 	cmd.args = make([dynamic]string)
 	cmd.flags = make(map[string]string)
 	cmd.bool_set = make(map[string]bool)
@@ -117,21 +94,9 @@ parse_args :: proc(args: []string, out: io.Stream, err: io.Stream) -> (cmd: Comm
 		}
 	}
 
-	if val, ok := cmd.flags["config-file"]; ok {
-		cmd.config_path = val
-	} else if val, ok := cmd.flags["c"]; ok {
-		cmd.config_path = val
-	} else {
-		// FIXME: Handle err
-		// TODO: Is this right?
-		home, _ := os.user_home_dir(context.temp_allocator)
-		// TODO: should we copy out of the temp_allocator?
-		cmd.config_path = default_config_path(home, context.temp_allocator)
-	}
-
 	if has_flag(&cmd, "help") {
-		print_command_help(&cmd)
-		return cmd, false
+		print_command_help(cmd.name)
+		return Command{}, false
 	}
 
 	return cmd, true
@@ -181,24 +146,24 @@ write_command_help :: proc(name: string, w: io.Writer) -> bool {
 		fmt.wprintf(w, "\n%s\n", info.long, flush = false)
 	}
 
-	fmt.wprintf(
-		w,
-		"\nFlags:\n  -h, --help   help for %s\n  -c, --config-file <path>   config file (default \"~/.envr/config.json\")\n",
-		info.name,
-		flush = false,
-	)
+	fmt.wprintf(w, "\nFlags:\n  -h, --help   help for %s\n", info.name, flush = false)
 	return true
 }
 
-print_command_help :: proc(cmd: ^Command) {
-	ok := write_command_help(cmd.name, cmd.out)
+print_command_help :: proc(name: string) {
+	bw: bufio.Writer
+	bufio.writer_init(&bw, io.to_writer(os.to_writer(os.stdout)), mem.DEFAULT_PAGE_SIZE)
+	defer bufio.writer_destroy(&bw)
+
+	w := bufio.writer_to_writer(&bw)
+	ok := write_command_help(name, w)
 	if !ok {
-		fmt.wprintf(cmd.err, "Unknown command: %s\n", cmd.name)
-		write_usage(cmd.out)
+		fmt.printf("Unknown command: %s\n", name)
+		print_usage()
 	}
+	bufio.writer_flush(&bw)
 }
 
-// TODO: command args should be shown in usage.
 write_usage :: proc(w: io.Writer) {
 	fmt.wprintf(
 		w,
@@ -262,7 +227,6 @@ Available Commands:
 		`
 Flags:
   -h, --help   help for envr
-  -c, --config-file <path>   config file (default "~/.envr/config.json")
 
 Use "envr [command] --help" for more information about a command.
 `,
@@ -270,3 +234,13 @@ Use "envr [command] --help" for more information about a command.
 	)
 }
 
+// TODO: Look at usages,might want to pass a writer
+print_usage :: proc() {
+	bw: bufio.Writer
+	bufio.writer_init(&bw, io.to_writer(os.to_writer(os.stdout)), mem.DEFAULT_PAGE_SIZE)
+	defer bufio.writer_destroy(&bw)
+	defer bufio.writer_flush(&bw)
+
+	write_usage(bufio.writer_to_writer(&bw))
+}
+

cli_test.odin

@@ -2,7 +2,6 @@
 package main
 
 import "core:fmt"
-import "core:fmt"
 import "core:strings"
 import "core:testing"
 
@@ -190,181 +189,3 @@ test_has_flag_empty_command :: proc(t: ^testing.T) {
 }
 
 
-	args: []string,
-) -> (
-	cmd: Command,
-	ok: bool,
-	out_text: string,
-	err_text: string,
-) {
-	out_b: strings.Builder
-	strings.builder_init(&out_b)
-	defer strings.builder_destroy(&out_b)
-	err_b: strings.Builder
-	strings.builder_init(&err_b)
-	defer strings.builder_destroy(&err_b)
-
-	cmd, ok = parse_args(args, strings.to_stream(&out_b), strings.to_stream(&err_b))
-
-	if ok {
-		bufio.writer_flush(cmd.out_buf)
-		out_text = strings.to_string(out_b)
-		err_text = strings.to_string(err_b)
-	}
-
-	return
-}
-
-@(test)
-test_parse_args_bare_command :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "list"})
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect_value(t, cmd.name, "list")
-	testing.expect_value(t, len(cmd.args), 0)
-	testing.expect_value(t, len(cmd.flags), 0)
-	testing.expect_value(t, len(cmd.bool_set), 0)
-}
-
-@(test)
-test_parse_args_positional :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "backup", "/project/.env"})
-	defer delete_command(&cmd)
-	testing.expect(t, ok, "should succeed")
-
-	testing.expect(t, cmd.name == "backup")
-	testing.expect(t, len(cmd.args) == 1)
-	testing.expect(t, cmd.args[0] == "/project/.env")
-}
-
-@(test)
-test_parse_args_long_flag_with_value :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "sync", "--config", "x.json"})
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect(t, cmd.flags["config"] == "x.json")
-}
-
-@(test)
-test_parse_args_short_flag_with_value :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "sync", "-c", "x.json"})
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect(t, cmd.flags["c"] == "x.json")
-}
-
-@(test)
-test_parse_args_long_bool_flag :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "init", "--force"})
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect(t, cmd.bool_set["force"] == true)
-}
-
-@(test)
-test_parse_args_short_bool_flag :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "version", "-l"})
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect(t, cmd.bool_set["l"] == true)
-}
-
-@(test)
-test_parse_args_multiple_positionals :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "backup", "a", "b"})
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect(t, len(cmd.args) == 2)
-	testing.expect(t, cmd.args[0] == "a")
-	testing.expect(t, cmd.args[1] == "b")
-}
-
-@(test)
-test_parse_args_mixed_flags_and_positionals :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "backup", "/project/.env", "--force"})
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect(t, cmd.bool_set["force"] == true)
-	testing.expect(t, len(cmd.args) == 1)
-	testing.expect(t, cmd.args[0] == "/project/.env")
-}
-
-@(test)
-test_parse_args_no_args :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr"})
-	defer delete_command(&cmd)
-	testing.expect(t, !ok, "no args should return false")
-}
-
-@(test)
-test_parse_args_flag_then_positional_then_flag :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "backup", "a.env", "--force", "--verbose"})
-	defer delete_command(&cmd)
-	testing.expect(t, ok, "should succeed")
-
-	testing.expect(t, cmd.bool_set["force"] == true)
-	testing.expect(t, cmd.bool_set["verbose"] == true)
-	testing.expect(t, len(cmd.args) == 1)
-	testing.expect(t, cmd.args[0] == "a.env")
-}
-
-@(test)
-test_parse_args_config_file_long_flag :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args(
-		[]string{"envr", "list", "--config-file", "/custom/config.json"},
-	)
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect(
-		t,
-		cmd.config_path == "/custom/config.json",
-		"config_path should be set from --config-file",
-	)
-}
-
-@(test)
-test_parse_args_config_file_short_flag :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "list", "-c", "/custom/config.json"})
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect(
-		t,
-		cmd.config_path == "/custom/config.json",
-		"config_path should be set from -c",
-	)
-}
-
-@(test)
-test_parse_args_config_file_defaults :: proc(t: ^testing.T) {
-	cmd, ok, _, _ := test_parse_args([]string{"envr", "list"})
-	testing.expect(t, ok, "should succeed")
-	if !ok do return
-	defer delete_command(&cmd)
-
-	testing.expect(t, len(cmd.config_path) > 0, "config_path should default to non-empty path")
-	testing.expect(
-		t,
-		strings.contains(cmd.config_path, ".envr"),
-		"default config_path should contain .envr dir, got %s",
-	)
-}
-
-

cmd/backup.go

@@ -0,0 +1,56 @@
+/*
+Copyright © 2025 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/sbrow/envr/app"
+	"github.com/spf13/cobra"
+)
+
+// backupCmd represents the backup command
+var backupCmd = &cobra.Command{
+	Use:     "backup <path>",
+	Short:   "Import a .env file into envr",
+	Aliases: []string{"add"},
+	Args:    cobra.ExactArgs(1),
+	// Long: `Long desc`
+	RunE: func(cmd *cobra.Command, args []string) error {
+		path := args[0]
+		if len(strings.TrimSpace(path)) == 0 {
+			return fmt.Errorf("No path provided")
+		}
+
+		db, err := app.Open()
+		if err != nil {
+			return err
+		} else {
+			defer db.Close()
+			record := app.NewEnvFile(path)
+
+			if err := db.Insert(record); err != nil {
+				return err
+			} else {
+				fmt.Printf("Saved %s into the database", path)
+				return nil
+			}
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(backupCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// backupCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// backupCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/check.go

@@ -0,0 +1,109 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/sbrow/envr/app"
+	"github.com/spf13/cobra"
+)
+
+var checkCmd = &cobra.Command{
+	Use:   "check [path]",
+	Short: "check if files in the current directory are backed up",
+	// TODO: Long description for new check command
+	Args: cobra.MaximumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		// Accept an optional path arg, default to current working directory
+		var checkPath string
+		if len(args) > 0 {
+			checkPath = args[0]
+		} else {
+			cwd, err := os.Getwd()
+			if err != nil {
+				return fmt.Errorf("failed to get current working directory: %w", err)
+			}
+			checkPath = cwd
+		}
+
+		// Get absolute path
+		absPath, err := filepath.Abs(checkPath)
+		if err != nil {
+			return fmt.Errorf("failed to get absolute path: %w", err)
+		}
+
+		// Open database
+		db, err := app.Open()
+		if err != nil {
+			return fmt.Errorf("failed to open database: %w", err)
+		}
+		defer db.Close()
+
+		// Check if the path is a file or directory
+		info, err := os.Stat(absPath)
+		if err != nil {
+			return fmt.Errorf("failed to stat path: %w", err)
+		}
+
+		var filesInPath []string
+
+		if info.IsDir() {
+			// Find .env files in the specified directory
+			if err := db.CanScan(); err != nil {
+				return err
+			}
+
+			// Scan only the specified path for .env files
+			filesInPath, err = db.Scan([]string{absPath})
+			if err != nil {
+				return fmt.Errorf("failed to scan path for env files: %w", err)
+			}
+		} else {
+			// Path is a file, just check this specific file
+			filesInPath = []string{absPath}
+		}
+
+		// Get all backed up files from the database
+		envFiles, err := db.List()
+		if err != nil {
+			return fmt.Errorf("failed to list files from database: %w", err)
+		}
+
+		// Check which files are not backed up
+		var notBackedUp []string
+		for _, file := range filesInPath {
+			isBackedUp := false
+			for _, envFile := range envFiles {
+				if envFile.Path == file {
+					isBackedUp = true
+					break
+				}
+			}
+			if !isBackedUp {
+				notBackedUp = append(notBackedUp, file)
+			}
+		}
+
+		// Display results
+		if len(notBackedUp) == 0 {
+			if len(filesInPath) == 0 {
+				fmt.Println("No .env files found in the specified directory.")
+			} else {
+				fmt.Println("✓ All .env files in the directory are backed up.")
+			}
+		} else {
+			fmt.Printf("Found %d .env file(s) that are not backed up:\n", len(notBackedUp))
+			for _, file := range notBackedUp {
+				fmt.Printf("  %s\n", file)
+			}
+			fmt.Println("\nRun 'envr sync' to back up these files.")
+		}
+
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(checkCmd)
+}

cmd/deps.go

@@ -0,0 +1,51 @@
+package cmd
+
+import (
+	"os"
+
+	"github.com/olekukonko/tablewriter"
+	"github.com/sbrow/envr/app"
+	"github.com/spf13/cobra"
+)
+
+var depsCmd = &cobra.Command{
+	Use:   "deps",
+	Short: "Check for missing binaries",
+	Long: `envr relies on external binaries for certain functionality.
+
+The check command reports on which binaries are available and which are not.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		db, err := app.Open()
+		if err != nil {
+			return err
+		} else {
+			defer db.Close()
+			features := db.Features()
+
+			table := tablewriter.NewWriter(os.Stdout)
+			table.Header([]string{"Feature", "Status"})
+
+			// Check Git
+			if features&app.Git == 1 {
+				table.Append([]string{"Git", "✓ Available"})
+			} else {
+				table.Append([]string{"Git", "✗ Missing"})
+			}
+
+			// Check fd
+			if features&app.Fd == app.Fd {
+				table.Append([]string{"fd", "✓ Available"})
+			} else {
+				table.Append([]string{"fd", "✗ Missing"})
+			}
+
+			table.Render()
+
+			return nil
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(depsCmd)
+}

cmd/edit_config.go

@@ -0,0 +1,55 @@
+/*
+Copyright © 2025 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/spf13/cobra"
+)
+
+var editConfigCmd = &cobra.Command{
+	Use:   "edit-config",
+	Short: "Edit your config with your default editor",
+	// Long: ``,
+	Run: func(cmd *cobra.Command, args []string) {
+		editor := os.Getenv("EDITOR")
+		if editor == "" {
+			fmt.Println("Error: $EDITOR environment variable is not set")
+			return
+		}
+
+		homeDir, err := os.UserHomeDir()
+		if err != nil {
+			fmt.Printf("Error getting home directory: %v\n", err)
+			return
+		}
+
+		configPath := filepath.Join(homeDir, ".envr", "config.json")
+
+		// Check if config file exists
+		if _, err := os.Stat(configPath); os.IsNotExist(err) {
+			fmt.Printf("Config file does not exist at %s. Run 'envr init' first.\n", configPath)
+			return
+		}
+
+		// Execute the editor
+		execCmd := exec.Command(editor, configPath)
+		execCmd.Stdin = os.Stdin
+		execCmd.Stdout = os.Stdout
+		execCmd.Stderr = os.Stderr
+
+		if err := execCmd.Run(); err != nil {
+			fmt.Printf("Error running editor: %v\n", err)
+			return
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(editConfigCmd)
+}

cmd/init.go

@@ -0,0 +1,96 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/sbrow/envr/app"
+	"github.com/spf13/cobra"
+)
+
+var initCmd = &cobra.Command{
+	Use:   "init",
+	Short: "Set up envr",
+	Long: `The init command generates your initial config and saves it to
+~/.envr/config in JSON format.
+
+During setup, you will be prompted to select one or more ssh keys with which to
+encrypt your databse. **Make 100% sure** that you have **a remote copy** of this
+key somewhere, otherwise your data could be lost forever.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		force, _ := cmd.Flags().GetBool("force")
+		config, _ := app.LoadConfig()
+
+		if config == nil || force {
+			keys, err := selectSSHKeys()
+			if err != nil {
+				return fmt.Errorf("Error selecting SSH keys: %v", err)
+			}
+
+			if len(keys) == 0 {
+				return fmt.Errorf("No SSH keys selected - Config not created")
+			}
+
+			cfg := app.NewConfig(keys)
+			if err := cfg.Save(); err != nil {
+				return err
+			}
+
+			fmt.Printf("Config initialized with %d SSH key(s). You are ready to use envr.\n", len(keys))
+			return nil
+		} else {
+			return fmt.Errorf(`You have already initialized envr.
+Run again with the --force flag if you want to reinitialize.
+`)
+		}
+	},
+}
+
+func init() {
+	initCmd.Flags().BoolP("force", "f", false, "Overwrite an existing config")
+	rootCmd.AddCommand(initCmd)
+}
+
+func selectSSHKeys() ([]string, error) {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return nil, err
+	}
+
+	// TODO: Support reading from ssh-agent
+	sshDir := filepath.Join(homeDir, ".ssh")
+	entries, err := os.ReadDir(sshDir)
+	if err != nil {
+		return nil, fmt.Errorf("could not read ~/.ssh directory: %w", err)
+	}
+
+	var privateKeys []string
+	for _, entry := range entries {
+		name := entry.Name()
+		if !entry.IsDir() && !strings.HasSuffix(name, ".pub") &&
+			!strings.Contains(name, "known_hosts") && !strings.Contains(name, "config") {
+			privateKeys = append(privateKeys, filepath.Join(sshDir, name))
+		}
+	}
+
+	if len(privateKeys) == 0 {
+		return nil, fmt.Errorf("no SSH private keys found in ~/.ssh")
+	}
+
+	var selected []string
+
+	prompt := &survey.MultiSelect{
+		Message: "Select SSH private keys:",
+		Options: privateKeys,
+	}
+
+	err = survey.AskOne(prompt, &selected)
+	if err != nil {
+		return nil, err
+	}
+
+	return selected, nil
+}

cmd/list.go

@@ -0,0 +1,69 @@
+package cmd
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+
+	"github.com/mattn/go-isatty"
+	"github.com/olekukonko/tablewriter"
+	"github.com/sbrow/envr/app"
+	"github.com/spf13/cobra"
+)
+
+type listEntry struct {
+	Directory string `json:"directory"`
+	Path      string `json:"path"`
+}
+
+var listCmd = &cobra.Command{
+	Use:   "list",
+	Short: "View your tracked files",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		db, err := app.Open()
+		if err != nil {
+			return err
+		}
+		defer db.Close()
+
+		rows, err := db.List()
+		if err != nil {
+			return err
+		}
+
+		if isatty.IsTerminal(os.Stdout.Fd()) {
+			table := tablewriter.NewWriter(os.Stdout)
+			table.Header([]string{"Directory", "Path"})
+
+			for _, row := range rows {
+				path, err := filepath.Rel(row.Dir, row.Path)
+				if err != nil {
+					return err
+				}
+				table.Append([]string{row.Dir + "/", path})
+			}
+			table.Render()
+		} else {
+			var entries []listEntry
+			for _, row := range rows {
+				path, err := filepath.Rel(row.Dir, row.Path)
+				if err != nil {
+					return err
+				}
+				entries = append(entries, listEntry{
+					Directory: row.Dir + "/",
+					Path:      path,
+				})
+			}
+
+			encoder := json.NewEncoder(os.Stdout)
+			return encoder.Encode(entries)
+		}
+
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(listCmd)
+}

cmd/mod.nu

@@ -0,0 +1,79 @@
+# envr command extern definitions for Nushell
+# A tool for managing environment files and backups
+
+export def tracked-paths [] {
+  (
+    ^envr list
+    | from json
+    | each {
+      [$in.directory $in.path] | path join
+    }
+  )
+}
+
+export def untracked-paths [] {
+  (
+    ^envr scan
+    | from json
+  )
+}
+
+# Complete shell types for completion command
+def shells [] {
+  ["bash", "zsh", "fish", "powershell"]
+}
+
+export extern envr [
+  ...args: any
+  --help(-h)              # Show help information
+  --toggle(-t)            # Help message for toggle
+]
+
+export extern "envr backup" [
+  --help(-h) # Show help for backup command
+  path: path@untracked-paths # Path to .env file to backup
+]
+#TODO: envr backup path.
+
+export extern "envr check" [
+  --help(-h)              # Show help for check command
+]
+
+export extern "envr completion" [
+  shell: string@shells   # Shell to generate completion for
+  --help(-h)                      # Show help for completion command
+]
+
+export extern "envr edit-config" [
+  --help(-h)              # Show help for edit-config command
+]
+
+export extern "envr help" [
+  command?: string        # Show help for specific command
+]
+
+export extern "envr init" [
+  --help(-h)              # Show help for init command
+]
+
+export extern "envr list" [
+  --help(-h)              # Show help for list command
+]
+
+export extern "envr remove" [
+  --help(-h)              # Show help for remove command
+  path: path@tracked-paths
+]
+
+export extern "envr restore" [
+  --help(-h)              # Show help for restore command
+  path: path@tracked-paths
+]
+
+export extern "envr scan" [
+  --help(-h)              # Show help for scan command
+]
+
+export extern "envr sync" [
+  --help(-h)              # Show help for sync command
+]

cmd/nushell_completion.go

@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	_ "embed"
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+//go:embed mod.nu
+var completion string
+
+// nushellCompletionCmd represents the nushellCompletion command
+var nushellCompletionCmd = &cobra.Command{
+	Use:   "nushell-completion",
+	Short: "Generate custom completions for nushell",
+	Long: `At time of writing, cobra does not natively support nushell,
+so a custom command had to be written`,
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println(completion)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(nushellCompletionCmd)
+}

cmd/remove.go

@@ -0,0 +1,51 @@
+/*
+Copyright © 2025 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/sbrow/envr/app"
+	"github.com/spf13/cobra"
+)
+
+var removeCmd = &cobra.Command{
+	Use:   "remove",
+	Short: "Remove a .env file from your database",
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		path := args[0]
+		if len(strings.TrimSpace(path)) == 0 {
+			return fmt.Errorf("No path provided")
+		}
+
+		db, err := app.Open()
+		if err != nil {
+			return err
+		} else {
+			defer db.Close()
+			if err := db.Delete(path); err != nil {
+				return err
+			} else {
+				fmt.Printf("Removed %s from the database", path)
+				return nil
+			}
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(removeCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// removeCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// removeCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/restore.go

@@ -0,0 +1,60 @@
+/*
+Copyright © 2025 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/sbrow/envr/app"
+	"github.com/spf13/cobra"
+)
+
+// restoreCmd represents the restore command
+var restoreCmd = &cobra.Command{
+	Use:   "restore",
+	Short: "Install a .env file from the database into your file system",
+	// Long:  ``,
+	Args: cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		path := args[0]
+		if len(strings.TrimSpace(path)) == 0 {
+			return fmt.Errorf("No path provided")
+		}
+
+		db, err := app.Open()
+		if err != nil {
+			return err
+		} else {
+			defer db.Close()
+			record, err := db.Fetch(path)
+
+			if err != nil {
+				return err
+			} else {
+				err := record.Restore()
+
+				if err != nil {
+					return err
+				} else {
+					return nil
+				}
+			}
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(restoreCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// restoreCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// restoreCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

cmd/root.go

@@ -0,0 +1,66 @@
+package cmd
+
+import (
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+var rootCmd = &cobra.Command{
+	Use:   "envr",
+	Short: "Manage your .env files.",
+	Long: `envr keeps your .env synced to a local, age encrypted database.
+Is a safe and eay way to gather all your .env files in one place where they can
+easily be backed by another tool such as restic or git.
+
+All your data is stored in ~/data.age
+
+Getting started is easy:
+
+1. Create your configuration file and set up encrypted storage:
+
+> envr init
+
+2. Scan for existing .env files:
+
+> envr scan
+
+Select the files you want to back up from the interactive list.
+
+3. Verify that it worked:
+
+> envr list
+
+4. After changing any of your .env files, update the backup with:
+
+> envr sync
+
+5. If you lose a repository, after re-cloning the repo into the same path it was
+at before, restore your backup with:
+
+> envr restore ~/<path to repository>/.env`,
+}
+
+// Execute adds all child commands to the root command and sets flags appropriately.
+// This is called by main.main(). It only needs to happen once to the rootCmd.
+func Execute() {
+	err := rootCmd.Execute()
+	if err != nil {
+		os.Exit(1)
+	}
+}
+
+func init() {
+	// Here you will define your flags and configuration settings.
+	// Cobra supports persistent flags, which, if defined here,
+	// will be global for your application.
+
+	// rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.envr.yaml)")
+
+	// Cobra also supports local flags, which will only run
+	// when this action is called directly.
+	// rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}
+
+// Expose the root command for our generators.
+func Root() *cobra.Command { return rootCmd }

cmd/scan.go

@@ -0,0 +1,104 @@
+package cmd
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/mattn/go-isatty"
+	"github.com/sbrow/envr/app"
+	"github.com/spf13/cobra"
+)
+
+var scanCmd = &cobra.Command{
+	Use:   "scan",
+	Short: "Find and select .env files for backup",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		db, err := app.Open()
+		if err != nil {
+			return err
+		}
+
+		if db == nil {
+			return fmt.Errorf("No db was loaded")
+		}
+
+		if err := db.CanScan(); err != nil {
+			return err
+		}
+
+		files, err := db.Scan(nil)
+		if err != nil {
+			return err
+		}
+
+		if len(files) == 0 {
+			return fmt.Errorf("No .env files found to add.")
+		}
+
+		if isatty.IsTerminal(os.Stdout.Fd()) {
+			selectedFiles, err := selectEnvFiles(files)
+			if err != nil {
+				return err
+			}
+
+			// Insert selected files into database
+			var addedCount int
+			for _, file := range selectedFiles {
+				envFile := app.NewEnvFile(file)
+				err := db.Insert(envFile)
+				if err != nil {
+					fmt.Printf("Error adding %s: %v\n", file, err)
+				} else {
+					addedCount++
+				}
+			}
+
+			// Close database with write mode to persist changes
+			if addedCount > 0 {
+				err = db.Close()
+				if err != nil {
+					return fmt.Errorf("Error saving changes: %v\n", err)
+				} else {
+					fmt.Printf("Successfully added %d file(s) to backup.\n", addedCount)
+					return nil
+				}
+			} else {
+				err = db.Close()
+				if err != nil {
+					return fmt.Errorf("Error closing database: %v\n", err)
+				}
+				fmt.Println("No files were added.")
+				return nil
+			}
+		} else {
+			output, err := json.Marshal(files)
+			if err != nil {
+				return fmt.Errorf("Error marshaling files to JSON: %v", err)
+			}
+			fmt.Println(string(output))
+			return nil
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(scanCmd)
+}
+
+func selectEnvFiles(files []string) ([]string, error) {
+	var selectedFiles []string
+
+	prompt := &survey.MultiSelect{
+		Message: "Select .env files to backup:",
+		Options: files,
+	}
+
+	err := survey.AskOne(prompt, &selectedFiles)
+	if err != nil {
+		return nil, err
+	}
+
+	return selectedFiles, nil
+}

cmd/sync.go

@@ -0,0 +1,101 @@
+package cmd
+
+import (
+	"encoding/json"
+	"os"
+
+	"github.com/mattn/go-isatty"
+	"github.com/olekukonko/tablewriter"
+	"github.com/sbrow/envr/app"
+	"github.com/spf13/cobra"
+)
+
+var syncCmd = &cobra.Command{
+	Use:   "sync",
+	Short: "Update or restore your env backups",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		db, err := app.Open()
+
+		if err != nil {
+			return err
+		} else {
+			defer db.Close()
+			files, err := db.List()
+
+			if err != nil {
+				return err
+			} else {
+				type syncResult struct {
+					Path   string `json:"path"`
+					Status string `json:"status"`
+				}
+				var results []syncResult
+
+				for _, file := range files {
+					// Syncronize the filesystem with the database.
+					oldPath := file.Path
+					changed, err := db.Sync(&file)
+
+					var status string
+					switch changed {
+					case app.BackedUp:
+						status = "Backed Up"
+						if err := db.Insert(file); err != nil {
+							return err
+						}
+					case app.Restored:
+						fallthrough
+					case app.RestoredAndDirUpdated:
+						status = "Restored"
+					case app.Error:
+						if err == nil {
+							panic("err cannot be nil when Sync returns Error")
+						}
+						status = err.Error()
+					case app.Noop:
+						status = "OK"
+					case app.DirUpdated:
+						status = "Moved"
+					default:
+						panic("Unknown result")
+					}
+
+					if changed&app.DirUpdated == app.DirUpdated {
+						if err := db.Delete(oldPath); err != nil {
+							return err
+						}
+					}
+					if db.UpdateRequired(changed) {
+						if err := db.Insert(file); err != nil {
+							return err
+						}
+					}
+
+					results = append(results, syncResult{
+						Path:   file.Path,
+						Status: status,
+					})
+				}
+
+				if isatty.IsTerminal(os.Stdout.Fd()) {
+					table := tablewriter.NewWriter(os.Stdout)
+					table.Header([]string{"File", "Status"})
+
+					for _, result := range results {
+						table.Append([]string{result.Path, result.Status})
+					}
+					table.Render()
+				} else {
+					encoder := json.NewEncoder(os.Stdout)
+					return encoder.Encode(results)
+				}
+
+				return nil
+			}
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(syncCmd)
+}

cmd/version.go

@@ -0,0 +1,36 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	version = "dev"
+	commit  = "none"
+	date    = "unknown"
+)
+
+var long bool
+
+// versionCmd represents the version command
+// Deprecated: Remove when Zig has the chance to emit help
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Show envr's version",
+	Run: func(cmd *cobra.Command, args []string) {
+		if long {
+			fmt.Printf("envr version %s\n", version)
+			fmt.Printf("commit: %s\n", commit)
+			fmt.Printf("built: %s\n", date)
+		} else {
+			fmt.Printf("%s\n", version)
+		}
+	},
+}
+
+func init() {
+	versionCmd.Flags().BoolVarP(&long, "long", "l", false, "Show all version information")
+	rootCmd.AddCommand(versionCmd)
+}

cmd_backup.odin

@@ -5,13 +5,13 @@ import "core:strings"
 
 cmd_backup :: proc(cmd: ^Command) {
 	if len(cmd.args) != 1 {
-		print_command_help(cmd)
+		print_command_help("backup")
 		return
 	}
 
 	path := cmd.args[0]
 	if len(strings.trim_space(path)) == 0 {
-		fmt.wprintln(cmd.err, "Error: No path provided", flush = false)
+		fmt.println("Error: No path provided")
 		return
 	}
 
@@ -20,7 +20,7 @@ cmd_backup :: proc(cmd: ^Command) {
 		return
 	}
 
-	db, db_ok := db_open(cmd.config_path)
+	db, db_ok := db_open()
 	if !db_ok {
 		return
 	}
@@ -30,6 +30,5 @@ cmd_backup :: proc(cmd: ^Command) {
 		return
 	}
 
-	fmt.wprintf(cmd.out, "Saved %s into the database\n", path, flush = false)
+	fmt.printf("Saved %s into the database\n", path)
 }
-

cmd_check.odin

@@ -3,6 +3,7 @@ package main
 import "core:fmt"
 import "core:os"
 import "core:path/filepath"
+import "core:strings"
 
 cmd_check :: proc(cmd: ^Command) {
 	feats := check_features()
@@ -11,9 +12,9 @@ cmd_check :: proc(cmd: ^Command) {
 	if len(cmd.args) > 0 {
 		check_path = cmd.args[0]
 	} else {
-		cwd, cwd_err := os.get_working_directory(context.temp_allocator)
+		cwd, cwd_err := os.get_working_directory(context.allocator)
 		if cwd_err != nil {
-			fmt.wprintf(cmd.err, "Error getting current directory: %v\n", cwd_err, flush = false)
+			fmt.printf("Error getting current directory: %v\n", cwd_err)
 			return
 		}
 		check_path = cwd
@@ -25,13 +26,13 @@ cmd_check :: proc(cmd: ^Command) {
 	} else {
 		resolved, abs_err := filepath.abs(check_path)
 		if abs_err != nil {
-			fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
+			fmt.printf("Error getting absolute path: %v\n", abs_err)
 			return
 		}
 		abs_path = resolved
 	}
 
-	db, db_ok := db_open(cmd.config_path)
+	db, db_ok := db_open()
 	if !db_ok {
 		return
 	}
@@ -43,17 +44,15 @@ cmd_check :: proc(cmd: ^Command) {
 
 	if is_dir {
 		if cant_scan(feats) {
-			fmt.wprintln(
-				cmd.err,
+			fmt.println(
 				"Error: please install fd to use the check command (https://github.com/sharkdp/fd)",
-				flush = false,
 			)
 			return
 		}
 
 		scanned, scan_ok := scan_path(abs_path, db.cfg)
 		if !scan_ok {
-			fmt.wprintln(cmd.err, "Error scanning directory for .env files", flush = false)
+			fmt.println("Error scanning directory for .env files")
 			return
 		}
 		files_in_path = scanned
@@ -70,15 +69,16 @@ cmd_check :: proc(cmd: ^Command) {
 
 	if len(not_backed) == 0 {
 		if len(files_in_path) == 0 {
-			fmt.wprintln(cmd.out, "No .env files found in the specified directory.", flush = false)
+			fmt.println("No .env files found in the specified directory.")
 		} else {
-			fmt.wprintln(cmd.out, "✓ All .env files in the directory are backed up.", flush = false)
+			fmt.println("✓ All .env files in the directory are backed up.")
 		}
 	} else {
-		fmt.wprintf(cmd.out, "Found %d .env file(s) that are not backed up:\n", len(not_backed), flush = false)
+		fmt.printf("Found %d .env file(s) that are not backed up:\n", len(not_backed))
 		for file in not_backed {
-			fmt.wprintf(cmd.out, "  %s\n", file, flush = false)
+			fmt.printf("  %s\n", file)
 		}
-		fmt.wprintln(cmd.out, "\nRun 'envr sync' to back up these files.", flush = false)
+		fmt.println("\nRun 'envr sync' to back up these files.")
 	}
 }
+

cmd_deps.odin

@@ -1,10 +1,7 @@
 package main
 
 import "core:fmt"
-import "core:os"
-import "core:terminal"
 
-// TODO: Improve table rendering
 cmd_deps :: proc(cmd: ^Command) {
 	feats := check_features()
 
@@ -23,11 +20,11 @@ cmd_deps :: proc(cmd: ^Command) {
 		append(&rows, []string{"fd", "\u2717 Missing"})
 	}
 
-	if terminal.is_terminal(os.stdout) {
-		render_table(cmd.out, headers, rows[:])
+	if .Age in feats {
+		append(&rows, []string{"age", "\u2713 Available"})
 	} else {
-		render_json_rows(cmd.out, headers, rows[:])
-		fmt.wprint(cmd.out, "\n", flush = false)
-	}
+		append(&rows, []string{"age", "\u2717 Missing"})
 	}
 
+	render_table(headers, rows[:])
+}

cmd_edit_config.odin

@@ -2,24 +2,25 @@ package main
 
 import "core:fmt"
 import "core:os"
+import "core:path/filepath"
+import "core:strings"
 
 cmd_edit_config :: proc(cmd: ^Command) {
     editor := os.get_env("EDITOR", context.allocator)
     if len(editor) == 0 {
-		fmt.wprintln(cmd.err, "Error: $EDITOR environment variable is not set", flush = false)
+        fmt.println("Error: $EDITOR environment variable is not set")
         return
     }
 
-	config_path := cmd.config_path
+    config_path, join_err := filepath.join([]string{envr_dir(), "config.json"})
+    if join_err != nil {
+        fmt.printf("Error building config path: %v\n", join_err)
+        return
+    }
 
     _, stat_err := os.stat(config_path, context.allocator)
     if stat_err != nil {
-		fmt.wprintf(
-			cmd.err,
-			"Config file does not exist at %s. Run 'envr init' first.\n",
-			config_path,
-			flush = false,
-		)
+        fmt.printf("Config file does not exist at %s. Run 'envr init' first.\n", config_path)
         return
     }
 
@@ -33,17 +34,16 @@ cmd_edit_config :: proc(cmd: ^Command) {
 
     p, start_err := os.process_start(desc)
     if start_err != nil {
-		fmt.wprintf(cmd.err, "Error running editor: %v\n", start_err, flush = false)
+        fmt.printf("Error running editor: %v\n", start_err)
         return
     }
 
     state, wait_err := os.process_wait(p)
     if wait_err != nil {
-		fmt.wprintf(cmd.err, "Error waiting for editor: %v\n", wait_err, flush = false)
+        fmt.printf("Error waiting for editor: %v\n", wait_err)
         return
     }
     if state.exit_code != 0 {
         os.exit(int(state.exit_code))
     }
 }
-

cmd_init.odin

@@ -5,16 +5,10 @@ import "core:fmt"
 cmd_init :: proc(cmd: ^Command) {
 	force := has_flag(cmd, "force") || has_flag(cmd, "f")
 
-	fmt.wprintln(cmd.out, cmd.config_path, flush = false)
-
-	_, cfg_exists := load_config(cmd.config_path)
+	_, cfg_exists := load_config()
 	if cfg_exists && !force {
-		fmt.wprintln(
-			cmd.out,
-			`You have already initialized envr.
-Run again with the --force flag if you want to reinitialize.`,
-			flush = false,
-		)
+		fmt.println("You have already initialized envr.")
+		fmt.println("Run again with the --force flag if you want to reinitialize.")
 		return
 	}
 
@@ -24,15 +18,13 @@ Run again with the --force flag if you want to reinitialize.`,
 	}
 
 	if len(keys) == 0 {
-		fmt.wprintln(cmd.err, `No ssh-ed25519 keys found in ~/.ssh
-Generate one with: ssh-keygen -t ed25519`, flush = false)
+		fmt.println("No SSH private keys found in ~/.ssh")
 		return
 	}
 
 	selected, result := multi_select("Select SSH private keys:", keys[:])
-	defer delete(selected)
 	if result == .Cancel {
-		fmt.wprintln(cmd.out, "\x1b[2mCancelled.\x1b[0m", flush = false)
+		fmt.println("\x1b[2mCancelled.\x1b[0m")
 		return
 	}
 
@@ -44,19 +36,18 @@ Generate one with: ssh-keygen -t ed25519`, flush = false)
 	}
 
 	if len(selected_paths) == 0 {
-		fmt.wprintln(cmd.err, "No SSH keys selected - Config not created", flush = false)
+		fmt.println("No SSH keys selected - Config not created")
 		return
 	}
 
-	cfg := new_config(selected_paths[:], cmd.config_path)
+	cfg := new_config(selected_paths[:])
 	if !save_config(cfg, force = force) {
 		return
 	}
 
-	fmt.wprintf(
-		cmd.out,
+	fmt.printf(
 		"Config initialized with %d SSH key(s). You are ready to use envr.\n",
 		len(selected_paths),
-		flush = false,
 	)
 }
+

cmd_list.odin

@@ -2,20 +2,16 @@ package main
 
 import "core:encoding/json"
 import "core:fmt"
-import "core:os"
 import "core:path/filepath"
 import "core:strings"
-import "core:terminal"
 
 ListEntry :: struct {
     Directory: string `json:"directory"`,
     Path:      string `json:"path"`,
 }
 
-// TODO: Support --format flag
-// TODO: Improve table rendering
 cmd_list :: proc(cmd: ^Command) {
-	db, db_ok := db_open(cmd.config_path)
+    db, db_ok := db_open()
     if !db_ok {
         return
     }
@@ -27,12 +23,12 @@ cmd_list :: proc(cmd: ^Command) {
     }
     defer delete(rows)
 
-	if terminal.is_terminal(os.stdout) {
+    if is_tty() {
         headers := []string{"Directory", "Path"}
-		table_rows := make([dynamic][]string, 0, len(rows), context.temp_allocator)
+        table_rows := make([dynamic][]string, 0, len(rows))
 
         for row in rows {
-			dir_str := strings.concatenate({row.Dir, "/"}, context.temp_allocator)
+            dir_str := strings.concatenate({row.Dir, "/"})
             filename := filepath.base(row.Path)
             row_slice := make([]string, 2)
             row_slice[0] = dir_str
@@ -40,27 +36,22 @@ cmd_list :: proc(cmd: ^Command) {
             append(&table_rows, row_slice)
         }
 
-		render_table(cmd.out, headers, table_rows[:])
+        render_table(headers, table_rows[:])
     } else {
-		// TODO: Should we instead print full entries here?
         entries: [dynamic]ListEntry
         for row in rows {
             filename := filepath.base(row.Path)
-			append(
-				&entries,
-				ListEntry {
-					Directory = strings.concatenate({row.Dir, "/"}, context.temp_allocator),
+            append(&entries, ListEntry{
+                Directory = strings.concatenate({row.Dir, "/"}),
                 Path = filename,
-				},
-			)
+            })
         }
 
-		data, marshal_err := json.marshal(entries[:], allocator = context.temp_allocator)
+        data, marshal_err := json.marshal(entries[:])
         if marshal_err != nil {
-			fmt.wprintf(cmd.err, "Error marshaling JSON: %v\n", marshal_err, flush = false)
+            fmt.printf("Error marshaling JSON: %v\n", marshal_err)
             return
         }
-		fmt.wprintln(cmd.out, string(data), flush = false)
+        fmt.println(string(data))
     }
 }
-

cmd_nushell_completion.odin

@@ -5,6 +5,5 @@ import "core:fmt"
 COMPLETION_SCRIPT: string : string(#load("mod.nu"))
 
 cmd_nushell_completion :: proc(cmd: ^Command) {
-	fmt.wprint(cmd.out, COMPLETION_SCRIPT, flush = false)
+	fmt.print(COMPLETION_SCRIPT)
 }
-

cmd_remove.odin

@@ -6,30 +6,29 @@ import "core:strings"
 
 cmd_remove :: proc(cmd: ^Command) {
     if len(cmd.args) != 1 {
-		print_command_help(cmd)
+		print_command_help("remove")
         return
     }
 
     path := cmd.args[0]
     if len(strings.trim_space(path)) == 0 {
-		fmt.wprintln(cmd.err, "Error: No path provided", flush = false)
+        fmt.println("Error: No path provided")
         return
     }
 
-	// TODO: Is this the best way to do it?
     abs_path: string
     if filepath.is_abs(path) {
         abs_path = path
     } else {
         resolved, abs_err := filepath.abs(path)
         if abs_err != nil {
-			fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
+            fmt.printf("Error getting absolute path: %v\n", abs_err)
             return
         }
         abs_path = resolved
     }
 
-	db, db_ok := db_open(cmd.config_path)
+    db, db_ok := db_open()
     if !db_ok {
         return
     }
@@ -39,6 +38,5 @@ cmd_remove :: proc(cmd: ^Command) {
         return
     }
 
-	fmt.wprintf(cmd.out, "Removed %s from the database\n", abs_path, flush = false)
+    fmt.printf("Removed %s from the database\n", abs_path)
 }
-

cmd_restore.odin

@@ -7,30 +7,29 @@ import "core:strings"
 
 cmd_restore :: proc(cmd: ^Command) {
     if len(cmd.args) != 1 {
-		print_command_help(cmd)
+		print_command_help("restore")
         return
     }
 
     path := cmd.args[0]
     if len(strings.trim_space(path)) == 0 {
-		fmt.wprintln(cmd.err, "Error: No path provided", flush = false)
+        fmt.println("Error: No path provided")
         return
     }
 
-	// TODO: Is this the right way to handle this?
     abs_path: string
     if filepath.is_abs(path) {
         abs_path = path
     } else {
         resolved, abs_err := filepath.abs(path)
         if abs_err != nil {
-			fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
+            fmt.printf("Error getting absolute path: %v\n", abs_err)
             return
         }
         abs_path = resolved
     }
 
-	db, db_ok := db_open(cmd.config_path)
+    db, db_ok := db_open()
     if !db_ok {
         return
     }
@@ -46,10 +45,9 @@ cmd_restore :: proc(cmd: ^Command) {
 
     write_err := os.write_entire_file(file.Path, file.contents)
     if write_err != nil {
-		fmt.wprintf(cmd.err, "Error writing file: %v\n", write_err, flush = false)
+        fmt.printf("Error writing file: %v\n", write_err)
         return
     }
 
-	fmt.wprintf(cmd.out, "Restored %s\n", file.Path, flush = false)
+    fmt.printf("Restored %s\n", file.Path)
 }
-

cmd_scan.odin

@@ -2,21 +2,17 @@ package main
 
 import "core:encoding/json"
 import "core:fmt"
-import "core:os"
-import "core:terminal"
 
 cmd_scan :: proc(cmd: ^Command) {
 	feats := check_features()
 	if cant_scan(feats) {
-		fmt.wprintln(
-			cmd.err,
+		fmt.println(
 			"Error: please install fd to use the scan command (https://github.com/sharkdp/fd)",
-			flush = false,
 		)
 		return
 	}
 
-	db, db_ok := db_open(cmd.config_path)
+	db, db_ok := db_open()
 	if !db_ok {
 		return
 	}
@@ -24,11 +20,7 @@ cmd_scan :: proc(cmd: ^Command) {
 
 	search_dirs := search_paths(db.cfg)
 	if len(search_dirs) == 0 {
-		fmt.wprintln(
-			cmd.err,
-			"No search paths configured. Please run `envr init -f` or edit your config.",
-			flush = false,
-		)
+		fmt.println("No search paths configured. Please run `envr init` or edit your config.")
 		return
 	}
 
@@ -37,7 +29,7 @@ cmd_scan :: proc(cmd: ^Command) {
 	for dir in search_dirs {
 		found, scan_ok := scan_path(dir, db.cfg)
 		if !scan_ok {
-			fmt.wprintf(cmd.err, "Error scanning %s\n", dir, flush = false)
+			fmt.printf("Error scanning %s\n", dir)
 			continue
 		}
 		for f in found {
@@ -53,29 +45,23 @@ cmd_scan :: proc(cmd: ^Command) {
 	files := find_unbacked(all_files[:], db_files[:])
 
 	if len(files) == 0 {
-		fmt.wprintln(cmd.out, "No .env files found to add.", flush = false)
+		fmt.println("No .env files found to add.")
 		return
 	}
 
-	if !terminal.is_terminal(os.stdout) {
+	if !is_tty() {
 		output, marshal_err := json.marshal(files[:])
 		if marshal_err != nil {
-			fmt.wprintf(
-				cmd.err,
-				"Error marshaling files to JSON: %v\n",
-				marshal_err,
-				flush = false,
-			)
+			fmt.printf("Error marshaling files to JSON: %v\n", marshal_err)
 			return
 		}
-		fmt.wprintln(cmd.out, string(output), flush = false)
+		fmt.println(string(output))
 		return
 	}
 
 	selected, result := multi_select("Select .env files to backup:", files[:])
-	defer delete(selected)
 	if result == .Cancel {
-		fmt.wprintln(cmd.out, "\x1b[2mCancelled.\x1b[0m", flush = false)
+		fmt.println("\x1b[2mCancelled.\x1b[0m")
 		return
 	}
 
@@ -86,25 +72,20 @@ cmd_scan :: proc(cmd: ^Command) {
 		}
 		env_file, ok := new_env_file(files[i])
 		if !ok {
-			fmt.wprintf(cmd.err, "Error reading %s\n", files[i], flush = false)
+			fmt.printf("Error reading %s\n", files[i])
 			continue
 		}
 		if !db_insert(&db, env_file) {
-			fmt.wprintf(cmd.err, "Error adding %s\n", files[i], flush = false)
+			fmt.printf("Error adding %s\n", files[i])
 			continue
 		}
 		added_count += 1
 	}
 
 	if added_count > 0 {
-		fmt.wprintf(
-			cmd.out,
-			"\x1b[1;32mSuccessfully added %d file(s) to backup.\x1b[0m\n",
-			added_count,
-			flush = false,
-		)
+		fmt.printf("\x1b[1;32mSuccessfully added %d file(s) to backup.\x1b[0m\n", added_count)
 	} else {
-		fmt.wprintln(cmd.out, "\x1b[2mNo files were added.\x1b[0m", flush = false)
+		fmt.println("\x1b[2mNo files were added.\x1b[0m")
 	}
 }
 

cmd_sync.odin

@@ -2,19 +2,15 @@ package main
 
 import "core:encoding/json"
 import "core:fmt"
-import "core:os"
 import "core:strings"
-import "core:terminal"
 
 SyncEntry :: struct {
 	Path:   string `json:"path"`,
 	Status: string `json:"status"`,
 }
 
-// TODO: Check for quiet failures.
-// TODO: Support --format -f flags
 cmd_sync :: proc(cmd: ^Command) {
-	db, db_ok := db_open(cmd.config_path)
+	db, db_ok := db_open()
 	if !db_ok {
 		return
 	}
@@ -26,33 +22,37 @@ cmd_sync :: proc(cmd: ^Command) {
 	}
 	defer delete(files)
 
-	// TODO: Set sane default size
 	results: [dynamic]SyncEntry
-	defer delete(results)
 
 	for &file in files {
 		old_path: string
-		old_path, _ = strings.clone(file.Path, context.temp_allocator)
+		old_path, _ = strings.clone(file.Path)
 
 		result, err_msg := db_sync(&db, &file)
 
 		status: string
-		is_dir_updated := .DirUpdated in result
+		s := i32(result)
+		is_error := (s & i32(SyncResult.Error)) != 0
+		is_backed := (s & i32(SyncResult.BackedUp)) != 0
+		is_restored := (s & i32(SyncResult.Restored)) != 0
+		is_dir_updated := (s & i32(SyncResult.DirUpdated)) != 0
 
-		switch {
-		case .Error in result:
+		if is_error {
 			if len(err_msg) > 0 {
 				status = err_msg
 			} else {
 				status = "error"
 			}
-		case .BackedUp in result:
+		} else if is_backed {
 			status = "Backed Up"
-		case .Restored in result:
+			if !db_insert(&db, file) {
+				return
+			}
+		} else if is_restored {
 			status = "Restored"
-		case .DirUpdated in result:
+		} else if is_dir_updated && !is_restored {
 			status = "Moved"
-		case:
+		} else {
 			status = "OK"
 		}
 
@@ -72,7 +72,7 @@ cmd_sync :: proc(cmd: ^Command) {
 		append(&results, SyncEntry{Path = path_str, Status = status_str})
 	}
 
-	if terminal.is_terminal(os.stdout) {
+	if is_tty() {
 		headers := []string{"File", "Status"}
 		table_rows := make([dynamic][]string, 0, len(results))
 
@@ -83,14 +83,13 @@ cmd_sync :: proc(cmd: ^Command) {
 			append(&table_rows, row_slice)
 		}
 
-		render_table(cmd.out, headers, table_rows[:])
+		render_table(headers, table_rows[:])
 	} else {
 		data, marshal_err := json.marshal(results[:])
 		if marshal_err != nil {
-			fmt.wprintf(cmd.err, "Error marshaling JSON: %v\n", marshal_err, flush = false)
+			fmt.printf("Error marshaling JSON: %v\n", marshal_err)
 			return
 		}
-		fmt.wprintln(cmd.out, string(data), flush = false)
+		fmt.println(string(data))
 	}
 }
-

cmd_version.odin

@@ -1,10 +0,0 @@
-package main
-
-import "core:fmt"
-
-VERSION :: #load("version.txt", string)
-
-cmd_version :: proc(cmd: ^Command) {
-	fmt.wprintln(cmd.out, VERSION, flush = false)
-}
-

config.odin

@@ -20,63 +20,50 @@ ScanConfig :: struct {
 Config :: struct {
 	Keys:       [dynamic]SshKeyPair `json:"keys"`,
 	ScanConfig: ScanConfig `json:"scan"`,
-	config_path: string `json:"-"`,
 }
 
-default_config_path :: proc(home: string, allocator := context.allocator) -> string {
-	path, err := filepath.join([]string{home, ".envr", "config.json"}, allocator)
-	if err != nil {
-		panic("Ran out of memory when building config path")
+load_config :: proc() -> (Config, bool) {
+	home, home_err := os.user_home_dir(context.temp_allocator)
+	if home_err != nil {
+		fmt.printf("Error getting home dir: %v\n", home_err)
+		return Config{}, false
 	}
-	return path
+	config_path, join_err := filepath.join([]string{home, ".envr", "config.json"})
+	if join_err != nil {
+		return Config{}, false
 	}
 
-load_config :: proc(config_path: string) -> (Config, bool) {
 	data, read_err := os.read_entire_file_from_path(config_path, context.allocator)
 	if read_err != nil {
 		fmt.println("No config file found. Please run `envr init` to generate one.")
 		return Config{}, false
 	}
-	defer delete(data)
 
 	cfg: Config
-	// TODO: use json 5
 	err := json.unmarshal(data, &cfg)
 	if err != nil {
 		fmt.printf("Error parsing config: %v\n", err)
 		return Config{}, false
 	}
-	cfg.config_path = config_path
 
 	return cfg, true
 }
 
-delete_config :: proc(cfg: ^Config) {
-	for key in cfg.Keys {
-		delete(key.Private)
-		delete(key.Public)
-	}
+delete_config :: proc(cfg: Config) {
 	delete(cfg.Keys)
-
-	delete(cfg.ScanConfig.Matcher)
-
-	for exclude in cfg.ScanConfig.Exclude {
-		delete(exclude)
-	}
 	delete(cfg.ScanConfig.Exclude)
-
-	for include in cfg.ScanConfig.Include {
-		delete(include)
-	}
 	delete(cfg.ScanConfig.Include)
 }
 
-envr_dir :: proc(config_path: string) -> string {
-	return filepath.dir(config_path)
+envr_dir :: proc() -> string {
+	home, _ := os.user_home_dir(context.allocator)
+	dir, _ := filepath.join([]string{home, ".envr"})
+	return dir
 }
 
-data_encrypted_path :: proc(config_path: string) -> string {
-	path, _ := filepath.join([]string{envr_dir(config_path), "data.envr"})
+data_age_path :: proc() -> string {
+	dir := envr_dir()
+	path, _ := filepath.join([]string{dir, "data.age"})
 	return path
 }
 
@@ -116,9 +103,6 @@ find_ssh_private_keys :: proc() -> (keys: [dynamic]string, ok: bool) {
 		}
 
 		full_path, _ := filepath.join([]string{ssh_dir, name})
-		if !is_ed25519_key(full_path) {
-			continue
-		}
 		append(&keys, full_path)
 	}
 
@@ -126,49 +110,53 @@ find_ssh_private_keys :: proc() -> (keys: [dynamic]string, ok: bool) {
 	return
 }
 
-new_config :: proc(
-	private_key_paths: []string,
-	cfg_path: string = "~/.envr/config.json",
-) -> Config {
+new_config :: proc(private_key_paths: []string) -> Config {
 	keys := make([dynamic]SshKeyPair, 0, len(private_key_paths))
 	for priv in private_key_paths {
 		// TODO: Is this bad?
-		priv_key := strings.clone(priv)
-		pub, _ := strings.concatenate([]string{priv_key, ".pub"})
-		append(&keys, SshKeyPair{Private = priv_key, Public = pub})
+		pub, _ := strings.concatenate([]string{priv, ".pub"}, context.temp_allocator)
+		append(&keys, SshKeyPair{Private = priv, Public = pub})
 	}
 
 	exclude := make([dynamic]string, 0, 4)
-	append(&exclude, strings.clone("*\\.envrc"))
-	append(&exclude, strings.clone("\\.local/"))
-	append(&exclude, strings.clone("node_modules"))
-	append(&exclude, strings.clone("vendor"))
+	append(&exclude, "*\\.envrc")
+	append(&exclude, "\\.local/")
+	append(&exclude, "node_modules")
+	append(&exclude, "vendor")
 
 	include := make([dynamic]string, 0, 1)
-	append(&include, strings.clone("~"))
+	append(&include, "~")
 
 	scan_cfg := ScanConfig {
-		Matcher = strings.clone("\\.env"),
+		Matcher = "\\.env",
 		Exclude = exclude,
 		Include = include,
 	}
 
-	return Config{Keys = keys, ScanConfig = scan_cfg, config_path = cfg_path}
+	return Config{Keys = keys, ScanConfig = scan_cfg}
 }
 
 save_config :: proc(cfg: Config, force: bool = false) -> bool {
-	config_dir := envr_dir(cfg.config_path)
+	home, home_err := os.user_home_dir(context.allocator)
+	if home_err != nil {
+		fmt.printf("Error getting home dir: %v\n", home_err)
+		return false
+	}
+
+	config_dir, _ := filepath.join([]string{home, ".envr"})
 
 	if !os.exists(config_dir) {
 		mkdir_err := os.make_directory(config_dir)
 		if mkdir_err != nil {
-			fmt.printf("Error creating %s directory: %v\n", config_dir, mkdir_err)
+			fmt.printf("Error creating ~/.envr directory: %v\n", mkdir_err)
 			return false
 		}
 	}
 
-	if os.exists(cfg.config_path) && !force {
-		info, stat_err := os.stat(cfg.config_path, context.allocator)
+	config_path, _ := filepath.join([]string{config_dir, "config.json"})
+
+	if os.exists(config_path) && !force {
+		info, stat_err := os.stat(config_path, context.allocator)
 		if stat_err == nil {
 			defer os.file_info_delete(info, context.allocator)
 			if info.size > 0 {
@@ -183,9 +171,8 @@ save_config :: proc(cfg: Config, force: bool = false) -> bool {
 		fmt.printf("Error marshaling config: %v\n", marshal_err)
 		return false
 	}
-	defer delete(data)
 
-	write_err := os.write_entire_file(cfg.config_path, data)
+	write_err := os.write_entire_file(config_path, data)
 	if write_err != nil {
 		fmt.printf("Error writing config: %v\n", write_err)
 		return false
@@ -195,18 +182,15 @@ save_config :: proc(cfg: Config, force: bool = false) -> bool {
 }
 
 search_paths :: proc(cfg: Config) -> (paths: [dynamic]string) {
-	// TODO: Is this okay?
-	// TODO: handle error
-	home, _ := os.user_home_dir(context.temp_allocator)
+	home, _ := os.user_home_dir(context.allocator)
 
 	for include in cfg.ScanConfig.Include {
-		// TODO: Do we need to manually expand ~/ in odin?
 		expanded, _ := strings.replace(include, "~", home, 1)
-		if filepath.is_abs(expanded) {
-			append(&paths, expanded)
+		cloned, _ := strings.clone(expanded)
+		if filepath.is_abs(cloned) {
+			append(&paths, cloned)
 		} else {
-			defer delete(expanded)
-			resolved, err := filepath.abs(expanded)
+			resolved, err := filepath.abs(cloned)
 			if err == nil {
 				append(&paths, resolved)
 			}

config_test.odin

@@ -1,19 +1,12 @@
 package main
 
-import "core:fmt"
-import "core:os"
-import "core:path/filepath"
-import "core:strings"
-import "core:sync"
 import "core:testing"
 
-home_mutex: sync.Mutex
-
 @(test)
 test_new_config_single_key :: proc(t: ^testing.T) {
 	paths := []string{"/home/user/.ssh/id_ed25519"}
 	cfg := new_config(paths)
-	defer delete_config(&cfg)
+	defer delete_config(cfg)
 
 	testing.expect(t, len(cfg.Keys) == 1, "should have 1 key")
 	testing.expect(t, cfg.Keys[0].Private == "/home/user/.ssh/id_ed25519", "Private path mismatch")
@@ -28,7 +21,7 @@ test_new_config_single_key :: proc(t: ^testing.T) {
 test_new_config_multiple_keys :: proc(t: ^testing.T) {
 	paths := []string{"/home/user/.ssh/id_ed25519", "/home/user/.ssh/id_rsa"}
 	cfg := new_config(paths)
-	defer delete_config(&cfg)
+	defer delete_config(cfg)
 
 	testing.expect(t, len(cfg.Keys) == 2, "should have 2 keys")
 	testing.expect(t, cfg.Keys[0].Private == "/home/user/.ssh/id_ed25519")
@@ -39,7 +32,7 @@ test_new_config_multiple_keys :: proc(t: ^testing.T) {
 test_new_config_empty_keys :: proc(t: ^testing.T) {
 	paths: []string
 	cfg := new_config(paths)
-	defer delete_config(&cfg)
+	defer delete_config(cfg)
 
 	testing.expect(t, len(cfg.Keys) == 0, "should have 0 keys")
 }
@@ -48,7 +41,7 @@ test_new_config_empty_keys :: proc(t: ^testing.T) {
 test_new_config_scan_defaults :: proc(t: ^testing.T) {
 	paths := []string{"/home/user/.ssh/id_ed25519"}
 	cfg := new_config(paths)
-	defer delete_config(&cfg)
+	defer delete_config(cfg)
 
 	testing.expect(t, cfg.ScanConfig.Matcher == "\\.env", "matcher should be \\.env")
 	testing.expect(t, len(cfg.ScanConfig.Exclude) == 4, "should have 4 exclude patterns")
@@ -60,7 +53,7 @@ test_new_config_scan_defaults :: proc(t: ^testing.T) {
 test_new_config_exclude_patterns :: proc(t: ^testing.T) {
 	paths := []string{"/home/user/.ssh/id_ed25519"}
 	cfg := new_config(paths)
-	defer delete_config(&cfg)
+	defer delete_config(cfg)
 
 	expected := []string{"*\\.envrc", "\\.local/", "node_modules", "vendor"}
 	for i in 0 ..< len(expected) {
@@ -68,143 +61,3 @@ test_new_config_exclude_patterns :: proc(t: ^testing.T) {
 	}
 }
 
-@(test)
-test_save_load_config_roundtrip :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-cfg-rt-%d", os.get_pid())
-	os.mkdir_all(base)
-	defer os.remove_all(base)
-
-	cfgPath, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
-	testing.expect(t, err == nil, "cfgPath should build successfully")
-
-	cfg := new_config([]string{"/home/user/.ssh/id_ed25519"}, cfgPath)
-	defer delete_config(&cfg)
-
-	testing.expect(t, save_config(cfg, force = true), "save should succeed")
-
-	loaded, ok := load_config(cfg.config_path)
-	testing.expect(t, ok, "load should succeed")
-	if !ok do return
-	defer delete_config(&loaded)
-
-	testing.expect(t, len(loaded.Keys) == 1, "should have 1 key")
-	testing.expect(t, loaded.Keys[0].Private == "/home/user/.ssh/id_ed25519")
-	testing.expect(t, loaded.Keys[0].Public == "/home/user/.ssh/id_ed25519.pub")
-	testing.expect(t, loaded.ScanConfig.Matcher == "\\.env")
-	testing.expect(t, len(loaded.ScanConfig.Exclude) == 4)
-	testing.expect(t, len(loaded.ScanConfig.Include) == 1)
-	testing.expect(t, loaded.ScanConfig.Include[0] == "~")
-}
-
-@(test)
-test_load_config_missing :: proc(t: ^testing.T) {
-	_, ok := load_config("/tmp/envr-test-cfg-nonexistent/config.json")
-	testing.expect(t, !ok, "missing config should return false")
-}
-
-@(test)
-test_save_config_no_clobber :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-cfg-noclobber-%d", os.get_pid())
-	os.mkdir_all(base)
-	defer os.remove_all(base)
-
-	cfgPath, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
-	testing.expect(t, err == nil, "cfgPath should build successfully")
-
-	cfg := new_config([]string{"/home/user/.ssh/key1"}, cfgPath)
-	defer delete_config(&cfg)
-	testing.expect(t, save_config(cfg, force = true), "first save should succeed")
-
-	cfg2 := new_config([]string{"/home/user/.ssh/key2"}, cfgPath)
-	defer delete_config(&cfg2)
-	testing.expect(t, !save_config(cfg2), "second save without force should fail")
-}
-
-@(test)
-test_save_config_force_overwrites :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-cfg-force-%d", os.get_pid())
-	os.mkdir_all(base)
-	defer os.remove_all(base)
-
-	cfgPath, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
-	testing.expect(t, err == nil, "cfgPath should build successfully")
-
-	cfg := new_config([]string{"/home/user/.ssh/key1"}, cfgPath)
-	defer delete_config(&cfg)
-	testing.expect(t, save_config(cfg, force = true), "first save should succeed")
-
-	cfg2 := new_config([]string{"/home/user/.ssh/key2"}, cfgPath)
-	defer delete_config(&cfg2)
-	testing.expect(t, save_config(cfg2, force = true), "force save should overwrite")
-
-	loaded, ok := load_config(cfgPath)
-	testing.expect(t, ok, "load should succeed")
-	if !ok do return
-	defer delete_config(&loaded)
-
-	testing.expect(t, len(loaded.Keys) == 1, "should have 1 key")
-	testing.expect(
-		t,
-		loaded.Keys[0].Private == "/home/user/.ssh/key2",
-		"should be the overwritten key",
-	)
-}
-
-@(test)
-test_envr_dir :: proc(t: ^testing.T) {
-	dir := envr_dir("/tmp/envr-fake-home-envrdir/.envr/config.json")
-	testing.expectf(t, strings.has_suffix(dir, ".envr"), "dir should end with .envr, got %s", dir)
-	testing.expectf(
-		t,
-		strings.contains(dir, "envr-fake-home-envrdir"),
-		"dir should contain home dir, got %s",
-		dir,
-	)
-}
-
-@(test)
-test_data_encrypted_path :: proc(t: ^testing.T) {
-	p := data_encrypted_path("/tmp/envr-fake-home-datapath/config.json")
-	defer delete(p)
-	testing.expectf(t, strings.has_suffix(p, "data.envr"), "should end with data.envr, got %s", p)
-	testing.expectf(t, strings.contains(p, ".envr"), "should contain .envr dir, got %s", p)
-}
-
-@(test)
-test_search_paths_expands_tilde :: proc(t: ^testing.T) {
-	sync.mutex_lock(&home_mutex)
-	defer sync.mutex_unlock(&home_mutex)
-
-	old_home := os.get_env("HOME", context.temp_allocator)
-	defer {
-		if old_home != "" {
-			os.set_env("HOME", old_home)
-		}
-	}
-
-	os.set_env("HOME", "/tmp/envr-fake-home-search")
-
-	cfg := Config {
-		ScanConfig = ScanConfig{Include = make([dynamic]string, 0, 1)},
-	}
-	defer delete(cfg.ScanConfig.Include)
-	append(&cfg.ScanConfig.Include, "~")
-
-	paths := search_paths(cfg)
-	defer delete(paths)
-	for path in paths {
-		defer delete(path)
-	}
-
-	testing.expect(t, len(paths) == 1, "should have 1 path")
-	if len(paths) > 0 {
-		testing.expectf(
-			t,
-			strings.contains(paths[0], "envr-fake-home-search"),
-			"should expand ~ to home, got %s",
-			paths[0],
-		)
-		testing.expect(t, !strings.contains(paths[0], "~"), "should not contain literal ~")
-	}
-}
-

crypto.odin

@@ -1,338 +0,0 @@
-package main
-
-import "core:fmt"
-import "core:mem"
-
-MAGIC :: "ENVR"
-MAGIC_BYTES := [4]u8{u8('E'), u8('N'), u8('V'), u8('R')}
-
-RECIPIENT_ENTRY_SIZE ::
-	CRYPTO_BOX_PUBLICKEY_BYTES +
-	CRYPTO_BOX_NONCE_BYTES +
-	CRYPTO_SECRETBOX_KEY_BYTES +
-	CRYPTO_BOX_MAC_BYTES
-
-HEADER_SIZE :: 4 + CRYPTO_BOX_PUBLICKEY_BYTES + CRYPTO_SECRETBOX_NONCE_BYTES + 4
-
-RecipientEntry :: struct {
-	PublicKey:    [CRYPTO_BOX_PUBLICKEY_BYTES]u8,
-	Nonce:        [CRYPTO_BOX_NONCE_BYTES]u8,
-	EncryptedKey: [CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES]u8,
-}
-
-sodium_initialized: bool
-
-ensure_sodium :: proc() -> bool {
-	if sodium_initialized {
-		return true
-	}
-	rc := sodium_init()
-	if rc < 0 {
-		fmt.println("Error: libsodium initialization failed")
-		return false
-	}
-	sodium_initialized = true
-	return true
-}
-
-X25519Keypair :: struct {
-	Public:  [CRYPTO_BOX_PUBLICKEY_BYTES]u8,
-	Private: [CRYPTO_BOX_SECRETKEY_BYTES]u8,
-}
-
-ssh_to_x25519 :: proc(keys: []SshKeyPair) -> (pairs: []X25519Keypair, ok: bool) {
-	if len(keys) == 0 {
-		return
-	}
-
-	pairs = make([]X25519Keypair, len(keys))
-
-	for i in 0 ..< len(keys) {
-		ssh_kp, parse_ok := parse_ssh_private_key(keys[i].Private)
-		if !parse_ok {
-			fmt.printf("Error: failed to parse SSH private key: %s\n", keys[i].Private)
-			delete(pairs)
-			return
-		}
-
-		ssh_pub, pub_ok := parse_ssh_public_key(keys[i].Public)
-		if !pub_ok {
-			fmt.printf("Error: failed to parse SSH public key: %s\n", keys[i].Public)
-			delete(pairs)
-			return
-		}
-
-		pk_rc := crypto_sign_ed25519_pk_to_curve25519(&pairs[i].Public[0], &ssh_pub[0])
-		if pk_rc != 0 {
-			fmt.println("Error: failed to convert ed25519 public key to curve25519")
-			delete(pairs)
-			return
-		}
-
-		ed25519_sk: [64]u8
-		for j in 0 ..< 32 {
-			ed25519_sk[j] = ssh_kp.Private[j]
-		}
-		for j in 0 ..< 32 {
-			ed25519_sk[32 + j] = ssh_kp.Public[j]
-		}
-
-		sk_rc := crypto_sign_ed25519_sk_to_curve25519(&pairs[i].Private[0], &ed25519_sk[0])
-		if sk_rc != 0 {
-			fmt.println("Error: failed to convert ed25519 private key to curve25519")
-			delete(pairs)
-			return
-		}
-	}
-
-	ok = true
-	return
-}
-
-encrypt :: proc(plaintext: []u8, keys: []SshKeyPair) -> (ciphertext: []u8, ok: bool) {
-	if !ensure_sodium() {
-		return
-	}
-
-	x25519_pairs, pairs_ok := ssh_to_x25519(keys)
-	if !pairs_ok {
-		return
-	}
-	defer delete(x25519_pairs)
-
-	sym_key: [CRYPTO_SECRETBOX_KEY_BYTES]u8
-	randombytes_buf(&sym_key[0], CRYPTO_SECRETBOX_KEY_BYTES)
-
-	main_nonce: [CRYPTO_SECRETBOX_NONCE_BYTES]u8
-	randombytes_buf(&main_nonce[0], CRYPTO_SECRETBOX_NONCE_BYTES)
-
-	ct_len := len(plaintext) + CRYPTO_SECRETBOX_MAC_BYTES
-	secret_ct := make([]u8, ct_len)
-	pt_ptr: [^]u8
-	if len(plaintext) > 0 {
-		pt_ptr = &plaintext[0]
-	}
-	rc := crypto_secretbox_easy(
-		&secret_ct[0],
-		pt_ptr,
-		u64(len(plaintext)),
-		&main_nonce[0],
-		&sym_key[0],
-	)
-	if rc != 0 {
-		fmt.println("Error: symmetric encryption failed")
-		delete(secret_ct)
-		return
-	}
-
-	num_recipients := u32(len(x25519_pairs))
-	entries := make([]RecipientEntry, num_recipients)
-
-	for i in 0 ..< len(x25519_pairs) {
-		for j in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
-			entries[i].PublicKey[j] = x25519_pairs[i].Public[j]
-		}
-
-		randombytes_buf(&entries[i].Nonce[0], CRYPTO_BOX_NONCE_BYTES)
-
-		rc = crypto_box_easy(
-			&entries[i].EncryptedKey[0],
-			&sym_key[0],
-			CRYPTO_SECRETBOX_KEY_BYTES,
-			&entries[i].Nonce[0],
-			&x25519_pairs[i].Public[0],
-			&x25519_pairs[0].Private[0],
-		)
-		if rc != 0 {
-			fmt.printf("Error: failed to encrypt for recipient %d\n", i)
-			delete(entries)
-			delete(secret_ct)
-			return
-		}
-	}
-
-	total_len := HEADER_SIZE + int(num_recipients) * RECIPIENT_ENTRY_SIZE + ct_len
-	ciphertext = make([]u8, total_len)
-
-	pos := 0
-
-	mem.copy(&ciphertext[pos], &MAGIC_BYTES[0], 4)
-	pos += 4
-
-	mem.copy(&ciphertext[pos], &x25519_pairs[0].Public[0], CRYPTO_BOX_PUBLICKEY_BYTES)
-	pos += CRYPTO_BOX_PUBLICKEY_BYTES
-
-	mem.copy(&ciphertext[pos], &main_nonce[0], CRYPTO_SECRETBOX_NONCE_BYTES)
-	pos += CRYPTO_SECRETBOX_NONCE_BYTES
-
-	ciphertext[pos] = u8((num_recipients >> 24) & 0xff)
-	ciphertext[pos + 1] = u8((num_recipients >> 16) & 0xff)
-	ciphertext[pos + 2] = u8((num_recipients >> 8) & 0xff)
-	ciphertext[pos + 3] = u8(num_recipients & 0xff)
-	pos += 4
-
-	for i in 0 ..< int(num_recipients) {
-		mem.copy(&ciphertext[pos], &entries[i].PublicKey[0], CRYPTO_BOX_PUBLICKEY_BYTES)
-		pos += CRYPTO_BOX_PUBLICKEY_BYTES
-		mem.copy(&ciphertext[pos], &entries[i].Nonce[0], CRYPTO_BOX_NONCE_BYTES)
-		pos += CRYPTO_BOX_NONCE_BYTES
-		mem.copy(
-			&ciphertext[pos],
-			&entries[i].EncryptedKey[0],
-			CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES,
-		)
-		pos += CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES
-	}
-
-	mem.copy(&ciphertext[pos], &secret_ct[0], ct_len)
-
-	delete(entries)
-	delete(secret_ct)
-	ok = true
-	return
-}
-
-decrypt :: proc(ciphertext: []u8, keys: []SshKeyPair) -> (plaintext: []u8, ok: bool) {
-	if !ensure_sodium() {
-		return
-	}
-
-	if len(ciphertext) < HEADER_SIZE {
-		fmt.println("Error: ciphertext too short (header)")
-		return
-	}
-
-	for i in 0 ..< 4 {
-		if ciphertext[i] != MAGIC_BYTES[i] {
-			fmt.println("Error: invalid magic bytes")
-			return
-		}
-	}
-
-	offset := 4
-
-	sender_pk: [CRYPTO_BOX_PUBLICKEY_BYTES]u8
-	for i in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
-		sender_pk[i] = ciphertext[offset + i]
-	}
-	offset += CRYPTO_BOX_PUBLICKEY_BYTES
-
-	main_nonce: [CRYPTO_SECRETBOX_NONCE_BYTES]u8
-	for i in 0 ..< CRYPTO_SECRETBOX_NONCE_BYTES {
-		main_nonce[i] = ciphertext[offset + i]
-	}
-	offset += CRYPTO_SECRETBOX_NONCE_BYTES
-
-	num_recipients :=
-		u32(ciphertext[offset]) << 24 |
-		u32(ciphertext[offset + 1]) << 16 |
-		u32(ciphertext[offset + 2]) << 8 |
-		u32(ciphertext[offset + 3])
-	offset += 4
-
-	recipients_end := offset + int(num_recipients) * RECIPIENT_ENTRY_SIZE
-	if recipients_end > len(ciphertext) {
-		fmt.println("Error: ciphertext too short (recipient data)")
-		return
-	}
-
-	enc_sym_key: [CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES]u8
-	enc_nonce: [CRYPTO_BOX_NONCE_BYTES]u8
-	enc_pub: [CRYPTO_BOX_PUBLICKEY_BYTES]u8
-
-	x25519_pairs, pairs_ok := ssh_to_x25519(keys)
-	if !pairs_ok {
-		return
-	}
-	defer delete(x25519_pairs)
-
-	found := false
-	matched_pi := 0
-	for pi in 0 ..< len(x25519_pairs) {
-		scan_offset := offset
-		for _ in 0 ..< int(num_recipients) {
-			for i in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
-				enc_pub[i] = ciphertext[scan_offset + i]
-			}
-			scan_offset += CRYPTO_BOX_PUBLICKEY_BYTES
-
-			match := true
-			for i in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
-				if enc_pub[i] != x25519_pairs[pi].Public[i] {
-					match = false
-					break
-				}
-			}
-			if !match {
-				scan_offset +=
-					CRYPTO_BOX_NONCE_BYTES + CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES
-				continue
-			}
-
-			for i in 0 ..< CRYPTO_BOX_NONCE_BYTES {
-				enc_nonce[i] = ciphertext[scan_offset + i]
-			}
-			scan_offset += CRYPTO_BOX_NONCE_BYTES
-
-			for i in 0 ..< CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES {
-				enc_sym_key[i] = ciphertext[scan_offset + i]
-			}
-			scan_offset += CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES
-
-			found = true
-			matched_pi = pi
-			break
-		}
-		if found {
-			break
-		}
-	}
-
-	if !found {
-		fmt.println("Error: no matching recipient found")
-		return
-	}
-
-	sym_key: [CRYPTO_SECRETBOX_KEY_BYTES]u8
-	rc := crypto_box_open_easy(
-		&sym_key[0],
-		&enc_sym_key[0],
-		CRYPTO_SECRETBOX_KEY_BYTES + CRYPTO_BOX_MAC_BYTES,
-		&enc_nonce[0],
-		&sender_pk[0],
-		&x25519_pairs[matched_pi].Private[0],
-	)
-	if rc != 0 {
-		fmt.println("Error: failed to decrypt symmetric key")
-		return
-	}
-
-	ct_data := ciphertext[recipients_end:]
-	pt_len := len(ct_data) - CRYPTO_SECRETBOX_MAC_BYTES
-	if pt_len < 0 {
-		fmt.println("Error: ciphertext too short (no encrypted data)")
-		return
-	}
-
-	plaintext = make([]u8, pt_len)
-	pt_ptr: [^]u8
-	if len(plaintext) > 0 {
-		pt_ptr = &plaintext[0]
-	}
-	rc = crypto_secretbox_open_easy(
-		pt_ptr,
-		&ct_data[0],
-		u64(len(ct_data)),
-		&main_nonce[0],
-		&sym_key[0],
-	)
-	if rc != 0 {
-		fmt.println("Error: symmetric decryption failed")
-		delete(plaintext)
-		return
-	}
-
-	ok = true
-	return
-}
-

crypto_test.odin

@@ -1,134 +0,0 @@
-package main
-
-import "core:fmt"
-import "core:testing"
-
-CRYPTO_TEST_KEY_DIR :: "fixtures/keys"
-
-make_test_key_pair :: proc(name: string) -> SshKeyPair {
-	priv := fmt.tprintf("%s/%s", CRYPTO_TEST_KEY_DIR, name)
-	pub := fmt.tprintf("%s/%s.pub", CRYPTO_TEST_KEY_DIR, name)
-	return SshKeyPair{Private = priv, Public = pub}
-}
-
-@(test)
-test_encrypt_decrypt_roundtrip :: proc(t: ^testing.T) {
-	key := make_test_key_pair("test_ed25519")
-	original := []u8{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
-
-	encrypted, enc_ok := encrypt(original, []SshKeyPair{key})
-	testing.expect(t, enc_ok, "encryption should succeed")
-	testing.expect(t, len(encrypted) > 0, "ciphertext should not be empty")
-	defer delete(encrypted)
-
-	decrypted, dec_ok := decrypt(encrypted, []SshKeyPair{key})
-	testing.expect(t, dec_ok, "decryption should succeed")
-	defer delete(decrypted)
-
-	testing.expect(
-		t,
-		len(decrypted) == len(original),
-		fmt.tprintf("expected %d bytes, got %d", len(original), len(decrypted)),
-	)
-	for i in 0 ..< len(original) {
-		testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at index %d", i))
-	}
-}
-
-@(test)
-test_encrypt_decrypt_multi_recipient :: proc(t: ^testing.T) {
-	key1 := make_test_key_pair("test_ed25519")
-	key2 := make_test_key_pair("test_ed25519_second")
-	original := []u8{42, 43, 44, 45}
-
-	encrypted, enc_ok := encrypt(original, []SshKeyPair{key1, key2})
-	testing.expect(t, enc_ok, "encryption with 2 keys should succeed")
-	defer delete(encrypted)
-
-	decrypted1, dec1_ok := decrypt(encrypted, []SshKeyPair{key1})
-	testing.expect(t, dec1_ok, "decryption with key1 should succeed")
-	defer delete(decrypted1)
-
-	decrypted2, dec2_ok := decrypt(encrypted, []SshKeyPair{key2})
-	testing.expect(t, dec2_ok, "decryption with key2 should succeed")
-	defer delete(decrypted2)
-
-	for i in 0 ..< len(original) {
-		testing.expect(
-			t,
-			decrypted1[i] == original[i],
-			fmt.tprintf("key1: byte mismatch at %d", i),
-		)
-		testing.expect(
-			t,
-			decrypted2[i] == original[i],
-			fmt.tprintf("key2: byte mismatch at %d", i),
-		)
-	}
-}
-
-@(test)
-test_decrypt_wrong_key_fails :: proc(t: ^testing.T) {
-	key1 := make_test_key_pair("test_ed25519")
-	key2 := make_test_key_pair("test_ed25519_second")
-	original := []u8{1, 2, 3}
-
-	encrypted, enc_ok := encrypt(original, []SshKeyPair{key1})
-	testing.expect(t, enc_ok, "encryption should succeed")
-	defer delete(encrypted)
-
-	_, dec_ok := decrypt(encrypted, []SshKeyPair{key2})
-	testing.expect(t, !dec_ok, "decryption with wrong key should fail")
-}
-
-@(test)
-test_encrypt_empty_plaintext :: proc(t: ^testing.T) {
-	key := make_test_key_pair("test_ed25519")
-	original: []u8
-
-	encrypted, enc_ok := encrypt(original, []SshKeyPair{key})
-	testing.expect(t, enc_ok, "encryption of empty data should succeed")
-	defer delete(encrypted)
-
-	decrypted, dec_ok := decrypt(encrypted, []SshKeyPair{key})
-	testing.expect(t, dec_ok, "decryption should succeed")
-	defer delete(decrypted)
-
-	testing.expect(t, len(decrypted) == 0, "decrypted empty data should be empty")
-}
-
-@(test)
-test_recipient_can_decrypt_senders_data :: proc(t: ^testing.T) {
-	key1 := make_test_key_pair("test_ed25519")
-	key2 := make_test_key_pair("test_ed25519_second")
-	original := []u8{10, 20, 30, 40, 50}
-
-	encrypted, enc_ok := encrypt(original, []SshKeyPair{key1, key2})
-	testing.expect(t, enc_ok, "encryption with 2 keys should succeed")
-	defer delete(encrypted)
-
-	decrypted, dec_ok := decrypt(encrypted, []SshKeyPair{key2})
-	testing.expect(t, dec_ok, "second recipient should decrypt without the sender key present")
-	defer delete(decrypted)
-
-	for i in 0 ..< len(original) {
-		testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at %d", i))
-	}
-}
-
-@(test)
-test_ciphertext_has_magic :: proc(t: ^testing.T) {
-	key := make_test_key_pair("test_ed25519")
-	original := []u8{1, 2, 3}
-
-	encrypted, enc_ok := encrypt(original, []SshKeyPair{key})
-	testing.expect(t, enc_ok, "encryption should succeed")
-	defer delete(encrypted)
-
-	testing.expect(t, len(encrypted) >= 4, "ciphertext should have at least 4 bytes")
-	testing.expect(t, encrypted[0] == u8('E'), "magic byte 0")
-	testing.expect(t, encrypted[1] == u8('N'), "magic byte 1")
-	testing.expect(t, encrypted[2] == u8('V'), "magic byte 2")
-	testing.expect(t, encrypted[3] == u8('R'), "magic byte 3")
-}
-

db.odin

@@ -1,5 +1,6 @@
 package main
 
+import "core:c"
 import "core:crypto/hash"
 import "core:encoding/hex"
 import "core:encoding/json"
@@ -11,23 +12,20 @@ import "core:time"
 
 import "sqlite"
 
-SyncFlagEnum :: enum {
-	Noop,
-	DirUpdated,
-	Restored,
-	BackedUp,
-	Error,
+SyncResult :: enum i32 {
+	Noop       = 0,
+	DirUpdated = 1,
+	Restored   = 1 << 1,
+	BackedUp   = 1 << 2,
+	Error      = 1 << 3,
 }
 
-SyncFlag :: bit_set[SyncFlagEnum]
-
 SyncDirection :: enum {
 	TrustDatabase,
 	TrustFilesystem,
 }
 
 Db :: struct {
-	// Pointer to the sqlite db
 	db:      ^rawptr,
 	cfg:     Config,
 	changed: bool,
@@ -41,33 +39,22 @@ EnvFile :: struct {
 	contents: string,
 }
 
-delete_envfile :: proc(f: ^EnvFile) {
-	delete(f.Path)
-	for &remote in f.Remotes {
-		delete(remote)
-	}
-	delete(f.Remotes)
-	delete(f.Sha256)
-	delete(f.contents)
-}
-
 make_temp_path :: proc() -> string {
 	ts := time.time_to_unix(time.now())
 	b: strings.Builder
 	strings.builder_init(&b)
-	defer strings.builder_destroy(&b)
 	fmt.sbprintf(&b, "/tmp/envr-%d-%d.db", os.get_pid(), ts)
 	return strings.to_string(b)
 }
 
-db_open :: proc(cfg_path: string) -> (Db, bool) {
-	cfg, ok := load_config(cfg_path)
+db_open :: proc() -> (Db, bool) {
+	cfg, ok := load_config()
 	if !ok {
 		return Db{}, false
 	}
 
-	data_path := data_encrypted_path(cfg.config_path)
-	_, stat_err := os.stat(data_path, context.allocator)
+	age_path := data_age_path()
+	_, stat_err := os.stat(age_path, context.allocator)
 
 	db: ^rawptr
 	rc := sqlite.db_open(":memory:", &db)
@@ -76,8 +63,8 @@ db_open :: proc(cfg_path: string) -> (Db, bool) {
 		return Db{}, false
 	}
 
-	create_sql: cstring = "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
-	rc = sqlite.db_exec(db, create_sql, nil, nil, nil)
+	create_sql := "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
+	rc = sqlite.db_exec(db, string_to_cstring(create_sql), nil, nil, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error creating table: %s\n", sqlite.db_errmsg(db))
 		sqlite.db_close(db)
@@ -85,7 +72,7 @@ db_open :: proc(cfg_path: string) -> (Db, bool) {
 	}
 
 	if stat_err == nil {
-		if !db_restore_from_encrypted(db, cfg) {
+		if !db_restore_from_age(db, cfg) {
 			sqlite.db_close(db)
 			return Db{}, false
 		}
@@ -104,60 +91,21 @@ db_close :: proc(d: ^Db) {
 			return
 		}
 
-		sqlite_data, read_err := os.read_entire_file_from_path(tmp_path, context.allocator)
+		db_encrypt_file(tmp_path, d.cfg.Keys[:])
 		os.remove(tmp_path)
-		if read_err != nil {
-			fmt.printf("Error reading vacuumed database: %v\n", read_err)
-			sqlite.db_close(d.db)
-			return
-		}
-
-		encrypted, enc_ok := encrypt(sqlite_data, d.cfg.Keys[:])
-		delete(sqlite_data)
-		if !enc_ok {
-			fmt.println("Error: encryption failed")
-			sqlite.db_close(d.db)
-			return
-		}
-
-		data_path := data_encrypted_path(d.cfg.config_path)
-		envr_d := envr_dir(d.cfg.config_path)
-		os.mkdir_all(envr_d)
-
-		write_err := os.write_entire_file(data_path, encrypted)
-		delete(encrypted)
-		if write_err != nil {
-			fmt.printf("Error writing encrypted database: %v\n", write_err)
-			sqlite.db_close(d.db)
-			return
-		}
-
 		d.changed = false
 	}
 	sqlite.db_close(d.db)
 }
 
-// Caller is responsible for calling:
-// ```odin
-// delete(results)
-// for &result in results {
-// 	delete(&result)
-// }
-// ```
-db_list :: proc(d: ^Db, allocator := context.allocator) -> (results: [dynamic]EnvFile, ok: bool) {
+db_list :: proc(d: ^Db) -> (results: [dynamic]EnvFile, ok: bool) {
+	sql := "SELECT path, remotes, sha256, contents FROM envr_env_files"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(
-		d.db,
-		"SELECT path, remotes, sha256, contents FROM envr_env_files",
-		-1,
-		&stmt,
-		nil,
-	)
+	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing query: %s\n", sqlite.db_errmsg(d.db))
 		return
 	}
-	defer sqlite.finalize(stmt)
 
 	for {
 		rc = sqlite.step(stmt)
@@ -166,15 +114,19 @@ db_list :: proc(d: ^Db, allocator := context.allocator) -> (results: [dynamic]En
 		}
 		if rc != sqlite.ROW {
 			fmt.printf("Error stepping query: %s\n", sqlite.db_errmsg(d.db))
+			sqlite.finalize(stmt)
 			return
 		}
 
-		remotes_json := string(sqlite.column_text(stmt, 1))
-		remotes: [dynamic]string = ---
+		path := cstring_to_string(sqlite.column_text(stmt, 0))
+		remotes_json := cstring_to_string(sqlite.column_text(stmt, 1))
+		sha := cstring_to_string(sqlite.column_text(stmt, 2))
+		contents := cstring_to_string(sqlite.column_text(stmt, 3))
+
+		remotes: [dynamic]string
 		if len(remotes_json) > 0 {
-			json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
+			json.unmarshal_string(remotes_json, &remotes)
 		}
-		path := clone_cstring(sqlite.column_text(stmt, 0), allocator)
 
 		append(
 			&results,
@@ -182,12 +134,13 @@ db_list :: proc(d: ^Db, allocator := context.allocator) -> (results: [dynamic]En
 				Path = path,
 				Dir = filepath.dir(path),
 				Remotes = remotes,
-				Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
-				contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
+				Sha256 = sha,
+				contents = contents,
 			},
 		)
 	}
 
+	sqlite.finalize(stmt)
 	ok = true
 	return
 }
@@ -195,9 +148,9 @@ db_list :: proc(d: ^Db, allocator := context.allocator) -> (results: [dynamic]En
 db_vacuum_to_file :: proc(db: ^rawptr, path: string) -> bool {
 	b: strings.Builder
 	strings.builder_init(&b)
-	defer strings.builder_destroy(&b)
 	fmt.sbprintf(&b, "VACUUM INTO '%s'", path)
-	rc := sqlite.db_exec(db, to_cstring(&b), nil, nil, nil)
+	sql := strings.to_string(b)
+	rc := sqlite.db_exec(db, string_to_cstring(sql), nil, nil, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error vacuuming database: %s\n", sqlite.db_errmsg(db))
 		return false
@@ -205,28 +158,13 @@ db_vacuum_to_file :: proc(db: ^rawptr, path: string) -> bool {
 	return true
 }
 
-db_restore_from_encrypted :: proc(db: ^rawptr, cfg: Config) -> bool {
-	data_path := data_encrypted_path(cfg.config_path)
-	encrypted_data, read_err := os.read_entire_file_from_path(data_path, context.temp_allocator)
-	if read_err != nil {
-		fmt.printf("Error reading encrypted database: %v\n", read_err)
-		return false
-	}
-
-	plaintext, dec_ok := decrypt(encrypted_data, cfg.Keys[:])
-	if !dec_ok {
-		fmt.println("Error: decryption failed")
-		return false
-	}
-	defer delete(plaintext)
-
+db_restore_from_age :: proc(db: ^rawptr, cfg: Config) -> bool {
 	tmp_path := make_temp_path()
-	write_err := os.write_entire_file(tmp_path, plaintext)
-	if write_err != nil {
-		fmt.printf("Error writing temp database: %v\n", write_err)
+	defer os.remove(tmp_path)
+
+	if !db_decrypt_to_file(tmp_path, cfg.Keys[:]) {
 		return false
 	}
-	defer os.remove(tmp_path)
 
 	if !db_attach_and_copy(db, tmp_path) {
 		return false
@@ -235,13 +173,100 @@ db_restore_from_encrypted :: proc(db: ^rawptr, cfg: Config) -> bool {
 	return true
 }
 
+db_decrypt_to_file :: proc(tmp_path: string, keys: []SshKeyPair) -> bool {
+	age_path := data_age_path()
+
+	args := make([dynamic]string)
+	append(&args, "age")
+	append(&args, "--decrypt")
+	append(&args, "-o")
+	append(&args, tmp_path)
+	for key in keys {
+		append(&args, "-i")
+		append(&args, key.Private)
+	}
+	append(&args, age_path)
+
+	desc := os.Process_Desc {
+		command = args[:],
+		stdout  = os.stderr,
+		stderr  = os.stderr,
+	}
+
+	p, err := os.process_start(desc)
+	if err != nil {
+		fmt.printf("Error running age decrypt: %v\n", err)
+		return false
+	}
+
+	state, wait_err := os.process_wait(p)
+	if wait_err != nil {
+		fmt.printf("Error waiting for age: %v\n", wait_err)
+		return false
+	}
+	if state.exit_code != 0 {
+		fmt.println("Error: age decryption failed")
+		return false
+	}
+	return true
+}
+
+db_encrypt_file :: proc(tmp_path: string, keys: []SshKeyPair) -> bool {
+	age_path := data_age_path()
+	envr_d := envr_dir()
+	os.mkdir_all(envr_d)
+
+	args := make([dynamic]string)
+	append(&args, "age")
+	append(&args, "--encrypt")
+	for key in keys {
+		append(&args, "-r")
+		pub_data, pub_err := os.read_entire_file_from_path(key.Public, context.allocator)
+		if pub_err != nil {
+			fmt.printf("Error reading public key: %s\n", key.Public)
+			return false
+		}
+		pub_str := string(pub_data)
+		if strings.has_suffix(pub_str, "\n") {
+			pub_str = pub_str[:len(pub_str) - 1]
+		}
+		append(&args, pub_str)
+	}
+	append(&args, "-o")
+	append(&args, age_path)
+	append(&args, tmp_path)
+
+	desc := os.Process_Desc {
+		command = args[:],
+		stdout  = os.stderr,
+		stderr  = os.stderr,
+	}
+
+	p, err := os.process_start(desc)
+	if err != nil {
+		fmt.printf("Error running age encrypt: %v\n", err)
+		return false
+	}
+
+	state, wait_err := os.process_wait(p)
+	if wait_err != nil {
+		fmt.printf("Error waiting for age: %v\n", wait_err)
+		return false
+	}
+	if state.exit_code != 0 {
+		fmt.println("Error: age encryption failed")
+		return false
+	}
+	return true
+}
+
 db_attach_and_copy :: proc(mem_db: ^rawptr, src_path: string) -> bool {
 	b: strings.Builder
 	strings.builder_init(&b)
-	defer strings.builder_destroy(&b)
 	fmt.sbprintf(&b, "ATTACH DATABASE '%s' AS source", src_path)
+	attach_sql := strings.to_string(b)
 
-	rc := sqlite.db_exec(mem_db, to_cstring(&b), nil, nil, nil)
+	rc := sqlite.db_exec(mem_db, string_to_cstring(attach_sql), nil, nil, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error attaching database: %s\n", sqlite.db_errmsg(mem_db))
 		return false
@@ -270,7 +295,6 @@ get_git_remotes :: proc(dir: string) -> [dynamic]string {
 
 	b: strings.Builder
 	strings.builder_init(&b)
-	defer strings.builder_destroy(&b)
 	fmt.sbprintf(&b, "%s-git-remotes", make_temp_path())
 	tmp_path := strings.to_string(b)
 	tmp_file, tmp_err := os.open(tmp_path, os.O_CREATE | os.O_WRONLY | os.O_TRUNC)
@@ -300,13 +324,13 @@ get_git_remotes :: proc(dir: string) -> [dynamic]string {
 	}
 
 	data, read_err := os.read_entire_file_from_path(tmp_path, context.allocator)
-	defer delete(data)
 	os.remove(tmp_path)
 	if read_err != nil {
 		return remotes
 	}
 
-	lines := strings.split(string(data), "\n")
+	output_str := string(data)
+	lines := strings.split(output_str, "\n")
 
 	for &line in lines {
 		line = strings.trim_space(line)
@@ -333,27 +357,27 @@ new_env_file :: proc(path: string) -> (EnvFile, bool) {
 		fmt.printf("Error getting absolute path: %v\n", abs_err)
 		return EnvFile{}, false
 	}
+	cloned_path, _ := strings.clone(abs_path)
 
-	dir := filepath.dir(abs_path)
+	dir := filepath.dir(cloned_path)
 
 	remotes := get_git_remotes(dir)
 
-	data, read_err := os.read_entire_file_from_path(abs_path, context.allocator)
-	defer delete(data)
+	data, read_err := os.read_entire_file_from_path(cloned_path, context.allocator)
 	if read_err != nil {
-		fmt.printf("Error reading file %s: %v\n", abs_path, read_err)
+		fmt.printf("Error reading file %s: %v\n", cloned_path, read_err)
 		return EnvFile{}, false
 	}
 
-	digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
-	// TODO: Handle error
+	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
 	hex_bytes, _ := hex.encode(digest)
+	sha_str := string(hex_bytes)
 
 	return EnvFile {
-			Path = abs_path,
+			Path = cloned_path,
 			Dir = dir,
 			Remotes = remotes,
-			Sha256 = string(hex_bytes),
+			Sha256 = sha_str,
 			contents = string(data),
 		},
 		true
@@ -365,35 +389,20 @@ db_insert :: proc(d: ^Db, file: EnvFile) -> bool {
 		fmt.printf("Error marshaling remotes: %v\n", marshal_err)
 		return false
 	}
-	defer delete(remotes_json)
 
-	sql: cstring =
-		"INSERT OR REPLACE INTO " +
-		"envr_env_files (path, remotes, sha256, contents) VALUES (?, ?, ?, ?)"
+	sql := "INSERT OR REPLACE INTO envr_env_files (path, remotes, sha256, contents) VALUES (?, ?, ?, ?)"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
+	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing insert: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}
 	defer sqlite.finalize(stmt)
 
-	// TODO: deal with elsewhere?
-	cpath := to_cstring(file.Path)
-	defer delete(cpath)
-	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
-
-	cremotes := to_cstring(string(remotes_json))
-	defer delete(cremotes)
-	rc = sqlite.bind_text(stmt, 2, cremotes, -1, nil)
-
-	csha := to_cstring(file.Sha256)
-	defer delete(csha)
-	rc = sqlite.bind_text(stmt, 3, csha, -1, nil)
-
-	ccontents := to_cstring(file.contents)
-	defer delete(ccontents)
-	rc = sqlite.bind_text(stmt, 4, ccontents, -1, nil)
+	rc = sqlite.bind_text(stmt, 1, string_to_cstring(file.Path), -1, nil)
+	rc = sqlite.bind_text(stmt, 2, string_to_cstring(string(remotes_json)), -1, nil)
+	rc = sqlite.bind_text(stmt, 3, string_to_cstring(file.Sha256), -1, nil)
+	rc = sqlite.bind_text(stmt, 4, string_to_cstring(file.contents), -1, nil)
 
 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
@@ -405,19 +414,17 @@ db_insert :: proc(d: ^Db, file: EnvFile) -> bool {
 	return true
 }
 
-db_fetch :: proc(d: ^Db, path: string, allocator := context.allocator) -> (EnvFile, bool) {
-	sql: cstring = "SELECT path, remotes, sha256, contents FROM envr_env_files WHERE path = ?"
+db_fetch :: proc(d: ^Db, path: string) -> (EnvFile, bool) {
+	sql := "SELECT path, remotes, sha256, contents FROM envr_env_files WHERE path = ?"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
+	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing fetch: %s\n", sqlite.db_errmsg(d.db))
 		return EnvFile{}, false
 	}
 	defer sqlite.finalize(stmt)
 
-	cpath := to_cstring(path, allocator)
-	defer delete(cpath, allocator)
-	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
+	rc = sqlite.bind_text(stmt, 1, string_to_cstring(path), -1, nil)
 	rc = sqlite.step(stmt)
 	if rc == sqlite.DONE {
 		fmt.printf("No file found with path: %s\n", path)
@@ -428,37 +435,38 @@ db_fetch :: proc(d: ^Db, path: string, allocator := context.allocator) -> (EnvFi
 		return EnvFile{}, false
 	}
 
-	remotes_json := string(sqlite.column_text(stmt, 1))
-	remotes: [dynamic]string = ---
+	file_path := cstring_to_string(sqlite.column_text(stmt, 0))
+	remotes_json := cstring_to_string(sqlite.column_text(stmt, 1))
+	sha := cstring_to_string(sqlite.column_text(stmt, 2))
+	contents := cstring_to_string(sqlite.column_text(stmt, 3))
+
+	remotes: [dynamic]string
 	if len(remotes_json) > 0 {
-		json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
+		json.unmarshal_string(remotes_json, &remotes)
 	}
 
-	file_path := clone_cstring(sqlite.column_text(stmt, 0))
-
+	cloned_path, _ := strings.clone(file_path)
 	return EnvFile {
-			Path = file_path,
-			Dir = filepath.dir(file_path),
+			Path = cloned_path,
+			Dir = filepath.dir(cloned_path),
 			Remotes = remotes,
-			Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
-			contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
+			Sha256 = sha,
+			contents = contents,
 		},
 		true
 }
 
 db_delete :: proc(d: ^Db, path: string) -> bool {
-	sql: cstring = "DELETE FROM envr_env_files WHERE path = ?"
+	sql := "DELETE FROM envr_env_files WHERE path = ?"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
+	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing delete: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}
 	defer sqlite.finalize(stmt)
 
-	cpath := to_cstring(path)
-	defer delete(cpath)
-	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
+	rc = sqlite.bind_text(stmt, 1, string_to_cstring(path), -1, nil)
 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
 		fmt.printf("Error deleting: %s\n", sqlite.db_errmsg(d.db))
@@ -474,33 +482,22 @@ db_delete :: proc(d: ^Db, path: string) -> bool {
 	return true
 }
 
-to_cstring :: proc {
-	string_to_cstring,
-	strings.to_cstring,
+cstring_to_string :: proc(cs: cstring) -> string {
+	if cs == nil {
+		return ""
+	}
+	s, _ := strings.clone_from_cstring(cs)
+	return s
 }
 
-string_to_cstring :: proc(s: string, allocator := context.allocator) -> cstring {
-	cs, err := strings.clone_to_cstring(s, allocator)
-	if err != nil {
-		fmt.printf("Failed to convert string to cstring: %v\n", err)
-		panic("Allocation Exception")
-	}
+string_to_cstring :: proc(s: string) -> cstring {
+	cs, _ := strings.clone_to_cstring(s)
 	return cs
 }
 
-clone_cstring :: proc(c: cstring, allocator := context.allocator) -> string {
-	str, err := strings.clone_from_cstring(c, allocator)
-	if err != nil {
-		fmt.printf("Failed to convert string to cstring: %v\n", err)
-		delete(str)
-		panic("Allocation Exception")
-	}
-
-	return str
-}
-
-db_update_required :: proc(status: SyncFlag) -> bool {
-	return .BackedUp in status || .DirUpdated in status
+db_update_required :: proc(status: SyncResult) -> bool {
+	s := i32(status)
+	return (s & (i32(SyncResult.BackedUp) | i32(SyncResult.DirUpdated))) != 0
 }
 
 shares_remote :: proc(f: ^EnvFile, remotes: []string) -> bool {
@@ -545,13 +542,23 @@ find_moved_dirs :: proc(d: ^Db, f: ^EnvFile) -> ([dynamic]string, bool) {
 	return moved, true
 }
 
-db_sync :: proc(d: ^Db, f: ^EnvFile) -> (SyncFlag, string) {
-	return env_file_sync(f, .TrustFilesystem, d)
+env_file_backup :: proc(f: ^EnvFile) -> bool {
+	data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
+	if read_err != nil {
+		fmt.printf("Error reading file %s: %v\n", f.Path, read_err)
+		return false
 	}
 
-// If SyncFlag is .BackedUp, Caller is responsible for calling delete on f.contents and f.Sha256
-env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, string) {
-	result: SyncFlag = {}
+	f.contents = string(data)
+	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
+	hex_bytes, _ := hex.encode(digest)
+	f.Sha256 = string(hex_bytes)
+	return true
+}
+
+env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncResult, string) {
+	result: SyncResult = .Noop
+	err_msg: string
 
 	_, stat_err := os.stat(f.Dir, context.allocator)
 	if stat_err != nil {
@@ -560,18 +567,18 @@ env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, str
 		if d != nil {
 			dirs, dirs_ok := find_moved_dirs(d, f)
 			if !dirs_ok {
-				return {.Error}, "failed to find moved dirs"
+				return .Error, "failed to find moved dirs"
 			}
 			moved_dirs = dirs
 		}
 
 		if len(moved_dirs) == 0 {
-			return {.Error}, "directory missing"
+			return .Error, "directory missing"
 		} else if len(moved_dirs) == 1 {
 			update_dir(f, moved_dirs[0])
-			result = {.DirUpdated}
+			result = .DirUpdated
 		} else {
-			return {.Error}, "multiple directories found"
+			return .Error, "multiple directories found"
 		}
 	}
 
@@ -580,10 +587,11 @@ env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, str
 		write_err := os.write_entire_file(f.Path, f.contents)
 		if write_err != nil {
 			msg, _ := strings.concatenate({"failed to write file: ", fmt.tprintf("%v", write_err)})
-			return {.Error}, msg
+			return .Error, msg
 		}
 
-		return result + {.Restored}, ""
+		s := i32(result) | i32(SyncResult.Restored)
+		return SyncResult(s), ""
 	}
 
 	data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
@@ -591,11 +599,10 @@ env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, str
 		msg, _ := strings.concatenate(
 			{"failed to read file for SHA comparison: ", fmt.tprintf("%v", read_err)},
 		)
-		return {.Error}, msg
+		return .Error, msg
 	}
 
 	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
-	// TODO: Handle error
 	hex_bytes, _ := hex.encode(digest)
 	current_sha := string(hex_bytes)
 
@@ -608,37 +615,21 @@ env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, str
 		write_err := os.write_entire_file(f.Path, f.contents)
 		if write_err != nil {
 			msg, _ := strings.concatenate({"failed to write file: ", fmt.tprintf("%v", write_err)})
-			return {.Error}, msg
+			return .Error, msg
 		}
-		return result + {.Restored}, ""
+		s := i32(result) | i32(SyncResult.Restored)
+		return SyncResult(s), ""
 	case .TrustFilesystem:
 		if !env_file_backup(f) {
-			return {.Error}, "failed to backup file"
+			return .Error, "failed to backup file"
 		}
-		return result + {.BackedUp}, ""
+		return .BackedUp, ""
 	}
 
 	return result, ""
 }
 
-// Loads the contents of the the file at f.Path into f.contents
-//
-// Caller is responsible for calling delete on f.contents and f.Sha256
-env_file_backup :: proc(f: ^EnvFile) -> bool {
-	data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
-	if read_err != nil {
-		fmt.printf("Error reading file %s: %v\n", f.Path, read_err)
-		return false
-	}
-
-	f.contents = string(data)
-	digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
-	hex_bytes, alloc_err := hex.encode(digest)
-	if alloc_err != nil {
-		fmt.printf("Error generating hash for file %s: %v\n", f.Path, alloc_err)
-		return false
-	}
-	f.Sha256 = string(hex_bytes)
-	return true
+db_sync :: proc(d: ^Db, f: ^EnvFile) -> (SyncResult, string) {
+	return env_file_sync(f, .TrustFilesystem, d)
 }
 

db_integration_test.odin

@@ -1,332 +0,0 @@
-package main
-
-import "core:fmt"
-import "core:os"
-import "core:path/filepath"
-import "core:strings"
-import "core:testing"
-
-import "sqlite"
-
-FIXTURES :: "fixtures"
-
-fixture_key :: proc() -> SshKeyPair {
-	priv, _ := strings.concatenate(
-		[]string{FIXTURES, "/keys/insecure-test-key"},
-		context.temp_allocator,
-	)
-	pub, _ := strings.concatenate(
-		[]string{FIXTURES, "/keys/insecure-test-key.pub"},
-		context.temp_allocator,
-	)
-	return SshKeyPair{Private = priv, Public = pub}
-}
-
-fixture_db_path :: proc() -> string {
-	p, _ := strings.concatenate([]string{FIXTURES, "/single-file.db"}, context.temp_allocator)
-	return p
-}
-
-fixture_config :: proc() -> Config {
-	cfg := Config {
-		Keys = make([dynamic]SshKeyPair, 0, 1),
-	}
-	append(&cfg.Keys, fixture_key())
-	return cfg
-}
-
-@(test)
-test_encrypt_decrypt_sqlite_roundtrip :: proc(t: ^testing.T) {
-	cfg := fixture_config()
-	defer {
-		delete(cfg.Keys)
-	}
-
-	db_path := fixture_db_path()
-	sqlite_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
-	testing.expectf(t, read_err == nil, "failed to read fixture db: %v", read_err)
-	if read_err != nil {
-		return
-	}
-	defer delete(sqlite_data)
-
-	encrypted, enc_ok := encrypt(sqlite_data, cfg.Keys[:])
-	testing.expect(t, enc_ok, "encryption should succeed")
-	if !enc_ok {
-		return
-	}
-	defer delete(encrypted)
-
-	testing.expect(t, len(encrypted) >= HEADER_SIZE, "ciphertext should have header")
-	testing.expect(t, encrypted[0] == u8('E'), "magic byte 0")
-	testing.expect(t, encrypted[1] == u8('N'), "magic byte 1")
-	testing.expect(t, encrypted[2] == u8('V'), "magic byte 2")
-	testing.expect(t, encrypted[3] == u8('R'), "magic byte 3")
-
-	plaintext, dec_ok := decrypt(encrypted, cfg.Keys[:])
-	testing.expect(t, dec_ok, "decryption should succeed")
-	if !dec_ok {
-		return
-	}
-	defer delete(plaintext)
-
-	testing.expectf(
-		t,
-		len(plaintext) == len(sqlite_data),
-		"round-trip size mismatch: expected %d, got %d",
-		len(sqlite_data),
-		len(plaintext),
-	)
-
-	match := true
-	for i in 0 ..< len(sqlite_data) {
-		if plaintext[i] != sqlite_data[i] {
-			match = false
-			break
-		}
-	}
-	testing.expect(t, match, "decrypted data should match original")
-}
-
-@(test)
-test_encrypt_write_read_decrypt :: proc(t: ^testing.T) {
-	cfg := fixture_config()
-	defer {
-		delete(cfg.Keys)
-	}
-
-	db_path := fixture_db_path()
-	sqlite_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
-	testing.expectf(t, read_err == nil, "failed to read fixture db: %v", read_err)
-	if read_err != nil {
-		return
-	}
-	defer delete(sqlite_data)
-
-	encrypted, enc_ok := encrypt(sqlite_data, cfg.Keys[:])
-	testing.expect(t, enc_ok, "encryption should succeed")
-	if !enc_ok {
-		return
-	}
-	defer delete(encrypted)
-
-	tmp_enc_path := fmt.tprintf("/tmp/envr-test-ewrd-%d.envr", os.get_pid())
-	write_err := os.write_entire_file(tmp_enc_path, encrypted)
-	testing.expectf(t, write_err == nil, "failed to write encrypted file: %v", write_err)
-	if write_err != nil {
-		return
-	}
-	defer os.remove(tmp_enc_path)
-
-	read_back, rb_err := os.read_entire_file_from_path(tmp_enc_path, context.allocator)
-	testing.expectf(t, rb_err == nil, "failed to read back encrypted file: %v", rb_err)
-	if rb_err != nil {
-		return
-	}
-	defer delete(read_back)
-
-	plaintext, dec_ok := decrypt(read_back, cfg.Keys[:])
-	testing.expect(t, dec_ok, "decryption after write/read should succeed")
-	if !dec_ok {
-		return
-	}
-	defer delete(plaintext)
-
-	testing.expect(t, len(plaintext) == len(sqlite_data), "size mismatch after file round-trip")
-}
-
-@(test)
-test_decrypt_then_attach_sqlite :: proc(t: ^testing.T) {
-	cfg := fixture_config()
-	defer {
-		delete(cfg.Keys)
-	}
-
-	db_path := fixture_db_path()
-	sqlite_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
-	testing.expectf(t, read_err == nil, "failed to read fixture db: %v", read_err)
-	if read_err != nil {
-		return
-	}
-	defer delete(sqlite_data)
-
-	encrypted, enc_ok := encrypt(sqlite_data, cfg.Keys[:])
-	testing.expect(t, enc_ok, "encryption should succeed")
-	if !enc_ok {
-		return
-	}
-	defer delete(encrypted)
-
-	plaintext, dec_ok := decrypt(encrypted, cfg.Keys[:])
-	testing.expect(t, dec_ok, "decryption should succeed")
-	if !dec_ok {
-		return
-	}
-	defer delete(plaintext)
-
-	tmp_db_path := fmt.tprintf("/tmp/envr-test-attach-%d.db", os.get_pid())
-	write_err := os.write_entire_file(tmp_db_path, plaintext)
-	testing.expectf(t, write_err == nil, "failed to write temp db: %v", write_err)
-	if write_err != nil {
-		return
-	}
-	defer os.remove(tmp_db_path)
-
-	mem_db: ^rawptr
-	rc := sqlite.db_open(":memory:", &mem_db)
-	testing.expectf(t, rc == sqlite.OK, "failed to open in-memory db")
-	if rc != sqlite.OK {
-		return
-	}
-	defer sqlite.db_close(mem_db)
-
-	create_sql: cstring = "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
-	rc = sqlite.db_exec(mem_db, create_sql, nil, nil, nil)
-	testing.expect(t, rc == sqlite.OK, "failed to create table")
-
-	attach_ok := db_attach_and_copy(mem_db, tmp_db_path)
-	testing.expect(t, attach_ok, "failed to attach and copy")
-
-	sql: cstring = "SELECT path FROM envr_env_files"
-	stmt: ^rawptr
-	rc = sqlite.prepare_v2(mem_db, sql, -1, &stmt, nil)
-	testing.expect(t, rc == sqlite.OK, "prepare failed")
-	if rc != sqlite.OK {
-		return
-	}
-	defer sqlite.finalize(stmt)
-
-	rc = sqlite.step(stmt)
-	testing.expect(t, rc == sqlite.ROW, "expected at least one row")
-	if rc == sqlite.ROW {
-		path := string(sqlite.column_text(stmt, 0))
-		testing.expect(t, len(path) > 0, "path should not be empty")
-	}
-}
-
-@(test)
-test_full_db_cycle :: proc(t: ^testing.T) {
-	cfg := fixture_config()
-	defer delete(cfg.Keys)
-
-	db_path := fixture_db_path()
-	original_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
-	testing.expectf(t, read_err == nil, "failed to read fixture db: %v", read_err)
-	if read_err != nil {
-		return
-	}
-	defer delete(original_data)
-
-	encrypted, enc_ok := encrypt(original_data, cfg.Keys[:])
-	testing.expect(t, enc_ok, "first encryption should succeed")
-	if !enc_ok {
-		return
-	}
-	defer delete(encrypted)
-
-	envr_dir_path := fmt.tprintf("/tmp/envr-test-cycle-%d/.envr", os.get_pid())
-	os.mkdir_all(envr_dir_path)
-
-	data_path, _ := filepath.join([]string{envr_dir_path, "data.envr"})
-	defer delete(data_path)
-	write_err := os.write_entire_file(data_path, encrypted)
-	testing.expectf(t, write_err == nil, "failed to write data.envr: %v", write_err)
-	if write_err != nil {
-		return
-	}
-
-	read_back, rb_err := os.read_entire_file_from_path(data_path, context.allocator)
-	testing.expectf(t, rb_err == nil, "failed to read data.envr: %v", rb_err)
-	if rb_err != nil {
-		return
-	}
-	defer delete(read_back)
-
-	plaintext, dec_ok := decrypt(read_back, cfg.Keys[:])
-	testing.expect(t, dec_ok, "decryption should succeed")
-	if !dec_ok {
-		return
-	}
-	defer delete(plaintext)
-
-	encrypted2, enc2_ok := encrypt(plaintext, cfg.Keys[:])
-	testing.expect(t, enc2_ok, "re-encryption should succeed")
-	if !enc2_ok {
-		return
-	}
-	defer delete(encrypted2)
-
-	plaintext2, dec2_ok := decrypt(encrypted2, cfg.Keys[:])
-	testing.expect(t, dec2_ok, "second decryption should succeed")
-	if !dec2_ok {
-		return
-	}
-	defer delete(plaintext2)
-
-	testing.expect(
-		t,
-		len(plaintext2) == len(original_data),
-		fmt.tprintf(
-			"double round-trip size mismatch: expected %d, got %d",
-			len(original_data),
-			len(plaintext2),
-		),
-	)
-
-	os.remove(data_path)
-	os.remove(envr_dir_path)
-	home := filepath.dir(filepath.dir(envr_dir_path))
-	os.remove(home)
-}
-
-@(test)
-test_ssh_key_parse_from_fixtures :: proc(t: ^testing.T) {
-	key := fixture_key()
-
-	priv_kp, priv_ok := parse_ssh_private_key(key.Private)
-	testing.expect(t, priv_ok, "should parse private key from fixtures")
-	if !priv_ok {
-		return
-	}
-
-	pub_key, pub_ok := parse_ssh_public_key(key.Public)
-	testing.expect(t, pub_ok, "should parse public key from fixtures")
-	if !pub_ok {
-		return
-	}
-
-	for i in 0 ..< 32 {
-		testing.expectf(t, priv_kp.Public[i] == pub_key[i], "public key mismatch at byte %d", i)
-	}
-
-	x25519_pairs, x_ok := ssh_to_x25519([]SshKeyPair{key})
-	testing.expect(t, x_ok, "ssh_to_x25519 should succeed")
-	if !x_ok {
-		return
-	}
-	defer delete(x25519_pairs)
-
-	testing.expect(t, len(x25519_pairs) == 1, "should have 1 x25519 keypair")
-}
-
-@(test)
-test_config_load_with_fixture_key :: proc(t: ^testing.T) {
-	cfg := fixture_config()
-	defer {
-		delete(cfg.Keys)
-	}
-
-	testing.expect(t, len(cfg.Keys) == 1, "should have 1 key")
-
-	key := cfg.Keys[0]
-
-	testing.expectf(t, len(key.Private) > 0, "private key path should not be empty")
-	testing.expectf(t, len(key.Public) > 0, "public key path should not be empty")
-
-	_, priv_ok := parse_ssh_private_key(key.Private)
-	testing.expect(t, priv_ok, "should parse private key using config paths")
-	if !priv_ok {
-		fmt.printf("  private key path was: '%s'\n", key.Private)
-	}
-}
-

db_test.odin

@@ -1,274 +1,36 @@
 package main
 
-import "core:fmt"
-import "core:os"
-import "core:path/filepath"
-import "core:strings"
 import "core:testing"
 
-import "sqlite"
-
-make_test_db :: proc() -> (Db, bool) {
-	db: ^rawptr
-	rc := sqlite.db_open(":memory:", &db)
-	if rc != sqlite.OK {
-		return Db{}, false
-	}
-
-	create_sql: cstring = "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
-	rc = sqlite.db_exec(db, create_sql, nil, nil, nil)
-	if rc != sqlite.OK {
-		sqlite.db_close(db)
-		return Db{}, false
-	}
-
-	return Db{db = db}, true
-}
-
-make_test_env_file :: proc(path, sha, contents: string, remotes: []string = {}) -> EnvFile {
-	f := EnvFile {
-		Path     = path,
-		Dir      = "",
-		Sha256   = sha,
-		contents = contents,
-		Remotes  = make([dynamic]string, 0, len(remotes)),
-	}
-	for r in remotes {
-		append(&f.Remotes, r)
-	}
-	return f
-}
-
-@(test)
-test_db_insert_and_fetch :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	path := "/project/.env"
-	sha := "abc123"
-	contents := "SECRET=value"
-
-	f := make_test_env_file(path, sha, contents, []string{"git@github.com:user/repo.git"})
-	defer delete(f.Remotes)
-
-	testing.expect(t, db_insert(&d, f), "insert should succeed")
-
-	fetched, fetch_ok := db_fetch(&d, "/project/.env")
-	defer delete_envfile(&fetched)
-	testing.expect(t, fetch_ok, "fetch should succeed")
-	if !fetch_ok do return
-
-	testing.expect_value(t, fetched.Path, path)
-	testing.expect_value(t, fetched.Sha256, sha)
-	testing.expect_value(t, fetched.contents, contents)
-	testing.expect_value(t, len(fetched.Remotes), 1)
-	testing.expect_value(t, fetched.Remotes[0], "git@github.com:user/repo.git")
-}
-
-@(test)
-test_db_fetch_missing :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	_, fetch_ok := db_fetch(&d, "/nonexistent/.env")
-	testing.expect(t, !fetch_ok, "fetch missing should return false")
-}
-
-@(test)
-test_db_insert_or_replace :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	f1 := make_test_env_file("/project/.env", "sha1", "KEY=old")
-	defer delete(f1.Remotes)
-	testing.expect(t, db_insert(&d, f1), "first insert should succeed")
-
-	f2 := make_test_env_file("/project/.env", "sha2", "KEY=new")
-	defer delete(f2.Remotes)
-	testing.expect(t, db_insert(&d, f2), "second insert should succeed")
-
-	results, list_ok := db_list(&d)
-	testing.expect(t, list_ok, "list should succeed")
-	if !list_ok do return
-	defer delete(results)
-	for &result in results {
-		defer delete_envfile(&result)
-	}
-
-	testing.expect(t, len(results) == 1, "should have 1 row, not 2")
-
-	fetched, fetch_ok := db_fetch(&d, "/project/.env")
-	testing.expect(t, fetch_ok, "fetch should succeed")
-	if !fetch_ok do return
-	defer delete_envfile(&fetched)
-
-	testing.expect_value(t, fetched.contents, "KEY=new")
-	testing.expect_value(t, fetched.Sha256, "sha2")
-}
-
-@(test)
-test_db_delete_existing :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	f := make_test_env_file("/project/.env", "sha", "KEY=val")
-	defer delete(f.Remotes)
-	db_insert(&d, f)
-
-	testing.expect(t, db_delete(&d, "/project/.env"), "delete should return true")
-
-	_, fetch_ok := db_fetch(&d, "/project/.env")
-	testing.expect(t, !fetch_ok, "row should be gone after delete")
-}
-
-@(test)
-test_db_delete_missing :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	testing.expect(t, !db_delete(&d, "/nonexistent/.env"), "delete missing should return false")
-}
-
-@(test)
-test_db_list_multiple :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	f1 := make_test_env_file("/proj1/.env", "sha1", "A=1", []string{"git@github.com:a/repo.git"})
-	defer delete(f1.Remotes)
-	f2 := make_test_env_file("/proj2/.env", "sha2", "B=2", []string{"git@github.com:b/repo.git"})
-	defer delete(f2.Remotes)
-	f3 := make_test_env_file("/proj3/.env", "sha3", "C=3")
-
-	db_insert(&d, f1)
-	db_insert(&d, f2)
-	db_insert(&d, f3)
-
-	results, list_ok := db_list(&d)
-	testing.expect(t, list_ok, "list should succeed")
-	if !list_ok do return
-	defer delete(results)
-	defer {
-		for &result in results {
-			delete_envfile(&result)
-		}
-	}
-
-	testing.expect_value(t, len(results), 3)
-}
-
-@(test)
-test_db_list_empty :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	results, list_ok := db_list(&d)
-	testing.expect(t, list_ok, "list should succeed on empty db")
-	testing.expect(t, len(results) == 0, "should have 0 rows")
-	if list_ok do delete(results)
-}
-
-@(test)
-test_db_insert_sets_changed :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	testing.expect(t, !d.changed, "changed should start false")
-
-	f := make_test_env_file("/project/.env", "sha", "KEY=val")
-	defer delete(f.Remotes)
-	db_insert(&d, f)
-
-	testing.expect(t, d.changed, "changed should be true after insert")
-}
-
-@(test)
-test_db_delete_sets_changed :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	f := make_test_env_file("/project/.env", "sha", "KEY=val")
-	defer delete(f.Remotes)
-	db_insert(&d, f)
-	d.changed = false
-
-	db_delete(&d, "/project/.env")
-	testing.expect(t, d.changed, "changed should be true after delete")
-}
-
-@(test)
-test_db_vacuum_to_file :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
-	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
-
-	f := make_test_env_file("/project/.env", "sha", "KEY=val")
-	defer delete(f.Remotes)
-	db_insert(&d, f)
-
-	vacuum_path := fmt.tprintf("/tmp/envr-test-vacuum-%d.db", os.get_pid())
-	defer os.remove(vacuum_path)
-
-	testing.expect(t, db_vacuum_to_file(d.db, vacuum_path), "vacuum should succeed")
-
-	info, stat_err := os.stat(vacuum_path, context.allocator)
-	defer os.file_info_delete(info, context.allocator)
-	testing.expect(t, stat_err == nil, "vacuumed file should exist")
-
-	data, read_err := os.read_entire_file_from_path(vacuum_path, context.allocator)
-	testing.expect(t, read_err == nil, "should read vacuumed file")
-	defer delete(data)
-
-	testing.expect(t, len(data) > 0, "vacuumed file should be non-empty")
-}
-
 @(test)
 test_db_update_required_noop :: proc(t: ^testing.T) {
-	testing.expect(t, !db_update_required({}), "Noop should not require update")
+	testing.expect(t, !db_update_required(.Noop), "Noop should not require update")
 }
 
 @(test)
 test_db_update_required_backed_up :: proc(t: ^testing.T) {
-	testing.expect(t, db_update_required({.BackedUp}), "BackedUp should require update")
+	testing.expect(t, db_update_required(.BackedUp), "BackedUp should require update")
 }
 
 @(test)
 test_db_update_required_dir_updated :: proc(t: ^testing.T) {
-	testing.expect(t, db_update_required({.DirUpdated}), "DirUpdated should require update")
+	testing.expect(t, db_update_required(.DirUpdated), "DirUpdated should require update")
 }
 
 @(test)
 test_db_update_required_restored :: proc(t: ^testing.T) {
-	testing.expect(t, !db_update_required({.Restored}), "Restored alone should not require update")
+	testing.expect(t, !db_update_required(.Restored), "Restored alone should not require update")
 }
 
 @(test)
 test_db_update_required_error :: proc(t: ^testing.T) {
-	testing.expect(t, !db_update_required({.Error}), "Error alone should not require update")
+	testing.expect(t, !db_update_required(.Error), "Error alone should not require update")
 }
 
 @(test)
 test_db_update_required_combined :: proc(t: ^testing.T) {
-	combined := SyncFlag{.DirUpdated, .Restored}
+	s := i32(SyncResult.DirUpdated) | i32(SyncResult.Restored)
+	combined := SyncResult(s)
 	testing.expect(t, db_update_required(combined), "DirUpdated|Restored should require update")
 }
 
@@ -326,82 +88,3 @@ test_shares_remote_both_empty :: proc(t: ^testing.T) {
 	testing.expect(t, !shares_remote(&f, remotes), "both empty should not share")
 }
 
-@(test)
-test_make_temp_path_format :: proc(t: ^testing.T) {
-	p := make_temp_path()
-	testing.expect(t, strings.has_suffix(p, ".db"), "should end with .db")
-	testing.expect(t, strings.contains(p, fmt.tprintf("%d", os.get_pid())), "should contain PID")
-}
-
-@(test)
-test_new_env_file :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-envfile-%d", os.get_pid())
-	os.mkdir_all(base)
-	defer os.remove_all(base)
-
-	env_path := fmt.tprintf("%s/.env", base)
-	err := os.write_entire_file(env_path, "SECRET=value\n")
-	testing.expect(t, err == nil, ".env file should exists")
-
-	file, ok := new_env_file(env_path)
-	testing.expect(t, ok, "new_env_file should succeed")
-	if !ok do return
-	defer delete(file.Remotes)
-	defer delete(file.Sha256)
-	defer delete(file.Path)
-
-	testing.expect(t, filepath.is_abs(file.Path), "path should be absolute")
-	testing.expect(t, strings.has_suffix(file.Path, "/.env"), "path should end with /.env")
-	testing.expect(t, file.contents == "SECRET=value\n", "contents mismatch")
-	testing.expect(t, len(file.Sha256) == 64, "sha256 should be 64 hex chars")
-}
-
-@(test)
-test_new_env_file_missing :: proc(t: ^testing.T) {
-	_, ok := new_env_file("/tmp/envr-nonexistent-envfile/path/.env")
-	testing.expect(t, !ok, "missing file should return false")
-}
-
-@(test)
-test_env_file_backup :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-backup-%d", os.get_pid())
-	os.mkdir_all(base)
-	defer os.remove_all(base)
-
-	env_path := fmt.tprintf("%s/.env", base)
-	err := os.write_entire_file(env_path, "KEY=12345\n")
-	testing.expect(t, err == nil, ".env file should exist")
-
-	f := EnvFile {
-		Path = env_path,
-	}
-	defer delete(f.contents)
-	defer delete(f.Sha256)
-	testing.expect(t, env_file_backup(&f), "backup should succeed")
-	testing.expect_value(t, f.contents, "KEY=12345\n")
-	testing.expect_value(t, len(f.Sha256), 64)
-}
-
-@(test)
-test_env_file_backup_missing :: proc(t: ^testing.T) {
-	f := EnvFile {
-		Path = "/tmp/envr-nonexistent-backup/.env",
-	}
-	testing.expect(t, !env_file_backup(&f), "missing file should return false")
-}
-
-@(test)
-test_update_dir :: proc(t: ^testing.T) {
-	f := EnvFile {
-		Path    = "/old/project/.env",
-		Dir     = "/old/project",
-		Remotes = make([dynamic]string, 0),
-	}
-	defer delete_envfile(&f)
-
-	update_dir(&f, "/new/location")
-
-	testing.expect_value(t, f.Dir, "/new/location")
-	testing.expect_value(t, f.Path, "/new/location/.env")
-}
-

features.odin

@@ -8,6 +8,7 @@ import "core:strings"
 Feature :: enum {
 	Git,
 	Fd,
+	Age,
 }
 
 AvailableFeatures :: bit_set[Feature]
@@ -30,6 +31,9 @@ check_features :: proc() -> AvailableFeatures {
 	if find_binary(paths, "fd") != "" {
 		feats += {.Fd}
 	}
+	if find_binary(paths, "age") != "" {
+		feats += {.Age}
+	}
 
 	return feats
 }

fixtures/default_config.json

@@ -0,0 +1,21 @@
+{
+  "db_path": "~/.envr/data.age",
+  "keys": [
+    {
+      "private": "~/.ssh/id_ed25519",
+      "public": "~/.ssh/id_ed25519.pub"
+    }
+  ],
+  "scan": {
+    "matcher": "\\.env",
+    "exclude": [
+      "*\\.envrc",
+      "\\.local",
+      "node_modules",
+      "vendor"
+    ],
+    "include": [
+      "~"
+    ]
+  }
+}

fixtures/hello-world.age

@@ -0,0 +1,5 @@
+age-encryption.org/v1
+-> ssh-ed25519 Boe0UQ 2ngx7jSJ8/yuAzTgeiiCTYZRSkBCeJfaHTL0u7k6ziU
+0XmEy0bOTeW1MF9ev32n4xISPDl9UQNHzEB0vsZHDuU
+--- UV7IjWFCCg79Pf3T9vUWBxT4MhgeARWp6E+LK9tMy1g
+u‡No2Zÿꥡé–Ý…++˜‡°ð¾ÓYÏóíð<C3AD>y:æ@'NÍ
xP¾

fixtures/hello-world.txt

@@ -0,0 +1 @@
+Hello, World!

fixtures/keys/test_ed25519

@@ -1,7 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACC4CdhiPHmU44cyy9UZV1ISnDq9RbYl1m1qTYOXaSNougAAAIg+8A82PvAP
-NgAAAAtzc2gtZWQyNTUxOQAAACC4CdhiPHmU44cyy9UZV1ISnDq9RbYl1m1qTYOXaSNoug
-AAAEAalxEoCavixCImtND1I0YHZZjhOrBLxk//t9v0sjYNVLgJ2GI8eZTjhzLL1RlXUhKc
-Or1FtiXWbWpNg5dpI2i6AAAABHRlc3QB
------END OPENSSH PRIVATE KEY-----

fixtures/keys/test_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILgJ2GI8eZTjhzLL1RlXUhKcOr1FtiXWbWpNg5dpI2i6 test

fixtures/keys/test_ed25519_encrypted

@@ -1,8 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABD342Kol/
-iE3kW3alqJTPVpAAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIF29NuS3O0JUKCj4
-j/NmmJJyJk6n/MwI37WtVeWAC5c/AAAAoPFp0zRQufp8S+f68atSqFT1FYMUvGqL2cmmtJ
-r+kXEeEvSGdi3xAxCSLuoe0tMeUYP8aUP1M5L9VzTpFoi8jBIfcPl/ZRX8F/+J4dhp5jno
-3nQuo1AN0D60r+UmmX+Z0IzIrD2jIpZ/Y7P2kXT8OErIhtC4ZJs3nIIOKFY7ZzlM1IqbYH
-dSSlpUnsAoMPjMb0eD0Q6s6JaldfiNshckauU=
------END OPENSSH PRIVATE KEY-----

fixtures/keys/test_ed25519_encrypted.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF29NuS3O0JUKCj4j/NmmJJyJk6n/MwI37WtVeWAC5c/ encrypted test key

fixtures/keys/test_ed25519_second

@@ -1,7 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACCZhSOlxHj1zxd+P7adxHOjo3tqqe68AVQ1itJ96nJ95wAAAIh6gz6PeoM+
-jwAAAAtzc2gtZWQyNTUxOQAAACCZhSOlxHj1zxd+P7adxHOjo3tqqe68AVQ1itJ96nJ95w
-AAAEAEsVzs6egkWMZolD/pZCX5ZcZVXfd5wZ6Ja12f+PxAQJmFI6XEePXPF34/tp3Ec6Oj
-e2qp7rwBVDWK0n3qcn3nAAAABXRlc3Qy
------END OPENSSH PRIVATE KEY-----

fixtures/keys/test_ed25519_second.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJmFI6XEePXPF34/tp3Ec6Oje2qp7rwBVDWK0n3qcn3n test2

fixtures/keys/test_rsa

@@ -1,27 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
-NhAAAAAwEAAQAAAQEAjwq/ISeK/TmKiV1NABIq+tFwevArpTRTyZ9eC5JyGvDzDB03buVl
-6bXd6+cwv+h0AZa7BZN60ayv8zAUmyGpSxFN2gMFiJ/0iFYpTHiLZD4VUH8mCPllIehOdr
-epchmlh14BeShJjlGzwBAlgiEON5V62gCWWLmkIzcAgUd3R2NUQfajl74wA0JBkaNeFwUp
-nUARyPUeMVX8ZVUvbpE/WOFTZYfFZDkul6aSkAzEeyZq9s4qJ2mWt5acuXcMcUl6YtuAGM
-Xii+uV1nJyQpNgHRdEZ2Ch1zmtiTrqjutdBUOfyQZJ3Ln9h/nPJDerUHZboyhu654dLbac
-0P3pYciW8wAAA8BvZFJ5b2RSeQAAAAdzc2gtcnNhAAABAQCPCr8hJ4r9OYqJXU0AEir60X
-B68CulNFPJn14LknIa8PMMHTdu5WXptd3r5zC/6HQBlrsFk3rRrK/zMBSbIalLEU3aAwWI
-n/SIVilMeItkPhVQfyYI+WUh6E52t6lyGaWHXgF5KEmOUbPAECWCIQ43lXraAJZYuaQjNw
-CBR3dHY1RB9qOXvjADQkGRo14XBSmdQBHI9R4xVfxlVS9ukT9Y4VNlh8VkOS6XppKQDMR7
-Jmr2zionaZa3lpy5dwxxSXpi24AYxeKL65XWcnJCk2AdF0RnYKHXOa2JOuqO610FQ5/JBk
-ncuf2H+c8kN6tQdlujKG7rnh0ttpzQ/elhyJbzAAAAAwEAAQAAAQAVAR96x1s1/vaUYDJ3
-4bMU/J83NkA6dJofH7tIGLuPsDUIYNvseVwDOxT42IyEiaZLO26ADZ1535FAtR05gHJjFw
-nnCw2Ld+2I/Zn35DWXxTQNC3ay16hdl8a50RNdMV3oqEmwGFXgw6eQ+u3/E0qKp/UPwQlS
-wwPStfdphGyD+15BxNcc/ZTAByKe9JMi7KkygE02jUn9OMPjJJT9RR+oRXZHLq+yU8Fayl
-QUDgmU5Vq8Mhp0P4JrmCMVeZuRhMPrk3XaDJFPgfSMY1fKEapW6itwsG9VTh6xUMxks26t
-hk/GuGNjhmt5NOKpQDLLOTKd22u+PZ6kJJQcJjsj47ktAAAAgGcWjHLNm6T0Dp1p5hgfPy
-QK019Xp24V1zlejyC0iykzBaC+ZFFS9JOBkqfdrrEE1nAzLvJblhUeWpmLBaqOF+PpPxkF
-oAGXzYck2axVcXhpvgB71uOARGZntVDoxVoOC7vT6I2h8eL75pZNGYJZt1K9Zufr4UwNR4
-F+FY194pSLAAAAgQDEx1MSFuVZ5sfAH7RteSHWjvyD/CWwbhVzL3IWeUXCMsf9HwUZZd8e
-zgyqE6Dh65GTXviuy8Tpb4gT4Gne/QblMHGvdbFMlXNOfzz9U5VkF0q1Y/D4rN0Sa7+nzR
-lZx/LKM20egfypNeJWBQT5KzZ8gEOamL7Qyyk5YG2q5evWnwAAAIEAuhdRyPjXaCM2NyvO
-dPxvbnpEJZDWRw6iVWtzPAXgwIiI6ngEUVXK2O8T8j0Ufssk3AVbVj1OH8/KJonyWUbedM
-mDaFhs4Uvd9iuSZdpS7PbLqHYonurg3m6dz4TrtoWUQuBATdGuIGrtkN+Y83e6UqOGT7lY
-Vqw7lPqhNUowAy0AAAAIdGVzdC1yc2EBAgM=
------END OPENSSH PRIVATE KEY-----

fixtures/keys/test_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCPCr8hJ4r9OYqJXU0AEir60XB68CulNFPJn14LknIa8PMMHTdu5WXptd3r5zC/6HQBlrsFk3rRrK/zMBSbIalLEU3aAwWIn/SIVilMeItkPhVQfyYI+WUh6E52t6lyGaWHXgF5KEmOUbPAECWCIQ43lXraAJZYuaQjNwCBR3dHY1RB9qOXvjADQkGRo14XBSmdQBHI9R4xVfxlVS9ukT9Y4VNlh8VkOS6XppKQDMR7Jmr2zionaZa3lpy5dwxxSXpi24AYxeKL65XWcnJCk2AdF0RnYKHXOa2JOuqO610FQ5/JBkncuf2H+c8kN6tQdlujKG7rnh0ttpzQ/elhyJbz test-rsa

flake.nix

@@ -40,6 +40,7 @@
           };
 
           treefmt = {
+            # Used to find the project root
             projectRootFile = "flake.nix";
             settings.global.excludes = [
               ".direnv/**"
@@ -49,51 +50,66 @@
               ".env.local"
             ];
 
+
+            # Format nix files
             programs.nixpkgs-fmt.enable = true;
+            # programs.deadnix.enable = true;
+
+            # Format go files
+            programs.goimports.enable = true;
           };
 
-          packages.default = pkgs.stdenv.mkDerivation rec {
+          packages.default = pkgs.buildGoModule rec {
             pname = "envr";
             version = "0.2.0";
             src = ./.;
+            # If the build complains, uncomment this line
+            # vendorHash = "sha256:0000000000000000000000000000000000000000000000000000";
+            vendorHash = "sha256-aC82an6vYifewx4amfXLzk639jz9fF5bD5cF6krY0Ks=";
             
-            nativeBuildInputs = [
-              pkgs.unstable.odin
-              pkgs.pkg-config
+            nativeBuildInputs = [ pkgs.installShellFiles ];
+
+            ldflags = [
+              "-X github.com/sbrow/envr/cmd.version=v${version}"
+              # "-X github.com/sbrow/envr/cmd.commit=$(git rev-parse HEAD)"
+              # "-X github.com/sbrow/envr/cmd.date=$(date -u +%Y-%m-%dT%H:%M:%SZ)"
             ];
             
-            buildInputs = [
-              pkgs.libsodium
-              pkgs.sqlite
-            ];
-
-            buildPhase = ''
-              runHook preBuild
-              echo '${version}' > version.txt
-              odin build . -o:speed -out:${pname}
-              runHook postBuild
+            postBuild = ''
+              # Generate man pages
+              $GOPATH/bin/docgen -out ./man -format man
             '';
             
-            installPhase = ''
-              runHook preInstall
-              install -Dm755 ${pname} $out/bin/${pname}
-              runHook postInstall
+            postInstall = ''
+              # Install man pages
+              installManPage ./man/*.1
             '';
           };
 
-          devShells.default = pkgs.mkShell {
+          devShells.default = pkgs.mkShell
+            {
               buildInputs = with pkgs; [
                 fd
                 nushell
+                go
+                gopls
+                sqlite
 
-              libsodium
+                gotools
+                cobra-cli
+
+                age
                 sqlite
                 unstable.odin
                 unstable.ols
 
                 # Build tools
+                age
+                unstable.cargo
                 zip
 
+                opencode
+
                 # IDE
                 unstable.helix
                 typescript-language-server

go.mod

@@ -0,0 +1,41 @@
+module github.com/sbrow/envr
+
+go 1.24.6
+
+require (
+	filippo.io/age v1.2.1
+	github.com/AlecAivazis/survey/v2 v2.3.7
+	github.com/mattn/go-isatty v0.0.20
+	github.com/olekukonko/tablewriter v1.1.0
+	github.com/spf13/cobra v1.10.1
+	modernc.org/sqlite v1.39.1
+)
+
+require (
+	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/olekukonko/errors v1.1.0 // indirect
+	github.com/olekukonko/ll v0.0.9 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/term v0.36.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	modernc.org/libc v1.66.10 // indirect
+	modernc.org/mathutil v1.7.1 // indirect
+	modernc.org/memory v1.11.0 // indirect
+)

go.sum

@@ -0,0 +1,138 @@
+c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805 h1:u2qwJeEvnypw+OCPUHmoZE3IqwfuN5kgDfo5MLzpNM0=
+c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805/go.mod h1:FomMrUJ2Lxt5jCLmZkG3FHa72zUprnhd3v/Z18Snm4w=
+filippo.io/age v1.2.1 h1:X0TZjehAZylOIj4DubWYU1vWQxv9bJpo+Uu2/LGhi1o=
+filippo.io/age v1.2.1/go.mod h1:JL9ew2lTN+Pyft4RiNGguFfOpewKwSHm5ayKD/A4004=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
+github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
+github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
+github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
+github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
+github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+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=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
+github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
+github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
+github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
+github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
+github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
+github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
+github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
+github.com/olekukonko/tablewriter v1.1.0 h1:N0LHrshF4T39KvI96fn6GT8HEjXRXYNDrDjKFDB7RIY=
+github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
+github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
+github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
+golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
+golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
+golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
+golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+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/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+modernc.org/cc/v4 v4.26.5 h1:xM3bX7Mve6G8K8b+T11ReenJOT+BmVqQj0FY5T4+5Y4=
+modernc.org/cc/v4 v4.26.5/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/ccgo/v4 v4.28.1 h1:wPKYn5EC/mYTqBO373jKjvX2n+3+aK7+sICCv4Fjy1A=
+modernc.org/ccgo/v4 v4.28.1/go.mod h1:uD+4RnfrVgE6ec9NGguUNdhqzNIeeomeXf6CL0GTE5Q=
+modernc.org/fileutil v1.3.40 h1:ZGMswMNc9JOCrcrakF1HrvmergNLAmxOPjizirpfqBA=
+modernc.org/fileutil v1.3.40/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
+modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
+modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
+modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
+modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
+modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A=
+modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I=
+modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
+modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
+modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
+modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
+modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
+modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
+modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
+modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
+modernc.org/sqlite v1.39.1 h1:H+/wGFzuSCIEVCvXYVHX5RQglwhMOvtHSv+VtidL2r4=
+modernc.org/sqlite v1.39.1/go.mod h1:9fjQZ0mB1LLP0GYrp39oOJXx/I2sxEnZtzCmEQIKvGE=
+modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
+modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
+modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
+modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

internal/tools/docgen/main.go

@@ -0,0 +1,58 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/sbrow/envr/cmd" // update to your module path
+	"github.com/spf13/cobra/doc"
+)
+
+func main() {
+	out := flag.String("out", "./docs/cli", "output directory")
+	format := flag.String("format", "markdown", "markdown|man|rest")
+	front := flag.Bool("frontmatter", false, "prepend simple YAML front matter to markdown")
+	flag.Parse()
+
+	if err := os.MkdirAll(*out, 0o755); err != nil {
+		log.Fatal(err)
+	}
+
+	root := cmd.Root()
+	root.DisableAutoGenTag = true // stable, reproducible files (no timestamp footer)
+
+	switch *format {
+	case "markdown":
+		if *front {
+			prep := func(filename string) string {
+				base := filepath.Base(filename)
+				name := strings.TrimSuffix(base, filepath.Ext(base))
+				title := strings.ReplaceAll(name, "_", " ")
+				return fmt.Sprintf("---\ntitle: %q\nslug: %q\ndescription: \"CLI reference for %s\"\n---\n\n", title, name, title)
+			}
+			link := func(name string) string { return strings.ToLower(name) }
+			if err := doc.GenMarkdownTreeCustom(root, *out, prep, link); err != nil {
+				log.Fatal(err)
+			}
+		} else {
+			if err := doc.GenMarkdownTree(root, *out); err != nil {
+				log.Fatal(err)
+			}
+		}
+	case "man":
+		hdr := &doc.GenManHeader{Title: strings.ToUpper(root.Name()), Section: "1"}
+		if err := doc.GenManTree(root, hdr, *out); err != nil {
+			log.Fatal(err)
+		}
+	case "rest":
+		if err := doc.GenReSTTree(root, *out); err != nil {
+			log.Fatal(err)
+		}
+	default:
+		log.Fatalf("unknown format: %s", *format)
+	}
+}

main.go

@@ -0,0 +1,7 @@
+package main
+
+import "github.com/sbrow/envr/cmd"
+
+func main() {
+	cmd.Execute()
+}

main.odin

@@ -1,12 +1,10 @@
 package main
 
-import "core:bufio"
 import "core:fmt"
 import "core:os"
 
 main :: proc() {
-	cmd, ok := parse_args(os.args, os.to_writer(os.stdout), os.to_writer(os.stderr))
-	defer bufio.writer_flush(cmd.out_buf)
+	cmd, ok := parse_args()
 	if !ok {
 		return
 	}
@@ -37,9 +35,10 @@ main :: proc() {
 	case "nushell-completion":
 		cmd_nushell_completion(&cmd)
 	case:
-		fmt.wprintf(cmd.err, "Unknown command: %s\n", cmd.name)
-		write_usage(cmd.out)
+		fmt.printf("Unknown command: %s\n", cmd.name)
+		print_usage()
 		os.exit(1)
 	}
 }
 
+

prompt.odin

@@ -113,14 +113,10 @@ MultiSelect_Result :: enum {
 
 MAX_VISIBLE :: 7
 
-// Caller is responsible for deleting the responses.
 multi_select :: proc(
 	prompt: string,
 	options: []string,
-) -> (
-	selected: [dynamic]bool,
-	result: MultiSelect_Result,
-) {
+) -> (selected: [dynamic]bool, result: MultiSelect_Result) {
 	if len(options) == 0 {
 		return
 	}
@@ -170,14 +166,11 @@ multi_select :: proc(
 	}
 }
 
-render_options :: proc(
-	prompt: string,
-	options: []string,
-	selected: []bool,
-	cursor: int,
-	scroll_offset: int,
-) -> int {
-	fmt.printf("\x1b[1;36m%s\x1b[0m (↑/↓ move, space select, enter confirm)\r\n", prompt)
+render_options :: proc(prompt: string, options: []string, selected: []bool, cursor: int, scroll_offset: int) -> int {
+	fmt.printf(
+		"\x1b[1;36m%s\x1b[0m (↑/↓ move, space select, enter confirm)\r\n",
+		prompt,
+	)
 
 	end := scroll_offset + MAX_VISIBLE
 	if end > len(options) {
@@ -198,4 +191,3 @@ render_options :: proc(
 
 	return end - scroll_offset
 }
-

scan.odin

@@ -4,14 +4,13 @@ import "core:fmt"
 import "core:os"
 import "core:strings"
 import "core:sync"
-import "core:terminal"
 
 fd_counter: sync.Atomic_Mutex
 fd_seq: int
 
 // Caller is responsible for freeing paths
 scan_path :: proc(search_path: string, cfg: Config) -> (paths: [dynamic]string, ok: bool) {
-	if terminal.is_terminal(os.stdout) {
+	if is_tty() {
 		fmt.printf("Searching for all files in \"%s\"...\n", search_path)
 	}
 	all_files, all_ok := run_fd(build_fd_args(search_path, cfg, true))
@@ -19,7 +18,7 @@ scan_path :: proc(search_path: string, cfg: Config) -> (paths: [dynamic]string,
 		return
 	}
 
-	if terminal.is_terminal(os.stdout) {
+	if is_tty() {
 		fmt.printf("Search for unignored fies in \"%s\"...\n", search_path)
 	}
 	unignored_files, unignored_ok := run_fd(build_fd_args(search_path, cfg, false))
@@ -69,7 +68,6 @@ run_fd :: proc(args: []string) -> (lines: []string, ok: bool) {
 	tmp_path := next_fd_tmp_path()
 	tmp_file, tmp_err := os.open(tmp_path, os.O_CREATE | os.O_WRONLY | os.O_TRUNC)
 	if tmp_err != nil {
-		// TODO: Log a message here
 		return
 	}
 

scan_test.odin

@@ -3,7 +3,6 @@ package main
 import "core:fmt"
 import "core:os"
 import "core:path/filepath"
-import "core:strings"
 import "core:testing"
 
 @(test)
@@ -86,11 +85,3 @@ test_scan_path_empty_dir :: proc(t: ^testing.T) {
 	testing.expect(t, len(results) == 0, fmt.tprintf("expected 0 results, got %d", len(results)))
 }
 
-@(test)
-test_scan_meets_expectations :: proc(t: ^testing.T) {
-	testing.expect(t, cant_scan({}), "no features should mean can't scan")
-	testing.expect(t, cant_scan({.Git}), "Git alone should mean can't scan")
-	testing.expect(t, !cant_scan({.Fd}), "having Fd should mean can scan")
-	testing.expect(t, !cant_scan({.Fd, .Git}), "both Fd and Git should mean can scan")
-}
-

sodium.odin

@@ -1,31 +0,0 @@
-package main
-
-import "core:c"
-
-foreign import libsodium "system:sodium"
-
-CRYPTO_BOX_PUBLICKEY_BYTES :: 32
-CRYPTO_BOX_SECRETKEY_BYTES :: 32
-CRYPTO_BOX_NONCE_BYTES :: 24
-CRYPTO_BOX_MAC_BYTES :: 16
-
-CRYPTO_SECRETBOX_KEY_BYTES :: 32
-CRYPTO_SECRETBOX_NONCE_BYTES :: 24
-CRYPTO_SECRETBOX_MAC_BYTES :: 16
-
-CRYPTO_SIGN_PUBLICKEY_BYTES :: 32
-CRYPTO_SIGN_SECRETKEY_BYTES :: 64
-
-@(default_calling_convention = "c")
-foreign libsodium {
-	sodium_init :: proc() -> c.int ---
-	// crypto_box_keypair :: proc(pk: [^]u8, sk: [^]u8) -> c.int ---
-	crypto_box_easy :: proc(ciphertext: [^]u8, plaintext: [^]u8, mlen: c.ulong, nonce: [^]u8, pk: [^]u8, sk: [^]u8) -> c.int ---
-	crypto_box_open_easy :: proc(plaintext: [^]u8, ciphertext: [^]u8, clen: c.ulong, nonce: [^]u8, pk: [^]u8, sk: [^]u8) -> c.int ---
-	crypto_secretbox_easy :: proc(ciphertext: [^]u8, plaintext: [^]u8, mlen: c.ulong, nonce: [^]u8, key: [^]u8) -> c.int ---
-	crypto_secretbox_open_easy :: proc(plaintext: [^]u8, ciphertext: [^]u8, clen: c.ulong, nonce: [^]u8, key: [^]u8) -> c.int ---
-	crypto_sign_ed25519_pk_to_curve25519 :: proc(curve25519_pk: [^]u8, ed25519_pk: [^]u8) -> c.int ---
-	crypto_sign_ed25519_sk_to_curve25519 :: proc(curve25519_sk: [^]u8, ed25519_sk: [^]u8) -> c.int ---
-	randombytes_buf :: proc(buf: [^]u8, size: c.ulong) ---
-}
-

src/Config.zig

@@ -0,0 +1,226 @@
+const std = @import("std");
+
+db_path: []const u8 = "~/.envr/data.age",
+
+/// Keys that are available for encryption
+keys: []const SSHKeyPair = &.{
+    .from_pub_path("~/.ssh/id_ed25519.pub"),
+},
+
+/// Rules for how to match the scan command
+scan: ScanConfig = .default,
+
+// TODO: Allow incomplete pairs
+pub const SSHKeyPair = struct {
+    private: []const u8,
+    public: []const u8,
+
+    /// Caller owns the returned memory
+    pub fn from_path(
+        gpa: std.mem.Allocator,
+        path: []const u8,
+    ) error{OutOfMemory}!SSHKeyPair {
+        if (std.mem.eql(u8, std.fs.path.extension(path), ".pub")) {
+            return from_pub_path(path);
+        } else {
+            return .{
+                .public = try std.mem.concat(gpa, u8, &.{ path, ".pub" }),
+                .private = path,
+            };
+        }
+    }
+
+    pub fn from_pub_path(path: []const u8) SSHKeyPair {
+        std.debug.assert(std.mem.eql(u8, std.fs.path.extension(path), ".pub"));
+
+        return .{
+            .public = path,
+            .private = path[0 .. path.len - 4],
+        };
+    }
+};
+
+/// Configuration for the scan command
+pub const ScanConfig = struct {
+    /// the file extension to look for
+    matcher: []const u8,
+
+    /// Glob patterns to ignore
+    exclude: []const []const u8,
+
+    /// paths to search in
+    include: []const []const u8,
+
+    const default: @This() = .{
+        .matcher = "\\.env",
+        .exclude = &.{
+            "*\\.envrc",
+            "\\.local",
+            "node_modules",
+            "vendor",
+        },
+        .include = &.{"~"},
+    };
+};
+
+/// Load the Config from the file at path
+/// TODO: Use a concrete error set
+pub fn load(
+    io: std.Io,
+    gpa: std.mem.Allocator,
+    path: []const u8,
+) !std.json.Parsed(@This()) {
+    var file = try std.Io.Dir.cwd().openFile(
+        io,
+        path,
+        .{ .mode = .read_only },
+    );
+    defer file.close(io);
+
+    var buffer: [4096]u8 = undefined;
+    var reader = file.reader(io, &buffer);
+
+    var json_reader: std.json.Reader = .init(gpa, &reader.interface);
+    defer json_reader.deinit();
+
+    return try std.json.parseFromTokenSource(
+        @This(),
+        gpa,
+        &json_reader,
+        .{},
+    );
+}
+
+/// Save the config to the given file
+pub fn save(
+    self: *@This(),
+    io: std.Io,
+    dir: std.Io.Dir,
+    path: []const u8,
+) !void {
+    // TODO: Remove dependence on string?
+    var string: std.Io.Writer.Allocating = .init(std.testing.allocator);
+    defer string.deinit();
+
+    try string.writer.print(
+        "{f}",
+        .{std.json.fmt(self, .{ .whitespace = .indent_2 })},
+    );
+
+    var file = try dir.createFile(io, path, .{ .truncate = true });
+    defer file.close(io);
+
+    try file.writeStreamingAll(io, string.written());
+}
+
+test "loading the default config from disk matches expected values" {
+    const gpa = std.testing.allocator;
+
+    const parsed = try load(std.testing.io, gpa, "./fixtures/default_config.json");
+    defer parsed.deinit();
+
+    const got = parsed.value;
+    try std.testing.expectEqualDeep(got.scan, ScanConfig.default);
+}
+
+test "saving to a new file upserts the file" {
+    const io = std.testing.io;
+
+    var cfg: @This() = .{};
+
+    var tmp = std.testing.tmpDir(.{});
+    defer tmp.cleanup();
+
+    var dir = tmp.dir;
+
+    try std.testing.expectError(
+        error.FileNotFound,
+        dir.statFile(io, "config.json", .{}),
+    );
+
+    try cfg.save(io, dir, "config.json");
+
+    const contents = try dir.readFileAlloc(
+        io,
+        "config.json",
+        std.testing.allocator,
+        .unlimited,
+    );
+    defer std.testing.allocator.free(contents);
+
+    const want =
+        \\{
+        \\  "db_path": "~/.envr/data.age",
+        \\  "keys": [
+        \\    {
+        \\      "private": "~/.ssh/id_ed25519",
+        \\      "public": "~/.ssh/id_ed25519.pub"
+        \\    }
+        \\  ],
+        \\  "scan": {
+        \\    "matcher": "\\.env",
+        \\    "exclude": [
+        \\      "*\\.envrc",
+        \\      "\\.local",
+        \\      "node_modules",
+        \\      "vendor"
+        \\    ],
+        \\    "include": [
+        \\      "~"
+        \\    ]
+        \\  }
+        \\}
+    ;
+
+    try std.testing.expectEqualSlices(u8, want, contents);
+}
+
+test "saving to an existing file updates the file" {
+    const io = std.testing.io;
+
+    var cfg: @This() = .{};
+
+    var tmp = std.testing.tmpDir(.{});
+    defer tmp.cleanup();
+
+    var dir = tmp.dir;
+
+    try dir.writeFile(io, .{ .sub_path = "config.json", .data = "{}" });
+    _ = try dir.statFile(io, "config.json", .{});
+
+    try cfg.save(io, dir, "config.json");
+
+    const contents = try dir.readFileAlloc(
+        io,
+        "config.json",
+        std.testing.allocator,
+        .unlimited,
+    );
+    defer std.testing.allocator.free(contents);
+
+    const want =
+        \\{
+        \\  "db_path": "~/.envr/data.age",
+        \\  "keys": [
+        \\    {
+        \\      "private": "~/.ssh/id_ed25519",
+        \\      "public": "~/.ssh/id_ed25519.pub"
+        \\    }
+        \\  ],
+        \\  "scan": {
+        \\    "matcher": "\\.env",
+        \\    "exclude": [
+        \\      "*\\.envrc",
+        \\      "\\.local",
+        \\      "node_modules",
+        \\      "vendor"
+        \\    ],
+        \\    "include": [
+        \\      "~"
+        \\    ]
+        \\  }
+        \\}
+    ;
+
+    try std.testing.expectEqualSlices(u8, want, contents);
+}

src/Db.zig

@@ -0,0 +1,488 @@
+//! Db interacts with an age encrypted sqlite database.
+//!
+const std = @import("std");
+const sqlite = @import("sqlite");
+
+const age = @import("age.zig");
+const Config = @import("Config.zig");
+
+/// controls the keys and filepaths used for saving
+opts: OpenOptions,
+
+/// The underlying data store.
+sql_db: sqlite.Db,
+
+/// Set to true whenever the data updates. If false when close() is called,
+/// the database will be closed without saving
+changed: bool = false,
+
+/// Decrypts the database into a temporary file and opens it in memory
+// FIXME: Test me with real file
+pub fn open(
+    io: std.Io,
+    gpa: std.mem.Allocator,
+    opts: OpenOptions,
+) !@This() {
+    // FIXME: cheating here
+    const db_path = try std.fs.path.join(gpa, &.{
+        opts.home,
+        opts.config.db_path[2..],
+    });
+    defer gpa.free(db_path);
+
+    // const tmp_dir = try std.Io.Dir.cwd().openDir(io, tmp, .{});
+    // defer tmp_dir.deleteFile(io, "envr.db");
+
+    const tmp_db_path = try std.fs.path.joinZ(gpa, &.{ opts.tmp, "envr.db" });
+    defer gpa.free(tmp_db_path);
+
+    if (db_exists(io, db_path)) {
+        // TODO: Use std.MultiArrayList? Had json issues
+        {
+            var private_keys: std.ArrayList([]const u8) = try .initCapacity(
+                gpa,
+                opts.config.keys.len,
+            );
+            defer private_keys.deinit(gpa);
+
+            for (opts.config.keys) |key| {
+                // FIXME: cheating here
+                if (std.mem.startsWith(u8, key.private, "~/")) {
+                    const key_path = try std.fs.path.join(gpa, &.{
+                        opts.home,
+                        key.private[2..],
+                    });
+                    private_keys.appendAssumeCapacity(key_path);
+                    // defer gpa.free(key_path);
+                } else {
+                    private_keys.appendAssumeCapacity(key.private);
+                }
+            }
+
+            // TODO: Pass key(s) from Config
+            try age.decrypt(io, gpa, private_keys.items, db_path, tmp_db_path);
+
+            for (opts.config.keys, 0..) |key, i| {
+                if (std.mem.startsWith(u8, key.private, "~/")) {
+                    gpa.free(private_keys.items[i]);
+                }
+            }
+        }
+    }
+
+    return open_decrypted(opts, tmp_db_path);
+}
+
+const OpenOptions = struct {
+    config: Config = .{},
+
+    /// The path to the home directory
+    home: []const u8 = "~/",
+    /// The path to the /tmp directory
+    // FIXME: Support windows
+    tmp: []const u8 = "/tmp",
+};
+
+/// Create a new instance of the database
+fn open_decrypted(opts: OpenOptions, tmp_db_path: [:0]const u8) !@This() {
+    var db = try sqlite.Db.init(.{
+        .mode = .{ .File = tmp_db_path },
+        .open_flags = .{
+            .write = true,
+            .create = true,
+        },
+        .threading_mode = .MultiThread,
+    });
+
+    try db.exec(
+        \\create table if not exists envr_env_files (
+        \\  path text primary key not null
+        \\, remotes text -- JSON
+        \\, sha256 text not null
+        \\, contents text not null
+        \\)
+    , .{}, .{});
+
+    return .{
+        .sql_db = db,
+        .opts = opts,
+    };
+}
+
+/// Returns true if a file exists at ~/.envr/data.age
+fn db_exists(io: std.Io, path: []const u8) bool {
+    if (std.Io.Dir.cwd().access(io, path, .{ .read = true })) {
+        return true;
+    } else |_| {
+        return false;
+    }
+}
+
+// TODO: Finish
+// pub fn tmpDir(opts: std.fs.Dir.OpenDirOptions) TmpDir {
+//     var random_bytes: [TmpDir.random_bytes_count]u8 = undefined;
+//     std.crypto.random.bytes(&random_bytes);
+//     var sub_path: [TmpDir.sub_path_len]u8 = undefined;
+//     _ = std.fs.base64_encoder.encode(&sub_path, &random_bytes);
+// }
+//
+// const TmpDir = struct {};
+
+/// Close the database
+/// FIXME: Test me with data but no changes
+/// FIXME: Test me with data and changes
+pub fn close(
+    self: *@This(),
+    io: std.Io,
+    gpa: std.mem.Allocator,
+) !void {
+    defer self.sql_db.deinit();
+
+    if (self.changed) {
+        const tmp_db_path = try std.fs.path.join(gpa, &.{ self.opts.tmp, "envr.db" });
+        defer gpa.free(tmp_db_path);
+
+        try self.sql_db.exec("VACUUM INTO ?", .{}, .{tmp_db_path});
+
+        const db_path = try std.fs.path.join(gpa, &.{ self.opts.home, ".envr", "data.age" });
+        defer gpa.free(db_path);
+
+        {
+            // TODO: Use std.MultiArrayList? Had json issues
+            var public_keys: std.ArrayList([]const u8) = try .initCapacity(
+                gpa,
+                self.opts.config.keys.len,
+            );
+            defer public_keys.deinit(gpa);
+
+            for (self.opts.config.keys) |key| {
+                public_keys.appendAssumeCapacity(key.private);
+            }
+
+            try age.encrypt(io, gpa, public_keys.items, tmp_db_path, db_path);
+        }
+
+        self.changed = false;
+    }
+}
+
+/// Returns a list of all the .env files present in the database.
+/// The caller is responsible for freeing memory
+pub fn list(self: *@This(), gpa: std.mem.Allocator) ![]EnvFile {
+    var stmt = try self.sql_db.prepare(
+        "select path, remotes, sha256, contents from envr_env_files",
+    );
+    defer stmt.deinit();
+
+    return stmt.all(EnvFile, gpa, .{}, .{});
+}
+
+pub const EnvFile = struct {
+    // TODO: Should use file_name in the struct and derive from the path.
+    path: []const u8,
+
+    // /// dir is derived from Path, and is not stored in the database.
+    // dir: []const u8,
+
+    /// JSON encoded list of strings
+    remotes: []const u8,
+    sha256: []const u8,
+    contents: []const u8,
+
+    pub fn deinit(self: *EnvFile, alloc: std.mem.Allocator) void {
+        alloc.free(self.path);
+        alloc.free(self.remotes);
+        alloc.free(self.sha256);
+        alloc.free(self.contents);
+    }
+};
+
+test {
+    std.testing.refAllDecls(@import("age.zig"));
+}
+
+test "simple database can be opened" {
+    var db = try sqlite.Db.init(.{
+        .mode = sqlite.Db.Mode{ .File = "./fixtures/example.db" },
+        .open_flags = .{
+            .write = false,
+            .create = false,
+        },
+        .threading_mode = .MultiThread,
+    });
+
+    var stmt = try db.prepare("SELECT * FROM hello");
+    defer stmt.deinit();
+
+    const alloc = std.testing.allocator;
+
+    if (try stmt.oneAlloc(struct { text: []const u8 }, alloc, .{}, .{})) |got| {
+        defer alloc.free(got.text);
+
+        try std.testing.expectEqualSlices(u8, "world!", got.text);
+    } else {
+        return error.TestUnexpectedResult;
+    }
+}
+
+test "encrypted database can be opened" {
+    const io = std.testing.io;
+    const gpa = std.testing.allocator;
+
+    var tmp = std.testing.tmpDir(.{});
+    defer tmp.cleanup();
+
+    const dir_path = try tmp.dir.realPathFileAlloc(io, ".", gpa);
+    defer gpa.free(dir_path);
+
+    const decrypted_path = try std.fs.path.joinZ(gpa, &.{ dir_path, "example.db" });
+    defer gpa.free(decrypted_path);
+
+    try age.decrypt(
+        io,
+        gpa,
+        &.{"./fixtures/insecure-test-key"},
+        "./fixtures/encrypted-example.db.age",
+        decrypted_path,
+    );
+
+    var db = try sqlite.Db.init(.{
+        .mode = sqlite.Db.Mode{ .File = decrypted_path },
+        .open_flags = .{
+            .write = false,
+            .create = false,
+        },
+        .threading_mode = .MultiThread,
+    });
+
+    var stmt = try db.prepare("SELECT * FROM hello");
+    defer stmt.deinit();
+
+    const alloc = std.testing.allocator;
+
+    if (try stmt.oneAlloc(struct { text: []const u8 }, alloc, .{}, .{})) |got| {
+        defer alloc.free(got.text);
+
+        try std.testing.expectEqualSlices(u8, "world!", got.text);
+    } else {
+        return error.TestUnexpectedResult;
+    }
+}
+
+test "Closing a fresh database does not create a file" {
+    const io = std.testing.io;
+    const gpa = std.testing.allocator;
+
+    var tmp_dir = std.testing.tmpDir(.{});
+    defer tmp_dir.cleanup();
+
+    try tmp_dir.dir.createDir(io, "home", .default_dir);
+    try tmp_dir.dir.createDir(io, "tmp", .default_dir);
+
+    const tmp_dir_path = try tmp_dir.dir.realPathFileAlloc(io, ".", gpa);
+    defer gpa.free(tmp_dir_path);
+
+    const home = try std.fs.path.join(gpa, &.{ tmp_dir_path, "home" });
+    defer gpa.free(home);
+    const tmp = try std.fs.path.join(gpa, &.{ tmp_dir_path, "tmp" });
+    defer gpa.free(tmp);
+
+    // TODO: Pass testing keys
+    var db: @This() = try .open(io, gpa, .{ .home = home, .tmp = tmp });
+
+    // TODO: Get rid of direct access
+    const db_path = try std.fs.path.join(gpa, &.{ home, ".envr", "data.age" });
+    defer gpa.free(db_path);
+
+    try std.testing.expectError(
+        error.FileNotFound,
+        tmp_dir.dir.access(io, db_path, .{ .read = true }),
+    );
+
+    try db.close(io, gpa);
+
+    try std.testing.expectError(
+        error.FileNotFound,
+        tmp_dir.dir.access(io, db_path, .{ .read = true }),
+    );
+}
+
+test "single-file.db has envr_env_files table" {
+    const io = std.testing.io;
+    const gpa = std.testing.allocator;
+
+    const dir_path = try std.Io.Dir.cwd().realPathFileAlloc(io, ".", gpa);
+    defer gpa.free(dir_path);
+
+    const path = try std.fs.path.joinZ(
+        gpa,
+        &.{ dir_path, "fixtures", "single-file.db" },
+    );
+    defer gpa.free(path);
+
+    var db = try sqlite.Db.init(.{
+        .mode = .{ .File = path },
+        .open_flags = .{
+            .write = false,
+            .create = false,
+        },
+        .threading_mode = .MultiThread,
+    });
+
+    var diags: sqlite.Diagnostics = .{};
+    var stmt = db.prepareDynamicWithDiags(
+        "select name from sqlite_master where type='table'",
+        .{ .diags = &diags },
+    ) catch |err| {
+        std.log.err(
+            "unable to prepare statement, got error {}. diagnostics: {f}",
+            .{ err, diags },
+        );
+        return err;
+    };
+    defer stmt.deinit();
+
+    const tables = (try stmt.oneAlloc(
+        []const u8,
+        gpa,
+        .{ .diags = &diags },
+        .{},
+    )).?;
+    defer gpa.free(tables);
+
+    try std.testing.expectEqualSlices(u8, "envr_env_files", tables);
+}
+
+// test "raw restore works" {
+//     const io = std.testing.io;
+//     const gpa = std.testing.allocator;
+
+//     var db = try sqlite.Db.init(.{
+//         .mode = .Memory,
+//         .open_flags = .{
+//             .write = true,
+//             .create = true,
+//         },
+//         .threading_mode = .MultiThread,
+//     });
+
+//     try db.exec(
+//         \\create table envr_env_files (
+//         \\  path text primary key not null
+//         \\, remotes text -- JSON
+//         \\, sha256 text not null
+//         \\, contents text not null
+//         \\)
+//     , .{}, .{});
+
+//     const dir_path = try std.Io.Dir.cwd().realPathFileAlloc(io, ".", gpa);
+//     defer gpa.free(dir_path);
+
+//     const path = try std.fs.path.join(
+//         gpa,
+//         &.{ dir_path, "fixtures", "single-file.db" },
+//     );
+//     defer gpa.free(path);
+
+//     std.debug.print("path: {s}\n", .{path});
+//     try db.exec(
+//         "ATTACH DATABASE ? AS source",
+//         .{},
+//         .{path},
+//     );
+//     defer db.exec("DETACH DATABASE source", .{}, .{}) catch unreachable;
+
+//     var diags: sqlite.Diagnostics = .{};
+//     db.exec(
+//         "INSERT INTO main.envr_env_files SELECT * FROM source.envr_env_files",
+//         .{ .diags = &diags },
+//         .{},
+//     ) catch |err| {
+//         std.log.err(
+//             "unable to prepare statement, got error {}. diagnostics: {f}",
+//             .{ err, diags },
+//         );
+//         return err;
+//     };
+// }
+
+// test "Closing a modified database does create a file" {}
+
+test "list displays the database's keys" {
+    const io = std.testing.io;
+    const gpa = std.testing.allocator;
+
+    var tmp_dir = std.testing.tmpDir(.{});
+    defer tmp_dir.cleanup();
+
+    try tmp_dir.dir.createDir(io, "home", .default_dir);
+    try tmp_dir.dir.createDir(io, "home/.envr", .default_dir);
+    try tmp_dir.dir.createDir(io, "tmp", .default_dir);
+
+    const tmp_dir_path = try tmp_dir.dir.realPathFileAlloc(io, ".", gpa);
+    defer gpa.free(tmp_dir_path);
+
+    const home = try std.fs.path.join(gpa, &.{ tmp_dir_path, "home" });
+    defer gpa.free(home);
+    const tmp = try std.fs.path.join(gpa, &.{ tmp_dir_path, "tmp" });
+    defer gpa.free(tmp);
+
+    // TODO: Get rid of direct access
+    const db_path = try std.fs.path.join(gpa, &.{ home, ".envr", "data.age" });
+    defer gpa.free(db_path);
+
+    try std.Io.Dir.cwd().copyFile(
+        "fixtures/encrypted-single-file.db.age",
+        tmp_dir.dir,
+        "home/.envr/data.age",
+        io,
+        .{},
+    );
+
+    // Asserts file existence
+    try tmp_dir.dir.access(io, db_path, .{ .read = true });
+
+    // TODO: Pass testing keys
+    const config: Config = .{
+        .keys = &.{.from_pub_path("fixtures/insecure-test-key.pub")},
+    };
+    var db: @This() = try .open(io, gpa, .{
+        .config = config,
+        .home = home,
+        .tmp = tmp,
+    });
+
+    const env_files = try db.list(gpa);
+    defer gpa.free(env_files);
+    try std.testing.expectEqual(1, env_files.len);
+
+    var hasher = std.crypto.hash.sha2.Sha256.init(.{});
+
+    try std.testing.expectEqual(1, env_files.len);
+
+    for (env_files) |*file| {
+        defer file.deinit(gpa);
+
+        try std.testing.expectEqualSlices(
+            u8,
+            "~/project/.env.example",
+            file.path,
+        );
+        try std.testing.expectEqualSlices(
+            u8,
+            "API_KEY=\\\"sk_my_api_key\\\"\\nAPP_ENV=testing",
+            file.contents,
+        );
+        try std.testing.expectEqualSlices(
+            u8,
+            "[\"git@github.com:user/project.git\"]",
+            file.remotes,
+        );
+
+        hasher.update(file.contents);
+        const hash = hasher.finalResult();
+        try std.testing.expectEqualStrings(&std.fmt.bytesToHex(&hash, .lower), file.sha256);
+    }
+
+    try db.close(io, gpa);
+}

src/age.zig

@@ -0,0 +1,153 @@
+const std = @import("std");
+
+/// Decrypts the file into output path
+pub fn decrypt(
+    io: std.Io,
+    gpa: std.mem.Allocator,
+    private_keys: []const []const u8,
+    input_path: []const u8,
+    output_path: []const u8,
+) !void {
+    // TODO: use raw array?
+    var argv: std.ArrayList([]const u8) = try .initCapacity(gpa, 2 + (2 * private_keys.len) + 3);
+    defer argv.deinit(gpa);
+
+    argv.appendAssumeCapacity("age");
+    argv.appendAssumeCapacity("-d");
+
+    for (private_keys) |key| {
+        argv.appendAssumeCapacity("-i");
+        argv.appendAssumeCapacity(key);
+    }
+
+    argv.appendAssumeCapacity("-o");
+    argv.appendAssumeCapacity(output_path);
+
+    argv.appendAssumeCapacity(input_path);
+
+    const result = try std.process.run(gpa, io, .{
+        .argv = argv.items,
+    });
+    defer gpa.free(result.stderr);
+    defer gpa.free(result.stdout);
+
+    if (result.stdout.len > 0) {
+        std.debug.print("stdout: \"{s}\"\n", .{result.stdout});
+        unreachable;
+    }
+
+    if (result.stderr.len > 0) {
+        std.debug.print("stderr: \"{s}\"\n", .{result.stderr});
+        unreachable;
+    }
+}
+
+/// Encrypts the file into output path
+pub fn encrypt(
+    io: std.Io,
+    gpa: std.mem.Allocator,
+    // TODO: Accept multiple keys
+    public_keys: []const []const u8,
+    input_path: []const u8,
+    output_path: []const u8,
+) !void {
+    var argv: std.ArrayList([]const u8) = try .initCapacity(gpa, 2 + (2 * public_keys.len) + 3);
+    defer argv.deinit(gpa);
+
+    argv.appendAssumeCapacity("age");
+    argv.appendAssumeCapacity("-e");
+
+    for (public_keys) |key| {
+        argv.appendAssumeCapacity("-R");
+        argv.appendAssumeCapacity(key);
+    }
+
+    argv.appendAssumeCapacity("-o");
+    argv.appendAssumeCapacity(output_path);
+
+    argv.appendAssumeCapacity(input_path);
+
+    const result = try std.process.run(gpa, io, .{
+        .argv = argv.items,
+    });
+    defer gpa.free(result.stderr);
+    defer gpa.free(result.stdout);
+
+    if (result.stdout.len > 0) {
+        std.debug.print("stdout: \"{s}\"\n", .{result.stdout});
+        unreachable;
+    }
+
+    if (result.stderr.len > 0) {
+        std.debug.print("stderr: \"{s}\"\n", .{result.stderr});
+        unreachable;
+    }
+}
+
+test "sample file can be decrypted" {
+    const io = std.testing.io;
+    const gpa = std.testing.allocator;
+
+    var tmp = std.testing.tmpDir(.{});
+    defer tmp.cleanup();
+
+    const dir_path = try tmp.dir.realPathFileAlloc(io, ".", gpa);
+    defer gpa.free(dir_path);
+
+    const output_path = try std.fs.path.join(gpa, &.{ dir_path, "got.txt" });
+    defer gpa.free(output_path);
+
+    try decrypt(
+        io,
+        gpa,
+        &.{"./fixtures/insecure-test-key"},
+        "./fixtures/hello-world.age",
+        output_path,
+    );
+
+    const contents = try tmp.dir.readFileAlloc(io, output_path, gpa, .unlimited);
+    defer gpa.free(contents);
+
+    try std.testing.expectEqualSlices(u8, "Hello, World!\n", contents);
+}
+
+test "sample file can be encrypted" {
+    const io = std.testing.io;
+    const gpa = std.testing.allocator;
+
+    var tmp = std.testing.tmpDir(.{});
+    defer tmp.cleanup();
+
+    const dir_path = try tmp.dir.realPathFileAlloc(io, ".", gpa);
+    defer gpa.free(dir_path);
+
+    const output_path = try std.fs.path.join(gpa, &.{ dir_path, "hello-world.age" });
+    defer gpa.free(output_path);
+
+    try encrypt(
+        io,
+        gpa,
+        &.{"./fixtures/insecure-test-key.pub"},
+        "./fixtures/hello-world.txt",
+        output_path,
+    );
+
+    const got = try tmp.dir.readFileAlloc(io, output_path, gpa, .unlimited);
+    defer gpa.free(got);
+
+    const want = try std.Io.Dir.cwd().readFileAlloc(
+        io,
+        "./fixtures/hello-world.age",
+        gpa,
+        .unlimited,
+    );
+    defer gpa.free(want);
+
+    const contents = try tmp.dir.readFileAlloc(io, output_path, gpa, .unlimited);
+    defer gpa.free(contents);
+
+    try std.testing.expectEqual(want.len, got.len);
+
+    // FIXME: Test that decrypted file contents match
+    // try std.testing.expectEqualSlices(u8, "Hello, World!\n", decrypted_contents);
+}

src/comma.zig

@@ -0,0 +1,146 @@
+//! By convention, root.zig is the root source file when making a package.
+const std = @import("std");
+const Io = std.Io;
+
+pub const Command = struct {
+    name: []const u8,
+    short: ?[]const u8 = null,
+    long: ?[]const u8 = null,
+    subcommands: []const Command = &.{},
+    examples: [][]const u8 = &.{},
+    /// The enum type of the command
+    Type: type,
+    /// The type of struct that holds the Commands's flags and arguments
+    // Params: type,
+
+    pub fn new(cmd: CommandOptions) Command {
+        const subcommands: [cmd.subcommands.len]Command = blk: {
+            var result: [cmd.subcommands.len]Command = undefined;
+            inline for (cmd.subcommands, 0..) |sub, idx| {
+                result[idx] = new(sub);
+            }
+            break :blk result;
+        };
+
+        return .{
+            .name = cmd.name,
+            .short = cmd.short,
+            .long = cmd.long,
+            .subcommands = &subcommands,
+            .Type = cmd.as_enum(),
+        };
+    }
+
+    pub fn parse(comptime self: @This(), args: []const []const u8) self.Type {
+        if (args.len == 0) {
+            return @enumFromInt(0);
+        }
+
+        const target = args[0];
+
+        inline for (self.subcommands, 1..) |cmd, idx| {
+            if (std.mem.eql(u8, target, cmd.name)) {
+                return @enumFromInt(idx);
+            }
+        }
+
+        return @enumFromInt(self.subcommands.len + 1);
+    }
+
+    /// Used for indentation when printing command help
+    const tab = "  ";
+
+    /// Print usage information to the console.
+    pub fn help(self: @This(), w: *Io.Writer) !void {
+        defer w.flush() catch {};
+
+        if (self.long) |long| {
+            try w.print("{s}\n\n", .{long});
+        }
+
+        try w.print("Usage:\n{s}{s}\n", .{ tab, self.name });
+
+        if (self.subcommands.len > 0) {
+            try w.print("\nAvailable Commands:\n", .{});
+
+            var max_width: u8 = 0;
+
+            inline for (self.subcommands) |cmd| {
+                max_width = @max(max_width, cmd.name.len);
+            }
+
+            // Print short command description
+            inline for (self.subcommands) |cmd| {
+                try w.print(
+                    "{s}{s}",
+                    .{
+                        tab,
+                        cmd.name,
+                    },
+                );
+
+                for (0..(max_width - cmd.name.len)) |_| {
+                    try w.print(" ", .{});
+                }
+
+                try w.print(
+                    " {s}\n",
+                    .{
+                        cmd.short orelse "",
+                    },
+                );
+            }
+
+            try w.print("\n", .{});
+        }
+
+        // TODO: Print flags
+
+        // TODO: Print arguments
+
+        if (self.subcommands.len > 0) {
+            try w.print(
+                "Use \"{s} [command] --help\" for more information about a command.",
+                .{self.name},
+            );
+        }
+    }
+};
+
+pub const ParseError = error{
+    InvalidType,
+};
+
+const CommandOptions = struct {
+    name: []const u8,
+    short: ?[]const u8 = null,
+    long: ?[]const u8 = null,
+    subcommands: []const CommandOptions = &[0]CommandOptions{},
+
+    fn as_enum(self: @This()) type {
+        var field_names: [self.subcommands.len + 2][]const u8 = undefined;
+        var field_values: [self.subcommands.len + 2]u32 = undefined;
+
+        field_names[0] = self.name;
+        field_values[0] = 0;
+
+        inline for (self.subcommands, 1..) |cmd, idx| {
+            field_names[idx] = cmd.name;
+            field_values[idx] = idx;
+        }
+
+        field_names[self.subcommands.len + 1] = "unknown";
+        field_values[self.subcommands.len + 1] = self.subcommands.len + 1;
+
+        return @Enum(
+            u32,
+            .exhaustive,
+            &field_names,
+            &field_values,
+        );
+    }
+};
+
+// /// parses the args into params
+// pub fn params(cmd: Command, args: [][]const u8) cmd.Params {
+// }

src/main.zig

@@ -0,0 +1,149 @@
+const std = @import("std");
+const Io = std.Io;
+
+const config = @import("config");
+const comma = @import("comma");
+const envr = @import("envr");
+
+const goBinary = "envr-go";
+
+pub fn main(init: std.process.Init) !void {
+    // This is appropriate for anything that lives as long as the process.
+    const arena: std.mem.Allocator = init.arena.allocator();
+
+    const args = try init.minimal.args.toSlice(arena);
+
+    try run(init.environ_map, init.io, arena, args);
+}
+
+/// Attempt to run the requested command.
+fn run(
+    environ_map: *std.process.Environ.Map,
+    io: Io,
+    arena: std.mem.Allocator,
+    args: []const [:0]const u8,
+) !void {
+    const page_size = std.heap.pageSize();
+
+    const cmd = envr.root.parse(args[1..]);
+    switch (cmd) {
+        .envr => {
+            var stdout_buffer: [page_size]u8 = undefined;
+            var stdout_file_writer: Io.File.Writer = .init(.stdout(), io, &stdout_buffer);
+            const stdout_writer = &stdout_file_writer.interface;
+
+            return envr.root.help(stdout_writer);
+        },
+        .deps => {
+            var stdout_buffer: [1024]u8 = undefined;
+            var stdout_file_writer: Io.File.Writer = .init(.stdout(), io, &stdout_buffer);
+            const stdout_writer = &stdout_file_writer.interface;
+
+            return envr.deps(
+                io,
+                stdout_writer,
+                environ_map.get("PATH").?,
+            );
+        },
+        .init => {
+            var stdout_buffer: [1024]u8 = undefined;
+            var stdout_file_writer: Io.File.Writer = .init(.stdout(), io, &stdout_buffer);
+            const stdout_writer = &stdout_file_writer.interface;
+
+            try envr.init_cmd(
+                io,
+                arena,
+                stdout_writer,
+                environ_map.get("HOME").?,
+                .{
+                    // TODO: Actually parse this
+                    .force = true,
+                },
+            );
+        },
+        .list => {
+            var stdout_buffer: [page_size]u8 = undefined;
+            var stdout_file_writer: Io.File.Writer = .init(.stdout(), io, &stdout_buffer);
+            const stdout_writer = &stdout_file_writer.interface;
+
+            return envr.list(
+                io,
+                arena,
+                stdout_writer,
+                environ_map.get("HOME").?,
+                // TODO: Don't hardcode this?
+                "/tmp",
+            );
+        },
+        .version => {
+            var stdout_buffer: [1024]u8 = undefined;
+            var stdout_file_writer: Io.File.Writer = .init(.stdout(), io, &stdout_buffer);
+            const stdout_writer = &stdout_file_writer.interface;
+
+            return version(stdout_writer);
+        },
+        .unknown => {
+            return fallback_to_go(io, arena, args);
+        },
+    }
+}
+
+fn version(writer: *Io.Writer) !void {
+    try writer.print("{s}\n", .{config.version});
+    try writer.flush();
+}
+
+fn fallback_to_go(
+    io: Io,
+    arena: std.mem.Allocator,
+    args: []const [:0]const u8,
+) std.process.ReplaceError {
+    // Remap args
+    var childArgs = try std.ArrayList([]const u8).initCapacity(arena, args.len);
+    childArgs.appendAssumeCapacity(goBinary);
+
+    for (args[1..]) |arg| {
+        childArgs.appendAssumeCapacity(arg);
+    }
+
+    return std.process.replace(io, .{ .argv = childArgs.items });
+}
+
+test "simple test" {
+    const gpa = std.testing.allocator;
+    var alist: std.ArrayList(i32) = .empty;
+    defer alist.deinit(gpa); // Try commenting this out and see if zig detects the memory leak!
+    try alist.append(gpa, 42);
+    try std.testing.expectEqual(@as(i32, 42), alist.pop());
+}
+
+test "fuzz example" {
+    try std.testing.fuzz({}, testOne, .{});
+}
+
+fn testOne(context: void, smith: *std.testing.Smith) !void {
+    _ = context;
+    // Try passing `--fuzz` to `zig build test` and see if it manages to fail this test case!
+
+    const gpa = std.testing.allocator;
+    var alist: std.ArrayList(u8) = .empty;
+    defer alist.deinit(gpa);
+    while (!smith.eos()) switch (smith.value(enum { add_data, dup_data })) {
+        .add_data => {
+            const slice = try alist.addManyAsSlice(gpa, smith.value(u4));
+            smith.bytes(slice);
+        },
+        .dup_data => {
+            if (alist.items.len == 0) continue;
+            if (alist.items.len > std.math.maxInt(u32)) return error.SkipZigTest;
+            const len = smith.valueRangeAtMost(u32, 1, @min(32, alist.items.len));
+            const off = smith.valueRangeAtMost(u32, 0, @intCast(alist.items.len - len));
+            try alist.appendSlice(gpa, alist.items[off..][0..len]);
+            try std.testing.expectEqualSlices(
+                u8,
+                alist.items[off..][0..len],
+                alist.items[alist.items.len - len ..],
+            );
+        },
+    };
+}

src/root.zig

@@ -0,0 +1,423 @@
+//! By convention, root.zig is the root source file when making a package.
+const std = @import("std");
+const Io = std.Io;
+
+const Command = @import("comma").Command;
+
+const Config = @import("Config.zig");
+const Db = @import("Db.zig");
+const tabula = @import("./tabula.zig");
+
+pub const root: Command = .new(.{
+    .name = "envr",
+    .short = "Manage your .env files.",
+    .long =
+    \\envr keeps your .env synced to a local, age encrypted database.
+    \\It is a safe and eay way to gather all your .env files in one place where they can
+    \\easily be backed by another tool such as restic or git.
+    \\All your data is stored in ~/data.age
+    \\
+    \\Getting started is easy:
+    \\
+    \\1. Create your configuration file and set up encrypted storage:
+    \\
+    \\> envr init
+    \\
+    \\2. Scan for existing .env files:
+    \\
+    \\> envr scan
+    \\
+    \\Select the files you want to back up from the interactive list.
+    \\
+    \\3. Verify that it worked:
+    \\
+    \\> envr list
+    \\
+    \\4. After changing any of your .env files, update the backup with:
+    \\
+    \\> envr sync
+    \\
+    \\5. If you lose a repository, after re-cloning the repo into the same path it was
+    \\at before, restore your backup with:
+    \\
+    \\> envr restore <path to repository> .env
+    ,
+    .subcommands = &.{
+        .{
+            .name = "deps",
+            .short = "Check for missing binaries",
+            .long =
+            \\envr relies on external binaries for certain functionality.
+            \\
+            \\ The deps command reports which binaries are available and which are not."
+            ,
+        },
+        .{
+            .name = "init",
+            .short = "Set up envr",
+            .long =
+            \\The init command generates your initial config and saves it to
+            \\~/.envr/config in JSON format.
+            \\
+            \\During setup, you will be prompted to select one or more ssh keys with which to
+            \\encrypt your databse. **Make 100% sure** that you have **a remote copy** of this
+            \\key somewhere, otherwise your data could be lost forever.
+            ,
+            //.flags =  struct { force: bool }
+        },
+        .{
+            .name = "list",
+            .short = "View your tracked files",
+        },
+        .{
+            .name = "version",
+            .short = "Show envr's version",
+        },
+    },
+});
+
+// Display dependency statuses
+pub fn deps(
+    io: Io,
+    writer: *Io.Writer,
+    path: []const u8,
+) !void {
+    const feats: Features = try .scan(io, path);
+
+    // FIXME: Draw as a table
+    try writer.print("features: {}", .{feats});
+    try writer.flush();
+}
+
+const Features = packed struct {
+    git: bool = false,
+    fd: bool = false,
+    const all_features: Features = .{
+        .git = true,
+        .fd = true,
+    };
+
+    /// Scans your PATH variable for programs.
+    pub fn scan(io: Io, path: []const u8) !@This() {
+        var feats: Features = .{};
+
+        var dirs = std.mem.splitScalar(u8, path, std.fs.path.delimiter);
+
+        loop: while (dirs.next()) |dir| {
+            const dirt = Io.Dir.openDir(Io.Dir.cwd(), io, dir, .{ .follow_symlinks = true, .iterate = true }) catch continue;
+            defer dirt.close(io);
+
+            var dir_paths = dirt.iterate();
+
+            while (try dir_paths.next(io)) |file| {
+                // FIXME: Check if executable
+                if (std.mem.eql(u8, std.fs.path.basename(file.name), "git")) {
+                    feats.git = true;
+
+                    if (feats == Features.all_features) {
+                        break :loop;
+                    }
+                }
+
+                if (std.mem.eql(u8, std.fs.path.basename(file.name), "fd")) {
+                    feats.fd = true;
+
+                    if (feats == Features.all_features) {
+                        break :loop;
+                    }
+                }
+            }
+        }
+
+        return feats;
+    }
+};
+
+pub fn init_cmd(
+    io: Io,
+    arena: std.mem.Allocator,
+    out: *std.Io.Writer,
+    home: []const u8,
+    flags: struct { force: bool },
+) !void {
+    defer out.flush() catch unreachable;
+
+    // TODO: Don't hardcode
+    const cfgPath = try std.fs.path.join(arena, &.{ home, ".envr", "config.json" });
+    defer arena.free(cfgPath);
+
+    if (flags.force or !file_exists(io, cfgPath)) {
+        const keys = try select_ssh_keys(io, arena, home, out);
+
+        // defer {
+        // for (keys) |*key| {
+        // arena.destroy(key);
+        // }
+        // arena.free(&keys);
+        // }
+
+        // const cfg: Config = .{ .keys = keys };
+        // TODO: How to handle this error?
+        // try cfg.save(io, cfgPath);
+
+        try out.print(
+            "Config initialized with {} SSH key(s). You are ready to use envr.\n",
+            .{keys.len},
+        );
+    } else {
+        try out.writeAll(
+            \\You have already initialized envr.
+            \\Run again with the --force flag if you want to reinitialize.
+            \\
+            ,
+        );
+    }
+}
+
+/// Returns true if the file exists
+fn file_exists(io: std.Io, path: []const u8) bool {
+    if (std.Io.Dir.cwd().access(io, path, .{ .read = true })) {
+        return true;
+    } else |_| {
+        return false;
+    }
+}
+
+/// Returns a list of keys that the user has selected to add to their config.
+/// Caller owns the returned memory
+// TODO: Write a test for this
+fn select_ssh_keys(
+    io: std.Io,
+    alloc: std.mem.Allocator,
+    home_path: []const u8,
+    out: *std.Io.Writer,
+) ![]Config.SSHKeyPair {
+    const ssh_path = try std.fs.path.join(alloc, &.{ home_path, ".ssh" });
+    defer alloc.free(ssh_path);
+
+    // TODO: Arbitrary capacity chosen
+    var keys: std.ArrayList(Config.SSHKeyPair) = try .initCapacity(alloc, 3);
+
+    {
+        const ssh_dir = try std.Io.Dir.cwd().openDir(io, ssh_path, .{ .iterate = true });
+        defer ssh_dir.close(io);
+
+        var itr = ssh_dir.iterate();
+
+        const expect1 =
+            \\-----BEGIN OPENSSH PRIVATE KEY-----
+            \\
+        ;
+
+        const expect2 =
+            \\-----BEGIN RSA PRIVATE KEY-----
+            \\
+        ;
+
+        var buf: [expect1.len]u8 = undefined;
+
+        while (try itr.next(io)) |entry| {
+            switch (entry.kind) {
+                .file => {
+                    var file = try ssh_dir.openFile(io, entry.name, .{});
+                    _ = try file.readPositionalAll(io, &buf, 0);
+
+                    // TODO: Faster to use hash or something?
+                    if ( // zig fmt: off
+                        std.mem.eql(u8, expect1, &buf) or 
+                        std.mem.eql(u8, expect2, buf[0..expect2.len])
+                       ) { // zig fmt: on
+                        // File is a private ssh key
+
+                        const full_path = try ssh_dir.realPathFileAlloc(
+                            io,
+                            entry.name,
+                            alloc,
+                        );
+
+                        try keys.append(alloc, try .from_path(alloc, full_path));
+                    }
+                },
+                .sym_link => {
+                    // TODO: Handle symlinks
+                },
+                .block_device,
+                .character_device,
+                .directory,
+                .named_pipe,
+                .unix_domain_socket,
+                .whiteout,
+                .door,
+                .event_port,
+                .unknown,
+                => continue,
+            }
+        }
+    }
+
+    for (keys.items, 1..) |key, n| {
+        try out.print("{d}. {s}\n", .{ n, key.private });
+    }
+    try out.writeAll(
+        "\nPlease enter the number(s) of SSH keys you'd like to use for encryption:\n> ",
+    );
+    try out.flush();
+    defer out.writeAll("\n\n") catch unreachable;
+
+    // TODO: ask user for number(s) to use.
+    // TODO: confirm with a y/n prompt
+    // TODO: only return selected keys
+
+    return keys.toOwnedSlice(alloc);
+}
+
+pub fn list(
+    io: Io,
+    arena: std.mem.Allocator,
+    out: *std.Io.Writer,
+    home: []const u8,
+    tmp: []const u8,
+) !void {
+    // TODO: Don't hardcode
+    const cfgPath = try std.fs.path.join(arena, &.{ home, ".envr", "config.json" });
+    defer arena.free(cfgPath);
+
+    var cfg = (try Config.load(io, arena, cfgPath));
+    defer cfg.deinit();
+
+    var db: Db = try .open(io, arena, .{
+        .config = cfg.value,
+        .home = home,
+        .tmp = tmp,
+    });
+
+    const files = try db.list(arena);
+    defer arena.free(files);
+
+    const table: tabula.Table(Db.EnvFile, .initOne(.path)) = .{ .items = files };
+    try out.print("{f}", .{table});
+    try out.flush();
+
+    try db.close(io, arena); // TODO: Defer this
+
+    for (files) |*file| {
+        file.deinit(arena);
+    }
+}
+
+test {
+    std.testing.refAllDecls(@import("Config.zig"));
+    std.testing.refAllDecls(@import("Db.zig"));
+}
+
+test "enum type" {
+    const got: root.Type = @enumFromInt(3);
+
+    try std.testing.expectEqual(.version, got);
+}
+
+test "parse deps" {
+    const args = &[_][]const u8{"deps"};
+    const cmd = root.parse(args);
+
+    try std.testing.expectEqual(.deps, cmd);
+}
+
+test "parse list" {
+    const args = &[_][]const u8{"list"};
+    const cmd = root.parse(args);
+
+    try std.testing.expectEqual(.list, cmd);
+}
+
+test "parse version" {
+    const args = &[_][]const u8{"version"};
+    const cmd = root.parse(args);
+
+    try std.testing.expectEqual(.version, cmd);
+}
+
+test "parse unknown" {
+    const args = &[_][]const u8{ "bad", "value" };
+    const cmd = root.parse(args);
+
+    try std.testing.expectEqual(.unknown, cmd);
+}
+
+test "list returns a table" {
+    const io = std.testing.io;
+    const gpa = std.testing.allocator;
+
+    var tmp_dir = std.testing.tmpDir(.{});
+    defer tmp_dir.cleanup();
+
+    try tmp_dir.dir.createDir(io, "home", .default_dir);
+    try tmp_dir.dir.createDir(io, "home/.envr", .default_dir);
+    try tmp_dir.dir.createDir(io, "home/.ssh", .default_dir);
+    try tmp_dir.dir.createDir(io, "tmp", .default_dir);
+
+    const tmp_dir_path = try tmp_dir.dir.realPathFileAlloc(io, ".", gpa);
+    defer gpa.free(tmp_dir_path);
+
+    const home = try std.fs.path.join(gpa, &.{ tmp_dir_path, "home" });
+    defer gpa.free(home);
+    const tmp = try std.fs.path.join(gpa, &.{ tmp_dir_path, "tmp" });
+    defer gpa.free(tmp);
+
+    try std.Io.Dir.cwd().copyFile(
+        "fixtures/encrypted-single-file.db.age",
+        tmp_dir.dir,
+        "home/.envr/data.age",
+        io,
+        .{},
+    );
+
+    try std.Io.Dir.cwd().copyFile(
+        "fixtures/default_config.json",
+        tmp_dir.dir,
+        "home/.envr/config.json",
+        io,
+        .{},
+    );
+
+    try std.Io.Dir.cwd().copyFile(
+        "fixtures/insecure-test-key",
+        tmp_dir.dir,
+        "home/.ssh/id_ed25519",
+        io,
+        .{},
+    );
+
+    try std.Io.Dir.cwd().copyFile(
+        "fixtures/insecure-test-key.pub",
+        tmp_dir.dir,
+        "home/.ssh/id_ed25519.pub",
+        io,
+        .{},
+    );
+
+    var out: std.Io.Writer.Allocating = .init(gpa);
+    defer out.deinit();
+
+    // Run Test
+
+    try list(
+        io,
+        std.testing.allocator,
+        &out.writer,
+        home,
+        tmp,
+    );
+
+    const got = try out.toOwnedSlice();
+    defer gpa.free(got);
+
+    try std.testing.expectEqualStrings(
+        \\┌────────────────────────┐
+        \\│          path          │
+        \\├────────────────────────┤
+        \\│ ~/project/.env.example │
+        \\└────────────────────────┘
+        \\
+    , got);
+}

src/tabula.zig

@@ -0,0 +1,311 @@
+const std = @import("std");
+
+const hor = "─";
+const tl = "┌";
+const tm = "┬";
+const tr = "┐";
+const sep = "│";
+const ml = "├";
+const mm = "┼";
+const mr = "┤";
+const bl = "└";
+const bm = "┴";
+const br = "┘";
+
+/// Prepare a TUI table to be written to a writer.
+pub fn Table(
+    comptime T: type,
+    comptime fields: std.EnumSet(std.meta.FieldEnum(T)),
+) type {
+    return struct {
+        items: []const T,
+
+        pub fn format(self: @This(), writer: *std.Io.Writer) !void {
+            const max_column_widths = determine_col_widths(T, self.items);
+
+            try header(T, fields, &max_column_widths, writer);
+
+            // Print body
+            for (self.items) |item| {
+                try writer.writeAll(sep);
+
+                comptime var itr = fields.iterator();
+                comptime var i: usize = 0;
+                inline while (comptime itr.next()) |c| : (i += 1) {
+                    try writer.writeByte(' ');
+                    try write_aligned(writer, @field(item, @tagName(c)), max_column_widths[i], .left);
+                    try writer.print(" {s}", .{sep});
+                }
+
+                try writer.writeAll("\n");
+            }
+
+            // Print post-body
+            {
+                try writer.writeAll(bl);
+
+                var itr = fields.iterator();
+                var i: usize = 0;
+                while (itr.next()) |_| : (i += 1) {
+                    if (i > 0) {
+                        try writer.writeAll(bm);
+                    }
+
+                    const padding = max_column_widths[i] + 2;
+                    for (0..padding) |_| {
+                        try writer.writeAll(hor);
+                    }
+                }
+
+                try writer.writeAll(br ++ "\n");
+            }
+        }
+    };
+}
+
+fn determine_col_widths(
+    T: type,
+    items: []const T,
+) [@typeInfo(T).@"struct".fields.len]usize {
+    const all_fields = @typeInfo(T).@"struct".fields;
+
+    var max_column_widths: [all_fields.len]usize = @splat(0);
+    for (items) |item| {
+        inline for (all_fields, 0..) |field, i| {
+            // TODO: Get str len of item
+            const value_len = @field(item, field.name).len;
+            max_column_widths[i] = @max(
+                max_column_widths[i],
+                field.name.len,
+                value_len,
+            );
+        }
+    }
+
+    return max_column_widths;
+}
+
+// Print the header of a table
+fn header(
+    T: type,
+    comptime fields: std.EnumSet(std.meta.FieldEnum(T)),
+    max_column_widths: []const usize,
+    writer: *std.Io.Writer,
+) !void {
+
+    // Print Pre-Header
+    {
+        try writer.writeAll(tl);
+
+        inline for (0..comptime fields.count()) |i| {
+            if (i > 0) {
+                try writer.writeAll(tm);
+            }
+            const padding = max_column_widths[i] + 2;
+            for (0..padding) |_| {
+                try writer.writeAll(hor);
+            }
+        }
+
+        try writer.writeAll(tr ++ "\n");
+    }
+
+    // Main Header
+    {
+        try writer.writeAll(sep);
+
+        comptime var itr = fields.iterator();
+        comptime var i: usize = 0;
+        inline while (comptime itr.next()) |field| : (i += 1) {
+            try writer.writeByte(' ');
+            try write_aligned(
+                writer,
+                @tagName(field),
+                max_column_widths[i],
+                .center,
+            );
+            try writer.print(" {s}", .{sep});
+        }
+
+        try writer.writeByte('\n');
+    }
+
+    // Print post-header
+    {
+        try writer.writeAll(ml);
+
+        inline for (0..comptime fields.count()) |i| {
+            if (i > 0) {
+                try writer.writeAll(mm);
+            }
+            const padding = max_column_widths[i] + 2;
+            for (0..padding) |_| {
+                try writer.writeAll(hor);
+            }
+        }
+
+      try writer.writeAll(mr ++ "\n");
+    }
+}
+
+fn write_aligned(
+    writer: *std.Io.Writer,
+    data: []const u8,
+    max_width: usize,
+    alignment: Alignment,
+) !void {
+    std.debug.assert(data.len > 0);
+    std.debug.assert(max_width >= data.len);
+
+    const padding: [2]usize = switch (alignment) {
+        .left => .{ 0, max_width - data.len },
+        .right => .{ max_width - data.len, 0 },
+        .center => blk: {
+            // Faster to inline the divFloor?
+            const half = @divFloor(max_width - data.len, 2);
+            break :blk .{ half, max_width - data.len - half };
+        },
+    };
+
+    for (0..padding[0]) |_| {
+        try writer.writeByte(' ');
+    }
+
+    try writer.writeAll(data);
+
+    for (0..padding[1]) |_| {
+        try writer.writeByte(' ');
+    }
+}
+
+const Alignment = enum { left, center, right };
+
+test "can print a simple table" {
+    const gpa = std.testing.allocator;
+
+    var out: std.Io.Writer.Allocating = .init(gpa);
+    defer out.deinit();
+
+    const F = struct { foo: []const u8, bar: []const u8 };
+    const table: Table(F, .full) = .{
+        .items = &.{.{ .foo = "bat", .bar = "baz" }},
+    };
+
+    try out.writer.print("{f}", .{table});
+
+    const got = try out.toOwnedSlice();
+    defer gpa.free(got);
+
+    try std.testing.expectEqualStrings(
+        \\┌─────┬─────┐
+        \\│ foo │ bar │
+        \\├─────┼─────┤
+        \\│ bat │ baz │
+        \\└─────┴─────┘
+        \\
+    , got);
+}
+
+test "can print a table with varying header widths" {
+    const gpa = std.testing.allocator;
+
+    var out: std.Io.Writer.Allocating = .init(gpa);
+    defer out.deinit();
+
+    const F = struct { foo: []const u8, abart: []const u8 };
+    const table: Table(F, .full) = .{
+        .items = &.{.{ .foo = "bat", .abart = "baz" }},
+    };
+    try out.writer.print("{f}", .{table});
+
+    const got = try out.toOwnedSlice();
+    defer gpa.free(got);
+
+    try std.testing.expectEqualStrings(
+        \\┌─────┬───────┐
+        \\│ foo │ abart │
+        \\├─────┼───────┤
+        \\│ bat │ baz   │
+        \\└─────┴───────┘
+        \\
+    , got);
+}
+
+test "can print a table with varying column widths" {
+    const gpa = std.testing.allocator;
+
+    var out: std.Io.Writer.Allocating = .init(gpa);
+    defer out.deinit();
+
+    const F = struct { foo: []const u8, bar: []const u8 };
+    const table: Table(F, .full) = .{ .items = &.{.{ .foo = "bat", .bar = "bazzar" }} };
+
+    try out.writer.print("{f}", .{table});
+
+    const got = try out.toOwnedSlice();
+    defer gpa.free(got);
+
+    try std.testing.expectEqualStrings(
+        \\┌─────┬────────┐
+        \\│ foo │  bar   │
+        \\├─────┼────────┤
+        \\│ bat │ bazzar │
+        \\└─────┴────────┘
+        \\
+    , got);
+}
+
+test "can print a multi row table with varying column widths" {
+    const gpa = std.testing.allocator;
+
+    var out: std.Io.Writer.Allocating = .init(gpa);
+    defer out.deinit();
+
+    const F = struct { foo: []const u8, bar: []const u8 };
+    const table: Table(F, .full) = .{
+        .items = &.{
+            .{ .foo = "baz", .bar = "quz" },
+            .{ .foo = "bat", .bar = "bazzar" },
+        },
+    };
+    try out.writer.print("{f}", .{table});
+
+    const got = try out.toOwnedSlice();
+    defer gpa.free(got);
+
+    try std.testing.expectEqualStrings(
+        \\┌─────┬────────┐
+        \\│ foo │  bar   │
+        \\├─────┼────────┤
+        \\│ baz │ quz    │
+        \\│ bat │ bazzar │
+        \\└─────┴────────┘
+        \\
+    , got);
+}
+
+test "can print a table with limited columns" {
+    const gpa = std.testing.allocator;
+
+    var out: std.Io.Writer.Allocating = .init(gpa);
+    defer out.deinit();
+
+    const F = struct { foo: []const u8, bar: []const u8 };
+    const table: Table(F, .initOne(.foo)) = .{
+        .items = &.{.{ .foo = "bat", .bar = "baz" }},
+    };
+
+    try out.writer.print("{f}", .{table});
+
+    const got = try out.toOwnedSlice();
+    defer gpa.free(got);
+
+    try std.testing.expectEqualStrings(
+        \\┌─────┐
+        \\│ foo │
+        \\├─────┤
+        \\│ bat │
+        \\└─────┘
+        \\
+    , got);
+}

ssh.odin

@@ -1,255 +0,0 @@
-package main
-
-import "core:encoding/base64"
-import "core:fmt"
-import "core:os"
-import "core:strings"
-
-SSH_ED25519 :: "ssh-ed25519"
-
-Ed25519Keypair :: struct {
-	Public:  [32]u8,
-	Private: [32]u8,
-}
-
-read_wire_string :: proc(data: []u8, offset: ^int) -> (s: string, ok: bool) {
-	if offset^ + 4 > len(data) {
-		return
-	}
-	length := u32(data[offset^]) << 24 | u32(data[offset^ + 1]) << 16 |
-		u32(data[offset^ + 2]) << 8 | u32(data[offset^ + 3])
-	offset^ += 4
-
-	if offset^ + int(length) > len(data) {
-		return
-	}
-
-	s = string(data[offset^ : offset^ + int(length)])
-	offset^ += int(length)
-	ok = true
-	return
-}
-
-parse_ssh_public_key :: proc(pub_path: string) -> (pub: [32]u8, ok: bool) {
-	data, err := os.read_entire_file_from_path(pub_path, context.temp_allocator)
-	if err != nil {
-		return
-	}
-
-	text := strings.trim_right(string(data), "\n")
-	parts := strings.split(text, " ", context.temp_allocator)
-	if len(parts) < 2 {
-		return
-	}
-	if parts[0] != SSH_ED25519 {
-		return
-	}
-
-	decoded, decode_err := base64.decode(parts[1], allocator = context.temp_allocator)
-	if decode_err != nil || len(decoded) < 51 {
-		return
-	}
-
-	offset := 0
-	key_type, type_ok := read_wire_string(decoded, &offset)
-	if !type_ok || key_type != SSH_ED25519 {
-		return
-	}
-
-	pk_data, pk_ok := read_wire_string(decoded, &offset)
-	if !pk_ok || len(pk_data) != 32 {
-		return
-	}
-
-	for i in 0 ..< 32 {
-		pub[i] = pk_data[i]
-	}
-
-	ok = true
-	return
-}
-
-parse_ssh_private_key :: proc(priv_path: string) -> (kp: Ed25519Keypair, ok: bool) {
-	data, err := os.read_entire_file_from_path(priv_path, context.temp_allocator)
-	if err != nil {
-		return
-	}
-
-	text := string(data)
-	lines := strings.split(text, "\n", context.temp_allocator)
-
-	b: strings.Builder
-	strings.builder_init(&b, context.temp_allocator)
-	defer strings.builder_destroy(&b)
-
-	in_block := false
-	for line in lines {
-		trimmed := strings.trim_space(line)
-		if trimmed == "-----BEGIN OPENSSH PRIVATE KEY-----" {
-			in_block = true
-			continue
-		}
-		if trimmed == "-----END OPENSSH PRIVATE KEY-----" {
-			break
-		}
-		if in_block && len(trimmed) > 0 {
-			fmt.sbprintf(&b, "%s", trimmed)
-		}
-	}
-
-	b64_str := strings.to_string(b)
-	decoded, decode_err := base64.decode(b64_str, allocator = context.temp_allocator)
-	if decode_err != nil {
-		return
-	}
-
-	magic := "openssh-key-v1\x00"
-	if len(decoded) < len(magic) {
-		return
-	}
-	for i in 0 ..< len(magic) {
-		if decoded[i] != u8(magic[i]) {
-			return
-		}
-	}
-
-	offset := len(magic)
-
-	ciphername, cipher_ok := read_wire_string(decoded, &offset)
-	if !cipher_ok || ciphername != "none" {
-		return
-	}
-
-	kdfname, kdf_ok := read_wire_string(decoded, &offset)
-	if !kdf_ok || kdfname != "none" {
-		return
-	}
-
-	_, opts_ok := read_wire_string(decoded, &offset)
-	if !opts_ok {
-		return
-	}
-
-	if offset + 4 > len(decoded) {
-		return
-	}
-	num_keys := u32(decoded[offset]) << 24 | u32(decoded[offset + 1]) << 16 |
-		u32(decoded[offset + 2]) << 8 | u32(decoded[offset + 3])
-	offset += 4
-
-	if num_keys != 1 {
-		return
-	}
-
-	_, pub_blob_ok := read_wire_string(decoded, &offset)
-	if !pub_blob_ok {
-		return
-	}
-
-	priv_blob, priv_blob_ok := read_wire_string(decoded, &offset)
-	if !priv_blob_ok {
-		return
-	}
-
-	inner_offset := 0
-	if inner_offset + 8 > len(priv_blob) {
-		return
-	}
-	check1 := u32(priv_blob[inner_offset]) << 24 | u32(priv_blob[inner_offset + 1]) << 16 |
-		u32(priv_blob[inner_offset + 2]) << 8 | u32(priv_blob[inner_offset + 3])
-	inner_offset += 4
-	check2 := u32(priv_blob[inner_offset]) << 24 | u32(priv_blob[inner_offset + 1]) << 16 |
-		u32(priv_blob[inner_offset + 2]) << 8 | u32(priv_blob[inner_offset + 3])
-	inner_offset += 4
-
-	if check1 != check2 {
-		return
-	}
-
-	priv_type, type_ok := read_wire_string(transmute([]u8)priv_blob, &inner_offset)
-	if !type_ok || priv_type != SSH_ED25519 {
-		return
-	}
-
-	pub_wire, pub_ok := read_wire_string(transmute([]u8)priv_blob, &inner_offset)
-	if !pub_ok || len(pub_wire) != 32 {
-		return
-	}
-	for i in 0 ..< 32 {
-		kp.Public[i] = pub_wire[i]
-	}
-
-	priv_wire, priv_ok := read_wire_string(transmute([]u8)priv_blob, &inner_offset)
-	if !priv_ok || len(priv_wire) != 64 {
-		return
-	}
-	for i in 0 ..< 32 {
-		kp.Private[i] = priv_wire[i]
-	}
-
-	ok = true
-	return
-}
-
-is_ed25519_key :: proc(priv_path: string) -> bool {
-	pub_path, _ := strings.concatenate([]string{priv_path, ".pub"}, context.temp_allocator)
-	_, ok := parse_ssh_public_key(pub_path)
-	return ok
-}
-
-is_encrypted_key :: proc(priv_path: string) -> bool {
-	data, err := os.read_entire_file_from_path(priv_path, context.temp_allocator)
-	if err != nil {
-		return true
-	}
-
-	if !strings.contains(string(data), "BEGIN OPENSSH PRIVATE KEY") {
-		return true
-	}
-
-	text := string(data)
-	lines := strings.split(text, "\n", context.temp_allocator)
-
-	b2: strings.Builder
-	strings.builder_init(&b2, context.temp_allocator)
-	defer strings.builder_destroy(&b2)
-
-	in_block := false
-	for line in lines {
-		trimmed := strings.trim_space(line)
-		if trimmed == "-----BEGIN OPENSSH PRIVATE KEY-----" {
-			in_block = true
-			continue
-		}
-		if trimmed == "-----END OPENSSH PRIVATE KEY-----" {
-			break
-		}
-		if in_block && len(trimmed) > 0 {
-			fmt.sbprintf(&b2, "%s", trimmed)
-		}
-	}
-
-	b64_str := strings.to_string(b2)
-	decoded, decode_err := base64.decode(b64_str, allocator = context.temp_allocator)
-	if decode_err != nil {
-		return true
-	}
-
-	magic := "openssh-key-v1\x00"
-	if len(decoded) < len(magic) {
-		return true
-	}
-	for i in 0 ..< len(magic) {
-		if decoded[i] != u8(magic[i]) {
-			return true
-		}
-	}
-
-	offset := len(magic)
-	ciphername, cipher_ok := read_wire_string(decoded, &offset)
-	if !cipher_ok {
-		return true
-	}
-
-	return ciphername != "none"
-}

ssh_test.odin

@@ -1,108 +0,0 @@
-package main
-
-import "core:fmt"
-import "core:testing"
-
-TEST_KEY_DIR :: "fixtures/keys"
-
-@(test)
-test_parse_ed25519_public_key :: proc(t: ^testing.T) {
-	pub, ok := parse_ssh_public_key(TEST_KEY_DIR + "/test_ed25519.pub")
-	testing.expect(t, ok, "expected ed25519 public key to parse")
-	testing.expect(t, pub != [32]u8{}, fmt.tprintf("expected non-zero public key"))
-}
-
-@(test)
-test_parse_ed25519_private_key :: proc(t: ^testing.T) {
-	kp, ok := parse_ssh_private_key(TEST_KEY_DIR + "/test_ed25519")
-	testing.expect(t, ok, "expected ed25519 private key to parse")
-	testing.expect(t, kp.Public != [32]u8{}, "expected non-zero public key")
-	testing.expect(t, kp.Private != [32]u8{}, "expected non-zero private key")
-}
-
-@(test)
-test_parse_rsa_public_key_fails :: proc(t: ^testing.T) {
-	_, ok := parse_ssh_public_key(TEST_KEY_DIR + "/test_rsa.pub")
-	testing.expect(t, !ok, "expected RSA key parsing to fail")
-}
-
-@(test)
-test_is_ed25519_key_true :: proc(t: ^testing.T) {
-	testing.expect(t, is_ed25519_key(TEST_KEY_DIR + "/test_ed25519"))
-}
-
-@(test)
-test_is_ed25519_key_false_for_rsa :: proc(t: ^testing.T) {
-	testing.expect(t, !is_ed25519_key(TEST_KEY_DIR + "/test_rsa"))
-}
-
-@(test)
-test_private_key_pub_matches_public_key :: proc(t: ^testing.T) {
-	pub_from_pub, pub_ok := parse_ssh_public_key(TEST_KEY_DIR + "/test_ed25519.pub")
-	testing.expect(t, pub_ok, "expected public key to parse")
-
-	kp, priv_ok := parse_ssh_private_key(TEST_KEY_DIR + "/test_ed25519")
-	testing.expect(t, priv_ok, "expected private key to parse")
-
-	testing.expect(
-		t,
-		pub_from_pub == kp.Public,
-		fmt.tprintf(
-			"public key mismatch:\n  from .pub: %v\n  from priv: %v",
-			pub_from_pub,
-			kp.Public,
-		),
-	)
-}
-
-@(test)
-test_read_wire_string :: proc(t: ^testing.T) {
-	data := []u8{0, 0, 0, 5, u8('h'), u8('e'), u8('l'), u8('l'), u8('o'), 0, 0, 0, 0}
-	offset := 0
-
-	s, ok := read_wire_string(data, &offset)
-	testing.expect(t, ok, "expected read_wire_string to succeed")
-	testing.expect(t, s == "hello", fmt.tprintf("expected 'hello', got %q", s))
-	testing.expect(t, offset == 9, fmt.tprintf("expected offset 9, got %d", offset))
-
-	s2, ok2 := read_wire_string(data, &offset)
-	testing.expect(t, ok2, "expected second read to succeed")
-	testing.expect(t, s2 == "", "expected empty string")
-}
-
-@(test)
-test_is_encrypted_key_encrypted :: proc(t: ^testing.T) {
-	testing.expect(
-		t,
-		is_encrypted_key(TEST_KEY_DIR + "/test_ed25519_encrypted"),
-		"encrypted key should be detected as encrypted",
-	)
-}
-
-@(test)
-test_is_encrypted_key_unencrypted :: proc(t: ^testing.T) {
-	testing.expect(
-		t,
-		!is_encrypted_key(TEST_KEY_DIR + "/test_ed25519"),
-		"unencrypted key should not be detected as encrypted",
-	)
-}
-
-@(test)
-test_is_encrypted_key_rsa_unencrypted :: proc(t: ^testing.T) {
-	testing.expect(
-		t,
-		!is_encrypted_key(TEST_KEY_DIR + "/test_rsa"),
-		"unencrypted RSA key should not be detected as encrypted",
-	)
-}
-
-@(test)
-test_is_encrypted_key_missing_file :: proc(t: ^testing.T) {
-	testing.expect(
-		t,
-		is_encrypted_key(TEST_KEY_DIR + "/nonexistent"),
-		"missing file should be treated as encrypted (fail-safe)",
-	)
-}
-

table.odin

@@ -3,18 +3,26 @@ package main
 import "core:encoding/json"
 import "core:fmt"
 import "core:io"
+import "core:os"
 import "core:strings"
 
-render_table :: proc(w: io.Writer, headers: []string, rows: [][]string) {
+render_table :: proc(headers: []string, rows: [][]string) {
+	if !is_tty() {
+		w := io.to_writer(os.to_writer(os.stdout))
+		render_json_rows(w, headers, rows)
+		io.write_string(w, "\n")
+		return
+	}
+
 	col_widths := make([dynamic]int, 0, len(headers))
 	for i in 0 ..< len(headers) {
 		append(&col_widths, strings.rune_count(headers[i]))
 	}
 	for r in rows {
 		for i in 0 ..< len(r) {
-			rw := strings.rune_count(r[i])
-			if i < len(col_widths) && rw > col_widths[i] {
-				col_widths[i] = rw
+			w := strings.rune_count(r[i])
+			if i < len(col_widths) && w > col_widths[i] {
+				col_widths[i] = w
 			}
 		}
 	}
@@ -24,7 +32,7 @@ render_table :: proc(w: io.Writer, headers: []string, rows: [][]string) {
 	defer strings.builder_destroy(&b)
 	defer delete(col_widths)
 
-	hline :: proc(w: io.Writer, b: ^strings.Builder, left, mid, right: string, widths: [dynamic]int) {
+	hline :: proc(b: ^strings.Builder, left, mid, right: string, widths: [dynamic]int) {
 		strings.write_string(b, left)
 		for i in 0 ..< len(widths) {
 			for _ in 0 ..< widths[i] + 2 {
@@ -36,11 +44,11 @@ render_table :: proc(w: io.Writer, headers: []string, rows: [][]string) {
 				strings.write_string(b, right)
 			}
 		}
-		fmt.wprintf(w, "%s\n", strings.to_string(b^), flush = false)
+		fmt.println(strings.to_string(b^))
 		strings.builder_reset(b)
 	}
 
-	hline(w, &b, "\u250c", "\u252c", "\u2510", col_widths)
+	hline(&b, "\u250c", "\u252c", "\u2510", col_widths)
 
 	cell :: proc(b: ^strings.Builder, s: string, width: int) {
 		extra := len(s) - strings.rune_count(s)
@@ -51,21 +59,21 @@ render_table :: proc(w: io.Writer, headers: []string, rows: [][]string) {
 	for i in 0 ..< len(headers) {
 		cell(&b, headers[i], col_widths[i])
 	}
-	fmt.wprintf(w, "%s\n", strings.to_string(b), flush = false)
+	fmt.println(strings.to_string(b))
 	strings.builder_reset(&b)
 
-	hline(w, &b, "\u251c", "\u253c", "\u2524", col_widths)
+	hline(&b, "\u251c", "\u253c", "\u2524", col_widths)
 
 	for r in rows {
 		strings.write_string(&b, "\u2502")
 		for i in 0 ..< len(r) {
 			cell(&b, r[i], col_widths[i])
 		}
-		fmt.wprintf(w, "%s\n", strings.to_string(b), flush = false)
+		fmt.println(strings.to_string(b))
 		strings.builder_reset(&b)
 	}
 
-	hline(w, &b, "\u2514", "\u2534", "\u2518", col_widths)
+	hline(&b, "\u2514", "\u2534", "\u2518", col_widths)
 }
 
 render_json_rows :: proc(w: io.Writer, headers: []string, rows: [][]string) {

table_test.odin

@@ -2,6 +2,7 @@ package main
 
 import "core:encoding/json"
 import "core:fmt"
+import "core:io"
 import "core:strings"
 import "core:testing"
 
@@ -102,97 +103,3 @@ test_render_json_rows_empty :: proc(t: ^testing.T) {
 	testing.expect(t, len(result) == 0)
 }
 
-@(test)
-test_render_table_normal :: proc(t: ^testing.T) {
-	b: strings.Builder
-	strings.builder_init(&b)
-	defer strings.builder_destroy(&b)
-
-	headers := []string{"Name", "Path"}
-	rows := [][]string{{"foo", "/home/user/.env"}, {"bar", "/home/user/project/.env"}}
-
-	w := strings.to_writer(&b)
-	render_table(w, headers, rows)
-
-	output := strings.to_string(b)
-
-	expected := `┌──────┬─────────────────────────┐
-│ Name │ Path                    │
-├──────┼─────────────────────────┤
-│ foo  │ /home/user/.env         │
-│ bar  │ /home/user/project/.env │
-└──────┴─────────────────────────┘
-`
-	testing.expect(
-		t,
-		output == expected,
-		fmt.tprintf(
-			"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
-			expected,
-			output,
-		),
-	)
-}
-
-@(test)
-test_render_table_empty :: proc(t: ^testing.T) {
-	b: strings.Builder
-	strings.builder_init(&b)
-	defer strings.builder_destroy(&b)
-
-	headers := []string{"Name"}
-	rows: [][]string
-
-	w := strings.to_writer(&b)
-	render_table(w, headers, rows)
-
-	output := strings.to_string(b)
-
-	expected := `┌──────┐
-│ Name │
-├──────┤
-└──────┘
-`
-	testing.expect(
-		t,
-		output == expected,
-		fmt.tprintf(
-			"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
-			expected,
-			output,
-		),
-	)
-}
-
-@(test)
-test_render_table_unicode :: proc(t: ^testing.T) {
-	b: strings.Builder
-	strings.builder_init(&b)
-	defer strings.builder_destroy(&b)
-
-	headers := []string{"Status", "Detail"}
-	rows := [][]string{{"\u2713 Available", "ok"}, {"\u2717 Missing", "fail"}}
-
-	w := strings.to_writer(&b)
-	render_table(w, headers, rows)
-
-	output := strings.to_string(b)
-
-	expected := `┌─────────────┬────────┐
-│ Status      │ Detail │
-├─────────────┼────────┤
-│ ✓ Available │ ok     │
-│ ✗ Missing   │ fail   │
-└─────────────┴────────┘
-`
-	testing.expect(
-		t,
-		output == expected,
-		fmt.tprintf(
-			"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
-			expected,
-			output,
-		),
-	)
-}
-

tty.odin

@@ -0,0 +1,8 @@
+package main
+
+import "core:sys/posix"
+
+is_tty :: proc() -> bool {
+	return bool(posix.isatty(1))
+}
+

version.odin

@@ -0,0 +1,13 @@
+package main
+
+import "core:fmt"
+
+VERSION :: "0.2.0"
+
+cmd_version :: proc(cmd: ^Command) {
+	if has_flag(cmd, "long") || has_flag(cmd, "l") {
+		fmt.printf("envr version %s\n", VERSION)
+	} else {
+		fmt.println(VERSION)
+	}
+}

version.txt

@@ -1 +0,0 @@
-0.2.0

zig-vendor/age-ffi/.gitignore

@@ -0,0 +1 @@
+target

zig-vendor/age-ffi/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "age-ffi"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["staticlib"]
+
+[dependencies]
+age = { version = "0.11", features = ["armor", "ssh", "plugin", "cli-common"] }
+secrecy = "0.10"
+libc = "0.2"
+
+[profile.release]
+lto = true

zig-vendor/age-ffi/README.md

@@ -0,0 +1,165 @@
+# age-ffi
+
+A Rust FFI wrapper for the [age](https://github.com/str4d/rage) encryption library, with Zig bindings.
+
+## Overview
+
+This library provides C-compatible FFI bindings for the age encryption library, making it easy to use age encryption from other languages. It includes comprehensive Zig bindings and examples.
+
+## Features
+
+- **X25519 encryption** - Standard age public key encryption (`age1...`)
+- **SSH key support** - Encrypt to SSH keys (`ssh-ed25519`, `ssh-rsa`)
+- **Plugin support** - Full support for age plugins including:
+  - [age-plugin-se](https://github.com/remko/age-plugin-se) (Secure Enclave on macOS)
+  - [age-plugin-yubikey](https://github.com/str4d/age-plugin-yubikey)
+  - Any other age-compatible plugin
+- **Passphrase encryption** - Scrypt-based passphrase encryption
+- **Multiple recipients** - Encrypt to multiple recipients at once
+- **Armor format** - ASCII-armored output support
+- **File operations** - Direct file encryption/decryption
+- **Memory-safe API** - Proper error handling and memory management
+- **Comprehensive test suite**
+
+## Supported Identity/Recipient Types
+
+| Type | Recipient Format | Identity Format |
+|------|-----------------|-----------------|
+| X25519 | `age1...` | `AGE-SECRET-KEY-1...` |
+| SSH | `ssh-ed25519 ...`, `ssh-rsa ...` | SSH private key file |
+| Plugin | `age1<plugin>1...` | `AGE-PLUGIN-<NAME>-1...` |
+| Passphrase | N/A | Passphrase string |
+
+## Building
+
+### Rust Library
+
+```bash
+cargo build --release
+```
+
+This produces `target/release/libage_ffi.a` (static library).
+
+### Zig Bindings
+
+```bash
+cd zig
+zig build
+```
+
+Run the example:
+
+```bash
+cd zig
+zig build run
+```
+
+Run tests:
+
+```bash
+cd zig
+zig build test
+```
+
+## Usage
+
+### Zig
+
+```zig
+const age = @import("age");
+
+// Generate a keypair
+var keypair = try age.generateKeypair();
+defer keypair.deinit();
+
+// Encrypt data
+const plaintext = "Hello, World!";
+var encrypted = try age.encrypt(plaintext, keypair.getPublicKey());
+defer encrypted.deinit();
+
+// Decrypt data
+var decrypted = try age.decrypt(encrypted.toSlice(), keypair.getPrivateKey());
+defer decrypted.deinit();
+
+// File operations with plugin support
+try age.encryptToFile(plaintext, "age1se1...", "/path/to/output.age");
+var content = try age.decryptFile("/path/to/file.age", "/path/to/identities");
+defer content.deinit();
+```
+
+### C
+
+```c
+#include <age_ffi.h>
+
+// Generate keypair
+AgeKeypair keypair;
+age_generate_keypair(&keypair);
+
+// Encrypt
+AgeBuffer encrypted;
+age_encrypt(plaintext, plaintext_len, keypair.public_key, &encrypted);
+
+// Decrypt
+AgeBuffer decrypted;
+age_decrypt(encrypted.data, encrypted.len, keypair.private_key, &decrypted);
+
+// Free resources
+age_free_buffer(&encrypted);
+age_free_buffer(&decrypted);
+age_free_keypair(&keypair);
+```
+
+## Plugin Support
+
+This library supports the [age plugin protocol](https://github.com/C2SP/C2SP/blob/main/age.md), allowing encryption and decryption with hardware-backed keys and other plugin-based identities.
+
+### Requirements
+
+- The plugin binary must be in your `$PATH` (e.g., `age-plugin-se`)
+- For Secure Enclave: macOS with Touch ID or Apple Watch
+
+### Example with Secure Enclave
+
+```bash
+# Install the plugin
+brew install age-plugin-se
+
+# Generate a Secure Enclave identity
+age-plugin-se --generate -o ~/.age/se-identity.txt
+
+# The library will automatically use the plugin when it sees:
+# - Recipients starting with age1se1...
+# - Identities starting with AGE-PLUGIN-SE-...
+```
+
+## API Reference
+
+### Key Generation
+- `age_generate_keypair()` - Generate X25519 keypair
+- `age_generate_x25519()` - Generate X25519 keypair (alias)
+- `age_x25519_to_public()` - Derive public key from private key
+
+### Encryption
+- `age_encrypt()` - Encrypt to a single recipient
+- `age_encrypt_multi()` - Encrypt to multiple recipients
+- `age_encrypt_armor()` - Encrypt with ASCII armor
+- `age_encrypt_passphrase()` - Encrypt with passphrase
+- `age_encrypt_to_file()` - Encrypt directly to file
+
+### Decryption
+- `age_decrypt()` - Decrypt with identity string
+- `age_decrypt_multi()` - Decrypt with multiple identities
+- `age_decrypt_file()` - Decrypt file using identity file (supports plugins)
+- `age_decrypt_passphrase()` - Decrypt with passphrase
+
+### Utilities
+- `age_armor()` - Wrap binary data in ASCII armor
+- `age_dearmor()` - Unwrap ASCII-armored data
+- `age_validate_recipient()` - Check if recipient string is valid
+- `age_validate_identity()` - Check if identity string is valid
+- `age_version()` - Get library version
+
+## License
+
+This project is dual-licensed under MIT and Apache-2.0, matching the age library.

zig-vendor/age-ffi/src/armor.rs

@@ -0,0 +1,95 @@
+//! ASCII armor utilities.
+
+use crate::helpers::cstr_to_str;
+use crate::helpers::string_to_cstr;
+use crate::types::{AgeBuffer, AgeResult};
+use std::io::{Read, Write};
+use std::os::raw::c_char;
+
+/// Wrap binary data in ASCII armor.
+///
+/// # Arguments
+/// * `data` - Pointer to the binary data
+/// * `data_len` - Length of the data
+/// * `output` - Pointer to receive the armored string
+///
+/// # Returns
+/// AgeResult indicating success or failure
+#[no_mangle]
+pub extern "C" fn age_armor(
+    data: *const u8,
+    data_len: usize,
+    output: *mut *mut c_char,
+) -> AgeResult {
+    if data.is_null() || output.is_null() {
+        return AgeResult::InvalidInput;
+    }
+
+    let data = unsafe { std::slice::from_raw_parts(data, data_len) };
+
+    let mut armored = Vec::new();
+    let mut writer = match age::armor::ArmoredWriter::wrap_output(&mut armored, age::armor::Format::AsciiArmor) {
+        Ok(w) => w,
+        Err(_) => return AgeResult::ArmorError,
+    };
+
+    if writer.write_all(data).is_err() {
+        return AgeResult::ArmorError;
+    }
+
+    if writer.finish().is_err() {
+        return AgeResult::ArmorError;
+    }
+
+    let armored_str = match String::from_utf8(armored) {
+        Ok(s) => s,
+        Err(_) => return AgeResult::ArmorError,
+    };
+
+    let c_output = match string_to_cstr(armored_str) {
+        Ok(s) => s,
+        Err(e) => return e,
+    };
+
+    unsafe {
+        *output = c_output;
+    }
+
+    AgeResult::Success
+}
+
+/// Remove ASCII armor from data.
+///
+/// # Arguments
+/// * `armored` - The armored string
+/// * `output` - Pointer to receive the binary buffer
+///
+/// # Returns
+/// AgeResult indicating success or failure
+#[no_mangle]
+pub extern "C" fn age_dearmor(
+    armored: *const c_char,
+    output: *mut AgeBuffer,
+) -> AgeResult {
+    if output.is_null() {
+        return AgeResult::InvalidInput;
+    }
+
+    let armored_str = match unsafe { cstr_to_str(armored) } {
+        Ok(s) => s,
+        Err(e) => return e,
+    };
+
+    let mut reader = age::armor::ArmoredReader::new(armored_str.as_bytes());
+
+    let mut dearmored = Vec::new();
+    if reader.read_to_end(&mut dearmored).is_err() {
+        return AgeResult::ArmorError;
+    }
+
+    unsafe {
+        *output = AgeBuffer::from_vec(dearmored);
+    }
+
+    AgeResult::Success
+}

zig-vendor/age-ffi/src/armor_tests.rs

@@ -0,0 +1,175 @@
+//! Tests for ASCII armor utilities.
+
+use crate::armor::*;
+use crate::encrypt::*;
+use crate::keys::*;
+use crate::memory::*;
+use crate::types::*;
+use std::ffi::{CStr, CString};
+use std::os::raw::c_char;
+
+#[test]
+fn test_armor_basic() {
+    let data = b"Hello, this is binary data to armor!";
+    let mut armored: *mut c_char = std::ptr::null_mut();
+
+    let result = age_armor(data.as_ptr(), data.len(), &mut armored);
+    assert_eq!(result, AgeResult::Success);
+    assert!(!armored.is_null());
+
+    let armored_str = unsafe { CStr::from_ptr(armored).to_str().unwrap() };
+    assert!(armored_str.starts_with("-----BEGIN AGE ENCRYPTED FILE-----"));
+    assert!(armored_str.contains("-----END AGE ENCRYPTED FILE-----"));
+
+    age_free_string(armored);
+}
+
+#[test]
+fn test_dearmor_basic() {
+    let data = b"Test data for dearmoring";
+    let mut armored: *mut c_char = std::ptr::null_mut();
+    age_armor(data.as_ptr(), data.len(), &mut armored);
+
+    let mut dearmored = AgeBuffer::null();
+    let result = age_dearmor(armored, &mut dearmored);
+    assert_eq!(result, AgeResult::Success);
+
+    let dearmored_slice = unsafe { std::slice::from_raw_parts(dearmored.data, dearmored.len) };
+    assert_eq!(dearmored_slice, data);
+
+    age_free_string(armored);
+    age_free_buffer(&mut dearmored);
+}
+
+#[test]
+fn test_armor_round_trip() {
+    // Test with various data sizes (skip empty - armor requires data)
+    let test_data = [
+        b"A".to_vec(),
+        b"Short".to_vec(),
+        (0u16..256).map(|i| i as u8).collect::<Vec<u8>>(),
+        vec![0u8; 1000],
+        (0..10000).map(|i| (i % 256) as u8).collect::<Vec<u8>>(),
+    ];
+
+    for data in &test_data {
+        let mut armored: *mut c_char = std::ptr::null_mut();
+        let result = age_armor(data.as_ptr(), data.len(), &mut armored);
+        assert_eq!(result, AgeResult::Success, "Failed to armor data of len {}", data.len());
+
+        let mut dearmored = AgeBuffer::null();
+        let result = age_dearmor(armored, &mut dearmored);
+        assert_eq!(result, AgeResult::Success, "Failed to dearmor data of len {}", data.len());
+
+        let dearmored_slice = unsafe { std::slice::from_raw_parts(dearmored.data, dearmored.len) };
+        assert_eq!(dearmored_slice, data.as_slice());
+
+        age_free_string(armored);
+        age_free_buffer(&mut dearmored);
+    }
+}
+
+#[test]
+fn test_armor_null_input() {
+    let mut armored: *mut c_char = std::ptr::null_mut();
+
+    let result = age_armor(std::ptr::null(), 0, &mut armored);
+    assert_eq!(result, AgeResult::InvalidInput);
+
+    let result = age_armor(b"test".as_ptr(), 4, std::ptr::null_mut());
+    assert_eq!(result, AgeResult::InvalidInput);
+}
+
+#[test]
+fn test_dearmor_null_input() {
+    let mut dearmored = AgeBuffer::null();
+
+    let result = age_dearmor(std::ptr::null(), &mut dearmored);
+    assert_eq!(result, AgeResult::InvalidInput);
+}
+
+#[test]
+fn test_dearmor_null_output() {
+    let data = b"test";
+    let mut armored: *mut c_char = std::ptr::null_mut();
+    age_armor(data.as_ptr(), data.len(), &mut armored);
+
+    let result = age_dearmor(armored, std::ptr::null_mut());
+    assert_eq!(result, AgeResult::InvalidInput);
+
+    age_free_string(armored);
+}
+
+#[test]
+fn test_dearmor_invalid_armor() {
+    let invalid_armor = CString::new("This is not valid armor").unwrap();
+    let mut dearmored = AgeBuffer::null();
+
+    let result = age_dearmor(invalid_armor.as_ptr(), &mut dearmored);
+    // Should still succeed but return the data as-is or fail gracefully
+    // The ArmoredReader is forgiving and may just return the raw data
+    // Let's check that it doesn't crash at least
+    if result == AgeResult::Success {
+        age_free_buffer(&mut dearmored);
+    }
+}
+
+#[test]
+fn test_encrypt_armor_and_dearmor() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"Test encrypt -> armor -> dearmor -> decrypt";
+    let mut armored: *mut c_char = std::ptr::null_mut();
+
+    let result = age_encrypt_armor(
+        plaintext.as_ptr(),
+        plaintext.len(),
+        keypair.public_key,
+        &mut armored,
+    );
+    assert_eq!(result, AgeResult::Success);
+
+    // Dearmor
+    let mut dearmored = AgeBuffer::null();
+    let result = age_dearmor(armored, &mut dearmored);
+    assert_eq!(result, AgeResult::Success);
+
+    // Decrypt
+    let mut decrypted = AgeBuffer::null();
+    let result = crate::decrypt::age_decrypt(
+        dearmored.data,
+        dearmored.len,
+        keypair.private_key,
+        &mut decrypted,
+    );
+    assert_eq!(result, AgeResult::Success);
+
+    let decrypted_slice = unsafe { std::slice::from_raw_parts(decrypted.data, decrypted.len) };
+    assert_eq!(decrypted_slice, plaintext);
+
+    age_free_string(armored);
+    age_free_buffer(&mut dearmored);
+    age_free_buffer(&mut decrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_armor_binary_data() {
+    // Test with binary data including null bytes
+    let binary_data: Vec<u8> = (0u16..256).map(|i| i as u8).collect();
+    let mut armored: *mut c_char = std::ptr::null_mut();
+
+    let result = age_armor(binary_data.as_ptr(), binary_data.len(), &mut armored);
+    assert_eq!(result, AgeResult::Success);
+
+    let mut dearmored = AgeBuffer::null();
+    let result = age_dearmor(armored, &mut dearmored);
+    assert_eq!(result, AgeResult::Success);
+
+    let dearmored_slice = unsafe { std::slice::from_raw_parts(dearmored.data, dearmored.len) };
+    assert_eq!(dearmored_slice, binary_data.as_slice());
+
+    age_free_string(armored);
+    age_free_buffer(&mut dearmored);
+}

zig-vendor/age-ffi/src/decrypt.rs

@@ -0,0 +1,299 @@
+//! In-memory decryption functions.
+
+use crate::helpers::cstr_to_str;
+use crate::types::{AgeBuffer, AgeResult};
+use age::ssh;
+use std::io::{BufReader, Read};
+use std::os::raw::c_char;
+use std::str::FromStr;
+
+/// Decrypt data in memory using a single x25519 identity.
+/// This is a simple API for common use cases.
+///
+/// # Arguments
+/// * `ciphertext` - Pointer to the encrypted data
+/// * `ciphertext_len` - Length of the ciphertext
+/// * `identity` - The private key string (AGE-SECRET-KEY-1...)
+/// * `output` - Pointer to receive the decrypted buffer
+///
+/// # Returns
+/// AgeResult indicating success or failure
+#[no_mangle]
+pub extern "C" fn age_decrypt(
+    ciphertext: *const u8,
+    ciphertext_len: usize,
+    identity: *const c_char,
+    output: *mut AgeBuffer,
+) -> AgeResult {
+    if ciphertext.is_null() || output.is_null() {
+        return AgeResult::InvalidInput;
+    }
+
+    let ciphertext = unsafe { std::slice::from_raw_parts(ciphertext, ciphertext_len) };
+
+    let identity_str = match unsafe { cstr_to_str(identity) } {
+        Ok(s) => s,
+        Err(e) => return e,
+    };
+
+    let identity = match age::x25519::Identity::from_str(identity_str) {
+        Ok(i) => i,
+        Err(_) => return AgeResult::InvalidIdentity,
+    };
+
+    let decrypted = match age::decrypt(&identity, ciphertext) {
+        Ok(d) => d,
+        Err(_) => return AgeResult::DecryptionFailed,
+    };
+
+    unsafe {
+        *output = AgeBuffer::from_vec(decrypted);
+    }
+
+    AgeResult::Success
+}
+
+/// Decrypt data in memory using multiple identities.
+/// The library will try each identity until one succeeds.
+///
+/// # Arguments
+/// * `ciphertext` - Pointer to the encrypted data
+/// * `ciphertext_len` - Length of the ciphertext
+/// * `identities` - Array of identity C strings
+/// * `identity_count` - Number of identities
+/// * `output` - Pointer to receive the decrypted buffer
+///
+/// # Returns
+/// AgeResult indicating success or failure
+#[no_mangle]
+pub extern "C" fn age_decrypt_multi(
+    ciphertext: *const u8,
+    ciphertext_len: usize,
+    identities: *const *const c_char,
+    identity_count: usize,
+    output: *mut AgeBuffer,
+) -> AgeResult {
+    if ciphertext.is_null() || identities.is_null() || output.is_null() || identity_count == 0 {
+        return AgeResult::InvalidInput;
+    }
+
+    let ciphertext = unsafe { std::slice::from_raw_parts(ciphertext, ciphertext_len) };
+    let identity_ptrs = unsafe { std::slice::from_raw_parts(identities, identity_count) };
+
+    let mut parsed_identities: Vec<Box<dyn age::Identity>> = Vec::new();
+
+    for &ptr in identity_ptrs {
+        let identity_str = match unsafe { cstr_to_str(ptr) } {
+            Ok(s) => s.trim(),
+            Err(e) => return e,
+        };
+
+        // Try x25519 first
+        if let Ok(i) = age::x25519::Identity::from_str(identity_str) {
+            parsed_identities.push(Box::new(i));
+            continue;
+        }
+
+        // Skip comments and empty lines
+        if identity_str.is_empty() || identity_str.starts_with('#') {
+            continue;
+        }
+
+        return AgeResult::InvalidIdentity;
+    }
+
+    if parsed_identities.is_empty() {
+        return AgeResult::NoIdentities;
+    }
+
+    let decryptor = match age::Decryptor::new(ciphertext) {
+        Ok(d) => d,
+        Err(_) => return AgeResult::DecryptionFailed,
+    };
+
+    let mut decrypted = Vec::new();
+    let mut reader = match decryptor.decrypt(parsed_identities.iter().map(|i| i.as_ref())) {
+        Ok(r) => r,
+        Err(_) => return AgeResult::DecryptionFailed,
+    };
+
+    if reader.read_to_end(&mut decrypted).is_err() {
+        return AgeResult::DecryptionFailed;
+    }
+
+    unsafe {
+        *output = AgeBuffer::from_vec(decrypted);
+    }
+
+    AgeResult::Success
+}
+
+/// Decrypt data using an SSH private key.
+/// Supports both Ed25519 and RSA SSH keys.
+///
+/// # Arguments
+/// * `ciphertext` - Pointer to the encrypted data
+/// * `ciphertext_len` - Length of the ciphertext
+/// * `ssh_key` - The SSH private key in PEM or OpenSSH format
+/// * `passphrase` - Optional passphrase for encrypted SSH keys (can be null)
+/// * `output` - Pointer to receive the decrypted buffer
+///
+/// # Returns
+/// AgeResult indicating success or failure
+#[no_mangle]
+pub extern "C" fn age_decrypt_ssh(
+    ciphertext: *const u8,
+    ciphertext_len: usize,
+    ssh_key: *const c_char,
+    passphrase: *const c_char,
+    output: *mut AgeBuffer,
+) -> AgeResult {
+    if ciphertext.is_null() || output.is_null() {
+        return AgeResult::InvalidInput;
+    }
+
+    let ciphertext = unsafe { std::slice::from_raw_parts(ciphertext, ciphertext_len) };
+
+    let ssh_key_str = match unsafe { cstr_to_str(ssh_key) } {
+        Ok(s) => s,
+        Err(e) => return e,
+    };
+
+    // Parse SSH identity from buffer
+    let buf_reader = BufReader::new(ssh_key_str.as_bytes());
+    let identity = match ssh::Identity::from_buffer(buf_reader, None) {
+        Ok(id) => id,
+        Err(_) => return AgeResult::SshKeyError,
+    };
+
+    // Handle encrypted SSH keys - keep as ssh::Identity since it implements age::Identity
+    let identity: ssh::Identity = match identity {
+        ssh::Identity::Unencrypted(_) => identity,
+        ssh::Identity::Encrypted(enc) => {
+            let passphrase_str = if passphrase.is_null() {
+                return AgeResult::PassphraseRequired;
+            } else {
+                match unsafe { cstr_to_str(passphrase) } {
+                    Ok(s) if !s.is_empty() => s,
+                    _ => return AgeResult::PassphraseRequired,
+                }
+            };
+
+            match enc.decrypt(age::secrecy::SecretString::from(passphrase_str.to_string())) {
+                Ok(id) => ssh::Identity::Unencrypted(id),
+                Err(_) => return AgeResult::InvalidPassphrase,
+            }
+        }
+        ssh::Identity::Unsupported(_) => return AgeResult::UnsupportedKey,
+    };
+
+    let decryptor = match age::Decryptor::new(ciphertext) {
+        Ok(d) => d,
+        Err(_) => return AgeResult::DecryptionFailed,
+    };
+
+    let mut decrypted = Vec::new();
+    let mut reader = match decryptor.decrypt(std::iter::once(&identity as &dyn age::Identity)) {
+        Ok(r) => r,
+        Err(_) => return AgeResult::DecryptionFailed,
+    };
+
+    if reader.read_to_end(&mut decrypted).is_err() {
+        return AgeResult::DecryptionFailed;
+    }
+
+    unsafe {
+        *output = AgeBuffer::from_vec(decrypted);
+    }
+
+    AgeResult::Success
+}
+
+/// Decrypt data using an SSH private key file.
+///
+/// # Arguments
+/// * `ciphertext` - Pointer to the encrypted data
+/// * `ciphertext_len` - Length of the ciphertext
+/// * `ssh_key_path` - Path to the SSH private key file
+/// * `passphrase` - Optional passphrase for encrypted SSH keys (can be null)
+/// * `output` - Pointer to receive the decrypted buffer
+///
+/// # Returns
+/// AgeResult indicating success or failure
+#[no_mangle]
+pub extern "C" fn age_decrypt_ssh_file(
+    ciphertext: *const u8,
+    ciphertext_len: usize,
+    ssh_key_path: *const c_char,
+    passphrase: *const c_char,
+    output: *mut AgeBuffer,
+) -> AgeResult {
+    if ciphertext.is_null() || output.is_null() {
+        return AgeResult::InvalidInput;
+    }
+
+    let ciphertext = unsafe { std::slice::from_raw_parts(ciphertext, ciphertext_len) };
+
+    let path_str = match unsafe { cstr_to_str(ssh_key_path) } {
+        Ok(s) => s,
+        Err(e) => return e,
+    };
+
+    // The filename is passed as a hint for error messages
+    let filename = Some(path_str.to_string());
+
+    // Read and parse SSH key file
+    let ssh_key_data = match std::fs::read(path_str) {
+        Ok(data) => data,
+        Err(_) => return AgeResult::IoError,
+    };
+
+    let buf_reader = BufReader::new(ssh_key_data.as_slice());
+    let identity = match ssh::Identity::from_buffer(buf_reader, filename) {
+        Ok(id) => id,
+        Err(_) => return AgeResult::SshKeyError,
+    };
+
+    // Handle encrypted SSH keys - keep as ssh::Identity since it implements age::Identity
+    let identity: ssh::Identity = match identity {
+        ssh::Identity::Unencrypted(_) => identity,
+        ssh::Identity::Encrypted(enc) => {
+            // Parse passphrase if provided
+            let passphrase_str = if passphrase.is_null() {
+                return AgeResult::PassphraseRequired;
+            } else {
+                match unsafe { cstr_to_str(passphrase) } {
+                    Ok(s) if !s.is_empty() => s,
+                    _ => return AgeResult::PassphraseRequired,
+                }
+            };
+
+            match enc.decrypt(age::secrecy::SecretString::from(passphrase_str.to_string())) {
+                Ok(id) => ssh::Identity::Unencrypted(id),
+                Err(_) => return AgeResult::InvalidPassphrase,
+            }
+        }
+        ssh::Identity::Unsupported(_) => return AgeResult::UnsupportedKey,
+    };
+
+    let decryptor = match age::Decryptor::new(ciphertext) {
+        Ok(d) => d,
+        Err(_) => return AgeResult::DecryptionFailed,
+    };
+
+    let mut decrypted = Vec::new();
+    let mut reader = match decryptor.decrypt(std::iter::once(&identity as &dyn age::Identity)) {
+        Ok(r) => r,
+        Err(_) => return AgeResult::DecryptionFailed,
+    };
+
+    if reader.read_to_end(&mut decrypted).is_err() {
+        return AgeResult::DecryptionFailed;
+    }
+
+    unsafe {
+        *output = AgeBuffer::from_vec(decrypted);
+    }
+
+    AgeResult::Success
+}

zig-vendor/age-ffi/src/decrypt_tests.rs

@@ -0,0 +1,430 @@
+//! Tests for in-memory decryption functions.
+
+use crate::decrypt::*;
+use crate::encrypt::*;
+use crate::keys::*;
+use crate::memory::*;
+use crate::types::*;
+use std::ffi::CString;
+use std::os::raw::c_char;
+
+#[test]
+fn test_basic_decrypt() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"Decryption test message";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    let mut decrypted = AgeBuffer::null();
+    let result = age_decrypt(
+        encrypted.data,
+        encrypted.len,
+        keypair.private_key,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::Success);
+    let decrypted_slice = unsafe { std::slice::from_raw_parts(decrypted.data, decrypted.len) };
+    assert_eq!(decrypted_slice, plaintext);
+
+    age_free_buffer(&mut encrypted);
+    age_free_buffer(&mut decrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_null_ciphertext() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+    let mut decrypted = AgeBuffer::null();
+
+    let result = age_decrypt(
+        std::ptr::null(),
+        0,
+        keypair.private_key,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::InvalidInput);
+
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_null_output() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"test";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    let result = age_decrypt(
+        encrypted.data,
+        encrypted.len,
+        keypair.private_key,
+        std::ptr::null_mut(),
+    );
+
+    assert_eq!(result, AgeResult::InvalidInput);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_invalid_identity() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"test";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    let invalid_identity = CString::new("not-a-valid-identity").unwrap();
+    let mut decrypted = AgeBuffer::null();
+
+    let result = age_decrypt(
+        encrypted.data,
+        encrypted.len,
+        invalid_identity.as_ptr(),
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::InvalidIdentity);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_wrong_key() {
+    let mut keypair1 = AgeKeypair::null();
+    let mut keypair2 = AgeKeypair::null();
+    age_generate_x25519(&mut keypair1);
+    age_generate_x25519(&mut keypair2);
+
+    let plaintext = b"Secret message";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair1.public_key, &mut encrypted);
+
+    // Try to decrypt with wrong key
+    let mut decrypted = AgeBuffer::null();
+    let result = age_decrypt(
+        encrypted.data,
+        encrypted.len,
+        keypair2.private_key, // Wrong key!
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::DecryptionFailed);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair1);
+    age_free_keypair(&mut keypair2);
+}
+
+#[test]
+fn test_decrypt_corrupted_ciphertext() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"Original message";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    // Corrupt the ciphertext
+    if encrypted.len > 50 {
+        unsafe {
+            *encrypted.data.add(50) ^= 0xFF;
+        }
+    }
+
+    let mut decrypted = AgeBuffer::null();
+    let result = age_decrypt(
+        encrypted.data,
+        encrypted.len,
+        keypair.private_key,
+        &mut decrypted,
+    );
+
+    // Should fail (either DecryptionFailed or other error depending on what was corrupted)
+    assert_ne!(result, AgeResult::Success);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_multi_with_multiple_identities() {
+    let mut keypair1 = AgeKeypair::null();
+    let mut keypair2 = AgeKeypair::null();
+    age_generate_x25519(&mut keypair1);
+    age_generate_x25519(&mut keypair2);
+
+    let plaintext = b"Multi-identity message";
+    let recipients: [*const c_char; 1] = [keypair1.public_key as *const c_char];
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt_multi(
+        plaintext.as_ptr(),
+        plaintext.len(),
+        recipients.as_ptr(),
+        1,
+        false,
+        &mut encrypted,
+    );
+
+    // Decrypt with multiple identities (one valid, one invalid for this message)
+    let identities: [*const c_char; 2] = [
+        keypair2.private_key as *const c_char, // Wrong key first
+        keypair1.private_key as *const c_char, // Correct key
+    ];
+    let mut decrypted = AgeBuffer::null();
+
+    let result = age_decrypt_multi(
+        encrypted.data,
+        encrypted.len,
+        identities.as_ptr(),
+        2,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::Success);
+    let decrypted_slice = unsafe { std::slice::from_raw_parts(decrypted.data, decrypted.len) };
+    assert_eq!(decrypted_slice, plaintext);
+
+    age_free_buffer(&mut encrypted);
+    age_free_buffer(&mut decrypted);
+    age_free_keypair(&mut keypair1);
+    age_free_keypair(&mut keypair2);
+}
+
+#[test]
+fn test_decrypt_multi_empty_identities() {
+    let plaintext = b"test";
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    let mut decrypted = AgeBuffer::null();
+    let result = age_decrypt_multi(
+        encrypted.data,
+        encrypted.len,
+        std::ptr::null(),
+        0,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::InvalidInput);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_null_identity() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"test";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    let mut decrypted = AgeBuffer::null();
+    let result = age_decrypt(
+        encrypted.data,
+        encrypted.len,
+        std::ptr::null(),
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::InvalidInput);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_multi_null_identity_in_array() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"test";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    // Array with a null pointer inside
+    let identities: [*const c_char; 2] = [
+        keypair.private_key as *const c_char,
+        std::ptr::null(),
+    ];
+    let mut decrypted = AgeBuffer::null();
+
+    let result = age_decrypt_multi(
+        encrypted.data,
+        encrypted.len,
+        identities.as_ptr(),
+        2,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::InvalidInput);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_multi_with_comments_and_empty() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"test with comments";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    // Mix of comments, empty strings, and valid identity
+    let comment = CString::new("# This is a comment").unwrap();
+    let empty = CString::new("").unwrap();
+    let identities: [*const c_char; 3] = [
+        comment.as_ptr(),
+        empty.as_ptr(),
+        keypair.private_key as *const c_char,
+    ];
+    let mut decrypted = AgeBuffer::null();
+
+    let result = age_decrypt_multi(
+        encrypted.data,
+        encrypted.len,
+        identities.as_ptr(),
+        3,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::Success);
+
+    let decrypted_slice = unsafe { std::slice::from_raw_parts(decrypted.data, decrypted.len) };
+    assert_eq!(decrypted_slice, plaintext);
+
+    age_free_buffer(&mut encrypted);
+    age_free_buffer(&mut decrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_multi_only_comments() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"test";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    // Only comments and empty - no valid identities
+    let comment1 = CString::new("# Comment 1").unwrap();
+    let comment2 = CString::new("# Comment 2").unwrap();
+    let empty = CString::new("").unwrap();
+    let identities: [*const c_char; 3] = [
+        comment1.as_ptr(),
+        comment2.as_ptr(),
+        empty.as_ptr(),
+    ];
+    let mut decrypted = AgeBuffer::null();
+
+    let result = age_decrypt_multi(
+        encrypted.data,
+        encrypted.len,
+        identities.as_ptr(),
+        3,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::NoIdentities);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_multi_invalid_identity_format() {
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let plaintext = b"test";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair.public_key, &mut encrypted);
+
+    // Invalid identity (not a comment, not empty, not valid key)
+    let invalid = CString::new("invalid-key-format").unwrap();
+    let identities: [*const c_char; 1] = [invalid.as_ptr()];
+    let mut decrypted = AgeBuffer::null();
+
+    let result = age_decrypt_multi(
+        encrypted.data,
+        encrypted.len,
+        identities.as_ptr(),
+        1,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::InvalidIdentity);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_multi_corrupted_ciphertext() {
+    let corrupted = b"not valid age encrypted data at all";
+    let mut keypair = AgeKeypair::null();
+    age_generate_x25519(&mut keypair);
+
+    let identities: [*const c_char; 1] = [keypair.private_key as *const c_char];
+    let mut decrypted = AgeBuffer::null();
+
+    let result = age_decrypt_multi(
+        corrupted.as_ptr(),
+        corrupted.len(),
+        identities.as_ptr(),
+        1,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::DecryptionFailed);
+
+    age_free_keypair(&mut keypair);
+}
+
+#[test]
+fn test_decrypt_multi_wrong_key_only() {
+    let mut keypair1 = AgeKeypair::null();
+    let mut keypair2 = AgeKeypair::null();
+    age_generate_x25519(&mut keypair1);
+    age_generate_x25519(&mut keypair2);
+
+    let plaintext = b"test";
+    let mut encrypted = AgeBuffer::null();
+    age_encrypt(plaintext.as_ptr(), plaintext.len(), keypair1.public_key, &mut encrypted);
+
+    // Only provide wrong key
+    let identities: [*const c_char; 1] = [keypair2.private_key as *const c_char];
+    let mut decrypted = AgeBuffer::null();
+
+    let result = age_decrypt_multi(
+        encrypted.data,
+        encrypted.len,
+        identities.as_ptr(),
+        1,
+        &mut decrypted,
+    );
+
+    assert_eq!(result, AgeResult::DecryptionFailed);
+
+    age_free_buffer(&mut encrypted);
+    age_free_keypair(&mut keypair1);
+    age_free_keypair(&mut keypair2);
+}