blun-king-cli 9.1.25 → 9.1.26

package/blun.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:390518244a4c2f3bd6dba9ae2b00963abb0416572bc276f8c933f99a17ae0d33
+// BLUN_BUILD_INPUT_SHA256:7d2032417fd49eb3d28a7006057755559c5bb8da252a52c972b2ccc12a33dd14
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
@@ -76385,7 +76385,7 @@ var init_telemetry_events = __esmMin((() => {
 //#endregion
 //#region ../../packages/agent-core/src/agent/cron/manager.ts
 var STALE_THRESHOLD_MS, CronManager;
-var init_manager$2 = __esmMin((() => {
+var init_manager$3 = __esmMin((() => {
 	init_clock();
 	init_cron_fire_xml();
 	init_persist();
@@ -76797,7 +76797,7 @@ var init_manager$2 = __esmMin((() => {
 //#endregion
 //#region ../../packages/agent-core/src/agent/cron/index.ts
 var init_cron$1 = __esmMin((() => {
-	init_manager$2();
+	init_manager$3();
 }));
 //#endregion
 //#region ../../packages/agent-core/src/tools/policies/sensitive.ts
@@ -232055,7 +232055,7 @@ var init_mission_contract_bridge = __esmMin((() => {
 //#endregion
 //#region ../../packages/agent-core/src/agent/injection/manager.ts
 var ACTIVE_BACKGROUND_TASK_GUIDANCE, InjectionManager;
-var init_manager$1 = __esmMin((() => {
+var init_manager$2 = __esmMin((() => {
 	init_task_list();
 	init_action_style();
 	init_error_memory$1();
@@ -252200,6 +252200,26 @@ var init_edit$1 = __esmMin((() => {
 	edit_default = "Perform exact replacements in existing files.\n\n- Edit is mandatory for every incremental change, especially small edits. DO NOT use Write or Bash `sed`.\n- Read the target file before every Edit. DO NOT call Edit from memory, stale context, or a guessed `old_string`.\n- Take `old_string` and `new_string` from the Read output view.\n- Drop the line-number prefix and tab; match only file content.\n- `old_string` must be unique unless `replace_all` is set.\n- If `old_string` is ambiguous, add surrounding context. Use `replace_all` only when every occurrence should change — for example, renaming a symbol throughout the file.\n- Multiple Edit calls may run in one response only when they do not target the same file.\n- DO NOT issue consecutive Edit calls on the same file. A previous Edit can invalidate a later Edit's `old_string`, causing `old_string not found`. Read the file again before the next Edit.\n- A write lock serializes same-file edits in response order, but serialization does not make stale `old_string` valid.\n- For pure CRLF files, Read shows LF; use LF in `old_string` and `new_string`, and Edit writes CRLF back.\n- For mixed endings or lone carriage returns, Read shows carriage returns as \\r; include actual \\r escapes in those positions.\n- Source files may contain at most 500 lines. An already oversized source may only be edited when the result has fewer lines.\n- Set `single_file_override=true` only when the latest direct user message explicitly requires one single file. The accepted override is reported visibly.\n";
 }));
 //#endregion
+//#region ../../packages/agent-core/src/tools/builtin/file/lsp-diagnostics.ts
+async function appendLspDiagnostics(result, path, lsp) {
+	if (lsp === void 0 || result.isError === true || typeof result.output !== "string") return result;
+	try {
+		const diagnostics = await lsp.diagnosticsAfterChange(path);
+		if (diagnostics === void 0 || diagnostics.length === 0) return result;
+		return {
+			...result,
+			output: `${result.output}\nLSP diagnostics:\n${JSON.stringify(diagnostics, null, 2)}`
+		};
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return {
+			...result,
+			output: `${result.output}\nLSP diagnostics unavailable: ${message}`
+		};
+	}
+}
+var init_lsp_diagnostics = __esmMin((() => {}));
+//#endregion
 //#region ../../packages/agent-core/src/tools/builtin/file/edit.ts
 function replaceOnceLiteral(content, oldString, newString) {
 	const index = content.indexOf(oldString);
@@ -252216,6 +252236,7 @@ var init_edit = __esmMin((() => {
 	init_line_endings();
 	init_source_file_line_limit();
 	init_edit$1();
+	init_lsp_diagnostics();
 	EditInputSchema = object({
 		path: string().describe("Path to the text file to edit. Relative paths resolve against the working directory; a path outside the working directory must be absolute."),
 		old_string: string().min(1).describe("Exact content to replace from the Read output view, without the line-number prefix. Use LF for pure CRLF files; use actual \\r escapes where Read shows \\r."),
@@ -252227,13 +252248,15 @@ var init_edit = __esmMin((() => {
 		kaos;
 		workspace;
 		history;
+		lsp;
 		name = "Edit";
 		description = edit_default;
 		parameters = toInputJsonSchema(EditInputSchema);
-		constructor(kaos, workspace, history) {
+		constructor(kaos, workspace, history, lsp) {
 			this.kaos = kaos;
 			this.workspace = workspace;
 			this.history = history;
+			this.lsp = lsp;
 		}
 		resolveExecution(args) {
 			const path = resolvePathAccessPath(args.path, {
@@ -252324,7 +252347,7 @@ var init_edit = __esmMin((() => {
 			await this.kaos.writeText(safePath, materialized);
 			const occurrence = replacementCount === 1 ? "occurrence" : "occurrences";
 			const notice = lineLimit.notice === void 0 ? "" : ` ${lineLimit.notice}`;
-			return { output: `Replaced ${String(replacementCount)} ${occurrence} in ${args.path}.` + notice };
+			return appendLspDiagnostics({ output: `Replaced ${String(replacementCount)} ${occurrence} in ${args.path}.` + notice }, safePath, this.lsp);
 		}
 	};
 }));
@@ -258411,6 +258434,7 @@ var init_write = __esmMin((() => {
 	init_rule_match();
 	init_source_file_line_limit();
 	init_write$1();
+	init_lsp_diagnostics();
 	S_IFMT = 61440;
 	S_IFDIR = 16384;
 	WriteInputSchema = object({
@@ -258426,13 +258450,15 @@ bytesWritten: number$1().int().nonnegative() });
 		kaos;
 		workspace;
 		history;
+		lsp;
 		name = "Write";
 		description = write_default;
 		parameters = toInputJsonSchema(WriteInputSchema);
-		constructor(kaos, workspace, history) {
+		constructor(kaos, workspace, history, lsp) {
 			this.kaos = kaos;
 			this.workspace = workspace;
 			this.history = history;
+			this.lsp = lsp;
 		}
 		resolveExecution(args) {
 			const path = resolvePathAccessPath(args.path, {
@@ -258489,7 +258515,7 @@ bytesWritten: number$1().int().nonnegative() });
 				else await this.kaos.writeText(safePath, args.content);
 				const bytesWritten = Buffer.byteLength(args.content, "utf8");
 				const notice = lineLimit.notice === void 0 ? "" : ` ${lineLimit.notice}`;
-				return { output: `${mode === "append" ? "Appended" : "Wrote"} ${String(bytesWritten)} bytes to ${args.path}.${notice}` };
+				return appendLspDiagnostics({ output: `${mode === "append" ? "Appended" : "Wrote"} ${String(bytesWritten)} bytes to ${args.path}.${notice}` }, safePath, this.lsp);
 			} catch (error) {
 				if (error?.code === "ENOENT") return {
 					isError: true,
@@ -261017,6 +261043,83 @@ var init_codebase_search = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../packages/agent-core/src/tools/builtin/search/lsp.md?raw
+var lsp_default;
+var init_lsp$2 = __esmMin((() => {
+	lsp_default = "Query a configured Language Server Protocol (LSP) server for precise code intelligence.\n\nUse this tool for definitions, references, hover/type information, document or workspace symbols, implementations, and current diagnostics. Line and character positions are one-based. Use `workspace_symbols` with `query`; all other operations require `path`. Position-based operations also require `line` and `character`.\n\nLanguage servers are provided by enabled plugins and start only when first used. If the required server executable is missing, report that exact setup error instead of falling back to a guess.\n";
+}));
+//#endregion
+//#region ../../packages/agent-core/src/tools/builtin/search/lsp.ts
+var LspInputSchema, LspTool;
+var init_lsp$1 = __esmMin((() => {
+	init_zod$1();
+	init_tool_access();
+	init_path_access();
+	init_input_schema();
+	init_rule_match();
+	init_lsp$2();
+	LspInputSchema = object({
+		operation: _enum([
+			"definition",
+			"references",
+			"hover",
+			"document_symbols",
+			"workspace_symbols",
+			"implementation",
+			"diagnostics"
+		]),
+		path: string().optional().describe("Source file path, relative to the working directory or absolute."),
+		line: number$1().int().positive().optional().describe("One-based source line."),
+		character: number$1().int().positive().optional().describe("One-based character offset."),
+		query: string().optional().describe("Symbol query for workspace_symbols.")
+	});
+	LspTool = class {
+		service;
+		kaos;
+		workspace;
+		name = "LSP";
+		description = lsp_default;
+		parameters = toInputJsonSchema(LspInputSchema);
+		constructor(service, kaos, workspace) {
+			this.service = service;
+			this.kaos = kaos;
+			this.workspace = workspace;
+		}
+		resolveExecution(args) {
+			const safePath = args.path === void 0 || this.kaos === void 0 || this.workspace === void 0 ? args.path : resolvePathAccessPath(args.path, {
+				kaos: this.kaos,
+				workspace: this.workspace,
+				operation: "read"
+			});
+			return {
+				description: `LSP ${args.operation}${args.path === void 0 ? "" : `: ${args.path}`}`,
+				accesses: safePath === void 0 ? ToolAccesses.searchTree(this.workspace?.workspaceDir ?? ".") : ToolAccesses.readFile(safePath),
+				approvalRule: literalRulePattern(this.name, args.operation),
+				matchesRule: safePath === void 0 || this.kaos === void 0 || this.workspace === void 0 ? void 0 : (ruleArgs) => matchesPathRuleSubject(ruleArgs, safePath, {
+					cwd: this.workspace.workspaceDir,
+					pathClass: this.kaos.pathClass(),
+					homeDir: this.kaos.gethome()
+				}),
+				execute: () => this.execute({
+					...args,
+					path: safePath
+				})
+			};
+		}
+		async execute(args) {
+			try {
+				const result = await this.service.request(args);
+				return { output: JSON.stringify(result ?? null, null, 2) };
+			} catch (error) {
+				return {
+					isError: true,
+					output: error instanceof Error ? error.message : String(error)
+				};
+			}
+		}
+	};
+}));
+//#endregion
 //#region ../../packages/agent-core/src/tools/builtin/mistake-record.md?raw
 var mistake_record_default;
 var init_mistake_record$1 = __esmMin((() => {
@@ -261391,6 +261494,7 @@ var init_builtin = __esmMin((() => {
 	init_fetch_url();
 	init_web_search();
 	init_codebase_search();
+	init_lsp$1();
 	init_mistake_record();
 	init_blun_media$1();
 }));
@@ -261789,8 +261893,8 @@ var init_tool$1 = __esmMin((() => {
 			const goalToolsEnabled = this.agent.type === "main";
 			this.builtinTools = new Map([
 				new ReadTool(kaos, workspace),
-				new WriteTool(kaos, workspace, () => this.agent.context.history),
-				new EditTool(kaos, workspace, () => this.agent.context.history),
+				new WriteTool(kaos, workspace, () => this.agent.context.history, toolServices?.lsp),
+				new EditTool(kaos, workspace, () => this.agent.context.history, toolServices?.lsp),
 				new GrepTool(kaos, workspace, this.agent.telemetry),
 				new GlobTool(kaos, workspace, this.agent.telemetry),
 				new BashTool(kaos, cwd, background, { allowBackground }),
@@ -261826,7 +261930,8 @@ var init_tool$1 = __esmMin((() => {
 				toolServices?.media && new LipSyncMediaTool(toolServices.media),
 				toolServices?.media && new GetMediaTool(toolServices.media),
 				new MistakeRecordTool(this.agent),
-				new CodebaseSearchTool(cwd)
+				new CodebaseSearchTool(cwd),
+				toolServices?.lsp && new LspTool(toolServices.lsp, kaos, workspace)
 			].filter((tool) => !!tool).map((tool) => [tool.name, tool]));
 		}
 		refreshBuiltinTools() {
@@ -262220,7 +262325,7 @@ var init_agent = __esmMin((() => {
 	init_error_memory();
 	init_goal$1();
 	init_hooks();
-	init_manager$1();
+	init_manager$2();
 	init_permission();
 	init_plan();
 	init_records();
@@ -263955,7 +264060,7 @@ var init_ajv_provider = __esmMin((() => {
 //#endregion
 //#region ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.29.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/client.js
 var ExperimentalClientTasks;
-var init_client$2 = __esmMin((() => {
+var init_client$3 = __esmMin((() => {
 	init_types$4();
 	ExperimentalClientTasks = class {
 		constructor(_client) {
@@ -264213,12 +264318,12 @@ function getSupportedElicitationModes(capabilities) {
 	};
 }
 var Client;
-var init_client$1 = __esmMin((() => {
+var init_client$2 = __esmMin((() => {
 	init_protocol();
 	init_types$4();
 	init_ajv_provider();
 	init_zod_compat();
-	init_client$2();
+	init_client$3();
 	init_helpers$1();
 	Client = class extends Protocol {
 		/**
@@ -265237,7 +265342,7 @@ function buildMcpHttpHeaders(config, envLookup) {
 }
 var HttpMcpClient;
 var init_client_http = __esmMin((() => {
-	init_client$1();
+	init_client$2();
 	init_streamableHttp();
 	init_client_shared();
 	init_client_remote();
@@ -265759,7 +265864,7 @@ function isTerminalSseTransportError(error) {
 }
 var SseMcpClient;
 var init_client_sse = __esmMin((() => {
-	init_client$1();
+	init_client$2();
 	init_sse();
 	init_client_shared();
 	init_client_remote();
@@ -292969,7 +293074,7 @@ var STDERR_BUFFER_CAPACITY, StdioMcpClient, BoundedTail;
 var init_client_stdio = __esmMin((() => {
 	init_errors$8();
 	init_proxy();
-	init_client$1();
+	init_client$2();
 	init_stdio();
 	init_dist$6();
 	init_client_shared();
@@ -293235,7 +293340,7 @@ async function withTimeout(promise, timeoutMs, onTimeout) {
 		if (timer !== void 0) clearTimeout(timer);
 	}
 }
-var DEFAULT_STARTUP_TIMEOUT_MS, McpConnectionManager;
+var DEFAULT_STARTUP_TIMEOUT_MS$1, McpConnectionManager;
 var init_connection_manager = __esmMin((() => {
 	init_errors$8();
 	init_logger$1();
@@ -293246,7 +293351,7 @@ var init_connection_manager = __esmMin((() => {
 	init_client_stdio();
 	init_public_display();
 	init_types$1();
-	DEFAULT_STARTUP_TIMEOUT_MS = 3e4;
+	DEFAULT_STARTUP_TIMEOUT_MS$1 = 3e4;
 	McpConnectionManager = class {
 		options;
 		entries = /* @__PURE__ */ new Map();
@@ -293403,7 +293508,7 @@ var init_connection_manager = __esmMin((() => {
 			await Promise.allSettled(tasks);
 		}
 		async connectOne(entry, attemptId) {
-			const timeoutMs = entry.config.startupTimeoutMs ?? DEFAULT_STARTUP_TIMEOUT_MS;
+			const timeoutMs = entry.config.startupTimeoutMs ?? DEFAULT_STARTUP_TIMEOUT_MS$1;
 			let client;
 			try {
 				const startupClient = this.createClient(entry.config, entry.name);
@@ -293745,6 +293850,446 @@ var init_legacy_memory = __esmMin((() => {
 	LEGACY_LOCAL_MEMORY_SAVE = "When the user tells you something worth remembering (preferences, facts about them, project context, corrections), SAVE it:";
 }));
 //#endregion
+//#region ../../packages/agent-core/src/lsp/client.ts
+async function waitForExit$1(child, timeoutMs) {
+	if (child.exitCode !== null) return;
+	await Promise.race([new Promise((resolve) => {
+		child.once("exit", () => resolve());
+	}), delay(timeoutMs)]);
+}
+function delay(timeoutMs) {
+	return new Promise((resolve) => {
+		setTimeout(resolve, timeoutMs).unref?.();
+	});
+}
+var DEFAULT_STARTUP_TIMEOUT_MS, DEFAULT_SHUTDOWN_TIMEOUT_MS, REQUEST_TIMEOUT_MS, StdioLspClient;
+var init_client$1 = __esmMin((() => {
+	DEFAULT_STARTUP_TIMEOUT_MS = 1e4;
+	DEFAULT_SHUTDOWN_TIMEOUT_MS = 2e3;
+	REQUEST_TIMEOUT_MS = 3e4;
+	StdioLspClient = class {
+		name;
+		config;
+		cwd;
+		process;
+		startPromise;
+		stdout = Buffer.alloc(0);
+		nextId = 1;
+		stopped = false;
+		_generation = 0;
+		pending = /* @__PURE__ */ new Map();
+		diagnosticsByUri = /* @__PURE__ */ new Map();
+		diagnosticsWaiters = /* @__PURE__ */ new Map();
+		constructor(name, config, cwd) {
+			this.name = name;
+			this.config = config;
+			this.cwd = cwd;
+		}
+		get running() {
+			return this.process !== void 0 && this.process.exitCode === null && !this.stopped;
+		}
+		get generation() {
+			return this._generation;
+		}
+		async start() {
+			if (this.running) return;
+			if (this.startPromise !== void 0) return this.startPromise;
+			this.startPromise = this.startInternal().catch((error) => {
+				this.startPromise = void 0;
+				throw error;
+			});
+			return this.startPromise;
+		}
+		async request(method, params) {
+			await this.start();
+			return this.sendRequest(method, params, REQUEST_TIMEOUT_MS);
+		}
+		notify(method, params) {
+			if (!this.running) throw new Error(`LSP server "${this.name}" is not running`);
+			this.write({
+				jsonrpc: "2.0",
+				method,
+				params
+			});
+		}
+		diagnostics(uri) {
+			return this.diagnosticsByUri.get(uri);
+		}
+		clearDiagnostics(uri) {
+			this.diagnosticsByUri.delete(uri);
+		}
+		async waitForDiagnostics(uri, timeoutMs = 300) {
+			const current = this.diagnosticsByUri.get(uri);
+			if (current !== void 0) return current;
+			let notify;
+			const notification = new Promise((resolve) => {
+				notify = resolve;
+				const waiters = this.diagnosticsWaiters.get(uri) ?? [];
+				waiters.push(resolve);
+				this.diagnosticsWaiters.set(uri, waiters);
+			});
+			await Promise.race([notification, delay(timeoutMs)]);
+			const waiters = this.diagnosticsWaiters.get(uri);
+			if (waiters !== void 0) {
+				const remaining = waiters.filter((waiter) => waiter !== notify);
+				if (remaining.length === 0) this.diagnosticsWaiters.delete(uri);
+				else this.diagnosticsWaiters.set(uri, remaining);
+			}
+			return this.diagnosticsByUri.get(uri) ?? [];
+		}
+		async shutdown() {
+			this.stopped = true;
+			const child = this.process;
+			if (child === void 0 || child.exitCode !== null) return;
+			try {
+				await this.sendRequest("shutdown", null, this.config.shutdownTimeoutMs ?? DEFAULT_SHUTDOWN_TIMEOUT_MS);
+				this.write({
+					jsonrpc: "2.0",
+					method: "exit",
+					params: null
+				});
+			} catch {}
+			await waitForExit$1(child, this.config.shutdownTimeoutMs ?? DEFAULT_SHUTDOWN_TIMEOUT_MS);
+			if (child.exitCode === null) child.kill();
+			this.process = void 0;
+			this.startPromise = void 0;
+		}
+		async startInternal() {
+			this.stopped = false;
+			const child = spawn(this.config.command, [...this.config.args ?? []], {
+				cwd: this.config.workspaceFolder ?? this.cwd,
+				env: {
+					...process.env,
+					...this.config.env
+				},
+				stdio: [
+					"pipe",
+					"pipe",
+					"pipe"
+				],
+				windowsHide: true
+			});
+			this.process = child;
+			child.stdout.on("data", (chunk) => this.onStdout(chunk));
+			child.stderr.on("data", () => {});
+			child.once("error", (error) => this.failProcess(error));
+			child.once("exit", (code, signal) => {
+				if (!this.stopped) this.failProcess(/* @__PURE__ */ new Error(`LSP server "${this.name}" exited unexpectedly (${code === null ? signal : String(code)})`));
+			});
+			const rootPath = this.config.workspaceFolder ?? this.cwd;
+			const rootUri = pathToFileURL(rootPath).href;
+			try {
+				await this.sendRequest("initialize", {
+					processId: process.pid,
+					clientInfo: {
+						name: "BLUN Code",
+						version: "1"
+					},
+					rootPath,
+					rootUri,
+					workspaceFolders: [{
+						uri: rootUri,
+						name: this.name
+					}],
+					capabilities: {
+						textDocument: {
+							hover: { contentFormat: ["markdown", "plaintext"] },
+							definition: { linkSupport: true },
+							implementation: { linkSupport: true },
+							publishDiagnostics: { relatedInformation: true }
+						},
+						workspace: { symbol: { resolveSupport: { properties: ["location.range"] } } }
+					},
+					initializationOptions: this.config.initializationOptions
+				}, this.config.startupTimeoutMs ?? DEFAULT_STARTUP_TIMEOUT_MS);
+				this.notify("initialized", {});
+				this._generation++;
+				if (this.config.settings !== void 0) this.notify("workspace/didChangeConfiguration", { settings: this.config.settings });
+			} catch (error) {
+				if (child.exitCode === null) child.kill();
+				const message = error instanceof Error ? error.message : String(error);
+				throw new Error(`Failed to start LSP server "${this.name}" (${this.config.command}): ${message}`, { cause: error });
+			}
+		}
+		sendRequest(method, params, timeoutMs) {
+			const id = this.nextId++;
+			return new Promise((resolve, reject) => {
+				const timer = setTimeout(() => {
+					this.pending.delete(id);
+					reject(/* @__PURE__ */ new Error(`LSP request "${method}" timed out after ${String(timeoutMs)} ms`));
+				}, timeoutMs);
+				timer.unref?.();
+				this.pending.set(id, {
+					resolve,
+					reject,
+					timer
+				});
+				try {
+					this.write({
+						jsonrpc: "2.0",
+						id,
+						method,
+						params
+					});
+				} catch (error) {
+					clearTimeout(timer);
+					this.pending.delete(id);
+					reject(error instanceof Error ? error : new Error(String(error)));
+				}
+			});
+		}
+		write(message) {
+			const stdin = this.process?.stdin;
+			if (stdin === void 0 || stdin.destroyed) throw new Error(`LSP server "${this.name}" is not available`);
+			const body = Buffer.from(JSON.stringify(message), "utf8");
+			stdin.write(`Content-Length: ${String(body.length)}\r\n\r\n`);
+			stdin.write(body);
+		}
+		onStdout(chunk) {
+			this.stdout = Buffer.concat([this.stdout, chunk]);
+			while (true) {
+				const headerEnd = this.stdout.indexOf("\r\n\r\n");
+				if (headerEnd < 0) return;
+				const header = this.stdout.subarray(0, headerEnd).toString("ascii");
+				const match = /(?:^|\r\n)Content-Length:\s*(\d+)/i.exec(header);
+				if (match === null) {
+					this.failProcess(/* @__PURE__ */ new Error(`Invalid LSP response header from "${this.name}"`));
+					return;
+				}
+				const length = Number(match[1]);
+				const bodyStart = headerEnd + 4;
+				if (this.stdout.length < bodyStart + length) return;
+				const body = this.stdout.subarray(bodyStart, bodyStart + length).toString("utf8");
+				this.stdout = this.stdout.subarray(bodyStart + length);
+				try {
+					this.handleMessage(JSON.parse(body));
+				} catch (error) {
+					this.failProcess(error instanceof Error ? error : new Error(String(error)));
+					return;
+				}
+			}
+		}
+		handleMessage(message) {
+			if (message.id !== void 0 && message.method !== void 0) {
+				this.handleServerRequest(message.id, message.method, message.params);
+				return;
+			}
+			if (message.id !== void 0) {
+				const pending = this.pending.get(message.id);
+				if (pending === void 0) return;
+				clearTimeout(pending.timer);
+				this.pending.delete(message.id);
+				if (message.error !== void 0) pending.reject(/* @__PURE__ */ new Error(`LSP request failed${message.error.code === void 0 ? "" : ` (${String(message.error.code)})`}: ${message.error.message ?? "unknown error"}`));
+				else pending.resolve(message.result);
+				return;
+			}
+			if (message.method !== "textDocument/publishDiagnostics") return;
+			const params = message.params;
+			if (typeof params?.uri !== "string" || !Array.isArray(params.diagnostics)) return;
+			this.diagnosticsByUri.set(params.uri, params.diagnostics);
+			const waiters = this.diagnosticsWaiters.get(params.uri) ?? [];
+			this.diagnosticsWaiters.delete(params.uri);
+			for (const resolve of waiters) resolve();
+		}
+		handleServerRequest(id, method, params) {
+			if (method === "workspace/configuration") {
+				const items = params?.items;
+				const count = Array.isArray(items) ? items.length : 0;
+				this.write({
+					jsonrpc: "2.0",
+					id,
+					result: Array.from({ length: count }, () => this.config.settings ?? null)
+				});
+				return;
+			}
+			if (method === "workspace/workspaceFolders") {
+				const rootPath = this.config.workspaceFolder ?? this.cwd;
+				this.write({
+					jsonrpc: "2.0",
+					id,
+					result: [{
+						uri: pathToFileURL(rootPath).href,
+						name: this.name
+					}]
+				});
+				return;
+			}
+			if (method === "client/registerCapability" || method === "client/unregisterCapability" || method === "window/workDoneProgress/create") {
+				this.write({
+					jsonrpc: "2.0",
+					id,
+					result: null
+				});
+				return;
+			}
+			this.write({
+				jsonrpc: "2.0",
+				id,
+				error: {
+					code: -32601,
+					message: `Client method not supported: ${method}`
+				}
+			});
+		}
+		failProcess(error) {
+			const wrapped = new Error(`LSP server "${this.name}" (${this.config.command}) failed: ${error.message}`, { cause: error });
+			for (const pending of this.pending.values()) {
+				clearTimeout(pending.timer);
+				pending.reject(wrapped);
+			}
+			this.pending.clear();
+			this.process = void 0;
+			if (this.config.restartOnCrash !== false && !this.stopped) this.startPromise = void 0;
+		}
+	};
+}));
+//#endregion
+//#region ../../packages/agent-core/src/lsp/manager.ts
+function methodForOperation(operation) {
+	switch (operation) {
+		case "definition": return "textDocument/definition";
+		case "references": return "textDocument/references";
+		case "hover": return "textDocument/hover";
+		case "document_symbols": return "textDocument/documentSymbol";
+		case "implementation": return "textDocument/implementation";
+	}
+}
+function oneBasedToZeroBased(value, name) {
+	if (value === void 0 || !Number.isInteger(value) || value < 1) throw new Error(`LSP operation requires a one-based ${name}`);
+	return value - 1;
+}
+function positionFrom(input) {
+	return {
+		line: oneBasedToZeroBased(input.line, "line"),
+		character: oneBasedToZeroBased(input.character, "character")
+	};
+}
+var LspManager;
+var init_manager$1 = __esmMin((() => {
+	init_client$1();
+	LspManager = class {
+		options;
+		clients = /* @__PURE__ */ new Map();
+		openedDocuments = /* @__PURE__ */ new Map();
+		constructor(options) {
+			this.options = options;
+		}
+		serverNames() {
+			return Object.keys(this.options.servers).toSorted();
+		}
+		runningServerNames() {
+			return [...this.clients.entries()].filter(([, client]) => client.running).map(([name]) => name).toSorted();
+		}
+		async diagnosticsAfterChange(filePath) {
+			const resolvedPath = path.resolve(this.options.cwd, filePath);
+			if (!this.supportsPath(resolvedPath)) return void 0;
+			const diagnostics = await this.request({
+				operation: "diagnostics",
+				path: resolvedPath
+			});
+			return Array.isArray(diagnostics) ? diagnostics : [];
+		}
+		async request(input) {
+			if (input.operation === "workspace_symbols") {
+				if (input.query === void 0) throw new Error("workspace_symbols requires query");
+				const results = await Promise.allSettled(this.serverNames().map(async (name) => {
+					const result = await this.client(name, this.options.servers[name]).request("workspace/symbol", { query: input.query });
+					return Array.isArray(result) ? result : [];
+				}));
+				const fulfilled = results.filter((result) => result.status === "fulfilled");
+				if (fulfilled.length === 0) throw results.find((result) => result.status === "rejected")?.reason ?? /* @__PURE__ */ new Error("No LSP servers are configured");
+				return fulfilled.flatMap((result) => result.value);
+			}
+			const documentPath = this.requireDocumentPath(input.path);
+			const { client, languageId } = this.clientForPath(documentPath);
+			const uri = pathToFileURL(documentPath).href;
+			await this.openOrUpdateDocument(client, uri, documentPath, languageId);
+			if (input.operation === "diagnostics") return client.waitForDiagnostics(uri);
+			const method = methodForOperation(input.operation);
+			const params = input.operation === "document_symbols" ? { textDocument: { uri } } : input.operation === "references" ? {
+				textDocument: { uri },
+				position: positionFrom(input),
+				context: { includeDeclaration: true }
+			} : {
+				textDocument: { uri },
+				position: positionFrom(input)
+			};
+			return client.request(method, params);
+		}
+		async shutdown() {
+			await Promise.allSettled([...this.clients.values()].map((client) => client.shutdown()));
+			this.clients.clear();
+			this.openedDocuments.clear();
+		}
+		clientForPath(filePath) {
+			const extension = path.extname(filePath).toLowerCase();
+			for (const [name, config] of Object.entries(this.options.servers)) {
+				const languageId = config.extensionToLanguage[extension];
+				if (languageId !== void 0) return {
+					client: this.client(name, config),
+					languageId
+				};
+			}
+			throw new Error(`No LSP server is configured for "${extension || path.basename(filePath)}". Configured servers: ${this.serverNames().join(", ") || "none"}`);
+		}
+		supportsPath(filePath) {
+			const extension = path.extname(filePath).toLowerCase();
+			return Object.values(this.options.servers).some((config) => config.extensionToLanguage[extension] !== void 0);
+		}
+		client(name, config) {
+			const existing = this.clients.get(name);
+			if (existing !== void 0) return existing;
+			const client = new StdioLspClient(name, config, this.options.cwd);
+			this.clients.set(name, client);
+			return client;
+		}
+		async openOrUpdateDocument(client, uri, filePath, languageId) {
+			await client.start();
+			const text = await readFile(filePath, "utf8");
+			const key = `${client.name}\0${uri}`;
+			const current = this.openedDocuments.get(key);
+			if (current === void 0 || current.generation !== client.generation) {
+				this.openedDocuments.set(key, {
+					text,
+					version: 1,
+					generation: client.generation
+				});
+				client.notify("textDocument/didOpen", { textDocument: {
+					uri,
+					languageId,
+					version: 1,
+					text
+				} });
+				return;
+			}
+			if (current.text === text) return;
+			const version = current.version + 1;
+			this.openedDocuments.set(key, {
+				text,
+				version,
+				generation: client.generation
+			});
+			client.clearDiagnostics(uri);
+			client.notify("textDocument/didChange", {
+				textDocument: {
+					uri,
+					version
+				},
+				contentChanges: [{ text }]
+			});
+		}
+		requireDocumentPath(input) {
+			if (input === void 0 || input.trim().length === 0) throw new Error("LSP operation requires path");
+			return path.resolve(this.options.cwd, input);
+		}
+	};
+}));
+//#endregion
+//#region ../../packages/agent-core/src/lsp/index.ts
+var init_lsp = __esmMin((() => {
+	init_manager$1();
+}));
+//#endregion
 //#region ../../packages/agent-core/src/session/index.ts
 async function waitForSettlementOrTimeout(promise, timeoutMs) {
 	let timeout;
@@ -293789,6 +294334,7 @@ var init_session$1 = __esmMin((() => {
 	init_flags();
 	init_abort();
 	init_vision_reader();
+	init_lsp();
 	init_subagent_host();
 	BACKGROUND_KEEP_ALIVE_ON_EXIT_ENV = "BLUN_BACKGROUND_KEEP_ALIVE_ON_EXIT";
 	ACTIVE_TURN_CLOSE_TIMEOUT_MS = 8e3;
@@ -293800,6 +294346,7 @@ var init_session$1 = __esmMin((() => {
 		skills;
 		agents = /* @__PURE__ */ new Map();
 		mcp;
+		lsp;
 		log;
 		logHandle;
 		hookEngine;
@@ -293849,6 +294396,10 @@ var init_session$1 = __esmMin((() => {
 				log: this.log,
 				stdioCwd: options.kaos.getcwd()
 			});
+			this.lsp = options.lspServers === void 0 || Object.keys(options.lspServers).length === 0 ? void 0 : new LspManager({
+				cwd: options.kaos.getcwd(),
+				servers: options.lspServers
+			});
 			this.mcp.onStatusChange((entry) => {
 				this.onMcpServerStatusChange(entry);
 			});
@@ -293951,7 +294502,7 @@ var init_session$1 = __esmMin((() => {
 				await this.triggerSessionEnd("exit");
 			} finally {
 				try {
-					await this.mcp.shutdown();
+					await Promise.allSettled([this.mcp.shutdown(), this.lsp?.shutdown()]);
 				} finally {
 					await this.logHandle?.close();
 				}
@@ -293963,7 +294514,7 @@ var init_session$1 = __esmMin((() => {
 				await this.flushMetadata();
 			} finally {
 				try {
-					await this.mcp.shutdown();
+					await Promise.allSettled([this.mcp.shutdown(), this.lsp?.shutdown()]);
 				} finally {
 					await this.logHandle?.close();
 				}
@@ -294351,7 +294902,10 @@ var init_session$1 = __esmMin((() => {
 				...config,
 				type,
 				kaos: this.toolKaos.withCwd(cwd),
-				toolServices: this.options.toolServices,
+				toolServices: {
+					...this.options.toolServices,
+					lsp: this.lsp
+				},
 				config: this.options.config,
 				blunHomeDir: this.options.blunHomeDir,
 				homedir,
@@ -294650,6 +295204,7 @@ async function parseManifest(pluginRoot) {
 			skills,
 			sessionStart: readSessionStart(raw["sessionStart"], diagnostics),
 			mcpServers: await readMcpServers(pluginRoot, raw["mcpServers"], diagnostics),
+			lspServers: await readLspServers(pluginRoot, raw["lspServers"], diagnostics),
 			hooks: readHooks(raw["hooks"], diagnostics),
 			commands: await readCommands(pluginRoot, raw["commands"], diagnostics),
 			interface: readInterface(raw["interface"]),
@@ -294798,6 +295353,114 @@ async function readMcpServers(pluginRoot, raw, diagnostics) {
 	}
 	return Object.keys(out).length === 0 ? void 0 : out;
 }
+async function readLspServers(pluginRoot, manifestValue, diagnostics) {
+	let raw = manifestValue;
+	if (raw === void 0) {
+		const configPath = path.join(pluginRoot, ".lsp.json");
+		if (!await isFile$1(configPath)) return void 0;
+		try {
+			raw = JSON.parse(await readFile(configPath, "utf8"));
+		} catch (error) {
+			diagnostics.push({
+				severity: "warn",
+				message: `Failed to parse .lsp.json: ${error.message}`
+			});
+			return;
+		}
+	}
+	if (!isObject$4(raw)) {
+		diagnostics.push({
+			severity: "warn",
+			message: "\"lspServers\" must be an object"
+		});
+		return;
+	}
+	const out = {};
+	for (const [name, value] of Object.entries(raw)) {
+		const config = await normalizePluginLspServer(pluginRoot, name, value, diagnostics);
+		if (config !== void 0) out[name] = config;
+	}
+	return out;
+}
+async function normalizePluginLspServer(pluginRoot, name, raw, diagnostics) {
+	const field = `lspServers.${name}`;
+	if (!isObject$4(raw)) {
+		diagnostics.push({
+			severity: "warn",
+			message: `"${field}" must be an object`
+		});
+		return;
+	}
+	let command = stringField$3(raw, "command");
+	if (command === void 0) {
+		diagnostics.push({
+			severity: "warn",
+			message: `"${field}.command" is required`
+		});
+		return;
+	}
+	const extensionToLanguage = stringRecordField(raw["extensionToLanguage"]);
+	if (extensionToLanguage === void 0 || Object.keys(extensionToLanguage).length === 0) {
+		diagnostics.push({
+			severity: "warn",
+			message: `"${field}.extensionToLanguage" must map at least one extension to a language`
+		});
+		return;
+	}
+	if (command.startsWith("./")) {
+		command = await resolvePluginPathField({
+			pluginRoot,
+			field: `${field}.command`,
+			value: command,
+			diagnostics
+		});
+		if (command === void 0) return void 0;
+	} else if (command.includes("/") || path.isAbsolute(command)) {
+		diagnostics.push({
+			severity: "warn",
+			message: `"${field}.command" must be a PATH command or start with "./"`
+		});
+		return;
+	}
+	let workspaceFolder = stringField$3(raw, "workspaceFolder");
+	if (workspaceFolder !== void 0) {
+		workspaceFolder = await resolvePluginPathField({
+			pluginRoot,
+			field: `${field}.workspaceFolder`,
+			value: workspaceFolder,
+			diagnostics
+		});
+		if (workspaceFolder === void 0) return void 0;
+	}
+	const args = stringArrayField$1(raw, "args");
+	if (raw["args"] !== void 0 && args === void 0) {
+		diagnostics.push({
+			severity: "warn",
+			message: `"${field}.args" must be a string[]`
+		});
+		return;
+	}
+	const env = stringRecordField(raw["env"]);
+	if (raw["env"] !== void 0 && env === void 0) {
+		diagnostics.push({
+			severity: "warn",
+			message: `"${field}.env" must contain string values`
+		});
+		return;
+	}
+	return {
+		command,
+		args,
+		extensionToLanguage,
+		env,
+		initializationOptions: objectField(raw["initializationOptions"]),
+		settings: objectField(raw["settings"]),
+		workspaceFolder,
+		startupTimeoutMs: positiveNumberField(raw["startupTimeoutMs"]),
+		shutdownTimeoutMs: positiveNumberField(raw["shutdownTimeoutMs"]),
+		restartOnCrash: booleanField(raw["restartOnCrash"])
+	};
+}
 function readHooks(raw, diagnostics) {
 	if (raw === void 0) return void 0;
 	if (!Array.isArray(raw)) {
@@ -294945,6 +295608,19 @@ function stringArrayField$1(raw, key) {
 	if (!Array.isArray(value) || !value.every((entry) => typeof entry === "string")) return;
 	return value;
 }
+function stringRecordField(value) {
+	if (!isObject$4(value) || !Object.values(value).every((entry) => typeof entry === "string")) return;
+	return value;
+}
+function objectField(value) {
+	return isObject$4(value) ? value : void 0;
+}
+function positiveNumberField(value) {
+	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : void 0;
+}
+function booleanField(value) {
+	return typeof value === "boolean" ? value : void 0;
+}
 function isObject$4(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -295474,7 +296150,7 @@ function pluginMcpServerInfo(record, name, config) {
 }
 function publicPluginManifest(manifest) {
 	if (manifest === void 0) return void 0;
-	const { mcpServers: _privateMcpServers, ...publicManifest } = manifest;
+	const { mcpServers: _privateMcpServers, lspServers: _privateLspServers, ...publicManifest } = manifest;
 	return publicManifest;
 }
 function sanitizePluginOriginalSource(value) {
@@ -295724,6 +296400,14 @@ var init_manager = __esmMin((() => {
 		enabledMcpServers() {
 			return Object.fromEntries(this.mcpServerConfigs().filter((entry) => entry.config.enabled !== false).map((entry) => [entry.runtimeName, entry.config]));
 		}
+		enabledLspServers() {
+			const out = {};
+			for (const record of this.records.values()) {
+				if (!this.runtimeEnabled(record) || record.state !== "ok" || record.manifest === void 0) continue;
+				for (const [name, config] of Object.entries(record.manifest.lspServers ?? {})) out[`plugin-${record.id}:${name}`] = config;
+			}
+			return out;
+		}
 		/** All installed plugin MCPs, including disabled plugin/server entries. */
 		mcpServerConfigs() {
 			const out = [];
@@ -312945,6 +313629,7 @@ var init_core_impl = __esmMin((() => {
 				permissionRules: config.permission?.rules,
 				skills: this.resolveSessionSkillConfig(config),
 				mcpConfig,
+				lspServers: this.plugins.enabledLspServers(),
 				experimentalFlags: this.experimentalFlags,
 				telemetry: sessionTelemetry,
 				pluginSessionStarts,
@@ -313041,6 +313726,7 @@ var init_core_impl = __esmMin((() => {
 				permissionRules: config.permission?.rules,
 				skills: this.resolveSessionSkillConfig(config),
 				mcpConfig,
+				lspServers: this.plugins.enabledLspServers(),
 				experimentalFlags: this.experimentalFlags,
 				telemetry: withTelemetryContext$1(this.telemetry, { sessionId: summary.id }),
 				initializeMainAgent: false,
@@ -414965,6 +415651,9 @@ function resolveTelegramBridgeLaunch(bridge, options = {}) {
 		}
 	};
 }
+function queueIdentity(stats) {
+	return `${stats.dev}:${stats.ino}:${stats.birthtimeMs}`;
+}
 function telegramStateDir() {
 	return process.env["BLUN_TELEGRAM_STATE_DIR"] ?? join(homedir(), ".blun", "channels", "telegram");
 }
@@ -415036,7 +415725,10 @@ var TelegramChannelController = class {
 	activationTimer;
 	handoffTimer;
 	offset = 0;
-	remainder = "";
+	checkpointOffset = 0;
+	queueFileId = "";
+	remainder = Buffer.alloc(0);
+	pendingQueueLines = [];
 	started = false;
 	stopped = false;
 	activeOwner = false;
@@ -415078,6 +415770,9 @@ var TelegramChannelController = class {
 	get queueFile() {
 		return join(this.dir, "inbound-queue.jsonl");
 	}
+	get queueCheckpointFile() {
+		return join(this.dir, "inbound-queue.checkpoint.json");
+	}
 	get botPidFile() {
 		return join(this.dir, "bot.pid");
 	}
@@ -415106,9 +415801,19 @@ var TelegramChannelController = class {
 		this.heartbeatTimer = setInterval(() => this.writeLease(), HEARTBEAT_MS);
 		this.heartbeatTimer.unref();
 		try {
-			this.offset = statSync(this.queueFile).size;
+			const stats = statSync(this.queueFile);
+			this.queueFileId = queueIdentity(stats);
+			const checkpoint = this.readQueueCheckpoint();
+			if (checkpoint?.fileId === this.queueFileId && checkpoint.offset >= 0 && checkpoint.offset <= stats.size) this.offset = checkpoint.offset;
+			else {
+				this.offset = stats.size;
+				this.writeQueueCheckpoint(this.offset);
+			}
+			this.checkpointOffset = this.offset;
 		} catch {
 			this.offset = 0;
+			this.checkpointOffset = 0;
+			this.queueFileId = "";
 		}
 		this.tailTimer = setInterval(() => this.drainQueue(), TAIL_POLL_MS);
 		this.tailTimer.unref();
@@ -415286,24 +415991,34 @@ var TelegramChannelController = class {
 			this.loseOwnership();
 			return;
 		}
-		let size;
+		let stats;
 		try {
-			size = statSync(this.queueFile).size;
+			stats = statSync(this.queueFile);
 		} catch {
 			return;
 		}
-		if (size < this.offset) {
+		const size = stats.size;
+		const fileId = queueIdentity(stats);
+		if (this.queueFileId === "") {
+			this.queueFileId = fileId;
+			this.writeQueueCheckpoint(this.checkpointOffset);
+		} else if (fileId !== this.queueFileId || size < this.offset) {
+			this.queueFileId = fileId;
 			this.offset = 0;
-			this.remainder = "";
+			this.checkpointOffset = 0;
+			this.remainder = Buffer.alloc(0);
+			this.pendingQueueLines.length = 0;
+			this.writeQueueCheckpoint(0);
 		}
 		if (size === this.offset) return;
 		let chunk;
+		const chunkStart = this.offset;
 		try {
 			const fd = openSync(this.queueFile, "r");
 			try {
 				const buf = Buffer.alloc(size - this.offset);
 				const read = readSync(fd, buf, 0, buf.length, this.offset);
-				chunk = buf.subarray(0, read).toString("utf8");
+				chunk = buf.subarray(0, read);
 				this.offset += read;
 			} finally {
 				closeSync(fd);
@@ -415311,11 +416026,54 @@ var TelegramChannelController = class {
 		} catch {
 			return;
 		}
-		const lines = (this.remainder + chunk).split("\n");
-		this.remainder = lines.pop() ?? "";
-		for (const line of lines) {
+		const combinedStart = chunkStart - this.remainder.byteLength;
+		const combined = this.remainder.byteLength === 0 ? chunk : Buffer.concat([this.remainder, chunk]);
+		let lineStart = 0;
+		for (let index = 0; index < combined.byteLength; index += 1) {
+			if (combined[index] !== 10) continue;
+			const line = combined.subarray(lineStart, index).toString("utf8");
+			const pending = {
+				endOffset: combinedStart + index + 1,
+				acknowledged: false
+			};
+			this.pendingQueueLines.push(pending);
 			const envelope = parseChannelEnvelope(line);
-			if (envelope !== void 0) this.host.inject(envelope);
+			if (envelope === void 0) this.acknowledgeQueueLine(pending);
+			else this.host.inject(envelope, () => this.acknowledgeQueueLine(pending));
+			lineStart = index + 1;
+		}
+		this.remainder = combined.subarray(lineStart);
+	}
+	acknowledgeQueueLine(pending) {
+		if (this.stopped || !this.ownsChannel() || pending.acknowledged) return;
+		pending.acknowledged = true;
+		let nextOffset = this.checkpointOffset;
+		while (this.pendingQueueLines[0]?.acknowledged === true) nextOffset = this.pendingQueueLines.shift().endOffset;
+		if (nextOffset === this.checkpointOffset) return;
+		this.checkpointOffset = nextOffset;
+		this.writeQueueCheckpoint(nextOffset);
+	}
+	readQueueCheckpoint() {
+		try {
+			const parsed = JSON.parse(readFileSync(this.queueCheckpointFile, "utf8"));
+			if (parsed.version === 1 && typeof parsed.fileId === "string" && parsed.fileId.length > 0 && Number.isSafeInteger(parsed.offset) && (parsed.offset ?? -1) >= 0) return parsed;
+		} catch {}
+	}
+	writeQueueCheckpoint(offset) {
+		if (this.queueFileId.length === 0) return;
+		const temporary = join(this.dir, `.inbound-queue.checkpoint.${process.pid}.${this.ownerId}.tmp`);
+		try {
+			const checkpoint = {
+				version: 1,
+				fileId: this.queueFileId,
+				offset
+			};
+			writeFileSync(temporary, `${JSON.stringify(checkpoint)}\n`, { mode: 384 });
+			renameSync(temporary, this.queueCheckpointFile);
+		} catch (error) {
+			this.host.warn(uiText("telegramChannel.leaseWriteFailed", { error: String(error) }));
+		} finally {
+			rmSync(temporary, { force: true });
 		}
 	}
 	/**
@@ -510529,6 +511287,7 @@ var BlunTUI = class {
 		};
 		try {
 			if (!(await this.harness.withInteractiveAgent(item.agentId ?? "main", () => session.steerActive(input, expectedTurnId === void 0 ? {} : { expectedTurnId }))).accepted) return restoreHead();
+			item.channelAcknowledge?.();
 		} catch (error) {
 			return restoreHead(error);
 		}
@@ -510670,12 +511429,12 @@ var BlunTUI = class {
 	* queuedMessages mechanic as typed input; a completed tool/step boundary
 	* steers one FIFO head into the active turn without interrupting it.
 	*/
-	injectChannelMessage(envelope) {
+	injectChannelMessage(envelope, acknowledge) {
 		injectChannelEnvelope({
 			canDeliver: () => this.session !== void 0 && this.state.appState.model.trim().length > 0,
 			isBusy: () => this.state.queuedMessages.length > 0 || this.queueSteerInFlight !== void 0 || this.deferUserMessages || this.state.appState.streamingPhase !== "idle" || this.state.appState.isCompacting,
 			deliverNow: (modelInput, displayText, origin, contextOnly) => {
-				this.sendChannelMessageInternal(this.requireSession(), modelInput, displayText, origin, envelope.meta.chat_id, envelope.meta["image_path"], contextOnly);
+				this.sendChannelMessageInternal(this.requireSession(), modelInput, displayText, origin, envelope.meta.chat_id, envelope.meta["image_path"], contextOnly, false, acknowledge);
 			},
 			enqueue: (modelInput, displayText, origin, contextOnly) => {
 				this.state.queuedMessages.push({
@@ -510686,6 +511445,7 @@ var BlunTUI = class {
 					mode: "channel",
 					channelChatId: envelope.meta.chat_id,
 					channelContextOnly: contextOnly,
+					channelAcknowledge: acknowledge,
 					...envelope.meta["image_path"] !== void 0 ? { channelImagePath: envelope.meta["image_path"] } : {}
 				});
 				this.syncChannelQueueDeadline();
@@ -510702,6 +511462,7 @@ var BlunTUI = class {
 					content: displayText,
 					origin
 				});
+				acknowledge?.();
 				this.state.ui.requestRender();
 			},
 			reportUndeliverable: (reason) => {
@@ -510709,7 +511470,7 @@ var BlunTUI = class {
 			}
 		}, envelope, this.channelPreamble);
 	}
-	sendChannelMessageInternal(session, modelInput, displayText, origin, channelChatId, channelImagePath, contextOnly = false, transcriptRendered = false) {
+	sendChannelMessageInternal(session, modelInput, displayText, origin, channelChatId, channelImagePath, contextOnly = false, transcriptRendered = false, acknowledge) {
 		if (!transcriptRendered) this.appendTranscriptEntry({
 			id: nextTranscriptId(),
 			kind: "user",
@@ -510719,12 +511480,14 @@ var BlunTUI = class {
 			origin
 		});
 		this.beginSessionRequest();
-		if (channelChatId !== void 0) this.pendingChannelReplyGuard = {
+		const previousGuard = this.pendingChannelReplyGuard;
+		const installedGuard = channelChatId === void 0 ? void 0 : {
 			chatId: channelChatId,
 			outboxMarker: outboxMarker(),
 			transcriptStart: this.state.transcriptEntries.length,
 			contextOnly
 		};
+		if (installedGuard !== void 0) this.pendingChannelReplyGuard = installedGuard;
 		const imagePart = channelImagePath !== void 0 ? buildChannelImagePart(channelImagePath) : void 0;
 		const visionReaderEnabled = isExperimentalFlagEnabled("vision_reader");
 		this.setAppState({
@@ -510735,7 +511498,29 @@ var BlunTUI = class {
 			type: "text",
 			text: modelInput
 		}, imagePart] : modelInput;
-		session.promptAccepted(promptInput).catch((error) => {
+		session.promptAccepted(promptInput).then((result) => {
+			if (result.accepted) {
+				acknowledge?.();
+				return;
+			}
+			if (installedGuard !== void 0 && this.pendingChannelReplyGuard === installedGuard) this.pendingChannelReplyGuard = previousGuard;
+			this.state.queuedMessages = [{
+				text: modelInput,
+				displayText,
+				origin,
+				agentId: this.harness.interactiveAgentId,
+				mode: "channel",
+				channelChatId,
+				channelContextOnly: contextOnly,
+				channelTranscriptRendered: true,
+				channelAcknowledge: acknowledge,
+				...channelImagePath === void 0 ? {} : { channelImagePath }
+			}, ...this.state.queuedMessages];
+			this.syncChannelQueueDeadline();
+			this.track("input_queue");
+			this.updateQueueDisplay();
+			this.state.ui.requestRender();
+		}).catch((error) => {
 			this.failSessionRequest(uiText("blunTui.session.sendFailed", { error: formatErrorMessage$2(error) }));
 		});
 		this.updateQueueDisplay();
@@ -510779,8 +511564,8 @@ var BlunTUI = class {
 		}
 		let controller;
 		controller = new TelegramChannelController({
-			inject: (envelope) => {
-				this.injectChannelMessage(envelope);
+			inject: (envelope, acknowledge) => {
+				this.injectChannelMessage(envelope, acknowledge);
 			},
 			warn: (message) => {
 				this.showStatus(message, "warning");
@@ -510904,7 +511689,7 @@ var BlunTUI = class {
 		const activeSession = this.session ?? session;
 		if (item.mode === "channel") {
 			this.harness.withInteractiveAgent(item.agentId ?? "main", () => {
-				this.sendChannelMessageInternal(activeSession, item.text, item.displayText ?? "", item.origin, item.channelChatId, item.channelImagePath, item.channelContextOnly, item.channelTranscriptRendered);
+				this.sendChannelMessageInternal(activeSession, item.text, item.displayText ?? "", item.origin, item.channelChatId, item.channelImagePath, item.channelContextOnly, item.channelTranscriptRendered, item.channelAcknowledge);
 			});
 			return;
 		}
@@ -511263,7 +512048,7 @@ var BlunTUI = class {
 			streamingPhase: "idle"
 		});
 		if (!this.preserveQueueAcrossSessionReset) {
-			this.state.queuedMessages = [];
+			this.state.queuedMessages = this.state.queuedMessages.filter((item) => item.mode === "channel");
 			this.queueFlushBatchRemaining = 0;
 			this.queueSteerInFlight = void 0;
 		}

package/package.json

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