@openclaw/clickclack 2026.9.7 → 2026.10.1-beta.1

package/dist/.setup/{channel-Bcwtohk7.mjs → channel-DI3hKiSg.mjs}

@@ -1,11 +1,11 @@
 import { n as __reExport, t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { c as CLICKCLACK_CHANNEL_ID, d as DEFAULT_ACCOUNT_ID, f as isClickClackAccountCurrent, g as resolveClickClackAccountConfig, h as resolveClickClackAccount, l as clickClackConfigAdapter, m as listEnabledClickClackAccounts, n as clickClackSetupContract, s as clickClackConfigSchema, t as clickClackSetupWizard, u as clickClackMeta } from "./setup-surface-BW1Q06w5.mjs";
-import { i as createClickClackClient, n as resolveWorkspaceId, o as normalizeClickClackCorrelationId, r as ClickClackHttpError, t as resolveChannelId } from "./resolve-BHGLohni.mjs";
-import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-BKkzzjBA.mjs";
+import { c as CLICKCLACK_CHANNEL_ID, d as DEFAULT_ACCOUNT_ID, f as isClickClackAccountCurrent, g as resolveClickClackAccountConfig, h as resolveClickClackAccount, l as clickClackConfigAdapter, m as listEnabledClickClackAccounts, n as clickClackSetupContract, s as clickClackConfigSchema, t as clickClackSetupWizard, u as clickClackMeta } from "./setup-surface-DcF_7-VV.mjs";
+import { a as createClickClackClient, i as ClickClackHttpError, n as resolveChannelId, r as resolveWorkspaceId, s as normalizeClickClackCorrelationId } from "./resolve-DPtjHQHt.mjs";
+import { n as collectRuntimeConfigAssignments, r as secretTargetRegistryEntries } from "./secret-contract-CF7TKtkU.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 { normalizeTrimmedStringList, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildChannelOutboundSessionRoute, buildThreadAwareOutboundSessionRoute, createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { buildChannelProgressDraftLine, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, deriveDurableFinalDeliveryRequirements, formatChannelProgressDraftLineForEntry, isCompleteAgentPreamble } from "openclaw/plugin-sdk/channel-outbound";
 import { createComputedAccountStatusAdapter, createDefaultChannelRuntimeState } from "openclaw/plugin-sdk/status-helpers";
@@ -18,13 +18,15 @@ import { parseAccessGroupAllowFromEntry } from "openclaw/plugin-sdk/access-group
 import { formatNormalizedAllowFromEntries, resolveAllowlistMatchByCandidates } from "openclaw/plugin-sdk/allow-from";
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
 import { createHash, randomUUID } from "node:crypto";
+import { createAsyncLock } from "openclaw/plugin-sdk/async-lock-runtime";
 import { truncateCodePoints } from "openclaw/plugin-sdk/text-utility-runtime";
 import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
 import { listNativeCommandSpecsForConfig } from "openclaw/plugin-sdk/native-command-registry";
 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";
+import { sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
+import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 //#region src/channels/mention-gating.ts
 function resolveBotThreadMentionPolicy(params) {
 	if (!params.isBotOwnedThread || params.requireMentionInBotThreads === void 0) return {
@@ -56,14 +58,12 @@ function withGenerationStore(runtime, run) {
 		owner = {
 			store,
 			...!store.observe || !store.compareAndApply ? { native: runtime.state.openSyncKeyedStore(GENERATION_STORE_OPTIONS) } : {},
-			tail: Promise.resolve()
+			withLock: createAsyncLock()
 		};
 		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;
+	return currentOwner.withLock(() => run(currentOwner));
 }
 function mutateGeneration(runtime, sessionKey, decide) {
 	return withGenerationStore(runtime, async ({ store, native }) => {
@@ -248,12 +248,7 @@ function attachBindingToCurrentActiveSession(params) {
 		readConsistency: "latest"
 	});
 	if (!entry?.sessionId || entry.archivedAt !== void 0) return;
-	if (entry.sessionId === params.binding.sessionId) {
-		if (params.binding.detachedAt === void 0) return params.binding;
-		const { detachedAt: _detachedAt, ...attached } = params.binding;
-		params.store.set(params.sessionKey, attached);
-		return attached;
-	}
+	if (entry.sessionId === params.binding.sessionId && params.binding.detachedAt === void 0) return params.binding;
 	const { detachedAt: _detachedAt, ...retained } = params.binding;
 	const attached = {
 		...retained,
@@ -546,12 +541,6 @@ function resolveClickClackGroupPolicy(params) {
 }
 //#endregion
 //#region extensions/clickclack/src/mention-facts.ts
-/**
-* Detects whether a ClickClack group message contains a direct mention of the
-* current account.
-*
-* Pure helper – no side effects, no runtime imports.
-*/
 const CLICKCLACK_MENTION_PATTERN = /(?:^|[^a-z0-9_@-])@([a-z0-9][a-z0-9_-]{1,31})(?![a-z0-9_-])/giu;
 function buildLocalMentionRegexes(params) {
 	if (params.mentionPatterns.length === 0) return [];
@@ -574,18 +563,6 @@ function buildLocalMentionRegexes(params) {
 function resolveMentionHandles(body) {
 	return [...body.matchAll(CLICKCLACK_MENTION_PATTERN)].map((match) => match[1]?.toLowerCase()).filter((handle) => Boolean(handle));
 }
-/**
-* Builds mention facts for a ClickClack message.
-*
-* Rules:
-* - DMs always have canDetectMention: false, wasMentioned: false
-*   (DMs bypass mention gating).
-* - Group messages: canDetectMention: true when body text is available.
-* - Checks the message body against shared and account-local mention patterns.
-* - If botHandle is provided and the message body contains its ClickClack
-*   `@handle`, treat it as a mention.
-* - Shared patterns default to the routed agent's identity name when none are configured.
-*/
 function resolveClickClackMentionFacts(params) {
 	const { isDirect, body, mentionPatterns, botHandle, cfg, agentId, channelId } = params;
 	if (isDirect) return {
@@ -783,10 +760,6 @@ async function resolvePreparedInboundRoute(params) {
 		revoked: discussionResolution.state === "revoked"
 	};
 }
-/**
-* Resolves whether a ClickClack message should enter the agent pipeline and
-* whether its command-style body may run tools.
-*/
 async function resolveClickClackInboundAccess(params) {
 	const runtime = getClickClackRuntime();
 	const rootPolicyConfigured = resolveClickClackGroupPolicy({
@@ -1024,11 +997,6 @@ async function syncClickClackCommandMenu(params) {
 }
 //#endregion
 //#region extensions/clickclack/src/activity.ts
-/**
-* Publishes agent activity (streamed commentary + tool progress) into
-* ClickClack as durable `agent_commentary` / `agent_tool` message rows,
-* coalesced so one logical step becomes one row instead of a row per frame.
-*/
 const CLICKCLACK_COMMENTARY_FLUSH_MS = 700;
 /** Item kinds rendered as agent_tool rows; everything else is commentary. */
 const TOOL_ITEM_KINDS = /* @__PURE__ */ new Set([
@@ -1067,18 +1035,9 @@ function commentaryBody(payload) {
 }
 function activityBody(payload) {
 	const line = formatChannelProgressDraftLineForEntry(void 0, {
+		...payload,
 		event: "item",
-		itemId: payload.itemId,
-		toolCallId: payload.toolCallId,
-		itemKind: payload.kind,
-		title: payload.title,
-		name: payload.name,
-		phase: payload.phase,
-		status: payload.status,
-		summary: payload.summary,
-		progressText: payload.progressText,
-		meta: payload.meta,
-		commandBearing: payload.commandBearing
+		itemKind: payload.kind
 	})?.trim();
 	if (line) return line;
 	const head = payload.name?.trim() || payload.title?.trim();
@@ -1229,28 +1188,7 @@ function createClickClackActivityPublisher(params) {
 }
 //#endregion
 //#region extensions/clickclack/src/outbound.ts
-/**
-* Outbound ClickClack delivery helpers for channel messages, thread replies,
-* and direct messages.
-*/
 const CLICKCLACK_MAX_UPLOAD_BYTES = 67108864;
-const CLICKCLACK_FORMAT_PROFILE = FormatCapabilityProfile.define({
-	mechanism: "markdown",
-	chunk: {
-		limit: 1048576,
-		unit: "bytes"
-	}
-});
-function renderClickClackMarkdown(markdown) {
-	return renderMarkdownWithMarkers({
-		text: markdown,
-		styles: [],
-		links: []
-	}, {
-		styleMarkers: {},
-		escapeText: (text) => text
-	}, CLICKCLACK_FORMAT_PROFILE);
-}
 async function createTargetMessage(params) {
 	const parsed = parseClickClackTarget(params.to);
 	const explicitThreadId = params.threadId == null ? "" : String(params.threadId);
@@ -1340,7 +1278,7 @@ function createOutboundContext(params) {
 * message id, or undefined when sanitization removes all content.
 */
 async function sendClickClackText(params) {
-	const text = renderClickClackMarkdown(sanitizeAssistantVisibleText(params.text));
+	const text = sanitizeAssistantVisibleText(params.text);
 	if (!text) return;
 	const { account, client } = createOutboundContext(params);
 	return (await createTargetMessage({
@@ -1351,32 +1289,25 @@ async function sendClickClackText(params) {
 		threadId: params.threadId,
 		replyToId: params.replyToId,
 		provenance: params.provenance,
-		nonce: textDeliveryNonce({
-			deliveryQueueId: params.deliveryQueueId,
-			deliveryPartIndex: params.deliveryPartIndex
-		}),
+		nonce: textDeliveryNonce(params),
 		onPlatformSendDispatch: params.onPlatformSendDispatch,
 		assertDirectAdapterHandoff: params.assertDirectAdapterHandoff
 	})).id;
 }
-/** Resolves, uploads, sends, then attaches one file to a ClickClack message. */
 async function sendClickClackMedia(params) {
-	const nonces = mediaDeliveryNonces({
-		deliveryQueueId: params.deliveryQueueId,
-		deliveryPartIndex: params.deliveryPartIndex
-	});
+	const nonces = mediaDeliveryNonces(params);
 	const { account, client } = createOutboundContext(params);
-	const maxBytes = Math.min(resolveChannelMediaMaxBytes({
-		cfg: params.cfg,
-		accountId: account.accountId,
-		resolveChannelLimitMb: () => account.config.mediaMaxMb
-	}) ?? CLICKCLACK_MAX_UPLOAD_BYTES, CLICKCLACK_MAX_UPLOAD_BYTES);
-	const preloadedMedia = nonces.upload ? void 0 : await loadOutboundMediaFromUrl(params.mediaUrl, {
-		maxBytes,
+	const mediaLoadOptions = {
+		maxBytes: Math.min(resolveChannelMediaMaxBytes({
+			cfg: params.cfg,
+			accountId: account.accountId,
+			resolveChannelLimitMb: () => account.config.mediaMaxMb
+		}) ?? CLICKCLACK_MAX_UPLOAD_BYTES, CLICKCLACK_MAX_UPLOAD_BYTES),
 		mediaAccess: params.mediaAccess,
 		mediaLocalRoots: params.mediaLocalRoots,
 		mediaReadFile: params.mediaReadFile
-	});
+	};
+	const preloadedMedia = nonces.upload ? void 0 : await loadOutboundMediaFromUrl(params.mediaUrl, mediaLoadOptions);
 	const workspaceId = await resolveWorkspaceId(client, account.workspace);
 	let upload = nonces.upload ? await client.findUploadByNonce({
 		workspaceId,
@@ -1384,12 +1315,7 @@ async function sendClickClackMedia(params) {
 	}) : void 0;
 	let mediaFilename = preloadedMedia?.fileName?.trim();
 	if (!upload) {
-		const media = preloadedMedia ?? await loadOutboundMediaFromUrl(params.mediaUrl, {
-			maxBytes,
-			mediaAccess: params.mediaAccess,
-			mediaLocalRoots: params.mediaLocalRoots,
-			mediaReadFile: params.mediaReadFile
-		});
+		const media = preloadedMedia ?? await loadOutboundMediaFromUrl(params.mediaUrl, mediaLoadOptions);
 		const contentType = media.contentType?.trim() || "application/octet-stream";
 		const filename = media.fileName?.trim() || `attachment${extensionForMime(contentType) ?? ""}`;
 		mediaFilename = filename;
@@ -1401,7 +1327,7 @@ async function sendClickClackMedia(params) {
 			...nonces.upload ? { nonce: nonces.upload } : {}
 		});
 	}
-	const text = renderClickClackMarkdown(sanitizeAssistantVisibleText(params.text)) || mediaFilename || upload.filename || "attachment";
+	const text = sanitizeAssistantVisibleText(params.text) || mediaFilename || upload.filename || "attachment";
 	const message = await createTargetMessage({
 		client,
 		workspaceId,
@@ -1442,12 +1368,6 @@ async function sendClickClackMedia(params) {
 	}
 	return message.id;
 }
-function collectReconciliationMediaUrls(ctx) {
-	const planned = ctx.renderedBatchPlan?.items[0]?.mediaUrls;
-	if (planned?.length) return planned.map((url) => url.trim()).filter(Boolean);
-	const payload = ctx.payloads[0];
-	return [payload?.mediaUrl, ...payload?.mediaUrls ?? []].map((url) => url?.trim()).filter((url) => Boolean(url));
-}
 /**
 * Completes an unknown durable send through ClickClack's message/upload nonces.
 * Media recovery never rereads the original source after restart.
@@ -1457,14 +1377,15 @@ async function reconcileClickClackUnknownSend(ctx) {
 		status: "unresolved",
 		error: "ClickClack reconciliation requires exactly one payload"
 	};
-	const mediaUrls = collectReconciliationMediaUrls(ctx);
+	const payload = ctx.payloads[0];
+	const plannedMediaUrls = ctx.renderedBatchPlan?.items[0]?.mediaUrls;
+	const mediaUrls = normalizeTrimmedStringList(plannedMediaUrls?.length ? plannedMediaUrls : [payload?.mediaUrl, ...payload?.mediaUrls ?? []]);
 	const { account, client } = createOutboundContext({
 		cfg: ctx.cfg,
 		accountId: ctx.accountId
 	});
 	const workspaceId = await resolveWorkspaceId(client, account.workspace);
 	const effectiveReplyToId = ctx.effectiveReplyToId !== void 0 ? ctx.effectiveReplyToId : ctx.replyToMode === "off" ? void 0 : ctx.replyToId;
-	const payload = ctx.payloads[0];
 	const caption = ctx.renderedBatchPlan?.items[0]?.text ?? payload?.text ?? "";
 	if (mediaUrls.length === 0) {
 		const nonce = textDeliveryNonce({
@@ -1548,11 +1469,6 @@ async function reconcileClickClackUnknownSend(ctx) {
 }
 //#endregion
 //#region extensions/clickclack/src/progress.ts
-/**
-* Publishes ClickClack's native ephemeral agent.progress signal for one
-* OpenClaw turn. ClickClack renders this as its compact "Agent is
-* responding" status and the detailed progress lines above the composer.
-*/
 function normalizedKind(payload) {
 	const kind = payload.kind?.trim().toLowerCase();
 	if (!kind || kind === "preamble" || kind === "analysis" || kind === "thinking" || kind === "reasoning" || kind === "missing") return "commentary";
@@ -1561,18 +1477,9 @@ function normalizedKind(payload) {
 function progressText(payload) {
 	if (payload.kind !== "preamble" && payload.title) return payload.title;
 	const line = buildChannelProgressDraftLine({
+		...payload,
 		event: "item",
-		itemId: payload.itemId,
-		toolCallId: payload.toolCallId,
-		itemKind: payload.kind,
-		title: payload.title,
-		name: payload.name,
-		phase: payload.phase,
-		status: payload.status,
-		summary: payload.summary,
-		progressText: payload.progressText,
-		meta: payload.meta,
-		commandBearing: payload.commandBearing
+		itemKind: payload.kind
 	})?.text?.trim();
 	if (line) return line;
 	return payload.progressText?.trim() || payload.summary?.trim() || payload.title?.trim() || payload.name?.trim() || payload.meta?.trim() || payload.status?.trim() || "Working";
@@ -1590,15 +1497,15 @@ function createLineIdResolver() {
 		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)) ?? (() => {
-			const created = {
-				id: `item:${kind}:${++anonymousSequence}`,
-				active: true
-			};
-			anonymousLines.push(created);
+		const existingAnonymous = payload.phase?.trim().toLowerCase() === "start" ? void 0 : anonymousLines.toReversed().find((line) => line.active);
+		const line = existingAnonymous ?? {
+			id: `item:${kind}:${++anonymousSequence}`,
+			active: true
+		};
+		if (!existingAnonymous) {
+			anonymousLines.push(line);
 			anonymousLinesByKind.set(kind, anonymousLines);
-			return created;
-		})();
+		}
 		if (isFinal(payload)) line.active = false;
 		return line.id;
 	};
@@ -1661,18 +1568,11 @@ function createClickClackAgentProgressPublisher(params) {
 		queue.splice(0, queue.length, ...controlFrames);
 	};
 	const waitForDrainWithinFinalizeGrace = async (pending) => {
-		let timeout;
 		let drained = false;
-		try {
-			await Promise.race([pending.then(() => {
-				drained = true;
-			}), new Promise((resolve) => {
-				timeout = setTimeout(resolve, CLICKCLACK_PROGRESS_FINALIZE_GRACE_MS);
-			})]);
-			return drained;
-		} finally {
-			if (timeout) clearTimeout(timeout);
-		}
+		await raceWithTimeout(pending.then(() => {
+			drained = true;
+		}), CLICKCLACK_PROGRESS_FINALIZE_GRACE_MS, () => void 0);
+		return drained;
 	};
 	const scheduleLineDrain = () => {
 		if (lineDrainTimer) return;

package/dist/.setup/{resolve-BHGLohni.mjs → resolve-DPtjHQHt.mjs}

@@ -9,10 +9,6 @@ const WebSocket = require(path.join(path.dirname(require.resolve("ws/package.jso
 //#endregion
 //#region extensions/clickclack/src/http-client.ts
 /**
-* Thin ClickClack REST/websocket client used by gateway, resolver, and outbound
-* delivery code.
-*/
-/**
 * Serializes optional provenance into the wire fields. Unknown JSON fields
 * are ignored by servers without the provenance columns, so these are safe
 * to send unconditionally when present.
@@ -60,9 +56,6 @@ function normalizeClickClackCorrelationId(value) {
 	if (!normalized || normalized.length > CLICKCLACK_CORRELATION_ID_MAX_LENGTH || !CLICKCLACK_CORRELATION_ID_PATTERN.test(normalized)) return;
 	return normalized;
 }
-/**
-* Creates a typed client for the ClickClack API using bearer-token auth.
-*/
 function createClickClackClient(options) {
 	const baseUrl = options.baseUrl.replace(/\/$/, "");
 	const fetcher = options.fetch ?? fetch;
@@ -99,6 +92,9 @@ function createClickClackClient(options) {
 			if (timeout) clearTimeout(timeout);
 		}
 	}
+	async function requestObject(key, path, init) {
+		return (await request(path, init))[key];
+	}
 	async function fetchEventPage(workspaceId, pageOptions = {}) {
 		const query = new URLSearchParams({ workspace_id: workspaceId });
 		if (pageOptions.afterCursor) query.set("after_cursor", pageOptions.afterCursor);
@@ -111,7 +107,7 @@ function createClickClackClient(options) {
 		};
 	}
 	async function createMessage(path, body, opts) {
-		return (await request(path, {
+		return requestObject("message", path, {
 			method: "POST",
 			body: JSON.stringify({
 				body,
@@ -119,7 +115,7 @@ function createClickClackClient(options) {
 				...opts?.nonce ? { nonce: opts.nonce } : {},
 				...provenanceFields(opts?.provenance)
 			})
-		})).message;
+		});
 	}
 	async function findByNonce(kind, params) {
 		const query = new URLSearchParams({
@@ -137,36 +133,22 @@ function createClickClackClient(options) {
 		}
 	}
 	return {
-		me: async () => {
-			return (await request("/api/me")).user;
-		},
-		setBotCommands: async (commands) => {
-			return (await request("/api/bots/self/commands", {
-				method: "PUT",
-				body: JSON.stringify({ commands })
-			})).bot_commands;
-		},
-		workspaces: async () => {
-			return (await request("/api/workspaces")).workspaces;
-		},
-		channels: async (workspaceId) => {
-			return (await request(`/api/workspaces/${encodeURIComponent(workspaceId)}/channels`)).channels;
-		},
-		createChannel: async (workspaceId, channel) => {
-			return (await request(`/api/workspaces/${encodeURIComponent(workspaceId)}/channels`, {
-				method: "POST",
-				body: JSON.stringify(channel)
-			})).channel;
-		},
-		updateChannel: async (channelId, patch) => {
-			return (await request(`/api/channels/${encodeURIComponent(channelId)}`, {
-				method: "PATCH",
-				body: JSON.stringify(patch)
-			})).channel;
-		},
-		channelMessages: async (channelId, afterSeq, limit = 20) => {
-			return (await request(`/api/channels/${encodeURIComponent(channelId)}/messages?after_seq=${afterSeq}&limit=${limit}`)).messages;
-		},
+		me: async () => requestObject("user", "/api/me"),
+		setBotCommands: async (commands) => requestObject("bot_commands", "/api/bots/self/commands", {
+			method: "PUT",
+			body: JSON.stringify({ commands })
+		}),
+		workspaces: async () => requestObject("workspaces", "/api/workspaces"),
+		channels: async (workspaceId) => requestObject("channels", `/api/workspaces/${encodeURIComponent(workspaceId)}/channels`),
+		createChannel: async (workspaceId, channel) => requestObject("channel", `/api/workspaces/${encodeURIComponent(workspaceId)}/channels`, {
+			method: "POST",
+			body: JSON.stringify(channel)
+		}),
+		updateChannel: async (channelId, patch) => requestObject("channel", `/api/channels/${encodeURIComponent(channelId)}`, {
+			method: "PATCH",
+			body: JSON.stringify(patch)
+		}),
+		channelMessages: async (channelId, afterSeq, limit = 20) => requestObject("messages", `/api/channels/${encodeURIComponent(channelId)}/messages?after_seq=${afterSeq}&limit=${limit}`),
 		latestChannelMessages: async (channelId, limit = 30) => {
 			const boundedLimit = Math.max(1, Math.min(CLICKCLACK_MESSAGE_PAGE_LIMIT, limit));
 			let beforeSeq;
@@ -209,38 +191,32 @@ function createClickClackClient(options) {
 				beforeSeq = page.oldest_seq;
 			}
 		},
-		directMessages: async (conversationId, afterSeq, limit = 20) => {
-			return (await request(`/api/dms/${encodeURIComponent(conversationId)}/messages?after_seq=${afterSeq}&limit=${limit}`)).messages;
-		},
+		directMessages: async (conversationId, afterSeq, limit = 20) => requestObject("messages", `/api/dms/${encodeURIComponent(conversationId)}/messages?after_seq=${afterSeq}&limit=${limit}`),
 		thread: async (messageId) => await request(`/api/messages/${encodeURIComponent(messageId)}/thread`),
-		message: async (messageId) => {
-			return (await request(`/api/messages/${encodeURIComponent(messageId)}`)).message;
-		},
+		message: async (messageId) => requestObject("message", `/api/messages/${encodeURIComponent(messageId)}`),
 		findMessageByNonce: async (params) => findByNonce("message", params),
 		createChannelMessage: async (channelId, body, opts) => createMessage(`/api/channels/${encodeURIComponent(channelId)}/messages`, body, opts),
 		createThreadReply: async (messageId, body, opts) => createMessage(`/api/messages/${encodeURIComponent(messageId)}/thread/replies`, body, {
 			nonce: opts?.nonce,
 			provenance: opts?.provenance
 		}),
-		createDirectConversation: async (workspaceId, memberIds) => {
-			return (await request("/api/dms", {
-				method: "POST",
-				body: JSON.stringify({
-					workspace_id: workspaceId,
-					member_ids: memberIds
-				})
-			})).conversation;
-		},
+		createDirectConversation: async (workspaceId, memberIds) => requestObject("conversation", "/api/dms", {
+			method: "POST",
+			body: JSON.stringify({
+				workspace_id: workspaceId,
+				member_ids: memberIds
+			})
+		}),
 		createUpload: async (params) => {
 			const form = new FormData();
 			const bytes = bufferToBlobPart(params.buffer);
 			form.append("file", new Blob([bytes], { type: params.contentType }), params.filename);
 			const query = new URLSearchParams({ workspace_id: params.workspaceId });
 			if (params.nonce) query.set("nonce", params.nonce);
-			return (await request(`/api/uploads?${query.toString()}`, {
+			return requestObject("upload", `/api/uploads?${query.toString()}`, {
 				method: "POST",
 				body: form
-			})).upload;
+			});
 		},
 		findUploadByNonce: async (params) => findByNonce("upload", params),
 		attachUpload: async (messageId, uploadId) => {
@@ -256,7 +232,7 @@ function createClickClackClient(options) {
 		*/
 		createActivityMessage: async (params) => {
 			if (!params.channelId && !params.conversationId) throw new Error("createActivityMessage requires a channelId or conversationId");
-			return (await request(params.channelId ? `/api/channels/${encodeURIComponent(params.channelId)}/messages` : `/api/dms/${encodeURIComponent(params.conversationId ?? "")}/messages`, {
+			return requestObject("message", params.channelId ? `/api/channels/${encodeURIComponent(params.channelId)}/messages` : `/api/dms/${encodeURIComponent(params.conversationId ?? "")}/messages`, {
 				method: "POST",
 				body: JSON.stringify({
 					body: params.body,
@@ -264,15 +240,12 @@ function createClickClackClient(options) {
 					turn_id: params.turnId,
 					...provenanceFields(params.provenance)
 				})
-			})).message;
-		},
-		/** PATCHes the body of an existing message (activity row coalescing). */
-		updateMessageBody: async (messageId, body) => {
-			return (await request(`/api/messages/${encodeURIComponent(messageId)}`, {
-				method: "PATCH",
-				body: JSON.stringify({ body })
-			})).message;
+			});
 		},
+		updateMessageBody: async (messageId, body) => requestObject("message", `/api/messages/${encodeURIComponent(messageId)}`, {
+			method: "PATCH",
+			body: JSON.stringify({ body })
+		}),
 		/**
 		* Publishes an ephemeral realtime signal such as native agent progress.
 		* These frames are intentionally not persisted as messages.
@@ -313,19 +286,15 @@ function createClickClackClient(options) {
 }
 //#endregion
 //#region extensions/clickclack/src/resolve.ts
-/**
-* Resolves a workspace slug/name/id from config to a ClickClack workspace id.
-*/
+function findClickClackWorkspace(workspaces, selector) {
+	return workspaces.find((candidate) => candidate.id === selector || candidate.slug === selector || candidate.name === selector);
+}
 async function resolveWorkspaceId(client, workspace) {
 	if (workspace.startsWith("wsp_")) return workspace;
-	const found = (await client.workspaces()).find((candidate) => candidate.id === workspace || candidate.slug === workspace || candidate.name === workspace);
+	const found = findClickClackWorkspace(await client.workspaces(), workspace);
 	if (!found) throw new Error(`ClickClack workspace not found: ${workspace}`);
 	return found.id;
 }
-/**
-* Resolves a channel name/id from config or target input to a ClickClack
-* channel id.
-*/
 async function resolveChannelId(client, workspaceId, channel) {
 	if (channel.startsWith("chn_")) return channel;
 	const found = (await client.channels(workspaceId)).find((candidate) => candidate.id === channel || candidate.name === channel);
@@ -333,4 +302,4 @@ async function resolveChannelId(client, workspaceId, channel) {
 	return found.id;
 }
 //#endregion
-export { isClickClackChannelNameConflict as a, createClickClackClient as i, resolveWorkspaceId as n, normalizeClickClackCorrelationId as o, ClickClackHttpError as r, resolveChannelId as t };
+export { createClickClackClient as a, ClickClackHttpError as i, resolveChannelId as n, isClickClackChannelNameConflict as o, resolveWorkspaceId as r, normalizeClickClackCorrelationId as s, findClickClackWorkspace as t };