@zq-silk/yui 0.6.11 → 0.6.13

package/dist/storage/upgrade/sqliteFileSet.js

@@ -0,0 +1,50 @@
+import { existsSync, renameSync, rmSync } from "node:fs";
+const SQLITE_FILE_SUFFIXES = ["", "-wal", "-shm"];
+/**
+ * Move a SQLite database together with any live WAL/SHM sidecars.
+ *
+ * A WAL database is one logical file set. Moving only the main file can leave
+ * the old WAL under the promoted database name, causing SQLite to replay it
+ * against an unrelated database. The migration fence guarantees there are no
+ * writers while this bounded rename runs.
+ */
+export function moveSqliteFileSet(sourcePath, targetPath, rename = renameSync) {
+    const suffixes = SQLITE_FILE_SUFFIXES.filter((suffix) => existsSync(`${sourcePath}${suffix}`));
+    for (const suffix of suffixes) {
+        if (existsSync(`${targetPath}${suffix}`)) {
+            throw new Error(`Refusing to overwrite an existing SQLite switch target: ${targetPath}${suffix}.`);
+        }
+    }
+    const moved = [];
+    try {
+        for (const suffix of suffixes) {
+            rename(`${sourcePath}${suffix}`, `${targetPath}${suffix}`);
+            moved.push(suffix);
+        }
+    }
+    catch (error) {
+        let rollbackError;
+        for (const suffix of moved.reverse()) {
+            try {
+                rename(`${targetPath}${suffix}`, `${sourcePath}${suffix}`);
+            }
+            catch (candidate) {
+                rollbackError ??= candidate;
+            }
+        }
+        if (rollbackError !== undefined) {
+            throw new Error(`SQLite file-set move failed and rollback was incomplete: ${messageOf(error)}; `
+                + `rollback failed: ${messageOf(rollbackError)}`);
+        }
+        throw error;
+    }
+}
+/** Remove a promoted SQLite file set before restoring its timestamped backup. */
+export function removeSqliteFileSet(databasePath) {
+    for (const suffix of SQLITE_FILE_SUFFIXES) {
+        rmSync(`${databasePath}${suffix}`, { force: true });
+    }
+}
+function messageOf(error) {
+    return error instanceof Error ? error.message : String(error);
+}

package/dist/storage/upgrade/sqliteMigrationTarget.js

@@ -42,6 +42,7 @@ import { describeActiveRuntime, homeRuntimeIsActive, inspectHomeRuntime, inspect
 import { COMMITTED_DATABASE_FILENAME, STAGED_DATABASE_FILENAME, computeDbFamilyChecksums, computeStateFamilyChecksums, populateSqliteFromState } from "./sqliteStateMigration.js";
 import { latestStateBackupPath } from "./pseudoLayoutRepair.js";
 import { migrationReceiptPath, writeMigrationReceipt } from "./migrationReceipt.js";
+import { moveSqliteFileSet, removeSqliteFileSet } from "./sqliteFileSet.js";
 /** Build the SQLite-backed migration target. */
 export function createSqliteMigrationTarget(options) {
     const home = options.home;
@@ -155,7 +156,7 @@ export function createSqliteMigrationTarget(options) {
                     if (existsSync(backupPath)) {
                         throw new Error(`Refusing to overwrite an existing database backup: ${backupPath}.`);
                     }
-                    renameSync(committedDbPath, backupPath);
+                    moveSqliteFileSet(committedDbPath, backupPath);
                 }
                 renameSync(stagedDbPath, committedDbPath);
                 // The staged connection may leave empty WAL/SHM sidecars behind
@@ -167,7 +168,7 @@ export function createSqliteMigrationTarget(options) {
                 // Pre-promotion failure: restore the original database if we moved it.
                 if (backupPath !== undefined && existsSync(backupPath)) {
                     try {
-                        renameSync(backupPath, committedDbPath);
+                        moveSqliteFileSet(backupPath, committedDbPath);
                     }
                     catch {
                         throw new AmbiguousSwitchError({
@@ -208,10 +209,11 @@ export function createSqliteMigrationTarget(options) {
                 // is ambiguous and must be recovered manually.
                 try {
                     if (backupPath !== undefined && existsSync(backupPath)) {
-                        renameSync(backupPath, committedDbPath);
+                        removeSqliteFileSet(committedDbPath);
+                        moveSqliteFileSet(backupPath, committedDbPath);
                     }
                     else {
-                        rmSync(committedDbPath, { force: true });
+                        removeSqliteFileSet(committedDbPath);
                     }
                 }
                 catch {

package/dist/storage/upgrade/sqliteRecordMigrationTarget.js

@@ -37,6 +37,7 @@ import { planMigration } from "../migration/planner.js";
 import { AmbiguousSwitchError } from "../migration/index.js";
 import { describeActiveRuntime, homeRuntimeIsActive, inspectHomeRuntime, inspectSourceVersionState, inspectSnapshotVersionState } from "./homeMigrationTarget.js";
 import { writeSwitchProgress } from "./switchProgress.js";
+import { moveSqliteFileSet, removeSqliteFileSet } from "./sqliteFileSet.js";
 import { COMMITTED_DATABASE_FILENAME, STAGED_DATABASE_FILENAME, copySqlitePassthroughState, computeDbFamilyChecksums, computeStateFamilyChecksums, populateSqliteFromState, readStateFromSqlite } from "./sqliteStateMigration.js";
 /** Build the SQLite-backed record-migration target. */
 export function createSqliteRecordMigrationTarget(options) {
@@ -135,7 +136,7 @@ export function createSqliteRecordMigrationTarget(options) {
                     if (existsSync(backupPath)) {
                         throw new Error(`Refusing to overwrite an existing database backup: ${backupPath}.`);
                     }
-                    renameSync(committedDbPath, backupPath);
+                    moveSqliteFileSet(committedDbPath, backupPath);
                 }
                 promoteRename(stagedDbPath, committedDbPath);
                 // The staged connection may leave empty WAL/SHM sidecars behind
@@ -147,7 +148,7 @@ export function createSqliteRecordMigrationTarget(options) {
                 // Pre-promotion failure: restore the original database if we moved it.
                 if (backupPath !== undefined && existsSync(backupPath)) {
                     try {
-                        promoteRename(backupPath, committedDbPath);
+                        moveSqliteFileSet(backupPath, committedDbPath, promoteRename);
                     }
                     catch {
                         writeInterruptedMarker(home, backupPath, stagedDbPath, now);
@@ -175,10 +176,11 @@ export function createSqliteRecordMigrationTarget(options) {
                 // is ambiguous and must be recovered manually.
                 try {
                     if (backupPath !== undefined && existsSync(backupPath)) {
-                        promoteRename(backupPath, committedDbPath);
+                        removeSqliteFileSet(committedDbPath);
+                        moveSqliteFileSet(backupPath, committedDbPath, promoteRename);
                     }
                     else {
-                        rmSync(committedDbPath, { force: true });
+                        removeSqliteFileSet(committedDbPath);
                     }
                 }
                 catch {

package/dist/storage/upgrade/sqliteStateMigration.js

@@ -529,7 +529,6 @@ function hashPayloadTable(db, sql) {
     const rows = db.prepare(sql).all();
     return hashRecords(rows.map((row) => JSON.parse(row.payload)));
 }
-/** Reconstruct a WorkMailbox from the normalised mailboxes table columns. */
 export function rowToMailbox(row) {
     let target;
     switch (row.target_kind) {
@@ -551,13 +550,25 @@ export function rowToMailbox(row) {
         default:
             target = { kind: row.target_kind };
     }
-    return {
-        schemaVersion: 1,
+    const common = {
         target,
         nextSequence: row.next_sequence,
         processing: row.processing === null ? null : JSON.parse(row.processing),
         pending: row.pending === null ? null : JSON.parse(row.pending)
     };
+    return Object.hasOwn(row, "input_delivery")
+        ? {
+            schemaVersion: 2,
+            ...common,
+            inputDelivery: row.input_delivery === null
+                ? null
+                : JSON.parse(row.input_delivery)
+        }
+        : { schemaVersion: 1, ...common };
+}
+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();
 }
 /**
  * Compute per-family checksums from the SQLite database. The database is
@@ -603,7 +614,7 @@ export function computeDbFamilyChecksums(home, databaseFilename) {
         checksums.capabilityGrant = hashPayloadTable(db, "SELECT payload FROM capability_grants");
         checksums.releaseWorkflow = hashPayloadTable(db, "SELECT payload FROM release_workflows");
         // Mailboxes are reconstructed from typed columns (no payload column).
-        const mailboxRows = db.prepare("SELECT target_kind, task_id, role_name, next_sequence, processing, pending FROM mailboxes ORDER BY target_key").all();
+        const mailboxRows = readWorkMailboxRows(db);
         checksums.workMailbox = hashRecords(mailboxRows.map(rowToMailbox));
         return checksums;
     }
@@ -774,7 +785,7 @@ export function readStateFromSqlite(home) {
             stored.idHighWaterMarks[row.kind] = row.high_water;
         }
         // Work mailboxes: reconstructed from typed columns (no payload column).
-        const mailboxRows = db.prepare("SELECT target_kind, task_id, role_name, next_sequence, processing, pending FROM mailboxes ORDER BY target_key").all();
+        const mailboxRows = readWorkMailboxRows(db);
         const mailboxes = state.mailboxes;
         for (const row of mailboxRows) {
             const mailbox = rowToMailbox(row);

package/package.json

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