@gitroll/tacitt-cli 0.6.7 → 0.6.9

package/dist/{query-Bb72w2DX.mjs → query-CfhcS4gd.mjs}

@@ -1,10 +1,10 @@
-import { $ as createCleanup, B as parallelismLimits, C as readOriginalSearchFields, F as SessionWorkerError, G as processJourneyMetadataFields, H as privateJourneyDirectory, I as sessionWorkerFailure, K as staticMaskCategory, O as captureLogicalJourneySources, P as createSharedSessionPool, Q as removeNamedTemporarySpools, R as defaultParallelism, T as createCollectionArtifacts, U as readLogicalJourneyFinalMasks, W as readConfiguredOutputInfo, Z as createTemporary, _ as processJourneyMetadata, a as scanReviewFields, at as windowsOwnerOnly, c as readSessionScanRecords, g as readCapturedOriginalRows, i as buildWorkScanBatches, it as restrictToOwner, j as runConfiguredSessionJob, k as capturedJourneyScope, l as scanPreparedSession, m as openConfiguredUpload, n as verifyPreparedSessionSources, nt as makePrivateDirectory, o as createWorkPieces, ot as isWindowsAclFailure, p as configuredSessionUploads, q as readWorkspacePair, r as prepareSessionScans, rt as openPrivateFile, s as readSessionScanFields, st as windowsAclCodes, t as preparedScanConfiguration, v as readStaticSessionMasks, w as readConfiguredSearchFields, y as staticSessionJobs, z as gitSeedsProvider } from "./src-p_uJNjV3.mjs";
-import { A as createExecutionPort, C as saveRemoteState, D as createPackagingProgressPort, E as exportDelivery, F as loadDeliveryResults, L as inBackgroundStoreLane, M as withStateMutex, N as createDeliveryService, O as createStore, P as preflight, R as isBackgroundStatusPoll, S as readRemoteState, T as collectRemoteWorkers, _ as staticBaseProduction, a as writeJourneyOutput, b as workApproval, c as mergeHideIndexTokens, f as writeJourneyBase, g as staticBaseInputs, h as staticSessions, l as packRenderHideIndex, m as saveStaticSession, o as createHideIndexTokens, p as readStaticResult, s as hideIndexTexts, t as journeyOutputJob, u as journeyBaseJob, v as readSelectedCaptures, w as journeyDirectory, x as isRemoteImport, y as prepareSourcePlan, z as retrySharingViolation } from "./job-CeSf9UCC.mjs";
+import { $ as createCleanup, B as parallelismLimits, C as readOriginalSearchFields, F as SessionWorkerError, G as processJourneyMetadataFields, H as privateJourneyDirectory, I as sessionWorkerFailure, K as staticMaskCategory, O as captureLogicalJourneySources, P as createSharedSessionPool, Q as removeNamedTemporarySpools, R as defaultParallelism, T as createCollectionArtifacts, U as readLogicalJourneyFinalMasks, W as readConfiguredOutputInfo, Z as createTemporary, _ as processJourneyMetadata, a as scanReviewFields, at as windowsOwnerOnly, c as readSessionScanRecords, g as readCapturedOriginalRows, i as buildWorkScanBatches, it as restrictToOwner, j as runConfiguredSessionJob, k as capturedJourneyScope, l as scanPreparedSession, m as openConfiguredUpload, n as verifyPreparedSessionSources, nt as makePrivateDirectory, o as createWorkPieces, ot as isWindowsAclFailure, p as configuredSessionUploads, q as readWorkspacePair, r as prepareSessionScans, rt as openPrivateFile, s as readSessionScanFields, st as windowsAclCodes, t as preparedScanConfiguration, v as readStaticSessionMasks, w as readConfiguredSearchFields, y as staticSessionJobs, z as gitSeedsProvider } from "./src-V9GHLZQs.mjs";
+import { A as createExecutionPort, C as saveRemoteState, D as createPackagingProgressPort, E as exportDelivery, F as loadDeliveryResults, L as inBackgroundStoreLane, M as withStateMutex, N as createDeliveryService, O as createStore, P as preflight, R as isBackgroundStatusPoll, S as readRemoteState, T as collectRemoteWorkers, _ as staticBaseProduction, a as writeJourneyOutput, b as workApproval, c as mergeHideIndexTokens, f as writeJourneyBase, g as staticBaseInputs, h as staticSessions, l as packRenderHideIndex, m as saveStaticSession, o as createHideIndexTokens, p as readStaticResult, s as hideIndexTexts, t as journeyOutputJob, u as journeyBaseJob, v as readSelectedCaptures, w as journeyDirectory, x as isRemoteImport, y as prepareSourcePlan, z as retrySharingViolation } from "./job-BQXssW46.mjs";
 import { $t as safeField, Bt as sessionPeriodSchema, Dn as createStaticProcessor, Fn as entityDictionaryVersion, Ft as termTypeInfo, Gt as ownerProfileSchema, Kt as passportAddressSchema, Ot as privacyTermKey, Qt as safeCode, Sn as currentDetectorVersion, T as bLiteralTerms, Un as frameRecords, Wt as mergeOwnerProfile, Xt as ApplicationError, Zt as UnfinishedJourneyError, an as observeSource, ar as admitCustomTerm, c as textDigest, ir as createEntityMatcher, nn as reviewFamilies, or as admitGitName, qt as profileHasChoices, tn as familySelected, ur as ProcessingError, zt as filterInventoryByPeriod } from "./locate-BWkblijS.mjs";
-import { a as mainTextChunks, c as previewInWorker, i as nearestSortingRepository, l as createNativeAdapters, n as createProjectEvidenceCollector, o as mainTextFields, r as sortingRepositoryId, s as textChunks, t as createHarnesses, u as createGitNameSeedProvider } from "./src-BBjnljUs.mjs";
-import { $ as settingsBatchSchema, A as deviceAuthorizationSchema, Ar as staticReviewDigest, B as inspectionStartSchema, Br as sendResolutionSchema, Bt as classificationWorks, Ct as sendPrepareSchema, Dt as currentJourneyAdapters, Fn as bTermMatcher, Fr as agentSourcesSchema, Gn as retireWorkDescription, Gr as isReadingComplete, Hn as journeyConfirmedHides, Hr as hasCompleteWorkDescription, Ht as newJourneyWork, Ir as journeySendSchema, Jn as workCorrectionBinding, Kn as workDecisionDigest, Kr as isSelectedWork, Lr as sendArtifactSchema, M as profileUrlMatchesIdentity, N as readAccountAvatarUrl, O as createAccount, Ot as obsoleteJourney, P as storedCredentialSchema, Pr as agentSourceSchema, Pt as applyClassification, R as createApplication, Rr as sendReceiptSchema, St as sendChoiceSchema, Tr as privacyDecisionDigest, Tt as sendStartSchema, Ur as isClassifying, V as validateInspectionBatch, Vr as sendSettingsSchema, Vt as retireScanGeneration, W as inspectionQuerySchema, Wr as isIncludedWork, Yr as withReadingProgress, Yt as journeySearchResultSchema, Zt as searchScopeDigest, _ as changeJourney, _r as emptyPreparationFacts, _t as emptyTermsRevision, ai as selectionSchema, ar as scanPreparationDigest, bt as replaceSensitiveTermsSchema, cr as scanGitSeedsResource, et as settingsQuerySchema, ft as manualUploadChoiceSchema, h as hideScopeDigest, ht as manualUploadStartSchema, ii as selectionBatchSchema, j as deviceProfileScopeSchema, k as accountProfileSchema, kr as hasCurrentStaticReview, lr as verifiedScanGitSeeds, lt as validateFailureLocation, m as activeJourneyTerms, mt as manualUploadSchema, ni as commandSchema, or as scanSessionResourceSchema, pt as manualUploadPrepareSchema, ri as packageCommandSchema, rt as appendSensitiveTerms, si as producerVersion, sr as scanGitSeedsId, st as artifactFailureDetailSchema, ui as recommendParallelism, ur as scanExclusionResourceSchema, ut as manualUploadActionSchema, wr as assertJourneyPrivacyReady, wt as sendRequestSchema, xt as sendActionSchema, yt as normalizeSensitiveTerms, z as inspectionCancelSchema, zn as confirmedHideKinds, zr as sendReplaceResultSchema, zt as classificationPartition } from "./src-d7n58sbH.mjs";
-import { _t as isCoordinationBusy } from "./heap-DsE74_-n.mjs";
-import { t as createAgentSetupPort } from "./agent-setup-YlFIJz-h.mjs";
+import { a as mainTextChunks, c as previewInWorker, i as nearestSortingRepository, l as createNativeAdapters, n as createProjectEvidenceCollector, o as mainTextFields, r as sortingRepositoryId, s as textChunks, t as createHarnesses, u as createGitNameSeedProvider } from "./src-BgsEnMsy.mjs";
+import { $ as settingsBatchSchema, $r as isReadingComplete, A as deviceAuthorizationSchema, B as inspectionStartSchema, Bt as classificationWorks, Ct as sendPrepareSchema, Dt as currentJourneyAdapters, Fn as bTermMatcher, Gn as retireWorkDescription, Gr as sendArtifactSchema, Hn as journeyConfirmedHides, Hr as agentSourceSchema, Ht as newJourneyWork, Jn as workCorrectionBinding, Jr as sendResolutionSchema, Kn as workDecisionDigest, Kr as sendReceiptSchema, Lr as hasCurrentStaticReview, M as profileUrlMatchesIdentity, Mr as privacyDecisionDigest, N as readAccountAvatarUrl, O as createAccount, Or as displayedScopeDigest, Ot as obsoleteJourney, P as storedCredentialSchema, Pt as applyClassification, Qr as isIncludedWork, R as createApplication, Rr as staticReviewDigest, St as sendChoiceSchema, Tt as sendStartSchema, Ur as agentSourcesSchema, V as validateInspectionBatch, Vt as retireScanGeneration, W as inspectionQuerySchema, Wr as journeySendSchema, Xr as hasCompleteWorkDescription, Yr as sendSettingsSchema, Yt as journeySearchResultSchema, Zr as isClassifying, Zt as searchScopeDigest, _ as changeJourney, _r as emptyPreparationFacts, _t as emptyTermsRevision, ai as packageCommandSchema, ar as scanPreparationDigest, bt as replaceSensitiveTermsSchema, cr as scanGitSeedsResource, ei as isSelectedWork, et as settingsQuerySchema, fi as recommendParallelism, ft as manualUploadChoiceSchema, h as hideScopeDigest, ht as manualUploadStartSchema, ii as commandSchema, j as deviceProfileScopeSchema, jr as assertJourneyPrivacyReady, k as accountProfileSchema, kr as requestedScope, li as producerVersion, lr as verifiedScanGitSeeds, lt as validateFailureLocation, m as activeJourneyTerms, mt as manualUploadSchema, oi as selectionBatchSchema, or as scanSessionResourceSchema, pt as manualUploadPrepareSchema, qr as sendReplaceResultSchema, ri as withReadingProgress, rt as appendSensitiveTerms, si as selectionSchema, sr as scanGitSeedsId, st as artifactFailureDetailSchema, ur as scanExclusionResourceSchema, ut as manualUploadActionSchema, wt as sendRequestSchema, xt as sendActionSchema, yt as normalizeSensitiveTerms, z as inspectionCancelSchema, zn as confirmedHideKinds, zt as classificationPartition } from "./src-DzKuzGVH.mjs";
+import { _t as isCoordinationBusy } from "./heap-Dt3-d27v.mjs";
+import { t as createAgentSetupPort } from "./agent-setup-CODlN6zl.mjs";
 import { t as workerMessageSchema } from "./messages-D3m3bhva.mjs";
 import { constants, write } from "node:fs";
 import { z } from "zod";
@@ -2603,18 +2603,24 @@ function createJourneyPreparation(options) {
 			const scanWorks = scanRequested && state.scope.status === "confirmed" ? state.works : [];
 			if (scanWorks.length) run = await runWorkers(options.workers);
 			const frozen = state;
-			const blockWork = (work, error) => changeJourney(storage, journeyId, "snapshot", (before) => {
-				if (before.phase === "paused") throw new ApplicationError("OPERATION_CANCELED");
-				if (before.phase === "sending" || before.phase === "completed") return before;
-				return withReadingProgress({
-					...before,
-					works: before.works.map((item) => item.id === work.id && item.inputRevision === work.inputRevision && !item.blockedCodes.includes("PRIVACY_CHANGE_PENDING") ? {
-						...item,
-						status: "blocked",
-						blockedCodes: blockedCodes(error, safeCode(error))
-					} : item)
-				});
-			}, 100);
+			const blockedForRetry = new Set(state.works.filter((work) => work.status === "blocked").map((work) => `${work.id}:${work.inputRevision}`));
+			const deferredForHide = /* @__PURE__ */ new Set();
+			const blockWork = async (work, error) => {
+				const blocked = await changeJourney(storage, journeyId, "snapshot", (before) => {
+					if (before.phase === "paused") throw new ApplicationError("OPERATION_CANCELED");
+					if (before.phase === "sending" || before.phase === "completed") return before;
+					return withReadingProgress({
+						...before,
+						works: before.works.map((item) => item.id === work.id && item.inputRevision === work.inputRevision && !item.blockedCodes.includes("PRIVACY_CHANGE_PENDING") ? {
+							...item,
+							status: "blocked",
+							blockedCodes: blockedCodes(error, safeCode(error))
+						} : item)
+					});
+				}, 100);
+				if (blocked.works.some((item) => item.id === work.id && item.inputRevision === work.inputRevision && item.status === "blocked")) blockedForRetry.add(`${work.id}:${work.inputRevision}`);
+				return blocked;
+			};
 			const retryLimit = options.retryLimit ?? workRetryDelaysMs.length;
 			const generation = (work) => `${work.id}:${work.inputRevision}`;
 			let serialAdmission = Promise.resolve();
@@ -2638,11 +2644,14 @@ function createJourneyPreparation(options) {
 				await (options.retryDelay ?? waitForWorkRetry)(delay, abort.signal);
 				abort.signal.throwIfAborted();
 				let resumed = false;
-				await changeJourney(storage, journeyId, "snapshot", (before) => {
+				let deferred = false;
+				const committed = await changeJourney(storage, journeyId, "snapshot", (before) => {
 					resumed = false;
+					deferred = false;
 					const target = before.works.find((item) => item.id === work.id);
 					if (before.phase === "sending" || before.phase === "completed" || before.phase === "paused" || !target || !isSelectedWork(target) || target.inputRevision !== work.inputRevision || target.status !== "blocked" || target.blockedCodes.includes("PRIVACY_CHANGE_PENDING")) return before;
 					resumed = !before.pendingHideId;
+					deferred = !resumed;
 					return withReadingProgress({
 						...before,
 						privacy: {
@@ -2656,6 +2665,7 @@ function createJourneyPreparation(options) {
 						} : item)
 					});
 				}, 100);
+				if (deferred && committed.pendingHideId && committed.works.some((item) => generation(item) === generation(work) && item.status === "pending")) deferredForHide.add(generation(work));
 				return resumed;
 			};
 			const readRetries = /* @__PURE__ */ new Map();
@@ -2693,6 +2703,7 @@ function createJourneyPreparation(options) {
 					"reading",
 					"review"
 				].includes(work.status)) return false;
+				blockedForRetry.delete(generation(work));
 				prepared.add(generation(work));
 				await prepareClassificationMetadata(storage, latest, work, options.processing, abort.signal, plan);
 				let failures = collectPreparationFailures(plan.approval.inventory, work.rootSessionIds, {
@@ -2802,7 +2813,15 @@ function createJourneyPreparation(options) {
 				abort.abort(error);
 			};
 			const statics = [];
+			const priorStatics = /* @__PURE__ */ new Map();
 			const reads = [];
+			const activeReads = /* @__PURE__ */ new Set();
+			const activeStatics = /* @__PURE__ */ new Set();
+			let workSettled = Promise.withResolvers();
+			const notifySettled = () => {
+				workSettled.resolve();
+				workSettled = Promise.withResolvers();
+			};
 			const pass = async (works) => {
 				let submittedWorks = 0;
 				const submitted = Promise.withResolvers();
@@ -2826,6 +2845,7 @@ function createJourneyPreparation(options) {
 					releaseAdmission.set(planned.id, () => released.resolve());
 					const onSubmitted = submission();
 					const read = async () => {
+						await priorStatics.get(planned.id);
 						if (!run.pool) await previous;
 						if (fatal) {
 							onSubmitted();
@@ -2840,25 +2860,45 @@ function createJourneyPreparation(options) {
 							onSubmitted();
 							released.resolve();
 						}
-						statics.push(retryContention(() => staticWork(planned, passSubmitted), (error) => options.onFailure(error), abort.signal).catch(stop));
+						activeStatics.add(planned.id);
+						const staticResult = retryContention(() => staticWork(planned, passSubmitted), (error) => options.onFailure(error), abort.signal).catch(stop).finally(() => {
+							activeStatics.delete(planned.id);
+							notifySettled();
+						});
+						priorStatics.set(planned.id, staticResult);
+						statics.push(staticResult);
 					};
-					reads.push(read());
+					activeReads.add(planned.id);
+					reads.push(read().finally(() => {
+						activeReads.delete(planned.id);
+						notifySettled();
+					}));
 				}
 				await Promise.all(admissions);
 			};
-			/** Selected Works this run has not prepared yet, waiting while grouping continues (E2). */
+			/** Admit newly grouped and explicitly retried Works until both read and static work drain. */
 			const later = async () => {
 				for (;;) {
 					abort.signal.throwIfAborted();
+					const settled = workSettled.promise;
 					const latest = await storage.current(journeyId);
 					if (!latest || latest.phase === "paused" || latest.scope.status !== "confirmed") return [];
+					for (const work of latest.works) if (work.status === "blocked") blockedForRetry.add(generation(work));
 					const ready = latest.works.filter((work) => isSelectedWork(work) && [
 						"pending",
 						"reading",
 						"review"
-					].includes(work.status) && !prepared.has(`${work.id}:${work.inputRevision}`));
-					if (ready.length || !isClassifying(latest)) return ready;
-					await setTimeout$1(laterWorksPollMs, void 0, { signal: abort.signal }).catch(() => abort.signal.throwIfAborted());
+					].includes(work.status) && !activeReads.has(work.id) && !activeStatics.has(work.id) && !deferredForHide.has(generation(work)) && (!prepared.has(generation(work)) && !hasCurrentStaticReview(latest, work) || work.status === "pending" && blockedForRetry.has(generation(work))));
+					if (ready.length || !isClassifying(latest) && !activeReads.size && !activeStatics.size) return ready;
+					const polling = new AbortController();
+					try {
+						await Promise.race([settled, setTimeout$1(laterWorksPollMs, void 0, { signal: AbortSignal.any([abort.signal, polling.signal]) })]);
+					} catch (error) {
+						abort.signal.throwIfAborted();
+						throw error;
+					} finally {
+						polling.abort();
+					}
 				}
 			};
 			try {
@@ -2971,7 +3011,16 @@ async function packageBase(storage, state, work, processing, directory, signal,
 		if (after.phase === "paused") throw new ApplicationError("OPERATION_CANCELED");
 		assertJourneyPrivacyReady(after, true);
 	}
-	await assertCurrent();
+	try {
+		await assertCurrent();
+	} catch (error) {
+		await Promise.all([
+			base.primary,
+			base.companion,
+			base.maskLedger
+		].map((file) => rm(file.path, { force: true })));
+		throw error;
+	}
 	try {
 		await storage.saveResource(base);
 		return base;
@@ -6928,7 +6977,7 @@ function retryDelay(error, fallback, now) {
 	const delay = Number.isFinite(seconds) ? seconds * 1e3 : Date.parse(header) - now;
 	return Number.isFinite(delay) ? Math.max(fallback, delay) : fallback;
 }
-/** Reconcile first; only failed transfers that consumed bytes charge the durable budget. */
+/** Reconcile retained intents; only byte-started failures charge the durable budget. */
 async function attemptSession({ dependencies, original, session, key, remote, signal, guard, checkpoint }) {
 	const previous = original.sessionUpload?.key === key && original.sessionUpload.sha256 === session.sha256 ? original.sessionUpload : null;
 	let failures = previous?.attempt ?? 0;
@@ -6967,8 +7016,31 @@ async function attemptSession({ dependencies, original, session, key, remote, si
 	await guard();
 	await save();
 	let lastReported = 0;
+	const reserveUploadComplete = async () => {
+		await guard();
+		const reservation = await remote.reserve(input, signal);
+		if (reservation.state === "awaiting_upload") {
+			await guard();
+			transfer.attempt = failures + 1;
+			await session.upload(reservation, signal, async (bytes) => {
+				const sent = Math.min(session.byteLength, Math.max(transfer.bytesSent, bytes));
+				transfer.bytesAttempted += sent - transfer.bytesSent;
+				transfer.bytesSent = sent;
+				if (Date.now() - lastReported >= 250 || sent === session.byteLength) {
+					report();
+					lastReported = Date.now();
+				}
+			});
+			await guard();
+			await remote.complete({
+				...input,
+				metadata: session.metadata
+			}, signal);
+		}
+	};
 	try {
-		try {
+		if (previous === null) await reserveUploadComplete();
+		else try {
 			await remote.complete({
 				...input,
 				metadata: session.metadata
@@ -6976,26 +7048,7 @@ async function attemptSession({ dependencies, original, session, key, remote, si
 		} catch (error) {
 			if (!(error instanceof JourneyRemoteError) || error.status !== 409 || error.code !== "upload_incomplete") throw error;
 			if (failures >= 3) throw new ApplicationError("SESSION_UPLOAD_EXHAUSTED");
-			await guard();
-			const reservation = await remote.reserve(input, signal);
-			if (reservation.state === "awaiting_upload") {
-				await guard();
-				transfer.attempt = failures + 1;
-				await session.upload(reservation, signal, async (bytes) => {
-					const sent = Math.min(session.byteLength, Math.max(transfer.bytesSent, bytes));
-					transfer.bytesAttempted += sent - transfer.bytesSent;
-					transfer.bytesSent = sent;
-					if (Date.now() - lastReported >= 250 || sent === session.byteLength) {
-						report();
-						lastReported = Date.now();
-					}
-				});
-				await guard();
-				await remote.complete({
-					...input,
-					metadata: session.metadata
-				}, signal);
-			}
+			await reserveUploadComplete();
 		}
 		transfer.bytesAcknowledged = session.byteLength;
 		await guard();
@@ -7197,10 +7250,10 @@ function usesSessionSend(dependencies, send) {
 	if (send.items.some((item) => item.sessionUpload !== void 0 || item.sessionMembership || item.sessionAssembly)) return true;
 	return !send.items.some((item) => item.receipt || item.reservation || item.previousReceipts.length > 0);
 }
-async function saveSend(dependencies, snapshot, next, action) {
+async function saveSend(dependencies, snapshot, next, action, expectedJourneyRevision = action?.expectedJourneyRevision ?? snapshot.journey.revision) {
 	return dependencies.storage.commitSend({
 		journeyId: snapshot.journey.journeyId,
-		expectedJourneyRevision: action?.expectedJourneyRevision ?? snapshot.journey.revision,
+		expectedJourneyRevision,
 		expectedSendRevision: action?.expectedSendRevision ?? (snapshot.send?.id === next.id ? snapshot.send.revision : null),
 		requestKey: action?.idempotencyKey ?? randomUUID(),
 		requestHash: hash$1(action ?? next),
@@ -9240,89 +9293,91 @@ const sendRecoveryCodes = [
 ];
 //#endregion
 //#region apps/cli/src/account/journey/request.ts
-/** Artifact-independent authorization: packaging progress cannot expand this scope. */
-function requestedScope(journey) {
-	return hash$1({
-		privacy: privacyDecisionDigest(journey),
-		configurationId: journey.configurationId,
-		confirmedHideRevision: journey.confirmedHideRevision ?? 0,
-		consent: journey.consent,
-		profile: journey.profile,
-		works: journey.works.map((work) => ({
-			id: work.id,
-			inputRevision: work.inputRevision,
-			access: work.access,
-			accessConfirmed: work.accessConfirmed,
-			included: isIncludedWork(work),
-			placement: work.placement,
-			suggestion: work.suggestion
-		}))
-	});
-}
 function requestMatches(send, journey) {
 	return send.request?.scopeDigest === requestedScope(journey) && !journey.pendingHideId && journey.phase !== "paused" && !journey.abandonedAt;
 }
 async function requestSend(dependencies, raw, hostId, source) {
 	const input = sendRequestSchema.parse(raw);
-	const current = await dependencies.storage.loadSend(input.journeyId);
-	if (!current) throw new ApplicationError("UNKNOWN_ITEM");
-	const recorded = current.send?.id === input.idempotencyKey ? current : await dependencies.storage.loadSend(input.journeyId, input.idempotencyKey);
-	if (recorded?.send) return dependencies.storage.commitSend({
-		journeyId: input.journeyId,
-		expectedJourneyRevision: input.expectedJourneyRevision,
-		expectedSendRevision: null,
-		requestKey: input.idempotencyKey,
-		requestHash: hash$1(input),
-		state: recorded.send,
-		at: dependencies.now()
-	});
-	if (current.journey.revision !== input.expectedJourneyRevision) return {
-		...current,
-		status: "stale"
-	};
-	assertJourneyPrivacyReady(current.journey);
-	if (current.journey.pendingHideId || current.journey.phase === "paused") throw new ApplicationError("SCOPE_NOT_READY");
-	if (current.send && ([
-		"awaiting-packaging",
-		"sending",
-		"waiting",
-		"sign-in",
-		"review"
-	].includes(current.send.status) || current.send.items.some((item) => item.recoveryReview) || current.send.status === "paused" && current.send.confirmedAt !== null && current.send.scopeDigest === scopeDigest(current.journey))) throw new ApplicationError("INVALID_TRANSITION");
-	if (!hostId) throw new ApplicationError("INVALID_TRANSITION");
-	const included = current.journey.works.filter(isIncludedWork);
-	if (!sameIds$1(input.included.map((work) => work.workId), included.map((work) => work.id)) || !input.included.every((item) => included.some((work) => work.id === item.workId && work.access === item.access && work.accessConfirmed)) || !sameIds$1(input.omittedWorkIds, current.journey.works.filter((work) => !isIncludedWork(work)).map((work) => work.id))) throw new ApplicationError("CONFIRMATION_REQUIRED");
-	const subject = (await dependencies.auth.connect(new AbortController().signal))?.subject ?? null;
-	const at = dependencies.now();
-	return dependencies.storage.commitSend({
-		journeyId: input.journeyId,
-		expectedJourneyRevision: input.expectedJourneyRevision,
-		expectedSendRevision: null,
-		requestKey: input.idempotencyKey,
-		requestHash: hash$1(input),
-		state: {
-			id: input.idempotencyKey,
+	let expectedScope = input.displayedScopeDigest;
+	let binding;
+	let firstSendId = null;
+	for (let attempt = 0;; attempt += 1) {
+		const current = await dependencies.storage.loadSend(input.journeyId);
+		if (!current) throw new ApplicationError("UNKNOWN_ITEM");
+		if (attempt === 0) firstSendId = current.send?.id ?? null;
+		const recorded = current.send?.id === input.idempotencyKey ? current : await dependencies.storage.loadSend(input.journeyId, input.idempotencyKey);
+		if (recorded?.send) return dependencies.storage.commitSend({
 			journeyId: input.journeyId,
-			revision: 0,
-			scopeDigest: requestedScope(current.journey),
-			subject,
-			confirmedAt: null,
-			status: "awaiting-packaging",
-			items: [],
-			omitted: [],
-			error: null,
-			request: {
-				requestedAt: at,
-				subject,
-				hostId,
-				source,
+			expectedJourneyRevision: input.expectedJourneyRevision,
+			expectedSendRevision: null,
+			requestKey: input.idempotencyKey,
+			requestHash: hash$1(input),
+			state: recorded.send,
+			at: dependencies.now()
+		});
+		if (attempt > 0 && (current.send?.id ?? null) !== firstSendId) return {
+			...current,
+			status: "stale"
+		};
+		if (expectedScope === void 0) {
+			if (current.journey.revision !== input.expectedJourneyRevision) return {
+				...current,
+				status: "stale"
+			};
+			expectedScope = displayedScopeDigest(current.journey);
+		}
+		if (displayedScopeDigest(current.journey) !== expectedScope) return {
+			...current,
+			status: "stale"
+		};
+		assertJourneyPrivacyReady(current.journey);
+		if (current.journey.pendingHideId || current.journey.phase === "paused") throw new ApplicationError("SCOPE_NOT_READY");
+		if (current.send && ([
+			"awaiting-packaging",
+			"sending",
+			"waiting",
+			"sign-in",
+			"review"
+		].includes(current.send.status) || current.send.items.some((item) => item.recoveryReview) || current.send.status === "paused" && current.send.confirmedAt !== null && scopeDigest(current.journey) === current.send.scopeDigest)) throw new ApplicationError("INVALID_TRANSITION");
+		if (!hostId) throw new ApplicationError("INVALID_TRANSITION");
+		const included = current.journey.works.filter(isIncludedWork);
+		if (!sameIds$1(input.included.map((work) => work.workId), included.map((work) => work.id)) || !input.included.every((item) => included.some((work) => work.id === item.workId && work.access === item.access && work.accessConfirmed)) || !sameIds$1(input.omittedWorkIds, current.journey.works.filter((work) => !isIncludedWork(work)).map((work) => work.id))) throw new ApplicationError("CONFIRMATION_REQUIRED");
+		if (!binding) binding = {
+			subject: (await dependencies.auth.connect(new AbortController().signal))?.subject ?? null,
+			at: dependencies.now()
+		};
+		const { subject, at } = binding;
+		const result = await dependencies.storage.commitSend({
+			journeyId: input.journeyId,
+			expectedJourneyRevision: current.journey.revision,
+			expectedSendRevision: null,
+			requestKey: input.idempotencyKey,
+			requestHash: hash$1(input),
+			state: {
+				id: input.idempotencyKey,
+				journeyId: input.journeyId,
+				revision: 0,
 				scopeDigest: requestedScope(current.journey),
-				included: input.included,
-				omittedWorkIds: input.omittedWorkIds
-			}
-		},
-		at
-	});
+				subject,
+				confirmedAt: null,
+				status: "awaiting-packaging",
+				items: [],
+				omitted: [],
+				error: null,
+				request: {
+					requestedAt: at,
+					subject,
+					hostId,
+					source,
+					scopeDigest: requestedScope(current.journey),
+					included: input.included,
+					omittedWorkIds: input.omittedWorkIds
+				}
+			},
+			at
+		});
+		if (result.status !== "stale" || attempt === 1) return result;
+	}
 }
 /**
 * Previously sent Works with unchanged access remain part of the displayed authorization. Keep
@@ -9484,7 +9539,7 @@ function createJourneySender(dependencies, phases = 3, host = {
 			const snapshot = await dependencies.storage.loadSend(input.journeyId);
 			sessionFacts.retain(input.journeyId, snapshot?.send ?? null);
 			if (!snapshot) throw new ApplicationError("UNKNOWN_ITEM");
-			if (snapshot.journey.revision !== input.expectedJourneyRevision) return {
+			if (input.displayedScopeDigest ? displayedScopeDigest(snapshot.journey) !== input.displayedScopeDigest : snapshot.journey.revision !== input.expectedJourneyRevision) return {
 				...snapshot,
 				status: "stale"
 			};
@@ -9526,7 +9581,7 @@ function createJourneySender(dependencies, phases = 3, host = {
 					await connection.assertCurrent(signal);
 				}
 			}
-			const canReuseExistingSend = !(snapshot.send?.confirmedAt && ["blocked", "paused"].includes(snapshot.send.status)) && !recover && snapshot.send?.scopeDigest === draft.scopeDigest && snapshot.send.subject === draft.subject;
+			const canReuseExistingSend = !(snapshot.send?.confirmedAt && ["blocked", "paused"].includes(snapshot.send.status)) && !recover && snapshot.send && scopeDigest(snapshot.journey) === snapshot.send.scopeDigest && snapshot.send.subject === draft.subject;
 			const next = pending ? {
 				...draft,
 				id: pending.id,
@@ -9538,7 +9593,7 @@ function createJourneySender(dependencies, phases = 3, host = {
 			} : draft;
 			const result = await dependencies.storage.commitSend({
 				journeyId: input.journeyId,
-				expectedJourneyRevision: input.expectedJourneyRevision,
+				expectedJourneyRevision: snapshot.journey.revision,
 				expectedSendRevision: pending?.revision ?? (canReuseExistingSend && snapshot.send ? snapshot.send.revision : null),
 				requestKey: input.idempotencyKey,
 				requestHash: hash$1(input),
@@ -9551,7 +9606,12 @@ function createJourneySender(dependencies, phases = 3, host = {
 		async start(raw, signal) {
 			const input = sendStartSchema.parse(raw);
 			const snapshot = await load(input);
-			if (!matchesAction(snapshot, input)) return saveSend(dependencies, snapshot, snapshot.send, input);
+			if (snapshot.send.revision !== input.expectedSendRevision || !input.displayedScopeDigest && snapshot.journey.revision !== input.expectedJourneyRevision) return saveSend(dependencies, snapshot, snapshot.send, input);
+			if (input.displayedScopeDigest && displayedScopeDigest(snapshot.journey) !== input.displayedScopeDigest) return {
+				...snapshot,
+				status: "stale"
+			};
+			const saveStart = (next) => saveSend(dependencies, snapshot, next, input, snapshot.journey.revision);
 			if (pendingElsewhere(snapshot.send)) return {
 				...snapshot,
 				status: "applied"
@@ -9560,7 +9620,7 @@ function createJourneySender(dependencies, phases = 3, host = {
 			if (snapshot.send.request && !snapshot.send.confirmedAt && (authorizationError || !requestMatches(snapshot.send, snapshot.journey))) return block(snapshot, snapshot.send, authorizationError ?? "REVISION_CONFLICT");
 			assertScope(snapshot.journey, snapshot.send);
 			if (!sameIds$1(input.confirmedWorkIds, snapshot.send.items.map((item) => item.workId)) || !sameIds$1(input.confirmedOmittedWorkIds, snapshot.send.omitted.map((item) => item.workId)) || input.scopeDigest !== snapshot.send.scopeDigest || snapshot.send.items.length === 0) throw new ApplicationError("CONFIRMATION_REQUIRED");
-			if (snapshot.send.confirmedAt !== null) return saveSend(dependencies, snapshot, snapshot.send, input);
+			if (snapshot.send.confirmedAt !== null) return saveStart(snapshot.send);
 			const connection = await dependencies.auth.connect(signal);
 			if (snapshot.send.request && (connection?.subject ?? null) !== snapshot.send.request.subject) return saveSend(dependencies, snapshot, {
 				...snapshot.send,
@@ -9576,18 +9636,18 @@ function createJourneySender(dependencies, phases = 3, host = {
 			if (connection) try {
 				profile = await prepareProfile(dependencies, snapshot, connection, signal);
 			} catch (error) {
-				if (error instanceof ApplicationError && error.code === "REVISION_CONFLICT") return saveSend(dependencies, snapshot, snapshot.send, input);
+				if (error instanceof ApplicationError && error.code === "REVISION_CONFLICT") return saveStart(snapshot.send);
 				throw error;
 			}
 			signal.throwIfAborted();
 			const finalAuthorizationError = await requestError(dependencies, snapshot.send, hostId, signal);
 			if (finalAuthorizationError) return block(snapshot, snapshot.send, finalAuthorizationError);
-			return saveSend(dependencies, snapshot, {
+			return saveStart({
 				...snapshot.send,
 				subject: connection?.subject ?? snapshot.send.subject,
 				confirmedAt: snapshot.send.request && !connection ? null : dependencies.now(),
 				...profile
-			}, input);
+			});
 		},
 		async respond(raw) {
 			const input = sendChoiceSchema.parse(raw);

package/dist/{run-RA_8zZsL.mjs → run-xlOaKCk8.mjs}

@@ -1,7 +1,7 @@
 import { ln as sessionSchema } from "./locate-BWkblijS.mjs";
 import { t as createZstdFrameCheck$1 } from "./frame-Dj5Zs6UW.mjs";
-import "./src-d7n58sbH.mjs";
-import { a as isRecord } from "./model-f_QnDyyb.mjs";
+import "./src-DzKuzGVH.mjs";
+import { a as isRecord } from "./model-CSx2dP_P.mjs";
 import { constants } from "node:fs";
 import { z } from "zod";
 import { lstat, open, stat } from "node:fs/promises";

package/dist/{src-BBjnljUs.mjs → src-BgsEnMsy.mjs}

@@ -1,7 +1,7 @@
 import { Bn as nativeItems, En as walkNativeFields, Nn as parseNativeRecord, Rn as nativeBoolean, Vn as nativeText, Wn as retainedMainTextNodes, Xn as defaultLimits, an as observeSource, on as sourceSnapshotId, ur as ProcessingError, zn as nativeField } from "./locate-BWkblijS.mjs";
-import { At as nativeAdapterVersions, nt as reviewInventory, oi as gitMetadataBudgetBytes } from "./src-d7n58sbH.mjs";
-import { a as isRecord, i as errorCode, n as checkDiscoveryAbort, o as unresolvedMetadata, r as discoveryBounds, t as DiscoveryWarnings } from "./model-f_QnDyyb.mjs";
-import { c as previewLimits, d as checkOpenSource, f as checkSource, h as openSource, i as pageFits, l as previewSourceVersion, m as noSymlinks, p as fileSnapshot, r as previewHeapLimits, s as previewMessageSchema, u as createZstdFrameCheck } from "./run-RA_8zZsL.mjs";
+import { At as nativeAdapterVersions, ci as gitMetadataBudgetBytes, nt as reviewInventory } from "./src-DzKuzGVH.mjs";
+import { a as isRecord, i as errorCode, n as checkDiscoveryAbort, o as unresolvedMetadata, r as discoveryBounds, t as DiscoveryWarnings } from "./model-CSx2dP_P.mjs";
+import { c as previewLimits, d as checkOpenSource, f as checkSource, h as openSource, i as pageFits, l as previewSourceVersion, m as noSymlinks, p as fileSnapshot, r as previewHeapLimits, s as previewMessageSchema, u as createZstdFrameCheck } from "./run-xlOaKCk8.mjs";
 import { a as titleHintLimits, n as titleHeapLimits, o as titleInputSchema, r as decodeTitleError, s as titleReplySchema } from "./heap-1FYhGds4.mjs";
 import { constants } from "node:fs";
 import { lstat, open, opendir, readFile, readdir, realpath, stat } from "node:fs/promises";