@openclaw/discord 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{thread-bindings.manager-D2-GYZ5s.mjs → thread-bindings.manager-CdNa6UIs.mjs}

@@ -1,34 +1,33 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { A as isDiscordThreadChannelType } from "./allow-list-vxkG9_JD.mjs";
-import { P as createDiscordRestClient } from "./send.shared-C4CN24D9.mjs";
-import { C as withDiscordRequestAuthority, tt as createChannelWebhook, ut as getChannel } from "./discord-9gysrhzp.mjs";
-import { h as canFallbackDiscordWebhookSend, m as resolveDiscordChannelId } from "./send.receipt-DVOg2Oaw.mjs";
-import { c as sendWebhookMessageDiscord, u as createThreadDiscord } from "./send-CJk3VP5q.mjs";
-import { t as sendMessageDiscord } from "./send.outbound-rOboMO_6.mjs";
-import { A as resolveBindingRecordKey, C as getThreadBindingToken, D as rememberReusableWebhook, E as refreshUnboundThreadWebhookIdentity, F as resolveThreadBindingMaxAgeMs$1, I as shouldDefaultPersist, L as toBindingRecordKey, M as resolveThreadBindingIdleTimeoutMs$1, O as rememberThreadBindingToken, R as toReusableWebhookKey, S as forgetThreadBindingToken, T as normalizeThreadBindingDurationMs, _ as MANAGERS_BY_ACCOUNT_ID, b as THREAD_BINDING_TOUCH_PERSIST_MIN_INTERVAL_MS, c as drainThreadBindingAccountOperations, d as runThreadBindingAccountOperation, f as runThreadBindingMutation, g as BINDINGS_BY_THREAD_ID, h as updateBindingRecordSync, j as resolvePreparedThreadBindingLifecycle, k as resolveBindingIdsForSession, l as drainThreadBindingMutations, m as snapshotThreadBindingJson, p as shouldPersistAnyBindingState, s as commitBindingRecord, v as PERSIST_BY_ACCOUNT_ID, w as normalizeTargetKind, x as ensureBindingsLoadedAsync, y as REUSABLE_WEBHOOKS_BY_ACCOUNT_CHANNEL } from "./thread-bindings.session-updates-Bu_CGr_O.mjs";
-import { n as resolveDiscordChannelInfoSafe, t as resolveDiscordChannelIdSafe } from "./channel-access-BRp3Y-rF.mjs";
+import { A as isDiscordThreadChannelType } from "./allow-list-B_ToXtew.mjs";
+import { P as createDiscordRestClient } from "./send.shared-CjQ4jbMA.mjs";
+import { W as withDiscordRequestAuthority, dt as getChannel, tt as createChannelWebhook } from "./discord-BGqgx-yd.mjs";
+import { p as canFallbackDiscordWebhookSend } from "./send.receipt-BAlzXd8e.mjs";
+import { n as resolveDiscordChannelId } from "./target-parsing-C-HyNxcE.mjs";
+import { c as sendWebhookMessageDiscord, u as createThreadDiscord } from "./send-DbILKgcm.mjs";
+import { t as sendMessageDiscord } from "./send.outbound-_jx4Xpd3.mjs";
+import { A as resolveBindingRecordKey, C as getThreadBindingToken, D as rememberReusableWebhook, E as refreshUnboundThreadWebhookIdentity, F as resolveThreadBindingMaxAgeMs$1, I as shouldDefaultPersist, L as toBindingRecordKey, M as resolveThreadBindingIdleTimeoutMs$1, O as rememberThreadBindingToken, R as toReusableWebhookKey, S as forgetThreadBindingToken, T as normalizeThreadBindingDurationMs, _ as MANAGERS_BY_ACCOUNT_ID, b as THREAD_BINDING_TOUCH_PERSIST_MIN_INTERVAL_MS, c as drainThreadBindingAccountOperations, d as runThreadBindingAccountOperation, f as runThreadBindingMutation, g as BINDINGS_BY_THREAD_ID, h as updateBindingRecordSync, j as resolvePreparedThreadBindingLifecycle, k as resolveBindingIdsForSession, l as drainThreadBindingMutations, m as snapshotThreadBindingMetadata, p as shouldPersistAnyBindingState, s as commitBindingRecord, v as PERSIST_BY_ACCOUNT_ID, w as normalizeTargetKind, x as ensureBindingsLoadedAsync, y as REUSABLE_WEBHOOKS_BY_ACCOUNT_CHANNEL } from "./thread-bindings.session-updates-DGSljVf6.mjs";
+import { n as resolveDiscordChannelInfoSafe, t as resolveDiscordChannelIdSafe } from "./channel-access-DasWY_OV.mjs";
 import { createSubsystemLogger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
-import { asOptionalObjectRecord, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
+import { normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { getRuntimeConfigSnapshot } from "openclaw/plugin-sdk/runtime-config-snapshot";
 import { parseStrictNonNegativeInteger as parseStrictNonNegativeInteger$1 } from "openclaw/plugin-sdk/number-runtime";
 import { SYSTEM_MARK } from "openclaw/plugin-sdk/text-chunking";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
-import { registerSessionBindingAdapter, resolveThreadBindingConversationIdFromBindingId, resolveThreadBindingFarewellText, resolveThreadBindingThreadName, unregisterSessionBindingAdapter } from "openclaw/plugin-sdk/conversation-runtime";
+import { registerSessionBindingAdapter, resolveThreadBindingFarewellText, resolveThreadBindingThreadName, unregisterSessionBindingAdapter } from "openclaw/plugin-sdk/conversation-runtime";
+import { createAccountScopedBindingAdapter, projectThreadBindingRecord } from "openclaw/plugin-sdk/thread-bindings-session-runtime";
 import { resolveSessionAgentIdStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 //#region extensions/discord/src/monitor/thread-bindings.persona.ts
 const THREAD_BINDING_PERSONA_MAX_CHARS = 80;
 function normalizePersonaLabel(value) {
-	if (!value) return;
-	return value.replace(/\s+/g, " ").trim() || void 0;
+	return value ? value.replace(/\s+/g, " ").trim() || void 0 : void 0;
 }
 function resolveThreadBindingPersona(params) {
 	const base = normalizePersonaLabel(params.label) || normalizePersonaLabel(params.agentId) || "agent";
 	return truncateUtf16Safe(`${SYSTEM_MARK} ${base}`, THREAD_BINDING_PERSONA_MAX_CHARS);
 }
-function resolveThreadBindingPersonaFromRecord(record) {
-	return resolveThreadBindingPersona(record);
-}
+const resolveThreadBindingPersonaFromRecord = resolveThreadBindingPersona;
 //#endregion
 //#region extensions/discord/src/monitor/thread-bindings.types.ts
 const THREAD_BINDINGS_SWEEP_INTERVAL_MS = 12e4;
@@ -36,9 +35,6 @@ const DEFAULT_THREAD_BINDING_IDLE_TIMEOUT_MS = 864e5;
 //#endregion
 //#region extensions/discord/src/monitor/thread-bindings.discord-api.ts
 const log = createSubsystemLogger("discord/thread-bindings");
-function buildThreadTarget(threadId) {
-	return /^(channel:|user:)/i.test(threadId) ? threadId : `channel:${threadId}`;
-}
 function isThreadArchived(raw) {
 	if (!raw || typeof raw !== "object") return false;
 	const asRecord = raw;
@@ -55,23 +51,14 @@ function normalizeDiscordBindingChannelId(raw) {
 }
 function summarizeDiscordError(err) {
 	if (err instanceof Error) return err.message;
-	if (typeof err === "string") return err;
-	if (typeof err === "number" || typeof err === "boolean" || typeof err === "bigint" || typeof err === "symbol") return String(err);
+	if (typeof err === "string" || typeof err === "number" || typeof err === "boolean" || typeof err === "bigint" || typeof err === "symbol") return String(err);
 	return "error";
 }
-function extractDiscordErrorStatus(err) {
-	if (!err || typeof err !== "object") return;
-	const candidate = err;
-	return parseStrictNonNegativeInteger$1(candidate.status) ?? parseStrictNonNegativeInteger$1(candidate.statusCode) ?? parseStrictNonNegativeInteger$1(candidate.response?.status);
-}
-function extractDiscordErrorCode(err) {
-	if (!err || typeof err !== "object") return;
-	const candidate = err;
-	return parseStrictNonNegativeInteger$1(candidate.code) ?? parseStrictNonNegativeInteger$1(candidate.rawError?.code) ?? parseStrictNonNegativeInteger$1(candidate.body?.code) ?? parseStrictNonNegativeInteger$1(candidate.response?.body?.code) ?? parseStrictNonNegativeInteger$1(candidate.response?.data?.code);
-}
 function isDiscordThreadGoneError(err) {
-	if (extractDiscordErrorCode(err) === 10003) return true;
-	const status = extractDiscordErrorStatus(err);
+	if (!err || typeof err !== "object") return false;
+	const candidate = err;
+	if ((parseStrictNonNegativeInteger$1(candidate.code) ?? parseStrictNonNegativeInteger$1(candidate.rawError?.code) ?? parseStrictNonNegativeInteger$1(candidate.body?.code) ?? parseStrictNonNegativeInteger$1(candidate.response?.body?.code) ?? parseStrictNonNegativeInteger$1(candidate.response?.data?.code)) === 10003) return true;
+	const status = parseStrictNonNegativeInteger$1(candidate.status) ?? parseStrictNonNegativeInteger$1(candidate.statusCode) ?? parseStrictNonNegativeInteger$1(candidate.response?.status);
 	return status === 404 || status === 403;
 }
 async function maybeSendBindingMessage(params) {
@@ -104,7 +91,9 @@ async function maybeSendBindingMessage(params) {
 	try {
 		await withDiscordRequestAuthority(assertCurrent, () => {
 			assertCurrent?.();
-			return sendMessageDiscord(buildThreadTarget(record.threadId), text, {
+			const threadId = record.threadId;
+			const target = /^(channel:|user:)/i.test(threadId) ? threadId : `channel:${threadId}`;
+			return sendMessageDiscord(target, text, {
 				cfg: params.cfg,
 				accountId: record.accountId
 			});
@@ -186,7 +175,7 @@ async function createThreadForBinding(params) {
 			token: params.token,
 			...assertCreateAllowed ? { assertCreateAllowed } : {}
 		});
-		return (normalizeOptionalString(created?.id) ?? "") || null;
+		return normalizeOptionalString(created?.id) ?? null;
 	} catch (err) {
 		logVerbose(`discord thread binding auto-thread create failed for ${params.channelId}: ${summarizeDiscordError(err)}`);
 		return null;
@@ -194,44 +183,32 @@ async function createThreadForBinding(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/thread-bindings.session-adapter.ts
-function toSessionBindingRecord(record, defaults) {
-	const bindingId = resolveBindingRecordKey({
-		accountId: record.accountId,
-		threadId: record.threadId
-	}) ?? `${record.accountId}:${record.threadId}`;
-	const lifecycle = resolvePreparedThreadBindingLifecycle({
-		record,
-		...defaults
-	});
-	return {
-		bindingId,
-		targetSessionKey: record.targetSessionKey,
-		targetKind: record.targetKind === "subagent" ? "subagent" : "session",
-		conversation: {
-			channel: "discord",
-			accountId: record.accountId,
-			conversationId: record.threadId,
-			parentConversationId: record.channelId
-		},
-		status: "active",
-		boundAt: record.boundAt,
-		expiresAt: lifecycle.expiresAt,
-		metadata: {
-			agentId: record.agentId,
-			label: record.label,
-			webhookId: record.webhookId,
-			webhookToken: record.webhookToken,
-			boundBy: record.boundBy,
-			lastActivityAt: record.lastActivityAt,
-			idleTimeoutMs: lifecycle.idleTimeoutMs,
-			maxAgeMs: lifecycle.maxAgeMs,
-			...record.metadata
-		}
-	};
-}
 function createThreadBindingSessionAdapter(params) {
-	const serializeBinding = (entry) => toSessionBindingRecord(entry, params.defaults);
-	return {
+	const serializeBinding = (record) => {
+		const defaults = params.defaults;
+		const bindingId = resolveBindingRecordKey(record) ?? `${record.accountId}:${record.threadId}`;
+		const lifecycle = resolvePreparedThreadBindingLifecycle({
+			record,
+			...defaults
+		});
+		return projectThreadBindingRecord(record, {
+			conversation: {
+				channel: "discord",
+				conversationId: record.threadId,
+				parentConversationId: record.channelId
+			},
+			bindingId,
+			targetKind: record.targetKind === "subagent" ? "subagent" : "session",
+			lifecycle,
+			metadata: (lifecycleMetadata) => ({
+				...lifecycleMetadata,
+				webhookId: record.webhookId,
+				webhookToken: record.webhookToken,
+				...record.metadata
+			})
+		});
+	};
+	return createAccountScopedBindingAdapter({
 		channel: "discord",
 		accountId: params.accountId,
 		capabilities: { placements: ["current", "child"] },
@@ -241,19 +218,12 @@ function createThreadBindingSessionAdapter(params) {
 			const targetSessionKey = input.targetSessionKey.trim();
 			if (!targetSessionKey) return null;
 			const conversationId = normalizeOptionalString(input.conversation.conversationId) ?? "";
-			const placement = input.placement === "child" ? "child" : "current";
-			const metadata = asOptionalObjectRecord(snapshotThreadBindingJson(input.metadata ? { ...input.metadata } : void 0)) ?? {};
+			const createThread = input.placement === "child";
+			const metadata = snapshotThreadBindingMetadata(input) ?? {};
 			const targetKind = input.targetKind === "subagent" ? "subagent" : "acp";
-			const label = normalizeOptionalString(metadata.label);
-			const threadName = normalizeOptionalString(metadata.threadName);
-			const introText = normalizeOptionalString(metadata.introText);
-			const boundBy = normalizeOptionalString(metadata.boundBy);
-			const agentId = normalizeOptionalString(metadata.agentId);
-			let threadId;
+			const threadId = createThread ? void 0 : conversationId || void 0;
 			let channelId;
-			let createThread = false;
-			if (placement === "child") {
-				createThread = true;
+			if (createThread) {
 				channelId = normalizeDiscordBindingChannelId(input.conversation.parentConversationId) ?? void 0;
 				if (!channelId && conversationId) channelId = await resolveChannelIdForBinding({
 					cfg: params.resolveCurrentCfg(),
@@ -261,69 +231,45 @@ function createThreadBindingSessionAdapter(params) {
 					token: params.resolveCurrentToken(),
 					threadId: conversationId
 				}) ?? void 0;
-			} else threadId = conversationId || void 0;
+			}
 			const bound = await params.manager.bindTarget({
 				threadId,
 				channelId,
 				createThread,
-				threadName,
+				threadName: normalizeOptionalString(metadata.threadName),
 				targetKind,
 				targetSessionKey,
-				agentId,
-				label,
-				boundBy,
-				introText,
+				agentId: normalizeOptionalString(metadata.agentId),
+				label: normalizeOptionalString(metadata.label),
+				boundBy: normalizeOptionalString(metadata.boundBy),
+				introText: normalizeOptionalString(metadata.introText),
 				metadata,
 				...assertCurrent ? { assertCurrent } : {}
 			});
 			return bound ? serializeBinding(bound) : null;
 		},
-		listBySession: (targetSessionKey) => params.manager.listBySessionKey(targetSessionKey).map(serializeBinding),
-		resolveByConversation: (ref) => {
-			if (ref.channel !== "discord") return null;
-			const binding = params.manager.getByThreadId(ref.conversationId);
-			return binding ? serializeBinding(binding) : null;
-		},
-		touch: (bindingId, at) => {
-			const threadId = resolveThreadBindingConversationIdFromBindingId({
-				accountId: params.accountId,
-				bindingId
-			});
-			if (threadId) params.manager.touchThreadSync({
-				threadId,
-				at,
-				persist: true
-			});
-		},
-		touchAsync: async (bindingId, at) => {
-			const threadId = resolveThreadBindingConversationIdFromBindingId({
-				accountId: params.accountId,
-				bindingId
-			});
-			if (!threadId) return;
-			await params.manager.touchThread({
-				threadId,
-				at,
-				persist: true
-			});
-		},
-		unbind: async (input) => {
-			if (input.targetSessionKey?.trim()) return (await params.manager.unbindBySessionKey({
-				targetSessionKey: input.targetSessionKey,
-				reason: input.reason
-			})).map(serializeBinding);
-			const threadId = resolveThreadBindingConversationIdFromBindingId({
-				accountId: params.accountId,
-				bindingId: input.bindingId
-			});
-			if (!threadId) return [];
-			const removed = await params.manager.unbindThread({
-				threadId,
-				reason: input.reason
-			});
-			return removed ? [serializeBinding(removed)] : [];
-		}
-	};
+		project: serializeBinding,
+		listBySessionKey: params.manager.listBySessionKey,
+		getByConversation: (ref) => params.manager.getByThreadId(ref.conversationId),
+		touchConversation: (threadId, at) => params.manager.touchThreadSync({
+			threadId,
+			at,
+			persist: true
+		}),
+		touchConversationAsync: (threadId, at) => params.manager.touchThread({
+			threadId,
+			at,
+			persist: true
+		}),
+		unbindConversation: (threadId, reason) => params.manager.unbindThread({
+			threadId,
+			reason
+		}),
+		unbindBySessionKey: (targetSessionKey, reason) => params.manager.unbindBySessionKey({
+			targetSessionKey,
+			reason
+		})
+	});
 }
 /** Disabled bindings have a live empty owner; retirement still makes that owner unavailable. */
 function createNoopThreadBindingManager(accountIdRaw) {
@@ -372,6 +318,15 @@ function isDirectConversationBindingId(value) {
 	const trimmed = normalizeOptionalString(value);
 	return Boolean(trimmed && /^(user:|channel:)/i.test(trimmed));
 }
+function normalizeTouchTimestamp(at) {
+	return typeof at === "number" && Number.isFinite(at) ? Math.max(0, Math.floor(at)) : Date.now();
+}
+function touchBindingRecord(record, at) {
+	return {
+		...record,
+		lastActivityAt: Math.max(record.lastActivityAt || 0, at)
+	};
+}
 async function createThreadBindingManager(input) {
 	const params = { ...input };
 	await ensureBindingsLoadedAsync();
@@ -385,17 +340,11 @@ async function createThreadBindingManager(input) {
 function createLoadedThreadBindingManager(params) {
 	const accountId = normalizeAccountId(params.accountId);
 	const existing = MANAGERS_BY_ACCOUNT_ID.get(accountId);
-	if (existing) {
-		rememberThreadBindingToken({
-			accountId,
-			token: params.token
-		});
-		return existing;
-	}
 	rememberThreadBindingToken({
 		accountId,
 		token: params.token
 	});
+	if (existing) return existing;
 	const persist = params.persist ?? shouldDefaultPersist();
 	PERSIST_BY_ACCOUNT_ID.set(accountId, persist);
 	const idleTimeoutMs = normalizeThreadBindingDurationMs(params.idleTimeoutMs, DEFAULT_THREAD_BINDING_IDLE_TIMEOUT_MS);
@@ -403,6 +352,17 @@ function createLoadedThreadBindingManager(params) {
 	const resolveCurrentCfg = () => getRuntimeConfigSnapshot() ?? params.cfg;
 	const resolveCurrentToken = () => getThreadBindingToken(accountId) ?? params.token;
 	const getCurrentBinding = (threadId) => MANAGERS_BY_ACCOUNT_ID.get(accountId) === manager ? manager.getByThreadId(threadId) : void 0;
+	const getBinding = (threadId) => {
+		const bindingKey = resolveBindingRecordKey({
+			accountId,
+			threadId
+		});
+		const record = bindingKey ? BINDINGS_BY_THREAD_ID.get(bindingKey) : void 0;
+		return bindingKey && record?.accountId === accountId ? {
+			bindingKey,
+			record
+		} : void 0;
+	};
 	let stopping = false;
 	let stopPromise;
 	let sweepPromise;
@@ -423,7 +383,6 @@ function createLoadedThreadBindingManager(params) {
 	let sweepTimer = null;
 	const runSweepOnce = async () => {
 		const bindings = manager.listBindings();
-		if (bindings.length === 0) return;
 		let rest = null;
 		for (const snapshotBinding of bindings) {
 			const binding = getCurrentBinding(snapshotBinding.threadId);
@@ -451,9 +410,8 @@ function createLoadedThreadBindingManager(params) {
 			}
 			if (isDirectConversationBindingId(binding.threadId)) continue;
 			if (!rest) try {
-				const cfg = resolveCurrentCfg();
 				rest = createDiscordRestClient({
-					cfg,
+					cfg: resolveCurrentCfg(),
 					accountId,
 					token: resolveCurrentToken()
 				}).rest;
@@ -464,7 +422,7 @@ function createLoadedThreadBindingManager(params) {
 				const channel = await getChannel(rest, binding.threadId);
 				if (getCurrentBinding(binding.threadId) !== binding) continue;
 				if (!channel || typeof channel !== "object") {
-					logVerbose(`discord thread binding sweep probe returned invalid payload for ${binding.threadId}`);
+					logVerbose(`discord thread binding sweep check returned invalid payload for ${binding.threadId}`);
 					continue;
 				}
 				if (isThreadArchived(channel)) await manager.unbindThread({
@@ -485,37 +443,36 @@ function createLoadedThreadBindingManager(params) {
 					});
 					continue;
 				}
-				logVerbose(`discord thread binding sweep probe failed for ${binding.threadId}: ${summarizeDiscordError(err)}`);
+				logVerbose(`discord thread binding sweep check failed for ${binding.threadId}: ${summarizeDiscordError(err)}`);
 			}
 		}
 	};
 	const unbindThread = async (unbindParams) => {
-		const bindingKey = resolveBindingRecordKey({
-			accountId,
-			threadId: unbindParams.threadId
-		});
-		if (!bindingKey) return null;
-		const existingLocal = BINDINGS_BY_THREAD_ID.get(bindingKey);
-		if (!existingLocal || existingLocal.accountId !== accountId || unbindParams.expected && existingLocal !== unbindParams.expected) return null;
+		const binding = getBinding(unbindParams.threadId);
+		if (!binding || unbindParams.expected && binding.record !== unbindParams.expected) return null;
+		const { bindingKey, record: existingLocal } = binding;
 		await commitBindingRecord({
 			bindingKey,
 			previous: existingLocal,
 			next: null,
 			persist: unbindParams.persist ?? persist,
-			assertCurrent: assertManagerCurrent
+			assertCurrent: () => {
+				assertManagerCurrent();
+				unbindParams.assertCurrent?.();
+			}
 		});
-		const removed = existingLocal;
-		manager.notifyUnbound(removed, unbindParams);
-		return removed;
+		manager.notifyUnbound(existingLocal, unbindParams);
+		return existingLocal;
 	};
 	const manager = {
 		accountId,
 		isStopping: () => stopping,
 		notifyUnbound: (removed, notification) => {
 			refreshUnboundThreadWebhookIdentity(removed);
-			if (notification.sendFarewell !== false) {
-				const cfg = resolveCurrentCfg();
-				const farewell = resolveThreadBindingFarewellText({
+			if (notification.sendFarewell !== false) maybeSendBindingMessage({
+				cfg: resolveCurrentCfg(),
+				record: removed,
+				text: resolveThreadBindingFarewellText({
 					reason: notification.reason,
 					farewellText: notification.farewellText,
 					idleTimeoutMs: resolveThreadBindingIdleTimeoutMs$1({
@@ -526,36 +483,18 @@ function createLoadedThreadBindingManager(params) {
 						record: removed,
 						defaultMaxAgeMs: maxAgeMs
 					})
-				});
-				if (cfg) maybeSendBindingMessage({
-					cfg,
-					record: removed,
-					text: farewell,
-					preferWebhook: false
-				});
-			}
+				}),
+				preferWebhook: false
+			});
 		},
 		getIdleTimeoutMs: () => idleTimeoutMs,
 		getMaxAgeMs: () => maxAgeMs,
-		getByThreadId: (threadId) => {
-			const key = resolveBindingRecordKey({
-				accountId,
-				threadId
-			});
-			if (!key) return;
-			const entry = BINDINGS_BY_THREAD_ID.get(key);
-			if (!entry || entry.accountId !== accountId) return;
-			return entry;
-		},
-		getBySessionKey: (targetSessionKey) => {
-			return manager.listBySessionKey(targetSessionKey)[0];
-		},
-		listBySessionKey: (targetSessionKey) => {
-			return resolveBindingIdsForSession({
-				targetSessionKey,
-				accountId
-			}).map((bindingKey) => BINDINGS_BY_THREAD_ID.get(bindingKey)).filter((entry) => Boolean(entry));
-		},
+		getByThreadId: (threadId) => getBinding(threadId)?.record,
+		getBySessionKey: (targetSessionKey) => manager.listBySessionKey(targetSessionKey)[0],
+		listBySessionKey: (targetSessionKey) => resolveBindingIdsForSession({
+			targetSessionKey,
+			accountId
+		}).map((bindingKey) => BINDINGS_BY_THREAD_ID.get(bindingKey)).filter((entry) => Boolean(entry)),
 		listBindings: () => [...BINDINGS_BY_THREAD_ID.values()].filter((entry) => entry.accountId === accountId),
 		touchThreadSync: (input) => {
 			assertManagerCurrent();
@@ -565,13 +504,10 @@ function createLoadedThreadBindingManager(params) {
 				threadId: input.threadId
 			});
 			if (!key) return null;
-			const at = typeof input.at === "number" && Number.isFinite(input.at) ? Math.max(0, Math.floor(input.at)) : Date.now();
+			const at = normalizeTouchTimestamp(input.at);
 			return updateBindingRecordSync({
 				bindingKey: key,
-				transform: (record) => ({
-					...record,
-					lastActivityAt: Math.max(record.lastActivityAt || 0, at)
-				}),
+				transform: (record) => touchBindingRecord(record, at),
 				persist: (input.persist ?? persist) && shouldPersistAnyBindingState(),
 				minIntervalMs: THREAD_BINDING_TOUCH_PERSIST_MIN_INTERVAL_MS
 			});
@@ -579,22 +515,15 @@ function createLoadedThreadBindingManager(params) {
 		touchThread: (input) => {
 			const touchParams = {
 				...input,
-				at: typeof input.at === "number" && Number.isFinite(input.at) ? Math.max(0, Math.floor(input.at)) : Date.now()
+				at: normalizeTouchTimestamp(input.at)
 			};
 			return mutate(async () => {
-				const key = resolveBindingRecordKey({
-					accountId,
-					threadId: touchParams.threadId
-				});
-				if (!key) return null;
-				const existingResult = BINDINGS_BY_THREAD_ID.get(key);
-				if (!existingResult || existingResult.accountId !== accountId) return null;
-				const nextRecord = {
-					...existingResult,
-					lastActivityAt: Math.max(existingResult.lastActivityAt || 0, touchParams.at)
-				};
+				const binding = getBinding(touchParams.threadId);
+				if (!binding) return null;
+				const { bindingKey, record: existingResult } = binding;
+				const nextRecord = touchBindingRecord(existingResult, touchParams.at);
 				await commitBindingRecord({
-					bindingKey: key,
+					bindingKey,
 					previous: existingResult,
 					next: nextRecord,
 					persist: (touchParams.persist ?? persist) && shouldPersistAnyBindingState(),
@@ -607,7 +536,7 @@ function createLoadedThreadBindingManager(params) {
 		bindTarget: async (input) => {
 			const bindParams = {
 				...input,
-				metadata: asOptionalObjectRecord(snapshotThreadBindingJson(input.metadata ? { ...input.metadata } : void 0))
+				metadata: snapshotThreadBindingMetadata(input)
 			};
 			return runOwnedMutation(async () => {
 				const assertCurrent = bindParams.assertCurrent;
@@ -715,7 +644,7 @@ function createLoadedThreadBindingManager(params) {
 					}
 				}));
 				const introText = bindParams.introText?.trim();
-				if (introText && cfg) maybeSendBindingMessage({
+				if (introText) maybeSendBindingMessage({
 					cfg,
 					record,
 					text: introText,
@@ -740,7 +669,6 @@ function createLoadedThreadBindingManager(params) {
 					accountId,
 					targetKind: unbindParams.targetKind
 				});
-				if (ids.length === 0) return [];
 				const removed = [];
 				for (const bindingKey of ids) {
 					const binding = BINDINGS_BY_THREAD_ID.get(bindingKey);
@@ -789,7 +717,7 @@ function createLoadedThreadBindingManager(params) {
 				sweepPromise = void 0;
 			});
 		}, THREAD_BINDINGS_SWEEP_INTERVAL_MS);
-		if (!(process.env.VITEST || false)) sweepTimer.unref?.();
+		if (shouldDefaultPersist()) sweepTimer.unref?.();
 	}
 	const sessionBindingAdapter = createThreadBindingSessionAdapter({
 		accountId,
@@ -806,8 +734,7 @@ function createLoadedThreadBindingManager(params) {
 	return manager;
 }
 function getThreadBindingManager(accountId) {
-	const normalized = normalizeAccountId(accountId);
-	return MANAGERS_BY_ACCOUNT_ID.get(normalized) ?? null;
+	return MANAGERS_BY_ACCOUNT_ID.get(normalizeAccountId(accountId)) ?? null;
 }
 //#endregion
 export { isThreadArchived as a, resolveThreadBindingPersonaFromRecord as c, createNoopThreadBindingManager as i, getThreadBindingManager as n, resolveChannelIdForBinding as o, thread_bindings_manager_exports as r, resolveThreadBindingPersona as s, createThreadBindingManager as t };