@senguoyun/dsh-arkme 0.1.40 → 0.1.41

package/lib/index.js

@@ -1,4 +1,4 @@
-import { A as inspectNativeBundleArtifactV3, D as bundleSha256, E as arkmeSandboxEntryId, F as assertExtensionArtifactSize, G as validateVoiceprintPcm16Wav, I as canonicalExtensionJson, J as arkmeRichBackgroundSound, K as isRecordingInstantOnOrAfterUnixEpoch, L as sha256Hex, M as packLocalNativeBundleDirectoryV3, N as readNativeBundleTarballV3, O as canonicalBundleJson, P as renderArkmeSandboxHostEntry, R as unpackArkmeExtension, S as ARKME_BUNDLE_ARTIFACT_KIND, T as ArkmeBundleArtifactError, U as ARKME_EXTENSION_RUNTIME_UNAVAILABLE_MESSAGE, W as ArkmeService, X as ARKME_PROVIDER_CONTRACT_VERSION, Y as ARKME_DEFAULT_SHARE_WEBSITE, _ as arkmeClientContentDigest, at as arkmeNormalizedFileMimeType, b as verifyExtensionResolutionSignature, c as persistentExtensionBundleDirectory, ct as recordingImportFileKind, d as readPersistentExtensionActivation, dt as ArkmePluginError, et as ARKME_WORLD_PUBLISH_MAX_IMAGES, f as refreshPersistentClientWrapper, ft as ArkmeOutgoingCallError, g as activeProfileExtensionOwnerConflicts, h as renderArkmeBundleClientBundle, i as invokePersistentArkmeExtension, it as arkmeCanInlineLocalFile, j as packBundleFiles, k as inspectBundleArtifact, l as persistentExtensionPackageIdentity, lt as sameRecordingImportIdentity, m as writePersistentExtensionActivation, nt as ARKME_RUNTIME_INSTANCE_ID, o as persistentArkmeExtensionRuntimeState, ot as arkmePickedFileKind, p as repairPersistentExtensionInstallation, pt as SecretValue, q as arkmeFileBackgroundSound, r as deactivatePersistentArkmeExtension, rt as ARKME_TOOL_FILE_MAX_BYTES, s as materializePersistentExtensionBundle, st as isArkmeBotAvatarRef, t as activatePersistentArkmeExtension, tt as ARKME_WORLD_PUBLISH_MAX_IMAGE_BYTES, u as quarantinePersistentExtension, v as arkmeClientContentDigestFromSource, w as ARKME_NATIVE_BUNDLE_ARTIFACT_KIND, x as verifyNativeBundleResolutionSignature, y as verifyBundleResolutionSignature, z as ARKME_EXTENSION_FORMAT } from "./persistent-runtime-BDvChgZV.js";
+import { A as inspectNativeBundleArtifactV3, D as bundleSha256, E as arkmeSandboxEntryId, F as assertExtensionArtifactSize, G as validateVoiceprintPcm16Wav, I as canonicalExtensionJson, J as arkmeRichBackgroundSound, K as isRecordingInstantOnOrAfterUnixEpoch, L as sha256Hex, M as packLocalNativeBundleDirectoryV3, N as readNativeBundleTarballV3, O as canonicalBundleJson, P as renderArkmeSandboxHostEntry, R as unpackArkmeExtension, S as ARKME_BUNDLE_ARTIFACT_KIND, T as ArkmeBundleArtifactError, U as ARKME_EXTENSION_RUNTIME_UNAVAILABLE_MESSAGE, W as ArkmeService, X as ARKME_PROVIDER_CONTRACT_VERSION, Y as ARKME_DEFAULT_SHARE_WEBSITE, _ as arkmeClientContentDigest, at as arkmeNormalizedFileMimeType, b as verifyExtensionResolutionSignature, c as persistentExtensionBundleDirectory, ct as recordingImportFileKind, d as readPersistentExtensionActivation, dt as ArkmePluginError, et as ARKME_WORLD_PUBLISH_MAX_IMAGES, f as refreshPersistentClientWrapper, ft as ArkmeOutgoingCallError, g as activeProfileExtensionOwnerConflicts, h as renderArkmeBundleClientBundle, i as invokePersistentArkmeExtension, it as arkmeCanInlineLocalFile, j as packBundleFiles, k as inspectBundleArtifact, l as persistentExtensionPackageIdentity, lt as sameRecordingImportIdentity, m as writePersistentExtensionActivation, nt as ARKME_RUNTIME_INSTANCE_ID, o as persistentArkmeExtensionRuntimeState, ot as arkmePickedFileKind, p as repairPersistentExtensionInstallation, pt as SecretValue, q as arkmeFileBackgroundSound, r as deactivatePersistentArkmeExtension, rt as ARKME_TOOL_FILE_MAX_BYTES, s as materializePersistentExtensionBundle, st as isArkmeBotAvatarRef, t as activatePersistentArkmeExtension, tt as ARKME_WORLD_PUBLISH_MAX_IMAGE_BYTES, u as quarantinePersistentExtension, v as arkmeClientContentDigestFromSource, w as ARKME_NATIVE_BUNDLE_ARTIFACT_KIND, x as verifyNativeBundleResolutionSignature, y as verifyBundleResolutionSignature, z as ARKME_EXTENSION_FORMAT } from "./persistent-runtime-B1gJH2Nx.js";
 import { a as securePrivateDirectory, c as securePrivateFileSync, i as prepareProfilePackageManager, n as isArkmeProfilePackageName, o as securePrivateDirectorySync, r as localExtensionPnpmArgs, s as securePrivateFile, t as applyArkmeProfileBundlePolicy } from "./profile-bundle-policy-CvojZuTD.js";
 import { _ as parsePluginUpdateManifest, b as validatePluginUpdateServiceOrigin, d as writePluginUpdateLifecycleLog, f as PluginUpdateInstallStateStore, g as existingCachedPluginArtifactPath, h as downloadAndCachePluginArtifact, m as PluginUpdateArtifactError, n as buildTargetInstallArgs, o as reconcilePluginUpdaterProfilePolicy, p as ARKME_PLUGIN_PACKAGE_NAME$1, t as assertTargetArtifactIntegrity, u as detachManagedProfilePluginLink, v as pluginUpdateEndpointUrl, y as validatePluginUpdateArtifactOrigin } from "./plugin-updater-helper-BByw0ZyG.js";
 import { i as invokeArkmeBundle, n as arkmeBundleActive, r as deactivateArkmeBundle } from "./bundle-runtime-BTzRlc6V.js";
@@ -26,6 +26,7 @@ import { Buffer as Buffer$1 } from "node:buffer";
 import sharp from "sharp";
 import { AttachmentError, AttachmentId } from "@deepseek-ai/dsh-attachment";
 import WebSocket from "ws";
+import { scheduler } from "node:timers/promises";
 //#region src/openclaw/cli-adapter.ts
 const JOTMO_CHANNEL_PACKAGE = "@jotmo/openclaw-channel@0.1.12";
 function assertSucceeded(result, operation) {
@@ -2061,8 +2062,7 @@ function createArkmeHostApi(service, options) {
 				"recordings.import.retry",
 				"recordings.import.cancel",
 				"recordings.speaker.assign-item",
-				"openapi.mcp.retry",
-				"openapi.mcp.reauthorize"
+				"openapi.mcp.retry"
 			].includes(request.operation) && origin === void 0) throw new ArkmePluginError("origin-required", "该敏感变更必须从当前 DSH 页面发起", false, 403);
 			writeJson$5(res, 200, {
 				ok: true,
@@ -4488,7 +4488,8 @@ var ManagedOpenApiMcpController = class {
 	}
 	guardToolExecution(toolName) {
 		const ownsManagedNamespace = this.mounted !== void 0 || this.mountTransition !== void 0;
-		if (!toolName.startsWith(MANAGED_TOOL_PREFIX$1) || !ownsManagedNamespace || this.toolExecutionEnabled) return void 0;
+		if (!toolName.startsWith(MANAGED_TOOL_PREFIX$1) || !ownsManagedNamespace) return void 0;
+		if (this.mounted !== void 0 && this.executionMatches(this.mounted)) return void 0;
 		return "Arkme OpenAPI MCP tools are not ready for the current account";
 	}
 	/** Fences both sides of an official MCP dispatch and diagnoses managed failures in the background. */
@@ -4583,12 +4584,15 @@ var ManagedOpenApiMcpController = class {
 		const abort = new AbortController();
 		this.activeAbort = abort;
 		const progress = { phase: "credential" };
-		if (!background && !this.toolExecutionEnabled) this.setStatus({
+		const activeCredentialExpired = this.activeCredential !== void 0 && this.activeCredential.expiresAtMillis <= this.now();
+		if (activeCredentialExpired) this.disableToolExecution();
+		if ((!background || activeCredentialExpired) && !this.toolExecutionEnabled) this.setStatus({
 			state: "reconciling",
 			retryable: false,
 			userAction: "none"
 		});
 		try {
+			if (activeCredentialExpired) await this.disposeMount();
 			const session = await this.options.sessionStore.read();
 			const principal = openApiMcpPrincipal(session);
 			if (session === void 0) {
@@ -4724,7 +4728,7 @@ var ManagedOpenApiMcpController = class {
 			session = await this.options.sessionStore.read();
 		} catch {
 			this.scheduleCredential(credentialRetryDelay(this.credentialFailures), operationEpoch);
-			this.setDegradedStatus();
+			this.setStatusFromExecutionAvailability();
 			return;
 		}
 		if (session === void 0) {
@@ -4736,14 +4740,13 @@ var ManagedOpenApiMcpController = class {
 			return;
 		}
 		this.scheduleCredential(credentialRetryDelay(this.credentialFailures), operationEpoch);
-		this.setDegradedStatus();
+		this.setStatusFromExecutionAvailability();
 	}
 	async handleManifestFailure(error, operationEpoch) {
 		this.manifestFailures++;
 		this.warn(failureCategory(error));
 		this.scheduleManifest(manifestRetryDelay(this.manifestFailures), operationEpoch);
-		if (this.toolExecutionEnabled && this.mounted !== void 0) this.setReadyStatus();
-		else this.setDegradedStatus();
+		this.setStatusFromExecutionAvailability();
 	}
 	scheduleDiagnosticReconcile(mounted) {
 		if (this.disposed || this.diagnosticPending || !this.executionMatches(mounted)) return;
@@ -4839,7 +4842,8 @@ var ManagedOpenApiMcpController = class {
 		this.toolExecutionAborts.clear();
 	}
 	executionMatches(mounted) {
-		return !this.disposed && this.toolExecutionEnabled && this.mounted === mounted && samePrincipal(this.activePrincipal, mounted.principal);
+		const credential = this.activeCredential;
+		return !this.disposed && credential !== void 0 && credential.expiresAtMillis > this.now() && credential.keyId === mounted.keyId && credential.generation === mounted.generation && credentialBelongsTo(credential, mounted.principal) && this.toolExecutionEnabled && this.mounted === mounted && samePrincipal(this.activePrincipal, mounted.principal);
 	}
 	mountMatchesCredential(credential, principal) {
 		return this.mounted !== void 0 && this.mounted.keyId === credential.keyId && this.mounted.generation === credential.generation && samePrincipal(this.mounted.principal, principal);
@@ -4902,7 +4906,10 @@ var ManagedOpenApiMcpController = class {
 	scheduleCredential(delayMillis, operationEpoch) {
 		if (this.credentialTimer !== void 0) clearTimeout(this.credentialTimer);
 		const jittered = this.jitter(delayMillis, 10080 * 6e4);
-		const next = this.now() + jittered;
+		const scheduledAt = this.now();
+		const remainingValidity = this.activeCredential === void 0 ? void 0 : this.activeCredential.expiresAtMillis - scheduledAt;
+		const boundedDelay = remainingValidity !== void 0 && remainingValidity > 0 ? Math.min(jittered, remainingValidity) : jittered;
+		const next = scheduledAt + boundedDelay;
 		this.credentialNextAtMillis = next;
 		this.credentialTimer = setTimeout(() => {
 			this.credentialTimer = void 0;
@@ -4910,7 +4917,7 @@ var ManagedOpenApiMcpController = class {
 			if (!this.disposed && operationEpoch === this.epoch) this.enqueue(async () => {
 				await this.reconcileCredential(operationEpoch);
 			});
-		}, jittered);
+		}, boundedDelay);
 		this.credentialTimer.unref();
 		return next;
 	}
@@ -4954,6 +4961,11 @@ var ManagedOpenApiMcpController = class {
 			...next === void 0 ? {} : { nextReconcileAtMillis: next }
 		});
 	}
+	setStatusFromExecutionAvailability() {
+		const mounted = this.mounted;
+		if (mounted !== void 0 && this.executionMatches(mounted)) this.setReadyStatus();
+		else this.setDegradedStatus();
+	}
 	cancelCurrent(quarantineTools) {
 		this.epoch++;
 		this.activeAbort?.abort(/* @__PURE__ */ new Error("OpenAPI MCP lifecycle superseded"));
@@ -5365,24 +5377,31 @@ function formatArkmeIdMutationResult(result) {
 }
 //#endregion
 //#region src/openapi-mcp/status-tool.ts
+function modelSafeStatus(status) {
+	return JSON.stringify({
+		state: status.state,
+		retryable: status.retryable,
+		userAction: status.userAction
+	});
+}
 function registerOpenApiMcpLifecycleTools(ctx, controller) {
 	ctx.tools.register(defineTool({
 		name: "arkme_openapi_mcp_status",
-		description: "Check whether managed OpenAPI MCP tools are available for the current Arkme account and whether login is required.",
+		description: "Report the managed Arkme OpenAPI MCP connection for the current account. state is inactive, reconciling, ready, or degraded; ready means the current mcp__arkme__* tools are mounted and executable. userAction is none or login. Returns no credentials or account identifiers.",
 		parameters: {},
 		output: TEXT_OUTPUT$3,
 		isConcurrencySafe: () => true,
 		execute() {
-			return Promise.resolve(JSON.stringify(controller.status()));
+			return Promise.resolve(modelSafeStatus(controller.status()));
 		}
 	}));
 	ctx.tools.register(defineTool({
 		name: "arkme_openapi_mcp_retry",
-		description: "Retry the managed OpenAPI MCP connection for the current Arkme account and return its safe lifecycle status.",
+		description: "Retry the managed Arkme OpenAPI MCP connection when state is degraded and retryable is true. userAction is none or login. Returns no credentials, account identifiers, or scheduler details.",
 		parameters: {},
 		output: TEXT_OUTPUT$3,
 		execute() {
-			return controller.retry().then((status) => JSON.stringify(status));
+			return controller.retry().then(modelSafeStatus);
 		}
 	}));
 }
@@ -20070,6 +20089,7 @@ function extractCompletedTurnWindows(source) {
 //#endregion
 //#region src/dsh-remote/host.ts
 const HISTORY_RECONCILE_INTERVAL_MILLIS = 3e4;
+const HISTORY_RECONCILE_SESSION_BATCH_ITEMS = 4;
 const PROJECTION_SYNC_INTERVAL_MILLIS = 3e4;
 const BACKEND_HISTORY_BATCH_ITEMS = 100;
 const BACKEND_TURN_BATCH_ITEMS = 100;
@@ -20789,19 +20809,17 @@ var ArkmeRemoteRealtimeHost = class {
 			return false;
 		}
 	}
-	scheduleHistoryReconcile(delayMillis = 0) {
+	scheduleHistoryReconcile(delayMillis = HISTORY_RECONCILE_INTERVAL_MILLIS) {
+		if (this.options.eagerHistoryBackfill !== true) return;
 		const runtime = this.runtime;
 		if (!this.started || this.accountId === void 0 || runtime?.desktopRef === void 0) return;
 		const capabilities = new Set(runtime.capabilities);
 		if (!capabilities.has("session.list") || !capabilities.has("session.history")) return;
-		if (delayMillis === 0 && this.historyReconcileFlight !== void 0) {
+		if (this.historyReconcileFlight !== void 0) {
 			this.historyReconcileRequested = true;
 			return;
 		}
-		if (this.historyReconcileTimer !== void 0) {
-			if (delayMillis > 0) return;
-			clearTimeout(this.historyReconcileTimer);
-		}
+		if (this.historyReconcileTimer !== void 0) return;
 		this.historyReconcileTimer = setTimeout(() => {
 			this.historyReconcileTimer = void 0;
 			this.reconcileAllHistorySafely();
@@ -20837,6 +20855,9 @@ var ArkmeRemoteRealtimeHost = class {
 	historyOwnerMatches(accountId, runtime) {
 		return this.started && this.accountId === accountId && this.runtime?.runtimeRef === runtime.runtimeRef && this.runtime.hostGeneration === runtime.hostGeneration;
 	}
+	async yieldHistoryReconciliation() {
+		await (this.options.yieldToEventLoop?.() ?? scheduler.yield());
+	}
 	async reconcileAllHistory() {
 		const accountId = this.accountId;
 		const runtime = this.runtime;
@@ -20857,6 +20878,7 @@ var ArkmeRemoteRealtimeHost = class {
 			if (cursor !== void 0) {
 				if (seenSessionCursors.has(cursor)) throw new DshRemoteError("REMOTE_INVALID_RESPONSE", "DSH 会话游标发生循环", true);
 				seenSessionCursors.add(cursor);
+				await this.yieldHistoryReconciliation();
 			}
 		} while (cursor !== void 0);
 		const statuses = /* @__PURE__ */ new Map();
@@ -20873,18 +20895,24 @@ var ArkmeRemoteRealtimeHost = class {
 				if (status === void 0) throw new DshRemoteError("REMOTE_INVALID_RESPONSE", "Backend 缺少会话历史完整性条目", true);
 				statuses.set(ref, status);
 			}
+			if (offset + 50 < sessions.length) await this.yieldHistoryReconciliation();
 		}
-		let firstFailure;
-		for (const session of sessions) {
-			if (!this.historyOwnerMatches(accountId, runtime)) return;
+		const pendingSessions = sessions.filter((session) => {
 			const status = statuses.get(session.sessionId);
-			if (status === void 0) continue;
-			if (session.projectionAsOfSeq !== void 0 && status.historyCompleteThroughSeq >= session.projectionAsOfSeq && (this.options.controlPlane.syncSessionTurns === void 0 || status.turnProjectionCompleteThroughSeq >= session.projectionAsOfSeq)) continue;
-			try {
-				await this.reconcileSessionHistory(accountId, runtime, session.sessionId, session.projectionAsOfSeq);
-			} catch (error) {
-				firstFailure ??= error;
+			if (status === void 0) return false;
+			return session.projectionAsOfSeq === void 0 || status.historyCompleteThroughSeq < session.projectionAsOfSeq || this.options.controlPlane.syncSessionTurns !== void 0 && status.turnProjectionCompleteThroughSeq < session.projectionAsOfSeq;
+		});
+		let firstFailure;
+		for (let offset = 0; offset < pendingSessions.length; offset += HISTORY_RECONCILE_SESSION_BATCH_ITEMS) {
+			for (const session of pendingSessions.slice(offset, offset + HISTORY_RECONCILE_SESSION_BATCH_ITEMS)) {
+				if (!this.historyOwnerMatches(accountId, runtime)) return;
+				try {
+					await this.reconcileSessionHistory(accountId, runtime, session.sessionId, session.projectionAsOfSeq);
+				} catch (error) {
+					firstFailure ??= error;
+				}
 			}
+			if (offset + HISTORY_RECONCILE_SESSION_BATCH_ITEMS < pendingSessions.length) await this.yieldHistoryReconciliation();
 		}
 		if (firstFailure !== void 0) throw firstFailure;
 	}
@@ -20920,6 +20948,7 @@ var ArkmeRemoteRealtimeHost = class {
 			const next = page.nextCursor;
 			if (next === void 0 || next < 0 || seenCursors.has(next)) throw new DshRemoteError("REMOTE_INVALID_RESPONSE", "DSH 历史游标无效或发生循环", true);
 			seenCursors.add(next);
+			await this.yieldHistoryReconciliation();
 			beforeSeq = next;
 		}
 		const throughSeq = completeThroughSeq ?? maximumEntrySeq;
@@ -21002,7 +21031,6 @@ var ArkmeRemoteRealtimeHost = class {
 			desktopRef
 		};
 		await this.syncProjectionSnapshot(true);
-		this.scheduleHistoryReconcile();
 		const controller = new AbortController();
 		await this.options.realtime.connect({
 			profileRef: this.options.profileRef,

package/lib/persistent-extension.js

@@ -1,2 +1,2 @@
-import { a as persistentArkmeExtensionActive, i as invokePersistentArkmeExtension, n as applyPersistentArkmeHostExtension, o as persistentArkmeExtensionRuntimeState, r as deactivatePersistentArkmeExtension, t as activatePersistentArkmeExtension } from "./persistent-runtime-BDvChgZV.js";
+import { a as persistentArkmeExtensionActive, i as invokePersistentArkmeExtension, n as applyPersistentArkmeHostExtension, o as persistentArkmeExtensionRuntimeState, r as deactivatePersistentArkmeExtension, t as activatePersistentArkmeExtension } from "./persistent-runtime-B1gJH2Nx.js";
 export { activatePersistentArkmeExtension, applyPersistentArkmeHostExtension, deactivatePersistentArkmeExtension, invokePersistentArkmeExtension, persistentArkmeExtensionActive, persistentArkmeExtensionRuntimeState };

package/lib/{persistent-runtime-BDvChgZV.js → persistent-runtime-B1gJH2Nx.js}

@@ -19376,6 +19376,57 @@ function chatExtensionTreeItemFromData(value, fallbackParentRecordUid) {
 		...structuredContent === void 0 ? {} : { structuredContent }
 	};
 }
+function extensionMediaRecord(recordUid, contentPayload, displayItems = []) {
+	return {
+		record_uid: recordUid,
+		content_payload: contentPayload,
+		...displayItems.length === 0 ? {} : { media_display_items: displayItems }
+	};
+}
+function publicExtensionMediaRecord(value, recordUid) {
+	const data = objectValue$1(value);
+	const core = objectValue$1(data.record_core ?? data.recordCore);
+	const contentPayload = objectValue$1(data.content_payload ?? data.contentPayload ?? core.content_payload ?? core.contentPayload);
+	const mediaItems = listValue$16(data.media_items ?? data.mediaItems ?? core.media_items ?? core.mediaItems);
+	const mediaRefs = listValue$16(contentPayload.media_refs ?? contentPayload.mediaRefs);
+	const displayItems = [
+		...listValue$16(data.media_display_items ?? data.mediaDisplayItems),
+		...listValue$16(core.media_display_items ?? core.mediaDisplayItems),
+		...mediaItems
+	];
+	return extensionMediaRecord(recordUid, {
+		...contentPayload,
+		...mediaRefs.length > 0 || mediaItems.length === 0 ? {} : { media_refs: mediaItems }
+	}, displayItems);
+}
+function chatExtensionMediaRecord(value, recordUid) {
+	const child = objectValue$1(value);
+	const item = objectValue$1(child.item);
+	const record = objectValue$1(item.record);
+	const payload = objectValue$1(record.payload);
+	return extensionMediaRecord(recordUid, objectValue$1(payload.content_payload ?? payload.contentPayload ?? record.content_payload ?? record.contentPayload), [
+		...listValue$16(child.media_display_items ?? child.mediaDisplayItems),
+		...listValue$16(item.media_display_items ?? item.mediaDisplayItems),
+		...listValue$16(record.media_display_items ?? record.mediaDisplayItems),
+		...listValue$16(payload.media_display_items ?? payload.mediaDisplayItems)
+	]);
+}
+function uploadedExtensionMediaRecord(recordUid, assets) {
+	return extensionMediaRecord(recordUid, {
+		payload_kind: 2,
+		schema_version: 1,
+		media_refs: assets.map((asset, index) => ({
+			file_asset_uid: asset.fileAssetUid,
+			content_file_role: 1,
+			render_role: 1,
+			sort_order: index,
+			file_name: asset.fileName,
+			file_kind: asset.fileKind,
+			mime_type: asset.mimeType,
+			size: asset.size
+		}))
+	});
+}
 function messageCopyLinkRecordContextFromData(data) {
 	const context = objectValue$1(data.record_context ?? data.recordContext);
 	const extensions = listValue$16(context.extensions ?? context.extend_records ?? context.extendRecords ?? context.list ?? data.extensions ?? data.extend_records ?? data.extendRecords ?? data.list).map(messageCopyLinkExtensionItemFromData).filter((item) => item !== void 0);
@@ -19671,6 +19722,66 @@ var ChatService = class {
 		this.privacy = privacy;
 		this.messageActions = messageActions;
 	}
+	async hydrateExtensionMedia(projections, session, signal) {
+		const mediaProjections = projections.filter(({ extension }) => extension.mediaItems.length > 0);
+		if (mediaProjections.length === 0) return projections.map(({ extension }) => extension);
+		let directlyHydrated;
+		try {
+			directlyHydrated = new Map(mediaProjections.map(({ extension, mediaRecord }) => [extension.recordUid, this.media.richContentBlocks(mediaRecord, session.userId)]));
+		} catch (error) {
+			if (signal?.aborted === true) throw error;
+			const mediaRecordUids = new Set(mediaProjections.map(({ extension }) => extension.recordUid));
+			return projections.map(({ extension }) => mediaRecordUids.has(extension.recordUid) ? {
+				...extension,
+				mediaUnavailable: true
+			} : extension);
+		}
+		const unresolved = mediaProjections.filter(({ extension }) => (directlyHydrated.get(extension.recordUid)?.length ?? 0) === 0);
+		if (unresolved.length === 0) return projections.map(({ extension }) => {
+			const contentBlocks = directlyHydrated.get(extension.recordUid);
+			return contentBlocks === void 0 ? extension : {
+				...extension,
+				contentBlocks
+			};
+		});
+		try {
+			const media = await this.media.hydrateRecordMediaPage(unresolved.map(({ mediaRecord }) => mediaRecord), session, signal);
+			const hydratedByRecordUid = new Map(mediaProjections.map(({ extension, mediaRecord }) => {
+				const directContentBlocks = directlyHydrated.get(extension.recordUid) ?? [];
+				const displayItems = directContentBlocks.length > 0 ? [] : media.displayItemsByRecordUid.get(extension.recordUid) ?? [];
+				const contentBlocks = directContentBlocks.length > 0 ? directContentBlocks : this.media.richContentBlocks(mediaRecord, session.userId, displayItems);
+				return [extension.recordUid, {
+					...extension,
+					...contentBlocks.length === 0 ? { mediaUnavailable: true } : { contentBlocks }
+				}];
+			}));
+			return projections.map(({ extension }) => hydratedByRecordUid.get(extension.recordUid) ?? extension);
+		} catch (error) {
+			if (signal?.aborted === true) throw error;
+			const mediaRecordUids = new Set(mediaProjections.map(({ extension }) => extension.recordUid));
+			return projections.map(({ extension }) => {
+				const contentBlocks = directlyHydrated.get(extension.recordUid) ?? [];
+				if (contentBlocks.length > 0) return {
+					...extension,
+					contentBlocks
+				};
+				return mediaRecordUids.has(extension.recordUid) ? {
+					...extension,
+					mediaUnavailable: true
+				} : extension;
+			});
+		}
+	}
+	async hydrateUploadedExtension(extension, assets, session, signal) {
+		if (assets.length === 0) return extension;
+		return (await this.hydrateExtensionMedia([{
+			extension,
+			mediaRecord: uploadedExtensionMediaRecord(extension.recordUid, assets)
+		}], session, signal))[0] ?? {
+			...extension,
+			mediaUnavailable: true
+		};
+	}
 	async readDirectBotConversation(botId, chatSessionUid, options = {}) {
 		const normalizedBotId = botId.trim();
 		const normalizedSessionUid = chatSessionUid.trim();
@@ -20460,7 +20571,14 @@ var ChatService = class {
 					});
 					const rawItems = listValue$16(data.list ?? data.items);
 					if (offset === 0) total = Math.max(0, integerLikeValue(data.total));
-					const pageItems = rawItems.map((raw) => messageCopyLinkExtensionItemFromData(raw)).filter((item) => item !== void 0);
+					const pageProjections = rawItems.flatMap((raw) => {
+						const extension = messageCopyLinkExtensionItemFromData(raw);
+						return extension === void 0 ? [] : [{
+							extension,
+							mediaRecord: publicExtensionMediaRecord(raw, extension.recordUid)
+						}];
+					});
+					const pageItems = await this.hydrateExtensionMedia(pageProjections, session, signal);
 					extensions.push(...pageItems);
 					if (rawItems.length === 0) break;
 					offset += rawItems.length;
@@ -20493,7 +20611,14 @@ var ChatService = class {
 			parent_record_uid: parentRecordUid,
 			limit: 100
 		}, session, signal);
-		const extensions = listValue$16(data.children).map((child) => chatExtensionTreeItemFromData(child, parentRecordUid)).filter((item) => item !== void 0).sort((left, right) => right.sendAtMillis - left.sendAtMillis);
+		const projections = listValue$16(data.children).flatMap((child) => {
+			const extension = chatExtensionTreeItemFromData(child, parentRecordUid);
+			return extension === void 0 ? [] : [{
+				extension,
+				mediaRecord: chatExtensionMediaRecord(child, extension.recordUid)
+			}];
+		});
+		const extensions = (await this.hydrateExtensionMedia(projections, session, signal)).sort((left, right) => right.sendAtMillis - left.sendAtMillis);
 		const extensionCount = Math.max(integerLikeValue(data.total), extensions.length);
 		return extensionCount <= 0 ? void 0 : {
 			extensionCount,
@@ -20578,6 +20703,26 @@ var ChatService = class {
 			const createdRecordUid = stringValue$1(data.child_record_uid).trim() || normalizedUid;
 			const sequence = numberValue$19(data.seq);
 			this.realtime.scheduleChatSessionProjection(reference.chatSessionUid, sequence);
+			const extension = await this.hydrateUploadedExtension({
+				recordUid: createdRecordUid,
+				parentRecordUid: reference.recordUid,
+				recordOwnerUserId: session.userId,
+				level: extensionLevel,
+				sourceKind: "record_extension",
+				senderDisplayName: profile.nickname.trim() || profile.displayName.trim() || "我",
+				...profile.avatarRef.trim() === "" ? {} : { senderAvatarUrl: profile.avatarRef.trim() },
+				title: "",
+				textContent: normalizedText,
+				sendAtMillis,
+				templateKind: assets.length === 0 ? 1 : 2,
+				displayKind: 0,
+				officialMark: 0,
+				mediaItems: assets.map((asset) => ({
+					fileKind: asset.fileKind,
+					fileName: asset.fileName,
+					size: asset.size
+				}))
+			}, assets, session, options.signal);
 			return {
 				recordUid: createdRecordUid,
 				parentRecordUid: reference.recordUid,
@@ -20585,26 +20730,7 @@ var ChatService = class {
 				...sequence > 0 ? { sequence } : {},
 				status: 1,
 				localState: "synced",
-				extension: {
-					recordUid: createdRecordUid,
-					parentRecordUid: reference.recordUid,
-					recordOwnerUserId: session.userId,
-					level: extensionLevel,
-					sourceKind: "record_extension",
-					senderDisplayName: profile.nickname.trim() || profile.displayName.trim() || "我",
-					...profile.avatarRef.trim() === "" ? {} : { senderAvatarUrl: profile.avatarRef.trim() },
-					title: "",
-					textContent: normalizedText,
-					sendAtMillis,
-					templateKind: assets.length === 0 ? 1 : 2,
-					displayKind: 0,
-					officialMark: 0,
-					mediaItems: assets.map((asset) => ({
-						fileKind: asset.fileKind,
-						fileName: asset.fileName,
-						size: asset.size
-					}))
-				}
+				extension
 			};
 		}
 		if (source.kind === "topic") {
@@ -20648,32 +20774,33 @@ var ChatService = class {
 				revision: this.realtime.nextChatClientRevision(),
 				projection: "record"
 			});
+			const extension = await this.hydrateUploadedExtension({
+				recordUid: createdRecordUid,
+				parentRecordUid: reference.recordUid,
+				recordOwnerUserId: session.userId,
+				level: extensionLevel,
+				sourceKind: "record_extension",
+				senderDisplayName: profile.nickname.trim() || profile.displayName.trim() || "我",
+				...profile.avatarRef.trim() === "" ? {} : { senderAvatarUrl: profile.avatarRef.trim() },
+				title: "",
+				textContent: normalizedText,
+				sendAtMillis,
+				templateKind: assets.length === 0 ? 1 : 2,
+				displayKind: 0,
+				officialMark: 0,
+				mediaItems: assets.map((asset) => ({
+					fileKind: asset.fileKind,
+					fileName: asset.fileName,
+					size: asset.size
+				}))
+			}, assets, session, options.signal);
 			return {
 				recordUid: createdRecordUid,
 				parentRecordUid: createdParentUid,
 				...relationUid === "" ? {} : { relationUid },
 				status: numberValue$19(data.record_status ?? data.status),
 				localState: "synced",
-				extension: {
-					recordUid: createdRecordUid,
-					parentRecordUid: reference.recordUid,
-					recordOwnerUserId: session.userId,
-					level: extensionLevel,
-					sourceKind: "record_extension",
-					senderDisplayName: profile.nickname.trim() || profile.displayName.trim() || "我",
-					...profile.avatarRef.trim() === "" ? {} : { senderAvatarUrl: profile.avatarRef.trim() },
-					title: "",
-					textContent: normalizedText,
-					sendAtMillis,
-					templateKind: assets.length === 0 ? 1 : 2,
-					displayKind: 0,
-					officialMark: 0,
-					mediaItems: assets.map((asset) => ({
-						fileKind: asset.fileKind,
-						fileName: asset.fileName,
-						size: asset.size
-					}))
-				}
+				extension
 			};
 		}
 		if (source.kind === "send_to_self" || source.kind === "default_category") {
@@ -20687,32 +20814,33 @@ var ChatService = class {
 				revision: this.realtime.nextChatClientRevision(),
 				projection: "record"
 			});
+			const extension = await this.hydrateUploadedExtension({
+				recordUid: recordResult.recordUid,
+				parentRecordUid: reference.recordUid,
+				recordOwnerUserId: session.userId,
+				level: extensionLevel,
+				sourceKind: "record_extension",
+				senderDisplayName: profile.nickname.trim() || profile.displayName.trim() || "我",
+				...profile.avatarRef.trim() === "" ? {} : { senderAvatarUrl: profile.avatarRef.trim() },
+				title: "",
+				textContent: normalizedText,
+				sendAtMillis,
+				templateKind: assets.length === 0 ? 1 : 2,
+				displayKind: 0,
+				officialMark: 0,
+				mediaItems: assets.map((asset) => ({
+					fileKind: asset.fileKind,
+					fileName: asset.fileName,
+					size: asset.size
+				}))
+			}, assets, session, options.signal);
 			return {
 				recordUid: recordResult.recordUid,
 				parentRecordUid: reference.recordUid,
 				status: recordResult.status,
 				localState: recordResult.localState,
 				...recordResult.error === void 0 ? {} : { error: recordResult.error },
-				extension: {
-					recordUid: recordResult.recordUid,
-					parentRecordUid: reference.recordUid,
-					recordOwnerUserId: session.userId,
-					level: extensionLevel,
-					sourceKind: "record_extension",
-					senderDisplayName: profile.nickname.trim() || profile.displayName.trim() || "我",
-					...profile.avatarRef.trim() === "" ? {} : { senderAvatarUrl: profile.avatarRef.trim() },
-					title: "",
-					textContent: normalizedText,
-					sendAtMillis,
-					templateKind: assets.length === 0 ? 1 : 2,
-					displayKind: 0,
-					officialMark: 0,
-					mediaItems: assets.map((asset) => ({
-						fileKind: asset.fileKind,
-						fileName: asset.fileName,
-						size: asset.size
-					}))
-				}
+				extension
 			};
 		}
 		const existingExtension = (await this.loadMessageCopyLinkPublicExtensions([reference.recordUid], session, options.signal, { strict: true }))?.extensions.find((extension) => extension.recordUid === normalizedUid);
@@ -20792,29 +20920,30 @@ var ChatService = class {
 			revision: this.realtime.nextChatClientRevision(),
 			projection: "record"
 		});
+		const extension = await this.hydrateUploadedExtension({
+			recordUid: publishedRecordUid,
+			level: 2,
+			sourceKind: "record_extension",
+			senderDisplayName,
+			...senderAvatarUrl === "" ? {} : { senderAvatarUrl },
+			title: "",
+			textContent: normalizedText,
+			sendAtMillis,
+			templateKind: assets.length === 0 ? 1 : 2,
+			displayKind: 0,
+			officialMark: 0,
+			mediaItems: assets.map((asset) => ({
+				fileKind: asset.fileKind,
+				fileName: asset.fileName,
+				size: asset.size
+			}))
+		}, assets, session, options.signal);
 		return {
 			recordUid: publishedRecordUid,
 			parentRecordUid: reference.recordUid,
 			status: numberValue$19(data.status ?? data.check_status ?? createdRecordStatus),
 			localState: "synced",
-			extension: {
-				recordUid: publishedRecordUid,
-				level: 2,
-				sourceKind: "record_extension",
-				senderDisplayName,
-				...senderAvatarUrl === "" ? {} : { senderAvatarUrl },
-				title: "",
-				textContent: normalizedText,
-				sendAtMillis,
-				templateKind: assets.length === 0 ? 1 : 2,
-				displayKind: 0,
-				officialMark: 0,
-				mediaItems: assets.map((asset) => ({
-					fileKind: asset.fileKind,
-					fileName: asset.fileName,
-					size: asset.size
-				}))
-			}
+			extension
 		};
 	}
 	async extendMessageCopyLink(sid, itemIndex, textContent, recordUid, options = {}) {

package/lib/types/client/ArkmeNoteDetails.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkmeNoteDetails.d.ts","sourceRoot":"","sources":["../../../src/client/ArkmeNoteDetails.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAMV,8BAA8B,EAE9B,iBAAiB,EAClB,MAAM,aAAa,CAAA;AA0WpB,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAE7E;AA6ID,wBAAgB,yBAAyB,CAAC,EACxC,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,qBAAqB,EAAE,eAAe,EAAE,OAAO,GACxH,EAAE;IACD,IAAI,EAAE,iBAAiB,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,YAAY,EAAE,OAAO,CAAA;IACrB,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,gBAAgB,EAAE,MAAM,IAAI,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7C,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,8BAA8B,KAAK,IAAI,CAAA;IAClE,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACpC,+BAmMA;AAcD,wBAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,sCAiDvG"}
+{"version":3,"file":"ArkmeNoteDetails.d.ts","sourceRoot":"","sources":["../../../src/client/ArkmeNoteDetails.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAMV,8BAA8B,EAE9B,iBAAiB,EAClB,MAAM,aAAa,CAAA;AAyWpB,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAE7E;AA6ID,wBAAgB,yBAAyB,CAAC,EACxC,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,qBAAqB,EAAE,eAAe,EAAE,OAAO,GACxH,EAAE;IACD,IAAI,EAAE,iBAAiB,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,YAAY,EAAE,OAAO,CAAA;IACrB,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,gBAAgB,EAAE,MAAM,IAAI,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7C,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,8BAA8B,KAAK,IAAI,CAAA;IAClE,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACpC,+BAmMA;AAcD,wBAAgB,oBAAoB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,sCAiDvG"}