@gitroll/tacitt-cli 0.6.6 → 0.6.8

package/dist/cli.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import { _ as permissionDiagnostic, a as readAgentPresence, d as guardDetachedStartup, f as createRenderActivity, g as longCommands, h as businessCommands, i as invoke, l as awaitingPassport, m as parseOptions, n as readOperation, o as createRuntime, p as helpText, r as waitOperation, s as executorEventSchema, t as cancelOperation, u as serveDetached, v as startupFailure, y as traceStartup } from "./query-D2L1WzCS.mjs";
+import { _ as permissionDiagnostic, a as readAgentPresence, d as guardDetachedStartup, f as createRenderActivity, g as longCommands, h as businessCommands, i as invoke, l as awaitingPassport, m as parseOptions, n as readOperation, o as createRuntime, p as helpText, r as waitOperation, s as executorEventSchema, t as cancelOperation, u as serveDetached, v as startupFailure, y as traceStartup } from "./query-CaBXQlpF.mjs";
 import { nt as makePrivateDirectory, rt as openPrivateFile } from "./src-p_uJNjV3.mjs";
-import { A as createExecutionPort, I as inBackgroundStatusPoll, j as startHost, k as readStateDump } from "./job-DiewDY_E.mjs";
+import { A as createExecutionPort, I as inBackgroundStatusPoll, j as startHost, k as readStateDump } from "./job-CeSf9UCC.mjs";
 import { $t as safeField, Qt as safeCode, Xt as ApplicationError } from "./locate-BWkblijS.mjs";
 import { $n as reviewTransportBytes, ci as stateSchema, ct as resolveFailureLocation, tt as readWorkspaceOutcomes } from "./src-d7n58sbH.mjs";
-import { _t as isCoordinationBusy } from "./heap-DFHajqf2.mjs";
+import { _t as isCoordinationBusy } from "./heap-DsE74_-n.mjs";
 import { constants, createReadStream, write } from "node:fs";
 import { z } from "zod";
 import { lstat, mkdir, mkdtemp, open, readFile, readdir, realpath, rename, rm, writeFile } from "node:fs/promises";

package/dist/configured-session-worker.mjs

@@ -1,5 +1,5 @@
 import { et as safeError, h as captureConfiguredSessionJob, j as runConfiguredSessionJob, u as runConfiguredScanJob, z as gitSeedsProvider } from "./src-p_uJNjV3.mjs";
-import { d as runJourneyBaseJob, i as runJourneyOutputVerifyJob, n as runJourneyOutputJob, r as runJourneyOutputShardJob } from "./job-DiewDY_E.mjs";
+import { d as runJourneyBaseJob, i as runJourneyOutputVerifyJob, n as runJourneyOutputJob, r as runJourneyOutputShardJob } from "./job-CeSf9UCC.mjs";
 import { Dn as createStaticProcessor, Qt as safeCode } from "./locate-BWkblijS.mjs";
 import { l as createNativeAdapters } from "./src-BBjnljUs.mjs";
 import "./src-d7n58sbH.mjs";

package/dist/{heap-DFHajqf2.mjs → heap-DsE74_-n.mjs}

@@ -3608,7 +3608,15 @@ function saveJourneyResource(db, resource) {
 			db.prepare("UPDATE journey_resources SET json=? WHERE journey_id=? AND kind=? AND id=?").run(json, resource.journeyId, resource.kind, key);
 			return;
 		}
-		if (old["json"] !== json) throw new ApplicationError("OPERATION_CONFLICT");
+		if (old["json"] !== json) throw new ApplicationError("OPERATION_CONFLICT", void 0, { cause: new Error(JSON.stringify({
+			operation: "journey.saveResource",
+			kind: resource.kind,
+			journeyId: resource.journeyId,
+			resourceKey: key,
+			..."workId" in resource ? { workId: resource.workId } : {},
+			..."inputRevision" in resource ? { inputRevision: resource.inputRevision } : {},
+			..."revision" in resource ? { revision: resource.revision } : {}
+		})) });
 		return;
 	}
 	db.prepare("INSERT INTO journey_resources VALUES(?,?,?,?)").run(resource.journeyId, resource.kind, key, json);
@@ -6988,6 +6996,7 @@ function isOperationName(value) {
 }
 //#endregion
 //#region packages/local-host/src/store/worker/protocol.ts
+const maximumErrorStackLength = 16384;
 const encodedErrorSchema = z.lazy(() => z.object({
 	kind: z.enum([
 		"store",
@@ -6998,6 +7007,7 @@ const encodedErrorSchema = z.lazy(() => z.object({
 	]),
 	name: z.string(),
 	message: z.string(),
+	stack: z.string().max(maximumErrorStackLength).nullable(),
 	code: z.string().nullable(),
 	errcode: z.number().nullable(),
 	errstr: z.string().nullable(),
@@ -7107,8 +7117,8 @@ function dropsAnchor(error) {
 	return typeof code === "string" && (code.startsWith("STALE_") || code === "RESET_INCOMPLETE" || code === "STATE_CLOSE_FAILED");
 }
 var ProtocolError = class extends Error {
-	constructor(message) {
-		super(message);
+	constructor(message, options) {
+		super(message, options);
 		this.name = "ProtocolError";
 	}
 };
@@ -7122,7 +7132,7 @@ function field(value, key) {
 function text(value) {
 	return typeof value === "string" ? value : null;
 }
-/** Keeps codes and causes that classification depends on; no stack crosses the thread. */
+/** Keeps classification and bounded original stacks for private diagnostics across the Worker. */
 function encodeError(error, depth = 0) {
 	const code = text(field(error, "code"));
 	const errcode = field(error, "errcode");
@@ -7132,6 +7142,7 @@ function encodeError(error, depth = 0) {
 		kind: error instanceof StoreError ? "store" : error instanceof ApplicationError ? "application" : error instanceof ProtocolError ? "protocol" : typeof errcode === "number" ? "sqlite" : "error",
 		name: error instanceof Error ? error.name : "Error",
 		message: error instanceof Error ? error.message : "Non-error value thrown",
+		stack: text(field(error, "stack"))?.slice(0, 16384) ?? null,
 		code,
 		errcode: typeof errcode === "number" ? errcode : null,
 		errstr: text(field(error, "errstr")),
@@ -7148,7 +7159,7 @@ function decodeError(encoded) {
 	let error;
 	if (encoded.kind === "store" && isStoreErrorCode(encoded.code)) error = new StoreError(encoded.code, encoded.message, options);
 	else if (encoded.kind === "application" && encoded.code !== null) error = new ApplicationError(encoded.code, encoded.field ?? void 0, options);
-	else if (encoded.kind === "protocol") error = new ProtocolError(encoded.message);
+	else if (encoded.kind === "protocol") error = new ProtocolError(encoded.message, options);
 	else if (encoded.errors.length > 0) error = new AggregateError(encoded.errors.map(decodeError), encoded.message, options);
 	else error = new Error(encoded.message, options);
 	if (encoded.kind === "error" || encoded.kind === "sqlite") error.name = encoded.name;
@@ -7157,6 +7168,8 @@ function decodeError(encoded) {
 		...encoded.errcode === null ? {} : { errcode: encoded.errcode },
 		...encoded.errstr === null ? {} : { errstr: encoded.errstr }
 	});
+	if (encoded.stack === null) delete error.stack;
+	else error.stack = encoded.stack;
 	return error;
 }
 //#endregion

package/dist/{job-DiewDY_E.mjs → job-CeSf9UCC.mjs}

@@ -1,7 +1,7 @@
 import { A as renderJobDigest, D as prepareCollectionProduction, E as checkReusableBundle, L as privateCollectionDirectory, M as readCollectionIndex, N as parseCollectionWorkspaceSummary, V as writeLogicalJourneyOutput, W as readConfiguredOutputInfo, at as windowsOwnerOnly, b as writeLogicalJourneyBase, d as verifyOutputShard, f as writeOutputShard, nt as makePrivateDirectory, ot as isWindowsAclFailure, rt as openPrivateFile, w as readConfiguredSearchFields, z as gitSeedsProvider } from "./src-p_uJNjV3.mjs";
 import { $t as safeField, F as bClassificationKey, Ft as termTypeInfo, H as codePointLength, Ht as journeyProfileAddressActionSchema, K as utf16Offset, Kt as passportAddressSchema, N as bUnitFragments, Qt as safeCode, Ut as journeyProfileLinksActionSchema, V as bDigest, Xt as ApplicationError, b as validateBReview, c as textDigest, h as reviewFindingsDigest, ht as journeyDescribeSchema, jt as reviewTermsInputSchema, l as validateReview, n as compileBFindings, nn as reviewFamilies, r as reviewBatchChunks, s as reviewSubmitSchema, t as locateTerms, z as bAnchorKey, zt as filterInventoryByPeriod } from "./locate-BWkblijS.mjs";
 import { $ as settingsBatchSchema, $r as journeyPreviewSchema, B as inspectionStartSchema, C as rebindReviewOverlay, Ct as sendPrepareSchema, D as staticallyHiddenFindings, Dn as termHideAdditions, Dr as nativeGetSchema, E as guardedFindingText, Er as nativeEventsSchema, It as journeyReviewStorageQuerySchema, Ln as confirmedHideGroupIds, Mr as staticSessionResourceSchema, On as addHideIndexTokens, Or as nativeRespondSchema, Qn as reviewRepairResourceSchema, Qr as journeyFindingsSchema, Qt as journeyPolicyRespondSchema, S as rebindReviewAlignment, Sn as confirmedHideAdditions, Sr as journeyClassificationSessionsSchema, St as sendChoiceSchema, T as reviewBatchReuse, Tn as renderedHideValue, Tt as sendStartSchema, Un as maskedHitsStale, Ut as reviewCompileSchema, W as inspectionQuerySchema, Wt as journeyContextQuerySchema, Xn as reviewCandidateResourceSchema, Yn as reviewCandidateInputSchema, Zn as reviewRepairInputSchema, Zr as journeyFindingImpactSchema, _n as sessionUsefulnessInputSchema, a as bCrossSegmentReviewSchema, ai as selectionSchema, an as reviewAttemptResourceSchema, b as isGenericPublicTerm, bt as replaceSensitiveTermsSchema, c as reconstructBFields, ci as stateSchema, cn as sessionReconcileInputSchema, ct as resolveFailureLocation, dn as sessionRereadInputSchema, ei as journeyRenderInputSchema, en as journeyResourceQuerySchema, er as bReviewDigest, et as settingsQuerySchema, f as selectedValueMembers, ft as manualUploadChoiceSchema, hi as selectFrozenConfiguration, ht as manualUploadStartSchema, i as validateBCrossSegmentReview, ii as selectionBatchSchema, jn as packHideIndex, kn as hideKeyId, mi as freezeConfiguration, mn as sessionReviewQuerySchema, n as scanBatchEquivalenceDigest, ni as commandSchema, nr as planBRepair, o as bRereadDigest, p as splitSelectorValues, pi as defaultScopedSettings, pn as sessionReviewInputSchema, pr as journeyInventoryQuerySchema, pt as manualUploadPrepareSchema, r as locateTermEvidence, ri as packageCommandSchema, rn as journeyPlaceSchema, s as reconcileBSession, si as producerVersion, t as scanBatchContextDigest, ti as journeyRenderSchema, tt as readWorkspaceOutcomes, ut as manualUploadActionSchema, vt as maximumTermsFileBytes, w as rebindReviewSubmit, wn as readConfirmedHideChange, wt as sendRequestSchema, x as bReviewScope, xt as sendActionSchema, z as inspectionCancelSchema } from "./src-d7n58sbH.mjs";
-import { $ as checkVersion, A as resourceSelectionQuerySchema, B as termReuseQuerySchema, C as loadAcceptedReview, D as aggregateUsefulness, E as loadPrivateResource, F as validateUnitCandidate, G as requireActiveBatch, H as batchHeader, I as reuseQuerySchema, J as validateDatabase, K as initializeAndClaim, L as batchQuery, M as evaluateUnitEvidence, N as sameCandidateRequest, O as sessionUsefulnessRecommendation, P as validateCandidateAttempt, Q as validateState, R as isPrivateResourceKind, S as validateSessionBindings, T as loadBatch, U as createJourneyPayloadFiles, V as privateReviewHash, W as validateBatchBody, X as readBundleDirectory, Y as withDatabase, Z as readStoredState, _ as loadReconciliation, _t as isCoordinationBusy, a as decodeError, at as hasResetMarker, b as validatePreparationSelection, c as dropsAnchor, ct as privatePath, d as parseDelivery, dt as stateDirectory, et as schemaVersion, f as validateCandidate, ft as syncDirectory, g as loadPreparedBodies, gt as errorCode, h as loadPreparation, ht as StoreError, i as createExecutor, it as finishReset, j as inspectionQuerySchema$1, k as sessionQuery, l as replySchema, lt as readResetMarker, m as loadStatus, mt as withFileCheckTimings, n as releaseInheritedHeapFlags, nt as createDatabaseFile, o as ProtocolError, ot as inspectStateFiles, p as classificationJourneyCommit, pt as withStateSnapshot, q as ownership, r as storeHeapLimits, rt as databaseName, s as allowedReplies, st as present, tt as beginReset, u as operations, ut as recheckPrivatePath, v as loadRereadBodies, vt as isSqliteCorruption, w as loadAuthenticatedReview, x as validateSessionReconciliation, y as loadSessionBodies, z as privateResourceHeader } from "./heap-DFHajqf2.mjs";
+import { $ as checkVersion, A as resourceSelectionQuerySchema, B as termReuseQuerySchema, C as loadAcceptedReview, D as aggregateUsefulness, E as loadPrivateResource, F as validateUnitCandidate, G as requireActiveBatch, H as batchHeader, I as reuseQuerySchema, J as validateDatabase, K as initializeAndClaim, L as batchQuery, M as evaluateUnitEvidence, N as sameCandidateRequest, O as sessionUsefulnessRecommendation, P as validateCandidateAttempt, Q as validateState, R as isPrivateResourceKind, S as validateSessionBindings, T as loadBatch, U as createJourneyPayloadFiles, V as privateReviewHash, W as validateBatchBody, X as readBundleDirectory, Y as withDatabase, Z as readStoredState, _ as loadReconciliation, _t as isCoordinationBusy, a as decodeError, at as hasResetMarker, b as validatePreparationSelection, c as dropsAnchor, ct as privatePath, d as parseDelivery, dt as stateDirectory, et as schemaVersion, f as validateCandidate, ft as syncDirectory, g as loadPreparedBodies, gt as errorCode, h as loadPreparation, ht as StoreError, i as createExecutor, it as finishReset, j as inspectionQuerySchema$1, k as sessionQuery, l as replySchema, lt as readResetMarker, m as loadStatus, mt as withFileCheckTimings, n as releaseInheritedHeapFlags, nt as createDatabaseFile, o as ProtocolError, ot as inspectStateFiles, p as classificationJourneyCommit, pt as withStateSnapshot, q as ownership, r as storeHeapLimits, rt as databaseName, s as allowedReplies, st as present, tt as beginReset, u as operations, ut as recheckPrivatePath, v as loadRereadBodies, vt as isSqliteCorruption, w as loadAuthenticatedReview, x as validateSessionReconciliation, y as loadSessionBodies, z as privateResourceHeader } from "./heap-DsE74_-n.mjs";
 import { constants, write } from "node:fs";
 import { z } from "zod";
 import { copyFile, link, lstat, mkdir, mkdtemp, open, opendir, readFile, readdir, realpath, rename, rm, unlink, writeFile } from "node:fs/promises";

package/dist/operation-executor.mjs

@@ -1,4 +1,4 @@
-import { c as executorRequestSchema, g as longCommands, i as invoke, m as parseOptions, n as readOperation, o as createRuntime, r as waitOperation, v as startupFailure } from "./query-D2L1WzCS.mjs";
+import { c as executorRequestSchema, g as longCommands, i as invoke, m as parseOptions, n as readOperation, o as createRuntime, r as waitOperation, v as startupFailure } from "./query-CaBXQlpF.mjs";
 import { $t as safeField, Qt as safeCode, Xt as ApplicationError } from "./locate-BWkblijS.mjs";
 import "./src-d7n58sbH.mjs";
 import { z } from "zod";

package/dist/{query-D2L1WzCS.mjs → query-CaBXQlpF.mjs}

@@ -1,9 +1,9 @@
 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-DiewDY_E.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 { $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-DFHajqf2.mjs";
+import { _t as isCoordinationBusy } from "./heap-DsE74_-n.mjs";
 import { t as createAgentSetupPort } from "./agent-setup-YlFIJz-h.mjs";
 import { t as workerMessageSchema } from "./messages-D3m3bhva.mjs";
 import { constants, write } from "node:fs";
@@ -2947,11 +2947,12 @@ async function runWorkers(workers) {
 /** Package-only staging from the complete Track B base; scanning never calls this. */
 async function packageBase(storage, state, work, processing, directory, signal, readState = () => storage.current(state.journeyId), write = writeJourneyBase) {
 	assertJourneyPrivacyReady(state, true);
-	const existing = (await storage.resources({
+	const readBase = async () => (await storage.resources({
 		journeyId: state.journeyId,
 		kind: "base",
 		id: `${work.id}:${work.inputRevision}`
-	})).find((item) => item.kind === "base" && item.workId === work.id && item.inputRevision === work.inputRevision);
+	})).find((item) => item.kind === "base" && item.journeyId === state.journeyId && item.workId === work.id && item.inputRevision === work.inputRevision);
+	const existing = await readBase();
 	if (existing?.kind === "base") return existing;
 	const inputs = await staticBaseInputs(storage, state, work);
 	if (!inputs) throw new ApplicationError("ARTIFACT_EMPTY_SCOPE");
@@ -2961,12 +2962,26 @@ async function packageBase(storage, state, work, processing, directory, signal,
 		directory,
 		processing
 	}, signal);
-	const after = await readState();
-	const current = after?.works.find((item) => item.id === work.id);
-	if (!after || after.snapshotId !== state.snapshotId || after.configurationId !== state.configurationId || current?.revision !== work.revision || current.inputRevision !== work.inputRevision || after.pendingHideId) throw new ApplicationError("REVISION_CONFLICT");
-	assertJourneyPrivacyReady(after, true);
-	await storage.saveResource(base);
-	return base;
+	async function assertCurrent() {
+		signal.throwIfAborted();
+		const after = await readState();
+		signal.throwIfAborted();
+		const current = after?.works.find((item) => item.id === work.id);
+		if (!after || after.snapshotId !== state.snapshotId || after.configurationId !== state.configurationId || current?.revision !== work.revision || current.inputRevision !== work.inputRevision || after.pendingHideId) throw new ApplicationError("REVISION_CONFLICT");
+		if (after.phase === "paused") throw new ApplicationError("OPERATION_CANCELED");
+		assertJourneyPrivacyReady(after, true);
+	}
+	await assertCurrent();
+	try {
+		await storage.saveResource(base);
+		return base;
+	} catch (error) {
+		if (!(error instanceof ApplicationError && error.code === "OPERATION_CONFLICT")) throw error;
+		const winner = await readBase();
+		if (winner?.kind !== "base") throw error;
+		await assertCurrent();
+		return winner;
+	}
 }
 //#endregion
 //#region apps/cli/src/journey/edits.ts
@@ -3751,7 +3766,11 @@ function createJourneyRenderer(options) {
 			return {
 				...current,
 				works,
-				phase: current.phase === "paused" ? "paused" : current.readingComplete && works.every((item) => !isIncludedWork(item) || item.status === "ready") ? "ready" : current.phase
+				phase: [
+					"paused",
+					"sending",
+					"completed"
+				].includes(current.phase) ? current.phase : current.readingComplete && works.every((item) => !isIncludedWork(item) || item.status === "ready") ? "ready" : current.phase
 			};
 		});
 	}
@@ -6909,7 +6928,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;
@@ -6948,8 +6967,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
@@ -6957,26 +6999,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();

package/dist/store-database-worker.mjs

@@ -1,4 +1,4 @@
-import { i as createExecutor, t as assertStoreHeap } from "./heap-DFHajqf2.mjs";
+import { i as createExecutor, t as assertStoreHeap } from "./heap-DsE74_-n.mjs";
 import { parentPort } from "node:worker_threads";
 //#region packages/local-host/src/store/worker/entry.ts
 if (!parentPort) throw new Error("STORE_WORKER_REQUIRED");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitroll/tacitt-cli",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Private local session review and export for coding agents",
   "license": "UNLICENSED",
   "repository": {