plan++

Author: subtleGradient

.tasks/backlog/TASK-123-fix-clock-table-schema-parity.md

@@ -0,0 +1,35 @@
+# TASK-123: Fix clock table schema parity with oracle
+
+## Status
+- [ ] Planned
+
+## Priority
+medium
+
+## Assigned To
+(unassigned)
+
+## Parent Docs / Cross-links
+- Divergence documented in: `.tasks/done/TASK-074-cross-impl-compat-expanded.md`
+- Test: `zig/harness/test-oracle-parity.sh` (Test 2)
+- Zig clock table creation: `zig/src/as_crr.zig`
+- Gap backlog: `research/zig-cr/92-gap-backlog.md`
+
+## Description
+The Zig `__crsql_clock` table schema differs from the Rust/C oracle in two ways:
+
+1. **Column naming**: Zig uses `pk` column, Rust/C uses `key` column
+2. **Index**: Rust/C has an index on the clock table, Zig has 0 indexes
+3. **Strict**: Rust/C uses STRICT tables, Zig does not
+
+These differences may cause cross-implementation database sharing issues.
+
+## Files to Modify
+- `zig/src/as_crr.zig` - clock table creation
+
+## Acceptance Criteria
+- [ ] `__crsql_clock` table schema matches oracle exactly
+- [ ] Column names match (change `pk` to `key` - careful with pks table relation!)
+- [ ] Index structure matches oracle (add `_dbv_idx` on `db_version`)
+- [ ] Strict mode enabled
+- [ ] `zig/harness/test-oracle-parity.sh` Test 2 passes

.tasks/backlog/TASK-124-fix-site-id-cross-open-parity.md

@@ -0,0 +1,39 @@
+# TASK-124: Fix site_id preservation on cross-implementation DB open
+
+## Status
+- [ ] Planned
+
+## Priority
+medium
+
+## Assigned To
+(unassigned)
+
+## Parent Docs / Cross-links
+- Divergence documented in: `.tasks/done/TASK-074-cross-impl-compat-expanded.md`
+- Test: `zig/harness/test-oracle-parity.sh` (Test 4b, 4c)
+- Zig site_id handling: `zig/src/site_identity.zig`
+- Zig init handling: `zig/src/ffi/init.zig`
+- Gap backlog: `research/zig-cr/92-gap-backlog.md`
+
+## Description
+When Rust/C opens a database created by Zig, the site_id is not preserved correctly.
+
+**Current behavior:**
+- Zig creates DB with site_id: A6C2BD7D1EF644D4B72C5C97D0B50B78
+- Rust/C opens same DB and reads site_id: (empty or different)
+
+**Expected behavior:**
+Both implementations should read the same site_id from an existing database.
+
+**Investigation Notes:**
+The issue might be due to missing version information in `crsql_master`. Rust/C implementation checks for a minimum version before accepting a database.
+
+## Files to Modify
+- `zig/src/ffi/init.zig` - initialization (version writing)
+- `zig/src/site_identity.zig` - site_id storage/retrieval
+
+## Acceptance Criteria
+- [ ] When Rust/C opens a Zig-created DB, site_id is preserved
+- [ ] When Zig opens a Rust/C-created DB, site_id is preserved
+- [ ] `zig/harness/test-oracle-parity.sh` Test 4b and 4c pass

research/zig-cr/92-gap-backlog.md

@@ -12,6 +12,10 @@
 
 Goal: invalidate the hypothesis that "Zig is done" by expanding cross-implementation parity coverage and adding real-system tests.
 
+### Open Gaps (Parity Divergences)
+- [ ] **TASK-123** — Fix clock table schema parity (pk vs key, index) `.tasks/backlog/TASK-123-fix-clock-table-schema-parity.md`
+- [ ] **TASK-124** — Fix site_id preservation on cross-open `.tasks/backlog/TASK-124-fix-site-id-cross-open-parity.md`
+
 ### Parity/Coverage Tasks (ready to assign)
 - [x] **TASK-070** — Cover missing C suites: ext-data + sandbox ✓ `.tasks/done/TASK-070-zig-parity-extdata-sandbox.md`
   - ext-data: 15/15 tests pass (test-extdata.sh)
@@ -203,4 +207,4 @@ Goal: invalidate the hypothesis that "Zig is done" by expanding cross-implementa
 - **Round 51 (2025-12-20)**:
   - TASK-121: Fix rows_impacted ROLLBACK reset divergence (18/18 pass)
   - TASK-122: Fix no-op UPDATE db_version divergence (14/14 pass)
-  - **Zero oracle divergences remaining**
+  - **Remaining divergences**: TASK-123 (clock schema), TASK-124 (site_id cross-open)

zig/src/merge_insert.zig

@@ -316,9 +316,10 @@ pub fn setWinnerClock(
     seq: i64,
 ) MergeError!void {
     var buf: [1024]u8 = undefined;
+    // Note: Clock table uses "key" column, not "pk" - must match as_crr.zig schema
     const sql = std.fmt.bufPrintZ(&buf,
         \\INSERT OR REPLACE INTO "{s}__crsql_clock"
-        \\  ("pk", "col_name", "col_version", "db_version", "site_id", "seq")
+        \\  ("key", "col_name", "col_version", "db_version", "site_id", "seq")
         \\VALUES (?, ?, ?, ?, ?, ?)
     , .{table_name}) catch return MergeError.BufferOverflow;