@senguoyun/dsh-arkme 0.1.60 → 0.1.61

package/lib/harness-onboarding-client.js

@@ -21,19 +21,79 @@ window.__ModuleLoader__.load({
 			} catch {}
 		}
 		//#endregion
+		//#region src/harness-embed-contract.ts
+		const ARKME_NATIVE_SELECTION_CLIENT_ID = "@senguoyun/dsh-arkme/harness-native-selection";
+		//#endregion
+		//#region src/client/harness-native-selection-loader.ts
+		/** Called after native readiness. This resource is deliberately absent from the boot graph. */
+		function loadNativeSelection(ctx, doc, url) {
+			const modules = ctx.modules;
+			if (typeof modules?.import !== "function") return () => {};
+			let stopped = false;
+			let restore;
+			const script = doc.createElement("script");
+			script.src = url;
+			script.async = true;
+			const failed = () => {
+				script.remove();
+				console.warn("Arkme native selection unavailable; native chat remains active.");
+			};
+			script.onerror = failed;
+			script.onload = () => {
+				modules.import(ARKME_NATIVE_SELECTION_CLIENT_ID).then((value) => {
+					if (stopped) return;
+					const module = value;
+					if (typeof module?.install !== "function") throw new Error("Missing native selection entry");
+					restore = module.install(ctx, doc);
+				}).catch(() => {
+					if (!stopped) failed();
+				});
+			};
+			doc.head.append(script);
+			return () => {
+				if (stopped) return;
+				stopped = true;
+				script.onload = null;
+				script.onerror = null;
+				script.remove();
+				restore?.();
+			};
+		}
+		//#endregion
 		//#region src/client/harness-onboarding-client.tsx
-		const inject = ["slots", "sessions"];
+		const inject = [
+			"slots",
+			"sessions",
+			"modules"
+		];
 		/** Runs in the native iframe. The settings coordinator owns when this step mounts. */
 		function apply(ctx) {
 			const sessions = ctx.sessions;
 			let completed = false;
 			let wasActive;
+			let selectionStarted = false;
+			let disposeSelection;
+			let selectionTimer;
 			const publish = () => {
 				const snapshot = sessions.list.getSnapshot();
 				const active = snapshot.phase === "ready" && (snapshot.current === void 0 || snapshot.byId[snapshot.current]?.blank === true);
 				if (active && wasActive === false) completed = false;
 				wasActive = active;
-				const state = snapshot.phase === "ready" && (!active || completed) ? "ready" : "pending";
+				const ready = snapshot.phase === "ready" && (!active || completed);
+				const state = ready ? "ready" : "pending";
+				if (ready && !selectionStarted) {
+					const asset = document.querySelector("meta[name=\"arkme-native-selection\"]")?.content;
+					if (asset && /^\/arkme-self\/harness-native-selection-client\.js\?rev=[a-f0-9]+$/.test(asset)) {
+						selectionStarted = true;
+						selectionTimer = setTimeout(() => {
+							try {
+								disposeSelection = loadNativeSelection(ctx, document, asset);
+							} catch (error) {
+								console.warn("Arkme native selection could not start.", error);
+							}
+						}, 0);
+					}
+				}
 				if (document.body.dataset.arkmeHarnessOnboarding !== state) {
 					document.body.dataset.arkmeHarnessOnboarding = state;
 					homeTourDiagnostic("harness-onboarding-state", {
@@ -56,6 +116,8 @@ window.__ModuleLoader__.load({
 				const unsubscribe = sessions.list.subscribe(publish);
 				return () => {
 					unsubscribe();
+					clearTimeout(selectionTimer);
+					disposeSelection?.();
 					delete document.body.dataset.arkmeHarnessOnboarding;
 				};
 			}, "arkme: native onboarding readiness");

package/lib/harness-session-client.js

@@ -4,8 +4,16 @@ window.__ModuleLoader__.load({
 		var module = { exports: {} };
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+		//#region src/harness-embed-contract.ts
+		/** Same-origin bridge owned and disposed by the embedded session client. */
+		const HARNESS_SESSION_NAVIGATION_KEY = "__arkmeHarnessSessionNavigation";
+		//#endregion
 		//#region src/client/harness-session-client.ts
-		const inject = ["sessions"];
+		const inject = [
+			"sessions",
+			"remote",
+			"remote.session"
+		];
 		const REFRESH_MS = 1e4;
 		/** The iframe reads selection through the public DSH store; Arkme owns visibility. */
 		function apply(ctx) {
@@ -13,9 +21,37 @@ window.__ModuleLoader__.load({
 				const surface = window.frameElement?.parentElement;
 				if (surface?.getAttribute("data-arkme-owned") !== "deepseek-harness-surface") return () => void 0;
 				const apiPath = document.querySelector("meta[name=\"arkme-session-api\"]")?.content;
-				if (apiPath === void 0 || !/^\/[A-Za-z0-9/_-]+$/.test(apiPath)) return () => void 0;
 				const sessions = ctx.sessions;
 				if (sessions === void 0) return () => void 0;
+				const frameWindow = window;
+				const navigation = {
+					async has(sessionId) {
+						if (!/^[A-Za-z0-9_.:-]{1,256}$/.test(sessionId)) throw new Error("DSH 对话标识无效");
+						const remote = ctx.remote?.session;
+						if (typeof remote?.list !== "function") throw new Error("当前 DSH 版本无法核验本机会话");
+						const result = await remote.list({});
+						if (!result.ok) throw new Error(result.error?.message || "本机会话列表读取失败，请稍后重试");
+						if (!Array.isArray(result.value?.items)) throw new Error("本机会话列表响应不完整");
+						if (!result.value.items.some((item) => item.sessionId === sessionId)) return false;
+						const refreshable = sessions;
+						if (sessions.list.getSnapshot().byId[sessionId] === void 0) {
+							if (typeof refreshable.refresh !== "function") throw new Error("本机会话列表尚未就绪，请稍后重试");
+							await refreshable.refresh();
+						}
+						if (sessions.list.getSnapshot().byId[sessionId] === void 0) throw new Error("本机会话列表尚未就绪，请稍后重试");
+						return true;
+					},
+					open(sessionId) {
+						if (typeof sessionId !== "string" || sessionId.trim() === "") throw new Error("DSH 对话标识无效");
+						if (typeof sessions.open !== "function") throw new Error("当前 DSH 版本暂不支持打开任务");
+						sessions.open(sessionId);
+					}
+				};
+				frameWindow[HARNESS_SESSION_NAVIGATION_KEY] = navigation;
+				const disposeNavigation = () => {
+					if (frameWindow["__arkmeHarnessSessionNavigation"] === navigation) delete frameWindow[HARNESS_SESSION_NAVIGATION_KEY];
+				};
+				if (apiPath === void 0 || !/^\/[A-Za-z0-9/_-]+$/.test(apiPath)) return disposeNavigation;
 				const windowRef = crypto.randomUUID();
 				let revision = 0;
 				let stopped = false;
@@ -106,6 +142,7 @@ window.__ModuleLoader__.load({
 				window.addEventListener("pageshow", changed);
 				report();
 				return () => {
+					disposeNavigation();
 					stopped = true;
 					clearSelection();
 					observer.disconnect();

package/lib/index.js

@@ -1,4 +1,4 @@
-import { $ as ARKME_DEFAULT_SHARE_WEBSITE, A as inspectNativeBundleArtifactV3, At as createDesktopLifecycleReader, D as bundleSha256, Dt as ArkmePluginError, E as arkmeSandboxEntryId, Et as normalizeRecentEmojiIds, F as assertExtensionArtifactSize, Ft as __toCommonJS, G as validateVoiceprintPcm16Wav, I as canonicalExtensionJson, J as arkmeRequiredLinkMetadataFallback, K as arkmeExtensionShareRefFromLink, L as sha256Hex, M as packLocalNativeBundleDirectoryV3, Mt as __esmMin, N as readNativeBundleTarballV3, Nt as __exportAll, O as canonicalBundleJson, Ot as retryAfterMillis, P as renderArkmeSandboxHostEntry, Pt as __require, Q as parseArkmeRecordReeditAttachments, R as unpackArkmeExtension, S as ARKME_BUNDLE_ARTIFACT_KIND, St as sameRecordingImportIdentity, T as ArkmeBundleArtifactError, Tt as isRecentEmojiId, U as ARKME_EXTENSION_RUNTIME_UNAVAILABLE_MESSAGE, W as ArkmeService, X as arkmeRichBackgroundSound, Y as arkmeFileBackgroundSound, Z as ArkmeRecordReeditDraftConflict, _ as arkmeClientContentDigest, _t as SecretValue, at as ARKME_WORLD_PUBLISH_MAX_IMAGE_BYTES, b as verifyExtensionResolutionSignature, bt as isUnresolvedRecordingImportJob, c as persistentExtensionBundleDirectory, ct as mergeMemberJoinEvents, d as readPersistentExtensionActivation, dt as ARKME_TOOL_FILE_MAX_BYTES, et as ARKME_PROVIDER_CONTRACT_VERSION, f as refreshPersistentClientWrapper, ft as arkmeCanInlineLocalFile, g as activeProfileExtensionOwnerConflicts, gt as ArkmeOutgoingCallError, h as renderArkmeBundleClientBundle, ht as isArkmeBotAvatarRef, i as invokePersistentArkmeExtension, it as ARKME_WORLD_PUBLISH_MAX_IMAGES, j as packBundleFiles, jt as __commonJSMin, k as inspectBundleArtifact, kt as recordOwnerId, l as persistentExtensionPackageIdentity, lt as validateMemberUpdate, m as writePersistentExtensionActivation, mt as arkmePickedFileKind, o as persistentArkmeExtensionRuntimeState, ot as applyMemberUpdate, p as repairPersistentExtensionInstallation, pt as arkmeNormalizedFileMimeType, q as arkmeIsGenericLinkMetadataTitle, r as deactivatePersistentArkmeExtension, s as materializePersistentExtensionBundle, st as cachedMemberItem, t as activatePersistentArkmeExtension, u as quarantinePersistentExtension, ut as ARKME_RUNTIME_INSTANCE_ID, v as arkmeClientContentDigestFromSource, vt as ArkmeDirectMessageAdmissionError, w as ARKME_NATIVE_BUNDLE_ARTIFACT_KIND, wt as recordingImportFileNameKey, x as verifyNativeBundleResolutionSignature, xt as recordingImportFileKind, y as verifyBundleResolutionSignature, yt as isRecordingInstantOnOrAfterUnixEpoch, z as ARKME_EXTENSION_FORMAT } from "./persistent-runtime-DqPfc6RO.js";
+import { $ as ARKME_DEFAULT_SHARE_WEBSITE, A as inspectNativeBundleArtifactV3, At as registerDSHAgentInputRecordSync, D as bundleSha256, Dt as ArkmePluginError, E as arkmeSandboxEntryId, Et as normalizeRecentEmojiIds, F as assertExtensionArtifactSize, Ft as __require, G as validateVoiceprintPcm16Wav, I as canonicalExtensionJson, It as __toCommonJS, J as arkmeRequiredLinkMetadataFallback, K as arkmeExtensionShareRefFromLink, L as sha256Hex, M as packLocalNativeBundleDirectoryV3, Mt as __commonJSMin, N as readNativeBundleTarballV3, Nt as __esmMin, O as canonicalBundleJson, Ot as retryAfterMillis, P as renderArkmeSandboxHostEntry, Pt as __exportAll, Q as parseArkmeRecordReeditAttachments, R as unpackArkmeExtension, S as ARKME_BUNDLE_ARTIFACT_KIND, St as sameRecordingImportIdentity, T as ArkmeBundleArtifactError, Tt as isRecentEmojiId, U as ARKME_EXTENSION_RUNTIME_UNAVAILABLE_MESSAGE, W as ArkmeService, X as arkmeRichBackgroundSound, Y as arkmeFileBackgroundSound, Z as ArkmeRecordReeditDraftConflict, _ as arkmeClientContentDigest, _t as SecretValue, at as ARKME_WORLD_PUBLISH_MAX_IMAGE_BYTES, b as verifyExtensionResolutionSignature, bt as isUnresolvedRecordingImportJob, c as persistentExtensionBundleDirectory, ct as mergeMemberJoinEvents, d as readPersistentExtensionActivation, dt as ARKME_TOOL_FILE_MAX_BYTES, et as ARKME_PROVIDER_CONTRACT_VERSION, f as refreshPersistentClientWrapper, ft as arkmeCanInlineLocalFile, g as activeProfileExtensionOwnerConflicts, gt as ArkmeOutgoingCallError, h as renderArkmeBundleClientBundle, ht as isArkmeBotAvatarRef, i as invokePersistentArkmeExtension, it as ARKME_WORLD_PUBLISH_MAX_IMAGES, j as packBundleFiles, jt as createDesktopLifecycleReader, k as inspectBundleArtifact, kt as recordOwnerId, l as persistentExtensionPackageIdentity, lt as validateMemberUpdate, m as writePersistentExtensionActivation, mt as arkmePickedFileKind, o as persistentArkmeExtensionRuntimeState, ot as applyMemberUpdate, p as repairPersistentExtensionInstallation, pt as arkmeNormalizedFileMimeType, q as arkmeIsGenericLinkMetadataTitle, r as deactivatePersistentArkmeExtension, s as materializePersistentExtensionBundle, st as cachedMemberItem, t as activatePersistentArkmeExtension, u as quarantinePersistentExtension, ut as ARKME_RUNTIME_INSTANCE_ID, v as arkmeClientContentDigestFromSource, vt as ArkmeDirectMessageAdmissionError, w as ARKME_NATIVE_BUNDLE_ARTIFACT_KIND, wt as recordingImportFileNameKey, x as verifyNativeBundleResolutionSignature, xt as recordingImportFileKind, y as verifyBundleResolutionSignature, yt as isRecordingInstantOnOrAfterUnixEpoch, z as ARKME_EXTENSION_FORMAT } from "./persistent-runtime-CXd9RuRR.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-y7wzJLOx.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-DLXDyohJ.js";
 import { i as invokeArkmeBundle, n as arkmeBundleActive, r as deactivateArkmeBundle } from "./bundle-runtime-CE73h3vS.js";
@@ -148,6 +148,7 @@ const ARKME_HARNESS_MODEL_CLIENT_PATH = "/arkme-self/harness-model-client.js";
 const ARKME_HARNESS_ONBOARDING_CLIENT_PATH = "/arkme-self/harness-onboarding-client.js";
 const ARKME_HARNESS_TRAJECTORY_CLIENT_PATH = "/arkme-self/harness-trajectory-client.js";
 const ARKME_HARNESS_SIDEBAR_CLIENT_PATH = "/arkme-self/harness-sidebar-client.js";
+const ARKME_NATIVE_SELECTION_CLIENT_PATH = "/arkme-self/harness-native-selection-client.js";
 //#endregion
 //#region src/plugin-update-policy.ts
 const PLUGIN_UPDATE_TERMINAL_STATE_TTL_MS = 10 * 6e4;
@@ -10481,103 +10482,6 @@ function createOpenClawFileSecretStore(options) {
 	};
 }
 //#endregion
-//#region src/dsh-agent-input-sync.ts
-function sessionEventSource(value) {
-	return value !== null && typeof value === "object" && typeof value.on === "function" ? value : void 0;
-}
-function objectValue$2(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
-function stringValue(value) {
-	return typeof value === "string" ? value : "";
-}
-function numberValue(value) {
-	return typeof value === "number" && Number.isFinite(value) ? value : 0;
-}
-function stableRecordUid(namespace, key) {
-	const bytes = createHash("sha256").update(`dsh-arkme:${namespace}:${key}`).digest().subarray(0, 16);
-	bytes[6] = (bytes[6] ?? 0) & 15 | 80;
-	bytes[8] = (bytes[8] ?? 0) & 63 | 128;
-	const hex = bytes.toString("hex");
-	return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
-}
-function dshAgentInputRecordUid(sessionId, eventSeq) {
-	return stableRecordUid("dsh-agent-input", `${sessionId}\0${String(eventSeq)}`);
-}
-function dshAgentInputTextFromEvent(event) {
-	const envelope = objectValue$2(event);
-	if (envelope.type !== "user/message") return void 0;
-	const data = objectValue$2(envelope.data);
-	if (objectValue$2(data.source).kind !== "user") return void 0;
-	const text = (Array.isArray(data.content) ? data.content : []).map((block) => {
-		const item = objectValue$2(block);
-		return item.type === "text" ? stringValue(item.text).trim() : "";
-	}).filter(Boolean).join("\n").trim();
-	return text === "" ? void 0 : text;
-}
-function registerDSHAgentInputRecordSync(ctx, service, options = {}) {
-	const logger = options.logger ?? ctx.logger;
-	const maxAttempts = Math.max(1, Math.trunc(options.maxAttempts ?? 3));
-	const retryDelayMillis = Math.max(0, Math.trunc(options.retryDelayMillis ?? 5e3));
-	const inFlight = /* @__PURE__ */ new Set();
-	const synced = /* @__PURE__ */ new Set();
-	const timers = /* @__PURE__ */ new Set();
-	let disposed = false;
-	const sync = (key, recordUid, text, sendAtMillis, attempt) => {
-		inFlight.add(key);
-		let retrying = false;
-		service.createDSHAgentInputText(recordUid, text, sendAtMillis).then(() => {
-			if (disposed) return;
-			synced.add(key);
-		}).catch((error) => {
-			if (disposed) return;
-			if (attempt < maxAttempts) {
-				retrying = true;
-				const timer = setTimeout(() => {
-					timers.delete(timer);
-					if (disposed) {
-						inFlight.delete(key);
-						return;
-					}
-					sync(key, recordUid, text, sendAtMillis, attempt + 1);
-				}, retryDelayMillis);
-				timers.add(timer);
-				return;
-			}
-			const message = error instanceof Error && error.message.trim() !== "" ? error.message : String(error);
-			logger.warn(`dsh-arkme: failed to sync DSH Agent input record: ${message}`);
-		}).finally(() => {
-			if (!retrying || disposed) inFlight.delete(key);
-		});
-	};
-	const listener = (rawSession, rawEvent) => {
-		if (disposed) return;
-		const event = objectValue$2(rawEvent);
-		const sessionId = stringValue(objectValue$2(rawSession).id).trim();
-		const eventSeq = Math.trunc(numberValue(event.seq));
-		if (sessionId === "" || eventSeq < 0) return;
-		const text = dshAgentInputTextFromEvent(event);
-		if (text === void 0) return;
-		const key = `${sessionId}\0${String(eventSeq)}`;
-		if (inFlight.has(key) || synced.has(key)) return;
-		sync(key, dshAgentInputRecordUid(sessionId, eventSeq), text, numberValue(event.time), 1);
-	};
-	ctx.effect(() => {
-		const source = sessionEventSource(ctx);
-		if (source === void 0) {
-			logger.warn("dsh-arkme: DSH session/event API is unavailable; DSH Agent input sync disabled");
-			return () => {};
-		}
-		const dispose = source.on("session/event", listener, { global: true });
-		return () => {
-			disposed = true;
-			dispose();
-			for (const timer of timers) clearTimeout(timer);
-			timers.clear();
-		};
-	}, "dsh-arkme: DSH Agent input record sync");
-}
-//#endregion
 //#region src/directory-reader.ts
 /** Transport-neutral dispatch only: each business owner keeps its own projection and credentials. */
 function readDirectoryPage(service, teams, section, options = {}) {
@@ -11825,6 +11729,7 @@ async function dispatchArkmeHostOperation(service, operation, params, updateMana
 		case "source.interwoven-detail": return await service.interwovenMomentDetail(requiredInterwovenParam(params, "sourceRef"), requiredInterwovenParam(params, "momentRef"));
 		case "source.related-quick-notes.from-message": return await service.relatedQuickNotesFromMessage(requiredRelatedQuickNoteParam(params, "sourceRef"), requiredRelatedQuickNoteParam(params, "messageActionRef", MAX_MESSAGE_ACTION_REF_CHARS), requestSignal);
 		case "source.related-quick-notes.from-moment": return await service.relatedQuickNotesFromMoment(requiredRelatedQuickNoteParam(params, "sourceRef"), requiredRelatedQuickNoteParam(params, "momentRef"), requestSignal);
+		case "source.record-edit-history": return await service.recordEditHistoryPage(stringParam(params, "sourceRef"), stringParam(params, "messageActionRef"), numberParam(params, "cursorEditAt", 0), requestSignal);
 		case "source.related-quick-note.detail": return await service.relatedQuickNoteDetail(requiredRelatedQuickNoteParam(params, "sourceRef"), requiredRelatedQuickNoteParam(params, "relatedRef"), requestSignal);
 		case "source.message-preparing.report":
 		case "source.message-preparing.cancel": {
@@ -12559,7 +12464,8 @@ function createHarnessEmbedRouteHandler(options) {
 				projectedGraph.rev = shortHash(`${projectedGraph.rev}:${rev}`);
 			}
 			let html = replaceHarnessBootGraph(await options.readRootHtml(request), fullGraph, projectedGraph);
-			if (options.sessionClient !== void 0) {
+			if (options.selectionClientRevision && /^[a-f0-9]+$/.test(options.selectionClientRevision)) html = html.replace("</head>", `<meta name="arkme-native-selection" content="/arkme-self/harness-native-selection-client.js?rev=${options.selectionClientRevision}"></head>`);
+			if (options.sessionClient?.apiPath !== void 0) {
 				const apiPath = options.sessionClient.apiPath;
 				if (!/^\/[A-Za-z0-9/_-]+$/.test(apiPath) || !html.includes("</head>")) throw new Error("harness session observer configuration is invalid");
 				html = html.replace("</head>", `<meta name="arkme-session-api" content="${apiPath}"></head>`);
@@ -16596,10 +16502,9 @@ async function parseHttpError(response) {
 }
 function requestImageAttachments(options) {
 	const result = [];
-	for (const message of options.messages) {
-		if (message.role !== "user") continue;
-		for (const block of message.content) if (block.type === "image") result.push(block.attachment);
-	}
+	for (const message of options.messages) if (message.role === "system") assertTextOnly(message.content, "系统消息");
+	else if (message.role === "assistant") assertAssistantBlocks(message.content);
+	else for (const block of userContentLeaves(message.content)) if (block.type === "image") result.push(block.attachment);
 	return result;
 }
 function inputAssetOwnerAttachmentScope(bearer, attachment) {
@@ -16633,15 +16538,11 @@ function assertTextOnly(blocks, location) {
 function assertAssistantBlocks(blocks) {
 	for (const block of blocks) if (block.type !== "text" && block.type !== "reasoning" && block.type !== "tool-call") throw new LlmError(`助手消息不支持内容类型“${block.type}”`, "UNSUPPORTED_CONTENT");
 }
-function assertUserBlocks(blocks) {
-	for (const block of blocks) {
-		if (block.type === "text" || block.type === "image") continue;
-		if (block.type === "tool-result") {
-			assertTextOnly(block.content, "工具结果");
-			continue;
-		}
-		throw new LlmError(`用户消息不支持内容类型“${block.type}”`, "UNSUPPORTED_CONTENT");
-	}
+/** One traversal for validation, image accounting and tool-result serialization. */
+function* userContentLeaves(blocks) {
+	for (const block of blocks) if (block.type === "text" || block.type === "image") yield block;
+	else if (block.type === "tool-result") yield* userContentLeaves(block.content);
+	else throw new LlmError(`用户或工具结果不支持内容类型“${block.type}”`, "UNSUPPORTED_CONTENT");
 }
 function limitConcurrency(maximum, operation, signal) {
 	let active = 0;
@@ -16706,47 +16607,78 @@ function serializeAssistant(message) {
 	};
 }
 async function serializeMessages(messages, resolveImage, signal) {
-	for (const message of messages) if (message.role === "system") assertTextOnly(message.content, "系统消息");
-	else if (message.role === "assistant") assertAssistantBlocks(message.content);
-	else assertUserBlocks(message.content);
 	const resolveImageLimited = limitConcurrency(MAX_CONCURRENT_INPUT_ASSET_UPLOADS, resolveImage, signal);
-	return (await Promise.all(messages.map(async (message) => {
-		if (message.role === "system") return [{
-			role: "system",
-			content: flattenText(message.content)
-		}];
-		if (message.role === "assistant") return [serializeAssistant(message)];
+	const contentParts = async (blocks) => (await Promise.all(Array.from(userContentLeaves(blocks), async (block) => block.type === "text" ? {
+		type: "text",
+		text: block.text
+	} : {
+		type: "image_asset",
+		asset_ref: await resolveImageLimited(block.attachment)
+	}))).filter((part) => part.type !== "text" || part.text.length > 0);
+	const groups = await Promise.all(messages.map(async (message) => {
+		if (message.role === "system") return {
+			regular: {
+				role: "system",
+				content: flattenText(message.content)
+			},
+			tools: [],
+			toolImages: []
+		};
+		if (message.role === "assistant") return {
+			regular: serializeAssistant(message),
+			tools: [],
+			toolImages: []
+		};
 		const toolResults = message.content.filter((block) => block.type === "tool-result");
-		const parts = (await Promise.all(message.content.map(async (block) => {
-			if (block.type === "text") return block.text.length === 0 ? void 0 : {
-				type: "text",
-				text: block.text
-			};
-			if (block.type === "image") return {
-				type: "image_asset",
-				asset_ref: await resolveImageLimited(block.attachment)
-			};
-		}))).filter((part) => part !== void 0);
-		const wire = [];
-		if (parts.length > 0 || toolResults.length === 0) if (parts.length === 0) wire.push({
+		const [parts, results] = await Promise.all([contentParts(message.content.filter((block) => block.type !== "tool-result")), Promise.all(toolResults.map(async (result) => ({
+			result,
+			parts: await contentParts(result.content)
+		})))]);
+		let regular;
+		if (parts.length > 0 || toolResults.length === 0) regular = {
 			role: "user",
-			content: ""
-		});
-		else if (parts.every((part) => part.type === "text")) wire.push({
-			role: "user",
-			content: parts.map((part) => part.type === "text" ? part.text : "").join("")
-		});
-		else wire.push({
+			content: parts.every((part) => part.type === "text") ? parts.map((part) => part.type === "text" ? part.text : "").join("") : parts
+		};
+		const tools = [];
+		const toolImages = [];
+		for (const { result, parts: resultParts } of results) {
+			tools.push({
+				role: "tool",
+				tool_call_id: String(result.toolCallId),
+				content: resultParts.map((part) => part.type === "text" ? part.text : "").join("") || "(no output)"
+			});
+			const images = resultParts.filter((part) => part.type === "image_asset");
+			if (images.length > 0) toolImages.push({
+				type: "text",
+				text: `Images from tool call ${String(result.toolCallId)}:`
+			}, ...images);
+		}
+		return {
+			...regular === void 0 ? {} : { regular },
+			tools,
+			toolImages
+		};
+	}));
+	const wire = [];
+	let pendingToolImages = [];
+	const flushToolImages = () => {
+		if (pendingToolImages.length === 0) return;
+		wire.push({
 			role: "user",
-			content: parts
-		});
-		for (const result of toolResults) wire.push({
-			role: "tool",
-			tool_call_id: String(result.toolCallId),
-			content: flattenText(result.content) || "(no output)"
+			content: pendingToolImages
 		});
-		return wire;
-	}))).flat();
+		pendingToolImages = [];
+	};
+	for (const group of groups) {
+		if (group.regular !== void 0) {
+			flushToolImages();
+			wire.push(group.regular);
+		}
+		wire.push(...group.tools);
+		pendingToolImages.push(...group.toolImages);
+	}
+	flushToolImages();
+	return wire;
 }
 async function serializeRequest(options, resolveImage, signal) {
 	const messages = [];
@@ -17354,6 +17286,10 @@ function managedAiLocalizedFailure(facts) {
 		code: facts.code,
 		message: "无法读取历史图片，请检查本地附件存储后重试"
 	};
+	if (facts.code === "UNSUPPORTED_CONTENT") return {
+		code: facts.code,
+		message: "当前模型或图片服务不支持这类内容，请检查模型选择和附件后重试"
+	};
 	if (facts.code === "CONTEXT_WINDOW_EXCEEDED") return {
 		code: facts.code,
 		message: "对话内容过长，请新建对话或减少上下文后重试"
@@ -36514,7 +36450,7 @@ function apply(ctx, config) {
 		...config,
 		fileStateDirectory: join(stateDirectory, "files"),
 		recordingImportDirectory: join(stateDirectory, "recording-imports")
-	}, sessionStore, localDatabase, fetch, pendingSessionStore);
+	}, sessionStore, localDatabase, fetch, pendingSessionStore, void 0, void 0, void 0, () => ctx.get("sessionQuery"));
 	const openApiMcpCredentialNamespace = `${config.keychainServicePrefix}.${config.environment}.openapi-mcp`;
 	const openApiMcpController = new ManagedOpenApiMcpController({
 		mountMcp: config.openApiMcpEnabled,
@@ -36887,11 +36823,11 @@ function apply(ctx, config) {
 		expectedPort: ctx.webServer.port,
 		allowNonLoopback: config.allowNonLoopback
 	});
-	const sessionClient = config.dshRemoteFeatureEnabled ? {
+	const sessionClient = {
 		source: readFileSync(new URL("../lib/harness-session-client.js", import.meta.url)),
-		apiPath: config.routePath
-	} : void 0;
-	if (sessionClient !== void 0) ctx.effect(() => ctx.webServer.register({
+		...config.dshRemoteFeatureEnabled ? { apiPath: config.routePath } : {}
+	};
+	ctx.effect(() => ctx.webServer.register({
 		kind: "exact",
 		path: HARNESS_SESSION_CLIENT_PATH,
 		handler: (_request, response) => {
@@ -36906,6 +36842,24 @@ function apply(ctx, config) {
 	const harnessOnboardingClient = readFileSync(new URL("../lib/harness-onboarding-client.js", import.meta.url));
 	const harnessTrajectoryClient = readFileSync(new URL("../lib/harness-trajectory-client.js", import.meta.url));
 	const harnessSidebarClient = readFileSync(new URL("../lib/harness-sidebar-client.js", import.meta.url));
+	let selectionClientRevision;
+	try {
+		const selectionClient = readFileSync(new URL("../lib/harness-native-selection-client.js", import.meta.url));
+		selectionClientRevision = createHash("sha256").update(selectionClient).digest("hex");
+		ctx.effect(() => ctx.webServer.register({
+			kind: "exact",
+			path: ARKME_NATIVE_SELECTION_CLIENT_PATH,
+			handler: (_request, response) => {
+				response.writeHead(200, {
+					"Content-Type": "application/javascript",
+					"Cache-Control": "no-cache"
+				});
+				response.end(selectionClient);
+			}
+		}), "arkme: optional native selection asset");
+	} catch {
+		ctx.logger.warn("dsh-arkme: optional native selection asset unavailable");
+	}
 	ctx.effect(() => ctx.webServer.register({
 		kind: "exact",
 		path: ARKME_HARNESS_SIDEBAR_CLIENT_PATH,
@@ -36940,6 +36894,7 @@ function apply(ctx, config) {
 		}
 	}), "arkme: Harness onboarding bridge asset");
 	const harnessEmbedHandler = createHarnessEmbedRouteHandler({
+		...selectionClientRevision === void 0 ? {} : { selectionClientRevision },
 		sidebarClient: {
 			id: "@senguoyun/dsh-arkme/harness-sidebar",
 			url: ARKME_HARNESS_SIDEBAR_CLIENT_PATH,
@@ -36956,10 +36911,10 @@ function apply(ctx, config) {
 			rev: createHash("sha256").update(harnessOnboardingClient).digest("hex"),
 			external: ["react"]
 		},
-		...sessionClient === void 0 ? {} : { sessionClient: {
+		sessionClient: {
 			revision: createHash("sha256").update(sessionClient.source).digest("hex").slice(0, 12),
-			apiPath: sessionClient.apiPath
-		} },
+			..."apiPath" in sessionClient ? { apiPath: sessionClient.apiPath } : {}
+		},
 		modelClient: {
 			id: "@senguoyun/dsh-arkme/harness-model",
 			url: ARKME_HARNESS_MODEL_CLIENT_PATH,

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-DqPfc6RO.js";
+import { a as persistentArkmeExtensionActive, i as invokePersistentArkmeExtension, n as applyPersistentArkmeHostExtension, o as persistentArkmeExtensionRuntimeState, r as deactivatePersistentArkmeExtension, t as activatePersistentArkmeExtension } from "./persistent-runtime-CXd9RuRR.js";
 export { activatePersistentArkmeExtension, applyPersistentArkmeHostExtension, deactivatePersistentArkmeExtension, invokePersistentArkmeExtension, persistentArkmeExtensionActive, persistentArkmeExtensionRuntimeState };