@rexvane/piweb 0.3.16 → 0.3.17

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

@@ -7,10 +7,10 @@
  */
 import path from "node:path";
 import fs from "node:fs/promises";
-import { eachJsonLine, listFiles, readHead, readTail, reachedLimit, statMtime } from "./files";
+import { eachJsonLine, listFiles, readHead, reachedLimit, sortByRecency } from "./files";
 import { codexRoot } from "./paths";
 import type { ExternalSessionSummary, ImportedBlock, ImportedEntry, ImportedSession, ImportSourceModule, ScanOptions } from "./types";
-import { cleanTitle, compactBlocks, dataUrlImageBlock, outputBlocks, parseArguments, textBlock, toEpochMs } from "./types";
+import { cleanTitle, compactBlocks, outputBlocks, parseArguments, textBlock, toEpochMs } from "./types";
 
 const ROOT = codexRoot;
 
@@ -80,7 +80,6 @@ function messageBlocks(payload: Record<string, 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 === "input_image") return [dataUrlImageBlock(block.image_url, block.mime_type)];
 		if (typeof block?.text === "string") return [textBlock(block.text)];
 		return [];
 	}));
@@ -96,17 +95,6 @@ function reasoningText(payload: Record<string, unknown>): ImportedBlock | null {
 	return null;
 }
 
-/** 文件 mtime 可能因复制/恢复失真；Codex 每行自带时间，末尾记录才是权威的最近活动时间 */
-function latestTimestamp(records: Record<string, unknown>[]): number | undefined {
-	let latest: number | undefined;
-	for (const record of records) {
-		const payload = record.payload as Record<string, unknown> | undefined;
-		const at = toEpochMs(record.timestamp) ?? toEpochMs(payload?.timestamp);
-		if (at !== undefined) latest = Math.max(latest ?? at, at);
-	}
-	return latest;
-}
-
 /** 标题：Codex 不写标题字段，用首条真人用户消息（rollout 头几十行里就有） */
 function titleFrom(records: Record<string, unknown>[]): string | undefined {
 	for (const record of records) {
@@ -125,22 +113,10 @@ export const codexSource: ImportSourceModule = {
 
 	async scan(options?: ScanOptions): Promise<ExternalSessionSummary[]> {
 		const limit = options?.limit ?? 0;
-		const files = await listFiles(ROOT(), { match: (name) => name.startsWith("rollout-") && name.endsWith(".jsonl") });
-		// 只读每个文件末尾 64KB 就能按记录时间正确排序；不能先按 mtime 截断，否则复制过的旧文件会挤掉真正最近的会话。
-		const candidates = await Promise.all(files.map(async (file) => {
-			const mtime = await statMtime(file);
-			try {
-				const updatedAt = latestTimestamp([...eachJsonLine(await readTail(file))]);
-				return { file, mtime, updatedAt: updatedAt ?? mtime };
-			} catch {
-				return { file, mtime, updatedAt: mtime };
-			}
-		}));
-		candidates.sort((left, right) => (right.updatedAt ?? 0) - (left.updatedAt ?? 0));
-
+		const candidates = await sortByRecency(await listFiles(ROOT(), { match: (name) => name.startsWith("rollout-") && name.endsWith(".jsonl") }));
 		const out: ExternalSessionSummary[] = [];
-		for (const { file, mtime, updatedAt } of candidates) {
-			if (reachedLimit(out.length, limit)) break;
+		for (const { file, mtime } of candidates) {
+			if (reachedLimit(out.length, limit)) break; // 只读最近的若干条
 			let head: string;
 			try {
 				head = await readHead(file);
@@ -160,7 +136,7 @@ export const codexSource: ImportSourceModule = {
 				model: meta.model,
 				provider: meta.provider,
 				createdAt: meta.createdAt ?? mtime,
-				updatedAt,
+				updatedAt: mtime,
 				location: file,
 			});
 		}
@@ -178,18 +154,11 @@ export const codexSource: ImportSourceModule = {
 		const skipped: string[] = [];
 		let synthetic = 0;
 		let reasoningSkipped = 0;
-		let runtimeContext = 0;
 		let meta: Meta = { cwd: summary.projectPath, createdAt: summary.createdAt, model: summary.model, provider: summary.provider };
 
 		for (const record of eachJsonLine(text)) {
 			if (record.type === "session_meta") {
 				meta = { ...meta, ...metaFrom([record]) };
-				const payload = record.payload as Record<string, unknown> | undefined;
-				if (payload?.base_instructions) runtimeContext += 1;
-				continue;
-			}
-			if (record.type === "world_state" || record.type === "turn_context") {
-				runtimeContext += 1;
 				continue;
 			}
 			if (record.type !== "response_item") continue;
@@ -200,15 +169,11 @@ export const codexSource: ImportSourceModule = {
 			switch (payload.type) {
 				case "message": {
 					const role = payload.role;
-					if (role === "developer") {
-						runtimeContext += 1; // 系统/开发者上下文由 pi 按当前工作区重新生成
-						continue;
-					}
+					if (role === "developer") continue; // 系统提示，不进对话
 					const blocks = messageBlocks(payload);
 					const plain = blocks.filter((block) => block.type === "text").map((block) => block.text).join("\n").trim();
 					if (role === "user") {
-						// 只有图片的真人输入也必须保留；纯文本的环境/AGENTS 注入仍不冒充用户消息
-						if (!blocks.length || (plain && isSynthetic(plain))) {
+						if (!plain || isSynthetic(plain)) {
 							synthetic += 1;
 							continue;
 						}
@@ -252,7 +217,6 @@ export const codexSource: ImportSourceModule = {
 
 		if (synthetic) skipped.push(`跳过 ${synthetic} 条合成输入`);
 		if (reasoningSkipped) skipped.push(`跳过 ${reasoningSkipped} 条仅含加密内容的推理记录`);
-		if (runtimeContext) skipped.push(`跳过 ${runtimeContext} 条源工具运行时上下文（pi 会按当前工作区重新生成）`);
 		if (!entries.some((entry) => entry.type === "message")) return null;
 		return { summary: { ...summary, ...meta, projectPath: meta.cwd, model: meta.model, provider: meta.provider }, entries, skipped };
 	},

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

@@ -13,20 +13,6 @@ export async function readHead(file: string, bytes = 64 * 1024): Promise<string>
 	}
 }
 
-/** 读文件末尾若干字节；首行可能是被截断的半行，JSONL 解析时会自然跳过 */
-export async function readTail(file: string, bytes = 64 * 1024): Promise<string> {
-	const handle = await fs.open(file, "r");
-	try {
-		const size = (await handle.stat()).size;
-		const length = Math.min(size, bytes);
-		const buffer = Buffer.alloc(length);
-		const { bytesRead } = await handle.read(buffer, 0, length, size - length);
-		return buffer.subarray(0, bytesRead).toString("utf8");
-	} finally {
-		await handle.close();
-	}
-}
-
 /** 逐行解析 JSONL；单行坏掉只跳过该行，不放弃整个文件 */
 export function* eachJsonLine(text: string): Generator<Record<string, unknown>> {
 	for (const line of text.split("\n")) {

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

@@ -6,10 +6,10 @@
  */
 import path from "node:path";
 import fs from "node:fs/promises";
-import { eachJsonLine, listFiles, readHead, reachedLimit, statMtime } from "./files";
+import { eachJsonLine, listFiles, readHead, reachedLimit, sortByRecency } from "./files";
 import { grokRoot } from "./paths";
 import type { ExternalSessionSummary, ImportedBlock, ImportedEntry, ImportedSession, ImportSourceModule, ScanOptions } from "./types";
-import { cleanTitle, compactBlocks, dataUrlImageBlock, outputBlocks, parseArguments, textBlock, toEpochMs } from "./types";
+import { cleanTitle, compactBlocks, outputBlocks, parseArguments, textBlock, toEpochMs } from "./types";
 
 const ROOT = grokRoot;
 
@@ -30,10 +30,10 @@ function decodeProjectDir(name: string): string | undefined {
 function importable(records: Record<string, unknown>[]): boolean {
 	for (const record of records) {
 		if (record.type === "assistant" || record.type === "tool_result") return true;
-		if (record.type === "reasoning" && reasoningText(record.summary)) return true;
+		if (record.type === "reasoning" && typeof record.summary === "string" && record.summary.trim()) return true;
 		if (record.type !== "user" || record.synthetic_reason) continue;
 		const blocks = userBlocks(record.content);
-		if (blocks.some((block) => block.type === "image" || (block.type === "text" && block.text.replace(/<[^>]+>/g, "").trim()))) return true;
+		if (blocks.some((block) => block.type === "text" && block.text.replace(/<[^>]+>/g, "").trim())) return true;
 	}
 	return false;
 }
@@ -46,69 +46,41 @@ async function hasRealMessage(history: string): Promise<boolean> {
 	}
 }
 
-/** user 的 content 可能是字符串、文本块或 data URL 图片块 */
-function userBlocks(content: unknown): ImportedBlock[] {
+/** user 的 content 可能是字符串或块数组 */function userBlocks(content: unknown): ImportedBlock[] {
 	if (typeof content === "string") return compactBlocks([textBlock(content)]);
 	if (!Array.isArray(content)) return [];
 	return compactBlocks(content.flatMap((raw): Array<ImportedBlock | null> => {
 		if (typeof raw === "string") return [textBlock(raw)];
 		const block = raw as Record<string, unknown>;
 		if (typeof block?.text === "string") return [textBlock(block.text)];
-		if (block?.type === "image") return [dataUrlImageBlock(block.url, block.mime ?? block.mimeType)];
 		return [];
 	}));
 }
 
-/** Grok 新版把 reasoning.summary 从字符串改成了 summary_text 块数组；两代格式都要读 */
-function reasoningText(summary: unknown): string {
-	if (typeof summary === "string") return summary.trim();
-	if (!Array.isArray(summary)) return "";
-	return summary
-		.map((item) => {
-			if (typeof item === "string") return item;
-			const block = item as { text?: unknown; summary_text?: unknown };
-			return typeof block?.text === "string" ? block.text : typeof block?.summary_text === "string" ? block.summary_text : "";
-		})
-		.filter(Boolean)
-		.join("\n")
-		.trim();
-}
-
 export const grokSource: ImportSourceModule = {
 	id: "grok",
 
 	async scan(options?: ScanOptions): Promise<ExternalSessionSummary[]> {
+		// 先按 chat_history 的 mtime 排序（只 stat，不读内容），再从最近往下读：
+		// summary.json 里有标题/模型/时间/消息数，读它即可，正文只在确认有真实对话时碰一下头部
 		const limit = options?.limit ?? 0;
 		const files = await listFiles(ROOT(), { match: (name) => name === "summary.json" });
-		// summary.updated_at / last_active_at 是 Grok 的权威活动时间。必须先按它排序再 LIMIT，
-		// 不能用复制、恢复备份时会变化的 chat_history mtime 决定“最近 15 条”。
-		const candidates = (await Promise.all(files.map(async (summaryFile) => {
-			const dir = path.dirname(summaryFile);
-			const history = path.join(dir, "chat_history.jsonl");
+		const candidates = await sortByRecency(files.map((file) => path.join(path.dirname(file), "chat_history.jsonl")));
+		const out: ExternalSessionSummary[] = [];
+		for (const { file: history, mtime } of candidates) {
+			if (reachedLimit(out.length, limit)) break; // 只读最近的若干条
+			const dir = path.dirname(history);
+			let summary: Record<string, unknown>;
 			try {
-				const summary = JSON.parse(await fs.readFile(summaryFile, "utf8")) as Record<string, unknown>;
-				const mtime = await statMtime(history);
-				if (mtime === undefined) return null;
-				return {
-					dir,
-					history,
-					summary,
-					mtime,
-					updatedAt: toEpochMs(summary.updated_at ?? summary.last_active_at) ?? mtime,
-				};
+				summary = JSON.parse(await fs.readFile(path.join(dir, "summary.json"), "utf8")) as Record<string, unknown>;
 			} catch {
-				return null;
+				continue;
 			}
-		}))).filter((candidate): candidate is NonNullable<typeof candidate> => candidate !== null)
-			.sort((left, right) => right.updatedAt - left.updatedAt);
-
-		const out: ExternalSessionSummary[] = [];
-		for (const { dir, history, summary, mtime, updatedAt } of candidates) {
-			if (reachedLimit(out.length, limit)) break;
+			if (mtime === undefined) continue; // 没有正文就没什么可导
 			const info = summary.info as Record<string, unknown> | undefined;
-			// num_messages 包含 trace/内部事件；num_chat_messages 才对应 chat_history 的会话记录数
-			const numMessages = Number(summary.num_chat_messages ?? summary.num_messages);
+			const numMessages = Number(summary.num_messages ?? summary.num_chat_messages);
 			// 子代理会话（grok 的 spawn_subagent：subagent / subagent_fork / subagent_resume，本机 24 条）
+			// 以及它们的派生：agent_name 是 general-purpose / explore 之类，不是你在用的那条对话
 			if (typeof summary.session_kind === "string" && summary.session_kind.startsWith("subagent")) continue;
 			if (numMessages === 0) continue; // 开了没用的空会话
 			// 只有系统提示与合成提醒（system_reminder）的会话读不出对话，别列进列表
@@ -120,7 +92,7 @@ export const grokSource: ImportSourceModule = {
 				projectPath: typeof info?.cwd === "string" ? info.cwd : decodeProjectDir(path.basename(path.dirname(dir))),
 				model: typeof summary.current_model_id === "string" ? summary.current_model_id : undefined,
 				createdAt: toEpochMs(summary.created_at) ?? mtime,
-				updatedAt,
+				updatedAt: toEpochMs(summary.updated_at ?? summary.last_active_at) ?? mtime,
 				...(Number.isFinite(numMessages) ? { messageCount: numMessages } : {}),
 				location: history,
 			});
@@ -139,18 +111,17 @@ export const grokSource: ImportSourceModule = {
 		const skipped: string[] = [];
 		let encryptedReasoning = 0;
 		let synthetic = 0;
-		let runtimeContext = 0;
 		let model = summary.model;
 
 		for (const record of eachJsonLine(text)) {
 			const timestamp = toEpochMs(record.timestamp ?? record.time ?? record.created_at) ?? summary.createdAt ?? Date.now();
 			switch (record.type) {
 				case "system":
-					runtimeContext += 1;
-					continue; // 系统提示由 pi 按目标工作区重新生成，不冒充用户消息
+					continue; // 系统提示不进对话
 				case "user": {
 					const blocks = userBlocks(record.content);
-					if (record.synthetic_reason || !blocks.length) {
+					const plain = blocks.map((block) => (block.type === "text" ? block.text : "")).join("\n").trim();
+					if (record.synthetic_reason || !plain) {
 						synthetic += 1;
 						continue;
 					}
@@ -174,8 +145,8 @@ export const grokSource: ImportSourceModule = {
 					continue;
 				}
 				case "reasoning": {
-					const text = reasoningText(record.summary);
-					if (text) entries.push({ type: "message", message: { role: "assistant", content: [{ type: "thinking", thinking: text }], timestamp, ...(model ? { model } : {}) } });
+					const text = typeof record.summary === "string" ? record.summary : "";
+					if (text.trim()) entries.push({ type: "message", message: { role: "assistant", content: [{ type: "thinking", thinking: text }], timestamp, ...(model ? { model } : {}) } });
 					else encryptedReasoning += 1; // 加密推理无正文可导：计数后汇总成一行，不要刷屏
 					continue;
 				}
@@ -192,7 +163,6 @@ export const grokSource: ImportSourceModule = {
 
 		if (synthetic) skipped.push(`跳过 ${synthetic} 条合成输入`);
 		if (encryptedReasoning) skipped.push(`跳过 ${encryptedReasoning} 条仅含加密内容的推理记录`);
-		if (runtimeContext) skipped.push(`跳过 ${runtimeContext} 条源工具运行时上下文（pi 会按当前工作区重新生成）`);
 		if (!entries.some((entry) => entry.type === "message")) return null;
 		return { summary: { ...summary, model }, entries, skipped };
 	},

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

@@ -18,7 +18,6 @@ import { dshSource } from "./dsh";
 import { zcodeSource } from "./zcode";
 import { opencodeSource } from "./opencode";
 import { importedKey, listImportedKeys, findImported, writeImportedSession } from "./writer";
-import { withImportLock } from "./lock";
 
 export const IMPORT_SOURCE_MODULES: Record<ImportSource, ImportSourceModule> = {
 	claude: claudeSource,
@@ -147,10 +146,6 @@ async function oversize(location: string): Promise<boolean> {
 }
 
 export async function importSessions(items: ImportSelection[], options: ImportOptions): Promise<ImportReport> {
-	return withImportLock(options.agentDir, () => importSessionsLocked(items, options));
-}
-
-async function importSessionsLocked(items: ImportSelection[], options: ImportOptions): Promise<ImportReport> {
 	const results: ImportOutcome[] = [];
 	const workspaces = new Set<string>();
 	const fallback = (await isDirectory(options.fallbackCwd)) ? path.resolve(options.fallbackCwd as string) : undefined;

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

@@ -121,18 +121,6 @@ export function compactBlocks(blocks: Array<ImportedBlock | null | undefined>):
 	return blocks.filter((block): block is ImportedBlock => Boolean(block));
 }
 
-/** 外部工具常把图片内联成 data URL；只接受 base64，避免把本地路径或远程 URL 塞进 pi 会话 */
-export function dataUrlImageBlock(value: unknown, explicitMime?: unknown): ImportedBlock | null {
-	if (typeof value !== "string") return null;
-	const match = /^data:([^;,]+);base64,(.+)$/s.exec(value);
-	if (!match) return null;
-	return {
-		type: "image",
-		data: match[2],
-		mimeType: typeof explicitMime === "string" && explicitMime.trim() ? explicitMime : match[1],
-	};
-}
-
 /** 工具返回值可能是字符串、对象或数组，统一成内容块 */
 export function outputBlocks(value: unknown): ImportedBlock[] {
 	if (typeof value === "string") return compactBlocks([textBlock(value)]);

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

@@ -235,14 +235,9 @@ export async function writeImportedSession(session: ImportedSession, options: Wr
 	const dir = path.join(options.agentDir, "sessions", encodeSessionDir(options.cwd));
 	await fs.mkdir(dir, { recursive: true });
 	const target = path.join(dir, importedFileName(summary.source, summary.externalId, createdAt));
-	const temporary = `${target}.${randomUUID()}.tmp`;
-	try {
-		await fs.writeFile(temporary, `${lines.join("\n")}\n`, { encoding: "utf8", flag: "wx" });
-		// Publish a complete file atomically without replacing an existing imported session.
-		await fs.link(temporary, target);
-	} finally {
-		await fs.rm(temporary, { force: true });
-	}
+	const temporary = `${target}.${process.pid}.tmp`;
+	await fs.writeFile(temporary, `${lines.join("\n")}\n`, "utf8");
+	await fs.rename(temporary, target);
 	return { path: target, messageCount: messages.messages.length, skipped };
 }
 

package/src/lib/skills-service.ts

@@ -33,8 +33,7 @@ async function toComparablePath(target: string): Promise<string> {
 	} catch {
 		resolved = path.resolve(target); // 路径还不存在（如待创建的技能目录）：退化成普通规范化
 	}
-	const normalized = resolved.replace(/\\/g, "/").replace(/\/+$/, "");
-	return process.platform === "win32" ? normalized.toLowerCase() : normalized;
+	return resolved.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
 }
 
 interface ScopeContext {
@@ -58,10 +57,10 @@ const within = (target: string, root: string) => target.startsWith(`${root}/`);
 
 async function classifyScope(filePath: string, context: ScopeContext): Promise<SkillView["scope"]> {
 	const norm = await toComparablePath(filePath);
-	if (norm.includes("/node_modules/")) return "package";
 	if (within(norm, context.agentDir) || within(norm, `${context.home}/.agents`) || within(norm, `${context.home}/.pi`))
 		return "global";
 	if (context.cwd && within(norm, context.cwd)) return "project";
+	if (norm.includes("/node_modules/")) return "package";
 	return "package";
 }
 
@@ -122,7 +121,7 @@ export async function setSkillDisabled(filePath: string, disabled: boolean, cwd?
 	await fs.writeFile(authorized, next, "utf8");
 	// 就地重载加载器并让活跃会话重建系统提示（技能列表在系统提示里）；全局技能影响所有目录
 	await reloadAllLoaders();
-	const context = await scopeContext(cwd ?? process.cwd());
+	const context = await scopeContext(cwd);
 	const scope = await classifyScope(authorized, context);
 	await reloadSessionsForCwd(scope === "project" ? cwd : undefined);
 	return { changed: true };
@@ -138,23 +137,17 @@ export async function readSkillFile(filePath: string, cwd?: string): Promise<str
 export async function deleteSkill(filePath: string, cwd?: string): Promise<{ removed: string }> {
 	const skills = await listSkills(cwd);
 	const authorized = await resolveDiscoveredPath(filePath, skills.map((skill) => skill.filePath));
-	const context = await scopeContext(cwd ?? process.cwd());
+	const context = await scopeContext(cwd);
 	if ((await classifyScope(authorized, context)) === "package") {
 		throw new Error("package-managed skill: disable it instead (it is reinstalled with the package)");
 	}
 	const skillDir = path.dirname(authorized);
+	// 只删技能目录本身，不能误删父目录（全局技能目录 ~/.pi/agent/skills、项目 .agents/skills 等）
 	const normalizedSkillDir = await toComparablePath(skillDir);
-	const workspace = cwd ?? process.cwd();
-	const roots = [path.parse(skillDir).root, getAgentDir(), os.homedir(), workspace];
-	for (const base of [getAgentDir(), os.homedir(), workspace]) {
-		for (const relative of ["skills", "web-skills", ".git", ".agents", ".agents/skills", ".pi", ".pi/skills", ".pi/agent", ".pi/agent/skills"]) {
-			roots.push(path.join(base, relative));
-		}
-	}
-	const protectedRoots = await Promise.all(roots.map(toComparablePath));
-	// A discovered root-level SKILL.md never authorizes deleting its collection or workspace.
-	if (protectedRoots.some((root) => root === normalizedSkillDir || within(root, normalizedSkillDir))) {
-		throw new Error("refusing to delete protected skill collection or workspace root");
+	const knownRoots = [`${context.agentDir}/skills`, `${context.agentDir}/web-skills`];
+	if (!knownRoots.includes(normalizedSkillDir)) {
+		// 非已知根：项目内技能目录，至少确认 SKILL.md 直接位于其下且目录名非空
+		if (path.basename(skillDir) === "") throw new Error("refusing to delete workspace root");
 	}
 	await fs.rm(skillDir, { recursive: true, force: true });
 	await reloadAllLoaders();

package/src/lib/theme.ts

@@ -5,8 +5,6 @@
  */
 
 export type PebrelTheme =
-	| 'piweb'
-	| 'ocean-ink'
 	| 'silver-steel'
 	| 'limestone-coal'
 	| 'linen-moss'
@@ -17,61 +15,7 @@ export type PebrelTheme =
 /** dsh 的 THEME_PREFERENCES：浅色/深色/跟随系统 */
 export type ThemeMode = 'light' | 'dark' | 'system';
 
-export interface ThemeMeta {
-	id: PebrelTheme;
-	name: string;
-	description: string;
-	colors: [string, string];
-}
-
-export const THEME_CATALOG: ThemeMeta[] = [
-	{
-		id: 'piweb',
-		name: 'PiWeb · 工作台',
-		description: '粘土薄荷原装配方',
-		colors: ['#34D399', '#A7F3D0'],
-	},
-	{
-		id: 'ocean-ink',
-		name: '海与墨',
-		description: '湛蓝深邃与清爽青靛',
-		colors: ['#38BDF8', '#0284C7'],
-	},
-	{
-		id: 'silver-steel',
-		name: '银钢',
-		description: '坚实质感与精密中性',
-		colors: ['#E2E8F0', '#475569'],
-	},
-	{
-		id: 'limestone-coal',
-		name: '石灰与煤炭',
-		description: '暖橙炭黑微拟物风格',
-		colors: ['#FB923C', '#1E293B'],
-	},
-	{
-		id: 'linen-moss',
-		name: '亚麻与苔绿',
-		description: '自然植物纤维温润感',
-		colors: ['#FFDCC5', '#006C4B'],
-	},
-	{
-		id: 'nord-paper',
-		name: '北欧纸墨',
-		description: '哑光书纸触觉明度',
-		colors: ['#F6FAFE', '#00668A'],
-	},
-	{
-		id: 'pebrel',
-		name: 'Pebrel',
-		description: '柔和薰衣草紫与鹅卵石质感',
-		colors: ['#818CF8', '#EEF2FF'],
-	},
-];
-
 export const PEBREL_THEME_IDS: PebrelTheme[] = [
-	'piweb',
-	'ocean-ink',
 	'dsh',
 	'silver-steel',
 	'limestone-coal',
@@ -82,12 +26,11 @@ export const PEBREL_THEME_IDS: PebrelTheme[] = [
 
 export const THEME_MODES: ThemeMode[] = ['light', 'dark', 'system'];
 
-export const DEFAULT_PEBREL_THEME: PebrelTheme = 'piweb';
+export const DEFAULT_PEBREL_THEME: PebrelTheme = 'dsh';
 export const DEFAULT_THEME_MODE: ThemeMode = 'system';
 
 const THEME_KEY = 'piweb.pebrelTheme';
 const MODE_KEY = 'piweb.theme';
-const DESIGN_VERSION_KEY = 'piweb.designVersion';
 
 export function isPebrelTheme(value: string | null): value is PebrelTheme {
 	return !!value && (PEBREL_THEME_IDS as string[]).includes(value);
@@ -101,11 +44,6 @@ export function loadPebrelTheme(): PebrelTheme {
 	if (typeof window === 'undefined') return DEFAULT_PEBREL_THEME;
 	try {
 		const saved = localStorage.getItem(THEME_KEY);
-		if (saved === 'dsh' && localStorage.getItem(DESIGN_VERSION_KEY) !== '1') {
-			localStorage.setItem(THEME_KEY, 'piweb');
-			localStorage.setItem(DESIGN_VERSION_KEY, '1');
-			return 'piweb';
-		}
 		if (isPebrelTheme(saved)) return saved;
 	} catch {
 		/* ignore */
@@ -141,17 +79,13 @@ function applyLightDark(mode: ThemeMode): void {
 	if (isDark) {
 		root.setAttribute('data-ds-dark-theme', '');
 		root.removeAttribute('data-ds-light-theme');
-		root.classList.add('dark');
 		body?.setAttribute('data-ds-dark-theme', '');
 		body?.removeAttribute('data-ds-light-theme');
-		body?.classList.add('dark');
 	} else {
 		root.removeAttribute('data-ds-dark-theme');
 		root.setAttribute('data-ds-light-theme', '');
-		root.classList.remove('dark');
 		body?.removeAttribute('data-ds-dark-theme');
 		body?.setAttribute('data-ds-light-theme', '');
-		body?.classList.remove('dark');
 	}
 	root.style.colorScheme = isDark ? 'dark' : 'light';
 }
@@ -192,7 +126,6 @@ export function applyPebrelTheme(theme: PebrelTheme, mode?: ThemeMode): void {
 	try {
 		localStorage.setItem(THEME_KEY, theme);
 		localStorage.setItem(MODE_KEY, effectiveMode);
-		localStorage.setItem(DESIGN_VERSION_KEY, '1');
 	} catch {
 		/* ignore */
 	}

package/src/lib/trajectory.ts

@@ -14,7 +14,6 @@ export function toTrajTokens(u: any): TrajTokens | undefined {
 	if (typeof u.output === "number") t.output = u.output;
 	if (typeof u.cacheRead === "number") t.cacheRead = u.cacheRead;
 	if (typeof u.cacheWrite === "number") t.cacheWrite = u.cacheWrite;
-	if (typeof u.totalTokens === "number") t.totalTokens = u.totalTokens;
 	return Object.keys(t).length ? t : undefined;
 }