@co0ontty/wand 4.90.2 → 4.91.0

package/README.md

@@ -160,6 +160,9 @@ also reads generated iOS/macOS AppIcon PNGs, which on macOS come from
 `swift <platform>/scripts/generate-icons.swift` (run `npm run sync:brand-assets`
 first; CI does the same in `.github/workflows/ci.yml`). To preview removable
 compiler caches, run `npm run clean:build-cache`; add `-- --apply` to remove them.
+For macOS daily cleanup of inactive archived compiler intermediates (seven-day retention),
+use `npm run clean:build-cache:install -- --install`; see [automatic cleanup](docs/build-cache-cleanup.md).
+This does not install Git hooks or remove live native build trees.
 
 Runtime data is stored under `~/.wand/`: `config.json`, `wand.db`, and `sessions/`.
 
@@ -387,6 +390,8 @@ git submodule update --init -- render-bin
 全量 `npm test` 包含跨端源码契约检查，运行前另检出 `android ios macos render`。品牌一致性用例还会读 iOS/macOS 的 AppIcon PNG（生成物），在 macOS 上先跑 `npm run sync:brand-assets`，再用 `swift <平台>/scripts/generate-icons.swift` 生成（CI 的 `.github/workflows/ci.yml` 做同样的事）。
 `npm run clean:build-cache` 预览可清理的编译缓存，追加 `-- --apply` 才执行删除；
 保留分发包、Release Render 二进制、签名、依赖和会话数据。
+macOS 每日清理历史归档编译中间物（保留7天）用 `npm run clean:build-cache:install -- --install`；
+范围、并发保护、日志和停用方式见[自动清理说明](docs/build-cache-cleanup.md)。不修改Git hook，不自动删除现用原生构建树。
 
 数据存储在 `~/.wand/` 下：`config.json`（配置）、`wand.db`（SQLite）、`sessions/`（日志）。
 

package/dist/agent-dispatch.js

@@ -70,7 +70,7 @@ export async function dispatchAgentForTask(deps, input) {
             // 直接派发 Wand Agent（不进员工候选链）：先裁决进程内引擎是否可用，
             // 不可用就让这次派发明确失败，不静默退回 CLI 冒充。
             ...(agent.engine === "sdk"
-                ? { engine: structured.resolveNewSessionPiEngine("sdk").engine }
+                ? { engine: (await structured.resolveNewSessionPiEngine("sdk")).engine }
                 : {}),
             worktreeEnabled: false,
             sessionSource: "automation",

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "6f48f3ff2587f94d7339d5c1a263a04dc16e9e92",
-  "builtAt": "2026-10-13T02:11:29.396Z",
-  "version": "4.90.2",
+  "commit": "0adcac1ecb8447d91e5abc44d2dd6a8b2f807243",
+  "builtAt": "2026-10-13T05:03:40.007Z",
+  "version": "4.91.0",
   "channel": "stable"
 }

package/dist/conversation-service.d.ts

@@ -3,7 +3,7 @@ import { type AiTeamRunner } from "./ai-team-runner.js";
 import { type ConversationDetail, type ConversationInstance, type ConversationReceipt, type ConversationSummary, type ConversationTarget, type ConversationSessionUpdate } from "./conversation-types.js";
 import type { WandStorage } from "./storage.js";
 import type { StructuredSessionManager } from "./structured-session-manager.js";
-import type { ConversationTurn, ProcessEvent, WandConfig } from "./types.js";
+import type { ConversationTurn, ProcessEvent, SessionSnapshot, WandConfig } from "./types.js";
 export interface GroupInput {
     employeeIds?: string[];
     templateId?: string;
@@ -40,6 +40,7 @@ export declare class ConversationService {
     private readonly removals;
     private readonly pendingOperations;
     private readonly previewTimers;
+    private readonly legacyChannels;
     /** Reuse session events; send only a bounded IM projection, never a second execution protocol. */
     ingestSessionEvent(event: ProcessEvent): void;
     dispose(): void;
@@ -48,6 +49,8 @@ export declare class ConversationService {
     /** Explicit startup/event migration, never a GET repair and never an invented group. */
     importRun(run: AiTeamRun): void;
     migrateExistingChats(): void;
+    /** Startup + session events, never GET repair. Stable employee identity is the only attribution source. */
+    importEmployeeSession(session: SessionSnapshot): void;
     pendingEmployee(employeeId: string): ConversationInstance;
     private requireInstance;
     /** 会话里「我自己」的署名与头像：跟随当前设置，改设置不改写历史回合。 */

package/dist/conversation-service.js

@@ -54,22 +54,28 @@ export class ConversationService {
     removals = new Map();
     pendingOperations = new Map();
     previewTimers = new Map();
+    legacyChannels = new Set();
     /** Reuse session events; send only a bounded IM projection, never a second execution protocol. */
     ingestSessionEvent(event) {
         const session = this.deps.structured.get(event.sessionId);
-        if (!this.deps.notifySession || !session?.automationId?.startsWith(CONVERSATION_SESSION_PREFIX)
-            || this.previewTimers.has(event.sessionId))
+        if (session)
+            this.importEmployeeSession(session);
+        if (!this.deps.notifySession || !session || this.previewTimers.has(event.sessionId)
+            || (!session.automationId?.startsWith(CONVERSATION_SESSION_PREFIX)
+                && !this.storage.employeeConversationForSession(session.id)))
             return;
         const timer = setTimeout(() => {
             this.previewTimers.delete(event.sessionId);
             const current = this.snapshot(event.sessionId);
             const requestId = current?.automationId?.slice(CONVERSATION_SESSION_PREFIX.length);
             const receipt = requestId ? this.receipt(requestId) : null;
-            if (!receipt || receipt.sessionId !== event.sessionId || !this.storage.getConversation(receipt.conversationId)
-                || this.storage.conversationListState(receipt.conversationId).deleting)
+            const conversationId = receipt?.sessionId === event.sessionId ? receipt.conversationId
+                : this.storage.employeeConversationForSession(event.sessionId);
+            if (!conversationId || !this.storage.getConversation(conversationId)
+                || this.storage.conversationListState(conversationId).deleting)
                 return;
-            this.deps.notifySession?.({ conversationId: receipt.conversationId, sessionId: event.sessionId,
-                preview: conversationSessionPreview(current, receipt) });
+            this.deps.notifySession?.({ conversationId, sessionId: event.sessionId,
+                preview: conversationSessionPreview(current, receipt ?? undefined) });
         }, 100);
         timer.unref?.();
         this.previewTimers.set(event.sessionId, timer);
@@ -115,6 +121,29 @@ export class ConversationService {
     migrateExistingChats() {
         for (const run of this.storage.listAiTeamRuns().reverse())
             this.importRun(run);
+        // Preserve legacy channels and already accepted IM links; only unbound interactive work is imported.
+        const instances = this.storage.listConversations();
+        for (const instance of instances)
+            for (const id of [instance.sessionId, instance.communicationSessionId, ...(instance.historySessionIds ?? [])]) {
+                if (id)
+                    this.legacyChannels.add(id);
+            }
+        const channels = new Set([...this.legacyChannels, ...instances.flatMap(instance => this.storage.conversationSessionIds(instance.id))]);
+        for (const session of this.storage.loadSessionsSlim()) {
+            if (!channels.has(session.id))
+                this.importEmployeeSession(session);
+        }
+    }
+    /** Startup + session events, never GET repair. Stable employee identity is the only attribution source. */
+    importEmployeeSession(session) {
+        if (this.legacyChannels.has(session.id) || session.sessionKind !== "structured" || !session.employeeId || session.automationId
+            || (session.sessionSource && session.sessionSource !== "interactive") || session.workspaceTaskId)
+            return;
+        const instance = this.storage.getConversation(employeeConversationId(session.employeeId))
+            ?? this.pendingEmployee(session.employeeId);
+        if (this.storage.conversationListState(instance.id).deleting)
+            return;
+        this.storage.linkEmployeeSession(instance, session);
     }
     pendingEmployee(employeeId) {
         const employee = this.storage.getSiliconEmployee(employeeId);

package/dist/employee-text.js

@@ -1,4 +1,3 @@
-import { normalizeContext } from "@earendil-works/pi-ai";
 import { coreHarnessRuntime, loadPiAi, resolveCoreModel } from "./harness-engine.js";
 import { agentKey } from "./ai-team-types.js";
 import { getDefaultModelForProvider } from "./config.js";
@@ -87,7 +86,8 @@ export async function prepareEmployeeTextCandidate(deps, agent, request, signal)
     }
     if (agent.provider !== "pi")
         throw new Error("Wand Agent只支持Pi provider。");
-    const context = normalizeContext({ systemPrompt: request.system,
+    const pi = await loadPiAi();
+    const context = pi.normalizeContext({ systemPrompt: request.system,
         messages: [{ role: "user", content: request.prompt, timestamp: Date.now() }], tools: [] });
     const reasoning = thinkingEffortToPiLevel(agent.thinkingEffort ?? "off");
     if (isOpenRouterFreeSelector(agent.model)) {
@@ -111,7 +111,7 @@ export async function prepareEmployeeTextCandidate(deps, agent, request, signal)
     const resolved = await resolveCoreModel(config.harness, agent.model, { cwd: config.defaultCwd });
     if (!resolved)
         throw new Error("Wand Agent模型不可用。");
-    const runtime = await coreHarnessRuntime(config.harness), pi = await loadPiAi();
+    const runtime = await coreHarnessRuntime(config.harness);
     const level = pi.clampThinkingLevel(resolved.model, (reasoning ?? "off"));
     return async () => {
         signal.throwIfAborted();

package/dist/pi-auto-resources.js

@@ -35,7 +35,7 @@ export function withAutomaticPiResources(runner, config, options) {
                 let fallback = "";
                 let timer;
                 try {
-                    inventory = await (options.inventory?.(context.session.cwd) ?? discoverPiResources(config, context.session.cwd));
+                    inventory = await (options.inventory?.(context.session.cwd) ?? discoverPiResources(config, context.session.cwd, context.env));
                     checkActive();
                     // A missing manual resource must fail as usual, never be silently replaced by an automatic pick.
                     resolvePiResourceSelection(inventory, manual);

package/dist/pi-cli-runtime.d.ts

@@ -0,0 +1,8 @@
+/** Extension code uses the running host, including a CLI update between preparation and spawn. */
+export declare function runningPiCliPackage(): string;
+/** Read-only npm/managed CLI discovery using the same environment as the actual child. */
+export declare function resolvePiCliPackage(env?: NodeJS.ProcessEnv, cwd?: string): string;
+/** Resolve a host-provided leaf API against the running CLI, never against the extension's Wand package. */
+export declare function importPiCliAiModule<T>(root: string, relative: string): Promise<T>;
+/** One compatibility boundary for CLI-owned built-ins/read-only parsers, not the SDK entry/harness. */
+export declare function importPiCliModule<T>(root: string, relative: string): Promise<T>;

package/dist/pi-cli-runtime.js

@@ -0,0 +1,105 @@
+import { accessSync, constants, existsSync, readFileSync, realpathSync, statSync } from "node:fs";
+import path from "node:path";
+import { findPackageJSON } from "node:module";
+import { pathToFileURL } from "node:url";
+import { buildChildEnv } from "./env-utils.js";
+const PACKAGE_NAME = "@earendil-works/pi-coding-agent";
+const UNSUPPORTED = "当前 Pi CLI 无法提供会话级资源接口；请使用官方 npm 或 managed 安装。没有加载 Wand SDK 或改用其他 CLI。";
+/** Identify the package owning an actual CLI entry, never resolve from Wand's node_modules. */
+function packageOfEntry(entry) {
+    let actual;
+    try {
+        actual = realpathSync(entry);
+    }
+    catch {
+        return null;
+    }
+    let dir = path.dirname(actual);
+    for (let depth = 0; depth < 6; depth++) {
+        try {
+            const manifestPath = path.join(dir, "package.json");
+            if (statSync(manifestPath).size > 128 * 1024)
+                throw new Error("manifest too large");
+            const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
+            const bin = typeof manifest.bin === "string" ? manifest.bin : manifest.bin?.pi;
+            if (manifest.name === PACKAGE_NAME && typeof bin === "string"
+                && realpathSync(path.resolve(dir, bin)) === actual)
+                return dir;
+        }
+        catch { /* Not a package-owned CLI entry. */ }
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
+/** Extension code uses the running host, including a CLI update between preparation and spawn. */
+export function runningPiCliPackage() {
+    const root = process.argv[1] && packageOfEntry(process.argv[1]);
+    if (!root)
+        throw new Error(UNSUPPORTED);
+    return root;
+}
+/** Read-only npm/managed CLI discovery using the same environment as the actual child. */
+export function resolvePiCliPackage(env = buildChildEnv(true), cwd = process.cwd()) {
+    const names = process.platform === "win32" ? ["pi.exe", "pi.cmd", "pi"] : ["pi"];
+    for (const directory of (env.PATH ?? "").split(path.delimiter)) {
+        for (const name of names) {
+            const candidate = path.resolve(cwd, directory || ".", name);
+            try {
+                accessSync(candidate, constants.X_OK);
+            }
+            catch {
+                continue;
+            }
+            const direct = packageOfEntry(candidate);
+            if (direct)
+                return direct;
+            // Official managed launcher: inspect its own active release. Do not evaluate
+            // arbitrary shell wrappers or pick a different install later on PATH.
+            try {
+                const launcher = realpathSync(candidate);
+                const install = path.resolve(path.dirname(launcher), "../install");
+                const versionFile = path.join(install, "current-version");
+                if (statSync(launcher).size > 64 * 1024 || statSync(versionFile).size > 256)
+                    throw new Error("unsupported launcher");
+                const source = readFileSync(launcher, "utf8");
+                const version = readFileSync(versionFile, "utf8").trim();
+                if (source.includes("PI_MANAGED_INSTALL_ROOT") && source.includes("install/current-version")
+                    && /^[0-9A-Za-z][0-9A-Za-z._+-]{0,127}$/.test(version)) {
+                    const managed = packageOfEntry(path.join(install, "releases", version, "node_modules/.bin/pi"));
+                    if (managed)
+                        return managed;
+                }
+            }
+            catch { /* Unsupported launcher; fail closed. */ }
+            throw new Error(UNSUPPORTED);
+        }
+    }
+    throw new Error("未找到 Pi CLI；请先安装 Pi。没有加载 Wand SDK。");
+}
+/** Resolve a host-provided leaf API against the running CLI, never against the extension's Wand package. */
+export async function importPiCliAiModule(root, relative) {
+    try {
+        const manifest = findPackageJSON("@earendil-works/pi-ai", pathToFileURL(path.join(root, "package.json")));
+        if (!manifest)
+            throw new Error("CLI peer missing");
+        return await import(pathToFileURL(path.join(path.dirname(manifest), "dist", relative)).href);
+    }
+    catch {
+        throw new Error("Pi CLI 的 provider 接口加载失败，请检查 CLI 安装。没有改用 Wand SDK。");
+    }
+}
+/** One compatibility boundary for CLI-owned built-ins/read-only parsers, not the SDK entry/harness. */
+export async function importPiCliModule(root, relative) {
+    const file = path.join(root, "dist", relative);
+    if (!existsSync(file))
+        throw new Error(UNSUPPORTED);
+    try {
+        return await import(pathToFileURL(file).href);
+    }
+    catch {
+        throw new Error("Pi CLI 的会话级资源接口加载失败，请检查 CLI 安装。没有改用 Wand SDK。");
+    }
+}

package/dist/pi-extension-resources.d.ts

@@ -1,10 +1,11 @@
-import { loadPiCodingAgent } from "./harness-engine.js";
+import type { loadPiCodingAgent } from "./harness-engine.js";
+import { type PiResourceReader } from "./pi-user-resources.js";
 import type { WandConfig } from "./types.js";
 import type { PiSessionSettings } from "./pi-session-settings.js";
 import type { ResourceLoader } from "@earendil-works/pi-coding-agent";
 type CodingAgent = Awaited<ReturnType<typeof loadPiCodingAgent>>;
 /** Resolve already-installed USER resources only. Never install, import code, or trust project packages. */
-export declare function installedPiExtensions(config: WandConfig, cwd: string): Promise<Array<{
+export declare function installedPiExtensions(config: WandConfig, cwd: string, reader?: PiResourceReader): Promise<Array<{
     path: string;
     name: string;
     goal: boolean;

package/dist/pi-extension-resources.js

@@ -1,24 +1,10 @@
-import { readFile } from "node:fs/promises";
 import path from "node:path";
-import { coreHarnessAgentDir, loadPiCodingAgent } from "./harness-engine.js";
+import { coreHarnessAgentDir } from "./harness-engine.js";
+import { cliPiResourceReader, installedPiUserResources } from "./pi-user-resources.js";
 /** Resolve already-installed USER resources only. Never install, import code, or trust project packages. */
-export async function installedPiExtensions(config, cwd) {
-    const pi = await loadPiCodingAgent();
-    const agentDir = coreHarnessAgentDir(config.harness);
-    let raw = {};
-    try {
-        raw = JSON.parse(await readFile(path.join(agentDir, "settings.json"), "utf8"));
-    }
-    catch (error) {
-        if (error.code !== "ENOENT")
-            throw error;
-    }
-    const settings = pi.SettingsManager.inMemory({
-        packages: Array.isArray(raw.packages) ? raw.packages : [],
-        extensions: Array.isArray(raw.extensions) ? raw.extensions.filter((item) => typeof item === "string") : [],
-    }, { projectTrusted: false });
-    const manager = new pi.DefaultPackageManager({ cwd, agentDir, settingsManager: settings });
-    const resolved = await manager.resolve(async () => "skip");
+export async function installedPiExtensions(config, cwd, reader) {
+    const pi = reader ?? await cliPiResourceReader(cwd);
+    const resolved = await installedPiUserResources(pi, coreHarnessAgentDir(config.harness), cwd);
     return resolved.extensions.filter((item) => item.enabled && item.metadata.scope === "user").map((item) => {
         const name = item.metadata.source === "local" || item.metadata.source === "auto"
             ? path.basename(item.path) : item.metadata.source.replace(/^npm:/, "");
@@ -39,7 +25,7 @@ async function nativeExtensionLoader() {
     return loaded;
 }
 export async function createPiExtensionResources(pi, config, cwd, settings, systemPrompt) {
-    const resources = settings.globalTools || settings.goalMode ? await installedPiExtensions(config, cwd) : [];
+    const resources = settings.globalTools || settings.goalMode ? await installedPiExtensions(config, cwd, pi) : [];
     if (settings.goalMode && !resources.some((item) => item.goal)) {
         throw new Error("目标模式不可用：请先在 Pi 中安装并启用 pi-goal。");
     }

package/dist/pi-openrouter-free-bridge.d.ts

@@ -1,2 +1,2 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-export default function wandOpenRouterFree(pi: ExtensionAPI): void;
+export default function wandOpenRouterFree(pi: ExtensionAPI): Promise<void>;

package/dist/pi-openrouter-free-bridge.js

@@ -4,10 +4,10 @@
 /** Pi CLI provider bridge. No Agent/SDK runner and no changes to the user's Pi auth/models files. */
 import { readFileSync, rmSync } from "node:fs";
 import { dirname } from "node:path";
-import { createAssistantMessageEventStream, lazyApi } from "@earendil-works/pi-ai";
+import { importPiCliAiModule, runningPiCliPackage } from "./pi-cli-runtime.js";
 import { OPENROUTER_FREE_PROVIDER, OPENROUTER_FREE_ROUTING } from "./openrouter-free-models.js";
 import { openOpenRouterFreeCliAccess, revokeOpenRouterFreeCliAccess } from "./openrouter-free-cli.js";
-export default function wandOpenRouterFree(pi) {
+export default async function wandOpenRouterFree(pi) {
     const file = process.env.WAND_PI_FREE_POLICY;
     const token = process.env.WAND_PI_FREE_TOKEN ?? "";
     delete process.env.WAND_PI_FREE_POLICY;
@@ -15,9 +15,13 @@ export default function wandOpenRouterFree(pi) {
     if (!file)
         throw new Error("免费模型调用缺少本轮策略。");
     const policy = JSON.parse(readFileSync(file, "utf8"));
+    const host = runningPiCliPackage();
+    const [{ createAssistantMessageEventStream }, api] = await Promise.all([
+        importPiCliAiModule(host, "utils/event-stream.js"),
+        importPiCliAiModule(host, "api/openai-completions.js"),
+    ]);
     // Pi applies its HTTP/proxy configuration after factories load; use the current fetch per request.
     const access = openOpenRouterFreeCliAccess(policy.databasePath, token, (url, init) => globalThis.fetch(url, init));
-    const api = lazyApi(() => import("@earendil-works/pi-ai/api/openai-completions"));
     let activeModel = policy.model;
     const streamSimple = (model, transcript, options) => {
         const stream = createAssistantMessageEventStream();

package/dist/pi-resource-bridge.d.ts

@@ -1,2 +1,2 @@
-import { type ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 export default function wandResourceSelection(pi: ExtensionAPI): Promise<void>;

package/dist/pi-resource-bridge.js

@@ -4,12 +4,15 @@
 /** Explicit CLI extension: replaces built-in MCP discovery without changing the user's agent directory. */
 import { readFileSync, rmSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { createCodemodeExtension, createMcpExtension, createToolSearchExtension } from "@earendil-works/pi-coding-agent";
+import { importPiCliModule, runningPiCliPackage } from "./pi-cli-runtime.js";
 export default async function wandResourceSelection(pi) {
     const policyFile = process.env.WAND_PI_RESOURCE_POLICY;
     if (!policyFile)
         throw new Error("Wand 资源选择缺少本轮策略。");
     const policy = JSON.parse(readFileSync(policyFile, "utf8"));
+    // Use the running CLI's built-ins, not Wand's pinned SDK entry point. An update
+    // between preparation and spawn therefore still uses one matching CLI runtime.
+    const host = runningPiCliPackage();
     // Entries were validated by Pi's parser immediately before spawning. Read only this user's file;
     // do not replace the agent directory or discover trusted-project/extension servers implicitly.
     const allowed = new Set(policy.mcpServers ?? []);
@@ -20,7 +23,10 @@ export default async function wandResourceSelection(pi) {
             const value = Reflect.get(target, key);
             return typeof value === "function" ? value.bind(target) : value;
         } });
-    if (policy.mcpServers)
+    if (policy.mcpServers) {
+        const { createMcpExtension } = await importPiCliModule(host, "extensions/mcp/index.js");
+        if (typeof createMcpExtension !== "function")
+            throw new Error("Pi CLI 不支持会话级 MCP 选择。");
         createMcpExtension({
             loadConfig: () => {
                 if (!allowed.size)
@@ -42,7 +48,11 @@ export default async function wandResourceSelection(pi) {
             },
             updateConfig: () => { throw new Error("请通过 Wand 输入框中的 Skills / MCP 设置修改本会话选择。"); },
         })(scoped);
+    }
     if (policy.codemodeOverride) {
+        const { createCodemodeExtension } = await importPiCliModule(host, "extensions/codemode/index.js");
+        if (typeof createCodemodeExtension !== "function")
+            throw new Error("Pi CLI 不支持会话级 CodeMode 设置。");
         // This explicit factory replaces the CLI builtin and can express `only` without modifying
         // settings.json. Active-tool changes preserve every common tool and selected MCP connection.
         const codemodeApi = policy.codemodeOverride === "off" ? new Proxy(pi, { get(target, key) {
@@ -54,8 +64,12 @@ export default async function wandResourceSelection(pi) {
         createCodemodeExtension({ mode: policy.codemodeOverride === "only" ? "only" : "on" })(codemodeApi);
         // MCP tools with indirect exposure still need an entrance when CodeMode is explicitly off.
         const searchInstead = policy.codemodeOverride === "off" && !!policy.mcpServers?.length;
-        if (searchInstead)
+        if (searchInstead) {
+            const { createToolSearchExtension } = await importPiCliModule(host, "extensions/tool-search/index.js");
+            if (typeof createToolSearchExtension !== "function")
+                throw new Error("Pi CLI 不支持关闭 CodeMode 后的 MCP 工具发现。");
             createToolSearchExtension()(pi);
+        }
         const apply = () => {
             const other = pi.getActiveTools().filter((name) => name !== "codemode");
             pi.setActiveTools(policy.codemodeOverride === "off"

package/dist/pi-resource-catalog.d.ts

@@ -7,10 +7,10 @@ export interface PiResourceInventory {
     skills: Map<string, Skill>;
     servers: Map<string, McpConfig["servers"][number]>;
 }
-/** Pinned, read-only parser boundary; never connects, runs credential commands or loads extension code. */
-export declare function readUserPiMcpConfig(agentDir: string, cwd: string): Promise<McpConfig>;
+/** CLI-owned, read-only parser: no connection, credential command, extension code or Wand SDK. */
+export declare function readUserPiMcpConfig(agentDir: string, cwd: string, env?: NodeJS.ProcessEnv): Promise<McpConfig>;
 /** Installed USER resources only. No package downloads and no project config mutation/trust elevation. */
-export declare function discoverPiResources(config: Pick<WandConfig, "harness">, cwd: string): Promise<PiResourceInventory>;
+export declare function discoverPiResources(config: Pick<WandConfig, "harness">, cwd: string, env?: NodeJS.ProcessEnv): Promise<PiResourceInventory>;
 export declare function resolvePiResourceSelection(inventory: PiResourceInventory, selection: PiResourceSelection): {
     skills: Skill[];
     servers: McpConfig["servers"];

package/dist/pi-resource-catalog.js

@@ -1,38 +1,23 @@
 import { createHash } from "node:crypto";
-import { readFile, realpath, stat } from "node:fs/promises";
-import path from "node:path";
-import { coreHarnessAgentDir, loadPiCodingAgent } from "./harness-engine.js";
+import { realpath, stat } from "node:fs/promises";
+import { coreHarnessAgentDir } from "./harness-engine.js";
+import { importPiCliModule, resolvePiCliPackage } from "./pi-cli-runtime.js";
+import { cliPiResourceReader, installedPiUserResources } from "./pi-user-resources.js";
 function resourceId(kind, identity) {
     return `${kind}-${createHash("sha256").update(identity).digest("hex").slice(0, 24)}`;
 }
-/** Pinned, read-only parser boundary; never connects, runs credential commands or loads extension code. */
-export async function readUserPiMcpConfig(agentDir, cwd) {
-    const url = new URL("./extensions/mcp/config.js", import.meta.resolve("@earendil-works/pi-coding-agent"));
-    const parser = await import(url.href);
+/** CLI-owned, read-only parser: no connection, credential command, extension code or Wand SDK. */
+export async function readUserPiMcpConfig(agentDir, cwd, env) {
+    const parser = await importPiCliModule(resolvePiCliPackage(env, cwd), "extensions/mcp/config.js");
+    if (typeof parser.loadMcpConfig !== "function")
+        throw new Error("Pi CLI 不支持只读 MCP 配置发现。");
     return parser.loadMcpConfig({ agentDir, cwd, projectTrusted: false });
 }
 /** Installed USER resources only. No package downloads and no project config mutation/trust elevation. */
-export async function discoverPiResources(config, cwd) {
-    const pi = await loadPiCodingAgent();
+export async function discoverPiResources(config, cwd, env) {
+    const pi = await cliPiResourceReader(cwd, env);
     const agentDir = coreHarnessAgentDir(config.harness);
-    let raw = {};
-    try {
-        const content = await readFile(path.join(agentDir, "settings.json"), "utf8");
-        if (content.length > 1_048_576)
-            throw new Error("配置过大");
-        raw = JSON.parse(content);
-    }
-    catch (error) {
-        if (error.code !== "ENOENT")
-            throw new Error("Pi 资源配置无法读取，请检查 settings.json。");
-    }
-    const settings = pi.SettingsManager.inMemory({
-        packages: Array.isArray(raw.packages) ? raw.packages : [],
-        skills: Array.isArray(raw.skills) ? raw.skills.filter((item) => typeof item === "string") : [],
-        extensions: Array.isArray(raw.extensions) ? raw.extensions.filter((item) => typeof item === "string") : [],
-    }, { projectTrusted: false });
-    const manager = new pi.DefaultPackageManager({ cwd, agentDir, settingsManager: settings });
-    const resolved = await manager.resolve(async () => "skip");
+    const resolved = await installedPiUserResources(pi, agentDir, cwd);
     const paths = resolved.skills.filter((item) => item.enabled && item.metadata.scope === "user").map((item) => item.path);
     const loaded = pi.loadSkills({ cwd, agentDir, skillPaths: paths, includeDefaults: false });
     const skills = new Map();
@@ -47,7 +32,7 @@ export async function discoverPiResources(config, cwd) {
         if (skills.size >= 200)
             break;
     }
-    const mcp = await readUserPiMcpConfig(agentDir, cwd);
+    const mcp = await readUserPiMcpConfig(agentDir, cwd, env);
     const servers = new Map();
     for (const server of mcp.servers.slice(0, 64))
         servers.set(resourceId("mcp", server.name), server);

package/dist/pi-resource-run.js

@@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url";
 import { discoverPiResources, resolvePiResourceSelection } from "./pi-resource-catalog.js";
 /** Re-resolve at execution time: removed resources fail, never silently enable defaults. */
 export async function preparePiResources(agentDir, cwd, selection, baseEnv, codemodeOverride) {
-    const selected = selection ? resolvePiResourceSelection(await discoverPiResources({ harness: { engine: "cli", agentDir } }, cwd), selection) : undefined;
+    const selected = selection ? resolvePiResourceSelection(await discoverPiResources({ harness: { engine: "cli", agentDir } }, cwd, baseEnv), selection) : undefined;
     const privateDir = mkdtempSync(path.join(os.tmpdir(), "wand-pi-resources-"));
     chmodSync(privateDir, 0o700);
     try {

package/dist/pi-user-resources.d.ts

@@ -0,0 +1,5 @@
+export type PiResourceReader = Pick<typeof import("@earendil-works/pi-coding-agent"), "SettingsManager" | "DefaultPackageManager" | "loadSkills">;
+/** CLI inventory imports only the executing CLI's read-only resource modules, never the Wand SDK. */
+export declare function cliPiResourceReader(cwd: string, env?: NodeJS.ProcessEnv): Promise<PiResourceReader>;
+/** Resolve installed USER resources only: no download, extension import or project trust elevation. */
+export declare function installedPiUserResources(pi: PiResourceReader, agentDir: string, cwd: string): Promise<import("@earendil-works/pi-coding-agent").ResolvedPaths>;

package/dist/pi-user-resources.js

@@ -0,0 +1,37 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { importPiCliModule, resolvePiCliPackage } from "./pi-cli-runtime.js";
+/** CLI inventory imports only the executing CLI's read-only resource modules, never the Wand SDK. */
+export async function cliPiResourceReader(cwd, env) {
+    const root = resolvePiCliPackage(env, cwd);
+    const [settings, packages, skills] = await Promise.all([
+        importPiCliModule(root, "core/settings-manager.js"),
+        importPiCliModule(root, "core/package-manager.js"),
+        importPiCliModule(root, "core/skills.js"),
+    ]);
+    if (typeof settings.SettingsManager?.inMemory !== "function" || typeof packages.DefaultPackageManager !== "function"
+        || typeof skills.loadSkills !== "function")
+        throw new Error("Pi CLI 不支持只读资源发现；没有加载 Wand SDK。");
+    return { ...settings, ...packages, ...skills };
+}
+/** Resolve installed USER resources only: no download, extension import or project trust elevation. */
+export async function installedPiUserResources(pi, agentDir, cwd) {
+    let raw = {};
+    try {
+        const content = await readFile(path.join(agentDir, "settings.json"), "utf8");
+        if (content.length > 1_048_576)
+            throw new Error("配置过大");
+        raw = JSON.parse(content);
+    }
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw new Error("Pi 资源配置无法读取，请检查 settings.json。");
+    }
+    const settings = pi.SettingsManager.inMemory({
+        packages: Array.isArray(raw.packages) ? raw.packages : [],
+        skills: Array.isArray(raw.skills) ? raw.skills.filter((item) => typeof item === "string") : [],
+        extensions: Array.isArray(raw.extensions) ? raw.extensions.filter((item) => typeof item === "string") : [],
+    }, { projectTrusted: false });
+    const manager = new pi.DefaultPackageManager({ cwd, agentDir, settingsManager: settings });
+    return await manager.resolve(async () => "skip");
+}

package/dist/server-session-context.js

@@ -23,15 +23,17 @@ export function createSessionRouteContext(deps) {
     const piSettingsResponse = async (id) => {
         const { settings, resolution } = structured.getPiSettings(id);
         const snapshot = structured.get(id);
-        const installed = await installedPiExtensions(config, snapshot.cwd);
         const sdk = resolution.engine === "core";
+        const sdkReader = sdk ? await (await import("./harness-engine.js")).loadPiCodingAgent() : undefined;
+        const installed = await installedPiExtensions(config, snapshot.cwd, sdkReader);
         const archived = snapshot.archived;
         const modifiable = !archived;
         const goalAvailable = installed.some((item) => item.goal);
         const localDecisionAvailable = config.localDecision?.enabled === true || decisions?.status().enabled === true;
-        const inventory = await discoverPiResources(config, snapshot.cwd);
-        const resourceCatalog = { ...inventory.catalog, supported: modifiable && !sdk && inventory.catalog.supported,
-            reason: archived ? "请先恢复已归档的会话。" : sdk ? "Wand Agent 尚不支持 Skills / MCP 会话选择。" : inventory.catalog.reason };
+        const catalog = sdk ? { supported: false, reason: "Wand Agent 尚不支持 Skills / MCP 会话选择。", skills: [], mcpServers: [] }
+            : (await discoverPiResources(config, snapshot.cwd)).catalog;
+        const resourceCatalog = { ...catalog, supported: modifiable && !sdk && catalog.supported,
+            reason: archived ? "请先恢复已归档的会话。" : sdk ? "Wand Agent 尚不支持 Skills / MCP 会话选择。" : catalog.reason };
         const controls = {
             // 基础工具与 CodeMode 在两种引擎下都能表达（CLI 通过 --tools 白名单）。
             tools: modifiable,

package/dist/server-session-lifecycle-routes.js

@@ -61,7 +61,7 @@ export function registerSessionLifecycleRoutes(app, ctx) {
                 res.status(400).json({ error: "Wand Agent 只支持 Pi 结构化会话。" });
                 return;
             }
-            const engineDecision = requestedEngine ? structured.resolveNewSessionPiEngine(requestedEngine) : null;
+            const engineDecision = requestedEngine ? await structured.resolveNewSessionPiEngine(requestedEngine) : null;
             const rawModel = typeof body.model === "string" ? body.model.trim() : "";
             const origin = parseSessionCreationOrigin(body);
             // Explicit employees/custom role rules and internal automation retain their own role.
@@ -175,7 +175,7 @@ export function registerSessionLifecycleRoutes(app, ctx) {
             sendRouteError(res, error, "切换员工失败。");
         }
     });
-    app.post("/api/sessions/:id/provider", (req, res) => {
+    app.post("/api/sessions/:id/provider", asyncRoute(async (req, res) => {
         const provider = req.body?.provider;
         const engine = req.body?.engine;
         if (engine !== undefined && engine !== "cli" && engine !== "sdk") {
@@ -201,12 +201,14 @@ export function registerSessionLifecycleRoutes(app, ctx) {
             return;
         }
         try {
+            if (engine === "sdk")
+                await structured.resolveNewSessionPiEngine(engine);
             res.json(sessionResponseDTO(structured.setSessionProvider(id, provider, engine), req));
         }
         catch (error) {
             sendRouteError(res, error, "切换工具失败。");
         }
-    });
+    }));
     app.get("/api/sessions/:id/pi-settings", asyncRoute(async (req, res) => {
         try {
             requirePiSession(req.params.id);