@happyvertical/smrt-ingestion 0.60.5 → 0.60.6

package/FEEDBACK.md

@@ -220,6 +220,13 @@ pending actions; regenerate their proposals and obtain fresh approval to recover
 A preview replay checks the exact persisted proposal it returns, including its
 analysis attempt; a newer action revision cannot supply replacement lineage.
 Plan replay and final sealed plan-step publication use the same gate.
+Reading examples (retrieval and every selection re-check) takes no exclusive
+lock on a source item (#4651): each source is loaded before and after its
+checks, both loads must agree (review binding and analysis revision), and a
+retention narrowing writes the row only when it actually narrows. Parallel
+reads therefore cannot deadlock on PostgreSQL by visiting source items in
+different orders. A database error inside an example check is never treated as
+an excluded example: it propagates and ends the read.
 For already successful actions, current-authorized durable outcomes remain
 readable/replayable, but invalid learned lineage suppresses saved proposal
 display, arguments and plan payload. An empty selection carries no learned source

package/PROPOSALS.md

@@ -497,6 +497,13 @@ like `reviewSuggestion`, never enter frozen configuration, digests or
 `proposalReadConfiguration`. A reviewer can still re-run a finally failed item
 with "Try again" (REVIEW.md, `retryInterpretation`).
 
+Independently of `retry`, a PostgreSQL deadlock (`40P01`) or serialization
+failure (`40001`) in the database reads around the provider call (candidate
+discovery, feedback retrieval and the provider-boundary re-checks) re-runs that
+read up to five times with a short jittered pause (#4651). It is never
+published as a failed attempt: one that outlasts those runs is thrown from
+`generate`, leaving the attempt unpublished for the next lease claim.
+
 ### Failed-attempt capture (opt-in, #4285)
 
 The value-free reason cannot show what the model actually sent. A host that

package/dist/chunks/{execution-Clcmi0sj.js → execution-ySzcTXW3.js}

@@ -6685,6 +6685,9 @@ function strings(value) {
 function time(value) {
 	return new Date(value).getTime();
 }
+function byItem([a], [b]) {
+	return a < b ? -1 : a > b ? 1 : 0;
+}
 var IntakeExecutionService = class IntakeExecutionService {
 	constructor(options, config) {
 		this.options = options;
@@ -6718,14 +6721,14 @@ var IntakeExecutionService = class IntakeExecutionService {
 		} catch (error) {
 			if (error instanceof RetentionExpired) intents.set(error.itemId, Math.min(intents.get(error.itemId) ?? Infinity, error.deadline));
 			if (intents.size) await withEmbeddedWriteTransaction(this.db, isEmbeddedDatabase(this.db), async (db) => {
-				for (const [itemId, deadline] of intents) await this.restoreRetention(db, itemId, deadline);
+				for (const [itemId, deadline] of [...intents].sort(byItem)) await this.restoreRetention(db, itemId, deadline);
 			});
 			throw error;
 		}
 	}
 	async restoreRetention(db, itemId, deadline) {
 		const expiry = new Date(deadline).toISOString();
-		const item = (await db.query("UPDATE intake_items SET expires_at=CASE WHEN expires_at>? THEN ? ELSE expires_at END WHERE id=? AND tenant_id=? AND confidential_scope_id=? RETURNING id,expires_at,visibility", expiry, expiry, itemId, this.scope.tenantId, this.scope.confidentialScopeId)).rows[0];
+		const item = (await db.query("UPDATE intake_items SET expires_at=? WHERE id=? AND tenant_id=? AND confidential_scope_id=? AND expires_at>? RETURNING id,expires_at,visibility", expiry, itemId, this.scope.tenantId, this.scope.confidentialScopeId, expiry)).rows[0] ?? (await db.query("SELECT id,expires_at,visibility FROM intake_items WHERE id=? AND tenant_id=? AND confidential_scope_id=?", itemId, this.scope.tenantId, this.scope.confidentialScopeId)).rows[0];
 		if (!item) throw new IntakeAccessDeniedError();
 		if (!this.retained(item)) await this.redactExecution(db, item);
 		return item;
@@ -6741,13 +6744,18 @@ var IntakeExecutionService = class IntakeExecutionService {
 			"intake_dispositions"
 		]) await db.query(`UPDATE ${table} SET data='{}' WHERE item_id=? AND tenant_id=? AND confidential_scope_id=?`, item.id, this.scope.tenantId, this.scope.confidentialScopeId);
 	}
-	async narrowRetention(db, item, deadline) {
-		const current = await this.item(db, String(item.id), true, true);
+	async narrowRetention(db, item, deadline, exclusive = true) {
+		const current = await this.item(db, String(item.id), exclusive, true);
 		const effective = Math.min(time(current.expires_at), deadline);
 		if (!Number.isFinite(effective)) throw new Error("Invalid retention deadline");
-		if (effective < time(current.expires_at)) await db.query("UPDATE intake_items SET expires_at=? WHERE id=? AND tenant_id=? AND confidential_scope_id=?", new Date(effective).toISOString(), item.id, this.scope.tenantId, this.scope.confidentialScopeId);
-		item.expires_at = new Date(effective).toISOString();
-		item.visibility = current.visibility;
+		let stored = current;
+		if (effective < time(current.expires_at)) {
+			const expiry = new Date(effective).toISOString();
+			await db.query(`UPDATE intake_items SET expires_at=? WHERE id=? AND tenant_id=? AND confidential_scope_id=?${exclusive ? "" : " AND expires_at>?"}`, expiry, item.id, this.scope.tenantId, this.scope.confidentialScopeId, ...exclusive ? [] : [expiry]);
+			if (!exclusive) stored = await this.item(db, String(item.id), false, true);
+		}
+		item.expires_at = new Date(Math.min(effective, time(stored.expires_at))).toISOString();
+		item.visibility = stored.visibility;
 		if (!this.retained(item)) await this.redactExecution(db, item);
 	}
 	async rows(db, table, where = "", params = []) {
@@ -6856,13 +6864,13 @@ var IntakeExecutionService = class IntakeExecutionService {
 			deadline
 		};
 	}
-	async access(db, item, handler, operation) {
+	async access(db, item, handler, operation, exclusive = true) {
 		const { current, ceiling, policy, deadline } = await this.authority(db, item, handler, operation);
 		const enforce = async (executor) => {
 			const intents = this.retentionIntents.getStore();
 			const itemId = String(item.id);
 			intents?.set(itemId, Math.min(intents.get(itemId) ?? Infinity, deadline));
-			await this.narrowRetention(executor, item, deadline);
+			await this.narrowRetention(executor, item, deadline, exclusive);
 		};
 		if (db === this.db) await this.tx(enforce);
 		else await enforce(db);
@@ -6892,8 +6900,8 @@ var IntakeExecutionService = class IntakeExecutionService {
 			permissions: intersect(strings(current.permissions), ceiling.permissions)
 		};
 	}
-	async principal(db, item, handler, operation, work) {
-		const access = await this.access(db, item, handler, operation);
+	async principal(db, item, handler, operation, work, exclusive = true) {
+		const access = await this.access(db, item, handler, operation, exclusive);
 		const registered = ObjectRegistry.getClassByQualifiedName(handler.operation.model);
 		const tool = `${registered.collection}.${handler.operation.action}`;
 		return executeAsPrincipal({
@@ -6937,23 +6945,23 @@ var IntakeExecutionService = class IntakeExecutionService {
 				id: id2
 			})), requireReview);
 			const result = await work(db, authorize);
-			for (const [retainedItemId, deadline] of this.retentionIntents.getStore() ?? []) {
+			for (const [retainedItemId, deadline] of [...this.retentionIntents.getStore() ?? []].sort(byItem)) {
 				const item = await this.restoreRetention(db, retainedItemId, deadline);
 				if (!this.retained(item)) throw new RetentionExpired(retainedItemId, deadline);
 			}
 			return result;
 		}));
 	}
-	async discoveryContext(db, itemId, handlerId, handlerVersion, work, requireReview = false, revalidate) {
+	async discoveryContext(db, itemId, handlerId, handlerVersion, work, requireReview = false, revalidate, exclusive = true) {
 		const review = async () => {
-			const item = await this.item(db, itemId, true);
-			await this.access(db, item, this.handler(handlerId, handlerVersion), "review");
+			const item = await this.item(db, itemId, exclusive);
+			await this.access(db, item, this.handler(handlerId, handlerVersion), "review", exclusive);
 		};
 		const authorize = async (callback) => {
-			const item = await this.item(db, itemId, true);
+			const item = await this.item(db, itemId, exclusive);
 			const handler = this.handler(handlerId, handlerVersion);
-			if ("execution" in handler) return this.principal(db, item, this.operation(handler), "preview", callback);
-			const { context } = await this.access(db, item, handler, "preview");
+			if ("execution" in handler) return this.principal(db, item, this.operation(handler), "preview", callback, exclusive);
+			const { context } = await this.access(db, item, handler, "preview", exclusive);
 			const resolved = await resolvePlaybook(handler.operation.playbookKey, {
 				db,
 				tenantId: this.scope.tenantId,
@@ -6969,7 +6977,7 @@ var IntakeExecutionService = class IntakeExecutionService {
 				if (operation.kind !== "operation") throw new Error("Playbook unavailable");
 				const found = this.config.handlers.find((candidate) => "execution" in candidate && candidate.operation.model === operation.model && candidate.operation.action === operation.action);
 				if (!found) throw new Error("Handler unavailable");
-				await this.principal(db, item, this.operation(found), "preview", async () => {});
+				await this.principal(db, item, this.operation(found), "preview", async () => {}, exclusive);
 			}
 			return callback(context);
 		};
@@ -7045,15 +7053,15 @@ var IntakeExecutionService = class IntakeExecutionService {
 	}
 	/** Same-executor current review/evidence/target gate for the owning feedback ledger. */
 	/** Join an existing owning transaction; its outer boundary restores retention after rollback. */
-	[feedbackDiscoveryContext](db, itemId, handlerId, handlerVersion, work, revalidate) {
-		const run = (executor) => this.discoveryContext(executor, itemId, handlerId, handlerVersion, work, false, revalidate);
+	[feedbackDiscoveryContext](db, itemId, handlerId, handlerVersion, work, revalidate, exclusive = true) {
+		const run = (executor) => this.discoveryContext(executor, itemId, handlerId, handlerVersion, work, false, revalidate, exclusive);
 		return db ? run(db) : this.tx(run);
 	}
-	[feedbackActionTransaction](actionId, reviewer, work, executor, requiredProviders, proposalId, targetRevisions = true) {
+	[feedbackActionTransaction](actionId, reviewer, work, executor, requiredProviders, proposalId, targetRevisions = true, exclusive = true) {
 		const operation = async (db) => {
 			const load = async () => {
-				const bound = await this.bound(db, actionId, true, false, proposalId);
-				const { context, permissions } = await this.access(db, bound.item, bound.handler, reviewer ? "review" : "read");
+				const bound = await this.bound(db, actionId, exclusive, false, proposalId);
+				const { context, permissions } = await this.access(db, bound.item, bound.handler, reviewer ? "review" : "read", exclusive);
 				if (requiredProviders?.some((provider) => !context.policy.providers.includes(provider))) throw new Error("Feedback source provider unavailable");
 				await this.verifyEvidence(db, bound);
 				for (const target of bound.binding.targetPreconditions) await context.assertTarget(target.model, target.id, bound.action.state === "succeeded" || !targetRevisions ? void 0 : target.revision);
@@ -7063,7 +7071,7 @@ var IntakeExecutionService = class IntakeExecutionService {
 					const data2 = object(plan.data);
 					await this.discoveryContext(db, String(bound.item.id), String(data2.handlerId), String(data2.handlerVersion), async (parent) => {
 						for (const target of object(data2.preview).targetPreconditions) await parent.assertTarget(target.model, target.id, bound.action.state === "succeeded" ? void 0 : target.revision);
-					}, reviewer);
+					}, reviewer, void 0, exclusive);
 				}
 				const [analysis] = await this.rows(db, "intake_analyses", "id=?", [bound.proposal.analysis_id]);
 				const [attempt] = await this.rows(db, "intake_analysis_attempts", "id=?", [bound.proposal.analysis_attempt_id]);
@@ -7109,7 +7117,7 @@ var IntakeExecutionService = class IntakeExecutionService {
 			const before = await load();
 			const result = await work(before);
 			const after = await load();
-			if (intakeBindingDigest(before.review) !== intakeBindingDigest(after.review)) throw new Error("Feedback binding changed");
+			if (intakeBindingDigest(before.review) !== intakeBindingDigest(after.review) || !exclusive && before.context.analysisRevision !== after.context.analysisRevision) throw new Error("Feedback binding changed");
 			if (after.permissions.some((permission) => !before.permissions.includes(permission))) throw new Error("Feedback cannot widen permissions");
 			const prior = before.context.policy, next = after.context.policy;
 			for (const key of [
@@ -7144,7 +7152,7 @@ var IntakeExecutionService = class IntakeExecutionService {
 		if (!Array.isArray(references)) throw new Error("Feedback lineage unavailable");
 		if (references.length === 0) return;
 		if (!this.options.feedback) throw new Error("Feedback configuration unavailable");
-		const { IntakeFeedbackService } = await import("./feedback-hDSMYjiG.js").then((n) => n.r);
+		const { IntakeFeedbackService } = await import("./feedback-CSi5pVUI.js").then((n) => n.r);
 		await new IntakeFeedbackService(this.options, this).assertActionLineage(String(bound.action.id), db, String(bound.proposal.id));
 	}
 	async getAction(actionId) {
@@ -8729,4 +8737,4 @@ async function continueIntakeReview(service, actionId, task) {
 //#endregion
 export { __toESM as A, storedFailureCapture as C, generationSnapshotRead as D, discoveryTransaction as E, listReadGate as O, prepareFailureCapture as S, completeWithFailureCapture as T, HandlerArgumentsInvalidError as _, resolveIntakePolicy as a, FAILURE_CAPTURE_MAX_BYTES as b, HANDLER_ARGUMENT_ISSUE_LIMIT as c, schemaOwnedPath as d, require_ajv as f, GenerationSourceStaleError as g, GenerationSnapshotStaleError as h, intakeBindingDigest as i, __exportAll as k, HANDLER_ARGUMENT_PATH_LIMIT as l, redactedCeiling as m, IntakeExecutionService as n, feedbackActionTransaction as o, UNFINISHED_ACTION_STATES as p, continueIntakeReview as r, feedbackDiscoveryContext as s, IntakeAccessDeniedError as t, describeArgumentRefusal as u, ProposalsNotConfiguredError as v, analysisLeaseRemaining as w, assertFailureCapture as x, FAILURE_CAPTURE_DEFAULT_MAX_BYTES as y };
 
-//# sourceMappingURL=execution-Clcmi0sj.js.map
+//# sourceMappingURL=execution-ySzcTXW3.js.map