chore(dev): release 0.4.0

2026-06-27 18:48:33 -04:00 · 2026-06-18 10:35:49 -04:00
36 changed files with 1160 additions and 883 deletions
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -2,6 +2,8 @@ on:
  push:
    branches:
      - main
+      - dev
+      - odin

 permissions:
  contents: write
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ man
 builds
 envr
 envr-go
-envr-prof
 findr/findr
 findr/findr-prof
 findr/bench-*.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog

+## [0.4.0](https://github.com/sbrow/envr/compare/v0.3.0...v0.4.0) (2026-06-18)
+
+
+### Features
+
+* Removed runtime git dependency. ([12574e1](https://github.com/sbrow/envr/commit/12574e123bdedba3aca813143e906ec5e0b95719))
+
+
+### Bug Fixes
+
+* Fixed memory leaks in the db. ([5059572](https://github.com/sbrow/envr/commit/5059572951b3ec20b3d2027032a9c3be5cb14dba))
+
+
+### Performance Improvements
+
+* Replaced `fd` with custom internals. ([2ef733f](https://github.com/sbrow/envr/commit/2ef733fe58594b0a0b6e3ef85142b74af445ccb8))
+
 ## [0.3.0](https://github.com/sbrow/envr/compare/v0.2.1...v0.3.0) (2026-06-16)

 Version 0.3.0 represents a significant departure (and improvement) for envr.
--- a/9
+++ b/9
@@ -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 profile help
+.PHONY: all clean cleanall build-linux build-darwin compress release help

 # Default target
 all: release clean
@@ -66,12 +66,6 @@ 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..."
@@ -90,7 +84,6 @@ 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"
--- a/TABLE_IMPROVEMENT_PLAN.md
+++ b/TABLE_IMPROVEMENT_PLAN.md
@@ -0,0 +1,268 @@
+# 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
--- a/TODOS.md
+++ b/TODOS.md
@@ -1,62 +1,55 @@
 # TODOs

-1. Commands are still leaking.
+1. Consider giving db its own allocator

-2. **db.odin** — Inconsistencies in how struct vs sqlite are named.
+27. Commands are still leaking.

-3. Add color flag and support non colored output.
+2. Generate md and man pages again.

-4. Use text/tables for command output
+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.

-5. Generate md and man pages again.
+4. Make sure official path separators are used when appropriate, rather than '/'.

-6. **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.
+5. **cmd_restore.odin:20-30 & cmd_remove.odin:19-29** — Identical path-resolution block copy-pasted. `is_abs` guard is redundant since `filepath.abs` is a no-op on absolute paths. Extract a helper.

-7. Make sure official path separators are used when appropriate, rather than '/'.
+6. **cmd_restore.odin:44** — `os.mkdir_all` error silently discarded. Subsequent write failure will be confusing.

-8. **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.
+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.

-9. **cmd_restore.odin:44** — `os.mkdir_all` error silently discarded. Subsequent write failure will be confusing.
+10. **db.odin:115** — `json.unmarshal_string` error not checked. Malformed JSON silently produces empty/partial data.

-10. **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.
+11. **db.odin:352-353** — `hex.encode` error ignored. `string(hex_bytes)` aliases the byte slice.

-11. **db.odin:115** — `json.unmarshal_string` error not checked. Malformed JSON silently produces empty/partial data.
+12. **cmd_sync.odin:80, cmd_list.odin:33** — `make([]string, 2)` for table rows never freed. Leaks per row. Defer to memory pass.

-12. **db.odin:352-353** — `hex.encode` error ignored. `string(hex_bytes)` aliases the byte slice.
-
-13. **cmd_sync.odin:80, cmd_list.odin:33** — `make([]string, 2)` for table rows never freed. Leaks per row. Defer to memory pass.
+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"`.

 14. Check for prealloc opportunities. i.e. `make([dynamic]string)` -> `make([dynamic]string, 5)`.

 15. Add a text filter to the multi_select.

-16. Add tests for untested commands.
+17. Add tests for untested commands.

-17. 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.
+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.

-18. add --format -f flag to commands that draw tables.
+20. add --format -f flag to commands that draw tables.

-19. Replace `testing.expect` calls with `testing.expect_value` calls where appropriate.
+21. Replace `testing.expect` calls with `testing.expect_value` calls where appropriate.

-20. Change struct field names from PascalCase to snake_case.
+22. Change struct field names from PascalCase to snake_case.

-21. procedures should be ordered by use, main at the top, then in the order they are called from main.
+23. procedures should be ordered by use, main at the top, then in the order they are called from main.

-22. Shell completion
+24. Shell completion

-23. Bring back windows support / cross-compilation.
+25. Bring back windows support / cross-compilation.

-24. Test all cmds / terminal branches.
-
-25. Replace `fmt.tprintf("/tmp/envr-test-...-%d", os.get_pid())` + `os.mkdir_all` in test files with `os.mkdir_temp` (race-free, honors `$TMPDIR`, matches `findr/test_env.odin` pattern).
-
-26. Adopt `core:log` across `db.odin`, `crypto.odin`, `config.odin`, `ssh.odin` — replace ~30 scattered `fmt.printf("Error ...")` calls with leveled logging for consistent stderr routing and source locations.
+26. Test all cmds / terminal branches.

 ## Double-check AI output

 - [ ] cli.odin
 - [ ] cli_test.odin
- [x] colors.odin
 - [x] cmd_backup.odin
 - [x] cmd_check.odin
 - [ ] cmd_check_test.odin
@@ -83,7 +76,7 @@
 - [ ] scan.odin
 - [ ] scan_test.odin
 - [ ] sodium.odin
- [x] sqlite/sqlite.odin
+- [ ] sqlite/sqlite.odin
 - [ ] ssh.odin
 - [ ] ssh_test.odin
 - [ ] table.odin
--- a/cli.odin
+++ b/cli.odin
@@ -75,7 +75,6 @@ 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]
@@ -103,10 +102,9 @@ parse_args :: proc(args: []string, out: io.Stream, err: io.Stream) -> (cmd: Comm
 		}
 	}

-	val: string = ---
-	if val, ok = cmd.flags["config-file"]; ok {
+	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
@@ -138,38 +136,13 @@ write_command_help :: proc(name: string, w: io.Writer) -> bool {
 		return 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,
-	)
+	fmt.wprintf(w, "Usage: %s [flags]\n\n", info.usage, flush = false)
+	fmt.wprintf(w, "%s\n", info.short, flush = false)

 	if len(info.aliases) > 0 {
-		fmt.wprintf(
-			w,
-			"\n" +
-			COLOR_HEADINGS +
-			"Aliases:" +
-			ANSI_RESET +
-			"\n\n  " +
-			COLOR_COMMANDS +
-			"%s" +
-			ANSI_RESET,
-			info.name,
-			flush = false,
-		)
+		fmt.wprintf(w, "\nAliases:\n  %s", info.name, flush = false)
 		for a in info.aliases {
-			fmt.wprintf(w, ", " + COLOR_COMMANDS + "%s" + ANSI_RESET, a, flush = false)
+			fmt.wprintf(w, ", %s", a, flush = false)
 		}
 		fmt.wprintf(w, "\n", flush = false)
 	}
@@ -180,20 +153,7 @@ write_command_help :: proc(name: string, w: io.Writer) -> bool {

 	fmt.wprintf(
 		w,
-		"\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")
-`,
+		"\nFlags:\n  -h, --help   help for %s\n  -c, --config-file <path>   config file (default \"~/.envr/config.json\")\n",
 		info.name,
 		flush = false,
 	)
@@ -218,11 +178,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, encrypted database.
+		`envr keeps your .env synced to a local, age encrypted database.
 Is a safe and easy way to gather all your .env files in one place where they can
 easily be backed by another tool such as restic or git.

-All your data is stored in ~/.envr/data.envr
+All your data is stored in ~/data.age

 Getting started is easy:

@@ -249,29 +209,21 @@ at before, restore your backup with:

 > envr restore ~/<path to repository>/.env

-%sUsage:%s
+Usage:
+  envr [command]

-  %senvr%s [command]
-
-%sAvailable Commands:%s
+Available Commands:
 `,
-		COLOR_HEADINGS,
-		ANSI_RESET,
-		COLOR_FLAGS,
-		ANSI_RESET,
-		COLOR_HEADINGS,
-		ANSI_RESET,
 		flush = false,
 	)

 	for c in COMMANDS {
 		name_start := len(c.name)
-		fmt.wprintf(w, "  %s%s", COLOR_COMMANDS, c.name, flush = false)
+		fmt.wprintf(w, "%s", c.name, flush = false)
 		for a in c.aliases {
 			fmt.wprintf(w, ", %s", a, flush = false)
 			name_start += len(a) + 2
 		}
-		fmt.wprint(w, ANSI_RESET)
 		padding := 20 - name_start
 		if padding > 0 {
 			for _ in 0 ..< padding {
@@ -283,32 +235,24 @@ at before, restore your backup with:

 	fmt.wprintf(
 		w,
-		"\n" +
-		COLOR_HEADINGS +
-		"Flags:" +
-		ANSI_RESET +
-		"\n\n  " +
-		COLOR_FLAGS +
-		"-h, --help" +
-		ANSI_RESET +
-		"   help for envr\n" +
-		COLOR_FLAGS +
-		`  -c, --config-file` +
-		ANSI_RESET +
-		` <path>   config file (default "~/.envr/config.json")
+		`
+Flags:
+  -h, --help   help for envr
+  -c, --config-file <path>   config file (default "~/.envr/config.json")

-Use "` +
-		COLOR_FLAGS +
-		"envr" +
-		ANSI_RESET +
-		` [command] --help" for more information about a command.
+Use "envr [command] --help" for more information about a command.
 `,
 		flush = false,
 	)
 }

 has_flag :: proc(cmd: ^Command, name: string) -> bool {
-	return name in cmd.flags || name in cmd.bool_set
+	_, ok := cmd.flags[name]
+	if ok {
+		return true
+	}
+	_, ok2 := cmd.bool_set[name]
+	return ok2
 }

 delete_command :: proc(cmd: ^Command) {
--- a/cli_test.odin
+++ b/cli_test.odin
@@ -1,6 +1,5 @@
 #+feature dynamic-literals
 package main
-package main

 import "core:bufio"
 import "core:fmt"
@@ -58,7 +57,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, "Use \"envr [command] --help\""), "missing help hint")
-}
+}

@(test)
 test_command_help_backup :: proc(t: ^testing.T) {
--- a/cmd_check.odin
+++ b/cmd_check.odin
@@ -4,8 +4,6 @@ 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
 	if len(cmd.args) > 0 {
@@ -39,8 +37,7 @@ cmd_check :: proc(cmd: ^Command) {

 	is_dir := os.is_directory(abs_path)

-	// TODO: set a reasonable default
-	files_in_path := make([dynamic]string, context.temp_allocator)
+	files_in_path: [dynamic]string

 	if is_dir {
 		scanned, scan_ok := scan_path(abs_path, db.cfg)
@@ -57,6 +54,8 @@ cmd_check :: proc(cmd: ^Command) {
 	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[:])

--- a/cmd_check_test.odin
+++ b/cmd_check_test.odin
@@ -1,4 +1,3 @@
-#+test
 package main

 import "core:fmt"
--- a/cmd_edit_config.odin
+++ b/cmd_edit_config.odin
@@ -12,7 +12,8 @@ cmd_edit_config :: proc(cmd: ^Command) {

 	config_path := cmd.config_path

-	if !os.exists(config_path) {
+	_, stat_err := os.stat(config_path, context.allocator)
+	if stat_err != nil {
 		fmt.wprintf(
 			cmd.err,
 			"Config file does not exist at %s. Run 'envr init' first.\n",
--- a/cmd_init.odin
+++ b/cmd_init.odin
@@ -1,7 +1,6 @@
 package main

 import "core:fmt"
-import "core:terminal/ansi"

 cmd_init :: proc(cmd: ^Command) {
 	force := has_flag(cmd, "force") || has_flag(cmd, "f")
@@ -33,7 +32,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, ansi.CSI + ansi.FAINT + ansi.SGR + "Cancelled." + ANSI_RESET, flush = false)
+		fmt.wprintln(cmd.out, "\x1b[2mCancelled.\x1b[0m", flush = false)
 		return
 	}

--- a/cmd_list.odin
+++ b/cmd_list.odin
@@ -6,7 +6,6 @@ import "core:os"
 import "core:path/filepath"
 import "core:strings"
 import "core:terminal"
-import "core:text/table"

 ListEntry :: struct {
 	Directory: string `json:"directory"`,
@@ -26,29 +25,23 @@ 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) {
-		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,
-		)
+		headers := []string{"Directory", "Path"}
+		table_rows := make([dynamic][]string, 0, len(rows), context.temp_allocator)

 		for row in rows {
-			dir_str := strings.concatenate(
-				{row.Dir, os.Path_Separator_String},
-				context.temp_allocator,
-			)
+			dir_str := strings.concatenate({row.Dir, "/"}, context.temp_allocator)
 			filename := filepath.base(row.Path)
-
-			table.row(&t, dir_str, filename)
+			row_slice := make([]string, 2, context.temp_allocator)
+			row_slice[0] = dir_str
+			row_slice[1] = filename
+			append(&table_rows, row_slice)
 		}

-		table.write_decorated_table(cmd.out, &t, decorations, ansi_aware_width)
+		render_table(cmd.out, headers, table_rows[:])
 	} else {
 		// TODO: Should we instead print full entries here?
 		entries: [dynamic]ListEntry
--- a/cmd_list_test.odin
+++ b/cmd_list_test.odin
@@ -1,4 +1,3 @@
-#+test
 package main

 import "core:path/filepath"
--- a/cmd_nushell_completion_test.odin
+++ b/cmd_nushell_completion_test.odin
@@ -1,4 +1,3 @@
-#+test
 package main

 import "core:fmt"
--- a/cmd_scan.odin
+++ b/cmd_scan.odin
@@ -4,7 +4,6 @@ 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)
@@ -13,7 +12,7 @@ cmd_scan :: proc(cmd: ^Command) {
 	}
 	defer db_close(&db)

-	search_dirs := search_paths(db.cfg, context.temp_allocator)
+	search_dirs := search_paths(db.cfg)
 	if len(search_dirs) == 0 {
 		fmt.wprintln(
 			cmd.err,
@@ -24,15 +23,9 @@ cmd_scan :: proc(cmd: ^Command) {
 	}

 	// TODO: Figure out a sane default
-	// 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)
-	}
+	all_files: [dynamic]string
 	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
@@ -72,7 +65,7 @@ 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, ansi.CSI + ansi.FAINT + ansi.SGR + "Cancelled." + ANSI_RESET, flush = false)
+		fmt.wprintln(cmd.out, "\x1b[2mCancelled.\x1b[0m", flush = false)
 		return
 	}

@@ -96,12 +89,12 @@ cmd_scan :: proc(cmd: ^Command) {
 	if added_count > 0 {
 		fmt.wprintf(
 			cmd.out,
-			ansi.CSI + ansi.BOLD + ";" + ansi.FG_GREEN + ansi.SGR + "Successfully added %d file(s) to backup." + ANSI_RESET + "\n",
+			"\x1b[1;32mSuccessfully added %d file(s) to backup.\x1b[0m\n",
 			added_count,
 			flush = false,
 		)
 	} else {
-		fmt.wprintln(cmd.out, ansi.CSI + ansi.FAINT + ansi.SGR + "No files were added." + ANSI_RESET, flush = false)
+		fmt.wprintln(cmd.out, "\x1b[2mNo files were added.\x1b[0m", flush = false)
 	}
 }

--- a/cmd_sync.odin
+++ b/cmd_sync.odin
@@ -3,8 +3,8 @@ 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"`,
@@ -24,50 +24,68 @@ cmd_sync :: proc(cmd: ^Command) {
 	if !list_ok {
 		return
 	}
+	defer delete(files)

-	results := make([]SyncEntry, len(files), context.temp_allocator)
+	// TODO: Set sane default size
+	results: [dynamic]SyncEntry
+	defer delete(results)

-	for &file, i in files {
-		result, err := db_sync(&db, &file)
+	for &file in files {
+		old_path: string
+		old_path, _ = strings.clone(file.Path, context.temp_allocator)
+
+		result, err_msg := db_sync(&db, &file)

 		status: string
-		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"
+		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:
+			status = "Moved"
+		case:
 			status = "OK"
 		}

-		results[i] = SyncEntry {
-			Path   = file.Path,
-			Status = status,
+		if is_dir_updated {
+			if !db_delete(&db, old_path) {
+				return
 			}
 		}
+		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) {
-		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,
-		)
+		headers := []string{"File", "Status"}
+		table_rows := make([dynamic][]string, 0, len(results))

 		for res in results {
-			table.row(&t, res.Path, res.Status)
+			row_slice := make([]string, 2)
+			row_slice[0] = res.Path
+			row_slice[1] = res.Status
+			append(&table_rows, row_slice)
 		}

-		table.write_decorated_table(cmd.out, &t, decorations, ansi_aware_width)
+		render_table(cmd.out, headers, table_rows[:])
 	} else {
-		data, marshal_err := json.marshal(results[:], allocator = context.temp_allocator)
+		data, marshal_err := json.marshal(results[:])
 		if marshal_err != nil {
 			fmt.wprintf(cmd.err, "Error marshaling JSON: %v\n", marshal_err, flush = false)
 			return
@@ -76,23 +94,3 @@ 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"
-}
-
--- a/colors.odin
+++ b/colors.odin
@@ -1,17 +0,0 @@
-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
-
--- a/config.odin
+++ b/config.odin
@@ -25,16 +25,17 @@ Config :: struct {
 	config_path: string `json:"-"`,
 }

-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)
+load_config :: proc(config_path: string) -> (Config, bool) {
+	data, read_err := os.read_entire_file_from_path(config_path, context.allocator)
 	if read_err != nil {
 		fmt.println("No config file found. Please run `envr init` to generate one.")
 		return Config{}, false
 	}
+	defer delete(data)

 	cfg: Config
-	err := json.unmarshal(data, &cfg, .JSON5, allocator)
+	// TODO: use json 5
+	err := json.unmarshal(data, &cfg)
 	if err != nil {
 		fmt.printf("Error parsing config: %v\n", err)
 		return Config{}, false
@@ -52,22 +53,22 @@ default_config_path :: proc(home: string, allocator := context.allocator) -> str
 	return path
 }

-delete_config :: proc(cfg: ^Config, allocator := context.allocator) {
+delete_config :: proc(cfg: ^Config) {
 	for key in cfg.Keys {
-		delete(key.Private, allocator)
-		delete(key.Public, allocator)
+		delete(key.Private)
+		delete(key.Public)
 	}
 	delete(cfg.Keys)

-	delete(cfg.ScanConfig.Matcher, allocator)
+	delete(cfg.ScanConfig.Matcher)

 	for exclude in cfg.ScanConfig.Exclude {
-		delete(exclude, allocator)
+		delete(exclude)
 	}
 	delete(cfg.ScanConfig.Exclude)

 	for include in cfg.ScanConfig.Include {
-		delete(include, allocator)
+		delete(include)
 	}
 	delete(cfg.ScanConfig.Include)
 }
@@ -84,9 +85,9 @@ save_config :: proc(cfg: Config, force: bool = false) -> bool {
 	}

 	if os.exists(cfg.config_path) && !force {
-		info, stat_err := os.stat(cfg.config_path, context.temp_allocator)
+		info, stat_err := os.stat(cfg.config_path, context.allocator)
 		if stat_err == nil {
-			defer os.file_info_delete(info, context.temp_allocator)
+			defer os.file_info_delete(info, context.allocator)
 			if info.size > 0 {
 				fmt.println("Config file already exists. Run again with --force to reinitialize.")
 				return false
@@ -94,15 +95,12 @@ save_config :: proc(cfg: Config, force: bool = false) -> bool {
 		}
 	}

-	data, marshal_err := json.marshal(
-		cfg,
-		{pretty = true, use_spaces = true, spaces = 2},
-		context.temp_allocator,
-	)
+	data, marshal_err := json.marshal(cfg, {pretty = true, use_spaces = true, spaces = 2})
 	if marshal_err != nil {
 		fmt.printf("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 {
@@ -190,40 +188,32 @@ find_ssh_private_keys :: proc() -> (keys: [dynamic]string, ok: bool) {
 	return
 }

-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(), allocator)
+find_git_roots :: proc(cfg: Config) -> (roots: [dynamic]string, ok: bool) {
+	paths := search_paths(cfg)
 	findr.find_repos(paths[:], &roots, os.get_processor_core_count())
 	ok = true
 	return
 }

-search_paths :: proc(cfg: Config, allocator := context.allocator) -> [dynamic]string {
+search_paths :: proc(cfg: Config) -> (paths: [dynamic]string) {
+	// TODO: Is this okay?
 	// TODO: handle error
 	home, _ := os.user_home_dir(context.temp_allocator)

-	paths, _ := new_clone(cfg.ScanConfig.Include, allocator)
-
-	for &include in paths {
+	for include in cfg.ScanConfig.Include {
 		// TODO: Do we need to manually expand ~/ in odin?
-		expanded, _ := strings.replace(include, "~", home, 1, allocator)
+		expanded, _ := strings.replace(include, "~", home, 1)
 		if filepath.is_abs(expanded) {
-			include = expanded
+			append(&paths, expanded)
 		} else {
-			resolved, err := filepath.abs(expanded, allocator)
+			defer delete(expanded)
+			resolved, err := filepath.abs(expanded)
 			if err == nil {
-				include = resolved
+				append(&paths, resolved)
 			}
 		}
 	}
-	return paths^
+	return
 }

 envr_dir :: proc(config_path: string) -> string {
--- a/config_test.odin
+++ b/config_test.odin
@@ -1,4 +1,3 @@
-#+test
 package main

 import "core:fmt"
@@ -188,10 +187,14 @@ test_search_paths_expands_tilde :: proc(t: ^testing.T) {
 	cfg := Config {
 		ScanConfig = ScanConfig{Include = make([dynamic]string, 0, 1)},
 	}
-	append(&cfg.ScanConfig.Include, "~")
 	defer delete(cfg.ScanConfig.Include)
+	append(&cfg.ScanConfig.Include, "~")

-	paths := search_paths(cfg, context.temp_allocator)
+	paths := search_paths(cfg)
+	defer delete(paths)
+	for path in paths {
+		defer delete(path)
+	}

 	testing.expect(t, len(paths) == 1, "should have 1 path")
 	if len(paths) > 0 {
--- a/crypto.odin
+++ b/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, context.temp_allocator)
+	x25519_pairs, pairs_ok := ssh_to_x25519(keys)
 	if !pairs_ok {
 		return
 	}
+	defer delete(x25519_pairs)

 	sym_key: [CRYPTO_SECRETBOX_KEY_BYTES]u8
 	randombytes_buf(&sym_key[0], CRYPTO_SECRETBOX_KEY_BYTES)
@@ -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, context.temp_allocator)
+	secret_ct := make([]u8, ct_len)
 	pt_ptr: [^]u8
 	if len(plaintext) > 0 {
 		pt_ptr = &plaintext[0]
@@ -66,7 +66,7 @@ encrypt :: proc(plaintext: []u8, keys: []SshKeyPair) -> (ciphertext: []u8, ok: b
 	}

 	num_recipients := u32(len(x25519_pairs))
-	entries := make([]RecipientEntry, num_recipients, context.temp_allocator)
+	entries := make([]RecipientEntry, num_recipients)

 	for i in 0 ..< len(x25519_pairs) {
 		for j in 0 ..< CRYPTO_BOX_PUBLICKEY_BYTES {
@@ -126,6 +126,8 @@ 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
 }
@@ -174,10 +176,11 @@ 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, context.temp_allocator)
+	x25519_pairs, pairs_ok := ssh_to_x25519(keys)
 	if !pairs_ok {
 		return
 	}
+	defer delete(x25519_pairs)

 	found := false
 	matched_pi := 0
@@ -269,39 +272,33 @@ decrypt :: proc(ciphertext: []u8, keys: []SshKeyPair) -> (plaintext: []u8, ok: b
 	return
 }

-ssh_to_x25519 :: proc(
-	keys: []SshKeyPair,
-	allocator := context.temp_allocator,
-) -> (
-	[]X25519Keypair,
-	bool,
-) {
+ssh_to_x25519 :: proc(keys: []SshKeyPair) -> (pairs: []X25519Keypair, ok: bool) {
 	if len(keys) == 0 {
-		return {}, false
+		return
 	}

-	pairs := make([]X25519Keypair, len(keys), allocator)
+	pairs = make([]X25519Keypair, len(keys))

 	for i in 0 ..< len(keys) {
 		ssh_kp, parse_ok := parse_ssh_private_key(keys[i].Private)
 		if !parse_ok {
 			fmt.printf("Error: failed to parse SSH private key: %s\n", keys[i].Private)
 			delete(pairs)
-			return pairs, false
+			return
 		}

 		ssh_pub, pub_ok := parse_ssh_public_key(keys[i].Public)
 		if !pub_ok {
 			fmt.printf("Error: failed to parse SSH public key: %s\n", keys[i].Public)
 			delete(pairs)
-			return pairs, false
+			return
 		}

 		pk_rc := crypto_sign_ed25519_pk_to_curve25519(&pairs[i].Public[0], &ssh_pub[0])
 		if pk_rc != 0 {
 			fmt.println("Error: failed to convert ed25519 public key to curve25519")
 			delete(pairs)
-			return pairs, false
+			return
 		}

 		ed25519_sk: [64]u8
@@ -316,10 +313,11 @@ ssh_to_x25519 :: proc(
 		if sk_rc != 0 {
 			fmt.println("Error: failed to convert ed25519 private key to curve25519")
 			delete(pairs)
-			return pairs, false
+			return
 		}
 	}

-	return pairs, true
+	ok = true
+	return
 }

--- a/crypto_test.odin
+++ b/crypto_test.odin
@@ -1,11 +1,9 @@
-#+test
 package main

 import "core:fmt"
-import "core:os"
 import "core:testing"

-CRYPTO_TEST_KEY_DIR :: "fixtures" + os.Path_Separator_String + "keys"
+CRYPTO_TEST_KEY_DIR :: "fixtures/keys"

 make_test_key_pair :: proc(name: string) -> SshKeyPair {
 	priv := fmt.tprintf("%s/%s", CRYPTO_TEST_KEY_DIR, name)
--- a/db.odin
+++ b/db.odin
@@ -5,7 +5,6 @@ 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"
@@ -13,28 +12,25 @@ import "core:strings"
 import "sqlite"

 SyncFlagEnum :: enum {
+	Noop,
 	DirUpdated,
 	Restored,
 	BackedUp,
+	Error,
 }

 SyncFlag :: bit_set[SyncFlagEnum]

-SyncError :: enum {
-	None,
-	DirMissing,
-	MultipleDirs,
-	GitRootFailed,
-	WriteFailed,
-	ReadFailed,
-	DbFailed,
+SyncDirection :: enum {
+	TrustDatabase,
+	TrustFilesystem,
 }

 Db :: struct {
-	conn:    sqlite.Db,
+	// Pointer to the sqlite db
+	db:      ^rawptr,
 	cfg:     Config,
 	changed: bool,
-	arena:   mem.Dynamic_Arena,
 }

 EnvFile :: struct {
@@ -45,7 +41,6 @@ EnvFile :: struct {
 	contents: string,
 }

-@(deprecated = "call db_close to clean up EnvFiles")
 delete_envfile :: proc(f: ^EnvFile) {
 	delete(f.Path)
 	for &remote in f.Remotes {
@@ -56,61 +51,50 @@ delete_envfile :: proc(f: ^EnvFile) {
 	delete(f.contents)
 }

-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_open :: proc(cfg_path: string) -> (database: Db, ok: bool) {
+	database.cfg = load_config(cfg_path) or_return

-	// TODO: Use different allocators?
-	data_path := data_path(db.cfg.config_path, context.temp_allocator)
-	if os.exists(data_path) {
-		if ok = db_restore_from_encrypted(&db, data_path); !ok {
-			sqlite.close(db.conn)
-			return db, false
-		}
-	} else {
-		// DB was created
-		db.changed = 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)
+	{
+		db: ^rawptr
+		rc := sqlite.db_open(":memory:", &db)
 		if rc != sqlite.OK {
-		fmt.printf("Error opening in-memory database: %s\n", sqlite.db_errmsg(conn))
+			fmt.printf("Error opening in-memory database: %s\n", sqlite.db_errmsg(db))
 			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.db_exec(conn, create_sql, nil, nil, nil)
+		rc = sqlite.db_exec(db, create_sql, nil, nil, nil)
 		if rc != sqlite.OK {
-		fmt.printf("Error creating table: %s\n", sqlite.db_errmsg(conn))
-		sqlite.close(conn)
+			fmt.printf("Error creating table: %s\n", sqlite.db_errmsg(db))
+			sqlite.db_close(db)
 			return
 		}
-	db.conn = conn
-
-	mem.dynamic_arena_init(&db.arena)
-
-	return db, true
+		database.db = db
 	}

-db_allocator :: proc(db: ^Db) -> mem.Allocator {
-	return mem.dynamic_arena_allocator(&db.arena)
+	// TODO: Use different allocators?
+	data_path := data_path(database.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
+		}
+	} else {
+		// DB was created
+		database.changed = true
+	}
+
+	return database, true
 }

 db_restore_from_encrypted :: proc(db: ^Db, data_path: string) -> bool {
-	encrypted_data, read_err := os.read_entire_file_from_path(data_path, context.temp_allocator)
+	encrypted_data, read_err := os.read_entire_file_from_path(data_path, context.allocator)
+	defer delete(encrypted_data)
 	if read_err != nil {
 		fmt.printf("Error reading encrypted database: %v\n", read_err)
 		return false
 	}

-	// TODO: Use context.temp_allocator
 	plaintext, dec_ok := decrypt(encrypted_data, db.cfg.Keys[:])
 	if !dec_ok {
 		fmt.println("Error: decryption failed")
@@ -126,38 +110,36 @@ db_restore_from_encrypted :: proc(db: ^Db, data_path: string) -> bool {
 	}
 	copy(buf[:len(plaintext)], plaintext)

-	flags: sqlite.DESERIALIZE_FLAGS = {.FREEONCLOSE, .RESIZEABLE}
-
-	rc := sqlite.deserialize(db.conn, "main", buf, n, n, flags)
+	rc := sqlite.deserialize(
+		db.db,
+		"main",
+		buf,
+		n,
+		n,
+		sqlite.DESERIALIZE_FREEONCLOSE | sqlite.DESERIALIZE_RESIZEABLE,
+	)
 	if rc != sqlite.OK {
 		sqlite.free(buf)
-		fmt.printf("Error deserializing database: %s\n", sqlite.db_errmsg(db.conn))
+		fmt.printf("Error deserializing database: %s\n", sqlite.db_errmsg(db.db))
 		return false
 	}

 	return true
 }

-db_close :: proc(db: ^Db) {
-	allocator := db_allocator(db)
+db_close :: proc(d: ^Db) {
+	defer sqlite.db_close(d.db)
+	defer delete_config(&d.cfg)

-	defer {
-		sqlite.close(db.conn)
-
-		delete_config(&db.cfg, allocator)
-
-		mem.dynamic_arena_destroy(&db.arena)
-	}
-
-	if db.changed {
-		rc := sqlite.db_exec(db.conn, "VACUUM", nil, nil, nil)
+	if d.changed {
+		rc := sqlite.db_exec(d.db, "VACUUM", nil, nil, nil)
 		if rc != sqlite.OK {
-			fmt.printf("Error vacuuming database: %s\n", sqlite.db_errmsg(db.conn))
+			fmt.printf("Error vacuuming database: %s\n", sqlite.db_errmsg(d.db))
 			return
 		}

 		sz: i64
-		data := sqlite.serialize(db.conn, "main", &sz, 0)
+		data := sqlite.serialize(d.db, "main", &sz, 0)
 		if data == nil {
 			fmt.println("Error: failed to serialize database")
 			return
@@ -165,15 +147,14 @@ db_close :: proc(db: ^Db) {
 		defer sqlite.free(data)

 		sqlite_data := data[:sz]
-		// TODO: PAss allocator chain
-		encrypted, enc_ok := encrypt(sqlite_data, db.cfg.Keys[:])
+		encrypted, enc_ok := encrypt(sqlite_data, d.cfg.Keys[:])
 		if !enc_ok {
 			fmt.println("Error: encryption failed")
 			return
 		}

-		data_path := data_path(db.cfg.config_path, allocator)
-		envr_d := envr_dir(db.cfg.config_path)
+		data_path := data_path(d.cfg.config_path)
+		envr_d := envr_dir(d.cfg.config_path)
 		os.mkdir_all(envr_d)

 		write_err := os.write_entire_file(data_path, encrypted)
@@ -183,37 +164,33 @@ db_close :: proc(db: ^Db) {
 			return
 		}

-		db.changed = false
+		d.changed = false
 	}
 }

-// Results will be freed when `db_close` is called.
-db_list :: proc(db: ^Db) -> ([]EnvFile, bool) {
-	stmt: sqlite.Stmt
+db_list :: proc(d: ^Db, allocator := context.allocator) -> (results: [dynamic]EnvFile, ok: bool) {
+	stmt: ^rawptr
 	rc := sqlite.prepare_v2(
-		db.conn,
+		d.db,
 		"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(db.conn))
-		return []EnvFile{}, false
+		fmt.printf("Error preparing query: %s\n", sqlite.db_errmsg(d.db))
+		return
 	}
 	defer sqlite.finalize(stmt)

-	allocator := db_allocator(db)
-	results := make([dynamic]EnvFile, 0, 10, allocator)
-
 	for {
 		rc = sqlite.step(stmt)
 		if rc == sqlite.DONE {
 			break
 		}
 		if rc != sqlite.ROW {
-			fmt.printf("Error stepping query: %s\n", sqlite.db_errmsg(db.conn))
-			#no_bounds_check return results[:], false
+			fmt.printf("Error stepping query: %s\n", sqlite.db_errmsg(d.db))
+			return
 		}

 		remotes_json := string(sqlite.column_text(stmt, 1))
@@ -235,24 +212,25 @@ db_list :: proc(db: ^Db) -> ([]EnvFile, bool) {
 		)
 	}

-	#no_bounds_check return results[:], true
+	ok = true
+	return
 }

-// TODO: Should we use context.temp_allocator for proc scoped lifetimes?
-db_insert :: proc(db: ^Db, file: EnvFile) -> bool {
-	remotes_json, marshal_err := json.marshal(file.Remotes, allocator = context.temp_allocator)
+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)

 	sql: cstring =
 		"INSERT OR REPLACE INTO " +
 		"envr_env_files (path, remotes, sha256, contents) VALUES (?, ?, ?, ?)"
-	stmt: sqlite.Stmt
-	rc := sqlite.prepare_v2(db.conn, sql, -1, &stmt, nil)
+	stmt: ^rawptr
+	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error preparing insert: %s\n", sqlite.db_errmsg(db.conn))
+		fmt.printf("Error preparing insert: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}
 	defer sqlite.finalize(stmt)
@@ -262,7 +240,7 @@ db_insert :: proc(db: ^Db, file: EnvFile) -> 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(db.conn))
+		fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}

@@ -270,7 +248,7 @@ db_insert :: proc(db: ^Db, file: EnvFile) -> bool {
 	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(db.conn))
+		fmt.printf("Error binding remotes: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}

@@ -278,7 +256,7 @@ db_insert :: proc(db: ^Db, file: EnvFile) -> bool {
 	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(db.conn))
+		fmt.printf("Error binding sha256: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}

@@ -286,38 +264,35 @@ db_insert :: proc(db: ^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(db.conn))
+		fmt.printf("Error binding contents: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}

 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
-		fmt.printf("Error inserting: %s\n", sqlite.db_errmsg(db.conn))
+		fmt.printf("Error inserting: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}

-	db.changed = true
+	d.changed = true
 	return true
 }

-// Result will be freed when `db_close` is called.
-db_fetch :: proc(db: ^Db, path: string) -> (EnvFile, bool) {
+db_fetch :: proc(d: ^Db, path: string, allocator := context.allocator) -> (EnvFile, bool) {
 	sql: cstring = "SELECT path, remotes, sha256, contents FROM envr_env_files WHERE path = ?"
-	stmt: sqlite.Stmt
-	rc := sqlite.prepare_v2(db.conn, sql, -1, &stmt, nil)
+	stmt: ^rawptr
+	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error preparing fetch: %s\n", sqlite.db_errmsg(db.conn))
+		fmt.printf("Error preparing fetch: %s\n", sqlite.db_errmsg(d.db))
 		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(db.conn))
+		fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
 		return EnvFile{}, false
 	}
 	rc = sqlite.step(stmt)
@@ -326,7 +301,7 @@ db_fetch :: proc(db: ^Db, path: string) -> (EnvFile, bool) {
 		return EnvFile{}, false
 	}
 	if rc != sqlite.ROW {
-		fmt.printf("Error fetching: %s\n", sqlite.db_errmsg(db.conn))
+		fmt.printf("Error fetching: %s\n", sqlite.db_errmsg(d.db))
 		return EnvFile{}, false
 	}

@@ -336,7 +311,7 @@ db_fetch :: proc(db: ^Db, path: string) -> (EnvFile, bool) {
 		json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
 	}

-	file_path := clone_cstring(sqlite.column_text(stmt, 0), allocator)
+	file_path := clone_cstring(sqlite.column_text(stmt, 0))

 	return EnvFile {
 			Path = file_path,
@@ -348,12 +323,12 @@ db_fetch :: proc(db: ^Db, path: string) -> (EnvFile, bool) {
 		true
 }

-db_delete :: proc(db: ^Db, path: string) -> bool {
+db_delete :: proc(d: ^Db, path: string) -> bool {
 	sql: cstring = "DELETE FROM envr_env_files WHERE path = ?"
-	stmt: sqlite.Stmt
-	rc := sqlite.prepare_v2(db.conn, sql, -1, &stmt, nil)
+	stmt: ^rawptr
+	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
-		fmt.printf("Error preparing delete: %s\n", sqlite.db_errmsg(db.conn))
+		fmt.printf("Error preparing delete: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}
 	defer sqlite.finalize(stmt)
@@ -362,21 +337,21 @@ db_delete :: proc(db: ^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(db.conn))
+		fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}
 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
-		fmt.printf("Error deleting: %s\n", sqlite.db_errmsg(db.conn))
+		fmt.printf("Error deleting: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}

-	if sqlite.changes(db.conn) == 0 {
+	if sqlite.changes(d.db) == 0 {
 		fmt.printf("No file found with path: %s\n", path)
 		return false
 	}

-	db.changed = true
+	d.changed = true
 	return true
 }

@@ -389,8 +364,7 @@ new_env_file :: proc(path: string) -> (EnvFile, bool) {

 	dir := filepath.dir(abs_path)

-	// TODO: Should we use the db allocator here?
-	remotes := get_git_remotes(dir, context.allocator)
+	remotes := get_git_remotes(dir)

 	data, read_err := os.read_entire_file_from_path(abs_path, context.allocator)
 	defer delete(data)
@@ -413,106 +387,126 @@ new_env_file :: proc(path: string) -> (EnvFile, bool) {
 		true
 }

-// Reconciles `f` with the filesystem and persists changes to the database.
-db_sync :: proc(db: ^Db, f: ^EnvFile) -> (SyncFlag, SyncError) {
-	allocator := db_allocator(db)
+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) {
 	result: SyncFlag = {}
-	old_path := f.Path

-	if !os.exists(f.Dir) {
-		moved, err := try_move_dir(db, f, allocator)
-		if !moved {
-			return {}, err
+	_, 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"
 			}
-		result += {.DirUpdated}
+			moved_dirs = dirs
 		}

-	if !os.exists(f.Path) {
+		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"
+		}
+	}
+
+	_, 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 write_err != nil {
-			fmt.eprintf("db_sync: failed to write %s: %v\n", f.Path, write_err)
-			return result, .WriteFailed
+			msg, _ := strings.concatenate({"failed to write file: ", fmt.tprintf("%v", write_err)})
+			return {.Error}, msg
 		}

-		if !db_persist(db, f, old_path) {
-			return result, .DbFailed
-		}
-		return result + {.Restored}, .None
+		return result + {.Restored}, ""
 	}

-	data, read_err := os.read_entire_file_from_path(f.Path, allocator)
+	data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
 	if read_err != nil {
-		fmt.eprintf("db_sync: failed to read %s: %v\n", f.Path, read_err)
-		return result, .ReadFailed
+		msg, _ := strings.concatenate(
+			{"failed to read file for SHA comparison: ", fmt.tprintf("%v", read_err)},
+		)
+		return {.Error}, msg
 	}

-	digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
-	hex_bytes, hex_err := hex.encode(digest, allocator)
-	if hex_err != nil {
-		fmt.eprintf("db_sync: failed to encode hash for %s: %v\n", f.Path, hex_err)
-		return result, .ReadFailed
-	}
+	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
+	// TODO: Handle error
+	hex_bytes, _ := hex.encode(digest)
 	current_sha := string(hex_bytes)

 	if current_sha == f.Sha256 {
-		if !db_persist(db, f, old_path) {
-			return result, .DbFailed
+		return result, ""
 	}
-		return result, .None
+
+	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
+		}
+		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
 	}

 	f.contents = string(data)
-	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) {
+	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
 	}
-	}
-	return db_insert(db, f^)
-}
-
-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 {
@@ -526,35 +520,38 @@ shares_remote :: proc(f: ^EnvFile, remotes: []string) -> bool {
 	return false
 }

-get_git_remotes :: proc(dir: string, allocator: mem.Allocator) -> [dynamic]string {
-	config_path, _ := filepath.join({dir, ".git", "config"}, context.temp_allocator)
-	// TODO: Handle error
-	m, _, read_ok := ini.load_map_from_path(config_path, context.temp_allocator)
-	if !read_ok {
-		return nil
-	}
+get_git_remotes :: proc(dir: string) -> [dynamic]string {
+	remotes: [dynamic]string
+	remote_set: map[string]bool
+	defer delete(remote_set)

-	remotes := make([dynamic]string, 0, 1, allocator)
+	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
+	}
+	defer ini.delete_map(m)

 	for section_name, section in m {
 		if strings.has_prefix(section_name, "remote ") {
 			if url, ok := section["url"]; ok {
-				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)
-				}
+				remote_set[url] = true
 			}
 		}
 	}

+	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,
@@ -569,7 +566,7 @@ string_to_cstring :: proc(s: string, allocator := context.allocator) -> cstring
 	return cs
 }

-// Unless an explicit allocator is passed, caller is responsible for freeing the result
+// 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 {
--- a/db_integration_test.odin
+++ b/db_integration_test.odin
@@ -1,4 +1,3 @@
-#+test
 package main

 import "core:fmt"
@@ -165,13 +164,13 @@ test_decrypt_then_deserialize_sqlite :: proc(t: ^testing.T) {
 	}
 	defer delete(plaintext)

-	mem_db: sqlite.Db
-	rc := sqlite.open(":memory:", &mem_db)
+	mem_db: ^rawptr
+	rc := sqlite.db_open(":memory:", &mem_db)
 	testing.expectf(t, rc == sqlite.OK, "failed to open in-memory db")
 	if rc != sqlite.OK {
 		return
 	}
-	defer sqlite.close(mem_db)
+	defer sqlite.db_close(mem_db)

 	n := i64(len(plaintext))
 	buf := sqlite.malloc64(n)
@@ -179,7 +178,14 @@ 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, {.FREEONCLOSE, .RESIZEABLE})
+	rc = sqlite.deserialize(
+		mem_db,
+		"main",
+		buf,
+		n,
+		n,
+		sqlite.DESERIALIZE_FREEONCLOSE | sqlite.DESERIALIZE_RESIZEABLE,
+	)
 	testing.expect(t, rc == sqlite.OK, "deserialize should succeed")
 	if rc != sqlite.OK {
 		sqlite.free(buf)
@@ -187,7 +193,7 @@ test_decrypt_then_deserialize_sqlite :: proc(t: ^testing.T) {
 	}

 	sql: cstring = "SELECT path FROM envr_env_files"
-	stmt: sqlite.Stmt
+	stmt: ^rawptr
 	rc = sqlite.prepare_v2(mem_db, sql, -1, &stmt, nil)
 	testing.expect(t, rc == sqlite.OK, "prepare failed")
 	if rc != sqlite.OK {
@@ -303,6 +309,7 @@ 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")
 }
--- a/db_test.odin
+++ b/db_test.odin
@@ -1,8 +1,5 @@
-#+test
 package main

-import "core:crypto/hash"
-import "core:encoding/hex"
 import "core:fmt"
 import "core:os"
 import "core:path/filepath"
@@ -11,13 +8,30 @@ import "core:testing"

 import "sqlite"

+make_test_db :: proc() -> (Db, bool) {
+	db: ^rawptr
+	rc := sqlite.db_open(":memory:", &db)
+	if rc != sqlite.OK {
+		return Db{}, false
+	}
+
+	create_sql: cstring = "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
+	rc = sqlite.db_exec(db, create_sql, nil, nil, nil)
+	if rc != sqlite.OK {
+		sqlite.db_close(db)
+		return Db{}, false
+	}
+
+	return Db{db = db}, true
+}
+
 make_test_env_file :: proc(path, sha, contents: string, remotes: []string = {}) -> EnvFile {
 	f := EnvFile {
 		Path     = path,
 		Dir      = "",
 		Sha256   = sha,
 		contents = contents,
-		Remotes  = make([dynamic]string, 0, len(remotes), context.temp_allocator),
+		Remotes  = make([dynamic]string, 0, len(remotes)),
 	}
 	for r in remotes {
 		append(&f.Remotes, r)
@@ -27,10 +41,10 @@ make_test_env_file :: proc(path, sha, contents: string, remotes: []string = {})

@(test)
 test_db_insert_and_fetch :: proc(t: ^testing.T) {
-	db, ok := db_init()
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer db_close(&db)
+	defer sqlite.db_close(d.db)

 	path := "/project/.env"
 	sha := "abc123"
@@ -39,10 +53,10 @@ test_db_insert_and_fetch :: proc(t: ^testing.T) {
 	f := make_test_env_file(path, sha, contents, []string{"git@github.com:user/repo.git"})
 	defer delete(f.Remotes)

-	testing.expect(t, db_insert(&db, f), "insert should succeed")
+	testing.expect(t, db_insert(&d, f), "insert should succeed")

-	fetched, fetch_ok := db_fetch(&db, "/project/.env")
-	// defer delete_envfile(&fetched)
+	fetched, fetch_ok := db_fetch(&d, "/project/.env")
+	defer delete_envfile(&fetched)
 	testing.expect(t, fetch_ok, "fetch should succeed")
 	if !fetch_ok do return

@@ -55,38 +69,44 @@ test_db_insert_and_fetch :: proc(t: ^testing.T) {

@(test)
 test_db_fetch_missing :: proc(t: ^testing.T) {
-	db, ok := db_init()
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer db_close(&db)
+	defer sqlite.db_close(d.db)

-	_, fetch_ok := db_fetch(&db, "/nonexistent/.env")
+	_, fetch_ok := db_fetch(&d, "/nonexistent/.env")
 	testing.expect(t, !fetch_ok, "fetch missing should return false")
 }

@(test)
 test_db_insert_or_replace :: proc(t: ^testing.T) {
-	db, ok := db_init()
-	defer db_close(&db)
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
+	if !ok do return
+	defer sqlite.db_close(d.db)

 	f1 := make_test_env_file("/project/.env", "sha1", "KEY=old")
 	defer delete(f1.Remotes)
-	testing.expect(t, db_insert(&db, f1), "first insert should succeed")
+	testing.expect(t, db_insert(&d, f1), "first insert should succeed")

 	f2 := make_test_env_file("/project/.env", "sha2", "KEY=new")
 	defer delete(f2.Remotes)
-	testing.expect(t, db_insert(&db, f2), "second insert should succeed")
+	testing.expect(t, db_insert(&d, f2), "second insert should succeed")

-	results, list_ok := db_list(&db)
+	results, list_ok := db_list(&d)
 	testing.expect(t, list_ok, "list should succeed")
+	if !list_ok do return
+	defer delete(results)
+	for &result in results {
+		defer delete_envfile(&result)
+	}

 	testing.expect(t, len(results) == 1, "should have 1 row, not 2")

-	fetched, fetch_ok := db_fetch(&db, "/project/.env")
+	fetched, fetch_ok := db_fetch(&d, "/project/.env")
 	testing.expect(t, fetch_ok, "fetch should succeed")
 	if !fetch_ok do return
-	// defer delete_envfile(&fetched)
+	defer delete_envfile(&fetched)

 	testing.expect_value(t, fetched.contents, "KEY=new")
 	testing.expect_value(t, fetched.Sha256, "sha2")
@@ -94,36 +114,37 @@ test_db_insert_or_replace :: proc(t: ^testing.T) {

@(test)
 test_db_delete_existing :: proc(t: ^testing.T) {
-	db, ok := db_init()
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer db_close(&db)
+	defer sqlite.db_close(d.db)

 	f := make_test_env_file("/project/.env", "sha", "KEY=val")
 	defer delete(f.Remotes)
-	db_insert(&db, f)
+	db_insert(&d, f)

-	testing.expect(t, db_delete(&db, "/project/.env"), "delete should return true")
+	testing.expect(t, db_delete(&d, "/project/.env"), "delete should return true")

-	_, fetch_ok := db_fetch(&db, "/project/.env")
+	_, fetch_ok := db_fetch(&d, "/project/.env")
 	testing.expect(t, !fetch_ok, "row should be gone after delete")
 }

@(test)
 test_db_delete_missing :: proc(t: ^testing.T) {
-	db, ok := db_init()
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer db_close(&db)
+	defer sqlite.db_close(d.db)

-	testing.expect(t, !db_delete(&db, "/nonexistent/.env"), "delete missing should return false")
+	testing.expect(t, !db_delete(&d, "/nonexistent/.env"), "delete missing should return false")
 }

@(test)
 test_db_list_multiple :: proc(t: ^testing.T) {
-	db, ok := db_init()
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
-	defer db_close(&db)
+	if !ok do return
+	defer sqlite.db_close(d.db)

 	f1 := make_test_env_file("/proj1/.env", "sha1", "A=1", []string{"git@github.com:a/repo.git"})
 	defer delete(f1.Remotes)
@@ -131,72 +152,81 @@ test_db_list_multiple :: proc(t: ^testing.T) {
 	defer delete(f2.Remotes)
 	f3 := make_test_env_file("/proj3/.env", "sha3", "C=3")

-	db_insert(&db, f1)
-	db_insert(&db, f2)
-	db_insert(&db, f3)
+	db_insert(&d, f1)
+	db_insert(&d, f2)
+	db_insert(&d, f3)

-	results, list_ok := db_list(&db)
+	results, list_ok := db_list(&d)
 	testing.expect(t, list_ok, "list should succeed")
+	if !list_ok do return
+	defer delete(results)
+	defer {
+		for &result in results {
+			delete_envfile(&result)
+		}
+	}

 	testing.expect_value(t, len(results), 3)
 }

@(test)
 test_db_list_empty :: proc(t: ^testing.T) {
-	db, ok := db_init()
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
-	defer db_close(&db)
+	if !ok do return
+	defer sqlite.db_close(d.db)

-	results, list_ok := db_list(&db)
+	results, list_ok := db_list(&d)
 	testing.expect(t, list_ok, "list should succeed on empty db")
 	testing.expect(t, len(results) == 0, "should have 0 rows")
+	if list_ok do delete(results)
 }

@(test)
 test_db_insert_sets_changed :: proc(t: ^testing.T) {
-	db, ok := db_init()
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer db_close(&db)
+	defer sqlite.db_close(d.db)

-	testing.expect(t, !db.changed, "changed should start false")
+	testing.expect(t, !d.changed, "changed should start false")

 	f := make_test_env_file("/project/.env", "sha", "KEY=val")
 	defer delete(f.Remotes)
-	db_insert(&db, f)
+	db_insert(&d, f)

-	testing.expect(t, db.changed, "changed should be true after insert")
+	testing.expect(t, d.changed, "changed should be true after insert")
 }

@(test)
 test_db_delete_sets_changed :: proc(t: ^testing.T) {
-	db, ok := db_init()
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer db_close(&db)
+	defer sqlite.db_close(d.db)

 	f := make_test_env_file("/project/.env", "sha", "KEY=val")
 	defer delete(f.Remotes)
-	db_insert(&db, f)
-	db.changed = false
+	db_insert(&d, f)
+	d.changed = false

-	db_delete(&db, "/project/.env")
-	testing.expect(t, db.changed, "changed should be true after delete")
+	db_delete(&d, "/project/.env")
+	testing.expect(t, d.changed, "changed should be true after delete")
 }

@(test)
 test_db_serialize :: proc(t: ^testing.T) {
-	db, ok := db_init()
+	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
-	defer db_close(&db)
+	defer sqlite.db_close(d.db)

 	f := make_test_env_file("/project/.env", "sha", "KEY=val")
 	defer delete(f.Remotes)
-	db_insert(&db, f)
+	db_insert(&d, f)

 	sz: i64
-	data := sqlite.serialize(db.conn, "main", &sz, 0)
+	data := sqlite.serialize(d.db, "main", &sz, 0)
 	testing.expect(t, data != nil, "serialize should return non-nil")
 	if data == nil do return
 	defer sqlite.free(data)
@@ -204,6 +234,37 @@ 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 {
@@ -279,7 +340,8 @@ test_get_git_remotes_single :: proc(t: ^testing.T) {
 	err := os.write_entire_file(config_path, transmute([]u8)config_content)
 	testing.expect(t, err == nil, "should write .git/config")

-	remotes := get_git_remotes(base, context.temp_allocator)
+	remotes := get_git_remotes(base)
+	defer delete_remotes(remotes)

 	testing.expect(t, len(remotes) == 1, "should find 1 remote")
 	if len(remotes) != 1 do return
@@ -300,7 +362,8 @@ test_get_git_remotes_multiple :: proc(t: ^testing.T) {
 	err := os.write_entire_file(config_path, transmute([]u8)config_content)
 	testing.expect(t, err == nil, "should write .git/config")

-	remotes := get_git_remotes(base, context.temp_allocator)
+	remotes := get_git_remotes(base)
+	defer delete_remotes(remotes)

 	testing.expect(t, len(remotes) == 2, "should find 2 remotes")
 }
@@ -311,7 +374,8 @@ test_get_git_remotes_no_config :: proc(t: ^testing.T) {
 	os.mkdir_all(base)
 	defer os.remove_all(base)

-	remotes := get_git_remotes(base, context.temp_allocator)
+	remotes := get_git_remotes(base)
+	defer delete_remotes(remotes)

 	testing.expect(t, len(remotes) == 0, "should return empty when no .git/config")
 }
@@ -330,7 +394,8 @@ test_get_git_remotes_no_remotes :: proc(t: ^testing.T) {
 	err := os.write_entire_file(config_path, transmute([]u8)config_content)
 	testing.expect(t, err == nil, "should write .git/config")

-	remotes := get_git_remotes(base, context.temp_allocator)
+	remotes := get_git_remotes(base)
+	defer delete_remotes(remotes)

 	testing.expect(t, len(remotes) == 0, "should return empty when no remote sections")
 }
@@ -364,6 +429,49 @@ 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())
@@ -373,14 +481,13 @@ test_closing_db_has_no_leaks :: proc(t: ^testing.T) {
 	cfg_path, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
 	testing.expect(t, err == nil, "cfgPath should build successfully")

-	{
 	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")
-		delete_config(&cfg)
-	}

 	db, ok := db_open(cfg_path)
 	testing.expect(t, ok, "db should open")
+	if !ok do return
 	db_close(&db)
 }

@@ -393,22 +500,15 @@ test_open_existing_db_has_no_leaks :: proc(t: ^testing.T) {
 	cfg_path, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
 	testing.expect(t, err == nil, "cfgPath should build successfully")

-	{
 	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")
-		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"},
-	)
+	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)
@@ -420,151 +520,3 @@ test_open_existing_db_has_no_leaks :: proc(t: ^testing.T) {
 	db_close(&db2)
 }

-@(test)
-test_db_sync_noop :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-sync-noop-%d", os.get_pid())
-	os.mkdir_all(base)
-	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(t, write_err == nil, "should write .env file")
-
-	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(t, sync_err == .None, "sync should not error")
-	testing.expect(t, result == {}, "should be noop")
-}
-
-@(test)
-test_db_sync_backed_up :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-sync-backup-%d", os.get_pid())
-	os.mkdir_all(base)
-	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(t, write_err == nil, "should write .env file")
-
-	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(t, sync_err == .None, "sync should not error")
-	testing.expect(t, .BackedUp in result, "should be backed up")
-}
-
-@(test)
-test_db_sync_restored :: proc(t: ^testing.T) {
-	base := fmt.tprintf("/tmp/envr-test-sync-restore-%d", os.get_pid())
-	os.mkdir_all(base)
-	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(t, err == .None, "sync should not error")
-	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(t, read_err == nil, "file should exist after restore")
-	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 := fmt.tprintf("/tmp/envr-test-sync-moved-%d", os.get_pid())
-	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(t, write_err == nil, "should write .git/config")
-
-	db, ok := db_init()
-	testing.expect(t, ok, "failed to create test db")
-	defer db_close(&db)
-
-	db.cfg.ScanConfig.Include = make([dynamic]string, 0, 1, context.temp_allocator)
-	append(&db.cfg.ScanConfig.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(t, err == .None, "sync should not error")
-	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")
-	}
-}
-
--- a/docs/cli/envr.md
+++ b/docs/cli/envr.md
@@ -4,11 +4,11 @@ Manage your .env files.

 ### Synopsis

-envr keeps your .env synced to a local, encrypted database.
+envr keeps your .env synced to a local, age encrypted database.
 Is a safe and eay way to gather all your .env files in one place where they can
 easily be backed by another tool such as restic or git.

-All your data is stored in ~/.envr/data.envr
+All your data is stored in ~/data.age

 Getting started is easy:

--- a/flake.nix
+++ b/flake.nix
@@ -79,13 +79,6 @@
              mysqlite
            ];

-            doCheck = true;
-            checkPhase = ''
-              runHook preCheck
-              odin test . -all-packages
-              runHook postCheck
-            '';
-
            buildPhase = ''
              runHook preBuild
              echo '${version}' > version.txt
--- a/main.odin
+++ b/main.odin
@@ -1,36 +1,10 @@
 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)
@@ -86,21 +60,3 @@ 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)
-	}
-}
-
--- a/prompt.odin
+++ b/prompt.odin
@@ -2,7 +2,6 @@ package main

 import "core:fmt"
 import "core:sys/posix"
-import "core:terminal/ansi"

 MultiSelect_Result :: enum {
 	Confirm,
@@ -37,16 +36,16 @@ multi_select :: proc(
 		return
 	}

-	selected = make([dynamic]bool, len(options))
+	selected = make([dynamic]bool, 0, len(options))
 	cursor: int = 0
 	scroll_offset: int = 0

-	fmt.printf(ansi.CSI + ansi.DECTCEM_HIDE)
+	fmt.printf("\x1b[?25l")
 	visible := render_options(prompt, options, selected[:], cursor, scroll_offset)

 	raw, ok := enable_raw_mode(posix.STDIN_FILENO)
 	if !ok {
-		fmt.printf(ansi.CSI + ansi.DECTCEM_SHOW)
+		fmt.printf("\x1b[?25h")
 		return
 	}
 	defer disable_raw_mode(&raw)
@@ -66,18 +65,18 @@ multi_select :: proc(
 		case .Space:
 			selected[cursor] = !selected[cursor]
 		case .Enter:
-			fmt.printf(ansi.CSI + "%d" + ansi.CUU + ansi.CSI + ansi.ED + ansi.CSI + ansi.DECTCEM_SHOW, visible + 1)
+			fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
 			result = .Confirm
 			return
 		case .Escape:
-			fmt.printf(ansi.CSI + "%d" + ansi.CUU + ansi.CSI + ansi.ED + ansi.CSI + ansi.DECTCEM_SHOW, visible + 1)
+			fmt.printf("\x1b[%dA\x1b[J\x1b[?25h", visible + 1)
 			result = .Cancel
 			return
 		case .Unknown:
 		}

 		scroll_offset = max(0, min(cursor - MAX_VISIBLE / 2, len(options) - MAX_VISIBLE))
-		fmt.printf(ansi.CSI + "%d" + ansi.CUU + ansi.CSI + ansi.RESET + ansi.ED, visible + 1)
+		fmt.printf("\x1b[%dA\x1b[0J", visible + 1)
 		visible = render_options(prompt, options, selected[:], cursor, scroll_offset)
 	}
 }
@@ -89,7 +88,7 @@ render_options :: proc(
 	cursor: int,
 	scroll_offset: int,
 ) -> int {
-	fmt.printf(ansi.CSI + ansi.BOLD + ";" + ansi.FG_CYAN + ansi.SGR + "%s" + ANSI_RESET + " (↑/↓ move, space select, enter confirm)\r\n", prompt)
+	fmt.printf("\x1b[1;36m%s\x1b[0m (↑/↓ move, space select, enter confirm)\r\n", prompt)

 	end := scroll_offset + MAX_VISIBLE
 	if end > len(options) {
@@ -102,9 +101,9 @@ render_options :: proc(
 			checkbox = "x"
 		}
 		if i == cursor {
-			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])
+			fmt.printf("\x1b[1;32m> \x1b[0m[\x1b[32m%s\x1b[0m] %s\r\n", checkbox, options[i])
 		} else {
-			fmt.printf("  [" + ansi.CSI + ansi.FAINT + ansi.SGR + "%s" + ANSI_RESET + "] %s\r\n", checkbox, options[i])
+			fmt.printf("  [\x1b[2m%s\x1b[0m] %s\r\n", checkbox, options[i])
 		}
 	}

--- a/scan_test.odin
+++ b/scan_test.odin
@@ -1,4 +1,3 @@
-#+test
 package main

 import "core:fmt"
--- a/sqlite/sqlite.odin
+++ b/sqlite/sqlite.odin
@@ -4,51 +4,42 @@ 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_FLAGS :: bit_set[DESERIALIZE_FLAG]
-DESERIALIZE_FLAG :: enum u32 {
-	FREEONCLOSE = 1,
-	RESIZEABLE  = 2,
-}
+DESERIALIZE_FREEONCLOSE :: 1
+DESERIALIZE_RESIZEABLE :: 2

 foreign lib {
    @(link_name="sqlite3_open")
-	open :: proc(filename: cstring, ppDb: ^Db) -> c.int ---
+    db_open          :: proc(filename: cstring, ppDb: ^^rawptr) -> c.int ---
    @(link_name="sqlite3_close")
-	close :: proc(db: Db) -> c.int ---
+    db_close         :: proc(db: ^rawptr) -> c.int ---
    @(link_name="sqlite3_errmsg")
-	db_errmsg :: proc(db: Db) -> cstring ---
+    db_errmsg        :: proc(db: ^rawptr) -> cstring ---
    @(link_name="sqlite3_exec")
-	db_exec :: proc(db: Db, sql: cstring, callback: rawptr, callback_arg: rawptr, errmsg: ^cstring) -> c.int ---
+    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: Db, sql: cstring, nByte: c.int, ppStmt: ^Stmt, pzTail: ^cstring) -> c.int ---
+    prepare_v2       :: proc(db: ^rawptr, sql: cstring, nByte: c.int, ppStmt: ^^rawptr, pzTail: ^cstring) -> c.int ---
    @(link_name="sqlite3_step")
-	step :: proc(stmt: Stmt) -> c.int ---
+    step             :: proc(stmt: ^rawptr) -> c.int ---
    @(link_name="sqlite3_finalize")
-	finalize :: proc(stmt: Stmt) -> c.int ---
+    finalize         :: proc(stmt: ^rawptr) -> c.int ---
    @(link_name="sqlite3_column_text")
-	column_text :: proc(stmt: Stmt, iCol: c.int) -> cstring ---
+    column_text      :: proc(stmt: ^rawptr, iCol: c.int) -> cstring ---
    @(link_name="sqlite3_column_bytes")
-	column_bytes :: proc(stmt: Stmt, iCol: c.int) -> c.int ---
+    column_bytes     :: proc(stmt: ^rawptr, 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 ---
+    bind_text        :: proc(stmt: ^rawptr, idx: c.int, val: cstring, n: c.int, destructor: rawptr) -> c.int ---
    @(link_name="sqlite3_changes")
-	changes :: proc(db: Db) -> c.int ---
+    changes          :: proc(db: ^rawptr) -> c.int ---
    @(link_name="sqlite3_serialize")
-	serialize :: proc(db: Db, zSchema: cstring, piSize: ^i64, mFlags: u32) -> [^]u8 ---
+    serialize        :: proc(db: ^rawptr, zSchema: cstring, piSize: ^i64, mFlags: u32) -> [^]u8 ---
    @(link_name="sqlite3_deserialize")
-	deserialize :: proc(db: Db, zSchema: cstring, pData: [^]u8, szDb: i64, szBuf: i64, mFlags: DESERIALIZE_FLAGS) -> c.int ---
+    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) ---
 }
-
--- a/ssh_test.odin
+++ b/ssh_test.odin
@@ -1,11 +1,9 @@
-#+test
 package main

 import "core:fmt"
-import "core:os"
 import "core:testing"

-TEST_KEY_DIR :: "fixtures" + os.Path_Separator_String + "keys"
+TEST_KEY_DIR :: "fixtures/keys"

@(test)
 test_parse_ed25519_public_key :: proc(t: ^testing.T) {
--- a/table.odin
+++ b/table.odin
@@ -1,36 +1,89 @@
 package main

-import "core:text/table"
-import "core:unicode/utf8"
+import "core:encoding/json"
+import "core:fmt"
+import "core:io"
+import "core:strings"

-decorations := table.Decorations {
-	"┌",
-	"┬",
-	"┐",
-	"├",
-	"┼",
-	"┤",
-	"└",
-	"┴",
-	"┘",
-	"│",
-	"─",
+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
+			}
+		}
 	}

-// TODO: Optimize ansi_aware_width
-ansi_aware_width :: proc(str: string) -> int {
-	buf: [4096]byte
-	pos := 0
-	i := 0
-	for 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}}
+	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 {
-			buf[pos] = str[i]; pos += 1; i += 1
+				strings.write_string(b, right)
 			}
 		}
-	_, _, width := utf8.grapheme_count(string(buf[:pos]))
-	return width
+		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)
+}
+
+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]
+		}
+		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)
 }

--- a/table_test.odin
+++ b/table_test.odin
@@ -1,33 +1,198 @@
-#+test
-
 package main

+import "core:encoding/json"
+import "core:fmt"
+import "core:strings"
 import "core:testing"

@(test)
-test_ansi_aware_width_plain_ascii :: proc(t: ^testing.T) {
-	testing.expect_value(t, ansi_aware_width("hello"), 5)
+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)
-test_ansi_aware_width_empty :: proc(t: ^testing.T) {
-	testing.expect_value(t, ansi_aware_width(""), 0)
+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)
-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_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)
-test_ansi_aware_width_unicode :: proc(t: ^testing.T) {
-	testing.expect_value(t, ansi_aware_width("\u2713 Available"), 11)
-	testing.expect_value(t, ansi_aware_width("\u2717 Missing"), 9)
+test_render_table_normal :: proc(t: ^testing.T) {
+	b: strings.Builder
+	strings.builder_init(&b)
+	defer strings.builder_destroy(&b)
+
+	headers := []string{"Name", "Path"}
+	rows := [][]string{{"foo", "/home/user/.env"}, {"bar", "/home/user/project/.env"}}
+
+	w := strings.to_writer(&b)
+	render_table(w, headers, rows)
+
+	output := strings.to_string(b)
+
+	expected := `┌──────┬─────────────────────────┐
+│ Name │ Path                    │
+├──────┼─────────────────────────┤
+│ foo  │ /home/user/.env         │
+│ bar  │ /home/user/project/.env │
+└──────┴─────────────────────────┘
+`
+	testing.expect(
+		t,
+		output == expected,
+		fmt.tprintf(
+			"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
+			expected,
+			output,
+		),
+	)
 }

@(test)
-test_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_render_table_empty :: proc(t: ^testing.T) {
+	b: strings.Builder
+	strings.builder_init(&b)
+	defer strings.builder_destroy(&b)
+
+	headers := []string{"Name"}
+	rows: [][]string
+
+	w := strings.to_writer(&b)
+	render_table(w, headers, rows)
+
+	output := strings.to_string(b)
+
+	expected := `┌──────┐
+│ Name │
+├──────┤
+└──────┘
+`
+	testing.expect(
+		t,
+		output == expected,
+		fmt.tprintf(
+			"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
+			expected,
+			output,
+		),
+	)
 }
+
+@(test)
+test_render_table_unicode :: proc(t: ^testing.T) {
+	b: strings.Builder
+	strings.builder_init(&b)
+	defer strings.builder_destroy(&b)
+
+	headers := []string{"Status", "Detail"}
+	rows := [][]string{{"\u2713 Available", "ok"}, {"\u2717 Missing", "fail"}}
+
+	w := strings.to_writer(&b)
+	render_table(w, headers, rows)
+
+	output := strings.to_string(b)
+
+	expected := `┌─────────────┬────────┐
+│ Status      │ Detail │
+├─────────────┼────────┤
+│ ✓ Available │ ok     │
+│ ✗ Missing   │ fail   │
+└─────────────┴────────┘
+`
+	testing.expect(
+		t,
+		output == expected,
+		fmt.tprintf(
+			"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
+			expected,
+			output,
+		),
+	)
+}
+
--- a/BIN
+++ b/BIN
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.3.0
+0.4.0
@@ -1 +1 @@
 .3.0
 .4.0