blun-king-cli 9.1.14 → 9.1.16

package/blun.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:8f93034aa92ac7b99ba8e0031ea4a42ec693cfb699ca6223c4a889ff94f85670
+// BLUN_BUILD_INPUT_SHA256:39e4b4359446de9a47446e631b853adaafc78c8097e76296c6826ec91ee9902d
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
@@ -397833,7 +397833,6 @@ function slashBusyMessage(commandName, reason) {
 }
 //#endregion
 //#region src/tui/commands/plugin-commands.ts
-const REMOVED_PLUGIN_COMMANDS = new Set(["telegram:access"]);
 function pluginCommandName(pluginId, name) {
 	return `${pluginId}:${name}`;
 }
@@ -397842,7 +397841,6 @@ function buildPluginSlashCommands(defs) {
 	const commands = [];
 	for (const def of defs) {
 		const commandName = pluginCommandName(def.pluginId, def.name);
-		if (REMOVED_PLUGIN_COMMANDS.has(commandName)) continue;
 		commandMap.set(commandName, def.body);
 		commands.push({
 			name: commandName,
@@ -421301,6 +421299,16 @@ var TelegramAccessMenuComponent = class extends Container {
 		};
 		this.invalidate();
 	}
+	setTokenSaved() {
+		if (this.done) return;
+		this.replacementToken = void 0;
+		this.tokenConfigured = true;
+		this.tokenInput.setValue("");
+		this.mode = { kind: "menu" };
+		this.notice = void 0;
+		this.rows = this.createRows();
+		this.invalidate();
+	}
 	render(width) {
 		const safeWidth = Math.max(1, width);
 		this.tokenInput.focused = this.focused && this.mode.kind === "token" && !this.done;
@@ -421392,12 +421400,9 @@ var TelegramAccessMenuComponent = class extends Container {
 			this.invalidate();
 			return;
 		}
-		this.replacementToken = token;
-		this.tokenConfigured = true;
-		this.tokenInput.setValue("");
-		this.mode = { kind: "menu" };
+		this.mode = { kind: "saving" };
 		this.notice = void 0;
-		this.rows = this.createRows();
+		this.options.onTokenSave(token);
 		this.invalidate();
 	}
 	openTargetEditor(editIndex) {
@@ -421778,7 +421783,7 @@ function nextAccessDocument(current, targets) {
 	};
 }
 function envWithToken(current, token) {
-	const lines = (current ?? "").split(/\r?\n/);
+	const lines = (current ?? "").replace(/^\uFEFF/u, "").split(/\r?\n/);
 	const next = [];
 	let replaced = false;
 	for (const line of lines) if (line.startsWith("BLUN_TELEGRAM_BOT_TOKEN=")) {
@@ -421832,6 +421837,15 @@ function withAccessLock(dir, action) {
 		rmSync(lock, { force: true });
 	}
 }
+function saveTelegramBotToken(value, dir = telegramStateDir(), env = process.env) {
+	const token = value.trim();
+	if (!isValidTelegramBotToken(token)) throw new TelegramAccessStorageError("invalid-token");
+	withAccessLock(dir, () => {
+		const currentEnvRaw = readOptionalFile(envPath(dir));
+		atomicWritePrivate(envPath(dir), envWithToken(currentEnvRaw, token));
+		env["BLUN_TELEGRAM_BOT_TOKEN"] = token;
+	});
+}
 function saveTelegramAccessConfiguration(draft, dir = telegramStateDir(), env = process.env) {
 	const token = draft.token?.trim();
 	if (token !== void 0 && !isValidTelegramBotToken(token)) throw new TelegramAccessStorageError("invalid-token");
@@ -421883,6 +421897,7 @@ async function verifyTelegramBotToken(token, fetchImpl = globalThis.fetch) {
 //#region src/tui/commands/telegram-access.ts
 const DEFAULT_DEPENDENCIES = {
 	readConfiguration: () => readTelegramAccessConfiguration(),
+	saveToken: (token) => saveTelegramBotToken(token),
 	saveConfiguration: (draft) => {
 		saveTelegramAccessConfiguration(draft);
 	},
@@ -421899,6 +421914,9 @@ function handleTelegramAccessCommand(host, dependencies = DEFAULT_DEPENDENCIES)
 	let component;
 	component = new TelegramAccessMenuComponent({
 		configuration,
+		onTokenSave: (token) => {
+			verifyAndSaveTelegramToken(component, token, dependencies);
+		},
 		onSave: (draft) => {
 			saveAndConnectTelegramAccess(host, component, draft, dependencies);
 		},
@@ -421909,6 +421927,19 @@ function handleTelegramAccessCommand(host, dependencies = DEFAULT_DEPENDENCIES)
 	});
 	host.mountEditorReplacement(component);
 }
+async function verifyAndSaveTelegramToken(component, token, dependencies = DEFAULT_DEPENDENCIES) {
+	if (!await dependencies.verifyToken(token)) {
+		component.setSaveError(uiText("telegramAccess.error.verify"));
+		return;
+	}
+	try {
+		dependencies.saveToken(token);
+	} catch (error) {
+		component.setSaveError(uiText("telegramAccess.error.save", { error: formatErrorMessage$2(error) }));
+		return;
+	}
+	component.setTokenSaved();
+}
 async function saveAndConnectTelegramAccess(host, component, draft, dependencies = DEFAULT_DEPENDENCIES) {
 	if (draft.token !== void 0 && !await dependencies.verifyToken(draft.token)) {
 		component.setSaveError(uiText("telegramAccess.error.verify"));
@@ -424681,10 +424712,25 @@ const INTERNAL_TAG_PREFIXES = [
 	"<｜dsml｜",
 	"</｜dsml｜"
 ];
+const RUNTIME_INSTRUCTION_OPEN = "Bevor du antwortest:";
+const RUNTIME_INSTRUCTION_CLOSE = "Die einzige Ausnahme: eine Zahl, die der Nutzer selbst in seiner Nachricht genannt hat - die darfst du uebernehmen und weiterverwenden.";
 /** Remove model-only envelopes before assistant text reaches a transcript renderer. */
 function sanitizeAssistantDisplayText(text, options = {}) {
 	const transient = options.transient === true;
-	return stripIncompleteInternalSuffix(stripControlTokens(stripDsmlBlocks(stripSystemReminderBlocks(text, transient))), transient);
+	return stripIncompleteInternalSuffix(stripControlTokens(stripDsmlBlocks(stripSystemReminderBlocks(stripEchoedRuntimeInstructions(text), transient))), transient);
+}
+function stripEchoedRuntimeInstructions(text) {
+	let cursor = 0;
+	let output = "";
+	while (cursor < text.length) {
+		const open = text.indexOf(RUNTIME_INSTRUCTION_OPEN, cursor);
+		if (open < 0) break;
+		output += text.slice(cursor, open);
+		const close = text.indexOf(RUNTIME_INSTRUCTION_CLOSE, open + 20);
+		if (close < 0) return output;
+		cursor = close + 135;
+	}
+	return output + text.slice(cursor);
 }
 function stripSystemReminderBlocks(text, transient) {
 	let cursor = 0;

package/package.json

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