blun-king-cli 9.1.486 → 9.1.488

package/blun.mjs

@@ -262128,12 +262128,14 @@ var init_turn = __esmMin((() => {
 				return {
 					accepted: true,
 					buffered: false,
+					duplicate: true,
 					turnId: null
 				};
 			}
 			if (this.activeTurn !== null) return {
 				accepted: false,
 				buffered: false,
+				duplicate: false,
 				turnId: null
 			};
 			this.telegramDeliveryLedger.remember(input, origin);
@@ -262147,6 +262149,7 @@ var init_turn = __esmMin((() => {
 			return {
 				accepted: true,
 				buffered,
+				duplicate: false,
 				turnId
 			};
 		}
@@ -262776,10 +262779,11 @@ var init_turn = __esmMin((() => {
 								const steerInput = pendingSteers.flatMap((steer) => [...steer.input]);
 								const steerThinkingEffort = "low";
 								const steerPendingMediaJobIds = this.agent.toolServices?.media?.pendingMediaJobIds?.() ?? [];
-								const steerLLM = this.agent.llmForTurn(steerThinkingEffort, blunPendingMediaSystemPrompt(this.agent.fastConversationSystemPrompt, steerPendingMediaJobIds));
 								const steerText = blunExtractText(steerInput);
 								const steerRequiredToolNames = mediaToolNamesForTurnText(steerText);
 								for (const name of rankedToolNamesForTurnText(eligibleTools, steerText)) steerRequiredToolNames.add(name);
+								const steerNeedsActionTools = steerRequiredToolNames.size > 0;
+								const steerLLM = this.agent.llmForTurn(steerThinkingEffort, blunPendingMediaSystemPrompt(steerNeedsActionTools ? this.agent.effectiveSystemPrompt : this.agent.fastConversationSystemPrompt, steerPendingMediaJobIds));
 								const steerTools = [...blunFastConversationTools(eligibleTools, steerInput, steerPendingMediaJobIds, steerRequiredToolNames)];
 								const steerHistory = () => blunFastConversationHistory(this.agent.context.history);
 								const buildSteerMessages = () => this.agent.context.project(steerHistory(), { dropOrphanResults: true });
@@ -326885,7 +326889,7 @@ var Session = class {
 				buffered: false,
 				turnId: null
 			};
-		}, (result) => result.accepted);
+		}, (result) => result.accepted && result.duplicate !== true);
 	}
 	/** Execute a user-initiated `!` shell command (silent — does not prompt the
 	*  model). Resolves with the command's stdout/stderr for immediate display.
@@ -329199,7 +329203,7 @@ var AsyncTransport = class {
 	constructor(options) {
 		this.homeDir = options.homeDir;
 		this.deviceId = options.deviceId;
-		this.endpoint = options.endpoint ?? "https://telemetry-logs.blun.ai/v1/event";
+		this.endpoint = options.endpoint ?? "";
 		this.getAccessToken = options.getAccessToken ?? null;
 		this.fetchImpl = options.fetchImpl ?? globalThis.fetch.bind(globalThis);
 		this.retryBackoffsMs = options.retryBackoffsMs ?? RETRY_BACKOFFS_MS;
@@ -329208,7 +329212,7 @@ var AsyncTransport = class {
 		this.now = options.now ?? Date.now;
 	}
 	async send(events, signal) {
-		if (events.length === 0) return;
+		if (events.length === 0 || !isBlunTelemetryHost(this.endpoint)) return;
 		let savedToDisk = false;
 		const saveEventsToDisk = () => {
 			if (savedToDisk) return;
@@ -329248,7 +329252,7 @@ var AsyncTransport = class {
 		saveEventsToDisk();
 	}
 	saveToDisk(events) {
-		if (events.length === 0) return;
+		if (events.length === 0 || !isBlunTelemetryHost(this.endpoint)) return;
 		const path = join(this.telemetryDir(), `failed_${randomBytes(6).toString("hex")}.jsonl`);
 		writeFileSync(path, events.map((event) => JSON.stringify(event)).join("\n") + "\n", {
 			encoding: "utf-8",
@@ -329290,6 +329294,7 @@ var AsyncTransport = class {
 		return new Set(pruned.map((entry) => entry.name));
 	}
 	async retryDiskEvents() {
+		if (!isBlunTelemetryHost(this.endpoint)) return;
 		const spoolEntries = this.readSpoolEntries();
 		const prunedNames = this.pruneDiskSpool(spoolEntries);
 		const retryEntries = selectTelemetryRetryEntries(spoolEntries
@@ -403774,6 +403779,13 @@ const BUILTIN_SLASH_COMMAND_DEFINITIONS = [
 		priority: 60,
 		availability: "always"
 	},
+	{
+		name: "agent-spine",
+		aliases: [],
+		descriptionKey: "command.plugins.description",
+		priority: 61,
+		availability: "idle-only"
+	},
 	{
 		name: "telegram-access",
 		aliases: ["telegram-acces"],
@@ -496448,6 +496460,9 @@ async function handleBuiltInSlashCommand(host, name, args) {
 		case "plugins":
 			await handlePluginsCommand(host, args);
 			return;
+		case "agent-spine":
+			await handlePluginsCommand(host, "info agent-spine");
+			return;
 		case "telegram-access":
 			handleTelegramAccessCommand(host);
 			return;
@@ -503961,8 +503976,8 @@ const CHANNEL_QUEUE_RETRY_MS = 5e3;
 //#endregion
 //#region src/tui/controllers/channel-queue-deadline.ts
 /**
-* Steers queued channel work into the active turn as soon as it arrives. A busy
-* runtime is retried without ever cancelling the turn or crossing a FIFO barrier.
+* Delivers channel work only after Ctrl+S or Escape releases it. A busy runtime
+* is retried without cancelling the turn or crossing the FIFO barrier.
 */
 var ChannelQueueDeadlineController = class {
 	host;
@@ -503985,10 +504000,7 @@ var ChannelQueueDeadlineController = class {
 	}
 	requestDeliveryNow() {
 		if (this.retainReleaseWhileDeliveryIsInFlight()) return;
-		if (this.host.hasWaitingWork() && !this.host.canDeliverWork()) {
-			this.scheduleRetry();
-			return;
-		}
+		if (this.host.hasWaitingWork() && !this.host.canDeliverWork()) return;
 		this.requestDelivery();
 	}
 	retainReleaseWhileDeliveryIsInFlight() {
@@ -504016,7 +504028,10 @@ var ChannelQueueDeadlineController = class {
 		this.deliveryInFlight = true;
 		this.clearRetryTimer();
 		Promise.resolve().then(() => this.host.deliverOne()).catch(() => false).then((delivered) => {
-			if (!delivered && this.host.hasWaitingWork()) this.scheduleRetry();
+			if (!delivered && this.host.hasWaitingWork()) {
+				this.pendingReleaseCount = 0;
+				this.scheduleRetry();
+			}
 		}).finally(() => {
 			this.deliveryInFlight = false;
 			this.pumpDelivery();
@@ -505471,7 +505486,10 @@ var EditorKeyboardController = class {
 				return;
 			}
 			if (host.state.appState.isCompacting && host.streamingUI.hasActiveTurn()) {
-				host.discardQueuedSlashCommands();
+				if (host.releaseNextQueuedMessage()) {
+					this.clearPendingUndoEsc();
+					return;
+				}
 				this.cancelCurrentStream();
 				this.clearPendingUndoEsc();
 				return;
@@ -505486,7 +505504,10 @@ var EditorKeyboardController = class {
 				return;
 			}
 			if (host.queueSteerInFlight !== void 0 || host.streamingUI.hasActiveTurn() || host.state.appState.streamingPhase !== "idle") {
-				host.discardQueuedSlashCommands();
+				if (host.releaseNextQueuedMessage()) {
+					this.clearPendingUndoEsc();
+					return;
+				}
 				this.cancelCurrentStream();
 				this.clearPendingUndoEsc();
 				return;
@@ -505495,10 +505516,6 @@ var EditorKeyboardController = class {
 				this.clearPendingUndoEsc();
 				return;
 			}
-			if (host.discardQueuedSlashCommands() > 0) {
-				this.clearPendingUndoEsc();
-				return;
-			}
 			if (this.pendingUndoEsc !== null) {
 				this.clearPendingUndoEsc();
 				host.openUndoSelector();
@@ -517887,8 +517904,7 @@ var BlunTUI = class {
 	canDeliverQueuedChannelHead() {
 		const item = this.state.queuedMessages[0];
 		const hasActiveTurn = this.streamingUI.hasActiveTurn() || (this.state.appState.streamingPhase !== "idle" && this.state.appState.streamingPhase !== "shell");
-		if (this.isShuttingDown || this.queueCommandRunning || this.queueSteerInFlight !== void 0 || this.editorReplacementActive || this.deferUserMessages || this.session === void 0 || this.state.appState.model.trim().length === 0 || !hasActiveTurn || item?.mode !== "channel") return false;
-		if (this.directFocusController.isPaused() && item.channelDirect !== true && item.channelUrgent !== true) return false;
+		if (this.isShuttingDown || this.queueCommandRunning || this.queueSteerInFlight !== void 0 || this.queueFlushBatchRemaining === 0 || this.editorReplacementActive || this.deferUserMessages || this.session === void 0 || this.state.appState.model.trim().length === 0 || !hasActiveTurn || item?.mode !== "channel") return false;
 		return true;
 	}
 	async deliverQueuedChannelHead() {
@@ -517912,10 +517928,12 @@ var BlunTUI = class {
 			this.syncChannelQueueDeadline();
 			this.updateQueueDisplay();
 			this.state.ui.requestRender();
+			this.steerQueueFlushPrefix();
 			return true;
 		}
 		const batchEnd = item.channelAttention === true ? 1 : item.channelUrgent === true ? this.state.queuedMessages.findIndex((queued) => queued.channelUrgent !== true) : item.channelDirect === true ? this.state.queuedMessages.findIndex((queued) => queued.channelDirect !== true) : item.channelAddressed === true ? this.state.queuedMessages.findIndex((queued) => queued.channelAddressed !== true) : this.state.queuedMessages.findIndex((queued) => queued.mode !== "channel" || queued.channelContextOnly === true || queued.channelAttention === true);
-		const items = this.state.queuedMessages.slice(0, batchEnd < 0 ? this.state.queuedMessages.length : batchEnd);
+		const candidateCount = batchEnd < 0 ? this.state.queuedMessages.length : batchEnd;
+		const items = this.state.queuedMessages.slice(0, Math.min(candidateCount, this.queueFlushBatchRemaining));
 		if (items.length === 0) return false;
 		this.state.queuedMessages = this.state.queuedMessages.slice(items.length);
 		this.updateQueueDisplay();
@@ -517955,6 +517973,7 @@ var BlunTUI = class {
 			turnEnded: false,
 			onCommit: () => {
 				renderTranscripts();
+				for (const queued of queuedItems) queued.channelTranscriptRendered = true;
 				for (const queued of items) queued.channelAcknowledge?.();
 				if (this.queueFlushBatchRemaining > 0) this.queueFlushBatchRemaining = Math.max(0, this.queueFlushBatchRemaining - items.length);
 			},
@@ -518021,7 +518040,11 @@ var BlunTUI = class {
 	}
 	updateAddressedChannelFocus() {
 		this.state.channelFocusContainer.clear();
-		const items = this.addressedChannelFocusStore.snapshot();
+		const queuedFocusIds = new Set([
+			...this.state.queuedMessages,
+			...this.queueSteerInFlight?.items ?? []
+		].map((item) => item.channelFocusId).filter((id) => id !== void 0));
+		const items = this.addressedChannelFocusStore.snapshot().filter((item) => !queuedFocusIds.has(item.id));
 		if (items.length > 0) this.state.channelFocusContainer.addChild(new AddressedChannelFocusPaneComponent(items));
 		this.state.ui.requestRender();
 	}
@@ -518031,15 +518054,23 @@ var BlunTUI = class {
 		inFlight.stepStarted = true;
 		this.commitQueuedSteerIfReady(inFlight);
 	}
+	releaseNextQueuedMessage() {
+		const inFlightCount = this.queueSteerInFlight?.items.length ?? 0;
+		const authorizedQueuedCount = Math.max(0, this.queueFlushBatchRemaining - inFlightCount);
+		if (authorizedQueuedCount >= this.state.queuedMessages.length) return false;
+		this.queueFlushBatchRemaining += 1;
+		this.steerQueueFlushPrefix();
+		this.updateQueueDisplay();
+		this.state.ui.requestRender();
+		return true;
+	}
 	restoreQueuedSteerAtTurnEnd(turnId) {
+		const turnKey = String(turnId);
 		const inFlight = this.queueSteerInFlight;
-		if (inFlight === void 0 || inFlight.turnId !== String(turnId)) return;
+		if (inFlight === void 0 || inFlight.turnId !== turnKey) return;
 		inFlight.turnEnded = true;
-		if (inFlight.stepStarted) {
-			this.commitQueuedSteer(inFlight);
-			return;
-		}
-		if (inFlight.accepted) this.restoreQueuedSteer(inFlight);
+		if (inFlight.stepStarted) this.commitQueuedSteer(inFlight);
+		else if (inFlight.accepted) this.restoreQueuedSteer(inFlight);
 	}
 	commitQueuedSteerIfReady(inFlight) {
 		if (this.queueSteerInFlight !== inFlight || !inFlight.accepted || !inFlight.stepStarted || inFlight.turnEnded) return;
@@ -518056,13 +518087,24 @@ var BlunTUI = class {
 		this.scheduleQueueDrain();
 	}
 	recoverRejectedActiveSteer(inFlight) {
-		const restored = this.restoreQueuedSteer(inFlight);
+		if (this.queueSteerInFlight !== inFlight) return false;
+		if (inFlight.confirmationTimer !== void 0) clearTimeout(inFlight.confirmationTimer);
+		this.queueSteerInFlight = void 0;
+		inFlight.onRestore?.();
+		const restoredItems = inFlight.items.map((item) => {
+			const copy = { ...item };
+			delete copy.channelDeliveryFailures;
+			return copy;
+		});
+		this.state.queuedMessages = [...restoredItems, ...this.state.queuedMessages];
+		this.updateQueueDisplay();
+		this.state.ui.requestRender();
 		if (!this.streamingUI.hasActiveTurn()) {
 			this.setAppState({ streamingPhase: "idle" });
 			this.resetLivePane();
 			this.scheduleQueueDrain();
 		}
-		return restored;
+		return false;
 	}
 	quarantineQueuedSteer(inFlight, error) {
 		if (this.queueSteerInFlight !== inFlight) return false;
@@ -518125,7 +518167,7 @@ var BlunTUI = class {
 		})), ...this.state.queuedMessages];
 		this.updateQueueDisplay();
 		this.state.ui.requestRender();
-		if (this.state.queuedMessages[0]?.mode === "channel") this.channelQueueDeadline.requestDeliveryNow();
+		if (this.queueFlushBatchRemaining > 0 && this.state.queuedMessages[0]?.mode === "channel") this.channelQueueDeadline.requestDeliveryNow();
 		this.scheduleQueueDrain();
 		return false;
 	}
@@ -518133,6 +518175,7 @@ var BlunTUI = class {
 		this.channelQueueDeadline?.sync();
 	}
 	releaseChannelQueueAtSafePoint() {
+		if (this.queueFlushBatchRemaining === 0) return;
 		this.channelQueueDeadline.requestDeliveryAtSafePoint();
 	}
 	canDrainQueue() {
@@ -518467,6 +518510,16 @@ var BlunTUI = class {
 			modelFallbackAllowed: false
 		});
 		session.promptAccepted(options?.parts ?? input).then((result) => {
+			if (result.duplicate === true) {
+				if (this.pendingChannelReplyGuard === installedGuard) this.pendingChannelReplyGuard = previousGuard;
+				this.setAppState({ streamingPhase: "idle" });
+				this.resetLivePane();
+				context.item.channelAcknowledge?.();
+				this.scheduleQueueDrain();
+				this.updateQueueDisplay();
+				this.state.ui.requestRender();
+				return;
+			}
 			if (result.accepted) {
 				context.item.channelAcknowledge?.();
 				return;
@@ -518520,6 +518573,17 @@ var BlunTUI = class {
 			text: focusedModelInput
 		}, imagePart] : focusedModelInput;
 		session.promptAccepted(promptInput, channelPromptOrigin(channelReportSources)).then((result) => {
+			if (result.duplicate === true) {
+				finishPersonalMemoryRememberIntentTurn(session.id);
+				if (installedGuard !== void 0 && this.pendingChannelReplyGuard === installedGuard) this.pendingChannelReplyGuard = previousGuard;
+				this.setAppState({ streamingPhase: "idle" });
+				this.resetLivePane();
+				acknowledge?.();
+				this.scheduleQueueDrain();
+				this.updateQueueDisplay();
+				this.state.ui.requestRender();
+				return;
+			}
 			if (result.accepted) {
 				acknowledge?.();
 				return;
@@ -519880,6 +519944,7 @@ var BlunTUI = class {
 		return this.state.livePane.mode;
 	}
 	updateQueueDisplay() {
+		this.updateAddressedChannelFocus();
 		this.state.queueContainer.clear();
 		const queued = this.state.queuedMessages;
 		if (queued.length === 0) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "9.1.486",
+  "version": "9.1.488",
   "description": "BLUN CLI - your own AI agent with a Telegram channel. Get it done. With BLUN.",
   "license": "MIT",
   "bin": {
@@ -37,6 +37,7 @@
     "scripts/fix-node-pty-perms.js",
     "standard-skills/",
     "standard-tools/",
+    "agent-spine-plugin/",
     "telegram-plugin/",
     "LIESMICH.txt"
   ],