pi-web-ui 0.44.2 → 0.46.0

package/dist/server/agent-service.js

@@ -10,7 +10,7 @@
  * snapshots. The frontend is snapshot-driven (server is the source of truth),
  * so reconnects just re-request a snapshot.
  */
-import { spawn } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { existsSync, readFileSync, rmSync, statSync, writeFileSync, mkdirSync, watch, } from "node:fs";
 import { basename, dirname, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -80,14 +80,14 @@ export class QuiesceRejectedError extends Error {
  *  programs wait for input that never comes. Legacy Chinese files are often
  *  GBK/GB2312 — read them with the right encoding, never paste mojibake into
  *  reasoning/answers. */
-const WINDOWS_PERSONA = `You are a coding agent running on Windows. The bash tool runs Git Bash (bash.exe), not PowerShell. Follow these rules to avoid hanging the session:
-
-
-
-- ALWAYS pass a timeout parameter to the bash tool (in seconds). There is NO default timeout — a command that never finishes (servers, watchers, infinite loops, slow downloads/installs) will hang the entire conversation indefinitely. Pick a generous timeout for long-running work, but never omit it.
-- NEVER run interactive or foreground long-running commands through the bash tool (vi, less, top, python -, node -, npm run dev, sleep 10000). For servers/daemons use background execution with output redirected to a log file, then poll the log; stop them when done.
-- In the interactive terminal (TTY) — which is Git Bash too, not PowerShell — NEVER use heredocs (<<'EOF' ... EOF) or here-strings, and NEVER start interactive programs (vi, less, python -, node -, npm init): they wait for keyboard input that never arrives and hang the terminal forever. Prefer writing a temp script file (e.g. .pi-tmp.sh) and running it non-interactively. ALWAYS pass a timeout to long-running commands (e.g. \`timeout 120 npm run dev\`).
-
+const WINDOWS_PERSONA = `You are a coding agent running on Windows. The bash tool runs Git Bash (bash.exe), not PowerShell. Follow these rules to avoid hanging the session:
+
+
+
+- ALWAYS pass a timeout parameter to the bash tool (in seconds). There is NO default timeout — a command that never finishes (servers, watchers, infinite loops, slow downloads/installs) will hang the entire conversation indefinitely. Pick a generous timeout for long-running work, but never omit it.
+- NEVER run interactive or foreground long-running commands through the bash tool (vi, less, top, python -, node -, npm run dev, sleep 10000). For servers/daemons use background execution with output redirected to a log file, then poll the log; stop them when done.
+- In the interactive terminal (TTY) — which is Git Bash too, not PowerShell — NEVER use heredocs (<<'EOF' ... EOF) or here-strings, and NEVER start interactive programs (vi, less, python -, node -, npm init): they wait for keyboard input that never arrives and hang the terminal forever. Prefer writing a temp script file (e.g. .pi-tmp.sh) and running it non-interactively. ALWAYS pass a timeout to long-running commands (e.g. \`timeout 120 npm run dev\`).
+
 Many legacy Chinese text files (.html/.txt/.md/.log, exported documents) are GBK/GB2312 encoded: the read tool decodes UTF-8 only and will show mojibake (乱码) for them. If a file's content looks garbled, read it through the terminal instead: in Git Bash use \`cat file | iconv -f GBK -t UTF-8\` (or \`iconv -f GBK -t UTF-8 file\`); in cmd use \`chcp 65001 && type file\`; in PowerShell use \`Get-Content -Encoding Default file\`. Never paste mojibake into your reasoning or answer — describe the decoded content instead.`;
 /**
  * Killable bash tool: wraps the SDK bash tool with operations that register
@@ -550,6 +550,8 @@ export class ClientSession {
             flushSnapshot: () => this.flushSnapshot(),
             isDisposed: () => this.disposed,
             getSession: () => this.session,
+            cwd: () => this.cwd,
+            agentDir: () => this.agentDir,
             isStreaming: () => this.session.isStreaming,
             reloadSession: async () => {
                 await this.session.reload();
@@ -1028,6 +1030,7 @@ export class ClientSession {
             // (new chat + first message, completed turns, compaction, etc.).
             case "agent_end": {
                 this.scheduleSessionsRefresh();
+                this.refreshConversationTitle(conv);
                 // Manual interrupt (Stop button / abort): the last assistant message
                 // carries stopReason "aborted". A half-finished run should NOT be
                 // reviewed (it would fail and inject a revision, only to be stopped
@@ -1057,6 +1060,7 @@ export class ClientSession {
             }
             case "entry_appended":
                 this.scheduleSessionsRefresh();
+                this.refreshConversationTitle(conv);
                 break;
             case "message_update": {
                 // Live assistant-message increment, deliberately OUTSIDE the snapshot
@@ -1123,6 +1127,21 @@ export class ClientSession {
         }, 800);
         // pushSessions no-ops unless the client opted in via list_sessions.
     }
+    /** Refresh a conversation's title from its persisted first user message
+     *  while it is still unnamed. Runs off the event stream (entry_appended /
+     *  agent_end) rather than the prompt() call site, so ANY entry path that
+     *  lands a message names the chat the moment it is persisted — a rename
+     *  skipped by the prompt-start fast path (e.g. a concurrent switch) is
+     *  recovered here instead of leaving a permanent “新对话”. */
+    refreshConversationTitle(conv) {
+        if (conv.title !== DEFAULT_CONV_TITLE)
+            return;
+        const title = conversationTitle(conv.session);
+        if (title === DEFAULT_CONV_TITLE)
+            return;
+        conv.title = title;
+        this.emitConversations();
+    }
     /** Serialize a persisted message with a STABLE id + cached object reference. */
     serializeCached(m) {
         const conv = this.conv;
@@ -1251,6 +1270,7 @@ export class ClientSession {
             tools: state.tools.map((t) => t.name),
             version: ++this.version,
             piConfigured: this.isPiConfigured(),
+            piAgentInstalled: this.isPiCliInstalled(),
             stats,
         };
     }
@@ -1336,6 +1356,38 @@ export class ClientSession {
         this.piCheckCache = { at: now, configured };
         return configured;
     }
+    /**
+     * Whether the pi CLI binary is installed and runnable (`pi --version`
+     * probe). Cached machine-wide (same binary for every client) for 10s —
+     * the check is only rerun after install or when the cache expires.
+     */
+    static piCliProbe = null;
+    static PI_CLI_PROBE_TTL_MS = 10_000;
+    isPiCliInstalled() {
+        const now = Date.now();
+        const cached = ClientSession.piCliProbe;
+        if (cached && now - cached.at < ClientSession.PI_CLI_PROBE_TTL_MS)
+            return cached.installed;
+        let installed = false;
+        try {
+            const res = spawnSync("pi", ["--version"], {
+                timeout: 5000,
+                stdio: "ignore",
+                // Windows: `pi` resolves to a pi.cmd shim — spawnSync can only
+                // exec those through a shell (else ENOENT).
+                shell: process.platform === "win32",
+            });
+            installed = !res.error && res.status === 0;
+        }
+        catch {
+            installed = false;
+        }
+        ClientSession.piCliProbe = { at: now, installed };
+        return installed;
+    }
+    static invalidatePiCliProbe() {
+        ClientSession.piCliProbe = null;
+    }
     /**
      * Run a command async, collecting stdout+stderr; kills on timeout.
      * Never throws / never crashes the server: spawn errors (ENOENT etc.)
@@ -1483,6 +1535,9 @@ export class ClientSession {
                 text: `pi agent 安装失败：${err.message}`,
             });
         }
+        // The CLI may just have landed on PATH (or the install may have failed) —
+        // drop the probe cache so the next snapshot re-checks.
+        ClientSession.invalidatePiCliProbe();
         this.flushSnapshot();
     }
     /** Send a snapshot immediately (cancels any pending throttled one).
@@ -1707,6 +1762,11 @@ export class ClientSession {
      * after the current turn settles, skipping remaining planned tool calls.
      */
     queue = false) {
+        // Captured at the START (before any await): the conversation being
+        // addressed by this prompt. See the naming block below — a concurrent
+        // switch/new_chat while prompt() is in flight must never target a
+        // different conversation.
+        const conv = this.conv;
         try {
             const s = this.session;
             // Native slash commands (see NATIVE_COMMANDS) are executed here and
@@ -1722,6 +1782,19 @@ export class ClientSession {
             // is refused until admission reopens.
             if (this.quiesceBlocked())
                 return;
+            // Name the conversation from its FIRST prompt immediately, before any
+            // await: the typed text IS the name. The `conv` reference was captured
+            // before the try block, so a concurrent switch/new_chat while prompt()
+            // is in flight can never rename a DIFFERENT conversation — or miss the
+            // rename entirely. A failed send still leaves the name, which matches
+            // what the user typed intent-wise; the entry_appended fallback below
+            // re-derives it from the persisted transcript when needed.
+            if (conv.title === DEFAULT_CONV_TITLE && text.trim()) {
+                const trimmed = text.trim().replace(/\s+/g, " ");
+                conv.title =
+                    trimmed.length > 30 ? `${trimmed.slice(0, 30)}…` : trimmed;
+                this.emitConversations();
+            }
             // Attach files as independent nextTurn context messages (asides) so the
             // user message stays clean; they render as separate attachment cards.
             const asides = await buildAttachmentMessages({
@@ -1760,16 +1833,10 @@ export class ClientSession {
                 text: `提示发送失败：${err.message}`,
             });
         }
-        // Name the conversation after its first user prompt.
-        const conv = this.conv;
-        if (conv.title === DEFAULT_CONV_TITLE && text.trim()) {
-            const trimmed = text.trim().replace(/\s+/g, " ");
-            conv.title = trimmed.length > 30 ? `${trimmed.slice(0, 30)}…` : trimmed;
-            this.emitConversations();
-        }
-        // The active conversation has been continued since it was opened — it
-        // must not be dismissed when the user switches away. (Also bumps the
-        // per-project "most recently active" order used by set_cwd.)
+        // The active conversation (captured at prompt start — see above) has been
+        // continued since it was opened — it must not be dismissed when the user
+        // switches away. (Also bumps the per-project "most recently active"
+        // order used by set_cwd.)
         conv.promptedSinceActive = true;
         conv.lastActiveAt = Date.now();
         // Fresh run — restart the stall watchdog window.
@@ -2095,9 +2162,12 @@ export class ClientSession {
             return;
         const displaced = this.displaceActive();
         this.activeId = id;
-        this.cwd = this.conv.cwd;
-        // All listed conversations share the current project's cwd, so this is
-        // normally a no-op — kept defensive for stale clients.
+        const newCwd = this.conv.cwd;
+        // A listed conversation may belong to ANOTHER project (cross-project
+        // running list). Switching to it must also switch the active workspace
+        // — otherwise the file tree / session history / recent-projects order
+        // would keep showing the OLD project while the chat shows the new one.
+        const cwdChanged = newCwd !== this.cwd;
         if (displaced)
             this.removeConversation(displaced.id);
         this.conv.promptedSinceActive = false;
@@ -2108,15 +2178,33 @@ export class ClientSession {
         this.pushTerminals();
         // The switched-to conversation has its own runtime (own resource cache).
         void this.pushSlashCommands();
+        if (cwdChanged) {
+            this.cwd = newCwd;
+            // Mirror set_cwd's project-switch side-effects so the whole UI follows
+            // the new workspace, not just the chat pane.
+            try {
+                this.onCwdChanged?.(newCwd);
+            }
+            catch {
+                /* hook failure must not break the switch */
+            }
+            this.stateStore.remember(this.clientId, newCwd);
+            void this.pushProjects();
+            void this.refreshSessions();
+            void this.listFiles(undefined);
+            void this.listCommands();
+        }
         this.flushSnapshot();
     }
-    /** Push the current project's running-conversation list to the client. */
+    /** Push every running conversation across ALL projects to the client. The
+     *  running-conversation list is global so a background run from another
+     *  workspace stays visible; clicking one switches both the conversation and
+     *  its project (see switchConversation). The client groups the list by cwd. */
     emitConversations() {
         const conversations = [];
         for (const conv of this.convs.values()) {
-            // The running-conversation list is per project and only contains
-            // conversations that were displaced to the background while running.
-            if (conv.cwd !== this.cwd || !conv.listed)
+            // Only conversations that were displaced to the background while running.
+            if (!conv.listed)
                 continue;
             let messageCount = 0;
             let isStreaming = false;
@@ -2223,26 +2311,86 @@ export class ClientSession {
             });
         }
     }
-    /** Switch the active session to a persisted one (from listSessions). */
+    /** Open a persisted session as the active conversation (from listSessions).
+     *
+     * A persisted-session click must follow the same ownership rule as
+     * new_chat/switch_conversation: every open conversation keeps its own
+     * runtime. AgentSessionRuntime.switchSession() tears down (and aborts) the
+     * current runtime, which would otherwise stop a response merely because the
+     * user opened history while it was streaming.
+     */
     async switchSession(path) {
         if (this.quiesceBlocked())
             return;
+        let openedRuntime = null;
+        let openedTerminals = null;
         try {
-            await this.runtime.switchSession(path);
-            await this.bindSession();
-            // The resumed session carries its own cwd — sync it into the ACTIVE
-            // conversation (other open conversations are untouched).
-            this.conv.cwd = this.runtime.cwd;
-            this.cwd = this.runtime.cwd;
-            this.conv.title = conversationTitle(this.runtime.session);
+            const targetPath = resolve(path);
+            // A session may already be open in the running-conversation map. Reuse it
+            // instead of creating a second writer for the same JSONL transcript.
+            for (const conv of this.convs.values()) {
+                const sessionFile = conv.session.sessionFile;
+                if (sessionFile && resolve(sessionFile) === targetPath) {
+                    await this.switchConversation(conv.id);
+                    return;
+                }
+            }
+            const sessionManager = SessionManager.open(targetPath);
+            const targetCwd = sessionManager.getCwd();
+            const conversationId = this.nextConversationId();
+            openedTerminals = this.makeTerminalManager(conversationId, targetCwd);
+            openedRuntime = await createAgentSessionRuntime(this.makeRuntimeFactory(openedTerminals), {
+                cwd: targetCwd,
+                agentDir: this.agentDir,
+                sessionManager,
+            });
+            // Only displace the old active conversation after the replacement runtime
+            // is known-good. This keeps a failed history open entirely non-destructive.
+            const oldListed = this.conv.listed;
+            const displaced = this.displaceActive();
+            const openInProject = [...this.convs.values()].filter((c) => c.cwd === targetCwd).length +
+                1 -
+                (displaced?.cwd === targetCwd ? 1 : 0);
+            if (openInProject > MAX_OPEN_CONVERSATIONS) {
+                // displaceActive() may have promoted a streaming conversation into the
+                // running list. Roll that presentation-only mutation back because no
+                // switch will take place.
+                this.conv.listed = oldListed;
+                openedTerminals.killAll();
+                await openedRuntime.dispose();
+                openedRuntime = null;
+                openedTerminals = null;
+                this.emit({
+                    type: "notice",
+                    level: "warning",
+                    text: `当前项目运行的对话已达上限（${MAX_OPEN_CONVERSATIONS} 个），请先打开某个对话并离开（不继续对话）以移出列表`,
+                });
+                return;
+            }
+            const conv = this.makeConversation(openedRuntime, conversationId, openedTerminals);
             // Deliberately resumed — must not be dismissed when the user later
             // switches away without sending a new message.
-            this.conv.promptedSinceActive = true;
+            conv.promptedSinceActive = true;
+            this.convs.set(conv.id, conv);
+            this.activeId = conv.id;
+            openedRuntime = null;
+            openedTerminals = null;
+            if (displaced)
+                this.removeConversation(displaced.id);
+            await this.bindSession();
+            this.cwd = targetCwd;
+            this.conv.lastActiveAt = Date.now();
+            this.webUi.refresh();
             this.emitConversations();
-            // switchSession replaced the runtime — its resource cache is fresh.
+            this.goalSvc.emitGoalStatus();
+            this.pushTerminals();
+            // The restored conversation has a fresh project-bound resource cache.
             void this.pushSlashCommands();
         }
         catch (err) {
+            openedTerminals?.killAll();
+            if (openedRuntime)
+                await openedRuntime.dispose().catch(() => { });
             this.emit({
                 type: "notice",
                 level: "error",

package/dist/server/attachments.js

@@ -448,9 +448,9 @@ export async function buildAttachmentMessages(ctx, attachments) {
                         content: [
                             {
                                 type: "text",
-                                text: `
-<vision-bridge>
-${transcript}
+                                text: `
+<vision-bridge>
+${transcript}
 </vision-bridge>`,
                             },
                             ...(pathImg

package/dist/server/client-state.js

@@ -178,6 +178,7 @@ export class ClientStateStore {
             terminalBash: s?.settings?.terminalBash ?? false,
             terminalBashIdleMs: s?.settings?.terminalBashIdleMs ?? 15_000,
             thinkingWrap: s?.settings?.thinkingWrap ?? false,
+            toolsWrap: s?.settings?.toolsWrap ?? true,
             visionBridgeEnabled: s?.settings?.visionBridgeEnabled ?? true,
             visionBridgeModel: s?.settings?.visionBridgeModel ?? null,
             visionBridgePromptMode: s?.settings?.visionBridgePromptMode === "replace" ? "replace" : "append",
@@ -201,6 +202,7 @@ export class ClientStateStore {
             terminalBash: settings.terminalBash ?? cur.terminalBash ?? false,
             terminalBashIdleMs: settings.terminalBashIdleMs ?? cur.terminalBashIdleMs ?? 15_000,
             thinkingWrap: settings.thinkingWrap ?? cur.thinkingWrap ?? false,
+            toolsWrap: settings.toolsWrap ?? cur.toolsWrap ?? true,
             visionBridgeEnabled: settings.visionBridgeEnabled ?? cur.visionBridgeEnabled ?? true,
             visionBridgeModel: settings.visionBridgeModel ?? cur.visionBridgeModel ?? null,
             visionBridgePromptMode: settings.visionBridgePromptMode ??

package/dist/server/index.js

@@ -179,6 +179,11 @@ const here = dirname(fileURLToPath(import.meta.url)); // <pkg>/dist/server or <p
 // Resolve the package root robustly: dev runs from <repo>/server (tsx), prod
 // from <pkg>/dist/server — the ancestor that actually has package.json wins.
 function resolvePkgRoot() {
+    // PI_WEB_PKG_ROOT: Electron 桌面版打包后，server 子进程从 extraResources 目录
+    //（process.resourcesPath）加载 web/dist 和 themes。通过这个 env var 告诉
+    // server 去哪里找 pkgRoot，避免 resolvePkgRoot 的候选路径找不到 package.json。
+    if (process.env.PI_WEB_PKG_ROOT)
+        return process.env.PI_WEB_PKG_ROOT;
     const candidates = [
         resolve(here, ".."),
         resolve(here, "..", ".."),
@@ -717,6 +722,7 @@ wss.on("connection", (ws) => {
                     terminalBash: msg.terminalBash,
                     terminalBashIdleMs: msg.terminalBashIdleMs,
                     thinkingWrap: msg.thinkingWrap,
+                    toolsWrap: msg.toolsWrap,
                     visionBridgeEnabled: msg.visionBridgeEnabled,
                     visionBridgeModel: msg.visionBridgeModel,
                     visionBridgePromptMode: msg.visionBridgePromptMode,

package/dist/server/protocol-version.js

@@ -8,4 +8,4 @@
  * its own copy in web/src/protocol-version.ts; scripts/check-protocol-sync.mjs
  * verifies the two never drift.
  */
-export const PROTOCOL_VERSION = 9;
+export const PROTOCOL_VERSION = 10;

package/dist/server/settings-service.js

@@ -6,7 +6,8 @@
  * 预设存取 + 何时需要 reload」，真正动 runtime 的 session.reload() 走宿主回调
  * （reloadSession 里还会刷新斜杠命令目录）。
  */
-import { basename } from "node:path";
+import { existsSync, readdirSync } from "node:fs";
+import { basename, dirname, join } from "node:path";
 import { extensionKey } from "./client-state.js";
 import { findVisionModels, SYSTEM_PROMPT } from "./vision-bridge.js";
 export class SettingsService {
@@ -39,20 +40,88 @@ export class SettingsService {
         this.pendingReload = false;
         return v;
     }
+    /** 判断某个 skill 名是否仍存在于磁盘任何来源（agent 区 / 项目 .pi / 祖先
+     *  .agents/skills / npm 包内 skills）。被禁用且文件已删除的名字不应再
+     *  出现在设置面板，也不应留在持久化记录里。 */
+    skillStillOnDisk(name) {
+        const cwd = this.host.cwd();
+        const agentDir = this.host.agentDir();
+        const check = (base) => existsSync(join(base, name)) || existsSync(join(base, `${name}.md`));
+        // ① 用户区 <agentDir>/skills ② 项目 .pi/skills
+        if (check(join(agentDir, "skills")))
+            return true;
+        if (check(join(cwd, ".pi", "skills")))
+            return true;
+        // ③ 祖先链 .agents/skills（SDK collectAncestorAgentsSkillDirs 语义，最多上溯 6 层）
+        let dir = cwd;
+        for (let i = 0; i < 6 && dir !== dirname(dir); i++, dir = dirname(dir)) {
+            if (check(join(dir, ".agents", "skills")))
+                return true;
+        }
+        // ④ npm 包内 skills（agent 级 + 项目级，含 @scope 两级子包）
+        for (const npmRoot of [
+            join(agentDir, "npm", "node_modules"),
+            join(cwd, ".pi", "npm", "node_modules"),
+        ]) {
+            try {
+                for (const entry of readdirSync(npmRoot, { withFileTypes: true })) {
+                    if (!entry.isDirectory())
+                        continue;
+                    if (!entry.name.startsWith("@")) {
+                        if (check(join(npmRoot, entry.name, "skills")))
+                            return true;
+                    }
+                    else {
+                        for (const sub of readdirSync(join(npmRoot, entry.name), { withFileTypes: true })) {
+                            if (sub.isDirectory() && check(join(npmRoot, entry.name, sub.name, "skills"))) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+            catch {
+                // npm 目录不存在/不可读 → 不是来源
+            }
+        }
+        return false;
+    }
     push() {
         const disabledSkills = new Set(this.settings.disabledSkills);
         const reviewDisabledSkills = new Set(this.settings.reviewDisabledSkills);
         const disabledExts = new Set(this.settings.disabledExtensions);
+        let loadedSkillNames = null;
         try {
-            // Refresh the cache with the CURRENTLY loaded set (post-filter).
-            for (const s of this.host.getSession().resourceLoader.getSkills().skills) {
+            const loadedSkills = this.host.getSession().resourceLoader.getSkills().skills;
+            const loadedExts = this.host.getSession().resourceLoader.getExtensions().extensions;
+            loadedSkillNames = new Set(loadedSkills.map((s) => s.name));
+            // Prune entries that no longer exist on disk AND aren't disabled
+            // (e.g. a skill/extension file was deleted). Disabled entries are
+            // kept so they can be re-enabled even when filtered out of the loader.
+            const keepSkills = new Set([
+                ...loadedSkills.map((s) => s.name),
+                ...this.settings.disabledSkills,
+            ]);
+            const keepExts = new Set([
+                ...loadedExts.map((e) => extensionKey(e)),
+                ...this.settings.disabledExtensions,
+            ]);
+            for (const name of [...this.knownSkills.keys()]) {
+                if (!keepSkills.has(name))
+                    this.knownSkills.delete(name);
+            }
+            for (const id of [...this.knownExtensions.keys()]) {
+                if (!keepExts.has(id))
+                    this.knownExtensions.delete(id);
+            }
+            for (const s of loadedSkills) {
                 this.knownSkills.set(s.name, {
                     name: s.name,
                     description: s.description,
                     enabled: true,
                 });
             }
-            for (const e of this.host.getSession().resourceLoader.getExtensions().extensions) {
+            for (const e of loadedExts) {
                 const id = extensionKey(e);
                 const p = e.sourceInfo?.path ?? e.path;
                 this.knownExtensions.set(id, {
@@ -68,13 +137,33 @@ export class SettingsService {
         catch {
             // Session not ready yet — keep whatever we already know.
         }
-        // Disabled entries are filtered out of the loader — keep them in the
-        // panel (with the last-known description) so they can be re-enabled.
-        for (const name of this.settings.disabledSkills) {
-            if (!this.knownSkills.has(name)) {
-                this.knownSkills.set(name, { name, description: "", enabled: false });
+        // 清理“源文件已删除”的禁用残留记录：磁盘上已不存在的技能名从
+        // disabledSkills / reviewDisabledSkills 持久化记录中移除——否则每次
+        // 推送都会把已删除的 skill 以灰条形式永恒地补回面板（“关闭过的
+        // skill 被一直记录”）。session 未就绪时保守跳过。
+        if (loadedSkillNames !== null) {
+            const stale = [
+                ...new Set([...this.settings.disabledSkills, ...this.settings.reviewDisabledSkills]),
+            ].filter((name) => !loadedSkillNames.has(name) && !this.skillStillOnDisk(name));
+            if (stale.length > 0) {
+                this.settings.disabledSkills = this.settings.disabledSkills.filter((n) => !stale.includes(n));
+                this.settings.reviewDisabledSkills = this.settings.reviewDisabledSkills.filter((n) => !stale.includes(n));
+                this.host.stateStore.saveSettings(this.host.clientId, {
+                    disabledSkills: this.settings.disabledSkills,
+                    reviewDisabledSkills: this.settings.reviewDisabledSkills,
+                });
             }
         }
+        // Disabled entries that still exist on disk are re-added (with the
+        // last-known description) so they can be re-enabled; entries whose
+        // source file was deleted are dropped instead of being resurrected.
+        for (const name of this.settings.disabledSkills) {
+            if (this.knownSkills.has(name))
+                continue;
+            if (!this.skillStillOnDisk(name))
+                continue;
+            this.knownSkills.set(name, { name, description: "", enabled: false });
+        }
         for (const id of this.settings.disabledExtensions) {
             if (!this.knownExtensions.has(id)) {
                 this.knownExtensions.set(id, {
@@ -103,6 +192,7 @@ export class SettingsService {
                 terminalBash: this.settings.terminalBash,
                 terminalBashIdleMs: this.settings.terminalBashIdleMs,
                 thinkingWrap: this.settings.thinkingWrap,
+                toolsWrap: this.settings.toolsWrap,
                 visionBridgeEnabled: this.settings.visionBridgeEnabled,
                 visionBridgeModel: this.settings.visionBridgeModel,
                 visionBridgePromptMode: this.settings.visionBridgePromptMode,
@@ -174,6 +264,9 @@ export class SettingsService {
         if (partial.thinkingWrap !== undefined) {
             this.settings.thinkingWrap = partial.thinkingWrap;
         }
+        if (partial.toolsWrap !== undefined) {
+            this.settings.toolsWrap = partial.toolsWrap;
+        }
         if (partial.visionBridgeEnabled !== undefined) {
             this.settings.visionBridgeEnabled = partial.visionBridgeEnabled;
         }
@@ -245,10 +338,11 @@ export class SettingsService {
             reviewDisabledSkills: [
                 ...(p.reviewDisabledSkills ?? this.settings.reviewDisabledSkills),
             ],
-            // Presets don't capture vision-bridge prefs — keep the current ones.
-            visionBridgeEnabled: this.settings.visionBridgeEnabled,
             // 纯 UI 偏好不进预设——保留当前值。
             thinkingWrap: this.settings.thinkingWrap,
+            toolsWrap: this.settings.toolsWrap,
+            // Presets don't capture vision-bridge prefs — keep the current ones.
+            visionBridgeEnabled: this.settings.visionBridgeEnabled,
             visionBridgeModel: this.settings.visionBridgeModel,
             visionBridgePromptMode: this.settings.visionBridgePromptMode,
             visionBridgePrompt: this.settings.visionBridgePrompt,

package/dist/server/terminals.js

@@ -1230,11 +1230,11 @@ export const TERMINAL_TOOL_NAMES = [
 /** System-prompt guidance teaching the model WHEN to prefer the terminal tools
  *  over one-shot bash. Without it models almost never pick them — bash returns
  *  complete output in a single call, so it always wins on convenience. */
-export const TERMINAL_TOOLS_GUIDANCE = `Persistent interactive terminal tools are available (terminal_create / terminal_list / terminal_close / terminal_input / terminal_key / terminal_read / terminal_wait). The one-shot bash tool stays the DEFAULT for ordinary commands - it runs once and returns the full output. Switch to the terminal tools only when:
-- The program is interactive or TUI-based (REPLs like python/node, vim/htop, installers asking y/n, anything waiting on stdin).
-- You start a long-running server or watcher and want to keep watching its output (terminal_read with waitMs), send keys to it later (e.g. interrupt via terminal_key with Ctrl+c), or block until a backgrounded command finishes without polling (terminal_wait).
-- The user explicitly asks you to work in the visible terminal panel.
-Liveness watchdog: terminals you touched (create/input/key) are monitored - if one goes silent with no new output while you are working (default 15s), an automatic system reminder is injected into the conversation. Treat it as a prompt to check that terminal (terminal_read), respond to an input prompt (terminal_input / terminal_key), or close it (terminal_close) if it is no longer needed.
+export const TERMINAL_TOOLS_GUIDANCE = `Persistent interactive terminal tools are available (terminal_create / terminal_list / terminal_close / terminal_input / terminal_key / terminal_read / terminal_wait). The one-shot bash tool stays the DEFAULT for ordinary commands - it runs once and returns the full output. Switch to the terminal tools only when:
+- The program is interactive or TUI-based (REPLs like python/node, vim/htop, installers asking y/n, anything waiting on stdin).
+- You start a long-running server or watcher and want to keep watching its output (terminal_read with waitMs), send keys to it later (e.g. interrupt via terminal_key with Ctrl+c), or block until a backgrounded command finishes without polling (terminal_wait).
+- The user explicitly asks you to work in the visible terminal panel.
+Liveness watchdog: terminals you touched (create/input/key) are monitored - if one goes silent with no new output while you are working (default 15s), an automatic system reminder is injected into the conversation. Treat it as a prompt to check that terminal (terminal_read), respond to an input prompt (terminal_input / terminal_key), or close it (terminal_close) if it is no longer needed.
 Do NOT use them for simple one-shot commands; bash remains cheaper and simpler there.`;
 /** Build the agent-facing persistent terminal tools for one conversation. */
 export function makePersistentTerminalTools(terminals, cwd) {