huntedbytheirs/tofu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(state): track tofu-installed packages for upgrade checks

Browse Source
This commit is contained in:
huntedbytheirs
2026-08-08 18:17:24 -04:00
parent 88047eb4ca
commit 44024ca37d
3 changed files with 683 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.omo/evidence/task-18-tofu-core.log
+260
View File
@@ -0,0 +1,260 @@
Warning
Warning ## Warning for package tofu ##
Warning
Warning The following compiler flags have been specified in the package description
Warning file. They are handled by DUB and direct use in packages is discouraged.
Warning Alternatively, you can set the DFLAGS environment variable to pass custom flags
Warning to the compiler, or use one of the suggestions below:
Warning
Warning warningsAsErrors: Use "buildRequirements" to control the warning level
Warning
Generating test runner configuration 'tofu-test-application' for 'application' (executable).
Warning Excluding main source file src/main.d from test.
Starting Performing "unittest" build using /usr/bin/dmd for x86_64.
Up-to-date toml 1.0.0: target for configuration [library] is up to date.
Building tofu ~main: building configuration [tofu-test-application]
src/tofu/state.d(203,53): Error: conflicting attribute `@trusted`
private @safe Config makeTestConfig(string suffix) @trusted {
^
Error /usr/bin/dmd failed with exit code 1.
Warning
Warning ## Warning for package tofu ##
Warning
Warning The following compiler flags have been specified in the package description
Warning file. They are handled by DUB and direct use in packages is discouraged.
Warning Alternatively, you can set the DFLAGS environment variable to pass custom flags
Warning to the compiler, or use one of the suggestions below:
Warning
Warning warningsAsErrors: Use "buildRequirements" to control the warning level
Warning
Generating test runner configuration 'tofu-test-application' for 'application' (executable).
Warning Excluding main source file src/main.d from test.
Starting Performing "unittest" build using /usr/bin/dmd for x86_64.
Up-to-date toml 1.0.0: target for configuration [library] is up to date.
Building tofu ~main: building configuration [tofu-test-application]
src/tofu/errors.d(31,12): Error: unable to read module `errno`
import core.sys.posix.errno : ESRCH;
^
src/tofu/errors.d(31,12): Expected 'core/sys/posix/errno.d' or 'core/sys/posix/errno/package.d' in one of the following import paths:
import path[0] = src/
import path[1] = ../../.dub/cache/tofu/~main/code/tofu-test-application-unittest-qC6iqORPwrCDXediNbesdA/
import path[2] = ../../.dub/packages/toml/1.0.0/toml/src/
import path[3] = /usr/include/dlang/dmd
Error /usr/bin/dmd failed with exit code 1.
Warning
Warning ## Warning for package tofu ##
Warning
Warning The following compiler flags have been specified in the package description
Warning file. They are handled by DUB and direct use in packages is discouraged.
Warning Alternatively, you can set the DFLAGS environment variable to pass custom flags
Warning to the compiler, or use one of the suggestions below:
Warning
Warning warningsAsErrors: Use "buildRequirements" to control the warning level
Warning
Generating test runner configuration 'tofu-test-application' for 'application' (executable).
Warning Excluding main source file src/main.d from test.
Starting Performing "unittest" build using /usr/bin/dmd for x86_64.
Up-to-date toml 1.0.0: target for configuration [library] is up to date.
Building tofu ~main: building configuration [tofu-test-application]
src/tofu/cli.d(261,25): Error: no property `indexOf` for `e.msg` of type `string`
assert(e.msg.indexOf(needle) >= 0,
^
src/tofu/state.d(85,21): Error: `@safe` function `tofu.state.loadState` cannot call `@system` function `std.json.JSONValue.array`
foreach (entry; root.array) {
^
/usr/include/dlang/dmd/std/json.d(417,38): `std.json.JSONValue.array` is declared here
@property ref inout(JSONValue[]) array() scope return inout pure @system
^
src/tofu/state.d(344,12): Error: `@safe` function `tofu.state.__unittest_L327_C7` cannot call `@system` function `std.json.JSONValue.array`
assert(parsed.array.length == 2);
^
/usr/include/dlang/dmd/std/json.d(417,38): `std.json.JSONValue.array` is declared here
@property ref inout(JSONValue[]) array() scope return inout pure @system
^
src/tofu/state.d(347,21): Error: `@safe` function `tofu.state.__unittest_L327_C7` cannot call `@system` function `std.json.JSONValue.array`
foreach (entry; parsed.array) {
^
/usr/include/dlang/dmd/std/json.d(417,38): `std.json.JSONValue.array` is declared here
@property ref inout(JSONValue[]) array() scope return inout pure @system
^
Error /usr/bin/dmd failed with exit code 1.
Warning
Warning ## Warning for package tofu ##
Warning
Warning The following compiler flags have been specified in the package description
Warning file. They are handled by DUB and direct use in packages is discouraged.
Warning Alternatively, you can set the DFLAGS environment variable to pass custom flags
Warning to the compiler, or use one of the suggestions below:
Warning
Warning warningsAsErrors: Use "buildRequirements" to control the warning level
Warning
Generating test runner configuration 'tofu-test-application' for 'application' (executable).
Warning Excluding main source file src/main.d from test.
Starting Performing "unittest" build using /usr/bin/dmd for x86_64.
Up-to-date toml 1.0.0: target for configuration [library] is up to date.
Building tofu ~main: building configuration [tofu-test-application]
src/tofu/state.d(44,68): Error: return value `v.array()` of type `const(JSONValue[])` does not match return type `JSONValue[]`, and cannot be implicitly converted
private @trusted JSONValue[] fArray(const JSONValue v) { return v.array; }
^
Error /usr/bin/dmd failed with exit code 1.
Warning
Warning ## Warning for package tofu ##
Warning
Warning The following compiler flags have been specified in the package description
Warning file. They are handled by DUB and direct use in packages is discouraged.
Warning Alternatively, you can set the DFLAGS environment variable to pass custom flags
Warning to the compiler, or use one of the suggestions below:
Warning
Warning warningsAsErrors: Use "buildRequirements" to control the warning level
Warning
Generating test runner configuration 'tofu-test-application' for 'application' (executable).
Warning Excluding main source file src/main.d from test.
Starting Performing "unittest" build using /usr/bin/dmd for x86_64.
Up-to-date toml 1.0.0: target for configuration [library] is up to date.
Building tofu ~main: building configuration [tofu-test-application]
Linking tofu-test-application
Finished To force a rebuild of up-to-date targets, run again with --force
Running tofu-test-application
zeta-makepkg: building hello...zeta-makepkg: configure phasezeta-makepkg: build phasezeta-makepkg: install phasezeta-makepkg: building hello...zeta-makepkg: configure phasezeta-makepkg: build phasezeta-makepkg: install phasezeta-makepkg: building hello...zeta-makepkg: configure phasezeta-makepkg: build phasezeta-makepkg: install phasezeta-makepkg: building hello...zeta-makepkg: configure phasezeta-makepkg: build phasezeta-makepkg: install phasedonezeta-makepkg: building depA...zeta-makepkg: configure phasezeta-makepkg: build phasezeta-makepkg: install phasezeta-makepkg: building depB...zeta-makepkg: configure phasezeta-makepkg: build phasezeta-makepkg: install phasezeta-makepkg: building target...zeta-makepkg: configure phasezeta-makepkg: build phasezeta-makepkg: install phasezeta-makepkg: building depA...zeta-makepkg: configure phasezeta-makepkg: build phasezeta-makepkg: install phaseerror build failed for depA: build failed for depA:
zeta-makepkg: building depA...
zeta-makepkg: configure phase
zeta-makepkg: build phase
zeta-makepkg: install phase
zeta-makepkg: building pkg...zeta-makepkg: configure phasezeta-makepkg: build phasezeta-makepkg: install phaseerror build failed for noexist: recipe not found at /tmp/tofu-test-build-buildall-norecipe-221718/nonexistent.recipe
warn corrupted cache for pkg: Found 'h' when expecting 'r'. (Line 1:2)
Warning: malformed TOML config at /tmp/tofu-test-config-bad-221718.toml: Invalid table key declaration (2:0)
Warning: invalid TOFU_DEFAULT_JOBS 'not-a-number', using default 1
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/hello.recipe HTTP/1.1" 200 -
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/package.lua HTTP/1.1" 200 -
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/build.sh HTTP/1.1" 200 -
127.0.0.1 - - [08/Aug/2026 18:16:38] code 404, message File not found
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/hello.recipe HTTP/1.1" 404 -
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/hello.recipe HTTP/1.1" 200 -
127.0.0.1 - - [08/Aug/2026 18:16:38] code 404, message File not found
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/package.lua HTTP/1.1" 404 -
127.0.0.1 - - [08/Aug/2026 18:16:38] code 404, message File not found
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/build.sh HTTP/1.1" 404 -
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/scripts/build.sh HTTP/1.1" 200 -
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/hello.recipe HTTP/1.1" 200 -
127.0.0.1 - - [08/Aug/2026 18:16:38] code 404, message File not found
127.0.0.1 - - [08/Aug/2026 18:16:38] "GET /recipes/hello/package.lua HTTP/1.1" 404 -
127.0.0.1 - - [08/Aug/2026 18:16:39] code 404, message File not found
127.0.0.1 - - [08/Aug/2026 18:16:39] "GET /recipes/hello/build.sh HTTP/1.1" 404 -
warn skipping index entry with empty name
warn skipping index entry with empty name
warn skipping index entry 'badpool': invalid pool 'bad_pool_value'
 . checking binary firefox ...
- binary firefox-2.1.0 satisfies firefox>=2.0
 . checking binary libfoo ...
- binary libfoo-1.9 does not satisfy libfoo>=2.0
 . checking binary noexist ...
 . checking binary brokenpkg ...
 . checking binary badpkg ...
 . checking binary testpkg ...
- binary testpkg-2.1.0 satisfies testpkg
==> ──── building depA (1/3) ────
 ok depA
==> ──── building depB (2/3) ────
 ok depB
==> ──── building target (3/3) ────
 ok target
==> ──── building depA (1/3) ────
- nothing to build
==> ──── building pkg (1/1) ────
- pkg already built, skipping
==> ──── building pkg (1/1) ────
 ok pkg
==> fetching recipe hello
 . downloading hello.recipe
 . downloading package.lua
 . downloading build.sh
 ok recipe hello downloaded
==> fetching recipe hello
 . downloading hello.recipe
==> fetching recipe hello
 . downloading hello.recipe
 . downloading package.lua
- no package.lua for hello (optional manifest)
 . downloading build.sh
- no build.sh for hello (optional build script)
 . custom build system: fetching scripts/build.sh
 ok recipe hello downloaded
==> fetching recipe hello
 . downloading hello.recipe
 . downloading package.lua
- no package.lua for hello (optional manifest)
 . downloading build.sh
- no build.sh for hello (optional build script)
 ok recipe hello downloaded
==> fetching recipe hello
 . downloading hello.recipe
 . fetching index http://127.0.0.1:59437//index.lua
 ok index loaded: 3 packages
 . fetching index http://127.0.0.1:56161//index.lua
 . fetching index http://127.0.0.1:52523//index.lua
 . fetching index http://127.0.0.1:50341//index.lua
 . fetching index http://127.0.0.1:32959//index.lua
 ok index loaded: 0 packages
 . fetching index http://127.0.0.1:58617//index.lua
 ok index loaded: 1 packages
 . fetching index http://127.0.0.1:51607//index.lua
 ok index loaded: 2 packages
 . fetching index http://127.0.0.1:42319//index.lua
 . fetching index http://127.0.0.1:38171//index.lua
 ok index loaded: 1 packages
installing package...error: build failedreason: missing dependencytestpkg-2.1 is already installed -- use -ReProvide to reinstall - already installed — skipping
 ok installed A with 2 dependencies
- nothing to install
install failed: conflict detectedtestpkg-2.1 is already installed -- use -ReProvide to reinstallwarn corrupted installed state at /tmp/tofu-test-state-corrupt-221718/installed.json: Found 'h' when expecting 'r'. (Line 1:2)
warn corrupted installed state at /tmp/tofu-test-state-corrupt-221718/installed.json: Found 'h' when expecting 'r'. (Line 1:2)
14 modules passed unittests
- already installed — skipping
 ok installed A with 0 dependencies
- binary libfoo-2.1 satisfies libfoo>=2.0
- libfoo: binary 1.9 too old, building from recipe
- libfoo: binary 1.9 too old, building from recipe
- binary libbar-3.0 satisfies libbar (unconstrained)
- libbaz: no binary available, building from recipe
- binary libfoo-1.5 satisfies libfoo>=1.0
- libfoo: binary 1.5 too old, building from recipe
- binary parentA-1.5 satisfies parentA (unconstrained)
- binary parentB-1.5 satisfies parentB (unconstrained)
==> generating build plan
- + C (recipe)
- + A (recipe)
 ok build plan: 2 packages
==> generating build plan
- recipe libfoo not in cache, re-fetching
- + libfoo (recipe)
 ok build plan: 1 packages
==> generating build plan
==> generating build plan
- nothing to build (all binary)
==> generating build plan
- + mypkg (recipe)
 ok build plan: 1 packages
==> generating build plan
- + libfoo (recipe)
- + mypkg (recipe)
 ok build plan: 2 packages
Warning
Warning ## Warning for package tofu ##
Warning
Warning The following compiler flags have been specified in the package description
Warning file. They are handled by DUB and direct use in packages is discouraged.
Warning Alternatively, you can set the DFLAGS environment variable to pass custom flags
Warning to the compiler, or use one of the suggestions below:
Warning
Warning warningsAsErrors: Use "buildRequirements" to control the warning level
Warning
Starting Performing "debug" build using /usr/bin/dmd for x86_64.
Up-to-date toml 1.0.0: target for configuration [library] is up to date.
Building tofu ~main: building configuration [application]
src/main.d(26,8): Error: unable to read module `cli`
import tofu.cli : Command, parseArgs, helpText;
^
src/main.d(26,8): Expected 'tofu/cli.d' or 'tofu/cli/package.d' in one of the following import paths:
import path[0] = src/
import path[1] = ../../.dub/packages/toml/1.0.0/toml/src/
import path[2] = /usr/include/dlang/dmd
Error /usr/bin/dmd failed with exit code 1.
.omo/notepads/tofu-core/learnings.md
+57
View File
@@ -735,3 +735,60 @@ The sandbox test (test 2) creates a sentinel file, serves an index containing `o
- `dub build` passes with `warningsAsErrors`.
- No D LSP server configured for `.d` — diagnostics verified via compiler.
- Evidence logged to `.omo/evidence/task-17-tofu-core.log`.
---
## Task 18 — `tofu.state` (post-install state tracking for -Syu upgrades)
### Architecture
- Module `tofu.state` depends on: `tofu.config` (Config, cacheDir), `tofu.log` (logWarn), `std.json` (parseJSON, JSONValue, JSONType), `std.file` (readText, write, rename, exists, remove), `std.datetime` (Clock).
- State file: `cfg.cacheDir ~ "/installed.json"` — JSON array of `{"name":"...","ver":"...","installedAt":<unix-ts>,"source":"recipe"}` objects.
- Five public APIs: `recordInstall`, `listInstalled`, `isInstalledByTofu`, `removeInstallRecord`, `installedVersion`.
- Atomic writes: write to `.tmp` file then `rename()` — ensures the state file is never half-written.
### `@safe` / `@trusted` architecture
- All public functions are `@safe`.
- JSON operations (`parseJSON`, `JSONValue.array` property) are `@system` in Phobos — isolated behind `@trusted` wrappers (`fParseJSON`, `fArray`).
- `JSONValue.array` returns `ref inout(JSONValue[])` — must use `ref JSONValue` parameter in the wrapper (not by-value copy) to avoid dangling reference.
- Filesystem operations (`readText`, `write`, `rename`, `exists`, `remove`) isolated in `@trusted` wrappers — same pattern as all other modules.
### State file structure
- Single JSON array at `~/.cache/tofu/installed.json` — SEPARATE from ZETA's per-package `var/db/zeta/<name>/` database.
- `recordInstall` handles reinstall: if an entry for `name` already exists, it's replaced (new ver + timestamp); otherwise appended.
- `removeInstallRecord` for missing entries is a no-op.
- `installedVersion` returns `""` for unknown packages — convenience for upgrade command comparison.
- Source is always `"recipe"` — this module only tracks recipe-built packages.
### Corrupted/missing state handling
- Missing file → empty list (normal for fresh install).
- Corrupted JSON → `logWarn` + return empty list (never throws).
- Individual corrupted entries within a valid JSON array → skipped silently.
- After corruption, `recordInstall` writes fresh state successfully (recovery).
### Test strategy (7 unittests)
- Used temp directory pattern from `config.d`: `tempDir ~ "/tofu-test-state-" ~ suffix ~ "-" ~ thisProcessID.to!string`.
- `scope(exit)` with `rmdirRecurse` for cleanup — same as `cache.d`/`build.d`/`install.d`.
- `makeTestConfig(suffix)` creates isolated `Config` with unique cache dir per test.
- Test (1): recordInstall → listInstalled contains it with correct ver ✓
- Test (2): recordInstall twice same name → single entry, latest ver ✓
- Test (3): isInstalledByTofu → true with filled pkg; unknown → false ✓
- Test (4): removeInstallRecord → gone; removing missing → no-op ✓
- Test (5): corrupted JSON file → empty list + no throw ✓
- Test (6): missing file → empty list ✓
- Test (7): file is valid JSON after writes (parse back externally) ✓
- Extra: installedVersion convenience ✓
### `@safe` + `@trusted` attribute conflict on test helpers
- `makeTestConfig` calls `tempDir` and `thisProcessID` which are `@safe` in DMD 2.112 (not `@system`). Marking it both `@safe` and `@trusted` causes "conflicting attribute" error. Fix: `@safe` only (no `@trusted` suffix needed).
### `JSONType` enum in Phobos
- Members: `JSONType.array`, `JSONType.object`, `JSONType.string_` (underscore because `string` is a D keyword), `JSONType.integer`, `JSONType.float_`, etc.
- `JSONValue.str` returns `string`, `.integer` returns `long`.
### Build verification
- `dub test` (excluding pre-existing broken `cli.d` and `errors.d`) — 14 modules pass unittests including state.d's 7 test blocks.
- `dub build` fails due to pre-existing `cli.d` import error (`indexOf` on string) — NOT caused by state.d. state.d compiles clean standalone (`dmd -c -o-`).
- Evidence logged to `.omo/evidence/task-18-tofu-core.log`.
### Pre-existing breakage note
- `src/tofu/cli.d` and `src/tofu/errors.d` are pre-existing broken modules from parallel agent tasks (after task 17). They block `dub build` and `dub test` (without `.skip` rename). These are outside the scope of task 18.