@senguoyun/dsh-arkme 0.1.58 → 0.1.60

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

@@ -1153,6 +1153,51 @@ var ServiceRuntime = class {
 	readRevision(scope) {
 		return this.readRevisions.get(scope) ?? 0;
 	}
+	calendarRevisions = /* @__PURE__ */ new Map();
+	calendarVersion(scope) {
+		let value = this.calendarRevisions.get(scope);
+		if (!value) {
+			value = {
+				epoch: 0,
+				revision: 0,
+				dates: /* @__PURE__ */ new Map()
+			};
+			this.calendarRevisions.set(scope, value);
+		}
+		return value;
+	}
+	calendarReadRevision(scope, start, end, timezone) {
+		const value = this.calendarVersion(scope);
+		const format = new Intl.DateTimeFormat("en-CA", {
+			timeZone: timezone === "local" ? void 0 : timezone,
+			year: "numeric",
+			month: "2-digit",
+			day: "2-digit"
+		});
+		let revision = 0;
+		for (const [stamp, changed] of value.dates) {
+			const day = format.format(new Date(stamp));
+			if (day >= start && day <= end) revision = Math.max(revision, changed);
+		}
+		return `${value.epoch}:${revision}`;
+	}
+	/** Chat deltas invalidate only affected composite month results (in any timezone). */
+	invalidateCalendarDates(scope, stamps) {
+		const dates = [...new Set(stamps.filter((stamp) => Number.isFinite(stamp) && stamp > 0))];
+		if (!dates.length) {
+			this.invalidateKey(scope, "calendar:");
+			return;
+		}
+		const value = this.calendarVersion(scope);
+		if (value.dates.size + dates.length > 256) {
+			value.epoch++;
+			value.dates.clear();
+		}
+		for (const stamp of dates) value.dates.set(stamp, ++value.revision);
+		this.readRevisions.set(scope, this.readRevision(scope) + 1);
+		this.requestCoordinator.invalidateKey(scope, "calendar:");
+		this.requestCoordinator.invalidateKey(scope, "owner-read:");
+	}
 	async withOwnerReadInvalidation(route, operation) {
 		const session = await this.requireSession();
 		try {
@@ -1194,16 +1239,25 @@ var ServiceRuntime = class {
 		});
 	}
 	invalidateScope(scope) {
+		const calendar = this.calendarVersion(scope);
+		calendar.epoch++;
+		calendar.dates.clear();
 		this.readRevisions.set(scope, this.readRevision(scope) + 1);
 		this.requestCoordinator.invalidateScope(scope);
 	}
 	invalidateKey(scope, key) {
+		if (key.startsWith("calendar:")) {
+			const calendar = this.calendarVersion(scope);
+			calendar.epoch++;
+			calendar.dates.clear();
+		}
 		this.readRevisions.set(scope, this.readRevision(scope) + 1);
 		this.requestCoordinator.invalidateKey(scope, key);
 		this.requestCoordinator.invalidateKey(scope, "owner-read:");
 	}
 	dispose() {
 		this.refreshInFlightByUserId.clear();
+		this.calendarRevisions.clear();
 		this.requestCoordinator.dispose();
 	}
 	async requireSession() {
@@ -35608,6 +35662,8 @@ var SourceService = class {
 	chatSourceCache = /* @__PURE__ */ new Map();
 	sourceListCache = /* @__PURE__ */ new Map();
 	sourceListInFlight = new SharedReadGroup();
+	selfDirectoryContexts = /* @__PURE__ */ new Map();
+	selfDirectoryContextReads = new SharedReadGroup();
 	groupAvatarSnapshotCache = /* @__PURE__ */ new Map();
 	topicDissolveProgress = /* @__PURE__ */ new Map();
 	constructor(runtime, profile, recordReader, privacy = new ArkmePrivacyVisibilityService(runtime)) {
@@ -35886,6 +35942,8 @@ var SourceService = class {
 		this.chatSourceCache.clear();
 		this.sourceListCache.clear();
 		this.sourceListInFlight.clear();
+		this.selfDirectoryContexts.clear();
+		this.selfDirectoryContextReads.clear();
 		this.groupAvatarSnapshotCache.clear();
 		this.topicDissolveProgress.clear();
 	}
@@ -36224,7 +36282,7 @@ var SourceService = class {
 		const movedParentUid = stringValue$2(moved.parent_topic_uid).trim();
 		const siblingOrder = numberValue$26(moved.sibling_order);
 		if (movedTopicUid !== topic.ownerRef || movedParentUid !== (nextParentUid ?? "") || siblingOrder <= 0) throw new ArkmePluginError("topic-hierarchy-move-contract-invalid", "主题移动响应不完整，请刷新后重试", true, 502);
-		this.sourceListCache.clear();
+		this.invalidateSourceListCache(session.userId, "send_to_self");
 		return {
 			sourceRef,
 			...nextParentSourceRef === void 0 ? {} : { parentSourceRef: nextParentSourceRef },
@@ -36286,6 +36344,10 @@ var SourceService = class {
 		options.signal?.throwIfAborted();
 		const limit = Math.min(directory === "send_to_self" ? 100 : 50, Math.max(1, Math.trunc(options.limit ?? 30)));
 		const cursor = options.cursor?.trim() ?? "";
+		if (directory === "send_to_self" && options.refresh === true && cursor === "") {
+			this.selfDirectoryContexts.delete(session.userId);
+			this.selfDirectoryContextReads.invalidate((key) => key === String(session.userId));
+		}
 		const cacheKey = `${String(session.userId)}:${directory}:${String(limit)}:${cursor}:${options.firstPaint === true ? "first" : "full"}`;
 		this.pruneSourceListCache();
 		const cached = this.sourceListCache.get(cacheKey);
@@ -36464,19 +36526,34 @@ var SourceService = class {
 		}
 		throw new ArkmePluginError("directory-groups-pagination-limit", "群聊列表超过安全分页上限", false, 502);
 	}
+	async selfDirectoryContext(session, signal) {
+		const cached = this.selfDirectoryContexts.get(session.userId);
+		if (cached && cached.expiresAtMillis > Date.now()) return cached.value;
+		return this.selfDirectoryContextReads.run(String(session.userId), async (inner, isCurrent) => {
+			const [hierarchyData, [summaryResult, latestRecordsResult]] = await Promise.all([this.runtime.authenticatedPost("/api/v1/topics/hierarchy/relations/list", {}, session, inner).catch(() => void 0), Promise.allSettled([this.recordReader.summary(), this.runtime.authenticatedPost("/api/v1/records/uncategorized/query", { limit: 10 }, session, inner)])]);
+			const value = {
+				hierarchyData,
+				summaryResult,
+				latestRecordsResult
+			};
+			if (isCurrent()) this.selfDirectoryContexts.set(session.userId, {
+				value,
+				expiresAtMillis: Date.now() + SOURCE_LIST_CACHE_TTL_MS
+			});
+			return value;
+		}, signal);
+	}
 	async listSourcesUncached(session, directory, options, limit, sessionKind) {
 		if (directory === "send_to_self") {
 			const lockedRecordUids = await this.privacy.lockedRecordUids(session, options.signal);
 			const topicPage = options.cursor === void 0 || options.cursor.trim() === "" ? void 0 : this.decodeTopicDirectoryCursor(options.cursor);
-			const [data, hierarchyData] = await Promise.all([this.runtime.authenticatedPost("/api/v1/topics/display/list", {
+			const [data, { hierarchyData, summaryResult, latestRecordsResult }] = await Promise.all([this.runtime.authenticatedPost("/api/v1/topics/display/list", {
 				limit: Math.min(100, Math.max(1, limit)),
 				keyword: "",
 				privacy_state: 1,
 				...topicPage?.pageCursor === void 0 ? {} : { page_cursor: topicPage.pageCursor },
 				...topicPage?.offset === void 0 ? {} : { offset: topicPage.offset }
-			}, session, options.signal), this.runtime.authenticatedPost("/api/v1/topics/hierarchy/relations/list", {}, session, options.signal).catch(() => void 0)]);
-			options.signal?.throwIfAborted();
-			const [summaryResult, latestRecordsResult] = await Promise.allSettled([this.recordReader.summary(), this.runtime.authenticatedPost("/api/v1/records/uncategorized/query", { limit: 10 }, session, options.signal)]);
+			}, session, options.signal), this.selfDirectoryContext(session, options.signal)]);
 			options.signal?.throwIfAborted();
 			const cached = summaryResult.status === "rejected" || latestRecordsResult.status === "rejected" ? await this.runtime.stateStore.cachedSnapshot(session.userId).catch(() => void 0) : void 0;
 			const defaultRecordCount = summaryResult.status === "fulfilled" ? summaryResult.value.recordCount : cached?.summary?.recordCount;
@@ -36512,6 +36589,7 @@ var SourceService = class {
 				const item = objectValue$2(raw);
 				if (arkmePrivacyLockedTopic(item)) continue;
 				const core = objectValue$2(item.topic_core);
+				if (numberValue$26(core.kind) === 3) continue;
 				const status = core.status ?? item.status;
 				if (status !== void 0 && numberValue$26(status) !== 1) continue;
 				const summary = objectValue$2(item.summary);
@@ -36690,6 +36768,10 @@ var SourceService = class {
 		};
 	}
 	invalidateSourceListCache(userId, directory) {
+		if (directory === void 0 || directory === "send_to_self") {
+			this.selfDirectoryContexts.delete(userId);
+			this.selfDirectoryContextReads.invalidate((key) => key === String(userId));
+		}
 		if (directory === void 0 || directory === "root") this.runtime.invalidateKey(this.runtime.requestScope(userId), "directory:root:");
 		const prefix = `${String(userId)}:`;
 		const matches = (key) => key.startsWith(prefix) && (directory === void 0 || key.startsWith(`${prefix}${directory}:`));
@@ -37879,10 +37961,29 @@ var BotConversationService = class {
 		return context.reference.target.kind === "subject" ? this.subject : this.chatAdapter;
 	}
 };
+/** Authoritative wire fields only: ordinary topics may have the same title. */
+function isDshAgentInputRawRecord(raw) {
+	const object = (value) => value !== null && typeof value === "object" ? value : {};
+	const item = object(raw);
+	const core = object(item.record_core);
+	const topic = object(item.topic_core);
+	return Number(item.creation_source ?? item.creationSource ?? core.creation_source ?? core.creationSource) === 3 || Number(topic.kind ?? item.topicKind) === 3;
+}
 //#endregion
 //#region src/services/calendar-service.ts
 const MAX_CALENDAR_RANGE_DAYS = 62;
 const MAX_DAY_RECORD_LIMIT = 50;
+async function mapBounded(items, project) {
+	const result = new Array(items.length);
+	let index = 0;
+	await Promise.all(Array.from({ length: Math.min(4, items.length) }, async () => {
+		while (index < items.length) {
+			const current = index++;
+			result[current] = await project(items[current]);
+		}
+	}));
+	return result;
+}
 function numberValue$23(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
@@ -37943,6 +38044,12 @@ var CalendarService = class {
 	media;
 	record;
 	source;
+	months = /* @__PURE__ */ new Map();
+	monthReads = new SharedReadGroup();
+	dispose() {
+		this.months.clear();
+		this.monthReads.clear();
+	}
 	constructor(runtime, privacy, media, record, source) {
 		this.runtime = runtime;
 		this.privacy = privacy;
@@ -37951,6 +38058,44 @@ var CalendarService = class {
 		this.source = source;
 	}
 	async bucketPage(options) {
+		options.signal?.throwIfAborted();
+		const session = await this.runtime.requireSession();
+		const timezone = readTimezone(options.timezone);
+		const key = JSON.stringify([
+			session.userId,
+			options.sourceRef ?? "global",
+			options.startDate,
+			options.endDate,
+			timezone
+		]);
+		const revision = () => this.runtime.calendarReadRevision?.(`user:${session.userId}`, options.startDate, options.endDate, timezone) ?? "0";
+		const version = revision();
+		const cached = this.months.get(key);
+		if (cached && cached.revision === version && cached.expires > Date.now()) {
+			this.months.delete(key);
+			this.months.set(key, cached);
+			return structuredClone(cached.value);
+		}
+		return structuredClone(await this.monthReads.run(`${key}:${version}`, async (signal, isCurrent) => {
+			const value = await this.bucketPageUncached({
+				...options,
+				timezone,
+				signal
+			});
+			signal.throwIfAborted();
+			if (isCurrent() && revision() === version) {
+				this.months.delete(key);
+				this.months.set(key, {
+					revision: version,
+					expires: Date.now() + 6e4,
+					value
+				});
+				while (this.months.size > 48) this.months.delete(this.months.keys().next().value);
+			}
+			return value;
+		}, options.signal));
+	}
+	async bucketPageUncached(options) {
 		const startDate = readCalendarDate(options.startDate, "start_date");
 		const endDate = readCalendarDate(options.endDate, "end_date");
 		const startDay = calendarDayNumber(startDate);
@@ -37959,25 +38104,60 @@ var CalendarService = class {
 		if (endDay - startDay + 1 > MAX_CALENDAR_RANGE_DAYS) throw new ArkmePluginError("calendar-range-too-wide", `日历范围最多查询 ${MAX_CALENDAR_RANGE_DAYS} 天`, false);
 		const timezone = readTimezone(options.timezone);
 		const session = await this.runtime.requireSession();
-		await this.privacy.lockedRecordUids(session, options.signal);
-		const data = await this.runtime.authenticatedCalendarPost("/api/v1/calendar/buckets/query", {
-			bucket_scope_kind: 1,
-			bucket_scope_uid: "",
-			start_date: startDate,
-			end_date: endDate,
-			timezone
-		}, session, options.signal, {
-			key: `calendar:buckets:self:${startDate}:${endDate}:${timezone}`,
-			cacheMs: 3e4,
-			failureCooldownMs: 2e3
+		const locked = await this.privacy.lockedRecordUids(session, options.signal);
+		const scope = await this.resolveScope(options.sourceRef, session, options.signal);
+		const pages = await mapBounded(scope.buckets, async (bucket) => {
+			return {
+				bucket,
+				days: listValue$20((await this.runtime.authenticatedCalendarPost("/api/v1/calendar/buckets/query", {
+					bucket_scope_kind: bucket.kind,
+					bucket_scope_uid: bucket.uid,
+					start_date: startDate,
+					end_date: endDate,
+					timezone
+				}, session, options.signal, {
+					key: `calendar:buckets:${bucket.kind === 1 ? "self" : `topic:${bucket.uid}`}:${startDate}:${endDate}:${timezone}`,
+					cacheMs: 3e4,
+					lane: options.background ? "background-read" : "interactive-read",
+					failureCooldownMs: 2e3
+				})).daily_data).map((raw) => this.bucketDay(raw)).filter((day) => day !== void 0)
+			};
+		});
+		const days = await mapBounded([...new Set(pages.flatMap((page) => page.days.map((day) => day.bucketDate)))].sort(), async (bucketDate) => {
+			const contributors = pages.flatMap((page) => {
+				const day = page.days.find((day) => day.bucketDate === bucketDate);
+				return day?.hasRecords ? [{
+					bucket: page.bucket,
+					day
+				}] : [];
+			});
+			if (scope.kind === "self") return contributors[0]?.day ?? {
+				bucketDate,
+				count: 0,
+				protectedCount: 0,
+				hasRecords: false
+			};
+			const records = /* @__PURE__ */ new Map();
+			for (const { bucket } of contributors) {
+				const rows = await this.scopedDayRows(bucket, scope.kind, bucketDate, timezone, Infinity, void 0, session, locked, options.signal, options.background);
+				for (const { item } of rows) records.set(item.recordUid, item);
+			}
+			const first = Math.min(...[...records.values()].map((item) => item.sendAtMillis));
+			return {
+				bucketDate,
+				count: records.size,
+				protectedCount: 0,
+				hasRecords: records.size > 0,
+				...Number.isFinite(first) ? { firstSendAtMillis: first } : {}
+			};
 		});
 		return {
-			scope: "self",
+			scope: scope.kind,
 			startDate,
 			endDate,
-			timezone: stringValue$2(data.timezone).trim() || timezone,
+			timezone,
 			refreshedAtMillis: Date.now(),
-			days: listValue$20(data.daily_data).map((raw) => this.bucketDay(raw)).filter((day) => day !== void 0)
+			days
 		};
 	}
 	async dayRecords(options) {
@@ -37988,7 +38168,21 @@ var CalendarService = class {
 		const cursorRecordUid = options.cursor?.recordUid.trim() ?? "";
 		const session = await this.runtime.requireSession();
 		const lockedRecordUids = await this.privacy.lockedRecordUids(session, options.signal);
-		const data = await this.runtime.authenticatedCalendarPost("/api/v1/calendar/records/query", {
+		const scope = await this.resolveScope(options.sourceRef, session, options.signal);
+		let data;
+		if (scope.kind !== "self") {
+			const streams = await mapBounded(scope.buckets, (bucket) => this.scopedDayRows(bucket, scope.kind, bucketDate, timezone, limit + 1, options.cursor, session, lockedRecordUids, options.signal));
+			const sorted = [...new Map(streams.flat().map((row) => [row.item.recordUid, row])).values()].sort((a, b) => b.item.sendAtMillis - a.item.sendAtMillis || b.item.recordUid.localeCompare(a.item.recordUid));
+			const last = sorted[Math.min(limit, sorted.length) - 1]?.item;
+			data = {
+				items: sorted.slice(0, limit).map((row) => row.raw),
+				has_more: sorted.length > limit,
+				...sorted.length > limit && last ? {
+					next_cursor_send_at: last.sendAtMillis,
+					next_cursor_record_uid: last.recordUid
+				} : {}
+			};
+		} else data = await this.runtime.authenticatedCalendarPost("/api/v1/calendar/records/query", {
 			bucket_scope_kind: 1,
 			bucket_scope_uid: "",
 			bucket_date: bucketDate,
@@ -38034,7 +38228,7 @@ var CalendarService = class {
 		}
 		const media = await this.media.hydrateRecordMediaPage(rows.filter((row) => row.item.accessState === "available").map((row) => row.raw), session, options.signal);
 		return {
-			scope: "self",
+			scope: scope.kind,
 			bucketDate,
 			timezone: stringValue$2(data.timezone).trim() || timezone,
 			refreshedAtMillis: Date.now(),
@@ -38064,6 +38258,96 @@ var CalendarService = class {
 			} } : {}
 		};
 	}
+	async resolveScope(sourceRef, session, signal) {
+		if (sourceRef === void 0) return {
+			kind: "self",
+			buckets: [{
+				kind: 1,
+				uid: ""
+			}]
+		};
+		const source = await this.source.openSourceRef(sourceRef, session.userId);
+		if (source.kind === "send_to_self") return {
+			kind: "send_to_self",
+			buckets: [{
+				kind: 1,
+				uid: ""
+			}]
+		};
+		if (source.kind === "default_category") return {
+			kind: "uncategorized",
+			buckets: [{
+				kind: 1,
+				uid: ""
+			}]
+		};
+		if (source.kind !== "topic") throw new ArkmePluginError("calendar-source-invalid", "此日历仅支持发给自己和主题", false, 400);
+		const metadata = await readTopicMetadata(this.runtime, session, source.ownerRef, signal);
+		if (metadata.privacyState === 2) throw new ArkmePluginError("topic-privacy-locked", "隐私锁主题不能在 Arkme 插件中查看", false, 403);
+		if (metadata.topicKind === 3) return {
+			kind: "topic",
+			buckets: []
+		};
+		return {
+			kind: "topic",
+			buckets: (await mapBounded(await this.source.topicSubtreeSources(sourceRef, signal), async (topic) => {
+				const opened = await this.source.openSourceRef(topic.sourceRef, session.userId);
+				const meta = opened.ownerRef === source.ownerRef ? metadata : await readTopicMetadata(this.runtime, session, opened.ownerRef, signal);
+				return meta.privacyState === 2 || meta.topicKind === 3 ? [] : [{
+					kind: 2,
+					uid: opened.ownerRef
+				}];
+			})).flat()
+		};
+	}
+	/** Read only one calendar day; backfill filtered rows and reject stalled cursors. */
+	async scopedDayRows(bucket, scope, bucketDate, timezone, count, cursor, session, locked, signal, background = false) {
+		const rows = /* @__PURE__ */ new Map();
+		const visited = /* @__PURE__ */ new Set();
+		for (let page = 0; page < 1e3; page++) {
+			signal?.throwIfAborted();
+			const key = `${cursor?.sendAtMillis ?? 0}:${cursor?.recordUid ?? ""}`;
+			if (visited.has(key)) throw new ArkmePluginError("calendar-cursor-invalid", "日历分页未推进，请重试", true, 502);
+			visited.add(key);
+			const data = await this.runtime.authenticatedCalendarPost("/api/v1/calendar/records/query", {
+				bucket_scope_kind: bucket.kind,
+				bucket_scope_uid: bucket.uid,
+				bucket_date: bucketDate,
+				timezone,
+				limit: MAX_DAY_RECORD_LIMIT,
+				...cursor ? {
+					cursor_send_at: cursor.sendAtMillis,
+					cursor_record_uid: cursor.recordUid
+				} : {}
+			}, session, signal, {
+				key: `calendar:records:${bucket.kind === 1 ? "self" : `topic:${bucket.uid}`}:${bucketDate}:${timezone}:50:${key}`,
+				cacheMs: 1e4,
+				failureCooldownMs: 2e3,
+				lane: background ? "background-read" : "interactive-read"
+			});
+			for (const raw of listValue$20(data.items)) {
+				const item = this.dayRecord(raw);
+				if (!item || locked.has(item.recordUid)) continue;
+				if (isDshAgentInputRawRecord(raw)) continue;
+				if (scope === "uncategorized" && item.isUncategorized !== true) continue;
+				if (scope === "send_to_self" && item.sourceKind !== "self" && item.sourceKind !== "topic") continue;
+				rows.set(item.recordUid, {
+					raw,
+					item
+				});
+				if (rows.size >= count) return [...rows.values()];
+			}
+			if (data.has_more !== true) return [...rows.values()];
+			const sendAtMillis = Math.trunc(numberValue$23(data.next_cursor_send_at));
+			const recordUid = stringValue$2(data.next_cursor_record_uid).trim();
+			if (sendAtMillis <= 0 || recordUid === "") throw new ArkmePluginError("calendar-cursor-invalid", "日历分页信息缺失，请重试", true, 502);
+			cursor = {
+				sendAtMillis,
+				recordUid
+			};
+		}
+		throw new ArkmePluginError("calendar-pagination-limit", "日历当日记录尚未加载完整，请重试", true, 502);
+	}
 	bucketDay(raw) {
 		const item = objectValue$2(raw);
 		const bucketDate = stringValue$2(item.bucket_date).trim();
@@ -38103,7 +38387,7 @@ var CalendarService = class {
 			preview,
 			...stringValue$2(topic.title).trim() === "" ? {} : { topicTitle: stringValue$2(topic.title).trim() },
 			sourceKind: sourceKind(item),
-			creationSource: Math.trunc(numberValue$23(core.creation_source)),
+			creationSource: isDshAgentInputRawRecord(raw) ? 3 : Math.trunc(numberValue$23(core.creation_source)),
 			templateKind: Math.trunc(numberValue$23(core.template_kind)),
 			displayKind: Math.trunc(numberValue$23(core.display_kind)),
 			protected: false,
@@ -38669,10 +38953,12 @@ var CallHistoryService = class {
 	runtime;
 	profile;
 	media;
-	constructor(runtime, profile, media) {
+	source;
+	constructor(runtime, profile, media, source) {
 		this.runtime = runtime;
 		this.profile = profile;
 		this.media = media;
+		this.source = source;
 	}
 	async listCallHistory(options = {}, signal) {
 		const session = await this.runtime.requireSession();
@@ -38688,7 +38974,7 @@ var CallHistoryService = class {
 			failureCooldownMs: 2e3
 		});
 		const validItems = (await Promise.all(this.historyItems(raw).map(async (item) => await this.normalizeHistoryItem(item, session.userId)))).filter((item) => item !== void 0);
-		await this.attachPeerAvatars(validItems, session, signal);
+		await this.attachPeerPresentation(validItems, session, signal);
 		const hasMore = booleanValue$9(raw.has_more ?? raw.hasMore);
 		const nextCursor = firstString$1(raw, [
 			"next_cursor",
@@ -38931,16 +39217,18 @@ var CallHistoryService = class {
 			return [];
 		}
 	}
-	async attachPeerAvatars(items, session, signal) {
+	async attachPeerPresentation(items, session, signal) {
 		const ids = [...new Set(items.flatMap((item) => item.peerUserId === void 0 ? [] : [item.peerUserId]))];
 		if (ids.length === 0) return;
-		const profiles = await this.profile.publicProfilesByUserIds(ids, session, signal).catch(() => /* @__PURE__ */ new Map());
+		const [profiles, remarks] = await Promise.all([this.profile.publicProfileSummariesByUserIds(ids, session, signal).catch(() => /* @__PURE__ */ new Map()), this.source?.privateRemarksByUserIds(ids, signal === void 0 ? {} : { signal }).catch(() => /* @__PURE__ */ new Map()) ?? Promise.resolve(/* @__PURE__ */ new Map())]);
 		await Promise.all(items.map(async (item) => {
 			const peerUserId = item.peerUserId;
 			if (peerUserId === void 0) return;
 			const profile = profiles.get(peerUserId);
 			const displayName = profile?.displayName?.trim() ?? "";
-			if (displayName !== "" && /^Arkme 用户 \d+$/.test(item.peerDisplayName.trim())) item.peerDisplayName = displayName;
+			const remark = remarks.get(peerUserId)?.trim() ?? "";
+			if (remark !== "") item.peerDisplayName = remark;
+			else if (displayName !== "" && /^Arkme 用户 \d+$/.test(item.peerDisplayName.trim())) item.peerDisplayName = displayName;
 			if (profile?.avatarUrl === void 0) return;
 			item.peerAvatarRef = await this.profile.sealProfileImageRef(session.userId, peerUserId);
 		}));
@@ -40337,7 +40625,7 @@ var ChatRealtimeService = class {
 			console.warn("dsh-arkme: Chat read receipt invalidation failed:", safeFailureMessage$5(error));
 		}
 	}
-	async invalidateRecordProjection() {
+	async invalidateRecordProjection(options = {}) {
 		try {
 			const session = await this.runtime.sessionStore.read();
 			if (session === void 0) return;
@@ -40346,7 +40634,8 @@ var ChatRealtimeService = class {
 			this.emitChatClientEvent({
 				type: "projection-invalidated",
 				revision: this.nextChatClientRevision(),
-				projection: "record"
+				projection: "record",
+				...options.contentOnly ? { retainTopicCounts: true } : {}
 			});
 		} catch (error) {
 			console.warn("dsh-arkme: Record projection invalidation failed:", safeFailureMessage$5(error));
@@ -40971,7 +41260,7 @@ var ChatRealtimeService = class {
 		if (ownerGeneration !== this.attentionOwnerGeneration) return [];
 		if (updates.length > 0) {
 			this.source.invalidateSourceListCache(session.userId, "root");
-			this.runtime.invalidateKey(this.runtime.requestScope(session.userId), "calendar:");
+			this.runtime.invalidateCalendarDates(this.runtime.requestScope(session.userId), updates.flatMap((update) => [update.source.activeAtMillis, ...update.timelineItems.map((item) => item.sendAtMillis)]));
 			this.emitChatClientEvent({
 				type: "sessions-delta",
 				revision: this.nextChatClientRevision(),
@@ -41860,7 +42149,6 @@ function numberValue$20(value) {
 function listValue$17(value) {
 	return Array.isArray(value) ? value : [];
 }
-const DSH_AGENT_INPUT_CREATION_SOURCE = 3;
 const MAX_DEFAULT_CATEGORY_FILTER_BACKFILL_PAGES = 5;
 const RECORD_REEDIT_SUPPORTED_TEMPLATE_KINDS = /* @__PURE__ */ new Set([
 	1,
@@ -41882,7 +42170,7 @@ function recordCreationSource(raw) {
 	return integerLikeValue$1(item.creation_source ?? item.creationSource ?? core.creation_source ?? core.creationSource);
 }
 function isDSHAgentInputRecord(raw) {
-	return recordCreationSource(raw) === DSH_AGENT_INPUT_CREATION_SOURCE;
+	return isDshAgentInputRawRecord(raw);
 }
 function safeFailureMessage$4(error) {
 	if (error instanceof ArkmePluginError) return error.message;
@@ -43784,7 +44072,11 @@ function snapshotDetailFromChatRaw(raw, fallback) {
 		...position,
 		...objectValue$2(values.position)
 	});
-	const locationLabel = firstSnapshotText(position.poi, position.poi_name, position.poiName, position.address, position.road, location.poi_name, location.poiName, location.address, location.name);
+	const locationLabel = firstSnapshotText([
+		[firstSnapshotText(position.city)?.replace(/市$/, ""), firstSnapshotText(position.county)?.replace(/(区|县|市)$/, "")].filter(Boolean).join("·"),
+		firstSnapshotText(position.road),
+		firstSnapshotText(position.poi, position.poi_name, position.poiName)
+	].join(""), position.address, location.poi_name, location.poiName, location.address, location.name);
 	const weather = snapshotWeatherText(position.weather, position.weatherText, location.weather, values.weather);
 	const altitudeMeters = nonNegativeNumberValue(location.altitude, location.alt, position.altitude, position.alt);
 	const movement = snapshotMovement({
@@ -45022,9 +45314,13 @@ var ChatService = class {
 		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 = [];
+		const visited = /* @__PURE__ */ new Set();
 		let pageCursor = cursor;
 		for (let pageIndex = 0; pageIndex < 100; pageIndex += 1) {
 			signal?.throwIfAborted();
+			const key = JSON.stringify(pageCursor ?? {});
+			if (visited.has(key)) throw new ArkmePluginError("topic-record-page-invalid", "主题快记分页未推进，请重试", true, 502);
+			visited.add(key);
 			const page = await readTopicRecordPage(this.runtime, session, opened.ownerRef, {
 				limit,
 				...pageCursor === void 0 ? {} : { cursor: pageCursor },
@@ -45039,24 +45335,35 @@ var ChatService = class {
 					hasMore: false
 				};
 			}
+			let filtered = false;
 			for (const raw of page.records) {
-				if (arkmePrivacyLockedRecord(raw) || lockedRecordUids.has(this.record.recordUid(raw))) continue;
+				if (isDshAgentInputRawRecord(raw) || arkmePrivacyLockedRecord(raw) || lockedRecordUids.has(this.record.recordUid(raw))) {
+					filtered = true;
+					continue;
+				}
 				records.push(raw);
 			}
-			if (!merged) return {
+			if (!merged && !filtered && records.length <= limit) 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 (records.length >= limit) {
+				const last = objectValue$2(records[limit - 1]);
+				const nextCursor = records.length > limit ? {
+					sendAtMillis: numberValue$19(last.send_at ?? objectValue$2(last.record_core).send_at),
+					itemUid: this.record.recordUid(last)
+				} : page.nextCursor;
+				return {
+					topic,
+					topicUid: opened.ownerRef,
+					records: records.slice(0, limit),
+					hasMore: records.length > limit || page.hasMore,
+					...nextCursor === void 0 ? {} : { nextCursor }
+				};
+			}
 			if (!page.hasMore) return {
 				topic,
 				topicUid: opened.ownerRef,
@@ -45095,13 +45402,55 @@ var ChatService = class {
 		const limit = Math.min(100, Math.max(1, Math.trunc(options.limit ?? 30)));
 		if (source.kind === "send_to_self") {
 			const lockedRecordUids = await this.privacy.lockedRecordUids(session, options.signal);
-			const data = await this.runtime.authenticatedPost("/api/v1/home/feed/query", {
-				limit,
-				source_kinds: [1, 2],
-				...options.cursor?.sendAtMillis === void 0 ? {} : { cursor_send_at: options.cursor.sendAtMillis },
-				...options.cursor?.itemUid === void 0 ? {} : { cursor_record_uid: options.cursor.itemUid }
-			}, session, options.signal);
-			const rawRecords = listValue$16(data.items).filter((raw) => !arkmePrivacyLockedRecord(raw) && !lockedRecordUids.has(this.record.recordUid(raw)));
+			const rawRecords = [];
+			const seen = /* @__PURE__ */ new Set();
+			const visited = /* @__PURE__ */ new Set();
+			let cursor = options.cursor;
+			let hasMore = false;
+			let nextCursor;
+			for (let pageIndex = 0; pageIndex < 100; pageIndex++) {
+				options.signal?.throwIfAborted();
+				const key = `${cursor?.sendAtMillis ?? 0}:${cursor?.itemUid ?? ""}`;
+				if (visited.has(key)) throw new ArkmePluginError("self-feed-cursor-invalid", "发给自己分页未推进，请重试", true, 502);
+				visited.add(key);
+				const data = await this.runtime.authenticatedPost("/api/v1/home/feed/query", {
+					limit,
+					source_kinds: [1, 2],
+					...cursor?.sendAtMillis === void 0 ? {} : { cursor_send_at: cursor.sendAtMillis },
+					...cursor?.itemUid === void 0 ? {} : { cursor_record_uid: cursor.itemUid }
+				}, session, options.signal);
+				const rows = listValue$16(data.items);
+				let filtered = false;
+				for (const raw of rows) {
+					const uid = this.record.recordUid(raw);
+					if (isDshAgentInputRawRecord(raw) || arkmePrivacyLockedRecord(raw) || lockedRecordUids.has(uid) || seen.has(uid)) {
+						filtered = true;
+						continue;
+					}
+					seen.add(uid);
+					rawRecords.push(raw);
+				}
+				hasMore = data.has_more === true;
+				const nextSendAt = numberValue$19(data.next_cursor_send_at);
+				const nextUid = stringValue$2(data.next_cursor_record_uid).trim();
+				nextCursor = nextSendAt > 0 && nextUid !== "" ? {
+					sendAtMillis: nextSendAt,
+					itemUid: nextUid
+				} : void 0;
+				if (rawRecords.length >= limit || !hasMore || !filtered) break;
+				if (!nextCursor) throw new ArkmePluginError("self-feed-cursor-invalid", "发给自己分页信息缺失，请重试", true, 502);
+				cursor = nextCursor;
+				if (pageIndex === 99) throw new ArkmePluginError("self-feed-pagination-limit", "发给自己加载未完成，请重试", true, 502);
+			}
+			if (rawRecords.length > limit) {
+				rawRecords.length = limit;
+				const last = objectValue$2(rawRecords.at(-1));
+				nextCursor = {
+					sendAtMillis: numberValue$19(last.send_at ?? objectValue$2(last.record_core).send_at),
+					itemUid: this.record.recordUid(last)
+				};
+				hasMore = true;
+			}
 			const media = await this.media.hydrateRecordMediaPage(rawRecords, session, options.signal);
 			const signingKey = await this.runtime.stateStore.uniqueCode();
 			const items = (await Promise.all(rawRecords.map(async (raw) => {
@@ -45132,16 +45481,11 @@ var ChatService = class {
 			}))).filter((item) => item.itemUid !== "");
 			this.hydrateTimelineExtensionParents(items);
 			const projectedItems = items.map((item) => this.withRecordMessageActionRef(source, item, session.userId, signingKey));
-			const nextSendAt = numberValue$19(data.next_cursor_send_at);
-			const nextUid = stringValue$2(data.next_cursor_record_uid).trim();
 			return {
 				source: await this.source.sourceItem(source),
 				items: projectedItems,
-				hasMore: data.has_more === true,
-				...nextSendAt > 0 && nextUid !== "" ? { nextCursor: {
-					sendAtMillis: nextSendAt,
-					itemUid: nextUid
-				} } : {}
+				hasMore,
+				...nextCursor === void 0 ? {} : { nextCursor }
 			};
 		}
 		if (source.kind === "default_category") {
@@ -46247,7 +46591,7 @@ var ChatService = class {
 		const publishedRecordUid = stringValue$2(data.record_uid).trim() || createdRecordUid;
 		const senderDisplayName = profile.nickname.trim() || profile.displayName.trim() || "我";
 		const senderAvatarUrl = profile.avatarRef.trim();
-		await this.realtime.invalidateRecordProjection();
+		await this.realtime.invalidateRecordProjection({ contentOnly: true });
 		return {
 			sid: detail.sid,
 			recordUid: publishedRecordUid,
@@ -46342,7 +46686,7 @@ var ChatService = class {
 				content_payload: contentPayload,
 				send_at: Date.now()
 			}, session, options.signal);
-			await this.realtime.invalidateRecordProjection();
+			await this.realtime.invalidateRecordProjection({ contentOnly: true });
 			return await appendCommentWarning({
 				sourceRef: targetSourceRef,
 				itemUid: stringValue$2(data.record_uid).trim() || recordUid,
@@ -46358,7 +46702,7 @@ var ChatService = class {
 			content_payload: contentPayload,
 			send_at: Date.now()
 		}, session, options.signal);
-		await this.realtime.invalidateRecordProjection();
+		await this.realtime.invalidateRecordProjection({ contentOnly: true });
 		return await appendCommentWarning({
 			sourceRef: targetSourceRef,
 			itemUid: stringValue$2(data.record_uid).trim() || recordUid,
@@ -46381,7 +46725,7 @@ var ChatService = class {
 				...options.recordDurationMillis === void 0 ? {} : { recordDurationMillis: options.recordDurationMillis },
 				...options.captureContext === void 0 ? {} : { captureContext: options.captureContext }
 			});
-			if (result.localState !== "failed") await this.realtime.invalidateRecordProjection();
+			if (result.localState !== "failed") await this.realtime.invalidateRecordProjection({ contentOnly: true });
 			return await this.withConfirmedSendReferences({
 				sourceRef,
 				itemUid: result.recordUid,
@@ -46414,7 +46758,7 @@ var ChatService = class {
 				send_at: sendAtMillis
 			}, session);
 			await this.record.syncCreatedRecordTags?.(stringValue$2(result.record_uid).trim() || recordUid, text, session.userId);
-			await this.realtime.invalidateRecordProjection();
+			await this.realtime.invalidateRecordProjection({ contentOnly: true });
 			return await this.withConfirmedSendReferences({
 				sourceRef,
 				itemUid: stringValue$2(result.record_uid).trim() || recordUid,
@@ -46785,7 +47129,7 @@ var ChatService = class {
 		if (source.kind === "send_to_self" || source.kind === "default_category") {
 			const result = await this.runtime.authenticatedPost("/api/v1/records/create", commonBody, session, options.signal, { trackWriteOutcome: true });
 			await this.record.syncCreatedRecordTags?.(stringValue$2(result.record_uid).trim() || recordUid, textContent, session.userId, options.signal, input.textFormat);
-			await this.realtime.invalidateRecordProjection();
+			await this.realtime.invalidateRecordProjection({ contentOnly: true });
 			return await this.withConfirmedSendReferences({
 				sourceRef,
 				itemUid: stringValue$2(result.record_uid).trim() || recordUid,
@@ -46810,7 +47154,7 @@ var ChatService = class {
 				...commonBody
 			}, session, options.signal, { trackWriteOutcome: true });
 			await this.record.syncCreatedRecordTags?.(stringValue$2(result.record_uid).trim() || recordUid, textContent, session.userId, options.signal, input.textFormat);
-			await this.realtime.invalidateRecordProjection();
+			await this.realtime.invalidateRecordProjection({ contentOnly: true });
 			return await this.withConfirmedSendReferences({
 				sourceRef,
 				itemUid: stringValue$2(result.record_uid).trim() || recordUid,
@@ -89513,7 +89857,7 @@ var ArkmeService = class {
 		this.arrangement = new ArrangementService(this.runtime);
 		this.wechat = new WechatService(this.runtime);
 		this.profile = new ProfileService(this.runtime);
-		this.callHistory = new CallHistoryService(this.runtime, this.profile, { forwardContentBlocks: (files, viewerUserId) => this.media.forwardContentBlocks(files, viewerUserId) });
+		this.callHistory = new CallHistoryService(this.runtime, this.profile, { forwardContentBlocks: (files, viewerUserId) => this.media.forwardContentBlocks(files, viewerUserId) }, { privateRemarksByUserIds: (userIds, options) => this.source.privateRemarksByUserIds(userIds, options) });
 		this.extensionReview = new ExtensionReviewService(this.runtime, this.profile, { createTextForConversation: async (recordUid, textContent) => {
 			return await this.createTextForConversation(recordUid, textContent);
 		} });
@@ -89675,6 +90019,7 @@ var ArkmeService = class {
 		return await this.backgroundSoundPreferenceOwner.update(enabled, signal, expectedUserId);
 	}
 	clearAccountState(userIds) {
+		this.calendar.dispose();
 		this.directory.reset();
 		this.realtime.resetAttentionSummary();
 		for (const userId of userIds) this.privacy.clear(userId);
@@ -90903,7 +91248,7 @@ var ArkmeService = class {
 	}
 	async createText(recordUid, textContent) {
 		const result = await this.record.createText(recordUid, textContent);
-		await this.realtime.invalidateRecordProjection();
+		await this.realtime.invalidateRecordProjection({ contentOnly: true });
 		return result;
 	}
 	async listRecordTags(limit = 100, signal) {
@@ -90911,7 +91256,7 @@ var ArkmeService = class {
 	}
 	async createTextForConversation(recordUid, textContent) {
 		const result = await this.record.createTextForConversation(recordUid, textContent);
-		if (result.localState !== "failed") await this.realtime.invalidateRecordProjection();
+		if (result.localState !== "failed") await this.realtime.invalidateRecordProjection({ contentOnly: true });
 		return result;
 	}
 	async createDSHAgentInputText(recordUid, textContent, sendAtMillis) {