@happyvertical/smrt-ingestion 0.60.5 → 0.60.7

package/dist/proposals.d.ts

@@ -52,7 +52,12 @@ export declare class IngestionProposalService {
     }): Promise<CandidatePage>;
     prepareGeneration(itemId: string, attemptId: string): Promise<GenerationStageConfiguration>;
     private extraction;
+    /**
+     * The provider-boundary authority re-check. Each part is its own read
+     * transaction, so a deadlock or serialization failure re-runs it (#4651).
+     */
     private live;
+    private liveOnce;
     private feedbackGate;
     /** Whether the analysis lease still covers `delay` plus another full stage deadline. */
     private retryFits;

package/dist/proposals.d.ts.map

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

package/dist/proposals.js

@@ -1,8 +1,8 @@
-import { A as __toESM, D as generationSnapshotRead, E as discoveryTransaction, S as prepareFailureCapture, T as completeWithFailureCapture, _ as HandlerArgumentsInvalidError, b as FAILURE_CAPTURE_MAX_BYTES, d as schemaOwnedPath, f as require_ajv, h as GenerationSnapshotStaleError, i as intakeBindingDigest, n as IntakeExecutionService, u as describeArgumentRefusal, w as analysisLeaseRemaining, x as assertFailureCapture, y as FAILURE_CAPTURE_DEFAULT_MAX_BYTES } from "./chunks/execution-Clcmi0sj.js";
+import { A as __toESM, D as generationSnapshotRead, E as discoveryTransaction, S as prepareFailureCapture, T as completeWithFailureCapture, _ as HandlerArgumentsInvalidError, b as FAILURE_CAPTURE_MAX_BYTES, d as schemaOwnedPath, f as require_ajv, h as GenerationSnapshotStaleError, i as intakeBindingDigest, n as IntakeExecutionService, u as describeArgumentRefusal, w as analysisLeaseRemaining, x as assertFailureCapture, y as FAILURE_CAPTURE_DEFAULT_MAX_BYTES } from "./chunks/execution-ySzcTXW3.js";
 import { c as storableJSONText, o as providerIdentity, s as normalizeObservedImageRegions } from "./chunks/extraction-providers-DoD7M-Lm.js";
 import { a as generationLimiter, c as shouldRetry, f as proposeDocumentSplits, l as SplitGroupError, n as assertProposalLimits, o as generationRetryPolicy, r as GenerationLimiter, s as retryDelay, t as proposalReadConfiguration } from "./chunks/proposal-contracts-DREPLG56.js";
-import { i as reviewerInstructionView } from "./chunks/reviewer-instruction-BeOYVCVk.js";
-import { n as IntakeFeedbackService, t as FeedbackRetrievalDeniedError } from "./chunks/feedback-hDSMYjiG.js";
+import { i as reviewerInstructionView } from "./chunks/reviewer-instruction-Bst9wIak.js";
+import { a as retryTransactionConflicts, i as isTransactionConflict, n as IntakeFeedbackService, t as FeedbackRetrievalDeniedError } from "./chunks/feedback-CSi5pVUI.js";
 import { executeDecision, isEmbeddedDatabase, withEmbeddedWriteTransaction } from "@happyvertical/smrt-core";
 import { AIError } from "@happyvertical/ai";
 //#region src/host-review.ts
@@ -1490,7 +1490,14 @@ var IngestionProposalService = class {
 		}
 		return results;
 	}
-	async live(lease, catalogDigest, offered = [], feedback) {
+	/**
+	* The provider-boundary authority re-check. Each part is its own read
+	* transaction, so a deadlock or serialization failure re-runs it (#4651).
+	*/
+	live(lease, catalogDigest, offered = [], feedback) {
+		return retryTransactionConflicts(() => this.liveOnce(lease, catalogDigest, offered, feedback));
+	}
+	async liveOnce(lease, catalogDigest, offered, feedback) {
 		await this.service.getGenerationInput(lease);
 		const catalog = await this.catalog(lease.itemId);
 		if (intakeBindingDigest(catalog) !== catalogDigest) throw new Error("Generation catalog changed");
@@ -1603,12 +1610,12 @@ var IngestionProposalService = class {
 			const query = evidence.flatMap((entry) => entry.segments.map((segment) => segment.text)).join("\n").slice(0, this.config.limits.maxQueryLength);
 			for (const { handler } of catalog) {
 				await this.live(lease, expected.catalogDigest);
-				const candidates = await this.findCandidates({
+				const candidates = await retryTransactionConflicts(() => this.findCandidates({
 					itemId: lease.itemId,
 					handlerId: handler.id,
 					handlerVersion: handler.version,
 					query
-				});
+				}));
 				if (candidates.truncated) output.warnings.push("candidate_set_truncated");
 				output.offered.push({
 					handler,
@@ -1619,7 +1626,7 @@ var IngestionProposalService = class {
 			if (this.options.feedback && !generation.configuration.humanCorrection && query.trim() && output.offered.length) {
 				const feedbackQuery = query.slice(0, 4096);
 				try {
-					feedbackSelection = await new IntakeFeedbackService(this.options, this.execution).retrieve({
+					feedbackSelection = await retryTransactionConflicts(() => new IntakeFeedbackService(this.options, this.execution).retrieve({
 						itemId: lease.itemId,
 						query: feedbackQuery,
 						offered: output.offered,
@@ -1627,7 +1634,7 @@ var IngestionProposalService = class {
 						configurationVersion: this.config.version,
 						model: this.identity,
 						providers: [this.identity.provider, ...this.decisionIdentity ? [this.decisionIdentity.provider] : []]
-					});
+					}));
 				} catch (error) {
 					if (!(error instanceof FeedbackRetrievalDeniedError)) throw error;
 				}
@@ -1757,6 +1764,7 @@ var IngestionProposalService = class {
 				}
 			}
 		} catch (error) {
+			if (isTransactionConflict(error)) throw error;
 			const candidate = captureCandidate;
 			captureCandidate = void 0;
 			await this.live(lease, expected.catalogDigest);