blun-king-cli 9.1.190 → 9.1.192

package/bin/approval-rejection-stop.cjs

@@ -0,0 +1,15 @@
+'use strict';
+
+function buildApprovalRejectionStop(output) {
+  return {
+    syntheticResult: {
+      output,
+      isError: true,
+      stopTurn: true,
+    },
+  };
+}
+
+module.exports = {
+  buildApprovalRejectionStop,
+};

package/bin/context-budget-ledger.cjs

@@ -0,0 +1,31 @@
+'use strict';
+
+function wholeTokenCount(value) {
+  if (!Number.isFinite(value) || value <= 0) return 0;
+  return Math.floor(value);
+}
+
+function reconcileContextBudget(input = {}) {
+  const totalTokens = wholeTokenCount(input.totalTokens);
+  const maxTokens = Math.max(totalTokens, wholeTokenCount(input.maxTokens));
+  const conversationTokens = Math.min(totalTokens, wholeTokenCount(input.conversationTokens));
+  const toolTokens = Math.min(
+    totalTokens - conversationTokens,
+    wholeTokenCount(input.toolTokens),
+  );
+  const systemTokens = totalTokens - conversationTokens - toolTokens;
+
+  return {
+    systemTokens,
+    conversationTokens,
+    toolTokens,
+    freeTokens: maxTokens - totalTokens,
+    totalTokens,
+    maxTokens,
+  };
+}
+
+module.exports = {
+  reconcileContextBudget,
+  wholeTokenCount,
+};

package/blun.mjs

@@ -233964,10 +233964,7 @@ var init_permission = __esmMin((() => {
 			const resolved = result.resolveApproval?.(response);
 			if (resolved !== void 0) return this.permissionPolicyResolutionToPrepare(resolved, context, policyName);
 			if (response.decision === "approved") return;
-			return {
-				block: true,
-				reason: this.formatApprovalRejectionMessage(name, response)
-			};
+			return buildApprovalRejectionStop(this.formatApprovalRejectionMessage(name, response));
 		}
 		async evaluatePolicies(context) {
 			for (const policy of this.policies) {
@@ -265084,7 +265081,9 @@ var init_agent = __esmMin((() => {
 					...this.context.data(),
 					projectedTokenCount: this.fullCompaction.estimateCurrentRequestTokens(),
 					effectiveMaxContextTokens: this.fullCompaction.getEffectiveMaxContextTokens(),
-					compactionBudgetTokens: this.fullCompaction.getCompactionBudgetTokens()
+					compactionBudgetTokens: this.fullCompaction.getCompactionBudgetTokens(),
+					conversationTokens: estimateTokensForMessages(this.context.messages),
+					toolSchemaTokens: estimateTokensForTools(this.tools.loopTools)
 				}),
 				getConfig: () => this.config.data(),
 				getPermission: () => this.permission.data(),
@@ -327382,6 +327381,8 @@ var SDKRpcClientBase = class {
 			contextTokens,
 			maxContextTokens,
 			compactionBudgetTokens: context.compactionBudgetTokens,
+			conversationTokens: context.conversationTokens,
+			toolSchemaTokens: context.toolSchemaTokens,
 			contextUsage,
 			usage: hasUsage ? usage : void 0
 		};
@@ -402997,7 +402998,7 @@ const BUILTIN_SLASH_COMMAND_DEFINITIONS = [
 	},
 	{
 		name: "usage",
-		aliases: [],
+		aliases: ["context"],
 		descriptionKey: "command.usage.description",
 		priority: 60,
 		availability: "always"
@@ -416738,6 +416739,8 @@ function buildManagedUsageReportLines(options) {
 	const errorStyle = (text) => currentTheme.fg("error", text);
 	return buildManagedUsageSection(options.managedUsage, options.managedUsageError, accent, value, muted, errorStyle);
 }
+var { buildApprovalRejectionStop } = createRequire(import.meta.url)("./bin/approval-rejection-stop.cjs");
+var { reconcileContextBudget } = createRequire(import.meta.url)("./bin/context-budget-ledger.cjs");
 function buildUsageReportLines(options) {
 	const accent = (text) => currentTheme.boldFg("primary", text);
 	const value = (text) => currentTheme.fg("text", text);
@@ -416753,6 +416756,22 @@ function buildUsageReportLines(options) {
 		lines.push("");
 		lines.push(accent(uiText("usage.context.title")));
 		lines.push(`  ${barColoured}  ${value(pct.padStart(6, " "))}  ` + muted(`(${formatExactTokenCount(options.contextTokens, getCurrentUiLocale())} / ${formatExactTokenCount(options.maxContextTokens, getCurrentUiLocale())})`));
+		if (Number.isFinite(options.conversationTokens) && Number.isFinite(options.toolSchemaTokens)) {
+			const budget = reconcileContextBudget({
+				totalTokens: options.contextTokens,
+				maxTokens: options.maxContextTokens,
+				conversationTokens: options.conversationTokens,
+				toolTokens: options.toolSchemaTokens
+			});
+			const locale = getCurrentUiLocale();
+			const contextRows = [
+				[uiText("export.system"), budget.systemTokens],
+				[uiText("export.conversation"), budget.conversationTokens],
+				[uiText("mcp.capability.tools"), budget.toolTokens]
+			];
+			for (const [label, count] of contextRows) lines.push(`  ${muted(`${label}:`)} ${value(formatExactTokenCount(count, locale))}`);
+			lines.push(`  ${muted(uiText("usage.plan.metric.remaining", { count: formatExactTokenCount(budget.freeTokens, locale) }))}`);
+		}
 	}
 	const managedSection = buildManagedUsageReportLines({
 		managedUsage: options.managedUsage,
@@ -417767,14 +417786,19 @@ function managedUsageErrorCode(error) {
 	return record.status === 401 || record.status === 403 ? "unauthenticated" : "unavailable";
 }
 async function showUsage(host) {
-	const sessionUsage = await loadSessionUsageReport(host);
-	const managedUsage = await loadManagedUsageReport(host);
+	const [sessionUsage, managedUsage, runtimeStatus] = await Promise.all([
+		loadSessionUsageReport(host),
+		loadManagedUsageReport(host),
+		loadRuntimeStatusReport(host)
+	]);
 	const reportArgs = {
 		sessionUsage: sessionUsage.usage,
 		sessionUsageError: sessionUsage.error,
 		contextUsage: host.state.appState.contextUsage,
-		contextTokens: host.state.appState.contextTokens,
-		maxContextTokens: host.state.appState.maxContextTokens,
+		contextTokens: runtimeStatus.status?.contextTokens ?? host.state.appState.contextTokens,
+		maxContextTokens: runtimeStatus.status?.maxContextTokens ?? host.state.appState.maxContextTokens,
+		conversationTokens: runtimeStatus.status?.conversationTokens,
+		toolSchemaTokens: runtimeStatus.status?.toolSchemaTokens,
 		managedUsage: managedUsage?.usage,
 		managedUsageError: managedUsage?.error
 	};

package/package.json

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