dsh-mnemon-strategy-default-three-tier 0.5.8 → 0.5.9

package/lib/index.js

@@ -196,18 +196,23 @@ var ThreeTierTurn = class {
 		const input = memoryInputRecord(request.input, "Documents search");
 		const query = String(input.query).trim();
 		const includeArchived = input.includeArchived === true;
+		if (this.state.documentSearchPending !== void 0) {
+			await Promise.allSettled([this.state.documentSearchPending]);
+			return this.documents(request, read);
+		}
 		if (this.state.documentSearchClaimed) return {
 			...this.empty(request),
 			output: {
 				query,
 				includeArchived,
 				notRun: true,
+				budgetExhausted: true,
 				results: [],
-				hint: "This Agent turn already used its Documents search slot, so no second disk query ran. Use the admitted evidence, make one focused mnemon_recall only if exact durable history is still missing, or answer with appropriate uncertainty."
+				hint: "This query did not run: this Agent turn already used its Documents search. The empty list does not mean no document matches. Use the admitted evidence, make one focused mnemon_recall where it is offered only if exact durable history is still missing, or answer with appropriate uncertainty."
 			}
 		};
 		this.state.documentSearchClaimed = true;
-		const evidence = await read({
+		const pending = read({
 			query,
 			includeArchived,
 			limit: Math.min(4, typeof input.limit === "number" ? Math.max(1, input.limit) : 4)
@@ -215,6 +220,16 @@ var ThreeTierTurn = class {
 			maxResults: 4,
 			maxCharacters: 6e3
 		});
+		this.state.documentSearchPending = pending;
+		let evidence;
+		try {
+			evidence = await pending;
+		} catch (error) {
+			this.state.documentSearchClaimed = false;
+			throw error;
+		} finally {
+			if (this.state.documentSearchPending === pending) delete this.state.documentSearchPending;
+		}
 		const metadata = optionalObject(evidence.metadata) ?? {};
 		const results = evidence.items.filter((item) => optionalObject(item.provenance)?.kind !== "suggestion").map((item) => {
 			const record = optionalObject(item.provenance) ?? {};
@@ -277,14 +292,19 @@ var ThreeTierTurn = class {
 			};
 		}
 		if (retrieval.recallAttempts.length >= MODEL_RECALL_ATTEMPT_LIMIT) {
-			const latest = retrieval.recallAttempts[retrieval.recallAttempts.length - 1];
-			const last = latest?.result ?? await latest?.pending;
-			const previous = last?.memoryEvidence?.sourceInstanceKey === authority.sourceInstanceKey ? last : void 0;
+			const inflight = retrieval.recallAttempts.flatMap((entry) => entry.pending === void 0 ? [] : [entry.pending]);
+			if (inflight.length > 0) {
+				await Promise.allSettled(inflight);
+				signal.throwIfAborted();
+				return this.recall(request, read, signal, authority);
+			}
 			return {
-				query: previous?.query ?? scoped.query,
-				mode: previous?.mode ?? scoped.mode ?? "smart",
-				...replayEvidence(previous, scoped.memoryBodyIds, authority.sourceInstanceKey),
-				hint: "The two-query turn Recall budget is exhausted. The Host replayed the latest admitted evidence without another Provider query; stop retrieval and answer from the evidence or state what remains unknown."
+				query: scoped.query,
+				mode: scoped.mode ?? "smart",
+				results: [],
+				notRun: true,
+				budgetExhausted: true,
+				hint: "The two-query turn Recall budget is exhausted, so this query did not run. It has no results; the empty list does not mean nothing matches. Answer from the evidence the other Recall calls returned, or state what remains unknown."
 			};
 		}
 		const attemptIndex = retrieval.recallAttempts.length;
@@ -346,6 +366,7 @@ var ThreeTierTurn = class {
 			query: `related:${id}`,
 			mode: "related",
 			results: [],
+			notRun: true,
 			hint: "Related traversal requires an insight admitted by the current turn's direct Recall. No Provider query was made."
 		};
 		const digest = sha256(JSON.stringify({
@@ -356,13 +377,28 @@ var ThreeTierTurn = class {
 			edge: options.edge ?? ""
 		}));
 		if (retrieval.relatedDigest !== void 0) {
+			if (retrieval.relatedDigest !== digest) {
+				if (retrieval.relatedPending !== void 0) {
+					await Promise.allSettled([retrieval.relatedPending]);
+					signal.throwIfAborted();
+					return this.related(id, memoryBodyId, read, signal, authority, options);
+				}
+				return {
+					query: `related:${id}`,
+					mode: "related",
+					results: [],
+					notRun: true,
+					budgetExhausted: true,
+					hint: "Related traversal is complete for this turn, so this one did not run. It has no results; the empty list does not mean nothing is related. Answer from the evidence the other calls returned."
+				};
+			}
 			const last = retrieval.relatedResult ?? await retrieval.relatedPending;
 			const previous = last?.memoryEvidence?.sourceInstanceKey === authority.sourceInstanceKey ? last : void 0;
 			return {
 				query: previous?.query ?? `related:${id}`,
 				mode: previous?.mode ?? "related",
 				...replayEvidence(previous, [selected], authority.sourceInstanceKey),
-				hint: retrieval.relatedDigest === digest ? "This exact Related traversal already ran. The Host replayed its admitted evidence without another Provider query; stop retrieval and answer from it." : "Related traversal is complete for this turn. The Host replayed the admitted evidence; stop retrieval and answer from it."
+				hint: "This exact Related traversal already ran. The Host replayed its admitted evidence without another Provider query; stop retrieval and answer from it."
 			};
 		}
 		retrieval.relatedDigest = digest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mnemon-strategy-default-three-tier",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "Explicit three-tier View Strategy for Composable View Memory.",
   "license": "MIT",
   "type": "module",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
-    "dsh-mnemon": "^0.5.25",
+    "dsh-mnemon": "^0.5.30",
     "tsdown": "^0.22.0",
     "typescript": "^5.9.0",
     "vitest": "^3.2.0"