@senguoyun/dsh-arkme 0.1.56 → 0.1.57

package/lib/client.js

@@ -5934,7 +5934,7 @@ window.__ModuleLoader__.load({
 		qrcode.stringToBytes;
 		//#endregion
 		//#region package.json
-		var version$3 = "0.1.56";
+		var version$3 = "0.1.57";
 		//#endregion
 		//#region src/client/arkme-billing.css?inline
 		var arkme_billing_default = ".arkme-billing-backdrop {\n  z-index: 120;\n  backdrop-filter: blur(3px);\n  background: #181b223d;\n  place-items: center;\n  padding: 28px;\n  display: grid;\n  position: fixed;\n  inset: 0;\n}\n\n.arkme-billing-recharge-dialog, .arkme-billing-payment-dialog {\n  color: #20232c;\n  background: #fff;\n  border: 1px solid #dedfe3;\n  border-radius: 20px;\n  width: min(620px, 100%);\n  max-height: min(720px, 100vh - 56px);\n  overflow-y: auto;\n  box-shadow: 0 24px 72px #191c232e;\n}\n\n.arkme-billing-payment-dialog {\n  width: min(420px, 100%);\n}\n\n.arkme-billing-dialog-header {\n  border-bottom: 1px solid #ececef;\n  justify-content: space-between;\n  align-items: flex-start;\n  gap: 18px;\n  min-height: 78px;\n  padding: 20px 22px 16px;\n  display: flex;\n}\n\n.arkme-billing-dialog-header h2 {\n  margin: 0;\n  font-size: 18px;\n  font-weight: 600;\n  line-height: 25px;\n}\n\n.arkme-billing-dialog-header p {\n  overflow-wrap: anywhere;\n  color: #8a8e96;\n  margin: 4px 0 0;\n  font-size: 12px;\n  line-height: 18px;\n}\n\n.arkme-billing-dialog-header > button {\n  color: #777c85;\n  width: 32px;\n  height: 32px;\n  font: inherit;\n  cursor: pointer;\n  background: none;\n  border: 0;\n  border-radius: 9px;\n  flex: none;\n  place-items: center;\n  font-size: 22px;\n  display: grid;\n}\n\n.arkme-billing-dialog-header > button:hover {\n  color: #20232c;\n  background: #f3f3f5;\n}\n\n.arkme-billing-dialog-body {\n  padding: 18px 22px 22px;\n}\n\n.arkme-billing-dialog-balance {\n  border-bottom: 1px solid #ececef;\n  grid-template-columns: minmax(0, 1fr) auto;\n  align-items: center;\n  column-gap: 12px;\n  min-height: 48px;\n  padding: 0 2px 16px;\n  display: grid;\n}\n\n.arkme-billing-dialog-balance > span {\n  color: #8a8e96;\n  grid-column: 1;\n  font-size: 11px;\n  line-height: 16px;\n}\n\n.arkme-billing-dialog-balance > strong {\n  grid-column: 1;\n  font-size: 22px;\n  font-weight: 600;\n  line-height: 28px;\n}\n\n.arkme-billing-dialog-balance > button, .arkme-billing-error > button {\n  color: #626772;\n  height: 30px;\n  font: inherit;\n  cursor: pointer;\n  background: #fff;\n  border: 1px solid #dfe1e5;\n  border-radius: 9px;\n  grid-area: 1 / 2 / span 2;\n  padding: 0 12px;\n  font-size: 11px;\n}\n\n.arkme-billing-products-section, .arkme-billing-payment-section {\n  padding-top: 17px;\n}\n\n.arkme-billing-products-section h3, .arkme-billing-payment-section h3 {\n  color: #747984;\n  margin: 0 0 11px;\n  font-size: 12px;\n  font-weight: 500;\n  line-height: 18px;\n}\n\n.arkme-billing-product-grid {\n  width: 100%;\n}\n\n.arkme-billing-product-grid > button {\n  color: #20232c;\n  min-width: 0;\n  min-height: 62px;\n  font: inherit;\n  text-align: left;\n  cursor: pointer;\n  background: #fff;\n  border: 1px solid #dfe1e5;\n  border-radius: 11px;\n  align-content: center;\n  gap: 4px;\n  padding: 9px 11px;\n  display: grid;\n}\n\n.arkme-billing-product-grid > button:hover {\n  background: #f8f8f9;\n  border-color: #cfd2d8;\n}\n\n.arkme-billing-product-grid > button.is-selected {\n  border-color: #75839e;\n  box-shadow: 0 0 0 1px #75839e;\n}\n\n.arkme-billing-product-grid > button > span {\n  white-space: nowrap;\n  text-overflow: ellipsis;\n  font-size: 12px;\n  font-weight: 500;\n  line-height: 17px;\n  overflow: hidden;\n}\n\n.arkme-billing-product-grid > button > strong {\n  font-size: 14px;\n  font-weight: 600;\n  line-height: 19px;\n}\n\n.arkme-billing-payment-actions {\n  flex-wrap: wrap;\n  gap: 10px;\n  display: flex;\n}\n\n.arkme-billing-payment-actions > button {\n  color: #333842;\n  min-width: 154px;\n  height: 38px;\n  font: inherit;\n  cursor: pointer;\n  background: #fff;\n  border: 1px solid #dfe1e5;\n  border-radius: 10px;\n  justify-content: center;\n  align-items: center;\n  gap: 8px;\n  padding: 0 14px;\n  font-size: 12px;\n  display: inline-flex;\n}\n\n.arkme-billing-payment-actions > button:hover {\n  background: #f7f7f8;\n  border-color: #cfd3da;\n}\n\n.arkme-billing-payment-actions > button:disabled, .arkme-billing-product-grid > button:disabled {\n  opacity: .48;\n  cursor: default;\n}\n\n.arkme-billing-platform-icon {\n  flex: none;\n  width: 18px;\n  height: 18px;\n}\n\n.arkme-billing-platform-icon.is-alipay {\n  color: #1677ff;\n}\n\n.arkme-billing-platform-icon.is-wechat {\n  color: #07c160;\n}\n\n.arkme-billing-state {\n  color: #858992;\n  margin: 12px 0 2px;\n  font-size: 12px;\n  line-height: 18px;\n}\n\n.arkme-billing-error {\n  color: #b54841;\n  justify-content: space-between;\n  align-items: center;\n  gap: 12px;\n  margin-top: 10px;\n  font-size: 12px;\n  line-height: 18px;\n  display: flex;\n}\n\n.arkme-billing-error.is-purchase {\n  justify-content: flex-start;\n}\n\n.arkme-billing-payment-content {\n  text-align: center;\n  justify-items: center;\n  gap: 10px;\n  padding: 28px 24px 18px;\n  display: grid;\n}\n\n.arkme-billing-payment-content > .arkme-billing-platform-icon {\n  width: 38px;\n  height: 38px;\n  margin-bottom: 4px;\n}\n\n.arkme-billing-payment-content > img {\n  border-radius: 10px;\n  width: 210px;\n  height: 210px;\n}\n\n.arkme-billing-payment-content > strong {\n  font-size: 14px;\n  font-weight: 600;\n  line-height: 21px;\n}\n\n.arkme-billing-payment-content > p {\n  color: #858992;\n  margin: 0;\n  font-size: 12px;\n  line-height: 18px;\n}\n\n.arkme-billing-payment-content.is-paid > strong {\n  color: #16794f;\n  font-size: 18px;\n  line-height: 25px;\n}\n\n.arkme-billing-payment-content.is-paid > .arkme-billing-error {\n  justify-content: center;\n}\n\n.arkme-billing-payment-content.is-crediting > strong {\n  color: #335f9e;\n}\n\n.arkme-billing-dialog-actions {\n  flex-wrap: wrap;\n  justify-content: center;\n  gap: 9px;\n  padding: 0 22px 20px;\n  display: flex;\n}\n\n.arkme-billing-dialog-actions > button, .arkme-billing-primary-action {\n  color: #3c424d;\n  height: 34px;\n  font: inherit;\n  cursor: pointer;\n  background: #fff;\n  border: 1px solid #dfe1e5;\n  border-radius: 9px;\n  padding: 0 14px;\n  font-size: 12px;\n}\n\n.arkme-billing-dialog-actions > .arkme-billing-primary-action, .arkme-billing-payment-content > .arkme-billing-primary-action {\n  color: #fff;\n  background: #20232d;\n  border-color: #20232d;\n}\n";
@@ -129372,6 +129372,166 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 			});
 		}
 		//#endregion
+		//#region src/client/source-tree.ts
+		/** Return the complete visible hierarchy for a topic, from its root to itself. */
+		function arkmeTopicPathNames(selectedSource, sources) {
+			if (selectedSource === void 0 || selectedSource.kind !== "topic") return [];
+			const sourceByRef = new Map(sources.map((source) => [source.sourceRef, source]));
+			const sourceByHierarchyKey = new Map(sources.flatMap((source) => source.topicHierarchyKey === void 0 ? [] : [[source.topicHierarchyKey, source]]));
+			const path = [];
+			const visited = /* @__PURE__ */ new Set();
+			let current = sourceByRef.get(selectedSource.sourceRef) ?? selectedSource;
+			while (current !== void 0 && current.kind === "topic" && !visited.has(current.sourceRef)) {
+				visited.add(current.sourceRef);
+				path.unshift(current);
+				const parentReference = current.parentTopicHierarchyKey ?? current.parentSourceRef;
+				current = parentReference === void 0 ? void 0 : current.parentTopicHierarchyKey === void 0 ? sourceByRef.get(parentReference) : sourceByHierarchyKey.get(parentReference);
+			}
+			return path.map((source) => source.displayName);
+		}
+		/** A hierarchy move may not create a cycle or exceed the five-level topic limit. */
+		function canMoveArkmeTopicToParent(source, nextParent, sources) {
+			if (!arkmeSourceAllowsUserWrite(source) || nextParent !== void 0 && !arkmeSourceAllowsUserWrite(nextParent)) return false;
+			if (source.kind !== "topic") return false;
+			if (nextParent === void 0) return true;
+			if (nextParent.kind !== "topic" || nextParent.sourceRef === source.sourceRef) return false;
+			const byRef = new Map(sources.map((item) => [item.sourceRef, item]));
+			const byHierarchyKey = new Map(sources.flatMap((item) => item.topicHierarchyKey === void 0 ? [] : [[item.topicHierarchyKey, item]]));
+			const parentOf = (item) => item.parentTopicHierarchyKey === void 0 ? item.parentSourceRef === void 0 ? void 0 : byRef.get(item.parentSourceRef) : byHierarchyKey.get(item.parentTopicHierarchyKey);
+			const targetAncestors = /* @__PURE__ */ new Set();
+			let current = nextParent;
+			while (current !== void 0 && !targetAncestors.has(current.sourceRef)) {
+				targetAncestors.add(current.sourceRef);
+				current = parentOf(current);
+			}
+			if (targetAncestors.has(source.sourceRef)) return false;
+			const childRefsByParent = /* @__PURE__ */ new Map();
+			for (const item of sources) {
+				const parent = parentOf(item);
+				if (parent === void 0) continue;
+				const children = childRefsByParent.get(parent.sourceRef) ?? [];
+				children.push(item);
+				childRefsByParent.set(parent.sourceRef, children);
+			}
+			const subtreeDepth = (item, visited = /* @__PURE__ */ new Set()) => {
+				if (visited.has(item.sourceRef)) return 0;
+				visited.add(item.sourceRef);
+				return 1 + Math.max(0, ...(childRefsByParent.get(item.sourceRef) ?? []).map((child) => subtreeDepth(child, visited)));
+			};
+			return targetAncestors.size + subtreeDepth(source) <= 5;
+		}
+		/** Build a stable tree while keeping paged children hidden until their known parent arrives. */
+		function buildArkmeSourceTree(sources) {
+			const sourcesByRef = new Map(sources.map((source) => [source.sourceRef, source]));
+			const sourcesByTopicHierarchyKey = new Map(sources.flatMap((source) => source.topicHierarchyKey === void 0 ? [] : [[source.topicHierarchyKey, source]]));
+			const nodesByRef = new Map(sources.map((source) => [source.sourceRef, {
+				source,
+				children: []
+			}]));
+			const roots = [];
+			const validParent = (source) => {
+				if (source.kind !== "topic") return void 0;
+				const parentReference = source.parentTopicHierarchyKey ?? source.parentSourceRef;
+				if (parentReference === void 0) return void 0;
+				const parentByReference = (reference) => source.parentTopicHierarchyKey === void 0 ? sourcesByRef.get(reference) : sourcesByTopicHierarchyKey.get(reference);
+				const seen = /* @__PURE__ */ new Set([source.topicHierarchyKey ?? source.sourceRef]);
+				let parentRef = parentReference;
+				let directParent;
+				while (parentRef !== void 0) {
+					if (seen.has(parentRef)) return void 0;
+					seen.add(parentRef);
+					const parent = parentByReference(parentRef);
+					if (parent === void 0) return source.parentTopicHierarchyKey === void 0 ? void 0 : null;
+					if (parent.kind !== "topic") return void 0;
+					directParent ??= parent;
+					parentRef = parent.parentTopicHierarchyKey ?? parent.parentSourceRef;
+				}
+				return directParent;
+			};
+			for (const source of sources) {
+				const node = nodesByRef.get(source.sourceRef);
+				const parent = validParent(source);
+				if (parent === null) continue;
+				const parentNode = parent === void 0 ? void 0 : nodesByRef.get(parent.sourceRef);
+				if (parentNode === void 0) roots.push(node);
+				else parentNode.children.push(node);
+			}
+			return roots;
+		}
+		const sourceNameCollator = new Intl.Collator("zh-CN", {
+			numeric: true,
+			sensitivity: "base"
+		});
+		function nonNegativeFinite(value) {
+			return value !== void 0 && Number.isFinite(value) && value > 0 ? value : 0;
+		}
+		/**
+		* Sort peers only, preserving every parent-child relationship. `custom` uses
+		* the server's persisted sibling order, with the legacy name order as fallback.
+		*/
+		function sortArkmeSourceTree(roots, sort) {
+			const compare = (left, right) => {
+				if (left.source.kind === "default_category") return right.source.kind === "default_category" ? 0 : -1;
+				if (right.source.kind === "default_category") return 1;
+				if (sort === "latest") {
+					const byLatest = nonNegativeFinite(right.source.activeAtMillis) - nonNegativeFinite(left.source.activeAtMillis);
+					if (byLatest !== 0) return byLatest;
+					const byCount = nonNegativeFinite(right.source.recordCount) - nonNegativeFinite(left.source.recordCount);
+					if (byCount !== 0) return byCount;
+				} else if (sort === "most") {
+					const byCount = nonNegativeFinite(right.source.recordCount) - nonNegativeFinite(left.source.recordCount);
+					if (byCount !== 0) return byCount;
+					const byLatest = nonNegativeFinite(right.source.activeAtMillis) - nonNegativeFinite(left.source.activeAtMillis);
+					if (byLatest !== 0) return byLatest;
+				} else {
+					const leftOrder = nonNegativeFinite(left.source.siblingOrder);
+					const rightOrder = nonNegativeFinite(right.source.siblingOrder);
+					if (leftOrder > 0 || rightOrder > 0) {
+						if (leftOrder <= 0) return 1;
+						if (rightOrder <= 0) return -1;
+						const byOrder = leftOrder - rightOrder;
+						if (byOrder !== 0) return byOrder;
+					}
+				}
+				return sourceNameCollator.compare(left.source.displayName, right.source.displayName);
+			};
+			return roots.map((node) => ({
+				...node,
+				children: sortArkmeSourceTree(node.children, sort)
+			})).sort(compare);
+		}
+		/** Total every topic from its direct records plus every descendant exactly once. */
+		function aggregateArkmeSourceTreeRecordCounts(roots) {
+			const totals = /* @__PURE__ */ new Map();
+			const visit = (node) => {
+				const total = nonNegativeFinite(node.source.recordCount) + node.children.reduce((sum, child) => sum + visit(child), 0);
+				totals.set(node.source.sourceRef, total);
+				return total;
+			};
+			roots.forEach(visit);
+			return totals;
+		}
+		function flattenVisibleArkmeSourceTree(roots, collapsedSourceRefs) {
+			const rows = [];
+			const visit = (node, depth) => {
+				const hasChildren = node.children.length > 0;
+				const expanded = hasChildren && !collapsedSourceRefs.has(node.source.sourceRef);
+				rows.push({
+					source: node.source,
+					depth,
+					hasChildren,
+					expanded
+				});
+				if (expanded) node.children.forEach((child) => {
+					visit(child, depth + 1);
+				});
+			};
+			roots.forEach((root) => {
+				visit(root, 0);
+			});
+			return rows;
+		}
+		//#endregion
 		//#region src/client/read-deadline.ts
 		/** Bound interactive reads, including browser connection-queue time. Never retry writes here. */
 		async function withArkmeReadDeadline(read, signal) {
@@ -138125,7 +138285,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 		}
 		//#endregion
 		//#region src/client/arko-pending-turn-store.ts
-		const STORAGE_KEY_PREFIX$2 = "arkme:arko:pending-turn:v1:";
+		const STORAGE_KEY_PREFIX$3 = "arkme:arko:pending-turn:v1:";
 		const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 		function defaultStorage() {
 			try {
@@ -138135,7 +138295,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 			}
 		}
 		function storageKey$2(userId) {
-			return `${STORAGE_KEY_PREFIX$2}${String(userId)}`;
+			return `${STORAGE_KEY_PREFIX$3}${String(userId)}`;
 		}
 		function optionalTrimmedString(value) {
 			if (typeof value !== "string") return void 0;
@@ -148840,166 +149000,6 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 		//#region assets/recording-icons/icon_send_to_self_sidebar_dark.svg
 		var icon_send_to_self_sidebar_dark_default = "PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMzAiIHZpZXdCb3g9IjAgMCAzMCAzMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGNpcmNsZSBjeD0iMTUiIGN5PSIxNSIgcj0iMTUiIGZpbGw9IndoaXRlIiBmaWxsLW9wYWNpdHk9IjAuMSIvPgo8Y2lyY2xlIGN4PSIxNSIgY3k9IjE1IiByPSIxNC43NSIgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLW9wYWNpdHk9IjAuMTUiIHN0cm9rZS13aWR0aD0iMC41Ii8+CjxwYXRoIGQ9Ik0xNS43OTM0IDExSDExLjUyNjdDMTEuMzUzNCAxMSAxMS4xODY3IDExLjAwNjcgMTEuMDI2NyAxMS4wMjY3QzkuMjMzMzcgMTEuMTggOC4zMzMzNyAxMi4yNCA4LjMzMzM3IDE0LjE5MzNWMTYuODZDOC4zMzMzNyAxOS41MjY3IDkuNDAwMDQgMjAuMDUzMyAxMS41MjY3IDIwLjA1MzNIMTEuNzkzNEMxMS45NCAyMC4wNTMzIDEyLjEzMzQgMjAuMTUzMyAxMi4yMiAyMC4yNjY3TDEzLjAyIDIxLjMzMzNDMTMuMzczNCAyMS44MDY3IDEzLjk0NjcgMjEuODA2NyAxNC4zIDIxLjMzMzNMMTUuMSAyMC4yNjY3QzE1LjIgMjAuMTMzMyAxNS4zNiAyMC4wNTMzIDE1LjUyNjcgMjAuMDUzM0gxNS43OTM0QzE3Ljc0NjcgMjAuMDUzMyAxOC44MDY3IDE5LjE2IDE4Ljk2IDE3LjM2QzE4Ljk4IDE3LjIgMTguOTg2NyAxNy4wMzMzIDE4Ljk4NjcgMTYuODZWMTQuMTkzM0MxOC45ODY3IDEyLjA2NjcgMTcuOTIgMTEgMTUuNzkzNCAxMVpNMTEuMzMzNCAxNi4zMzMzQzEwLjk2IDE2LjMzMzMgMTAuNjY2NyAxNi4wMzMzIDEwLjY2NjcgMTUuNjY2N0MxMC42NjY3IDE1LjMgMTAuOTY2NyAxNSAxMS4zMzM0IDE1QzExLjcgMTUgMTIgMTUuMyAxMiAxNS42NjY3QzEyIDE2LjAzMzMgMTEuNyAxNi4zMzMzIDExLjMzMzQgMTYuMzMzM1pNMTMuNjYgMTYuMzMzM0MxMy4yODY3IDE2LjMzMzMgMTIuOTkzNCAxNi4wMzMzIDEyLjk5MzQgMTUuNjY2N0MxMi45OTM0IDE1LjMgMTMuMjkzNCAxNSAxMy42NiAxNUMxNC4wMjY3IDE1IDE0LjMyNjcgMTUuMyAxNC4zMjY3IDE1LjY2NjdDMTQuMzI2NyAxNi4wMzMzIDE0LjAzMzQgMTYuMzMzMyAxMy42NiAxNi4zMzMzWk0xNS45OTM0IDE2LjMzMzNDMTUuNjIgMTYuMzMzMyAxNS4zMjY3IDE2LjAzMzMgMTUuMzI2NyAxNS42NjY3QzE1LjMyNjcgMTUuMyAxNS42MjY3IDE1IDE1Ljk5MzQgMTVDMTYuMzYgMTUgMTYuNjYgMTUuMyAxNi42NiAxNS42NjY3QzE2LjY2IDE2LjAzMzMgMTYuMzYgMTYuMzMzMyAxNS45OTM0IDE2LjMzMzNaIiBmaWxsPSIjOUVEREE0Ii8+CjxwYXRoIGQ9Ik0yMS42NTMzIDExLjUyNjZWMTQuMTkzM0MyMS42NTMzIDE1LjUyNjYgMjEuMjQgMTYuNDMzMyAyMC40MTMzIDE2LjkzMzNDMjAuMjEzMyAxNy4wNTMzIDE5Ljk4IDE2Ljg5MzMgMTkuOTggMTYuNjU5OUwxOS45ODY2IDE0LjE5MzNDMTkuOTg2NiAxMS41MjY2IDE4LjQ2IDkuOTk5OTIgMTUuNzkzMyA5Ljk5OTkyTDExLjczMzMgMTAuMDA2NkMxMS41IDEwLjAwNjYgMTEuMzQgOS43NzMyNSAxMS40NiA5LjU3MzI1QzExLjk2IDguNzQ2NTkgMTIuODY2NiA4LjMzMzI1IDE0LjE5MzMgOC4zMzMyNUgxOC40NkMyMC41ODY2IDguMzMzMjUgMjEuNjUzMyA5LjM5OTkyIDIxLjY1MzMgMTEuNTI2NloiIGZpbGw9IiM5RUREQTQiLz4KPC9zdmc+Cg==";
 		//#endregion
-		//#region src/client/source-tree.ts
-		/** Return the complete visible hierarchy for a topic, from its root to itself. */
-		function arkmeTopicPathNames(selectedSource, sources) {
-			if (selectedSource === void 0 || selectedSource.kind !== "topic") return [];
-			const sourceByRef = new Map(sources.map((source) => [source.sourceRef, source]));
-			const sourceByHierarchyKey = new Map(sources.flatMap((source) => source.topicHierarchyKey === void 0 ? [] : [[source.topicHierarchyKey, source]]));
-			const path = [];
-			const visited = /* @__PURE__ */ new Set();
-			let current = sourceByRef.get(selectedSource.sourceRef) ?? selectedSource;
-			while (current !== void 0 && current.kind === "topic" && !visited.has(current.sourceRef)) {
-				visited.add(current.sourceRef);
-				path.unshift(current);
-				const parentReference = current.parentTopicHierarchyKey ?? current.parentSourceRef;
-				current = parentReference === void 0 ? void 0 : current.parentTopicHierarchyKey === void 0 ? sourceByRef.get(parentReference) : sourceByHierarchyKey.get(parentReference);
-			}
-			return path.map((source) => source.displayName);
-		}
-		/** A hierarchy move may not create a cycle or exceed the five-level topic limit. */
-		function canMoveArkmeTopicToParent(source, nextParent, sources) {
-			if (!arkmeSourceAllowsUserWrite(source) || nextParent !== void 0 && !arkmeSourceAllowsUserWrite(nextParent)) return false;
-			if (source.kind !== "topic") return false;
-			if (nextParent === void 0) return true;
-			if (nextParent.kind !== "topic" || nextParent.sourceRef === source.sourceRef) return false;
-			const byRef = new Map(sources.map((item) => [item.sourceRef, item]));
-			const byHierarchyKey = new Map(sources.flatMap((item) => item.topicHierarchyKey === void 0 ? [] : [[item.topicHierarchyKey, item]]));
-			const parentOf = (item) => item.parentTopicHierarchyKey === void 0 ? item.parentSourceRef === void 0 ? void 0 : byRef.get(item.parentSourceRef) : byHierarchyKey.get(item.parentTopicHierarchyKey);
-			const targetAncestors = /* @__PURE__ */ new Set();
-			let current = nextParent;
-			while (current !== void 0 && !targetAncestors.has(current.sourceRef)) {
-				targetAncestors.add(current.sourceRef);
-				current = parentOf(current);
-			}
-			if (targetAncestors.has(source.sourceRef)) return false;
-			const childRefsByParent = /* @__PURE__ */ new Map();
-			for (const item of sources) {
-				const parent = parentOf(item);
-				if (parent === void 0) continue;
-				const children = childRefsByParent.get(parent.sourceRef) ?? [];
-				children.push(item);
-				childRefsByParent.set(parent.sourceRef, children);
-			}
-			const subtreeDepth = (item, visited = /* @__PURE__ */ new Set()) => {
-				if (visited.has(item.sourceRef)) return 0;
-				visited.add(item.sourceRef);
-				return 1 + Math.max(0, ...(childRefsByParent.get(item.sourceRef) ?? []).map((child) => subtreeDepth(child, visited)));
-			};
-			return targetAncestors.size + subtreeDepth(source) <= 5;
-		}
-		/** Build a stable tree while keeping paged children hidden until their known parent arrives. */
-		function buildArkmeSourceTree(sources) {
-			const sourcesByRef = new Map(sources.map((source) => [source.sourceRef, source]));
-			const sourcesByTopicHierarchyKey = new Map(sources.flatMap((source) => source.topicHierarchyKey === void 0 ? [] : [[source.topicHierarchyKey, source]]));
-			const nodesByRef = new Map(sources.map((source) => [source.sourceRef, {
-				source,
-				children: []
-			}]));
-			const roots = [];
-			const validParent = (source) => {
-				if (source.kind !== "topic") return void 0;
-				const parentReference = source.parentTopicHierarchyKey ?? source.parentSourceRef;
-				if (parentReference === void 0) return void 0;
-				const parentByReference = (reference) => source.parentTopicHierarchyKey === void 0 ? sourcesByRef.get(reference) : sourcesByTopicHierarchyKey.get(reference);
-				const seen = /* @__PURE__ */ new Set([source.topicHierarchyKey ?? source.sourceRef]);
-				let parentRef = parentReference;
-				let directParent;
-				while (parentRef !== void 0) {
-					if (seen.has(parentRef)) return void 0;
-					seen.add(parentRef);
-					const parent = parentByReference(parentRef);
-					if (parent === void 0) return source.parentTopicHierarchyKey === void 0 ? void 0 : null;
-					if (parent.kind !== "topic") return void 0;
-					directParent ??= parent;
-					parentRef = parent.parentTopicHierarchyKey ?? parent.parentSourceRef;
-				}
-				return directParent;
-			};
-			for (const source of sources) {
-				const node = nodesByRef.get(source.sourceRef);
-				const parent = validParent(source);
-				if (parent === null) continue;
-				const parentNode = parent === void 0 ? void 0 : nodesByRef.get(parent.sourceRef);
-				if (parentNode === void 0) roots.push(node);
-				else parentNode.children.push(node);
-			}
-			return roots;
-		}
-		const sourceNameCollator = new Intl.Collator("zh-CN", {
-			numeric: true,
-			sensitivity: "base"
-		});
-		function nonNegativeFinite(value) {
-			return value !== void 0 && Number.isFinite(value) && value > 0 ? value : 0;
-		}
-		/**
-		* Sort peers only, preserving every parent-child relationship. `custom` uses
-		* the server's persisted sibling order, with the legacy name order as fallback.
-		*/
-		function sortArkmeSourceTree(roots, sort) {
-			const compare = (left, right) => {
-				if (left.source.kind === "default_category") return right.source.kind === "default_category" ? 0 : -1;
-				if (right.source.kind === "default_category") return 1;
-				if (sort === "latest") {
-					const byLatest = nonNegativeFinite(right.source.activeAtMillis) - nonNegativeFinite(left.source.activeAtMillis);
-					if (byLatest !== 0) return byLatest;
-					const byCount = nonNegativeFinite(right.source.recordCount) - nonNegativeFinite(left.source.recordCount);
-					if (byCount !== 0) return byCount;
-				} else if (sort === "most") {
-					const byCount = nonNegativeFinite(right.source.recordCount) - nonNegativeFinite(left.source.recordCount);
-					if (byCount !== 0) return byCount;
-					const byLatest = nonNegativeFinite(right.source.activeAtMillis) - nonNegativeFinite(left.source.activeAtMillis);
-					if (byLatest !== 0) return byLatest;
-				} else {
-					const leftOrder = nonNegativeFinite(left.source.siblingOrder);
-					const rightOrder = nonNegativeFinite(right.source.siblingOrder);
-					if (leftOrder > 0 || rightOrder > 0) {
-						if (leftOrder <= 0) return 1;
-						if (rightOrder <= 0) return -1;
-						const byOrder = leftOrder - rightOrder;
-						if (byOrder !== 0) return byOrder;
-					}
-				}
-				return sourceNameCollator.compare(left.source.displayName, right.source.displayName);
-			};
-			return roots.map((node) => ({
-				...node,
-				children: sortArkmeSourceTree(node.children, sort)
-			})).sort(compare);
-		}
-		/** Total every topic from its direct records plus every descendant exactly once. */
-		function aggregateArkmeSourceTreeRecordCounts(roots) {
-			const totals = /* @__PURE__ */ new Map();
-			const visit = (node) => {
-				const total = nonNegativeFinite(node.source.recordCount) + node.children.reduce((sum, child) => sum + visit(child), 0);
-				totals.set(node.source.sourceRef, total);
-				return total;
-			};
-			roots.forEach(visit);
-			return totals;
-		}
-		function flattenVisibleArkmeSourceTree(roots, collapsedSourceRefs) {
-			const rows = [];
-			const visit = (node, depth) => {
-				const hasChildren = node.children.length > 0;
-				const expanded = hasChildren && !collapsedSourceRefs.has(node.source.sourceRef);
-				rows.push({
-					source: node.source,
-					depth,
-					hasChildren,
-					expanded
-				});
-				if (expanded) node.children.forEach((child) => {
-					visit(child, depth + 1);
-				});
-			};
-			roots.forEach((root) => {
-				visit(root, 0);
-			});
-			return rows;
-		}
-		//#endregion
 		//#region src/client/recordings/recording-forward-attempt.ts
 		function recordingForwardTargetKey(target) {
 			if (target.kind === "private_chat" || target.kind === "group_chat") return target.sourceKey ?? "";
@@ -180034,8 +180034,8 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 		//#endregion
 		//#region src/client/marketplace-sort-preference.ts
 		const DEFAULT_MARKETPLACE_SORT = "rating";
-		const STORAGE_KEY_PREFIX$1 = "dsh-arkme:marketplace-sort:v1:";
-		function preferenceStorage(storage) {
+		const STORAGE_KEY_PREFIX$2 = "dsh-arkme:marketplace-sort:v1:";
+		function preferenceStorage$1(storage) {
 			if (storage !== void 0) return storage;
 			try {
 				return typeof window === "undefined" ? void 0 : window.localStorage;
@@ -180043,27 +180043,27 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 				return;
 			}
 		}
-		function preferenceKey(userId) {
-			return Number.isSafeInteger(userId) && (userId ?? 0) > 0 ? `${STORAGE_KEY_PREFIX$1}user:${String(userId)}` : `${STORAGE_KEY_PREFIX$1}anonymous`;
+		function preferenceKey$1(userId) {
+			return Number.isSafeInteger(userId) && (userId ?? 0) > 0 ? `${STORAGE_KEY_PREFIX$2}user:${String(userId)}` : `${STORAGE_KEY_PREFIX$2}anonymous`;
 		}
 		function isMarketplaceSort(value) {
 			return value === "rating" || value === "comments" || value === "opens" || value === "created_at";
 		}
 		function readMarketplaceSortPreference(userId, storage) {
-			const target = preferenceStorage(storage);
+			const target = preferenceStorage$1(storage);
 			if (target === void 0) return DEFAULT_MARKETPLACE_SORT;
 			try {
-				const value = target.getItem(preferenceKey(userId));
+				const value = target.getItem(preferenceKey$1(userId));
 				return isMarketplaceSort(value) ? value : DEFAULT_MARKETPLACE_SORT;
 			} catch {
 				return DEFAULT_MARKETPLACE_SORT;
 			}
 		}
 		function writeMarketplaceSortPreference(userId, sort, storage) {
-			const target = preferenceStorage(storage);
+			const target = preferenceStorage$1(storage);
 			if (target === void 0) return;
 			try {
-				target.setItem(preferenceKey(userId), sort);
+				target.setItem(preferenceKey$1(userId), sort);
 			} catch {}
 		}
 		//#endregion
@@ -185082,6 +185082,43 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 			});
 		}
 		//#endregion
+		//#region src/client/self-topic-sort-preference.ts
+		const DEFAULT_SELF_TOPIC_SORT = "latest";
+		const STORAGE_KEY_PREFIX$1 = "dsh-arkme:self-topic-sort:v1:user:";
+		function preferenceStorage(storage) {
+			if (storage !== void 0) return storage;
+			try {
+				return typeof window === "undefined" ? void 0 : window.localStorage;
+			} catch {
+				return;
+			}
+		}
+		function preferenceKey(userId) {
+			return Number.isSafeInteger(userId) && (userId ?? 0) > 0 ? `${STORAGE_KEY_PREFIX$1}${String(userId)}` : void 0;
+		}
+		function isSelfTopicSort(value) {
+			return value === "latest" || value === "most" || value === "custom";
+		}
+		function readSelfTopicSortPreference(userId, storage) {
+			const key = preferenceKey(userId);
+			const target = preferenceStorage(storage);
+			if (key === void 0 || target === void 0) return DEFAULT_SELF_TOPIC_SORT;
+			try {
+				const value = target.getItem(key);
+				return isSelfTopicSort(value) ? value : DEFAULT_SELF_TOPIC_SORT;
+			} catch {
+				return DEFAULT_SELF_TOPIC_SORT;
+			}
+		}
+		function writeSelfTopicSortPreference(userId, sort, storage) {
+			const key = preferenceKey(userId);
+			const target = preferenceStorage(storage);
+			if (key === void 0 || target === void 0) return;
+			try {
+				target.setItem(key, sort);
+			} catch {}
+		}
+		//#endregion
 		//#region src/client/conversation-timeline-read-port.ts
 		const conversationTimelineReadPort = { readPage: async (sourceRef, cursor, signal) => await callArkme("source.timeline", {
 			sourceRef,
@@ -190061,6 +190098,23 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 		}
 		//#endregion
 		//#region src/client/ArkmeSourceBreadcrumb.tsx
+		/** Split a topic row into a narrow reorder edge and a generous nesting center. */
+		function arkmeTopicDropPosition(clientY, rect) {
+			if (rect.height <= 0) return "into";
+			const ratio = (clientY - rect.top) / rect.height;
+			if (ratio < .22) return "before";
+			if (ratio > .78) return "after";
+			return "into";
+		}
+		/** Return one frame of proportional list scrolling while a drag hugs an edge. */
+		function arkmeTopicDragAutoScrollDelta(clientX, clientY, rect, edgeSize = 44, minimumSpeed = 4, maximumSpeed = 18) {
+			if (clientX < rect.left || clientX > rect.right || clientY < rect.top || clientY > rect.bottom) return 0;
+			const safeEdgeSize = Math.max(1, Math.min(edgeSize, (rect.bottom - rect.top) / 2));
+			const speed = (distance) => Math.round(minimumSpeed + (maximumSpeed - minimumSpeed) * Math.min(1, Math.max(0, distance / safeEdgeSize)));
+			if (clientY < rect.top + safeEdgeSize) return -speed(rect.top + safeEdgeSize - clientY);
+			if (clientY > rect.bottom - safeEdgeSize) return speed(clientY - (rect.bottom - safeEdgeSize));
+			return 0;
+		}
 		const colors$4 = {
 			text: "#171923",
 			secondary: "#6f747d",
@@ -190206,10 +190260,48 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 				borderRadius: 7
 			},
 			topicRowHover: { background: "#f3f4f7" },
-			topicRowDropTarget: { background: "#f3f5ff" },
-			topicRowDropBefore: { boxShadow: "inset 0 2px 0 #5870d8" },
-			topicRowDropAfter: { boxShadow: "inset 0 -2px 0 #5870d8" },
-			topicRowDropInto: { outline: "1px solid #8fa0e9" },
+			topicRowSelected: {
+				background: colors$4.selected,
+				fontWeight: 600
+			},
+			topicHierarchyGuide: {
+				position: "absolute",
+				top: 0,
+				bottom: 0,
+				width: 1,
+				background: "#e7e9ed",
+				pointerEvents: "none"
+			},
+			topicRowDropInto: {
+				background: "#eef2ff",
+				outline: "1px solid #8295e5",
+				outlineOffset: -1
+			},
+			topicDropLine: {
+				position: "absolute",
+				zIndex: 2,
+				right: 4,
+				height: 2,
+				borderRadius: 0,
+				background: "#5870d8",
+				pointerEvents: "none"
+			},
+			topicDropIntoBadge: {
+				position: "absolute",
+				zIndex: 3,
+				right: 6,
+				top: 5,
+				height: 22,
+				display: "inline-flex",
+				alignItems: "center",
+				padding: "0 6px",
+				borderRadius: 5,
+				background: "#dce4ff",
+				color: "#445bbd",
+				fontSize: 10,
+				fontWeight: 600,
+				pointerEvents: "none"
+			},
 			topicToggle: {
 				width: 24,
 				height: 28,
@@ -190248,10 +190340,6 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 				textAlign: "left",
 				cursor: "pointer"
 			},
-			topicSelectSelected: {
-				background: colors$4.selected,
-				fontWeight: 600
-			},
 			topicName: {
 				minWidth: 0,
 				flex: 1,
@@ -190523,11 +190611,11 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 		function topicCountLabel(count) {
 			return count === void 0 ? "…" : count.toLocaleString("zh-CN");
 		}
-		function ArkmeSourceBreadcrumb({ selectedSource, sources, loading = false, error, onSelect, onSelectAggregate, onCreateTopic, onCreateChildTopic, onRenameTopic, onDissolveTopic, onRetry, onMoveTopic, activeDissolve, tourOpen }) {
+		function ArkmeSourceBreadcrumb({ userId, selectedSource, sources, loading = false, error, onSelect, onSelectAggregate, onCreateTopic, onCreateChildTopic, onRenameTopic, onDissolveTopic, onRetry, onMoveTopic, activeDissolve, tourOpen }) {
 			const [manualOpen, setOpen] = (0, react$1.useState)(false);
 			const open = tourOpen ?? manualOpen;
 			const [collapsedSourceRefs, setCollapsedSourceRefs] = (0, react$1.useState)(() => /* @__PURE__ */ new Set());
-			const [sort, setSort] = (0, react$1.useState)("latest");
+			const [sort, setSort] = (0, react$1.useState)(() => readSelfTopicSortPreference(userId));
 			const [draggingSourceRef, setDraggingSourceRef] = (0, react$1.useState)();
 			const [hoveredSourceRef, setHoveredSourceRef] = (0, react$1.useState)();
 			const [topicMenuSource, setTopicMenuSource] = (0, react$1.useState)();
@@ -190541,10 +190629,15 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 			const [dropPlan, setDropPlan] = (0, react$1.useState)();
 			const [movingTopic, setMovingTopic] = (0, react$1.useState)(false);
 			const [moveError, setMoveError] = (0, react$1.useState)("");
-			const rootRef = (0, react$1.useRef)(null);
+			const selectorRef = (0, react$1.useRef)(null);
+			const menuRef = (0, react$1.useRef)(null);
 			const menuListRef = (0, react$1.useRef)(null);
 			const pendingSelectedFocusRef = (0, react$1.useRef)(false);
 			const dragStartXRef = (0, react$1.useRef)(0);
+			const dragPointerRef = (0, react$1.useRef)();
+			const dragAutoScrollFrameRef = (0, react$1.useRef)();
+			const dragAutoExpandTimerRef = (0, react$1.useRef)();
+			const dragAutoExpandSourceRef = (0, react$1.useRef)();
 			const observedActiveDissolveRef = (0, react$1.useRef)(false);
 			const topicRoots = (0, react$1.useMemo)(() => sortArkmeSourceTree(buildArkmeSourceTree(arkmeSelfDirectorySources(sources)), sort), [sort, sources]);
 			const rows = (0, react$1.useMemo)(() => flattenVisibleArkmeSourceTree(topicRoots, collapsedSourceRefs), [collapsedSourceRefs, topicRoots]);
@@ -190574,6 +190667,9 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 				setTopicMutationError("");
 				setDissolveDialogOpen(true);
 			};
+			(0, react$1.useEffect)(() => {
+				setSort(readSelfTopicSortPreference(userId));
+			}, [userId]);
 			(0, react$1.useEffect)(() => {
 				if (activeDissolveRunning && activeDissolve !== void 0) {
 					observedActiveDissolveRef.current = true;
@@ -190601,24 +190697,75 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 				const currentParent = currentParentOf(draggingSource);
 				return currentParent?.sourceRef !== nextParent?.sourceRef || nextSiblingOf(draggingSource, currentParent)?.sourceRef !== insertBefore?.sourceRef;
 			};
+			const stopTopicDragAutoScroll = () => {
+				dragPointerRef.current = void 0;
+				if (dragAutoScrollFrameRef.current !== void 0) cancelAnimationFrame(dragAutoScrollFrameRef.current);
+				dragAutoScrollFrameRef.current = void 0;
+			};
+			const runTopicDragAutoScroll = () => {
+				dragAutoScrollFrameRef.current = void 0;
+				const list = menuListRef.current;
+				const pointer = dragPointerRef.current;
+				if (list === null || pointer === void 0) return;
+				const delta = arkmeTopicDragAutoScrollDelta(pointer.clientX, pointer.clientY, list.getBoundingClientRect());
+				if (delta === 0) return;
+				const before = list.scrollTop;
+				list.scrollTop += delta;
+				if (list.scrollTop === before) return;
+				dragAutoScrollFrameRef.current = requestAnimationFrame(runTopicDragAutoScroll);
+			};
+			const updateTopicDragAutoScroll = (clientX, clientY) => {
+				dragPointerRef.current = {
+					clientX,
+					clientY
+				};
+				if (dragAutoScrollFrameRef.current === void 0) dragAutoScrollFrameRef.current = requestAnimationFrame(runTopicDragAutoScroll);
+			};
+			const stopTopicAutoExpand = () => {
+				if (dragAutoExpandTimerRef.current !== void 0) clearTimeout(dragAutoExpandTimerRef.current);
+				dragAutoExpandTimerRef.current = void 0;
+				dragAutoExpandSourceRef.current = void 0;
+			};
+			const scheduleTopicAutoExpand = (row, plan) => {
+				const expandable = row.hasChildren || row.source.hasPendingChildren === true;
+				if (plan?.into !== true || !expandable || row.expanded) {
+					stopTopicAutoExpand();
+					return;
+				}
+				if (dragAutoExpandSourceRef.current === row.source.sourceRef) return;
+				stopTopicAutoExpand();
+				dragAutoExpandSourceRef.current = row.source.sourceRef;
+				dragAutoExpandTimerRef.current = setTimeout(() => {
+					setCollapsedSourceRefs((current) => {
+						if (!current.has(row.source.sourceRef)) return current;
+						const next = new Set(current);
+						next.delete(row.source.sourceRef);
+						return next;
+					});
+					dragAutoExpandTimerRef.current = void 0;
+					dragAutoExpandSourceRef.current = void 0;
+				}, 500);
+			};
 			const planMoveAtRow = (row, clientX, clientY, rect) => {
 				if (row.source.kind === "default_category" || !arkmeSourceAllowsUserWrite(row.source)) return void 0;
 				if (draggingSource === void 0) return void 0;
 				const horizontalDelta = clientX - dragStartXRef.current;
-				if (horizontalDelta >= 24) {
+				const position = arkmeTopicDropPosition(clientY, rect);
+				const targetParent = currentParentOf(row.source);
+				const outdenting = horizontalDelta <= -24 && targetParent !== void 0;
+				if (position === "into" && !outdenting) {
 					if (!canMoveTo(row.source, void 0)) return void 0;
 					return {
 						parent: row.source,
 						insertBefore: void 0,
 						indicatorSourceRef: row.source.sourceRef,
+						indicatorDepth: row.depth + 1,
 						before: false,
 						into: true
 					};
 				}
-				const targetParent = currentParentOf(row.source);
-				const outdenting = horizontalDelta <= -24 && targetParent !== void 0;
 				const parent = outdenting ? currentParentOf(targetParent) : targetParent;
-				const before = clientY < rect.top + rect.height / 2;
+				const before = position === "before";
 				const anchor = outdenting ? targetParent : row.source;
 				const insertBefore = before ? anchor : nextSiblingOf(anchor, parent);
 				if (!canMoveTo(parent, insertBefore)) return void 0;
@@ -190626,6 +190773,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 					parent,
 					insertBefore,
 					indicatorSourceRef: row.source.sourceRef,
+					indicatorDepth: outdenting ? Math.max(0, row.depth - 1) : row.depth,
 					before,
 					into: false
 				};
@@ -190633,6 +190781,14 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 			const finishTopicMove = (plan) => {
 				if (plan === void 0 || !canMoveTo(plan.parent, plan.insertBefore) || draggingSource === void 0 || onMoveTopic === void 0) return;
 				const movedSource = draggingSource;
+				stopTopicDragAutoScroll();
+				stopTopicAutoExpand();
+				if (plan.into && plan.parent !== void 0) setCollapsedSourceRefs((current) => {
+					if (!current.has(plan.parent.sourceRef)) return current;
+					const next = new Set(current);
+					next.delete(plan.parent.sourceRef);
+					return next;
+				});
 				setMovingTopic(true);
 				setMoveError("");
 				setDropPlan(void 0);
@@ -190643,6 +190799,10 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 					setMovingTopic(false);
 				});
 			};
+			(0, react$1.useEffect)(() => () => {
+				stopTopicDragAutoScroll();
+				stopTopicAutoExpand();
+			}, []);
 			const revealSelectedTopic = () => {
 				if (selectedRef === void 0) {
 					menuListRef.current?.scrollTo({ top: 0 });
@@ -190682,10 +190842,10 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 				if (!open) return;
 				const closeOutside = (event) => {
 					if (tourOpen !== void 0) return;
-					if (event.target instanceof Node && !rootRef.current?.contains(event.target)) {
-						setOpen(false);
-						setTopicMenuSource(void 0);
-					}
+					if (!(event.target instanceof Node)) return;
+					if (selectorRef.current?.contains(event.target) || menuRef.current?.contains(event.target)) return;
+					setOpen(false);
+					setTopicMenuSource(void 0);
 				};
 				const closeEscape = (event) => {
 					if (tourOpen !== void 0) return;
@@ -190778,7 +190938,6 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 				});
 			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("nav", {
-				ref: rootRef,
 				"aria-label": "发给自己主题",
 				style: styles$13.breadcrumb,
 				children: [
@@ -190788,6 +190947,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 						children: "发给自己"
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+						ref: selectorRef,
 						type: "button",
 						"aria-label": "选择主题",
 						"aria-haspopup": "tree",
@@ -190849,6 +191009,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 						}), activeDissolveLabel]
 					}),
 					open && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						ref: menuRef,
 						role: "tree",
 						"aria-label": "主题",
 						"data-arkme-self-topic-menu": true,
@@ -190874,6 +191035,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 									},
 									onClick: () => {
 										setSort(value);
+										writeSelfTopicSortPreference(userId, value);
 										revealSelectedTopic();
 									},
 									children: label
@@ -190888,6 +191050,20 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								ref: menuListRef,
 								style: styles$13.menuList,
+								onDragOver: (event) => {
+									if (!customDragEnabled || draggingSource === void 0) return;
+									updateTopicDragAutoScroll(event.clientX, event.clientY);
+								},
+								onDragLeave: (event) => {
+									if (event.relatedTarget instanceof Node && event.currentTarget.contains(event.relatedTarget)) return;
+									stopTopicDragAutoScroll();
+									stopTopicAutoExpand();
+									setDropPlan(void 0);
+								},
+								onDrop: () => {
+									stopTopicDragAutoScroll();
+									stopTopicAutoExpand();
+								},
 								children: [
 									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 										type: "button",
@@ -190920,24 +191096,34 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 										const isSelected = selectedRef === row.source.sourceRef;
 										const isHovered = hoveredSourceRef === row.source.sourceRef;
 										const isDefaultCategory = row.source.kind === "default_category";
+										const canDragTopic = customDragEnabled && !isDefaultCategory && arkmeSourceAllowsUserWrite(row.source);
 										const canCreateChild = arkmeSourceAllowsUserWrite(row.source) && !isDefaultCategory && onCreateChildTopic !== void 0 && row.depth + 1 < 5;
 										const canManageTopic = arkmeSourceAllowsUserWrite(row.source) && !isDefaultCategory && (canCreateChild || onRenameTopic !== void 0 || onDissolveTopic !== void 0);
-										const showActions = isHovered && canManageTopic;
+										const showActions = isHovered && canManageTopic && draggingSource === void 0;
 										const manageMenuOpen = topicMenuSource?.sourceRef === row.source.sourceRef;
+										const rowDropPlan = dropPlan?.indicatorSourceRef === row.source.sourceRef ? dropPlan : void 0;
 										const displayedCount = (row.hasChildren || row.source.hasPendingChildren === true) && !countsComplete ? void 0 : aggregateTopicCounts.get(row.source.sourceRef) ?? topicDirectRecordCount(row.source);
+										const depthInset = row.depth * 16;
 										return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 											role: "treeitem",
 											"aria-level": row.depth + 1,
 											"aria-selected": selectedRef === row.source.sourceRef,
 											...row.hasChildren ? { "aria-expanded": row.expanded } : {},
+											draggable: canDragTopic,
 											"data-arkme-self-topic-tree-row": "true",
 											"data-arkme-self-topic-tree-row-ref": row.source.sourceRef,
+											"data-arkme-self-topic-hit-region": "true",
 											style: {
 												...styles$13.topicRow,
-												paddingLeft: row.depth * 16,
+												marginLeft: depthInset,
+												width: `calc(100% - ${String(depthInset)}px)`,
 												...isHovered && !isSelected ? styles$13.topicRowHover : {},
-												...dropPlan?.indicatorSourceRef === row.source.sourceRef ? styles$13.topicRowDropTarget : {},
-												...dropPlan?.indicatorSourceRef === row.source.sourceRef && dropPlan.into ? styles$13.topicRowDropInto : dropPlan?.indicatorSourceRef === row.source.sourceRef && dropPlan.before ? styles$13.topicRowDropBefore : dropPlan?.indicatorSourceRef === row.source.sourceRef ? styles$13.topicRowDropAfter : {}
+												...isSelected ? styles$13.topicRowSelected : {},
+												...rowDropPlan?.into === true ? styles$13.topicRowDropInto : {},
+												...canDragTopic ? { cursor: "grab" } : {}
+											},
+											onClick: () => {
+												selectTopic(row.source);
 											},
 											onMouseEnter: () => {
 												setHoveredSourceRef(row.source.sourceRef);
@@ -190949,22 +191135,67 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 											},
 											onDragOver: (event) => {
 												const plan = planMoveAtRow(row, event.clientX, event.clientY, event.currentTarget.getBoundingClientRect());
-												if (plan === void 0) return;
+												if (plan === void 0) {
+													setDropPlan(void 0);
+													stopTopicAutoExpand();
+													return;
+												}
 												event.preventDefault();
 												event.dataTransfer.dropEffect = "move";
 												setDropPlan(plan);
+												scheduleTopicAutoExpand(row, plan);
+											},
+											onDragStart: (event) => {
+												event.dataTransfer.effectAllowed = "move";
+												event.dataTransfer.setData("text/plain", row.source.sourceRef);
+												dragStartXRef.current = event.clientX;
+												stopTopicDragAutoScroll();
+												stopTopicAutoExpand();
+												setMoveError("");
+												setDropPlan(void 0);
+												setDraggingSourceRef(row.source.sourceRef);
+											},
+											onDragEnd: () => {
+												stopTopicDragAutoScroll();
+												stopTopicAutoExpand();
+												setDraggingSourceRef(void 0);
+												setDropPlan(void 0);
 											},
 											onDrop: (event) => {
 												event.preventDefault();
 												finishTopicMove(planMoveAtRow(row, event.clientX, event.clientY, event.currentTarget.getBoundingClientRect()));
 											},
 											children: [
+												Array.from({ length: row.depth }, (_, guideDepth) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													"aria-hidden": true,
+													"data-arkme-self-topic-hierarchy-guide": guideDepth,
+													style: {
+														...styles$13.topicHierarchyGuide,
+														left: (guideDepth - row.depth) * 16 + 12
+													}
+												}, `guide-${String(guideDepth)}`)),
+												rowDropPlan !== void 0 && !rowDropPlan.into && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													"aria-hidden": true,
+													"data-arkme-self-topic-drop-line": rowDropPlan.before ? "before" : "after",
+													style: {
+														...styles$13.topicDropLine,
+														left: (rowDropPlan.indicatorDepth - row.depth) * 16 + 4,
+														...rowDropPlan.before ? { top: -1 } : { bottom: -1 }
+													}
+												}),
+												rowDropPlan?.into === true && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													"aria-hidden": true,
+													"data-arkme-self-topic-drop-into": "true",
+													style: styles$13.topicDropIntoBadge,
+													children: "移入"
+												}),
 												row.hasChildren ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 													type: "button",
 													"aria-label": `${row.expanded ? "收起" : "展开"}${row.source.displayName}`,
 													title: row.expanded ? "收起子主题" : "展开子主题",
 													style: styles$13.topicToggle,
-													onClick: () => {
+													onClick: (event) => {
+														event.stopPropagation();
 														toggleTopicExpansion(row.source.sourceRef);
 													},
 													children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("svg", {
@@ -190992,23 +191223,9 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 												}),
 												/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 													type: "button",
-													draggable: customDragEnabled && !isDefaultCategory && arkmeSourceAllowsUserWrite(row.source),
-													style: {
-														...styles$13.topicSelect,
-														...isSelected ? styles$13.topicSelectSelected : {}
-													},
-													onDragStart: (event) => {
-														event.dataTransfer.effectAllowed = "move";
-														event.dataTransfer.setData("text/plain", row.source.sourceRef);
-														dragStartXRef.current = event.clientX;
-														setMoveError("");
-														setDraggingSourceRef(row.source.sourceRef);
-													},
-													onDragEnd: () => {
-														setDraggingSourceRef(void 0);
-														setDropPlan(void 0);
-													},
-													onClick: () => {
+													style: styles$13.topicSelect,
+													onClick: (event) => {
+														event.stopPropagation();
 														selectTopic(row.source);
 													},
 													children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -191156,10 +191373,12 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 											if (!canMoveTo(void 0, void 0)) return;
 											event.preventDefault();
 											event.dataTransfer.dropEffect = "move";
+											stopTopicAutoExpand();
 											setDropPlan({
 												parent: void 0,
 												insertBefore: void 0,
 												indicatorSourceRef: "root",
+												indicatorDepth: 0,
 												before: false,
 												into: false
 											});
@@ -191170,6 +191389,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 												parent: void 0,
 												insertBefore: void 0,
 												indicatorSourceRef: "root",
+												indicatorDepth: 0,
 												before: false,
 												into: false
 											});
@@ -199005,11 +199225,22 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 				unreadCount: 0
 			};
 		}
-		function ArkmeTimelineSelfTopicBadge({ topic, onSelect }) {
+		function arkmeTimelineSelfTopicPresentation(item, currentSource, sources) {
+			if (currentSource?.kind !== "send_to_self" && currentSource?.kind !== "topic") return void 0;
+			const topic = arkmeTimelineSelfTopicSource(item, sources);
+			if (topic === void 0) return void 0;
+			return {
+				topic,
+				displayLabel: arkmeTopicPathNames(topic, sources).join(" / ") || topic.displayName
+			};
+		}
+		function ArkmeTimelineSelfTopicBadge({ topic, displayLabel, onSelect }) {
+			const label = displayLabel?.trim() || topic.displayName;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 				type: "button",
-				"data-arkme-self-topic-badge": topic.displayName,
-				"aria-label": `查看主题「${topic.displayName}」`,
+				"data-arkme-self-topic-badge": label,
+				"aria-label": `查看主题「${label}」`,
+				title: label,
 				style: styles$6.selfTopicBadge,
 				onClick: (event) => {
 					event.stopPropagation();
@@ -199030,7 +199261,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						style: styles$6.selfTopicBadgeText,
-						children: topic.displayName
+						children: label
 					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						"aria-hidden": true,
@@ -205246,6 +205477,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 										/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 											style: styles$6.titleGroup,
 											children: [authenticated && conversationBackdropVisible && isArkmeSelfWorkspaceSource(selectedSource) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ArkmeSourceBreadcrumb, {
+												userId: auth?.userId,
 												selectedSource,
 												sources: selfSources,
 												tourOpen: selfTour.topicMenuOpen,
@@ -205655,7 +205887,7 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 																onOpen: openMomentDetail
 															})] }, row.id);
 															const item = row.item;
-															const selfTopicSource = source?.kind === "send_to_self" ? arkmeTimelineSelfTopicSource(item, selfSources) : void 0;
+															const selfTopicPresentation = arkmeTimelineSelfTopicPresentation(item, source, selfSources);
 															const avatarRef = arkmeTimelineAvatarRef(item, selfProfile);
 															const messageMember = item.memberRef === void 0 ? item.isMe ? selfConversationMember : void 0 : conversationMemberByRef.get(item.memberRef);
 															const messageHeader = item.isMe || source.kind === "private_chat" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ArkmeTimelineMessageHeader, {
@@ -205872,8 +206104,9 @@ body[data-ds-dark-theme] .arkme-mention-all-avatar [data-arkme-theme-image="dark
 																					wide: isStructuredMessageCard,
 																					children: messageBubble
 																				}, `read-receipt:${conversationOverlayKey}`);
-																				const topicBadge = selfTopicSource === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ArkmeTimelineSelfTopicBadge, {
-																					topic: selfTopicSource,
+																				const topicBadge = selfTopicPresentation === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ArkmeTimelineSelfTopicBadge, {
+																					topic: selfTopicPresentation.topic,
+																					...selfTopicPresentation.displayLabel === void 0 ? {} : { displayLabel: selfTopicPresentation.displayLabel },
 																					onSelect: activateSelfSource
 																				});
 																				if (!isExtensionMessage || item.extensionParent === void 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [messageContentLine, topicBadge] });