@openclaw/clickclack 2026.9.4 → 2026.9.6

package/dist/{channel-ByvJKugM.js → .setup/channel-CT4CVd4d.mjs}

@@ -1,105 +1,156 @@
-import { _ as DEFAULT_ACCOUNT_ID, b as resolveClickClackAccount, c as resolveWorkspaceId, f as normalizeClickClackCorrelationId, g as clickClackMeta, h as clickClackConfigAdapter, l as ClickClackHttpError, m as CLICKCLACK_CHANNEL_ID, n as clickClackSetupContract, p as clickClackConfigSchema, s as resolveChannelId, t as clickClackSetupWizard, u as createClickClackClient, y as listEnabledClickClackAccounts } from "./setup-surface-qNPMK71w.js";
-import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-BKkzzjBA.js";
+import { _ as DEFAULT_ACCOUNT_ID, b as resolveClickClackAccount, c as resolveWorkspaceId, f as normalizeClickClackCorrelationId, g as clickClackMeta, h as clickClackConfigAdapter, l as ClickClackHttpError, m as CLICKCLACK_CHANNEL_ID, n as clickClackSetupContract, p as clickClackConfigSchema, s as resolveChannelId, t as clickClackSetupWizard, u as createClickClackClient, y as listEnabledClickClackAccounts } from "./setup-surface-BBl3rvVx.mjs";
+import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-BKkzzjBA.mjs";
 import { resolveChannelMediaMaxBytes } from "openclaw/plugin-sdk/account-helpers";
 import { parseDateStringTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildChannelOutboundSessionRoute, buildThreadAwareOutboundSessionRoute, createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
-import { buildChannelProgressDraftLine, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, deriveDurableFinalDeliveryRequirements } from "openclaw/plugin-sdk/channel-outbound";
+import { buildChannelProgressDraftLine, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, deriveDurableFinalDeliveryRequirements, formatChannelProgressDraftLineForEntry, isCompleteAgentPreamble } from "openclaw/plugin-sdk/channel-outbound";
 import { createComputedAccountStatusAdapter, createDefaultChannelRuntimeState } from "openclaw/plugin-sdk/status-helpers";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { channelReadyPatch, channelStoppedPatch } from "openclaw/plugin-sdk/gateway-runtime";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { rawDataToString } from "openclaw/plugin-sdk/webhook-ingress";
-import { resolveStableChannelMessageIngress } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { createHash, randomUUID } from "node:crypto";
+import { truncateCodePoints } from "openclaw/plugin-sdk/text-utility-runtime";
 import { buildMentionRegexes, normalizeMentionText } from "openclaw/plugin-sdk/channel-mention-gating";
 import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
 import { listNativeCommandSpecsForConfig } from "openclaw/plugin-sdk/native-command-registry";
-import { buildChannelInboundEventContext, createChannelInboundEnvelopeBuilder, recordChannelBotPairLoopAndCheckSuppression } from "openclaw/plugin-sdk/channel-inbound";
+import { buildChannelInboundEventContext, createChannelInboundEnvelopeBuilder, createChannelPartialDeliveryError, recordChannelBotPairLoopAndCheckSuppression } from "openclaw/plugin-sdk/channel-inbound";
 import { extensionForMime } from "openclaw/plugin-sdk/media-mime";
 import { loadOutboundMediaFromUrl } from "openclaw/plugin-sdk/outbound-media";
 import { FormatCapabilityProfile, renderMarkdownWithMarkers, sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
 //#region extensions/clickclack/src/discussions/binding-generation.ts
-const DISCUSSION_GENERATIONS_NAMESPACE = "discussion-binding-generations";
-const MAX_PENDING_DISCUSSION_GENERATIONS = 1e4;
+const GENERATION_STORE_OPTIONS = {
+	namespace: "discussion-binding-generations",
+	maxEntries: 1e4,
+	overflowPolicy: "reject-new"
+};
 const storesByRuntime$2 = /* @__PURE__ */ new WeakMap();
-function getGenerationStore(runtime) {
-	const existing = storesByRuntime$2.get(runtime);
-	if (existing) return existing;
-	const created = runtime.state.openSyncKeyedStore({
-		namespace: DISCUSSION_GENERATIONS_NAMESPACE,
-		maxEntries: MAX_PENDING_DISCUSSION_GENERATIONS,
-		overflowPolicy: "reject-new"
+function withGenerationStore(runtime, run) {
+	let owner = storesByRuntime$2.get(runtime);
+	if (!owner) {
+		const store = runtime.state.openKeyedStore(GENERATION_STORE_OPTIONS);
+		owner = {
+			store,
+			...!store.observe || !store.compareAndApply ? { native: runtime.state.openSyncKeyedStore(GENERATION_STORE_OPTIONS) } : {},
+			tail: Promise.resolve()
+		};
+		storesByRuntime$2.set(runtime, owner);
+	}
+	const currentOwner = owner;
+	const current = owner.tail.then(() => run(currentOwner));
+	owner.tail = current.then(() => void 0, () => void 0);
+	return current;
+}
+function mutateGeneration(runtime, sessionKey, decide) {
+	return withGenerationStore(runtime, async ({ store, native }) => {
+		if (native) {
+			const current = native.lookup(sessionKey);
+			const next = decide(current);
+			if (next.value !== current) {
+				if (next.value) native.register(sessionKey, next.value);
+				else native.delete(sessionKey);
+			}
+			return next.result;
+		}
+		const { observe, compareAndApply } = store;
+		if (!observe || !compareAndApply) throw new Error("ClickClack generation comparison capabilities changed");
+		let observed = await observe(sessionKey);
+		for (;;) {
+			const next = decide(observed.value);
+			const outcome = await compareAndApply(sessionKey, observed.comparison, next.value === observed.value ? {
+				operation: "update",
+				action: "keep"
+			} : next.value ? {
+				operation: "update",
+				action: "set",
+				value: next.value
+			} : {
+				operation: "delete",
+				action: "delete"
+			});
+			if (outcome.status !== "conflict") return next.result;
+			observed = outcome.current;
+		}
 	});
-	storesByRuntime$2.set(runtime, created);
-	return created;
 }
 /** Reserves a generation so an interrupted channel create can be adopted on retry. */
 function reserveDiscussionBindingGeneration(params) {
-	const store = getGenerationStore(params.runtime);
-	const existing = store.lookup(params.sessionKey);
-	const existingAccountId = existing?.accountId ?? existing?.pending?.accountId;
-	const existingCredentialFingerprint = existing?.credentialFingerprint ?? existing?.pending?.credentialFingerprint;
-	if (existing?.destinationIdentity === params.destinationIdentity && existingAccountId === params.accountId && existingCredentialFingerprint === params.credentialFingerprint) {
-		if (!existing.accountId || !existing.credentialFingerprint) store.register(params.sessionKey, {
-			...existing,
-			accountId: params.accountId,
-			credentialFingerprint: params.credentialFingerprint
-		});
-		return existing.generation;
-	}
-	const generation = (params.createGeneration ?? randomUUID)();
-	store.register(params.sessionKey, {
-		accountId: params.accountId,
-		credentialFingerprint: params.credentialFingerprint,
-		destinationIdentity: params.destinationIdentity,
-		generation
+	let generation;
+	return mutateGeneration(params.runtime, params.sessionKey, (existing) => {
+		const existingAccountId = existing?.accountId ?? existing?.pending?.accountId;
+		const existingCredentialFingerprint = existing?.credentialFingerprint ?? existing?.pending?.credentialFingerprint;
+		if (existing?.destinationIdentity === params.destinationIdentity && existingAccountId === params.accountId && existingCredentialFingerprint === params.credentialFingerprint) return {
+			value: existing.accountId && existing.credentialFingerprint ? existing : {
+				...existing,
+				accountId: params.accountId,
+				credentialFingerprint: params.credentialFingerprint
+			},
+			result: existing.generation
+		};
+		generation ??= (params.createGeneration ?? randomUUID)();
+		return {
+			value: {
+				accountId: params.accountId,
+				credentialFingerprint: params.credentialFingerprint,
+				destinationIdentity: params.destinationIdentity,
+				generation
+			},
+			result: generation
+		};
 	});
-	return generation;
 }
 /** Clears only the completed reservation; future opens must mint a new ownership ref. */
 function clearDiscussionBindingGeneration(params) {
-	const store = getGenerationStore(params.runtime);
-	const existing = store.lookup(params.sessionKey);
-	if (!existing) return;
-	if (params.expectedGeneration && existing.generation !== params.expectedGeneration) return;
-	store.delete(params.sessionKey);
+	return mutateGeneration(params.runtime, params.sessionKey, (existing) => ({
+		value: existing && params.expectedGeneration && existing.generation !== params.expectedGeneration ? existing : void 0,
+		result: void 0
+	}));
 }
 /** Quarantines a destination before the first fallible channel create. */
 function recordPendingDiscussionOpen(params) {
-	const store = getGenerationStore(params.runtime);
-	const existing = store.lookup(params.sessionKey);
-	if (!existing || existing.generation !== params.generation) throw new Error("ClickClack discussion generation changed before channel creation");
-	if (existing.accountId !== params.pending.accountId || existing.credentialFingerprint !== params.pending.credentialFingerprint) throw new Error("ClickClack discussion ownership changed before channel creation");
-	store.register(params.sessionKey, {
-		...existing,
-		pending: params.pending
+	return mutateGeneration(params.runtime, params.sessionKey, (existing) => {
+		if (!existing || existing.generation !== params.generation) throw new Error("ClickClack discussion generation changed before channel creation");
+		if (existing.accountId !== params.pending.accountId || existing.credentialFingerprint !== params.pending.credentialFingerprint) throw new Error("ClickClack discussion ownership changed before channel creation");
+		return {
+			value: {
+				...existing,
+				pending: params.pending
+			},
+			result: void 0
+		};
 	});
 }
 function listPendingDiscussionOpens(runtime) {
-	return getGenerationStore(runtime).entries().flatMap((entry) => entry.value.pending ? [{
+	return withGenerationStore(runtime, async ({ store }) => (await store.entries()).flatMap((entry) => entry.value.pending ? [{
 		sessionKey: entry.key,
 		generation: entry.value.generation,
 		...entry.value.pending
-	}] : []);
+	}] : []));
 }
 /** Stops destination-wide quarantine after the exact remote channel is known. */
 function clearPendingDiscussionOpen(params) {
-	const store = getGenerationStore(params.runtime);
-	const existing = store.lookup(params.sessionKey);
-	if (!existing || existing.generation !== params.expectedGeneration || !existing.pending) return;
-	store.register(params.sessionKey, {
-		accountId: existing.accountId ?? existing.pending.accountId,
-		credentialFingerprint: existing.credentialFingerprint ?? existing.pending.credentialFingerprint,
-		destinationIdentity: existing.destinationIdentity,
-		generation: existing.generation
+	return mutateGeneration(params.runtime, params.sessionKey, (existing) => {
+		if (!existing || existing.generation !== params.expectedGeneration || !existing.pending) return {
+			value: existing,
+			result: void 0
+		};
+		return {
+			value: {
+				accountId: existing.accountId ?? existing.pending.accountId,
+				credentialFingerprint: existing.credentialFingerprint ?? existing.pending.credentialFingerprint,
+				destinationIdentity: existing.destinationIdentity,
+				generation: existing.generation
+			},
+			result: void 0
+		};
 	});
 }
-function hasPendingDiscussionOpenForDestination(params) {
+async function hasPendingDiscussionOpenForDestination(params) {
 	const serverBaseUrl = params.serverBaseUrl.replace(/\/+$/u, "");
-	return listPendingDiscussionOpens(params.runtime).some((pending) => pending.serverBaseUrl === serverBaseUrl && pending.workspaceId === params.workspaceId);
+	return (await listPendingDiscussionOpens(params.runtime)).some((pending) => pending.serverBaseUrl === serverBaseUrl && pending.workspaceId === params.workspaceId);
 }
 //#endregion
 //#region extensions/clickclack/src/discussions/naming.ts
@@ -118,7 +169,7 @@ function resolveDiscussionLabel(entry, sessionKey, agentId) {
 	return entry.label?.trim() || entry.displayName?.trim() || entry.subject?.trim() || fallbackDiscussionLabel(sessionKey, agentId);
 }
 function truncateDiscussionDisplayTitle(label) {
-	return Array.from(label).slice(0, 200).join("").trim();
+	return truncateCodePoints(label, 200).trim();
 }
 function slugifyDiscussionLabel(label, sessionKey) {
 	return slugifyLabel(label) || fallbackDiscussionLabel(sessionKey);
@@ -217,7 +268,7 @@ var ClickClackDiscussionBindingStore = class {
 		return this.#store.lookup(sessionKey);
 	}
 	hasCapacity(sessionKey) {
-		return this.get(sessionKey) !== void 0 || this.#store.entries().length < MAX_DISCUSSION_BINDINGS;
+		return this.get(sessionKey) !== void 0 || this.count() < MAX_DISCUSSION_BINDINGS;
 	}
 	getByChannel(serverBaseUrl, channelId) {
 		const key = channelKey(serverBaseUrl, channelId);
@@ -260,6 +311,9 @@ var ClickClackDiscussionBindingStore = class {
 			binding: entry.value
 		}));
 	}
+	count() {
+		return this.#store.count?.() ?? this.#store.entries().length;
+	}
 	detachedCount() {
 		return this.#detachedAtBySession.size;
 	}
@@ -398,14 +452,19 @@ function isClickClackDiscussionChannelRevoked(params) {
 }
 //#endregion
 //#region extensions/clickclack/src/discussions/routing.ts
-function resolveClickClackDiscussionRoute(params) {
-	if (isClickClackDiscussionChannelRevoked(params)) return { state: "revoked" };
+async function resolveClickClackDiscussionRoute(params) {
 	const store = getClickClackDiscussionBindingStore(params.runtime);
-	const matched = store.getByChannel(params.serverBaseUrl, params.channelId);
-	if (!matched) return { state: hasPendingDiscussionOpenForDestination(params) ? "revoked" : "unbound" };
+	let matched = store.getByChannel(params.serverBaseUrl, params.channelId);
+	let pending = false;
+	if (!matched) {
+		pending = await hasPendingDiscussionOpenForDestination(params);
+		matched = store.getByChannel(params.serverBaseUrl, params.channelId);
+	}
+	if (isClickClackDiscussionChannelRevoked(params)) return { state: "revoked" };
+	if (!matched) return { state: pending ? "revoked" : "unbound" };
 	if (matched.binding.accountId !== params.accountId) return { state: "revoked" };
 	if (matched.binding.serverBaseUrl !== params.serverBaseUrl.replace(/\/+$/u, "")) return { state: "revoked" };
-	if (resolveDiscussionBindingAccount(params.config, matched.binding).state !== "active") return { state: "revoked" };
+	if (resolveDiscussionBindingAccount(params.runtime.config.current(), matched.binding).state !== "active") return { state: "revoked" };
 	let binding;
 	try {
 		binding = attachBindingToCurrentActiveSession({
@@ -618,10 +677,6 @@ function looksLikeClickClackTarget(raw) {
 }
 //#endregion
 //#region extensions/clickclack/src/access.ts
-/**
-* Maps ClickClack senders and conversations onto the shared channel ingress
-* allowlist/command authorization contract.
-*/
 const CHANNEL_ID$2 = "clickclack";
 function normalizeClickClackUserId(value) {
 	const trimmed = value.trim();
@@ -680,7 +735,7 @@ function resolveAccountAgentRoute(params) {
 		lastRoutePolicy: sessionKey === mainSessionKey ? "main" : "session"
 	};
 }
-function resolvePreparedInboundRoute(params) {
+async function resolvePreparedInboundRoute(params) {
 	const runtime = getClickClackRuntime();
 	const isDirect = Boolean(params.message.direct_conversation_id);
 	const target = buildClickClackTarget(isDirect ? {
@@ -698,9 +753,8 @@ function resolvePreparedInboundRoute(params) {
 		target,
 		isDirect
 	});
-	const discussionResolution = !isDirect && params.message.channel_id ? resolveClickClackDiscussionRoute({
+	const discussionResolution = !isDirect && params.message.channel_id ? await resolveClickClackDiscussionRoute({
 		runtime,
-		config: params.config,
 		accountId: params.account.accountId,
 		serverBaseUrl: params.account.baseUrl,
 		workspaceId: params.message.workspace_id,
@@ -727,7 +781,7 @@ function resolvePreparedInboundRoute(params) {
 async function resolveClickClackInboundAccess(params) {
 	const runtime = getClickClackRuntime();
 	const cfg = params.config;
-	const preparedRoute = resolvePreparedInboundRoute(params);
+	const preparedRoute = await resolvePreparedInboundRoute(params);
 	const shouldCheckCommand = runtime.channel.commands.shouldComputeCommandAuthorized(params.message.body, cfg);
 	const effectiveGroupPolicy = resolveClickClackGroupPolicy({
 		account: params.account,
@@ -782,7 +836,7 @@ async function resolveClickClackInboundAccess(params) {
 		surface: CHANNEL_ID$2,
 		commandSource: "text"
 	});
-	const resolved = await resolveStableChannelMessageIngress({
+	const resolved = await runtime.channel.inbound.ingress.resolveStable({
 		channelId: CHANNEL_ID$2,
 		accountId: params.account.accountId,
 		identity: clickClackIngressIdentity,
@@ -795,6 +849,7 @@ async function resolveClickClackInboundAccess(params) {
 		contextBinding: {
 			agentId: preparedRoute.route.agentId,
 			sessionKey: preparedRoute.route.sessionKey,
+			nativeChannelId: params.message.channel_id || params.message.direct_conversation_id,
 			messageId: params.message.id,
 			inboundEventKind: "user_request"
 		},
@@ -827,9 +882,6 @@ const CLICKCLACK_COMMAND_PATTERN = /^[a-z0-9_-]{1,32}$/u;
 const CLICKCLACK_MAX_COMMANDS = 100;
 const CLICKCLACK_MAX_DESCRIPTION_LENGTH = 100;
 const CLICKCLACK_MAX_ARGS_HINT_LENGTH = 100;
-function truncateCodePoints(value, maxLength) {
-	return Array.from(value).slice(0, maxLength).join("");
-}
 function commandArgsHint(spec) {
 	if (spec.args?.length) return truncateCodePoints(spec.args.map((arg) => arg.required ? `<${arg.name}>` : `[${arg.name}]`).join(" "), CLICKCLACK_MAX_ARGS_HINT_LENGTH);
 	return spec.acceptsArgs ? "[args]" : "";
@@ -937,7 +989,7 @@ function commentaryBody(payload) {
 	return text;
 }
 function activityBody(payload) {
-	const line = buildChannelProgressDraftLine({
+	const line = formatChannelProgressDraftLineForEntry(void 0, {
 		event: "item",
 		itemId: payload.itemId,
 		toolCallId: payload.toolCallId,
@@ -950,7 +1002,7 @@ function activityBody(payload) {
 		progressText: payload.progressText,
 		meta: payload.meta,
 		commandBearing: payload.commandBearing
-	})?.text?.trim();
+	})?.trim();
 	if (line) return line;
 	const head = payload.name?.trim() || payload.title?.trim();
 	const text = payload.progressText?.trim() || payload.summary?.trim();
@@ -1008,9 +1060,19 @@ function createClickClackActivityPublisher(params) {
 	};
 	const handleCommentary = (payload) => {
 		const body = commentaryBody(payload);
-		if (!body.trim()) return;
 		const key = payload.itemId?.trim() || "turn";
 		let segment = commentaryByItem.get(key);
+		if (!body.trim()) {
+			if (segment) {
+				clearTimeout(segment.timer);
+				commentaryByItem.delete(key);
+				const retracted = segment;
+				enqueue(async () => {
+					if (retracted.messageId) await params.client.updateMessageBody(retracted.messageId, "");
+				});
+			}
+			return;
+		}
 		if (!segment) {
 			segment = {
 				body: "",
@@ -1018,7 +1080,7 @@ function createClickClackActivityPublisher(params) {
 			};
 			commentaryByItem.set(key, segment);
 		}
-		if (body.length < segment.body.length || body === segment.body) return;
+		if (body === segment.body) return;
 		segment.body = body;
 		segment.dirty = true;
 		if (!segment.timer) segment.timer = setTimeout(() => {
@@ -1027,9 +1089,7 @@ function createClickClackActivityPublisher(params) {
 		}, flushMs);
 	};
 	const toolRowKey = (payload) => {
-		const toolCallId = payload.toolCallId?.trim();
-		if (toolCallId) return toolCallId;
-		return (payload.itemId?.trim() ?? "").replace(/^(tool|command):/, "");
+		return payload.itemId?.trim() || payload.toolCallId?.trim() || "";
 	};
 	const handleDiscreteItem = (payload) => {
 		const body = activityBody(payload);
@@ -1048,7 +1108,7 @@ function createClickClackActivityPublisher(params) {
 			});
 			return;
 		}
-		if (body.length <= existing.body.length) return;
+		if (body === existing.body) return;
 		existing.body = body;
 		enqueue(async () => {
 			if (existing.messageId && existing.body !== existing.sentBody) {
@@ -1059,6 +1119,18 @@ function createClickClackActivityPublisher(params) {
 	};
 	return {
 		onItemEvent: (payload) => {
+			if (payload.hideFromChannelProgress || payload.suppressChannelProgress || payload.suppressDurableProgress) {
+				const key = toolRowKey(payload);
+				const row = key ? toolRows.get(`agent_tool:${key}`) : void 0;
+				if (row) {
+					toolRows.delete(`agent_tool:${key}`);
+					enqueue(async () => {
+						if (row.messageId) await params.client.updateMessageBody(row.messageId, "");
+					});
+				}
+				return false;
+			}
+			if (payload.kind === "preamble" && !isCompleteAgentPreamble(payload)) return false;
 			const kind = normalizedItemKind(payload);
 			if (STREAMING_COMMENTARY_ITEM_KINDS.has(kind)) {
 				handleCommentary(payload);
@@ -1107,6 +1179,7 @@ async function createTargetMessage(params) {
 	const replyToId = params.replyToId == null ? "" : String(params.replyToId);
 	if (explicitThreadId || parsed.kind === "thread") {
 		const rootId = explicitThreadId || parsed.id;
+		params.assertDirectAdapterHandoff?.();
 		await params.onPlatformSendDispatch?.();
 		return await params.client.createThreadReply(rootId, params.text, {
 			provenance: params.provenance,
@@ -1114,14 +1187,16 @@ async function createTargetMessage(params) {
 		});
 	}
 	if (parsed.kind === "dm") {
-		await params.onPlatformSendDispatch?.();
 		const dm = await params.client.createDirectConversation(params.workspaceId, [parsed.id]);
+		params.assertDirectAdapterHandoff?.();
+		await params.onPlatformSendDispatch?.();
 		return await params.client.createDirectMessage(dm.id, params.text, {
 			quotedMessageId: replyToId || void 0,
 			nonce: params.nonce
 		});
 	}
 	const channelId = await resolveChannelId(params.client, params.workspaceId, parsed.id);
+	params.assertDirectAdapterHandoff?.();
 	await params.onPlatformSendDispatch?.();
 	return await params.client.createChannelMessage(channelId, params.text, {
 		provenance: params.provenance,
@@ -1146,21 +1221,15 @@ function textDeliveryNonce(params) {
 	const digest = durableDeliveryDigest(params);
 	return digest ? `openclaw-text:${digest}` : void 0;
 }
-function createDispatchOnce(onPlatformSendDispatch) {
-	let dispatched = false;
-	return async () => {
-		if (dispatched) return;
-		await onPlatformSendDispatch?.();
-		dispatched = true;
-	};
-}
 async function attachUploadRetrySafe(params) {
 	try {
 		await params.client.attachUpload(params.messageId, params.uploadId);
 	} catch (firstError) {
+		params.assertDirectAdapterHandoff?.();
 		try {
 			if ((await params.client.message(params.messageId)).attachments?.some((attachment) => attachment.id === params.uploadId)) return;
 		} catch {}
+		params.assertDirectAdapterHandoff?.();
 		try {
 			await params.client.attachUpload(params.messageId, params.uploadId);
 		} catch {
@@ -1173,12 +1242,18 @@ function createOutboundContext(params) {
 		cfg: params.cfg,
 		accountId: params.accountId
 	});
+	const assertDirectAdapterHandoff = params.assertDirectAdapterHandoff;
+	const fetcher = fetch;
 	return {
 		account,
 		client: createClickClackClient({
 			baseUrl: account.apiEndpoint,
 			token: account.token,
-			correlationId: params.correlationId
+			correlationId: params.correlationId,
+			fetch: assertDirectAdapterHandoff ? (input, init) => {
+				assertDirectAdapterHandoff();
+				return fetcher(input, init);
+			} : void 0
 		})
 	};
 }
@@ -1190,11 +1265,9 @@ async function sendClickClackText(params) {
 	const text = renderClickClackMarkdown(sanitizeAssistantVisibleText(params.text));
 	if (!text) return;
 	const { account, client } = createOutboundContext(params);
-	const workspaceId = await resolveWorkspaceId(client, account.workspace);
-	const dispatch = createDispatchOnce(params.onPlatformSendDispatch);
 	return (await createTargetMessage({
 		client,
-		workspaceId,
+		workspaceId: await resolveWorkspaceId(client, account.workspace),
 		to: params.to,
 		text,
 		threadId: params.threadId,
@@ -1204,7 +1277,8 @@ async function sendClickClackText(params) {
 			deliveryQueueId: params.deliveryQueueId,
 			deliveryPartIndex: params.deliveryPartIndex
 		}),
-		onPlatformSendDispatch: dispatch
+		onPlatformSendDispatch: params.onPlatformSendDispatch,
+		assertDirectAdapterHandoff: params.assertDirectAdapterHandoff
 	})).id;
 }
 /** Resolves, uploads, sends, then attaches one file to a ClickClack message. */
@@ -1226,12 +1300,10 @@ async function sendClickClackMedia(params) {
 		mediaReadFile: params.mediaReadFile
 	});
 	const workspaceId = await resolveWorkspaceId(client, account.workspace);
-	const persistedUpload = nonces.upload ? await client.findUploadByNonce({
+	let upload = nonces.upload ? await client.findUploadByNonce({
 		workspaceId,
 		nonce: nonces.upload
 	}) : void 0;
-	const dispatch = createDispatchOnce(params.onPlatformSendDispatch);
-	let upload = persistedUpload;
 	let mediaFilename = preloadedMedia?.fileName?.trim();
 	if (!upload) {
 		const media = preloadedMedia ?? await loadOutboundMediaFromUrl(params.mediaUrl, {
@@ -1243,7 +1315,6 @@ async function sendClickClackMedia(params) {
 		const contentType = media.contentType?.trim() || "application/octet-stream";
 		const filename = media.fileName?.trim() || `attachment${extensionForMime(contentType) ?? ""}`;
 		mediaFilename = filename;
-		await dispatch();
 		upload = await client.createUpload({
 			workspaceId,
 			buffer: media.buffer,
@@ -1261,13 +1332,36 @@ async function sendClickClackMedia(params) {
 		threadId: params.threadId,
 		replyToId: params.replyToId,
 		nonce: nonces.message,
-		onPlatformSendDispatch: dispatch
+		onPlatformSendDispatch: params.onPlatformSendDispatch,
+		assertDirectAdapterHandoff: params.assertDirectAdapterHandoff
 	});
-	await attachUploadRetrySafe({
-		client,
-		messageId: message.id,
-		uploadId: upload.id
+	const receipt = createMessageReceiptFromOutboundResults({
+		results: [{
+			channel: "clickclack",
+			messageId: message.id
+		}],
+		threadId: params.threadId == null ? void 0 : String(params.threadId),
+		replyToId: params.replyToId == null ? void 0 : String(params.replyToId),
+		kind: "text"
 	});
+	try {
+		await params.onDeliveryResult?.({
+			messageId: message.id,
+			receipt
+		});
+		await attachUploadRetrySafe({
+			client,
+			messageId: message.id,
+			uploadId: upload.id,
+			assertDirectAdapterHandoff: params.assertDirectAdapterHandoff
+		});
+	} catch (error) {
+		throw createChannelPartialDeliveryError(error, {
+			visibleReplySent: true,
+			messageIds: [message.id],
+			receipt
+		});
+	}
 	return message.id;
 }
 function collectReconciliationMediaUrls(ctx) {
@@ -1387,6 +1481,7 @@ function normalizedKind(payload) {
 	return kind;
 }
 function progressText(payload) {
+	if (payload.kind !== "preamble" && payload.title) return payload.title;
 	const line = buildChannelProgressDraftLine({
 		event: "item",
 		itemId: payload.itemId,
@@ -1410,21 +1505,11 @@ function isFinal(payload) {
 	return phase === "end" || status === "completed" || status === "failed" || status === "blocked";
 }
 function createLineIdResolver() {
-	const lineIdsByIdentity = /* @__PURE__ */ new Map();
 	const anonymousLinesByKind = /* @__PURE__ */ new Map();
 	let anonymousSequence = 0;
 	return (payload) => {
-		const identities = [payload.itemId?.replace(/^(tool|command):/, ""), payload.toolCallId].map((value) => value?.trim()).filter((value) => Boolean(value));
-		const existingId = identities.map((identity) => lineIdsByIdentity.get(identity)).find(Boolean);
-		if (existingId) {
-			for (const identity of identities) lineIdsByIdentity.set(identity, existingId);
-			return existingId;
-		}
-		if (identities.length > 0) {
-			const id = `item:${identities[0]}`;
-			for (const identity of identities) lineIdsByIdentity.set(identity, id);
-			return id;
-		}
+		const identity = payload.itemId?.trim() || payload.toolCallId?.trim();
+		if (identity) return `item:${identity}`;
 		const kind = normalizedKind(payload);
 		const anonymousLines = anonymousLinesByKind.get(kind) ?? [];
 		const line = (payload.phase?.trim().toLowerCase() === "start" ? void 0 : anonymousLines.toReversed().find((line) => line.active)) ?? (() => {
@@ -1551,7 +1636,19 @@ function createClickClackAgentProgressPublisher(params) {
 		},
 		onItemEvent(payload) {
 			if (!started || cleared) return false;
+			if (payload.suppressChannelProgress || payload.kind === "preamble" && !isCompleteAgentPreamble(payload)) return false;
 			const id = resolveLineId(payload);
+			if (payload.hideFromChannelProgress) {
+				if (seenLines.delete(id)) enqueueLine(id, {
+					op: "update",
+					line: {
+						id,
+						kind: normalizedKind(payload),
+						text: ""
+					}
+				});
+				return false;
+			}
 			const final = isFinal(payload);
 			const kind = normalizedKind(payload);
 			const retractsExistingCommentary = kind === "commentary" && seenLines.has(id) && payload.progressText !== void 0 && payload.progressText.trim() === "";
@@ -1564,7 +1661,7 @@ function createClickClackAgentProgressPublisher(params) {
 				id,
 				kind,
 				text: retractsExistingCommentary ? "" : progressText(payload),
-				status: payload.status?.trim() || (final ? "completed" : "running")
+				status: payload.status?.trim() || (final ? "blocked" : "running")
 			};
 			if (payload.name?.trim()) line.tool_name = payload.name.trim();
 			enqueueLine(id, {
@@ -2122,7 +2219,8 @@ const clickClackMessageAdapter = defineChannelMessageAdapter({
 				replyToId: ctx.replyToId,
 				deliveryQueueId: ctx.deliveryQueueId,
 				deliveryPartIndex: ctx.deliveryPartIndex,
-				onPlatformSendDispatch: ctx.onPlatformSendDispatch
+				onPlatformSendDispatch: ctx.onPlatformSendDispatch,
+				assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff
 			});
 			const threadId = ctx.threadId == null ? void 0 : String(ctx.threadId);
 			const replyToId = ctx.replyToId ?? void 0;
@@ -2153,7 +2251,9 @@ const clickClackMessageAdapter = defineChannelMessageAdapter({
 				replyToId: ctx.replyToId,
 				deliveryQueueId: ctx.deliveryQueueId,
 				deliveryPartIndex: ctx.deliveryPartIndex,
-				onPlatformSendDispatch: ctx.onPlatformSendDispatch
+				onPlatformSendDispatch: ctx.onPlatformSendDispatch,
+				assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
+				onDeliveryResult: ctx.onDeliveryResult
 			});
 			const threadId = ctx.threadId == null ? void 0 : String(ctx.threadId);
 			const replyToId = ctx.replyToId ?? void 0;
@@ -2264,7 +2364,7 @@ const clickClackPlugin = createChatChannelPlugin({
 		base: { deliveryMode: "direct" },
 		attachedResults: {
 			channel: CHANNEL_ID,
-			sendText: async ({ cfg, to, text, accountId, threadId, replyToId, deliveryQueueId, deliveryPartIndex, onPlatformSendDispatch }) => {
+			sendText: async ({ cfg, to, text, accountId, threadId, replyToId, deliveryQueueId, deliveryPartIndex, onPlatformSendDispatch, assertDirectAdapterHandoff }) => {
 				return { messageId: await sendClickClackText({
 					cfg,
 					accountId,
@@ -2274,10 +2374,11 @@ const clickClackPlugin = createChatChannelPlugin({
 					replyToId,
 					deliveryQueueId,
 					deliveryPartIndex,
-					onPlatformSendDispatch
+					onPlatformSendDispatch,
+					assertDirectAdapterHandoff
 				}) ?? "" };
 			},
-			sendMedia: async ({ cfg, to, text, mediaUrl, mediaAccess, mediaLocalRoots, mediaReadFile, accountId, threadId, replyToId, deliveryQueueId, deliveryPartIndex, onPlatformSendDispatch }) => {
+			sendMedia: async ({ cfg, to, text, mediaUrl, mediaAccess, mediaLocalRoots, mediaReadFile, accountId, threadId, replyToId, deliveryQueueId, deliveryPartIndex, onPlatformSendDispatch, assertDirectAdapterHandoff, onDeliveryResult }) => {
 				if (!mediaUrl) throw new Error("ClickClack media send requires mediaUrl");
 				return { messageId: await sendClickClackMedia({
 					cfg,
@@ -2292,7 +2393,13 @@ const clickClackPlugin = createChatChannelPlugin({
 					replyToId,
 					deliveryQueueId,
 					deliveryPartIndex,
-					onPlatformSendDispatch
+					onPlatformSendDispatch,
+					assertDirectAdapterHandoff,
+					onDeliveryResult: onDeliveryResult ? ({ messageId: acceptedMessageId, receipt }) => onDeliveryResult({
+						channel: CHANNEL_ID,
+						messageId: acceptedMessageId,
+						receipt
+					}) : void 0
 				}) };
 			}
 		}