@orkestrel/agent 0.0.37 → 0.0.39

package/dist/src/core/index.cjs

@@ -2756,6 +2756,7 @@ var AgentJudge = class {
 *
 * @remarks
 * The caller supplies the server origin and model. Every question travels in one request.
+* Wire keys are zero-based positions in question entry order; answers return under the caller's ids.
 * Server measures are ignored; the response model is preserved.
 * `headers` supplies authentication through the shared judge engine.
 * The example readings are those of the response Ollama 0.40.0 returned for that request on 2026-10-07.
@@ -2812,7 +2813,7 @@ var SystemOneJudge = class extends AgentJudge {
 	/** Identifies the System One protocol. */
 	name = "systemone";
 	/**
-	* Projects the state and questions onto the System One request with the configured model.
+	* Projects the state and questions onto the System One request with the configured model and positional keys.
 	*
 	* @param request - The state and questions keyed by caller id
 	* @returns The System One request body
@@ -2821,11 +2822,11 @@ var SystemOneJudge = class extends AgentJudge {
 		return {
 			state: request.state,
 			model: this.model,
-			questions: Object.fromEntries(Object.entries(request.questions).map(([id, question]) => [id, questionToSystemOne(question)]))
+			questions: Object.fromEntries(Object.values(request.questions).map((question, index) => [String(index), questionToSystemOne(question)]))
 		};
 	}
 	/**
-	* Decodes requested System One answers and reports the server model and available usage.
+	* Decodes positional System One answers under caller ids and reports the server model and available usage.
 	*
 	* @param value - The parsed response body
 	* @param request - The questions defining the expected answers
@@ -2835,9 +2836,10 @@ var SystemOneJudge = class extends AgentJudge {
 	*/
 	read(value, request) {
 		if (!isSystemOneResponse(value)) throw new JudgeError("PROTOCOL", `judge error: invalid System One response envelope; received ${(0, _orkestrel_contract.preview)(value)}`);
-		const entries = Object.entries(request.questions).map(([id, question]) => {
-			if (!Object.hasOwn(value.answers, id)) throw new JudgeError("PROTOCOL", `judge error: question ${id} has no System One answer`);
-			const wire = value.answers[id];
+		const entries = Object.entries(request.questions).map(([id, question], index) => {
+			const position = String(index);
+			if (!Object.hasOwn(value.answers, position)) throw new JudgeError("PROTOCOL", `judge error: question ${id} has no System One answer`);
+			const wire = value.answers[position];
 			if (!isSystemOneAnswer(wire)) throw new JudgeError("PROTOCOL", `judge error: question ${id} has an invalid System One answer; received ${(0, _orkestrel_contract.preview)(wire)}`);
 			const answer = extractSystemOneAnswer(wire, question);
 			if (answer === void 0) throw new JudgeError("PROTOCOL", `judge error: question ${id} has a mismatched or incomplete System One answer`);
@@ -9833,14 +9835,19 @@ function splitTopic(topic) {
 * Cuts entries to a room and names how many it left out.
 *
 * @remarks
-* The cut keeps at least one entry. When it leaves entries out, its last line reads
+* By default the cut keeps at least one entry. With `first: false`, it keeps whole entries only
+* when the joined result, tool framing, and omission line fit, and considers later entries after
+* an oversized group. When it leaves some entries out, its last line reads
 * `N older items not shown; name a narrower topic to narrow the recall`, which
 * {@link matchesCutLine} recognizes. Pass `more` when the entries aren't in age order, so the line
-* doesn't claim an omitted entry is older than a kept one.
+* doesn't claim an omitted entry is older than a kept one. A fitted cut also uses `more` when it
+* skips an entry before a kept one. With no kept entry it reads
+* `N older items didn't fit in this request; answer from the messages you can see`.
 *
 * @param entries - The entries in the order they are kept
 * @param room - The estimate units the joined entries can take
 * @param kind - What the cut line calls an omitted entry. Default: `older`
+* @param first - If `true`, keeps the first entry regardless of room; if `false`, fits every entry and the omission line. Default: `true`
 * @returns The kept entries followed by the cut line when any were left out, joined by newlines
 *
 * @example
@@ -9848,7 +9855,30 @@ function splitTopic(topic) {
 * cutListing(['first entry', 'second entry'], 1) // 'first entry\n1 older item not shown; name a narrower topic to narrow the recall'
 * ```
 */
-function cutListing(entries, room, kind = "older") {
+function cutListing(entries, room, kind = "older", first = true) {
+	if (!first) {
+		if (estimateMessages([{
+			id: "recall",
+			role: "tool",
+			content: entries.join("\n")
+		}]) <= room) return entries.join("\n");
+		const kept = entries.reduce((accepted, entry, at) => {
+			const left = entries.length - accepted.length - 1;
+			const omitted = accepted.length < at ? "more" : kind;
+			return estimateMessages([{
+				id: "recall",
+				role: "tool",
+				content: [
+					...accepted.map((index) => entries[index]),
+					entry,
+					...left > 0 ? [`${left} ${omitted} item${left === 1 ? "" : "s"} not shown; name a narrower topic to narrow the recall`] : []
+				].join("\n")
+			}]) <= room ? [...accepted, at] : accepted;
+		}, []);
+		const left = entries.length - kept.length;
+		const omitted = kept.some((at, index) => at !== index) ? "more" : kind;
+		return [...kept.map((at) => entries[at]), ...left > 0 ? [`${left} ${omitted} item${left === 1 ? "" : "s"} ${kept.length === 0 ? "didn't fit in this request; answer from the messages you can see" : "not shown; name a narrower topic to narrow the recall"}`] : []].join("\n");
+	}
 	const stop = [...entries.keys()].findIndex((at) => at > 0 && estimateMessages([{
 		id: "recall",
 		role: "tool",
@@ -9870,7 +9900,7 @@ function cutListing(entries, room, kind = "older") {
 * ```
 */
 function matchesCutLine(line) {
-	return /^\d+ (?:older|more) items? not shown; /.test(line);
+	return /^\d+ (?:older|more) items? (?:not shown; |didn't fit in this request; answer from the messages you can see$)/.test(line);
 }
 /**
 * Renders the tail stub of a lookup result from an earlier request.
@@ -10795,7 +10825,7 @@ var LedgerRequest = class {
 	#passes = [];
 	#attempts = [];
 	#admitted = /* @__PURE__ */ new Set();
-	#listed = /* @__PURE__ */ new Map();
+	#listed = [];
 	#recalls = 0;
 	#closed = false;
 	/**
@@ -10932,11 +10962,24 @@ var LedgerRequest = class {
 	close() {
 		this.#closed = true;
 	}
-	list(result, lines) {
-		this.#listed = new Map([...this.#listed, [result, lines]]);
+	list(result, lines, groups) {
+		const accepted = groups.reduce((kept, group) => {
+			const offset = kept.length === 0 ? 0 : kept.join("\n").length + 1;
+			return result.slice(offset) === group || result.slice(offset).startsWith(`${group}\n`) ? [...kept, group] : kept;
+		}, []);
+		this.#listed = [...this.#listed, {
+			result,
+			lines,
+			groups: accepted,
+			turn: this.calls.length
+		}];
+	}
+	/** Returns recall results with their accepted whole groups and provider-turn positions. */
+	get listings() {
+		return this.#listed;
 	}
 	lines(result) {
-		return this.#listed.get(result);
+		return this.#listed.findLast((listing) => listing.result === result)?.lines;
 	}
 };
 // src/core/ledgers/LedgerScan.ts
@@ -11459,10 +11502,10 @@ var Ledger = class {
 			});
 			const passes = [first];
 			if (!caller.aborted && (first.partial || first.content.trim() === "")) {
-				const digest = this.#buildDigest(request, entered);
-				if (digest !== void 0) this.#annotations.add(this.#conversation.add({
+				const recovery = this.#buildDigest(request, entered);
+				if (recovery.digest !== void 0) this.#annotations.add(this.#conversation.add({
 					role: "user",
-					content: digest
+					content: recovery.digest
 				}).id);
 				this.#annotations.add(this.#conversation.add({
 					role: "user",
@@ -11478,7 +11521,7 @@ var Ledger = class {
 						if (selection.fault !== void 0) return selection;
 						return {
 							...selection,
-							messages: selection.messages.filter((one) => one.role !== "tool" && !hasCalls(one))
+							messages: selection.messages.filter((one) => one.role !== "tool" && !hasCalls(one) && !recovery.omitted.has(one.id))
 						};
 					}
 				});
@@ -12111,11 +12154,21 @@ var Ledger = class {
 		request?.admit("recall", { topic });
 		const gauge = this.#gauge;
 		const calls = request?.calls ?? [];
-		if (gauge !== void 0 && calls.length > 0 && gauge.remainder(calls) - this.#predict < 2 * gauge.reserve(calls, this.#findLongest())) request?.close();
 		request?.recall();
 		const guidance = `an owner name, an id, or one of ${renderTopicNames(this.#options.topics)}`;
 		if (topic === "") throw new Error(`recall needs a topic: ${guidance}`);
-		const room = (gauge?.room(calls, this.#findLongest()) ?? 0) - estimateMessages([buildRecallMessage(topic)]);
+		const rate = this.#recallRate(request) * (1 + LEDGER_SCALE_DRIFT);
+		const call = calls.at(-1);
+		const carried = request === void 0 ? 0 : estimateMessages(stripThinking([...this.#agent.context.build(request.selection), ...this.#conversation.messages().slice(request.boundary)], this.#replay));
+		const completion = (0, _orkestrel_contract.isFiniteNumber)(call?.prompt) ? (call.completion ?? 0) - (this.#replay === "none" ? call.thinking ?? 0 : 0) : 0;
+		const extra = Math.max(0, (carried - (call?.estimate ?? carried)) * rate - completion);
+		const drift = (0, _orkestrel_contract.isFiniteNumber)(call?.prompt) ? 0 : Math.max(0, (call?.estimate ?? 0) * (rate - (gauge?.scale ?? rate)));
+		const siblings = estimateMessages((request?.listings ?? []).filter((listing) => listing.turn === calls.length).map((listing) => ({
+			id: "result",
+			role: "tool",
+			content: listing.result
+		})));
+		const room = gauge === void 0 ? -estimateMessages([buildRecallMessage(topic)]) : (gauge.remainder(calls) - this.#predict - extra - drift) / rate - siblings;
 		const scan = this.#scan(this.#conversation.messages());
 		const added = this.#scans.size === 0;
 		if (added) this.#hold(scan);
@@ -12172,8 +12225,8 @@ var Ledger = class {
 				return [`${label} ${message.content.replace(/[\n\v\f\r\u0085\u2028\u2029]+/g, "\n  ")}`];
 			});
 			const listed = [...gathered.listed, ...earlier];
-			const result = listed.length === 0 ? `nothing earlier on "${topic}"; answer from the messages you can see` : cutListing(listed, room, earlier.length > 0 ? "more" : "older");
-			request?.list(result, gathered.recalled);
+			const result = listed.length === 0 ? `nothing earlier on "${topic}"; answer from the messages you can see` : cutListing(listed, room, earlier.length > 0 ? "more" : "older", gauge === void 0);
+			request?.list(result, gathered.recalled, listed);
 			return result;
 		} finally {
 			if (added) this.#scans.delete(scan);
@@ -12181,15 +12234,58 @@ var Ledger = class {
 	}
 	#buildDigest(request, entered) {
 		this.#flush();
-		const lines = [...new Set(this.#collectAfter(entered).flatMap((message) => {
+		const groups = [...new Set(this.#collectAfter(entered).flatMap((message) => {
 			const result = this.#results.get(message.id);
 			if (message.role !== "tool" || result?.success !== true) return [];
 			const recalled = result.name === "recall";
 			if (recalled && /^nothing earlier on /.test(message.content)) return [];
-			const stored = recalled ? request.lines(message.content) : void 0;
-			return splitResultLines(message.content).filter((line) => !recalled || !matchesCutLine(line)).map((line) => stored?.get(line) ?? line);
+			const listing = recalled ? request.listings.findLast((one) => one.result === message.content) : void 0;
+			return (listing?.groups ?? [message.content]).map((group) => splitResultLines(group).map((line) => listing?.lines.get(line) ?? line).join("\n")).filter((group) => group !== "");
 		}))];
-		return lines.length === 0 ? void 0 : `${LEDGER_NOTES.results}\n${lines.join("\n")}`;
+		const unique = groups.filter((group, at) => !splitResultLines(group).every((line) => groups.slice(0, at).some((earlier) => splitResultLines(earlier).includes(line))));
+		const digest = unique.length === 0 ? void 0 : `${LEDGER_NOTES.results}\n${unique.join("\n")}`;
+		const omitted = /* @__PURE__ */ new Set();
+		const rate = this.#recallRate(request) * (1 + LEDGER_SCALE_DRIFT);
+		const allowance = (this.#options.capacity - this.#predict) / rate;
+		const after = this.#collectAfter(entered);
+		const messages = [
+			...request.plan?.messages ?? request.selection?.messages ?? [],
+			...after,
+			{
+				id: "cue",
+				role: "user",
+				content: LEDGER_NOTES.cue
+			}
+		].filter((message) => message.role !== "tool" && !hasCalls(message));
+		const note = digest === void 0 ? [] : [{
+			id: "results",
+			role: "user",
+			content: digest
+		}];
+		if (this.#gauge === void 0 || estimateMessages(stripThinking(this.#agent.context.build({
+			messages: [...messages, ...note],
+			judgments: []
+		}), this.#replay)) <= allowance) return {
+			digest,
+			omitted
+		};
+		const partials = new Set(after.filter((message) => message.role === "assistant" && !hasCalls(message)).map((message) => message.id));
+		const fitted = cutListing(unique, allowance - estimateMessages(stripThinking(this.#agent.context.build({
+			messages: messages.filter((message) => !partials.has(message.id)),
+			judgments: []
+		}), this.#replay)) - estimateTokens(`${LEDGER_NOTES.results}\n`), "more", false);
+		return {
+			digest: fitted === "" ? void 0 : `${LEDGER_NOTES.results}\n${fitted}`,
+			omitted: partials
+		};
+	}
+	#recallRate(request) {
+		const gauge = this.#gauge;
+		if (gauge === void 0) return 1;
+		const calls = request?.calls ?? [];
+		const last = calls.findLast((call) => (0, _orkestrel_contract.isFiniteNumber)(call.prompt));
+		const measured = last !== void 0 && (0, _orkestrel_contract.isFiniteNumber)(last.prompt) && last.estimate > 0 && ((last.spared ?? 0) === 0 || (last.spared ?? 0) >= gauge.overhead) ? (last.prompt - Math.max(0, gauge.overhead - (last.spared ?? 0))) / last.estimate : 0;
+		return Math.max(gauge.rate(calls), measured);
 	}
 };
 // src/core/ledgers/factories.ts