@senguoyun/dsh-arkme 0.1.56 → 0.1.58

package/lib/harness-trajectory-client.js

@@ -0,0 +1,254 @@
+window.__ModuleLoader__.load({
+	id: "@senguoyun/dsh-arkme/harness-trajectory",
+	factory: (require) => {
+		var module = { exports: {} };
+		var exports = module.exports;
+		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+		//#region src/client/harness-trajectory-menu.ts
+		const HEADER_SLOT = "[data-slot=\"conversation.session.header\"]";
+		const UTILITIES_SLOT = "[data-slot=\"conversation.session.header.utilities\"]";
+		const OWNED = "[data-arkme-harness-return], [data-arkme-harness-trajectory-item]";
+		const TABS_MARKER = "data-arkme-harness-view-tabs";
+		const HEADER_MARKER = "data-arkme-harness-compact-header";
+		const COPY = [{
+			chat: "对话",
+			trajectory: "轨迹",
+			more: "更多操作",
+			view: "查看轨迹",
+			back: "← 返回对话"
+		}, {
+			chat: "Chat",
+			trajectory: "Trajectory",
+			more: "More actions",
+			view: "View trajectory",
+			back: "← Back to chat"
+		}];
+		/** Only recognize the native two-view header; new upstream views keep their own navigation. */
+		function navigation(header) {
+			const tablists = header.querySelectorAll(":scope > [role=\"tablist\"]");
+			if (tablists.length !== 1) return;
+			const tabs = tablists[0];
+			const buttons = [...tabs.querySelectorAll(":scope > button[role=\"tab\"]")];
+			if (buttons.length !== 2 || tabs.children.length !== 2) return;
+			const copy = COPY.find((value) => buttons.some((button) => button.textContent?.trim() === value.chat) && buttons.some((button) => button.textContent?.trim() === value.trajectory));
+			if (copy === void 0) return;
+			const chat = buttons.find((button) => button.textContent?.trim() === copy.chat);
+			const trajectory = buttons.find((button) => button.textContent?.trim() === copy.trajectory);
+			if (chat.disabled || trajectory.disabled) return;
+			if (buttons.filter((button) => button.getAttribute("aria-selected") === "true").length !== 1) return;
+			const triggers = [...header.querySelectorAll(`${UTILITIES_SLOT} button[aria-haspopup="menu"]`)].filter((button) => button.getAttribute("aria-label") === copy.more && !button.disabled);
+			if (triggers.length !== 1) return;
+			const more = triggers[0];
+			if (more.parentElement?.closest(UTILITIES_SLOT) === null) return;
+			return {
+				header,
+				tabs,
+				chat,
+				trajectory,
+				more,
+				copy
+			};
+		}
+		function removeMount(mount) {
+			mount.tabs.removeAttribute(TABS_MARKER);
+			mount.header.removeAttribute(HEADER_MARKER);
+			mount.back.remove();
+			mount.item?.remove();
+		}
+		/**
+		* A reversible presentation adapter for DSH's native header. DSH 0.1.5-rc.2
+		* has no tab-strip or export-menu-item slot. Keep its components, handlers,
+		* session state and other menu entries intact; never copy/replace the header.
+		*/
+		function installHarnessTrajectoryMenu(doc) {
+			const Observer = doc.defaultView?.MutationObserver;
+			if (Observer === void 0 || doc.body === null) return () => {};
+			const mounts = /* @__PURE__ */ new Map();
+			const unsupported = /* @__PURE__ */ new WeakSet();
+			let disposed = false;
+			const style = doc.createElement("style");
+			style.dataset.arkmeHarnessTrajectory = "true";
+			style.textContent = `
+    [${TABS_MARKER}] { display: none !important; }
+    ${HEADER_SLOT} > header[${HEADER_MARKER}] {
+      min-height: 0; padding-bottom: 10px;
+    }
+    [data-arkme-harness-return] {
+      background: transparent; border: 0; padding: 4px 0; margin-top: 8px;
+      color: var(--dsw-alias-label-secondary, inherit); font: inherit;
+      font-size: 13px; cursor: pointer;
+    }
+    [data-arkme-harness-return]:hover { color: var(--dsw-alias-label-primary, inherit); }
+    [data-arkme-harness-return][hidden] { display: none; }
+  `;
+			doc.head.append(style);
+			function makeMount(value) {
+				const back = doc.createElement("button");
+				back.type = "button";
+				back.dataset.arkmeHarnessReturn = "true";
+				back.textContent = value.copy.back;
+				back.hidden = true;
+				const mount = {
+					...value,
+					back,
+					focusBack: false
+				};
+				back.addEventListener("click", () => {
+					if (!mount.chat.isConnected || mount.chat.disabled) return;
+					mount.chat.click();
+					mount.more.focus();
+				});
+				value.header.append(back);
+				return mount;
+			}
+			function syncMenu(mount) {
+				if (mount.more.getAttribute("aria-expanded") !== "true") {
+					mount.item?.remove();
+					delete mount.item;
+					return true;
+				}
+				const menus = mount.more.parentElement?.querySelectorAll(":scope > [role=\"menu\"]");
+				if (menus?.length !== 1) return false;
+				const menu = menus[0];
+				const template = [...menu.querySelectorAll("button[role=\"menuitem\"]")].find((button) => !button.closest(OWNED) && button.closest("[role=\"menu\"]") === menu);
+				const itemParent = template?.parentElement;
+				const viewport = itemParent?.parentElement;
+				const label = template === void 0 ? void 0 : [...template.children].find((child) => child.tagName === "SPAN" && child.textContent?.trim() === template.textContent?.trim());
+				if (template === void 0 || itemParent === null || itemParent === void 0 || viewport?.getAttribute("role") !== "presentation" || viewport.parentElement !== menu || label === void 0) return false;
+				if (mount.item?.parentElement === viewport) return true;
+				mount.item?.remove();
+				const item = doc.createElement("div");
+				item.dataset.arkmeHarnessTrajectoryItem = "true";
+				item.className = itemParent.className;
+				const button = doc.createElement("button");
+				button.type = "button";
+				button.setAttribute("role", "menuitem");
+				button.className = template.className;
+				const templateIcon = [...template.children].find((child) => child.tagName === "SPAN" && child.querySelector("svg"));
+				if (templateIcon !== void 0) {
+					const icon = doc.createElement("span");
+					icon.className = templateIcon.className;
+					const svg = doc.createElementNS("http://www.w3.org/2000/svg", "svg");
+					svg.setAttribute("width", "16");
+					svg.setAttribute("height", "16");
+					svg.setAttribute("viewBox", "0 0 16 16");
+					svg.setAttribute("fill", "none");
+					svg.setAttribute("aria-hidden", "true");
+					const path = doc.createElementNS(svg.namespaceURI, "path");
+					path.setAttribute("d", "M3.5 3h.01M3.5 8h.01M3.5 13h.01M3.5 4.5v2M3.5 9.5v2M7 3h6M7 8h6M7 13h6");
+					path.setAttribute("stroke", "currentColor");
+					path.setAttribute("stroke-width", "1.5");
+					path.setAttribute("stroke-linecap", "round");
+					svg.append(path);
+					icon.append(svg);
+					button.append(icon);
+				}
+				const text = doc.createElement("span");
+				text.className = label.className;
+				text.textContent = mount.copy.view;
+				button.append(text);
+				button.addEventListener("click", (event) => {
+					event.stopPropagation();
+					if (!mount.trajectory.isConnected || mount.trajectory.disabled) return;
+					mount.focusBack = true;
+					mount.more.click();
+					mount.trajectory.click();
+				});
+				button.addEventListener("keydown", (event) => {
+					if (event.key !== "Escape") return;
+					event.preventDefault();
+					event.stopPropagation();
+					mount.more.click();
+					mount.more.focus();
+				});
+				item.append(button);
+				viewport.append(item);
+				mount.item = item;
+				return true;
+			}
+			function sync() {
+				if (disposed) return;
+				for (const [header, mount] of mounts) if (!header.isConnected) {
+					removeMount(mount);
+					mounts.delete(header);
+				}
+				for (const header of doc.querySelectorAll(`${HEADER_SLOT} > header`)) {
+					const value = unsupported.has(header) ? void 0 : navigation(header);
+					let mount = mounts.get(header);
+					if (mount !== void 0 && (value === void 0 || mount.tabs !== value.tabs || mount.more !== value.more || mount.chat !== value.chat || mount.trajectory !== value.trajectory || mount.copy !== value.copy || mount.back.parentElement !== header)) {
+						removeMount(mount);
+						mounts.delete(header);
+						mount = void 0;
+					}
+					if (value === void 0) continue;
+					if (mount === void 0) {
+						mount = makeMount(value);
+						mounts.set(header, mount);
+					}
+					if (!syncMenu(mount)) {
+						unsupported.add(header);
+						removeMount(mount);
+						mounts.delete(header);
+						continue;
+					}
+					if (!mount.tabs.hasAttribute(TABS_MARKER)) mount.tabs.setAttribute(TABS_MARKER, "");
+					if (!mount.header.hasAttribute(HEADER_MARKER)) mount.header.setAttribute(HEADER_MARKER, "");
+					const inTrajectory = mount.trajectory.getAttribute("aria-selected") === "true";
+					if (mount.back.hidden === inTrajectory) mount.back.hidden = !inTrajectory;
+					if (mount.focusBack && inTrajectory) {
+						mount.focusBack = false;
+						mount.back.focus();
+					}
+				}
+			}
+			function touchesHeader(record) {
+				const target = record.target.nodeType === 1 ? record.target : record.target.parentElement;
+				if (target?.closest(OWNED)) return false;
+				if (target?.closest(HEADER_SLOT)) return true;
+				return [...record.addedNodes, ...record.removedNodes].some((node) => {
+					if (node.nodeType !== 1) return false;
+					const element = node;
+					return element.matches(HEADER_SLOT) || element.querySelector(HEADER_SLOT) !== null;
+				});
+			}
+			const observer = new Observer((records) => {
+				if (records.some(touchesHeader)) sync();
+			});
+			observer.observe(doc.body, {
+				childList: true,
+				subtree: true,
+				characterData: true,
+				attributes: true,
+				attributeFilter: [
+					"aria-selected",
+					"aria-expanded",
+					"aria-label",
+					"disabled",
+					"role",
+					"data-slot"
+				]
+			});
+			sync();
+			return () => {
+				if (disposed) return;
+				disposed = true;
+				observer.disconnect();
+				for (const mount of mounts.values()) removeMount(mount);
+				mounts.clear();
+				style.remove();
+			};
+		}
+		//#endregion
+		//#region src/client/harness-trajectory-client.ts
+		const inject = [];
+		/** This client is added only to the Arkme-owned native Harness iframe. */
+		function apply(ctx) {
+			if (typeof document === "undefined" || typeof window === "undefined" || new URLSearchParams(window.location.search).get("arkme-harness-embed") !== "1") return;
+			ctx.effect(() => installHarnessTrajectoryMenu(document), "arkme: native Harness trajectory navigation");
+		}
+		//#endregion
+		exports.apply = apply;
+		exports.inject = inject;
+		return module.exports;
+	}
+});

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-Bsk6in2a.js";
+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-BnDj8qcY.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";
@@ -109,6 +109,8 @@ const HARNESS_SESSION_CLIENT_ID = "@senguoyun/dsh-arkme/harness-session";
 const HARNESS_SESSION_CLIENT_PATH = "/arkme-self/harness-session-client.js";
 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";
 //#endregion
 //#region src/plugin-update-policy.ts
 const PLUGIN_UPDATE_TERMINAL_STATE_TTL_MS = 10 * 6e4;
@@ -12393,7 +12395,7 @@ function projectBootBatches(batches, keptPackageNames) {
 * Host halves stay process-owned and untouched; only this document's browser
 * boot graph is projected.
 */
-function projectHarnessBootGraph(graph, installedPackageNames, modelClient) {
+function projectHarnessBootGraph(graph, installedPackageNames, modelClient, trajectoryClient, sidebarClient) {
 	const requiredPackageNames = requiredBootPackages(graph.entries);
 	const removedPackageNames = /* @__PURE__ */ new Set([
 		ARKME_PLUGIN_PACKAGE_NAME,
@@ -12414,6 +12416,37 @@ function projectHarnessBootGraph(graph, installedPackageNames, modelClient) {
 			entries: [modelClient.id]
 		});
 	}
+	const trajectoryPackages = [
+		"@deepseek-ai/dsh-client-ui-conversation",
+		"@deepseek-ai/dsh-client-ui-trajectory",
+		"@deepseek-ai/dsh-session-log-export"
+	];
+	if (trajectoryClient && trajectoryPackages.every((id) => entries.some((entry) => entry.id === id))) {
+		const entry = {
+			...trajectoryClient,
+			inject: trajectoryPackages
+		};
+		entries.push(entry);
+		batches?.push({
+			phase: "application",
+			url: entry.url,
+			rev: entry.rev,
+			entries: [entry.id]
+		});
+	}
+	if (sidebarClient && entries.some((entry) => entry.id === "@deepseek-ai/dsh-client-ui-sidebar")) {
+		const entry = {
+			...sidebarClient,
+			inject: ["@deepseek-ai/dsh-client-ui-sidebar"]
+		};
+		entries.push(entry);
+		batches?.push({
+			phase: "application",
+			url: entry.url,
+			rev: entry.rev,
+			entries: [entry.id]
+		});
+	}
 	return {
 		rev: shortHash(JSON.stringify(batches === void 0 ? entries : {
 			entries,
@@ -12454,7 +12487,7 @@ function createHarnessEmbedRouteHandler(options) {
 		}
 		try {
 			const fullGraph = options.getGraph();
-			const projectedGraph = projectHarnessBootGraph(fullGraph, options.installedPackageNames(), options.modelClient);
+			const projectedGraph = projectHarnessBootGraph(fullGraph, options.installedPackageNames(), options.modelClient, options.trajectoryClient, options.sidebarClient);
 			if (options.onboardingClient !== void 0) {
 				const entry = {
 					...options.onboardingClient,
@@ -36826,6 +36859,30 @@ function apply(ctx, config) {
 	}), "arkme: Harness session observer asset");
 	const harnessModelClient = readFileSync(new URL("../lib/harness-model-client.js", import.meta.url));
 	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));
+	ctx.effect(() => ctx.webServer.register({
+		kind: "exact",
+		path: ARKME_HARNESS_SIDEBAR_CLIENT_PATH,
+		handler: (_request, response) => {
+			response.writeHead(200, {
+				"Content-Type": "application/javascript",
+				"Cache-Control": "no-cache"
+			});
+			response.end(harnessSidebarClient);
+		}
+	}), "arkme: Harness sidebar settings asset");
+	ctx.effect(() => ctx.webServer.register({
+		kind: "exact",
+		path: ARKME_HARNESS_TRAJECTORY_CLIENT_PATH,
+		handler: (_request, response) => {
+			response.writeHead(200, {
+				"Content-Type": "application/javascript",
+				"Cache-Control": "no-cache"
+			});
+			response.end(harnessTrajectoryClient);
+		}
+	}), "arkme: Harness trajectory navigation asset");
 	ctx.effect(() => ctx.webServer.register({
 		kind: "exact",
 		path: ARKME_HARNESS_ONBOARDING_CLIENT_PATH,
@@ -36838,6 +36895,16 @@ function apply(ctx, config) {
 		}
 	}), "arkme: Harness onboarding bridge asset");
 	const harnessEmbedHandler = createHarnessEmbedRouteHandler({
+		sidebarClient: {
+			id: "@senguoyun/dsh-arkme/harness-sidebar",
+			url: ARKME_HARNESS_SIDEBAR_CLIENT_PATH,
+			rev: createHash("sha256").update(harnessSidebarClient).digest("hex")
+		},
+		trajectoryClient: {
+			id: "@senguoyun/dsh-arkme/harness-trajectory",
+			url: ARKME_HARNESS_TRAJECTORY_CLIENT_PATH,
+			rev: createHash("sha256").update(harnessTrajectoryClient).digest("hex")
+		},
 		onboardingClient: {
 			id: "@senguoyun/dsh-arkme/harness-onboarding",
 			url: ARKME_HARNESS_ONBOARDING_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-Bsk6in2a.js";
+import { a as persistentArkmeExtensionActive, i as invokePersistentArkmeExtension, n as applyPersistentArkmeHostExtension, o as persistentArkmeExtensionRuntimeState, r as deactivatePersistentArkmeExtension, t as activatePersistentArkmeExtension } from "./persistent-runtime-BnDj8qcY.js";
 export { activatePersistentArkmeExtension, applyPersistentArkmeHostExtension, deactivatePersistentArkmeExtension, invokePersistentArkmeExtension, persistentArkmeExtensionActive, persistentArkmeExtensionRuntimeState };

package/lib/{persistent-runtime-Bsk6in2a.js → persistent-runtime-BnDj8qcY.js}

@@ -36316,6 +36316,64 @@ var SourceService = class {
 		signal?.throwIfAborted();
 		return target;
 	}
+	/**
+	* Resolve one personal topic and every visible descendant from the same
+	* paginated directory contract used by the topic picker. Keeping this owner
+	* here prevents a timeline read from trusting a partial browser-side tree or
+	* exposing raw topic ids across the Host boundary.
+	*/
+	async topicSubtreeSources(sourceRef, signal) {
+		signal?.throwIfAborted();
+		const session = await this.runtime.requireSession();
+		const selected = await this.openSourceRef(sourceRef, session.userId);
+		if (selected.kind !== "topic") throw new ArkmePluginError("topic-subtree-source-invalid", "仅主题支持读取下级主题内容", false, 400);
+		const selectedKey = await this.topicHierarchyKey(session.userId, selected.ownerRef);
+		const byHierarchyKey = /* @__PURE__ */ new Map();
+		let cursor;
+		const visitedCursors = /* @__PURE__ */ new Set();
+		for (let pageIndex = 0; pageIndex < 100; pageIndex += 1) {
+			signal?.throwIfAborted();
+			const page = await this.listSources("send_to_self", {
+				limit: 100,
+				...cursor === void 0 ? {} : { cursor },
+				...signal === void 0 ? {} : { signal }
+			});
+			for (const item of page.items) {
+				if (item.kind !== "topic" || item.topicHierarchyKey === void 0) continue;
+				byHierarchyKey.set(item.topicHierarchyKey, item);
+			}
+			if (!page.hasMore || page.nextCursor === void 0) break;
+			if (visitedCursors.has(page.nextCursor)) throw new ArkmePluginError("topic-subtree-cursor-invalid", "主题层级分页未推进，请重试", true, 502);
+			visitedCursors.add(page.nextCursor);
+			cursor = page.nextCursor;
+			if (pageIndex === 99) throw new ArkmePluginError("topic-subtree-pagination-limit", "主题层级加载未完成，请重试", true, 502);
+		}
+		const selectedSource = byHierarchyKey.get(selectedKey) ?? {
+			...await this.sourceItem(selected),
+			topicHierarchyKey: selectedKey
+		};
+		byHierarchyKey.set(selectedKey, selectedSource);
+		const childrenByParent = /* @__PURE__ */ new Map();
+		for (const item of byHierarchyKey.values()) {
+			const parentKey = item.parentTopicHierarchyKey;
+			if (parentKey === void 0 || parentKey === item.topicHierarchyKey) continue;
+			const children = childrenByParent.get(parentKey) ?? [];
+			children.push(item);
+			childrenByParent.set(parentKey, children);
+		}
+		const result = [];
+		const queue = [selectedSource];
+		const visited = /* @__PURE__ */ new Set();
+		while (queue.length > 0) {
+			const current = queue.shift();
+			const key = current.topicHierarchyKey ?? current.sourceRef;
+			if (visited.has(key)) continue;
+			visited.add(key);
+			result.push(current);
+			queue.push(...childrenByParent.get(key) ?? []);
+		}
+		return result;
+	}
 	async selfTargetForAccount(userId) {
 		return {
 			sourceRef: await this.sealSourceRef(userId, "send_to_self", "all", "发给自己"),
@@ -43309,6 +43367,7 @@ const OFFICIAL_AUTHOR_FALLBACK_DISPLAY_NAME = "即我作者";
 const RESERVED_ASEN_BOT_UID = "asen";
 const RESERVED_ASEN_DISPLAY_NAME = "阿森";
 const MAX_MESSAGE_COPY_LINK_ITEMS = 100;
+const TOPIC_SUBTREE_READ_CONCURRENCY = 6;
 const RECORD_UID_PATTERN$1 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const CHAT_MEMBER_REF_PREFIX = "arkme-chat-member-v1";
 const MESSAGE_WITHDRAWAL_REF_PREFIX = "arkme-message-withdrawal-v1";
@@ -44959,6 +45018,77 @@ var ChatService = class {
 			...profile.avatarUrl === void 0 ? {} : { avatarRef: await this.profile.sealProfileImageRef(session.userId, OFFICIAL_AUTHOR_USER_ID) }
 		};
 	}
+	async readTopicTimelineRawStream(topic, session, limit, cursor, lockedRecordUids, required, merged, signal) {
+		const opened = await this.source.openSourceRef(topic.sourceRef, session.userId);
+		if (opened.kind !== "topic") throw new ArkmePluginError("topic-subtree-source-invalid", "下级主题信息无效，请刷新后重试", true, 409);
+		const records = [];
+		let pageCursor = cursor;
+		for (let pageIndex = 0; pageIndex < 100; pageIndex += 1) {
+			signal?.throwIfAborted();
+			const page = await readTopicRecordPage(this.runtime, session, opened.ownerRef, {
+				limit,
+				...pageCursor === void 0 ? {} : { cursor: pageCursor },
+				...signal === void 0 ? {} : { signal }
+			});
+			if (page.privacyState === 2) {
+				if (required) throw new ArkmePluginError("topic-privacy-locked", "隐私锁主题不能在 Arkme 插件中查看", false, 403);
+				return {
+					topic,
+					topicUid: opened.ownerRef,
+					records: [],
+					hasMore: false
+				};
+			}
+			for (const raw of page.records) {
+				if (arkmePrivacyLockedRecord(raw) || lockedRecordUids.has(this.record.recordUid(raw))) continue;
+				records.push(raw);
+			}
+			if (!merged) return {
+				topic,
+				topicUid: opened.ownerRef,
+				records,
+				hasMore: page.hasMore,
+				...page.nextCursor === void 0 ? {} : { nextCursor: page.nextCursor }
+			};
+			if (records.length >= limit) return {
+				topic,
+				topicUid: opened.ownerRef,
+				records: records.slice(0, limit),
+				hasMore: records.length > limit || page.hasMore,
+				...page.nextCursor === void 0 ? {} : { nextCursor: page.nextCursor }
+			};
+			if (!page.hasMore) return {
+				topic,
+				topicUid: opened.ownerRef,
+				records,
+				hasMore: false
+			};
+			if (page.nextCursor === void 0) throw new ArkmePluginError("topic-record-page-invalid", "主题快记分页信息不完整，请重试", true, 502);
+			pageCursor = page.nextCursor;
+		}
+		throw new ArkmePluginError("topic-record-pagination-limit", "主题快记加载页数过多，请稍后重试", true, 502);
+	}
+	async readTopicTimelineRawStreams(topics, session, limit, cursor, lockedRecordUids, signal) {
+		const results = new Array(topics.length);
+		let nextIndex = 0;
+		let failure;
+		const worker = async () => {
+			while (failure === void 0) {
+				const index = nextIndex;
+				nextIndex += 1;
+				if (index >= topics.length) return;
+				try {
+					results[index] = await this.readTopicTimelineRawStream(topics[index], session, limit, cursor, lockedRecordUids, index === 0, topics.length > 1, signal);
+				} catch (cause) {
+					failure = cause;
+					return;
+				}
+			}
+		};
+		await Promise.all(Array.from({ length: Math.min(TOPIC_SUBTREE_READ_CONCURRENCY, topics.length) }, () => worker()));
+		if (failure !== void 0) throw failure;
+		return results;
+	}
 	async readSource(sourceRef, options = {}) {
 		const session = await this.runtime.requireSession();
 		const source = await this.source.openSourceRef(sourceRef, session.userId);
@@ -45031,34 +45161,83 @@ var ChatService = class {
 			};
 		}
 		if (source.kind === "topic") {
-			const lockedRecordUids = await this.privacy.lockedRecordUids(session, options.signal);
-			const [page, metadata] = await Promise.all([readTopicRecordPage(this.runtime, session, source.ownerRef, {
-				...options,
-				limit
-			}), readTopicMetadata(this.runtime, session, source.ownerRef, options.signal)]);
-			if (arkmePrivacyLockedTopic({ privacy_state: page.privacyState }) || metadata.privacyState === 2) throw new ArkmePluginError("topic-privacy-locked", "隐私锁主题不能在 Arkme 插件中查看", false, 403);
-			const topicKind = metadata.topicKind;
-			const rawRecords = page.records.filter((raw) => !arkmePrivacyLockedRecord(raw) && !lockedRecordUids.has(this.record.recordUid(raw)));
+			const metadata = await readTopicMetadata(this.runtime, session, source.ownerRef, options.signal);
+			if (metadata.privacyState === 2) throw new ArkmePluginError("topic-privacy-locked", "隐私锁主题不能在 Arkme 插件中查看", false, 403);
+			const exactTopicSource = async () => [{
+				...await this.source.sourceItem(source),
+				topicHierarchyKey: typeof this.source.topicHierarchyKey === "function" ? await this.source.topicHierarchyKey(session.userId, source.ownerRef) : sourceRef
+			}];
+			const subtreeSourcesPromise = typeof this.source.topicSubtreeSources === "function" ? this.source.topicSubtreeSources(sourceRef, options.signal).catch(async (cause) => {
+				if (options.signal?.aborted === true) throw cause;
+				return await exactTopicSource();
+			}) : exactTopicSource();
+			const [lockedRecordUids, subtreeSources] = await Promise.all([this.privacy.lockedRecordUids(session, options.signal), subtreeSourcesPromise]);
+			const streams = await this.readTopicTimelineRawStreams(subtreeSources, session, limit, options.cursor, lockedRecordUids, options.signal);
+			const candidates = [];
+			const seenRecordUids = /* @__PURE__ */ new Set();
+			for (const stream of streams) {
+				const topicHierarchyKey = stream.topic.topicHierarchyKey;
+				if (topicHierarchyKey === void 0) continue;
+				for (const raw of stream.records) {
+					const item = this.record.recordTimelineItemFromRaw(raw, session.userId, {
+						isMe: true,
+						selfTopic: {
+							topicHierarchyKey,
+							sourceRef: stream.topic.sourceRef,
+							title: stream.topic.displayName
+						}
+					});
+					if (item.itemUid === "" || seenRecordUids.has(item.itemUid)) continue;
+					seenRecordUids.add(item.itemUid);
+					candidates.push({
+						raw,
+						topic: stream.topic,
+						topicUid: stream.topicUid,
+						item
+					});
+				}
+			}
+			candidates.sort((left, right) => right.item.sendAtMillis - left.item.sendAtMillis || right.item.itemUid.localeCompare(left.item.itemUid));
+			const selected = candidates.slice(0, limit);
+			const rawRecords = selected.map((candidate) => candidate.raw);
 			const media = await this.media.hydrateRecordMediaPage(rawRecords, session, options.signal);
 			const signingKey = await this.runtime.stateStore.uniqueCode();
-			const records = rawRecords.map((raw) => {
+			const records = selected.map(({ raw, topic, topicUid }) => {
 				const recordUid = this.record.recordUid(raw);
 				const displayItems = media.displayItemsByRecordUid.get(recordUid);
+				const topicHierarchyKey = topic.topicHierarchyKey;
 				const item = this.record.recordTimelineItemFromRaw(raw, session.userId, {
 					...displayItems === void 0 ? {} : { displayItems },
+					isMe: true,
+					selfTopic: {
+						topicHierarchyKey,
+						sourceRef: topic.sourceRef,
+						title: topic.displayName
+					},
 					mediaUnavailable: media.unavailableRecordUids.has(recordUid)
 				});
-				return this.withPersonalRecordCapabilities(source, item, session.userId, signingKey, numberValue$19(objectValue$2(raw).owner_user_id), source.ownerRef);
+				const assignable = this.withPersonalRecordCapabilities(source, item, session.userId, signingKey, numberValue$19(objectValue$2(raw).owner_user_id), topicUid);
+				return assignable.recordTopicAssignmentRef === void 0 ? assignable : {
+					...assignable,
+					recordTopicAssignmentTopicKey: topicHierarchyKey
+				};
 			});
+			const hasMore = candidates.length > limit || streams.some((stream) => stream.hasMore);
+			const lastItem = selected.at(-1)?.item;
+			if (hasMore && lastItem === void 0) throw new ArkmePluginError("topic-subtree-page-invalid", "下级主题快记分页未推进，请重试", true, 502);
+			const currentSource = subtreeSources[0] ?? await this.source.sourceItem(source);
 			return {
 				source: {
-					...await this.source.sourceItem(source),
-					topicKind,
-					displayName: arkmeTopicDisplayName(source.displayName, topicKind)
+					...currentSource,
+					topicKind: metadata.topicKind,
+					displayName: arkmeTopicDisplayName(currentSource.displayName, metadata.topicKind)
 				},
 				items: records.map((item) => this.withRecordMessageActionRef(source, item, session.userId, signingKey)),
-				hasMore: page.hasMore,
-				...page.nextCursor === void 0 ? {} : { nextCursor: page.nextCursor }
+				hasMore,
+				...hasMore ? subtreeSources.length === 1 && streams[0]?.nextCursor !== void 0 ? { nextCursor: streams[0].nextCursor } : lastItem === void 0 ? {} : { nextCursor: {
+					sendAtMillis: lastItem.sendAtMillis,
+					itemUid: lastItem.itemUid
+				} } : {}
 			};
 		}
 		const aiPolishDecorations = source.kind === "group_chat" && options.cursor === void 0 ? Promise.allSettled([this.aiPolish.queryGroupAiPolishConfig(source.ownerRef, session, options.signal), this.aiPolish.queryGroupAiPolishNotices(source.ownerRef, session, options.signal)]) : void 0;

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

@@ -1 +1 @@
-{"version":3,"file":"ArkmePersistentShell.d.ts","sourceRoot":"","sources":["../../../src/client/ArkmePersistentShell.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACnG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAGrF,OAAO,KAAK,EAAE,iBAAiB,EAAoC,MAAM,aAAa,CAAA;AAyBtF,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAA;AAyCvE,KAAK,wBAAwB,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,CAAC,CAAA;AAEpE,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjE;AAOD,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,wBAAwB,GAAG,SAA6C,GAAG,MAAM,GAAG,SAAS,CAQhJ;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,wBAAwB,GAAG,SAA6C,GAAG,IAAI,CAIlJ;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,oBAAoB,CAAC,EAAE,MAAM,GAC5B,MAAM,CAKR;AAED,gGAAgG;AAChG,wBAAgB,4BAA4B,gCAuC3C;AAED,yGAAyG;AACzG,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,iBAAiB,GAAG,SAAS,EACnC,IAAI,EAAE,MAAM,EACZ,kBAAkB,UAA2B,GAC5C,OAAO,CAET;AAED,MAAM,MAAM,2BAA2B,GAAG,YAAY,CAAC,SAAS,CAAC,GAC7D,gBAAgB,CAAC,uBAAuB,GAAG,0BAA0B,GAAG,qBAAqB,CAAC,GAC9F;IACA,eAAe,IAAI,IAAI,CAAA;IACvB,YAAY,IAAI,IAAI,CAAA;IACpB,iBAAiB,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;IACvH,cAAc,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACzC,CAAA;AAcH,mDAAmD;AACnD,wBAAgB,sBAAsB,CAAC,EACrC,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EACvD,iBAA+D,EAAE,cAAgC,GAClG,EAAE,2BAA2B,+BA0S7B;AAED,MAAM,MAAM,6BAA6B,GAAG,YAAY,CAAC,cAAc,CAAC,GACpE,WAAW,CAAC,OAAO,4BAA4B,CAAC,GAChD;IAAE,YAAY,IAAI,IAAI,CAAA;CAAE,CAAA;AAE5B,6FAA6F;AAC7F,wBAAgB,wBAAwB,CAAC,EACvC,SAAS,EAAE,YAAY,EAAE,CAAC,GAC3B,EAAE,6BAA6B,+BAsF/B;AAED,MAAM,MAAM,2BAA2B,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG;IAAE,YAAY,IAAI,IAAI,CAAA;CAAE,CAAA;AAE5F,mGAAmG;AACnG,wBAAgB,sBAAsB,CAAC,EAAE,YAAY,EAAE,EAAE,2BAA2B,+BAGnF"}
+{"version":3,"file":"ArkmePersistentShell.d.ts","sourceRoot":"","sources":["../../../src/client/ArkmePersistentShell.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACnG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;AAGrF,OAAO,KAAK,EAAE,iBAAiB,EAAoC,MAAM,aAAa,CAAA;AAyBtF,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAA;AAyCvE,KAAK,wBAAwB,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,CAAC,CAAA;AAEpE,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjE;AAOD,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,wBAAwB,GAAG,SAA6C,GAAG,MAAM,GAAG,SAAS,CAQhJ;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,wBAAwB,GAAG,SAA6C,GAAG,IAAI,CAIlJ;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,CAAC,EAAE,MAAM,EACvB,oBAAoB,CAAC,EAAE,MAAM,GAC5B,MAAM,CAKR;AAED,gGAAgG;AAChG,wBAAgB,4BAA4B,gCAuC3C;AAED,yGAAyG;AACzG,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,iBAAiB,GAAG,SAAS,EACnC,IAAI,EAAE,MAAM,EACZ,kBAAkB,UAA2B,GAC5C,OAAO,CAET;AAED,MAAM,MAAM,2BAA2B,GAAG,YAAY,CAAC,SAAS,CAAC,GAC7D,gBAAgB,CAAC,uBAAuB,GAAG,0BAA0B,GAAG,qBAAqB,CAAC,GAC9F;IACA,eAAe,IAAI,IAAI,CAAA;IACvB,YAAY,IAAI,IAAI,CAAA;IACpB,iBAAiB,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;IACvH,cAAc,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACzC,CAAA;AAcH,mDAAmD;AACnD,wBAAgB,sBAAsB,CAAC,EACrC,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EACvD,iBAA+D,EAAE,cAAgC,GAClG,EAAE,2BAA2B,+BA0S7B;AAED,MAAM,MAAM,6BAA6B,GAAG,YAAY,CAAC,cAAc,CAAC,GACpE,WAAW,CAAC,OAAO,4BAA4B,CAAC,GAChD;IAAE,YAAY,IAAI,IAAI,CAAA;CAAE,CAAA;AAE5B,6FAA6F;AAC7F,wBAAgB,wBAAwB,CAAC,EACvC,SAAS,EAAE,YAAY,EAAE,CAAC,GAC3B,EAAE,6BAA6B,+BAuF/B;AAED,MAAM,MAAM,2BAA2B,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG;IAAE,YAAY,IAAI,IAAI,CAAA;CAAE,CAAA;AAE5F,mGAAmG;AACnG,wBAAgB,sBAAsB,CAAC,EAAE,YAAY,EAAE,EAAE,2BAA2B,+BAGnF"}

package/lib/types/client/ArkmeQuickAdd.d.ts

@@ -1,13 +1,16 @@
 import type { ArkmeBotSummary, ArkmeSourceItem } from '../types.js';
-export declare function ArkmeQuickAddMenu({ onContactAdd, onCreateGroup, onAddBot }: {
+export declare function ArkmeQuickAddMenu({ onContactAdd, onCreateGroup, onAddBot, onNewDshSession, error }: {
     onContactAdd(): void;
     onCreateGroup(): void;
     onAddBot(): void;
+    onNewDshSession?: (() => void) | undefined;
+    error?: string;
 }): import("react").JSX.Element;
-export declare function ArkmeQuickAddButton({ onContactAdd, onSourceCreated, onBotCreated, notificationActivationRevision, onBlockingOverlayChange, }: {
+export declare function ArkmeQuickAddButton({ onContactAdd, onSourceCreated, onBotCreated, onNewDshSession, notificationActivationRevision, onBlockingOverlayChange, }: {
     onContactAdd(): void;
     onSourceCreated(source: ArkmeSourceItem): void | Promise<void>;
     onBotCreated?(bot: ArkmeBotSummary): void | Promise<void>;
+    onNewDshSession?: (() => void) | undefined;
     notificationActivationRevision?: number;
     onBlockingOverlayChange?(open: boolean): void;
 }): import("react").JSX.Element;