nix: Fixed the nix build.

Allows printing data in tabular or json format.

.github/workflows/release-please.yml

@@ -2,8 +2,6 @@ on:
   push:
     branches:
       - main
-      - dev
-      - odin
 
 permissions:
   contents: write

.gitignore

@@ -11,6 +11,7 @@ man
 builds
 envr
 envr-go
+envr-prof
 findr/findr
 findr/findr-prof
 findr/bench-*.md

Makefile

@@ -10,7 +10,7 @@ LINUX_AMD64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-amd64
 LINUX_ARM64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-linux-arm64
 DARWIN_ARM64_BIN := $(BUILD_DIR)/$(APP_NAME)-$(VERSION)-darwin-arm64
 
-.PHONY: all clean cleanall build-linux build-darwin compress release help
+.PHONY: all clean cleanall build-linux build-darwin compress release profile help
 
 # Default target
 all: release clean
@@ -66,6 +66,12 @@ 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"
 
+# Build with spall profiling instrumentation
+profile:
+	@echo "Building with spall profiling..."
+	odin build . -define:SPALL=true -o:speed -out:envr-prof
+	@echo "Built envr-prof (run it to generate envr.spall)"
+
 # Clean binary files only
 clean:
 	@echo "Cleaning binary files..."
@@ -84,6 +90,7 @@ help:
 	@echo "  build-linux  - Build Linux binaries only"
 	@echo "  build-darwin - Build Darwin binaries only"
 	@echo "  compress    - Compress all built binaries"
+	@echo "  profile     - Build with spall profiling instrumentation"
 	@echo "  clean       - Remove binary files only"
 	@echo "  cleanall    - Remove entire build directory"
 	@echo "  help        - Show this help message"

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

TODOS.md

@@ -1,59 +1,42 @@
 # TODOs
 
-1. Consider giving db its own allocator
+1. Bring back windows support / cross-compilation.
 
-27. Commands are still leaking.
+2. Commands are still leaking. (Write tests for everything first)
 
-2. Generate md and man pages again.
+3. procedures should be ordered by use, main at the top, then in the order they are called from main.
 
-3. **db.odin:324-327** — Map iteration (`remote_set`) is non-deterministic. Same file can produce different JSON on each backup, causing spurious DB diffs. Sort remotes before storing.
+4. Check for prealloc opportunities. i.e. `make([dynamic]string)` -> `make([dynamic]string, 5)`.
 
-4. Make sure official path separators are used when appropriate, rather than '/'.
+5. Test all cmds / terminal branches.
 
-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.
+6. Generate md and man pages again.
 
-6. **cmd_restore.odin:44** — `os.mkdir_all` error silently discarded. Subsequent write failure will be confusing.
+7. Shell completion
 
-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.
+8. Add tests for untested commands.
 
-10. **db.odin:115** — `json.unmarshal_string` error not checked. Malformed JSON silently produces empty/partial data.
+9. Update `read_wire_string` to use a slice.
 
-11. **db.odin:352-353** — `hex.encode` error ignored. `string(hex_bytes)` aliases the byte slice.
+10. Pass allocator to findr?
 
-12. **cmd_sync.odin:80, cmd_list.odin:33** — `make([]string, 2)` for table rows never freed. Leaks per row. Defer to memory pass.
+11. Smarter flag parsing?
 
-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"`.
+12. Rewrite `write_command_help` to use text/tables
 
-14. Check for prealloc opportunities. i.e. `make([dynamic]string)` -> `make([dynamic]string, 5)`.
+13. Add color flag and support non colored output.
 
-15. Add a text filter to the multi_select.
-
-17. Add tests for untested commands.
-
-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.
-
-20. add --format -f flag to commands that draw tables.
-
-21. Replace `testing.expect` calls with `testing.expect_value` calls where appropriate.
-
-22. Change struct field names from PascalCase to snake_case.
-
-23. procedures should be ordered by use, main at the top, then in the order they are called from main.
-
-24. Shell completion
-
-25. Bring back windows support / cross-compilation.
-
-26. Test all cmds / terminal branches.
+14. Add a text filter to the multi_select.
 
 ## Double-check AI output
 
 - [ ] cli.odin
 - [ ] cli_test.odin
+- [x] colors.odin
 - [x] cmd_backup.odin
 - [x] cmd_check.odin
 - [ ] cmd_check_test.odin
-- [ ] cmd_edit_config.odin
+- [x] cmd_edit_config.odin
 - [x] cmd_init.odin
 - [x] cmd_list.odin
 - [ ] cmd_list_test.odin
@@ -64,7 +47,7 @@
 - [x] cmd_scan.odin
 - [x] cmd_sync.odin
 - [x] cmd_version.odin
-- [ ] config.odin
+- [x] config.odin
 - [ ] config_test.odin
 - [ ] crypto.odin
 - [ ] crypto_test.odin
@@ -73,10 +56,10 @@
 - [ ] db_test.odin
 - [x] main.odin
 - [x] prompt.odin
-- [ ] scan.odin
+- [x] scan.odin
 - [ ] scan_test.odin
 - [ ] sodium.odin
-- [ ] sqlite/sqlite.odin
+- [x] sqlite/sqlite.odin
 - [ ] ssh.odin
 - [ ] ssh_test.odin
 - [ ] table.odin

cli.odin

@@ -5,6 +5,8 @@ import "core:fmt"
 import "core:io"
 import "core:os"
 import "core:strings"
+import "core:terminal"
+import "core:text/table"
 
 Command :: struct {
 	name:        string,
@@ -17,6 +19,11 @@ Command :: struct {
 	err:         io.Writer,
 }
 
+Output_Format :: enum {
+	Table,
+	JSON,
+}
+
 CommandInfo :: struct {
 	name:    string,
 	usage:   string,
@@ -75,6 +82,7 @@ parse_args :: proc(args: []string, out: io.Stream, err: io.Stream) -> (cmd: Comm
 	cmd.flags = make(map[string]string)
 	cmd.bool_set = make(map[string]bool)
 
+	// TODO: Optimize loop?
 	i := 2
 	for i < len(args) {
 		arg := args[i]
@@ -102,9 +110,10 @@ parse_args :: proc(args: []string, out: io.Stream, err: io.Stream) -> (cmd: Comm
 		}
 	}
 
-	if val, ok := cmd.flags["config-file"]; ok {
+	val: string = ---
+	if val, ok = cmd.flags["config-file"]; ok {
 		cmd.config_path = val
-	} else if val, ok := cmd.flags["c"]; ok {
+	} else if val, ok = cmd.flags["c"]; ok {
 		cmd.config_path = val
 	} else {
 		// FIXME: Handle err
@@ -114,7 +123,7 @@ parse_args :: proc(args: []string, out: io.Stream, err: io.Stream) -> (cmd: Comm
 		cmd.config_path = default_config_path(home, context.temp_allocator)
 	}
 
-	if has_flag(&cmd, "help") {
+	if has_flag(&cmd, "help") || has_flag(&cmd, "h") {
 		print_command_help(&cmd)
 		return cmd, false
 	}
@@ -136,13 +145,38 @@ write_command_help :: proc(name: string, w: io.Writer) -> bool {
 		return false
 	}
 
-	fmt.wprintf(w, "Usage: %s [flags]\n\n", info.usage, flush = false)
-	fmt.wprintf(w, "%s\n", info.short, flush = false)
+	fmt.wprintf(
+		w,
+		"%s\n\n\n" +
+		COLOR_HEADINGS +
+		"Usage:" +
+		ANSI_RESET +
+		"\n\n  " +
+		COLOR_FLAGS +
+		"%s" +
+		ANSI_RESET +
+		" [flags]\n\n",
+		info.short,
+		info.usage,
+		flush = false,
+	)
 
 	if len(info.aliases) > 0 {
-		fmt.wprintf(w, "\nAliases:\n  %s", info.name, flush = false)
+		fmt.wprintf(
+			w,
+			"\n" +
+			COLOR_HEADINGS +
+			"Aliases:" +
+			ANSI_RESET +
+			"\n\n  " +
+			COLOR_COMMANDS +
+			"%s" +
+			ANSI_RESET,
+			info.name,
+			flush = false,
+		)
 		for a in info.aliases {
-			fmt.wprintf(w, ", %s", a, flush = false)
+			fmt.wprintf(w, ", " + COLOR_COMMANDS + "%s" + ANSI_RESET, a, flush = false)
 		}
 		fmt.wprintf(w, "\n", flush = false)
 	}
@@ -153,7 +187,20 @@ write_command_help :: proc(name: string, w: io.Writer) -> bool {
 
 	fmt.wprintf(
 		w,
-		"\nFlags:\n  -h, --help   help for %s\n  -c, --config-file <path>   config file (default \"~/.envr/config.json\")\n",
+		"\n" +
+		COLOR_HEADINGS +
+		"Flags:" +
+		ANSI_RESET +
+		"\n\n  " +
+		COLOR_FLAGS +
+		"-h, --help" +
+		ANSI_RESET +
+		"   help for %s\n  " +
+		COLOR_FLAGS +
+		"-c, --config-file" +
+		ANSI_RESET +
+		` <path>   config file (default "~/.envr/config.json")
+`,
 		info.name,
 		flush = false,
 	)
@@ -178,11 +225,11 @@ find_command :: proc(name: string) -> (CommandInfo, bool) {
 write_usage :: proc(w: io.Writer) {
 	fmt.wprintf(
 		w,
-		`envr keeps your .env synced to a local, age encrypted database.
+		`envr keeps your .env synced to a local, 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
+All your data is stored in ~/.envr/data.envr
 
 Getting started is easy:
 
@@ -209,50 +256,78 @@ at before, restore your backup with:
 
 > envr restore ~/<path to repository>/.env
 
-Usage:
-  envr [command]
+%sUsage:%s
+
+  %senvr%s [command]
 
-Available Commands:
 `,
+		COLOR_HEADINGS,
+		ANSI_RESET,
+		COLOR_FLAGS,
+		ANSI_RESET,
 		flush = false,
 	)
 
+	tbl: table.Table
+	table.init(&tbl, context.temp_allocator, context.temp_allocator)
+	table.padding(&tbl, 2, 0)
+
+	table.caption(&tbl, "Available Commands:")
+
 	for c in COMMANDS {
-		name_start := len(c.name)
-		fmt.wprintf(w, "%s", c.name, flush = false)
+		name := c.name
+		// TODO: Can we do better?
 		for a in c.aliases {
-			fmt.wprintf(w, ", %s", a, flush = false)
-			name_start += len(a) + 2
+			name = strings.join([]string{name, a}, ", ", tbl.format_allocator)
 		}
-		padding := 20 - name_start
-		if padding > 0 {
-			for _ in 0 ..< padding {
-				io.write_byte(w, ' ')
-			}
-		}
-		fmt.wprintf(w, " %s\n", c.short, flush = false)
+		table.row(&tbl, table.format(&tbl, "%s%s%s", COLOR_COMMANDS, name, ANSI_RESET), c.short)
 	}
 
+	write_borderless_table(w, &tbl)
+	table_reset(&tbl)
+
+	table.caption(&tbl, "Flags:")
+
+	table.row(&tbl, COLOR_FLAGS + "-h, --help" + ANSI_RESET, `show this documentation`)
+	table.row(
+		&tbl,
+		COLOR_FLAGS + "-c, --config-file" + ANSI_RESET + " <path>",
+		`config file (default "~/.envr/config.json")`,
+	)
+	table.row(
+		&tbl,
+		COLOR_FLAGS + "-f, --format" + ANSI_RESET + " 'json'|'table'",
+		`the format of output data. (default 'table', unless piping)`,
+	)
+	write_borderless_table(w, &tbl)
+
 	fmt.wprintf(
 		w,
-		`
-Flags:
-  -h, --help   help for envr
-  -c, --config-file <path>   config file (default "~/.envr/config.json")
-
-Use "envr [command] --help" for more information about a command.
-`,
+		`Use "%senvr%s [command] --help" for more information about a command.`,
+		COLOR_FLAGS,
+		ANSI_RESET,
 		flush = false,
 	)
 }
 
 has_flag :: proc(cmd: ^Command, name: string) -> bool {
-	_, ok := cmd.flags[name]
-	if ok {
-		return true
+	return name in cmd.flags || name in cmd.bool_set
+}
+
+get_format :: proc(cmd: ^Command) -> Output_Format {
+	flags :: []string{"format", "f"}
+	for name in flags {
+		if val, ok := cmd.flags[name]; ok {
+			switch val {
+			case "json":
+				return .JSON
+			case "table":
+				return .Table
+			}
+		}
 	}
-	_, ok2 := cmd.bool_set[name]
-	return ok2
+
+	return terminal.is_terminal(os.stdout) ? .Table : .JSON
 }
 
 delete_command :: proc(cmd: ^Command) {

cli_test.odin

@@ -1,5 +1,6 @@
 #+feature dynamic-literals
 #+test
+package main
 
 import "core:bufio"
 import "core:fmt"
@@ -57,7 +58,7 @@ test_usage_text_contains_flags_and_help_hint :: proc(t: ^testing.T) {
 	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, "[command] --help"), "missing help hint")
-}
+}
 
 @(test)
 test_command_help_backup :: proc(t: ^testing.T) {
@@ -122,7 +123,7 @@ test_command_help_unknown :: proc(t: ^testing.T) {
 
 	text := strings.to_string(b)
 	testing.expect_value(t, len(text), 0)
-}
+}
 
 @(test)
 test_command_help_version :: proc(t: ^testing.T) {
@@ -235,9 +236,9 @@ test_parse_args_positional :: proc(t: ^testing.T) {
 	testing.expect(t, ok, "should succeed")
 
 	testing.expect_value(t, cmd.name, "backup")
-	testing.expect(t, len(cmd.args) == 1)
-	testing.expect(t, cmd.args[0] == "/project/.env")
-}
+	testing.expect_value(t, len(cmd.args), 1)
+	testing.expect_value(t, cmd.args[0], "/project/.env")
+}
 
 @(test)
 test_parse_args_long_flag_with_value :: proc(t: ^testing.T) {
@@ -247,7 +248,7 @@ test_parse_args_long_flag_with_value :: proc(t: ^testing.T) {
 	defer delete_command(&cmd)
 
 	testing.expect_value(t, cmd.flags["config"], "x.json")
-}
+}
 
 @(test)
 test_parse_args_short_flag_with_value :: proc(t: ^testing.T) {
@@ -257,7 +258,7 @@ test_parse_args_short_flag_with_value :: proc(t: ^testing.T) {
 	defer delete_command(&cmd)
 
 	testing.expect_value(t, cmd.flags["c"], "x.json")
-}
+}
 
 @(test)
 test_parse_args_long_bool_flag :: proc(t: ^testing.T) {
@@ -267,7 +268,7 @@ test_parse_args_long_bool_flag :: proc(t: ^testing.T) {
 	defer delete_command(&cmd)
 
 	testing.expect_value(t, cmd.bool_set["force"], true)
-}
+}
 
 @(test)
 test_parse_args_short_bool_flag :: proc(t: ^testing.T) {
@@ -277,7 +278,7 @@ test_parse_args_short_bool_flag :: proc(t: ^testing.T) {
 	defer delete_command(&cmd)
 
 	testing.expect_value(t, cmd.bool_set["l"], true)
-}
+}
 
 @(test)
 test_parse_args_multiple_positionals :: proc(t: ^testing.T) {
@@ -287,9 +288,9 @@ test_parse_args_multiple_positionals :: proc(t: ^testing.T) {
 	defer delete_command(&cmd)
 
 	testing.expect_value(t, len(cmd.args), 2)
-	testing.expect(t, cmd.args[0] == "a")
-	testing.expect(t, cmd.args[1] == "b")
-}
+	testing.expect_value(t, cmd.args[0], "a")
+	testing.expect_value(t, cmd.args[1], "b")
+}
 
 @(test)
 test_parse_args_mixed_flags_and_positionals :: proc(t: ^testing.T) {
@@ -299,9 +300,9 @@ test_parse_args_mixed_flags_and_positionals :: proc(t: ^testing.T) {
 	defer delete_command(&cmd)
 
 	testing.expect_value(t, cmd.bool_set["force"], true)
-	testing.expect(t, len(cmd.args) == 1)
-	testing.expect(t, cmd.args[0] == "/project/.env")
-}
+	testing.expect_value(t, len(cmd.args), 1)
+	testing.expect_value(t, cmd.args[0], "/project/.env")
+}
 
 @(test)
 test_parse_args_no_args :: proc(t: ^testing.T) {
@@ -317,10 +318,10 @@ test_parse_args_flag_then_positional_then_flag :: proc(t: ^testing.T) {
 	testing.expect(t, ok, "should succeed")
 
 	testing.expect_value(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")
-}
+	testing.expect_value(t, cmd.bool_set["verbose"], true)
+	testing.expect_value(t, len(cmd.args), 1)
+	testing.expect_value(t, cmd.args[0], "a.env")
+}
 
 @(test)
 test_parse_args_config_file_long_flag :: proc(t: ^testing.T) {
@@ -332,11 +333,7 @@ test_parse_args_config_file_long_flag :: proc(t: ^testing.T) {
 	defer delete_command(&cmd)
 
 	testing.expect_value(t, cmd.config_path, "/custom/config.json")
-		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) {
@@ -346,11 +343,7 @@ test_parse_args_config_file_short_flag :: proc(t: ^testing.T) {
 	defer delete_command(&cmd)
 
 	testing.expect_value(t, cmd.config_path, "/custom/config.json")
-		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) {
@@ -368,3 +361,43 @@ test_parse_args_config_file_defaults :: proc(t: ^testing.T) {
 }
 
 @(test)
+test_get_format_long_json :: proc(t: ^testing.T) {
+	cmd, ok, _, _ := test_parse_args([]string{"envr", "list", "--format", "json"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete_command(&cmd)
+
+	testing.expect_value(t, get_format(&cmd), Output_Format.JSON)
+}
+
+@(test)
+test_get_format_short_json :: proc(t: ^testing.T) {
+	cmd, ok, _, _ := test_parse_args([]string{"envr", "list", "-f", "json"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete_command(&cmd)
+
+	testing.expect_value(t, get_format(&cmd), Output_Format.JSON)
+}
+
+@(test)
+test_get_format_long_table :: proc(t: ^testing.T) {
+	cmd, ok, _, _ := test_parse_args([]string{"envr", "list", "--format", "table"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete_command(&cmd)
+
+	testing.expect_value(t, get_format(&cmd), Output_Format.Table)
+}
+
+@(test)
+test_get_format_short_table :: proc(t: ^testing.T) {
+	cmd, ok, _, _ := test_parse_args([]string{"envr", "list", "-f", "table"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete_command(&cmd)
+
+	testing.expect_value(t, get_format(&cmd), Output_Format.Table)
+}
+
+

cmd_backup.odin

@@ -15,7 +15,10 @@ cmd_backup :: proc(cmd: ^Command) {
 		return
 	}
 
+	// TODO: allow new_env_file to accept allocator?
+	// TODO: Write a test that covers this leak
 	file, ok := new_env_file(path)
+	defer delete_envfile(&file)
 	if !ok {
 		return
 	}

cmd_check.odin

@@ -4,29 +4,24 @@ import "core:fmt"
 import "core:os"
 import "core:path/filepath"
 
+// TODO: What happens if you pass a non existent path to cmd_check?
+// TODO: UX could be improved, so "run envr add ." if file not exists.
 cmd_check :: proc(cmd: ^Command) {
-	check_path: string
+	_check_path: string
 	if len(cmd.args) > 0 {
-		check_path = cmd.args[0]
+		_check_path = cmd.args[0]
 	} else {
 		cwd, cwd_err := os.get_working_directory(context.temp_allocator)
 		if cwd_err != nil {
 			fmt.wprintf(cmd.err, "Error getting current directory: %v\n", cwd_err, flush = false)
 			return
 		}
-		check_path = cwd
+		_check_path = cwd
 	}
-
-	abs_path: string
-	if filepath.is_abs(check_path) {
-		abs_path = check_path
-	} 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)
-			return
-		}
-		abs_path = resolved
+	check_path, abs_err := filepath.abs(_check_path, context.temp_allocator)
+	if abs_err != nil {
+		fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
+		return
 	}
 
 	db, db_ok := db_open(cmd.config_path)
@@ -35,27 +30,26 @@ cmd_check :: proc(cmd: ^Command) {
 	}
 	defer db_close(&db)
 
-	is_dir := os.is_directory(abs_path)
+	is_dir := os.is_directory(check_path)
 
-	files_in_path: [dynamic]string
+	// TODO: set a reasonable default
+	files_in_path := make([dynamic]string, context.temp_allocator)
 
 	if is_dir {
-		scanned, scan_ok := scan_path(abs_path, db.cfg)
+		scanned, scan_ok := scan_path(check_path, db.cfg)
 		if !scan_ok {
 			fmt.wprintln(cmd.err, "Error scanning directory for .env files", flush = false)
 			return
 		}
 		files_in_path = scanned
 	} else {
-		append(&files_in_path, abs_path)
+		append(&files_in_path, check_path)
 	}
 
 	db_files, list_ok := db_list(&db)
 	if !list_ok {
 		return
 	}
-	defer delete(db_files)
-	defer for &file in db_files {delete_envfile(&file)}
 
 	not_backed := find_unbacked(files_in_path[:], db_files[:])
 

cmd_check_test.odin

@@ -1,40 +1,36 @@
+#+test
 package main
 
-import "core:fmt"
 import "core:testing"
 
 @(test)
 test_find_unbacked_finds_missing :: proc(t: ^testing.T) {
 	local := []string{"/a/.env", "/b/.env", "/c/.env"}
-	db := []EnvFile{{Path = "/a/.env"}, {Path = "/b/.env"}}
+	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_value(t, len(result), 1)
 	if len(result) > 0 {
-		testing.expect(
-			t,
-			result[0] == "/c/.env",
-			fmt.tprintf("expected /c/.env, got %s", result[0]),
-		)
+		testing.expect_value(t, result[0], "/c/.env")
 	}
 }
 
 @(test)
 test_find_unbacked_all_backed :: proc(t: ^testing.T) {
 	local := []string{"/a/.env", "/b/.env"}
-	db := []EnvFile{{Path = "/a/.env"}, {Path = "/b/.env"}}
+	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_value(t, len(result), 0)
 }
 
 @(test)
 test_find_unbacked_no_local :: proc(t: ^testing.T) {
 	local: []string
-	db := []EnvFile{{Path = "/a/.env"}}
+	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_value(t, len(result), 0)
 }
 
 @(test)
@@ -43,6 +39,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_value(t, len(result), 2)
 }
 

cmd_edit_config.odin

@@ -12,8 +12,7 @@ cmd_edit_config :: proc(cmd: ^Command) {
 
 	config_path := cmd.config_path
 
-	_, stat_err := os.stat(config_path, context.allocator)
-	if stat_err != nil {
+	if !os.exists(config_path) {
 		fmt.wprintf(
 			cmd.err,
 			"Config file does not exist at %s. Run 'envr init' first.\n",
@@ -42,6 +41,8 @@ cmd_edit_config :: proc(cmd: ^Command) {
 		fmt.wprintf(cmd.err, "Error waiting for editor: %v\n", wait_err, flush = false)
 		return
 	}
+
+	// TODO: Should we call exit inside of commands?
 	if state.exit_code != 0 {
 		os.exit(int(state.exit_code))
 	}

cmd_init.odin

@@ -1,6 +1,7 @@
 package main
 
 import "core:fmt"
+import "core:terminal/ansi"
 
 cmd_init :: proc(cmd: ^Command) {
 	force := has_flag(cmd, "force") || has_flag(cmd, "f")
@@ -32,7 +33,7 @@ Generate one with: ssh-keygen -t ed25519`, flush = false)
 	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.wprintln(cmd.out, ansi.CSI + ansi.FAINT + ansi.SGR + "Cancelled." + ANSI_RESET, flush = false)
 		return
 	}
 

cmd_list.odin

@@ -5,14 +5,13 @@ import "core:fmt"
 import "core:os"
 import "core:path/filepath"
 import "core:strings"
-import "core:terminal"
+import "core:text/table"
 
 ListEntry :: struct {
-	Directory: string `json:"directory"`,
-	Path:      string `json:"path"`,
+	dir:  string `json:"directory"`,
+	path: string `json:"path"`,
 }
 
-// TODO: Support --format flag
 // TODO: Improve table rendering
 cmd_list :: proc(cmd: ^Command) {
 	db, db_ok := db_open(cmd.config_path)
@@ -25,37 +24,47 @@ cmd_list :: proc(cmd: ^Command) {
 	if !list_ok {
 		return
 	}
-	defer delete(rows)
-	defer for &row in rows {delete_envfile(&row)}
 
-	if terminal.is_terminal(os.stdout) {
-		headers := []string{"Directory", "Path"}
-		table_rows := make([dynamic][]string, 0, len(rows), context.temp_allocator)
+	if get_format(cmd) == .Table {
+		t: table.Table
+		table.init(&t, context.temp_allocator, context.temp_allocator)
+		table.padding(&t, 1, 1)
+		table.aligned_header_of_values(
+			&t,
+			.Center,
+			COLOR_TABLE_HEADING + "Directory" + ANSI_RESET,
+			COLOR_TABLE_HEADING + "Path" + ANSI_RESET,
+		)
 
 		for row in rows {
-			dir_str := strings.concatenate({row.Dir, "/"}, context.temp_allocator)
-			filename := filepath.base(row.Path)
-			row_slice := make([]string, 2, context.temp_allocator)
-			row_slice[0] = dir_str
-			row_slice[1] = filename
-			append(&table_rows, row_slice)
+			dir_str := strings.concatenate(
+				{row.dir, os.Path_Separator_String},
+				context.temp_allocator,
+			)
+			filename := filepath.base(row.path)
+
+			table.row(&t, dir_str, filename)
 		}
 
-		render_table(cmd.out, headers, table_rows[:])
+		table.write_decorated_table(cmd.out, &t, decorations, ansi_aware_width)
 	} else {
 		// TODO: Should we instead print full entries here?
-		entries: [dynamic]ListEntry
+		entries := make([dynamic]ListEntry, 0, len(rows), context.temp_allocator)
 		for row in rows {
-			filename := filepath.base(row.Path)
+			filename := filepath.base(row.path)
 			append(
 				&entries,
 				ListEntry {
-					Directory = strings.concatenate({row.Dir, "/"}, context.temp_allocator),
-					Path = filename,
+					dir = strings.concatenate(
+						{row.dir, os.Path_Separator_String},
+						context.temp_allocator,
+					),
+					path = filename,
 				},
 			)
 		}
 
+
 		data, marshal_err := json.marshal(entries[:], allocator = context.temp_allocator)
 		if marshal_err != nil {
 			fmt.wprintf(cmd.err, "Error marshaling JSON: %v\n", marshal_err, flush = false)

cmd_list_test.odin

@@ -1,6 +1,11 @@
+#+feature dynamic-literals
+#+test
 package main
 
+import "core:bufio"
+import "core:os"
 import "core:path/filepath"
+import "core:strings"
 import "core:testing"
 
 @(test)
@@ -10,9 +15,101 @@ test_filepath_base_equals_rel :: proc(t: ^testing.T) {
 	for path in cases {
 		dir := filepath.dir(path)
 		rel, rel_err := filepath.rel(dir, path, context.temp_allocator)
-		testing.expect(t, rel_err == nil, "filepath.rel returned an error")
+		testing.expect_value(t, rel_err, nil)
 		base := filepath.base(path)
-		testing.expect(t, rel == base, "filepath.rel(dir, path) should equal filepath.base(path)")
+		testing.expect_value(t, rel, base)
 	}
 }
 
+@(test)
+test_cmd_list_format_json :: proc(t: ^testing.T) {
+	base := test_temp_dir(t, "envr-test-list-json-*")
+	defer os.remove_all(base)
+
+	cfg_path, _ := filepath.join([]string{base, "config.json"}, context.temp_allocator)
+	cfg := new_config([]string{"fixtures/keys/insecure-test-key"}, cfg_path)
+	testing.expect(t, save_config(cfg, force = true), "save should succeed")
+	delete_config(&cfg)
+
+	db, db_ok := db_open(cfg_path)
+	testing.expect(t, db_ok, "db should open")
+	if !db_ok do return
+	f := make_test_env_file("/project/.env", "abc123", "SECRET=value")
+	defer delete(f.remotes)
+	testing.expect(t, db_insert(&db, f), "insert should succeed")
+	db_close(&db)
+
+	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(
+		[]string{"envr", "list", "--format", "json", "--config-file", cfg_path},
+		strings.to_stream(&out_b),
+		strings.to_stream(&err_b),
+	)
+	testing.expect(t, ok, "parse_args should succeed")
+	if !ok do return
+	defer delete_command(&cmd)
+
+	cmd_list(&cmd)
+	bufio.writer_flush(cmd.out_buf)
+	output := strings.to_string(out_b)
+
+	testing.expect(t, strings.contains(output, "["), "json output should contain '['")
+	testing.expect(
+		t,
+		strings.contains(output, "\"directory\""),
+		"json output should contain directory key",
+	)
+}
+
+@(test)
+test_cmd_list_format_table :: proc(t: ^testing.T) {
+	base := test_temp_dir(t, "envr-test-list-table-*")
+	defer os.remove_all(base)
+
+	cfg_path, _ := filepath.join([]string{base, "config.json"}, context.temp_allocator)
+	cfg := new_config([]string{"fixtures/keys/insecure-test-key"}, cfg_path)
+	testing.expect(t, save_config(cfg, force = true), "save should succeed")
+	delete_config(&cfg)
+
+	db, db_ok := db_open(cfg_path)
+	testing.expect(t, db_ok, "db should open")
+	if !db_ok do return
+	f := make_test_env_file("/project/.env", "abc123", "SECRET=value")
+	defer delete(f.remotes)
+	testing.expect(t, db_insert(&db, f), "insert should succeed")
+	db_close(&db)
+
+	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(
+		[]string{"envr", "list", "--format", "table", "--config-file", cfg_path},
+		strings.to_stream(&out_b),
+		strings.to_stream(&err_b),
+	)
+	testing.expect(t, ok, "parse_args should succeed")
+	if !ok do return
+	defer delete_command(&cmd)
+
+	cmd_list(&cmd)
+	bufio.writer_flush(cmd.out_buf)
+	output := strings.to_string(out_b)
+
+	testing.expect(t, strings.contains(output, "│"), "table output should contain border chars")
+	testing.expect(
+		t,
+		strings.contains(output, "Directory"),
+		"table output should contain Directory header",
+	)
+}
+

cmd_nushell_completion_test.odin

@@ -1,3 +1,4 @@
+#+test
 package main
 
 import "core:fmt"

cmd_remove.odin

@@ -16,17 +16,10 @@ cmd_remove :: proc(cmd: ^Command) {
 		return
 	}
 
-	// TODO: Is this the best way to do it?
-	abs_path: string
-	if filepath.is_abs(path) {
-		abs_path = path
-	} else {
-		resolved, abs_err := filepath.abs(path)
-		if abs_err != nil {
-			fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
-			return
-		}
-		abs_path = resolved
+	abs_path, abs_err := filepath.abs(path, context.temp_allocator)
+	if abs_err != nil {
+		fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
+		return
 	}
 
 	db, db_ok := db_open(cmd.config_path)

cmd_restore.odin

@@ -16,18 +16,11 @@ cmd_restore :: proc(cmd: ^Command) {
 		fmt.wprintln(cmd.err, "Error: No path provided", flush = false)
 		return
 	}
+	abs_path, abs_err := filepath.abs(path, context.temp_allocator)
+	if abs_err != nil {
+		fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
 
-	// TODO: Is this the right way to handle this?
-	abs_path: string
-	if filepath.is_abs(path) {
-		abs_path = path
-	} else {
-		resolved, abs_err := filepath.abs(path)
-		if abs_err != nil {
-			fmt.wprintf(cmd.err, "Error getting absolute path: %v\n", abs_err, flush = false)
-			return
-		}
-		abs_path = resolved
+		return
 	}
 
 	db, db_ok := db_open(cmd.config_path)
@@ -41,15 +34,20 @@ cmd_restore :: proc(cmd: ^Command) {
 		return
 	}
 
-	dir := filepath.dir(file.Path)
-	os.mkdir_all(dir)
+	dir := filepath.dir(file.path)
+	if err := os.mkdir_all(dir); err != nil {
+		fmt.wprintf(cmd.err, "Failed to create directory: %v\n", err, flush = false)
 
-	write_err := os.write_entire_file(file.Path, file.contents)
-	if write_err != nil {
-		fmt.wprintf(cmd.err, "Error writing file: %v\n", write_err, flush = false)
 		return
 	}
 
-	fmt.wprintf(cmd.out, "Restored %s\n", file.Path, flush = false)
+	write_err := os.write_entire_file(file.path, file.contents)
+	if write_err != nil {
+		fmt.wprintf(cmd.err, "Error writing file: %v\n", write_err, flush = false)
+
+		return
+	}
+
+	fmt.wprintf(cmd.out, "Restored %s\n", file.path, flush = false)
 }
 

cmd_scan.odin

@@ -4,6 +4,7 @@ import "core:encoding/json"
 import "core:fmt"
 import "core:os"
 import "core:terminal"
+import "core:terminal/ansi"
 
 cmd_scan :: proc(cmd: ^Command) {
 	db, db_ok := db_open(cmd.config_path)
@@ -12,7 +13,7 @@ cmd_scan :: proc(cmd: ^Command) {
 	}
 	defer db_close(&db)
 
-	search_dirs := search_paths(db.cfg)
+	search_dirs := search_paths(db.cfg, context.temp_allocator)
 	if len(search_dirs) == 0 {
 		fmt.wprintln(
 			cmd.err,
@@ -23,9 +24,15 @@ cmd_scan :: proc(cmd: ^Command) {
 	}
 
 	// TODO: Figure out a sane default
-	all_files: [dynamic]string
+	// Can't use temp allocator becuase strings inside are copied to context.allocator
+	all_files := make([dynamic]string)
+	defer {
+		for &f in all_files {delete(f)}
+		delete(all_files)
+	}
 	for dir in search_dirs {
 		found, scan_ok := scan_path(dir, db.cfg)
+		defer delete(found)
 		if !scan_ok {
 			fmt.wprintf(cmd.err, "Error scanning %s\n", dir, flush = false)
 			continue
@@ -65,7 +72,11 @@ cmd_scan :: proc(cmd: ^Command) {
 	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.wprintln(
+			cmd.out,
+			ansi.CSI + ansi.FAINT + ansi.SGR + "Cancelled." + ANSI_RESET,
+			flush = false,
+		)
 		return
 	}
 
@@ -74,7 +85,9 @@ cmd_scan :: proc(cmd: ^Command) {
 		if !selected[i] {
 			continue
 		}
+		// TODO: Test cover this leak
 		env_file, ok := new_env_file(files[i])
+		defer delete_envfile(&env_file)
 		if !ok {
 			fmt.wprintf(cmd.err, "Error reading %s\n", files[i], flush = false)
 			continue
@@ -89,12 +102,23 @@ cmd_scan :: proc(cmd: ^Command) {
 	if added_count > 0 {
 		fmt.wprintf(
 			cmd.out,
-			"\x1b[1;32mSuccessfully added %d file(s) to backup.\x1b[0m\n",
+			ansi.CSI +
+			ansi.BOLD +
+			";" +
+			ansi.FG_GREEN +
+			ansi.SGR +
+			"Successfully added %d file(s) to backup." +
+			ANSI_RESET +
+			"\n",
 			added_count,
 			flush = false,
 		)
 	} else {
-		fmt.wprintln(cmd.out, "\x1b[2mNo files were added.\x1b[0m", flush = false)
+		fmt.wprintln(
+			cmd.out,
+			ansi.CSI + ansi.FAINT + ansi.SGR + "No files were added." + ANSI_RESET,
+			flush = false,
+		)
 	}
 }
 

cmd_sync.odin

@@ -2,17 +2,14 @@ package main
 
 import "core:encoding/json"
 import "core:fmt"
-import "core:os"
-import "core:strings"
-import "core:terminal"
+import "core:text/table"
 
 SyncEntry :: struct {
-	Path:   string `json:"path"`,
-	Status: string `json:"status"`,
+	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)
 	if !db_ok {
@@ -24,68 +21,50 @@ cmd_sync :: proc(cmd: ^Command) {
 	if !list_ok {
 		return
 	}
-	defer delete(files)
 
-	// TODO: Set sane default size
-	results: [dynamic]SyncEntry
-	defer delete(results)
+	results := make([]SyncEntry, len(files), context.temp_allocator)
 
-	for &file in files {
-		old_path: string
-		old_path, _ = strings.clone(file.Path, context.temp_allocator)
-
-		result, err_msg := db_sync(&db, &file)
+	for &file, i in files {
+		result, err := db_sync(&db, &file)
 
 		status: string
-		is_dir_updated := .DirUpdated in result
-
-		switch {
-		case .Error in result:
-			if len(err_msg) > 0 {
-				status = err_msg
-			} else {
-				status = "error"
-			}
-		case .BackedUp in result:
-			status = "Backed Up"
-		case .Restored in result:
-			status = "Restored"
-		case .DirUpdated in result:
+		if err != .None {
+			status = sync_error_message(err)
+		} else if .BackedUp in result {
+			status = .DirUpdated in result ? "Moved & Backed Up" : "Backed Up"
+		} else if .Restored in result {
+			status = .DirUpdated in result ? "Moved & Restored" : "Restored"
+		} else if .DirUpdated in result {
 			status = "Moved"
-		case:
+		} else {
 			status = "OK"
 		}
 
-		if is_dir_updated {
-			if !db_delete(&db, old_path) {
-				return
-			}
+		results[i] = SyncEntry {
+			path   = file.path,
+			status = status,
 		}
-		if db_update_required(result) {
-			if !db_insert(&db, file) {
-				return
-			}
-		}
-
-		path_str, _ := strings.clone(file.Path)
-		status_str, _ := strings.clone(status)
-		append(&results, SyncEntry{Path = path_str, Status = status_str})
 	}
 
-	if terminal.is_terminal(os.stdout) {
-		headers := []string{"File", "Status"}
-		table_rows := make([dynamic][]string, 0, len(results))
+	if get_format(cmd) == .Table {
+		t: table.Table
+		table.init(&t, context.temp_allocator, context.temp_allocator)
+		table.padding(&t, 1, 1)
+
+		table.aligned_header_of_values(
+			&t,
+			.Center,
+			COLOR_TABLE_HEADING + "File" + ANSI_RESET,
+			COLOR_TABLE_HEADING + "Status" + ANSI_RESET,
+		)
 
 		for res in results {
-			row_slice := make([]string, 2)
-			row_slice[0] = res.Path
-			row_slice[1] = res.Status
-			append(&table_rows, row_slice)
+			table.row(&t, res.path, res.status)
 		}
 
-		render_table(cmd.out, headers, table_rows[:])
+		table.write_decorated_table(cmd.out, &t, decorations, ansi_aware_width)
 	} else {
-		data, marshal_err := json.marshal(results[:])
+		data, marshal_err := json.marshal(results[:], allocator = context.temp_allocator)
 		if marshal_err != nil {
 			fmt.wprintf(cmd.err, "Error marshaling JSON: %v\n", marshal_err, flush = false)
 			return
@@ -94,3 +73,23 @@ cmd_sync :: proc(cmd: ^Command) {
 	}
 }
 
+sync_error_message :: proc(e: SyncError) -> string {
+	switch e {
+	case .None:
+		return ""
+	case .DirMissing:
+		return "directory missing"
+	case .MultipleDirs:
+		return "multiple directories found"
+	case .GitRootFailed:
+		return "failed to find git roots"
+	case .WriteFailed:
+		return "failed to write file"
+	case .ReadFailed:
+		return "failed to read file"
+	case .DbFailed:
+		return "failed to update database"
+	}
+	return "unknown error"
+}
+

colors.odin

@@ -0,0 +1,17 @@
+package main
+
+import "core:terminal/ansi"
+
+COLOR_HEADINGS ::
+	ansi.CSI + ansi.FG_BRIGHT_GREEN + ";" + ansi.BOLD + ";" + ansi.UNDERLINE + ansi.SGR
+
+COLOR_COMMANDS :: ansi.CSI + ansi.FG_BRIGHT_CYAN + ";" + ansi.BOLD + ansi.SGR
+
+COLOR_EXAMPLE :: ansi.CSI + ansi.ITALIC + ansi.SGR
+
+COLOR_FLAGS :: ansi.CSI + ansi.BOLD + ";" + ansi.FG_BRIGHT_WHITE + ansi.SGR
+
+COLOR_TABLE_HEADING :: ansi.CSI + ansi.FG_BRIGHT_GREEN + ansi.SGR
+
+ANSI_RESET :: ansi.CSI + ansi.RESET + ansi.SGR
+

config.odin

@@ -1,5 +1,6 @@
 package main
 
+import "base:runtime"
 import "core:encoding/json"
 import "core:fmt"
 import "core:os"
@@ -8,36 +9,35 @@ import "core:strings"
 
 import "findr"
 
-SshKeyPair :: struct {
-	Private: string `json:"private"`,
-	Public:  string `json:"public"`,
-}
-
-ScanConfig :: struct {
-	Matcher: string `json:"matcher"`,
-	Exclude: [dynamic]string `json:"exclude"`,
-	Include: [dynamic]string `json:"include"`,
-}
-
 Config :: struct {
-	Keys:        [dynamic]SshKeyPair `json:"keys"`,
-	ScanConfig:  ScanConfig `json:"scan"`,
+	keys:        [dynamic]SshKeyPair `json:"keys"`,
+	scan_config: ScanConfig `json:"scan"`,
 	config_path: string `json:"-"`,
 }
 
-load_config :: proc(config_path: string) -> (Config, bool) {
-	data, read_err := os.read_entire_file_from_path(config_path, context.allocator)
+SshKeyPair :: struct {
+	private: string `json:"private"`,
+	public:  string `json:"public"`,
+}
+
+ScanConfig :: struct {
+	matcher: string `json:"matcher"`,
+	exclude: [dynamic]string `json:"exclude"`,
+	include: [dynamic]string `json:"include"`,
+}
+
+load_config :: proc(config_path: string, allocator := context.allocator) -> (Config, bool) {
+	// TODO: Should we use context.allocator + defer delete()?
+	data, read_err := os.read_entire_file_from_path(config_path, context.temp_allocator)
 	if read_err != nil {
-		fmt.println("No config file found. Please run `envr init` to generate one.")
+		fmt.eprintln("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)
+	err := json.unmarshal(data, &cfg, .JSON5, allocator)
 	if err != nil {
-		fmt.printf("Error parsing config: %v\n", err)
+		fmt.eprintf("Error parsing config: %v\n", err)
 		return Config{}, false
 	}
 	cfg.config_path = config_path
@@ -53,24 +53,24 @@ default_config_path :: proc(home: string, allocator := context.allocator) -> str
 	return path
 }
 
-delete_config :: proc(cfg: ^Config) {
-	for key in cfg.Keys {
-		delete(key.Private)
-		delete(key.Public)
+delete_config :: proc(cfg: ^Config, allocator := context.allocator) {
+	for key in cfg.keys {
+		delete(key.private, allocator)
+		delete(key.public, allocator)
 	}
-	delete(cfg.Keys)
+	delete(cfg.keys)
 
-	delete(cfg.ScanConfig.Matcher)
+	delete(cfg.scan_config.matcher, allocator)
 
-	for exclude in cfg.ScanConfig.Exclude {
-		delete(exclude)
+	for exclude in cfg.scan_config.exclude {
+		delete(exclude, allocator)
 	}
-	delete(cfg.ScanConfig.Exclude)
+	delete(cfg.scan_config.exclude)
 
-	for include in cfg.ScanConfig.Include {
-		delete(include)
+	for include in cfg.scan_config.include {
+		delete(include, allocator)
 	}
-	delete(cfg.ScanConfig.Include)
+	delete(cfg.scan_config.include)
 }
 
 save_config :: proc(cfg: Config, force: bool = false) -> bool {
@@ -79,32 +79,35 @@ save_config :: proc(cfg: Config, force: bool = false) -> bool {
 	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.eprintf("Error creating %s directory: %v\n", config_dir, mkdir_err)
 			return false
 		}
 	}
 
 	if os.exists(cfg.config_path) && !force {
-		info, stat_err := os.stat(cfg.config_path, context.allocator)
+		info, stat_err := os.stat(cfg.config_path, context.temp_allocator)
 		if stat_err == nil {
-			defer os.file_info_delete(info, context.allocator)
+			defer os.file_info_delete(info, context.temp_allocator)
 			if info.size > 0 {
-				fmt.println("Config file already exists. Run again with --force to reinitialize.")
+				fmt.eprintln("Config file already exists. Run again with --force to reinitialize.")
 				return false
 			}
 		}
 	}
 
-	data, marshal_err := json.marshal(cfg, {pretty = true, use_spaces = true, spaces = 2})
+	data, marshal_err := json.marshal(
+		cfg,
+		{pretty = true, use_spaces = true, spaces = 2},
+		context.temp_allocator,
+	)
 	if marshal_err != nil {
-		fmt.printf("Error marshaling config: %v\n", marshal_err)
+		fmt.eprintf("Error marshaling config: %v\n", marshal_err)
 		return false
 	}
-	defer delete(data)
 
 	write_err := os.write_entire_file(cfg.config_path, data)
 	if write_err != nil {
-		fmt.printf("Error writing config: %v\n", write_err)
+		fmt.eprintf("Error writing config: %v\n", write_err)
 		return false
 	}
 
@@ -120,10 +123,12 @@ new_config :: proc(
 	for priv in private_key_paths {
 		// TODO: Is this bad?
 		priv_key := strings.clone(priv)
-		pub, _ := strings.concatenate([]string{priv_key, ".pub"})
-		append(&keys, SshKeyPair{Private = priv_key, Public = pub})
+		pub := strings.concatenate([]string{priv_key, ".pub"})
+		append(&keys, SshKeyPair{private = priv_key, public = pub})
 	}
 
+	// If we don't clone the strings, the cleanup semantics differ for Db created
+	// configs vs user created configs.
 	exclude := make([dynamic]string, 0, 4)
 	append(&exclude, strings.clone("*\\.envrc"))
 	append(&exclude, strings.clone("\\.local/"))
@@ -134,30 +139,30 @@ new_config :: proc(
 	append(&include, strings.clone("~"))
 
 	scan_cfg := ScanConfig {
-		Matcher = strings.clone("\\.env"),
-		Exclude = exclude,
-		Include = include,
+		matcher = strings.clone("\\.env"),
+		exclude = exclude,
+		include = include,
 	}
 
-	return Config{Keys = keys, ScanConfig = scan_cfg, config_path = cfg_path}
+	return Config{keys = keys, scan_config = scan_cfg, config_path = cfg_path}
 }
 
 find_ssh_private_keys :: proc() -> (keys: [dynamic]string, ok: bool) {
 	home, home_err := os.user_home_dir(context.allocator)
 	if home_err != nil {
-		fmt.printf("Error getting home dir: %v\n", home_err)
+		fmt.eprintf("Error getting home dir: %v\n", home_err)
 		return
 	}
 
 	ssh_dir, join_err := filepath.join([]string{home, ".ssh"})
 	if join_err != nil {
-		fmt.printf("Error building ssh path: %v\n", join_err)
+		fmt.eprintf("Error building ssh path: %v\n", join_err)
 		return
 	}
 
 	entries, dir_err := os.read_all_directory_by_path(ssh_dir, context.allocator)
 	if dir_err != nil {
-		fmt.printf("Could not read ~/.ssh directory: %v\n", dir_err)
+		fmt.eprintf("Could not read ~/.ssh directory: %v\n", dir_err)
 		return
 	}
 	defer os.file_info_slice_delete(entries, context.allocator)
@@ -188,32 +193,41 @@ find_ssh_private_keys :: proc() -> (keys: [dynamic]string, ok: bool) {
 	return
 }
 
-find_git_roots :: proc(cfg: Config) -> (roots: [dynamic]string, ok: bool) {
-	paths := search_paths(cfg)
+find_git_roots :: proc(
+	cfg: Config,
+	allocator := context.temp_allocator,
+) -> (
+	roots: [dynamic]string,
+	ok: bool,
+) {
+	paths := search_paths(cfg, allocator)
+	// TODO: Pass allocator to findr
 	findr.find_repos(paths[:], &roots, os.get_processor_core_count())
 	ok = true
 	return
 }
 
-search_paths :: proc(cfg: Config) -> (paths: [dynamic]string) {
-	// TODO: Is this okay?
-	// TODO: handle error
-	home, _ := os.user_home_dir(context.temp_allocator)
+search_paths :: proc(cfg: Config, allocator := context.allocator) -> [dynamic]string {
+	home, err := os.user_home_dir(context.temp_allocator)
+	if err != nil {
+		panic("Failed to find home directory")
+	}
 
-	for include in cfg.ScanConfig.Include {
-		// TODO: Do we need to manually expand ~/ in odin?
-		expanded, _ := strings.replace(include, "~", home, 1)
+	paths := new_clone(cfg.scan_config.include, allocator)
+
+	for &include in paths {
+		expanded, _ := strings.replace(include, "~", home, 1, allocator)
 		if filepath.is_abs(expanded) {
-			append(&paths, expanded)
+			include = expanded
 		} else {
-			defer delete(expanded)
-			resolved, err := filepath.abs(expanded)
+			// TODO: show errors?
+			resolved, err := filepath.abs(expanded, allocator)
 			if err == nil {
-				append(&paths, resolved)
+				include = resolved
 			}
 		}
 	}
-	return
+	return paths^
 }
 
 envr_dir :: proc(config_path: string) -> string {
@@ -221,8 +235,13 @@ envr_dir :: proc(config_path: string) -> string {
 }
 
 // User is responsible for freeing the path
-data_path :: proc(config_path: string, allocator := context.allocator) -> string {
-	path, _ := filepath.join([]string{envr_dir(config_path), "data.envr"}, allocator)
-	return path
+data_path :: proc(
+	config_path: string,
+	allocator := context.allocator,
+) -> (
+	string,
+	runtime.Allocator_Error,
+) #optional_allocator_error {
+	return filepath.join([]string{envr_dir(config_path), "data.envr"}, allocator)
 }
 

config_test.odin

@@ -1,3 +1,4 @@
+#+test
 package main
 
 import "core:fmt"
@@ -15,13 +16,9 @@ test_new_config_single_key :: proc(t: ^testing.T) {
 	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",
-	)
+	testing.expect_value(t, len(cfg.keys), 1)
+	testing.expect_value(t, cfg.keys[0].private, "/home/user/.ssh/id_ed25519")
+	testing.expect_value(t, cfg.keys[0].public, "/home/user/.ssh/id_ed25519.pub")
 }
 
 @(test)
@@ -30,9 +27,9 @@ test_new_config_multiple_keys :: proc(t: ^testing.T) {
 	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")
+	testing.expect_value(t, len(cfg.keys), 2)
+	testing.expect_value(t, cfg.keys[0].private, "/home/user/.ssh/id_ed25519")
+	testing.expect_value(t, cfg.keys[1].private, "/home/user/.ssh/id_rsa")
 }
 
 @(test)
@@ -41,7 +38,7 @@ test_new_config_empty_keys :: proc(t: ^testing.T) {
 	cfg := new_config(paths)
 	defer delete_config(&cfg)
 
-	testing.expect(t, len(cfg.Keys) == 0, "should have 0 keys")
+	testing.expect_value(t, len(cfg.keys), 0)
 }
 
 @(test)
@@ -50,10 +47,10 @@ test_new_config_scan_defaults :: proc(t: ^testing.T) {
 	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 ~")
+	testing.expect_value(t, cfg.scan_config.matcher, "\\.env")
+	testing.expect_value(t, len(cfg.scan_config.exclude), 4)
+	testing.expect_value(t, len(cfg.scan_config.include), 1)
+	testing.expect_value(t, cfg.scan_config.include[0], "~")
 }
 
 @(test)
@@ -64,18 +61,17 @@ test_new_config_exclude_patterns :: proc(t: ^testing.T) {
 
 	expected := []string{"*\\.envrc", "\\.local/", "node_modules", "vendor"}
 	for i in 0 ..< len(expected) {
-		testing.expect(t, cfg.ScanConfig.Exclude[i] == expected[i])
+		testing.expect_value(t, cfg.scan_config.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)
+	base := test_temp_dir(t, "envr-test-cfg-rt-*")
 	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")
+	testing.expect_value(t, err, nil)
 
 	cfg := new_config([]string{"/home/user/.ssh/id_ed25519"}, cfgPath)
 	defer delete_config(&cfg)
@@ -87,13 +83,13 @@ test_save_load_config_roundtrip :: proc(t: ^testing.T) {
 	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] == "~")
+	testing.expect_value(t, len(loaded.keys), 1)
+	testing.expect_value(t, loaded.keys[0].private, "/home/user/.ssh/id_ed25519")
+	testing.expect_value(t, loaded.keys[0].public, "/home/user/.ssh/id_ed25519.pub")
+	testing.expect_value(t, loaded.scan_config.matcher, "\\.env")
+	testing.expect_value(t, len(loaded.scan_config.exclude), 4)
+	testing.expect_value(t, len(loaded.scan_config.include), 1)
+	testing.expect_value(t, loaded.scan_config.include[0], "~")
 }
 
 @(test)
@@ -104,12 +100,11 @@ test_load_config_missing :: proc(t: ^testing.T) {
 
 @(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)
+	base := test_temp_dir(t, "envr-test-cfg-noclobber-*")
 	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")
+	testing.expect_value(t, err, nil)
 
 	cfg := new_config([]string{"/home/user/.ssh/key1"}, cfgPath)
 	defer delete_config(&cfg)
@@ -122,12 +117,11 @@ test_save_config_no_clobber :: proc(t: ^testing.T) {
 
 @(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)
+	base := test_temp_dir(t, "envr-test-cfg-force-*")
 	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")
+	testing.expect_value(t, err, nil)
 
 	cfg := new_config([]string{"/home/user/.ssh/key1"}, cfgPath)
 	defer delete_config(&cfg)
@@ -142,12 +136,8 @@ test_save_config_force_overwrites :: proc(t: ^testing.T) {
 	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",
-	)
+	testing.expect_value(t, len(loaded.keys), 1)
+	testing.expect_value(t, loaded.keys[0].private, "/home/user/.ssh/key2")
 }
 
 @(test)
@@ -185,18 +175,14 @@ test_search_paths_expands_tilde :: proc(t: ^testing.T) {
 	os.set_env("HOME", "/tmp/envr-fake-home-search")
 
 	cfg := Config {
-		ScanConfig = ScanConfig{Include = make([dynamic]string, 0, 1)},
+		scan_config = ScanConfig{include = make([dynamic]string, 0, 1)},
 	}
-	defer delete(cfg.ScanConfig.Include)
-	append(&cfg.ScanConfig.Include, "~")
+	append(&cfg.scan_config.include, "~")
+	defer delete(cfg.scan_config.include)
 
-	paths := search_paths(cfg)
-	defer delete(paths)
-	for path in paths {
-		defer delete(path)
-	}
+	paths := search_paths(cfg, context.temp_allocator)
 
-	testing.expect(t, len(paths) == 1, "should have 1 path")
+	testing.expect_value(t, len(paths), 1)
 	if len(paths) > 0 {
 		testing.expectf(
 			t,

crypto.odin

@@ -33,12 +33,12 @@ init_sodium :: proc "contextless" () {
 	}
 }
 
+// TODO: Optimize performance
 encrypt :: proc(plaintext: []u8, keys: []SshKeyPair) -> (ciphertext: []u8, ok: bool) {
-	x25519_pairs, pairs_ok := ssh_to_x25519(keys)
+	x25519_pairs, pairs_ok := ssh_to_x25519(keys, context.temp_allocator)
 	if !pairs_ok {
 		return
 	}
-	defer delete(x25519_pairs)
 
 	sym_key: [CRYPTO_SECRETBOX_KEY_BYTES]u8
 	randombytes_buf(&sym_key[0], CRYPTO_SECRETBOX_KEY_BYTES)
@@ -47,7 +47,7 @@ encrypt :: proc(plaintext: []u8, keys: []SshKeyPair) -> (ciphertext: []u8, ok: b
 	randombytes_buf(&main_nonce[0], CRYPTO_SECRETBOX_NONCE_BYTES)
 
 	ct_len := len(plaintext) + CRYPTO_SECRETBOX_MAC_BYTES
-	secret_ct := make([]u8, ct_len)
+	secret_ct := make([]u8, ct_len, context.temp_allocator)
 	pt_ptr: [^]u8
 	if len(plaintext) > 0 {
 		pt_ptr = &plaintext[0]
@@ -60,13 +60,13 @@ encrypt :: proc(plaintext: []u8, keys: []SshKeyPair) -> (ciphertext: []u8, ok: b
 		&sym_key[0],
 	)
 	if rc != 0 {
-		fmt.println("Error: symmetric encryption failed")
+		fmt.eprintln("Error: symmetric encryption failed")
 		delete(secret_ct)
 		return
 	}
 
 	num_recipients := u32(len(x25519_pairs))
-	entries := make([]RecipientEntry, num_recipients)
+	entries := make([]RecipientEntry, num_recipients, context.temp_allocator)
 
 	for i in 0 ..< len(x25519_pairs) {
 		for j in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
@@ -84,7 +84,7 @@ encrypt :: proc(plaintext: []u8, keys: []SshKeyPair) -> (ciphertext: []u8, ok: b
 			&x25519_pairs[0].Private[0],
 		)
 		if rc != 0 {
-			fmt.printf("Error: failed to encrypt for recipient %d\n", i)
+			fmt.eprintf("Error: failed to encrypt for recipient %d\n", i)
 			delete(entries)
 			delete(secret_ct)
 			return
@@ -126,21 +126,19 @@ encrypt :: proc(plaintext: []u8, keys: []SshKeyPair) -> (ciphertext: []u8, ok: b
 
 	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 len(ciphertext) < HEADER_SIZE {
-		fmt.println("Error: ciphertext too short (header)")
+		fmt.eprintln("Error: ciphertext too short (header)")
 		return
 	}
 
 	for i in 0 ..< 4 {
 		if ciphertext[i] != MAGIC_BYTES[i] {
-			fmt.println("Error: invalid magic bytes")
+			fmt.eprintln("Error: invalid magic bytes")
 			return
 		}
 	}
@@ -168,7 +166,7 @@ decrypt :: proc(ciphertext: []u8, keys: []SshKeyPair) -> (plaintext: []u8, ok: b
 
 	recipients_end := offset + int(num_recipients) * RECIPIENT_ENTRY_SIZE
 	if recipients_end > len(ciphertext) {
-		fmt.println("Error: ciphertext too short (recipient data)")
+		fmt.eprintln("Error: ciphertext too short (recipient data)")
 		return
 	}
 
@@ -176,11 +174,10 @@ decrypt :: proc(ciphertext: []u8, keys: []SshKeyPair) -> (plaintext: []u8, ok: b
 	enc_nonce: [CRYPTO_BOX_NONCE_BYTES]u8
 	enc_pub: [CRYPTO_BOX_PUBLICKEY_BYTES]u8
 
-	x25519_pairs, pairs_ok := ssh_to_x25519(keys)
+	x25519_pairs, pairs_ok := ssh_to_x25519(keys, context.temp_allocator)
 	if !pairs_ok {
 		return
 	}
-	defer delete(x25519_pairs)
 
 	found := false
 	matched_pi := 0
@@ -225,7 +222,7 @@ decrypt :: proc(ciphertext: []u8, keys: []SshKeyPair) -> (plaintext: []u8, ok: b
 	}
 
 	if !found {
-		fmt.println("Error: no matching recipient found")
+		fmt.eprintln("Error: no matching recipient found")
 		return
 	}
 
@@ -239,14 +236,14 @@ decrypt :: proc(ciphertext: []u8, keys: []SshKeyPair) -> (plaintext: []u8, ok: b
 		&x25519_pairs[matched_pi].Private[0],
 	)
 	if rc != 0 {
-		fmt.println("Error: failed to decrypt symmetric key")
+		fmt.eprintln("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)")
+		fmt.eprintln("Error: ciphertext too short (no encrypted data)")
 		return
 	}
 
@@ -263,7 +260,7 @@ decrypt :: proc(ciphertext: []u8, keys: []SshKeyPair) -> (plaintext: []u8, ok: b
 		&sym_key[0],
 	)
 	if rc != 0 {
-		fmt.println("Error: symmetric decryption failed")
+		fmt.eprintln("Error: symmetric decryption failed")
 		delete(plaintext)
 		return
 	}
@@ -272,33 +269,39 @@ decrypt :: proc(ciphertext: []u8, keys: []SshKeyPair) -> (plaintext: []u8, ok: b
 	return
 }
 
-ssh_to_x25519 :: proc(keys: []SshKeyPair) -> (pairs: []X25519Keypair, ok: bool) {
+ssh_to_x25519 :: proc(
+	keys: []SshKeyPair,
+	allocator := context.temp_allocator,
+) -> (
+	[]X25519Keypair,
+	bool,
+) {
 	if len(keys) == 0 {
-		return
+		return {}, false
 	}
 
-	pairs = make([]X25519Keypair, len(keys))
+	pairs := make([]X25519Keypair, len(keys), allocator)
 
 	for i in 0 ..< len(keys) {
-		ssh_kp, parse_ok := parse_ssh_private_key(keys[i].Private)
+		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)
+			fmt.eprintf("Error: failed to parse SSH private key: %s\n", keys[i].private)
 			delete(pairs)
-			return
+			return pairs, false
 		}
 
-		ssh_pub, pub_ok := parse_ssh_public_key(keys[i].Public)
+		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)
+			fmt.eprintf("Error: failed to parse SSH public key: %s\n", keys[i].public)
 			delete(pairs)
-			return
+			return pairs, false
 		}
 
 		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")
+			fmt.eprintln("Error: failed to convert ed25519 public key to curve25519")
 			delete(pairs)
-			return
+			return pairs, false
 		}
 
 		ed25519_sk: [64]u8
@@ -311,13 +314,12 @@ ssh_to_x25519 :: proc(keys: []SshKeyPair) -> (pairs: []X25519Keypair, ok: bool)
 
 		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")
+			fmt.eprintln("Error: failed to convert ed25519 private key to curve25519")
 			delete(pairs)
-			return
+			return pairs, false
 		}
 	}
 
-	ok = true
-	return
+	return pairs, true
 }
 

crypto_test.odin

@@ -1,14 +1,16 @@
+#+test
 package main
 
 import "core:fmt"
+import "core:os"
 import "core:testing"
 
-CRYPTO_TEST_KEY_DIR :: "fixtures/keys"
+CRYPTO_TEST_KEY_DIR :: "fixtures" + os.Path_Separator_String + "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}
+	return SshKeyPair{private = priv, public = pub}
 }
 
 @(test)
@@ -25,13 +27,10 @@ test_encrypt_decrypt_roundtrip :: proc(t: ^testing.T) {
 	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)),
-	)
+	testing.expect_value(t, len(decrypted), len(original))
+	// TODO: Should this be a loop?
 	for i in 0 ..< len(original) {
-		testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at index %d", i))
+		testing.expect_value(t, decrypted[i], original[i])
 	}
 }
 
@@ -54,16 +53,8 @@ test_encrypt_decrypt_multi_recipient :: proc(t: ^testing.T) {
 	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),
-		)
+		testing.expect_value(t, decrypted1[i], original[i])
+		testing.expect_value(t, decrypted2[i], original[i])
 	}
 }
 
@@ -94,7 +85,7 @@ test_encrypt_empty_plaintext :: proc(t: ^testing.T) {
 	testing.expect(t, dec_ok, "decryption should succeed")
 	defer delete(decrypted)
 
-	testing.expect(t, len(decrypted) == 0, "decrypted empty data should be empty")
+	testing.expect_value(t, len(decrypted), 0)
 }
 
 @(test)
@@ -111,8 +102,9 @@ test_recipient_can_decrypt_senders_data :: proc(t: ^testing.T) {
 	testing.expect(t, dec_ok, "second recipient should decrypt without the sender key present")
 	defer delete(decrypted)
 
+	// TODO: Should this be a loop?
 	for i in 0 ..< len(original) {
-		testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at %d", i))
+		testing.expect_value(t, decrypted[i], original[i])
 	}
 }
 
@@ -126,9 +118,9 @@ test_ciphertext_has_magic :: proc(t: ^testing.T) {
 	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")
+	testing.expect_value(t, encrypted[0], u8('E'))
+	testing.expect_value(t, encrypted[1], u8('N'))
+	testing.expect_value(t, encrypted[2], u8('V'))
+	testing.expect_value(t, encrypted[3], u8('R'))
 }
 

db.odin

@@ -1,10 +1,12 @@
 package main
 
+import "base:runtime"
 import "core:crypto/hash"
 import "core:encoding/hex"
 import "core:encoding/ini"
 import "core:encoding/json"
 import "core:fmt"
+import "core:mem"
 import "core:os"
 import "core:path/filepath"
 import "core:strings"
@@ -12,92 +14,119 @@ import "core:strings"
 import "sqlite"
 
 SyncFlagEnum :: enum {
-	Noop,
 	DirUpdated,
 	Restored,
 	BackedUp,
-	Error,
 }
 
 SyncFlag :: bit_set[SyncFlagEnum]
 
-SyncDirection :: enum {
-	TrustDatabase,
-	TrustFilesystem,
+SyncError :: enum {
+	None,
+	DirMissing,
+	MultipleDirs,
+	GitRootFailed,
+	WriteFailed,
+	ReadFailed,
+	DbFailed,
 }
 
 Db :: struct {
-	// Pointer to the sqlite db
-	db:      ^rawptr,
+	conn:    sqlite.Db,
 	cfg:     Config,
 	changed: bool,
+	arena:   mem.Dynamic_Arena,
 }
 
 EnvFile :: struct {
-	Path:     string,
-	Dir:      string,
-	Remotes:  [dynamic]string,
-	Sha256:   string,
+	path:     string,
+	dir:      string,
+	remotes:  [dynamic]string,
+	sha256:   string,
 	contents: string,
 }
 
+@(deprecated = "call db_close to clean up EnvFiles")
 delete_envfile :: proc(f: ^EnvFile) {
-	delete(f.Path)
-	for &remote in f.Remotes {
+	delete(f.path)
+	for &remote in f.remotes {
 		delete(remote)
 	}
-	delete(f.Remotes)
-	delete(f.Sha256)
+	delete(f.remotes)
+	delete(f.sha256)
 	delete(f.contents)
 }
 
-db_open :: proc(cfg_path: string) -> (database: Db, ok: bool) {
-	database.cfg = load_config(cfg_path) or_return
+db_open :: proc(cfg_path: string) -> (db: Db, ok: bool) {
+	db = db_init() or_return
+	db.cfg = load_config(cfg_path, db_allocator(&db)) or_return
 
-	{
-		db: ^rawptr
-		rc := sqlite.db_open(":memory:", &db)
-		if rc != sqlite.OK {
-			fmt.printf("Error opening in-memory database: %s\n", sqlite.db_errmsg(db))
-			return
-		}
+	if len(db.cfg.keys) == 0 {
+		fmt.eprintf("Error: no SSH keys configured in %s\n", cfg_path)
+		db_close(&db)
+		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 {
-			fmt.printf("Error creating table: %s\n", sqlite.db_errmsg(db))
-			sqlite.db_close(db)
-			return
-		}
-		database.db = db
+	_, keys_ok := ssh_to_x25519(db.cfg.keys[:], context.temp_allocator)
+	if !keys_ok {
+		db_close(&db)
+		return db, false
 	}
 
 	// TODO: Use different allocators?
-	data_path := data_path(database.cfg.config_path, context.temp_allocator)
+	data_path := data_path(db.cfg.config_path, context.temp_allocator)
 	if os.exists(data_path) {
-		if ok = db_restore_from_encrypted(&database, data_path); !ok {
-			sqlite.db_close(database.db)
-			return
+		if ok = db_restore_from_encrypted(&db, data_path); !ok {
+			sqlite.close(db.conn)
+			return db, false
 		}
 	} else {
 		// DB was created
-		database.changed = true
+		db.changed = true
 	}
 
-	return database, true
+	return db, true
+}
+
+// Creates a database an allocator and fresh, empty table, with zero encryption.
+// In production, you most likely want to use `db_open`.
+db_init :: proc() -> (db: Db, ok: bool) {
+	conn: sqlite.Db
+	rc := sqlite.open(":memory:", &conn)
+	if rc != sqlite.OK {
+		fmt.eprintf("Error opening in-memory database: %s\n", sqlite.errmsg(conn))
+		return
+	}
+
+	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.exec(conn, create_sql, nil, nil, nil)
+	if rc != sqlite.OK {
+		fmt.eprintf("Error creating table: %s\n", sqlite.errmsg(conn))
+		sqlite.close(conn)
+		return
+	}
+	db.conn = conn
+
+	mem.dynamic_arena_init(&db.arena)
+
+	return db, true
+}
+
+db_allocator :: proc(db: ^Db) -> mem.Allocator {
+	return mem.dynamic_arena_allocator(&db.arena)
 }
 
 db_restore_from_encrypted :: proc(db: ^Db, data_path: string) -> bool {
-	encrypted_data, read_err := os.read_entire_file_from_path(data_path, context.allocator)
-	defer delete(encrypted_data)
+	encrypted_data, read_err := os.read_entire_file_from_path(data_path, context.temp_allocator)
 	if read_err != nil {
-		fmt.printf("Error reading encrypted database: %v\n", read_err)
+		fmt.eprintf("Error reading encrypted database: %v\n", read_err)
 		return false
 	}
 
-	plaintext, dec_ok := decrypt(encrypted_data, db.cfg.Keys[:])
+	// TODO: Use context.temp_allocator
+	plaintext, dec_ok := decrypt(encrypted_data, db.cfg.keys[:])
 	if !dec_ok {
-		fmt.println("Error: decryption failed")
+		fmt.eprintln("Error: decryption failed")
 		return false
 	}
 	defer delete(plaintext)
@@ -105,158 +134,181 @@ db_restore_from_encrypted :: proc(db: ^Db, data_path: string) -> bool {
 	n := i64(len(plaintext))
 	buf := sqlite.malloc64(n)
 	if buf == nil {
-		fmt.println("Error: failed to allocate buffer for deserialization")
+		fmt.eprintln("Error: failed to allocate buffer for deserialization")
 		return false
 	}
 	copy(buf[:len(plaintext)], plaintext)
 
-	rc := sqlite.deserialize(
-		db.db,
-		"main",
-		buf,
-		n,
-		n,
-		sqlite.DESERIALIZE_FREEONCLOSE | sqlite.DESERIALIZE_RESIZEABLE,
-	)
+	flags: sqlite.DESERIALIZE_FLAGS = {.FREEONCLOSE, .RESIZEABLE}
+
+	rc := sqlite.deserialize(db.conn, "main", buf, n, n, flags)
 	if rc != sqlite.OK {
 		sqlite.free(buf)
-		fmt.printf("Error deserializing database: %s\n", sqlite.db_errmsg(db.db))
+		fmt.eprintf("Error deserializing database: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 
 	return true
 }
 
-db_close :: proc(d: ^Db) {
-	defer sqlite.db_close(d.db)
-	defer delete_config(&d.cfg)
+// db_close will fail silently if cfg.keys is empty. If you want to save the
+// Db, be sure to use db_open rather than db_init
+db_close :: proc(db: ^Db) {
+	allocator := db_allocator(db)
 
-	if d.changed {
-		rc := sqlite.db_exec(d.db, "VACUUM", nil, nil, nil)
+	defer {
+		sqlite.close(db.conn)
+
+		delete_config(&db.cfg, allocator)
+
+		mem.dynamic_arena_destroy(&db.arena)
+	}
+
+	if db.changed && len(db.cfg.keys) > 0 {
+		rc := sqlite.exec(db.conn, "VACUUM", nil, nil, nil)
 		if rc != sqlite.OK {
-			fmt.printf("Error vacuuming database: %s\n", sqlite.db_errmsg(d.db))
+			fmt.eprintf("Error vacuuming database: %s\n", sqlite.errmsg(db.conn))
 			return
 		}
 
 		sz: i64
-		data := sqlite.serialize(d.db, "main", &sz, 0)
+		data := sqlite.serialize(db.conn, "main", &sz, {})
 		if data == nil {
-			fmt.println("Error: failed to serialize database")
+			fmt.eprintln("Error: failed to serialize database")
 			return
 		}
 		defer sqlite.free(data)
 
 		sqlite_data := data[:sz]
-		encrypted, enc_ok := encrypt(sqlite_data, d.cfg.Keys[:])
+		// TODO: PAss allocator chain
+		encrypted, enc_ok := encrypt(sqlite_data, db.cfg.keys[:])
 		if !enc_ok {
-			fmt.println("Error: encryption failed")
+			fmt.eprintln("Database encryption failed")
+
 			return
 		}
 
-		data_path := data_path(d.cfg.config_path)
-		envr_d := envr_dir(d.cfg.config_path)
+		data_path := data_path(db.cfg.config_path, allocator)
+		envr_d := envr_dir(db.cfg.config_path)
 		os.mkdir_all(envr_d)
 
 		write_err := os.write_entire_file(data_path, encrypted)
 		delete(encrypted)
 		if write_err != nil {
-			fmt.printf("Error writing encrypted database: %v\n", write_err)
+			fmt.eprintf("Error writing encrypted database: %v\n", write_err)
 			return
 		}
 
-		d.changed = false
+		db.changed = false
 	}
 }
 
-db_list :: proc(d: ^Db, allocator := context.allocator) -> (results: [dynamic]EnvFile, ok: bool) {
-	stmt: ^rawptr
+// Results will be freed when `db_close` is called.
+db_list :: proc(db: ^Db) -> ([]EnvFile, bool) {
+	stmt: sqlite.Stmt
 	rc := sqlite.prepare_v2(
-		d.db,
+		db.conn,
 		"SELECT path, remotes, sha256, contents FROM envr_env_files",
 		-1,
 		&stmt,
 		nil,
 	)
 	if rc != sqlite.OK {
-		fmt.printf("Error preparing query: %s\n", sqlite.db_errmsg(d.db))
-		return
+		fmt.eprintf("Error preparing query: %s\n", sqlite.errmsg(db.conn))
+		return []EnvFile{}, false
 	}
 	defer sqlite.finalize(stmt)
 
+	allocator := db_allocator(db)
+	results := make([dynamic]EnvFile, 0, 10, allocator)
+
+	migrate := false
 	for {
 		rc = sqlite.step(stmt)
 		if rc == sqlite.DONE {
 			break
 		}
 		if rc != sqlite.ROW {
-			fmt.printf("Error stepping query: %s\n", sqlite.db_errmsg(d.db))
-			return
+			fmt.eprintf("Error stepping query: %s\n", sqlite.errmsg(db.conn))
+			#no_bounds_check return results[:], false
 		}
 
-		remotes_json := string(sqlite.column_text(stmt, 1))
+		// TODO: Remove json support after next major release
 		remotes: [dynamic]string = ---
-		if len(remotes_json) > 0 {
-			json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
+		remotes_raw := string(sqlite.column_text(stmt, 1))
+		if len(remotes_raw) > 0 {
+			if remotes_raw[0] == '[' {
+				err := json.unmarshal_string(remotes_raw, &remotes, allocator = allocator)
+				if err != nil {
+					fmt.eprintf("Warning: malformed remotes JSON: %v\n", err)
+				}
+				migrate = true
+			} else {
+				split := strings.split_lines(remotes_raw, context.temp_allocator)
+				remotes = make([dynamic]string, 0, len(split), allocator = allocator)
+				for s in split {
+					append(&remotes, strings.clone(s, allocator))
+				}
+			}
 		}
 		path := clone_cstring(sqlite.column_text(stmt, 0), allocator)
 
 		append(
 			&results,
 			EnvFile {
-				Path = path,
-				Dir = filepath.dir(path),
-				Remotes = remotes,
-				Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
+				path = path,
+				dir = filepath.dir(path),
+				remotes = remotes,
+				sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
 				contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
 			},
 		)
 	}
 
-	ok = true
-	return
+	if migrate {
+		migrate_remotes(db)
+	}
+
+	#no_bounds_check return results[:], true
 }
 
-db_insert :: proc(d: ^Db, file: EnvFile) -> bool {
-	remotes_json, marshal_err := json.marshal(file.Remotes)
-	if marshal_err != nil {
-		fmt.printf("Error marshaling remotes: %v\n", marshal_err)
-		return false
-	}
-	defer delete(remotes_json)
+// TODO: Should we use context.temp_allocator for proc scoped lifetimes?
+db_insert :: proc(db: ^Db, file: EnvFile) -> bool {
+	remotes := strings.join(file.remotes[:], "\n", allocator = context.temp_allocator)
 
 	sql: cstring =
 		"INSERT OR REPLACE INTO " +
 		"envr_env_files (path, remotes, sha256, contents) VALUES (?, ?, ?, ?)"
-	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
+	stmt: sqlite.Stmt
+	rc := sqlite.prepare_v2(db.conn, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error preparing insert: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error preparing insert: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 	defer sqlite.finalize(stmt)
 
 	// TODO: deal with elsewhere?
-	cpath := to_cstring(file.Path)
+	cpath := to_cstring(file.path)
 	defer delete(cpath)
 	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error binding path: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 
-	cremotes := to_cstring(string(remotes_json))
+	cremotes := to_cstring(remotes)
 	defer delete(cremotes)
 	rc = sqlite.bind_text(stmt, 2, cremotes, -1, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error binding remotes: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error binding remotes: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 
-	csha := to_cstring(file.Sha256)
+	csha := to_cstring(file.sha256)
 	defer delete(csha)
 	rc = sqlite.bind_text(stmt, 3, csha, -1, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error binding sha256: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error binding sha256: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 
@@ -264,71 +316,97 @@ db_insert :: proc(d: ^Db, file: EnvFile) -> bool {
 	defer delete(ccontents)
 	rc = sqlite.bind_text(stmt, 4, ccontents, -1, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error binding contents: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error binding contents: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 
 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
-		fmt.printf("Error inserting: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error inserting: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 
-	d.changed = true
+	db.changed = true
 	return true
 }
 
-db_fetch :: proc(d: ^Db, path: string, allocator := context.allocator) -> (EnvFile, bool) {
+// Result will be freed when `db_close` is called.
+//
+// Expects an absolute path
+db_fetch :: proc(db: ^Db, path: string) -> (EnvFile, bool) {
+	assert(os.is_absolute_path(path))
+
 	sql: cstring = "SELECT path, remotes, sha256, contents FROM envr_env_files WHERE path = ?"
-	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
+	stmt: sqlite.Stmt
+	rc := sqlite.prepare_v2(db.conn, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error preparing fetch: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error preparing fetch: %s\n", sqlite.errmsg(db.conn))
 		return EnvFile{}, false
 	}
 	defer sqlite.finalize(stmt)
 
+	allocator := db_allocator(db)
+
 	cpath := to_cstring(path, allocator)
 	defer delete(cpath, allocator)
 	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error binding path: %s\n", sqlite.errmsg(db.conn))
 		return EnvFile{}, false
 	}
 	rc = sqlite.step(stmt)
 	if rc == sqlite.DONE {
-		fmt.printf("No file found with path: %s\n", path)
+		fmt.eprintf("No file found with path: %s\n", path)
 		return EnvFile{}, false
 	}
 	if rc != sqlite.ROW {
-		fmt.printf("Error fetching: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error fetching: %s\n", sqlite.errmsg(db.conn))
 		return EnvFile{}, false
 	}
 
-	remotes_json := string(sqlite.column_text(stmt, 1))
+	// TODO: Remove json support after next major release
+	migrate := false
 	remotes: [dynamic]string = ---
-	if len(remotes_json) > 0 {
-		json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
+	remotes_raw := string(sqlite.column_text(stmt, 1))
+	if len(remotes_raw) > 0 {
+		if remotes_raw[0] == '[' {
+			err := json.unmarshal_string(remotes_raw, &remotes, allocator = allocator)
+			if err != nil {
+				fmt.eprintf("Warning: malformed remotes JSON: %v\n", err)
+			}
+
+			migrate = true
+		} else {
+			split := strings.split_lines(remotes_raw, context.temp_allocator)
+			remotes = make([dynamic]string, 0, len(split), allocator = allocator)
+			for s in split {
+				append(&remotes, strings.clone(s, allocator))
+			}
+		}
 	}
 
-	file_path := clone_cstring(sqlite.column_text(stmt, 0))
+	file_path := clone_cstring(sqlite.column_text(stmt, 0), allocator)
+
+	if migrate {
+		migrate_remotes(db)
+	}
 
 	return EnvFile {
-			Path = file_path,
-			Dir = filepath.dir(file_path),
-			Remotes = remotes,
-			Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
+			path = file_path,
+			dir = filepath.dir(file_path),
+			remotes = remotes,
+			sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
 			contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
 		},
 		true
 }
 
-db_delete :: proc(d: ^Db, path: string) -> bool {
+db_delete :: proc(db: ^Db, path: string) -> bool {
 	sql: cstring = "DELETE FROM envr_env_files WHERE path = ?"
-	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
+	stmt: sqlite.Stmt
+	rc := sqlite.prepare_v2(db.conn, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error preparing delete: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error preparing delete: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 	defer sqlite.finalize(stmt)
@@ -337,180 +415,176 @@ db_delete :: proc(d: ^Db, path: string) -> bool {
 	defer delete(cpath)
 	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error binding path: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
-		fmt.printf("Error deleting: %s\n", sqlite.db_errmsg(d.db))
+		fmt.eprintf("Error deleting: %s\n", sqlite.errmsg(db.conn))
 		return false
 	}
 
-	if sqlite.changes(d.db) == 0 {
-		fmt.printf("No file found with path: %s\n", path)
+	if sqlite.changes(db.conn) == 0 {
+		fmt.eprintf("No file found with path: %s\n", path)
 		return false
 	}
 
-	d.changed = true
+	db.changed = true
 	return true
 }
 
+// Caller is responsible for the returned memory
 new_env_file :: proc(path: string) -> (EnvFile, bool) {
 	abs_path, abs_err := filepath.abs(path)
 	if abs_err != nil {
-		fmt.printf("Error getting absolute path: %v\n", abs_err)
+		fmt.eprintf("Error getting absolute path: %v\n", abs_err)
 		return EnvFile{}, false
 	}
 
 	dir := filepath.dir(abs_path)
 
-	remotes := get_git_remotes(dir)
+	// TODO: Should we use the db allocator here?
+	remotes := get_git_remotes(dir, context.allocator)
 
 	data, read_err := os.read_entire_file_from_path(abs_path, context.allocator)
-	defer delete(data)
 	if read_err != nil {
-		fmt.printf("Error reading file %s: %v\n", abs_path, read_err)
+		fmt.eprintf("Error reading file %s: %v\n", abs_path, read_err)
 		return EnvFile{}, false
 	}
 
 	digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
-	// TODO: Handle error
-	hex_bytes, _ := hex.encode(digest)
-
+	hex_bytes := hex.encode(digest, context.allocator)
 	return EnvFile {
-			Path = abs_path,
-			Dir = dir,
-			Remotes = remotes,
-			Sha256 = string(hex_bytes),
+			path = abs_path,
+			dir = dir,
+			remotes = remotes,
+			sha256 = string(hex_bytes),
 			contents = string(data),
 		},
 		true
 }
 
-db_sync :: proc(d: ^Db, f: ^EnvFile) -> (SyncFlag, string) {
-	return env_file_sync(f, .TrustFilesystem, d)
-}
-
-// If SyncFlag is .BackedUp, Caller is responsible for calling delete on f.contents and f.Sha256
-env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, string) {
+// Reconciles `f` with the filesystem and persists changes to the database.
+db_sync :: proc(db: ^Db, f: ^EnvFile) -> (SyncFlag, SyncError) {
+	allocator := db_allocator(db)
 	result: SyncFlag = {}
+	old_path := f.path
 
-	_, stat_err := os.stat(f.Dir, context.allocator)
-	if stat_err != nil {
-		moved_dirs: [dynamic]string
-
-		if d != nil {
-			dirs, dirs_ok := find_moved_dirs(d, f)
-			if !dirs_ok {
-				return {.Error}, "failed to find moved dirs"
-			}
-			moved_dirs = dirs
-		}
-
-		if len(moved_dirs) == 0 {
-			return {.Error}, "directory missing"
-		} else if len(moved_dirs) == 1 {
-			update_dir(f, moved_dirs[0])
-			result = {.DirUpdated}
-		} else {
-			return {.Error}, "multiple directories found"
+	if !os.exists(f.dir) {
+		moved, err := try_move_dir(db, f, allocator)
+		if !moved {
+			return {}, err
 		}
+		result += {.DirUpdated}
 	}
 
-	_, file_stat_err := os.stat(f.Path, context.allocator)
-	if file_stat_err != nil {
-		write_err := os.write_entire_file(f.Path, f.contents)
+	if !os.exists(f.path) {
+		write_err := os.write_entire_file(f.path, f.contents)
 		if write_err != nil {
-			msg, _ := strings.concatenate({"failed to write file: ", fmt.tprintf("%v", write_err)})
-			return {.Error}, msg
+			fmt.eprintf("db_sync: failed to write %s: %v\n", f.path, write_err)
+			return result, .WriteFailed
 		}
 
-		return result + {.Restored}, ""
+		if !db_persist(db, f, old_path) {
+			return result, .DbFailed
+		}
+		return result + {.Restored}, .None
 	}
 
-	data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
+	data, read_err := os.read_entire_file_from_path(f.path, allocator)
 	if read_err != nil {
-		msg, _ := strings.concatenate(
-			{"failed to read file for SHA comparison: ", fmt.tprintf("%v", read_err)},
-		)
-		return {.Error}, msg
+		fmt.eprintf("db_sync: failed to read %s: %v\n", f.path, read_err)
+		return result, .ReadFailed
 	}
 
-	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
-	// TODO: Handle error
-	hex_bytes, _ := hex.encode(digest)
+	digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
+	hex_bytes := hex.encode(digest, allocator)
 	current_sha := string(hex_bytes)
 
-	if current_sha == f.Sha256 {
-		return result, ""
-	}
-
-	switch dir {
-	case .TrustDatabase:
-		write_err := os.write_entire_file(f.Path, f.contents)
-		if write_err != nil {
-			msg, _ := strings.concatenate({"failed to write file: ", fmt.tprintf("%v", write_err)})
-			return {.Error}, msg
+	if current_sha == f.sha256 {
+		if !db_persist(db, f, old_path) {
+			return result, .DbFailed
 		}
-		return result + {.Restored}, ""
-	case .TrustFilesystem:
-		if !env_file_backup(f) {
-			return {.Error}, "failed to backup file"
-		}
-		return result + {.BackedUp}, ""
-	}
-
-	return result, ""
-}
-
-find_moved_dirs :: proc(d: ^Db, f: ^EnvFile) -> ([dynamic]string, bool) {
-	roots, roots_ok := find_git_roots(d.cfg)
-	if !roots_ok {
-		return {}, false
-	}
-
-	moved: [dynamic]string
-	for root in roots {
-		remotes := get_git_remotes(root)
-		if shares_remote(f, remotes[:]) {
-			cloned, _ := strings.clone(root)
-			append(&moved, cloned)
-		}
-	}
-	return moved, true
-}
-
-update_dir :: proc(f: ^EnvFile, new_dir: string) {
-	f.Dir = new_dir
-	base := filepath.base(f.Path)
-	new_path, _ := strings.concatenate({new_dir, "/", base})
-	f.Path = new_path
-	f.Remotes = get_git_remotes(new_dir)
-}
-
-// Loads the contents of the the file at f.Path into f.contents
-//
-// Caller is responsible for calling delete on f.contents and f.Sha256
-env_file_backup :: proc(f: ^EnvFile) -> bool {
-	data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
-	if read_err != nil {
-		fmt.printf("Error reading file %s: %v\n", f.Path, read_err)
-		return false
+		return result, .None
 	}
 
 	f.contents = string(data)
-	digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
-	hex_bytes, alloc_err := hex.encode(digest)
-	if alloc_err != nil {
-		fmt.printf("Error generating hash for file %s: %v\n", f.Path, alloc_err)
-		return false
+	f.sha256 = current_sha
+	if !db_persist(db, f, old_path) {
+		return result, .DbFailed
+	}
+	return result + {.BackedUp}, .None
+}
+
+db_persist :: proc(db: ^Db, f: ^EnvFile, old_path: string) -> bool {
+	if f.path != old_path {
+		if !db_delete(db, old_path) {
+			return false
+		}
+	}
+	return db_insert(db, f^)
+}
+
+// TODO: Remove after the next major release
+migrate_remotes :: proc(db: ^Db) {
+	sql ::
+		"UPDATE envr_env_files " +
+		"SET remotes = COALESCE((" +
+		"  SELECT group_concat(atom, char(10)) " +
+		"  FROM json_each(envr_env_files.remotes)" +
+		"), '') " +
+		"WHERE remotes LIKE '[%'"
+
+	rc := sqlite.exec(db.conn, sql, nil, nil, nil)
+	if rc != sqlite.OK {
+		fmt.eprintf("Warning: failed to migrate remotes: %s\n", sqlite.errmsg(db.conn))
+		return
+	}
+
+	if sqlite.changes(db.conn) > 0 {
+		db.changed = true
+	}
+}
+
+try_move_dir :: proc(db: ^Db, f: ^EnvFile, allocator: mem.Allocator) -> (bool, SyncError) {
+	roots, ok := find_git_roots(db.cfg)
+	if !ok {
+		return false, .GitRootFailed
+	}
+	defer {
+		for root in roots {
+			delete(root)
+		}
+		delete(roots)
+	}
+
+	match_count := 0
+	matched_dir: string
+	for root in roots {
+		remotes := get_git_remotes(root, context.temp_allocator)
+		if shares_remote(f, remotes[:]) {
+			match_count += 1
+			matched_dir = root
+		}
+	}
+
+	switch match_count {
+	case 0:
+		return false, .DirMissing
+	case 1:
+		f.dir = strings.clone(matched_dir, allocator)
+		base := filepath.base(f.path)
+		new_path, _ := filepath.join({f.dir, base}, allocator)
+		f.path = new_path
+		f.remotes = get_git_remotes(f.dir, allocator)
+		return true, .None
+	case:
+		return false, .MultipleDirs
 	}
-	f.Sha256 = string(hex_bytes)
-	return true
 }
 
 shares_remote :: proc(f: ^EnvFile, remotes: []string) -> bool {
-	for r1 in f.Remotes {
+	for r1 in f.remotes {
 		for r2 in remotes {
 			if r1 == r2 {
 				return true
@@ -520,38 +594,35 @@ shares_remote :: proc(f: ^EnvFile, remotes: []string) -> bool {
 	return false
 }
 
-get_git_remotes :: proc(dir: string) -> [dynamic]string {
-	remotes: [dynamic]string
-	remote_set: map[string]bool
-	defer delete(remote_set)
-
+get_git_remotes :: proc(dir: string, allocator: mem.Allocator) -> [dynamic]string {
 	config_path, _ := filepath.join({dir, ".git", "config"}, context.temp_allocator)
-	m, _, ok := ini.load_map_from_path(config_path, context.allocator)
-	if !ok {
-		return remotes
+	// TODO: Handle error
+	m, _, read_ok := ini.load_map_from_path(config_path, context.temp_allocator)
+	if !read_ok {
+		return nil
 	}
-	defer ini.delete_map(m)
+
+	remotes := make([dynamic]string, 0, 1, allocator)
 
 	for section_name, section in m {
 		if strings.has_prefix(section_name, "remote ") {
 			if url, ok := section["url"]; ok {
-				remote_set[url] = true
+				found := false
+				for r in remotes {
+					if r == url {found = true; break}
+				}
+				if !found {
+					// FIXME: Currently leaks when adding a file with envr scan
+					cloned := strings.clone(url, allocator)
+					append(&remotes, cloned)
+				}
 			}
 		}
 	}
 
-	for remote in remote_set {
-		cloned, _ := strings.clone(remote)
-		append(&remotes, cloned)
-	}
-
 	return remotes
 }
 
-db_update_required :: proc(status: SyncFlag) -> bool {
-	return .BackedUp in status || .DirUpdated in status
-}
-
 to_cstring :: proc {
 	string_to_cstring,
 	strings.to_cstring,
@@ -560,17 +631,17 @@ to_cstring :: proc {
 string_to_cstring :: proc(s: string, allocator := context.allocator) -> cstring {
 	cs, err := strings.clone_to_cstring(s, allocator)
 	if err != nil {
-		fmt.printf("Failed to convert string to cstring: %v\n", err)
+		fmt.eprintf("Failed to convert string to cstring: %v\n", err)
 		panic("Allocation Exception")
 	}
 	return cs
 }
 
-// Caller is responsible for freeing the result
+// Unless an explicit allocator is passed, caller is responsible for freeing the result
 clone_cstring :: proc(c: cstring, allocator := context.allocator) -> string {
 	str, err := strings.clone_from_cstring(c, allocator)
 	if err != nil {
-		fmt.printf("Failed to convert string to cstring: %v\n", err)
+		fmt.eprintf("Failed to convert string to cstring: %v\n", err)
 		delete(str)
 		panic("Allocation Exception")
 	}

db_integration_test.odin

@@ -1,3 +1,4 @@
+#+test
 package main
 
 import "core:fmt"
@@ -10,6 +11,14 @@ import "sqlite"
 
 FIXTURES :: "fixtures"
 
+test_temp_dir :: proc(t: ^testing.T, prefix: string) -> string {
+	dir, err := os.mkdir_temp("", prefix, context.temp_allocator)
+	if err != nil {
+		testing.fail_now(t, fmt.tprintf("Failed to create temp dir: %v", err))
+	}
+	return dir
+}
+
 fixture_key :: proc() -> SshKeyPair {
 	priv, _ := strings.concatenate(
 		[]string{FIXTURES, "/keys/insecure-test-key"},
@@ -19,7 +28,7 @@ fixture_key :: proc() -> SshKeyPair {
 		[]string{FIXTURES, "/keys/insecure-test-key.pub"},
 		context.temp_allocator,
 	)
-	return SshKeyPair{Private = priv, Public = pub}
+	return SshKeyPair{private = priv, public = pub}
 }
 
 fixture_db_path :: proc() -> string {
@@ -29,9 +38,9 @@ fixture_db_path :: proc() -> string {
 
 fixture_config :: proc() -> Config {
 	cfg := Config {
-		Keys = make([dynamic]SshKeyPair, 0, 1),
+		keys = make([dynamic]SshKeyPair, 0, 1),
 	}
-	append(&cfg.Keys, fixture_key())
+	append(&cfg.keys, fixture_key())
 	return cfg
 }
 
@@ -39,7 +48,7 @@ fixture_config :: proc() -> Config {
 test_encrypt_decrypt_sqlite_roundtrip :: proc(t: ^testing.T) {
 	cfg := fixture_config()
 	defer {
-		delete(cfg.Keys)
+		delete(cfg.keys)
 	}
 
 	db_path := fixture_db_path()
@@ -50,7 +59,7 @@ test_encrypt_decrypt_sqlite_roundtrip :: proc(t: ^testing.T) {
 	}
 	defer delete(sqlite_data)
 
-	encrypted, enc_ok := encrypt(sqlite_data, cfg.Keys[:])
+	encrypted, enc_ok := encrypt(sqlite_data, cfg.keys[:])
 	testing.expect(t, enc_ok, "encryption should succeed")
 	if !enc_ok {
 		return
@@ -58,12 +67,12 @@ test_encrypt_decrypt_sqlite_roundtrip :: proc(t: ^testing.T) {
 	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")
+	testing.expect_value(t, encrypted[0], u8('E'))
+	testing.expect_value(t, encrypted[1], u8('N'))
+	testing.expect_value(t, encrypted[2], u8('V'))
+	testing.expect_value(t, encrypted[3], u8('R'))
 
-	plaintext, dec_ok := decrypt(encrypted, cfg.Keys[:])
+	plaintext, dec_ok := decrypt(encrypted, cfg.keys[:])
 	testing.expect(t, dec_ok, "decryption should succeed")
 	if !dec_ok {
 		return
@@ -92,7 +101,7 @@ test_encrypt_decrypt_sqlite_roundtrip :: proc(t: ^testing.T) {
 test_encrypt_write_read_decrypt :: proc(t: ^testing.T) {
 	cfg := fixture_config()
 	defer {
-		delete(cfg.Keys)
+		delete(cfg.keys)
 	}
 
 	db_path := fixture_db_path()
@@ -103,20 +112,21 @@ test_encrypt_write_read_decrypt :: proc(t: ^testing.T) {
 	}
 	defer delete(sqlite_data)
 
-	encrypted, enc_ok := encrypt(sqlite_data, cfg.Keys[:])
+	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())
+	ewrd_dir := test_temp_dir(t, "envr-test-ewrd-*")
+	defer os.remove_all(ewrd_dir)
+	tmp_enc_path, _ := filepath.join([]string{ewrd_dir, "data.envr"}, context.temp_allocator)
 	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)
@@ -125,21 +135,21 @@ test_encrypt_write_read_decrypt :: proc(t: ^testing.T) {
 	}
 	defer delete(read_back)
 
-	plaintext, dec_ok := decrypt(read_back, cfg.Keys[:])
+	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")
+	testing.expect_value(t, len(plaintext), len(sqlite_data))
 }
 
 @(test)
 test_decrypt_then_deserialize_sqlite :: proc(t: ^testing.T) {
 	cfg := fixture_config()
 	defer {
-		delete(cfg.Keys)
+		delete(cfg.keys)
 	}
 
 	db_path := fixture_db_path()
@@ -150,27 +160,27 @@ test_decrypt_then_deserialize_sqlite :: proc(t: ^testing.T) {
 	}
 	defer delete(sqlite_data)
 
-	encrypted, enc_ok := encrypt(sqlite_data, cfg.Keys[:])
+	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[:])
+	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)
+	mem_db: sqlite.Db
+	rc := sqlite.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)
+	defer sqlite.close(mem_db)
 
 	n := i64(len(plaintext))
 	buf := sqlite.malloc64(n)
@@ -178,31 +188,24 @@ test_decrypt_then_deserialize_sqlite :: proc(t: ^testing.T) {
 	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")
+	rc = sqlite.deserialize(mem_db, "main", buf, n, n, {.FREEONCLOSE, .RESIZEABLE})
+	testing.expect_value(t, rc, sqlite.OK)
 	if rc != sqlite.OK {
 		sqlite.free(buf)
 		return
 	}
 
 	sql: cstring = "SELECT path FROM envr_env_files"
-	stmt: ^rawptr
+	stmt: sqlite.Stmt
 	rc = sqlite.prepare_v2(mem_db, sql, -1, &stmt, nil)
-	testing.expect(t, rc == sqlite.OK, "prepare failed")
+	testing.expect_value(t, rc, sqlite.OK)
 	if rc != sqlite.OK {
 		return
 	}
 	defer sqlite.finalize(stmt)
 
 	rc = sqlite.step(stmt)
-	testing.expect(t, rc == sqlite.ROW, "expected at least one row")
+	testing.expect_value(t, rc, sqlite.ROW)
 	if rc == sqlite.ROW {
 		path := string(sqlite.column_text(stmt, 0))
 		testing.expect(t, len(path) > 0, "path should not be empty")
@@ -212,7 +215,7 @@ test_decrypt_then_deserialize_sqlite :: proc(t: ^testing.T) {
 @(test)
 test_full_db_cycle :: proc(t: ^testing.T) {
 	cfg := fixture_config()
-	defer delete(cfg.Keys)
+	defer delete(cfg.keys)
 
 	db_path := fixture_db_path()
 	original_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
@@ -222,18 +225,22 @@ test_full_db_cycle :: proc(t: ^testing.T) {
 	}
 	defer delete(original_data)
 
-	encrypted, enc_ok := encrypt(original_data, cfg.Keys[:])
+	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)
+	cycle_dir := test_temp_dir(t, "envr-test-cycle-*")
+	defer os.remove_all(cycle_dir)
+	envr_dir_path, _ := filepath.join([]string{cycle_dir, ".envr"}, context.temp_allocator)
+	{
+		err := os.mkdir_all(envr_dir_path)
+		testing.expect_value(t, err, nil)
+	}
 
-	data_path, _ := filepath.join([]string{envr_dir_path, "data.envr"})
-	defer delete(data_path)
+	data_path, _ := filepath.join([]string{envr_dir_path, "data.envr"}, context.temp_allocator)
 	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 {
@@ -247,36 +254,28 @@ test_full_db_cycle :: proc(t: ^testing.T) {
 	}
 	defer delete(read_back)
 
-	plaintext, dec_ok := decrypt(read_back, cfg.Keys[:])
+	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[:])
+	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[:])
+	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),
-		),
-	)
+	testing.expect_value(t, len(plaintext2), len(original_data))
 
 	os.remove(data_path)
 	os.remove(envr_dir_path)
@@ -288,13 +287,13 @@ test_full_db_cycle :: proc(t: ^testing.T) {
 test_ssh_key_parse_from_fixtures :: proc(t: ^testing.T) {
 	key := fixture_key()
 
-	priv_kp, priv_ok := parse_ssh_private_key(key.Private)
+	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)
+	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
@@ -309,29 +308,28 @@ test_ssh_key_parse_from_fixtures :: proc(t: ^testing.T) {
 	if !x_ok {
 		return
 	}
-	defer delete(x25519_pairs)
 
-	testing.expect(t, len(x25519_pairs) == 1, "should have 1 x25519 keypair")
+	testing.expect_value(t, len(x25519_pairs), 1)
 }
 
 @(test)
 test_config_load_with_fixture_key :: proc(t: ^testing.T) {
 	cfg := fixture_config()
 	defer {
-		delete(cfg.Keys)
+		delete(cfg.keys)
 	}
 
-	testing.expect(t, len(cfg.Keys) == 1, "should have 1 key")
+	testing.expect_value(t, len(cfg.keys), 1)
 
-	key := cfg.Keys[0]
+	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")
+	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)
+	_, 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)
+		fmt.printf("  private key path was: '%s'\n", key.private)
 	}
 }
 

db_test.odin

@@ -1,5 +1,8 @@
+#+test
 package main
 
+import "core:crypto/hash"
+import "core:encoding/hex"
 import "core:fmt"
 import "core:os"
 import "core:path/filepath"
@@ -8,225 +11,192 @@ 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,
+		path     = path,
+		dir      = "",
+		sha256   = sha,
 		contents = contents,
-		Remotes  = make([dynamic]string, 0, len(remotes)),
+		remotes  = make([dynamic]string, 0, len(remotes), context.temp_allocator),
 	}
 	for r in remotes {
-		append(&f.Remotes, r)
+		append(&f.remotes, r)
 	}
 	return f
 }
 
 @(test)
 test_db_insert_and_fetch :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
+	db, ok := db_init()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer sqlite.db_close(d.db)
+	defer db_close(&db)
 
 	path := "/project/.env"
 	sha := "abc123"
 	contents := "SECRET=value"
 
 	f := make_test_env_file(path, sha, contents, []string{"git@github.com:user/repo.git"})
-	defer delete(f.Remotes)
+	defer delete(f.remotes)
 
-	testing.expect(t, db_insert(&d, f), "insert should succeed")
+	testing.expect(t, db_insert(&db, f), "insert should succeed")
 
-	fetched, fetch_ok := db_fetch(&d, "/project/.env")
-	defer delete_envfile(&fetched)
+	fetched, fetch_ok := db_fetch(&db, "/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.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")
+	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()
+	db, ok := db_init()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer sqlite.db_close(d.db)
+	defer db_close(&db)
 
-	_, fetch_ok := db_fetch(&d, "/nonexistent/.env")
+	_, fetch_ok := db_fetch(&db, "/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()
+	db, ok := db_init()
+	defer db_close(&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")
+	defer delete(f1.remotes)
+	testing.expect(t, db_insert(&db, 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")
+	defer delete(f2.remotes)
+	testing.expect(t, db_insert(&db, f2), "second insert should succeed")
 
-	results, list_ok := db_list(&d)
+	results, list_ok := db_list(&db)
 	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")
+	testing.expect_value(t, len(results), 1)
 
-	fetched, fetch_ok := db_fetch(&d, "/project/.env")
+	fetched, fetch_ok := db_fetch(&db, "/project/.env")
 	testing.expect(t, fetch_ok, "fetch should succeed")
 	if !fetch_ok do return
-	defer delete_envfile(&fetched)
+	// defer delete_envfile(&fetched)
 
 	testing.expect_value(t, fetched.contents, "KEY=new")
-	testing.expect_value(t, fetched.Sha256, "sha2")
+	testing.expect_value(t, fetched.sha256, "sha2")
 }
 
 @(test)
 test_db_delete_existing :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
+	db, ok := db_init()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer sqlite.db_close(d.db)
+	defer db_close(&db)
 
 	f := make_test_env_file("/project/.env", "sha", "KEY=val")
-	defer delete(f.Remotes)
-	db_insert(&d, f)
+	defer delete(f.remotes)
+	db_insert(&db, f)
 
-	testing.expect(t, db_delete(&d, "/project/.env"), "delete should return true")
+	testing.expect(t, db_delete(&db, "/project/.env"), "delete should return true")
 
-	_, fetch_ok := db_fetch(&d, "/project/.env")
+	_, fetch_ok := db_fetch(&db, "/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()
+	db, ok := db_init()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer sqlite.db_close(d.db)
+	defer db_close(&db)
 
-	testing.expect(t, !db_delete(&d, "/nonexistent/.env"), "delete missing should return false")
+	testing.expect(t, !db_delete(&db, "/nonexistent/.env"), "delete missing should return false")
 }
 
 @(test)
 test_db_list_multiple :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
+	db, ok := db_init()
 	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
+	defer db_close(&db)
 
 	f1 := make_test_env_file("/proj1/.env", "sha1", "A=1", []string{"git@github.com:a/repo.git"})
-	defer delete(f1.Remotes)
+	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)
+	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)
+	db_insert(&db, f1)
+	db_insert(&db, f2)
+	db_insert(&db, f3)
 
-	results, list_ok := db_list(&d)
+	results, list_ok := db_list(&db)
 	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()
+	db, ok := db_init()
 	testing.expect(t, ok, "failed to create test db")
-	if !ok do return
-	defer sqlite.db_close(d.db)
+	defer db_close(&db)
 
-	results, list_ok := db_list(&d)
+	results, list_ok := db_list(&db)
 	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)
+	testing.expect_value(t, len(results), 0)
 }
 
 @(test)
 test_db_insert_sets_changed :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
+	db, ok := db_init()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer sqlite.db_close(d.db)
+	defer db_close(&db)
 
-	testing.expect(t, !d.changed, "changed should start false")
+	testing.expect(t, !db.changed, "changed should start false")
 
 	f := make_test_env_file("/project/.env", "sha", "KEY=val")
-	defer delete(f.Remotes)
-	db_insert(&d, f)
+	defer delete(f.remotes)
+	db_insert(&db, f)
 
-	testing.expect(t, d.changed, "changed should be true after insert")
+	testing.expect(t, db.changed, "changed should be true after insert")
 }
 
 @(test)
 test_db_delete_sets_changed :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
+	db, ok := db_init()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer sqlite.db_close(d.db)
+	defer db_close(&db)
 
 	f := make_test_env_file("/project/.env", "sha", "KEY=val")
-	defer delete(f.Remotes)
-	db_insert(&d, f)
-	d.changed = false
+	defer delete(f.remotes)
+	db_insert(&db, f)
+	db.changed = false
 
-	db_delete(&d, "/project/.env")
-	testing.expect(t, d.changed, "changed should be true after delete")
+	db_delete(&db, "/project/.env")
+	testing.expect(t, db.changed, "changed should be true after delete")
 }
 
 @(test)
 test_db_serialize :: proc(t: ^testing.T) {
-	d, ok := make_test_db()
+	db, ok := db_init()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer sqlite.db_close(d.db)
+	defer db_close(&db)
 
 	f := make_test_env_file("/project/.env", "sha", "KEY=val")
-	defer delete(f.Remotes)
-	db_insert(&d, f)
+	defer delete(f.remotes)
+	db_insert(&db, f)
 
 	sz: i64
-	data := sqlite.serialize(d.db, "main", &sz, 0)
+	data := sqlite.serialize(db.conn, "main", &sz, {})
 	testing.expect(t, data != nil, "serialize should return non-nil")
 	if data == nil do return
 	defer sqlite.free(data)
@@ -234,44 +204,13 @@ test_db_serialize :: proc(t: ^testing.T) {
 	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),
+		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")
+	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")
@@ -280,9 +219,9 @@ test_shares_remote_overlap :: proc(t: ^testing.T) {
 @(test)
 test_shares_remote_no_overlap :: proc(t: ^testing.T) {
 	f := EnvFile {
-		Remotes = make([dynamic]string, 1, context.temp_allocator),
+		remotes = make([dynamic]string, 1, context.temp_allocator),
 	}
-	append(&f.Remotes, "git@github.com:user/repo.git")
+	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")
@@ -291,7 +230,7 @@ test_shares_remote_no_overlap :: proc(t: ^testing.T) {
 @(test)
 test_shares_remote_empty_file_remotes :: proc(t: ^testing.T) {
 	f := EnvFile {
-		Remotes = make([dynamic]string, 0, context.temp_allocator),
+		remotes = make([dynamic]string, 0, context.temp_allocator),
 	}
 
 	remotes := []string{"git@github.com:user/repo.git"}
@@ -301,9 +240,9 @@ test_shares_remote_empty_file_remotes :: proc(t: ^testing.T) {
 @(test)
 test_shares_remote_empty_check_remotes :: proc(t: ^testing.T) {
 	f := EnvFile {
-		Remotes = make([dynamic]string, 1, context.temp_allocator),
+		remotes = make([dynamic]string, 1, context.temp_allocator),
 	}
-	append(&f.Remotes, "git@github.com:user/repo.git")
+	append(&f.remotes, "git@github.com:user/repo.git")
 
 	remotes: []string
 	testing.expect(t, !shares_remote(&f, remotes), "empty check remotes should not share")
@@ -312,7 +251,7 @@ test_shares_remote_empty_check_remotes :: proc(t: ^testing.T) {
 @(test)
 test_shares_remote_both_empty :: proc(t: ^testing.T) {
 	f := EnvFile {
-		Remotes = make([dynamic]string, 0),
+		remotes = make([dynamic]string, 0),
 	}
 
 	remotes: []string
@@ -328,8 +267,7 @@ delete_remotes :: proc(remotes: [dynamic]string) {
 
 @(test)
 test_get_git_remotes_single :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-remotes-%d", os.get_pid())
-	os.mkdir_all(base)
+	base := test_temp_dir(t, "envr-test-remotes-*")
 	defer os.remove_all(base)
 
 	git_dir := fmt.tprintf("%s/.git", base)
@@ -338,20 +276,18 @@ test_get_git_remotes_single :: proc(t: ^testing.T) {
 	config_content := "[core]\n\trepositoryformatversion = 0\n[remote \"origin\"]\n\turl = git@github.com:user/repo.git\n\tfetch = +refs/heads/*:refs/remotes/origin/*\n"
 	config_path := fmt.tprintf("%s/config", git_dir)
 	err := os.write_entire_file(config_path, transmute([]u8)config_content)
-	testing.expect(t, err == nil, "should write .git/config")
+	testing.expect_value(t, err, nil)
 
-	remotes := get_git_remotes(base)
-	defer delete_remotes(remotes)
+	remotes := get_git_remotes(base, context.temp_allocator)
 
-	testing.expect(t, len(remotes) == 1, "should find 1 remote")
+	testing.expect_value(t, len(remotes), 1)
 	if len(remotes) != 1 do return
 	testing.expect_value(t, remotes[0], "git@github.com:user/repo.git")
 }
 
 @(test)
 test_get_git_remotes_multiple :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-remotes-multi-%d", os.get_pid())
-	os.mkdir_all(base)
+	base := test_temp_dir(t, "envr-test-remotes-multi-*")
 	defer os.remove_all(base)
 
 	git_dir := fmt.tprintf("%s/.git", base)
@@ -360,30 +296,26 @@ test_get_git_remotes_multiple :: proc(t: ^testing.T) {
 	config_content := "[remote \"origin\"]\n\turl = git@github.com:user/repo.git\n[remote \"upstream\"]\n\turl = https://gitlab.com/upstream/repo.git\n"
 	config_path := fmt.tprintf("%s/config", git_dir)
 	err := os.write_entire_file(config_path, transmute([]u8)config_content)
-	testing.expect(t, err == nil, "should write .git/config")
+	testing.expect_value(t, err, nil)
 
-	remotes := get_git_remotes(base)
-	defer delete_remotes(remotes)
+	remotes := get_git_remotes(base, context.temp_allocator)
 
-	testing.expect(t, len(remotes) == 2, "should find 2 remotes")
+	testing.expect_value(t, len(remotes), 2)
 }
 
 @(test)
 test_get_git_remotes_no_config :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-remotes-none-%d", os.get_pid())
-	os.mkdir_all(base)
+	base := test_temp_dir(t, "envr-test-remotes-none-*")
 	defer os.remove_all(base)
 
-	remotes := get_git_remotes(base)
-	defer delete_remotes(remotes)
+	remotes := get_git_remotes(base, context.temp_allocator)
 
-	testing.expect(t, len(remotes) == 0, "should return empty when no .git/config")
+	testing.expect_value(t, len(remotes), 0)
 }
 
 @(test)
 test_get_git_remotes_no_remotes :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-remotes-empty-%d", os.get_pid())
-	os.mkdir_all(base)
+	base := test_temp_dir(t, "envr-test-remotes-empty-*")
 	defer os.remove_all(base)
 
 	git_dir := fmt.tprintf("%s/.git", base)
@@ -392,35 +324,34 @@ test_get_git_remotes_no_remotes :: proc(t: ^testing.T) {
 	config_content := "[core]\n\trepositoryformatversion = 0\n\tbare = false\n"
 	config_path := fmt.tprintf("%s/config", git_dir)
 	err := os.write_entire_file(config_path, transmute([]u8)config_content)
-	testing.expect(t, err == nil, "should write .git/config")
+	testing.expect_value(t, err, nil)
 
-	remotes := get_git_remotes(base)
-	defer delete_remotes(remotes)
+	remotes := get_git_remotes(base, context.temp_allocator)
 
-	testing.expect(t, len(remotes) == 0, "should return empty when no remote sections")
+	testing.expect_value(t, len(remotes), 0)
 }
 
 @(test)
 test_new_env_file :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-envfile-%d", os.get_pid())
-	os.mkdir_all(base)
+	base := test_temp_dir(t, "envr-test-envfile-*")
 	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")
+	testing.expect_value(t, err, nil)
 
 	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)
+	defer delete(file.contents)
+	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")
+	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_value(t, file.contents, "SECRET=value\n")
+	testing.expect_value(t, len(file.sha256), 64)
 }
 
 @(test)
@@ -429,87 +360,50 @@ test_new_env_file_missing :: proc(t: ^testing.T) {
 	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")
-}
-
 @(test)
 test_closing_db_has_no_leaks :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-leak-%d", os.get_pid())
-	os.mkdir_all(base)
+	base := test_temp_dir(t, "envr-test-leak-*")
 	defer os.remove_all(base)
 
 	cfg_path, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
-	testing.expect(t, err == nil, "cfgPath should build successfully")
+	testing.expect_value(t, err, nil)
 
-	cfg := new_config([]string{"fixtures/keys/insecure-test-key"}, cfg_path)
-	defer delete_config(&cfg)
-	testing.expect(t, save_config(cfg, force = true), "save should succeed")
+	{
+		cfg := new_config([]string{"fixtures/keys/insecure-test-key"}, cfg_path)
+		testing.expect(t, save_config(cfg, force = true), "save should succeed")
+		delete_config(&cfg)
+	}
 
 	db, ok := db_open(cfg_path)
 	testing.expect(t, ok, "db should open")
-	if !ok do return
 	db_close(&db)
 }
 
 @(test)
 test_open_existing_db_has_no_leaks :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-leak-existing-%d", os.get_pid())
-	os.mkdir_all(base)
+	base := test_temp_dir(t, "envr-test-leak-existing-*")
 	defer os.remove_all(base)
 
 	cfg_path, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
-	testing.expect(t, err == nil, "cfgPath should build successfully")
+	testing.expect_value(t, err, nil)
 
-	cfg := new_config([]string{"fixtures/keys/insecure-test-key"}, cfg_path)
-	defer delete_config(&cfg)
-	testing.expect(t, save_config(cfg, force = true), "save should succeed")
+	{
+		cfg := new_config([]string{"fixtures/keys/insecure-test-key"}, cfg_path)
+		testing.expect(t, save_config(cfg, force = true), "save should succeed")
+		delete_config(&cfg)
+	}
 
 	// First open/close creates data.envr on disk
 	db, ok := db_open(cfg_path)
 	testing.expect(t, ok, "db should open")
 	if !ok do return
-	f := make_test_env_file("/project/.env", "abc123", "SECRET=value", []string{"git@github.com:user/repo.git"})
-	defer delete(f.Remotes)
+	f := make_test_env_file(
+		"/project/.env",
+		"abc123",
+		"SECRET=value",
+		[]string{"git@github.com:user/repo.git"},
+	)
+	defer delete(f.remotes)
 	testing.expect(t, db_insert(&db, f), "insert should succeed")
 	db_close(&db)
 
@@ -520,3 +414,148 @@ test_open_existing_db_has_no_leaks :: proc(t: ^testing.T) {
 	db_close(&db2)
 }
 
+@(test)
+test_db_sync_noop :: proc(t: ^testing.T) {
+	base := test_temp_dir(t, "envr-test-sync-noop-*")
+	defer os.remove_all(base)
+
+	env_path := fmt.tprintf("%s/.env", base)
+	content := "KEY=value\n"
+	write_err := os.write_entire_file(env_path, transmute([]u8)content)
+	testing.expect_value(t, write_err, nil)
+
+	digest := hash.hash_bytes(
+		hash.Algorithm.SHA256,
+		transmute([]u8)content,
+		context.temp_allocator,
+	)
+	hex_bytes := hex.encode(digest, context.temp_allocator)
+	sha := string(hex_bytes)
+
+	db, ok := db_init()
+	testing.expect(t, ok, "failed to create test db")
+	defer db_close(&db)
+
+	f := make_test_env_file(env_path, sha, content)
+	f.dir = base
+	db_insert(&db, f)
+
+	result, sync_err := db_sync(&db, &f)
+	testing.expect_value(t, sync_err, SyncError.None)
+	testing.expect_value(t, result, nil)
+}
+
+@(test)
+test_db_sync_backed_up :: proc(t: ^testing.T) {
+	base := test_temp_dir(t, "envr-test-sync-backup-*")
+	defer os.remove_all(base)
+
+	env_path := fmt.tprintf("%s/.env", base)
+	changed_content := "KEY=changed\n"
+	write_err := os.write_entire_file(env_path, transmute([]u8)changed_content)
+	testing.expect_value(t, write_err, nil)
+
+	db, ok := db_init()
+	testing.expect(t, ok, "failed to create test db")
+	defer db_close(&db)
+
+	f := make_test_env_file(env_path, "old_sha", "KEY=original")
+	f.dir = base
+	db_insert(&db, f)
+
+	result, sync_err := db_sync(&db, &f)
+	testing.expect_value(t, sync_err, SyncError.None)
+	testing.expect(t, .BackedUp in result, "should be backed up")
+}
+
+@(test)
+test_db_sync_restored :: proc(t: ^testing.T) {
+	base := test_temp_dir(t, "envr-test-sync-restore-*")
+	defer os.remove_all(base)
+
+	env_path := fmt.tprintf("%s/.env", base)
+
+	db, ok := db_init()
+	testing.expect(t, ok, "failed to create test db")
+	defer db_close(&db)
+
+	f := make_test_env_file(env_path, "some_sha", "SECRET=value")
+	f.dir = base
+	defer delete(f.remotes)
+	db_insert(&db, f)
+
+	result, err := db_sync(&db, &f)
+	testing.expect_value(t, err, SyncError.None)
+	testing.expect(t, .Restored in result, "should be restored")
+
+	data, read_err := os.read_entire_file_from_path(env_path, context.temp_allocator)
+	testing.expect_value(t, read_err, nil)
+	if read_err == nil {
+		testing.expect_value(t, string(data), "SECRET=value")
+	}
+}
+
+@(test)
+test_db_sync_dir_missing :: proc(t: ^testing.T) {
+	db, ok := db_init()
+	testing.expect(t, ok, "failed to create test db")
+	defer db_close(&db)
+
+	f := make_test_env_file("/nonexistent/path/.env", "sha", "KEY=val")
+	db_insert(&db, f)
+
+	result, err := db_sync(&db, &f)
+	testing.expect_value(t, err, SyncError.DirMissing)
+	testing.expect_value(t, result, nil)
+}
+
+@(test)
+test_db_sync_moved :: proc(t: ^testing.T) {
+	base := test_temp_dir(t, "envr-test-sync-moved-*")
+	search_root := fmt.tprintf("%s/search", base)
+	repo_dir := fmt.tprintf("%s/myproject", search_root)
+	git_dir := fmt.tprintf("%s/.git", repo_dir)
+	defer os.remove_all(base)
+
+	os.mkdir_all(git_dir)
+
+	config_content := "[remote \"origin\"]\n\turl = git@github.com:user/repo.git\n"
+	config_path := fmt.tprintf("%s/config", git_dir)
+	write_err := os.write_entire_file(config_path, transmute([]u8)config_content)
+	testing.expect_value(t, write_err, nil)
+
+	db, ok := db_init()
+	testing.expect(t, ok, "failed to create test db")
+	defer db_close(&db)
+
+	db.cfg.scan_config.include = make([dynamic]string, 0, 1, context.temp_allocator)
+	append(&db.cfg.scan_config.include, search_root)
+
+	f := make_test_env_file(
+		"/old/nonexistent/path/.env",
+		"some_sha",
+		"SECRET=value",
+		[]string{"git@github.com:user/repo.git"},
+	)
+	testing.expect(t, db_insert(&db, f), "insert should succeed")
+
+	result, err := db_sync(&db, &f)
+	testing.expect_value(t, err, SyncError.None)
+	if err != .None do return
+	testing.expect(t, .DirUpdated in result, "should have DirUpdated flag")
+	testing.expect(t, .Restored in result, "should have Restored flag")
+
+	expected_path := fmt.tprintf("%s/.env", repo_dir)
+	testing.expect_value(t, f.path, expected_path)
+	testing.expect_value(t, f.dir, repo_dir)
+
+	_, old_exists := db_fetch(&db, "/old/nonexistent/path/.env")
+	testing.expect(t, !old_exists, "old path should be deleted from db")
+
+	new_fetched, new_ok := db_fetch(&db, expected_path)
+	testing.expect(t, new_ok, "new path should exist in db")
+	if new_ok {
+		testing.expect_value(t, new_fetched.contents, "SECRET=value")
+	}
+}
+

docs/cli/envr.md

@@ -4,11 +4,11 @@ Manage your .env files.
 
 ### Synopsis
 
-envr keeps your .env synced to a local, age encrypted database.
+envr keeps your .env synced to a local, 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
+All your data is stored in ~/.envr/data.envr
 
 Getting started is easy:
 

findr/findr_test.odin

@@ -21,9 +21,7 @@ test_basic_gitignored :: proc(t: ^testing.T) {
 	create_file(env, "repo/secrets.env")
 	create_file(env, "repo/normal.txt")
 
-	assert_output(t, env, nil, {}, {
-		"repo/.env", "repo/secrets.env",
-	})
+	assert_output(t, env, nil, {}, {"repo/.env", "repo/secrets.env"})
 }
 
 @(test)
@@ -49,9 +47,7 @@ test_negation_pattern :: proc(t: ^testing.T) {
 	create_file(env, "repo/secrets.env")
 	create_file(env, "repo/prod.env")
 
-	assert_output(t, env, nil, {}, {
-		"repo/.env", "repo/secrets.env",
-	})
+	assert_output(t, env, nil, {}, {"repo/.env", "repo/secrets.env"})
 }
 
 @(test)
@@ -67,9 +63,7 @@ test_multiple_repos :: proc(t: ^testing.T) {
 	create_file(env, "repo2/.gitignore", "*.key\n")
 	create_file(env, "repo2/secret.key")
 
-	assert_output(t, env, nil, {}, {
-		"repo1/a.env", "repo2/secret.key",
-	})
+	assert_output(t, env, nil, {}, {"repo1/a.env", "repo2/secret.key"})
 }
 
 @(test)
@@ -85,9 +79,7 @@ test_nested_repos :: proc(t: ^testing.T) {
 	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",
-	})
+	assert_output(t, env, nil, {}, {"parent/top.env", "parent/child/api.key"})
 }
 
 @(test)
@@ -102,9 +94,7 @@ test_nested_gitignore_read :: proc(t: ^testing.T) {
 	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",
-	})
+	assert_output(t, env, nil, {}, {"repo/sub/secret.txt", "repo/sub/.env"})
 }
 
 @(test)
@@ -119,9 +109,7 @@ test_nested_gitignore_negation :: proc(t: ^testing.T) {
 	create_file(env, "repo/sub/important.log")
 	create_file(env, "repo/sub/debug.log")
 
-	assert_output(t, env, nil, {}, {
-		"repo/sub/debug.log",
-	})
+	assert_output(t, env, nil, {}, {"repo/sub/debug.log"})
 }
 
 @(test)
@@ -136,9 +124,7 @@ test_multisegment_pattern :: proc(t: ^testing.T) {
 	create_file(env, "repo/build/other.txt")
 	create_file(env, "repo/output.txt")
 
-	assert_output(t, env, nil, {}, {
-		"repo/build/output.txt",
-	})
+	assert_output(t, env, nil, {}, {"repo/build/output.txt"})
 }
 
 @(test)
@@ -200,7 +186,7 @@ test_multiple_search_dirs :: proc(t: ^testing.T) {
 		stripped := r
 		if strings.has_prefix(stripped, env.temp_dir) {
 			stripped = stripped[len(env.temp_dir):]
-			if len(stripped) > 0 && stripped[0] == '/' {
+			if len(stripped) > 0 && stripped[0] == os.Path_Separator {
 				stripped = stripped[1:]
 			}
 		}
@@ -234,9 +220,7 @@ test_ignored_dir_descended :: proc(t: ^testing.T) {
 	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",
-	})
+	assert_output(t, env, nil, {}, {"repo/secrets/", "repo/secrets/.env", "repo/secrets/api.key"})
 }
 
 @(test)
@@ -251,10 +235,13 @@ test_nested_ignored_dir :: proc(t: ^testing.T) {
 	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",
-	})
+	assert_output(
+		t,
+		env,
+		nil,
+		{},
+		{"repo/build/", "repo/build/output.txt", "repo/build/sub/", "repo/build/sub/deep.env"},
+	)
 }
 
 // ============================================================================
@@ -272,10 +259,7 @@ test_excludes_prune_dirs :: proc(t: ^testing.T) {
 	create_dir(env, "repo/vendor")
 	create_file(env, "repo/vendor/lib.env")
 
-	assert_output(t, env, nil,
-		{excludes = {"vendor"}},
-		{"repo/.env"},
-	)
+	assert_output(t, env, nil, {excludes = {"vendor"}}, {"repo/.env"})
 }
 
 @(test)
@@ -289,10 +273,7 @@ test_pattern_filters_results :: proc(t: ^testing.T) {
 	create_file(env, "repo/secrets.env")
 	create_file(env, "repo/master.key")
 
-	assert_output(t, env, nil,
-		{pattern = "\\.env$"},
-		{"repo/.env", "repo/secrets.env"},
-	)
+	assert_output(t, env, nil, {pattern = "\\.env$"}, {"repo/.env", "repo/secrets.env"})
 }
 
 // ============================================================================
@@ -313,8 +294,6 @@ test_fifo_emitted :: proc(t: ^testing.T) {
 	defer delete(cpath)
 	linux.mknod(cpath, linux.S_IFIFO | linux.Mode{.IRUSR, .IWUSR}, 0)
 
-	assert_output(t, env, nil,
-		{pattern = "\\.fifo$"},
-		{"repo/test.fifo"},
-	)
+	assert_output(t, env, nil, {pattern = "\\.fifo$"}, {"repo/test.fifo"})
 }
+

findr/repos.odin

@@ -26,7 +26,7 @@ find_repos :: proc(roots: []string, results: ^[dynamic]string, thread_count: int
 	pool.threads = make([]^thread.Thread, thread_count)
 
 	for root in roots {
-		root_clone, _ := strings.clone(root)
+		root_clone := strings.clone(root)
 		append(&pool.queue, root_clone)
 		sync.atomic_sema_post(&pool.queue_sema)
 	}
@@ -97,7 +97,7 @@ process_repo_dir :: proc(pool: ^RepoPool, dir_path: string) {
 	defer linux.close(fd)
 
 	if has_git_dir(fd) {
-		cloned, _ := strings.clone(dir_path)
+		cloned := strings.clone(dir_path)
 		sync.mutex_lock(&pool.results_lock)
 		append(pool.results, cloned)
 		sync.mutex_unlock(&pool.results_lock)

findr/test_env.odin

@@ -37,7 +37,7 @@ 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, "/")
+	dir_end := strings.last_index(full, os.Path_Separator_String)
 	if dir_end >= 0 {
 		dir_path := full[:dir_end]
 		os.mkdir_all(dir_path, os.Permissions_Default_Directory)
@@ -105,12 +105,7 @@ assert_output :: proc(
 	}
 }
 
-assert_output_empty :: proc(
-	t: ^testing.T,
-	env: TestEnv,
-	args: []string,
-	opts: WalkOptions,
-) {
+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)}
@@ -139,10 +134,10 @@ collect_results :: proc(env: TestEnv, args: []string, opts: WalkOptions) -> [dyn
 		r := results[i]
 		if strings.has_prefix(r, env.temp_dir) {
 			stripped := r[len(env.temp_dir):]
-			if len(stripped) > 0 && stripped[0] == '/' {
+			if len(stripped) > 0 && stripped[0] == os.Path_Separator {
 				stripped = stripped[1:]
 			}
-			new_r, _ := strings.clone(stripped)
+			new_r := strings.clone(stripped)
 			delete(r)
 			results[i] = new_r
 		}
@@ -150,3 +145,4 @@ collect_results :: proc(env: TestEnv, args: []string, opts: WalkOptions) -> [dyn
 
 	return results
 }
+

findr/walker.odin

@@ -189,7 +189,7 @@ flush_buf :: proc(ch: chan.Chan([]u8), local: ^[dynamic]u8) {
 }
 
 append_path :: proc(buf: ^[dynamic]u8, parent, name: string, trailing_slash: bool) {
-	need_sep := len(parent) > 0 && parent[len(parent) - 1] != '/'
+	need_sep := len(parent) > 0 && parent[len(parent) - 1] != os.Path_Separator
 	size := len(parent) + len(name) + 1
 	if need_sep do size += 1
 	if trailing_slash do size += 1
@@ -200,9 +200,9 @@ append_path :: proc(buf: ^[dynamic]u8, parent, name: string, trailing_slash: boo
 
 	pos := old_len
 	pos += copy(buf[pos:], parent)
-	if need_sep {buf[pos] = '/'; pos += 1}
+	if need_sep {buf[pos] = os.Path_Separator; pos += 1}
 	pos += copy(buf[pos:], name)
-	if trailing_slash {buf[pos] = '/'; pos += 1}
+	if trailing_slash {buf[pos] = os.Path_Separator; pos += 1}
 	buf[pos] = '\n'
 }
 
@@ -362,6 +362,7 @@ check_chain :: proc(ctx: ^GIContext, entry_rel: string, is_dir: bool) -> bool {
 	return false
 }
 
+// TODO: Is this a copy of something in the core packages?
 relative_to :: proc(entry_rel, base_rel: string) -> string {
 	if len(base_rel) == 0 do return entry_rel
 	prefix_len := len(base_rel)
@@ -442,14 +443,15 @@ load_ignore_patterns :: proc(dir_path: string, in_repo: bool) -> ^Gitignore {
 	return gi
 }
 
+// TODO: Is this a copy of core package behavior?
 join_path :: proc(parent, child: string) -> string {
-	need_sep := len(parent) == 0 || parent[len(parent) - 1] != '/'
+	need_sep := len(parent) == 0 || parent[len(parent) - 1] != os.Path_Separator
 	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] = '/'
+		buf[pos] = os.Path_Separator
 		pos += 1
 	}
 	copy(buf[pos:], child)

flake.nix

@@ -36,11 +36,11 @@
           inputs',
           ...
         }:
-      let
-        mysqlite = pkgs.sqlite.overrideAttrs (old: {
-                configureFlags = (old.configureFlags or [ ]) ++ [ "--enable-deserialize" ];
-              });
-      in
+        let
+          mysqlite = pkgs.sqlite.overrideAttrs (old: {
+            configureFlags = (old.configureFlags or [ ]) ++ [ "--enable-deserialize" ];
+          });
+        in
         {
           _module.args.pkgs = import nixpkgs {
             inherit system;
@@ -75,10 +75,19 @@
             ];
 
             buildInputs = [
+              pkgs.git
+
               pkgs.libsodium
               mysqlite
             ];
 
+            doCheck = true;
+            checkPhase = ''
+              runHook preCheck
+              odin test . -all-packages
+              runHook postCheck
+            '';
+
             buildPhase = ''
               runHook preBuild
               echo '${version}' > version.txt

main.odin

@@ -1,10 +1,36 @@
 package main
 
+import "base:runtime"
 import "core:fmt"
 import "core:mem"
 import "core:os"
+import "core:prof/spall"
+import "core:sync"
+
+SPALL :: #config(SPALL, false)
+when SPALL {
+	spall_ctx: spall.Context
+	@(thread_local)
+	spall_buffer: spall.Buffer
+}
 
 main :: proc() {
+	when SPALL {
+		ctx, spall_ok := spall.context_create_with_scale("envr.spall", false, 1.0)
+		if !spall_ok {
+			fmt.eprintln("Failed to create spall trace file")
+			os.exit(1)
+		}
+		spall_ctx = ctx
+		defer spall.context_destroy(&spall_ctx)
+
+		spall_backing := make([]u8, spall.BUFFER_DEFAULT_SIZE)
+		defer delete(spall_backing)
+
+		spall_buffer = spall.buffer_create(spall_backing, u32(sync.current_thread_id()))
+		defer spall.buffer_destroy(&spall_ctx, &spall_buffer)
+	}
+
 	when ODIN_DEBUG {
 		heap_track: mem.Tracking_Allocator
 		mem.tracking_allocator_init(&heap_track, context.allocator)
@@ -60,3 +86,21 @@ main :: proc() {
 	}
 }
 
+when SPALL {
+	@(instrumentation_enter)
+	spall_enter :: proc "contextless" (
+		proc_address, call_site_return_address: rawptr,
+		loc: runtime.Source_Code_Location,
+	) {
+		spall._buffer_begin(&spall_ctx, &spall_buffer, "", "", loc)
+	}
+
+	@(instrumentation_exit)
+	spall_exit :: proc "contextless" (
+		proc_address, call_site_return_address: rawptr,
+		loc: runtime.Source_Code_Location,
+	) {
+		spall._buffer_end(&spall_ctx, &spall_buffer)
+	}
+}
+

prompt.odin

@@ -2,6 +2,7 @@ package main
 
 import "core:fmt"
 import "core:sys/posix"
+import "core:terminal/ansi"
 
 MultiSelect_Result :: enum {
 	Confirm,
@@ -36,16 +37,16 @@ multi_select :: proc(
 		return
 	}
 
-	selected = make([dynamic]bool, 0, len(options))
+	selected = make([dynamic]bool, len(options))
 	cursor: int = 0
 	scroll_offset: int = 0
 
-	fmt.printf("\x1b[?25l")
+	fmt.printf(ansi.CSI + ansi.DECTCEM_HIDE)
 	visible := render_options(prompt, options, selected[:], cursor, scroll_offset)
 
 	raw, ok := enable_raw_mode(posix.STDIN_FILENO)
 	if !ok {
-		fmt.printf("\x1b[?25h")
+		fmt.printf(ansi.CSI + ansi.DECTCEM_SHOW)
 		return
 	}
 	defer disable_raw_mode(&raw)
@@ -65,18 +66,18 @@ multi_select :: proc(
 		case .Space:
 			selected[cursor] = !selected[cursor]
 		case .Enter:
-			fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
+			fmt.printf(ansi.CSI + "%d" + ansi.CUU + ansi.CSI + ansi.ED + ansi.CSI + ansi.DECTCEM_SHOW, visible + 1)
 			result = .Confirm
 			return
 		case .Escape:
-			fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
+			fmt.printf(ansi.CSI + "%d" + ansi.CUU + ansi.CSI + ansi.ED + ansi.CSI + ansi.DECTCEM_SHOW, 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)
+		fmt.printf(ansi.CSI + "%d" + ansi.CUU + ansi.CSI + ansi.RESET + ansi.ED, visible + 1)
 		visible = render_options(prompt, options, selected[:], cursor, scroll_offset)
 	}
 }
@@ -88,7 +89,7 @@ render_options :: proc(
 	cursor: int,
 	scroll_offset: int,
 ) -> int {
-	fmt.printf("\x1b[1;36m%s\x1b[0m (↑/↓ move, space select, enter confirm)\r\n", prompt)
+	fmt.printf(ansi.CSI + ansi.BOLD + ";" + ansi.FG_CYAN + ansi.SGR + "%s" + ANSI_RESET + " (↑/↓ move, space select, enter confirm)\r\n", prompt)
 
 	end := scroll_offset + MAX_VISIBLE
 	if end > len(options) {
@@ -101,9 +102,9 @@ render_options :: proc(
 			checkbox = "x"
 		}
 		if i == cursor {
-			fmt.printf("\x1b[1;32m> \x1b[0m[\x1b[32m%s\x1b[0m] %s\r\n", checkbox, options[i])
+			fmt.printf(ansi.CSI + ansi.BOLD + ";" + ansi.FG_GREEN + ansi.SGR + "> " + ANSI_RESET + "[" + ansi.CSI + ansi.FG_GREEN + ansi.SGR + "%s" + ANSI_RESET + "] %s\r\n", checkbox, options[i])
 		} else {
-			fmt.printf("  [\x1b[2m%s\x1b[0m] %s\r\n", checkbox, options[i])
+			fmt.printf("  [" + ansi.CSI + ansi.FAINT + ansi.SGR + "%s" + ANSI_RESET + "] %s\r\n", checkbox, options[i])
 		}
 	}
 

scan.odin

@@ -7,18 +7,19 @@ import "findr"
 // Caller is responsible for freeing paths
 scan_path :: proc(search_path: string, cfg: Config) -> (paths: [dynamic]string, ok: bool) {
 	opts := findr.WalkOptions {
-		pattern  = cfg.ScanConfig.Matcher,
-		excludes = cfg.ScanConfig.Exclude[:],
+		pattern  = cfg.scan_config.matcher,
+		excludes = cfg.scan_config.exclude[:],
 	}
 	findr.walk({search_path}, &paths, opts, os.get_processor_core_count())
 	ok = true
 	return
 }
 
+// The returned values live on the temp_allocator
 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 {
-		backed_set[file.Path] = true
+		backed_set[file.path] = true
 	}
 
 	unbacked := make([dynamic]string, 0, len(db_files) / 2, context.temp_allocator)
@@ -29,3 +30,4 @@ find_unbacked :: proc(local_files: []string, db_files: []EnvFile) -> []string {
 	}
 	return unbacked[:]
 }
+

scan_test.odin

@@ -1,3 +1,4 @@
+#+test
 package main
 
 import "core:fmt"
@@ -7,8 +8,7 @@ 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())
-	os.mkdir_all(base)
+	base := test_temp_dir(t, "envr-scan-test-*")
 	defer os.remove_all(base)
 
 	git_init := os.Process_Desc {
@@ -18,23 +18,26 @@ test_scan_path_finds_gitignored_env_files :: proc(t: ^testing.T) {
 		stderr      = os.stderr,
 	}
 	p, err := os.process_start(git_init)
-	if err != nil {
-		return
-	}
-	_, wait_err := os.process_wait(p)
-	if wait_err != nil {
-		return
-	}
+	testing.expectf(t, err == nil, "Failed to run git: %v", err)
+	if err != nil do return
+	state, wait_err := os.process_wait(p)
+	testing.expectf(t, wait_err == nil, "Failed to wait: %v", wait_err)
+	if wait_err != nil do return
+	testing.expect(t, state.success, "command should succeed")
 
 	gitignore_path := fmt.tprintf("%s/.gitignore", base)
-	_ = os.write_entire_file(gitignore_path, ".env*\n")
+	err = os.write_entire_file(gitignore_path, ".env*\n")
+	testing.expectf(t, err == nil, "Failed: %v", err)
 
-	_ = os.write_entire_file(fmt.tprintf("%s/.env", base), "SECRET=1")
-	_ = os.write_entire_file(fmt.tprintf("%s/.env.testing", base), "TEST=1")
-	_ = os.write_entire_file(fmt.tprintf("%s/config.yaml", base), "key: value")
+	err = os.write_entire_file(fmt.tprintf("%s/.env", base), "SECRET=1")
+	testing.expectf(t, err == nil, "Failed: %v", err)
+	err = os.write_entire_file(fmt.tprintf("%s/.env.testing", base), "TEST=1")
+	testing.expectf(t, err == nil, "Failed: %v", err)
+	err = os.write_entire_file(fmt.tprintf("%s/config.yaml", base), "key: value")
+	testing.expectf(t, err == nil, "Failed: %v", err)
 
 	cfg := Config {
-		ScanConfig = ScanConfig{Matcher = "\\.env"},
+		scan_config = ScanConfig{matcher = "\\.env"},
 	}
 
 	results, ok := scan_path(base, cfg)
@@ -70,16 +73,16 @@ 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())
-	os.mkdir_all(base)
+	base := test_temp_dir(t, "envr-scan-empty-*")
 	defer os.remove_all(base)
 
 	cfg := Config {
-		ScanConfig = ScanConfig{Matcher = "\\.env"},
+		scan_config = ScanConfig{matcher = "\\.env"},
 	}
 
 	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_value(t, len(results), 0)
 }
+

sqlite/sqlite.odin

@@ -4,42 +4,57 @@ import "core:c"
 
 foreign import lib "system:sqlite3"
 
+Db :: distinct rawptr
+Stmt :: distinct rawptr
+
+// TODO: Use an enum?
 OK :: 0
 ROW :: 100
 DONE :: 101
 
-DESERIALIZE_FREEONCLOSE :: 1
-DESERIALIZE_RESIZEABLE :: 2
+
+DESERIALIZE_FLAGS :: bit_set[DESERIALIZE_FLAG]
+DESERIALIZE_FLAG :: enum u32 {
+	FREEONCLOSE = 1,
+	RESIZEABLE  = 2,
+	READONLY    = 4,
+}
+
+SERIALIZE_FLAGS :: bit_set[SERIALIZE_FLAG]
+SERIALIZE_FLAG :: enum u32 {
+	NOCOPY = 1,
+}
 
 foreign lib {
-    @(link_name="sqlite3_open")
-    db_open          :: proc(filename: cstring, ppDb: ^^rawptr) -> c.int ---
-    @(link_name="sqlite3_close")
-    db_close         :: proc(db: ^rawptr) -> c.int ---
-    @(link_name="sqlite3_errmsg")
-    db_errmsg        :: proc(db: ^rawptr) -> cstring ---
-    @(link_name="sqlite3_exec")
-    db_exec          :: proc(db: ^rawptr, sql: cstring, callback: rawptr, callback_arg: rawptr, errmsg: ^cstring) -> c.int ---
-    @(link_name="sqlite3_prepare_v2")
-    prepare_v2       :: proc(db: ^rawptr, sql: cstring, nByte: c.int, ppStmt: ^^rawptr, pzTail: ^cstring) -> c.int ---
-    @(link_name="sqlite3_step")
-    step             :: proc(stmt: ^rawptr) -> c.int ---
-    @(link_name="sqlite3_finalize")
-    finalize         :: proc(stmt: ^rawptr) -> c.int ---
-    @(link_name="sqlite3_column_text")
-    column_text      :: proc(stmt: ^rawptr, iCol: c.int) -> cstring ---
-    @(link_name="sqlite3_column_bytes")
-    column_bytes     :: proc(stmt: ^rawptr, iCol: c.int) -> c.int ---
-    @(link_name="sqlite3_bind_text")
-    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) ---
+	@(link_name = "sqlite3_open")
+	open :: proc(filename: cstring, ppDb: ^Db) -> c.int ---
+	@(link_name = "sqlite3_close")
+	close :: proc(db: Db) -> c.int ---
+	@(link_name = "sqlite3_errmsg")
+	errmsg :: proc(db: Db) -> cstring ---
+	@(link_name = "sqlite3_exec")
+	exec :: proc(db: Db, sql: cstring, callback: rawptr, callback_arg: rawptr, errmsg: ^cstring) -> c.int ---
+	@(link_name = "sqlite3_prepare_v2")
+	prepare_v2 :: proc(db: Db, sql: cstring, nByte: c.int, ppStmt: ^Stmt, pzTail: ^cstring) -> c.int ---
+	@(link_name = "sqlite3_step")
+	step :: proc(stmt: Stmt) -> c.int ---
+	@(link_name = "sqlite3_finalize")
+	finalize :: proc(stmt: Stmt) -> c.int ---
+	@(link_name = "sqlite3_column_text")
+	column_text :: proc(stmt: Stmt, iCol: c.int) -> cstring ---
+	@(link_name = "sqlite3_column_bytes")
+	column_bytes :: proc(stmt: Stmt, iCol: c.int) -> c.int ---
+	@(link_name = "sqlite3_bind_text")
+	bind_text :: proc(stmt: Stmt, idx: c.int, val: cstring, n: c.int, destructor: rawptr) -> c.int ---
+	@(link_name = "sqlite3_changes")
+	changes :: proc(db: Db) -> c.int ---
+	@(link_name = "sqlite3_serialize")
+	serialize :: proc(db: Db, zSchema: cstring, piSize: ^i64, mFlags: SERIALIZE_FLAGS) -> [^]u8 ---
+	@(link_name = "sqlite3_deserialize")
+	deserialize :: proc(db: Db, zSchema: cstring, pData: [^]u8, szDb: i64, szBuf: i64, mFlags: DESERIALIZE_FLAGS) -> c.int ---
+	@(link_name = "sqlite3_malloc64")
+	malloc64 :: proc(n: i64) -> [^]u8 ---
+	@(link_name = "sqlite3_free")
+	free :: proc(p: rawptr) ---
 }
+

ssh.odin

@@ -1,7 +1,10 @@
 package main
 
+import "base:runtime"
 import "core:encoding/base64"
+import "core:encoding/endian"
 import "core:fmt"
+import "core:mem"
 import "core:os"
 import "core:strings"
 
@@ -43,9 +46,7 @@ parse_ssh_public_key :: proc(pub_path: string) -> (pub: [32]u8, ok: bool) {
 		return
 	}
 
-	for i in 0 ..< 32 {
-		pub[i] = pk_data[i]
-	}
+	mem.copy_non_overlapping(&pub[0], raw_data(pk_data), 32)
 
 	ok = true
 	return
@@ -85,15 +86,10 @@ parse_ssh_private_key :: proc(priv_path: string) -> (kp: Ed25519Keypair, ok: boo
 		return
 	}
 
-	magic := "openssh-key-v1\x00"
-	if len(decoded) < len(magic) {
+	magic :: "openssh-key-v1\x00"
+	if !strings.has_prefix(string(decoded), magic) {
 		return
 	}
-	for i in 0 ..< len(magic) {
-		if decoded[i] != u8(magic[i]) {
-			return
-		}
-	}
 
 	offset := len(magic)
 
@@ -115,8 +111,8 @@ parse_ssh_private_key :: proc(priv_path: string) -> (kp: Ed25519Keypair, ok: boo
 	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])
+
+	num_keys := endian.get_u32(decoded[offset:offset + 4], .Big) or_return
 	offset += 4
 
 	if num_keys != 1 {
@@ -137,11 +133,16 @@ parse_ssh_private_key :: proc(priv_path: string) -> (kp: Ed25519Keypair, ok: boo
 	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])
+
+	check1 := endian.get_u32(
+		transmute([]u8)(priv_blob)[inner_offset:inner_offset + 4],
+		.Big,
+	) or_return
 	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])
+	check2 := endian.get_u32(
+		transmute([]u8)(priv_blob)[inner_offset:inner_offset + 4],
+		.Big,
+	) or_return
 	inner_offset += 4
 
 	if check1 != check2 {
@@ -157,99 +158,44 @@ parse_ssh_private_key :: proc(priv_path: string) -> (kp: Ed25519Keypair, ok: boo
 	if !pub_ok || len(pub_wire) != 32 {
 		return
 	}
-	for i in 0 ..< 32 {
-		kp.Public[i] = pub_wire[i]
-	}
+	mem.copy_non_overlapping(&kp.Public[0], raw_data(pub_wire), 32)
 
 	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]
-	}
+
+	mem.copy_non_overlapping(&kp.Private[0], raw_data(priv_wire), 32)
 
 	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"
+is_ed25519_key :: proc(
+	priv_path: string,
+) -> (
+	ok: bool,
+	err: runtime.Allocator_Error,
+) #optional_allocator_error {
+	pub_path := strings.concatenate([]string{priv_path, ".pub"}, context.temp_allocator) or_return
+	_, ok = parse_ssh_public_key(pub_path)
+	return ok, nil
 }
 
 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])
+	length := endian.get_u32(data[offset^:offset^ + 4], .Big) or_return
 	offset^ += 4
 
 	if offset^ + int(length) > len(data) {
 		return
 	}
 
-	s = string(data[offset^ : offset^ + int(length)])
+	s = string(data[offset^:offset^ + int(length)])
 	offset^ += int(length)
 	ok = true
 	return
 }
+

ssh_test.odin

@@ -1,9 +1,11 @@
+#+test
 package main
 
 import "core:fmt"
+import "core:os"
 import "core:testing"
 
-TEST_KEY_DIR :: "fixtures/keys"
+TEST_KEY_DIR :: "fixtures" + os.Path_Separator_String + "keys"
 
 @(test)
 test_parse_ed25519_public_key :: proc(t: ^testing.T) {
@@ -44,15 +46,7 @@ test_private_key_pub_matches_public_key :: proc(t: ^testing.T) {
 	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,
-		),
-	)
+	testing.expect_value(t, pub_from_pub, kp.Public)
 }
 
 @(test)
@@ -62,47 +56,11 @@ test_read_wire_string :: proc(t: ^testing.T) {
 
 	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))
+	testing.expect_value(t, s, "hello")
+	testing.expect_value(t, offset, 9)
 
 	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)",
-	)
+	testing.expect_value(t, s2, "")
 }
 

table.odin

@@ -1,89 +1,75 @@
 package main
 
-import "core:encoding/json"
 import "core:fmt"
 import "core:io"
-import "core:strings"
+import "core:text/table"
 
-render_table :: proc(w: io.Writer, headers: []string, rows: [][]string) {
-	col_widths := make([dynamic]int, 0, len(headers))
-	for i in 0 ..< len(headers) {
-		append(&col_widths, strings.rune_count(headers[i]))
-	}
-	for r in rows {
-		for i in 0 ..< len(r) {
-			rw := strings.rune_count(r[i])
-			if i < len(col_widths) && rw > col_widths[i] {
-				col_widths[i] = rw
-			}
-		}
-	}
-
-	b: strings.Builder
-	strings.builder_init(&b)
-	defer strings.builder_destroy(&b)
-	defer delete(col_widths)
-
-	hline :: proc(w: io.Writer, b: ^strings.Builder, left, mid, right: string, widths: [dynamic]int) {
-		strings.write_string(b, left)
-		for i in 0 ..< len(widths) {
-			for _ in 0 ..< widths[i] + 2 {
-				strings.write_string(b, "\u2500")
-			}
-			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)
-		strings.builder_reset(b)
-	}
-
-	hline(w, &b, "\u250c", "\u252c", "\u2510", col_widths)
-
-	cell :: proc(b: ^strings.Builder, s: string, width: int) {
-		extra := len(s) - strings.rune_count(s)
-		fmt.sbprintf(b, " %-*s \u2502", width + extra, s)
-	}
-
-	strings.write_string(&b, "\u2502")
-	for i in 0 ..< len(headers) {
-		cell(&b, headers[i], col_widths[i])
-	}
-	fmt.wprintf(w, "%s\n", strings.to_string(b), flush = false)
-	strings.builder_reset(&b)
-
-	hline(w, &b, "\u251c", "\u253c", "\u2524", col_widths)
-
-	for r in rows {
-		strings.write_string(&b, "\u2502")
-		for i in 0 ..< len(r) {
-			cell(&b, r[i], col_widths[i])
-		}
-		fmt.wprintf(w, "%s\n", strings.to_string(b), flush = false)
-		strings.builder_reset(&b)
-	}
-
-	hline(w, &b, "\u2514", "\u2534", "\u2518", col_widths)
+decorations := table.Decorations {
+	"┌",
+	"┬",
+	"┐",
+	"├",
+	"┼",
+	"┤",
+	"└",
+	"┴",
+	"┘",
+	"│",
+	"─",
 }
 
-render_json_rows :: proc(w: io.Writer, headers: []string, rows: [][]string) {
-	entries := make([dynamic]map[string]string, 0, len(rows), context.temp_allocator)
-
-	for row in rows {
-		entry := make(map[string]string, len(headers), context.temp_allocator)
-		for i in 0 ..< len(headers) {
-			entry[headers[i]] = row[i]
+ansi_aware_width :: proc(str: string) -> int #no_bounds_check {
+	width := 0
+	for i := 0; i < len(str); {
+		if i + 1 < len(str) && str[i] == 0x1b && str[i + 1] == '[' {
+			i += 2
+			for i < len(str) {c := str[i]; i += 1; if c >= 0x40 && c <= 0x7E {break}}
+		} else {
+			width += 1
+			i += 1
 		}
-		append(&entries, entry)
 	}
-
-	data, err := json.marshal(entries[:], allocator = context.temp_allocator)
-	if err != nil {
-		fmt.eprintf("Error marshaling JSON: %v\n", err)
-		return
-	}
-	fmt.wprintf(w, "%s", data, flush = false)
+	return width
+}
+
+write_borderless_table :: proc(w: io.Writer, t: ^table.Table) {
+	table.build(t, ansi_aware_width)
+
+	write_table_separator :: proc(w: io.Writer, tbl: ^table.Table) {
+		io.write_byte(w, '\n')
+	}
+
+	if t.caption != "" {
+		table.write_text_align(
+			w,
+			fmt.tprintf("%s%s%s", COLOR_HEADINGS, t.caption, ANSI_RESET),
+			.Left,
+			0, //t.lpad,
+			0, //t.rpad,
+			t.tblw + t.nr_cols - 1 - ansi_aware_width(t.caption) - t.lpad - t.rpad,
+		)
+		io.write_byte(w, '\n')
+	}
+
+	write_table_separator(w, t)
+	for row in 0 ..< t.nr_rows {
+		for col in 0 ..< t.nr_cols {
+			table.write_table_cell(w, t, row, col)
+		}
+		io.write_byte(w, '\n')
+		if t.has_header_row && row == table.header_row(t) {
+			write_table_separator(w, t)
+		}
+	}
+	write_table_separator(w, t)
+}
+
+table_reset :: proc(t: ^table.Table) {
+	clear(&t.cells)
+	clear(&t.colw)
+	t.caption = ""
+	t.tblw = 0
+	t.nr_cols = 0
+	t.nr_rows = 0
 }
 

table_test.odin

@@ -1,198 +1,33 @@
+#+test
+
 package main
 
-import "core:encoding/json"
-import "core:fmt"
-import "core:strings"
 import "core:testing"
 
 @(test)
-test_render_json_rows_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_json_rows(w, headers, rows)
-
-	output := strings.to_string(b)
-
-	result: []map[string]string = ---
-	unmarshal_err := json.unmarshal_string(output, &result, allocator = context.temp_allocator)
-	testing.expect(
-		t,
-		unmarshal_err == nil,
-		fmt.tprintf("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,
-		result[0]["name"] == "foo",
-		fmt.tprintf("expected name=foo, got %q", result[0]["name"]),
-	)
-	testing.expect(t, result[0]["path"] == "/home/user/.env")
-	testing.expect(t, result[1]["name"] == "bar")
-	testing.expect(t, result[1]["path"] == "/home/user/project/.env")
+test_ansi_aware_width_plain_ascii :: proc(t: ^testing.T) {
+	testing.expect_value(t, ansi_aware_width("hello"), 5)
 }
 
 @(test)
-test_render_json_rows_special_chars :: proc(t: ^testing.T) {
-	b: strings.Builder
-	strings.builder_init(&b)
-	defer strings.builder_destroy(&b)
-
-	headers := []string{"key", "value"}
-	rows := [][]string {
-		{"quote", `has "double quotes"`},
-		{"backslash", `path\to\file`},
-		{"newline", "line1\nline2"},
-		{"mixed", `a "b" c\nd`},
-	}
-
-	w := strings.to_writer(&b)
-	render_json_rows(w, headers, rows)
-
-	output := strings.to_string(b)
-
-	result: []map[string]string = ---
-	unmarshal_err := json.unmarshal(
-		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),
-	)
-	testing.expect(t, len(result) == 4)
-	testing.expect(
-		t,
-		result[0]["value"] == `has "double quotes"`,
-		fmt.tprintf("got %q", result[0]["value"]),
-	)
-	testing.expect(t, result[1]["value"] == `path\to\file`)
-	testing.expect(t, result[2]["value"] == "line1\nline2")
-	testing.expect(t, result[3]["value"] == `a "b" c\nd`)
+test_ansi_aware_width_empty :: proc(t: ^testing.T) {
+	testing.expect_value(t, ansi_aware_width(""), 0)
 }
 
 @(test)
-test_render_json_rows_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_json_rows(w, headers, rows)
-
-	output := strings.to_string(b)
-
-	result: []map[string]string = ---
-	unmarshal_err := json.unmarshal_string(output, &result, allocator = context.temp_allocator)
-	testing.expect(
-		t,
-		unmarshal_err == nil,
-		fmt.tprintf("json unmarshal failed: %v\noutput was: %q", unmarshal_err, output),
-	)
-	testing.expect(t, len(result) == 0)
+test_ansi_aware_width_with_color_codes :: proc(t: ^testing.T) {
+	colored := COLOR_TABLE_HEADING + "Directory" + ANSI_RESET
+	testing.expect_value(t, ansi_aware_width(colored), 9)
 }
 
 @(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_ansi_aware_width_multibyte :: proc(t: ^testing.T) {
+	testing.expect_value(t, ansi_aware_width("\u2713 Available"), 13)
+	testing.expect_value(t, ansi_aware_width("\u2717 Missing"), 11)
 }
 
 @(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_ansi_aware_width_multiple_escape_sequences :: proc(t: ^testing.T) {
+	colored := COLOR_TABLE_HEADING + "a" + ANSI_RESET + "b" + COLOR_TABLE_HEADING + "c" + ANSI_RESET
+	testing.expect_value(t, ansi_aware_width(colored), 3)
 }
-
-@(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,
-		),
-	)
-}
-