@rexvane/piweb 0.3.13 → 0.3.15

package/src/components/SessionImportSection.tsx

@@ -36,6 +36,8 @@ interface ImportOutcome {
 	reason?: string;
 	messageCount?: number;
 	workspace?: string;
+	/** 已成功导入，但源里的运行时注入/加密内容等无法作为对话还原 */
+	skipped?: string[];
 }
 
 interface ImportReport {
@@ -60,6 +62,8 @@ function dayOf(ms?: number): string {
 	return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
 }
 
+const summaryKey = (summary: Pick<Summary, "source" | "externalId">) => `${summary.source}:${summary.externalId}`;
+
 export function SessionImportSection({ cwd }: { cwd: string }) {
 	const { t } = useI18n();
 	const [summaries, setSummaries] = useState<Summary[]>([]);
@@ -83,9 +87,14 @@ export function SessionImportSection({ cwd }: { cwd: string }) {
 				setFailure(json.error || t.toastError);
 				return;
 			}
-			setSummaries(json.data.sessions ?? []);
+			const nextSummaries = (json.data.sessions ?? []) as Summary[];
+			const nextImported = new Set<string>(json.data.imported ?? []);
+			const selectable = new Set(nextSummaries.map(summaryKey));
+			setSummaries(nextSummaries);
 			setErrors(json.data.errors ?? []);
-			setImportedKeys(new Set<string>(json.data.imported ?? []));
+			setImportedKeys(nextImported);
+			// 重新扫描后，源会话可能已经消失或被另一个请求导入；不要留下幽灵选择
+			setSelected((previous) => new Set([...previous].filter((item) => selectable.has(item) && !nextImported.has(item))));
 		} catch (error) {
 			setFailure(error instanceof Error ? error.message : String(error));
 		} finally {
@@ -109,8 +118,6 @@ export function SessionImportSection({ cwd }: { cwd: string }) {
 		void scan();
 	}, [scan]);
 
-	const key = (summary: Summary) => `${summary.source}:${summary.externalId}`;
-
 	const groups = useMemo(() => {
 		const bySource = new Map<string, Summary[]>();
 		for (const summary of summaries) {
@@ -120,16 +127,30 @@ export function SessionImportSection({ cwd }: { cwd: string }) {
 		}
 		return SOURCE_ORDER.filter((source) => bySource.has(source)).map((source) => {
 			const rows = [...(bySource.get(source) as Summary[])].sort((left, right) => (right.updatedAt ?? right.createdAt ?? 0) - (left.updatedAt ?? left.createdAt ?? 0));
-			return { source, rows, imported: rows.filter((row) => importedKeys.has(key(row))).length };
+			return { source, rows, imported: rows.filter((row) => importedKeys.has(summaryKey(row))).length };
 		});
 	}, [summaries, importedKeys]);
 
+	/**
+	 * 一次只显示一个来源：六个工具各列 15 条就是 90 行，全铺出来既难找也没必要。
+	 * 首次打开默认落到“最近活动会话”所在的来源；用户切换后保持选择。
+	 * 直接派生有效来源，不用 effect 回填，避免初始化 effect 覆盖用户刚完成的点击。
+	 */
+	const [activeSource, setActiveSource] = useState("");
+	const defaultSource = groups.reduce<{ source: string; at: number } | null>((latest, group) => {
+		const first = group.rows[0];
+		const at = first?.updatedAt ?? first?.createdAt ?? 0;
+		return !latest || at > latest.at ? { source: group.source, at } : latest;
+	}, null)?.source ?? "";
+	const visibleSource = activeSource && groups.some((group) => group.source === activeSource) ? activeSource : defaultSource;
+	const activeGroup = groups.find((group) => group.source === visibleSource);
+
 	const toggle = (summary: Summary) => {
-		if (importedKeys.has(key(summary))) return;
+		if (importedKeys.has(summaryKey(summary))) return;
 		setSelected((previous) => {
 			const next = new Set(previous);
-			if (next.has(key(summary))) next.delete(key(summary));
-			else next.add(key(summary));
+			if (next.has(summaryKey(summary))) next.delete(summaryKey(summary));
+			else next.add(summaryKey(summary));
 			return next;
 		});
 	};
@@ -138,9 +159,9 @@ export function SessionImportSection({ cwd }: { cwd: string }) {
 		setSelected((previous) => {
 			const next = new Set(previous);
 			for (const row of rows) {
-				if (importedKeys.has(key(row))) continue;
-				if (checked) next.add(key(row));
-				else next.delete(key(row));
+				if (importedKeys.has(summaryKey(row))) continue;
+				if (checked) next.add(summaryKey(row));
+				else next.delete(summaryKey(row));
 			}
 			return next;
 		});
@@ -148,7 +169,7 @@ export function SessionImportSection({ cwd }: { cwd: string }) {
 
 	const run = async () => {
 		if (!selected.size) return;
-		const items = summaries.filter((summary) => selected.has(key(summary))).map((summary) => ({ source: summary.source, externalId: summary.externalId }));
+		const items = summaries.filter((summary) => selected.has(summaryKey(summary))).map((summary) => ({ source: summary.source, externalId: summary.externalId }));
 		setImporting(true);
 		setFailure(null);
 		setReport(null);
@@ -187,6 +208,7 @@ export function SessionImportSection({ cwd }: { cwd: string }) {
 
 	const failures = report?.results.filter((result) => result.status === "failed") ?? [];
 	const skipped = report?.results.filter((result) => result.status === "skipped") ?? [];
+	const importedWithNotes = report?.results.filter((result) => result.status === "imported" && result.skipped?.length) ?? [];
 
 	return (
 		<div className="flex flex-col gap-4" data-testid="session-import">
@@ -266,6 +288,11 @@ export function SessionImportSection({ cwd }: { cwd: string }) {
 							{sourceLabel(result.source)} · {result.title || result.externalId} — {result.reason}
 						</div>
 					))}
+					{importedWithNotes.map((result) => (
+						<div key={`note-${result.source}-${result.externalId}`} className="mt-1" style={{ fontSize: 11.5, color: "var(--dsw-label-caption)" }}>
+							{sourceLabel(result.source)} · {result.title || result.externalId} — {result.skipped?.join("；")}
+						</div>
+					))}
 					{failures.map((result) => (
 						<div key={`fail-${result.source}-${result.externalId}`} className="mt-1" style={{ fontSize: 11.5, color: "var(--dsw-danger)" }}>
 							{sourceLabel(result.source)} · {result.title || result.externalId} — {result.reason}
@@ -276,26 +303,52 @@ export function SessionImportSection({ cwd }: { cwd: string }) {
 
 			{!scanning && !summaries.length && !errors.length && <div style={{ fontSize: 13, color: "var(--dsw-label-caption)" }}>{t.importEmpty}</div>}
 
-			{groups.map((group) => (
-				<div key={group.source} className="flex flex-col gap-2" data-testid={`import-group-${group.source}`}>
+			{/* 来源选择器：选中哪个就只列哪个工具的会话 */}
+			{groups.length > 0 && (
+				<div className="flex flex-wrap items-center gap-1.5" role="tablist" aria-label={t.importPickSource} data-testid="import-source-tabs">
+					{groups.map((group) => {
+						const active = group.source === visibleSource;
+						return (
+							<button
+								key={group.source}
+								type="button"
+								role="tab"
+								aria-selected={active}
+								className="rounded-full px-3 py-1 transition-colors"
+								style={{
+									fontSize: 12,
+									border: `0.5px solid ${active ? "var(--dsw-accent)" : "var(--dsw-border-l2)"}`,
+									background: active ? "var(--dsw-accent)" : "transparent",
+									color: active ? "#fff" : "var(--dsw-label-tertiary)",
+								}}
+								onClick={() => setActiveSource(group.source)}
+								data-testid={`import-source-${group.source}`}
+							>
+								{sourceLabel(group.source)}
+								<span style={{ marginLeft: 6, opacity: 0.75 }}>{group.rows.length}</span>
+							</button>
+						);
+					})}
+				</div>
+			)}
+
+			{activeGroup && (
+				<div className="flex flex-col gap-2" data-testid={`import-group-${activeGroup.source}`}>
 					<div className="flex items-center gap-2">
-						<span className="rounded-full px-2 py-0.5" style={{ fontSize: 10.5, background: "var(--dsw-hover)", color: "var(--dsw-label-tertiary)" }}>
-							{sourceLabel(group.source)}
-						</span>
 						<span style={{ fontSize: 11.5, color: "var(--dsw-label-caption)" }}>
-							{t.importGroupCount.replace("{n}", String(group.rows.length)).replace("{imported}", String(group.imported))}
+							{t.importGroupCount.replace("{n}", String(activeGroup.rows.length)).replace("{imported}", String(activeGroup.imported))}
 						</span>
 						<div className="flex-1" />
-						<button className="rounded-lg px-2 py-0.5" style={{ fontSize: 11.5, color: "var(--dsw-label-tertiary)" }} onClick={() => selectGroup(group.rows, true)}>
+						<button className="rounded-lg px-2 py-0.5" style={{ fontSize: 11.5, color: "var(--dsw-label-tertiary)" }} onClick={() => selectGroup(activeGroup.rows, true)}>
 							{t.importSelectAll}
 						</button>
-						<button className="rounded-lg px-2 py-0.5" style={{ fontSize: 11.5, color: "var(--dsw-label-caption)" }} onClick={() => selectGroup(group.rows, false)}>
+						<button className="rounded-lg px-2 py-0.5" style={{ fontSize: 11.5, color: "var(--dsw-label-caption)" }} onClick={() => selectGroup(activeGroup.rows, false)}>
 							{t.importSelectNone}
 						</button>
 					</div>
 					<div className="flex flex-col gap-1.5">
-						{group.rows.map((row) => {
-							const rowKey = key(row);
+						{activeGroup.rows.map((row) => {
+							const rowKey = summaryKey(row);
 							const done = importedKeys.has(rowKey);
 							const checked = selected.has(rowKey);
 							return (
@@ -327,7 +380,7 @@ export function SessionImportSection({ cwd }: { cwd: string }) {
 						})}
 					</div>
 				</div>
-			))}
+			)}
 		</div>
 	);
 }

package/src/i18n.tsx

@@ -387,6 +387,7 @@ const zh = {
 	importSourceOpencode: "opencode",
 	importSourceError: "{source} 扫描失败：{message}",
 	importGroupCount: "{n} 条 · 已导入 {imported}",
+	importPickSource: "选择来源",
 	importLimitHint: "每个来源只列最近 {n} 条对话（更早的会话不扫描，省时省资源）",
 	importLimitHintTooltip: "看更早的会话：把 src/lib/session-import/index.ts 里的 SCAN_LIMIT_PER_SOURCE 调大",
 	importSelectAll: "全选本组",
@@ -985,6 +986,7 @@ const en: Dict = {
 	importSourceOpencode: "opencode",
 	importSourceError: "{source} scan failed: {message}",
 	importGroupCount: "{n} sessions · {imported} imported",
+	importPickSource: "Choose a source",
 	importLimitHint: "Only the {n} most recent conversations per source are scanned",
 	importLimitHintTooltip: "To see older sessions, raise SCAN_LIMIT_PER_SOURCE in src/lib/session-import/index.ts",
 	importSelectAll: "Select group",

package/src/lib/agent-manager.ts

@@ -35,6 +35,7 @@ import { sanitizeToolOutput } from "./text-sanitize";
 import { BoundaryError } from "./path-security";
 import { estimateTokensOf } from "./process-format";
 import { getPiSettings } from "./pi-settings";
+import { createManagedNiubashTools } from "./managed-niubash";
 import { clampThinkingLevel, getSupportedThinkingLevels } from "@earendil-works/pi-ai";
 import type {
 	AgentCommand,
@@ -799,6 +800,8 @@ export async function ensureSession(m: Managed): Promise<AgentSession> {
 				modelRuntime: await getModelRuntime(),
 				resourceLoader: loader,
 				settingsManager: getSettingsManager(m.cwd),
+				// Windows: 同名 bash 覆盖 SDK 内置工具，指向托管 niubash；其它平台返回 []，走 Pi 默认。
+				customTools: createManagedNiubashTools(m.cwd),
 			});
 			created = session;
 			if (m.disposed) throw new Error("session is disposed");

package/src/lib/managed-niubash.ts

@@ -0,0 +1,227 @@
+import crypto from "node:crypto";
+import fs from "node:fs";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { createBashToolDefinition, type ToolDefinition } from "@earendil-works/pi-coding-agent";
+import { APP_ROOT } from "./app-root";
+
+const DISTRIBUTION_VERSION = "1.1.4-piweb.0";
+const NIUBASH_VERSION = "1.1.4";
+const SOURCE_REPOSITORY = "https://github.com/unixwin/niubash";
+const SOURCE_TAG = "v1.1.4";
+
+const PACKAGE_BY_ARCH = {
+	x64: {
+		packageName: "@rexvane/piweb-niubash-win32-x64",
+		directory: "piweb-niubash-win32-x64",
+		asset: "niubash-v1.1.4-win-x64.zip",
+		assetSha256: "9f543634288a316f7ed8e5a76ff794eca402cb21e74b8f8a551daffafde162f5",
+		machine: 0x8664,
+	},
+	arm64: {
+		packageName: "@rexvane/piweb-niubash-win32-arm64",
+		directory: "piweb-niubash-win32-arm64",
+		asset: "niubash-v1.1.4-win-arm64.zip",
+		assetSha256: "77e98ba8d7f6be70c35388bcc28bdbc883c06bcaafffbe186a88788ad32ccf00",
+		machine: 0xaa64,
+	},
+} as const;
+
+const LICENSE_HASHES = {
+	"NIUBASH.txt": "1290aae99e71239ee3154e7847830e49e7a36c758fa6d659d73fa752dc9f81c8",
+	"RUBASH.txt": "e426a75a20633f3088da22aef61a5a44d06f1f884c600f6011d00702c3989079",
+	"WINUXCMD.txt": "8ffc4ed56f5e6ab8183a7ece2e3aa6ea4800b0a4e8170d11bd60856f2dd760f3",
+} as const;
+
+export type SupportedArch = keyof typeof PACKAGE_BY_ARCH;
+
+type PackageExport = {
+	schema?: unknown;
+	packageName?: unknown;
+	distributionVersion?: unknown;
+	niubashVersion?: unknown;
+	platform?: unknown;
+	arch?: unknown;
+	runtimeDir?: unknown;
+	shellPath?: unknown;
+	manifestPath?: unknown;
+};
+
+type LoadedPackage = { entryPath: string; value: unknown };
+
+/**
+ * npm 安装（全局或本地）普通情况下由 Node 解析：npm 会把可选包提升到任意祖先
+ * node_modules，所以解析必须从包自己的 package.json 出发。仓库检出（开发 / CI /
+ * 发布前的 runtime 准备）没有安装这一步，此时按约定找 platform-packages/<dir>——
+ * 这与平台包发布后的目录布局一一对应，不引入第二套解析规则。
+ */
+export function resolveManagedNiubashPackageEntry(packageName: string, arch: SupportedArch, root = APP_ROOT): LoadedPackage {
+	const require = createRequire(path.join(root, "package.json"));
+	try {
+		return { entryPath: require.resolve(packageName), value: require(packageName) };
+	} catch (error) {
+		const checkoutEntry = path.join(root, "platform-packages", PACKAGE_BY_ARCH[arch].directory, "index.cjs");
+		if (fs.existsSync(checkoutEntry)) return { entryPath: checkoutEntry, value: require(checkoutEntry) };
+		throw error;
+	}
+}
+
+export type ManagedNiubashRuntime = {
+	packageName: string;
+	distributionVersion: string;
+	niubashVersion: string;
+	arch: SupportedArch;
+	runtimeDir: string;
+	shellPath: string;
+};
+
+export type ManagedNiubashResolveOptions = {
+	platform?: string;
+	arch?: string;
+	/** Base for package resolution; tests and the prepare script point it at a checkout root. */
+	root?: string;
+	loadPackage?: (packageName: string, arch: SupportedArch) => LoadedPackage;
+	warn?: (message: string) => void;
+};
+
+function sha256File(filename: string): string {
+	return crypto.createHash("sha256").update(fs.readFileSync(filename)).digest("hex");
+}
+
+function readJson(filename: string): any {
+	const stat = fs.statSync(filename);
+	if (!stat.isFile() || stat.size > 2 * 1024 * 1024) throw new Error(`${path.basename(filename)} is missing or too large`);
+	return JSON.parse(fs.readFileSync(filename, "utf8"));
+}
+
+function samePath(left: string, right: string): boolean {
+	const a = path.resolve(left);
+	const b = path.resolve(right);
+	return process.platform === "win32" ? a.toLowerCase() === b.toLowerCase() : a === b;
+}
+
+function peMachine(filename: string): number {
+	const data = fs.readFileSync(filename);
+	if (data.length < 64 || data[0] !== 0x4d || data[1] !== 0x5a) throw new Error(`${path.basename(filename)} is not a PE executable`);
+	const offset = data.readUInt32LE(0x3c);
+	if (offset + 6 > data.length || data.toString("ascii", offset, offset + 4) !== "PE\0\0") {
+		throw new Error(`${path.basename(filename)} has an invalid PE header`);
+	}
+	return data.readUInt16LE(offset + 4);
+}
+
+function validatePackage(loaded: LoadedPackage, arch: SupportedArch): ManagedNiubashRuntime {
+	const expected = PACKAGE_BY_ARCH[arch];
+	if (!loaded.value || typeof loaded.value !== "object") throw new Error(`${expected.packageName} has no runtime export`);
+	const exported = loaded.value as PackageExport;
+	const packageRoot = path.dirname(path.resolve(loaded.entryPath));
+	const runtimeDir = path.join(packageRoot, "runtime");
+	const shellPath = path.join(runtimeDir, "niu.exe");
+	const manifestPath = path.join(packageRoot, "runtime-manifest.json");
+
+	const checks: Array<[unknown, unknown, string]> = [
+		[exported.schema, 1, "export schema"],
+		[exported.packageName, expected.packageName, "export package name"],
+		[exported.distributionVersion, DISTRIBUTION_VERSION, "export distribution version"],
+		[exported.niubashVersion, NIUBASH_VERSION, "export niubash version"],
+		[exported.platform, "win32", "export platform"],
+		[exported.arch, arch, "export architecture"],
+	];
+	for (const [actual, wanted, label] of checks) {
+		if (actual !== wanted) throw new Error(`${label} mismatch`);
+	}
+	if (typeof exported.runtimeDir !== "string" || !samePath(exported.runtimeDir, runtimeDir)) throw new Error("runtime directory escapes its package");
+	if (typeof exported.shellPath !== "string" || !samePath(exported.shellPath, shellPath)) throw new Error("shell path escapes its package");
+	if (typeof exported.manifestPath !== "string" || !samePath(exported.manifestPath, manifestPath)) throw new Error("manifest path escapes its package");
+
+	const packageInfo = readJson(path.join(packageRoot, "package.json"));
+	if (packageInfo.name !== expected.packageName || packageInfo.version !== DISTRIBUTION_VERSION) throw new Error("package identity mismatch");
+	if (packageInfo.os?.length !== 1 || packageInfo.os[0] !== "win32") throw new Error("package OS restriction mismatch");
+	if (packageInfo.cpu?.length !== 1 || packageInfo.cpu[0] !== arch) throw new Error("package CPU restriction mismatch");
+
+	const manifest = readJson(manifestPath);
+	if (manifest.schema !== 1
+		|| manifest.source?.repository !== SOURCE_REPOSITORY
+		|| manifest.source?.tag !== SOURCE_TAG
+		|| manifest.source?.asset !== expected.asset
+		|| manifest.source?.sha256 !== expected.assetSha256) {
+		throw new Error("runtime provenance mismatch");
+	}
+	if (!manifest.files || typeof manifest.files !== "object" || Array.isArray(manifest.files)) throw new Error("runtime file manifest is missing");
+	const files = Object.entries(manifest.files) as Array<[string, unknown]>;
+	if (files.length < 300 || files.length > 1000) throw new Error(`runtime file count is invalid (${files.length})`);
+	for (const [relative, digest] of files) {
+		if (!relative || relative.includes("\\") || path.posix.isAbsolute(relative) || /^[A-Za-z]:/.test(relative) || relative.split("/").includes("..")) {
+			throw new Error(`unsafe runtime path: ${relative}`);
+		}
+		if (typeof digest !== "string" || !/^[a-f0-9]{64}$/.test(digest)) throw new Error(`invalid runtime hash: ${relative}`);
+		const filename = path.join(runtimeDir, ...relative.split("/"));
+		if (!fs.statSync(filename).isFile()) throw new Error(`runtime file is missing: ${relative}`);
+		if (sha256File(filename) !== digest) throw new Error(`runtime file failed integrity check: ${relative}`);
+	}
+	for (const required of ["niu.exe", "winuxcmd/usr/bin/winuxcmd.exe", "bundles/oh-my-niu/bundle.toml"]) {
+		if (!(required in manifest.files)) throw new Error(`runtime file is missing: ${required}`);
+	}
+	for (const executable of [shellPath, path.join(runtimeDir, "winuxcmd", "usr", "bin", "winuxcmd.exe")]) {
+		if (peMachine(executable) !== expected.machine) throw new Error(`${path.basename(executable)} architecture mismatch`);
+	}
+	for (const [name, digest] of Object.entries(LICENSE_HASHES)) {
+		if (sha256File(path.join(packageRoot, "licenses", name)) !== digest) throw new Error(`license integrity check failed: ${name}`);
+	}
+
+	return Object.freeze({
+		packageName: expected.packageName,
+		distributionVersion: DISTRIBUTION_VERSION,
+		niubashVersion: NIUBASH_VERSION,
+		arch,
+		runtimeDir,
+		shellPath,
+	});
+}
+
+function reasonOf(error: unknown, packageName: string): string {
+	if ((error as NodeJS.ErrnoException | undefined)?.code === "MODULE_NOT_FOUND") return `${packageName} is not installed`;
+	return error instanceof Error ? error.message : String(error);
+}
+
+/** Resolve and fully validate the platform package. Failures deliberately fall back to Pi's normal Bash. */
+export function resolveManagedNiubash(options: ManagedNiubashResolveOptions = {}): ManagedNiubashRuntime | null {
+	const platform = options.platform ?? process.platform;
+	const arch = options.arch ?? process.arch;
+	if (platform !== "win32") return null;
+	const expected = PACKAGE_BY_ARCH[arch as SupportedArch];
+	if (!expected) {
+		(options.warn ?? console.warn)(`[piweb] Managed niubash does not support Windows ${arch}; using Pi's configured/default Bash.`);
+		return null;
+	}
+	const supported = arch as SupportedArch;
+	try {
+		const loaded = options.loadPackage
+			? options.loadPackage(expected.packageName, supported)
+			: resolveManagedNiubashPackageEntry(expected.packageName, supported, options.root);
+		return validatePackage(loaded, supported);
+	} catch (error) {
+		(options.warn ?? console.warn)(
+			`[piweb] Managed niubash is unavailable (${reasonOf(error, expected.packageName)}); using Pi's configured/default Bash. `
+			+ "Reinstall @rexvane/piweb to restore the bundled Windows shell (`npm run prepare:niubash` in a checkout).",
+		);
+		return null;
+	}
+}
+
+const globalForManagedNiubash = globalThis as typeof globalThis & {
+	__piWebManagedNiubash?: { resolved: ManagedNiubashRuntime | null };
+};
+
+function defaultRuntime(): ManagedNiubashRuntime | null {
+	if (!globalForManagedNiubash.__piWebManagedNiubash) {
+		globalForManagedNiubash.__piWebManagedNiubash = { resolved: resolveManagedNiubash() };
+	}
+	return globalForManagedNiubash.__piWebManagedNiubash.resolved;
+}
+
+/** Same-name custom tool intentionally replaces Pi's built-in bash only inside PiWeb sessions. */
+export function createManagedNiubashTools(cwd: string, options?: ManagedNiubashResolveOptions): ToolDefinition[] {
+	const runtime = options ? resolveManagedNiubash(options) : defaultRuntime();
+	return runtime ? [createBashToolDefinition(cwd, { shellPath: runtime.shellPath }) as ToolDefinition] : [];
+}

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

@@ -19,6 +19,15 @@ const SYNTHETIC_PREFIXES = ["<command-name>", "<command-message>", "<local-comma
 
 const isSynthetic = (text: string) => SYNTHETIC_PREFIXES.some((prefix) => text.startsWith(prefix));
 
+/**
+ * 子代理的转写不能当作会话：Claude Code 把它们放在
+ * `<项目>/<会话 uuid>/subagents/` 下（含更深的 workflows/wf_<id>/ 层，本机 236 个子代理文件 vs 70 个主会话）。
+ * 那是主代理派出去的活，不是你在用的那条对话。
+ * 这些文件里的记录全是 isSidechain，本来也会被 isMessageLine 挡掉，
+ * 这里再按路径显式排除一次：意图更清楚，也不怕以后格式变化。
+ */
+const isSubagentTranscript = (file: string) => file.split(/[/\\]/).includes("subagents");
+
 function isMessageLine(record: Record<string, unknown>): boolean {
 	return (record.type === "user" || record.type === "assistant") && record.isSidechain !== true && Boolean(record.message);
 }
@@ -115,6 +124,7 @@ export const claudeSource: ImportSourceModule = {
 		const out: ExternalSessionSummary[] = [];
 		for (const { file, mtime } of candidates) {
 			if (reachedLimit(out.length, limit)) break; // 只读最近的若干条：后面的文件根本不打开
+			if (isSubagentTranscript(file)) continue; // 主代理派给子代理的活不算会话
 			let head: string;
 			try {
 				head = await readHead(file);
@@ -150,6 +160,7 @@ export const claudeSource: ImportSourceModule = {
 		const skipped: string[] = [];
 		let sidechains = 0;
 		let synthetic = 0;
+		let runtimeContext = 0;
 		let projectPath = summary.projectPath;
 		let model = summary.model;
 		let provider: string | undefined;
@@ -159,6 +170,12 @@ export const claudeSource: ImportSourceModule = {
 				sidechains += 1;
 				continue;
 			}
+			// Claude 的 attachment/system 是技能列表、token 提醒、环境快照等运行时上下文；
+			// pi 会按目标工作区生成自己的版本，不能伪装成真人 user 消息，但要在报告中明确告知。
+			if (record.type === "attachment" || record.type === "system") {
+				runtimeContext += 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;
@@ -196,9 +213,12 @@ export const claudeSource: ImportSourceModule = {
 			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");
+				const nonText = 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 });
+					entries.push({ type: "message", message: { role: "user", content: [...nonText, { type: "text", text: plain }], timestamp } as ImportedMessage });
+				} else if (!plain && nonText.length) {
+					// 图片可以是用户消息的全部内容，不能因为没有文字就把整轮丢掉
+					entries.push({ type: "message", message: { role: "user", content: nonText, timestamp } as ImportedMessage });
 				} else if (plain) {
 					synthetic += 1;
 				}
@@ -213,6 +233,7 @@ export const claudeSource: ImportSourceModule = {
 
 		if (sidechains) skipped.push(`跳过 ${sidechains} 条侧链（子代理）记录`);
 		if (synthetic) skipped.push(`跳过 ${synthetic} 条合成输入（命令回显/系统提醒）`);
+		if (runtimeContext) skipped.push(`跳过 ${runtimeContext} 条源工具运行时上下文（pi 会按当前工作区重新生成）`);
 		if (!entries.some((entry) => entry.type === "message")) return null;
 		return { summary: { ...summary, projectPath, model, provider }, entries, skipped };
 	},