hippo-memory 1.70.0 → 1.71.0

package/dist/store/cards.js

@@ -1,9 +1,10 @@
 import { generateId } from '../core/memory.js';
-import { closeHippoDb, withWriteScope, withWriteScopeOr } from '../db/index.js';
+import { withWriteScope, withWriteScopeOr } from '../db/index.js';
 import { rowToSessionHandoff, isHandoffOutcome } from '../core/handoff.js';
-import { CARD_TRANSITIONS, CARD_LEASE_MS } from '../core/card.js';
+import { CARD_LEASE_MS, assertCardTransition } from '../core/card.js';
 import { assertTenantId } from './tenant.js';
-import { openStore } from './open.js';
+import { onHandle, openStore } from './open.js';
+import { chunked } from './entry-reads.js';
 import { HANDOFF_COLUMNS } from './handoffs.js';
 const CARD_COLUMNS = 'id, title, status, assignee_runtime, repo, contract, budget, lease_until, heartbeat_at, created_at, updated_at, tenant_id, scope';
 function rowToCard(row) {
@@ -77,26 +78,27 @@ function closeLiveRun(db, tenantId, cardId, outcome, now) {
     WHERE card = ? AND tenant_id = ? AND ended IS NULL
   `).run(now, outcome, now, cardId, tenantId);
 }
-export function transitionCard(db, tenantId, cardId, options) {
+function transitionCard(db, tenantId, cardId, options) {
+    return transitionCards(db, tenantId, [cardId], options);
+}
+/** transitionCard for every card in `cardIds`, as one statement with one timestamp; returns how many moved. */
+function transitionCards(db, tenantId, cardIds, options) {
     const { from, to, extra } = options;
-    for (const status of from) {
-        if (!CARD_TRANSITIONS[status].includes(to)) {
-            throw new Error(`illegal card transition: ${status} -> ${to}`);
-        }
-    }
+    assertCardTransition(from, to);
     const now = new Date().toISOString();
     // Lease columns follow status: set on the move to running, cleared on every other move (rule 15).
     const lease = to === 'running' ? [leaseUntilFrom(now), now] : [null, null];
     const fromPlaceholders = from.map(() => '?').join(', ');
     const sql = `
     UPDATE cards SET status = ?, updated_at = ?, lease_until = ?, heartbeat_at = ?${extra?.setSql ? `, ${extra.setSql}` : ''}
-    WHERE id = ? AND tenant_id = ? AND status IN (${fromPlaceholders})${extra?.whereSql ? ` AND ${extra.whereSql}` : ''}
+    WHERE id IN (${cardIds.map(() => '?').join(', ')}) AND tenant_id = ? AND status IN (${fromPlaceholders})${extra?.whereSql ? ` AND ${extra.whereSql}` : ''}
   `;
-    const params = [to, now, ...lease, ...(extra?.params ?? []), cardId, tenantId, ...from];
+    const params = [to, now, ...lease, ...(extra?.params ?? []), ...cardIds, tenantId, ...from];
     const result = db.prepare(sql).run(...params);
     return Number(result.changes ?? 0);
 }
-/** Creates a card; status is ready with no deps or once every dependsOn id is done, else backlog. An unknown dependsOn id throws and commits nothing. A repeated dependsOn id is recorded once. */
+/** Creates a card; status is ready with no deps or once every dependsOn id is done, else backlog.
+ * An unknown dependsOn id throws and commits nothing. A repeated dependsOn id is recorded once. */
 export function createCard(hippoRoot, tenantId, input) {
     assertTenantId('createCard', tenantId);
     if (input.title.trim() === '') {
@@ -105,8 +107,7 @@ export function createCard(hippoRoot, tenantId, input) {
     if (input.budget !== undefined && !(Number.isSafeInteger(input.budget) && input.budget > 0)) {
         throw new Error(`Invalid budget: ${input.budget} (expected a positive integer)`);
     }
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         const dependsOn = [...new Set(input.dependsOn ?? [])];
         let id = '';
         withWriteScope(db, 'create_card', () => {
@@ -120,17 +121,14 @@ export function createCard(hippoRoot, tenantId, input) {
         INSERT INTO cards (id, title, status, repo, contract, budget, created_at, updated_at, tenant_id)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
       `).run(id, input.title, status, input.repo ?? null, input.contract ?? null, input.budget ?? null, now, now, tenantId);
-            for (const parentId of dependsOn) {
-                db.prepare(`
-          INSERT INTO card_deps (parent, child, tenant_id, created_at) VALUES (?, ?, ?, ?)
-        `).run(parentId, id, tenantId, now);
-            }
+            const insertDep = db.prepare(`
+        INSERT INTO card_deps (parent, child, tenant_id, created_at) VALUES (?, ?, ?, ?)
+      `);
+            for (const parentId of dependsOn)
+                insertDep.run(parentId, id, tenantId, now);
         });
         return loadCardRow(db, tenantId, id);
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
 /** Whether every dependsOn card is done, true for none; throws on an id that is no card of the tenant. Call inside the write scope. */
 function everyParentDone(db, tenantId, dependsOn) {
@@ -151,19 +149,14 @@ function everyParentDone(db, tenantId, dependsOn) {
 /** Returns the card row for id, or null if it does not exist under this tenant. */
 export function loadCard(hippoRoot, tenantId, id) {
     assertTenantId('loadCard', tenantId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         return loadCardRow(db, tenantId, id);
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
 /** Lists cards for this tenant, optionally filtered to one status, newest-updated first. */
 export function listCards(hippoRoot, tenantId, opts = {}) {
     assertTenantId('listCards', tenantId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         const conditions = ['tenant_id = ?'];
         const params = [tenantId];
         if (opts.status) {
@@ -175,82 +168,63 @@ export function listCards(hippoRoot, tenantId, opts = {}) {
       SELECT ${CARD_COLUMNS} FROM cards WHERE ${conditions.join(' AND ')} ORDER BY updated_at DESC, id DESC
     `).all(...params);
         return rows.map(rowToCard);
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
 /** Returns this card's parent and child ids from card_deps. */
 export function loadCardDeps(hippoRoot, tenantId, id) {
     assertTenantId('loadCardDeps', tenantId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         // SAFETY: rows' shape matches the single `parent` column named in the SELECT below.
         const parents = db.prepare(`SELECT parent FROM card_deps WHERE tenant_id = ? AND child = ?`).all(tenantId, id).map((r) => r.parent);
         // SAFETY: rows' shape matches the single `child` column named in the SELECT below.
         const children = db.prepare(`SELECT child FROM card_deps WHERE tenant_id = ? AND parent = ?`).all(tenantId, id).map((r) => r.child);
         return { parents, children };
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
 /** Returns this card's run history, most recent first. */
 export function loadCardRuns(hippoRoot, tenantId, id) {
     assertTenantId('loadCardRuns', tenantId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         // SAFETY: rows' shape matches CardRunRow.
         const rows = db.prepare(`
       SELECT id, card, runtime, session_id, started, ended, outcome
       FROM card_runs WHERE tenant_id = ? AND card = ? ORDER BY started DESC, id DESC
     `).all(tenantId, id);
         return rows.map(rowToCardRun);
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
 /** Returns this card's comments, most recent first. */
 export function loadCardComments(hippoRoot, tenantId, id) {
     assertTenantId('loadCardComments', tenantId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         // SAFETY: rows' shape matches CardCommentRow.
         const rows = db.prepare(`
       SELECT id, card_id, author, body, created_at
       FROM card_comments WHERE tenant_id = ? AND card_id = ? ORDER BY created_at DESC, id DESC
     `).all(tenantId, id);
         return rows.map(rowToCardComment);
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
 /** Read side of the card <-> handoff round trip: the newest handoff filed against this card. */
 export function loadLatestHandoffForCard(hippoRoot, tenantId, cardId) {
     assertTenantId('loadLatestHandoffForCard', tenantId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         // SAFETY: row's shape matches HANDOFF_COLUMNS.
         const row = db.prepare(`
       SELECT ${HANDOFF_COLUMNS} FROM session_handoffs
       WHERE tenant_id = ? AND card_id = ? ORDER BY created_at DESC, id DESC LIMIT 1
     `).get(tenantId, cardId);
         return row ? rowToSessionHandoff(row) : null;
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
-/** Atomic claim: WHERE status IN (ready, blocked) AND assignee_runtime IS NULL decides the race. Throws on an unknown card id; returns null for a card not ready/blocked or already claimed. Sets a CARD_LEASE_MS lease and returns the new run's id as runId. */
+/** Atomic claim: WHERE status IN (ready, blocked) AND assignee_runtime IS NULL decides the race. Throws on an unknown card id;
+ * returns null for a card not ready/blocked or already claimed. Sets a CARD_LEASE_MS lease and returns the new run's id as runId. */
 export function claimCard(hippoRoot, tenantId, id, runtime, sessionId) {
     assertTenantId('claimCard', tenantId);
     if (runtime.trim() === '') {
         throw new Error('runtime must not be empty');
     }
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         const runId = withWriteScopeOr(db, 'claim_card', (rollback) => {
             const changes = transitionCard(db, tenantId, id, {
                 from: ['ready', 'blocked'],
@@ -271,17 +245,14 @@ export function claimCard(hippoRoot, tenantId, id, runtime, sessionId) {
             return Number(insert.lastInsertRowid ?? 0);
         });
         return runId === null ? null : { ...loadCardRow(db, tenantId, id), runId };
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
-/** Moves a running card's lease to CARD_LEASE_MS from now and records the heartbeat; updated_at is left alone. Throws on an unknown card id or a run id that is not a positive integer; returns null unless the card is running and runId is its live run. */
+/** Moves a running card's lease to CARD_LEASE_MS from now and records the heartbeat; updated_at is left alone. Throws on an
+ * unknown card id or a run id that is not a positive integer; returns null unless the card is running and runId is its live run. */
 export function heartbeatCard(hippoRoot, tenantId, id, runId) {
     assertTenantId('heartbeatCard', tenantId);
     assertRunId(runId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         const beat = withWriteScopeOr(db, 'heartbeat_card', (rollback) => {
             const card = loadCardRow(db, tenantId, id);
             if (!card) {
@@ -296,12 +267,10 @@ export function heartbeatCard(hippoRoot, tenantId, id, runId) {
             return true;
         });
         return beat ? loadCardRow(db, tenantId, id) : null;
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
-/** Requires the card be running; closes the live run as blocked and files reason as a comment. Throws on an unknown card id; returns null for a card not running. When runId is given, returns null unless it is the card's live run. */
+/** Requires the card be running; closes the live run as blocked and files reason as a comment. Throws on an unknown
+ * card id; returns null for a card not running. When runId is given, returns null unless it is the card's live run. */
 export function blockCard(hippoRoot, tenantId, id, reason, runId) {
     assertTenantId('blockCard', tenantId);
     if (reason.trim() === '') {
@@ -309,8 +278,7 @@ export function blockCard(hippoRoot, tenantId, id, reason, runId) {
     }
     if (runId !== undefined)
         assertRunId(runId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         const blocked = withWriteScopeOr(db, 'block_card', (rollback) => {
             const allowed = runId === undefined || isLiveRun(db, tenantId, id, runId);
             const changes = allowed ? transitionCard(db, tenantId, id, { from: ['running'], to: 'blocked', extra: { setSql: 'assignee_runtime = NULL' } }) : 0;
@@ -327,18 +295,15 @@ export function blockCard(hippoRoot, tenantId, id, reason, runId) {
             return true;
         });
         return blocked ? loadCardRow(db, tenantId, id) : null;
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
-/** Requires the card be running; moves it to review, clearing its lease and heartbeat and keeping its live run. When runId is given, returns null unless it is the card's live run. Throws on an unknown card id; returns null for a card not running. */
+/** Requires the card be running; moves it to review, clearing its lease and heartbeat and keeping its live run. When runId is
+ * given, returns null unless it is the card's live run. Throws on an unknown card id; returns null for a card not running. */
 export function reviewCard(hippoRoot, tenantId, id, runId) {
     assertTenantId('reviewCard', tenantId);
     if (runId !== undefined)
         assertRunId(runId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         const moved = withWriteScopeOr(db, 'review_card', (rollback) => {
             const allowed = runId === undefined || isLiveRun(db, tenantId, id, runId);
             const changes = allowed ? transitionCard(db, tenantId, id, { from: ['running'], to: 'review' }) : 0;
@@ -351,12 +316,10 @@ export function reviewCard(hippoRoot, tenantId, id, runId) {
             return true;
         });
         return moved ? loadCardRow(db, tenantId, id) : null;
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
-/** Requires the card be in review; closes the live run with outcome. Outcome 'success' moves the card to done and, in the same transaction, promotes any child whose parents are now all done; 'failure' or 'partial' moves it to shelved and promotes nothing. Throws on an unknown card id; returns null for a card not in review. When runId is given, returns null unless it is the card's live run. */
+/** Closes the live run of a card in review: 'success' moves it to done and promotes children whose parents are all done; 'failure'/'partial' shelves it.
+ * Throws on an unknown card id; returns null for a card not in review, or when `runId` is given and is not the card's live run. */
 export function completeCard(hippoRoot, tenantId, id, outcome, runId) {
     assertTenantId('completeCard', tenantId);
     if (!isHandoffOutcome(outcome)) {
@@ -364,8 +327,7 @@ export function completeCard(hippoRoot, tenantId, id, outcome, runId) {
     }
     if (runId !== undefined)
         assertRunId(runId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         const promoted = withWriteScopeOr(db, 'complete_card', (rollback) => {
             const target = outcome === 'success' ? 'done' : 'shelved';
             const allowed = runId === undefined || isLiveRun(db, tenantId, id, runId);
@@ -383,38 +345,29 @@ export function completeCard(hippoRoot, tenantId, id, outcome, runId) {
             return target === 'done' ? promoteUnblockedChildren(db, tenantId, id) : [];
         });
         return promoted === null ? null : { card: loadCardRow(db, tenantId, id), promotedChildren: promoted };
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
 /** Moves to ready each backlog child of `parentId` whose parents are all done, and returns their ids. Call inside the write scope. */
 function promoteUnblockedChildren(db, tenantId, parentId) {
-    const promotedChildren = [];
-    // SAFETY: rows' shape matches the single `child` column named in the SELECT below.
-    const children = db.prepare(`SELECT child FROM card_deps WHERE tenant_id = ? AND parent = ?`).all(tenantId, parentId).map((r) => r.child);
-    for (const childId of children) {
-        // SAFETY: row's shape matches the single `status` column named in the SELECT below.
-        const child = db.prepare(`SELECT status FROM cards WHERE tenant_id = ? AND id = ?`).get(tenantId, childId);
-        if (!child || child.status !== 'backlog')
-            continue;
-        // SAFETY: rows' shape matches the single `parent` column named in the SELECT below.
-        const parents = db.prepare(`SELECT parent FROM card_deps WHERE tenant_id = ? AND child = ?`).all(tenantId, childId).map((r) => r.parent);
-        const placeholders = parents.map(() => '?').join(', ');
-        // SAFETY: row's shape matches the single `c` column named in the SELECT below.
-        const doneCount = db.prepare(`SELECT COUNT(*) as c FROM cards WHERE tenant_id = ? AND id IN (${placeholders}) AND status = 'done'`).get(tenantId, ...parents).c;
-        if (doneCount === parents.length) {
-            transitionCard(db, tenantId, childId, { from: ['backlog'], to: 'ready' });
-            promotedChildren.push(childId);
-        }
-    }
-    return promotedChildren;
+    // The child's status and its open parents are result columns, not joins, so the rows keep the order of a plain read of the parent's children.
+    // SAFETY: rows' shape matches the three columns named in the SELECT below.
+    const children = db.prepare(`
+    SELECT d.child AS child,
+      (SELECT c.status FROM cards c WHERE c.tenant_id = ? AND c.id = d.child) AS status,
+      (SELECT COUNT(*) FROM card_deps p WHERE p.tenant_id = ? AND p.child = d.child
+        AND NOT EXISTS (SELECT 1 FROM cards pc WHERE pc.tenant_id = ? AND pc.id = p.parent AND pc.status = 'done')) AS open_parents
+    FROM card_deps d WHERE d.tenant_id = ? AND d.parent = ?
+  `).all(tenantId, tenantId, tenantId, tenantId, parentId);
+    const unblocked = children.filter((r) => r.status === 'backlog' && r.open_parents === 0).map((r) => r.child);
+    for (const ids of chunked(unblocked))
+        transitionCards(db, tenantId, ids, { from: ['backlog'], to: 'ready' });
+    return unblocked;
 }
-/** Returns to ready every running card of the tenant whose lease has expired or is missing: clears its assignee, closes its live run as 'reclaimed' and leaves its handoffs alone, all in one write transaction. Returns the reclaimed card ids in id order. */
+/** Returns to ready every running card of the tenant whose lease has expired or is missing: clears its assignee, closes its live
+ * run as 'reclaimed' and leaves its handoffs alone, all in one write transaction. Returns the reclaimed card ids in id order. */
 export function reclaimExpiredCards(hippoRoot, tenantId) {
     assertTenantId('reclaimExpiredCards', tenantId);
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         return withWriteScope(db, 'reclaim_expired_cards', () => {
             // Read lease times under the write lock, so a heartbeat that committed while we waited wins.
             const now = new Date().toISOString();
@@ -430,10 +383,7 @@ export function reclaimExpiredCards(hippoRoot, tenantId) {
             }
             return ids;
         });
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
 /** Appends a comment to cardId in any card status; throws if cardId is not a card of this tenant. */
 export function addCardComment(hippoRoot, tenantId, cardId, author, body) {
@@ -441,12 +391,8 @@ export function addCardComment(hippoRoot, tenantId, cardId, author, body) {
     if (body.trim() === '') {
         throw new Error('body must not be empty');
     }
-    const db = openStore(hippoRoot);
-    try {
+    return onHandle(hippoRoot, (db) => {
         return insertCardComment(db, tenantId, cardId, author, body);
-    }
-    finally {
-        closeHippoDb(db);
-    }
+    }, openStore);
 }
 //# sourceMappingURL=cards.js.map

package/dist/store/conflicts.d.ts

@@ -23,16 +23,12 @@ type DetectedConflict = {
 };
 type SameTenant = (a: string, b: string) => boolean;
 export declare function replaceDetectedConflicts(hippoRoot: string, detected: Array<DetectedConflict>, detectedAt?: string): void;
-/** Every memory's tenant, and each stored conflicts_with_json other than '[]', read before the refresh takes the write lock. */
+/** The tenant of every memory the refresh can compare, and each stored conflicts_with_json other than '[]', read before the refresh takes the write lock. */
 export interface ConflictRefreshReads {
     sameTenant: SameTenant;
     storedRefs: ReadonlyMap<string, string | null>;
 }
-/**
- * AT1 (plan §5): additive-optional opts for resolveConflict.
- * `rejectLoserValue` implies removal of the loser regardless of
- * `forgetLoser` — you cannot tombstone a value and leave it live.
- */
+/** `rejectLoserValue` implies removal of the loser regardless of `forgetLoser`: a tombstoned value cannot stay live. */
 export interface ResolveConflictOpts {
     /** Tombstone the loser's normalized digest + kind-aware remove it. */
     rejectLoserValue?: boolean;
@@ -42,21 +38,8 @@ export interface ResolveConflictOpts {
      *  loser is kind='raw'). Defaults to a conflict-context string. */
     reason?: string;
 }
-/**
- * Resolve a conflict by keeping one memory and weakening the other.
- * Sets conflict status to 'resolved' and halves the loser's half-life.
- * If --forget is used, the loser is removed entirely (kind-aware: raw rows
- * are archived via archiveRawMemory, others deleted via deleteEntryCore —
- * AT1 fix for the pre-existing crash where a raw loser aborted the whole
- * resolve transaction against the append-only trigger). `opts.rejectLoserValue`
- * additionally tombstones the loser's normalized digest so it cannot be
- * re-asserted later.
- *
- * Every resolution path (weaken / forget / reject) emits a `conflict_resolve`
- * audit row (AT1 — previously resolveConflict wrote zero audit rows on any path).
- *
- * Returns the resolved conflict, or null if not found.
- */
+/** Resolve a conflict by keeping one memory and halving the loser's half-life; `--forget` removes the loser, `opts.rejectLoserValue` also tombstones its
+ * digest. Every path emits a `conflict_resolve` audit row. Returns the resolved conflict, or null if not found. */
 export declare function resolveConflict(hippoRoot: string, conflictId: number, keepId: string, forgetLoser?: boolean, tenantId?: string, opts?: ResolveConflictOpts): {
     conflict: MemoryConflict;
     loserId: string;