blun-king-cli 9.1.282 → 9.1.284

package/bin/context-insight-policy.cjs

@@ -7,6 +7,7 @@ function finiteNonNegative(value) {
 function buildContextInsight(input = {}) {
   const projectedTokens = finiteNonNegative(input.projectedTokenCount);
   const maxTokens = finiteNonNegative(input.effectiveMaxContextTokens);
+  const systemPromptTokens = finiteNonNegative(input.systemPromptTokens);
   const conversationTokens = finiteNonNegative(input.conversationTokens);
   const toolSchemaTokens = finiteNonNegative(input.toolSchemaTokens);
   const compactionBudgetTokens = Math.min(
@@ -21,6 +22,7 @@ function buildContextInsight(input = {}) {
   return {
     projectedTokens,
     maxTokens,
+    systemPromptTokens,
     conversationTokens,
     toolSchemaTokens,
     compactionBudgetTokens,

package/bin/subagent-usage-rollup-policy.cjs

@@ -0,0 +1,29 @@
+'use strict';
+
+const USAGE_FIELDS = [
+  'inputOther',
+  'output',
+  'inputCacheRead',
+  'inputCacheCreation',
+];
+
+function safeTokenCount(value) {
+  return Number.isFinite(value) && value > 0 ? value : 0;
+}
+
+function buildSubagentUsageDelta(after, before) {
+  if (after === undefined || after === null || typeof after !== 'object') return null;
+  const baseline = before !== null && typeof before === 'object' ? before : {};
+  if (USAGE_FIELDS.some((field) => safeTokenCount(after[field]) < safeTokenCount(baseline[field]))) {
+    return null;
+  }
+  const delta = Object.fromEntries(USAGE_FIELDS.map((field) => [
+    field,
+    safeTokenCount(after[field]) - safeTokenCount(baseline[field]),
+  ]));
+  return USAGE_FIELDS.some((field) => delta[field] > 0) ? delta : null;
+}
+
+module.exports = {
+  buildSubagentUsageDelta,
+};

package/blun.mjs

@@ -75409,7 +75409,7 @@ var init_full = __esmMin((() => {
 		}
 		estimateProjectedRequestTokens(context = {}) {
 			const messages = context.messages ?? this.agent.context.messages;
-			return this.estimateRequestTokens(context.additionalMessages === void 0 ? messages : [...messages, ...context.additionalMessages], context.systemPrompt ?? this.agent.config.systemPrompt, context.tools ?? this.agent.tools.loopTools);
+			return this.estimateRequestTokens(context.additionalMessages === void 0 ? messages : [...messages, ...context.additionalMessages], context.systemPrompt ?? this.agent.effectiveSystemPrompt, context.tools ?? this.agent.tools.loopTools);
 		}
 		shouldRecoverFromContextOverflow(error) {
 			return error instanceof APIContextOverflowError;
@@ -252106,7 +252106,7 @@ function shouldSuppressQueuedAttemptFailureEvent(options, error) {
 	if (isProviderRateLimitError(error)) return true;
 	return isAbortError$4(error) || options.signal.aborted;
 }
-var DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation, SUMMARY_MIN_LENGTH, SUMMARY_CONTINUATION_ATTEMPTS, HOOK_TEXT_PREVIEW_LENGTH, SUBAGENT_MAX_TOKENS_ERROR, TOOL_CALL_DISABLED_MESSAGE, SUBAGENT_PROMPT_ORIGIN, SIDE_QUESTION_SYSTEM_REMINDER, SessionSubagentHost;
+var DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation, buildSubagentUsageDelta, SUMMARY_MIN_LENGTH, SUMMARY_CONTINUATION_ATTEMPTS, HOOK_TEXT_PREVIEW_LENGTH, SUBAGENT_MAX_TOKENS_ERROR, TOOL_CALL_DISABLED_MESSAGE, SUBAGENT_PROMPT_ORIGIN, SIDE_QUESTION_SYSTEM_REMINDER, SessionSubagentHost;
 var init_subagent_host = __esmMin((() => {
 	init_src$4();
 	init_errors$8();
@@ -252119,6 +252119,7 @@ var init_subagent_host = __esmMin((() => {
 	init_subagent_batch();
 	init_summary_continuation();
 	({ DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation } = createRequire(import.meta.url)("./bin/subagent-timeout-policy.cjs"));
+	({ buildSubagentUsageDelta } = createRequire(import.meta.url)("./bin/subagent-usage-rollup-policy.cjs"));
 	SUMMARY_MIN_LENGTH = 200;
 	SUMMARY_CONTINUATION_ATTEMPTS = 1;
 	HOOK_TEXT_PREVIEW_LENGTH = 500;
@@ -252177,7 +252178,7 @@ IMPORTANT:
 				parentAgentId: this.ownerAgentId,
 				swarmItem: options.swarmItem
 			});
-			const completion = this.runWithActiveChild(id, options, async (runOptions) => {
+			const completion = this.runWithTrackedChildUsage(parent, agent, id, options, async (runOptions) => {
 				this.emitSubagentSpawned(parent, id, profile.name, runOptions);
 				try {
 					await this.configureChild(parent, agent, profile);
@@ -252201,7 +252202,7 @@ IMPORTANT:
 				agentId,
 				profileName,
 				resumed: true,
-				completion: this.runWithActiveChild(agentId, options, async (runOptions) => {
+				completion: this.runWithTrackedChildUsage(parent, child, agentId, options, async (runOptions) => {
 					this.emitSubagentSpawned(parent, agentId, profileName, runOptions);
 					try {
 						child.config.update({
@@ -252239,7 +252240,7 @@ IMPORTANT:
 				agentId,
 				profileName,
 				resumed: true,
-				completion: this.runWithActiveChild(agentId, options, async (runOptions) => {
+				completion: this.runWithTrackedChildUsage(parent, child, agentId, options, async (runOptions) => {
 					try {
 						runOptions.signal.throwIfAborted();
 						child.config.update({
@@ -252354,6 +252355,20 @@ IMPORTANT:
 				this.activeChildren.delete(childId);
 			});
 		}
+		async runWithTrackedChildUsage(parent, child, childId, options, run) {
+			const usageBefore = child.usage.data().total;
+			try {
+				return await this.runWithActiveChild(childId, options, run);
+			} finally {
+				this.recordSubagentUsageDelta(parent, child, usageBefore);
+			}
+		}
+		recordSubagentUsageDelta(parent, child, usageBefore) {
+			const usageDelta = buildSubagentUsageDelta(child.usage.data().total, usageBefore);
+			if (usageDelta === null) return;
+			const model = child.config.modelAlias ?? parent.config.modelAlias ?? "subagent";
+			parent.usage.record(model, usageDelta, "session");
+		}
 		async runPromptTurn(parent, childId, child, profileName, options) {
 			options.signal.throwIfAborted();
 			await this.triggerSubagentStart(parent, profileName, options.prompt, options.signal);
@@ -265265,6 +265280,7 @@ var init_agent = __esmMin((() => {
 					projectedTokenCount: this.fullCompaction.estimateCurrentRequestTokens(),
 					effectiveMaxContextTokens: this.fullCompaction.getEffectiveMaxContextTokens(),
 					compactionBudgetTokens: this.fullCompaction.getCompactionBudgetTokens(),
+					systemPromptTokens: estimateTokens$1(this.effectiveSystemPrompt),
 					conversationTokens: estimateTokensForMessages(this.context.messages),
 					toolSchemaTokens: estimateTokensForTools(this.tools.loopTools)
 				}),
@@ -418113,6 +418129,7 @@ function buildContextInsightLines(insight) {
 	const percentage = `${(insight.ratio * 100).toFixed(1)}%`;
 	const lines = [
 		`  ${barColoured}  ${value(percentage.padStart(6, " "))}  ${muted(`(${formatExactTokenCount(insight.projectedTokens, locale)} / ${formatExactTokenCount(insight.maxTokens, locale)})`)}`,
+		`  ${muted(`${uiText("export.system")}:`)} ${value(formatExactTokenCount(insight.systemPromptTokens, locale))}`,
 		`  ${muted(`${uiText("export.conversation")}:`)} ${value(formatExactTokenCount(insight.conversationTokens, locale))}`,
 		`  ${muted(`${uiText("mcp.capability.tools")}:`)} ${value(formatExactTokenCount(insight.toolSchemaTokens, locale))}`,
 		`  ${muted(`${uiText("command.compact.description")}:`)} ${value(formatExactTokenCount(insight.compactionBudgetTokens, locale))}`,

package/package.json

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