@rexvane/piweb 0.3.13 → 0.3.15

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, reachedLimit, sortByRecency } from "./files";
+import { eachJsonLine, listFiles, readHead, readTail, reachedLimit, statMtime } from "./files";
 import { codexRoot } from "./paths";
 import type { ExternalSessionSummary, ImportedBlock, ImportedEntry, ImportedSession, ImportSourceModule, ScanOptions } from "./types";
-import { cleanTitle, compactBlocks, outputBlocks, parseArguments, textBlock, toEpochMs } from "./types";
+import { cleanTitle, compactBlocks, dataUrlImageBlock, outputBlocks, parseArguments, textBlock, toEpochMs } from "./types";
 
 const ROOT = codexRoot;
 
@@ -37,6 +37,21 @@ interface Meta {
 	createdAt?: number;
 	model?: string;
 	provider?: string;
+	/** true = 这条 rollout 是别的线程派出来的（子代理），不是主对话 */
+	subagent?: boolean;
+}
+
+/**
+ * 子代理线程的判定，依据 session_meta.payload（本机 51 个 rollout 里有 22 个是子代理）：
+ *  - parent_thread_id：它的存在就说明这条线程由另一条线程派生
+ *  - source 是对象（`{"subagent":{…}}`）而主线程是字符串 "cli" / "vscode"
+ *  - thread_source：主线程恒为 "user"，子代理是 "subagent" / "guardian_review"
+ * 三个条件在本机实测完全一致（22 个子代理全部同时命中，29 个主线程一个都不命中）。
+ */
+function isSubagentMeta(payload: Record<string, unknown>): boolean {
+	if (typeof payload.parent_thread_id === "string" && payload.parent_thread_id) return true;
+	if (payload.source && typeof payload.source === "object") return true;
+	return typeof payload.thread_source === "string" && payload.thread_source !== "user";
 }
 
 function metaFrom(records: Record<string, unknown>[]): Meta {
@@ -49,6 +64,7 @@ function metaFrom(records: Record<string, unknown>[]): Meta {
 		meta.createdAt = toEpochMs(payload.timestamp) ?? toEpochMs(record.timestamp);
 		if (typeof payload.model_provider === "string") meta.provider = payload.model_provider;
 		if (typeof payload.model === "string") meta.model = payload.model;
+		if (isSubagentMeta(payload)) meta.subagent = true;
 	}
 	// 模型有时只在 turn_context 里出现
 	for (const record of records) {
@@ -64,6 +80,7 @@ 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 [];
 	}));
@@ -79,6 +96,17 @@ 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) {
@@ -97,10 +125,22 @@ export const codexSource: ImportSourceModule = {
 
 	async scan(options?: ScanOptions): Promise<ExternalSessionSummary[]> {
 		const limit = options?.limit ?? 0;
-		const candidates = await sortByRecency(await listFiles(ROOT(), { match: (name) => name.startsWith("rollout-") && name.endsWith(".jsonl") }));
+		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 out: ExternalSessionSummary[] = [];
-		for (const { file, mtime } of candidates) {
-			if (reachedLimit(out.length, limit)) break; // 只读最近的若干条
+		for (const { file, mtime, updatedAt } of candidates) {
+			if (reachedLimit(out.length, limit)) break;
 			let head: string;
 			try {
 				head = await readHead(file);
@@ -109,6 +149,7 @@ export const codexSource: ImportSourceModule = {
 			}
 			const records = [...eachJsonLine(head)].slice(0, 300);
 			const meta = metaFrom(records);
+			if (meta.subagent) continue; // 主代理派给子代理的活，不算会话
 			const hasMessage = records.some((record) => record.type === "response_item");
 			if (!hasMessage) continue;
 			out.push({
@@ -119,7 +160,7 @@ export const codexSource: ImportSourceModule = {
 				model: meta.model,
 				provider: meta.provider,
 				createdAt: meta.createdAt ?? mtime,
-				updatedAt: mtime,
+				updatedAt,
 				location: file,
 			});
 		}
@@ -137,11 +178,18 @@ 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;
@@ -152,11 +200,15 @@ export const codexSource: ImportSourceModule = {
 			switch (payload.type) {
 				case "message": {
 					const role = payload.role;
-					if (role === "developer") continue; // 系统提示，不进对话
+					if (role === "developer") {
+						runtimeContext += 1; // 系统/开发者上下文由 pi 按当前工作区重新生成
+						continue;
+					}
 					const blocks = messageBlocks(payload);
 					const plain = blocks.filter((block) => block.type === "text").map((block) => block.text).join("\n").trim();
 					if (role === "user") {
-						if (!plain || isSynthetic(plain)) {
+						// 只有图片的真人输入也必须保留；纯文本的环境/AGENTS 注入仍不冒充用户消息
+						if (!blocks.length || (plain && isSynthetic(plain))) {
 							synthetic += 1;
 							continue;
 						}
@@ -200,6 +252,7 @@ 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/dsh.ts

@@ -36,6 +36,11 @@ interface DshHeader {
 	id?: string;
 	cwd?: string;
 	createdAt?: number;
+	/**
+	 * 主代理为 0；> 0 表示这条会话是主代理派给子代理的活（本机 198 个会话里有 55 个）。
+	 * 那是子任务，不该混进"我的对话"列表里。
+	 */
+	delegationDepth?: number;
 }
 
 function parseRecords(text: string): { header: DshHeader; records: Record<string, unknown>[] } {
@@ -51,7 +56,12 @@ function parseRecords(text: string): { header: DshHeader; records: Record<string
 			continue;
 		}
 		if (parsed.type === "session") {
-			header = { id: typeof parsed.id === "string" ? parsed.id : undefined, cwd: typeof parsed.cwd === "string" ? parsed.cwd : undefined, createdAt: toEpochMs(parsed.createdAt) };
+			header = {
+				id: typeof parsed.id === "string" ? parsed.id : undefined,
+				cwd: typeof parsed.cwd === "string" ? parsed.cwd : undefined,
+				createdAt: toEpochMs(parsed.createdAt),
+				delegationDepth: typeof parsed.delegationDepth === "number" ? parsed.delegationDepth : undefined,
+			};
 			continue;
 		}
 		records.push(parsed);
@@ -138,6 +148,7 @@ export const dshSource: ImportSourceModule = {
 			}
 			const { header, records } = parseRecords(head.text);
 			if (!header.id) continue;
+			if (header.delegationDepth) continue; // 主代理派给子代理的会话，不算"我的对话"
 			// 建了却从没用过的会话（只有 header 与几条配置）：整个文件都解出来却没有消息，不该列进列表
 			if (head.complete && !records.some((record) => record.type === "user/message" || record.type === "assistant/message")) continue;
 			let title: string | undefined;

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

@@ -13,6 +13,20 @@ 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, sortByRecency } from "./files";
+import { eachJsonLine, listFiles, readHead, reachedLimit, statMtime } from "./files";
 import { grokRoot } from "./paths";
 import type { ExternalSessionSummary, ImportedBlock, ImportedEntry, ImportedSession, ImportSourceModule, ScanOptions } from "./types";
-import { cleanTitle, compactBlocks, outputBlocks, parseArguments, textBlock, toEpochMs } from "./types";
+import { cleanTitle, compactBlocks, dataUrlImageBlock, 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" && typeof record.summary === "string" && record.summary.trim()) return true;
+		if (record.type === "reasoning" && reasoningText(record.summary)) return true;
 		if (record.type !== "user" || record.synthetic_reason) continue;
 		const blocks = userBlocks(record.content);
-		if (blocks.some((block) => block.type === "text" && block.text.replace(/<[^>]+>/g, "").trim())) return true;
+		if (blocks.some((block) => block.type === "image" || (block.type === "text" && block.text.replace(/<[^>]+>/g, "").trim()))) return true;
 	}
 	return false;
 }
@@ -46,39 +46,70 @@ async function hasRealMessage(history: string): Promise<boolean> {
 	}
 }
 
-/** user 的 content 可能是字符串或块数组 */function userBlocks(content: unknown): ImportedBlock[] {
+/** user 的 content 可能是字符串、文本块或 data URL 图片块 */
+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" });
-		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>;
+		// 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");
 			try {
-				summary = JSON.parse(await fs.readFile(path.join(dir, "summary.json"), "utf8")) as Record<string, unknown>;
+				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,
+				};
 			} catch {
-				continue;
+				return null;
 			}
-			if (mtime === undefined) 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;
 			const info = summary.info as Record<string, unknown> | undefined;
-			const numMessages = Number(summary.num_messages ?? summary.num_chat_messages);
+			// num_messages 包含 trace/内部事件；num_chat_messages 才对应 chat_history 的会话记录数
+			const numMessages = Number(summary.num_chat_messages ?? summary.num_messages);
+			// 子代理会话（grok 的 spawn_subagent：subagent / subagent_fork / subagent_resume，本机 24 条）
+			if (typeof summary.session_kind === "string" && summary.session_kind.startsWith("subagent")) continue;
 			if (numMessages === 0) continue; // 开了没用的空会话
 			// 只有系统提示与合成提醒（system_reminder）的会话读不出对话，别列进列表
 			if (!(await hasRealMessage(history))) continue;
@@ -89,7 +120,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: toEpochMs(summary.updated_at ?? summary.last_active_at) ?? mtime,
+				updatedAt,
 				...(Number.isFinite(numMessages) ? { messageCount: numMessages } : {}),
 				location: history,
 			});
@@ -108,17 +139,18 @@ 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":
-					continue; // 系统提示不进对话
+					runtimeContext += 1;
+					continue; // 系统提示由 pi 按目标工作区重新生成，不冒充用户消息
 				case "user": {
 					const blocks = userBlocks(record.content);
-					const plain = blocks.map((block) => (block.type === "text" ? block.text : "")).join("\n").trim();
-					if (record.synthetic_reason || !plain) {
+					if (record.synthetic_reason || !blocks.length) {
 						synthetic += 1;
 						continue;
 					}
@@ -142,8 +174,8 @@ export const grokSource: ImportSourceModule = {
 					continue;
 				}
 				case "reasoning": {
-					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 } : {}) } });
+					const text = reasoningText(record.summary);
+					if (text) entries.push({ type: "message", message: { role: "assistant", content: [{ type: "thinking", thinking: text }], timestamp, ...(model ? { model } : {}) } });
 					else encryptedReasoning += 1; // 加密推理无正文可导：计数后汇总成一行，不要刷屏
 					continue;
 				}
@@ -160,6 +192,7 @@ 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/types.ts

@@ -121,6 +121,18 @@ 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/skills-service.ts

@@ -18,13 +18,48 @@ export interface SkillView {
 	baseDir: string;
 }
 
-function classifyScope(filePath: string, cwd?: string): SkillView["scope"] {
-	const norm = filePath.replace(/\\/g, "/").toLowerCase();
-	const agentDir = getAgentDir().replace(/\\/g, "/").toLowerCase();
-	const home = os.homedir().replace(/\\/g, "/").toLowerCase();
-	if (norm.startsWith(`${agentDir}/`) || norm.startsWith(`${home}/.agents/`) || norm.startsWith(`${home}/.pi/`))
+/**
+ * 路径比较用的规范形式：展开真实路径 → 统一分隔符 → 去掉结尾斜杠 → Windows 下大小写不敏感。
+ *
+ * realpath 这一步是必须的：同一个目录可以有多种写法——Windows 的 8.3 短名（`C:\Users\RUNNER~1`）、
+ * 含 `..` 的路径、junction / symlink。删技能、开关技能时 `resolveDiscoveredPath` 交出的是 **realpath 形式**，
+ * 而 agentDir 是配置里的原样字符串，两边直接比字符串就会把"本来就在 agent 目录下"的全局技能
+ * 判成 package 技能而拒绝删除（CI 的 Windows runner 上就是这样红的，真实用户只要路径里带短名也会中招）。
+ */
+async function toComparablePath(target: string): Promise<string> {
+	let resolved: string;
+	try {
+		resolved = await fs.realpath(target);
+	} catch {
+		resolved = path.resolve(target); // 路径还不存在（如待创建的技能目录）：退化成普通规范化
+	}
+	return resolved.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+}
+
+interface ScopeContext {
+	/** 全部已展开成可比较形式 */
+	agentDir: string;
+	home: string;
+	cwd?: string;
+}
+
+/** 每次调用只展开一次来源路径，避免逐个技能重复 realpath */
+async function scopeContext(cwd?: string): Promise<ScopeContext> {
+	return {
+		agentDir: await toComparablePath(getAgentDir()),
+		home: await toComparablePath(os.homedir()),
+		cwd: cwd ? await toComparablePath(cwd) : undefined,
+	};
+}
+
+/** 严格判断"在某个目录里面"：必须落在分隔符之后，避免 /ws 误匹配 /ws-other */
+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 (within(norm, context.agentDir) || within(norm, `${context.home}/.agents`) || within(norm, `${context.home}/.pi`))
 		return "global";
-	if (cwd && norm.startsWith(path.resolve(cwd).replace(/\\/g, "/").toLowerCase())) return "project";
+	if (context.cwd && within(norm, context.cwd)) return "project";
 	if (norm.includes("/node_modules/")) return "package";
 	return "package";
 }
@@ -37,6 +72,7 @@ export async function listSkills(cwd?: string): Promise<SkillView[]> {
 		await resourceLoaderReady(dir);
 		const loader = getResourceLoader(dir);
 		const { skills } = loader.getSkills();
+		const context = await scopeContext(dir);
 		for (const s of skills) {
 			if (seen.has(s.filePath)) continue;
 			seen.add(s.filePath);
@@ -45,7 +81,7 @@ export async function listSkills(cwd?: string): Promise<SkillView[]> {
 				description: s.description,
 				filePath: s.filePath,
 				disabled: s.disableModelInvocation,
-				scope: classifyScope(s.filePath, dir),
+				scope: await classifyScope(s.filePath, context),
 				baseDir: s.baseDir,
 			});
 		}
@@ -85,7 +121,8 @@ export async function setSkillDisabled(filePath: string, disabled: boolean, cwd?
 	await fs.writeFile(authorized, next, "utf8");
 	// 就地重载加载器并让活跃会话重建系统提示（技能列表在系统提示里）；全局技能影响所有目录
 	await reloadAllLoaders();
-	const scope = classifyScope(authorized, cwd);
+	const context = await scopeContext(cwd);
+	const scope = await classifyScope(authorized, context);
 	await reloadSessionsForCwd(scope === "project" ? cwd : undefined);
 	return { changed: true };
 }
@@ -100,21 +137,21 @@ 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));
-	if (classifyScope(authorized, cwd) === "package") {
+	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 agentDir = getAgentDir().replace(/\\/g, "/");
-	const normalizedSkillDir = skillDir.replace(/\\/g, "/");
-	const knownRoots = [`${agentDir}/skills`, `${agentDir}/web-skills`];
-	if (!knownRoots.some((root) => normalizedSkillDir.toLowerCase() === root.toLowerCase())) {
+	const normalizedSkillDir = await toComparablePath(skillDir);
+	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();
-	const scope = classifyScope(authorized, cwd);
+	const scope = await classifyScope(authorized, context);
 	await reloadSessionsForCwd(scope === "project" ? cwd : undefined);
 	return { removed: skillDir };
 }