blun-king-cli 9.1.183 → 9.1.185

package/bin/launcher-runtime.js

@@ -34,6 +34,7 @@ const {
   RUNNING_UPDATE_MODE_MESSAGE,
   RUNNING_UPDATE_PREPARED_MESSAGE,
   activateRuntime,
+  handoffArgsForMode,
   handoffRuntime,
   prepareRunningUpdate,
   readActiveRuntime,
@@ -156,14 +157,18 @@ function resolveLauncherPrivatePaths(options = {}) {
   };
 }
 
-function readPackageVersion() {
-  const { version } = JSON.parse(fs.readFileSync(path.join(PKG, 'package.json'), 'utf8'));
+function readPackageVersionAt(packageRoot = PKG) {
+  const { version } = JSON.parse(fs.readFileSync(path.join(packageRoot, 'package.json'), 'utf8'));
   if (typeof version !== 'string' || version.length === 0) {
     throw new Error('Ungueltige Paketversion in package.json');
   }
   return version;
 }
 
+function readPackageVersion() {
+  return readPackageVersionAt(PKG);
+}
+
 function shouldDetachProtectedCore(options = {}) {
   const platform = options.platform || process.platform;
   const stdinIsTTY = Object.hasOwn(options, 'stdinIsTTY')
@@ -321,38 +326,45 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
       scheduleNextPreparation(child);
     });
   };
-  const core = (options.spawnProtectedCore || spawnProtectedCore)(args, env, cwd, {
+  const handleCoreMessage = (message, child) => {
+    if (message?.type === RUNTIME_READY_MESSAGE) {
+      runtimeReady = true;
+      refreshRunningUpdateMode();
+      if (automaticMode()) startPreparation(child);
+      else scheduleNextPreparation(child);
+    }
+    if (message?.type === RUNNING_UPDATE_MODE_MESSAGE && typeof message.mode === 'string') {
+      runningUpdateMode = normalizeRunningUpdateMode(message.mode);
+      handoffSessionId = undefined;
+      handoffMode = undefined;
+      clearRunningUpdatePoll();
+      if (automaticMode()) {
+        if (preparedTarget !== undefined) announcePrepared(child);
+        else if (runtimeReady) {
+          updateStarted = false;
+          startPreparation(child);
+        }
+      } else if (runtimeReady) scheduleNextPreparation(child);
+    }
+    if (message?.type === RUNNING_UPDATE_HANDOFF_MESSAGE
+      && typeof message.sessionId === 'string'
+      && message.sessionId.length > 0
+      && message.mode === runningUpdateMode
+      && automaticMode()) {
+      handoffSessionId = message.sessionId;
+      handoffMode = runningUpdateMode;
+    }
+  };
+  const spawnCore = options.spawnProtectedCore || spawnProtectedCore;
+  const core = options.existingCore || spawnCore(args, env, cwd, {
     packageRoot,
-    onMessage(message, child) {
-      if (message?.type === RUNTIME_READY_MESSAGE) {
-        runtimeReady = true;
-        refreshRunningUpdateMode();
-        if (automaticMode()) startPreparation(child);
-        else scheduleNextPreparation(child);
-      }
-      if (message?.type === RUNNING_UPDATE_MODE_MESSAGE && typeof message.mode === 'string') {
-        runningUpdateMode = normalizeRunningUpdateMode(message.mode);
-        handoffSessionId = undefined;
-        handoffMode = undefined;
-        clearRunningUpdatePoll();
-        if (automaticMode()) {
-          if (preparedTarget !== undefined) announcePrepared(child);
-          else if (runtimeReady) {
-            updateStarted = false;
-            startPreparation(child);
-          }
-        } else if (runtimeReady) scheduleNextPreparation(child);
-      }
-      if (message?.type === RUNNING_UPDATE_HANDOFF_MESSAGE
-        && typeof message.sessionId === 'string'
-        && message.sessionId.length > 0
-        && message.mode === runningUpdateMode
-        && automaticMode()) {
-        handoffSessionId = message.sessionId;
-        handoffMode = runningUpdateMode;
-      }
-    },
+    onMessage: handleCoreMessage,
   });
+  let existingMessageHandler;
+  if (options.existingCore) {
+    existingMessageHandler = (message) => handleCoreMessage(message, core.child);
+    core.child.on('message', existingMessageHandler);
+  }
   const loaded = await core.loaded;
   if (loaded && !runtimeReady) {
     // Core load is an independent readiness signal. Start the download even
@@ -366,6 +378,7 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
   await releaseNotice();
   const result = await core.completed;
   clearRunningUpdatePoll();
+  if (existingMessageHandler) core.child.off('message', existingMessageHandler);
   if (result.error) throw result.error;
   if (result.code === RUNNING_UPDATE_HANDOFF_EXIT_CODE
     && preparedTarget !== undefined
@@ -374,14 +387,14 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
     writeRunningUpdateHandoffNotice(options.runningUpdateNoticeOutput || process.stdout);
     const handoff = await handoffRuntime({
       target: preparedTarget,
-      previous: { packageRoot, version: readPackageVersion() },
+      previous: { packageRoot, version: readPackageVersionAt(packageRoot) },
       sessionId: handoffSessionId,
       mode: handoffMode,
       args,
       probeTarget: options.probeRunningUpdate || (() => true),
       stopOld: async () => {},
       startCore: async ({ packageRoot: nextRoot, args: nextArgs }) => {
-        const nextCore = spawnProtectedCore(nextArgs, env, cwd, { packageRoot: nextRoot });
+        const nextCore = spawnCore(nextArgs, env, cwd, { packageRoot: nextRoot });
         const nextLoaded = await nextCore.loaded;
         const ready = nextLoaded && await waitForRuntimeReady(nextCore, options.readyTimeoutMs);
         if (!ready) {
@@ -394,9 +407,12 @@ async function superviseProtectedCore(args, env, cwd, releaseNotice, options = {
     });
     const resumed = handoff.core;
     if (resumed === undefined || resumed.ready !== true) return 1;
-    const resumedResult = await resumed.completed;
-    if (resumedResult.error) throw resumedResult.error;
-    return exitCodeForChild(resumedResult, true);
+    const resumedArgs = handoffArgsForMode(args, handoffMode, handoffSessionId);
+    return superviseProtectedCore(resumedArgs, env, cwd, async () => {}, {
+      ...options,
+      existingCore: resumed,
+      packageRoot: handoff.runtime.packageRoot,
+    });
   }
   return exitCodeForChild(result, loaded);
 }

package/bin/turn-tool-performance-policy.cjs

@@ -29,11 +29,37 @@ const CORE_TOOL_NAMES = Object.freeze([
   'Grep',
   'Write',
   'Glob',
-  'GenerateImage',
-  'GenerateVideo',
   'mcp__plugin-telegram_telegram__reply',
 ]);
 
+const IMAGE_MEDIA_TERM_RE = /(?:^|[^\p{L}])(?:bild(?:er)?|foto(?:s)?|grafik(?:en)?|illustration(?:en)?|logo(?:s)?|image|images|photo|photos|picture|pictures|illustration|illustrations|visual|visuals)(?=$|[^\p{L}])/u;
+const VIDEO_MEDIA_TERM_RE = /(?:^|[^\p{L}])(?:video(?:s)?|clip(?:s)?|film(?:e)?|animation(?:en)?|movie|movies)(?=$|[^\p{L}])/u;
+const ANIMATE_ACTION_RE = /(?:^|[^\p{L}])(?:animier(?:e|en|t)?|animate|animated|animating)(?=$|[^\p{L}])/u;
+const CREATE_ACTION_RE = /(?:^|[^\p{L}])(?:erstell(?:e|en|t)?|generier(?:e|en|t)?|erzeug(?:e|en|t)?|produzier(?:e|en|t)?|zeichn(?:e|en|et)?|mal(?:e|en|t)?|render(?:e|n|t)?|mach(?:e|en|t)?|create|creates|creating|generate|generates|generating|make|makes|making|draw|draws|drawing|paint|paints|painting|render|renders|rendering|produce|produces|producing)(?=$|[^\p{L}])/u;
+const REQUEST_PREFIX_RE = /^(?:bitte\s+|please\s+)?(?:erstell|generier|erzeug|produzier|zeichn|mal|render|mach|animier|create|generate|make|draw|paint|render|produce|animate)/u;
+const REQUEST_PHRASE_RE = /(?:^|[^\p{L}])(?:bitte|kannst du|könntest du|ich möchte|ich will|ich brauche|please|can you|could you|i want|i need)(?=$|[^\p{L}])/u;
+
+function mediaGenerationToolNamesForText(value) {
+  const text = String(value || '').normalize('NFKC').trim().toLowerCase();
+  const selected = new Set();
+  if (!text) return selected;
+  if (/(?:^|[^a-z])generateimage(?=$|[^a-z])/u.test(text)) selected.add('GenerateImage');
+  if (/(?:^|[^a-z])generatevideo(?=$|[^a-z])/u.test(text)) selected.add('GenerateVideo');
+  if (selected.size > 0) return selected;
+
+  const animate = ANIMATE_ACTION_RE.test(text);
+  const create = CREATE_ACTION_RE.test(text);
+  const explicitRequest = REQUEST_PREFIX_RE.test(text) || REQUEST_PHRASE_RE.test(text);
+  if (!explicitRequest || (!create && !animate)) return selected;
+  if (animate && (IMAGE_MEDIA_TERM_RE.test(text) || VIDEO_MEDIA_TERM_RE.test(text))) {
+    selected.add('GenerateVideo');
+    return selected;
+  }
+  if (IMAGE_MEDIA_TERM_RE.test(text)) selected.add('GenerateImage');
+  if (VIDEO_MEDIA_TERM_RE.test(text)) selected.add('GenerateVideo');
+  return selected;
+}
+
 function toolSchemaBudgetTokens(maxContextTokens) {
   const context = Number(maxContextTokens);
   if (!Number.isFinite(context) || context <= 0) return TOOL_SCHEMA_MAX_TOKENS;
@@ -247,5 +273,6 @@ module.exports = {
   createDeferredToolLoader,
   deferredToolCatalog,
   deferredToolNames,
+  mediaGenerationToolNamesForText,
   toolSchemaBudgetTokens,
 };

package/blun.mjs

@@ -260959,10 +260959,10 @@ function blunPendingMediaSystemPrompt(systemPrompt, pendingMediaJobIds) {
 	if (pendingMediaJobIds.length === 0) return systemPrompt;
 	return `${systemPrompt}\n\n## Pending BLUN media\n\nThe following media jobs were already accepted and are still pending: ${pendingMediaJobIds.join(", ")}. Call GetMedia exactly once for each listed id before replying. If a job is still processing, report that status truthfully and wait for a later turn; do not claim that media tools are unavailable.`;
 }
-function blunFastConversationTools(tools, input, 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");
+	return tools.filter((tool) => 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
@@ -261208,7 +261208,7 @@ function toolResultText(result) {
 function abandonedToolResultOutput(ended) {
 	return `Tool call did not complete: ${ended.reason === "cancelled" ? "the turn was cancelled" : ended.reason === "failed" ? `the turn failed${ended.error !== void 0 ? ` (${ended.error.message})` : ""}` : "the turn ended"} before its result was recorded. Do not assume the tool completed successfully.`;
 }
-var BLUN_CORE_TOOL_NAMES, BLUN_LEAN_TOOL_NAMES, BLUN_ATTACHMENT_MARKER_RE, BLUN_TELEGRAM_OUTBOUND_TOOL_RE, BLUN_TELEGRAM_CHANNEL_RE, BLUN_TOOL_BUDGET_RATIO, createDeferredToolLoader, toolSchemaBudgetTokens, projectRecurringCronHistory, LLM_NOT_SET_MESSAGE, GOAL_CONTINUATION_ORIGIN, GOAL_COMPLETION_REMINDER_NAME, GOAL_BLOCKED_REMINDER_NAME, GOAL_RATE_LIMIT_PAUSE_REASON, GOAL_PROVIDER_CONNECTION_PAUSE_PREFIX, GOAL_PROVIDER_AUTH_PAUSE_PREFIX, GOAL_PROVIDER_API_PAUSE_PREFIX, GOAL_MODEL_CONFIG_PAUSE_PREFIX, GOAL_RUNTIME_PAUSE_PREFIX, GOAL_PROVIDER_FILTERED_PAUSE_REASON, GOAL_CONTINUATION_PROMPT, TurnFlow;
+var BLUN_CORE_TOOL_NAMES, BLUN_LEAN_TOOL_NAMES, BLUN_ATTACHMENT_MARKER_RE, BLUN_TELEGRAM_OUTBOUND_TOOL_RE, BLUN_TELEGRAM_CHANNEL_RE, BLUN_TOOL_BUDGET_RATIO, createDeferredToolLoader, mediaGenerationToolNamesForText, toolSchemaBudgetTokens, projectRecurringCronHistory, LLM_NOT_SET_MESSAGE, GOAL_CONTINUATION_ORIGIN, GOAL_COMPLETION_REMINDER_NAME, GOAL_BLOCKED_REMINDER_NAME, GOAL_RATE_LIMIT_PAUSE_REASON, GOAL_PROVIDER_CONNECTION_PAUSE_PREFIX, GOAL_PROVIDER_AUTH_PAUSE_PREFIX, GOAL_PROVIDER_API_PAUSE_PREFIX, GOAL_MODEL_CONFIG_PAUSE_PREFIX, GOAL_RUNTIME_PAUSE_PREFIX, GOAL_PROVIDER_FILTERED_PAUSE_REASON, GOAL_CONTINUATION_PROMPT, TurnFlow;
 var init_turn = __esmMin((() => {
 	init_dist$4();
 	init_src$4();
@@ -261225,7 +261225,7 @@ var init_turn = __esmMin((() => {
 	init_tool_result_budget();
 	init_user_message_offload();
 	init_assistant_message_offload();
-	({ CORE_TOOL_NAMES: BLUN_CORE_TOOL_NAMES, createDeferredToolLoader, toolSchemaBudgetTokens } = createRequire(import.meta.url)("./bin/turn-tool-performance-policy.cjs"));
+	({ CORE_TOOL_NAMES: BLUN_CORE_TOOL_NAMES, createDeferredToolLoader, mediaGenerationToolNamesForText, toolSchemaBudgetTokens } = createRequire(import.meta.url)("./bin/turn-tool-performance-policy.cjs"));
 	({ projectRecurringCronHistory } = createRequire(import.meta.url)("./bin/recurring-cron-history-policy.cjs"));
 	BLUN_LEAN_TOOL_NAMES = new Set(BLUN_CORE_TOOL_NAMES);
 	BLUN_ATTACHMENT_MARKER_RE = /\b(?:attachment_file_id|telegram-anhang|telegram attachment)\b/i;
@@ -261800,6 +261800,8 @@ var init_turn = __esmMin((() => {
 			const turnThinkingEffort = turnHasAttachment ? void 0 : selectThinkingEffortForTurn(blunExtractText(blunThinkingIntentInput(input)), origin.kind);
 			const fastConversation = turnThinkingEffort === "off" || turnThinkingEffort === "low";
 			const pendingMediaJobIds = this.agent.toolServices?.media?.pendingMediaJobIds?.() ?? [];
+			const requiredToolNames = mediaGenerationToolNamesForText(blunExtractText(blunThinkingIntentInput(input)));
+			if (turnHasAttachment) requiredToolNames.add("mcp__plugin-telegram_telegram__download_attachment");
 			const turnSystemPrompt = pendingMediaJobIds.length > 0 ? blunPendingMediaSystemPrompt(fastConversation ? this.agent.fastConversationSystemPrompt : this.agent.effectiveSystemPrompt, pendingMediaJobIds) : fastConversation ? this.agent.fastConversationSystemPrompt : void 0;
 			const turnLLM = this.agent.llmForTurn(turnThinkingEffort, turnSystemPrompt);
 			let previousStepToolOutcome = "initial";
@@ -261815,9 +261817,9 @@ var init_turn = __esmMin((() => {
 					const compactConversationTool = originTools.find((tool) => tool.name === "CompactConversation");
 					const eligibleTools = originTools.filter((tool) => tool.name !== "CompactConversation" || this.agent.fullCompaction.isProactiveCompactionEligible());
 					const toolSelection = fastConversation ? {
-						tools: [...blunFastConversationTools(eligibleTools, input, pendingMediaJobIds)],
+						tools: [...blunFastConversationTools(eligibleTools, input, pendingMediaJobIds, requiredToolNames)],
 						deferredToolCount: 0
-					} : turnNeedsTools ? blunSelectTurnTools(eligibleTools, this.agent.config.modelCapabilities?.max_context_tokens, this.loadedToolNames, turnHasAttachment ? new Set(["mcp__plugin-telegram_telegram__download_attachment"]) : void 0) : {
+					} : turnNeedsTools ? blunSelectTurnTools(eligibleTools, this.agent.config.modelCapabilities?.max_context_tokens, this.loadedToolNames, requiredToolNames) : {
 						tools: [],
 						deferredToolCount: 0
 					};
@@ -261884,7 +261886,8 @@ var init_turn = __esmMin((() => {
 								const steerThinkingEffort = "low";
 								const steerPendingMediaJobIds = this.agent.toolServices?.media?.pendingMediaJobIds?.() ?? [];
 								const steerLLM = this.agent.llmForTurn(steerThinkingEffort, blunPendingMediaSystemPrompt(this.agent.fastConversationSystemPrompt, steerPendingMediaJobIds));
-								const steerTools = [...blunFastConversationTools(eligibleTools, steerInput, steerPendingMediaJobIds)];
+								const steerRequiredToolNames = mediaGenerationToolNamesForText(blunExtractText(blunThinkingIntentInput(steerInput)));
+								const steerTools = [...blunFastConversationTools(eligibleTools, steerInput, steerPendingMediaJobIds, steerRequiredToolNames)];
 								const steerHistory = () => blunFastConversationHistory(this.agent.context.history);
 								const buildSteerMessages = () => this.agent.context.project(steerHistory(), { dropOrphanResults: true });
 								const buildSteerMessagesStrict = () => this.agent.context.project(steerHistory(), {
@@ -514883,7 +514886,7 @@ function notifyRunningRuntimeReady(tui) {
 }
 function requestRunningUpdateAtSafeBoundary(tui) {
 	if (tui.runningUpdatePreparedVersion === void 0 || tui.runningUpdatePreparedMode === void 0 || tui.runningUpdateHandoffStarted || !process.connected) return false;
-	if (!isSafeRuntimeBoundary({
+	const boundaryState = () => ({
 		isShuttingDown: tui.isShuttingDown,
 		streamingPhase: tui.state.appState.streamingPhase,
 		isCompacting: tui.state.appState.isCompacting,
@@ -514891,7 +514894,8 @@ function requestRunningUpdateAtSafeBoundary(tui) {
 		activeToolCalls: tui.streamingUI.hasActiveToolCalls() ? 1 : 0,
 		shellCommands: tui.shellOutputStreams.size,
 		queueCommandRunning: tui.queueCommandRunning
-	})) return false;
+	});
+	if (!isSafeRuntimeBoundary(boundaryState())) return false;
 	const sessionId = tui.getCurrentSessionId();
 	if (sessionId.length === 0) return false;
 	tui.runningUpdateHandoffStarted = true;
@@ -514901,12 +514905,17 @@ function requestRunningUpdateAtSafeBoundary(tui) {
 			sessionId,
 			version: tui.runningUpdatePreparedVersion,
 			mode: tui.runningUpdatePreparedMode
+		}, (error) => {
+			if (error || !isSafeRuntimeBoundary(boundaryState())) {
+				tui.runningUpdateHandoffStarted = false;
+				return;
+			}
+			void tui.stop(RUNNING_UPDATE_HANDOFF_EXIT_CODE);
 		});
 	} catch {
 		tui.runningUpdateHandoffStarted = false;
 		return false;
 	}
-	void tui.stop(RUNNING_UPDATE_HANDOFF_EXIT_CODE);
 	return true;
 }
 function installRunningUpdateListener(tui) {

package/package.json

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