blun-king-cli 9.1.283 → 9.1.285

package/bin/input-draft-persistence.cjs

@@ -0,0 +1,77 @@
+'use strict';
+
+const crypto = require('node:crypto');
+const fs = require('node:fs/promises');
+const path = require('node:path');
+
+const MAX_INPUT_DRAFT_BYTES = 64 * 1024;
+const MAX_INPUT_DRAFT_FILE_BYTES = MAX_INPUT_DRAFT_BYTES + 1024;
+const SCHEMA_VERSION = 1;
+const VALID_MODES = new Set(['bash', 'prompt']);
+
+function normalizeInputDraft(value) {
+  if (!value || typeof value !== 'object') return null;
+  if (!VALID_MODES.has(value.mode) || typeof value.text !== 'string') return null;
+  if (value.text.length === 0) return null;
+  if (Buffer.byteLength(value.text, 'utf8') > MAX_INPUT_DRAFT_BYTES) return null;
+  return { mode: value.mode, text: value.text };
+}
+
+async function clearInputDraft(filePath) {
+  await fs.rm(path.resolve(filePath), { force: true });
+}
+
+async function readInputDraft(filePath) {
+  const target = path.resolve(filePath);
+  try {
+    const stat = await fs.lstat(target);
+    if (!stat.isFile() || stat.isSymbolicLink() || stat.size > MAX_INPUT_DRAFT_FILE_BYTES) return null;
+    const record = JSON.parse(await fs.readFile(target, 'utf8'));
+    if (record?.schemaVersion !== SCHEMA_VERSION) return null;
+    return normalizeInputDraft(record);
+  } catch {
+    return null;
+  }
+}
+
+async function writeInputDraft(filePath, value) {
+  const target = path.resolve(filePath);
+  const text = typeof value?.text === 'string' ? value.text : '';
+  if (Buffer.byteLength(text, 'utf8') > MAX_INPUT_DRAFT_BYTES) {
+    await clearInputDraft(target);
+    throw new Error('draft_too_large');
+  }
+  if (text.length === 0) {
+    await clearInputDraft(target);
+    return;
+  }
+  const draft = normalizeInputDraft(value);
+  if (draft === null) throw new Error('draft_invalid');
+
+  const directory = path.dirname(target);
+  const temporary = path.join(
+    directory,
+    `.${path.basename(target)}.${process.pid}.${crypto.randomUUID()}.tmp`,
+  );
+  await fs.mkdir(directory, { recursive: true, mode: 0o700 });
+  try {
+    await fs.writeFile(
+      temporary,
+      `${JSON.stringify({ schemaVersion: SCHEMA_VERSION, ...draft })}\n`,
+      { encoding: 'utf8', flag: 'wx', mode: 0o600 },
+    );
+    await fs.rename(temporary, target);
+    await fs.chmod(target, 0o600).catch(() => {});
+  } catch (error) {
+    await fs.rm(temporary, { force: true }).catch(() => {});
+    throw error;
+  }
+}
+
+module.exports = {
+  MAX_INPUT_DRAFT_BYTES,
+  clearInputDraft,
+  normalizeInputDraft,
+  readInputDraft,
+  writeInputDraft,
+};

package/bin/subagent-usage-rollup-policy.cjs

@@ -0,0 +1,29 @@
+'use strict';
+
+const USAGE_FIELDS = [
+  'inputOther',
+  'output',
+  'inputCacheRead',
+  'inputCacheCreation',
+];
+
+function safeTokenCount(value) {
+  return Number.isFinite(value) && value > 0 ? value : 0;
+}
+
+function buildSubagentUsageDelta(after, before) {
+  if (after === undefined || after === null || typeof after !== 'object') return null;
+  const baseline = before !== null && typeof before === 'object' ? before : {};
+  if (USAGE_FIELDS.some((field) => safeTokenCount(after[field]) < safeTokenCount(baseline[field]))) {
+    return null;
+  }
+  const delta = Object.fromEntries(USAGE_FIELDS.map((field) => [
+    field,
+    safeTokenCount(after[field]) - safeTokenCount(baseline[field]),
+  ]));
+  return USAGE_FIELDS.some((field) => delta[field] > 0) ? delta : null;
+}
+
+module.exports = {
+  buildSubagentUsageDelta,
+};

package/blun.mjs

@@ -252106,7 +252106,7 @@ function shouldSuppressQueuedAttemptFailureEvent(options, error) {
 	if (isProviderRateLimitError(error)) return true;
 	return isAbortError$4(error) || options.signal.aborted;
 }
-var DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation, SUMMARY_MIN_LENGTH, SUMMARY_CONTINUATION_ATTEMPTS, HOOK_TEXT_PREVIEW_LENGTH, SUBAGENT_MAX_TOKENS_ERROR, TOOL_CALL_DISABLED_MESSAGE, SUBAGENT_PROMPT_ORIGIN, SIDE_QUESTION_SYSTEM_REMINDER, SessionSubagentHost;
+var DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation, buildSubagentUsageDelta, SUMMARY_MIN_LENGTH, SUMMARY_CONTINUATION_ATTEMPTS, HOOK_TEXT_PREVIEW_LENGTH, SUBAGENT_MAX_TOKENS_ERROR, TOOL_CALL_DISABLED_MESSAGE, SUBAGENT_PROMPT_ORIGIN, SIDE_QUESTION_SYSTEM_REMINDER, SessionSubagentHost;
 var init_subagent_host = __esmMin((() => {
 	init_src$4();
 	init_errors$8();
@@ -252119,6 +252119,7 @@ var init_subagent_host = __esmMin((() => {
 	init_subagent_batch();
 	init_summary_continuation();
 	({ DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation } = createRequire(import.meta.url)("./bin/subagent-timeout-policy.cjs"));
+	({ buildSubagentUsageDelta } = createRequire(import.meta.url)("./bin/subagent-usage-rollup-policy.cjs"));
 	SUMMARY_MIN_LENGTH = 200;
 	SUMMARY_CONTINUATION_ATTEMPTS = 1;
 	HOOK_TEXT_PREVIEW_LENGTH = 500;
@@ -252177,7 +252178,7 @@ IMPORTANT:
 				parentAgentId: this.ownerAgentId,
 				swarmItem: options.swarmItem
 			});
-			const completion = this.runWithActiveChild(id, options, async (runOptions) => {
+			const completion = this.runWithTrackedChildUsage(parent, agent, id, options, async (runOptions) => {
 				this.emitSubagentSpawned(parent, id, profile.name, runOptions);
 				try {
 					await this.configureChild(parent, agent, profile);
@@ -252201,7 +252202,7 @@ IMPORTANT:
 				agentId,
 				profileName,
 				resumed: true,
-				completion: this.runWithActiveChild(agentId, options, async (runOptions) => {
+				completion: this.runWithTrackedChildUsage(parent, child, agentId, options, async (runOptions) => {
 					this.emitSubagentSpawned(parent, agentId, profileName, runOptions);
 					try {
 						child.config.update({
@@ -252239,7 +252240,7 @@ IMPORTANT:
 				agentId,
 				profileName,
 				resumed: true,
-				completion: this.runWithActiveChild(agentId, options, async (runOptions) => {
+				completion: this.runWithTrackedChildUsage(parent, child, agentId, options, async (runOptions) => {
 					try {
 						runOptions.signal.throwIfAborted();
 						child.config.update({
@@ -252354,6 +252355,20 @@ IMPORTANT:
 				this.activeChildren.delete(childId);
 			});
 		}
+		async runWithTrackedChildUsage(parent, child, childId, options, run) {
+			const usageBefore = child.usage.data().total;
+			try {
+				return await this.runWithActiveChild(childId, options, run);
+			} finally {
+				this.recordSubagentUsageDelta(parent, child, usageBefore);
+			}
+		}
+		recordSubagentUsageDelta(parent, child, usageBefore) {
+			const usageDelta = buildSubagentUsageDelta(child.usage.data().total, usageBefore);
+			if (usageDelta === null) return;
+			const model = child.config.modelAlias ?? parent.config.modelAlias ?? "subagent";
+			parent.usage.record(model, usageDelta, "session");
+		}
 		async runPromptTurn(parent, childId, child, profileName, options) {
 			options.signal.throwIfAborted();
 			await this.triggerSubagentStart(parent, profileName, options.prompt, options.signal);
@@ -328707,6 +328722,7 @@ const BLUN_UPDATE_STATE_FILE_NAME = "latest.json";
 const BLUN_UPDATE_INSTALL_STATE_FILE_NAME = "install.json";
 const BLUN_UPDATE_ROLLOUT_LOG_FILE_NAME = "rollout.log";
 const BLUN_INPUT_HISTORY_DIR_NAME = "user-history";
+const BLUN_INPUT_DRAFT_DIR_NAME = "input-drafts";
 const BLUN_BANNER_DIR_NAME = "banner";
 const BLUN_BANNER_STATE_FILE_NAME = "state.json";
 const BLUN_STARTUP_DIR_NAME = "startup";
@@ -340161,6 +340177,10 @@ function getInputHistoryFile(workDir) {
 	const hash = createHash("md5").update(workDir, "utf-8").digest("hex");
 	return join(getDataDir(), BLUN_INPUT_HISTORY_DIR_NAME, `${hash}.jsonl`);
 }
+function getInputDraftFile(workDir, profile) {
+	const hash = createHash("sha256").update(`${profile}\0${workDir}`, "utf-8").digest("hex");
+	return join(getDataDir(), BLUN_INPUT_DRAFT_DIR_NAME, `${hash}.json`);
+}
 //#endregion
 //#region src/cli/build-info.ts
 function optionalBuildString(value) {
@@ -496889,6 +496909,7 @@ async function appendJsonlLine(filePath, lineSchema, value) {
 //#region src/utils/history/input-history.ts
 init_zod$1();
 const InputHistoryEntrySchema = object({ content: string() });
+var { readInputDraft, writeInputDraft } = createRequire(import.meta.url)("./bin/input-draft-persistence.cjs");
 async function loadInputHistory(file) {
 	return readJsonlFile(file, InputHistoryEntrySchema);
 }
@@ -504219,6 +504240,7 @@ var EditorKeyboardController = class {
 			if (!editor.wasGhostAcceptance()) this.inlineSuggest?.notifyActivity();
 			if (this.pendingExit) this.clearPendingExit();
 			host.updateEditorBorderHighlight(text);
+			host.scheduleInputDraftPersist(text, editor.inputMode);
 		};
 		let browseMode = null;
 		editor.setHistoryFilter((entry) => {
@@ -504345,6 +504367,7 @@ var EditorKeyboardController = class {
 		};
 		editor.onInputModeChange = (mode) => {
 			host.handleInputModeChange(mode);
+			host.scheduleInputDraftPersist(editor.getText(), mode);
 		};
 		editor.onOpenExternalEditor = () => {
 			host.track("shortcut_editor");
@@ -515537,6 +515560,9 @@ var BlunTUI = class {
 	mediaActivityTickTimer;
 	mediaActivityExpanded = false;
 	lastHistoryContent;
+	inputDraftTimer;
+	pendingInputDraft;
+	inputDraftWrite = Promise.resolve();
 	shellOutputStreams = /* @__PURE__ */ new Map();
 	streamingUI;
 	authFlow;
@@ -515783,6 +515809,7 @@ var BlunTUI = class {
 		this.loadPersistedInputHistory();
 		this.state.editorContainer.clear();
 		this.state.editorContainer.addChild(this.state.editor);
+		await this.loadPersistedInputDraft();
 		this.state.ui.setFocus(this.state.editor);
 		return shouldReplayHistory;
 	}
@@ -516054,6 +516081,7 @@ var BlunTUI = class {
 	async stop(exitCode) {
 		if (this.isShuttingDown) return;
 		this.isShuttingDown = true;
+		await this.flushInputDraft();
 		if (exitCode === 0 && process.connected) try {
 			process.send({ type: RUNTIME_EXIT_INTENT_MESSAGE });
 		} catch {}
@@ -516937,6 +516965,40 @@ var BlunTUI = class {
 			this.managedImageReaderAvailable = false;
 		}
 	}
+	inputDraftFile() {
+		return getInputDraftFile(
+			this.state.appState.workDir,
+			process.env["BLUN_PROFILE"] ?? "default"
+		);
+	}
+	async loadPersistedInputDraft() {
+		const draft = await readInputDraft(this.inputDraftFile());
+		if (draft === null || this.state.editor.getText().length > 0) return;
+		this.state.editor.setInputMode(draft.mode);
+		this.state.editor.setText(draft.text);
+		this.updateEditorBorderHighlight(draft.text);
+	}
+	scheduleInputDraftPersist(text, mode) {
+		this.pendingInputDraft = { text, mode };
+		if (this.inputDraftTimer !== void 0) clearTimeout(this.inputDraftTimer);
+		this.inputDraftTimer = setTimeout(() => {
+			this.inputDraftTimer = void 0;
+			void this.flushInputDraft();
+		}, 300);
+	}
+	async flushInputDraft() {
+		if (this.inputDraftTimer !== void 0) {
+			clearTimeout(this.inputDraftTimer);
+			this.inputDraftTimer = void 0;
+		}
+		const draft = this.pendingInputDraft;
+		this.pendingInputDraft = void 0;
+		if (draft === void 0) return this.inputDraftWrite;
+		this.inputDraftWrite = this.inputDraftWrite
+			.then(() => writeInputDraft(this.inputDraftFile(), draft))
+			.catch(() => {});
+		return this.inputDraftWrite;
+	}
 	async loadPersistedInputHistory() {
 		try {
 			const entries = await loadInputHistory(getInputHistoryFile(this.state.appState.workDir));

package/package.json

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