fix: fixing leaks.

.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,5 +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
-          target-branch: ${{ github.ref_name }}

.gitignore

@@ -1,18 +1,11 @@
 # dev env
 .direnv
 
-list.json
-
 # docs
 man 
 
 # build artifacts
-*.spall
 builds
 envr
 envr-go
-findr/findr
-findr/findr-prof
-findr/bench-*.md
 result
-version.odin

CHANGELOG.md

@@ -1,34 +1,5 @@
 # Changelog
 
-## [0.3.1](https://github.com/sbrow/envr/compare/v0.3.0...v0.3.1) (2026-06-17)
-
-
-### Performance Improvements
-
-* Replaced `fd` with custom internals. ([2ef733f](https://github.com/sbrow/envr/commit/2ef733fe58594b0a0b6e3ef85142b74af445ccb8))
-
-## [0.3.0](https://github.com/sbrow/envr/compare/v0.2.1...v0.3.0) (2026-06-16)
-
-Version 0.3.0 represents a significant departure (and improvement) for envr.
-The entire codebase was rewritten in [Odin](https://odin-lang.org/) (from Go).
-This reduced the binary size from over 17MB to under 600k, improved performance,
-and significantly reduced the number of project dependencies from 69 to just 2.
-
-### ⚠ BREAKING CHANGES
-
-* The encryption format of databases has changed. Age encryption is no longer supported, and no automatic migration path was implemented.
-
-### Features
-
-* All encryption/decryption now happens in-memory. ([fe2b256](https://github.com/sbrow/envr/commit/fe2b256bd61eaf551d53faf3893b473a64a94667))
-* Config can be loaded from any path with `--config-file (-c)` flag. ([4a26ee8](https://github.com/sbrow/envr/commit/4a26ee814591e6aab0eb99d2359d51b31011edfe))
-* Switched from age to libsodium. ([23b8c2d](https://github.com/sbrow/envr/commit/23b8c2dc671a23cf76cf6746b33806ded9381486))
-
-
-### Performance Improvements
-
-* Improved writer performance. ([365e914](https://github.com/sbrow/envr/commit/365e9149b1a738ac9119bb5f74dc7e047ecfed5b))
-
 ## [0.2.1](https://github.com/sbrow/envr/compare/v0.2.0...v0.2.1) (2026-01-12)
 
 

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)-linux-arm64.tar.gz \
-          # $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64.zip
+          $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64.zip
 
 # Build and compress all release artifacts
-# release: build-linux build-darwin compress
+release: build-linux build-darwin compress
-release: build-linux compress
 	@echo "Release artifacts created:"
 	@ls -la $(BUILD_DIR)/*.tar.gz $(BUILD_DIR)/*.zip 2>/dev/null || echo "No compressed artifacts found"
 
@@ -79,14 +79,14 @@ cleanall:
 # Show available targets
 help:
 	@echo "Available targets:"
-	@echo "  all         - Build all release artifacts (default)"
+	@echo "  all        - Build all release artifacts (default)"
-	@echo "  release     - Build and compress all release artifacts"
+	@echo "  release    - Build and compress all release artifacts"
-	@echo "  build-linux  - Build Linux binaries only"
+	@echo "  build-linux - Build Linux binaries only"
 	@echo "  build-darwin - Build Darwin binaries only"
-	@echo "  compress    - Compress all built binaries"
+	@echo "  compress   - Compress all built binaries"
-	@echo "  clean       - Remove binary files only"
+	@echo "  clean      - Remove binary files only"
-	@echo "  cleanall    - Remove entire build directory"
+	@echo "  cleanall   - Remove entire build directory"
-	@echo "  help        - Show this help message"
+	@echo "  help       - Show this help message"
 	@echo ""
 	@echo "Release artifacts will be created in $(BUILD_DIR)/"
 	@echo "Version: $(VERSION)"

README.md

@@ -13,7 +13,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 +37,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
+go install github.com/sbrow/envr
-odin build -o:speed
 envr init
 ```
 
@@ -105,18 +104,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.

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

@@ -1,80 +1,79 @@
-# TODOs
+# TODO
 
-1. Consider giving db its own allocator
+Note: These todos can wait until all the subcommands have been ported.
 
-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.
+## HIGH
 
-3. **db.odin:135, 250** — String interpolation into SQL (`VACUUM INTO '%s'`, `ATTACH DATABASE '%s'`). Currently safe because input is controlled, but fragile.
+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`.
 
-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).
+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.
 
-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.
+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"`).
 
-6. **cmd_restore.odin:44** — `os.mkdir_all` error silently discarded. Subsequent write failure will be confusing.
+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.
 
-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.
+## MEDIUM
 
-10. **db.odin:115** — `json.unmarshal_string` error not checked. Malformed JSON silently produces empty/partial data.
+4. **db.odin:29-35** — `make_temp_path` never calls `strings.builder_destroy`. Leaks builder buffer every call.
 
-11. **db.odin:352-353** — `hex.encode` error ignored. `string(hex_bytes)` aliases the byte slice.
+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.
 
-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.
+6. **db.odin:470-473** — `string_to_cstring` allocates via `strings.clone_to_cstring` and never frees. Called dozens of times across db operations.
 
-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"`.
+7. **db.odin:470, 462** — Both `string_to_cstring` and `cstring_to_string` ignore allocation errors. A nil cstring gets passed to SQLite (UB).
 
-14. Check for prealloc opportunities. i.e. `make([dynamic]string)` -> `make([dynamic]string, 5)`.
+8. **db.odin:135, 250** — String interpolation into SQL (`VACUUM INTO '%s'`, `ATTACH DATABASE '%s'`). Currently safe because input is controlled, but fragile.
 
-15. Add a text filter to the multi_select.
+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).
 
-16. Create backup / fallback fd.
+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.
 
-17. Add tests for untested commands.
+11. **cmd_restore.odin:44** — `os.mkdir_all` error silently discarded. Subsequent write failure will be confusing.
 
-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.
+12. **cmd_edit_config.odin:27** — `$EDITOR` used as single binary name. Breaks for multi-word values like `"code -w"`. Needs `strings.fields()`.
 
-20. add --format -f flag to commands that draw tables.
+13. [x] **cmd_list.odin:31-35, 58-61** — Uses a `strings.Builder` (never destroyed) for what is just `row.Dir + "/"`. Also `filepath.rel` used where `filepath.base` would suffice since dir is always the parent.
 
-21. Replace `testing.expect` calls with `testing.expect_value` calls where appropriate.
+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.
 
-22. Change struct field names from PascalCase to snake_case.
+34. **table.odin:84-88** — `render_json_rows` creates `map[string]string` per row, copies into dynamic array. `delete(entries)` frees the array but not individual map internals — potential map bucket leak per row.
 
-23. procedures should be ordered by use, main at the top, then in the order they are called from main.
+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))`.
 
-## Double-check AI output
+## LOW
 
-- [ ] cli.odin
+14. [x] **db.odin:338-341** — Unnecessary `strings.clone` before `filepath.dir` (which already returns a slice into the input).
-- [ ] cli_test.odin
+
-- [x] cmd_backup.odin
+15. **db.odin:115** — `json.unmarshal_string` error not checked. Malformed JSON silently produces empty/partial data.
-- [x] cmd_check.odin
+
-- [ ] cmd_check_test.odin
+16. **db.odin:352-353** — `hex.encode` error ignored. `string(hex_bytes)` aliases the byte slice.
-- [x] cmd_deps.odin
+
-- [ ] cmd_edit_config.odin
+18. **config.odin:51-60** — `envr_dir` recomputes home dir on every call. Could cache.
-- [x] cmd_init.odin
+
-- [x] cmd_list.odin
+19. **main.odin:42-46** — Dynamic array in `fallback_to_go` never deleted. Harmless since process exits.
-- [ ] cmd_list_test.odin
+
-- [x] cmd_nushell_completion.odin
+36. **cli.odin:59-76** — Single-dash multi-char flags (e.g. `-force`) silently misparse. `-force` becomes flag `f` with value `o`, then `rce` as positional arg. Only `--force` and `-f` work correctly.
-- [x] cmd_nushell_completion_test.odin
+
-- [x] cmd_remove.odin
+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.
-- [x] cmd_restore.odin
+
-- [x] cmd_scan.odin
+## REFACTOR
-- [x] cmd_sync.odin
+
-- [x] cmd_version.odin
+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"`.
-- [ ] config.odin
+
-- [ ] config_test.odin
+21. Check for prealloc opportunities. i.e. `make([dynamic]string)` -> `make([dynamic]string, 5)`.
-- [ ] crypto.odin
+
-- [ ] crypto_test.odin
+22. Replace is_tty with terminal.is_terminal
-- [ ] db.odin
+
-- [ ] db_integration_test.odin
+23. Add a text filter to the multi_select.
-- [ ] db_test.odin
+
-- [x] features.odin
+24. Create backup / fallback fd.
-- [x] features_test.odin
+
-- [x] main.odin
+25. Add tests for untested commands.
-- [x] prompt.odin
+
-- [ ] scan.odin
+26. Add a global --config -c flag to use an alternate config.
-- [ ] scan_test.odin
+
-- [ ] sodium.odin
+27. version --long Odin only prints version; Go also prints commit hash and build date
-- [ ] sqlite/sqlite.odin
+
-- [ ] ssh.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.
-- [ ] ssh_test.odin
+
-- [ ] table.odin
+29. nushell completions?
-- [ ] table_test.odin

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}
+	}
+}

cli.odin

@@ -1,20 +1,14 @@
 package main
 
-import "core:bufio"
 import "core:fmt"
-import "core:io"
 import "core:os"
 import "core:strings"
 
 Command :: struct {
-	name:        string,
+	name:     string,
-	args:        [dynamic]string,
+	args:     [dynamic]string,
-	flags:       map[string]string,
+	flags:    map[string]string,
-	bool_set:    map[string]bool,
+	bool_set: map[string]bool,
-	config_path: string,
-	out_buf:     ^bufio.Writer,
-	out:         io.Writer,
-	err:         io.Writer,
 }
 
 CommandInfo :: struct {
@@ -25,17 +19,10 @@ CommandInfo :: struct {
 	aliases: []string,
 }
 
-COMMANDS := []CommandInfo {
+COMMANDS := []CommandInfo{
-	{
+	{"init", "envr init", "Set up envr",
-		"init",
+		"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.",
-		"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.`,
-		{},
-	},
 	{"scan", "envr scan", "Find and select .env files for backup", "", {}},
 	{"sync", "envr sync", "Update or restore your env backups", "", {}},
 	{"backup", "envr backup <path>", "Import a .env file into envr", "", {"add"}},
@@ -43,49 +30,27 @@ key somewhere, otherwise your data could be lost forever.`,
 	{"list", "envr list", "View your tracked files", "", {}},
 	{"remove", "envr remove <path>", "Remove a .env file from your database", "", {}},
 	{"check", "envr check [path]", "Check if files are backed up", "", {}},
-	{
+	{"deps", "envr deps", "Check for missing binaries",
-		"deps",
-		"envr deps",
-		"Check for missing binaries",
 		"envr relies on external binaries for certain functionality.\n\nThe check command reports on which binaries are available and which are not.",
-		{},
+		{}},
-	},
 	{"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",
-		"",
-		{},
-	},
 }
 
-delete_command :: proc(cmd: ^Command) {
+parse_args :: proc() -> (cmd: Command, ok: bool) {
-	delete(cmd.args)
+	args := os.args
-	delete(cmd.flags)
+	if len(args) < 2 {
-	delete(cmd.bool_set)
+		print_usage()
-	bufio.writer_destroy(cmd.out_buf)
+		return Command{}, false
-	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
 	}
 
 	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)
@@ -95,8 +60,8 @@ parse_args :: proc(args: []string, out: io.Stream, err: io.Stream) -> (cmd: Comm
 		arg := args[i]
 		if strings.starts_with(arg, "--") {
 			key := arg[2:]
-			if i + 1 < len(args) && !strings.starts_with(args[i + 1], "-") {
+			if i+1 < len(args) && !strings.starts_with(args[i+1], "-") {
-				cmd.flags[key] = args[i + 1]
+				cmd.flags[key] = args[i+1]
 				i += 2
 			} else {
 				cmd.bool_set[key] = true
@@ -104,8 +69,8 @@ parse_args :: proc(args: []string, out: io.Stream, err: io.Stream) -> (cmd: Comm
 			}
 		} else if strings.starts_with(arg, "-") && len(arg) == 2 {
 			key_slice := arg[1:2]
-			if i + 1 < len(args) && !strings.starts_with(args[i + 1], "-") {
+			if i+1 < len(args) && !strings.starts_with(args[i+1], "-") {
-				cmd.flags[key_slice] = args[i + 1]
+				cmd.flags[key_slice] = args[i+1]
 				i += 2
 			} else {
 				cmd.bool_set[key_slice] = true
@@ -117,21 +82,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)
+		print_command_help(cmd.name)
-		return cmd, false
+		return Command{}, false
 	}
 
 	return cmd, true
@@ -160,113 +113,114 @@ find_command :: proc(name: string) -> (CommandInfo, bool) {
 	return CommandInfo{}, false
 }
 
-write_command_help :: proc(name: string, w: io.Writer) -> bool {
+command_help_text :: proc(name: string) -> (string, bool) {
 	info, found := find_command(name)
 	if !found {
-		return false
+		return "", false
 	}
 
-	fmt.wprintf(w, "Usage: %s [flags]\n\n", info.usage, flush = false)
+	b: strings.Builder
-	fmt.wprintf(w, "%s\n", info.short, flush = false)
+	strings.builder_init(&b)
+
+	fmt.sbprintf(&b, "Usage: %s [flags]\n\n", info.usage)
+	fmt.sbprintf(&b, "%s\n", info.short)
 
 	if len(info.aliases) > 0 {
-		fmt.wprintf(w, "\nAliases:\n  %s", info.name, flush = false)
+		fmt.sbprintf(&b, "\nAliases:\n  %s", info.name)
 		for a in info.aliases {
-			fmt.wprintf(w, ", %s", a, flush = false)
+			fmt.sbprintf(&b, ", %s", a)
 		}
-		fmt.wprintf(w, "\n", flush = false)
+		fmt.sbprintf(&b, "\n")
 	}
 
 	if len(info.long) > 0 {
-		fmt.wprintf(w, "\n%s\n", info.long, flush = false)
+		fmt.sbprintf(&b, "\n%s\n", info.long)
 	}
 
-	fmt.wprintf(
+	fmt.sbprintf(&b, "\nFlags:\n  -h, --help   help for %s\n", info.name)
-		w,
+
-		"\nFlags:\n  -h, --help   help for %s\n  -c, --config-file <path>   config file (default \"~/.envr/config.json\")\n",
+	s := strings.clone(strings.to_string(b))
-		info.name,
+	strings.builder_destroy(&b)
-		flush = false,
+	return s, true
-	)
-	return true
 }
 
-print_command_help :: proc(cmd: ^Command) {
+print_command_help :: proc(name: string) {
-	ok := write_command_help(cmd.name, cmd.out)
+	text, ok := command_help_text(name)
 	if !ok {
-		fmt.wprintf(cmd.err, "Unknown command: %s\n", cmd.name)
+		fmt.printf("Unknown command: %s\n", name)
-		write_usage(cmd.out)
+		print_usage()
+		return
 	}
+	fmt.println(text)
 }
 
-// TODO: command args should be shown in usage.
+usage_text :: proc() -> string {
-write_usage :: proc(w: io.Writer) {
+	b: strings.Builder
-	fmt.wprintf(
+	strings.builder_init(&b)
-		w,
-		`envr keeps your .env synced to a local, age encrypted database.
-Is a safe and easy 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
+	fmt.sbprintf(&b, "envr keeps your .env synced to a local, age encrypted database.\n")
-
+	fmt.sbprintf(&b, "Is a safe and easy way to gather all your .env files in one place where they can\n")
-Getting started is easy:
+	fmt.sbprintf(&b, "easily be backed by another tool such as restic or git.\n")
-
+	fmt.sbprintf(&b, "\n")
-1. Create your configuration file and set up encrypted storage:
+	fmt.sbprintf(&b, "All your data is stored in ~/data.age\n")
-
+	fmt.sbprintf(&b, "\n")
-> envr init
+	fmt.sbprintf(&b, "Getting started is easy:\n")
-
+	fmt.sbprintf(&b, "\n")
-2. Scan for existing .env files:
+	fmt.sbprintf(&b, "1. Create your configuration file and set up encrypted storage:\n")
-
+	fmt.sbprintf(&b, "\n")
-> envr scan
+	fmt.sbprintf(&b, "> envr init\n")
-
+	fmt.sbprintf(&b, "\n")
-Select the files you want to back up from the interactive list.
+	fmt.sbprintf(&b, "2. Scan for existing .env files:\n")
-
+	fmt.sbprintf(&b, "\n")
-3. Verify that it worked:
+	fmt.sbprintf(&b, "> envr scan\n")
-
+	fmt.sbprintf(&b, "\n")
-> envr list
+	fmt.sbprintf(&b, "Select the files you want to back up from the interactive list.\n")
-
+	fmt.sbprintf(&b, "\n")
-4. After changing any of your .env files, update the backup with:
+	fmt.sbprintf(&b, "3. Verify that it worked:\n")
-
+	fmt.sbprintf(&b, "\n")
-> envr sync
+	fmt.sbprintf(&b, "> envr list\n")
-
+	fmt.sbprintf(&b, "\n")
-5. If you lose a repository, after re-cloning the repo into the same path it was
+	fmt.sbprintf(&b, "4. After changing any of your .env files, update the backup with:\n")
-at before, restore your backup with:
+	fmt.sbprintf(&b, "\n")
-
+	fmt.sbprintf(&b, "> envr sync\n")
-> envr restore ~/<path to repository>/.env
+	fmt.sbprintf(&b, "\n")
-
+	fmt.sbprintf(&b, "5. If you lose a repository, after re-cloning the repo into the same path it was\n")
-Usage:
+	fmt.sbprintf(&b, "at before, restore your backup with:\n")
-  envr [command]
+	fmt.sbprintf(&b, "\n")
-
+	fmt.sbprintf(&b, "> envr restore ~/<path to repository>/.env\n")
-Available Commands:
+	fmt.sbprintf(&b, "\n")
-`,
+	fmt.sbprintf(&b, "Usage:\n")
-		flush = false,
+	fmt.sbprintf(&b, "  envr [command]\n")
-	)
+	fmt.sbprintf(&b, "\n")
+	fmt.sbprintf(&b, "Available Commands:\n")
 
 	for c in COMMANDS {
-		name_start := len(c.name)
+		name_start := len(b.buf)
-		fmt.wprintf(w, "%s", c.name, flush = false)
+		fmt.sbprintf(&b, "%s", c.name)
 		for a in c.aliases {
-			fmt.wprintf(w, ", %s", a, flush = false)
+			fmt.sbprintf(&b, ", %s", a)
-			name_start += len(a) + 2
 		}
-		padding := 20 - name_start
+		name_len := len(b.buf) - name_start
+		padding := 20 - name_len
 		if padding > 0 {
-			for _ in 0 ..< padding {
+			for _ in 0..<padding {
-				io.write_byte(w, ' ')
+				strings.write_byte(&b, ' ')
 			}
 		}
-		fmt.wprintf(w, " %s\n", c.short, flush = false)
+		fmt.sbprintf(&b, " %s\n", c.short)
 	}
 
-	fmt.wprintf(
+	fmt.sbprintf(&b, "\n")
-		w,
+	fmt.sbprintf(&b, "Flags:\n")
-		`
+	fmt.sbprintf(&b, "  -h, --help   help for envr\n")
-Flags:
+	fmt.sbprintf(&b, "\n")
-  -h, --help   help for envr
+	fmt.sbprintf(&b, "Use \"envr [command] --help\" for more information about a command.\n")
-  -c, --config-file <path>   config file (default "~/.envr/config.json")
 
-Use "envr [command] --help" for more information about a command.
+	s := strings.clone(strings.to_string(b))
-`,
+	strings.builder_destroy(&b)
-		flush = false,
+	return s
-	)
 }
 
+print_usage :: proc() {
+	fmt.print(usage_text())
+}

cli_test.odin

@@ -1,41 +1,32 @@
-#+feature dynamic-literals
-package main
 package main
 
-import "core:fmt"
 import "core:fmt"
 import "core:strings"
 import "core:testing"
 
 @(test)
 test_usage_text_contains_all_commands :: proc(t: ^testing.T) {
-	strings.builder_init(&b)
+	text := usage_text()
-	defer strings.builder_destroy(&b)
-
-	write_usage(strings.to_writer(&b))
-	text := strings.to_string(b)
-
 
 	for c in COMMANDS {
 		testing.expect(
 			t,
 			strings.contains(text, c.name),
-		)
+			fmt.aprintf("usage_text missing command %q", c.name),
 		)
 		for a in c.aliases {
-		}
+			testing.expect(
+				t,
+				strings.contains(text, a),
+				fmt.aprintf("usage_text missing alias %q", a),
+			)
 		}
 	}
 }
 
 @(test)
 test_usage_text_contains_steps :: proc(t: ^testing.T) {
-	strings.builder_init(&b)
+	text := usage_text()
-	defer strings.builder_destroy(&b)
-
-	write_usage(strings.to_writer(&b))
-	text := strings.to_string(b)
-
 
 	testing.expect(t, strings.contains(text, "1."), "missing step 1")
 	testing.expect(t, strings.contains(text, "2."), "missing step 2")
@@ -43,51 +34,55 @@ test_usage_text_contains_steps :: proc(t: ^testing.T) {
 	testing.expect(t, strings.contains(text, "4."), "missing step 4")
 	testing.expect(t, strings.contains(text, "5."), "missing step 5")
 	testing.expect(t, strings.contains(text, "> envr sync\n"), "step 4 missing 'envr sync'")
-}
+	testing.expect(
+		t,
+		strings.contains(text, "> envr restore"),
+		"step 5 missing 'envr restore'",
+	)
 }
 
 @(test)
 test_usage_text_contains_flags_and_help_hint :: proc(t: ^testing.T) {
-	strings.builder_init(&b)
+	text := usage_text()
-	defer strings.builder_destroy(&b)
-
-	write_usage(strings.to_writer(&b))
-	text := strings.to_string(b)
-
 
 	testing.expect(t, strings.contains(text, "Flags:"), "missing Flags section")
 	testing.expect(t, strings.contains(text, "--help"), "missing --help flag")
-}
+	testing.expect(
+		t,
+		strings.contains(text, "Use \"envr [command] --help\""),
+		"missing help hint",
+	)
 }
 
 @(test)
 test_command_help_backup :: proc(t: ^testing.T) {
-	strings.builder_init(&b)
+	text, ok := command_help_text("backup")
-	defer strings.builder_destroy(&b)
+	testing.expect(t, ok, "command_help_text(\"backup\") returned false")
-
 
-	testing.expect(t, ok, "write_command_help(\"backup\") returned false")
-
-	text := strings.to_string(b)
-	testing.expect(t, strings.contains(text, "Usage:"), "missing Usage line")
 	testing.expect(t, strings.contains(text, "Usage:"), "missing Usage line")
-	testing.expect(t, strings.contains(text, "Aliases:"), "missing Aliases section")
+	testing.expect(
-	testing.expect(t, strings.contains(text, "add"), "missing 'add' alias")
+		t,
+		strings.contains(text, "envr backup <path>"),
+		"missing usage pattern",
+	)
+	testing.expect(
+		t,
+		strings.contains(text, "Aliases:"),
+		"missing Aliases section",
+	)
 	testing.expect(t, strings.contains(text, "add"), "missing 'add' alias")
 	testing.expect(t, strings.contains(text, "Flags:"), "missing Flags section")
-}
+	testing.expect(
+		t,
+		strings.contains(text, "--help"),
+		"missing --help in flags",
+	)
 }
 
 @(test)
 test_command_help_add_alias :: proc(t: ^testing.T) {
-	strings.builder_init(&b)
+	text, ok := command_help_text("add")
-	defer strings.builder_destroy(&b)
+	testing.expect(t, ok, "command_help_text(\"add\") returned false")
-
-	ok := write_command_help("add", strings.to_writer(&b))
-	testing.expect(t, ok, "write_command_help(\"add\") returned false")
-
-	text := strings.to_string(b)
-	testing.expect(
 	testing.expect(
 		t,
 		strings.contains(text, "envr backup <path>"),
@@ -98,43 +93,34 @@ test_command_help_add_alias :: proc(t: ^testing.T) {
 
 @(test)
 test_command_help_init_no_aliases :: proc(t: ^testing.T) {
-	strings.builder_init(&b)
+	text, ok := command_help_text("init")
-	defer strings.builder_destroy(&b)
+	testing.expect(t, ok, "command_help_text(\"init\") returned false")
-
 
-	testing.expect(t, ok, "write_command_help(\"init\") returned false")
-
-	text := strings.to_string(b)
-	testing.expect(t, strings.contains(text, "Usage:"), "missing Usage line")
 	testing.expect(t, strings.contains(text, "Usage:"), "missing Usage line")
-	testing.expect(t, strings.contains(text, "Flags:"), "missing Flags section")
+	testing.expect(
+		t,
+		!strings.contains(text, "Aliases:"),
+		"init should not have Aliases section",
+	)
 	testing.expect(t, strings.contains(text, "Flags:"), "missing Flags section")
-}
+	testing.expect(
+		t,
+		strings.contains(text, "help for init"),
+		"missing 'help for init'",
+	)
 }
 
 @(test)
 test_command_help_unknown :: proc(t: ^testing.T) {
-	strings.builder_init(&b)
+	text, ok := command_help_text("nonexistent")
-	defer strings.builder_destroy(&b)
+	testing.expect(t, !ok, "command_help_text(\"nonexistent\") should return false")
-
-	ok := write_command_help("nonexistent", strings.to_writer(&b))
-	testing.expect(t, !ok, "write_command_help(\"nonexistent\") should return false")
-
-	text := strings.to_string(b)
-	testing.expect(t, len(text) == 0, "text should be empty for unknown command")
 	testing.expect(t, len(text) == 0, "text should be empty for unknown command")
 }
 
 @(test)
 test_command_help_version :: proc(t: ^testing.T) {
-	strings.builder_init(&b)
+	text, ok := command_help_text("version")
-	defer strings.builder_destroy(&b)
+	testing.expect(t, ok, "command_help_text(\"version\") returned false")
-
-	ok := write_command_help("version", strings.to_writer(&b))
-	testing.expect(t, ok, "write_command_help(\"version\") returned false")
-
-	text := strings.to_string(b)
-	testing.expect(t, strings.contains(text, "Usage:"), "missing Usage line")
 	testing.expect(t, strings.contains(text, "Usage:"), "missing Usage line")
 	testing.expect(
 		t,
@@ -142,229 +128,3 @@ test_command_help_version :: proc(t: ^testing.T) {
 		"version should not have Aliases section",
 	)
 }
-@(test)
-test_has_flag_bool_set :: proc(t: ^testing.T) {
-	cmd := Command {
-		name = "test",
-		bool_set = map[string]bool{"force" = true},
-	}
-	defer delete(cmd.bool_set)
-
-	testing.expect(t, has_flag(&cmd, "force"), "should find flag in bool_set")
-	testing.expect(t, !has_flag(&cmd, "verbose"), "should not find missing flag")
-}
-
-@(test)
-test_has_flag_value_map :: proc(t: ^testing.T) {
-	cmd := Command {
-		name = "test",
-		flags = map[string]string{"output" = "/tmp/out"},
-	}
-	defer delete(cmd.flags)
-
-	testing.expect(t, has_flag(&cmd, "output"), "should find flag in flags map")
-	testing.expect(t, !has_flag(&cmd, "force"), "should not find missing flag")
-}
-
-@(test)
-test_has_flag_both_maps :: proc(t: ^testing.T) {
-	cmd := Command {
-		name = "test",
-		flags = map[string]string{"output" = "/tmp/out"},
-		bool_set = map[string]bool{"force" = true},
-	}
-	defer delete(cmd.flags)
-	defer delete(cmd.bool_set)
-
-	testing.expect(t, has_flag(&cmd, "output"), "should find in flags")
-	testing.expect(t, has_flag(&cmd, "force"), "should find in bool_set")
-	testing.expect(t, !has_flag(&cmd, "verbose"), "should not find missing flag")
-}
-
-@(test)
-test_has_flag_empty_command :: proc(t: ^testing.T) {
-	cmd := Command {
-		name = "test",
-	}
-	testing.expect(t, !has_flag(&cmd, "anything"), "empty command should have no flags")
-}
-
-test_parse_args :: proc(
-	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

@@ -18,20 +18,32 @@ export def untracked-paths [] {
   )
 }
 
+# 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
 ]
@@ -65,7 +77,3 @@ export extern "envr scan" [
 export extern "envr sync" [
   --help(-h)              # Show help for sync command
 ]
-
-export extern "envr nushell-completion" [
-  --help(-h)              # Show help for nushell-completion 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,35 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	version = "dev"
+	commit  = "none"
+	date    = "unknown"
+)
+
+var long bool
+
+// versionCmd represents the version command
+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,15 +3,18 @@ package main
 import "core:fmt"
 import "core:os"
 import "core:path/filepath"
+import "core:strings"
 
 cmd_check :: proc(cmd: ^Command) {
+	feats := check_features()
+
 	check_path: string
 	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
@@ -23,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
 	}
@@ -40,9 +43,16 @@ cmd_check :: proc(cmd: ^Command) {
 	files_in_path: [dynamic]string
 
 	if is_dir {
+		if cant_scan(feats) {
+			fmt.println(
+				"Error: please install fd to use the check command (https://github.com/sharkdp/fd)",
+			)
+			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
@@ -59,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_check_test.odin

@@ -9,12 +9,12 @@ test_find_unbacked_finds_missing :: proc(t: ^testing.T) {
 	db := []EnvFile{{Path = "/a/.env"}, {Path = "/b/.env"}}
 
 	result := find_unbacked(local, db[:])
-	testing.expect(t, len(result) == 1, fmt.tprintf("expected 1 unbacked, got %d", len(result)))
+	testing.expect(t, len(result) == 1, fmt.aprintf("expected 1 unbacked, got %d", len(result)))
 	if len(result) > 0 {
 		testing.expect(
 			t,
 			result[0] == "/c/.env",
-			fmt.tprintf("expected /c/.env, got %s", result[0]),
+			fmt.aprintf("expected /c/.env, got %s", result[0]),
 		)
 	}
 }
@@ -25,7 +25,7 @@ test_find_unbacked_all_backed :: proc(t: ^testing.T) {
 	db := []EnvFile{{Path = "/a/.env"}, {Path = "/b/.env"}}
 
 	result := find_unbacked(local, db[:])
-	testing.expect(t, len(result) == 0, fmt.tprintf("expected 0 unbacked, got %d", len(result)))
+	testing.expect(t, len(result) == 0, fmt.aprintf("expected 0 unbacked, got %d", len(result)))
 }
 
 @(test)
@@ -34,7 +34,7 @@ test_find_unbacked_no_local :: proc(t: ^testing.T) {
 	db := []EnvFile{{Path = "/a/.env"}}
 
 	result := find_unbacked(local, db[:])
-	testing.expect(t, len(result) == 0, fmt.tprintf("expected 0 unbacked, got %d", len(result)))
+	testing.expect(t, len(result) == 0, fmt.aprintf("expected 0 unbacked, got %d", len(result)))
 }
 
 @(test)
@@ -43,6 +43,6 @@ test_find_unbacked_none_backed :: proc(t: ^testing.T) {
 	db: []EnvFile
 
 	result := find_unbacked(local, db[:])
-	testing.expect(t, len(result) == 2, fmt.tprintf("expected 2 unbacked, got %d", len(result)))
+	testing.expect(t, len(result) == 2, fmt.aprintf("expected 2 unbacked, got %d", len(result)))
 }
 

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()
 
@@ -17,11 +14,17 @@ cmd_deps :: proc(cmd: ^Command) {
 		append(&rows, []string{"Git", "\u2717 Missing"})
 	}
 
-	if terminal.is_terminal(os.stdout) {
+	if .Fd in feats {
-		render_table(cmd.out, headers, rows[:])
+		append(&rows, []string{"fd", "\u2713 Available"})
 	} else {
-		render_json_rows(cmd.out, headers, rows[:])
+		append(&rows, []string{"fd", "\u2717 Missing"})
-		fmt.wprint(cmd.out, "\n", flush = false)
 	}
-}
 
+	if .Age in feats {
+		append(&rows, []string{"age", "\u2713 Available"})
+	} else {
+		append(&rows, []string{"age", "\u2717 Missing"})
+	}
+
+	render_table(headers, rows[:])
+}

cmd_edit_config.odin

@@ -2,48 +2,48 @@ 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)
+    editor := os.get_env("EDITOR", context.allocator)
-	if len(editor) == 0 {
+    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
+        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)
+    _, stat_err := os.stat(config_path, context.allocator)
-	if stat_err != nil {
+    if stat_err != nil {
-		fmt.wprintf(
+        fmt.printf("Config file does not exist at %s. Run 'envr init' first.\n", config_path)
-			cmd.err,
+        return
-			"Config file does not exist at %s. Run 'envr init' first.\n",
+    }
-			config_path,
-			flush = false,
-		)
-		return
-	}
 
-	args := []string{editor, config_path}
+    args := []string{editor, config_path}
-	desc := os.Process_Desc {
+    desc := os.Process_Desc{
-		command = args,
+        command = args,
-		stdin   = os.stdin,
+        stdin = os.stdin,
-		stdout  = os.stdout,
+        stdout = os.stdout,
-		stderr  = os.stderr,
+        stderr = os.stderr,
-	}
+    }
 
-	p, start_err := os.process_start(desc)
+    p, start_err := os.process_start(desc)
-	if start_err != nil {
+    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
+        return
-	}
+    }
 
-	state, wait_err := os.process_wait(p)
+    state, wait_err := os.process_wait(p)
-	if wait_err != nil {
+    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
+        return
-	}
+    }
-	if state.exit_code != 0 {
+    if state.exit_code != 0 {
-		os.exit(int(state.exit_code))
+        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()
-
-	_, cfg_exists := load_config(cmd.config_path)
 	if cfg_exists && !force {
-		fmt.wprintln(
+		fmt.println("You have already initialized envr.")
-			cmd.out,
+		fmt.println("Run again with the --force flag if you want to reinitialize.")
-			`You have already initialized envr.
-Run again with the --force flag if you want to reinitialize.`,
-			flush = false,
-		)
 		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
+		fmt.println("No SSH private keys found in ~/.ssh")
-Generate one with: ssh-keygen -t ed25519`, flush = false)
 		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(
+	fmt.printf(
-		cmd.out,
 		"Config initialized with %d SSH key(s). You are ready to use envr.\n",
 		len(selected_paths),
-		flush = false,
 	)
 }
+

cmd_list.odin

@@ -2,65 +2,56 @@ 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"`,
+    Directory: string `json:"directory"`,
-	Path:      string `json:"path"`,
+    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 {
+    if !db_ok {
-		return
+        return
-	}
+    }
-	defer db_close(&db)
+    defer db_close(&db)
 
-	rows, list_ok := db_list(&db)
+    rows, list_ok := db_list(&db)
-	if !list_ok {
+    if !list_ok {
-		return
+        return
-	}
+    }
-	defer delete(rows)
+    defer delete(rows)
 
-	if terminal.is_terminal(os.stdout) {
+    if is_tty() {
-		headers := []string{"Directory", "Path"}
+        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 {
+        for row in rows {
-			dir_str := strings.concatenate({row.Dir, "/"}, context.temp_allocator)
+            dir_str := strings.concatenate({row.Dir, "/"})
-			filename := filepath.base(row.Path)
+            filename := filepath.base(row.Path)
-			row_slice := make([]string, 2)
+            row_slice := make([]string, 2)
-			row_slice[0] = dir_str
+            row_slice[0] = dir_str
-			row_slice[1] = filename
+            row_slice[1] = filename
-			append(&table_rows, row_slice)
+            append(&table_rows, row_slice)
-		}
+        }
 
-		render_table(cmd.out, headers, table_rows[:])
+        render_table(headers, table_rows[:])
-	} else {
+    } else {
-		// TODO: Should we instead print full entries here?
+        entries: [dynamic]ListEntry
-		entries: [dynamic]ListEntry
+        for row in rows {
-		for row in rows {
+            filename := filepath.base(row.Path)
-			filename := filepath.base(row.Path)
+            append(&entries, ListEntry{
-			append(
+                Directory = strings.concatenate({row.Dir, "/"}),
-				&entries,
+                Path = filename,
-				ListEntry {
+            })
-					Directory = strings.concatenate({row.Dir, "/"}, context.temp_allocator),
+        }
-					Path = filename,
-				},
-			)
-		}
 
-		data, marshal_err := json.marshal(entries[:], allocator = context.temp_allocator)
+        data, marshal_err := json.marshal(entries[:])
-		if marshal_err != nil {
+        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
+            return
-		}
+        }
-		fmt.wprintln(cmd.out, string(data), flush = false)
+        fmt.println(string(data))
-	}
+    }
 }
-

cmd_list_test.odin

@@ -5,14 +5,22 @@ import "core:testing"
 
 @(test)
 test_filepath_base_equals_rel :: proc(t: ^testing.T) {
-	cases := []string{"/home/user/.env", "/home/user/project/.envrc", "/tmp/foo", "/a/b/c/d.txt"}
+	cases := []string{
+		"/home/user/.env",
+		"/home/user/project/.envrc",
+		"/tmp/foo",
+		"/a/b/c/d.txt",
+	}
 
 	for path in cases {
 		dir := filepath.dir(path)
-		rel, rel_err := filepath.rel(dir, path, context.temp_allocator)
+		rel, rel_err := filepath.rel(dir, path)
 		testing.expect(t, rel_err == nil, "filepath.rel returned an error")
 		base := filepath.base(path)
-		testing.expect(t, rel == base, "filepath.rel(dir, path) should equal filepath.base(path)")
+		testing.expect(
+			t,
+			rel == base,
+			"filepath.rel(dir, path) should equal filepath.base(path)",
+		)
 	}
 }
-

cmd_nushell_completion.odin

@@ -1,10 +0,0 @@
-package main
-
-import "core:fmt"
-
-COMPLETION_SCRIPT: string : string(#load("mod.nu"))
-
-cmd_nushell_completion :: proc(cmd: ^Command) {
-	fmt.wprint(cmd.out, COMPLETION_SCRIPT, flush = false)
-}
-

cmd_nushell_completion_test.odin

@@ -1,36 +0,0 @@
-package main
-
-import "core:fmt"
-import "core:strings"
-import "core:testing"
-
-@(test)
-test_nushell_completion_nonempty :: proc(t: ^testing.T) {
-	testing.expect(t, len(COMPLETION_SCRIPT) > 0, "completion script should not be empty")
-}
-
-@(test)
-test_nushell_completion_contains_externs :: proc(t: ^testing.T) {
-	expected := []string{
-		"tracked-paths",
-		"untracked-paths",
-		"envr backup",
-		"envr check",
-		"envr edit-config",
-		"envr help",
-		"envr init",
-		"envr list",
-		"envr remove",
-		"envr restore",
-		"envr scan",
-		"envr sync",
-		"envr nushell-completion",
-	}
-	for ext in expected {
-		testing.expect(
-			t,
-			strings.contains(COMPLETION_SCRIPT, ext),
-			fmt.tprintf("expected script to contain %q", ext),
-		)
-	}
-}

cmd_remove.odin

@@ -5,40 +5,38 @@ import "core:path/filepath"
 import "core:strings"
 
 cmd_remove :: proc(cmd: ^Command) {
-	if len(cmd.args) != 1 {
+    if len(cmd.args) != 1 {
-		print_command_help(cmd)
+		print_command_help("remove")
-		return
+        return
-	}
+    }
 
-	path := cmd.args[0]
+    path := cmd.args[0]
-	if len(strings.trim_space(path)) == 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
+        return
-	}
+    }
 
-	// TODO: Is this the best way to do it?
+    abs_path: string
-	abs_path: string
+    if filepath.is_abs(path) {
-	if filepath.is_abs(path) {
+        abs_path = path
-		abs_path = path
+    } else {
-	} else {
+        resolved, abs_err := filepath.abs(path)
-		resolved, abs_err := filepath.abs(path)
+        if abs_err != nil {
-		if abs_err != nil {
+            fmt.printf("Error getting absolute path: %v\n", abs_err)
-			fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
+            return
-			return
+        }
-		}
+        abs_path = resolved
-		abs_path = resolved
+    }
-	}
 
-	db, db_ok := db_open(cmd.config_path)
+    db, db_ok := db_open()
-	if !db_ok {
+    if !db_ok {
-		return
+        return
-	}
+    }
-	defer db_close(&db)
+    defer db_close(&db)
 
-	if !db_delete(&db, abs_path) {
+    if !db_delete(&db, abs_path) {
-		return
+        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

@@ -6,50 +6,48 @@ import "core:path/filepath"
 import "core:strings"
 
 cmd_restore :: proc(cmd: ^Command) {
-	if len(cmd.args) != 1 {
+    if len(cmd.args) != 1 {
-		print_command_help(cmd)
+		print_command_help("restore")
-		return
+        return
-	}
+    }
 
-	path := cmd.args[0]
+    path := cmd.args[0]
-	if len(strings.trim_space(path)) == 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
+        return
-	}
+    }
 
-	// TODO: Is this the right way to handle this?
+    abs_path: string
-	abs_path: string
+    if filepath.is_abs(path) {
-	if filepath.is_abs(path) {
+        abs_path = path
-		abs_path = path
+    } else {
-	} else {
+        resolved, abs_err := filepath.abs(path)
-		resolved, abs_err := filepath.abs(path)
+        if abs_err != nil {
-		if abs_err != nil {
+            fmt.printf("Error getting absolute path: %v\n", abs_err)
-			fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
+            return
-			return
+        }
-		}
+        abs_path = resolved
-		abs_path = resolved
+    }
-	}
 
-	db, db_ok := db_open(cmd.config_path)
+    db, db_ok := db_open()
-	if !db_ok {
+    if !db_ok {
-		return
+        return
-	}
+    }
-	defer db_close(&db)
+    defer db_close(&db)
 
-	file, fetch_ok := db_fetch(&db, abs_path)
+    file, fetch_ok := db_fetch(&db, abs_path)
-	if !fetch_ok {
+    if !fetch_ok {
-		return
+        return
-	}
+    }
 
-	dir := filepath.dir(file.Path)
+    dir := filepath.dir(file.Path)
-	os.mkdir_all(dir)
+    os.mkdir_all(dir)
 
-	write_err := os.write_entire_file(file.Path, file.contents)
+    write_err := os.write_entire_file(file.Path, file.contents)
-	if write_err != nil {
+    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
+        return
-	}
+    }
 
-	fmt.wprintf(cmd.out, "Restored %s\n", file.Path, flush = false)
+    fmt.printf("Restored %s\n", file.Path)
 }
-

cmd_scan.odin

@@ -2,11 +2,17 @@ package main
 
 import "core:encoding/json"
 import "core:fmt"
-import "core:os"
-import "core:terminal"
 
 cmd_scan :: proc(cmd: ^Command) {
-	db, db_ok := db_open(cmd.config_path)
+	feats := check_features()
+	if cant_scan(feats) {
+		fmt.println(
+			"Error: please install fd to use the scan command (https://github.com/sharkdp/fd)",
+		)
+		return
+	}
+
+	db, db_ok := db_open()
 	if !db_ok {
 		return
 	}
@@ -14,11 +20,7 @@ cmd_scan :: proc(cmd: ^Command) {
 
 	search_dirs := search_paths(db.cfg)
 	if len(search_dirs) == 0 {
-		fmt.wprintln(
+		fmt.println("No search paths configured. Please run `envr init` or edit your config.")
-			cmd.err,
-			"No search paths configured. Please run `envr init -f` or edit your config.",
-			flush = false,
-		)
 		return
 	}
 
@@ -27,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 {
@@ -43,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(
+			fmt.printf("Error marshaling files to JSON: %v\n", marshal_err)
-				cmd.err,
-				"Error marshaling files to JSON: %v\n",
-				marshal_err,
-				flush = false,
-			)
 			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
 	}
 
@@ -76,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(
+		fmt.printf("\x1b[1;32mSuccessfully added %d file(s) to backup.\x1b[0m\n", added_count)
-			cmd.out,
-			"\x1b[1;32mSuccessfully added %d file(s) to backup.\x1b[0m\n",
-			added_count,
-			flush = false,
-		)
 	} 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 {
+		if is_error {
-		case .Error in result:
 			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

@@ -6,8 +6,6 @@ import "core:os"
 import "core:path/filepath"
 import "core:strings"
 
-import "findr"
-
 SshKeyPair :: struct {
 	Private: string `json:"private"`,
 	Public:  string `json:"public"`,
@@ -15,70 +13,51 @@ SshKeyPair :: struct {
 
 ScanConfig :: struct {
 	Matcher: string `json:"matcher"`,
-	Exclude: [dynamic]string `json:"exclude"`,
+	Exclude: []string `json:"exclude"`,
-	Include: [dynamic]string `json:"include"`,
+	Include: []string `json:"include"`,
 }
 
 Config :: struct {
-	Keys:        [dynamic]SshKeyPair `json:"keys"`,
+	Keys:       []SshKeyPair `json:"keys"`,
-	ScanConfig:  ScanConfig `json:"scan"`,
+	ScanConfig: ScanConfig `json:"scan"`,
-	config_path: string `json:"-"`,
 }
 
-default_config_path :: proc(home: string, allocator := context.allocator) -> string {
+load_config :: proc() -> (Config, bool) {
-	path, err := filepath.join([]string{home, ".envr", "config.json"}, allocator)
+	home, home_err := os.user_home_dir(context.allocator)
-	if err != nil {
+	if home_err != nil {
-		panic("Ran out of memory when building config path")
+		fmt.printf("Error getting home dir: %v\n", home_err)
+		return Config{}, false
+	}
+	config_path, join_err := filepath.join([]string{home, ".envr", "config.json"})
+	if join_err != nil {
+		return Config{}, false
 	}
-	return path
-}
 
-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) {
+envr_dir :: proc() -> string {
-	for key in cfg.Keys {
+	home, _ := os.user_home_dir(context.allocator)
-		delete(key.Private)
+	dir, _ := filepath.join([]string{home, ".envr"})
-		delete(key.Public)
+	return dir
-	}
-	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 {
+data_age_path :: proc() -> string {
-	return filepath.dir(config_path)
+	dir := envr_dir()
-}
+	path, _ := filepath.join([]string{dir, "data.age"})
-
-data_path :: proc(config_path: string) -> string {
-	path, _ := filepath.join([]string{envr_dir(config_path), "data.envr"})
 	return path
 }
 
@@ -118,9 +97,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)
 	}
 
@@ -128,50 +104,52 @@ find_ssh_private_keys :: proc() -> (keys: [dynamic]string, ok: bool) {
 	return
 }
 
-// Caller is responsible for calling delete_config()
+new_config :: proc(private_key_paths: []string) -> Config {
-new_config :: proc(
-	private_key_paths: []string,
-	cfg_path: string = "~/.envr/config.json",
-) -> Config {
 	keys := make([dynamic]SshKeyPair, 0, len(private_key_paths))
 	for priv in private_key_paths {
-		// TODO: Is this bad?
+		pub, _ := strings.concatenate([]string{priv, ".pub"})
-		priv_key := strings.clone(priv)
+		append(&keys, SshKeyPair{Private = priv, Public = pub})
-		pub, _ := strings.concatenate([]string{priv_key, ".pub"})
-		append(&keys, SshKeyPair{Private = priv_key, Public = pub})
 	}
 
 	exclude := make([dynamic]string, 0, 4)
-	append(&exclude, strings.clone("*\\.envrc"))
+	append(&exclude, "*\\.envrc")
-	append(&exclude, strings.clone("\\.local/"))
+	append(&exclude, "\\.local/")
-	append(&exclude, strings.clone("node_modules"))
+	append(&exclude, "node_modules")
-	append(&exclude, strings.clone("vendor"))
+	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,
+		Exclude = exclude[:],
-		Include = include,
+		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 {
+	config_path, _ := filepath.join([]string{config_dir, "config.json"})
-		info, stat_err := os.stat(cfg.config_path, context.allocator)
+
+	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 {
@@ -186,9 +164,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
@@ -198,18 +175,15 @@ save_config :: proc(cfg: Config, force: bool = false) -> bool {
 }
 
 search_paths :: proc(cfg: Config) -> (paths: [dynamic]string) {
-	// TODO: Is this okay?
+	home, _ := os.user_home_dir(context.allocator)
-	// TODO: handle error
-	home, _ := os.user_home_dir(context.temp_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) {
+		cloned, _ := strings.clone(expanded)
-			append(&paths, expanded)
+		if filepath.is_abs(cloned) {
+			append(&paths, cloned)
 		} else {
-			defer delete(expanded)
+			resolved, err := filepath.abs(cloned)
-			resolved, err := filepath.abs(expanded)
 			if err == nil {
 				append(&paths, resolved)
 			}
@@ -220,7 +194,22 @@ search_paths :: proc(cfg: Config) -> (paths: [dynamic]string) {
 
 find_git_roots :: proc(cfg: Config) -> (roots: [dynamic]string, ok: bool) {
 	paths := search_paths(cfg)
-	findr.find_repos(paths[:], &roots, os.get_processor_core_count())
+
+	for sp in paths {
+		args := []string{"fd", "-H", "-t", "d", "^\\.git$", sp}
+		lines, fd_ok := run_fd(args)
+		if !fd_ok {
+			return
+		}
+
+		for line in lines {
+			cleaned, _ := filepath.clean(line)
+			parent := filepath.dir(cleaned)
+			cloned, _ := strings.clone(parent)
+			append(&roots, cloned)
+		}
+	}
+
 	ok = true
 	return
 }

config_test.odin

@@ -1,210 +0,0 @@
-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)
-
-	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")
-	testing.expect(
-		t,
-		cfg.Keys[0].Public == "/home/user/.ssh/id_ed25519.pub",
-		"Public path mismatch",
-	)
-}
-
-@(test)
-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)
-
-	testing.expect(t, len(cfg.Keys) == 2, "should have 2 keys")
-	testing.expect(t, cfg.Keys[0].Private == "/home/user/.ssh/id_ed25519")
-	testing.expect(t, cfg.Keys[1].Private == "/home/user/.ssh/id_rsa")
-}
-
-@(test)
-test_new_config_empty_keys :: proc(t: ^testing.T) {
-	paths: []string
-	cfg := new_config(paths)
-	defer delete_config(&cfg)
-
-	testing.expect(t, len(cfg.Keys) == 0, "should have 0 keys")
-}
-
-@(test)
-test_new_config_scan_defaults :: proc(t: ^testing.T) {
-	paths := []string{"/home/user/.ssh/id_ed25519"}
-	cfg := new_config(paths)
-	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")
-	testing.expect(t, len(cfg.ScanConfig.Include) == 1, "should have 1 include path")
-	testing.expect(t, cfg.ScanConfig.Include[0] == "~", "include should be ~")
-}
-
-@(test)
-test_new_config_exclude_patterns :: proc(t: ^testing.T) {
-	paths := []string{"/home/user/.ssh/id_ed25519"}
-	cfg := new_config(paths)
-	defer delete_config(&cfg)
-
-	expected := []string{"*\\.envrc", "\\.local/", "node_modules", "vendor"}
-	for i in 0 ..< len(expected) {
-		testing.expect(t, cfg.ScanConfig.Exclude[i] == expected[i])
-	}
-}
-
-@(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_path :: proc(t: ^testing.T) {
-	p := data_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_integration_test.odin

@@ -1,337 +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_deserialize_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)
-
-	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)
-
-	n := i64(len(plaintext))
-	buf := sqlite.malloc64(n)
-	testing.expect(t, buf != nil, "malloc64 should succeed")
-	if buf == nil do return
-	copy(buf[:len(plaintext)], plaintext)
-
-	rc = sqlite.deserialize(
-		mem_db,
-		"main",
-		buf,
-		n,
-		n,
-		sqlite.DESERIALIZE_FREEONCLOSE | sqlite.DESERIALIZE_RESIZEABLE,
-	)
-	testing.expect(t, rc == sqlite.OK, "deserialize should succeed")
-	if rc != sqlite.OK {
-		sqlite.free(buf)
-		return
-	}
-
-	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,400 +1,19 @@
 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) {
+test_dir_slice_owns_parent :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
+	abs_path := "/home/user/project/.env"
-	testing.expect(t, ok, "failed to create test db")
+	cloned_path, _ := strings.clone(abs_path)
-	if !ok do return
-	defer sqlite.db_close(d.db)
 
-	path := "/project/.env"
+	dir := filepath.dir(cloned_path)
-	sha := "abc123"
-	contents := "SECRET=value"
 
-	f := make_test_env_file(path, sha, contents, []string{"git@github.com:user/repo.git"})
+	testing.expect(t, dir == "/home/user/project", "filepath.dir should return parent directory")
-	defer delete(f.Remotes)
+	testing.expect(t, len(dir) > 0, "dir should not be empty")
 
-	testing.expect(t, db_insert(&d, f), "insert should succeed")
+	cloned_dir, _ := strings.clone(dir)
-
+	testing.expect(t, cloned_dir == dir, "clone of dir should equal dir")
-	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_serialize :: 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)
-
-	sz: i64
-	data := sqlite.serialize(d.db, "main", &sz, 0)
-	testing.expect(t, data != nil, "serialize should return non-nil")
-	if data == nil do return
-	defer sqlite.free(data)
-
-	testing.expect(t, sz > 0, "serialized size should be > 0")
-}
-
-@(test)
-test_db_update_required_noop :: proc(t: ^testing.T) {
-	testing.expect(t, !db_update_required({}), "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")
-}
-
-@(test)
-test_db_update_required_dir_updated :: proc(t: ^testing.T) {
-	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")
-}
-
-@(test)
-test_db_update_required_error :: proc(t: ^testing.T) {
-	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}
-	testing.expect(t, db_update_required(combined), "DirUpdated|Restored should require update")
-}
-
-@(test)
-test_shares_remote_overlap :: proc(t: ^testing.T) {
-	f := EnvFile {
-		Remotes = make([dynamic]string, 2, context.temp_allocator),
-	}
-	append(&f.Remotes, "git@github.com:user/repo.git")
-	append(&f.Remotes, "git@gitlab.com:user/repo.git")
-
-	remotes := []string{"git@github.com:user/repo.git"}
-	testing.expect(t, shares_remote(&f, remotes), "should share remote")
-}
-
-@(test)
-test_shares_remote_no_overlap :: proc(t: ^testing.T) {
-	f := EnvFile {
-		Remotes = make([dynamic]string, 1, context.temp_allocator),
-	}
-	append(&f.Remotes, "git@github.com:user/repo.git")
-
-	remotes := []string{"git@github.com:other/repo.git"}
-	testing.expect(t, !shares_remote(&f, remotes), "should not share remote")
-}
-
-@(test)
-test_shares_remote_empty_file_remotes :: proc(t: ^testing.T) {
-	f := EnvFile {
-		Remotes = make([dynamic]string, 0, context.temp_allocator),
-	}
-
-	remotes := []string{"git@github.com:user/repo.git"}
-	testing.expect(t, !shares_remote(&f, remotes), "empty file remotes should not share")
-}
-
-@(test)
-test_shares_remote_empty_check_remotes :: proc(t: ^testing.T) {
-	f := EnvFile {
-		Remotes = make([dynamic]string, 1, context.temp_allocator),
-	}
-	append(&f.Remotes, "git@github.com:user/repo.git")
-
-	remotes: []string
-	testing.expect(t, !shares_remote(&f, remotes), "empty check remotes should not share")
-}
-
-@(test)
-test_shares_remote_both_empty :: proc(t: ^testing.T) {
-	f := EnvFile {
-		Remotes = make([dynamic]string, 0),
-	}
-
-	remotes: []string
-	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

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

features_test.odin

@@ -6,8 +6,8 @@ import "core:testing"
 
 @(test)
 test_find_binary_exists :: proc(t: ^testing.T) {
-	path := os.get_env("PATH", context.temp_allocator)
+	path := os.get_env("PATH", context.allocator)
-	paths := strings.split(path, ":", context.temp_allocator)
+	paths := strings.split(path, ":")
 
 	result := find_binary(paths, "sh")
 	testing.expect(t, result != "", "sh should be found on PATH")
@@ -15,7 +15,7 @@ test_find_binary_exists :: proc(t: ^testing.T) {
 
 @(test)
 test_find_binary_not_exists :: proc(t: ^testing.T) {
-	old_path := os.get_env("PATH", context.temp_allocator)
+	old_path := os.get_env("PATH", context.allocator)
 	defer {
 		if old_path != "" {
 			os.set_env("PATH", old_path)
@@ -24,8 +24,8 @@ test_find_binary_not_exists :: proc(t: ^testing.T) {
 
 	os.set_env("PATH", "/tmp/envr-nope")
 
-	path := os.get_env("PATH", context.temp_allocator)
+	path := os.get_env("PATH", context.allocator)
-	paths := strings.split(path, ":", context.temp_allocator)
+	paths := strings.split(path, ":")
 
 
 	result := find_binary(paths, "no_such_binary_xyz")

findr/findr_test.odin

@@ -1,320 +0,0 @@
-package findr
-
-import "core:os"
-import "core:sort"
-import "core:strings"
-import "core:sys/linux"
-import "core:testing"
-
-// ============================================================================
-// Gitignored file emission tests (emit ONLY gitignored files, descend everywhere)
-// ============================================================================
-
-@(test)
-test_basic_gitignored :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "*.env\n")
-	create_file(env, "repo/.env")
-	create_file(env, "repo/secrets.env")
-	create_file(env, "repo/normal.txt")
-
-	assert_output(t, env, nil, {}, {
-		"repo/.env", "repo/secrets.env",
-	})
-}
-
-@(test)
-test_non_repo_not_scanned :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_dir(env, "norepo")
-	create_file(env, "norepo/.gitignore", "*.env\n")
-	create_file(env, "norepo/.env")
-
-	assert_output_empty(t, env, nil, {})
-}
-
-@(test)
-test_negation_pattern :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "*.env\n!prod.env\n")
-	create_file(env, "repo/.env")
-	create_file(env, "repo/secrets.env")
-	create_file(env, "repo/prod.env")
-
-	assert_output(t, env, nil, {}, {
-		"repo/.env", "repo/secrets.env",
-	})
-}
-
-@(test)
-test_multiple_repos :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo1")
-	create_file(env, "repo1/.gitignore", "*.env\n")
-	create_file(env, "repo1/a.env")
-
-	create_git_repo(env, "repo2")
-	create_file(env, "repo2/.gitignore", "*.key\n")
-	create_file(env, "repo2/secret.key")
-
-	assert_output(t, env, nil, {}, {
-		"repo1/a.env", "repo2/secret.key",
-	})
-}
-
-@(test)
-test_nested_repos :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "parent")
-	create_file(env, "parent/.gitignore", "*.env\n")
-	create_file(env, "parent/top.env")
-
-	create_git_repo(env, "parent/child")
-	create_file(env, "parent/child/.gitignore", "*.key\n")
-	create_file(env, "parent/child/api.key")
-
-	assert_output(t, env, nil, {}, {
-		"parent/top.env", "parent/child/api.key",
-	})
-}
-
-@(test)
-test_nested_gitignore_read :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "*.env\n")
-	create_dir(env, "repo/sub")
-	create_file(env, "repo/sub/.gitignore", "*.txt\n")
-	create_file(env, "repo/sub/secret.txt")
-	create_file(env, "repo/sub/.env")
-
-	assert_output(t, env, nil, {}, {
-		"repo/sub/secret.txt", "repo/sub/.env",
-	})
-}
-
-@(test)
-test_nested_gitignore_negation :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "*.log\n")
-	create_dir(env, "repo/sub")
-	create_file(env, "repo/sub/.gitignore", "!important.log\n")
-	create_file(env, "repo/sub/important.log")
-	create_file(env, "repo/sub/debug.log")
-
-	assert_output(t, env, nil, {}, {
-		"repo/sub/debug.log",
-	})
-}
-
-@(test)
-test_multisegment_pattern :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "build/output.txt\n")
-	create_dir(env, "repo/build")
-	create_file(env, "repo/build/output.txt")
-	create_file(env, "repo/build/other.txt")
-	create_file(env, "repo/output.txt")
-
-	assert_output(t, env, nil, {}, {
-		"repo/build/output.txt",
-	})
-}
-
-@(test)
-test_no_gitignore_file :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.env")
-
-	assert_output_empty(t, env, nil, {})
-}
-
-@(test)
-test_empty_gitignore :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "\n\n# comment\n\n")
-	create_file(env, "repo/.env")
-
-	assert_output_empty(t, env, nil, {})
-}
-
-@(test)
-test_multiple_search_dirs :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "dir1/repo")
-	create_file(env, "dir1/repo/.gitignore", "*.env\n")
-	create_file(env, "dir1/repo/a.env")
-	create_file(env, "dir1/repo/normal.txt")
-
-	create_git_repo(env, "dir2/repo")
-	create_file(env, "dir2/repo/.gitignore", "*.env\n")
-	create_file(env, "dir2/repo/b.env")
-
-	dir1 := join_path(env.temp_dir, "dir1")
-	defer delete(dir1)
-	dir2 := join_path(env.temp_dir, "dir2")
-	defer delete(dir2)
-
-	results := make([dynamic]string)
-	defer {
-		for r in results {delete(r)}
-		delete(results)
-	}
-
-	opts := WalkOptions{}
-	thread_count := os.get_processor_core_count()
-	walk({dir1, dir2}, &results, opts, thread_count)
-
-	testing.expect_value(t, len(results), 2)
-
-	actual := make([dynamic]string, 0, len(results))
-	for r in results {
-		stripped := r
-		if strings.has_prefix(stripped, env.temp_dir) {
-			stripped = stripped[len(env.temp_dir):]
-			if len(stripped) > 0 && stripped[0] == '/' {
-				stripped = stripped[1:]
-			}
-		}
-		append(&actual, stripped)
-	}
-	defer delete(actual)
-
-	expected := []string{"dir1/repo/a.env", "dir2/repo/b.env"}
-
-	sort.quick_sort(actual[:])
-	sort.quick_sort(expected[:])
-
-	for i in 0 ..< len(expected) {
-		testing.expect_value(t, actual[i], expected[i])
-	}
-}
-
-// ============================================================================
-// Ignored directory recursion tests
-// ============================================================================
-
-@(test)
-test_ignored_dir_descended :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "secrets/\n")
-	create_dir(env, "repo/secrets")
-	create_file(env, "repo/secrets/.env")
-	create_file(env, "repo/secrets/api.key")
-
-	// Ignored dir's contents are emitted AND descended into
-	assert_output(t, env, nil, {}, {
-		"repo/secrets/", "repo/secrets/.env", "repo/secrets/api.key",
-	})
-}
-
-@(test)
-test_nested_ignored_dir :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "build/\n")
-	create_dir(env, "repo/build")
-	create_dir(env, "repo/build/sub")
-	create_file(env, "repo/build/output.txt")
-	create_file(env, "repo/build/sub/deep.env")
-
-	assert_output(t, env, nil, {}, {
-		"repo/build/", "repo/build/output.txt",
-		"repo/build/sub/", "repo/build/sub/deep.env",
-	})
-}
-
-// ============================================================================
-// Filter tests (excludes, pattern)
-// ============================================================================
-
-@(test)
-test_excludes_prune_dirs :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "*.env\n")
-	create_file(env, "repo/.env")
-	create_dir(env, "repo/vendor")
-	create_file(env, "repo/vendor/lib.env")
-
-	assert_output(t, env, nil,
-		{excludes = {"vendor"}},
-		{"repo/.env"},
-	)
-}
-
-@(test)
-test_pattern_filters_results :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "*.env\n*.key\n")
-	create_file(env, "repo/.env")
-	create_file(env, "repo/secrets.env")
-	create_file(env, "repo/master.key")
-
-	assert_output(t, env, nil,
-		{pattern = "\\.env$"},
-		{"repo/.env", "repo/secrets.env"},
-	)
-}
-
-// ============================================================================
-// Special file type tests
-// ============================================================================
-
-@(test)
-test_fifo_emitted :: proc(t: ^testing.T) {
-	env := create_test_env()
-	defer destroy_test_env(&env)
-
-	create_git_repo(env, "repo")
-	create_file(env, "repo/.gitignore", "*.env\n*.fifo\n")
-
-	fifo_path := join_path(env.temp_dir, "repo/test.fifo")
-	defer delete(fifo_path)
-	cpath := strings.clone_to_cstring(fifo_path)
-	defer delete(cpath)
-	linux.mknod(cpath, linux.S_IFIFO | linux.Mode{.IRUSR, .IWUSR}, 0)
-
-	assert_output(t, env, nil,
-		{pattern = "\\.fifo$"},
-		{"repo/test.fifo"},
-	)
-}

findr/gitignore.odin

@@ -1,88 +0,0 @@
-package findr
-
-import "core:strings"
-
-Gitignore :: struct {
-	rules: [dynamic]Rule,
-}
-
-Rule :: struct {
-	pattern:  GlobPattern,
-	negated:  bool,
-	dir_only: bool,
-}
-
-Match :: enum {
-	None,
-	Ignored,
-	Unignored,
-}
-
-is_ignored :: proc(gi: ^Gitignore, path: string, is_dir: bool) -> bool {
-	return check_match(gi, path, is_dir) == .Ignored
-}
-
-check_match :: proc(gi: ^Gitignore, path: string, is_dir: bool) -> Match {
-	result := Match.None
-	for &rule in gi.rules {
-		if rule.dir_only && !is_dir do continue
-		if glob_match_compiled(&rule.pattern, path) {
-			result = rule.negated ? .Unignored : .Ignored
-		}
-	}
-	return result
-}
-
-parse :: proc(content: string) -> Gitignore {
-	gi: Gitignore
-	gi.rules = make([dynamic]Rule)
-
-	remaining := content
-	for {
-		line, ok := strings.split_lines_iterator(&remaining)
-		if !ok do break
-
-		s := strings.trim_space(line)
-		if len(s) == 0 do continue
-		if s[0] == '#' do continue
-
-		negated := false
-		if s[0] == '!' {
-			negated = true
-			s = s[1:]
-		}
-
-		if len(s) > 0 && s[0] == '\\' {
-			if len(s) > 1 && (s[1] == '#' || s[1] == '!') {
-				s = s[1:]
-			}
-		}
-
-		dir_only := false
-		if len(s) > 0 && s[len(s) - 1] == '/' {
-			dir_only = true
-			s = s[:len(s) - 1]
-		}
-
-		anchored := false
-		if len(s) > 0 && s[0] == '/' {
-			anchored = true
-			s = s[1:]
-		}
-
-		if len(s) == 0 do continue
-
-		gp := glob_compile(s, anchored)
-		append(&gi.rules, Rule{pattern = gp, negated = negated, dir_only = dir_only})
-	}
-
-	return gi
-}
-
-destroy :: proc(gi: ^Gitignore) {
-	for &rule in gi.rules {
-		glob_destroy(&rule.pattern)
-	}
-	delete(gi.rules)
-}
-

findr/gitignore_test.odin

@@ -1,118 +0,0 @@
-package findr
-
-import "core:testing"
-
-@(test)
-test_is_ignored_basic :: proc(t: ^testing.T) {
-	gi := parse("*.env\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, is_ignored(&gi, ".env", false), true)
-	testing.expect_value(t, is_ignored(&gi, "foo.env", false), true)
-	testing.expect_value(t, is_ignored(&gi, ".env.local", false), false)
-	testing.expect_value(t, is_ignored(&gi, "config.yaml", false), false)
-}
-
-@(test)
-test_is_ignored_negation :: proc(t: ^testing.T) {
-	gi := parse("*.env\n!.env.production\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, is_ignored(&gi, ".env", false), true)
-	testing.expect_value(t, is_ignored(&gi, ".env.production", false), false)
-}
-
-@(test)
-test_is_ignored_dir_only :: proc(t: ^testing.T) {
-	gi := parse("node_modules/\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, is_ignored(&gi, "node_modules", true), true)
-	testing.expect_value(t, is_ignored(&gi, "node_modules", false), false)
-}
-
-@(test)
-test_is_ignored_anchored :: proc(t: ^testing.T) {
-	gi := parse("/secret.key\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, is_ignored(&gi, "secret.key", false), true)
-}
-
-@(test)
-test_is_ignored_comments_skipped :: proc(t: ^testing.T) {
-	gi := parse("# this is a comment\n#another\n*.tmp\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, len(gi.rules), 1)
-	testing.expect_value(t, is_ignored(&gi, "file.tmp", false), true)
-}
-
-@(test)
-test_is_ignored_blank_lines_skipped :: proc(t: ^testing.T) {
-	gi := parse("\n\n  \n*.log\n\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, len(gi.rules), 1)
-}
-
-@(test)
-test_is_ignored_last_match_wins :: proc(t: ^testing.T) {
-	gi := parse("*.env\n!*.env\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, is_ignored(&gi, ".env", false), false)
-}
-
-@(test)
-test_is_ignored_no_rules :: proc(t: ^testing.T) {
-	gi := parse("")
-	defer destroy(&gi)
-
-	testing.expect_value(t, is_ignored(&gi, "anything", false), false)
-}
-
-@(test)
-test_is_ignored_env_pattern :: proc(t: ^testing.T) {
-	gi := parse(".env*\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, is_ignored(&gi, ".env", false), true)
-	testing.expect_value(t, is_ignored(&gi, ".env.local", false), true)
-	testing.expect_value(t, is_ignored(&gi, ".envrc", false), true)
-}
-
-@(test)
-test_is_ignored_globstar :: proc(t: ^testing.T) {
-	gi := parse("**/cache\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, is_ignored(&gi, "cache", false), true)
-	testing.expect_value(t, is_ignored(&gi, "foo/cache", false), true)
-	testing.expect_value(t, is_ignored(&gi, "foo/bar/cache", false), true)
-}
-
-@(test)
-test_star_negation_subpath :: proc(t: ^testing.T) {
-	gi := parse("*\n!public/\n")
-	defer destroy(&gi)
-
-	// public dir itself is un-ignored
-	testing.expect_value(t, is_ignored(&gi, "public", true), false)
-	// children of public/ should still be ignored by *
-	testing.expect_value(t, is_ignored(&gi, "public/uuid-dir", true), true)
-	testing.expect_value(t, is_ignored(&gi, "public/uuid-dir/file.txt", false), true)
-}
-
-@(test)
-test_is_ignored_hash_pattern :: proc(t: ^testing.T) {
-	gi := parse("\\#*\\#\n")
-	defer destroy(&gi)
-
-	testing.expect_value(t, is_ignored(&gi, "#foo#", false), true)
-	testing.expect_value(t, is_ignored(&gi, "#test#", false), true)
-	testing.expect_value(t, is_ignored(&gi, "AUTHORS", false), false)
-	testing.expect_value(t, is_ignored(&gi, "build.zig", false), false)
-	testing.expect_value(t, is_ignored(&gi, "ChangeLog", false), false)
-}
-

findr/glob.odin

@@ -1,203 +0,0 @@
-package findr
-
-Range :: struct {
-	lo: u8,
-	hi: u8,
-}
-
-Class_Data :: struct {
-	negated: bool,
-	ranges:  [dynamic]Range,
-}
-
-Token_Kind :: enum u8 { Char, Star, Globstar, Question, Class }
-
-Token :: struct {
-	kind:      Token_Kind,
-	byte:      u8,
-	class_idx: u16,
-}
-
-GlobPattern :: struct {
-	tokens:   [dynamic]Token,
-	classes:  [dynamic]Class_Data,
-	anchored: bool,
-}
-
-glob_compile :: proc(pattern: string, anchored: bool) -> GlobPattern {
-	gp: GlobPattern
-	gp.tokens = make([dynamic]Token)
-	gp.classes = make([dynamic]Class_Data)
-	gp.anchored = anchored
-
-	i := 0
-	for i < len(pattern) {
-		c := pattern[i]
-
-		if c == '*' {
-			if i + 1 < len(pattern) && pattern[i + 1] == '*' {
-				prev_slash := i == 0 || pattern[i - 1] == '/'
-				at_end := i + 2 >= len(pattern)
-				next_slash := !at_end && pattern[i + 2] == '/'
-
-				if prev_slash && (next_slash || at_end) {
-					append(&gp.tokens, Token{kind = .Globstar})
-					if next_slash {
-						i += 3
-					} else {
-						i += 2
-					}
-				} else {
-					append(&gp.tokens, Token{kind = .Star})
-					i += 2
-				}
-			} else {
-				append(&gp.tokens, Token{kind = .Star})
-				i += 1
-			}
-		} else if c == '?' {
-			append(&gp.tokens, Token{kind = .Question})
-			i += 1
-		} else if c == '[' {
-			i += 1
-			negated := false
-			if i < len(pattern) && pattern[i] == '!' {
-				negated = true
-				i += 1
-			}
-
-			ranges := make([dynamic]Range)
-
-			if i < len(pattern) && pattern[i] == ']' {
-				append(&ranges, Range{lo = ']', hi = ']'})
-				i += 1
-			}
-
-			for i < len(pattern) && pattern[i] != ']' {
-				if i + 2 < len(pattern) && pattern[i + 1] == '-' && pattern[i + 2] != ']' {
-					append(&ranges, Range{lo = pattern[i], hi = pattern[i + 2]})
-					i += 3
-				} else {
-					append(&ranges, Range{lo = pattern[i], hi = pattern[i]})
-					i += 1
-				}
-			}
-
-			if i < len(pattern) {
-				i += 1
-			}
-
-			class_idx := u16(len(gp.classes))
-			append(&gp.classes, Class_Data{negated = negated, ranges = ranges})
-			append(&gp.tokens, Token{kind = .Class, class_idx = class_idx})
-		} else if c == '\\' {
-			i += 1
-			if i < len(pattern) {
-				append(&gp.tokens, Token{kind = .Char, byte = pattern[i]})
-				i += 1
-			}
-		} else {
-			append(&gp.tokens, Token{kind = .Char, byte = c})
-			i += 1
-		}
-	}
-
-	return gp
-}
-
-match_tokens :: proc(tokens: []Token, classes: []Class_Data, ti: int, path: string, pi: int) -> bool {
-	if ti >= len(tokens) {
-		return pi == len(path)
-	}
-
-	tok := tokens[ti]
-	switch tok.kind {
-	case .Char:
-		if pi < len(path) && path[pi] == tok.byte {
-			return match_tokens(tokens, classes, ti + 1, path, pi + 1)
-		}
-		return false
-
-	case .Question:
-		if pi < len(path) && path[pi] != '/' {
-			return match_tokens(tokens, classes, ti + 1, path, pi + 1)
-		}
-		return false
-
-	case .Star:
-		max_end := pi
-		for max_end < len(path) && path[max_end] != '/' {
-			max_end += 1
-		}
-		for end := max_end; end >= pi; end -= 1 {
-			if match_tokens(tokens, classes, ti + 1, path, end) {
-				return true
-			}
-		}
-		return false
-
-	case .Globstar:
-		if ti + 1 >= len(tokens) {
-			return true
-		}
-		if match_tokens(tokens, classes, ti + 1, path, pi) {
-			return true
-		}
-		for end := pi + 1; end <= len(path); end += 1 {
-			if path[end - 1] == '/' {
-				if match_tokens(tokens, classes, ti + 1, path, end) {
-					return true
-				}
-			}
-		}
-		return false
-
-	case .Class:
-		if pi >= len(path) {
-			return false
-		}
-		cd := classes[tok.class_idx]
-		ch := path[pi]
-		in_range := false
-		for r in cd.ranges {
-			if ch >= r.lo && ch <= r.hi {
-				in_range = true
-				break
-			}
-		}
-		if in_range != cd.negated {
-			return match_tokens(tokens, classes, ti + 1, path, pi + 1)
-		}
-		return false
-	}
-	return false
-}
-
-glob_match_compiled :: proc(gp: ^GlobPattern, path: string) -> bool {
-	tokens := gp.tokens[:]
-	classes := gp.classes[:]
-
-	if gp.anchored {
-		return match_tokens(tokens, classes, 0, path, 0)
-	}
-
-	if match_tokens(tokens, classes, 0, path, 0) {
-		return true
-	}
-	for i := 1; i < len(path); i += 1 {
-		if path[i - 1] == '/' {
-			if match_tokens(tokens, classes, 0, path, i) {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-glob_destroy :: proc(gp: ^GlobPattern) {
-	for &cd in gp.classes {
-		delete(cd.ranges)
-	}
-	delete(gp.classes)
-	delete(gp.tokens)
-}

findr/glob_test.odin

@@ -1,111 +0,0 @@
-package findr
-
-import "core:testing"
-
-glob_match :: proc(pattern: string, path: string, anchored: bool) -> bool {
-	gp := glob_compile(pattern, anchored)
-	result := glob_match_compiled(&gp, path)
-	glob_destroy(&gp)
-	return result
-}
-
-@(test)
-test_glob_simple :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("foo", "foo", false))
-	testing.expect(t, glob_match("foo", "bar/foo", false))
-	testing.expect(t, !glob_match("foo", "foobar", false))
-	testing.expect(t, !glob_match("foo", "foo/bar", false))
-}
-
-@(test)
-test_glob_anchored :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("foo", "foo", true))
-	testing.expect(t, !glob_match("foo", "bar/foo", true))
-	testing.expect(t, !glob_match("foo", "foobar", true))
-}
-
-@(test)
-test_glob_star :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("*.log", "test.log", false))
-	testing.expect(t, glob_match("*.log", ".log", false))
-	testing.expect(t, !glob_match("*.log", "test.txt", false))
-	testing.expect(t, !glob_match("*.log", "dir/test", false))
-}
-
-@(test)
-test_glob_question :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("?.log", "a.log", false))
-	testing.expect(t, !glob_match("?.log", "ab.log", false))
-	testing.expect(t, !glob_match("?.log", ".log", false))
-}
-
-@(test)
-test_glob_char_class :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("[abc].log", "a.log", false))
-	testing.expect(t, glob_match("[abc].log", "b.log", false))
-	testing.expect(t, !glob_match("[abc].log", "d.log", false))
-}
-
-@(test)
-test_glob_negated_class :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("[!abc].log", "d.log", false))
-	testing.expect(t, !glob_match("[!abc].log", "a.log", false))
-}
-
-@(test)
-test_glob_dot_literal :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match(".env", ".env", false))
-	testing.expect(t, glob_match(".env", "dir/.env", false))
-	testing.expect(t, !glob_match(".env", "env", false))
-	testing.expect(t, !glob_match(".env", "x.env", false))
-}
-
-@(test)
-test_glob_globstar_prefix :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("**/foo", "foo", false))
-	testing.expect(t, glob_match("**/foo", "a/b/foo", false))
-	testing.expect(t, !glob_match("**/foo", "foobar", false))
-	testing.expect(t, !glob_match("**/foo", "a/foobar", false))
-}
-
-@(test)
-test_glob_globstar_suffix :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("abc/**", "abc/x", false))
-	testing.expect(t, glob_match("abc/**", "abc/x/y", false))
-	testing.expect(t, !glob_match("abc/**", "abc", false))
-	testing.expect(t, !glob_match("abc/**", "abcd/x", false))
-}
-
-@(test)
-test_glob_globstar_middle :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("foo/**/bar", "foo/bar", false))
-	testing.expect(t, glob_match("foo/**/bar", "foo/x/bar", false))
-	testing.expect(t, !glob_match("foo/**/bar", "foo/barx", false))
-	testing.expect(t, !glob_match("foo/**/bar", "foo/x/y/baz", false))
-}
-
-@(test)
-test_glob_backslash_escape :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("\\!foo", "!foo", false))
-	testing.expect(t, !glob_match("\\!foo", "foo", false))
-}
-
-@(test)
-test_glob_hash_literal :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("#foo", "#foo", false))
-	testing.expect(t, !glob_match("#foo", "foo", false))
-}
-
-@(test)
-test_glob_hash_pattern :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("#*#", "#test#", false))
-	testing.expect(t, glob_match("#*#", "##", false))
-	testing.expect(t, !glob_match("#*#", "test", false))
-	testing.expect(t, !glob_match("#*#", "#test", false))
-}
-
-@(test)
-test_glob_empty :: proc(t: ^testing.T) {
-	testing.expect(t, glob_match("", "", false))
-	testing.expect(t, !glob_match("", "foo", false))
-}

findr/repos.odin

@@ -1,128 +0,0 @@
-package findr
-
-import "core:strings"
-import "core:sync"
-import "core:sys/linux"
-import "core:thread"
-
-RepoPool :: struct {
-	queue:        [dynamic]string,
-	queue_mutex:  sync.Mutex,
-	queue_sema:   sync.Atomic_Sema,
-	results:      ^[dynamic]string,
-	results_lock: sync.Mutex,
-	active:       i64,
-	done:         sync.One_Shot_Event,
-	threads:      []^thread.Thread,
-}
-
-find_repos :: proc(roots: []string, results: ^[dynamic]string, thread_count: int) {
-	if len(roots) == 0 do return
-
-	pool := new(RepoPool)
-	pool.queue = make([dynamic]string)
-	pool.results = results
-	pool.active = i64(len(roots))
-	pool.threads = make([]^thread.Thread, thread_count)
-
-	for root in roots {
-		root_clone, _ := strings.clone(root)
-		append(&pool.queue, root_clone)
-		sync.atomic_sema_post(&pool.queue_sema)
-	}
-
-	for i in 0 ..< thread_count {
-		t := thread.create(repo_worker)
-		t.data = rawptr(pool)
-		t.init_context = context
-		thread.start(t)
-		pool.threads[i] = t
-	}
-
-	sync.one_shot_event_wait(&pool.done)
-
-	for _ in 0 ..< thread_count {
-		sync.atomic_sema_post(&pool.queue_sema)
-	}
-
-	for t in pool.threads {
-		thread.destroy(t)
-	}
-	delete(pool.threads)
-
-	for path in pool.queue {
-		delete(path)
-	}
-	delete(pool.queue)
-
-	free(pool)
-}
-
-repo_worker :: proc(t: ^thread.Thread) {
-	pool := cast(^RepoPool)t.data
-
-	for {
-		sync.atomic_sema_wait(&pool.queue_sema)
-
-		sync.mutex_lock(&pool.queue_mutex)
-		if len(pool.queue) == 0 {
-			sync.mutex_unlock(&pool.queue_mutex)
-			if sync.atomic_load_explicit(&pool.active, .Acquire) == 0 {
-				sync.one_shot_event_signal(&pool.done)
-			}
-			break
-		}
-		last := len(pool.queue) - 1
-		dir_path := pool.queue[last]
-		ordered_remove(&pool.queue, last)
-		sync.mutex_unlock(&pool.queue_mutex)
-
-		process_repo_dir(pool, dir_path)
-		delete(dir_path)
-
-		old := sync.atomic_sub_explicit(&pool.active, 1, .Release)
-		if old == 1 {
-			sync.one_shot_event_signal(&pool.done)
-		}
-	}
-}
-
-process_repo_dir :: proc(pool: ^RepoPool, dir_path: string) {
-	cpath := strings.clone_to_cstring(dir_path)
-	if cpath == nil do return
-	defer delete(cpath)
-
-	fd, open_err := linux.open(cpath, {.DIRECTORY, .CLOEXEC})
-	if open_err != .NONE do return
-	defer linux.close(fd)
-
-	if has_git_dir(fd) {
-		cloned, _ := strings.clone(dir_path)
-		sync.mutex_lock(&pool.results_lock)
-		append(pool.results, cloned)
-		sync.mutex_unlock(&pool.results_lock)
-	}
-
-	buf: [32 * 1024]u8
-
-	for {
-		n, errno := linux.getdents(fd, buf[:])
-		if n <= 0 || errno != .NONE do break
-
-		offs := 0
-		for d in linux.dirent_iterate_buf(buf[:n], &offs) {
-			name := linux.dirent_name(d)
-			if name == "." || name == ".." do continue
-			if name == ".git" do continue
-
-			if d.type == .DIR {
-				child_path := join_path(dir_path, name)
-				sync.atomic_add_explicit(&pool.active, 1, .Relaxed)
-				sync.mutex_lock(&pool.queue_mutex)
-				append(&pool.queue, child_path)
-				sync.mutex_unlock(&pool.queue_mutex)
-				sync.atomic_sema_post(&pool.queue_sema)
-			}
-		}
-	}
-}

findr/test_env.odin

@@ -1,152 +0,0 @@
-package findr
-
-import "core:fmt"
-import "core:log"
-import "core:os"
-import "core:sort"
-import "core:strings"
-import "core:testing"
-
-TestEnv :: struct {
-	temp_dir: string,
-}
-
-create_test_env :: proc() -> (env: TestEnv) {
-	tmp, err := os.mkdir_temp("", "findr-test-*", context.allocator)
-	if err != nil {
-		log.error("Failed to create temp dir:", err)
-		panic("Failed to create temp dir")
-	}
-
-	env.temp_dir = tmp
-	return
-}
-
-destroy_test_env :: proc(env: ^TestEnv) {
-	os.remove_all(env.temp_dir)
-	delete(env.temp_dir)
-}
-
-create_dir :: proc(env: TestEnv, path: string) {
-	full := join_path(env.temp_dir, path)
-	defer delete(full)
-	os.mkdir_all(full, os.Permissions_Default_Directory)
-}
-
-create_file :: proc(env: TestEnv, path: string, content: string = "") {
-	full := join_path(env.temp_dir, path)
-	defer delete(full)
-
-	dir_end := strings.last_index(full, "/")
-	if dir_end >= 0 {
-		dir_path := full[:dir_end]
-		os.mkdir_all(dir_path, os.Permissions_Default_Directory)
-	}
-
-	f, err := os.create(full)
-	if err != nil {
-		log.error("Failed to create file:", full, err)
-		return
-	}
-	if len(content) > 0 {
-		os.write_string(f, content)
-	}
-	os.close(f)
-}
-
-create_git_repo :: proc(env: TestEnv, path: string) {
-	sub := join_path(path, ".git")
-	defer delete(sub)
-	create_dir(env, sub)
-}
-
-assert_output :: proc(
-	t: ^testing.T,
-	env: TestEnv,
-	args: []string,
-	opts: WalkOptions,
-	expected: []string,
-) {
-	results := collect_results(env, args, opts)
-	defer {
-		for r in results {delete(r)}
-		delete(results)
-	}
-
-	sorted_expected := make([dynamic]string, 0, len(expected))
-	for e in expected {append(&sorted_expected, e)}
-	defer delete(sorted_expected)
-
-	sorted_actual := make([dynamic]string, 0, len(results))
-	for a in results {append(&sorted_actual, a)}
-	defer delete(sorted_actual)
-
-	sort.quick_sort(sorted_expected[:])
-	sort.quick_sort(sorted_actual[:])
-
-	if len(sorted_expected) != len(sorted_actual) {
-		testing.fail(t)
-		log.error(
-			fmt.tprintf("Expected %d results, got %d", len(sorted_expected), len(sorted_actual)),
-		)
-		log.error("Expected:", sorted_expected[:])
-		log.error("Actual:  ", sorted_actual[:])
-		return
-	}
-
-	for i in 0 ..< len(sorted_expected) {
-		if sorted_expected[i] != sorted_actual[i] {
-			testing.fail(t)
-			log.error(fmt.tprintf("Mismatch at index %d", i))
-			log.error("Expected:", sorted_expected[:])
-			log.error("Actual:  ", sorted_actual[:])
-			return
-		}
-	}
-}
-
-assert_output_empty :: proc(
-	t: ^testing.T,
-	env: TestEnv,
-	args: []string,
-	opts: WalkOptions,
-) {
-	results := collect_results(env, args, opts)
-	defer {
-		for r in results {delete(r)}
-		delete(results)
-	}
-	if len(results) > 0 {
-		testing.fail(t)
-		log.error(fmt.tprintf("Expected no results, got %d:", len(results)))
-		for r in results {
-			log.error("  ", r)
-		}
-	}
-}
-
-collect_results :: proc(env: TestEnv, args: []string, opts: WalkOptions) -> [dynamic]string {
-	results := make([dynamic]string)
-
-	full_args := make([dynamic]string, 0, len(args) + 1, context.temp_allocator)
-	append(&full_args, env.temp_dir)
-	for a in args {append(&full_args, a)}
-
-	thread_count := os.get_processor_core_count()
-	walk(full_args[:], &results, opts, thread_count)
-
-	for i in 0 ..< len(results) {
-		r := results[i]
-		if strings.has_prefix(r, env.temp_dir) {
-			stripped := r[len(env.temp_dir):]
-			if len(stripped) > 0 && stripped[0] == '/' {
-				stripped = stripped[1:]
-			}
-			new_r, _ := strings.clone(stripped)
-			delete(r)
-			results[i] = new_r
-		}
-	}
-
-	return results
-}

findr/walker.odin

@@ -1,449 +0,0 @@
-package findr
-
-import "core:fmt"
-import "core:os"
-import "core:strings"
-import "core:sync"
-import "core:sync/chan"
-import "core:sys/linux"
-import "core:text/regex"
-import "core:thread"
-
-OUTPUT_BUF_SIZE :: 64 * 1024
-
-WalkOptions :: struct {
-	pattern:  string, // regex on basename; "" = match all
-	excludes: []string, // glob patterns to skip entirely
-}
-
-GIContext :: struct {
-	gi:       ^Gitignore, // nil if this dir had no .gitignore
-	base_rel: string, // relative path from repo root to this dir
-	parent:   ^GIContext, // parent context (nil if repo root)
-}
-
-WorkItem :: struct {
-	path:       string, // absolute directory path
-	rel:        string, // relative path from repo root ("" = root)
-	gi_ctx:     ^GIContext, // gitignore chain (nil = outside any repo)
-	in_repo:    bool, // true if inside a git repo
-	in_ignored: bool, // true if inside a gitignored directory
-}
-
-WalkerPool :: struct {
-	queue:         [dynamic]WorkItem,
-	queue_mutex:   sync.Mutex,
-	queue_sema:    sync.Atomic_Sema,
-	result_chan:   chan.Chan([]u8),
-	active:        i64,
-	done:          sync.One_Shot_Event,
-	threads:       []^thread.Thread,
-	opts:          WalkOptions,
-	pattern_re:    regex.Regular_Expression,
-	has_pattern:   bool,
-	exclude_gi:    ^Gitignore,
-	all_contexts:  [dynamic]^GIContext,
-	contexts_lock: sync.Mutex,
-}
-
-Collector_Data :: struct {
-	ch:      chan.Chan([]u8),
-	results: ^[dynamic]string,
-}
-
-collect_worker :: proc(t: ^thread.Thread) {
-	data := cast(^Collector_Data)t.data
-	for {
-		batch, ok := chan.recv(data.ch)
-		if !ok do break
-		start := 0
-		for i in 0 ..< len(batch) {
-			if batch[i] == '\n' {
-				if i > start {
-					s, _ := strings.clone(string(batch[start:i]))
-					append(data.results, s)
-				}
-				start = i + 1
-			}
-		}
-		delete(batch)
-	}
-}
-
-walk :: proc(roots: []string, results: ^[dynamic]string, opts: WalkOptions, thread_count: int) {
-	if len(roots) == 0 do return
-
-	ch, _ := chan.create(chan.Chan([]u8), max(2 * thread_count, 2), context.allocator)
-	defer chan.destroy(ch)
-
-	data := new(Collector_Data)
-	data.ch = ch
-	data.results = results
-	defer free(data)
-
-	collector := thread.create(collect_worker)
-	collector.data = rawptr(data)
-	collector.init_context = context
-	thread.start(collector)
-
-	pool := new(WalkerPool)
-	pool.queue = make([dynamic]WorkItem)
-	pool.result_chan = ch
-	pool.active = i64(len(roots))
-	pool.threads = make([]^thread.Thread, thread_count)
-	pool.all_contexts = make([dynamic]^GIContext)
-	pool.opts = opts
-	pool.exclude_gi = nil
-	pool.has_pattern = false
-
-	if len(opts.pattern) > 0 {
-		re, err := regex.create(opts.pattern, {regex.Flag.No_Capture})
-		if err == nil {
-			pool.pattern_re = re
-			pool.has_pattern = true
-		}
-	}
-
-	if len(opts.excludes) > 0 {
-		sb: strings.Builder
-		strings.builder_init(&sb)
-		for ex in opts.excludes {
-			fmt.sbprintf(&sb, "%s\n", ex)
-		}
-		content := strings.to_string(sb)
-		pool.exclude_gi = new(Gitignore)
-		pool.exclude_gi^ = parse(content)
-		strings.builder_destroy(&sb)
-	}
-
-	for root in roots {
-		root_clone, _ := strings.clone(root)
-		append(&pool.queue, WorkItem{path = root_clone})
-		sync.atomic_sema_post(&pool.queue_sema)
-	}
-
-	for i in 0 ..< thread_count {
-		t := thread.create(walk_worker)
-		t.data = rawptr(pool)
-		t.init_context = context
-		thread.start(t)
-		pool.threads[i] = t
-	}
-
-	sync.one_shot_event_wait(&pool.done)
-
-	for _ in 0 ..< thread_count {
-		sync.atomic_sema_post(&pool.queue_sema)
-	}
-
-	for t in pool.threads {
-		thread.destroy(t)
-	}
-	delete(pool.threads)
-	for item in pool.queue {
-		delete(item.path)
-		if len(item.rel) > 0 {delete(item.rel)}
-	}
-	delete(pool.queue)
-
-	for ctx in pool.all_contexts {
-		if ctx.gi != nil {
-			destroy(ctx.gi)
-			free(ctx.gi)
-		}
-		if len(ctx.base_rel) > 0 {
-			delete(ctx.base_rel)
-		}
-		free(ctx)
-	}
-	delete(pool.all_contexts)
-
-	if pool.has_pattern {
-		regex.destroy(pool.pattern_re)
-	}
-	if pool.exclude_gi != nil {
-		destroy(pool.exclude_gi)
-		free(pool.exclude_gi)
-	}
-
-	free(pool)
-
-	chan.close(ch)
-	thread.join(collector)
-	thread.destroy(collector)
-}
-
-flush_buf :: proc(ch: chan.Chan([]u8), local: ^[dynamic]u8) {
-	if len(local) == 0 do return
-	batch := local[:]
-	local^ = make([dynamic]u8, 0, OUTPUT_BUF_SIZE)
-	chan.send(ch, batch)
-}
-
-append_path :: proc(buf: ^[dynamic]u8, parent, name: string, trailing_slash: bool) {
-	need_sep := len(parent) > 0 && parent[len(parent) - 1] != '/'
-	size := len(parent) + len(name) + 1
-	if need_sep do size += 1
-	if trailing_slash do size += 1
-
-	old_len := len(buf)
-	reserve(buf, old_len + size)
-	resize(buf, old_len + size)
-
-	pos := old_len
-	pos += copy(buf[pos:], parent)
-	if need_sep {buf[pos] = '/'; pos += 1}
-	pos += copy(buf[pos:], name)
-	if trailing_slash {buf[pos] = '/'; pos += 1}
-	buf[pos] = '\n'
-}
-
-walk_worker :: proc(t: ^thread.Thread) {
-	pool := cast(^WalkerPool)t.data
-
-	local_buf := make([dynamic]u8, 0, OUTPUT_BUF_SIZE)
-	defer {
-		if len(local_buf) > 0 {
-			flush_buf(pool.result_chan, &local_buf)
-		}
-		delete(local_buf)
-	}
-
-	for {
-		sync.atomic_sema_wait(&pool.queue_sema)
-
-		sync.mutex_lock(&pool.queue_mutex)
-		if len(pool.queue) == 0 {
-			sync.mutex_unlock(&pool.queue_mutex)
-			if sync.atomic_load_explicit(&pool.active, .Acquire) == 0 {
-				sync.one_shot_event_signal(&pool.done)
-			}
-			break
-		}
-		last := len(pool.queue) - 1
-		item := pool.queue[last]
-		ordered_remove(&pool.queue, last)
-		sync.mutex_unlock(&pool.queue_mutex)
-
-		process_dir(pool, item, &local_buf)
-		delete(item.path)
-		if len(item.rel) > 0 {delete(item.rel)}
-
-		if len(local_buf) >= OUTPUT_BUF_SIZE {
-			flush_buf(pool.result_chan, &local_buf)
-		}
-
-		old := sync.atomic_sub_explicit(&pool.active, 1, .Release)
-		if old == 1 {
-			sync.one_shot_event_signal(&pool.done)
-		}
-	}
-}
-
-process_dir :: proc(pool: ^WalkerPool, item: WorkItem, local_buf: ^[dynamic]u8) {
-	dir_path := item.path
-
-	cpath := strings.clone_to_cstring(dir_path)
-	if cpath == nil do return
-	defer delete(cpath)
-
-	fd, open_err := linux.open(cpath, {.DIRECTORY, .CLOEXEC})
-	if open_err != .NONE do return
-	defer linux.close(fd)
-
-	has_git := false
-	if !item.in_ignored {
-		has_git = has_git_dir(fd)
-	}
-
-	gi_ctx := item.gi_ctx
-	rel := item.rel
-
-	if has_git {
-		gi_ctx = nil
-		rel = ""
-	}
-
-	child_in_repo := has_git || item.in_repo
-
-	gi: ^Gitignore = nil
-	if !item.in_ignored {
-		gi = load_ignore_patterns(dir_path, child_in_repo)
-	}
-	if gi != nil {
-		new_ctx := new(GIContext)
-		new_ctx.gi = gi
-		if len(rel) > 0 {
-			new_ctx.base_rel, _ = strings.clone(rel)
-		}
-		new_ctx.parent = gi_ctx
-
-		sync.mutex_lock(&pool.contexts_lock)
-		append(&pool.all_contexts, new_ctx)
-		sync.mutex_unlock(&pool.contexts_lock)
-
-		gi_ctx = new_ctx
-	}
-
-	buf: [32 * 1024]u8
-	rel_buf: [4096]u8
-
-	for {
-		n, errno := linux.getdents(fd, buf[:])
-		if n <= 0 || errno != .NONE do break
-
-		offs := 0
-		for d in linux.dirent_iterate_buf(buf[:n], &offs) {
-			name := linux.dirent_name(d)
-			if name == "." || name == ".." do continue
-			if name == ".git" do continue
-
-			is_dir := d.type == .DIR
-			is_nondir := d.type != .DIR
-
-			if pool.exclude_gi != nil && is_ignored(pool.exclude_gi, name, is_dir) {
-				continue
-			}
-
-			entry_rel := build_rel(rel_buf[:], rel, name)
-
-			ignored := false
-			if item.in_ignored {
-				ignored = true
-			} else if gi_ctx != nil {
-				ignored = check_chain(gi_ctx, entry_rel, is_dir)
-			}
-
-			if is_dir {
-				if ignored && matches_pattern(pool, name) {
-					append_path(local_buf, dir_path, name, true)
-				}
-				child_rel, _ := strings.clone(entry_rel)
-				child_path := join_path(dir_path, name)
-				push_work(
-					pool,
-					WorkItem {
-						path = child_path,
-						rel = child_rel,
-						gi_ctx = gi_ctx,
-						in_repo = child_in_repo,
-						in_ignored = ignored,
-					},
-				)
-			} else if is_nondir {
-				if ignored && matches_pattern(pool, name) {
-					append_path(local_buf, dir_path, name, false)
-				}
-			}
-		}
-	}
-}
-
-check_chain :: proc(ctx: ^GIContext, entry_rel: string, is_dir: bool) -> bool {
-	c := ctx
-	for c != nil {
-		if c.gi != nil {
-			rel := relative_to(entry_rel, c.base_rel)
-			match := check_match(c.gi, rel, is_dir)
-			if match != .None {
-				return match == .Ignored
-			}
-		}
-		c = c.parent
-	}
-	return false
-}
-
-relative_to :: proc(entry_rel, base_rel: string) -> string {
-	if len(base_rel) == 0 do return entry_rel
-	prefix_len := len(base_rel)
-	if len(entry_rel) > prefix_len &&
-	   entry_rel[prefix_len] == '/' &&
-	   strings.has_prefix(entry_rel, base_rel) {
-		return entry_rel[prefix_len + 1:]
-	}
-	return entry_rel
-}
-
-build_rel :: proc(buf: []u8, rel, name: string) -> string {
-	if len(rel) == 0 do return name
-	pos := copy(buf, rel)
-	if pos < len(buf) {
-		buf[pos] = '/'
-		pos += 1
-		pos += copy(buf[pos:], name)
-	}
-	return string(buf[:pos])
-}
-
-matches_pattern :: proc(pool: ^WalkerPool, name: string) -> bool {
-	if !pool.has_pattern do return true
-	cap, ok := regex.match(pool.pattern_re, name)
-	regex.destroy(cap)
-	return ok
-}
-
-push_work :: proc(pool: ^WalkerPool, item: WorkItem) {
-	sync.atomic_add_explicit(&pool.active, 1, .Relaxed)
-	sync.mutex_lock(&pool.queue_mutex)
-	append(&pool.queue, item)
-	sync.mutex_unlock(&pool.queue_mutex)
-	sync.atomic_sema_post(&pool.queue_sema)
-}
-
-has_git_dir :: proc(fd: linux.Fd) -> bool {
-	git_fd, err := linux.openat(fd, ".git", {.DIRECTORY, .CLOEXEC})
-	if err == .NONE {
-		linux.close(git_fd)
-		return true
-	}
-	return false
-}
-
-load_ignore_patterns :: proc(dir_path: string, in_repo: bool) -> ^Gitignore {
-	has_patterns := false
-	sb: strings.Builder
-	strings.builder_init(&sb)
-	defer strings.builder_destroy(&sb)
-
-	if in_repo {
-		gi_path := join_path(dir_path, ".gitignore")
-		data, err := os.read_entire_file_from_path(gi_path, context.allocator)
-		delete(gi_path)
-		if err == .NONE {
-			fmt.sbprintf(&sb, "%s", string(data))
-			delete(data)
-			has_patterns = true
-		}
-	}
-
-	ig_path := join_path(dir_path, ".ignore")
-	idata, ierr := os.read_entire_file_from_path(ig_path, context.allocator)
-	delete(ig_path)
-	if ierr == .NONE {
-		fmt.sbprintf(&sb, "%s", string(idata))
-		delete(idata)
-		has_patterns = true
-	}
-
-	if !has_patterns do return nil
-
-	content := strings.to_string(sb)
-	gi := new(Gitignore)
-	gi^ = parse(content)
-	return gi
-}
-
-join_path :: proc(parent, child: string) -> string {
-	need_sep := len(parent) == 0 || parent[len(parent) - 1] != '/'
-	total := len(parent) + len(child)
-	if need_sep do total += 1
-	buf := make([]u8, total, context.allocator)
-	pos := copy(buf, parent)
-	if need_sep {
-		buf[pos] = '/'
-		pos += 1
-	}
-	copy(buf[pos:], child)
-	return string(buf)
-}

fixtures/keys/insecure-test-key

@@ -1,7 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACCbll0MJper9prPwGn2wwikH3hTByL8tlzmhViuvfrryAAAAJCkxfzapMX8
-2gAAAAtzc2gtZWQyNTUxOQAAACCbll0MJper9prPwGn2wwikH3hTByL8tlzmhViuvfrryA
-AAAEDXQExhs89b3fjqJHkhuo9QX4JEjXiEC+vSnCAYc8OxcpuWXQwml6v2ms/AafbDCKQf
-eFMHIvy2XOaFWK69+uvIAAAACnNwZW5jZXJAZncBAgM=
------END OPENSSH PRIVATE KEY-----

fixtures/keys/insecure-test-key.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuWXQwml6v2ms/AafbDCKQfeFMHIvy2XOaFWK69+uvI spencer@fw

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

@@ -11,12 +11,11 @@
   };
 
   outputs =
-    inputs@{
+    inputs@{ flake-parts
-      flake-parts,
+    , nixpkgs
-      nixpkgs,
+    , nixpkgs-unstable
-      nixpkgs-unstable,
+    , self
-      self,
+    , treefmt-nix
-      treefmt-nix,
     }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
@@ -30,18 +29,7 @@
       ];
 
       perSystem =
-        {
+        { pkgs, system, inputs', ... }: {
-          pkgs,
-          system,
-          inputs',
-          ...
-        }:
-      let
-        mysqlite = pkgs.sqlite.overrideAttrs (old: {
-                configureFlags = (old.configureFlags or [ ]) ++ [ "--enable-deserialize" ];
-              });
-      in
-        {
           _module.args.pkgs = import nixpkgs {
             inherit system;
             config.allowUnfree = true;
@@ -52,6 +40,7 @@
           };
 
           treefmt = {
+            # Used to find the project root
             projectRootFile = "flake.nix";
             settings.global.excludes = [
               ".direnv/**"
@@ -61,60 +50,67 @@
               ".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.3.0";
+            version = "0.2.0";
             src = ./.;
+            # If the build complains, uncomment this line
+            # vendorHash = "sha256:0000000000000000000000000000000000000000000000000000";
+            vendorHash = "sha256-aC82an6vYifewx4amfXLzk639jz9fF5bD5cF6krY0Ks=";
             
-            nativeBuildInputs = [
+            nativeBuildInputs = [ pkgs.installShellFiles ];
-              pkgs.unstable.odin
+
-              pkgs.pkg-config
+            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 = [
+            postBuild = ''
-              pkgs.libsodium
+              # Generate man pages
-              mysqlite
+              $GOPATH/bin/docgen -out ./man -format man
-            ];
-
-            buildPhase = ''
-              runHook preBuild
-              echo '${version}' > version.txt
-              odin build . -o:speed -out:${pname}
-              runHook postBuild
             '';
             
-            installPhase = ''
+            postInstall = ''
-              runHook preInstall
+              # Install man pages
-              install -Dm755 ${pname} $out/bin/${pname}
+              installManPage ./man/*.1
-              runHook postInstall
             '';
           };
 
-          devShells.default = pkgs.mkShell {
+          devShells.default = pkgs.mkShell
-            buildInputs = with pkgs; [
+            {
-              nushell
+              buildInputs = with pkgs; [
+                fd
+                nushell
+                go
+                gopls
 
-              libsodium
+                gotools
-              mysqlite
+                cobra-cli
-              unstable.odin
-              unstable.ols
 
-              # Build tools
+                age
-              zip
+                sqlite
+                unstable.odin
+                unstable.ols
 
-              # Helper tools
+                # Build tools
-              delta
+                zip
-              hyperfine
 
-              # IDE
+                # IDE
-              unstable.helix
+                unstable.helix
-              typescript-language-server
+                typescript-language-server
-              vscode-langservers-extracted
+                vscode-langservers-extracted
-            ];
+              ];
-          };
+            };
         };
     };
 }

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,14 +1,10 @@
 package main
 
-import "core:bufio"
 import "core:fmt"
 import "core:os"
 
 main :: proc() {
-	defer free_all(context.temp_allocator)
+	cmd, ok := parse_args()
-
-	cmd, ok := parse_args(os.args, os.to_writer(os.stdout), os.to_writer(os.stderr))
-	defer bufio.writer_flush(cmd.out_buf)
 	if !ok {
 		return
 	}
@@ -36,12 +32,11 @@ main :: proc() {
 		cmd_scan(&cmd)
 	case "sync":
 		cmd_sync(&cmd)
-	case "nushell-completion":
-		cmd_nushell_completion(&cmd)
 	case:
-		fmt.wprintf(cmd.err, "Unknown command: %s\n", cmd.name)
+		fmt.printf("Unknown command: %s\n", cmd.name)
-		write_usage(cmd.out)
+		print_usage()
 		os.exit(1)
 	}
 }
 
+

prompt.odin

@@ -3,113 +3,11 @@ package main
 import "core:fmt"
 import "core:sys/posix"
 
-MultiSelect_Result :: enum {
-	Confirm,
-	Cancel,
-}
-
-Key :: enum {
-	Up,
-	Down,
-	Space,
-	Enter,
-	Escape,
-	Unknown,
-}
-
 Raw_State :: struct {
 	original: posix.termios,
 	fd:       posix.FD,
 }
 
-MAX_VISIBLE :: 7
-
-// Caller is responsible for deleting the responses.
-multi_select :: proc(
-	prompt: string,
-	options: []string,
-) -> (
-	selected: [dynamic]bool,
-	result: MultiSelect_Result,
-) {
-	if len(options) == 0 {
-		return
-	}
-
-	selected = make([dynamic]bool, 0, len(options))
-	cursor: int = 0
-	scroll_offset: int = 0
-
-	fmt.printf("\x1b[?25l")
-	visible := render_options(prompt, options, selected[:], cursor, scroll_offset)
-
-	raw, ok := enable_raw_mode(posix.STDIN_FILENO)
-	if !ok {
-		fmt.printf("\x1b[?25h")
-		return
-	}
-	defer disable_raw_mode(&raw)
-
-	for {
-		key := read_key()
-
-		switch key {
-		case .Up:
-			if cursor > 0 {
-				cursor -= 1
-			}
-		case .Down:
-			if cursor < len(options) - 1 {
-				cursor += 1
-			}
-		case .Space:
-			selected[cursor] = !selected[cursor]
-		case .Enter:
-			fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
-			result = .Confirm
-			return
-		case .Escape:
-			fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
-			result = .Cancel
-			return
-		case .Unknown:
-		}
-
-		scroll_offset = max(0, min(cursor - MAX_VISIBLE / 2, len(options) - MAX_VISIBLE))
-		fmt.printf("\x1b[%dA\x1b[0J", visible + 1)
-		visible = render_options(prompt, options, selected[:], cursor, scroll_offset)
-	}
-}
-
-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) {
-		end = len(options)
-	}
-
-	for i in scroll_offset ..< end {
-		checkbox := " "
-		if selected[i] {
-			checkbox = "x"
-		}
-		if i == cursor {
-			fmt.printf("\x1b[1;32m> \x1b[0m[\x1b[32m%s\x1b[0m] %s\r\n", checkbox, options[i])
-		} else {
-			fmt.printf("  [\x1b[2m%s\x1b[0m] %s\r\n", checkbox, options[i])
-		}
-	}
-
-	return end - scroll_offset
-}
-
 enable_raw_mode :: proc(fd: posix.FD) -> (Raw_State, bool) {
 	state: Raw_State
 	state.fd = fd
@@ -137,6 +35,15 @@ disable_raw_mode :: proc(state: ^Raw_State) {
 	posix.tcsetattr(state.fd, .TCSAFLUSH, &state.original)
 }
 
+Key :: enum {
+	Up,
+	Down,
+	Space,
+	Enter,
+	Escape,
+	Unknown,
+}
+
 read_key :: proc() -> Key {
 	buf: [3]u8
 
@@ -199,3 +106,88 @@ read_key :: proc() -> Key {
 	}
 }
 
+MultiSelect_Result :: enum {
+	Confirm,
+	Cancel,
+}
+
+MAX_VISIBLE :: 7
+
+multi_select :: proc(
+	prompt: string,
+	options: []string,
+) -> (selected: [dynamic]bool, result: MultiSelect_Result) {
+	if len(options) == 0 {
+		return
+	}
+
+	selected = make([dynamic]bool, len(options))
+	cursor: int = 0
+	scroll_offset: int = 0
+
+	fmt.printf("\x1b[?25l")
+	visible := render_options(prompt, options, selected[:], cursor, scroll_offset)
+
+	raw, ok := enable_raw_mode(posix.STDIN_FILENO)
+	if !ok {
+		fmt.printf("\x1b[?25h")
+		return
+	}
+	defer disable_raw_mode(&raw)
+
+	for {
+		key := read_key()
+
+		switch key {
+		case .Up:
+			if cursor > 0 {
+				cursor -= 1
+			}
+		case .Down:
+			if cursor < len(options) - 1 {
+				cursor += 1
+			}
+		case .Space:
+			selected[cursor] = !selected[cursor]
+		case .Enter:
+			fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
+			result = .Confirm
+			return
+		case .Escape:
+			fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
+			result = .Cancel
+			return
+		case .Unknown:
+		}
+
+		scroll_offset = max(0, min(cursor - MAX_VISIBLE / 2, len(options) - MAX_VISIBLE))
+		fmt.printf("\x1b[%dA\x1b[0J", visible + 1)
+		visible = render_options(prompt, options, selected[:], cursor, scroll_offset)
+	}
+}
+
+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) {
+		end = len(options)
+	}
+
+	for i in scroll_offset..<end {
+		checkbox := " "
+		if selected[i] {
+			checkbox = "x"
+		}
+		if i == cursor {
+			fmt.printf("\x1b[1;32m> \x1b[0m[\x1b[32m%s\x1b[0m] %s\r\n", checkbox, options[i])
+		} else {
+			fmt.printf("  [\x1b[2m%s\x1b[0m] %s\r\n", checkbox, options[i])
+		}
+	}
+
+	return end - scroll_offset
+}

scan.odin

@@ -1,20 +1,133 @@
 package main
 
+import "core:fmt"
 import "core:os"
+import "core:strings"
+import "core:sync"
 
-import "findr"
+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) {
-	opts := findr.WalkOptions {
+	if is_tty() {
-		pattern  = cfg.ScanConfig.Matcher,
+		fmt.printf("Searching for all files in \"%s\"...\n", search_path)
-		excludes = cfg.ScanConfig.Exclude[:],
 	}
-	findr.walk({search_path}, &paths, opts, os.get_processor_core_count())
+	all_files, all_ok := run_fd(build_fd_args(search_path, cfg, true))
+	if !all_ok {
+		return
+	}
+
+	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))
+	if !unignored_ok {
+		return
+	}
+
+	unignored_set := make(map[string]bool, len(unignored_files), context.temp_allocator)
+	for file in unignored_files {
+		unignored_set[file] = true
+	}
+
+	for file in all_files {
+		if !(file in unignored_set) {
+			append(&paths, file)
+		}
+	}
+
 	ok = true
 	return
 }
 
+@(private = "file")
+build_fd_args :: proc(search_path: string, cfg: Config, include_ignored: bool) -> []string {
+	args_len := 3 + 2 * len(cfg.ScanConfig.Exclude) + 2
+	args := make([dynamic]string, 0, args_len, context.temp_allocator)
+	append(&args, "fd")
+	append(&args, "-a")
+	append(&args, cfg.ScanConfig.Matcher)
+
+	for exclude in cfg.ScanConfig.Exclude {
+		append(&args, "-E")
+		append(&args, exclude)
+	}
+
+	if include_ignored {
+		append(&args, "-HI")
+	} else {
+		append(&args, "-H")
+	}
+
+	append(&args, search_path)
+	return args[:]
+}
+
+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 {
+		return
+	}
+
+	desc := os.Process_Desc {
+		command = args,
+		stdout  = tmp_file,
+		stderr  = nil,
+	}
+
+	p, start_err := os.process_start(desc)
+	os.close(tmp_file)
+	if start_err != nil {
+		os.remove(tmp_path)
+		return
+	}
+
+	state, wait_err := os.process_wait(p)
+	if wait_err != nil || state.exit_code != 0 {
+		os.remove(tmp_path)
+		return
+	}
+
+	data, read_err := os.read_entire_file_from_path(tmp_path, context.temp_allocator)
+	os.remove(tmp_path)
+	if read_err != nil {
+		return
+	}
+
+	output := string(data)
+	output = strings.trim_space(output)
+	if len(output) == 0 {
+		ok = true
+		return
+	}
+
+	raw_lines := strings.split(output, "\n", context.temp_allocator)
+	result := make([dynamic]string, 0, len(raw_lines), context.temp_allocator)
+	for line in raw_lines {
+		trimmed := strings.trim_space(line)
+		if len(trimmed) > 0 {
+			append(&result, trimmed)
+		}
+	}
+
+	return result[:], true
+}
+
+@(private = "file")
+next_fd_tmp_path :: proc() -> string {
+	sync.atomic_mutex_lock(&fd_counter)
+	n := fd_seq
+	fd_seq += 1
+	sync.atomic_mutex_unlock(&fd_counter)
+	return fmt.aprintf("/tmp/envr-fd-%d-%d", os.get_pid(), n, allocator = context.temp_allocator)
+}
+
+cant_scan :: proc(feats: AvailableFeatures) -> bool {
+	return Feature.Fd not_in feats
+}
+
 find_unbacked :: proc(local_files: []string, db_files: []EnvFile) -> []string {
 	backed_set := make(map[string]bool, len(db_files), context.temp_allocator)
 	for file in db_files {
@@ -29,3 +142,4 @@ find_unbacked :: proc(local_files: []string, db_files: []EnvFile) -> []string {
 	}
 	return unbacked[:]
 }
+

scan_test.odin

@@ -7,12 +7,15 @@ import "core:testing"
 
 @(test)
 test_scan_path_finds_gitignored_env_files :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-scan-test-%d", os.get_pid())
+	feats := check_features()
+	testing.expect(t, cant_scan(feats) == false)
+
+	base := fmt.aprintf("/tmp/envr-scan-test-%d", os.get_pid())
 	os.mkdir_all(base)
 	defer os.remove_all(base)
 
 	git_init := os.Process_Desc {
-		command     = []string{"git", "-c", "advice.defaultBranchName=false", "init", "-q"},
+		command     = []string{"git", "-c", "advice.defaultBranchName=false", "init"},
 		working_dir = base,
 		stdout      = os.stderr,
 		stderr      = os.stderr,
@@ -26,24 +29,19 @@ test_scan_path_finds_gitignored_env_files :: proc(t: ^testing.T) {
 		return
 	}
 
-	gitignore_path := fmt.tprintf("%s/.gitignore", base)
+	gitignore_path := fmt.aprintf("%s/.gitignore", base)
 	_ = os.write_entire_file(gitignore_path, ".env*\n")
 
-	_ = os.write_entire_file(fmt.tprintf("%s/.env", base), "SECRET=1")
+	_ = os.write_entire_file(fmt.aprintf("%s/.env", base), "SECRET=1")
-	_ = os.write_entire_file(fmt.tprintf("%s/.env.testing", base), "TEST=1")
+	_ = os.write_entire_file(fmt.aprintf("%s/.env.testing", base), "TEST=1")
-	_ = os.write_entire_file(fmt.tprintf("%s/config.yaml", base), "key: value")
+	_ = os.write_entire_file(fmt.aprintf("%s/config.yaml", base), "key: value")
 
 	cfg := Config {
-		ScanConfig = ScanConfig{Matcher = "\\.env"},
+		ScanConfig = ScanConfig{Matcher = "\\.env", Exclude = []string{}, Include = []string{}},
 	}
 
 	results, ok := scan_path(base, cfg)
-	defer {
+	defer delete(results)
-		for path in results {
-			delete(path)
-		}
-		delete(results)
-	}
 	testing.expect(t, ok, "scan_path should succeed")
 
 	found_env := false
@@ -70,16 +68,20 @@ test_scan_path_finds_gitignored_env_files :: proc(t: ^testing.T) {
 
 @(test)
 test_scan_path_empty_dir :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-scan-empty-%d", os.get_pid())
+	feats := check_features()
+	testing.expect(t, cant_scan(feats) == false)
+
+	base := fmt.aprintf("/tmp/envr-scan-empty-%d", os.get_pid())
 	os.mkdir_all(base)
 	defer os.remove_all(base)
 
 	cfg := Config {
-		ScanConfig = ScanConfig{Matcher = "\\.env"},
+		ScanConfig = ScanConfig{Matcher = "\\.env", Exclude = []string{}, Include = []string{}},
 	}
 
 	results, ok := scan_path(base, cfg)
 	defer delete(results)
 	testing.expect(t, ok, "scan_path should succeed")
-	testing.expect(t, len(results) == 0, fmt.tprintf("expected 0 results, got %d", len(results)))
+	testing.expect(t, len(results) == 0, fmt.aprintf("expected 0 results, got %d", len(results)))
 }
+

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) ---
-}
-

sqlite/sqlite.odin

@@ -8,9 +8,6 @@ OK :: 0
 ROW :: 100
 DONE :: 101
 
-DESERIALIZE_FREEONCLOSE :: 1
-DESERIALIZE_RESIZEABLE :: 2
-
 foreign lib {
     @(link_name="sqlite3_open")
     db_open          :: proc(filename: cstring, ppDb: ^^rawptr) -> c.int ---
@@ -34,12 +31,4 @@ foreign lib {
     bind_text        :: proc(stmt: ^rawptr, idx: c.int, val: cstring, n: c.int, destructor: rawptr) -> c.int ---
     @(link_name="sqlite3_changes")
     changes          :: proc(db: ^rawptr) -> c.int ---
-    @(link_name="sqlite3_serialize")
-    serialize        :: proc(db: ^rawptr, zSchema: cstring, piSize: ^i64, mFlags: u32) -> [^]u8 ---
-    @(link_name="sqlite3_deserialize")
-    deserialize      :: proc(db: ^rawptr, zSchema: cstring, pData: [^]u8, szDb: i64, szBuf: i64, mFlags: u32) -> c.int ---
-    @(link_name="sqlite3_malloc64")
-    malloc64         :: proc(n: i64) -> [^]u8 ---
-    @(link_name="sqlite3_free")
-    free             :: proc(p: rawptr) ---
 }

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) {
+	for i in 0..<len(headers) {
 		append(&col_widths, strings.rune_count(headers[i]))
 	}
 	for r in rows {
-		for i in 0 ..< len(r) {
+		for i in 0..<len(r) {
-			rw := strings.rune_count(r[i])
+			w := strings.rune_count(r[i])
-			if i < len(col_widths) && rw > col_widths[i] {
+			if i < len(col_widths) && w > col_widths[i] {
-				col_widths[i] = rw
+				col_widths[i] = w
 			}
 		}
 	}
@@ -24,23 +32,23 @@ 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 i in 0..<len(widths) {
-			for _ in 0 ..< widths[i] + 2 {
+			for _ in 0..<widths[i]+2 {
 				strings.write_string(b, "\u2500")
 			}
-			if i < len(widths) - 1 {
+			if i < len(widths)-1 {
 				strings.write_string(b, mid)
 			} else {
 				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)
@@ -48,42 +56,42 @@ render_table :: proc(w: io.Writer, headers: []string, rows: [][]string) {
 	}
 
 	strings.write_string(&b, "\u2502")
-	for i in 0 ..< len(headers) {
+	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) {
+		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) {
-	entries := make([dynamic]map[string]string, 0, len(rows), context.temp_allocator)
+	entries := make([dynamic]map[string]string, 0, len(rows))
+	defer delete(entries)
 
 	for row in rows {
-		entry := make(map[string]string, len(headers), context.temp_allocator)
+		entry: map[string]string
-		for i in 0 ..< len(headers) {
+		for i in 0..<len(headers) {
 			entry[headers[i]] = row[i]
 		}
 		append(&entries, entry)
 	}
 
-	data, err := json.marshal(entries[:], allocator = context.temp_allocator)
+	data, err := json.marshal(entries[:])
 	if err != nil {
 		fmt.eprintf("Error marshaling JSON: %v\n", err)
 		return
 	}
-	fmt.wprintf(w, "%s", data, flush = false)
+	io.write_string(w, string(data))
 }
-

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"
 
@@ -19,18 +20,18 @@ test_render_json_rows_normal :: proc(t: ^testing.T) {
 
 	output := strings.to_string(b)
 
-	result: []map[string]string = ---
+	result: []map[string]string
-	unmarshal_err := json.unmarshal_string(output, &result, allocator = context.temp_allocator)
+	unmarshal_err := json.unmarshal_string(output, &result)
 	testing.expect(
 		t,
 		unmarshal_err == nil,
-		fmt.tprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
+		fmt.aprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
 	)
-	testing.expect(t, len(result) == 2, fmt.tprintf("expected 2 rows, got %d", len(result)))
+	testing.expect(t, len(result) == 2, fmt.aprintf("expected 2 rows, got %d", len(result)))
 	testing.expect(
 		t,
 		result[0]["name"] == "foo",
-		fmt.tprintf("expected name=foo, got %q", result[0]["name"]),
+		fmt.aprintf("expected name=foo, got %q", result[0]["name"]),
 	)
 	testing.expect(t, result[0]["path"] == "/home/user/.env")
 	testing.expect(t, result[1]["name"] == "bar")
@@ -56,22 +57,18 @@ test_render_json_rows_special_chars :: proc(t: ^testing.T) {
 
 	output := strings.to_string(b)
 
-	result: []map[string]string = ---
+	result: []map[string]string
-	unmarshal_err := json.unmarshal(
+	unmarshal_err := json.unmarshal(transmute([]byte)output, &result)
-		transmute([]byte)output,
-		&result,
-		allocator = context.temp_allocator,
-	)
 	testing.expect(
 		t,
 		unmarshal_err == nil,
-		fmt.tprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
+		fmt.aprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
 	)
 	testing.expect(t, len(result) == 4)
 	testing.expect(
 		t,
 		result[0]["value"] == `has "double quotes"`,
-		fmt.tprintf("got %q", result[0]["value"]),
+		fmt.aprintf("got %q", result[0]["value"]),
 	)
 	testing.expect(t, result[1]["value"] == `path\to\file`)
 	testing.expect(t, result[2]["value"] == "line1\nline2")
@@ -92,107 +89,13 @@ test_render_json_rows_empty :: proc(t: ^testing.T) {
 
 	output := strings.to_string(b)
 
-	result: []map[string]string = ---
+	result: []map[string]string
-	unmarshal_err := json.unmarshal_string(output, &result, allocator = context.temp_allocator)
+	unmarshal_err := json.unmarshal_string(output, &result)
 	testing.expect(
 		t,
 		unmarshal_err == nil,
-		fmt.tprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
+		fmt.aprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
 	)
 	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.3.1