@zq-silk/yui 0.13.9 → 0.13.10

package/dist/storage/upgrade/sqliteStateMigration.js

@@ -29,7 +29,7 @@ import { mailboxTargetKey } from "../../coordination/workMailbox.js";
 import { managedWorkspaceKey } from "../../worktree/managedWorkspace.js";
 import { SqliteTaskStore } from "../sqliteStore.js";
 import { readStorageSchemaManifest } from "../storageSchema.js";
-import { CURRENT_STORED_TASK_SCHEMA_VERSION } from "../taskStore.js";
+import { CURRENT_STORED_TASK_SCHEMA_VERSION, CURRENT_WORK_MAILBOX_SCHEMA_VERSION } from "../taskStore.js";
 /** The sidecar database filename used during staging. */
 export const STAGED_DATABASE_FILENAME = "yui.db.staged";
 /** The committed database filename. */
@@ -62,7 +62,8 @@ export function readMigrationSourceStateFromSqlite(home) {
         // Physical migration 14 rewrites the WorkMailbox family while adding its
         // current columns. Preserve the source rows before applying it so the
         // logical record migration still sees and transforms v1 exactly once.
-        const sourceMailboxes = readWorkMailboxesFromSqlite(snapshotPath);
+        const sourceManifest = readStorageSchemaManifest(home);
+        const sourceMailboxes = readWorkMailboxesFromSqlite(snapshotPath, requireWorkMailboxSchemaVersion(sourceManifest.recordVersions?.workMailbox));
         const stagedStore = new SqliteTaskStore(home, {
             databaseFilename: MIGRATION_SOURCE_DATABASE_FILENAME,
             migration: true
@@ -596,7 +597,7 @@ function hashPayloadTable(db, sql) {
     const rows = db.prepare(sql).all();
     return hashRecords(rows.map((row) => JSON.parse(row.payload)));
 }
-export function rowToMailbox(row) {
+export function rowToMailbox(row, schemaVersion) {
     let target;
     switch (row.target_kind) {
         case "operator":
@@ -623,9 +624,9 @@ export function rowToMailbox(row) {
         processing: row.processing === null ? null : JSON.parse(row.processing),
         pending: row.pending === null ? null : JSON.parse(row.pending)
     };
-    return Object.hasOwn(row, "input_delivery")
+    return schemaVersion > 1
         ? {
-            schemaVersion: 2,
+            schemaVersion,
             ...common,
             inputDelivery: row.input_delivery === null
                 ? null
@@ -633,16 +634,22 @@ export function rowToMailbox(row) {
         }
         : { schemaVersion: 1, ...common };
 }
+function requireWorkMailboxSchemaVersion(value) {
+    if (value !== 1 && value !== 2 && value !== 3) {
+        throw new Error(`WorkMailbox manifest version is invalid: ${String(value)}.`);
+    }
+    return value;
+}
 function readWorkMailboxRows(db) {
     const hasInputDelivery = db.prepare("PRAGMA table_info(mailboxes)").all().some(({ name }) => name === "input_delivery");
     return db.prepare(`SELECT target_kind, task_id, role_name, next_sequence, processing, pending${hasInputDelivery ? ", input_delivery" : ""} FROM mailboxes ORDER BY target_key`).all();
 }
-function readWorkMailboxesFromSqlite(dbPath) {
+function readWorkMailboxesFromSqlite(dbPath, schemaVersion) {
     const db = new Database(dbPath, { readonly: true });
     try {
         const mailboxes = {};
         for (const row of readWorkMailboxRows(db)) {
-            const mailbox = rowToMailbox(row);
+            const mailbox = rowToMailbox(row, schemaVersion);
             mailboxes[mailboxTargetKey(mailbox.target)] = mailbox;
         }
         return mailboxes;
@@ -699,7 +706,7 @@ export function computeDbFamilyChecksums(home, databaseFilename) {
         checksums.publicationReference = hashPayloadTable(db, "SELECT payload FROM publication_references");
         // Mailboxes are reconstructed from typed columns (no payload column).
         const mailboxRows = readWorkMailboxRows(db);
-        checksums.workMailbox = hashRecords(mailboxRows.map(rowToMailbox));
+        checksums.workMailbox = hashRecords(mailboxRows.map((row) => rowToMailbox(row, CURRENT_WORK_MAILBOX_SCHEMA_VERSION)));
         return checksums;
     }
     finally {
@@ -756,6 +763,7 @@ export function readStateFromSqlite(home, databaseFilename = COMMITTED_DATABASE_
         const storedTaskVersion = typeof manifest.recordVersions?.storedTask === "number"
             ? manifest.recordVersions.storedTask
             : CURRENT_STORED_TASK_SCHEMA_VERSION;
+        const storedWorkMailboxVersion = requireWorkMailboxSchemaVersion(manifest.recordVersions?.workMailbox);
         // Home identity + revision continuity.
         const meta = db.prepare("SELECT home_identity, revision FROM home_meta WHERE id = 1").get();
         const state = {
@@ -880,7 +888,7 @@ export function readStateFromSqlite(home, databaseFilename = COMMITTED_DATABASE_
         const mailboxRows = readWorkMailboxRows(db);
         const mailboxes = state.mailboxes;
         for (const row of mailboxRows) {
-            const mailbox = rowToMailbox(row);
+            const mailbox = rowToMailbox(row, storedWorkMailboxVersion);
             mailboxes[mailboxTargetKey(mailbox.target)] = mailbox;
         }
         return state;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zq-silk/yui",
-  "version": "0.13.9",
+  "version": "0.13.10",
   "description": "Local control plane for long-running native agent CLI sessions backed by tmux.",
   "license": "MIT",
   "private": false,