@rexvane/piweb 0.3.11 → 0.3.13

package/src/lib/agent-manager.ts

@@ -684,17 +684,15 @@ async function buildContextBreakdown(
 		// Memory：AGENTS.md 等注入文件（contextResources 的 project 部分）
 		const memoryText = resources.filter((r) => r.source === "project").map((r) => r.content).join("\n\n");
 		breakdown.memory = estimateTokensOf(memoryText);
-		// Skills：从资源加载器取技能清单，按 system-prompt.js 的 formatSkillsForPrompt 段落定位
+		// Skills：从资源加载器取技能清单，按 SDK 的 formatSkillsForPrompt 段落定位。
+		// 该段落没有 Markdown 标题（原文以 "The following skills provide specialized instructions…" 开头，
+		// 结尾是 </available_skills>），以前按 "## Skills" 找永远找不到，技能段一直是 0。
 		try {
 			const { skills } = session.resourceLoader.getSkills();
 			if (skills.length && prompt) {
-				const header = prompt.indexOf("## Skills");
-				if (header >= 0) {
-					// skills 段之后是工具列表段（## Available Tools 等）；找不到就取到结尾
-					const next = prompt.slice(header + 1).search(/^## /m);
-					const section = next >= 0 ? prompt.slice(header, header + 1 + next) : prompt.slice(header);
-					breakdown.skills = estimateTokensOf(section);
-				}
+				const start = prompt.indexOf("The following skills provide specialized instructions");
+				const end = prompt.indexOf("</available_skills>");
+				if (start >= 0 && end > start) breakdown.skills = estimateTokensOf(prompt.slice(start, end + "</available_skills>".length));
 			}
 		} catch {
 			/* loader 不可用则跳过 */
@@ -1442,6 +1440,35 @@ export async function execute(m: Managed, cmd: AgentCommand): Promise<CommandRes
 				const r = await session.navigateTree(entryId);
 				return { ok: !r?.cancelled, data: { cancelled: r?.cancelled === true, editorText: r?.editorText } };
 			}
+			case "editAndResend": {
+				// 编辑用户消息并重发：先停在跑的回合（用户改口即表示不要这一轮的输出），
+				// 再回到该消息之前用新文本重新提问。放在服务端串行做，避免客户端"先 abort 再发"的竞态。
+				const entryId = String((cmd as any).entryId ?? "");
+				const text = (cmd.text ?? "").trim();
+				if (!entryId) return { ok: false, error: "missing entryId" };
+				if (!text) return { ok: false, error: "empty prompt" };
+				if (m.promptSubmitting || m.resourceReloading) return { ok: false, error: "session is busy accepting another command" };
+				m.promptSubmitting = true;
+				try {
+					const session = await ensureSession(m);
+					if (m.disposed) throw new Error("session is disposed");
+					if (session.isStreaming || m.runActive) {
+						await session.abort().catch(() => undefined);
+						// 等 SDK 真正回到空闲（abort 是异步的；最多等 5 秒，超时就按当前状态继续）
+						for (let i = 0; i < 50 && !m.disposed && (session.isStreaming || m.runActive); i += 1) {
+							await new Promise((resolve) => setTimeout(resolve, 100));
+						}
+					}
+					if (m.disposed) throw new Error("session is disposed");
+					const moved = await session.navigateTree(entryId);
+					if (moved?.cancelled) return { ok: false, error: "edit cancelled" };
+					await growthOf(m).prepare().catch(() => undefined);
+					await session.prompt(text);
+					return { ok: true };
+				} finally {
+					m.promptSubmitting = false;
+				}
+			}
 			case "rename": {
 				const name = (cmd.text ?? "").trim();
 				if (m.session) m.session.setSessionName(name);

package/src/lib/clipboard.ts

@@ -0,0 +1,27 @@
+/**
+ * 剪贴板工具：优先用异步 Clipboard API，非安全上下文（局域网 http）退回 textarea + execCommand。
+ * 从 ChatWindow 抽出来共用（消息操作行与提示词面板都用它）。
+ */
+export async function copyText(text: string): Promise<boolean> {
+	try {
+		if (navigator.clipboard?.writeText) {
+			await navigator.clipboard.writeText(text);
+			return true;
+		}
+	} catch {
+		// Non-secure local-network contexts need the legacy fallback below.
+	}
+	const field = document.createElement("textarea");
+	field.value = text;
+	field.style.position = "fixed";
+	field.style.opacity = "0";
+	document.body.appendChild(field);
+	field.select();
+	try {
+		return document.execCommand("copy");
+	} catch {
+		return false;
+	} finally {
+		field.remove();
+	}
+}

package/src/lib/command-validation.ts

@@ -15,6 +15,7 @@ const COMMANDS = new Set<AgentCommand["cmd"]>([
 	"fork",
 	"cycleModel",
 	"navigate",
+	"editAndResend",
 	"clearQueue",
 	"extensionUiResponse",
 	"reload",

package/src/lib/prompt-sources.ts

@@ -0,0 +1,229 @@
+/**
+ * prompt-sources：集中列出所有承载提示词的来源，供界面上"点开即看"。
+ *
+ * 覆盖：系统提示词覆盖文件（SYSTEM.md）、追加提示词（APPEND_SYSTEM.md）、项目记忆（AGENTS.md）、
+ * 技能提示词（SKILL.md）、提示模板（prompts/*.md）、以及来自扩展与 npm 包的同类资源；
+ * 热会话还额外给出"组装后真正发给模型的系统提示词"和每个工具的定义（名称/描述/参数 schema）。
+ *
+ * 只读：不改动任何提示词内容，也不影响发给模型的东西。
+ */
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { getAgentDir, getResourceLoader, resourceLoaderReady } from "./pi";
+import { resolveDiscoveredPath } from "./path-security";
+
+/** 提示词来源类别：界面按这个分组 */
+export type PromptSourceKind = "system" | "append" | "agents" | "skill" | "template" | "tool" | "assembled";
+
+/** 来源出处：界面据此显示徽标（项目 / 个人 / 某个包 / 某个扩展） */
+export interface PromptSourceOrigin {
+	scope: "project" | "agent" | "package" | "extension";
+	/** scope 为 package/extension 时的名字 */
+	name?: string;
+}
+
+export interface PromptSource {
+	kind: PromptSourceKind;
+	/** 展示名：文件名（不含目录）或工具名 */
+	name: string;
+	/** 绝对路径；合成项（assembled）没有路径 */
+	path?: string;
+	origin: PromptSourceOrigin;
+	/** 文件字节数（有路径且能 stat 到时） */
+	bytes?: number;
+}
+
+export interface PromptToolView {
+	name: string;
+	description?: string;
+	/** 参数 JSON schema，原样透出由界面格式化 */
+	parameters?: unknown;
+	promptGuidelines?: string[];
+	source: "builtin" | "extension";
+}
+
+export interface PromptSourcesResult {
+	sources: PromptSource[];
+	/** 热会话才有：实际发给模型的完整系统提示词（含你的 AGENTS.md、技能段、工具清单与追加段——不做任何过滤） */
+	assembledSystemPrompt?: string;
+	/** 热会话才有：压缩摘要（compact 后进入上下文的历史摘要，平时在界面上看不见） */
+	compactedSummary?: string;
+	/** 热会话才有：每个工具的定义 */
+	tools?: PromptToolView[];
+	/** 冷会话（agent 未启动）时为 false，界面据此说明为什么缺少合成项 */
+	sessionReady: boolean;
+}
+
+/** 只看这几个字段：够用且便于用假对象测试 */
+export interface PromptSessionLike {
+	systemPrompt: string;
+	getAllTools(): Array<{
+		name: string;
+		description?: string;
+		parameters?: unknown;
+		promptGuidelines?: string[];
+		sourceInfo?: { source?: string; origin?: string; scope?: string };
+	}>;
+	/** 会话条目入口：SDK 里字段名有 sm / sessionManager 两种（压缩摘要从这里取） */
+	sm?: { getEntries?: () => unknown[] };
+	sessionManager?: { getEntries?: () => unknown[] };
+}
+
+interface SourceInfoLike {
+	source?: string;
+	scope?: string;
+	origin?: string;
+}
+
+const normalize = (value: string) => value.replace(/\\/g, "/").toLowerCase();
+
+/** 从 node_modules 路径里取包名（含 scope） */
+function packageNameFromPath(filePath: string): string | undefined {
+	const parts = filePath.replace(/\\/g, "/").split("/");
+	const index = parts.lastIndexOf("node_modules");
+	if (index < 0 || index + 1 >= parts.length) return undefined;
+	const first = parts[index + 1];
+	return first.startsWith("@") ? `${first}/${parts[index + 2] ?? ""}`.replace(/\/$/, "") : first;
+}
+
+/** 扩展目录名（<任意>/extensions/<name>/...） */
+function extensionNameFromPath(filePath: string): string | undefined {
+	const parts = filePath.replace(/\\/g, "/").split("/");
+	const index = parts.lastIndexOf("extensions");
+	if (index < 0 || index + 1 >= parts.length) return undefined;
+	return parts[index + 1] || undefined;
+}
+
+/**
+ * 判断一个提示词文件来自哪里。优先用 SDK 的 SourceInfo（有 scope/origin），
+ * 没有时按路径归类：工作区内 = project，个人目录 = agent，node_modules = 某个包，
+ * extensions 目录 = 某个扩展。
+ */
+export function classifyPromptOrigin(filePath: string, cwd: string, sourceInfo?: SourceInfoLike): PromptSourceOrigin {
+	const normalized = normalize(filePath);
+	const packageName = packageNameFromPath(filePath);
+	if (packageName || sourceInfo?.origin === "package") {
+		return { scope: "package", ...(packageName ?? sourceInfo?.source ? { name: packageName ?? sourceInfo?.source } : {}) };
+	}
+	const resolvedCwd = normalize(path.resolve(cwd));
+	if (normalized === resolvedCwd || normalized.startsWith(`${resolvedCwd}/`)) return { scope: "project" };
+	const agentDir = normalize(getAgentDir());
+	if (normalized.startsWith(`${agentDir}/`)) {
+		// 个人目录里的扩展也算扩展，便于区分"我自己装的那个扩展"
+		const extension = extensionNameFromPath(filePath);
+		return extension ? { scope: "extension", name: extension } : { scope: "agent" };
+	}
+	const extension = extensionNameFromPath(filePath);
+	if (extension) return { scope: "extension", name: extension };
+	if (sourceInfo?.scope === "project") return { scope: "project" };
+	return { scope: "agent" };
+}
+
+const KIND_ORDER: PromptSourceKind[] = ["system", "append", "agents", "skill", "template", "tool", "assembled"];
+
+/** 纯函数：把各来源整理成界面要的列表（按类别、再按名字排序） */
+export function buildPromptSources(entries: Array<Omit<PromptSource, "origin"> & { origin?: PromptSourceOrigin; cwd: string; sourceInfo?: SourceInfoLike }>): PromptSource[] {
+	return entries
+		.map(({ cwd, sourceInfo, origin, ...rest }) => ({
+			...rest,
+			origin: origin ?? classifyPromptOrigin(rest.path ?? "", cwd, sourceInfo),
+		}))
+		.sort((a, b) => {
+			const byKind = KIND_ORDER.indexOf(a.kind) - KIND_ORDER.indexOf(b.kind);
+			return byKind !== 0 ? byKind : a.name.localeCompare(b.name);
+		});
+}
+
+async function fileSize(filePath: string | undefined): Promise<number | undefined> {
+	if (!filePath) return undefined;
+	try {
+		const stat = await fs.stat(filePath);
+		return stat.isFile() ? stat.size : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+/** 最近一次压缩的摘要（与上下文计量同一套取法：从会话条目的最后一条 compaction 往前找） */
+export function latestCompactionSummary(session: PromptSessionLike): string | undefined {
+	try {
+		const entries = sessionEntries(session);
+		for (let i = entries.length - 1; i >= 0; i -= 1) {
+			const entry = entries[i] as { type?: string; summary?: string };
+			if (entry?.type === "compaction" && typeof entry.summary === "string" && entry.summary.trim()) return entry.summary;
+		}
+	} catch {
+		/* 条目不可用则跳过 */
+	}
+	return undefined;
+}
+
+/** 会话条目入口在 SDK 里有两个字段名（sm / sessionManager），两种都认 */
+function sessionEntries(session: PromptSessionLike): unknown[] {
+	const s = session as unknown as { sm?: { getEntries?: () => unknown[] }; sessionManager?: { getEntries?: () => unknown[] } };
+	return s.sm?.getEntries?.() ?? s.sessionManager?.getEntries?.() ?? [];
+}
+
+/** 列出当前工作区的全部提示词来源（冷会话也能列全文件类来源） */
+export async function listPromptSources({
+	cwd,
+	session,
+}: {
+	cwd: string;
+	session?: PromptSessionLike | null;
+}): Promise<PromptSourcesResult> {
+	const resolvedCwd = path.resolve(cwd);
+	await resourceLoaderReady(resolvedCwd);
+	const loader = getResourceLoader(resolvedCwd);
+
+	const raw: Array<Omit<PromptSource, "origin"> & { cwd: string; sourceInfo?: SourceInfoLike; baseName?: string }> = [];
+	const push = (kind: PromptSourceKind, filePath: string | undefined, name: string | undefined, sourceInfo?: SourceInfoLike) => {
+		if (!filePath) return;
+		raw.push({ kind, path: filePath, name: name || path.basename(filePath), cwd: resolvedCwd, ...(sourceInfo ? { sourceInfo } : {}) });
+	};
+
+	const systemSource = loader.getSystemPromptSource();
+	push("system", systemSource?.path, systemSource ? path.basename(systemSource.path) : undefined);
+
+	for (const source of loader.getAppendSystemPromptSources()) push("append", source.path, source ? path.basename(source.path) : undefined);
+	for (const file of loader.getAgentsFiles().agentsFiles) push("agents", file.path, path.basename(file.path));
+	for (const skill of loader.getSkills().skills) push("skill", skill.filePath, skill.name || path.basename(skill.filePath), skill.sourceInfo as SourceInfoLike | undefined);
+	for (const template of loader.getPrompts().prompts) push("template", template.filePath, template.name || path.basename(template.filePath), template.sourceInfo as SourceInfoLike | undefined);
+
+	const withSizes = await Promise.all(raw.map(async (entry) => ({ ...entry, bytes: await fileSize(entry.path) })));
+	const sources = buildPromptSources(withSizes);
+	// 压缩摘要：compact 之后它以摘要形式进入上下文，界面上平时看不到，这里一并列出
+	const compacted = session ? latestCompactionSummary(session) : undefined;
+
+	const tools = session
+		? session.getAllTools().map((tool) => ({
+			name: tool.name,
+			...(tool.description === undefined ? {} : { description: tool.description }),
+			...(tool.parameters === undefined ? {} : { parameters: tool.parameters }),
+			...(tool.promptGuidelines?.length ? { promptGuidelines: tool.promptGuidelines } : {}),
+			source: tool.sourceInfo?.source === "builtin" ? ("builtin" as const) : ("extension" as const),
+		}))
+		: undefined;
+
+	return {
+		sources,
+		...(session?.systemPrompt ? { assembledSystemPrompt: session.systemPrompt } : {}),
+		...(compacted ? { compactedSummary: compacted } : {}),
+		...(tools ? { tools } : {}),
+		sessionReady: Boolean(session),
+	};
+}
+
+/** 读取单个来源的内容：只允许读取"本次发现列表里出现过"的路径（与技能读取同一套校验） */
+export async function readPromptSource(filePath: string, cwd: string): Promise<string> {
+	const { sources } = await listPromptSources({ cwd });
+	const allowed = sources.map((source) => source.path).filter((value): value is string => typeof value === "string");
+	const authorized = await resolveDiscoveredPath(filePath, allowed);
+	return fs.readFile(authorized, "utf8");
+}
+
+/** 给测试与诊断用：个人目录（提示词文件可能在 ~/.pi/agent 或 ~/.agents 下） */
+export function promptHomeDirs(): string[] {
+	return [getAgentDir(), path.join(os.homedir(), ".agents")];
+}

package/src/lib/session-import/claude.ts

@@ -0,0 +1,219 @@
+/**
+ * Claude Code（~/.claude/projects/<slug>/*.jsonl）
+ *
+ * 每行自带 type，无统一头行；消息行是 {type:user|assistant, message:{role,model,content[],usage,stop_reason}}。
+ * content 块有 text / thinking / tool_use / tool_result / image；工具结果出现在后续 user 行里，
+ * 靠 tool_use_id 与前面的 tool_use 配对（这一步交给 writer 兜底修复）。
+ */
+import path from "node:path";
+import fs from "node:fs/promises";
+import { eachJsonLine, listFiles, readHead, reachedLimit, sortByRecency } from "./files";
+import { claudeRoot } from "./paths";
+import type { ExternalSessionSummary, ImportedBlock, ImportedEntry, ImportedMessage, ImportedSession, ImportSourceModule, ScanOptions } from "./types";
+import { cleanTitle, compactBlocks, outputBlocks, textBlock, toEpochMs } from "./types";
+
+const ROOT = claudeRoot;
+
+/** 合成信封（命令输出、系统提醒等）不是真人输入，导入时跳过 */
+const SYNTHETIC_PREFIXES = ["<command-name>", "<command-message>", "<local-command-stdout>", "<local-command-caveat>", "<system-reminder>", "<user_info>", "<bash-input>", "<bash-stdout>"];
+
+const isSynthetic = (text: string) => SYNTHETIC_PREFIXES.some((prefix) => text.startsWith(prefix));
+
+function isMessageLine(record: Record<string, unknown>): boolean {
+	return (record.type === "user" || record.type === "assistant") && record.isSidechain !== true && Boolean(record.message);
+}
+
+function projectPathFrom(records: Record<string, unknown>[]): string | undefined {
+	for (const record of records) {
+		if (typeof record.cwd === "string" && record.cwd.trim()) return record.cwd;
+	}
+	return undefined;
+}
+
+function modelFrom(records: Record<string, unknown>[]): string | undefined {
+	for (const record of records) {
+		const message = record.message as { model?: unknown } | undefined;
+		if (typeof message?.model === "string" && message.model.trim()) return message.model;
+	}
+	return undefined;
+}
+
+/** 标题：优先会话摘要行，其次首条真人用户消息（Claude Code 不写标题字段） */
+function titleFrom(records: Record<string, unknown>[]): string | undefined {
+	for (const record of records) {
+		if (record.type === "summary" && typeof record.summary === "string" && record.summary.trim()) return record.summary.trim();
+	}
+	for (const record of records) {
+		if (record.type !== "user") continue;
+		const plain = userTextOf((record.message as { content?: unknown } | undefined)?.content);
+		if (plain && !isSynthetic(plain)) return plain;
+	}
+	return undefined;
+}
+
+function userTextOf(content: unknown): string {
+	const items = Array.isArray(content) ? content : [content];
+	return items
+		.map((item) => (typeof item === "string" ? item : typeof (item as { text?: unknown })?.text === "string" ? ((item as { text: string }).text) : ""))
+		.join("\n")
+		.replace(/\s+/g, " ")
+		.trim();
+}
+
+/** assistant 消息的 content 数组 */
+function assistantBlocks(content: unknown): ImportedBlock[] {
+	if (!Array.isArray(content)) return compactBlocks([textBlock(typeof content === "string" ? content : undefined)]);
+	return compactBlocks(content.flatMap((raw): Array<ImportedBlock | null> => {
+		const block = raw as Record<string, unknown>;
+		if (block?.type === "text") return [textBlock(block.text)];
+		if (block?.type === "thinking") return [typeof block.thinking === "string" && block.thinking ? { type: "thinking", thinking: block.thinking } : null];
+		if (block?.type === "tool_use") {
+			const id = typeof block.id === "string" ? block.id : "";
+			const name = typeof block.name === "string" ? block.name : "";
+			return id && name ? [{ type: "toolCall" as const, id, name, arguments: block.input ?? {} }] : [];
+		}
+		if (block?.type === "image") {
+			const source = block.source as Record<string, unknown> | undefined;
+			if (source?.type === "base64" && typeof source.data === "string" && typeof source.media_type === "string") {
+				return [{ type: "image", data: source.data, mimeType: source.media_type }];
+			}
+		}
+		return [];
+	}));
+}
+
+/** user 行可能同时含文本与工具结果：文本进用户消息，工具结果单列 */
+function splitUserContent(content: unknown): { text: ImportedBlock[]; results: Array<{ toolCallId: string; content: ImportedBlock[]; isError: boolean }> } {
+	const text: Array<ImportedBlock | null> = [];
+	const results: Array<{ toolCallId: string; content: ImportedBlock[]; isError: boolean }> = [];
+	const items = Array.isArray(content) ? content : [content];
+	for (const raw of items) {
+		if (typeof raw === "string") {
+			text.push(textBlock(raw));
+			continue;
+		}
+		const block = raw as Record<string, unknown>;
+		if (block?.type === "text") text.push(textBlock(block.text));
+		else if (block?.type === "tool_result" && typeof block.tool_use_id === "string") {
+			results.push({ toolCallId: block.tool_use_id, content: outputBlocks(block.content), isError: block.is_error === true });
+		} else if (block?.type === "image") {
+			const source = block.source as Record<string, unknown> | undefined;
+			if (source?.type === "base64" && typeof source.data === "string" && typeof source.media_type === "string") {
+				text.push({ type: "image", data: source.data, mimeType: source.media_type });
+			}
+		}
+	}
+	return { text: compactBlocks(text), results };
+}
+
+export const claudeSource: ImportSourceModule = {
+	id: "claude",
+
+	async scan(options?: ScanOptions): Promise<ExternalSessionSummary[]> {
+		const limit = options?.limit ?? 0;
+		const candidates = await sortByRecency(await listFiles(ROOT(), { match: (name) => name.endsWith(".jsonl") }));
+		const out: ExternalSessionSummary[] = [];
+		for (const { file, mtime } of candidates) {
+			if (reachedLimit(out.length, limit)) break; // 只读最近的若干条：后面的文件根本不打开
+			let head: string;
+			try {
+				head = await readHead(file);
+			} catch {
+				continue;
+			}
+			const records = [...eachJsonLine(head)].filter((record) => record.type !== undefined).slice(0, 200);
+			const first = records.find(isMessageLine);
+			if (!first) continue; // 只有元信息、没有消息的文件不列
+			out.push({
+				source: "claude",
+				externalId: path.basename(file, ".jsonl"),
+				title: cleanTitle(titleFrom(records)),
+				projectPath: projectPathFrom(records),
+				model: modelFrom(records),
+				createdAt: toEpochMs(first.timestamp) ?? mtime,
+				updatedAt: mtime,
+				// 消息数需要整读，扫描阶段不统计（界面显示 —）
+				location: file,
+			});
+		}
+		return out;
+	},
+
+	async read(summary: ExternalSessionSummary): Promise<ImportedSession | null> {
+		let text: string;
+		try {
+			text = await fs.readFile(summary.location, "utf8");
+		} catch {
+			return null;
+		}
+		const entries: ImportedEntry[] = [];
+		const skipped: string[] = [];
+		let sidechains = 0;
+		let synthetic = 0;
+		let projectPath = summary.projectPath;
+		let model = summary.model;
+		let provider: string | undefined;
+
+		for (const record of eachJsonLine(text)) {
+			if (record.isSidechain === true) {
+				sidechains += 1;
+				continue;
+			}
+			if (typeof record.cwd === "string" && record.cwd.trim()) projectPath = projectPath ?? record.cwd;
+			const message = record.message as Record<string, unknown> | undefined;
+			if (!message) continue;
+			if (typeof message.model === "string" && message.model.trim()) model = message.model;
+			if (typeof message.provider === "string" && message.provider.trim()) provider = message.provider;
+			const timestamp = toEpochMs(record.timestamp) ?? toEpochMs(message.timestamp) ?? summary.createdAt ?? Date.now();
+
+			if (record.type === "assistant") {
+				const content = assistantBlocks(message.content);
+				if (!content.length) continue;
+				const usage = message.usage as Record<string, unknown> | undefined;
+				entries.push({
+					type: "message",
+					message: {
+						role: "assistant",
+						content,
+						timestamp,
+						...(typeof message.model === "string" ? { model: message.model } : {}),
+						...(typeof message.stop_reason === "string" && message.stop_reason ? { stopReason: message.stop_reason } : {}),
+						...(usage
+							? {
+									usage: {
+										input: Number(usage.input_tokens) || 0,
+										output: Number(usage.output_tokens) || 0,
+										cacheRead: Number(usage.cache_read_input_tokens) || 0,
+										cacheWrite: Number(usage.cache_creation_input_tokens) || 0,
+									},
+								}
+							: {}),
+					},
+				});
+				continue;
+			}
+
+			if (record.type === "user") {
+				const { text: textBlocks, results } = splitUserContent((message as { content?: unknown }).content);
+				const plain = textBlocks.filter((block) => block.type === "text").map((block) => block.text).join("\n");
+				const keepText = textBlocks.filter((block) => block.type !== "text");
+				if (plain && !isSynthetic(plain.trim()) && !/^Caveat:/i.test(plain.trim())) {
+					entries.push({ type: "message", message: { role: "user", content: [...keepText, { type: "text", text: plain }], timestamp } as ImportedMessage });
+				} else if (plain) {
+					synthetic += 1;
+				}
+				for (const result of results) {
+					entries.push({
+						type: "message",
+						message: { role: "toolResult", toolCallId: result.toolCallId, content: result.content, isError: result.isError || undefined, timestamp } as ImportedMessage,
+					});
+				}
+			}
+		}
+
+		if (sidechains) skipped.push(`跳过 ${sidechains} 条侧链（子代理）记录`);
+		if (synthetic) skipped.push(`跳过 ${synthetic} 条合成输入（命令回显/系统提醒）`);
+		if (!entries.some((entry) => entry.type === "message")) return null;
+		return { summary: { ...summary, projectPath, model, provider }, entries, skipped };
+	},
+};