@rexvane/piweb 0.3.25 → 0.3.26

package/src/lib/github-identity.ts

@@ -1,245 +1,245 @@
-/**
- * GitHub 身份：Git 面板头部显示「头像 + 账号」。
- *
- * 只读，不碰任何写操作，也不把 token 交给浏览器。三档降级：
- *
- * 1. `gh api user` —— 本机 gh 已登录时拿到的是**当前登录账号**（最准）；
- * 2. 仓库 `origin` remote 的 owner —— 没装 gh / 没登录也能用，头像是免登录的
- *    `github.com/<owner>.png`；但拿到的可能是「仓库归属者」而不是登录账号；
- * 3. `git config user.name` —— 纯本地身份，没有头像，只作文字兜底。
- *
- * 两条网络路径实测：`gh api user` 约 1.1s、头像约 2.2s，所以结果缓存 12 小时
- * （内存 + 落盘，PiWeb 重启后仍然即时）。头像取到后转成 data URL 随身份一起返回，
- * 前端不用再发第二次请求，断网也能显示。
- *
- * 任何一步失败都只降级，不抛错：Git 面板不该因为 GitHub 不通而少东西。
- */
-import { execFile } from "node:child_process";
-import fs from "node:fs/promises";
-import path from "node:path";
-import { promisify } from "node:util";
-import { resolveGitBin } from "./growth-service";
-import { getAgentDir } from "./pi";
-
-const exec = promisify(execFile);
-
-export interface GithubIdentity {
-	login: string;
-	/** gh 里的显示名（如「心安」），没有就省略 */
-	name?: string;
-	/** data URL；取不到头像时省略，UI 退回首字母 */
-	avatar?: string;
-	/** 账号主页，点击可跳转 */
-	url?: string;
-	/** `owner/repo`（来自 origin remote），没配 remote 就没有 */
-	repo?: string;
-}
-
-const TTL_MS = 12 * 60 * 60 * 1_000;
-const GH_TIMEOUT_MS = 8_000;
-const AVATAR_TIMEOUT_MS = 8_000;
-const AVATAR_SIZE = 64;
-const AVATAR_MAX_BYTES = 256 * 1_024;
-const CACHE_FILENAME = "piweb-github-identity.json";
-// 身份字段一变就提版本：旧的缓存条目直接作废重取，避免返回已经删掉的字段
-const CACHE_VERSION = 2;
-
-interface CacheFile {
-	version: number;
-	entries: Record<string, { at: number; value: GithubIdentity | null }>;
-}
-
-const memory = new Map<string, { at: number; value: GithubIdentity | null }>();
-const inflight = new Map<string, Promise<GithubIdentity | null>>();
-let diskLoaded = false;
-let diskWrite: Promise<void> | null = null;
-
-function cachePath(): string {
-	return path.join(getAgentDir(), CACHE_FILENAME);
-}
-
-/** 离线模式（SDK 也认这个变量）：不发任何网络请求，只走本地能算出来的那一档 */
-function offline(): boolean {
-	const value = process.env.PI_OFFLINE;
-	if (!value || value === "0") return false;
-	return value.toLowerCase() !== "false";
-}
-
-async function loadDisk(): Promise<void> {
-	if (diskLoaded) return;
-	diskLoaded = true;
-	try {
-		const raw = JSON.parse(await fs.readFile(cachePath(), "utf8")) as CacheFile;
-		if (raw?.version !== CACHE_VERSION || !raw.entries || typeof raw.entries !== "object") return;
-		const now = Date.now();
-		for (const [key, entry] of Object.entries(raw.entries)) {
-			if (!entry || typeof entry.at !== "number" || now - entry.at >= TTL_MS) continue;
-			if (!memory.has(key)) memory.set(key, entry);
-		}
-	} catch {
-		/* 没有缓存 / 读不了都当第一次 */
-	}
-}
-
-function persist(): void {
-	if (diskWrite) return;
-	diskWrite = (async () => {
-		try {
-			const entries: CacheFile["entries"] = {};
-			for (const [key, entry] of memory) entries[key] = entry;
-			await fs.writeFile(cachePath(), JSON.stringify({ version: CACHE_VERSION, entries }), "utf8");
-		} catch {
-			/* 写不了就只在内存里缓存 */
-		} finally {
-			diskWrite = null;
-		}
-	})();
-}
-
-/** 解析 gh 可执行文件（PATH 找不到时退回常见安装位置）；结果缓存 */
-let ghBin: string | null | undefined;
-async function resolveGhBin(): Promise<string | null> {
-	if (ghBin !== undefined) return ghBin;
-	const candidates = process.platform === "win32"
-		? ["gh", path.join(process.env.ProgramFiles ?? "C:\\Program Files", "GitHub CLI", "gh.exe"), path.join(process.env.LOCALAPPDATA ?? "", "Programs", "GitHub CLI", "gh.exe")]
-		: ["gh", "/opt/homebrew/bin/gh", "/usr/local/bin/gh", "/usr/bin/gh"];
-	for (const candidate of candidates) {
-		if (!candidate) continue;
-		const ok = await exec(candidate, ["--version"], { timeout: 5_000, windowsHide: true }).then(() => true, () => false);
-		if (ok) {
-			ghBin = candidate;
-			return ghBin;
-		}
-	}
-	ghBin = null;
-	return ghBin;
-}
-
-async function git(cwd: string, args: string[]): Promise<string> {
-	const out = await exec(await resolveGitBin(), args, {
-		cwd,
-		timeout: 15_000,
-		maxBuffer: 1024 * 1_024,
-		windowsHide: true,
-		env: { ...process.env, GIT_OPTIONAL_LOCKS: "0", GIT_TERMINAL_PROMPT: "0" },
-	});
-	return out.stdout;
-}
-
-/** 从 remote URL 里取 owner 与仓库名：支持 https / ssh / git:// 三种写法 */
-export function parseGithubRemote(remote: string | undefined | null): { owner: string; repo?: string } | null {
-	if (!remote) return null;
-	const trimmed = remote.trim().replace(/\.git$/, "");
-	const m = trimmed.match(/github\.com[:/]+([^/]+)(?:\/([^/]+))?/i);
-	if (!m?.[1]) return null;
-	return { owner: m[1], repo: m[2] ? `${m[1]}/${m[2]}` : undefined };
-}
-
-async function ghAccount(cwd: string): Promise<{ login: string; name?: string; url?: string } | null> {
-	if (offline()) return null;
-	const bin = await resolveGhBin();
-	if (!bin) return null;
-	try {
-		const { stdout } = await exec(bin, ["api", "user"], {
-			cwd,
-			timeout: GH_TIMEOUT_MS,
-			maxBuffer: 1024 * 1_024,
-			windowsHide: true,
-			env: { ...process.env, GH_PROMPT_DISABLED: "1", GH_NO_UPDATE_NOTIFIER: "1" },
-		});
-		const parsed = JSON.parse(stdout) as { login?: unknown; name?: unknown; html_url?: unknown };
-		if (typeof parsed.login !== "string" || !parsed.login) return null;
-		return {
-			login: parsed.login,
-			name: typeof parsed.name === "string" && parsed.name.trim() ? parsed.name.trim() : undefined,
-			url: typeof parsed.html_url === "string" ? parsed.html_url : undefined,
-		};
-	} catch {
-		// 没网 / 没登录 / token 失效：交给下一档
-		return null;
-	}
-}
-
-async function avatarDataUrl(owner: string): Promise<string | undefined> {
-	if (offline()) return undefined;
-	try {
-		const res = await fetch(`https://github.com/${encodeURIComponent(owner)}.png?size=${AVATAR_SIZE}`, {
-			signal: AbortSignal.timeout(AVATAR_TIMEOUT_MS),
-			headers: { Accept: "image/*" },
-		});
-		if (!res.ok) return undefined;
-		const type = res.headers.get("content-type") ?? "image/png";
-		if (!type.startsWith("image/")) return undefined;
-		const buffer = Buffer.from(await res.arrayBuffer());
-		if (!buffer.length || buffer.length > AVATAR_MAX_BYTES) return undefined;
-		return `data:${type};base64,${buffer.toString("base64")}`;
-	} catch {
-		return undefined;
-	}
-}
-
-async function compute(root: string): Promise<GithubIdentity | null> {
-	let remote: { owner: string; repo?: string } | null = null;
-	try {
-		remote = parseGithubRemote(await git(root, ["remote", "get-url", "origin"]));
-	} catch {
-		/* 没有 origin 就往下走 */
-	}
-	const account = await ghAccount(root);
-	if (account) {
-		return {
-			login: account.login,
-			name: account.name,
-			url: account.url ?? `https://github.com/${account.login}`,
-			avatar: await avatarDataUrl(account.login),
-			repo: remote?.repo,
-		};
-	}
-	if (remote) {
-		return { login: remote.owner, url: `https://github.com/${remote.owner}`, avatar: await avatarDataUrl(remote.owner), repo: remote.repo };
-	}
-	try {
-		const name = (await git(root, ["config", "user.name"])).trim();
-		if (name) return { login: name };
-	} catch {
-		/* 什么都没配 */
-	}
-	return null;
-}
-
-function start(root: string): Promise<GithubIdentity | null> {
-	const existing = inflight.get(root);
-	if (existing) return existing;
-	const task = compute(root)
-		.then((value) => {
-			memory.set(root, { at: Date.now(), value });
-			persist();
-			return value;
-		})
-		.catch(() => null)
-		.finally(() => inflight.delete(root)) as Promise<GithubIdentity | null>;
-	inflight.set(root, task);
-	return task;
-}
-
-/**
- * 取仓库的 GitHub 身份。命中缓存立刻返回；否则**后台**刷新并返回已过期的旧值（或 null），
- * 不会让调用方等网络。要拿首次结果用 `awaitGithubIdentity`。
- */
-export function githubIdentity(root: string | null): GithubIdentity | null {
-	if (!root) return null;
-	void loadDisk();
-	const hit = memory.get(root);
-	if (hit && Date.now() - hit.at < TTL_MS) return hit.value;
-	void start(root);
-	return hit?.value ?? null;
-}
-
-/** 等首次解析完成（面板刚打开、缓存还冷时用；调用方自己控制超时） */
-export async function awaitGithubIdentity(root: string | null): Promise<GithubIdentity | null> {
-	if (!root) return null;
-	await loadDisk();
-	const hit = memory.get(root);
-	if (hit && Date.now() - hit.at < TTL_MS) return hit.value;
-	return start(root);
-}
+/**
+ * GitHub 身份：Git 面板头部显示「头像 + 账号」。
+ *
+ * 只读，不碰任何写操作，也不把 token 交给浏览器。三档降级：
+ *
+ * 1. `gh api user` —— 本机 gh 已登录时拿到的是**当前登录账号**（最准）；
+ * 2. 仓库 `origin` remote 的 owner —— 没装 gh / 没登录也能用，头像是免登录的
+ *    `github.com/<owner>.png`；但拿到的可能是「仓库归属者」而不是登录账号；
+ * 3. `git config user.name` —— 纯本地身份，没有头像，只作文字兜底。
+ *
+ * 两条网络路径实测：`gh api user` 约 1.1s、头像约 2.2s，所以结果缓存 12 小时
+ * （内存 + 落盘，PiWeb 重启后仍然即时）。头像取到后转成 data URL 随身份一起返回，
+ * 前端不用再发第二次请求，断网也能显示。
+ *
+ * 任何一步失败都只降级，不抛错：Git 面板不该因为 GitHub 不通而少东西。
+ */
+import { execFile } from "node:child_process";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { promisify } from "node:util";
+import { resolveGitBin } from "./growth-service";
+import { getAgentDir } from "./pi";
+
+const exec = promisify(execFile);
+
+export interface GithubIdentity {
+	login: string;
+	/** gh 里的显示名（如「心安」），没有就省略 */
+	name?: string;
+	/** data URL；取不到头像时省略，UI 退回首字母 */
+	avatar?: string;
+	/** 账号主页，点击可跳转 */
+	url?: string;
+	/** `owner/repo`（来自 origin remote），没配 remote 就没有 */
+	repo?: string;
+}
+
+const TTL_MS = 12 * 60 * 60 * 1_000;
+const GH_TIMEOUT_MS = 8_000;
+const AVATAR_TIMEOUT_MS = 8_000;
+const AVATAR_SIZE = 64;
+const AVATAR_MAX_BYTES = 256 * 1_024;
+const CACHE_FILENAME = "piweb-github-identity.json";
+// 身份字段一变就提版本：旧的缓存条目直接作废重取，避免返回已经删掉的字段
+const CACHE_VERSION = 2;
+
+interface CacheFile {
+	version: number;
+	entries: Record<string, { at: number; value: GithubIdentity | null }>;
+}
+
+const memory = new Map<string, { at: number; value: GithubIdentity | null }>();
+const inflight = new Map<string, Promise<GithubIdentity | null>>();
+let diskLoaded = false;
+let diskWrite: Promise<void> | null = null;
+
+function cachePath(): string {
+	return path.join(getAgentDir(), CACHE_FILENAME);
+}
+
+/** 离线模式（SDK 也认这个变量）：不发任何网络请求，只走本地能算出来的那一档 */
+function offline(): boolean {
+	const value = process.env.PI_OFFLINE;
+	if (!value || value === "0") return false;
+	return value.toLowerCase() !== "false";
+}
+
+async function loadDisk(): Promise<void> {
+	if (diskLoaded) return;
+	diskLoaded = true;
+	try {
+		const raw = JSON.parse(await fs.readFile(cachePath(), "utf8")) as CacheFile;
+		if (raw?.version !== CACHE_VERSION || !raw.entries || typeof raw.entries !== "object") return;
+		const now = Date.now();
+		for (const [key, entry] of Object.entries(raw.entries)) {
+			if (!entry || typeof entry.at !== "number" || now - entry.at >= TTL_MS) continue;
+			if (!memory.has(key)) memory.set(key, entry);
+		}
+	} catch {
+		/* 没有缓存 / 读不了都当第一次 */
+	}
+}
+
+function persist(): void {
+	if (diskWrite) return;
+	diskWrite = (async () => {
+		try {
+			const entries: CacheFile["entries"] = {};
+			for (const [key, entry] of memory) entries[key] = entry;
+			await fs.writeFile(cachePath(), JSON.stringify({ version: CACHE_VERSION, entries }), "utf8");
+		} catch {
+			/* 写不了就只在内存里缓存 */
+		} finally {
+			diskWrite = null;
+		}
+	})();
+}
+
+/** 解析 gh 可执行文件（PATH 找不到时退回常见安装位置）；结果缓存 */
+let ghBin: string | null | undefined;
+async function resolveGhBin(): Promise<string | null> {
+	if (ghBin !== undefined) return ghBin;
+	const candidates = process.platform === "win32"
+		? ["gh", path.join(process.env.ProgramFiles ?? "C:\\Program Files", "GitHub CLI", "gh.exe"), path.join(process.env.LOCALAPPDATA ?? "", "Programs", "GitHub CLI", "gh.exe")]
+		: ["gh", "/opt/homebrew/bin/gh", "/usr/local/bin/gh", "/usr/bin/gh"];
+	for (const candidate of candidates) {
+		if (!candidate) continue;
+		const ok = await exec(candidate, ["--version"], { timeout: 5_000, windowsHide: true }).then(() => true, () => false);
+		if (ok) {
+			ghBin = candidate;
+			return ghBin;
+		}
+	}
+	ghBin = null;
+	return ghBin;
+}
+
+async function git(cwd: string, args: string[]): Promise<string> {
+	const out = await exec(await resolveGitBin(), args, {
+		cwd,
+		timeout: 15_000,
+		maxBuffer: 1024 * 1_024,
+		windowsHide: true,
+		env: { ...process.env, GIT_OPTIONAL_LOCKS: "0", GIT_TERMINAL_PROMPT: "0" },
+	});
+	return out.stdout;
+}
+
+/** 从 remote URL 里取 owner 与仓库名：支持 https / ssh / git:// 三种写法 */
+export function parseGithubRemote(remote: string | undefined | null): { owner: string; repo?: string } | null {
+	if (!remote) return null;
+	const trimmed = remote.trim().replace(/\.git$/, "");
+	const m = trimmed.match(/github\.com[:/]+([^/]+)(?:\/([^/]+))?/i);
+	if (!m?.[1]) return null;
+	return { owner: m[1], repo: m[2] ? `${m[1]}/${m[2]}` : undefined };
+}
+
+async function ghAccount(cwd: string): Promise<{ login: string; name?: string; url?: string } | null> {
+	if (offline()) return null;
+	const bin = await resolveGhBin();
+	if (!bin) return null;
+	try {
+		const { stdout } = await exec(bin, ["api", "user"], {
+			cwd,
+			timeout: GH_TIMEOUT_MS,
+			maxBuffer: 1024 * 1_024,
+			windowsHide: true,
+			env: { ...process.env, GH_PROMPT_DISABLED: "1", GH_NO_UPDATE_NOTIFIER: "1" },
+		});
+		const parsed = JSON.parse(stdout) as { login?: unknown; name?: unknown; html_url?: unknown };
+		if (typeof parsed.login !== "string" || !parsed.login) return null;
+		return {
+			login: parsed.login,
+			name: typeof parsed.name === "string" && parsed.name.trim() ? parsed.name.trim() : undefined,
+			url: typeof parsed.html_url === "string" ? parsed.html_url : undefined,
+		};
+	} catch {
+		// 没网 / 没登录 / token 失效：交给下一档
+		return null;
+	}
+}
+
+async function avatarDataUrl(owner: string): Promise<string | undefined> {
+	if (offline()) return undefined;
+	try {
+		const res = await fetch(`https://github.com/${encodeURIComponent(owner)}.png?size=${AVATAR_SIZE}`, {
+			signal: AbortSignal.timeout(AVATAR_TIMEOUT_MS),
+			headers: { Accept: "image/*" },
+		});
+		if (!res.ok) return undefined;
+		const type = res.headers.get("content-type") ?? "image/png";
+		if (!type.startsWith("image/")) return undefined;
+		const buffer = Buffer.from(await res.arrayBuffer());
+		if (!buffer.length || buffer.length > AVATAR_MAX_BYTES) return undefined;
+		return `data:${type};base64,${buffer.toString("base64")}`;
+	} catch {
+		return undefined;
+	}
+}
+
+async function compute(root: string): Promise<GithubIdentity | null> {
+	let remote: { owner: string; repo?: string } | null = null;
+	try {
+		remote = parseGithubRemote(await git(root, ["remote", "get-url", "origin"]));
+	} catch {
+		/* 没有 origin 就往下走 */
+	}
+	const account = await ghAccount(root);
+	if (account) {
+		return {
+			login: account.login,
+			name: account.name,
+			url: account.url ?? `https://github.com/${account.login}`,
+			avatar: await avatarDataUrl(account.login),
+			repo: remote?.repo,
+		};
+	}
+	if (remote) {
+		return { login: remote.owner, url: `https://github.com/${remote.owner}`, avatar: await avatarDataUrl(remote.owner), repo: remote.repo };
+	}
+	try {
+		const name = (await git(root, ["config", "user.name"])).trim();
+		if (name) return { login: name };
+	} catch {
+		/* 什么都没配 */
+	}
+	return null;
+}
+
+function start(root: string): Promise<GithubIdentity | null> {
+	const existing = inflight.get(root);
+	if (existing) return existing;
+	const task = compute(root)
+		.then((value) => {
+			memory.set(root, { at: Date.now(), value });
+			persist();
+			return value;
+		})
+		.catch(() => null)
+		.finally(() => inflight.delete(root)) as Promise<GithubIdentity | null>;
+	inflight.set(root, task);
+	return task;
+}
+
+/**
+ * 取仓库的 GitHub 身份。命中缓存立刻返回；否则**后台**刷新并返回已过期的旧值（或 null），
+ * 不会让调用方等网络。要拿首次结果用 `awaitGithubIdentity`。
+ */
+export function githubIdentity(root: string | null): GithubIdentity | null {
+	if (!root) return null;
+	void loadDisk();
+	const hit = memory.get(root);
+	if (hit && Date.now() - hit.at < TTL_MS) return hit.value;
+	void start(root);
+	return hit?.value ?? null;
+}
+
+/** 等首次解析完成（面板刚打开、缓存还冷时用；调用方自己控制超时） */
+export async function awaitGithubIdentity(root: string | null): Promise<GithubIdentity | null> {
+	if (!root) return null;
+	await loadDisk();
+	const hit = memory.get(root);
+	if (hit && Date.now() - hit.at < TTL_MS) return hit.value;
+	return start(root);
+}

package/src/lib/growth-turns.ts

@@ -1,3 +1,5 @@
+import { promptTitleText } from "./chat/skill-expansion";
+
 export interface SessionTurn {
 	id: string;
 	ts: number;
@@ -47,7 +49,7 @@ export function promptsFromEntries(entries: readonly SessionEntry[], fromIndex =
 	for (const entry of entries.slice(Math.max(0, fromIndex))) {
 		if (entry.type !== "message" || entry.message?.role !== "user" || !entry.id) continue;
 		ids.push(entry.id);
-		if (!title) title = textOf(entry.message.content).split("\n").map((line) => line.trim()).find(Boolean) ?? "";
+		if (!title) title = promptTitleText(textOf(entry.message.content)).split("\n").map((line) => line.trim()).find(Boolean) ?? "";
 	}
 	return { ids, title };
 }

package/src/lib/session-reader.ts

@@ -7,9 +7,10 @@ import path from "node:path";
 import { createInterface } from "node:readline";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 import type { SessionSummary, WebMessage } from "./types";
-import { toWebMessage } from "./agent-manager";
+import { sessionDisplayMessages, syncSessionsFromDisk } from "./agent-manager";
 import { getAgentDir } from "./pi";
 import { BoundaryError, isPathInside } from "./path-security";
+import { promptTitleText } from "./chat/skill-expansion";
 
 function toSummary(info: {
 	path: string;
@@ -31,6 +32,11 @@ function toSummary(info: {
 	};
 }
 
+/** Date 能表示的毫秒数（±8.64e15）：超出范围的 toISOString 会抛 RangeError */
+function isValidTime(ms: number): boolean {
+	return Number.isFinite(ms) && Math.abs(ms) <= 8.64e15;
+}
+
 /** firstMessage 只当侧栏标题与搜索用：整段贴进来的长提问不该随每 3 秒一次的列表轮询反复下发 */
 export const FIRST_MESSAGE_MAX_CHARS = 300;
 
@@ -76,22 +82,25 @@ async function summarize(filePath: string, stat: { mtime: Date }): Promise<Sessi
 			if (!message || typeof message.role !== "string" || !("content" in message)) continue;
 			if (message.role !== "user" && message.role !== "assistant") continue;
 			const at = typeof message.timestamp === "number" ? message.timestamp : new Date(entry.timestamp).getTime();
-			if (Number.isFinite(at)) lastActivity = Math.max(lastActivity ?? 0, at);
+			if (isValidTime(at)) lastActivity = Math.max(lastActivity ?? 0, at);
 			if (!firstMessage && message.role === "user") {
 				const content = message.content;
-				firstMessage = typeof content === "string"
+				firstMessage = promptTitleText(typeof content === "string"
 					? content
-					: Array.isArray(content) ? content.filter((b: any) => b?.type === "text").map((b: any) => b.text).join(" ") : "";
+					: Array.isArray(content) ? content.filter((b: any) => b?.type === "text").map((b: any) => b.text).join(" ") : "");
 			}
 		}
 		if (!header) return null;
 		const headerTime = typeof header.timestamp === "string" ? new Date(header.timestamp).getTime() : NaN;
-		const modified = lastActivity && lastActivity > 0 ? new Date(lastActivity) : !Number.isNaN(headerTime) ? new Date(headerTime) : stat.mtime;
+		const created = isValidTime(headerTime) ? new Date(headerTime) : stat.mtime;
+		const modified = lastActivity && lastActivity > 0 ? new Date(lastActivity) : created;
 		return toSummary({
 			path: filePath,
 			name,
 			cwd: typeof header.cwd === "string" ? header.cwd : "",
-			created: new Date(String(header.timestamp)),
+			// 头里缺 timestamp 或写坏了：回落 mtime。以前直接 new Date(String(...))，Invalid Date 的 toISOString 一抛，
+			// 整个会话就被 catch 吞成 null，从侧栏里悄悄消失
+			created,
 			modified,
 			messageCount,
 			firstMessage: clipFirstMessage(firstMessage) || "(no messages)",
@@ -118,8 +127,12 @@ interface CachedSummary {
  * 按 mtime + 大小校验，命中就沿用摘要——侧栏首次渲染从"全量解析"变成"读一个小 JSON"。
  * 索引只是加速：读不到、版本不符、写不进去都退化成全量扫描，绝不影响正确性。
  */
-/** 2：firstMessage 开始截断，旧索引里的整段原文要重新摘要 */
-const INDEX_VERSION = 2;
+/**
+ * 2：firstMessage 开始截断，旧索引里的整段原文要重新摘要
+ * 3：技能展开的首条消息还原成 `/skill:name 参数`，旧索引里存的是 `<skill name=…>` 加 SKILL.md 正文
+ * 4：头时间戳坏掉的会话不再摘要成 null，旧索引里缓存的 null 要重读才能回到侧栏
+ */
+const INDEX_VERSION = 4;
 const INDEX_FILENAME = "piweb-session-index.json";
 const INDEX_MAX_ENTRIES = 5000;
 const INDEX_SAVE_DELAY_MS = 1500;
@@ -246,6 +259,8 @@ export async function listSessions(query?: string): Promise<SessionSummary[]> {
 		scanning ??= scanSessions().finally(() => { scanning = null; });
 		list = await scanning;
 		listCache = { at: Date.now(), list };
+		// 顺带看看开着的会话有没有被终端 pi 写过（见 agent-manager syncWithDisk）
+		syncSessionsFromDisk();
 	}
 	if (query?.trim()) {
 		const q = query.trim().toLowerCase();
@@ -281,7 +296,7 @@ export async function deleteSession(sessionPath: string): Promise<void> {
 	}
 }
 
-/** 冷读取：还原上下文消息 + 会话名（不启动 agent） */
+/** 冷读取：还原消息（含被压缩掉的历史）+ 会话名（不启动 agent） */
 export async function readSession(sessionPath: string): Promise<{
 	cwd: string;
 	name: string;
@@ -290,10 +305,7 @@ export async function readSession(sessionPath: string): Promise<{
 	const sm = SessionManager.open(sessionPath);
 	let messages: WebMessage[] = [];
 	try {
-		const entries = sm.buildContextEntries();
-		messages = entries
-			.filter((e: any) => e.type === "message" && e.message)
-			.map((e: any) => toWebMessage(e.message, e.id));
+		messages = sessionDisplayMessages(sm);
 	} catch {
 		messages = [];
 	}

package/src/lib/session-retention.ts

@@ -1,5 +1,6 @@
 /**
- * 归档会话保留期：归档后超过 N 天没有活动（以会话文件 mtime 为准）就自动删除。
+ * 归档会话保留期：从归档那一刻起算满 N 天就自动删除；归档后又用过的，从最后一次活动（文件 mtime）起算。
+ * 以前只看 mtime，于是把一个很久没动的旧会话归档，几小时内就会被直接删掉。
  *
  * 只会碰「在归档列表里」的会话：没归档的会话即使很久没动也不会被动。
  * 正在被本进程管理的会话（打开中/运行中）一律跳过——交给它自己空闲回收。
@@ -7,15 +8,16 @@
  */
 import fs from "node:fs/promises";
 import path from "node:path";
-import { forgetSession, getWorkspaceRegistry } from "./workspace-store";
+import { forgetSession, getArchivedEntries } from "./workspace-store";
 
-/** 归档会话多久没有活动就删除（天） */
+/** 归档会话保留多久（天）；侧栏「已归档」的提示文案（i18n archiveRetentionHint）写的是同一个数 */
 export const ARCHIVED_RETENTION_DAYS = 30;
 /** 两次清理之间的间隔 */
 export const SWEEP_INTERVAL_MS = 6 * 60 * 60 * 1000;
 
 export interface RetentionReport {
 	scanned: number;
+	/** idleDays：距归档或最后一次活动（取较晚者）的天数 */
 	deleted: { path: string; idleDays: number }[];
 	/** 文件已不在磁盘上：只清掉归档列表里的记录 */
 	missing: string[];
@@ -44,9 +46,9 @@ export async function sweepArchivedSessions({
 	const report: RetentionReport = { scanned: 0, deleted: [], missing: [], skippedActive: [], kept: 0 };
 	if (!Number.isFinite(retentionDays) || retentionDays <= 0) return report;
 	const cutoff = now - retentionDays * 24 * 60 * 60 * 1000;
-	const { archivedSessions } = await getWorkspaceRegistry();
+	const entries = await getArchivedEntries({ now, persist: !dryRun });
 
-	for (const sessionPath of archivedSessions) {
+	for (const { path: sessionPath, archivedAt } of entries) {
 		report.scanned += 1;
 		const target = path.resolve(sessionPath);
 		if (isActive(target)) {
@@ -66,18 +68,19 @@ export async function sweepArchivedSessions({
 			if (!dryRun) await forgetSession(target);
 			continue;
 		}
-		if (mtimeMs > cutoff) {
+		const since = Math.max(archivedAt, mtimeMs);
+		if (since > cutoff) {
 			report.kept += 1;
 			continue;
 		}
-		const idleDays = Math.floor((now - mtimeMs) / (24 * 60 * 60 * 1000));
+		const idleDays = Math.floor((now - since) / (24 * 60 * 60 * 1000));
 		report.deleted.push({ path: target, idleDays });
 		if (dryRun) continue;
 		// 运行时再取：session-reader → agent-manager → 本模块 构成环，静态导入会在初始化期踩空
 		const { deleteSession } = await import("./session-reader");
 		await deleteSession(target);
 		await forgetSession(target);
-		log(`[piweb] 归档会话已超过 ${retentionDays} 天没有活动（${idleDays} 天），已删除：${target}`);
+		log(`[piweb] 归档会话已满 ${retentionDays} 天（归档后 ${idleDays} 天没有活动），已删除：${target}`);
 	}
 	return report;
 }