chore(main): release 0.3.1

Release-as: v0.3.0

.github/workflows/release-please.yml

@@ -25,3 +25,4 @@ jobs:
           # this is a built-in strategy in release-please, see "Action Inputs"
           # for more options
           release-type: simple
+          target-branch: ${{ github.ref_name }}

.gitignore

@@ -7,8 +7,12 @@ list.json
 man 
 
 # build artifacts
+*.spall
 builds
 envr
 envr-go
+findr/findr
+findr/findr-prof
+findr/bench-*.md
 result
 version.odin

CHANGELOG.md

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

TEST_PLAN.md

@@ -2,101 +2,61 @@
 
 ## Current State
 
-- 63 tests, all passing (added 3 `render_table` tests)
-- Strong coverage: crypto (100%), ssh (80%), scan, features
-- `render_table` now takes `io.Writer` (Tier 1 item 1 done)
+- 104 tests, all passing
+- Strong coverage: crypto, ssh, db CRUD + env_file + update_dir, config save/load + paths, scan, features, cant_scan, parse_args, `-c`/`--config-file` flag
 - Misleading test files: `cmd_check_test`, `cmd_list_test`, `cmd_nushell_completion_test` don't test their namesake procs
-- Biggest gap: `db.odin` (15/21 procs untested), all `cmd_*` handlers untested, `parse_args` untested
+- Biggest remaining gap: all `cmd_*` handlers untested
 
-## Tier 1 — Easy wins (pure functions, minimal setup)
+## Command handler tests
 
-### 1. `render_table` (table.odin)
-- Follow existing `render_json_rows` test pattern
-- Test cases: normal data (verify box-drawing chars, column alignment), empty rows, wide unicode, single column
-- Assert against `strings.Builder` output
+Stdout will be captured by redirecting `os.stdout` to a pipe.
 
-### 2. `parse_args` (cli.odin) — BLOCKED: needs refactor
-- Reads `os.args` directly and calls `print_usage()`/`print_command_help()` as side effects
-- Cannot test without either accepting `[]string` param or extracting output
-- Minimal refactor: `parse_args(args: []string)` — caller passes `os.args`, tests pass synthetic slices
-- Return values (`ok`, `cmd.name`, `cmd.flags`, `cmd.bool_set`) are the interesting part to assert
-- Test cases: bare command, `--flag value`, `-f value`, positional args, `--help`/`-h`, unknown command, no args, mixed flags + positionals
-
-### 3. `is_encrypted_key` (ssh.odin)
-- Test cases: encrypted key (returns true), unencrypted key (returns false), RSA key, malformed key
-- Fills last gap in ssh.odin
-
-## Tier 2 — High value, medium effort (fixtures exist)
-
-### 4. `db.odin` CRUD layer
-Largest gap in the project. Infrastructure already in `db_integration_test.odin` (`fixture_key`, `fixture_db_path`, in-memory DB setup).
-
-Procs to test:
-- `db_open` / `db_close` — open in-memory DB, verify handle valid
-- `db_insert` — insert a row, verify it persists
-- `db_fetch` — fetch existing row, fetch missing row (returns false)
-- `db_delete` — delete existing row (returns true), delete missing row (returns false)
-- `db_list` — list multiple rows, empty DB
-- `db_vacuum_to_file` — vacuum to temp file, verify file exists and is non-empty
-
-Test pattern: create in-memory DB via `db_open`, insert fixture rows, query and assert, `defer db_close`.
-
-### 5. `load_config` / `save_config` (config.odin)
-- `save_config`: write a `Config` to temp dir, verify file exists and contents are valid JSON
-- `load_config`: read back a config written by `save_config`, round-trip assert
-- `load_config` error case: missing file returns error
-- Need a temp dir fixture (pattern exists in `scan_test.odin`)
-
-## Tier 3 — Command handlers (need DB + filesystem fixtures)
-
-### 6. `cmd_version` (cmd_version.odin)
+### `cmd_version` (cmd_version.odin)
 - Test default output (prints VERSION)
-- Test `--long`/`-l` flag output
-- Capture stdout, assert content
 
-### 7. `cmd_list` (cmd_list.odin)
+### `cmd_list` (cmd_list.odin)
 - Test TTY path: fixture DB with rows, capture table output
 - Test non-TTY path: capture JSON output, unmarshal and verify keys/values
 - Test empty DB: verify clean output (empty table or `[]`)
 
-### 8. `cmd_backup` (cmd_backup.odin)
+### `cmd_backup` (cmd_backup.odin)
 - Test successful backup: valid path, verify `db_insert` called
 - Test missing file: verify error message
 - Test duplicate backup: verify rejection or update behavior
 
-### 9. `cmd_remove` (cmd_remove.odin)
+### `cmd_remove` (cmd_remove.odin)
 - Test successful removal: existing entry, verify `db_delete` called
 - Test removal of non-existent entry: verify error or no-op
 
-### 10. `cmd_restore` (cmd_restore.odin)
+### `cmd_restore` (cmd_restore.odin)
 - Test successful restore: entry exists in DB, verify file written to correct path
 - Test restore of missing entry: verify error
 - Test directory creation: restore to path with missing parent dirs
 
-## Tier 4 — Hard to test (interactive / external deps)
+## Hard to test (interactive / external deps)
 
-### 11. `cmd_deps` (cmd_deps.odin)
+### `cmd_deps` (cmd_deps.odin)
 - Needs `git` and/or `fd` in PATH
 - Test TTY and non-TTY paths
 - Skip if dependencies not available (with `#assert` like TODO 28 suggests)
 
-### 12. `cmd_scan` (cmd_scan.odin)
+### `cmd_scan` (cmd_scan.odin)
 - Needs `fd` installed
 - Test with fixture git repo containing `.env` files
 - Test `find_unbacked` integration (already partially tested in `cmd_check_test.odin`)
 - Non-TTY JSON output path
 
-### 13. `cmd_edit_config` (cmd_edit_config.odin)
+### `cmd_edit_config` (cmd_edit_config.odin)
 - Needs refactoring: extract `$EDITOR` parsing into testable helper (TODO 12)
 - Test multi-word editor values (`"code -w"`)
 - Test missing `$EDITOR`
 
-### 14. `cmd_init` (cmd_init.odin)
+### `cmd_init` (cmd_init.odin)
 - Interactive prompt makes this hard
 - Needs refactoring: extract SSH key discovery and config generation into testable procs
 - Test `--force` flag behavior
 
-### 15. `prompt.odin`
+### `prompt.odin`
 - Needs refactoring to be testable
 - `render_options` could be tested if it accepted an `io.Writer`
 - `read_key` could be tested with a pipe/redirect instead of raw stdin
@@ -104,7 +64,7 @@ Test pattern: create in-memory DB via `db_open`, insert fixture rows, query and
 
 ## Notes
 
-- All command handler tests will need stdout capture. Consider extracting a helper or using `io.Writer` injection.
 - DB integration tests should use in-memory SQLite (`:memory:`) where possible.
 - Temp dir fixtures should follow the pattern in `scan_test.odin`.
 - External dependency tests (`fd`, `git`) should use `#assert` to ensure the dependency is present rather than silently skipping (TODO 28).
+- Tests that manipulate the `HOME` env var must use a mutex to prevent races with parallel test execution.

TODOS.md

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

cli.odin

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

cli_test.odin

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

cmd_backup.odin

@@ -5,34 +5,31 @@ import "core:strings"
 
 cmd_backup :: proc(cmd: ^Command) {
 	if len(cmd.args) != 1 {
-		print_command_help("backup")
+		print_command_help(cmd)
 		return
 	}
 
 	path := cmd.args[0]
 	if len(strings.trim_space(path)) == 0 {
-		fmt.println("Error: No path provided")
+		fmt.wprintln(cmd.err, "Error: No path provided", flush = false)
 		return
 	}
 
 	file, ok := new_env_file(path)
 	if !ok {
-		// TODO: log a message
 		return
 	}
 
-	db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
 	if !db_ok {
-		// TODO: log a message
 		return
 	}
 	defer db_close(&db)
 
 	if !db_insert(&db, file) {
-		// TODO: log a message
 		return
 	}
 
-	fmt.printf("Saved %s into the database\n", path)
+	fmt.wprintf(cmd.out, "Saved %s into the database\n", path, flush = false)
 }
 

cmd_check.odin

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

cmd_deps.odin

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

cmd_edit_config.odin

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

cmd_init.odin

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

cmd_list.odin

@@ -2,7 +2,6 @@ package main
 
 import "core:encoding/json"
 import "core:fmt"
-import "core:io"
 import "core:os"
 import "core:path/filepath"
 import "core:strings"
@@ -13,8 +12,10 @@ ListEntry :: struct {
 	Path:      string `json:"path"`,
 }
 
+// TODO: Support --format flag
+// TODO: Improve table rendering
 cmd_list :: proc(cmd: ^Command) {
-	db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
 	if !db_ok {
 		return
 	}
@@ -39,9 +40,9 @@ cmd_list :: proc(cmd: ^Command) {
 			append(&table_rows, row_slice)
 		}
 
-		w := io.to_writer(os.to_writer(os.stdout))
-		render_table(w, headers, table_rows[:])
+		render_table(cmd.out, headers, table_rows[:])
 	} else {
+		// TODO: Should we instead print full entries here?
 		entries: [dynamic]ListEntry
 		for row in rows {
 			filename := filepath.base(row.Path)
@@ -54,12 +55,12 @@ cmd_list :: proc(cmd: ^Command) {
 			)
 		}
 
-		data, marshal_err := json.marshal(entries[:])
+		data, marshal_err := json.marshal(entries[:], allocator = context.temp_allocator)
 		if marshal_err != nil {
-			fmt.printf("Error marshaling JSON: %v\n", marshal_err)
+			fmt.wprintf(cmd.err, "Error marshaling JSON: %v\n", marshal_err, flush = false)
 			return
 		}
-		fmt.println(string(data))
+		fmt.wprintln(cmd.out, string(data), flush = false)
 	}
 }
 

cmd_nushell_completion.odin

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

cmd_remove.odin

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

cmd_restore.odin

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

cmd_scan.odin

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

cmd_sync.odin

@@ -2,7 +2,6 @@ package main
 
 import "core:encoding/json"
 import "core:fmt"
-import "core:io"
 import "core:os"
 import "core:strings"
 import "core:terminal"
@@ -13,8 +12,9 @@ SyncEntry :: struct {
 }
 
 // TODO: Check for quiet failures.
+// TODO: Support --format -f flags
 cmd_sync :: proc(cmd: ^Command) {
-	db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
 	if !db_ok {
 		return
 	}
@@ -26,11 +26,13 @@ cmd_sync :: proc(cmd: ^Command) {
 	}
 	defer delete(files)
 
+	// TODO: Set sane default size
 	results: [dynamic]SyncEntry
+	defer delete(results)
 
 	for &file in files {
 		old_path: string
-		old_path, _ = strings.clone(file.Path)
+		old_path, _ = strings.clone(file.Path, context.temp_allocator)
 
 		result, err_msg := db_sync(&db, &file)
 
@@ -81,15 +83,14 @@ cmd_sync :: proc(cmd: ^Command) {
 			append(&table_rows, row_slice)
 		}
 
-		w := io.to_writer(os.to_writer(os.stdout))
-		render_table(w, headers, table_rows[:])
+		render_table(cmd.out, headers, table_rows[:])
 	} else {
 		data, marshal_err := json.marshal(results[:])
 		if marshal_err != nil {
-			fmt.printf("Error marshaling JSON: %v\n", marshal_err)
+			fmt.wprintf(cmd.err, "Error marshaling JSON: %v\n", marshal_err, flush = false)
 			return
 		}
-		fmt.println(string(data))
+		fmt.wprintln(cmd.out, string(data), flush = false)
 	}
 }
 

cmd_version.odin

@@ -5,6 +5,6 @@ import "core:fmt"
 VERSION :: #load("version.txt", string)
 
 cmd_version :: proc(cmd: ^Command) {
-	fmt.println(VERSION)
+	fmt.wprintln(cmd.out, VERSION, flush = false)
 }
 

config.odin

@@ -6,6 +6,8 @@ import "core:os"
 import "core:path/filepath"
 import "core:strings"
 
+import "findr"
+
 SshKeyPair :: struct {
 	Private: string `json:"private"`,
 	Public:  string `json:"public"`,
@@ -18,52 +20,65 @@ ScanConfig :: struct {
 }
 
 Config :: struct {
-	Keys:       [dynamic]SshKeyPair `json:"keys"`,
-	ScanConfig: ScanConfig `json:"scan"`,
+	Keys:        [dynamic]SshKeyPair `json:"keys"`,
+	ScanConfig:  ScanConfig `json:"scan"`,
+	config_path: string `json:"-"`,
 }
 
-load_config :: proc() -> (Config, bool) {
-	home, home_err := os.user_home_dir(context.temp_allocator)
-	if home_err != nil {
-		fmt.printf("Error getting home dir: %v\n", home_err)
-		return Config{}, false
-	}
-	config_path, join_err := filepath.join([]string{home, ".envr", "config.json"})
-	if join_err != nil {
-		return Config{}, false
+default_config_path :: proc(home: string, allocator := context.allocator) -> string {
+	path, err := filepath.join([]string{home, ".envr", "config.json"}, allocator)
+	if err != nil {
+		panic("Ran out of memory when building config path")
 	}
+	return path
+}
 
+load_config :: proc(config_path: string) -> (Config, bool) {
 	data, read_err := os.read_entire_file_from_path(config_path, context.allocator)
 	if read_err != nil {
 		fmt.println("No config file found. Please run `envr init` to generate one.")
 		return Config{}, false
 	}
+	defer delete(data)
 
 	cfg: Config
+	// TODO: use json 5
 	err := json.unmarshal(data, &cfg)
 	if err != nil {
 		fmt.printf("Error parsing config: %v\n", err)
 		return Config{}, false
 	}
+	cfg.config_path = config_path
 
 	return cfg, true
 }
 
-delete_config :: proc(cfg: Config) {
+delete_config :: proc(cfg: ^Config) {
+	for key in cfg.Keys {
+		delete(key.Private)
+		delete(key.Public)
+	}
 	delete(cfg.Keys)
+
+	delete(cfg.ScanConfig.Matcher)
+
+	for exclude in cfg.ScanConfig.Exclude {
+		delete(exclude)
+	}
 	delete(cfg.ScanConfig.Exclude)
+
+	for include in cfg.ScanConfig.Include {
+		delete(include)
+	}
 	delete(cfg.ScanConfig.Include)
 }
 
-envr_dir :: proc() -> string {
-	home, _ := os.user_home_dir(context.allocator)
-	dir, _ := filepath.join([]string{home, ".envr"})
-	return dir
+envr_dir :: proc(config_path: string) -> string {
+	return filepath.dir(config_path)
 }
 
-data_encrypted_path :: proc() -> string {
-	dir := envr_dir()
-	path, _ := filepath.join([]string{dir, "data.envr"})
+data_path :: proc(config_path: string) -> string {
+	path, _ := filepath.join([]string{envr_dir(config_path), "data.envr"})
 	return path
 }
 
@@ -113,53 +128,50 @@ find_ssh_private_keys :: proc() -> (keys: [dynamic]string, ok: bool) {
 	return
 }
 
-new_config :: proc(private_key_paths: []string) -> Config {
+// Caller is responsible for calling delete_config()
+new_config :: proc(
+	private_key_paths: []string,
+	cfg_path: string = "~/.envr/config.json",
+) -> Config {
 	keys := make([dynamic]SshKeyPair, 0, len(private_key_paths))
 	for priv in private_key_paths {
 		// TODO: Is this bad?
-		pub, _ := strings.concatenate([]string{priv, ".pub"}, context.temp_allocator)
-		append(&keys, SshKeyPair{Private = priv, Public = pub})
+		priv_key := strings.clone(priv)
+		pub, _ := strings.concatenate([]string{priv_key, ".pub"})
+		append(&keys, SshKeyPair{Private = priv_key, Public = pub})
 	}
 
 	exclude := make([dynamic]string, 0, 4)
-	append(&exclude, "*\\.envrc")
-	append(&exclude, "\\.local/")
-	append(&exclude, "node_modules")
-	append(&exclude, "vendor")
+	append(&exclude, strings.clone("*\\.envrc"))
+	append(&exclude, strings.clone("\\.local/"))
+	append(&exclude, strings.clone("node_modules"))
+	append(&exclude, strings.clone("vendor"))
 
 	include := make([dynamic]string, 0, 1)
-	append(&include, "~")
+	append(&include, strings.clone("~"))
 
 	scan_cfg := ScanConfig {
-		Matcher = "\\.env",
+		Matcher = strings.clone("\\.env"),
 		Exclude = exclude,
 		Include = include,
 	}
 
-	return Config{Keys = keys, ScanConfig = scan_cfg}
+	return Config{Keys = keys, ScanConfig = scan_cfg, config_path = cfg_path}
 }
 
 save_config :: proc(cfg: Config, force: bool = false) -> bool {
-	home, home_err := os.user_home_dir(context.allocator)
-	if home_err != nil {
-		fmt.printf("Error getting home dir: %v\n", home_err)
-		return false
-	}
-
-	config_dir, _ := filepath.join([]string{home, ".envr"})
+	config_dir := envr_dir(cfg.config_path)
 
 	if !os.exists(config_dir) {
 		mkdir_err := os.make_directory(config_dir)
 		if mkdir_err != nil {
-			fmt.printf("Error creating ~/.envr directory: %v\n", mkdir_err)
+			fmt.printf("Error creating %s directory: %v\n", config_dir, mkdir_err)
 			return false
 		}
 	}
 
-	config_path, _ := filepath.join([]string{config_dir, "config.json"})
-
-	if os.exists(config_path) && !force {
-		info, stat_err := os.stat(config_path, context.allocator)
+	if os.exists(cfg.config_path) && !force {
+		info, stat_err := os.stat(cfg.config_path, context.allocator)
 		if stat_err == nil {
 			defer os.file_info_delete(info, context.allocator)
 			if info.size > 0 {
@@ -174,8 +186,9 @@ save_config :: proc(cfg: Config, force: bool = false) -> bool {
 		fmt.printf("Error marshaling config: %v\n", marshal_err)
 		return false
 	}
+	defer delete(data)
 
-	write_err := os.write_entire_file(config_path, data)
+	write_err := os.write_entire_file(cfg.config_path, data)
 	if write_err != nil {
 		fmt.printf("Error writing config: %v\n", write_err)
 		return false
@@ -185,15 +198,18 @@ save_config :: proc(cfg: Config, force: bool = false) -> bool {
 }
 
 search_paths :: proc(cfg: Config) -> (paths: [dynamic]string) {
-	home, _ := os.user_home_dir(context.allocator)
+	// TODO: Is this okay?
+	// TODO: handle error
+	home, _ := os.user_home_dir(context.temp_allocator)
 
 	for include in cfg.ScanConfig.Include {
+		// TODO: Do we need to manually expand ~/ in odin?
 		expanded, _ := strings.replace(include, "~", home, 1)
-		cloned, _ := strings.clone(expanded)
-		if filepath.is_abs(cloned) {
-			append(&paths, cloned)
+		if filepath.is_abs(expanded) {
+			append(&paths, expanded)
 		} else {
-			resolved, err := filepath.abs(cloned)
+			defer delete(expanded)
+			resolved, err := filepath.abs(expanded)
 			if err == nil {
 				append(&paths, resolved)
 			}
@@ -204,22 +220,7 @@ search_paths :: proc(cfg: Config) -> (paths: [dynamic]string) {
 
 find_git_roots :: proc(cfg: Config) -> (roots: [dynamic]string, ok: bool) {
 	paths := search_paths(cfg)
-
-	for sp in paths {
-		args := []string{"fd", "-H", "-t", "d", "^\\.git$", sp}
-		lines, fd_ok := run_fd(args)
-		if !fd_ok {
-			return
-		}
-
-		for line in lines {
-			cleaned, _ := filepath.clean(line)
-			parent := filepath.dir(cleaned)
-			cloned, _ := strings.clone(parent)
-			append(&roots, cloned)
-		}
-	}
-
+	findr.find_repos(paths[:], &roots, os.get_processor_core_count())
 	ok = true
 	return
 }

config_test.odin

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

crypto_test.odin

@@ -25,7 +25,11 @@ test_encrypt_decrypt_roundtrip :: proc(t: ^testing.T) {
 	testing.expect(t, dec_ok, "decryption should succeed")
 	defer delete(decrypted)
 
-	testing.expect(t, len(decrypted) == len(original), fmt.tprintf("expected %d bytes, got %d", len(original), len(decrypted)))
+	testing.expect(
+		t,
+		len(decrypted) == len(original),
+		fmt.tprintf("expected %d bytes, got %d", len(original), len(decrypted)),
+	)
 	for i in 0 ..< len(original) {
 		testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at index %d", i))
 	}
@@ -50,8 +54,16 @@ test_encrypt_decrypt_multi_recipient :: proc(t: ^testing.T) {
 	defer delete(decrypted2)
 
 	for i in 0 ..< len(original) {
-		testing.expect(t, decrypted1[i] == original[i], fmt.tprintf("key1: byte mismatch at %d", i))
-		testing.expect(t, decrypted2[i] == original[i], fmt.tprintf("key2: byte mismatch at %d", i))
+		testing.expect(
+			t,
+			decrypted1[i] == original[i],
+			fmt.tprintf("key1: byte mismatch at %d", i),
+		)
+		testing.expect(
+			t,
+			decrypted2[i] == original[i],
+			fmt.tprintf("key2: byte mismatch at %d", i),
+		)
 	}
 }
 
@@ -85,6 +97,25 @@ test_encrypt_empty_plaintext :: proc(t: ^testing.T) {
 	testing.expect(t, len(decrypted) == 0, "decrypted empty data should be empty")
 }
 
+@(test)
+test_recipient_can_decrypt_senders_data :: proc(t: ^testing.T) {
+	key1 := make_test_key_pair("test_ed25519")
+	key2 := make_test_key_pair("test_ed25519_second")
+	original := []u8{10, 20, 30, 40, 50}
+
+	encrypted, enc_ok := encrypt(original, []SshKeyPair{key1, key2})
+	testing.expect(t, enc_ok, "encryption with 2 keys should succeed")
+	defer delete(encrypted)
+
+	decrypted, dec_ok := decrypt(encrypted, []SshKeyPair{key2})
+	testing.expect(t, dec_ok, "second recipient should decrypt without the sender key present")
+	defer delete(decrypted)
+
+	for i in 0 ..< len(original) {
+		testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at %d", i))
+	}
+}
+
 @(test)
 test_ciphertext_has_magic :: proc(t: ^testing.T) {
 	key := make_test_key_pair("test_ed25519")
@@ -100,3 +131,4 @@ test_ciphertext_has_magic :: proc(t: ^testing.T) {
 	testing.expect(t, encrypted[2] == u8('V'), "magic byte 2")
 	testing.expect(t, encrypted[3] == u8('R'), "magic byte 3")
 }
+

db.odin

@@ -27,6 +27,7 @@ SyncDirection :: enum {
 }
 
 Db :: struct {
+	// Pointer to the sqlite db
 	db:      ^rawptr,
 	cfg:     Config,
 	changed: bool,
@@ -40,21 +41,32 @@ EnvFile :: struct {
 	contents: string,
 }
 
+delete_envfile :: proc(f: ^EnvFile) {
+	delete(f.Path)
+	for &remote in f.Remotes {
+		delete(remote)
+	}
+	delete(f.Remotes)
+	delete(f.Sha256)
+	delete(f.contents)
+}
+
 make_temp_path :: proc() -> string {
 	ts := time.time_to_unix(time.now())
 	b: strings.Builder
 	strings.builder_init(&b)
+	defer strings.builder_destroy(&b)
 	fmt.sbprintf(&b, "/tmp/envr-%d-%d.db", os.get_pid(), ts)
 	return strings.to_string(b)
 }
 
-db_open :: proc() -> (Db, bool) {
-	cfg, ok := load_config()
+db_open :: proc(cfg_path: string) -> (Db, bool) {
+	cfg, ok := load_config(cfg_path)
 	if !ok {
 		return Db{}, false
 	}
 
-	data_path := data_encrypted_path()
+	data_path := data_path(cfg.config_path)
 	_, stat_err := os.stat(data_path, context.allocator)
 
 	db: ^rawptr
@@ -64,8 +76,8 @@ db_open :: proc() -> (Db, bool) {
 		return Db{}, false
 	}
 
-	create_sql := "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
-	rc = sqlite.db_exec(db, string_to_cstring(create_sql), nil, nil, nil)
+	create_sql: cstring = "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
+	rc = sqlite.db_exec(db, create_sql, nil, nil, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error creating table: %s\n", sqlite.db_errmsg(db))
 		sqlite.db_close(db)
@@ -83,56 +95,66 @@ db_open :: proc() -> (Db, bool) {
 }
 
 db_close :: proc(d: ^Db) {
+	defer sqlite.db_close(d.db)
+
 	if d.changed {
-		tmp_path := make_temp_path()
-
-		if !db_vacuum_to_file(d.db, tmp_path) {
-			os.remove(tmp_path)
-			sqlite.db_close(d.db)
+		rc := sqlite.db_exec(d.db, "VACUUM", nil, nil, nil)
+		if rc != sqlite.OK {
+			fmt.printf("Error vacuuming database: %s\n", sqlite.db_errmsg(d.db))
 			return
 		}
 
-		sqlite_data, read_err := os.read_entire_file_from_path(tmp_path, context.allocator)
-		os.remove(tmp_path)
-		if read_err != nil {
-			fmt.printf("Error reading vacuumed database: %v\n", read_err)
-			sqlite.db_close(d.db)
+		sz: i64
+		data := sqlite.serialize(d.db, "main", &sz, 0)
+		if data == nil {
+			fmt.println("Error: failed to serialize database")
 			return
 		}
+		defer sqlite.free(data)
 
+		sqlite_data := data[:sz]
 		encrypted, enc_ok := encrypt(sqlite_data, d.cfg.Keys[:])
-		delete(sqlite_data)
 		if !enc_ok {
 			fmt.println("Error: encryption failed")
-			sqlite.db_close(d.db)
 			return
 		}
 
-		data_path := data_encrypted_path()
-		envr_d := envr_dir()
+		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)
 		delete(encrypted)
 		if write_err != nil {
 			fmt.printf("Error writing encrypted database: %v\n", write_err)
-			sqlite.db_close(d.db)
 			return
 		}
 
 		d.changed = false
 	}
-	sqlite.db_close(d.db)
 }
 
-db_list :: proc(d: ^Db) -> (results: [dynamic]EnvFile, ok: bool) {
-	sql := "SELECT path, remotes, sha256, contents FROM envr_env_files"
+// Caller is responsible for calling:
+// ```odin
+// delete(results)
+// for &result in results {
+// 	delete(&result)
+// }
+// ```
+db_list :: proc(d: ^Db, allocator := context.allocator) -> (results: [dynamic]EnvFile, ok: bool) {
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
+	rc := sqlite.prepare_v2(
+		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(d.db))
 		return
 	}
+	defer sqlite.finalize(stmt)
 
 	for {
 		rc = sqlite.step(stmt)
@@ -141,19 +163,15 @@ db_list :: proc(d: ^Db) -> (results: [dynamic]EnvFile, ok: bool) {
 		}
 		if rc != sqlite.ROW {
 			fmt.printf("Error stepping query: %s\n", sqlite.db_errmsg(d.db))
-			sqlite.finalize(stmt)
 			return
 		}
 
-		path := cstring_to_string(sqlite.column_text(stmt, 0))
-		remotes_json := cstring_to_string(sqlite.column_text(stmt, 1))
-		sha := cstring_to_string(sqlite.column_text(stmt, 2))
-		contents := cstring_to_string(sqlite.column_text(stmt, 3))
-
-		remotes: [dynamic]string
+		remotes_json := string(sqlite.column_text(stmt, 1))
+		remotes: [dynamic]string = ---
 		if len(remotes_json) > 0 {
-			json.unmarshal_string(remotes_json, &remotes)
+			json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
 		}
+		path := clone_cstring(sqlite.column_text(stmt, 0), allocator)
 
 		append(
 			&results,
@@ -161,33 +179,22 @@ db_list :: proc(d: ^Db) -> (results: [dynamic]EnvFile, ok: bool) {
 				Path = path,
 				Dir = filepath.dir(path),
 				Remotes = remotes,
-				Sha256 = sha,
-				contents = contents,
+				Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
+				contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
 			},
 		)
 	}
 
-	sqlite.finalize(stmt)
 	ok = true
 	return
 }
 
-db_vacuum_to_file :: proc(db: ^rawptr, path: string) -> bool {
-	b: strings.Builder
-	strings.builder_init(&b)
-	fmt.sbprintf(&b, "VACUUM INTO '%s'", path)
-	sql := strings.to_string(b)
-	rc := sqlite.db_exec(db, string_to_cstring(sql), nil, nil, nil)
-	if rc != sqlite.OK {
-		fmt.printf("Error vacuuming database: %s\n", sqlite.db_errmsg(db))
-		return false
-	}
-	return true
-}
-
 db_restore_from_encrypted :: proc(db: ^rawptr, cfg: Config) -> bool {
-	data_path := data_encrypted_path()
-	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(cfg.config_path),
+		context.allocator,
+	)
+	defer delete(encrypted_data)
 	if read_err != nil {
 		fmt.printf("Error reading encrypted database: %v\n", read_err)
 		return false
@@ -200,56 +207,39 @@ db_restore_from_encrypted :: proc(db: ^rawptr, cfg: Config) -> bool {
 	}
 	defer delete(plaintext)
 
-	tmp_path := make_temp_path()
-	write_err := os.write_entire_file(tmp_path, plaintext)
-	if write_err != nil {
-		fmt.printf("Error writing temp database: %v\n", write_err)
+	n := i64(len(plaintext))
+	buf := sqlite.malloc64(n)
+	if buf == nil {
+		fmt.println("Error: failed to allocate buffer for deserialization")
 		return false
 	}
-	defer os.remove(tmp_path)
+	copy(buf[:len(plaintext)], plaintext)
 
-	if !db_attach_and_copy(db, tmp_path) {
-		return false
-	}
-
-	return true
-}
-
-db_attach_and_copy :: proc(mem_db: ^rawptr, src_path: string) -> bool {
-	b: strings.Builder
-	strings.builder_init(&b)
-	fmt.sbprintf(&b, "ATTACH DATABASE '%s' AS source", src_path)
-	attach_sql := strings.to_string(b)
-
-	rc := sqlite.db_exec(mem_db, string_to_cstring(attach_sql), nil, nil, nil)
-	if rc != sqlite.OK {
-		fmt.printf("Error attaching database: %s\n", sqlite.db_errmsg(mem_db))
-		return false
-	}
-
-	rc = sqlite.db_exec(
-		mem_db,
-		"INSERT INTO main.envr_env_files SELECT * FROM source.envr_env_files",
-		nil,
-		nil,
-		nil,
+	rc := sqlite.deserialize(
+		db,
+		"main",
+		buf,
+		n,
+		n,
+		sqlite.DESERIALIZE_FREEONCLOSE | sqlite.DESERIALIZE_RESIZEABLE,
 	)
 	if rc != sqlite.OK {
-		fmt.printf("Error copying data: %s\n", sqlite.db_errmsg(mem_db))
-		sqlite.db_exec(mem_db, "DETACH DATABASE source", nil, nil, nil)
+		sqlite.free(buf)
+		fmt.printf("Error deserializing database: %s\n", sqlite.db_errmsg(db))
 		return false
 	}
 
-	sqlite.db_exec(mem_db, "DETACH DATABASE source", nil, nil, nil)
 	return true
 }
 
+
 get_git_remotes :: proc(dir: string) -> [dynamic]string {
 	remotes: [dynamic]string
 	remote_set: map[string]bool
 
 	b: strings.Builder
 	strings.builder_init(&b)
+	defer strings.builder_destroy(&b)
 	fmt.sbprintf(&b, "%s-git-remotes", make_temp_path())
 	tmp_path := strings.to_string(b)
 	tmp_file, tmp_err := os.open(tmp_path, os.O_CREATE | os.O_WRONLY | os.O_TRUNC)
@@ -279,13 +269,13 @@ get_git_remotes :: proc(dir: string) -> [dynamic]string {
 	}
 
 	data, read_err := os.read_entire_file_from_path(tmp_path, context.allocator)
+	defer delete(data)
 	os.remove(tmp_path)
 	if read_err != nil {
 		return remotes
 	}
 
-	output_str := string(data)
-	lines := strings.split(output_str, "\n")
+	lines := strings.split(string(data), "\n")
 
 	for &line in lines {
 		line = strings.trim_space(line)
@@ -312,27 +302,27 @@ new_env_file :: proc(path: string) -> (EnvFile, bool) {
 		fmt.printf("Error getting absolute path: %v\n", abs_err)
 		return EnvFile{}, false
 	}
-	cloned_path, _ := strings.clone(abs_path)
 
-	dir := filepath.dir(cloned_path)
+	dir := filepath.dir(abs_path)
 
 	remotes := get_git_remotes(dir)
 
-	data, read_err := os.read_entire_file_from_path(cloned_path, context.allocator)
+	data, read_err := os.read_entire_file_from_path(abs_path, context.allocator)
+	defer delete(data)
 	if read_err != nil {
-		fmt.printf("Error reading file %s: %v\n", cloned_path, read_err)
+		fmt.printf("Error reading file %s: %v\n", abs_path, read_err)
 		return EnvFile{}, false
 	}
 
-	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
+	digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
+	// TODO: Handle error
 	hex_bytes, _ := hex.encode(digest)
-	sha_str := string(hex_bytes)
 
 	return EnvFile {
-			Path = cloned_path,
+			Path = abs_path,
 			Dir = dir,
 			Remotes = remotes,
-			Sha256 = sha_str,
+			Sha256 = string(hex_bytes),
 			contents = string(data),
 		},
 		true
@@ -344,20 +334,51 @@ db_insert :: proc(d: ^Db, file: EnvFile) -> bool {
 		fmt.printf("Error marshaling remotes: %v\n", marshal_err)
 		return false
 	}
+	defer delete(remotes_json)
 
-	sql := "INSERT OR REPLACE INTO envr_env_files (path, remotes, sha256, contents) VALUES (?, ?, ?, ?)"
+	sql: cstring =
+		"INSERT OR REPLACE INTO " +
+		"envr_env_files (path, remotes, sha256, contents) VALUES (?, ?, ?, ?)"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
+	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing insert: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}
 	defer sqlite.finalize(stmt)
 
-	rc = sqlite.bind_text(stmt, 1, string_to_cstring(file.Path), -1, nil)
-	rc = sqlite.bind_text(stmt, 2, string_to_cstring(string(remotes_json)), -1, nil)
-	rc = sqlite.bind_text(stmt, 3, string_to_cstring(file.Sha256), -1, nil)
-	rc = sqlite.bind_text(stmt, 4, string_to_cstring(file.contents), -1, nil)
+	// TODO: deal with elsewhere?
+	cpath := to_cstring(file.Path)
+	defer delete(cpath)
+	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
+	if rc != sqlite.OK {
+		fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
+		return false
+	}
+
+	cremotes := to_cstring(string(remotes_json))
+	defer delete(cremotes)
+	rc = sqlite.bind_text(stmt, 2, cremotes, -1, nil)
+	if rc != sqlite.OK {
+		fmt.printf("Error binding remotes: %s\n", sqlite.db_errmsg(d.db))
+		return false
+	}
+
+	csha := to_cstring(file.Sha256)
+	defer delete(csha)
+	rc = sqlite.bind_text(stmt, 3, csha, -1, nil)
+	if rc != sqlite.OK {
+		fmt.printf("Error binding sha256: %s\n", sqlite.db_errmsg(d.db))
+		return false
+	}
+
+	ccontents := to_cstring(file.contents)
+	defer delete(ccontents)
+	rc = sqlite.bind_text(stmt, 4, ccontents, -1, nil)
+	if rc != sqlite.OK {
+		fmt.printf("Error binding contents: %s\n", sqlite.db_errmsg(d.db))
+		return false
+	}
 
 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
@@ -369,17 +390,23 @@ db_insert :: proc(d: ^Db, file: EnvFile) -> bool {
 	return true
 }
 
-db_fetch :: proc(d: ^Db, path: string) -> (EnvFile, bool) {
-	sql := "SELECT path, remotes, sha256, contents FROM envr_env_files WHERE path = ?"
+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: ^rawptr
-	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
+	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing fetch: %s\n", sqlite.db_errmsg(d.db))
 		return EnvFile{}, false
 	}
 	defer sqlite.finalize(stmt)
 
-	rc = sqlite.bind_text(stmt, 1, string_to_cstring(path), -1, nil)
+	cpath := to_cstring(path, allocator)
+	defer delete(cpath, allocator)
+	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
+	if rc != sqlite.OK {
+		fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
+		return EnvFile{}, false
+	}
 	rc = sqlite.step(stmt)
 	if rc == sqlite.DONE {
 		fmt.printf("No file found with path: %s\n", path)
@@ -390,38 +417,41 @@ db_fetch :: proc(d: ^Db, path: string) -> (EnvFile, bool) {
 		return EnvFile{}, false
 	}
 
-	file_path := cstring_to_string(sqlite.column_text(stmt, 0))
-	remotes_json := cstring_to_string(sqlite.column_text(stmt, 1))
-	sha := cstring_to_string(sqlite.column_text(stmt, 2))
-	contents := cstring_to_string(sqlite.column_text(stmt, 3))
-
-	remotes: [dynamic]string
+	remotes_json := string(sqlite.column_text(stmt, 1))
+	remotes: [dynamic]string = ---
 	if len(remotes_json) > 0 {
-		json.unmarshal_string(remotes_json, &remotes)
+		json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
 	}
 
-	cloned_path, _ := strings.clone(file_path)
+	file_path := clone_cstring(sqlite.column_text(stmt, 0))
+
 	return EnvFile {
-			Path = cloned_path,
-			Dir = filepath.dir(cloned_path),
+			Path = file_path,
+			Dir = filepath.dir(file_path),
 			Remotes = remotes,
-			Sha256 = sha,
-			contents = contents,
+			Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
+			contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
 		},
 		true
 }
 
 db_delete :: proc(d: ^Db, path: string) -> bool {
-	sql := "DELETE FROM envr_env_files WHERE path = ?"
+	sql: cstring = "DELETE FROM envr_env_files WHERE path = ?"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
+	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing delete: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}
 	defer sqlite.finalize(stmt)
 
-	rc = sqlite.bind_text(stmt, 1, string_to_cstring(path), -1, nil)
+	cpath := to_cstring(path)
+	defer delete(cpath)
+	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
+	if rc != sqlite.OK {
+		fmt.printf("Error binding path: %s\n", sqlite.db_errmsg(d.db))
+		return false
+	}
 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
 		fmt.printf("Error deleting: %s\n", sqlite.db_errmsg(d.db))
@@ -437,19 +467,31 @@ db_delete :: proc(d: ^Db, path: string) -> bool {
 	return true
 }
 
-cstring_to_string :: proc(cs: cstring) -> string {
-	if cs == nil {
-		return ""
-	}
-	s, _ := strings.clone_from_cstring(cs)
-	return s
+to_cstring :: proc {
+	string_to_cstring,
+	strings.to_cstring,
 }
 
-string_to_cstring :: proc(s: string) -> cstring {
-	cs, _ := strings.clone_to_cstring(s)
+string_to_cstring :: proc(s: string, allocator := context.allocator) -> cstring {
+	cs, err := strings.clone_to_cstring(s, allocator)
+	if err != nil {
+		fmt.printf("Failed to convert string to cstring: %v\n", err)
+		panic("Allocation Exception")
+	}
 	return cs
 }
 
+clone_cstring :: proc(c: cstring, allocator := context.allocator) -> string {
+	str, err := strings.clone_from_cstring(c, allocator)
+	if err != nil {
+		fmt.printf("Failed to convert string to cstring: %v\n", err)
+		delete(str)
+		panic("Allocation Exception")
+	}
+
+	return str
+}
+
 db_update_required :: proc(status: SyncFlag) -> bool {
 	return .BackedUp in status || .DirUpdated in status
 }
@@ -475,8 +517,8 @@ update_dir :: proc(f: ^EnvFile, new_dir: string) {
 
 find_moved_dirs :: proc(d: ^Db, f: ^EnvFile) -> ([dynamic]string, bool) {
 	feats := check_features()
-	if .Fd not_in feats || .Git not_in feats {
-		fmt.println("Error: fd and git are required for moved dir detection")
+	if .Git not_in feats {
+		fmt.println("Error: git is required for moved dir detection")
 		return {}, false
 	}
 
@@ -496,20 +538,11 @@ find_moved_dirs :: proc(d: ^Db, f: ^EnvFile) -> ([dynamic]string, bool) {
 	return moved, true
 }
 
-env_file_backup :: proc(f: ^EnvFile) -> bool {
-	data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
-	if read_err != nil {
-		fmt.printf("Error reading file %s: %v\n", f.Path, read_err)
-		return false
-	}
-
-	f.contents = string(data)
-	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
-	hex_bytes, _ := hex.encode(digest)
-	f.Sha256 = string(hex_bytes)
-	return true
+db_sync :: proc(d: ^Db, f: ^EnvFile) -> (SyncFlag, string) {
+	return env_file_sync(f, .TrustFilesystem, d)
 }
 
+// If SyncFlag is .BackedUp, Caller is responsible for calling delete on f.contents and f.Sha256
 env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, string) {
 	result: SyncFlag = {}
 
@@ -555,6 +588,7 @@ env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, str
 	}
 
 	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
+	// TODO: Handle error
 	hex_bytes, _ := hex.encode(digest)
 	current_sha := string(hex_bytes)
 
@@ -580,7 +614,24 @@ env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, str
 	return result, ""
 }
 
-db_sync :: proc(d: ^Db, f: ^EnvFile) -> (SyncFlag, string) {
-	return env_file_sync(f, .TrustFilesystem, d)
+// Loads the contents of the the file at f.Path into f.contents
+//
+// Caller is responsible for calling delete on f.contents and f.Sha256
+env_file_backup :: proc(f: ^EnvFile) -> bool {
+	data, read_err := os.read_entire_file_from_path(f.Path, context.allocator)
+	if read_err != nil {
+		fmt.printf("Error reading file %s: %v\n", f.Path, read_err)
+		return false
+	}
+
+	f.contents = string(data)
+	digest := hash.hash_bytes(hash.Algorithm.SHA256, data, context.temp_allocator)
+	hex_bytes, alloc_err := hex.encode(digest)
+	if alloc_err != nil {
+		fmt.printf("Error generating hash for file %s: %v\n", f.Path, alloc_err)
+		return false
+	}
+	f.Sha256 = string(hex_bytes)
+	return true
 }
 

db_integration_test.odin

@@ -136,7 +136,7 @@ test_encrypt_write_read_decrypt :: proc(t: ^testing.T) {
 }
 
 @(test)
-test_decrypt_then_attach_sqlite :: proc(t: ^testing.T) {
+test_decrypt_then_deserialize_sqlite :: proc(t: ^testing.T) {
 	cfg := fixture_config()
 	defer {
 		delete(cfg.Keys)
@@ -164,14 +164,6 @@ test_decrypt_then_attach_sqlite :: proc(t: ^testing.T) {
 	}
 	defer delete(plaintext)
 
-	tmp_db_path := fmt.tprintf("/tmp/envr-test-attach-%d.db", os.get_pid())
-	write_err := os.write_entire_file(tmp_db_path, plaintext)
-	testing.expectf(t, write_err == nil, "failed to write temp db: %v", write_err)
-	if write_err != nil {
-		return
-	}
-	defer os.remove(tmp_db_path)
-
 	mem_db: ^rawptr
 	rc := sqlite.db_open(":memory:", &mem_db)
 	testing.expectf(t, rc == sqlite.OK, "failed to open in-memory db")
@@ -180,16 +172,29 @@ test_decrypt_then_attach_sqlite :: proc(t: ^testing.T) {
 	}
 	defer sqlite.db_close(mem_db)
 
-	create_sql := "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
-	rc = sqlite.db_exec(mem_db, string_to_cstring(create_sql), nil, nil, nil)
-	testing.expect(t, rc == sqlite.OK, "failed to create table")
+	n := i64(len(plaintext))
+	buf := sqlite.malloc64(n)
+	testing.expect(t, buf != nil, "malloc64 should succeed")
+	if buf == nil do return
+	copy(buf[:len(plaintext)], plaintext)
 
-	attach_ok := db_attach_and_copy(mem_db, tmp_db_path)
-	testing.expect(t, attach_ok, "failed to attach and copy")
+	rc = sqlite.deserialize(
+		mem_db,
+		"main",
+		buf,
+		n,
+		n,
+		sqlite.DESERIALIZE_FREEONCLOSE | sqlite.DESERIALIZE_RESIZEABLE,
+	)
+	testing.expect(t, rc == sqlite.OK, "deserialize should succeed")
+	if rc != sqlite.OK {
+		sqlite.free(buf)
+		return
+	}
 
-	sql := "SELECT path FROM envr_env_files"
+	sql: cstring = "SELECT path FROM envr_env_files"
 	stmt: ^rawptr
-	rc = sqlite.prepare_v2(mem_db, string_to_cstring(sql), -1, &stmt, nil)
+	rc = sqlite.prepare_v2(mem_db, sql, -1, &stmt, nil)
 	testing.expect(t, rc == sqlite.OK, "prepare failed")
 	if rc != sqlite.OK {
 		return
@@ -199,7 +204,7 @@ test_decrypt_then_attach_sqlite :: proc(t: ^testing.T) {
 	rc = sqlite.step(stmt)
 	testing.expect(t, rc == sqlite.ROW, "expected at least one row")
 	if rc == sqlite.ROW {
-		path := cstring_to_string(sqlite.column_text(stmt, 0))
+		path := string(sqlite.column_text(stmt, 0))
 		testing.expect(t, len(path) > 0, "path should not be empty")
 	}
 }
@@ -207,9 +212,7 @@ test_decrypt_then_attach_sqlite :: proc(t: ^testing.T) {
 @(test)
 test_full_db_cycle :: proc(t: ^testing.T) {
 	cfg := fixture_config()
-	defer {
-		delete(cfg.Keys)
-	}
+	defer delete(cfg.Keys)
 
 	db_path := fixture_db_path()
 	original_data, read_err := os.read_entire_file_from_path(db_path, context.allocator)
@@ -230,6 +233,7 @@ test_full_db_cycle :: proc(t: ^testing.T) {
 	os.mkdir_all(envr_dir_path)
 
 	data_path, _ := filepath.join([]string{envr_dir_path, "data.envr"})
+	defer delete(data_path)
 	write_err := os.write_entire_file(data_path, encrypted)
 	testing.expectf(t, write_err == nil, "failed to write data.envr: %v", write_err)
 	if write_err != nil {

db_test.odin

@@ -2,6 +2,8 @@ package main
 
 import "core:fmt"
 import "core:os"
+import "core:path/filepath"
+import "core:strings"
 import "core:testing"
 
 import "sqlite"
@@ -13,8 +15,8 @@ make_test_db :: proc() -> (Db, bool) {
 		return Db{}, false
 	}
 
-	create_sql := "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
-	rc = sqlite.db_exec(db, string_to_cstring(create_sql), nil, nil, nil)
+	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
@@ -25,11 +27,11 @@ make_test_db :: proc() -> (Db, bool) {
 
 make_test_env_file :: proc(path, sha, contents: string, remotes: []string = {}) -> EnvFile {
 	f := EnvFile {
-		Path = path,
-		Dir = "",
-		Sha256 = sha,
+		Path     = path,
+		Dir      = "",
+		Sha256   = sha,
 		contents = contents,
-		Remotes = make([dynamic]string, 0, len(remotes)),
+		Remotes  = make([dynamic]string, 0, len(remotes)),
 	}
 	for r in remotes {
 		append(&f.Remotes, r)
@@ -44,26 +46,25 @@ test_db_insert_and_fetch :: proc(t: ^testing.T) {
 	if !ok do return
 	defer sqlite.db_close(d.db)
 
-	f := make_test_env_file(
-		"/project/.env",
-		"abc123",
-		"SECRET=value",
-		[]string{"git@github.com:user/repo.git"},
-	)
+	path := "/project/.env"
+	sha := "abc123"
+	contents := "SECRET=value"
+
+	f := make_test_env_file(path, sha, contents, []string{"git@github.com:user/repo.git"})
 	defer delete(f.Remotes)
 
 	testing.expect(t, db_insert(&d, f), "insert should succeed")
 
 	fetched, fetch_ok := db_fetch(&d, "/project/.env")
+	defer delete_envfile(&fetched)
 	testing.expect(t, fetch_ok, "fetch should succeed")
 	if !fetch_ok do return
-	defer delete(fetched.Remotes)
 
-	testing.expect(t, fetched.Path == "/project/.env", "path mismatch")
-	testing.expect(t, fetched.Sha256 == "abc123", "sha mismatch")
-	testing.expect(t, fetched.contents == "SECRET=value", "contents mismatch")
-	testing.expect(t, len(fetched.Remotes) == 1, "remotes count mismatch")
-	testing.expect(t, fetched.Remotes[0] == "git@github.com:user/repo.git", "remote mismatch")
+	testing.expect_value(t, fetched.Path, path)
+	testing.expect_value(t, fetched.Sha256, sha)
+	testing.expect_value(t, fetched.contents, contents)
+	testing.expect_value(t, len(fetched.Remotes), 1)
+	testing.expect_value(t, fetched.Remotes[0], "git@github.com:user/repo.git")
 }
 
 @(test)
@@ -96,16 +97,19 @@ test_db_insert_or_replace :: proc(t: ^testing.T) {
 	testing.expect(t, list_ok, "list should succeed")
 	if !list_ok do return
 	defer delete(results)
+	for &result in results {
+		defer delete_envfile(&result)
+	}
 
 	testing.expect(t, len(results) == 1, "should have 1 row, not 2")
 
 	fetched, fetch_ok := db_fetch(&d, "/project/.env")
 	testing.expect(t, fetch_ok, "fetch should succeed")
 	if !fetch_ok do return
-	defer delete(fetched.Remotes)
+	defer delete_envfile(&fetched)
 
-	testing.expect(t, fetched.contents == "KEY=new", "contents should be updated")
-	testing.expect(t, fetched.Sha256 == "sha2", "sha should be updated")
+	testing.expect_value(t, fetched.contents, "KEY=new")
+	testing.expect_value(t, fetched.Sha256, "sha2")
 }
 
 @(test)
@@ -143,11 +147,10 @@ test_db_list_multiple :: proc(t: ^testing.T) {
 	defer sqlite.db_close(d.db)
 
 	f1 := make_test_env_file("/proj1/.env", "sha1", "A=1", []string{"git@github.com:a/repo.git"})
-	f2 := make_test_env_file("/proj2/.env", "sha2", "B=2", []string{"git@github.com:b/repo.git"})
-	f3 := make_test_env_file("/proj3/.env", "sha3", "C=3")
 	defer delete(f1.Remotes)
+	f2 := make_test_env_file("/proj2/.env", "sha2", "B=2", []string{"git@github.com:b/repo.git"})
 	defer delete(f2.Remotes)
-	defer delete(f3.Remotes)
+	f3 := make_test_env_file("/proj3/.env", "sha3", "C=3")
 
 	db_insert(&d, f1)
 	db_insert(&d, f2)
@@ -157,8 +160,13 @@ test_db_list_multiple :: proc(t: ^testing.T) {
 	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(t, len(results) == 3, "should have 3 rows")
+	testing.expect_value(t, len(results), 3)
 }
 
 @(test)
@@ -207,7 +215,7 @@ test_db_delete_sets_changed :: proc(t: ^testing.T) {
 }
 
 @(test)
-test_db_vacuum_to_file :: proc(t: ^testing.T) {
+test_db_serialize :: proc(t: ^testing.T) {
 	d, ok := make_test_db()
 	testing.expect(t, ok, "failed to create test db")
 	if !ok do return
@@ -217,21 +225,13 @@ test_db_vacuum_to_file :: proc(t: ^testing.T) {
 	defer delete(f.Remotes)
 	db_insert(&d, f)
 
-	vacuum_path := fmt.tprintf("/tmp/envr-test-vacuum-%d.db", os.get_pid())
-	defer os.remove(vacuum_path)
+	sz: i64
+	data := sqlite.serialize(d.db, "main", &sz, 0)
+	testing.expect(t, data != nil, "serialize should return non-nil")
+	if data == nil do return
+	defer sqlite.free(data)
 
-	testing.expect(t, db_vacuum_to_file(d.db, vacuum_path), "vacuum should succeed")
-
-	_, stat_err := os.stat(vacuum_path, context.allocator)
-	testing.expect(t, stat_err == nil, "vacuumed file should exist")
-	if stat_err != nil do return
-
-	data, read_err := os.read_entire_file_from_path(vacuum_path, context.allocator)
-	testing.expect(t, read_err == nil, "should read vacuumed file")
-	if read_err != nil do return
-	defer delete(data)
-
-	testing.expect(t, len(data) > 0, "vacuumed file should be non-empty")
+	testing.expect(t, sz > 0, "serialized size should be > 0")
 }
 
 @(test)
@@ -319,3 +319,82 @@ test_shares_remote_both_empty :: proc(t: ^testing.T) {
 	testing.expect(t, !shares_remote(&f, remotes), "both empty should not share")
 }
 
+@(test)
+test_make_temp_path_format :: proc(t: ^testing.T) {
+	p := make_temp_path()
+	testing.expect(t, strings.has_suffix(p, ".db"), "should end with .db")
+	testing.expect(t, strings.contains(p, fmt.tprintf("%d", os.get_pid())), "should contain PID")
+}
+
+@(test)
+test_new_env_file :: proc(t: ^testing.T) {
+	base := fmt.tprintf("/tmp/envr-test-envfile-%d", os.get_pid())
+	os.mkdir_all(base)
+	defer os.remove_all(base)
+
+	env_path := fmt.tprintf("%s/.env", base)
+	err := os.write_entire_file(env_path, "SECRET=value\n")
+	testing.expect(t, err == nil, ".env file should exists")
+
+	file, ok := new_env_file(env_path)
+	testing.expect(t, ok, "new_env_file should succeed")
+	if !ok do return
+	defer delete(file.Remotes)
+	defer delete(file.Sha256)
+	defer delete(file.Path)
+
+	testing.expect(t, filepath.is_abs(file.Path), "path should be absolute")
+	testing.expect(t, strings.has_suffix(file.Path, "/.env"), "path should end with /.env")
+	testing.expect(t, file.contents == "SECRET=value\n", "contents mismatch")
+	testing.expect(t, len(file.Sha256) == 64, "sha256 should be 64 hex chars")
+}
+
+@(test)
+test_new_env_file_missing :: proc(t: ^testing.T) {
+	_, ok := new_env_file("/tmp/envr-nonexistent-envfile/path/.env")
+	testing.expect(t, !ok, "missing file should return false")
+}
+
+@(test)
+test_env_file_backup :: proc(t: ^testing.T) {
+	base := fmt.tprintf("/tmp/envr-test-backup-%d", os.get_pid())
+	os.mkdir_all(base)
+	defer os.remove_all(base)
+
+	env_path := fmt.tprintf("%s/.env", base)
+	err := os.write_entire_file(env_path, "KEY=12345\n")
+	testing.expect(t, err == nil, ".env file should exist")
+
+	f := EnvFile {
+		Path = env_path,
+	}
+	defer delete(f.contents)
+	defer delete(f.Sha256)
+	testing.expect(t, env_file_backup(&f), "backup should succeed")
+	testing.expect_value(t, f.contents, "KEY=12345\n")
+	testing.expect_value(t, len(f.Sha256), 64)
+}
+
+@(test)
+test_env_file_backup_missing :: proc(t: ^testing.T) {
+	f := EnvFile {
+		Path = "/tmp/envr-nonexistent-backup/.env",
+	}
+	testing.expect(t, !env_file_backup(&f), "missing file should return false")
+}
+
+@(test)
+test_update_dir :: proc(t: ^testing.T) {
+	f := EnvFile {
+		Path    = "/old/project/.env",
+		Dir     = "/old/project",
+		Remotes = make([dynamic]string, 0),
+	}
+	defer delete_envfile(&f)
+
+	update_dir(&f, "/new/location")
+
+	testing.expect_value(t, f.Dir, "/new/location")
+	testing.expect_value(t, f.Path, "/new/location/.env")
+}
+

features.odin

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

findr/findr_test.odin

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

findr/gitignore.odin

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

findr/gitignore_test.odin

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

findr/glob.odin

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

findr/glob_test.odin

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

findr/repos.odin

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

findr/test_env.odin

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

findr/walker.odin

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

flake.nix

@@ -11,11 +11,12 @@
   };
 
   outputs =
-    inputs@{ flake-parts
-    , nixpkgs
-    , nixpkgs-unstable
-    , self
-    , treefmt-nix
+    inputs@{
+      flake-parts,
+      nixpkgs,
+      nixpkgs-unstable,
+      self,
+      treefmt-nix,
     }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
@@ -29,7 +30,18 @@
       ];
 
       perSystem =
-        { pkgs, system, inputs', ... }: {
+        {
+          pkgs,
+          system,
+          inputs',
+          ...
+        }:
+      let
+        mysqlite = pkgs.sqlite.overrideAttrs (old: {
+                configureFlags = (old.configureFlags or [ ]) ++ [ "--enable-deserialize" ];
+              });
+      in
+        {
           _module.args.pkgs = import nixpkgs {
             inherit system;
             config.allowUnfree = true;
@@ -54,7 +66,7 @@
 
           packages.default = pkgs.stdenv.mkDerivation rec {
             pname = "envr";
-            version = "0.2.0";
+            version = "0.3.0";
             src = ./.;
 
             nativeBuildInputs = [
@@ -64,7 +76,7 @@
 
             buildInputs = [
               pkgs.libsodium
-              pkgs.sqlite
+              mysqlite
             ];
 
             buildPhase = ''
@@ -83,17 +95,20 @@
 
           devShells.default = pkgs.mkShell {
             buildInputs = with pkgs; [
-              fd
               nushell
 
               libsodium
-              sqlite
+              mysqlite
               unstable.odin
               unstable.ols
 
               # Build tools
               zip
 
+              # Helper tools
+              delta
+              hyperfine
+
               # IDE
               unstable.helix
               typescript-language-server

main.odin

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

main.odin.bak

@@ -1,44 +0,0 @@
-package main
-
-import "core:fmt"
-import "core:os"
-
-main :: proc() {
-	cmd, ok := parse_args()
-	if !ok {
-		return
-	}
-
-	switch cmd.name {
-	case "init":
-		cmd_init(&cmd)
-	case "version":
-		cmd_version(&cmd)
-	case "deps":
-		cmd_deps(&cmd)
-	case "list":
-		cmd_list(&cmd)
-	case "backup", "add":
-		cmd_backup(&cmd)
-	case "remove":
-		cmd_remove(&cmd)
-	case "restore":
-		cmd_restore(&cmd)
-	case "edit-config":
-		cmd_edit_config(&cmd)
-	case "check":
-		cmd_check(&cmd)
-	case "scan":
-		cmd_scan(&cmd)
-	case "sync":
-		cmd_sync(&cmd)
-	case "nushell-completion":
-		cmd_nushell_completion(&cmd)
-	case:
-		fmt.printf("Unknown command: %s\n", cmd.name)
-		print_usage()
-		os.exit(1)
-	}
-}
-
-

prompt.odin

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

scan.odin

@@ -1,136 +1,21 @@
 package main
 
-import "core:fmt"
 import "core:os"
-import "core:strings"
-import "core:sync"
-import "core:terminal"
 
-fd_counter: sync.Atomic_Mutex
-fd_seq: int
+import "findr"
 
 // Caller is responsible for freeing paths
 scan_path :: proc(search_path: string, cfg: Config) -> (paths: [dynamic]string, ok: bool) {
-	if terminal.is_terminal(os.stdout) {
-		fmt.printf("Searching for all files in \"%s\"...\n", search_path)
+	opts := findr.WalkOptions {
+		pattern  = cfg.ScanConfig.Matcher,
+		excludes = cfg.ScanConfig.Exclude[:],
 	}
-	all_files, all_ok := run_fd(build_fd_args(search_path, cfg, true))
-	if !all_ok {
-		return
-	}
-
-	if terminal.is_terminal(os.stdout) {
-		fmt.printf("Search for unignored fies in \"%s\"...\n", search_path)
-	}
-	unignored_files, unignored_ok := run_fd(build_fd_args(search_path, cfg, false))
-	if !unignored_ok {
-		return
-	}
-
-	unignored_set := make(map[string]bool, len(unignored_files), context.temp_allocator)
-	for file in unignored_files {
-		unignored_set[file] = true
-	}
-
-	for file in all_files {
-		if !(file in unignored_set) {
-			append(&paths, file)
-		}
-	}
-
+	findr.walk({search_path}, &paths, opts, os.get_processor_core_count())
 	ok = true
 	return
 }
 
-@(private = "file")
-build_fd_args :: proc(search_path: string, cfg: Config, include_ignored: bool) -> []string {
-	args_len := 3 + 2 * len(cfg.ScanConfig.Exclude) + 2
-	args := make([dynamic]string, 0, args_len, context.temp_allocator)
-	append(&args, "fd")
-	append(&args, "-a")
-	append(&args, cfg.ScanConfig.Matcher)
-
-	for exclude in cfg.ScanConfig.Exclude {
-		append(&args, "-E")
-		append(&args, exclude)
-	}
-
-	if include_ignored {
-		append(&args, "-HI")
-	} else {
-		append(&args, "-H")
-	}
-
-	append(&args, search_path)
-	return args[:]
-}
-
-run_fd :: proc(args: []string) -> (lines: []string, ok: bool) {
-	tmp_path := next_fd_tmp_path()
-	tmp_file, tmp_err := os.open(tmp_path, os.O_CREATE | os.O_WRONLY | os.O_TRUNC)
-	if tmp_err != nil {
-		return
-	}
-
-	desc := os.Process_Desc {
-		command = args,
-		stdout  = tmp_file,
-		stderr  = nil,
-	}
-
-	p, start_err := os.process_start(desc)
-	os.close(tmp_file)
-	if start_err != nil {
-		os.remove(tmp_path)
-		return
-	}
-
-	state, wait_err := os.process_wait(p)
-	if wait_err != nil || state.exit_code != 0 {
-		os.remove(tmp_path)
-		return
-	}
-
-	data, read_err := os.read_entire_file_from_path(tmp_path, context.temp_allocator)
-	os.remove(tmp_path)
-	if read_err != nil {
-		return
-	}
-
-	output := string(data)
-	output = strings.trim_space(output)
-	if len(output) == 0 {
-		ok = true
-		return
-	}
-
-	raw_lines := strings.split(output, "\n", context.temp_allocator)
-	result := make([dynamic]string, 0, len(raw_lines), context.temp_allocator)
-	for line in raw_lines {
-		trimmed := strings.trim_space(line)
-		if len(trimmed) > 0 {
-			append(&result, trimmed)
-		}
-	}
-
-	return result[:], true
-}
-
-@(private = "file")
-next_fd_tmp_path :: proc() -> string {
-	sync.atomic_mutex_lock(&fd_counter)
-	n := fd_seq
-	fd_seq += 1
-	sync.atomic_mutex_unlock(&fd_counter)
-	return fmt.tprintf("/tmp/envr-fd-%d-%d", os.get_pid(), n)
-}
-
-cant_scan :: proc(feats: AvailableFeatures) -> bool {
-	return Feature.Fd not_in feats
-}
-
 find_unbacked :: proc(local_files: []string, db_files: []EnvFile) -> []string {
-	// Lives until the end of the function
 	backed_set := make(map[string]bool, len(db_files), context.temp_allocator)
 	for file in db_files {
 		backed_set[file.Path] = true
@@ -144,4 +29,3 @@ find_unbacked :: proc(local_files: []string, db_files: []EnvFile) -> []string {
 	}
 	return unbacked[:]
 }
-

scan_test.odin

@@ -7,9 +7,6 @@ import "core:testing"
 
 @(test)
 test_scan_path_finds_gitignored_env_files :: proc(t: ^testing.T) {
-	feats := check_features()
-	testing.expect(t, cant_scan(feats) == false)
-
 	base := fmt.tprintf("/tmp/envr-scan-test-%d", os.get_pid())
 	os.mkdir_all(base)
 	defer os.remove_all(base)
@@ -41,7 +38,12 @@ test_scan_path_finds_gitignored_env_files :: proc(t: ^testing.T) {
 	}
 
 	results, ok := scan_path(base, cfg)
-	defer delete(results)
+	defer {
+		for path in results {
+			delete(path)
+		}
+		delete(results)
+	}
 	testing.expect(t, ok, "scan_path should succeed")
 
 	found_env := false
@@ -68,9 +70,6 @@ test_scan_path_finds_gitignored_env_files :: proc(t: ^testing.T) {
 
 @(test)
 test_scan_path_empty_dir :: proc(t: ^testing.T) {
-	feats := check_features()
-	testing.expect(t, cant_scan(feats) == false)
-
 	base := fmt.tprintf("/tmp/envr-scan-empty-%d", os.get_pid())
 	os.mkdir_all(base)
 	defer os.remove_all(base)
@@ -84,4 +83,3 @@ test_scan_path_empty_dir :: proc(t: ^testing.T) {
 	testing.expect(t, ok, "scan_path should succeed")
 	testing.expect(t, len(results) == 0, fmt.tprintf("expected 0 results, got %d", len(results)))
 }
-

sqlite/sqlite.odin

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

table_test.odin

@@ -116,12 +116,22 @@ test_render_table_normal :: proc(t: ^testing.T) {
 
 	output := strings.to_string(b)
 
-	testing.expect(t, strings.contains(output, "Name"), "header 'Name' missing from output")
-	testing.expect(t, strings.contains(output, "Path"), "header 'Path' missing from output")
-	testing.expect(t, strings.contains(output, "foo"), "cell 'foo' missing from output")
-	testing.expect(t, strings.contains(output, "/home/user/.env"), "cell '/home/user/.env' missing from output")
-	testing.expect(t, strings.contains(output, "bar"), "cell 'bar' missing from output")
-	testing.expect(t, strings.contains(output, "/home/user/project/.env"), "cell '/home/user/project/.env' missing")
+	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)
@@ -138,7 +148,20 @@ test_render_table_empty :: proc(t: ^testing.T) {
 
 	output := strings.to_string(b)
 
-	testing.expect(t, strings.contains(output, "Name"), "header 'Name' missing from output")
+	expected := `┌──────┐
+│ Name │
+├──────┤
+└──────┘
+`
+	testing.expect(
+		t,
+		output == expected,
+		fmt.tprintf(
+			"table output mismatch\n--- expected ---\n%s\n--- got ---\n%s\n",
+			expected,
+			output,
+		),
+	)
 }
 
 @(test)
@@ -155,7 +178,21 @@ test_render_table_unicode :: proc(t: ^testing.T) {
 
 	output := strings.to_string(b)
 
-	testing.expect(t, strings.contains(output, "Available"), "unicode cell content missing")
-	testing.expect(t, strings.contains(output, "Missing"), "unicode cell content missing")
+	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,
+		),
+	)
 }
 

version.txt

@@ -1 +1 @@
-0.2.0
+0.3.1