@holon-run/agentinbox 1.3.1 → 1.3.2

package/dist/src/service.js

@@ -2255,17 +2255,15 @@ class AgentInboxService {
             return;
         }
         if (reason === "lease" && state.status === "notified") {
-            if (target.kind !== "terminal") {
-                // Webhook targets keep the existing lease-based behavior.
-            }
-            else {
-                this.store.upsertActivationDispatchState({
-                    ...state,
-                    leaseExpiresAt: new Date(Date.now() + target.notifyLeaseMs).toISOString(),
-                    updatedAt: (0, util_1.nowIso)(),
-                });
-                return;
-            }
+            // No new items since last notification — just renew lease for both
+            // terminal and webhook targets. Re-dispatching would cause an infinite
+            // wake loop (the agent already knows about these items).
+            this.store.upsertActivationDispatchState({
+                ...state,
+                leaseExpiresAt: new Date(Date.now() + target.notifyLeaseMs).toISOString(),
+                updatedAt: (0, util_1.nowIso)(),
+            });
+            return;
         }
         const dispatched = await this.dispatchActivationTarget({
             agentId,

package/dist/src/store.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentInboxStore = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const sql_js_1 = __importDefault(require("sql.js"));
+const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
 const util_1 = require("./util");
 const DRIZZLE_MIGRATIONS_TABLE = "__drizzle_migrations";
 const V1_BASELINE_TAG = "0000_v1_initial";
@@ -30,35 +30,99 @@ function earlierLifecycleRetirement(left, right) {
 class AgentInboxStore {
     dbPath;
     db;
-    static sqlPromise = null;
     constructor(dbPath, db) {
         this.dbPath = dbPath;
         this.db = db;
     }
     static async open(dbPath) {
         node_fs_1.default.mkdirSync(node_path_1.default.dirname(dbPath), { recursive: true });
-        const SQL = await this.loadSqlJs();
-        let db = node_fs_1.default.existsSync(dbPath)
-            ? new SQL.Database(node_fs_1.default.readFileSync(dbPath))
-            : new SQL.Database();
+        const existedBeforeOpen = node_fs_1.default.existsSync(dbPath);
+        let db = await this.openDatabaseWithRecovery(dbPath);
         let store = new AgentInboxStore(dbPath, db);
-        if (node_fs_1.default.existsSync(dbPath) && store.shouldArchivePreV1Database()) {
+        if (existedBeforeOpen && store.shouldArchivePreV1Database()) {
             const archivedPath = store.archivePreV1Database();
             console.warn(`[agentinbox] archived pre-v1 local database to ${archivedPath}; starting with a fresh v1 database (no data imported).`);
-            db = new SQL.Database();
+            db = this.openDatabase(dbPath);
             store = new AgentInboxStore(dbPath, db);
         }
+        else if (existedBeforeOpen) {
+            await store.backupHealthyDatabase();
+        }
         store.migrate();
         store.persist();
         return store;
     }
-    static async loadSqlJs() {
-        if (!this.sqlPromise) {
-            this.sqlPromise = (0, sql_js_1.default)({
-                locateFile: (file) => require.resolve(`sql.js/dist/${file}`),
-            });
+    static async openDatabaseWithRecovery(dbPath) {
+        try {
+            return this.openDatabase(dbPath);
+        }
+        catch (error) {
+            if (!node_fs_1.default.existsSync(dbPath)) {
+                throw error;
+            }
+            const backupPath = this.findRecoverableBackup(dbPath);
+            if (!backupPath) {
+                throw error;
+            }
+            const corruptPath = this.nextPath(`${dbPath}.corrupt`);
+            node_fs_1.default.renameSync(dbPath, corruptPath);
+            node_fs_1.default.copyFileSync(backupPath, dbPath);
+            console.warn(`[agentinbox] recovered local database from ${backupPath}; archived corrupt database to ${corruptPath}.`);
+            return this.openDatabase(dbPath);
+        }
+    }
+    static openDatabase(dbPath) {
+        const db = new better_sqlite3_1.default(dbPath);
+        db.pragma("busy_timeout = 5000");
+        db.pragma("journal_mode = WAL");
+        db.pragma("synchronous = NORMAL");
+        db.pragma("foreign_keys = ON");
+        this.assertHealthy(db, dbPath);
+        return db;
+    }
+    static assertHealthy(db, dbPath) {
+        const result = db.pragma("integrity_check", { simple: true });
+        if (result !== "ok") {
+            db.close();
+            throw new Error(`sqlite integrity_check failed for ${dbPath}: ${String(result)}`);
+        }
+    }
+    static findRecoverableBackup(dbPath) {
+        const candidates = this.listBackupCandidates(dbPath);
+        for (const candidate of candidates) {
+            try {
+                const db = new better_sqlite3_1.default(candidate, { readonly: true, fileMustExist: true });
+                this.assertHealthy(db, candidate);
+                db.close();
+                return candidate;
+            }
+            catch {
+                // Try the next backup candidate.
+            }
+        }
+        return null;
+    }
+    static listBackupCandidates(dbPath) {
+        const dir = node_path_1.default.dirname(dbPath);
+        const baseName = node_path_1.default.basename(dbPath);
+        const startupBackups = node_fs_1.default.existsSync(dir)
+            ? node_fs_1.default.readdirSync(dir)
+                .filter((name) => name.startsWith(`${baseName}.startup.`) && name.endsWith(".bak"))
+                .sort()
+                .reverse()
+                .map((name) => node_path_1.default.join(dir, name))
+            : [];
+        return [`${dbPath}.bak`, ...startupBackups].filter((candidate, index, all) => node_fs_1.default.existsSync(candidate) && all.indexOf(candidate) === index);
+    }
+    static nextPath(base) {
+        if (!node_fs_1.default.existsSync(base)) {
+            return base;
+        }
+        let suffix = 1;
+        while (node_fs_1.default.existsSync(`${base}.${suffix}`)) {
+            suffix += 1;
         }
-        return this.sqlPromise;
+        return `${base}.${suffix}`;
     }
     close() {
         this.db.close();
@@ -66,6 +130,18 @@ class AgentInboxStore {
     save() {
         this.persist();
     }
+    async backupHealthyDatabase() {
+        const backupPath = `${this.dbPath}.bak`;
+        const tmpPath = `${backupPath}.${process.pid}.tmp`;
+        try {
+            node_fs_1.default.rmSync(tmpPath, { force: true });
+            await this.db.backup(tmpPath);
+            node_fs_1.default.renameSync(tmpPath, backupPath);
+        }
+        finally {
+            node_fs_1.default.rmSync(tmpPath, { force: true });
+        }
+    }
     migrate() {
         const migrations = this.loadSqlMigrations();
         this.ensureDrizzleMigrationsTable();
@@ -124,7 +200,7 @@ class AgentInboxStore {
         });
     }
     recordAppliedMigration(tag) {
-        this.db.run(`insert or ignore into ${DRIZZLE_MIGRATIONS_TABLE} (tag, applied_at) values (?, ?)`, [tag, (0, util_1.nowIso)()]);
+        this.run(`insert or ignore into ${DRIZZLE_MIGRATIONS_TABLE} (tag, applied_at) values (?, ?)`, [tag, (0, util_1.nowIso)()]);
     }
     shouldArchivePreV1Database() {
         if (this.isV1Database()) {
@@ -174,8 +250,7 @@ class AgentInboxStore {
         return `${base}.${suffix}`;
     }
     persist() {
-        const data = this.db.export();
-        node_fs_1.default.writeFileSync(this.dbPath, Buffer.from(data));
+        // better-sqlite3 persists changes through SQLite's journaling layer.
     }
     inTransaction(fn) {
         this.db.exec("begin");
@@ -189,7 +264,7 @@ class AgentInboxStore {
         }
     }
     setUserVersion(version) {
-        this.db.exec(`pragma user_version = ${version};`);
+        this.db.pragma(`user_version = ${version}`);
     }
     tableExists(name) {
         const row = this.getOne("select name from sqlite_master where type = 'table' and name = ?", [name]);
@@ -259,7 +334,7 @@ class AgentInboxStore {
                     supersededAt: null,
                     createdAt: item.occurredAt,
                 });
-                this.db.run("insert or ignore into inbox_entry_items (entry_id, item_id) values (?, ?)", [entryId, item.itemId]);
+                this.run("insert or ignore into inbox_entry_items (entry_id, item_id) values (?, ?)", [entryId, item.itemId]);
             }
         });
     }
@@ -272,7 +347,7 @@ class AgentInboxStore {
         return row ? this.mapSourceHost(row) : null;
     }
     insertSourceHost(host) {
-        this.db.run(`
+        this.run(`
       insert into source_hosts (
         host_id, host_type, host_key, config_ref, config_json, status, created_at, updated_at
       ) values (?, ?, ?, ?, ?, ?, ?, ?)
@@ -299,7 +374,7 @@ class AgentInboxStore {
         if (!current) {
             throw new Error(`unknown source host: ${hostId}`);
         }
-        this.db.run(`
+        this.run(`
       update source_hosts
       set config_ref = ?, config_json = ?, updated_at = ?
       where host_id = ?
@@ -317,7 +392,7 @@ class AgentInboxStore {
         if (!current) {
             throw new Error(`unknown source host: ${hostId}`);
         }
-        this.db.run(`
+        this.run(`
       update source_hosts
       set status = ?, updated_at = ?
       where host_id = ?
@@ -341,7 +416,7 @@ class AgentInboxStore {
             if (!source.hostId || !source.streamKind || !source.streamKey) {
                 throw new Error("source insert requires hostId, streamKind, and streamKey");
             }
-            this.db.run(`
+            this.run(`
         insert into sources (
           source_id, host_id, stream_kind, stream_key,
           source_type, source_key, config_ref, config_json,
@@ -379,7 +454,7 @@ class AgentInboxStore {
         return rows.map((row) => this.mapSourceIdleState(row));
     }
     upsertSourceIdleState(idleState) {
-        this.db.run(`
+        this.run(`
       insert into source_idle_states (
         source_id, idle_since, auto_pause_at, auto_paused_at, updated_at
       ) values (?, ?, ?, ?, ?)
@@ -399,7 +474,7 @@ class AgentInboxStore {
         return this.getSourceIdleState(idleState.sourceId);
     }
     deleteSourceIdleState(sourceId) {
-        this.db.run("delete from source_idle_states where source_id = ?", [sourceId]);
+        this.run("delete from source_idle_states where source_id = ?", [sourceId]);
         this.persist();
     }
     updateSourceDefinition(sourceId, input) {
@@ -407,7 +482,7 @@ class AgentInboxStore {
         if (!current) {
             throw new Error(`unknown source: ${sourceId}`);
         }
-        this.db.run(`
+        this.run(`
       update sources
       set config_ref = ?, config_json = ?, updated_at = ?
       where source_id = ?
@@ -425,7 +500,7 @@ class AgentInboxStore {
         if (!current) {
             throw new Error(`unknown source: ${sourceId}`);
         }
-        this.db.run(`
+        this.run(`
       update sources
       set status = ?, checkpoint = ?, updated_at = ?
       where source_id = ?
@@ -448,20 +523,20 @@ class AgentInboxStore {
                 const consumers = this.getAll("select consumer_id from consumers where stream_id = ?", [stream.streamId]);
                 for (const row of consumers) {
                     const consumerId = String(row.consumer_id);
-                    this.db.run("delete from consumer_commits where consumer_id = ?", [consumerId]);
+                    this.run("delete from consumer_commits where consumer_id = ?", [consumerId]);
                 }
-                this.db.run("delete from consumers where stream_id = ?", [stream.streamId]);
-                this.db.run("delete from stream_events where stream_id = ?", [stream.streamId]);
-                this.db.run("delete from streams where stream_id = ?", [stream.streamId]);
+                this.run("delete from consumers where stream_id = ?", [stream.streamId]);
+                this.run("delete from stream_events where stream_id = ?", [stream.streamId]);
+                this.run("delete from streams where stream_id = ?", [stream.streamId]);
             }
-            this.db.run("delete from source_idle_states where source_id = ?", [sourceId]);
-            this.db.run("delete from sources where source_id = ?", [sourceId]);
+            this.run("delete from source_idle_states where source_id = ?", [sourceId]);
+            this.run("delete from sources where source_id = ?", [sourceId]);
             const hostId = source.hostId ?? null;
             const siblings = hostId
                 ? this.getOne("select count(*) as count from sources where host_id = ?", [hostId])
                 : null;
             if (hostId && Number(siblings?.count ?? 0) === 0) {
-                this.db.run("delete from source_hosts where host_id = ?", [hostId]);
+                this.run("delete from source_hosts where host_id = ?", [hostId]);
             }
         });
         this.persist();
@@ -472,7 +547,7 @@ class AgentInboxStore {
         return row ? this.mapAgent(row) : null;
     }
     insertAgent(agent) {
-        this.db.run(`
+        this.run(`
       insert into agents (
         agent_id, status, offline_since, runtime_kind, runtime_session_id, created_at, updated_at, last_seen_at
       ) values (?, ?, ?, ?, ?, ?, ?, ?)
@@ -493,7 +568,7 @@ class AgentInboxStore {
         if (!current) {
             throw new Error(`unknown agent: ${agentId}`);
         }
-        this.db.run(`
+        this.run(`
       update agents
       set status = ?, offline_since = ?, runtime_kind = ?, runtime_session_id = ?, updated_at = ?, last_seen_at = ?
       where agent_id = ?
@@ -524,7 +599,7 @@ class AgentInboxStore {
         return row ? this.mapInbox(row) : null;
     }
     insertInbox(inbox) {
-        this.db.run(`
+        this.run(`
       insert into inboxes (
         inbox_id, owner_agent_id, aggregation_enabled, aggregation_window_ms,
         aggregation_max_items, aggregation_max_thread_age_ms, created_at
@@ -545,7 +620,7 @@ class AgentInboxStore {
         if (!current) {
             throw new Error(`unknown inbox: ${inboxId}`);
         }
-        this.db.run(`
+        this.run(`
       update inboxes
       set aggregation_enabled = ?,
           aggregation_window_ms = ?,
@@ -573,7 +648,7 @@ class AgentInboxStore {
         return row ? this.mapSubscription(row) : null;
     }
     insertSubscription(subscription) {
-        this.db.run(`
+        this.run(`
       insert into subscriptions (
         subscription_id, agent_id, source_id, filter_json, tracked_resource_ref, cleanup_policy_json, start_policy, start_offset, start_time, created_at
       ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
@@ -644,10 +719,10 @@ class AgentInboxStore {
             return null;
         }
         this.inTransaction(() => {
-            this.db.run("delete from consumer_commits where consumer_id in (select consumer_id from consumers where subscription_id = ?)", [subscriptionId]);
-            this.db.run("delete from consumers where subscription_id = ?", [subscriptionId]);
-            this.db.run("delete from subscription_lifecycle_retirements where subscription_id = ?", [subscriptionId]);
-            this.db.run("delete from subscriptions where subscription_id = ?", [subscriptionId]);
+            this.run("delete from consumer_commits where consumer_id in (select consumer_id from consumers where subscription_id = ?)", [subscriptionId]);
+            this.run("delete from consumers where subscription_id = ?", [subscriptionId]);
+            this.run("delete from subscription_lifecycle_retirements where subscription_id = ?", [subscriptionId]);
+            this.run("delete from subscriptions where subscription_id = ?", [subscriptionId]);
         });
         this.persist();
         return subscription;
@@ -669,7 +744,7 @@ class AgentInboxStore {
         const next = existing
             ? earlierLifecycleRetirement(existing, retirement)
             : retirement;
-        this.db.run(`
+        this.run(`
       insert into subscription_lifecycle_retirements (
         subscription_id, host_id, tracked_resource_ref, retire_at, terminal_state, terminal_result, terminal_occurred_at, created_at, updated_at
       ) values (?, ?, ?, ?, ?, ?, ?, ?, ?)
@@ -697,7 +772,7 @@ class AgentInboxStore {
         return this.getSubscriptionLifecycleRetirement(retirement.subscriptionId);
     }
     deleteSubscriptionLifecycleRetirement(subscriptionId) {
-        this.db.run("delete from subscription_lifecycle_retirements where subscription_id = ?", [subscriptionId]);
+        this.run("delete from subscription_lifecycle_retirements where subscription_id = ?", [subscriptionId]);
         this.persist();
     }
     getActivationTarget(targetId) {
@@ -726,7 +801,7 @@ class AgentInboxStore {
     }
     insertActivationTarget(target) {
         if (target.kind === "webhook") {
-            this.db.run(`
+            this.run(`
         insert into activation_targets (
           target_id, agent_id, kind, status, offline_since, consecutive_failures, last_delivered_at, last_error,
           mode, notify_lease_ms, min_unacked_items, url, created_at, updated_at, last_seen_at
@@ -750,7 +825,7 @@ class AgentInboxStore {
             ]);
         }
         else {
-            this.db.run(`
+            this.run(`
         insert into activation_targets (
           target_id, agent_id, kind, status, offline_since, consecutive_failures, last_delivered_at, last_error, mode, notify_lease_ms, min_unacked_items,
           runtime_kind, runtime_session_id, runtime_pid, backend, tmux_pane_id, tty, term_program, iterm_session_id,
@@ -784,7 +859,7 @@ class AgentInboxStore {
         this.persist();
     }
     updateTerminalActivationTargetHeartbeat(targetId, input) {
-        this.db.run(`
+        this.run(`
       update activation_targets
       set status = 'active', offline_since = null, last_error = null, consecutive_failures = 0,
           runtime_kind = ?, runtime_session_id = ?, runtime_pid = ?, tmux_pane_id = ?, tty = ?, term_program = ?, iterm_session_id = ?, notify_lease_ms = ?, min_unacked_items = ?, updated_at = ?, last_seen_at = ?
@@ -811,7 +886,7 @@ class AgentInboxStore {
         return target;
     }
     updateWebhookActivationTarget(targetId, input) {
-        this.db.run(`
+        this.run(`
       update activation_targets
       set kind = 'webhook', status = 'active', offline_since = null, last_error = null, consecutive_failures = 0,
           mode = ?, notify_lease_ms = ?, min_unacked_items = ?, url = ?, updated_at = ?, last_seen_at = ?
@@ -837,7 +912,7 @@ class AgentInboxStore {
         if (!current) {
             throw new Error(`unknown activation target: ${targetId}`);
         }
-        this.db.run(`
+        this.run(`
       update activation_targets
       set status = ?, offline_since = ?, consecutive_failures = ?, last_delivered_at = ?, last_error = ?, updated_at = ?, last_seen_at = ?
       where target_id = ?
@@ -868,8 +943,8 @@ class AgentInboxStore {
     }
     deleteActivationTarget(agentId, targetId) {
         this.inTransaction(() => {
-            this.db.run("delete from activation_dispatch_states where agent_id = ? and target_id = ?", [agentId, targetId]);
-            this.db.run("delete from activation_targets where agent_id = ? and target_id = ?", [agentId, targetId]);
+            this.run("delete from activation_dispatch_states where agent_id = ? and target_id = ?", [agentId, targetId]);
+            this.run("delete from activation_targets where agent_id = ? and target_id = ?", [agentId, targetId]);
         });
         this.persist();
     }
@@ -878,26 +953,26 @@ class AgentInboxStore {
         const subscriptions = this.listSubscriptionsForAgent(agentId);
         this.inTransaction(() => {
             for (const subscription of subscriptions) {
-                this.db.run("delete from consumer_commits where consumer_id in (select consumer_id from consumers where subscription_id = ?)", [
+                this.run("delete from consumer_commits where consumer_id in (select consumer_id from consumers where subscription_id = ?)", [
                     subscription.subscriptionId,
                 ]);
-                this.db.run("delete from consumers where subscription_id = ?", [subscription.subscriptionId]);
+                this.run("delete from consumers where subscription_id = ?", [subscription.subscriptionId]);
             }
-            this.db.run("delete from subscription_lifecycle_retirements where subscription_id in (select subscription_id from subscriptions where agent_id = ?)", [agentId]);
-            this.db.run("delete from source_idle_states where source_id in (select distinct source_id from subscriptions where agent_id = ?)", [agentId]);
-            this.db.run("delete from timers where agent_id = ?", [agentId]);
-            this.db.run("delete from subscriptions where agent_id = ?", [agentId]);
-            this.db.run("delete from activation_dispatch_states where agent_id = ?", [agentId]);
-            this.db.run("delete from activation_targets where agent_id = ?", [agentId]);
+            this.run("delete from subscription_lifecycle_retirements where subscription_id in (select subscription_id from subscriptions where agent_id = ?)", [agentId]);
+            this.run("delete from source_idle_states where source_id in (select distinct source_id from subscriptions where agent_id = ?)", [agentId]);
+            this.run("delete from timers where agent_id = ?", [agentId]);
+            this.run("delete from subscriptions where agent_id = ?", [agentId]);
+            this.run("delete from activation_dispatch_states where agent_id = ?", [agentId]);
+            this.run("delete from activation_targets where agent_id = ?", [agentId]);
             if (inbox) {
-                this.db.run("delete from inbox_items where inbox_id = ?", [inbox.inboxId]);
-                this.db.run("delete from activations where agent_id = ? or inbox_id = ?", [agentId, inbox.inboxId]);
-                this.db.run("delete from inboxes where inbox_id = ?", [inbox.inboxId]);
+                this.run("delete from inbox_items where inbox_id = ?", [inbox.inboxId]);
+                this.run("delete from activations where agent_id = ? or inbox_id = ?", [agentId, inbox.inboxId]);
+                this.run("delete from inboxes where inbox_id = ?", [inbox.inboxId]);
             }
             else {
-                this.db.run("delete from activations where agent_id = ?", [agentId]);
+                this.run("delete from activations where agent_id = ?", [agentId]);
             }
-            this.db.run("delete from agents where agent_id = ?", [agentId]);
+            this.run("delete from agents where agent_id = ?", [agentId]);
         });
         if (options?.persist !== false) {
             this.persist();
@@ -912,7 +987,7 @@ class AgentInboxStore {
         return rows.map((row) => this.mapAgent(row));
     }
     insertTimer(timer) {
-        this.db.run(`
+        this.run(`
       insert into timers (
         schedule_id, agent_id, status, mode, at, interval_ms, cron_expr, timezone,
         message, sender, next_fire_at, last_fired_at, created_at, updated_at
@@ -964,7 +1039,7 @@ class AgentInboxStore {
         if (!current) {
             throw new Error(`unknown timer: ${scheduleId}`);
         }
-        this.db.run(`
+        this.run(`
       update timers
       set status = ?, mode = ?, at = ?, interval_ms = ?, cron_expr = ?, timezone = ?,
           message = ?, sender = ?, next_fire_at = ?, last_fired_at = ?, updated_at = ?
@@ -991,7 +1066,7 @@ class AgentInboxStore {
         if (!current) {
             return null;
         }
-        this.db.run("delete from timers where schedule_id = ?", [scheduleId]);
+        this.run("delete from timers where schedule_id = ?", [scheduleId]);
         this.persist();
         return current;
     }
@@ -1008,7 +1083,7 @@ class AgentInboxStore {
         return rows.map((row) => this.mapActivationDispatchState(row));
     }
     upsertActivationDispatchState(state) {
-        this.db.run(`
+        this.run(`
       insert into activation_dispatch_states (
         agent_id, target_id, status, lease_expires_at, last_notified_fingerprint, defer_reason, defer_attempts,
         first_deferred_at, last_deferred_at, pending_fingerprint, pending_new_item_count, pending_summary,
@@ -1048,12 +1123,11 @@ class AgentInboxStore {
         this.persist();
     }
     deleteActivationDispatchState(agentId, targetId) {
-        this.db.run("delete from activation_dispatch_states where agent_id = ? and target_id = ?", [agentId, targetId]);
+        this.run("delete from activation_dispatch_states where agent_id = ? and target_id = ?", [agentId, targetId]);
         this.persist();
     }
     insertInboxItem(item) {
-        const before = this.changes();
-        this.db.run(`
+        const result = this.run(`
       insert or ignore into inbox_items (
         item_id, source_id, source_native_id, event_variant, inbox_id, occurred_at,
         metadata_json, raw_payload_json, provider_raw_payload_json, delivery_handle_json, acked_at
@@ -1071,10 +1145,10 @@ class AgentInboxStore {
             item.deliveryHandle ? JSON.stringify(item.deliveryHandle) : null,
             item.ackedAt ?? null,
         ]);
-        const inserted = this.changes() > before;
+        const inserted = result.changes > 0;
         if (inserted) {
-            const rowId = this.lastInsertRowId();
-            this.db.run(`
+            const rowId = Number(result.lastInsertRowid);
+            this.run(`
         update inbox_items
         set inbox_sequence = ?
         where rowid = ? and inbox_sequence is null
@@ -1115,7 +1189,7 @@ class AgentInboxStore {
             supersededAt: null,
             createdAt: (0, util_1.nowIso)(),
         });
-        this.db.run("insert or ignore into inbox_entry_items (entry_id, item_id) values (?, ?)", [entryId, item.itemId]);
+        this.run("insert or ignore into inbox_entry_items (entry_id, item_id) values (?, ?)", [entryId, item.itemId]);
         this.persist();
         return this.getInboxEntry(entryId);
     }
@@ -1183,7 +1257,7 @@ class AgentInboxStore {
     }
     createDigestThread(input) {
         const threadId = (0, util_1.generateCanonicalId)("thr");
-        this.db.run(`
+        this.run(`
       insert into digest_threads (
         thread_id, inbox_id, source_id, group_key, resource_ref, event_family, latest_revision,
         latest_entry_id, status, summary, first_item_at, last_item_at, flush_after_at,
@@ -1212,8 +1286,8 @@ class AgentInboxStore {
     }
     addItemToDigestThread(threadId, itemId, occurredAt, summary, flushAfterAt) {
         this.inTransaction(() => {
-            this.db.run("insert or ignore into digest_thread_items (thread_id, item_id) values (?, ?)", [threadId, itemId]);
-            this.db.run(`
+            this.run("insert or ignore into digest_thread_items (thread_id, item_id) values (?, ?)", [threadId, itemId]);
+            this.run(`
         update digest_threads
         set summary = ?, last_item_at = ?, flush_after_at = ?, updated_at = ?
         where thread_id = ?
@@ -1259,7 +1333,7 @@ class AgentInboxStore {
         }
         this.inTransaction(() => {
             if (thread.latestEntryId != null) {
-                this.db.run("update inbox_entries set superseded_at = ? where entry_id = ? and superseded_at is null", [input.createdAt, thread.latestEntryId]);
+                this.run("update inbox_entries set superseded_at = ? where entry_id = ? and superseded_at is null", [input.createdAt, thread.latestEntryId]);
             }
             const nextRevision = thread.latestRevision + 1;
             const entryId = this.insertInboxEntryRecord({
@@ -1283,9 +1357,9 @@ class AgentInboxStore {
                 createdAt: input.createdAt,
             });
             for (const itemId of input.itemIds) {
-                this.db.run("insert or ignore into inbox_entry_items (entry_id, item_id) values (?, ?)", [entryId, itemId]);
+                this.run("insert or ignore into inbox_entry_items (entry_id, item_id) values (?, ?)", [entryId, itemId]);
             }
-            this.db.run(`
+            this.run(`
         update digest_threads
         set latest_revision = ?, latest_entry_id = ?, summary = ?, first_item_at = ?, last_item_at = ?,
             flush_after_at = null, updated_at = ?
@@ -1296,7 +1370,7 @@ class AgentInboxStore {
         return this.getInboxEntry(this.getDigestThread(input.threadId).latestEntryId);
     }
     closeDigestThread(threadId, updatedAt) {
-        this.db.run("update digest_threads set status = 'closed', flush_after_at = null, updated_at = ? where thread_id = ?", [updatedAt, threadId]);
+        this.run("update digest_threads set status = 'closed', flush_after_at = null, updated_at = ? where thread_id = ?", [updatedAt, threadId]);
         this.persist();
     }
     listDigestThreadsForRawItems(itemIds) {
@@ -1330,12 +1404,12 @@ class AgentInboxStore {
     ackItems(inboxId, itemIds, ackedAt) {
         let changes = 0;
         for (const itemId of itemIds) {
-            this.db.run(`
+            const result = this.run(`
         update inbox_items
         set acked_at = ?
         where inbox_id = ? and item_id = ? and acked_at is null
       `, [ackedAt, inboxId, itemId]);
-            changes += this.changes();
+            changes += result.changes;
         }
         if (changes > 0) {
             this.persist();
@@ -1347,14 +1421,14 @@ class AgentInboxStore {
         if (!anchor) {
             throw new Error(`unknown inbox item: ${itemId}`);
         }
-        this.db.run(`
+        const result = this.run(`
       update inbox_items
       set acked_at = ?
       where inbox_id = ?
         and acked_at is null
         and coalesce(inbox_sequence, rowid) <= ?
     `, [ackedAt, inboxId, Number(anchor.inbox_sequence)]);
-        const changes = this.changes();
+        const changes = result.changes;
         if (changes > 0) {
             this.persist();
         }
@@ -1397,7 +1471,7 @@ class AgentInboxStore {
         return Number(row?.count ?? 0);
     }
     insertActivation(activation) {
-        this.db.run(`
+        this.run(`
       insert into activations (
         activation_id, kind, agent_id, inbox_id, target_id, target_kind,
         subscription_ids_json, source_ids_json, latest_entry_id, new_entry_count, new_item_count, summary, items_json, created_at, delivered_at
@@ -1426,7 +1500,7 @@ class AgentInboxStore {
         return rows.map((row) => this.mapActivation(row));
     }
     insertDelivery(delivery) {
-        this.db.run(`
+        this.run(`
       insert into deliveries (
         delivery_id, provider, surface, target_ref, thread_ref, reply_mode,
         kind, payload_json, status, created_at
@@ -1450,7 +1524,7 @@ class AgentInboxStore {
         return rows.map((row) => this.mapDelivery(row));
     }
     insertStream(stream) {
-        this.db.run("insert into streams (stream_id, source_id, stream_key, backend, created_at) values (?, ?, ?, ?, ?)", [stream.streamId, stream.sourceId, stream.streamKey, stream.backend, stream.createdAt]);
+        this.run("insert into streams (stream_id, source_id, stream_key, backend, created_at) values (?, ?, ?, ?, ?)", [stream.streamId, stream.sourceId, stream.streamKey, stream.backend, stream.createdAt]);
         this.persist();
     }
     getStream(streamId) {
@@ -1474,8 +1548,7 @@ class AgentInboxStore {
         const providerRawPayloadJson = event.providerRawPayload ? JSON.stringify(event.providerRawPayload) : null;
         const deliveryHandleJson = event.deliveryHandle ? JSON.stringify(event.deliveryHandle) : null;
         for (let attempt = 0; attempt < 5; attempt += 1) {
-            const before = this.changes();
-            this.db.run(`
+            const result = this.run(`
         insert or ignore into stream_events (
           stream_event_id, stream_id, source_id, source_native_id, event_variant,
           occurred_at, metadata_json, raw_payload_json, provider_raw_payload_json, delivery_handle_json, created_at
@@ -1493,12 +1566,12 @@ class AgentInboxStore {
                 deliveryHandleJson,
                 (0, util_1.nowIso)(),
             ]);
-            if (this.changes() > before) {
+            if (result.changes > 0) {
                 this.persist();
                 return {
                     appended: 1,
                     deduped: 0,
-                    lastOffset: this.lastInsertRowId(),
+                    lastOffset: Number(result.lastInsertRowid),
                 };
             }
             const existing = this.getOne(`
@@ -1551,7 +1624,7 @@ class AgentInboxStore {
         return Number(row?.count ?? 0);
     }
     insertConsumer(consumer) {
-        this.db.run(`
+        this.run(`
       insert into consumers (
         consumer_id, stream_id, subscription_id, consumer_key, start_policy,
         start_offset, start_time, next_offset, created_at, updated_at
@@ -1584,8 +1657,8 @@ class AgentInboxStore {
     }
     deleteConsumer(consumerId) {
         this.inTransaction(() => {
-            this.db.run("delete from consumer_commits where consumer_id = ?", [consumerId]);
-            this.db.run("delete from consumers where consumer_id = ?", [consumerId]);
+            this.run("delete from consumer_commits where consumer_id = ?", [consumerId]);
+            this.run("delete from consumers where consumer_id = ?", [consumerId]);
         });
         this.persist();
     }
@@ -1596,8 +1669,8 @@ class AgentInboxStore {
         }
         const updatedAt = (0, util_1.nowIso)();
         this.inTransaction(() => {
-            this.db.run("update consumers set next_offset = ?, updated_at = ? where consumer_id = ?", [nextOffset, updatedAt, consumerId]);
-            this.db.run(`
+            this.run("update consumers set next_offset = ?, updated_at = ? where consumer_id = ?", [nextOffset, updatedAt, consumerId]);
+            this.run(`
         insert into consumer_commits (
           commit_id, consumer_id, stream_id, committed_offset, committed_at
         ) values (?, ?, ?, ?, ?)
@@ -1607,7 +1680,7 @@ class AgentInboxStore {
         return this.getConsumer(consumerId);
     }
     resetConsumer(consumerId, input) {
-        this.db.run(`
+        this.run(`
       update consumers
       set start_policy = ?, start_offset = ?, start_time = ?, next_offset = ?, updated_at = ?
       where consumer_id = ?
@@ -1654,32 +1727,14 @@ class AgentInboxStore {
         const row = this.getOne("select last_insert_rowid() as rowid");
         return Number(row?.rowid ?? 0);
     }
+    run(sql, params = []) {
+        return this.db.prepare(sql).run(...params);
+    }
     getOne(sql, params = []) {
-        const statement = this.db.prepare(sql);
-        try {
-            statement.bind(params);
-            if (!statement.step()) {
-                return undefined;
-            }
-            return statement.getAsObject();
-        }
-        finally {
-            statement.free();
-        }
+        return this.db.prepare(sql).get(...params);
     }
     getAll(sql, params = []) {
-        const statement = this.db.prepare(sql);
-        try {
-            statement.bind(params);
-            const rows = [];
-            while (statement.step()) {
-                rows.push(statement.getAsObject());
-            }
-            return rows;
-        }
-        finally {
-            statement.free();
-        }
+        return this.db.prepare(sql).all(...params);
     }
     mapSource(row) {
         const hostId = requiredText(row, "host_id");
@@ -2006,7 +2061,7 @@ class AgentInboxStore {
     }
     insertInboxEntryRecord(input) {
         const entryId = (0, util_1.generateCanonicalId)("ent");
-        this.db.run(`
+        this.run(`
       insert into inbox_entries (
         entry_id, inbox_id, kind, sequence, thread_id, revision, group_key, resource_ref, event_family,
         item_json, count, summary, first_item_at, last_item_at, source_ids_json,
@@ -2085,7 +2140,7 @@ class AgentInboxStore {
         return rows.map((row) => this.mapInboxEntry(row, itemIdsByEntry.get(String(row.entry_id)) ?? []));
     }
     syncInboxEntryAckState(inboxId, ackedAt) {
-        this.db.run(`
+        this.run(`
       update inbox_entries
       set acked_at = ?
       where inbox_id = ?
@@ -2111,9 +2166,9 @@ class AgentInboxStore {
     deleteInboxItemsAndEntryArtifacts(itemIds) {
         const placeholders = itemIds.map(() => "?").join(", ");
         this.inTransaction(() => {
-            this.db.run(`delete from digest_thread_items where item_id in (${placeholders})`, itemIds);
-            this.db.run(`delete from inbox_items where item_id in (${placeholders})`, itemIds);
-            this.db.run(`
+            this.run(`delete from digest_thread_items where item_id in (${placeholders})`, itemIds);
+            this.run(`delete from inbox_items where item_id in (${placeholders})`, itemIds);
+            this.run(`
         delete from inbox_entries
         where entry_id in (
           select e.entry_id
@@ -2130,7 +2185,7 @@ class AgentInboxStore {
           )
         )
         `);
-            this.db.run(`
+            this.run(`
         delete from inbox_entry_items
         where not exists (
           select 1
@@ -2138,7 +2193,7 @@ class AgentInboxStore {
           where ii.item_id = inbox_entry_items.item_id
         )
         `);
-            this.db.run(`
+            this.run(`
         update digest_threads
         set latest_entry_id = (
               select e.entry_id
@@ -2153,7 +2208,7 @@ class AgentInboxStore {
               where e.thread_id = digest_threads.thread_id
             ), 0)
         `);
-            this.db.run(`
+            this.run(`
         delete from digest_threads
         where not exists (
           select 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holon-run/agentinbox",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Local event subscription and delivery service for agents.",
   "license": "Apache-2.0",
   "repository": {
@@ -45,14 +45,14 @@
   "dependencies": {
     "@fastify/swagger": "^9.5.2",
     "@holon-run/uxc-daemon-client": "^0.15.4",
+    "better-sqlite3": "^12.10.0",
     "commander": "^14.0.3",
     "fastify": "^5.6.1",
-    "jexl": "^2.3.0",
-    "sql.js": "^1.13.0"
+    "jexl": "^2.3.0"
   },
   "devDependencies": {
+    "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^24.5.2",
-    "@types/sql.js": "^1.4.9",
     "drizzle-kit": "1.0.0-beta.21",
     "drizzle-orm": "^0.45.2",
     "mdorigin": "^0.5.0",