blun-king-cli 9.1.486 → 9.1.489

package/blun.mjs

@@ -30516,7 +30516,7 @@ var init_input_schema = __esmMin((() => {
 var todo_list_default;
 var init_todo_list$1 = __esmMin((() => {
 	todo_list_default = "Use this tool to maintain a structured TODO list as you work through a multi-step task. Use it proactively and often when progress tracking helps the current work. This is especially useful in long-running investigations and implementation tasks with several tool calls; in plan mode, write the plan to the plan file rather than tracking it here.\n\n**When to use:**\n- Multi-step tasks that span several tool calls\n- Tracking investigation progress across a large codebase search\n- Planning a sequence of edits before making them\n- After receiving new multi-step instructions, capture the requirements as todos\n- Before starting a tracked task, mark exactly one item as `in_progress`\n- Immediately after finishing a tracked task, record its truthful terminal state; do not batch completions at the end\n\n**When NOT to use:**\n- Single-shot answers that complete in one or two tool calls\n- Trivial requests where tracking adds no clarity\n- Purely conversational or informational replies\n\n**Avoid churn:**\n- Do not re-call this tool when nothing meaningful has changed since the last call — update the list only after real progress.\n- When unsure of the current state, call query mode first (omit `todos`) to check the list before deciding what to update.\n- If no available tool can move any task forward, tell the user where you are stuck instead of repeatedly re-ordering the same todos.\n\n**How to use:**\n- Call with `todos: [...]` to replace the full list. Statuses: pending / in_progress / done / blocked / waiting_approval / aborted.\n- Call with no `todos` argument to retrieve the current list without changing it.\n- Call with `todos: []` to clear the list.\n- Keep titles short and actionable (e.g. \"Read session-control.ts\", \"Add planMode flag to TurnManager\").\n- Update statuses as you make progress.\n- When work is underway, keep exactly one task `in_progress`.\n- Use `done` only when fully accomplished. Use `blocked` with the reason and the action that would unblock it, `waiting_approval` with the prepared result that awaits approval, and `aborted` with the last reached state.\n- Never mark a task `done` if tests are failing, implementation is partial, unresolved errors remain, or required files/dependencies could not be found.\n";
-	todo_list_default = "Maintain a structured TODO list when it adds clarity to multi-step work; skip it for conversation or a single-shot task. In plan mode, use the plan file instead.\n\nCall with `todos: [...]` to replace the full list. Statuses are `pending`, `in_progress`, `done`, `blocked`, `waiting_approval`, and `aborted`. Omit `todos` to query the current list; use `todos: []` to clear it.\n\nKeep titles short and actionable. Capture the real requirements, keep exactly one item `in_progress` while tracked work is active, and update a status immediately after real progress instead of batching or rewriting an unchanged list. Use `done` only for fully verified work. A `blocked` item names the reason and the action that can unblock it; `waiting_approval` names the prepared result awaiting approval; `aborted` records the last reached state. Before finishing, reconcile every tracked item truthfully. If no available tool can move the work forward, report the blocker to the user instead of churning the list.";
+	todo_list_default = "Maintain the agent's visible BLUN TUI task/TODO list as you work through a multi-step task. This is the Aufgaben/Task/Todo panel shown by the interface, not a file, Cron job, scheduled task, or background-agent list. Use it proactively for investigations and implementation work spanning several tool calls; skip it only for conversation or a genuinely single-shot task. In plan mode, use the plan file instead.\n\nStart multi-step work by replacing the list with the real requirements. Keep exactly one item `in_progress`, update it immediately after real progress, and move the next item to `in_progress` instead of batching status changes at the end. Call with `todos: [...]` to replace the full list. Statuses are `pending`, `in_progress`, `done`, `blocked`, `waiting_approval`, and `aborted`. Omit `todos` to query the current list; use `todos: []` to clear a finished non-goal list.\n\nKeep titles short and actionable. Use `done` only for fully verified work. A `blocked` item names the reason and the action that can unblock it; `waiting_approval` names the prepared result awaiting approval; `aborted` records the last reached state. Before finishing, reconcile every tracked item truthfully. If no available tool can move the work forward, report the blocker to the user instead of churning the list.";
 }));
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/state/todo-list.ts
@@ -261582,7 +261582,7 @@ function blunPendingMediaSystemPrompt(systemPrompt, pendingMediaJobIds) {
 function blunFastConversationTools(tools, input, pendingMediaJobIds = [], requiredToolNames = /* @__PURE__ */ new Set()) {
 	const telegramTurn = BLUN_TELEGRAM_CHANNEL_RE.test(blunExtractText(input));
 	const mediaPending = pendingMediaJobIds.length > 0;
-	return tools.filter((tool) => telegramTurn && BLUN_TELEGRAM_OUTBOUND_TOOL_RE.test(tool.name) || mediaPending && tool.name === "GetMedia" || requiredToolNames.has(tool.name));
+	return tools.filter((tool) => tool.name === "TodoList" || telegramTurn && BLUN_TELEGRAM_OUTBOUND_TOOL_RE.test(tool.name) || mediaPending && tool.name === "GetMedia" || requiredToolNames.has(tool.name));
 }
 /**
 * Keep frequently used native tools resident and expose every other tool by
@@ -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
 			};
 		}
@@ -262471,6 +262474,9 @@ var init_turn = __esmMin((() => {
 			this.agent.usage.endTurn();
 			this.flushCognitiveToolEvidence(turnId, true);
 			this.recordCognitiveStage("endTurn", { turnId, reason: ended.reason, durationMs: ended.durationMs ?? 0 });
+			if (ended.reason === "cancelled" && (this.currentStepByTurn.get(turnId) ?? 0) === 0) {
+				this.telegramDeliveryLedger.forget(input, origin);
+			}
 			this.agent.emitEvent(ended);
 			return ended;
 		}
@@ -262776,10 +262782,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 });
@@ -262852,6 +262859,8 @@ var init_turn = __esmMin((() => {
 								return { continue: false };
 							},
 							prepareToolExecution: async (ctx) => {
+								const goalTodoPolicy = enforceGoalTodoPolicy(this.agent, ctx);
+								if (goalTodoPolicy !== void 0) return goalTodoPolicy;
 								const ideaPolicy = enforceIdeaToolPolicy(this.agent, ctx);
 								if (ideaPolicy !== void 0) return ideaPolicy;
 								const cached = deduper.checkSameStep(ctx.toolCall.id, ctx.toolCall.name, ctx.args);
@@ -263182,6 +263191,7 @@ var init_update_goal = __esmMin((() => {
 					}
 					if (args.status === "complete") {
 						const completed = await goal.markComplete({}, "model");
+						if (completed !== null) this.agent.tools.updateStore(TODO_STORE_KEY, []);
 						if (completed !== null) this.agent.context.appendSystemReminder(buildGoalCompletionSummaryPrompt(completed), {
 							kind: "system_trigger",
 							name: GOAL_COMPLETION_REMINDER_NAME
@@ -265802,6 +265812,7 @@ var init_agent = __esmMin((() => {
 
 - Answer the user's current conversational message directly and concisely.
 - Use the language of the user's latest conversational message unless the persona or current session specifies a language override.
+- When the user assigns multi-step work, start and maintain the visible BLUN TodoList before doing the work; update it after real progress and reconcile it before finishing. TodoList is not Cron, a file, or a background-task list.
 - Do not claim to have inspected files, run commands, used tools, or checked current external state.
 - If the message actually requires work or live information, say that plainly instead of inventing a result.`].filter((block) => block.length > 0).join("\n\n");
 		}
@@ -297711,7 +297722,7 @@ var init_session$1 = __esmMin((() => {
 			this.log = this.logHandle?.logger ?? (options.id === void 0 ? log : log.createChild({ sessionId: options.id }));
 			this.rpc = options.rpc;
 			this.experimentalFlags = options.experimentalFlags ?? new FlagResolver();
-			this.visionReader = (this.experimentalFlags.enabled("vision_reader") ? createVisionReader(options.config?.services?.visionReader) : void 0) ?? createManagedMediaVisionReader(options.toolServices?.media);
+			this.visionReader = createManagedMediaVisionReader(options.toolServices?.media) ?? (this.experimentalFlags.enabled("vision_reader") ? createVisionReader(options.config?.services?.visionReader) : void 0);
 			this.hookEngine = new HookEngine(options.hooks, {
 				cwd: options.kaos.getcwd(),
 				sessionId: options.id
@@ -326885,7 +326896,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 +329210,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 +329219,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 +329259,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 +329301,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 +403786,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"],
@@ -423182,6 +423201,31 @@ function validInitialIdeaPlan(value) {
 	}
 	return active === 1;
 }
+function enforceGoalTodoPolicy(agent, context) {
+	if (isIdeaGoal(agent) || agent.goal.getActiveGoal() === null) return;
+	const todos = ideaTodos(agent);
+	if (todos.length === 0) {
+		const firstCall = context.toolCalls[0];
+		if (context.toolCall.id !== firstCall?.id || context.toolCall.name !== "TodoList") return {
+			block: true,
+			reason: "Active multi-step goals require TodoList to be the first tool call. Publish and maintain the visible task list before research or action."
+		};
+		if (!validInitialIdeaPlan(context.args?.todos)) return {
+			block: true,
+			reason: "The first goal TodoList must contain at least one item, exactly one in_progress item, and only pending items otherwise."
+		};
+		return;
+	}
+	if (context.toolCall.name !== "UpdateGoal" || context.args?.status !== "complete" && context.args?.status !== "blocked") return;
+	if (todos.some((todo) => !IDEA_TERMINAL_TODO_STATUSES.includes(todo.status))) return {
+		block: true,
+		reason: "The goal cannot finish while a visible TodoList item has no truthful terminal status. Reconcile the list first."
+	};
+	if (context.args.status === "complete" && todos.some((todo) => todo.status !== "done")) return {
+		block: true,
+		reason: "The goal can complete only when every visible TodoList item is done. Use blocked when an item is blocked, waiting_approval, or aborted."
+	};
+}
 function ideaOutboundChannel(toolName, args) {
 	if (toolName === "Bash") {
 		const command = typeof args?.command === "string" ? args.command : "";
@@ -496448,6 +496492,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 +504008,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 +504032,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 +504060,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 +505518,11 @@ var EditorKeyboardController = class {
 				return;
 			}
 			if (host.state.appState.isCompacting && host.streamingUI.hasActiveTurn()) {
-				host.discardQueuedSlashCommands();
+				if (host.releaseNextQueuedMessage()) {
+					this.clearPendingUndoEsc();
+					return;
+				}
+				host.markCurrentRunCancelledByUser();
 				this.cancelCurrentStream();
 				this.clearPendingUndoEsc();
 				return;
@@ -505486,7 +505537,11 @@ 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;
+				}
+				host.markCurrentRunCancelledByUser();
 				this.cancelCurrentStream();
 				this.clearPendingUndoEsc();
 				return;
@@ -505495,10 +505550,6 @@ var EditorKeyboardController = class {
 				this.clearPendingUndoEsc();
 				return;
 			}
-			if (host.discardQueuedSlashCommands() > 0) {
-				this.clearPendingUndoEsc();
-				return;
-			}
 			if (this.pendingUndoEsc !== null) {
 				this.clearPendingUndoEsc();
 				host.openUndoSelector();
@@ -508757,6 +508808,7 @@ var SessionEventHandler = class {
 		this.clearModelRetryHint();
 		this.turnWatchdog.stop();
 		this.host.restoreQueuedSteerAtTurnEnd(event.turnId);
+		this.host.settleChannelPromptAtTurnEnd(event.turnId, event.reason);
 		const sessionId = this.host.session?.id;
 		if (sessionId !== void 0) finishPersonalMemoryRememberIntentTurn(sessionId, event.turnId);
 		this.host.streamingUI.flushNow();
@@ -508783,6 +508835,7 @@ var SessionEventHandler = class {
 		this.turnWatchdog.recordProgress();
 		this.clearModelRetryHint();
 		this.host.commitQueuedSteerAtStepStart(event.turnId);
+		this.host.commitChannelPromptAtStepStart(event.turnId);
 		this.host.streamingUI.flushNow();
 		this.host.streamingUI.setStep(event.step);
 		this.host.streamingUI.resetToolUi();
@@ -509093,6 +509146,7 @@ var SessionEventHandler = class {
 		const { state } = this.host;
 		if (change.kind === "completion" && event.snapshot !== null) {
 			this.pendingModelBlockedFallback = void 0;
+			this.host.streamingUI.setTodoList([]);
 			this.goalCompletionAwaitingClear = true;
 			this.goalCompletionTurnEnded = false;
 			this.host.appendTranscriptEntry({
@@ -517538,7 +517592,7 @@ var BlunTUI = class {
 			sessionId: this.session?.id ?? "",
 			goal: this.state.appState.goal,
 			permissionMode: this.state.appState.permissionMode,
-			idle: this.session !== void 0 && !this.isShuttingDown && !this.aborted && !this.queueCommandRunning && this.queueSteerInFlight === void 0 && !this.editorReplacementActive && !this.deferUserMessages && !this.streamingUI.hasActiveTurn() && this.state.appState.streamingPhase === "idle" && !this.state.appState.isCompacting && this.state.queuedMessages.length === 0
+			idle: this.session !== void 0 && !this.isShuttingDown && !this.aborted && !this.queueCommandRunning && this.queueSteerInFlight === void 0 && this.channelPromptInFlight === void 0 && !this.editorReplacementActive && !this.deferUserMessages && !this.streamingUI.hasActiveTurn() && this.state.appState.streamingPhase === "idle" && !this.state.appState.isCompacting && this.state.queuedMessages.length === 0
 		};
 	}
 	syncGoalTimeTrigger() {
@@ -517877,6 +517931,7 @@ var BlunTUI = class {
 	telegramRemoteCommandContext;
 	queueFlushBatchRemaining = 0;
 	queueSteerInFlight;
+	channelPromptInFlight;
 	editorReplacementActive = false;
 	editorReplacement;
 	editorReplacementGeneration = 0;
@@ -517887,8 +517942,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 +517966,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 +518011,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 +518078,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 +518092,47 @@ 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;
+	}
+	markCurrentRunCancelledByUser() {
+		if (this.channelPromptInFlight !== void 0) this.channelPromptInFlight.userCancelled = true;
+		if (this.queueSteerInFlight !== void 0) this.queueSteerInFlight.userCancelled = 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);
+		if (inFlight.stepStarted || inFlight.userCancelled === true) this.commitQueuedSteer(inFlight);
+		else if (inFlight.accepted) this.restoreQueuedSteer(inFlight);
+	}
+	commitChannelPromptAtStepStart(turnId) {
+		const inFlight = this.channelPromptInFlight;
+		if (inFlight === void 0 || inFlight.turnId !== String(turnId)) return;
+		this.channelPromptInFlight = void 0;
+		inFlight.acknowledge();
+	}
+	settleChannelPromptAtTurnEnd(turnId, reason) {
+		const inFlight = this.channelPromptInFlight;
+		if (inFlight === void 0 || inFlight.turnId !== String(turnId)) return;
+		this.channelPromptInFlight = void 0;
+		if (reason !== "cancelled" || inFlight.userCancelled === true) {
+			inFlight.acknowledge();
 			return;
 		}
-		if (inFlight.accepted) this.restoreQueuedSteer(inFlight);
+		inFlight.onRestore?.();
+		this.state.queuedMessages = [inFlight.item, ...this.state.queuedMessages];
+		this.syncChannelQueueDeadline();
+		this.updateQueueDisplay();
+		this.state.ui.requestRender();
 	}
 	commitQueuedSteerIfReady(inFlight) {
 		if (this.queueSteerInFlight !== inFlight || !inFlight.accepted || !inFlight.stepStarted || inFlight.turnEnded) return;
@@ -518056,13 +518149,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 +518229,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,12 +518237,13 @@ var BlunTUI = class {
 		this.channelQueueDeadline?.sync();
 	}
 	releaseChannelQueueAtSafePoint() {
+		if (this.queueFlushBatchRemaining === 0) return;
 		this.channelQueueDeadline.requestDeliveryAtSafePoint();
 	}
 	canDrainQueue() {
 		const head = this.state.queuedMessages[0];
 		const directWork = head?.channelDirect === true || head?.channelUrgent === true || head?.mode === "channel-command" && /^[1-9]\d*$/u.test(String(head.channelChatId ?? ""));
-		return !this.isShuttingDown && !this.queueCommandRunning && this.queueSteerInFlight === void 0 && !this.editorReplacementActive && !this.deferUserMessages && !this.streamingUI.hasActiveTurn() && this.state.appState.streamingPhase === "idle" && !this.state.appState.isCompacting && (!this.directFocusController.isPaused() || directWork);
+		return !this.isShuttingDown && !this.queueCommandRunning && this.queueSteerInFlight === void 0 && this.channelPromptInFlight === void 0 && !this.editorReplacementActive && !this.deferUserMessages && !this.streamingUI.hasActiveTurn() && this.state.appState.streamingPhase === "idle" && !this.state.appState.isCompacting && (!this.directFocusController.isPaused() || directWork);
 	}
 	scheduleQueueDrain() {
 		if (this.queueDrainTimer !== void 0 || !this.canDrainQueue()) return;
@@ -518467,6 +518572,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,8 +518635,44 @@ var BlunTUI = class {
 			text: focusedModelInput
 		}, imagePart] : focusedModelInput;
 		session.promptAccepted(promptInput, channelPromptOrigin(channelReportSources)).then((result) => {
-			if (result.accepted) {
+			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) {
+				if (acknowledge !== void 0 && result.turnId !== null && result.turnId !== void 0) {
+					this.channelPromptInFlight = {
+						turnId: String(result.turnId),
+						acknowledge,
+						item: {
+							text: modelInput,
+							displayText,
+							origin,
+							agentId: this.harness.interactiveAgentId,
+							mode: "channel",
+							channelChatId,
+							channelReportSources: channelReportSources,
+							channelContextOnly: contextOnly,
+							channelTranscriptRendered: true,
+							channelAcknowledge: acknowledge,
+							...channelFocusId === void 0 ? {} : { channelFocusId, channelAddressed: true },
+							...channelAttention === true ? { channelAttention: true } : {},
+							...channelDirect === true ? { channelDirect: true, channelDirectResume } : {},
+							...queueKey === void 0 ? {} : { queueKey },
+							...channelImagePath === void 0 ? {} : { channelImagePath }
+						},
+						onRestore: () => {
+							if (installedGuard !== void 0 && this.pendingChannelReplyGuard === installedGuard) this.pendingChannelReplyGuard = previousGuard;
+						}
+					};
+				} else acknowledge?.();
 				return;
 			}
 			if (installedGuard !== void 0 && this.pendingChannelReplyGuard === installedGuard) this.pendingChannelReplyGuard = previousGuard;
@@ -519880,6 +520031,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.489",
   "description": "BLUN CLI - your own AI agent with a Telegram channel. Get it done. With BLUN.",
   "license": "MIT",
   "bin": {
@@ -37,7 +37,9 @@
     "scripts/fix-node-pty-perms.js",
     "standard-skills/",
     "standard-tools/",
+    "agent-spine-plugin/",
     "telegram-plugin/",
+    "CHANGELOG.md",
     "LIESMICH.txt"
   ],
   "keywords": [