hikoutei 0.3.2 → 0.3.4

package/dist/infrastructure/storage/state/resolution/resolutionWriter.js

@@ -10,12 +10,13 @@ import { applyResolution } from "../../../../domain/index.js";
 import { CONFLICT_TRANSITION_KINDS } from "../../../../domain/conflict/transitions.js";
 import { LOOKUP_RESULT_KINDS, PRESENCE_KINDS, } from "../../../../shared/state/constants.js";
 import { STORAGE_ERROR_CODES, StorageError } from "../../errors.js";
-import { appendPendingEffectsWithSql, } from "../../sync/outbound/effectOutbox.js";
+import { appendPendingEffectsWithSql, supersedeAndReplanWithSql, } from "../../sync/outbound/effectOutbox.js";
+import { readMappedLatestProjectionEffectWithSql } from "../mapped/mappedPersistenceSql.js";
 import { fromSqlNullable } from "../../sqlite/sqlState.js";
 import { withSqlSavepoint } from "../../sqlite/sqlTransaction.js";
 import { fenceParameters, isFencingValidWithSql, } from "../../sync/shared/writerLease.js";
 import { PERSIST_RESOLUTION_RESULT_KINDS, RESOLUTION_COMMAND_STATUSES, } from "./resolutionWriterContracts.js";
-import { ADVANCE_ROW_BINDING_CANDIDATE_EPOCH_SQL, CLEAR_ACTIVE_CANDIDATE_POINTER_SQL, FIND_EXISTING_COMMAND_SQL, INSERT_PROCESSING_COMMAND_SQL, MARK_COMMAND_APPLIED_SQL, MARK_COMMAND_REJECTED_SQL, MARK_COMMAND_STALE_SQL, MARK_CONFLICT_RESOLVED_SQL, MARK_CONFLICT_STALE_SQL, READ_ACTIVE_CANDIDATE_POINTER_SQL, READ_CONFLICT_SQL, READ_EFFECT_DEDUPE_SQL, READ_REGISTERED_PROJECTION_SQL, } from "./resolutionWriterSql.js";
+import { ADVANCE_ROW_BINDING_CANDIDATE_EPOCH_SQL, CLEAR_ACTIVE_CANDIDATE_POINTER_SQL, FIND_EXISTING_COMMAND_SQL, INSERT_PROCESSING_COMMAND_SQL, INSERT_PENDING_COMMAND_SQL, MARK_PENDING_COMMAND_PROCESSING_SQL, MARK_COMMAND_APPLIED_SQL, MARK_COMMAND_REJECTED_SQL, MARK_COMMAND_STALE_SQL, MARK_CONFLICT_RESOLVED_SQL, MARK_CONFLICT_STALE_SQL, READ_ACTIVE_CANDIDATE_POINTER_SQL, READ_CONFLICT_SQL, READ_EFFECT_DEDUPE_SQL, READ_REGISTERED_PROJECTION_SQL, READ_PROCESSING_PREDECESSOR_SQL, } from "./resolutionWriterSql.js";
 import { assertCurrentFenceWithSql, FenceLostError, parseNormalizedCell, requireConflictStatus, } from "./resolutionWriterHelpers.js";
 export { PERSIST_RESOLUTION_RESULT_KINDS, RESOLUTION_COMMAND_STATUSES, } from "./resolutionWriterContracts.js";
 /**
@@ -32,7 +33,9 @@ export async function persistResolutionCommandWithSql(sql, fence, input) {
         return await withSqlSavepoint(sql, "persist_resolution_command", async () => {
             await assertCurrentFenceWithSql(sql, fence);
             const duplicate = await findExistingCommandWithSql(sql, input.command);
-            if (duplicate.kind === LOOKUP_RESULT_KINDS.FOUND) {
+            const pendingCommand = duplicate.kind === LOOKUP_RESULT_KINDS.FOUND &&
+                duplicate.value.status === RESOLUTION_COMMAND_STATUSES.PENDING;
+            if (duplicate.kind === LOOKUP_RESULT_KINDS.FOUND && !pendingCommand) {
                 const duplicateResult = duplicate.value;
                 // A durable processing receipt already owns the request. Only a terminal
                 // replay may consume a still-checked control with a reset projection.
@@ -50,7 +53,27 @@ export async function persistResolutionCommandWithSql(sql, fence, input) {
                 };
             }
             const conflict = conflictResult.value;
-            await insertProcessingCommandWithSql(sql, fence, input);
+            const processingPredecessor = await findProcessingPredecessorWithSql(sql, input.effects);
+            if (processingPredecessor !== undefined) {
+                // Do not resolve the conflict while an older remote write is still in
+                // flight. The late response could materialize after the system-wins
+                // effect and overwrite the value that the resolution just selected.
+                // Keep a pending command receipt so the next polling pass can retry the
+                // exact CAS request after the predecessor has settled.
+                await insertPendingCommandWithSql(sql, fence, input);
+                return {
+                    kind: PERSIST_RESOLUTION_RESULT_KINDS.DEFERRED,
+                    commandId: input.command.commandId,
+                    conflictId: conflict.conflictId,
+                    reason: "processing_predecessor",
+                };
+            }
+            if (pendingCommand) {
+                await markPendingCommandProcessingWithSql(sql, fence, input.command.commandId, input.command.requestKey);
+            }
+            else {
+                await insertProcessingCommandWithSql(sql, fence, input);
+            }
             const pointerResult = await readActiveCandidatePointerWithSql(sql, conflict);
             const transition = pointerResult.kind === LOOKUP_RESULT_KINDS.FOUND &&
                 pointerResult.value.candidate_epoch === input.command.expectedCandidateEpoch &&
@@ -161,8 +184,16 @@ function sameCommandIdentity(existing, command) {
         existing.expected_candidate_epoch === command.expectedCandidateEpoch &&
         existing.payload_hash === command.payloadHash;
 }
+/** Reads all conflict IDs for one logical entity sheet. */
+export function readConflictIdsWithSql(sql, logicalSheetId) {
+    return sql.all("SELECT conflict_id FROM sync_conflict WHERE logical_sheet_id = ? ORDER BY created_at, conflict_id", [logicalSheetId]).then((rows) => rows.map((row) => row.conflict_id));
+}
+/** Reads unresolved conflict IDs for one logical entity sheet. */
+export function readOpenConflictIdsWithSql(sql, logicalSheetId) {
+    return sql.all("SELECT conflict_id FROM sync_conflict WHERE logical_sheet_id = ? AND status IN ('OPEN', 'NEEDS_REBASE') ORDER BY created_at, conflict_id", [logicalSheetId]).then((rows) => rows.map((row) => row.conflict_id));
+}
 /** Reads and validates one conflict record through the active async SQL transaction. */
-async function readConflictWithSql(sql, logicalSheetId, conflictId) {
+export async function readConflictWithSql(sql, logicalSheetId, conflictId) {
     const row = await sql.get(READ_CONFLICT_SQL, [logicalSheetId, conflictId]);
     if (row === undefined)
         return { kind: LOOKUP_RESULT_KINDS.NOT_FOUND };
@@ -225,6 +256,41 @@ async function insertProcessingCommandWithSql(sql, fence, input) {
     if (result.changes !== 1)
         throw new FenceLostError();
 }
+/** Stores a deferred command as durable pending work without changing conflict state. */
+async function insertPendingCommandWithSql(sql, fence, input) {
+    const command = input.command;
+    const result = await sql.run(INSERT_PENDING_COMMAND_SQL, [
+        command.commandId,
+        command.requestKey,
+        command.action,
+        command.actorId,
+        command.role,
+        command.targetConflictId,
+        command.expectedRevision,
+        command.activeCandidateHash,
+        command.expectedCandidateEpoch,
+        command.payloadHash,
+        fence.now,
+        command.commandId,
+        command.requestKey,
+        ...fenceParameters(fence),
+    ]);
+    if (result.changes === 1)
+        return;
+    if (result.changes === 0 && await isFencingValidWithSql(sql, fence))
+        return;
+    throw new FenceLostError();
+}
+/** Claims a pending deferred command after its processing predecessor settles. */
+async function markPendingCommandProcessingWithSql(sql, fence, commandId, requestKey) {
+    const result = await sql.run(MARK_PENDING_COMMAND_PROCESSING_SQL, [
+        commandId,
+        requestKey,
+        ...fenceParameters(fence),
+    ]);
+    if (result.changes !== 1)
+        throw new FenceLostError();
+}
 /** Applies a resolved transition, pointer clear, effects, and receipt through active async SQL. */
 async function applyResolvedCommandWithSql(sql, fence, input, conflict, pointer) {
     const command = input.command;
@@ -294,33 +360,53 @@ async function markRejectedCommandWithSql(sql, fence, input) {
     await appendResolutionEffectsWithSql(sql, fence, input.rejectedEffects ?? []);
 }
 /** Registers unseen resolution effects through the active async SQL transaction. */
-async function appendResolutionEffectsWithSql(sql, fence, effects) {
+export async function appendResolutionEffectsWithSql(sql, fence, effects) {
     if (effects.length === 0)
         return;
     await ensureResolutionEffectsRegisteredWithSql(sql, effects);
-    const unseen = [];
     for (const effect of effects) {
         const existing = await sql.get(READ_EFFECT_DEDUPE_SQL, [
             effect.effectDedupeKey,
         ]);
-        if (existing === undefined) {
-            unseen.push(effect);
+        if (existing !== undefined) {
+            if (existing.effect_kind !== effect.effectKind ||
+                existing.commit_id !== effect.commitId ||
+                existing.logical_sheet_id !== effect.logicalSheetId ||
+                existing.physical_sheet_id !== effect.physicalSheetId ||
+                existing.projection !== effect.projection ||
+                existing.target_kind !== effect.targetKind ||
+                existing.target_id !== effect.targetId ||
+                existing.payload_hash !== effect.payloadHash) {
+                throw new StorageError(STORAGE_ERROR_CODES.RESOLUTION_EFFECT_CONFLICT, "resolution effect dedupe key was reused with a different payload");
+            }
+            continue;
+        }
+        const processingPredecessor = await findProcessingPredecessorWithSql(sql, [effect]);
+        if (processingPredecessor !== undefined) {
+            throw new StorageError(STORAGE_ERROR_CODES.EFFECT_REPLAN_CONFLICT, `effect ${effect.effectId} cannot replace processing predecessor ${processingPredecessor}`);
+        }
+        const predecessor = await readMappedLatestProjectionEffectWithSql(sql, effect.logicalSheetId, effect.targetKind, effect.targetId);
+        if (predecessor !== undefined &&
+            (predecessor.status === "pending" ||
+                predecessor.status === "blocked_candidate" ||
+                predecessor.status === "conflict" ||
+                predecessor.status === "failed")) {
+            await supersedeAndReplanWithSql(sql, fence, predecessor.effect_id, effect);
             continue;
         }
-        if (existing.effect_kind !== effect.effectKind ||
-            existing.commit_id !== effect.commitId ||
-            existing.logical_sheet_id !== effect.logicalSheetId ||
-            existing.physical_sheet_id !== effect.physicalSheetId ||
-            existing.projection !== effect.projection ||
-            existing.target_kind !== effect.targetKind ||
-            existing.target_id !== effect.targetId ||
-            existing.payload_hash !== effect.payloadHash) {
-            throw new StorageError(STORAGE_ERROR_CODES.RESOLUTION_EFFECT_CONFLICT, "resolution effect dedupe key was reused with a different payload");
+        if (!(await appendPendingEffectsWithSql(sql, fence, [effect]))) {
+            throw new FenceLostError();
         }
     }
-    if (unseen.length > 0 && !(await appendPendingEffectsWithSql(sql, fence, unseen))) {
-        throw new FenceLostError();
+}
+/** Finds processing predecessors that must finish before a replacement is planned. */
+async function findProcessingPredecessorWithSql(sql, effects) {
+    for (const effect of effects) {
+        const row = await sql.get(READ_PROCESSING_PREDECESSOR_SQL, [effect.logicalSheetId, effect.targetKind, effect.targetId, effect.streamSequence]);
+        if (row !== undefined)
+            return row.effect_id;
     }
+    return undefined;
 }
 /** Validates every resolution effect target through the active async SQL transaction. */
 async function ensureResolutionEffectsRegisteredWithSql(sql, effects) {

package/dist/infrastructure/storage/state/resolution/resolutionWriter.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolutionWriter.js","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolutionWriter.js","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriter.ts"],"names":[],"mappings":"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"}

package/dist/infrastructure/storage/state/resolution/resolutionWriterContracts.d.ts

@@ -3,6 +3,8 @@ import type { ResolutionCommand } from "../../../../domain/index.js";
 import type { NewEffect } from "../../sync/outbound/effectOutbox.js";
 /** Runtime values for the durable resolution-command lifecycle. */
 export declare const RESOLUTION_COMMAND_STATUSES: {
+    /** A durable command waiting for an in-flight predecessor to settle. */
+    readonly PENDING: "pending";
     readonly PROCESSING: "processing";
     readonly APPLIED: "applied";
     readonly STALE: "stale";
@@ -14,6 +16,7 @@ export type ResolutionCommandStatus = (typeof RESOLUTION_COMMAND_STATUSES)[keyof
 /** Runtime values for results returned by the resolution writer. */
 export declare const PERSIST_RESOLUTION_RESULT_KINDS: {
     readonly FENCED_OUT: "fenced_out";
+    readonly DEFERRED: "deferred";
     readonly APPLIED: "applied";
     readonly STALE: "stale";
     readonly REJECTED: "rejected";
@@ -42,9 +45,14 @@ export interface PersistResolutionCommandInput {
      */
     readonly duplicateEffects?: readonly NewEffect[];
 }
-/** Terminal or replay-visible result of a resolution command transaction. */
+/** Result of a resolution command transaction, including safe in-flight deferral. */
 export type PersistResolutionCommandResult = {
     readonly kind: typeof PERSIST_RESOLUTION_RESULT_KINDS.FENCED_OUT;
+} | {
+    readonly kind: typeof PERSIST_RESOLUTION_RESULT_KINDS.DEFERRED;
+    readonly commandId: string;
+    readonly conflictId: string;
+    readonly reason: "processing_predecessor";
 } | {
     readonly kind: typeof PERSIST_RESOLUTION_RESULT_KINDS.APPLIED;
     readonly commandId: string;

package/dist/infrastructure/storage/state/resolution/resolutionWriterContracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolutionWriterContracts.d.ts","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriterContracts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolutionWriterContracts.d.ts","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriterContracts.ts"],"names":[],"mappings":"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"}

package/dist/infrastructure/storage/state/resolution/resolutionWriterContracts.js

@@ -1,6 +1,8 @@
 /** Status, command, row, and SQL-result contracts for resolution persistence. */
 /** Runtime values for the durable resolution-command lifecycle. */
 export const RESOLUTION_COMMAND_STATUSES = {
+    /** A durable command waiting for an in-flight predecessor to settle. */
+    PENDING: "pending",
     PROCESSING: "processing",
     APPLIED: "applied",
     STALE: "stale",
@@ -10,6 +12,7 @@ export const RESOLUTION_COMMAND_STATUSES = {
 /** Runtime values for results returned by the resolution writer. */
 export const PERSIST_RESOLUTION_RESULT_KINDS = {
     FENCED_OUT: "fenced_out",
+    DEFERRED: "deferred",
     APPLIED: "applied",
     STALE: "stale",
     REJECTED: "rejected",

package/dist/infrastructure/storage/state/resolution/resolutionWriterContracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolutionWriterContracts.js","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriterContracts.ts"],"names":[],"mappings":"AAAA,iFAAiF;AAKjF,mEAAmE;AACnE,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,UAAU,EAAE,YAAY;IACxB,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;CACR,CAAC;AAMX,oEAAoE;AACpE,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,UAAU,EAAE,YAAY;IACxB,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;CACd,CAAC"}
+{"version":3,"file":"resolutionWriterContracts.js","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriterContracts.ts"],"names":[],"mappings":"AAAA,iFAAiF;AAKjF,mEAAmE;AACnE,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,wEAAwE;IACxE,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,YAAY;IACxB,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;CACR,CAAC;AAMX,oEAAoE;AACpE,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,UAAU,EAAE,YAAY;IACxB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;CACd,CAAC"}

package/dist/infrastructure/storage/state/resolution/resolutionWriterSql.d.ts

@@ -4,6 +4,10 @@ export declare const FIND_EXISTING_COMMAND_SQL = "\n  SELECT command_id, request
 export declare const READ_CONFLICT_SQL = "\n  SELECT conflict_id, conflict_group_id, event_id, row_binding_id, entity_id, field_name,\n         user_value, user_base_revision, canonical_value_at_detection,\n         canonical_revision_at_detection, current_canonical_value,\n         current_canonical_revision, candidate_epoch, status, resolution_command_id\n  FROM sync_conflict\n  WHERE logical_sheet_id = ? AND conflict_id = ?\n";
 export declare const READ_ACTIVE_CANDIDATE_POINTER_SQL = "\n  SELECT physical_sheet_id, projection, candidate_epoch, active_candidate_hash\n  FROM sheet_visible_field_state\n  WHERE row_binding_id = ? AND field_name = ?\n    AND active_candidate_conflict_id = ?\n    AND active_candidate_hash IS NOT NULL\n";
 export declare const INSERT_PROCESSING_COMMAND_SQL = "\n  INSERT INTO resolution_command (\n    command_id, request_key, action, actor_id, role, target_conflict_id,\n    expected_revision, active_candidate_hash, expected_candidate_epoch,\n    payload_hash, status, issued_at\n  )\n  SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'processing', ?\n  WHERE EXISTS (\n  SELECT 1 FROM writer_lease\n  WHERE role = ? AND writer_epoch = ? AND fencing_token = ? AND lease_until > ?\n)\n";
+/** Records a deferred automatic resolution without claiming it for execution. */
+export declare const INSERT_PENDING_COMMAND_SQL = "\n  INSERT INTO resolution_command (\n    command_id, request_key, action, actor_id, role, target_conflict_id,\n    expected_revision, active_candidate_hash, expected_candidate_epoch,\n    payload_hash, status, issued_at\n  )\n  SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'pending', ?\n  WHERE NOT EXISTS (\n    SELECT 1 FROM resolution_command\n    WHERE command_id = ? OR request_key = ?\n  )\n    AND EXISTS (\n  SELECT 1 FROM writer_lease\n  WHERE role = ? AND writer_epoch = ? AND fencing_token = ? AND lease_until > ?\n)\n";
+/** Promotes a durable deferred command only after its predecessor is gone. */
+export declare const MARK_PENDING_COMMAND_PROCESSING_SQL = "\n  UPDATE resolution_command\n  SET status = 'processing'\n  WHERE command_id = ? AND request_key = ? AND status = 'pending'\n    AND EXISTS (\n  SELECT 1 FROM writer_lease\n  WHERE role = ? AND writer_epoch = ? AND fencing_token = ? AND lease_until > ?\n)\n";
 export declare const MARK_CONFLICT_RESOLVED_SQL = "\n  UPDATE sync_conflict\n  SET status = 'RESOLVED', resolution_command_id = ?, updated_at = ?\n  WHERE conflict_id = ? AND status IN ('OPEN', 'NEEDS_REBASE')\n    AND current_canonical_revision = ? AND candidate_epoch = ?\n    AND EXISTS (\n  SELECT 1 FROM writer_lease\n  WHERE role = ? AND writer_epoch = ? AND fencing_token = ? AND lease_until > ?\n)\n";
 export declare const CLEAR_ACTIVE_CANDIDATE_POINTER_SQL = "\n  UPDATE sheet_visible_field_state\n  SET active_candidate_conflict_id = NULL, active_candidate_hash = NULL,\n      candidate_epoch = candidate_epoch + 1\n  WHERE physical_sheet_id = ? AND projection = ?\n    AND row_binding_id = ? AND field_name = ?\n    AND active_candidate_conflict_id = ? AND candidate_epoch = ?\n    AND EXISTS (\n  SELECT 1 FROM writer_lease\n  WHERE role = ? AND writer_epoch = ? AND fencing_token = ? AND lease_until > ?\n)\n";
 export declare const ADVANCE_ROW_BINDING_CANDIDATE_EPOCH_SQL = "\n  UPDATE row_binding\n  SET candidate_epoch = CASE\n    WHEN candidate_epoch <= ? THEN ?\n    ELSE candidate_epoch\n  END\n  WHERE row_binding_id = ? AND logical_sheet_id = ?\n    AND EXISTS (\n  SELECT 1 FROM writer_lease\n  WHERE role = ? AND writer_epoch = ? AND fencing_token = ? AND lease_until > ?\n)\n";
@@ -13,4 +17,11 @@ export declare const MARK_COMMAND_STALE_SQL = "\n  UPDATE resolution_command\n
 export declare const MARK_COMMAND_REJECTED_SQL = "\n  UPDATE resolution_command\n  SET status = 'rejected'\n  WHERE command_id = ? AND status = 'processing'\n    AND EXISTS (\n  SELECT 1 FROM writer_lease\n  WHERE role = ? AND writer_epoch = ? AND fencing_token = ? AND lease_until > ?\n)\n";
 export declare const READ_EFFECT_DEDUPE_SQL = "\n  SELECT effect_kind, commit_id, logical_sheet_id, physical_sheet_id,\n         projection, target_kind, target_id, payload_hash\n  FROM sheet_effect_outbox\n  WHERE effect_dedupe_key = ?\n";
 export declare const READ_REGISTERED_PROJECTION_SQL = "\n  SELECT logical_sheet_id, projection, enabled\n  FROM physical_sheet_registry\n  WHERE physical_sheet_id = ?\n";
+/**
+ * Finds an in-flight predecessor that could still materialize after a
+ * replacement. `delivery_uncertain` counts as in-flight because the remote
+ * write may still commit after a lost response; resolution successors must
+ * wait until that predecessor is probe-settled.
+ */
+export declare const READ_PROCESSING_PREDECESSOR_SQL = "\n  SELECT effect_id\n  FROM sheet_effect_outbox\n  WHERE logical_sheet_id = ? AND target_kind = ? AND target_id = ?\n    AND stream_sequence < ? AND status IN ('processing', 'delivery_uncertain')\n  ORDER BY stream_sequence\n  LIMIT 1\n";
 //# sourceMappingURL=resolutionWriterSql.d.ts.map

package/dist/infrastructure/storage/state/resolution/resolutionWriterSql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolutionWriterSql.d.ts","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriterSql.ts"],"names":[],"mappings":"AAAA,sEAAsE;AAItE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,eAAO,MAAM,yBAAyB,yQAMrC,CAAC;AAEF,eAAO,MAAM,iBAAiB,2YAO7B,CAAC;AAEF,eAAO,MAAM,iCAAiC,6PAM7C,CAAC;AAEF,eAAO,MAAM,6BAA6B,oaAQzC,CAAC;AAEF,eAAO,MAAM,0BAA0B,yWAMtC,CAAC;AAEF,eAAO,MAAM,kCAAkC,ycAQ9C,CAAC;AAEF,eAAO,MAAM,uCAAuC,2TAQnD,CAAC;AAEF,eAAO,MAAM,wBAAwB,2QAKpC,CAAC;AAEF,eAAO,MAAM,uBAAuB,qQAKnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,kPAKlC,CAAC;AAEF,eAAO,MAAM,yBAAyB,qPAKrC,CAAC;AAEF,eAAO,MAAM,sBAAsB,oMAKlC,CAAC;AAEF,eAAO,MAAM,8BAA8B,sHAI1C,CAAC"}
+{"version":3,"file":"resolutionWriterSql.d.ts","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriterSql.ts"],"names":[],"mappings":"AAAA,sEAAsE;AAItE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,eAAO,MAAM,yBAAyB,yQAMrC,CAAC;AAEF,eAAO,MAAM,iBAAiB,2YAO7B,CAAC;AAEF,eAAO,MAAM,iCAAiC,6PAM7C,CAAC;AAEF,eAAO,MAAM,6BAA6B,oaAQzC,CAAC;AAEF,iFAAiF;AACjF,eAAO,MAAM,0BAA0B,+gBAYtC,CAAC;AAEF,8EAA8E;AAC9E,eAAO,MAAM,mCAAmC,wQAK/C,CAAC;AAEF,eAAO,MAAM,0BAA0B,yWAMtC,CAAC;AAEF,eAAO,MAAM,kCAAkC,ycAQ9C,CAAC;AAEF,eAAO,MAAM,uCAAuC,2TAQnD,CAAC;AAEF,eAAO,MAAM,wBAAwB,2QAKpC,CAAC;AAEF,eAAO,MAAM,uBAAuB,qQAKnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,kPAKlC,CAAC;AAEF,eAAO,MAAM,yBAAyB,qPAKrC,CAAC;AAEF,eAAO,MAAM,sBAAsB,oMAKlC,CAAC;AAEF,eAAO,MAAM,8BAA8B,sHAI1C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,+BAA+B,kPAO3C,CAAC"}

package/dist/infrastructure/storage/state/resolution/resolutionWriterSql.js

@@ -32,6 +32,27 @@ export const INSERT_PROCESSING_COMMAND_SQL = `
   SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'processing', ?
   WHERE EXISTS (${FENCE_EXISTS_SQL})
 `;
+/** Records a deferred automatic resolution without claiming it for execution. */
+export const INSERT_PENDING_COMMAND_SQL = `
+  INSERT INTO resolution_command (
+    command_id, request_key, action, actor_id, role, target_conflict_id,
+    expected_revision, active_candidate_hash, expected_candidate_epoch,
+    payload_hash, status, issued_at
+  )
+  SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'pending', ?
+  WHERE NOT EXISTS (
+    SELECT 1 FROM resolution_command
+    WHERE command_id = ? OR request_key = ?
+  )
+    AND EXISTS (${FENCE_EXISTS_SQL})
+`;
+/** Promotes a durable deferred command only after its predecessor is gone. */
+export const MARK_PENDING_COMMAND_PROCESSING_SQL = `
+  UPDATE resolution_command
+  SET status = 'processing'
+  WHERE command_id = ? AND request_key = ? AND status = 'pending'
+    AND EXISTS (${FENCE_EXISTS_SQL})
+`;
 export const MARK_CONFLICT_RESOLVED_SQL = `
   UPDATE sync_conflict
   SET status = 'RESOLVED', resolution_command_id = ?, updated_at = ?
@@ -92,4 +113,18 @@ export const READ_REGISTERED_PROJECTION_SQL = `
   FROM physical_sheet_registry
   WHERE physical_sheet_id = ?
 `;
+/**
+ * Finds an in-flight predecessor that could still materialize after a
+ * replacement. `delivery_uncertain` counts as in-flight because the remote
+ * write may still commit after a lost response; resolution successors must
+ * wait until that predecessor is probe-settled.
+ */
+export const READ_PROCESSING_PREDECESSOR_SQL = `
+  SELECT effect_id
+  FROM sheet_effect_outbox
+  WHERE logical_sheet_id = ? AND target_kind = ? AND target_id = ?
+    AND stream_sequence < ? AND status IN ('processing', 'delivery_uncertain')
+  ORDER BY stream_sequence
+  LIMIT 1
+`;
 //# sourceMappingURL=resolutionWriterSql.js.map

package/dist/infrastructure/storage/state/resolution/resolutionWriterSql.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolutionWriterSql.js","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriterSql.ts"],"names":[],"mappings":"AAAA,sEAAsE;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;;;CAMxC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG;;;;;;;CAOhC,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAG;;;;;;CAMhD,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG;;;;;;;kBAO3B,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG;;;;;kBAKxB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG;;;;;;;kBAOhC,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,uCAAuC,GAAG;;;;;;;kBAOrC,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG;;;;kBAItB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG;;;;kBAIrB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG;;;;kBAIpB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;kBAIvB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG;;;;;CAKrC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG;;;;CAI7C,CAAC"}
+{"version":3,"file":"resolutionWriterSql.js","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/state/resolution/resolutionWriterSql.ts"],"names":[],"mappings":"AAAA,sEAAsE;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;;;CAMxC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG;;;;;;;CAOhC,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAG;;;;;;CAMhD,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG;;;;;;;kBAO3B,gBAAgB;CACjC,CAAC;AAEF,iFAAiF;AACjF,MAAM,CAAC,MAAM,0BAA0B,GAAG;;;;;;;;;;;kBAWxB,gBAAgB;CACjC,CAAC;AAEF,8EAA8E;AAC9E,MAAM,CAAC,MAAM,mCAAmC,GAAG;;;;kBAIjC,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG;;;;;kBAKxB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG;;;;;;;kBAOhC,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,uCAAuC,GAAG;;;;;;;kBAOrC,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG;;;;kBAItB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG;;;;kBAIrB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG;;;;kBAIpB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;kBAIvB,gBAAgB;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG;;;;;CAKrC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG;;;;CAI7C,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG;;;;;;;CAO9C,CAAC"}

package/dist/infrastructure/storage/sync/outbound/effectOutbox.d.ts

@@ -9,9 +9,9 @@
  */
 import type { FencingContext } from "../shared/writerLease.js";
 import { type SqlExecutor, type SqlStorageAdapter } from "../../../../adapter/persistence/contracts/sql.js";
-import type { ApplyResultOptions, ClaimEffectOptions, ClaimResult, NewEffect, PendingEffect, RetryClaimedEffectOptions } from "./effectOutboxContracts.js";
+import type { ApplyResultOptions, ClaimEffectOptions, ClaimResult, MarkDeliveryUncertainOptions, NewEffect, RenewEffectLeaseOptions, PendingEffect, RetryClaimedEffectOptions } from "./effectOutboxContracts.js";
 export { SYNC_EFFECT_RECOVERY_ERROR_CODES } from "./effectOutboxContracts.js";
-export type { AppliedEffectResultOptions, ApplyResultOptions, ClaimEffectOptions, ClaimResult, NonAppliedEffectResultOptions, EffectProjectionConfirmation, NewEffect, PendingEffect, RetryClaimedEffectOptions, } from "./effectOutboxContracts.js";
+export type { AppliedEffectResultOptions, ApplyResultOptions, ClaimEffectOptions, ClaimResult, NonAppliedEffectResultOptions, RenewEffectLeaseOptions, EffectProjectionConfirmation, MarkDeliveryUncertainOptions, NewEffect, PendingEffect, RetryClaimedEffectOptions, } from "./effectOutboxContracts.js";
 /**
  * Claims a pending effect through an already-active async SQL context.
  *
@@ -21,6 +21,10 @@ export type { AppliedEffectResultOptions, ApplyResultOptions, ClaimEffectOptions
 export declare function claimEffectWithSql(sql: SqlExecutor, options: ClaimEffectOptions): Promise<ClaimResult>;
 /** Claims one effect inside an adapter-owned transaction. */
 export declare function claimEffectWithAdapter(storage: SqlStorageAdapter, options: ClaimEffectOptions): Promise<ClaimResult>;
+/** Renews a processing effect only while the current writer fence and claim still match. */
+export declare function renewEffectLeaseWithSql(sql: SqlExecutor, options: RenewEffectLeaseOptions): Promise<boolean>;
+/** Renews one claimed effect through an adapter-owned transaction. */
+export declare function renewEffectLeaseWithAdapter(storage: SqlStorageAdapter, options: RenewEffectLeaseOptions): Promise<boolean>;
 /**
  * Appends pending effects under the supplied writer fence.
  *
@@ -73,6 +77,10 @@ export declare function supersedeAndReplanWithAdapter(storage: SqlStorageAdapter
 export declare function recoverExpiredLeasesWithSql(sql: SqlExecutor, fence: FencingContext): Promise<number>;
 /** Marks expired effect leases inside an adapter-owned transaction. */
 export declare function recoverExpiredLeasesWithAdapter(storage: SqlStorageAdapter, fence: FencingContext): Promise<number>;
+/** Moves a claimed effect into durable ambiguous-delivery recovery. */
+export declare function markDeliveryUncertainWithSql(sql: SqlExecutor, options: MarkDeliveryUncertainOptions): Promise<boolean>;
+/** Moves one claimed effect into durable ambiguous-delivery recovery. */
+export declare function markDeliveryUncertainWithAdapter(storage: SqlStorageAdapter, options: MarkDeliveryUncertainOptions): Promise<boolean>;
 /**
  * Returns an acknowledged-but-unprocessed batch suffix to pending.
  *
@@ -110,9 +118,9 @@ export declare function findPendingEffectsByTargetWithAdapter(storage: SqlStorag
  * safely race this advisory selection without processing a later stream item.
  */
 /** Reads bounded head-of-line effects through an already-active async SQL context. */
-export declare function listReadyEffectsWithSql(sql: SqlExecutor, limit: number): Promise<readonly PendingEffect[]>;
+export declare function listReadyEffectsWithSql(sql: SqlExecutor, limit: number, now?: number): Promise<readonly PendingEffect[]>;
 /** Reads bounded head-of-line effects through a fresh adapter read context. */
-export declare function listReadyEffectsWithAdapter(storage: SqlStorageAdapter, limit: number): Promise<readonly PendingEffect[]>;
+export declare function listReadyEffectsWithAdapter(storage: SqlStorageAdapter, limit: number, now?: number): Promise<readonly PendingEffect[]>;
 /** Returns whether normal outbox work is still pending or actively processing. */
 /** Checks whether the durable outbox still has pending or processing work. */
 export declare function hasPendingOrProcessingEffectsWithSql(sql: SqlExecutor): Promise<boolean>;

package/dist/infrastructure/storage/sync/outbound/effectOutbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"effectOutbox.d.ts","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/sync/outbound/effectOutbox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"effectOutbox.d.ts","sourceRoot":"","sources":["../../../../../src/infrastructure/storage/sync/outbound/effectOutbox.ts"],"names":[],"mappings":"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"}

package/dist/infrastructure/storage/sync/outbound/effectOutbox.js

@@ -11,8 +11,8 @@ import { STORAGE_ERROR_CODES, StorageError } from "../../errors.js";
 import { withSqlSavepoint } from "../../sqlite/sqlTransaction.js";
 import { fenceParameters, isFencingValidWithSql, } from "../shared/writerLease.js";
 import { decodeSqlRows, } from "../../../../adapter/persistence/contracts/sql.js";
-import { APPLY_EFFECT_RESULT_SQL, CLAIM_EFFECT_SQL, COUNT_PENDING_OR_PROCESSING_EFFECTS_SQL, INSERT_PENDING_EFFECT_SQL, INSERT_REPLANNED_EFFECT_SQL, RECOVER_EXPIRED_LEASES_SQL, REQUEUE_CLAIMED_EFFECT_SQL, RELEASE_UNPROCESSED_EFFECT_SQL, SELECT_PENDING_EFFECTS_BY_TARGET_SQL, SELECT_READY_EFFECTS_SQL, SUPERSEDE_EFFECT_SQL, } from "./effectOutboxSql.js";
-import { applyEffectResultParameters, assertProjectionConfirmationTargetWithSql, AsyncFenceLostError, claimEffectParameters, decodePendingEffectRow, pendingEffectParameters, replannedEffectParameters, requireCurrentFenceWithSql, validateApplyResultOptions, validateEffectLeaseDuration, validateReadyEffectLimit, writeProjectionConfirmationWithSql, } from "./effectOutboxSupport.js";
+import { APPLY_EFFECT_RESULT_SQL, CLAIM_EFFECT_SQL, COUNT_PENDING_OR_PROCESSING_EFFECTS_SQL, INSERT_PENDING_EFFECT_SQL, INSERT_REPLANNED_EFFECT_SQL, MARK_DELIVERY_UNCERTAIN_SQL, RECOVER_EXPIRED_LEASES_SQL, RENEW_EFFECT_LEASE_SQL, REQUEUE_CLAIMED_EFFECT_SQL, RELEASE_UNPROCESSED_EFFECT_SQL, SELECT_PENDING_EFFECTS_BY_TARGET_SQL, SELECT_READY_EFFECTS_SQL, SUPERSEDE_EFFECT_SQL, } from "./effectOutboxSql.js";
+import { applyEffectResultParameters, assertProjectionConfirmationTargetWithSql, AsyncFenceLostError, claimEffectParameters, decodePendingEffectRow, pendingEffectParameters, markDeliveryUncertainParameters, replannedEffectParameters, requireCurrentFenceWithSql, retryClaimedEffectParameters, validateApplyResultOptions, validateEffectLeaseDuration, validateReadyEffectLimit, writeProjectionConfirmationWithSql, } from "./effectOutboxSupport.js";
 export { SYNC_EFFECT_RECOVERY_ERROR_CODES } from "./effectOutboxContracts.js";
 /**
  * Claims a pending effect through an already-active async SQL context.
@@ -49,6 +49,25 @@ export async function claimEffectWithSql(sql, options) {
 export async function claimEffectWithAdapter(storage, options) {
     return storage.transaction(({ sql }) => claimEffectWithSql(sql, options));
 }
+/** Renews a processing effect only while the current writer fence and claim still match. */
+export async function renewEffectLeaseWithSql(sql, options) {
+    if (!(await isFencingValidWithSql(sql, options)))
+        return false;
+    validateEffectLeaseDuration(options.leaseDurationMs);
+    const result = await sql.run(RENEW_EFFECT_LEASE_SQL, [
+        options.now + options.leaseDurationMs,
+        options.effectId,
+        options.claimToken,
+        options.writerEpoch,
+        options.now,
+        ...fenceParameters(options),
+    ]);
+    return result.changes === 1;
+}
+/** Renews one claimed effect through an adapter-owned transaction. */
+export async function renewEffectLeaseWithAdapter(storage, options) {
+    return storage.transaction(({ sql }) => renewEffectLeaseWithSql(sql, options));
+}
 /**
  * Appends pending effects under the supplied writer fence.
  *
@@ -165,6 +184,8 @@ export async function supersedeAndReplanWithAdapter(storage, fence, oldEffectId,
 export async function recoverExpiredLeasesWithSql(sql, fence) {
     await requireCurrentFenceWithSql(sql, fence);
     const result = await sql.run(RECOVER_EXPIRED_LEASES_SQL, [
+        fence.now,
+        fence.now,
         fence.now,
         ...fenceParameters(fence),
     ]);
@@ -174,6 +195,20 @@ export async function recoverExpiredLeasesWithSql(sql, fence) {
 export async function recoverExpiredLeasesWithAdapter(storage, fence) {
     return storage.transaction(({ sql }) => recoverExpiredLeasesWithSql(sql, fence));
 }
+/** Moves a claimed effect into durable ambiguous-delivery recovery. */
+export async function markDeliveryUncertainWithSql(sql, options) {
+    if (!(await isFencingValidWithSql(sql, options)))
+        return false;
+    if (options.nextProbeAt < options.uncertainSince || options.uncertainSince < 0) {
+        throw new StorageError(STORAGE_ERROR_CODES.INVALID_EFFECT_OPTIONS, "uncertain delivery timestamps must be ordered non-negative values");
+    }
+    const result = await sql.run(MARK_DELIVERY_UNCERTAIN_SQL, markDeliveryUncertainParameters(options));
+    return result.changes === 1;
+}
+/** Moves one claimed effect into durable ambiguous-delivery recovery. */
+export async function markDeliveryUncertainWithAdapter(storage, options) {
+    return storage.transaction(({ sql }) => markDeliveryUncertainWithSql(sql, options));
+}
 /**
  * Returns an acknowledged-but-unprocessed batch suffix to pending.
  *
@@ -186,6 +221,7 @@ export async function releaseUnprocessedEffectWithSql(sql, options) {
     if (!(await isFencingValidWithSql(sql, options)))
         return false;
     const result = await sql.run(RELEASE_UNPROCESSED_EFFECT_SQL, [
+        options.now + 1_000,
         options.effectId,
         options.claimToken,
         options.writerEpoch,
@@ -203,15 +239,7 @@ export async function releaseUnprocessedEffectWithAdapter(storage, options) {
 export async function retryClaimedEffectWithSql(sql, options) {
     if (!(await isFencingValidWithSql(sql, options)))
         return false;
-    const result = await sql.run(REQUEUE_CLAIMED_EFFECT_SQL, [
-        options.lastErrorCode,
-        options.lastErrorMessage,
-        options.effectId,
-        options.claimToken,
-        options.writerEpoch,
-        options.now,
-        ...fenceParameters(options),
-    ]);
+    const result = await sql.run(REQUEUE_CLAIMED_EFFECT_SQL, retryClaimedEffectParameters(options));
     return result.changes === 1;
 }
 /** Requeues a claimed effect inside an adapter-owned transaction. */
@@ -244,14 +272,17 @@ export async function findPendingEffectsByTargetWithAdapter(storage, logicalShee
  * safely race this advisory selection without processing a later stream item.
  */
 /** Reads bounded head-of-line effects through an already-active async SQL context. */
-export async function listReadyEffectsWithSql(sql, limit) {
+export async function listReadyEffectsWithSql(sql, limit, now = Date.now()) {
     validateReadyEffectLimit(limit);
-    const rows = await sql.all(SELECT_READY_EFFECTS_SQL, [limit]);
+    if (!Number.isSafeInteger(now) || now < 0) {
+        throw new StorageError(STORAGE_ERROR_CODES.INVALID_EFFECT_OPTIONS, "ready effect time must be a non-negative safe integer");
+    }
+    const rows = await sql.all(SELECT_READY_EFFECTS_SQL, [now, now, now, limit]);
     return decodeSqlRows(rows, decodePendingEffectRow, "ready effects");
 }
 /** Reads bounded head-of-line effects through a fresh adapter read context. */
-export async function listReadyEffectsWithAdapter(storage, limit) {
-    return storage.read(({ sql }) => listReadyEffectsWithSql(sql, limit));
+export async function listReadyEffectsWithAdapter(storage, limit, now = Date.now()) {
+    return storage.read(({ sql }) => listReadyEffectsWithSql(sql, limit, now));
 }
 /** Returns whether normal outbox work is still pending or actively processing. */
 /** Checks whether the durable outbox still has pending or processing work. */