pi-web-ui 0.31.0 → 0.34.0

package/dist/server/agent-service.js

@@ -11,12 +11,13 @@
  * so reconnects just re-request a snapshot.
  */
 import { spawn } from "node:child_process";
-import { existsSync, readFileSync, statSync, writeFileSync, mkdirSync, watch, } from "node:fs";
+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";
 import { createAgentSessionFromServices, createAgentSessionRuntime, createAgentSessionServices, createBashTool, createLocalBashOperations, defineTool, getAgentDir, ModelRuntime, SessionManager, VERSION, } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { BgServerTracker } from "./bg-servers.js";
+import { syncPluginToolsIntoSession } from "./plugins.js";
 import { SettingsService } from "./settings-service.js";
 import { GoalService } from "./goal-service.js";
 import { SlashCommandsService, parseSlash } from "./slash-commands.js";
@@ -24,7 +25,7 @@ import { ModelAdminService } from "./model-admin.js";
 import { FilesService, workspacePath } from "./files-service.js";
 import { isExtensionDisabled, ClientStateStore, } from "./client-state.js";
 import { saveUpload } from "./uploads.js";
-import { makePersistentTerminalTools, TERMINAL_TOOLS_GUIDANCE, TERMINAL_TOOL_NAMES, } from "./terminals.js";
+import { makePersistentTerminalTools, makeTerminalBashTool, stripAnsi, TERMINAL_TOOLS_GUIDANCE, TERMINAL_TOOL_NAMES, } from "./terminals.js";
 import { WebUIContext } from "./webui-context.js";
 import { buildAttachmentMessages, parseModelSpec, } from "./attachments.js";
 import { serializeMessage, serializeStreamingMessage, } from "./serialize.js";
@@ -126,6 +127,48 @@ function makeKillableBashTool(cwd, kills) {
         execute: (toolCallId, params, signal, onUpdate) => tool.execute(toolCallId, params, signal, onUpdate),
     };
 }
+/**
+ * 动态分流 bash：调用时按设置决定走哪套实现——「终端接管 bash」开关因此
+ * 即时生效（customTools 在 runtime 创建时固定，不能在创建时二选一）。
+ */
+function makeAdaptiveBashTool(killable, terminalBacked, useTerminal) {
+    return {
+        ...killable,
+        execute: (id, params, signal, onUpdate, ctx) => (useTerminal() ? terminalBacked : killable).execute(id, params, signal, onUpdate, ctx),
+    };
+}
+/**
+ * 插件结构化工具 → SDK ToolDefinition。
+ * execute 返回值宽容处理：{content,details} 原样收编；字符串/对象包成文本块。
+ */
+function pluginToolToDefinition(tool) {
+    const normalize = (result) => {
+        if (result &&
+            typeof result === "object" &&
+            Array.isArray(result.content)) {
+            return result;
+        }
+        const text = typeof result === "string" ? result : JSON.stringify(result ?? null, null, 2);
+        return { content: [{ type: "text", text }] };
+    };
+    return {
+        name: tool.name,
+        label: tool.label ?? tool.name,
+        description: tool.description,
+        promptSnippet: tool.promptSnippet,
+        promptGuidelines: tool.promptGuidelines,
+        parameters: (tool.parameters ?? {
+            type: "object",
+            properties: {},
+        }),
+        execute: async (toolCallId, params, signal, onUpdate) => {
+            const raw = await tool.execute(toolCallId, params, signal, onUpdate
+                ? (partial) => onUpdate(normalize(partial))
+                : undefined);
+            return normalize(raw);
+        },
+    };
+}
 /**
  * Cheap per-message discriminator for the serialization cache key. Persisted
  * message content never changes, so this is stable across snapshots, while
@@ -272,6 +315,13 @@ export class ClientSession {
         flushSnapshot: () => this.flushSnapshot(),
         isDisposed: () => this.disposed,
     });
+    /** index.ts 注入（经 AgentService 拷贝到每个新会话）：把 SDK 工具执行事件转发给
+     *  插件（PluginManager.emitToolEvent）。未设置时不做任何事。 */
+    onToolEvent = undefined;
+    /** index.ts 注入：读取插件当前注册的 AI 工具（attach 时拷贝到每个新会话）。 */
+    pluginToolsProvider = undefined;
+    /** 上一轮注入会话的插件工具名集合（用于检测注销/移除）。 */
+    appliedPluginToolNames = new Set();
     /** The active conversation (all session operations target it). */
     get conv() {
         const conv = this.convs.get(this.activeId);
@@ -299,7 +349,68 @@ export class ClientSession {
         return (conversationId ? this.convs.get(conversationId) : this.conv)?.cwd ?? this.cwd;
     }
     makeTerminalManager(conversationId, cwd) {
-        return new TerminalManager((msg) => this.emitTerminal(conversationId, msg), cwd);
+        const mgr = new TerminalManager((msg) => this.emitTerminal(conversationId, msg), cwd);
+        // 终端活力检测：AI 触碰过的终端静默 ≥ 阈值（PI_WEB_TERMINAL_IDLE_MS，
+        // 默认 15s）且该对话正在运行时，注入一条 steer 消息唤醒 AI 去检查。
+        mgr.onAgentIdle = (terminalId, idleMs, title) => this.notifyTerminalIdle(conversationId, terminalId, idleMs, title);
+        return mgr;
+    }
+    /** 终端活力提醒：仅在该对话正在流式运行时注入（sendUserMessage 在流式中
+     *  即 steer 语义——当前回合结算后送达，agent 立即响应）；空闲时不打扰。
+     *  一次性语义由 TerminalManager 保证（触发后解除武装，agent 再次触碰才
+     *  重新计时），不会反复刷屏。 */
+    notifyTerminalIdle(conversationId, terminalId, idleMs, title) {
+        const conv = this.convs.get(conversationId);
+        if (!conv || this.disposed)
+            return;
+        if (!conv.runtime.session.isStreaming)
+            return;
+        const seconds = Math.max(1, Math.round(idleMs / 1000));
+        void conv.runtime.session
+            .sendUserMessage(`（系统自动提醒：你启动的终端「${title}」已连续 ${seconds} 秒没有任何新输出。` +
+            `进程可能在等待输入、卡住或已挂起。请用 terminal_read 查看它的当前状态；` +
+            `若在等交互就用 terminal_input / terminal_key 回应；确认不再需要就 terminal_close 关掉它。）`)
+            .catch(() => {
+            // best effort —— 注入失败不影响终端本身
+        });
+    }
+    /**
+     * 终端接管的 bash 静默转后台后的完成通知：命令真正结束时主动告诉 AI。
+     * 流式中 → sendUserMessage（steer，立即唤醒处理）；空闲时 → sendCustomMessage
+     * nextTurn 排队（不唤醒 agent、不耗 token，下次对话自动带上）。
+     */
+    notifyTerminalBashDone(terminals, info) {
+        const conv = [...this.convs.values()].find((c) => c.terminals === terminals);
+        if (!conv || this.disposed)
+            return;
+        let tail = "";
+        try {
+            const end = terminals.endCursor(info.terminalId);
+            if (end !== null) {
+                tail = terminals.read(info.terminalId, Math.max(0, end - 4000))?.data ?? "";
+            }
+        }
+        catch {
+            // 终端可能已被关闭
+        }
+        const exitText = info.exitCode === null ? "终端已关闭" : `退出码 ${info.exitCode}`;
+        const cmdShort = info.command.length > 120 ? `${info.command.slice(0, 120)}…` : info.command;
+        const text = `（系统：你之前在终端 ${info.terminalId} 后台运行的命令已结束（${exitText}）：${cmdShort}\n` +
+            `最后输出：\n${stripAnsi(tail).trim() || "（无输出）"}）`;
+        const session = conv.runtime.session;
+        if (session.isStreaming) {
+            void session.sendUserMessage(text).catch(() => { });
+        }
+        else {
+            // 空闲时不唤醒 agent——排队为 nextTurn 上下文，下次对话自动可见。
+            void session
+                .sendCustomMessage({
+                customType: "terminal-bash-done",
+                content: [{ type: "text", text }],
+                display: true,
+            })
+                .catch(() => { });
+        }
     }
     emitTerminal(conversationId, msg) {
         // Background conversations keep collecting output in their own PTY buffer.
@@ -356,6 +467,20 @@ export class ClientSession {
         }
         return "";
     }
+    /** The FULL system prompt actually in effect right now (AgentSession getter,
+     *  includes the append/replace override + auto-appended sections like
+     *  project context, skills and tool guidance). Read-only view source for
+     *  the settings panel. */
+    effectiveSystemPrompt() {
+        try {
+            const sp = this.session.systemPrompt;
+            return typeof sp === "string" ? sp : "";
+        }
+        catch {
+            // Session not ready yet.
+            return "";
+        }
+    }
     /** Web-facing extension UI context (widgets, notifications). */
     webUi = new WebUIContext((msg) => this.emit(msg));
     widgetsTimer = null;
@@ -375,6 +500,11 @@ export class ClientSession {
     /** Messages array as of the last emitted snapshot/delta — identity-walked
      *  against the current array to detect append-only growth. */
     emittedMessages = null;
+    /** Conversation whose messages emittedMessages belongs to. A conversation
+     *  switch (set_cwd / new_chat / switch_*) must fall back to a FULL snapshot:
+     *  two empty conversations have identical (empty) arrays, so the identity
+     *  walk alone would misread the switch as "nothing changed" → delta. */
+    emittedConvId = null;
     /** snapRev value at which emittedMessages was captured. */
     emittedRev = 0;
     /**
@@ -420,6 +550,7 @@ export class ClientSession {
                 await this.pushSlashCommands();
             },
             effectiveDefaultSystemPrompt: () => this.effectiveDefaultSystemPrompt(),
+            effectiveSystemPrompt: () => this.effectiveSystemPrompt(),
         });
         this.goalSvc = new GoalService({
             clientId,
@@ -550,8 +681,21 @@ export class ClientSession {
                 // 覆盖），执行时把自己的 AbortController 注册进客户端集合——
                 // abortBash() 只杀这些命令，agent run 与对话继续。
                 customTools: [
-                    makeKillableBashTool(effectiveCwd, this.bashKills),
+                    // bash 双实现动态分流：「终端接管」开启时命令跑进持久可见终端
+                    // （保留 shell 状态、静默自动转后台），关闭时是原生 killable bash。
+                    makeAdaptiveBashTool(makeKillableBashTool(effectiveCwd, this.bashKills), makeTerminalBashTool(terminals, {
+                        cwd: effectiveCwd,
+                        idleMs: () => this.settingsSvc.current.terminalBash
+                            ? Math.max(0, Math.floor(this.settingsSvc.current.terminalBashIdleMs) ||
+                                0)
+                            : 0,
+                        kills: this.bashKills,
+                        notifyBackgroundDone: (info) => this.notifyTerminalBashDone(terminals, info),
+                    }), () => this.settingsSvc.current.terminalBash),
                     ...makePersistentTerminalTools(terminals, effectiveCwd),
+                    // 插件注册的 AI 工具（创建时刻的实时快照；后续注册经
+                    // refreshPluginTools 动态补入已有会话）。
+                    ...(this.pluginToolsProvider?.() ?? []).map(pluginToolToDefinition),
                 ],
             });
             // 终端工具开关从创建起就生效（工具始终注册进注册表，只调活跃集）。
@@ -797,6 +941,8 @@ export class ClientSession {
                     this.bg.snapshotBefore();
                 }
                 this.armToolWatchdog(conv, event.toolCallId);
+                // 插件扩展点：工具开始执行（异常由 emitToolEvent 隔离）。
+                this.onToolEvent?.({ phase: "start", toolName: event.toolName, conversationId: conv.id });
                 break;
             }
             case "tool_execution_end": {
@@ -808,6 +954,14 @@ export class ClientSession {
                 if (event.toolName === "bash")
                     void this.bg.trackAfterBash();
                 const durationMs = startedAt !== undefined ? Date.now() - startedAt : undefined;
+                // 插件扩展点：工具结束执行（带耗时与错误标志）。
+                this.onToolEvent?.({
+                    phase: "end",
+                    toolName: event.toolName,
+                    conversationId: conv.id,
+                    ...(durationMs !== undefined ? { durationMs } : {}),
+                    isError: event.isError,
+                });
                 // The bash tool does not put its exit code in result.details — on
                 // failure it throws "Command exited with code N" and the agent
                 // wraps that into the error result text. Try details first (future
@@ -1107,7 +1261,10 @@ export class ClientSession {
             return;
         const cur = this.currentMessages();
         const prev = this.emittedMessages;
-        let incremental = !forceFull && prev !== null && prev.length <= cur.length;
+        let incremental = !forceFull &&
+            prev !== null &&
+            this.emittedConvId === this.activeId &&
+            prev.length <= cur.length;
         if (incremental && prev) {
             for (let i = 0; i < prev.length; i++) {
                 if (prev[i] !== cur[i]) {
@@ -1120,6 +1277,7 @@ export class ClientSession {
         if (incremental && prev) {
             const baseRev = this.emittedRev;
             this.emittedMessages = cur;
+            this.emittedConvId = this.activeId;
             this.emittedRev = rev;
             this.emit({
                 type: "snapshot_delta",
@@ -1132,6 +1290,7 @@ export class ClientSession {
         }
         else {
             this.emittedMessages = cur;
+            this.emittedConvId = this.activeId;
             this.emittedRev = rev;
             this.emit({
                 type: "snapshot",
@@ -1238,13 +1397,6 @@ export class ClientSession {
         }
         return 0;
     }
-    /** True once updateApp succeeded — the process must restart to run new code. */
-    pendingRestart = false;
-    /**
-     * Set by index.ts: called after a successful self-update; returns whether
-     * the process is going to restart itself (so the notice can say so).
-     */
-    onUpdateReady = undefined;
     /** Set by index.ts: called when /pi-web-ui:quit is invoked. */
     onQuit = undefined;
     /** Ask the npm registry for the latest pi-web-ui version and report it. */
@@ -1269,7 +1421,6 @@ export class ClientSession {
                 latest,
                 latestPublishedAt,
                 upToDate,
-                pendingRestart: this.pendingRestart,
             });
         }
         catch (err) {
@@ -1279,115 +1430,10 @@ export class ClientSession {
                 latest: null,
                 latestPublishedAt: null,
                 upToDate: false,
-                pendingRestart: this.pendingRestart,
                 error: `检查更新失败：${err.message}`,
             });
         }
     }
-    /**
-     * After `npm i -g`, confirm the on-disk package this process serves from
-     * actually changed to the new version and is complete. Windows npm updates
-     * can fail partway (locked files / Defender / npm rollback) and leave the
-     * global install without its bin links — restarting into that is a silent
-     * crash (web/dist missing + `pi-web-ui` no longer on PATH). Returns null
-     * when OK, else a human-readable problem description.
-     */
-    static verifyGlobalInstall() {
-        try {
-            const here = dirname(fileURLToPath(import.meta.url));
-            const pkgRoot = resolve(here, "..", "..");
-            const pkg = JSON.parse(readFileSync(join(pkgRoot, "package.json"), "utf8"));
-            if (!pkg.version || pkg.version === ClientSession.currentAppVersion()) {
-                return `安装目录版本未变化（${pkg.version ?? "未知"}）`;
-            }
-            if (!existsSync(join(pkgRoot, "web", "dist", "index.html"))) {
-                return "web/dist/index.html 缺失（前端产物未安装完整）";
-            }
-            if (!existsSync(join(pkgRoot, "bin", "pi-web-ui.mjs"))) {
-                return "bin/pi-web-ui.mjs 缺失";
-            }
-            if (process.platform === "win32") {
-                const prefix = dirname(process.execPath);
-                const hasShim = existsSync(join(prefix, "pi-web-ui.cmd")) ||
-                    existsSync(join(prefix, "pi-web-ui.ps1"));
-                if (!hasShim)
-                    return "pi-web-ui 命令入口（bin 链接）未生成";
-            }
-            return null;
-        }
-        catch (err) {
-            return `读取安装目录失败：${err.message}`;
-        }
-    }
-    /** npm i -g pi-web-ui@latest — the new code only takes effect after a restart. */
-    async updateApp() {
-        try {
-            this.emit({
-                type: "notice",
-                level: "info",
-                text: "正在更新 pi-web-ui（npm i -g pi-web-ui@latest）…",
-            });
-            const { code, out } = await this.runAsync("npm", ["i", "-g", "pi-web-ui@latest"], 180_000);
-            if (code !== 0) {
-                this.emit({
-                    type: "update_result",
-                    ok: false,
-                    detail: `npm i 失败（${code ?? "timeout"}）：${out.slice(0, 400)}`,
-                });
-                this.emit({
-                    type: "notice",
-                    level: "error",
-                    text: `更新 pi-web-ui 失败（${code ?? "timeout"}）：${out.slice(0, 300)}`,
-                });
-                return;
-            }
-            // npm reported success, but on Windows the replacement can be partial
-            // (locked files, rollback) — restarting into a broken install is a
-            // crash with no hint. Verify before handing over.
-            const problem = ClientSession.verifyGlobalInstall();
-            if (problem) {
-                this.emit({
-                    type: "update_result",
-                    ok: false,
-                    detail: `npm i 成功但安装不完整（${problem}）。请手动执行 npm i -g pi-web-ui@latest 修复后再重启服务。`,
-                });
-                this.emit({
-                    type: "notice",
-                    level: "error",
-                    text: `更新未完整生效（${problem}）。请手动执行 npm i -g pi-web-ui@latest 修复`,
-                });
-                return;
-            }
-            this.pendingRestart = true;
-            this.emit({
-                type: "update_result",
-                ok: true,
-                detail: out.slice(0, 400),
-            });
-            const autoRestart = this.onUpdateReady?.() ?? false;
-            this.emit({
-                type: "notice",
-                level: "info",
-                text: autoRestart
-                    ? "✅ 已更新 pi-web-ui，正在自动重启…"
-                    : "✅ 已更新 pi-web-ui，重启服务后生效（pi-web-ui server restart）",
-            });
-        }
-        catch (err) {
-            this.emit({
-                type: "update_result",
-                ok: false,
-                detail: String(err),
-            });
-            this.emit({
-                type: "notice",
-                level: "error",
-                text: `更新 pi-web-ui 失败：${err.message}`,
-            });
-        }
-        // Re-check so the UI reflects the new state (pendingRestart included).
-        void this.checkUpdate();
-    }
     async installPiAgent() {
         try {
             mkdirSync(this.agentDir, { recursive: true });
@@ -1491,6 +1537,12 @@ export class ClientSession {
     refreshProviderModels(providerId, reqId) {
         return this.modelAdmin.refreshProviderModels(providerId, reqId);
     }
+    /** Copy a built-in provider into an editable custom-provider draft
+     *  (clone_provider_result) — lets the user run a second API key without
+     *  overwriting the built-in one. */
+    cloneProvider(providerId, reqId) {
+        return this.modelAdmin.cloneProvider(providerId, reqId);
+    }
     saveModelConfig(providerId, config) {
         return this.modelAdmin.saveModelConfig(providerId, config);
     }
@@ -1551,6 +1603,24 @@ export class ClientSession {
             // Session 未就绪——下次创建/reload 会再应用。
         }
     }
+    /** 把插件 AI 工具同步进一个已存在的会话（新增/更新/移除）。
+     *  实际 diff 逻辑在 plugins.ts 的 syncPluginToolsIntoSession（可单测）。 */
+    syncPluginTools(session) {
+        try {
+            const defs = (this.pluginToolsProvider?.() ?? []).map(pluginToolToDefinition);
+            const next = syncPluginToolsIntoSession(session, defs, this.appliedPluginToolNames);
+            if (next)
+                this.appliedPluginToolNames = new Set(next);
+        }
+        catch (err) {
+            console.error("[plugins] sync tools to session failed:", err);
+        }
+    }
+    /** index.ts 经 pluginMgr.onAgentToolsChanged 触发：把插件 AI 工具推入全部会话。 */
+    refreshPluginTools() {
+        for (const conv of this.convs.values())
+            this.syncPluginTools(conv.session);
+    }
     async applySettingsReload() {
         // 兼容旧入口：reload + 刷目录在宿主回调里完成
         return this.settingsSvc.applyRuntime();
@@ -2040,6 +2110,48 @@ export class ClientSession {
             this.emit({ type: "sessions", sessions: [] });
         }
     }
+    /** Remove an entry from the client's recent-project list (UI state only). */
+    async removeProject(path) {
+        this.stateStore.removeProject(this.clientId, path);
+        await this.pushProjects();
+    }
+    /** Permanently delete a persisted session transcript file (history list ✕). */
+    async deleteSession(path) {
+        try {
+            const abs = resolve(path);
+            // Guardrail: only transcripts under the shared sessions root
+            // (<agentDir>/sessions/) may be deleted — never arbitrary files.
+            const sessionsRoot = resolve(this.agentDir, "sessions");
+            if (!abs.startsWith(sessionsRoot + sep)) {
+                this.emit({
+                    type: "notice",
+                    level: "error",
+                    text: "只能删除会话目录中的对话记录",
+                });
+                return;
+            }
+            // Refuse to pull the file out from under a live conversation.
+            for (const conv of this.convs.values()) {
+                if (conv.session.sessionFile === abs) {
+                    this.emit({
+                        type: "notice",
+                        level: "warning",
+                        text: "该对话正在使用中，请先切换到其他对话再删除",
+                    });
+                    return;
+                }
+            }
+            rmSync(abs, { force: true });
+            await this.refreshSessions();
+        }
+        catch (err) {
+            this.emit({
+                type: "notice",
+                level: "error",
+                text: `删除会话失败：${err.message}`,
+            });
+        }
+    }
     /** Switch the active session to a persisted one (from listSessions). */
     async switchSession(path) {
         if (this.quiesceBlocked())
@@ -2160,6 +2272,7 @@ export class ClientSession {
     async pushProjects() {
         try {
             const saved = this.stateStore.get(this.clientId);
+            const removedProjects = new Set(this.stateStore.getRemovedProjects(this.clientId));
             const map = new Map();
             for (const p of saved.projects)
                 map.set(p.path, p.lastUsed);
@@ -2173,9 +2286,10 @@ export class ClientSession {
                 }
             }
             // Only keep directories that still exist — a deleted/unmounted workspace
-            // is useless in the picker.
+            // is useless in the picker. Tombstoned entries (explicitly removed by
+            // the user) stay hidden even though session files still mention them.
             const projects = [...map.entries()]
-                .filter(([path]) => existsSync(path))
+                .filter(([path]) => !removedProjects.has(path) && existsSync(path))
                 .map(([path, lastUsed]) => ({ path, lastUsed }))
                 .sort((a, b) => b.lastUsed - a.lastUsed)
                 .slice(0, 20);
@@ -2473,6 +2587,10 @@ export class ClientSession {
 }
 export class AgentService {
     cwd;
+    /** index.ts 注入：SDK 工具执行事件的插件转发钩子，attach 时拷贝到每个新会话。 */
+    onToolEvent = undefined;
+    /** index.ts 注入：读取插件当前注册的 AI 工具（attach 时拷贝到每个新会话）。 */
+    pluginToolsProvider = undefined;
     clients = new Map();
     /** Quiesce (draining) state — the service refuses NEW work (prompts, forks,
      *  session resumes, new clients) so a deploy/upgrade/backup can stop cleanly
@@ -2485,11 +2603,6 @@ export class AgentService {
     socketCount = 0;
     pending = new Map();
     stateStore;
-    /**
-     * Set by index.ts: called by a client session after a successful
-     * self-update; returns whether the process will restart itself.
-     */
-    onUpdateReady = undefined;
     /** Set by index.ts: called when /pi-web-ui:quit is invoked. */
     onQuit = undefined;
     constructor(cwd, stateFile) {
@@ -2603,11 +2716,17 @@ export class AgentService {
         cs.notifyInterrupted(this.stateStore.takeInterrupted(clientId));
         cs.attachSink(send);
         // Forward hooks (set once by index.ts) to every session.
-        cs.onUpdateReady = this.onUpdateReady;
         cs.onQuit = this.onQuit;
+        cs.onToolEvent = this.onToolEvent;
+        cs.pluginToolsProvider = this.pluginToolsProvider;
         cs.isQuiesced = () => this.quiesced;
         return cs;
     }
+    /** 插件 AI 工具集合变化（注册/注销）时由 index.ts 触发：推送到所有客户端的全部会话。 */
+    applyPluginAgentTools() {
+        for (const cs of this.clients.values())
+            cs.refreshPluginTools();
+    }
     /** Remove a socket from a client's broadcast set (called on socket close). */
     detach(clientId, send) {
         this.clients.get(clientId)?.detachSink(send);

package/dist/server/client-state.js

@@ -97,8 +97,31 @@ export class ClientStateStore {
             { path: cwd, lastUsed: now },
             ...state.projects.filter((p) => p.path !== cwd),
         ].slice(0, 30);
+        // Opening the workspace again clears its removal tombstone.
+        if (state.removedProjects?.length) {
+            state.removedProjects = state.removedProjects.filter((p) => p !== cwd);
+        }
+        this.save();
+    }
+    /** Drop one workspace from the recent-project list (user-requested removal).
+     *  Records a tombstone too: pushProjects() re-discovers cwds from session
+     *  files on every listing, so without it the entry would instantly reappear. */
+    removeProject(clientId, cwd) {
+        const all = this.load();
+        const state = (all[clientId] ??= { projects: [] });
+        state.projects = state.projects.filter((p) => p.path !== cwd);
+        if (state.lastCwd === cwd)
+            delete state.lastCwd;
+        const removed = new Set(state.removedProjects ?? []);
+        removed.add(cwd);
+        state.removedProjects = [...removed];
         this.save();
     }
+    /** Tombstoned projects (explicitly removed by the user) for filtering the
+     *  merged recent-project list. */
+    getRemovedProjects(clientId) {
+        return this.load()[clientId]?.removedProjects ?? [];
+    }
     /** Last-used goal/review prefs for a client, or undefined if never set. */
     getGoalPrefs(clientId) {
         const s = this.load()[clientId];
@@ -152,12 +175,15 @@ export class ClientStateStore {
             disabledSkills: s?.settings?.disabledSkills ?? [],
             disabledExtensions: s?.settings?.disabledExtensions ?? [],
             terminalToolsEnabled: s?.settings?.terminalToolsEnabled ?? true,
+            terminalBash: s?.settings?.terminalBash ?? false,
+            terminalBashIdleMs: s?.settings?.terminalBashIdleMs ?? 15_000,
             visionBridgeEnabled: s?.settings?.visionBridgeEnabled ?? true,
             visionBridgeModel: s?.settings?.visionBridgeModel ?? null,
             visionBridgePromptMode: s?.settings?.visionBridgePromptMode === "replace" ? "replace" : "append",
             visionBridgePrompt: s?.settings?.visionBridgePrompt ?? "",
             reviewPrompt: s?.settings?.reviewPrompt ?? "",
             reviewDisabledSkills: s?.settings?.reviewDisabledSkills ?? [],
+            disabledPlugins: s?.settings?.disabledPlugins ?? [],
         };
     }
     /** Persist the client's settings-panel state (partial merge). */
@@ -171,6 +197,8 @@ export class ClientStateStore {
             disabledSkills: settings.disabledSkills ?? cur.disabledSkills ?? [],
             disabledExtensions: settings.disabledExtensions ?? cur.disabledExtensions ?? [],
             terminalToolsEnabled: settings.terminalToolsEnabled ?? cur.terminalToolsEnabled ?? true,
+            terminalBash: settings.terminalBash ?? cur.terminalBash ?? false,
+            terminalBashIdleMs: settings.terminalBashIdleMs ?? cur.terminalBashIdleMs ?? 15_000,
             visionBridgeEnabled: settings.visionBridgeEnabled ?? cur.visionBridgeEnabled ?? true,
             visionBridgeModel: settings.visionBridgeModel ?? cur.visionBridgeModel ?? null,
             visionBridgePromptMode: settings.visionBridgePromptMode ??
@@ -179,6 +207,7 @@ export class ClientStateStore {
             visionBridgePrompt: settings.visionBridgePrompt ?? cur.visionBridgePrompt ?? "",
             reviewPrompt: settings.reviewPrompt ?? cur.reviewPrompt ?? "",
             reviewDisabledSkills: settings.reviewDisabledSkills ?? cur.reviewDisabledSkills ?? [],
+            disabledPlugins: settings.disabledPlugins ?? cur.disabledPlugins ?? [],
         };
         this.save();
     }