blun-king-cli 9.1.34 → 9.1.35

package/LIESMICH.txt

@@ -9,7 +9,7 @@ Installation
 ------------
 Die geprüfte Version exakt global installieren:
 
-  npm install -g blun-king-cli@9.1.1
+  npm install -g blun-king-cli@9.1.35
 
 Start
 -----

package/README.md

@@ -9,7 +9,7 @@ Voraussetzung ist Node.js 24.15 oder neuer. Die geprüfte Version wird exakt
 installiert:
 
 ```powershell
-npm install -g blun-king-cli@9.1.34
+npm install -g blun-king-cli@9.1.35
 ```
 
 ## Reproduzierbares Staging und Packen

package/blun.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:ec5eb56eb8addc29b2ddab22ca4987f2156e16b88a8f468ce3248d312afa717f
+// BLUN_BUILD_INPUT_SHA256:760e619c78a4f7144ea03820db15402ea00e8058f86f431c12fb1bbb633de6b9
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
@@ -75019,10 +75019,17 @@ function isModelFallbackStatus(error) {
 function compactionTimingKey(provider) {
 	return `${provider.name}\u0000${provider.modelName}`;
 }
-function estimateCompactionProgressPercent(initialInputTokens, currentInputTokens) {
-	if (initialInputTokens <= 0) return 0;
-	const reducedTokens = Math.max(0, initialInputTokens - currentInputTokens);
-	return Math.min(99, Math.floor(reducedTokens / initialInputTokens * 100));
+function estimateCompactionStageCount(initialInputTokens, safeRequestLimitTokens, currentStage) {
+	if (safeRequestLimitTokens <= 0) return currentStage;
+	return Math.max(currentStage, Math.ceil(initialInputTokens / safeRequestLimitTokens));
+}
+function estimateCompactionProgressPercent(stage, estimatedStageCount) {
+	if (estimatedStageCount <= 0) return 0;
+	return Math.min(99, Math.floor(stage / estimatedStageCount * 100));
+}
+function estimateCompactionWindowUsagePercent(requestTokens, maxContextTokens) {
+	if (maxContextTokens <= 0) return void 0;
+	return Math.min(100, Math.max(0, Math.ceil(requestTokens / maxContextTokens * 100)));
 }
 function selectHierarchicalCompactionChunk(history, targetRequestTokens, hardRequestLimit, build) {
 	const safeEnds = [];
@@ -75502,12 +75509,17 @@ var init_full = __esmMin((() => {
 					provider = buildCompactionProvider(estimatedCompactionRequestTokens);
 					attemptCount += 1;
 					charsReceived = 0;
-					const estimatedProgressPercent = estimateCompactionProgressPercent(initialCompactionRequestTokens, estimatedCompactionRequestTokens);
+					const stage = hierarchicalPassCount + 1;
+					const estimatedStageCount = estimateCompactionStageCount(initialCompactionRequestTokens, safeCompactionRequestLimit, stage);
+					const estimatedProgressPercent = estimateCompactionProgressPercent(stage, estimatedStageCount);
+					const windowUsagePercent = estimateCompactionWindowUsagePercent(estimatedCompactionRequestTokens, compactionRequestLimit);
 					this.agent.log.info("compaction stage request", {
 						source: data.source,
-						stage: hierarchicalPassCount + 1,
+						stage,
+						estimatedStageCount,
 						activeContextTokens: this.estimateProjectedRequestTokens(),
 						estimatedInputTokens: estimatedCompactionRequestTokens,
+						windowUsagePercent,
 						safeInputLimitTokens: safeCompactionRequestLimit,
 						maxContextTokens: compactionRequestLimit
 					});
@@ -75517,9 +75529,11 @@ var init_full = __esmMin((() => {
 						lastProgressEmitAt = now;
 						this.agent.emitEvent({
 							type: "compaction.progress",
-							stage: hierarchicalPassCount + 1,
+							stage,
+							estimatedStageCount,
 							estimatedInputTokens: estimatedCompactionRequestTokens,
 							estimatedProgressPercent,
+							...windowUsagePercent === void 0 ? {} : { windowUsagePercent },
 							charsReceived,
 							attempt: attemptCount,
 							...typicalDurationMs !== void 0 ? { typicalDurationMs } : {}
@@ -245396,7 +245410,9 @@ var init_events$1 = __esmMin((() => {
 	compactionProgressEventSchema = object({
 		type: literal("compaction.progress"),
 		stage: number$1().int().positive().optional(),
+		estimatedStageCount: number$1().int().positive().optional(),
 		estimatedProgressPercent: number$1().int().min(0).max(99).optional(),
+		windowUsagePercent: number$1().int().min(0).max(100).optional(),
 		estimatedInputTokens: number$1().optional(),
 		charsReceived: number$1(),
 		attempt: number$1(),
@@ -425706,6 +425722,14 @@ function formatCompactCount(n) {
 	if (n >= 1e3) return `${(n / 1e3).toFixed(1)}k`;
 	return String(n);
 }
+function formatCompactionStageText(progress) {
+	const stage = progress.stage;
+	const total = progress.estimatedStageCount;
+	const parts = [];
+	if (stage !== void 0 && total !== void 0) parts.push(`${String(stage)}/~${String(total)}`);
+	if (progress.windowUsagePercent !== void 0) parts.push(`${String(progress.windowUsagePercent)} %`);
+	return parts.join(" · ");
+}
 function formatCompactionRunningText(inputTokens) {
 	return inputTokens === void 0 ? uiText("compaction.running") : uiText("compaction.runningWithSize", { tokens: formatCompactCount(inputTokens) });
 }
@@ -425747,8 +425771,10 @@ var CompactionComponent = class extends Container {
 	estimatedInputTokens;
 	attempt = 1;
 	stage = 1;
+	estimatedStageCount;
 	stageCount;
 	estimatedProgressPercent;
+	windowUsagePercent;
 	constructor(ui, instruction, tip, showRunning = true) {
 		super();
 		this.showRunning = showRunning;
@@ -425803,7 +425829,9 @@ var CompactionComponent = class extends Container {
 		if (progress.attempt !== this.attempt) this.attemptStartedAtMs = Date.now();
 		this.attempt = progress.attempt;
 		this.stage = progress.stage ?? this.stage;
+		this.estimatedStageCount = progress.estimatedStageCount;
 		this.estimatedProgressPercent = progress.estimatedProgressPercent;
+		this.windowUsagePercent = progress.windowUsagePercent;
 		this.statusText.setText(this.buildStatusLine());
 		if (this.showRunning) this.ui?.requestRender();
 	}
@@ -425828,8 +425856,17 @@ var CompactionComponent = class extends Container {
 		const percent = this.estimatedProgressPercent ?? estimateCompactionPercent(elapsedMs, this.estimatedInputTokens);
 		const filled = Math.round(percent / 100 * BAR_WIDTH);
 		const bar = `[${"█".repeat(filled)}${"░".repeat(BAR_WIDTH - filled)}]`;
-		const runningText = `${formatCompactionRunningText(this.estimatedInputTokens)} · ${String(this.stage)}/?`;
-		return `${currentTheme.fg("primary", bar)} ${currentTheme.boldFg("primary", runningText)}${currentTheme.fg("textDim", ` ~${String(percent)} %`)}${currentTheme.fg("textDim", ` · ${String(this.elapsedSeconds())}s`)}${this.attempt > 1 ? currentTheme.fg("textDim", uiText("compaction.attempt", { attempt: this.attempt })) : ""}${currentTheme.fg("textDim", ` · ${uiText("compaction.cancelHint")}`)}${this.instruction ? currentTheme.fg("textDim", ` · ${this.instruction}`) : ""}${this.tip ? currentTheme.fg("textDim", ` · ${this.tip}`) : ""}`;
+		const stageText = formatCompactionStageText({
+			stage: this.stage,
+			estimatedStageCount: this.estimatedStageCount,
+			estimatedProgressPercent: this.estimatedProgressPercent,
+			windowUsagePercent: this.windowUsagePercent,
+			estimatedInputTokens: this.estimatedInputTokens,
+			charsReceived: 0,
+			attempt: this.attempt
+		});
+		const runningText = `${formatCompactionRunningText(this.estimatedInputTokens)}${stageText.length === 0 ? "" : ` · ${stageText}`}`;
+		return `${currentTheme.fg("primary", bar)} ${currentTheme.boldFg("primary", runningText)}${this.windowUsagePercent === void 0 ? currentTheme.fg("textDim", ` ~${String(percent)} %`) : ""}${currentTheme.fg("textDim", ` · ${String(this.elapsedSeconds())}s`)}${this.attempt > 1 ? currentTheme.fg("textDim", uiText("compaction.attempt", { attempt: this.attempt })) : ""}${currentTheme.fg("textDim", ` · ${uiText("compaction.cancelHint")}`)}${this.instruction ? currentTheme.fg("textDim", ` · ${this.instruction}`) : ""}${this.tip ? currentTheme.fg("textDim", ` · ${this.tip}`) : ""}`;
 	}
 	startTicking() {
 		this.timer = setInterval(() => {
@@ -506143,17 +506180,21 @@ function formatContextStatus(usage, tokens, maxTokens, colors, width, now = /* @
 	for (const variant of variants) if (visibleWidth(variant) <= available) return variant;
 	return truncateToWidth(current, available, "…");
 }
-function formatCompactionStatus(elapsedMs, estimatedInputTokens, colors, width, now = /* @__PURE__ */ new Date()) {
-	const percent = estimateCompactionPercent(elapsedMs, estimatedInputTokens);
+function formatCompactionStatus(elapsedMs, estimatedInputTokens, progress, colors, width, now = /* @__PURE__ */ new Date()) {
+	const percent = progress?.estimatedProgressPercent ?? estimateCompactionPercent(elapsedMs, estimatedInputTokens);
 	const filled = Math.max(1, Math.ceil((1 - percent / 100) * CONTEXT_BAR_WIDTH));
 	const bar = chalk.hex(colors.primary)(`${"█".repeat(filled)}${"░".repeat(CONTEXT_BAR_WIDTH - filled)}`);
 	const label = formatCompactionRunningText(estimatedInputTokens);
-	const estimate = `~${String(percent)} %`;
+	const stageText = progress === void 0 ? "" : formatCompactionStageText(progress);
+	const compactStageText = progress?.stage === void 0 || progress.estimatedStageCount === void 0 ? "" : `${String(progress.stage)}/~${String(progress.estimatedStageCount)}${progress.windowUsagePercent === void 0 ? "" : ` · ${String(progress.windowUsagePercent)}%`}`;
+	const estimate = progress?.windowUsagePercent === void 0 ? `~${String(percent)} %` : "";
+	const clock = chalk.hex(colors.textDim)(` · ${clockHhmm(now)}`);
 	const variants = [
-		`${label} ${bar} ${estimate}${chalk.hex(colors.textDim)(` · ${clockHhmm(now)}`)}`,
-		`${label} ${bar} ${estimate}`,
-		`${bar} ${estimate}`,
-		estimate
+		`${label}${stageText.length === 0 ? "" : ` · ${stageText}`} ${bar}${estimate.length === 0 ? "" : ` ${estimate}`}${clock}`,
+		`${label}${stageText.length === 0 ? "" : ` · ${stageText}`}`,
+		compactStageText,
+		`${bar}${estimate.length === 0 ? "" : ` ${estimate}`}`,
+		stageText.length === 0 ? estimate : stageText
 	];
 	const available = Math.max(0, width);
 	for (const variant of variants) if (visibleWidth(variant) <= available) return variant;
@@ -506188,6 +506229,7 @@ var FooterComponent = class {
 	goalTimer = null;
 	compactionAttemptStartedAtMs = null;
 	compactionEstimatedInputTokens;
+	compactionProgress;
 	compactionAttempt = 1;
 	compactionTimer = null;
 	/**
@@ -506222,6 +506264,7 @@ var FooterComponent = class {
 	startCompaction() {
 		this.compactionAttemptStartedAtMs = Date.now();
 		this.compactionEstimatedInputTokens = void 0;
+		this.compactionProgress = void 0;
 		this.compactionAttempt = 1;
 		if (this.compactionTimer === null) {
 			this.compactionTimer = setInterval(() => {
@@ -506235,11 +506278,13 @@ var FooterComponent = class {
 		if (progress.estimatedInputTokens !== void 0) this.compactionEstimatedInputTokens = progress.estimatedInputTokens;
 		if (progress.attempt !== this.compactionAttempt) this.compactionAttemptStartedAtMs = Date.now();
 		this.compactionAttempt = progress.attempt;
+		this.compactionProgress = progress;
 		this.onRefresh();
 	}
 	finishCompaction() {
 		this.compactionAttemptStartedAtMs = null;
 		this.compactionEstimatedInputTokens = void 0;
+		this.compactionProgress = void 0;
 		this.compactionAttempt = 1;
 		if (this.compactionTimer !== null) {
 			clearInterval(this.compactionTimer);
@@ -506306,7 +506351,7 @@ var FooterComponent = class {
 		const leftLine = left.join("  ");
 		const leftWidth = visibleWidth(leftLine);
 		const context = contextMetrics(state);
-		const contextText = this.compactionAttemptStartedAtMs === null ? formatContextStatus(context.usage, context.tokens, context.maxTokens, colors, width) : formatCompactionStatus(Math.max(0, Date.now() - this.compactionAttemptStartedAtMs), this.compactionEstimatedInputTokens, colors, width);
+		const contextText = this.compactionAttemptStartedAtMs === null ? formatContextStatus(context.usage, context.tokens, context.maxTokens, colors, width) : formatCompactionStatus(Math.max(0, Date.now() - this.compactionAttemptStartedAtMs), this.compactionEstimatedInputTokens, this.compactionProgress, colors, width);
 		const right = this.transientHint && this.compactionAttemptStartedAtMs === null ? chalk.hex(colors.warning).bold(this.transientHint) : chalk.hex(colors.text)(contextText);
 		const rightWidth = visibleWidth(right);
 		let line1;

package/package.json

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