blun-king-cli 9.1.243 → 9.1.245

package/bin/loop-event-record-policy.cjs

@@ -11,6 +11,17 @@ const STEP_END_LIVE_ONLY_FIELDS = [
 ];
 const STEP_END_ROUTINE_FINISH_REASONS = new Set(['tool_use', 'end_turn']);
 
+function usageTotal(usage) {
+	return usage.inputCacheRead + usage.inputCacheCreation + usage.inputOther + usage.output;
+}
+
+function resolveCompletedStepUuid(openSteps, event) {
+	if (event.uuid !== undefined) return event.uuid;
+	let latest;
+	for (const uuid of openSteps.keys()) latest = uuid;
+	return latest;
+}
+
 function hasOwn(object, key) {
 	return Object.prototype.hasOwnProperty.call(object, key);
 }
@@ -56,11 +67,14 @@ function projectLoopEventForRecord(event) {
 	}
 
 	const hasRoutineFinishReason = STEP_END_ROUTINE_FINISH_REASONS.has(event?.finishReason);
+	const hasUsage = event?.type === 'step.end' && hasOwn(event, 'usage');
 	if (
 		event?.type !== 'step.end' ||
 		(
+			!hasOwn(event, 'uuid') &&
 			!hasOwn(event, 'turnId') &&
 			!hasOwn(event, 'step') &&
+			!hasUsage &&
 			!hasRoutineFinishReason &&
 			!STEP_END_LIVE_ONLY_FIELDS.some((field) => hasOwn(event, field))
 		)
@@ -69,6 +83,7 @@ function projectLoopEventForRecord(event) {
 	}
 
 	const {
+		uuid: _uuid,
 		turnId: _turnId,
 		step: _step,
 		llmFirstTokenLatencyMs: _llmFirstTokenLatencyMs,
@@ -78,11 +93,15 @@ function projectLoopEventForRecord(event) {
 		llmServerDecodeMs: _llmServerDecodeMs,
 		llmClientConsumeMs: _llmClientConsumeMs,
 		messageId: _messageId,
+		usage: _usage,
 		...recordedEvent
 	} = event;
-	if (!hasRoutineFinishReason) return recordedEvent;
-	const { finishReason: _finishReason, ...withoutRoutineFinishReason } = recordedEvent;
+	const compactUsageEvent = hasUsage
+		? { ...recordedEvent, contextTokens: usageTotal(event.usage) }
+		: recordedEvent;
+	if (!hasRoutineFinishReason) return compactUsageEvent;
+	const { finishReason: _finishReason, ...withoutRoutineFinishReason } = compactUsageEvent;
 	return withoutRoutineFinishReason;
 }
 
-module.exports = { projectLoopEventForRecord };
+module.exports = { projectLoopEventForRecord, resolveCompletedStepUuid };

package/blun.mjs

@@ -75992,7 +75992,7 @@ var init_full = __esmMin((() => {
 }));
 //#endregion
 //#region ../../packages/agent-core/src/agent/compaction/micro.ts
-var selectMicroCompactionCutoff, MICRO_COMPACTION_RECENT_MESSAGES, MICRO_COMPACTION_TOOL_ARGUMENTS_ENABLED, MICRO_COMPACTION_TOOL_ARGUMENT_MIN_TOKENS, isPersistedToolResultReference, projectHistoricalUnaddressedTelegramMessages, dedupeRepeatedUserMessages, projectRepeatedAssistantResponses, compactHistoricalSkillActivations, dedupeRecurringCronWakeups, dedupeRepeatedInjections, projectLoopEventForRecord, DEFAULT_CONFIG, MicroCompaction;
+var selectMicroCompactionCutoff, MICRO_COMPACTION_RECENT_MESSAGES, MICRO_COMPACTION_TOOL_ARGUMENTS_ENABLED, MICRO_COMPACTION_TOOL_ARGUMENT_MIN_TOKENS, isPersistedToolResultReference, projectHistoricalUnaddressedTelegramMessages, dedupeRepeatedUserMessages, projectRepeatedAssistantResponses, compactHistoricalSkillActivations, dedupeRecurringCronWakeups, dedupeRepeatedInjections, projectLoopEventForRecord, resolveCompletedStepUuid, DEFAULT_CONFIG, MicroCompaction;
 var init_micro = __esmMin((() => {
 	({ selectMicroCompactionCutoff, MICRO_COMPACTION_RECENT_MESSAGES, MICRO_COMPACTION_TOOL_ARGUMENTS_ENABLED, MICRO_COMPACTION_TOOL_ARGUMENT_MIN_TOKENS } = createRequire(import.meta.url)("./bin/micro-compaction-policy.cjs"));
 	({ isPersistedToolResultReference } = createRequire(import.meta.url)("./bin/tool-result-offload-policy.cjs"));
@@ -76001,7 +76001,7 @@ var init_micro = __esmMin((() => {
 	({ projectRepeatedAssistantResponses } = createRequire(import.meta.url)("./bin/repeated-assistant-response-policy.cjs"));
 	({ compactHistoricalSkillActivations } = createRequire(import.meta.url)("./bin/skill-activation-performance-policy.cjs"));
 	({ dedupeRecurringCronWakeups, dedupeRepeatedInjections } = createRequire(import.meta.url)("./bin/repeated-injection-projection.cjs"));
-	({ projectLoopEventForRecord } = createRequire(import.meta.url)("./bin/loop-event-record-policy.cjs"));
+	({ projectLoopEventForRecord, resolveCompletedStepUuid } = createRequire(import.meta.url)("./bin/loop-event-record-policy.cjs"));
 	init_tokens();
 	DEFAULT_CONFIG = {
 		keepRecentMessages: MICRO_COMPACTION_RECENT_MESSAGES,
@@ -79130,12 +79130,13 @@ var init_context$2 = __esmMin((() => {
 					return;
 				}
 				case "step.end": {
-					const openStep = this.openSteps.get(event.uuid);
-					this.openSteps.delete(event.uuid);
-					if (event.usage !== void 0) {
+					const completedStepUuid = resolveCompletedStepUuid(this.openSteps, event);
+					const openStep = this.openSteps.get(completedStepUuid);
+					this.openSteps.delete(completedStepUuid);
+					if (event.usage !== void 0 || event.contextTokens !== void 0) {
 						const openStepIndex = openStep === void 0 ? -1 : this._history.indexOf(openStep);
 						const coveredCount = openStepIndex === -1 ? this._history.length : openStepIndex + 1;
-						const totalUsage = event.usage.inputCacheRead + event.usage.inputCacheCreation + event.usage.inputOther + event.usage.output;
+						const totalUsage = event.contextTokens ?? event.usage.inputCacheRead + event.usage.inputCacheCreation + event.usage.inputOther + event.usage.output;
 						if (totalUsage > 0) this._tokenCount = totalUsage;
 						else {
 							const previousCoveredCount = this.tokenCountCoveredMessageCount;
@@ -324048,10 +324049,12 @@ function reduceWireRecords(records) {
 				openSteps.set(event.uuid, entry);
 				return;
 			}
-			case "step.end":
-				openSteps.delete(event.uuid);
+			case "step.end": {
+				const completedStepUuid = resolveCompletedStepUuid(openSteps, event);
+				openSteps.delete(completedStepUuid);
 				flushDeferredIfToolExchangeClosed();
 				return;
+			}
 			case "content.part":
 				openSteps.get(event.stepUuid)?.message.content.push(event.part);
 				return;
@@ -398968,11 +398971,12 @@ function projectContext(entries, mode = "model") {
 						});
 					}
 				} else if (ev.type === "step.end") {
-					if ("usage" in ev && ev.usage !== void 0) {
-						const fill = ev.usage.inputCacheRead + ev.usage.inputCacheCreation + ev.usage.inputOther + ev.usage.output;
+					if ("usage" in ev && ev.usage !== void 0 || ev.contextTokens !== void 0) {
+						const fill = ev.contextTokens ?? ev.usage.inputCacheRead + ev.usage.inputCacheCreation + ev.usage.inputOther + ev.usage.output;
 						if (fill > 0) contextTokens = fill;
 					}
-					openSteps.delete(ev.uuid);
+					const completedStepUuid = resolveCompletedStepUuid(openSteps, ev);
+					openSteps.delete(completedStepUuid);
 				} else if (ev.type === "tool.result") {
 					const toolMsg = {
 						role: "tool",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "9.1.243",
+  "version": "9.1.245",
   "description": "BLUN CLI - your own AI agent with a Telegram channel. Get it done. With BLUN.",
   "license": "MIT",
   "bin": {