remoteclaw 0.2.0 → 0.2.1

package/dist/{subagent-registry-DvnyYXMs.js → subagent-registry-D2yHvOBr.js}

@@ -1,27 +1,27 @@
 import { t as __exportAll } from "./rolldown-runtime-Cbj13DAv.js";
-import { M as resolveUserPath, P as shortenHomeInString, S as CONFIG_DIR, T as escapeRegExp, at as resolveGatewayPort, r as defaultRuntime, rt as resolveConfigPath, st as resolveStateDir, t as createSubsystemLogger, w as ensureDir$1 } from "./subsystem-DLQY6iY4.js";
+import { M as resolveUserPath, P as shortenHomeInString, S as CONFIG_DIR, T as escapeRegExp, at as resolveGatewayPort, r as defaultRuntime, rt as resolveConfigPath, st as resolveStateDir, t as createSubsystemLogger, w as ensureDir$1 } from "./subsystem-9R2eOxp2.js";
 import { _ as parseAgentSessionKey, c as resolveAgentIdFromSessionKey, f as normalizeAccountId, g as getSubagentDepth, s as normalizeMainKey } from "./session-key-X7pmdLBX.js";
-import { d as resolveSessionAgentId, u as resolveDefaultAgentId } from "./agent-scope-wbu0VZoq.js";
-import { i as isSilentReplyText, n as SILENT_REPLY_TOKEN, t as HEARTBEAT_TOKEN } from "./tokens-CgIfCmK3.js";
-import { r as normalizeChannelId, t as getChannelPlugin } from "./plugins-ODda1fNU.js";
-import { K as DEFAULT_SUBAGENT_MAX_SPAWN_DEPTH, t as loadConfig, y as parseDurationMs } from "./config-Ca5Dfk8O.js";
-import { c as GATEWAY_CLIENT_IDS, i as isInternalMessageChannel, l as GATEWAY_CLIENT_MODES, n as isDeliverableMessageChannel, o as normalizeMessageChannel, t as INTERNAL_MESSAGE_CHANNEL, u as GATEWAY_CLIENT_NAMES } from "./message-channel-BuWy8hEk.js";
-import { F as resolveStorePath, R as resolveMainSessionKey, S as INPUT_PROVENANCE_KIND_VALUES, h as normalizeDeliveryContext, m as mergeDeliveryContext, p as deliveryContextFromSession, s as loadSessionStore } from "./sessions-BePPqEtN.js";
-import { n as logError, t as logDebug } from "./logger-Bp0X6yHd.js";
-import { h as getGlobalHookRunner, m as sanitizeUserFacingText, s as shouldSuppressReasoningPayload } from "./reply-payloads-DbQW7c5s.js";
-import { s as isLoopbackIpAddress } from "./ip-B27WD9wk.js";
-import { a as resolveEffectiveMessagesConfig, n as resolveResponsePrefixTemplate } from "./response-prefix-template-BgDMziqu.js";
-import { n as saveJsonFile, t as loadJsonFile } from "./json-file-CRyYLqpu.js";
+import { d as resolveSessionAgentId, u as resolveDefaultAgentId } from "./agent-scope-CYJrXxD6.js";
+import { i as isSilentReplyText, n as SILENT_REPLY_TOKEN, t as HEARTBEAT_TOKEN } from "./tokens-CFajuiSx.js";
+import { r as normalizeChannelId, t as getChannelPlugin } from "./plugins-sjrWIkqk.js";
+import { K as DEFAULT_SUBAGENT_MAX_SPAWN_DEPTH, t as loadConfig, y as parseDurationMs } from "./config-BIrnJuXL.js";
+import { c as GATEWAY_CLIENT_IDS, i as isInternalMessageChannel, l as GATEWAY_CLIENT_MODES, n as isDeliverableMessageChannel, o as normalizeMessageChannel, t as INTERNAL_MESSAGE_CHANNEL, u as GATEWAY_CLIENT_NAMES } from "./message-channel-tSSi5C96.js";
+import { C as INPUT_PROVENANCE_KIND_VALUES, I as resolveStorePath, g as normalizeDeliveryContext, h as mergeDeliveryContext, m as deliveryContextKey, p as deliveryContextFromSession, s as loadSessionStore, z as resolveMainSessionKey } from "./sessions-D5CiijxL.js";
+import { n as saveJsonFile, t as loadJsonFile } from "./json-file-DYQIVLc1.js";
+import { n as logError, t as logDebug } from "./logger-BKFID___.js";
+import { h as getGlobalHookRunner, m as sanitizeUserFacingText, s as shouldSuppressReasoningPayload } from "./reply-payloads-DwEnDy7C.js";
+import { s as isLoopbackIpAddress } from "./ip-N_XHHVsM.js";
+import { a as resolveEffectiveMessagesConfig, n as resolveResponsePrefixTemplate } from "./response-prefix-template-DDQsoC2g.js";
 import path from "node:path";
 import fs from "node:fs";
 import os from "node:os";
-import JSON5 from "json5";
+import json5 from "json5";
 import { promisify } from "node:util";
 import fs$1 from "node:fs/promises";
 import crypto, { X509Certificate, randomUUID } from "node:crypto";
 import { execFile } from "node:child_process";
 import AjvPkg from "ajv";
-import { WebSocket } from "ws";
+import { WebSocket as WebSocket$1 } from "ws";
 import { Buffer as Buffer$1 } from "node:buffer";
 import { Type } from "@sinclair/typebox";
 
@@ -153,6 +153,41 @@ function onAgentEvent(listener) {
 	return () => listeners.delete(listener);
 }
 
+//#endregion
+//#region src/agents/session-run-registry.ts
+const ACTIVE_SESSION_RUNS = /* @__PURE__ */ new Map();
+/** Check whether a session currently has an active CLI agent turn. */
+function isSessionRunActive(sessionKey) {
+	return ACTIVE_SESSION_RUNS.has(sessionKey);
+}
+/** Register an active session run. */
+function registerSessionRun(sessionKey, handle) {
+	ACTIVE_SESSION_RUNS.set(sessionKey, handle);
+}
+/** Unregister a session run (on turn completion or crash). */
+function unregisterSessionRun(sessionKey) {
+	ACTIVE_SESSION_RUNS.delete(sessionKey);
+}
+/**
+* Kill an active session run by aborting its controller or sending SIGTERM to its PID.
+* Returns `true` if a kill signal was dispatched.
+*/
+function killSessionRun(sessionKey) {
+	const handle = ACTIVE_SESSION_RUNS.get(sessionKey);
+	if (!handle) return false;
+	if (handle.abortController && !handle.abortController.signal.aborted) {
+		handle.abortController.abort();
+		return true;
+	}
+	if (typeof handle.pid === "number") try {
+		process.kill(handle.pid, "SIGTERM");
+		return true;
+	} catch {
+		return false;
+	}
+	return false;
+}
+
 //#endregion
 //#region src/process/lanes.ts
 let CommandLane = /* @__PURE__ */ function(CommandLane) {
@@ -1860,7 +1895,7 @@ var GatewayClient = class {
 				if (fingerprint !== expected) return /* @__PURE__ */ new Error("gateway tls fingerprint mismatch");
 			});
 		}
-		this.ws = new WebSocket(url, wsOptions);
+		this.ws = new WebSocket$1(url, wsOptions);
 		this.ws.on("open", () => {
 			if (url.startsWith("wss://") && this.opts.tlsFingerprint) {
 				const tlsError = this.validateTlsFingerprint();
@@ -2056,7 +2091,7 @@ var GatewayClient = class {
 		const connectChallengeTimeoutMs = typeof rawConnectDelayMs === "number" && Number.isFinite(rawConnectDelayMs) ? Math.max(250, Math.min(1e4, rawConnectDelayMs)) : 2e3;
 		if (this.connectTimer) clearTimeout(this.connectTimer);
 		this.connectTimer = setTimeout(() => {
-			if (this.connectSent || this.ws?.readyState !== WebSocket.OPEN) return;
+			if (this.connectSent || this.ws?.readyState !== WebSocket$1.OPEN) return;
 			this.opts.onConnectError?.(/* @__PURE__ */ new Error("gateway connect challenge timeout"));
 			this.ws?.close(1008, "connect challenge timeout");
 		}, connectChallengeTimeoutMs);
@@ -2098,7 +2133,7 @@ var GatewayClient = class {
 		return null;
 	}
 	async request(method, params, opts) {
-		if (!this.ws || this.ws.readyState !== WebSocket.OPEN) throw new Error("gateway not connected");
+		if (!this.ws || this.ws.readyState !== WebSocket$1.OPEN) throw new Error("gateway not connected");
 		const id = randomUUID();
 		const frame = {
 			type: "req",
@@ -2629,6 +2664,134 @@ function hasCrossChannelItems(items, resolveKey) {
 	return keys.size > 1;
 }
 
+//#endregion
+//#region src/agents/subagent-announce-queue.ts
+const ANNOUNCE_QUEUES = /* @__PURE__ */ new Map();
+function getAnnounceQueue(key, settings, send) {
+	const existing = ANNOUNCE_QUEUES.get(key);
+	if (existing) {
+		applyQueueRuntimeSettings({
+			target: existing,
+			settings
+		});
+		existing.send = send;
+		return existing;
+	}
+	const created = {
+		items: [],
+		draining: false,
+		lastEnqueuedAt: 0,
+		mode: settings.mode,
+		debounceMs: typeof settings.debounceMs === "number" ? Math.max(0, settings.debounceMs) : 1e3,
+		cap: typeof settings.cap === "number" && settings.cap > 0 ? Math.floor(settings.cap) : 20,
+		dropPolicy: settings.dropPolicy ?? "summarize",
+		droppedCount: 0,
+		summaryLines: [],
+		send,
+		consecutiveFailures: 0
+	};
+	applyQueueRuntimeSettings({
+		target: created,
+		settings
+	});
+	ANNOUNCE_QUEUES.set(key, created);
+	return created;
+}
+function hasAnnounceCrossChannelItems(items) {
+	return hasCrossChannelItems(items, (item) => {
+		if (!item.origin) return {};
+		if (!item.originKey) return { cross: true };
+		return { key: item.originKey };
+	});
+}
+function scheduleAnnounceDrain(key) {
+	const queue = beginQueueDrain(ANNOUNCE_QUEUES, key);
+	if (!queue) return;
+	(async () => {
+		try {
+			const collectState = { forceIndividualCollect: false };
+			for (;;) {
+				if (queue.items.length === 0 && queue.droppedCount === 0) break;
+				await waitForQueueDebounce(queue);
+				if (queue.mode === "collect") {
+					const collectDrainResult = await drainCollectQueueStep({
+						collectState,
+						isCrossChannel: hasAnnounceCrossChannelItems(queue.items),
+						items: queue.items,
+						run: async (item) => await queue.send(item)
+					});
+					if (collectDrainResult === "empty") break;
+					if (collectDrainResult === "drained") continue;
+					const items = queue.items.slice();
+					const summary = previewQueueSummaryPrompt({
+						state: queue,
+						noun: "announce"
+					});
+					const prompt = buildCollectPrompt({
+						title: "[Queued announce messages while agent was busy]",
+						items,
+						summary,
+						renderItem: (item, idx) => `---\nQueued #${idx + 1}\n${item.prompt}`.trim()
+					});
+					const last = items.at(-1);
+					if (!last) break;
+					await queue.send({
+						...last,
+						prompt
+					});
+					queue.items.splice(0, items.length);
+					if (summary) clearQueueSummaryState(queue);
+					continue;
+				}
+				const summaryPrompt = previewQueueSummaryPrompt({
+					state: queue,
+					noun: "announce"
+				});
+				if (summaryPrompt) {
+					if (!await drainNextQueueItem(queue.items, async (item) => await queue.send({
+						...item,
+						prompt: summaryPrompt
+					}))) break;
+					clearQueueSummaryState(queue);
+					continue;
+				}
+				if (!await drainNextQueueItem(queue.items, async (item) => await queue.send(item))) break;
+			}
+			queue.consecutiveFailures = 0;
+		} catch (err) {
+			queue.consecutiveFailures++;
+			const errorBackoffMs = Math.min(1e3 * Math.pow(2, queue.consecutiveFailures), 6e4);
+			const retryDelayMs = Math.max(errorBackoffMs, queue.debounceMs);
+			queue.lastEnqueuedAt = Date.now() + retryDelayMs - queue.debounceMs;
+			defaultRuntime.error?.(`announce queue drain failed for ${key} (attempt ${queue.consecutiveFailures}, retry in ${Math.round(retryDelayMs / 1e3)}s): ${String(err)}`);
+		} finally {
+			queue.draining = false;
+			if (queue.items.length === 0 && queue.droppedCount === 0) ANNOUNCE_QUEUES.delete(key);
+			else scheduleAnnounceDrain(key);
+		}
+	})();
+}
+function enqueueAnnounce(params) {
+	const queue = getAnnounceQueue(params.key, params.settings, params.send);
+	queue.lastEnqueuedAt = Math.max(queue.lastEnqueuedAt, Date.now());
+	if (!applyQueueDropPolicy({
+		queue,
+		summarize: (item) => item.summaryLine?.trim() || item.prompt.trim()
+	})) {
+		if (queue.dropPolicy === "new") scheduleAnnounceDrain(params.key);
+		return false;
+	}
+	const origin = normalizeDeliveryContext(params.item.origin);
+	const originKey = deliveryContextKey(origin);
+	queue.items.push({
+		...params.item,
+		origin,
+		originKey
+	});
+	scheduleAnnounceDrain(params.key);
+	return true;
+}
+
 //#endregion
 //#region src/auto-reply/reply/directive-parsing.ts
 function skipDirectiveArgPrefix(raw) {
@@ -4393,7 +4556,7 @@ async function routeReply(params) {
 	const resolvedReplyToId = replyToId ?? (channelId === "slack" && threadId != null && threadId !== "" ? String(threadId) : void 0);
 	const resolvedThreadId = channelId === "slack" ? null : threadId ?? null;
 	try {
-		const { deliverOutboundPayloads } = await import("./deliver-BTjGqSGN.js").then((n) => n.n);
+		const { deliverOutboundPayloads } = await import("./deliver-z04wZfnQ.js").then((n) => n.n);
 		const outboundSession = buildOutboundSessionContext({
 			cfg,
 			agentId: resolvedAgentId,
@@ -4855,6 +5018,11 @@ function buildAnnounceIdFromChildRun(params) {
 function buildAnnounceIdempotencyKey(announceId) {
 	return `announce:${announceId}`;
 }
+function resolveQueueAnnounceId(params) {
+	const announceId = params.announceId?.trim();
+	if (announceId) return announceId;
+	return `legacy:${params.sessionKey}:${params.enqueuedAt}`;
+}
 
 //#endregion
 //#region src/agents/subagent-depth.ts
@@ -4874,7 +5042,7 @@ function normalizeSessionKey(value) {
 function readSessionStore(storePath) {
 	try {
 		const raw = fs.readFileSync(storePath, "utf-8");
-		const parsed = JSON5.parse(raw);
+		const parsed = json5.parse(raw);
 		if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) return parsed;
 	} catch {}
 	return {};
@@ -6159,6 +6327,31 @@ async function resolveSubagentCompletionOrigin(params) {
 		};
 	}
 }
+async function sendAnnounce(item) {
+	const announceTimeoutMs = resolveSubagentAnnounceTimeoutMs(loadConfig());
+	const requesterIsSubagent = getSubagentDepthFromSessionStore(item.sessionKey) >= 1;
+	const origin = item.origin;
+	const threadId = origin?.threadId != null && origin.threadId !== "" ? String(origin.threadId) : void 0;
+	const idempotencyKey = buildAnnounceIdempotencyKey(resolveQueueAnnounceId({
+		announceId: item.announceId,
+		sessionKey: item.sessionKey,
+		enqueuedAt: item.enqueuedAt
+	}));
+	await callGateway({
+		method: "agent",
+		params: {
+			sessionKey: item.sessionKey,
+			message: item.prompt,
+			channel: requesterIsSubagent ? void 0 : origin?.channel,
+			accountId: requesterIsSubagent ? void 0 : origin?.accountId,
+			to: requesterIsSubagent ? void 0 : origin?.to,
+			threadId: requesterIsSubagent ? void 0 : threadId,
+			deliver: !requesterIsSubagent,
+			idempotencyKey
+		},
+		timeoutMs: announceTimeoutMs
+	});
+}
 function resolveRequesterStoreKey(cfg, requesterSessionKey) {
 	const raw = (requesterSessionKey ?? "").trim();
 	if (!raw) return raw;
@@ -6178,17 +6371,40 @@ function loadRequesterSessionEntry(requesterSessionKey) {
 		canonicalKey
 	};
 }
+function buildAnnounceQueueKey(sessionKey, origin) {
+	const accountId = normalizeAccountId(origin?.accountId);
+	if (!accountId) return sessionKey;
+	return `${sessionKey}:acct:${accountId}`;
+}
 async function maybeQueueSubagentAnnounce(params) {
 	if (params.signal?.aborted) return "none";
 	const { cfg, entry } = loadRequesterSessionEntry(params.requesterSessionKey);
-	resolveRequesterStoreKey(cfg, params.requesterSessionKey);
+	const canonicalKey = resolveRequesterStoreKey(cfg, params.requesterSessionKey);
 	if (!entry?.sessionId) return "none";
 	const queueSettings = resolveQueueSettings({
 		cfg,
 		channel: entry?.channel ?? entry?.lastChannel,
 		sessionEntry: entry
 	});
-	queueSettings.mode === "followup" || queueSettings.mode === "collect" || queueSettings.mode === "steer-backlog" || queueSettings.mode;
+	const isActive = isSessionRunActive(canonicalKey);
+	const shouldFollowup = queueSettings.mode === "followup" || queueSettings.mode === "collect" || queueSettings.mode === "steer-backlog" || queueSettings.mode === "interrupt";
+	if (isActive && (shouldFollowup || queueSettings.mode === "steer")) {
+		const origin = resolveAnnounceOrigin(entry, params.requesterOrigin);
+		enqueueAnnounce({
+			key: buildAnnounceQueueKey(canonicalKey, origin),
+			item: {
+				announceId: params.announceId,
+				prompt: params.triggerMessage,
+				summaryLine: params.summaryLine,
+				enqueuedAt: Date.now(),
+				sessionKey: canonicalKey,
+				origin
+			},
+			settings: queueSettings,
+			send: sendAnnounce
+		});
+		return "queued";
+	}
 	return "none";
 }
 function queueOutcomeToDeliveryResult(outcome) {
@@ -7540,4 +7756,4 @@ function countActiveDescendantRuns(rootSessionKey) {
 }
 
 //#endregion
-export { createReceiptCard as A, logWebhookReceived as B, resolveQueueSettings as C, isRoutableChannel as D, scheduleFollowupDrain as E, logMessageProcessed as F, extractQueueDirective as G, stopDiagnosticHeartbeat as H, logMessageQueued as I, AGENT_LANE_SUBAGENT as J, callGateway as K, logSessionStateChange as L, clearSessionQueues as M, clearCommandLane as N, routeReply as O, getQueueSize as P, resolveGatewayCredentialsFromConfig as Q, logWebhookError as R, unregisterSessionBindingAdapter as S, getFollowupQueueDepth as T, emitDiagnosticEvent as U, startDiagnosticHeartbeat as V, isDiagnosticsEnabled as W, emitAgentEvent as X, clearAgentRunContext as Y, registerAgentRunContext as Z, resolveMainSessionAlias as _, markSubagentRunTerminated as a, getSessionBindingService as b, subagent_registry_exports as c, extractAssistantText as d, sanitizeTextContent as f, resolveInternalSessionKey as g, resolveDisplaySessionKey as h, markSubagentRunForSteerRestart as i, buildOutboundSessionContext as j, normalizeReplyPayload as k, resolveAgentTimeoutMs as l, stripReasoningTagsFromText as m, countActiveRunsForSession as n, registerSubagentRun as o, stripToolMessages as p, AGENT_LANE_NESTED as q, listSubagentRunsForRequester as r, replaceSubagentRunAfterSteer as s, clearSubagentRunSteerRestart as t, buildSubagentSystemPrompt as u, getSubagentDepthFromSessionStore as v, enqueueFollowupRun as w, registerSessionBindingAdapter as x, extractTextFromChatContent as y, logWebhookProcessed as z };
+export { clearAgentRunContext as $, createReceiptCard as A, logWebhookReceived as B, resolveQueueSettings as C, isRoutableChannel as D, scheduleFollowupDrain as E, logMessageProcessed as F, extractQueueDirective as G, stopDiagnosticHeartbeat as H, logMessageQueued as I, AGENT_LANE_SUBAGENT as J, callGateway as K, logSessionStateChange as L, clearSessionQueues as M, clearCommandLane as N, routeReply as O, getQueueSize as P, unregisterSessionRun as Q, logWebhookError as R, unregisterSessionBindingAdapter as S, getFollowupQueueDepth as T, emitDiagnosticEvent as U, startDiagnosticHeartbeat as V, isDiagnosticsEnabled as W, killSessionRun as X, isSessionRunActive as Y, registerSessionRun as Z, resolveMainSessionAlias as _, markSubagentRunTerminated as a, getSessionBindingService as b, subagent_registry_exports as c, extractAssistantText as d, emitAgentEvent as et, sanitizeTextContent as f, resolveInternalSessionKey as g, resolveDisplaySessionKey as h, markSubagentRunForSteerRestart as i, buildOutboundSessionContext as j, normalizeReplyPayload as k, resolveAgentTimeoutMs as l, stripReasoningTagsFromText as m, countActiveRunsForSession as n, resolveGatewayCredentialsFromConfig as nt, registerSubagentRun as o, stripToolMessages as p, AGENT_LANE_NESTED as q, listSubagentRunsForRequester as r, replaceSubagentRunAfterSteer as s, clearSubagentRunSteerRestart as t, registerAgentRunContext as tt, buildSubagentSystemPrompt as u, getSubagentDepthFromSessionStore as v, enqueueFollowupRun as w, registerSessionBindingAdapter as x, extractTextFromChatContent as y, logWebhookProcessed as z };

package/dist/{subagent-registry-DMTgcI99.js → subagent-registry-DljM1oxO.js}

@@ -10,9 +10,9 @@ import { et as DEFAULT_SUBAGENT_MAX_SPAWN_DEPTH, i as loadConfig } from "./confi
 import { g as parseDurationMs } from "./zod-schema-C2MssSI0.js";
 import { r as normalizeChannelId$1, t as getChannelPlugin } from "./plugins-BzN42FWt.js";
 import { i as isSilentReplyText, n as SILENT_REPLY_TOKEN, t as HEARTBEAT_TOKEN } from "./tokens-DJrhANSO.js";
-import { p as getGlobalHookRunner, s as shouldSuppressReasoningPayload } from "./reply-payloads-C4mbcSP-.js";
+import { p as getGlobalHookRunner, s as shouldSuppressReasoningPayload } from "./reply-payloads-KYLwM629.js";
 import { m as resolveStorePath } from "./chat-envelope-DPKIEKwe.js";
-import { X as resolveMainSessionKey, d as deliveryContextFromSession, f as mergeDeliveryContext, n as loadSessionStore, p as normalizeDeliveryContext } from "./store-BS8fRU9w.js";
+import { Z as resolveMainSessionKey, d as deliveryContextFromSession, f as deliveryContextKey, m as normalizeDeliveryContext, n as loadSessionStore, p as mergeDeliveryContext } from "./store-BfW5-y9S.js";
 import { n as saveJsonFile, t as loadJsonFile } from "./json-file-BTOmHNpk.js";
 import { n as callGateway } from "./call-CzzsQW8Z.js";
 import { a as resolveEffectiveMessagesConfig, n as resolveResponsePrefixTemplate } from "./response-prefix-template-QvNeSzmd.js";
@@ -985,6 +985,134 @@ function hasCrossChannelItems(items, resolveKey) {
 	return keys.size > 1;
 }
 
+//#endregion
+//#region src/agents/subagent-announce-queue.ts
+const ANNOUNCE_QUEUES = /* @__PURE__ */ new Map();
+function getAnnounceQueue(key, settings, send) {
+	const existing = ANNOUNCE_QUEUES.get(key);
+	if (existing) {
+		applyQueueRuntimeSettings({
+			target: existing,
+			settings
+		});
+		existing.send = send;
+		return existing;
+	}
+	const created = {
+		items: [],
+		draining: false,
+		lastEnqueuedAt: 0,
+		mode: settings.mode,
+		debounceMs: typeof settings.debounceMs === "number" ? Math.max(0, settings.debounceMs) : 1e3,
+		cap: typeof settings.cap === "number" && settings.cap > 0 ? Math.floor(settings.cap) : 20,
+		dropPolicy: settings.dropPolicy ?? "summarize",
+		droppedCount: 0,
+		summaryLines: [],
+		send,
+		consecutiveFailures: 0
+	};
+	applyQueueRuntimeSettings({
+		target: created,
+		settings
+	});
+	ANNOUNCE_QUEUES.set(key, created);
+	return created;
+}
+function hasAnnounceCrossChannelItems(items) {
+	return hasCrossChannelItems(items, (item) => {
+		if (!item.origin) return {};
+		if (!item.originKey) return { cross: true };
+		return { key: item.originKey };
+	});
+}
+function scheduleAnnounceDrain(key) {
+	const queue = beginQueueDrain(ANNOUNCE_QUEUES, key);
+	if (!queue) return;
+	(async () => {
+		try {
+			const collectState = { forceIndividualCollect: false };
+			for (;;) {
+				if (queue.items.length === 0 && queue.droppedCount === 0) break;
+				await waitForQueueDebounce(queue);
+				if (queue.mode === "collect") {
+					const collectDrainResult = await drainCollectQueueStep({
+						collectState,
+						isCrossChannel: hasAnnounceCrossChannelItems(queue.items),
+						items: queue.items,
+						run: async (item) => await queue.send(item)
+					});
+					if (collectDrainResult === "empty") break;
+					if (collectDrainResult === "drained") continue;
+					const items = queue.items.slice();
+					const summary = previewQueueSummaryPrompt({
+						state: queue,
+						noun: "announce"
+					});
+					const prompt = buildCollectPrompt({
+						title: "[Queued announce messages while agent was busy]",
+						items,
+						summary,
+						renderItem: (item, idx) => `---\nQueued #${idx + 1}\n${item.prompt}`.trim()
+					});
+					const last = items.at(-1);
+					if (!last) break;
+					await queue.send({
+						...last,
+						prompt
+					});
+					queue.items.splice(0, items.length);
+					if (summary) clearQueueSummaryState(queue);
+					continue;
+				}
+				const summaryPrompt = previewQueueSummaryPrompt({
+					state: queue,
+					noun: "announce"
+				});
+				if (summaryPrompt) {
+					if (!await drainNextQueueItem(queue.items, async (item) => await queue.send({
+						...item,
+						prompt: summaryPrompt
+					}))) break;
+					clearQueueSummaryState(queue);
+					continue;
+				}
+				if (!await drainNextQueueItem(queue.items, async (item) => await queue.send(item))) break;
+			}
+			queue.consecutiveFailures = 0;
+		} catch (err) {
+			queue.consecutiveFailures++;
+			const errorBackoffMs = Math.min(1e3 * Math.pow(2, queue.consecutiveFailures), 6e4);
+			const retryDelayMs = Math.max(errorBackoffMs, queue.debounceMs);
+			queue.lastEnqueuedAt = Date.now() + retryDelayMs - queue.debounceMs;
+			defaultRuntime.error?.(`announce queue drain failed for ${key} (attempt ${queue.consecutiveFailures}, retry in ${Math.round(retryDelayMs / 1e3)}s): ${String(err)}`);
+		} finally {
+			queue.draining = false;
+			if (queue.items.length === 0 && queue.droppedCount === 0) ANNOUNCE_QUEUES.delete(key);
+			else scheduleAnnounceDrain(key);
+		}
+	})();
+}
+function enqueueAnnounce(params) {
+	const queue = getAnnounceQueue(params.key, params.settings, params.send);
+	queue.lastEnqueuedAt = Math.max(queue.lastEnqueuedAt, Date.now());
+	if (!applyQueueDropPolicy({
+		queue,
+		summarize: (item) => item.summaryLine?.trim() || item.prompt.trim()
+	})) {
+		if (queue.dropPolicy === "new") scheduleAnnounceDrain(params.key);
+		return false;
+	}
+	const origin = normalizeDeliveryContext(params.item.origin);
+	const originKey = deliveryContextKey(origin);
+	queue.items.push({
+		...params.item,
+		origin,
+		originKey
+	});
+	scheduleAnnounceDrain(params.key);
+	return true;
+}
+
 //#endregion
 //#region src/auto-reply/reply/directive-parsing.ts
 function skipDirectiveArgPrefix(raw) {
@@ -2191,7 +2319,7 @@ async function routeReply(params) {
 	const resolvedReplyToId = replyToId ?? (channelId === "slack" && threadId != null && threadId !== "" ? String(threadId) : void 0);
 	const resolvedThreadId = channelId === "slack" ? null : threadId ?? null;
 	try {
-		const { deliverOutboundPayloads } = await import("./deliver-D3lJfcWr.js").then((n) => n.n);
+		const { deliverOutboundPayloads } = await import("./deliver-Cu2kD7-u.js").then((n) => n.n);
 		const outboundSession = buildOutboundSessionContext({
 			cfg,
 			agentId: resolvedAgentId,
@@ -2653,6 +2781,63 @@ function buildAnnounceIdFromChildRun(params) {
 function buildAnnounceIdempotencyKey(announceId) {
 	return `announce:${announceId}`;
 }
+function resolveQueueAnnounceId(params) {
+	const announceId = params.announceId?.trim();
+	if (announceId) return announceId;
+	return `legacy:${params.sessionKey}:${params.enqueuedAt}`;
+}
+
+//#endregion
+//#region src/agents/session-run-registry.ts
+const ACTIVE_SESSION_RUNS = /* @__PURE__ */ new Map();
+/** Check whether a session currently has an active CLI agent turn. */
+function isSessionRunActive(sessionKey) {
+	return ACTIVE_SESSION_RUNS.has(sessionKey);
+}
+/** Return the number of currently active session runs. */
+function getActiveSessionRunCount() {
+	return ACTIVE_SESSION_RUNS.size;
+}
+/** Register an active session run. */
+function registerSessionRun(sessionKey, handle) {
+	ACTIVE_SESSION_RUNS.set(sessionKey, handle);
+}
+/** Unregister a session run (on turn completion or crash). */
+function unregisterSessionRun(sessionKey) {
+	ACTIVE_SESSION_RUNS.delete(sessionKey);
+}
+/**
+* Kill an active session run by aborting its controller or sending SIGTERM to its PID.
+* Returns `true` if a kill signal was dispatched.
+*/
+function killSessionRun(sessionKey) {
+	const handle = ACTIVE_SESSION_RUNS.get(sessionKey);
+	if (!handle) return false;
+	if (handle.abortController && !handle.abortController.signal.aborted) {
+		handle.abortController.abort();
+		return true;
+	}
+	if (typeof handle.pid === "number") try {
+		process.kill(handle.pid, "SIGTERM");
+		return true;
+	} catch {
+		return false;
+	}
+	return false;
+}
+/**
+* Wait (poll) for a session run to end.
+* Resolves `true` if the run ended, `false` on timeout.
+*/
+async function waitForSessionRunEnd(sessionKey, timeoutMs) {
+	if (!ACTIVE_SESSION_RUNS.has(sessionKey)) return true;
+	const deadline = Date.now() + timeoutMs;
+	while (ACTIVE_SESSION_RUNS.has(sessionKey)) {
+		if (Date.now() >= deadline) return false;
+		await new Promise((resolve) => setTimeout(resolve, 50));
+	}
+	return true;
+}
 
 //#endregion
 //#region src/agents/subagent-depth.ts
@@ -3769,6 +3954,31 @@ async function resolveSubagentCompletionOrigin(params) {
 		};
 	}
 }
+async function sendAnnounce(item) {
+	const announceTimeoutMs = resolveSubagentAnnounceTimeoutMs(loadConfig());
+	const requesterIsSubagent = getSubagentDepthFromSessionStore(item.sessionKey) >= 1;
+	const origin = item.origin;
+	const threadId = origin?.threadId != null && origin.threadId !== "" ? String(origin.threadId) : void 0;
+	const idempotencyKey = buildAnnounceIdempotencyKey(resolveQueueAnnounceId({
+		announceId: item.announceId,
+		sessionKey: item.sessionKey,
+		enqueuedAt: item.enqueuedAt
+	}));
+	await callGateway({
+		method: "agent",
+		params: {
+			sessionKey: item.sessionKey,
+			message: item.prompt,
+			channel: requesterIsSubagent ? void 0 : origin?.channel,
+			accountId: requesterIsSubagent ? void 0 : origin?.accountId,
+			to: requesterIsSubagent ? void 0 : origin?.to,
+			threadId: requesterIsSubagent ? void 0 : threadId,
+			deliver: !requesterIsSubagent,
+			idempotencyKey
+		},
+		timeoutMs: announceTimeoutMs
+	});
+}
 function resolveRequesterStoreKey(cfg, requesterSessionKey) {
 	const raw = (requesterSessionKey ?? "").trim();
 	if (!raw) return raw;
@@ -3788,17 +3998,40 @@ function loadRequesterSessionEntry(requesterSessionKey) {
 		canonicalKey
 	};
 }
+function buildAnnounceQueueKey(sessionKey, origin) {
+	const accountId = normalizeAccountId(origin?.accountId);
+	if (!accountId) return sessionKey;
+	return `${sessionKey}:acct:${accountId}`;
+}
 async function maybeQueueSubagentAnnounce(params) {
 	if (params.signal?.aborted) return "none";
 	const { cfg, entry } = loadRequesterSessionEntry(params.requesterSessionKey);
-	resolveRequesterStoreKey(cfg, params.requesterSessionKey);
+	const canonicalKey = resolveRequesterStoreKey(cfg, params.requesterSessionKey);
 	if (!entry?.sessionId) return "none";
 	const queueSettings = resolveQueueSettings({
 		cfg,
 		channel: entry?.channel ?? entry?.lastChannel,
 		sessionEntry: entry
 	});
-	queueSettings.mode === "followup" || queueSettings.mode === "collect" || queueSettings.mode === "steer-backlog" || queueSettings.mode;
+	const isActive = isSessionRunActive(canonicalKey);
+	const shouldFollowup = queueSettings.mode === "followup" || queueSettings.mode === "collect" || queueSettings.mode === "steer-backlog" || queueSettings.mode === "interrupt";
+	if (isActive && (shouldFollowup || queueSettings.mode === "steer")) {
+		const origin = resolveAnnounceOrigin(entry, params.requesterOrigin);
+		enqueueAnnounce({
+			key: buildAnnounceQueueKey(canonicalKey, origin),
+			item: {
+				announceId: params.announceId,
+				prompt: params.triggerMessage,
+				summaryLine: params.summaryLine,
+				enqueuedAt: Date.now(),
+				sessionKey: canonicalKey,
+				origin
+			},
+			settings: queueSettings,
+			send: sendAnnounce
+		});
+		return "queued";
+	}
 	return "none";
 }
 function queueOutcomeToDeliveryResult(outcome) {
@@ -5195,4 +5428,4 @@ function initSubagentRegistry() {
 }
 
 //#endregion
-export { DEFAULT_HEARTBEAT_EVERY as $, createSessionVisibilityGuard as A, AGENT_LANE_SUBAGENT as B, classifySessionKind as C, clearAgentRunContext as Ct, stripToolMessages as D, registerAgentRunContext as Dt, sanitizeTextContent as E, onAgentEvent as Et, resolveInternalSessionKey as F, unregisterSessionBindingAdapter as G, extractTextFromChatContent as H, resolveMainSessionAlias as I, getFollowupQueueDepth as J, resolveQueueSettings as K, resolveSessionReference as L, resolveSandboxedSessionToolContext as M, isResolvedSessionVisibleToRequester as N, stripReasoningTagsFromText as O, createReceiptCard as Ot, resolveDisplaySessionKey as P, normalizeReplyPayload as Q, shouldResolveSessionIdInput as R, runAgentStep as S, extractQueueDirective as St, extractAssistantText as T, getAgentRunContext as Tt, getSessionBindingService as U, getSubagentDepthFromSessionStore as V, registerSessionBindingAdapter as W, isRoutableChannel as X, scheduleFollowupDrain as Y, routeReply as Z, isAnnounceSkip as _, logWebhookReceived as _t, listDescendantRunsForRequester as a, getQueueSize as at, resolvePingPongTurns as b, emitDiagnosticEvent as bt, markSubagentRunTerminated as c, resetAllLanes as ct, subagent_registry_exports as d, CommandLane as dt, resolveHeartbeatPrompt as et, buildSubagentSystemPrompt as f, logMessageProcessed as ft, buildAgentToAgentReplyContext as g, logWebhookProcessed as gt, buildAgentToAgentMessageContext as h, logWebhookError as ht, initSubagentRegistry as i, getActiveTaskCount as it, resolveEffectiveSessionToolsVisibility as j, createAgentToAgentPolicy as k, resolveAgentTimeoutMs as kt, registerSubagentRun as l, setCommandLaneConcurrency as lt, buildAgentToAgentAnnounceContext as m, logSessionStateChange as mt, countActiveDescendantRuns as n, clearSessionQueues as nt, listSubagentRunsForRequester as o, getTotalQueueSize as ot, runSubagentAnnounceFlow as p, logMessageQueued as pt, enqueueFollowupRun as q, countActiveRunsForSession as r, clearCommandLane as rt, markSubagentRunForSteerRestart as s, markGatewayDraining as st, clearSubagentRunSteerRestart as t, buildOutboundSessionContext as tt, replaceSubagentRunAfterSteer as u, waitForActiveTasks as ut, isReplySkip as v, startDiagnosticHeartbeat as vt, deriveChannel as w, emitAgentEvent as wt, readLatestAssistantReply as x, isDiagnosticsEnabled as xt, resolveAnnounceTargetFromKey as y, stopDiagnosticHeartbeat as yt, AGENT_LANE_NESTED as z };
+export { enqueueFollowupRun as $, createSessionVisibilityGuard as A, emitAgentEvent as At, AGENT_LANE_SUBAGENT as B, classifySessionKind as C, logWebhookReceived as Ct, stripToolMessages as D, isDiagnosticsEnabled as Dt, sanitizeTextContent as E, emitDiagnosticEvent as Et, resolveInternalSessionKey as F, resolveAgentTimeoutMs as Ft, registerSessionRun as G, getActiveSessionRunCount as H, resolveMainSessionAlias as I, extractTextFromChatContent as J, unregisterSessionRun as K, resolveSessionReference as L, resolveSandboxedSessionToolContext as M, onAgentEvent as Mt, isResolvedSessionVisibleToRequester as N, registerAgentRunContext as Nt, stripReasoningTagsFromText as O, extractQueueDirective as Ot, resolveDisplaySessionKey as P, createReceiptCard as Pt, resolveQueueSettings as Q, shouldResolveSessionIdInput as R, runAgentStep as S, logWebhookProcessed as St, extractAssistantText as T, stopDiagnosticHeartbeat as Tt, isSessionRunActive as U, getSubagentDepthFromSessionStore as V, killSessionRun as W, registerSessionBindingAdapter as X, getSessionBindingService as Y, unregisterSessionBindingAdapter as Z, isAnnounceSkip as _, CommandLane as _t, listDescendantRunsForRequester as a, DEFAULT_HEARTBEAT_EVERY as at, resolvePingPongTurns as b, logSessionStateChange as bt, markSubagentRunTerminated as c, clearSessionQueues as ct, subagent_registry_exports as d, getQueueSize as dt, getFollowupQueueDepth as et, buildSubagentSystemPrompt as f, getTotalQueueSize as ft, buildAgentToAgentReplyContext as g, waitForActiveTasks as gt, buildAgentToAgentMessageContext as h, setCommandLaneConcurrency as ht, initSubagentRegistry as i, normalizeReplyPayload as it, resolveEffectiveSessionToolsVisibility as j, getAgentRunContext as jt, createAgentToAgentPolicy as k, clearAgentRunContext as kt, registerSubagentRun as l, clearCommandLane as lt, buildAgentToAgentAnnounceContext as m, resetAllLanes as mt, countActiveDescendantRuns as n, isRoutableChannel as nt, listSubagentRunsForRequester as o, resolveHeartbeatPrompt as ot, runSubagentAnnounceFlow as p, markGatewayDraining as pt, waitForSessionRunEnd as q, countActiveRunsForSession as r, routeReply as rt, markSubagentRunForSteerRestart as s, buildOutboundSessionContext as st, clearSubagentRunSteerRestart as t, scheduleFollowupDrain as tt, replaceSubagentRunAfterSteer as u, getActiveTaskCount as ut, isReplySkip as v, logMessageProcessed as vt, deriveChannel as w, startDiagnosticHeartbeat as wt, readLatestAssistantReply as x, logWebhookError as xt, resolveAnnounceTargetFromKey as y, logMessageQueued as yt, AGENT_LANE_NESTED as z };