pi-web-ui 0.93.0 → 0.94.0

package/CHANGELOG.md

@@ -10,14 +10,29 @@
 
 ## [Unreleased]
 
+## [0.94.0] — 2026-09-22
+
+### Added
+
+- **复制为图片：预览面板 + 标题 / 边框 / 水印 + 多轮勾选拼接（#274）** — 点「复制为图片」打开右侧停靠面板（不挡对话）。可选标题、边框、自定义水印（默认 `pi-web-ui`）；对话里勾选多条消息，按时间线从早到晚竖排拼成一张 2x PNG。面板提供「包含工具调用 / 包含思考过程」两个开关（默认关），勾上后把对应块加进图并强制展开，不改对话里原有折叠状态。超长则降到 1x 或拒绝复制，避免黑图。
+- **压缩软上限（Soft Cap）支持人性化 tokens 单位输入与纯数字智能识别** — 设置「消息显示」页与按模型覆盖的压缩阈值输入框全面支持人类习惯的缩写（如 `300k`、`1.5M`、`300,000`、`300_000`）；纯数字且 `<= 1000`（如 `300`、`128`、`64`）自动智能识别为 K tokens（`300` → `300,000`），回显自动格式化为整千/整百万可读缩写，避免手滑漏输 0。
+- **全局跨标签页/重启共享的项目模型与 Provider Key 记忆** — 将项目绑定的模型与服务商密钥提升至全局持久化层（`GLOBAL_SETTINGS_KEY`）。新开标签页、切换工作区或重启浏览器时，确定恢复该项目最后使用的模型与密钥；全新空白会话创建时提前解析并注入目标模型，且在 `setModel` 前优先恢复对应的 provider key，彻底解决新对话鉴权失败与回退内置硬编码模型的问题。
+
+### Changed
+
+- **官方插件清单内置为默认来源（`PI_WEB_PLUGIN_CATALOG_URL`）** —— 服务端启动时未配置该环境变量时，自动拉取官方社区清单 `https://xing-shuyin.github.io/pi-web-ui-plugins/catalog.json` 并同步进插件市场列表（**仅更新列表供用户按需安装，不自动安装插件**）；显式设为空串或 `off`/`0`/`false`/`no` 可关闭；仅当显式设置 `PI_WEB_PLUGIN_CATALOG_INSTALL=1` 时才在开机时顺手自动安装全部插件（headless/容器预置镜像场景）。
+- **界面交互防选区干扰与遮罩层重绘优化** —— 侧边栏（会话列表、项目列表、文件树）、顶栏、右键菜单、消息头部及技能卡片头部等不可交互文本区域增加 `user-select: none`，防止高频双击或拖拽时意外选中文本；弹窗与文件预览遮罩层移除 `backdrop-filter: blur` 改用纯色半透明实底，并添加 `overscroll-behavior: contain` 与硬件加速，消除滚动穿透并显著降低大消息流时的重绘负担。
+
+### Fixed
+
+- **复制为图片浅色主题色差（#273）** — html-to-image 把 `color-mix(...)` / 半透明 `rgba` 画到默认黑画布上，浅色气泡变成深紫、深字叠黑底。导出前把计算色拍成不透明 rgb，画布底用主题 `--card-bg`/`--bg` 实底，并去掉 `backdrop-filter`（否则 SVG 里会变成黑罩）。
+
 <!-- auto-i18n:start -->
 ### i18n
 
-- 前端新增 key（34）：`themeLight`、`themeDark`、`quickPhrasesSendTip`、`persistSubagent`、`toolImages`、`toolImagesDesc`、`toolImageZoom`、`toolWatchdogTimeout`、`toolWatchdogTimeoutDesc`、`toolWatchdogOff`、`uiLayoutContextToolcall`、`pluginSettingsTitle`、`pluginSettingsShow`、`pluginSettingsHide`、`claimFilesEnabledDesc`、`claimFilesOffHint`、`toolInfoMenuLabel`、`toolInfoTitle`、`toolInfoLoading`、`toolInfoUnsupported`、`toolInfoMissing`、`toolInfoActive`、`toolInfoInactive`、`toolInfoSource`、`toolInfoDescription`、`toolInfoNoDescription`、`toolInfoPromptSnippet`、`toolInfoGuidelines`、`toolInfoParams`、`toolInfoParamsNone`、`toolInfoSchemaDropped`、`toolInfoRawSchema`、`toolInfoRequired`、`toolInfoFootnote`
-- 前端中文变更（1）：`elsewhereTip`
-- 前端英文变更（1）：`elsewhereTip`
-- 服务端新增 key（1）：`agent.conv.limit.reached`
-- 服务端文案变更（2）：`subagents.spawn.started`、`subagents.list.empty`
+- 前端新增 key（13）：`saveAsImage`、`copyImageBtn`、`savingImage`、`imageTitle`、`imageTitlePlaceholder`、`imageBorder`、`imageWatermark`、`imageWatermarkPlaceholder`、`exportSelectHint`、`exportTooLong`、`exportSelectedCount`、`exportIncludeTools`、`exportIncludeThinking`
+- 前端中文变更（2）：`softCapHint`、`softCapOff`
+- 前端英文变更（2）：`softCapHint`、`softCapOff`
 <!-- auto-i18n:end -->
 
 ## [0.93.0] — 2026-09-21
@@ -1179,6 +1194,7 @@ when?, children?}`，也收 `topbar` / `settings` 这类简写别名）；宿主
 - 0.29.0（2026-08-23）：全局搜索弹窗（Ctrl+K）+ 消息列表惰性窗口化。
 
 [Unreleased]: https://github.com/xing-shuyin/pi-web-ui/compare/v0.93.0...main
+[0.94.0]: https://github.com/xing-shuyin/pi-web-ui/releases/tag/v0.94.0
 [0.93.0]: https://github.com/xing-shuyin/pi-web-ui/releases/tag/v0.93.0
 [0.92.0]: https://github.com/xing-shuyin/pi-web-ui/releases/tag/v0.92.0
 [0.91.0]: https://github.com/xing-shuyin/pi-web-ui/releases/tag/v0.91.0

package/README.md

@@ -712,7 +712,7 @@ All optional — the defaults are what the app is developed against. Full refere
 | `PI_WEB_SDK`                   | `bundled`          | Which pi SDK copy to run: `bundled` (the copy shipped with pi-web-ui) or `global` (the nearest ancestor copy when it is newer). |
 | `PI_WEB_ALLOW_ORIGINS`         | empty              | Extra comma-separated `Origin` allow-list for the WebSocket check (dev proxy / reverse proxy). |
 | `PI_WEB_GIT_EXTENSION_CHECK`   | `1` (on)           | `0` / `false` / `no` / `off` drops the git-source row from “Check all updates” (it runs `git ls-remote`), for very large repos. |
-| `PI_WEB_PLUGIN_CATALOG_URL`    | empty              | Boot-time catalog pre-sync: fetch a catalog document (http(s) URL or absolute path), write the installable list, then install/update every entry (failures only warn). |
+| `PI_WEB_PLUGIN_CATALOG_URL`    | official catalog URL              | Boot-time catalog source: defaults to the official community registry `https://xing-shuyin.github.io/pi-web-ui-plugins/catalog.json` (writes installable list only, **does not install plugins**). Set to empty or `off`/`0`/`false`/`no` to disable; combine with `PI_WEB_PLUGIN_CATALOG_INSTALL=1` to auto-install entries at boot (headless/container provisioning). |
 | `PI_WEB_LAUNCHED_BY` / `PI_WEB_SERVICE_NAME` | empty | Written by `pi-web-ui server install` into the service unit/launcher (`service` / the `--name`): tells the server a supervisor owns it, which is what enables the update panel's “Restart service” button. |
 | `PI_WEB_DSH_*`                 | —                  | DSH runtime knobs: `PI_WEB_DSH_RUNTIME`, `PI_WEB_DSH_DATA_DIR`, `PI_WEB_DSH_PATCH_DIR`, `PI_WEB_DSH_QUESTION_TIMEOUT_MS`, `PI_WEB_DSH_TOOL_TIMEOUT_MS`, `PI_WEB_DSH_SESSION_RETENTION_DAYS`, `PI_WEB_DSH_DEBUG`. |
 

package/README.zh-CN.md

@@ -595,7 +595,7 @@ pi-web-ui uninstall <id>      # 卸载插件
 | `PI_WEB_SDK`                   | `bundled`          | 用哪一份 pi SDK：`bundled`（pi-web-ui 自带的副本）或 `global`（祖先链上更新的那份）。 |
 | `PI_WEB_ALLOW_ORIGINS`         | 空                 | WebSocket Origin 校验的额外白名单（逗号分隔；dev 代理 / 反向代理用）。 |
 | `PI_WEB_GIT_EXTENSION_CHECK`   | `1`（默认开）      | 设 `0`/`false`/`no`/`off` 关闭「全部组件更新」里的 git 行（走 `git ls-remote`），大型单体仓库场景可用。 |
-| `PI_WEB_PLUGIN_CATALOG_URL`    | 空                 | 开机插件目录预同步：拉取目录文档（http(s) URL 或本地绝对路径）→ 写可安装列表 → 逐条安装/更新（失败只告警）。 |
+| `PI_WEB_PLUGIN_CATALOG_URL`    | 官方清单 URL       | 开机插件市场清单来源：默认指向官方社区清单 `https://xing-shuyin.github.io/pi-web-ui-plugins/catalog.json`（仅拉取文档写可安装列表，**不自动安装插件**）。设为空串或 `off`/`0`/`false`/`no` 可关闭；设 `PI_WEB_PLUGIN_CATALOG_INSTALL=1` 时顺手自动全部安装。 |
 | `PI_WEB_LAUNCHED_BY` / `PI_WEB_SERVICE_NAME` | 空 | 由 `pi-web-ui server install` 写进服务单元/启动脚本（`service` / `--name`）：服务端据此知道实例由平台服务托管，更新面板才会出现「重启服务」按钮。 |
 | `PI_WEB_DSH_*`                 | —                  | DSH 运行时旋钮：`PI_WEB_DSH_RUNTIME`、`PI_WEB_DSH_DATA_DIR`、`PI_WEB_DSH_PATCH_DIR`、`PI_WEB_DSH_QUESTION_TIMEOUT_MS`、`PI_WEB_DSH_TOOL_TIMEOUT_MS`、`PI_WEB_DSH_SESSION_RETENTION_DAYS`、`PI_WEB_DSH_DEBUG`。 |
 

package/dist/server/agent-service.js

@@ -1924,6 +1924,23 @@ export class ClientSession {
                 });
         }
         await cs.bindSession();
+        // 同步全局默认模型至 SDK settingsManager（若 settings.json 尚未写入），防底层 session 创建时 findInitialModel 兜底回退硬编码模型
+        const globalDefault = stateStore.getDefaultModel();
+        if (globalDefault) {
+            const slash = globalDefault.indexOf("/");
+            if (slash > 0 && slash < globalDefault.length - 1) {
+                const p = globalDefault.slice(0, slash);
+                const id = globalDefault.slice(slash + 1);
+                try {
+                    if (!cs.session.settingsManager.getDefaultModel()) {
+                        cs.session.settingsManager.setDefaultModelAndProvider(p, id);
+                    }
+                }
+                catch {
+                    /* 会话未就绪时忽略 */
+                }
+            }
+        }
         await cs.restoreProjectProviderKeysForCwd(cwd);
         await cs.restoreProjectModelForCwd(cwd);
         return cs;
@@ -1937,7 +1954,7 @@ export class ClientSession {
      * 应用（prompt replace/append + 白名单），其余（终端接管、Windows persona
      * 等）仍跟随主会话设置。undefined = 按主会话设置（普通对话/不选模板的子代理）。
      */
-    makeRuntimeFactory(terminals, apply, ownerId) {
+    makeRuntimeFactory(terminals, apply, ownerId, initialModel) {
         return async ({ cwd: effectiveCwd, sessionManager }) => {
             const services = await createAgentSessionServices({
                 cwd: effectiveCwd,
@@ -2077,9 +2094,38 @@ export class ClientSession {
             // anchor 在拿到 created.session 后回填（SDK 的 runtime.session 就是它）。
             const bridgeAnchor = {};
             const bridge = this.bridgeTarget(bridgeAnchor, ownerId);
+            // 为全新会话（0 条消息的空白对话/新对话）提前解析目标模型并注入，
+            // 避免 SDK findInitialModel 在无 model 时回退到内置硬编码默认（如 deepseek-v4-pro）：
+            let sessionModel = initialModel;
+            if (!sessionModel) {
+                const isBlank = sessionManager.buildSessionContext().messages.length === 0;
+                if (isBlank) {
+                    const savedModelId = this.stateStore.getProjectModel(this.clientId, effectiveCwd) ?? this.stateStore.getDefaultModel();
+                    if (savedModelId) {
+                        const slash = savedModelId.indexOf("/");
+                        if (slash > 0 && slash < savedModelId.length - 1) {
+                            const p = savedModelId.slice(0, slash);
+                            const id = savedModelId.slice(slash + 1);
+                            const found = services.modelRuntime.getModel(p, id);
+                            if (found) {
+                                try {
+                                    await this.restoreKeyForModel(savedModelId, effectiveCwd);
+                                    if (services.modelRuntime.hasConfiguredAuth(p)) {
+                                        sessionModel = found;
+                                    }
+                                }
+                                catch {
+                                    /* 密钥恢复失败则由 SDK 自行解析 */
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             const created = await createAgentSessionFromServices({
                 services,
                 sessionManager,
+                model: sessionModel,
                 // 覆盖 SDK 内置 bash（customTools 按 name 覆盖）。双实现分流：
                 // 「默认 bash 覆盖」开关（terminalBash）关 → 原生 SDK bash（纯进程、不开终端）；
                 // 开 → 终端接管 bash（persist 决定一次性/持久，可静默自动转后台）。
@@ -5581,7 +5627,7 @@ export class ClientSession {
         try {
             const conversationId = this.nextConversationId();
             const terminals = this.makeTerminalManager(conversationId, this.cwd);
-            const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(terminals, undefined, conversationId), {
+            const runtime = await createAgentSessionRuntime(this.makeRuntimeFactory(terminals, undefined, conversationId, prevModel ?? undefined), {
                 cwd: this.cwd,
                 agentDir: this.agentDir,
                 sessionManager: SessionManager.create(this.cwd),
@@ -5597,15 +5643,27 @@ export class ClientSession {
             this.invalidateSessionInfos();
             // New session seeds with the ModelRuntime default model — restore the
             // model the user had selected in the previous chat.
-            if (prevModel && this.sharedModelRuntime) {
+            let modelRestored = !!this.session.model;
+            if (!modelRestored && prevModel && this.sharedModelRuntime) {
                 try {
-                    await this.session.setModel(prevModel);
                     const p = prevModel.provider;
                     const mid = `${p}/${prevModel.id}`;
+                    // 先恢复 provider key，再 setModel（否则 checkAuth 鉴权失败）
                     await this.restoreKeyForModel(mid, this.cwd);
+                    await this.session.setModel(prevModel);
+                    modelRestored = true;
                 }
                 catch {
-                    // model no longer resolvable — keep the default
+                    // model no longer resolvable
+                }
+            }
+            if (!modelRestored) {
+                // 上个会话模型未能恢复（或无上个会话）：回落项目记忆或全局默认模型
+                try {
+                    await this.restoreProjectModelForCwd(this.cwd);
+                }
+                catch {
+                    /* 保持默认 */
                 }
             }
             if (prevThinking) {
@@ -7207,9 +7265,10 @@ export class ClientSession {
             // Restore the previously-selected model on the forked branch.
             if (prevModel && this.sharedModelRuntime) {
                 try {
-                    await this.session.setModel(prevModel);
                     const pm = prevModel;
+                    // 先恢复 provider key，再 setModel（否则 checkAuth 鉴权失败）
                     await this.restoreKeyForModel(`${pm.provider}/${pm.id}`, this.cwd);
+                    await this.session.setModel(prevModel);
                 }
                 catch {
                     // model no longer resolvable — keep the default
@@ -7808,8 +7867,9 @@ export class ClientSession {
             const model = mr.getModel(provider, id);
             if (!model)
                 throw new Error(`模型不存在：${modelId}`);
-            await this.session.setModel(model);
+            // 先恢复 provider key，再 setModel（否则 checkAuth 鉴权失败）
             await this.restoreKeyForModel(modelId, this.cwd);
+            await this.session.setModel(model);
             // Immediately remember the model + the key it uses for the current
             // project (not only after a turn). This is what makes project switching
             // restore both the model and the provider key.
@@ -7846,6 +7906,13 @@ export class ClientSession {
             const active = this.modelAdmin.getActiveKeyName(provider);
             if (active)
                 this.stateStore.saveDefaultProviderKey(provider, active);
+            // 同步写入 SDK 的 settingsManager，使底层 session 创建时 findInitialModel 也能识别该默认模型
+            try {
+                this.session.settingsManager.setDefaultModelAndProvider(provider, id);
+            }
+            catch {
+                /* 会话未就绪时忽略 */
+            }
             this.pushDefaultModel();
             this.emit({
                 type: "notice",
@@ -7867,6 +7934,12 @@ export class ClientSession {
     /** Clear the GLOBAL default model (new projects fall back to the SDK default). */
     clearDefaultModel() {
         this.stateStore.clearDefaultModel();
+        try {
+            this.session.settingsManager.setDefaultModelAndProvider(undefined, undefined);
+        }
+        catch {
+            /* 忽略 */
+        }
         this.pushDefaultModel();
         this.emit({
             type: "notice",

package/dist/server/client-state.js

@@ -591,11 +591,28 @@ export class ClientStateStore {
     }
     /** Get a single provider's saved key for a project. */
     getProjectProviderKey(clientId, cwd, provider) {
-        return this.load()[clientId]?.projectProviderKeys?.[cwd]?.[provider];
+        const all = this.load();
+        const globalHit = all[ClientStateStore.GLOBAL_SETTINGS_KEY]?.projectProviderKeys?.[cwd]?.[provider];
+        if (globalHit)
+            return globalHit;
+        const direct = all[clientId]?.projectProviderKeys?.[cwd]?.[provider];
+        if (direct)
+            return direct;
+        for (const [id, state] of Object.entries(all)) {
+            if (id === clientId || id === ClientStateStore.GLOBAL_SETTINGS_KEY)
+                continue;
+            const hit = state.projectProviderKeys?.[cwd]?.[provider];
+            if (hit)
+                return hit;
+        }
+        return undefined;
     }
     /** Remember which key was last used for a provider in a project. */
     saveProjectProviderKey(clientId, cwd, provider, keyName) {
         const all = this.load();
+        const globalState = (all[ClientStateStore.GLOBAL_SETTINGS_KEY] ??= { projects: [] });
+        const gMap = (globalState.projectProviderKeys ??= {});
+        (gMap[cwd] ??= {})[provider] = keyName;
         const state = (all[clientId] ??= { projects: [] });
         const map = (state.projectProviderKeys ??= {});
         const inner = (map[cwd] ??= {});
@@ -605,6 +622,13 @@ export class ClientStateStore {
     /** Delete a per-project provider key (e.g. when the key is removed). */
     deleteProjectProviderKey(clientId, cwd, provider) {
         const all = this.load();
+        const gInner = all[ClientStateStore.GLOBAL_SETTINGS_KEY]?.projectProviderKeys?.[cwd];
+        if (gInner && provider in gInner) {
+            delete gInner[provider];
+            if (Object.keys(gInner).length === 0) {
+                delete all[ClientStateStore.GLOBAL_SETTINGS_KEY].projectProviderKeys[cwd];
+            }
+        }
         const inner = all[clientId]?.projectProviderKeys?.[cwd];
         if (!inner || !(provider in inner))
             return;
@@ -672,11 +696,39 @@ export class ClientStateStore {
     }
     /** Get the model the user last selected in a project, or undefined. */
     getProjectModel(clientId, cwd) {
-        return this.load()[clientId]?.projectModels?.[cwd];
+        const all = this.load();
+        // 1. 全局项目模型记忆（跨标签页、跨客户端、重启浏览器共享，优先级最高）
+        const globalHit = all[ClientStateStore.GLOBAL_SETTINGS_KEY]?.projectModels?.[cwd];
+        if (globalHit)
+            return globalHit;
+        // 2. 本客户端记忆
+        const direct = all[clientId]?.projectModels?.[cwd];
+        if (direct)
+            return direct;
+        // 3. 其他客户端按最近活跃时间倒序查找兜底
+        const candidates = [];
+        for (const [id, state] of Object.entries(all)) {
+            if (id === clientId || id === ClientStateStore.GLOBAL_SETTINGS_KEY)
+                continue;
+            const m = state.projectModels?.[cwd];
+            if (m) {
+                const p = state.projects?.find((proj) => proj.path === cwd);
+                candidates.push({ model: m, lastUsed: p?.lastUsed ?? 0 });
+            }
+        }
+        if (candidates.length > 0) {
+            candidates.sort((a, b) => b.lastUsed - a.lastUsed);
+            return candidates[0].model;
+        }
+        return undefined;
     }
     /** Remember the model last selected in a project (immediate, not after a turn). */
     saveProjectModel(clientId, cwd, modelId) {
         const all = this.load();
+        // 写入全局项目记忆（保证新标签页/重启浏览器时确定可用）
+        const globalState = (all[ClientStateStore.GLOBAL_SETTINGS_KEY] ??= { projects: [] });
+        (globalState.projectModels ??= {})[cwd] = modelId;
+        // 同时写入本客户端
         const state = (all[clientId] ??= { projects: [] });
         (state.projectModels ??= {})[cwd] = modelId;
         this.save();
@@ -685,6 +737,12 @@ export class ClientStateStore {
      *  removed from the catalog). */
     deleteProjectModel(clientId, cwd) {
         const all = this.load();
+        const gMap = all[ClientStateStore.GLOBAL_SETTINGS_KEY]?.projectModels;
+        if (gMap && cwd in gMap) {
+            delete gMap[cwd];
+            if (Object.keys(gMap).length === 0)
+                delete all[ClientStateStore.GLOBAL_SETTINGS_KEY].projectModels;
+        }
         const map = all[clientId]?.projectModels;
         if (!map || !(cwd in map))
             return;

package/dist/server/files-service.js

@@ -78,7 +78,7 @@ export function absoluteParent(wire) {
         return null;
     const i = s.lastIndexOf("/");
     if (i < 0)
-        return IS_WIN32 && /^[A-Za-z]:$/.test(s) ? MACHINE_ROOT : null;
+        return /^[A-Za-z]:$/.test(s) ? MACHINE_ROOT : null;
     if (i === 0)
         return "/"; // posix "/a" → "/"
     return s.slice(0, i);

package/dist/server/index.js

@@ -2382,24 +2382,36 @@ httpServer.listen(PORT, HOST, () => {
 });
 // 上传文件保留期清理：启动扫一次 + 每 6 小时一次（best-effort，见 uploads.ts）
 scheduleUploadCleanup();
-// 开机目录预同步（issue #165）：PI_WEB_PLUGIN_CATALOG_URL 指向一份插件市场目录文档
-// （headless/预置场景，不开浏览器也能装插件）。只跑一次、失败只告警不阻断启动；
-// 条目逐条安装/更新（托管实例上安装会被安装器拒绝，但列表本身仍会更新）。
-const BOOT_CATALOG_URL = (process.env.PI_WEB_PLUGIN_CATALOG_URL ?? "").trim();
-if (BOOT_CATALOG_URL) {
-    void syncPluginCatalog(BOOT_CATALOG_URL, { install: true }, {
+// 开机目录预同步（issue #165）：拉取一份插件市场目录文档 → 写可安装列表 → 逐条安装/更新。
+// 官方社区清单（xing-shuyin/pi-web-ui-plugins，PR 经 CI 自动审核 + 构建发布）作为**默认来源**，
+// 开箱即用、无需配置 PI_WEB_PLUGIN_CATALOG_URL；显式设为空串或 off/0/false/no 可关闭。
+// 默认**仅同步市场目录列表，绝不自动安装插件**（用户在界面按需点击安装）。
+// 仅在显式配置 PI_WEB_PLUGIN_CATALOG_INSTALL=1/true 时才顺手全部安装（headless/容器预置镜像场景）。
+const OFFICIAL_PLUGIN_CATALOG_URL = "https://xing-shuyin.github.io/pi-web-ui-plugins/catalog.json";
+const BOOT_CATALOG_URL = process.env.PI_WEB_PLUGIN_CATALOG_URL === undefined
+    ? OFFICIAL_PLUGIN_CATALOG_URL
+    : process.env.PI_WEB_PLUGIN_CATALOG_URL.trim();
+const bootCatalogDisabled = !BOOT_CATALOG_URL || /^(0|off|false|no)$/i.test(BOOT_CATALOG_URL);
+const autoInstall = /^(1|true|yes)$/i.test(process.env.PI_WEB_PLUGIN_CATALOG_INSTALL ?? "");
+if (!bootCatalogDisabled) {
+    void syncPluginCatalog(BOOT_CATALOG_URL, { install: autoInstall }, {
         customCatalogPath: pluginMgr.customCatalogPath,
         pluginsDir: join(DATA_DIR, "plugins"),
         installer: pluginInstaller,
         afterWrite: () => reloadPluginsAndPush(),
     }).then((r) => {
         if (!r.ok) {
-            console.warn(`[catalog] PI_WEB_PLUGIN_CATALOG_URL 同步失败（不阻断启动）: ${r.error}`);
+            console.warn(`[catalog] 插件目录预同步失败（不阻断启动）: ${r.error}`);
             return;
         }
-        const bad = (r.installed ?? []).filter((i) => !i.ok);
-        console.log(`[catalog] PI_WEB_PLUGIN_CATALOG_URL 同步完成：安装 ${(r.installed ?? []).length - bad.length} 成功 / ${bad.length} 失败` +
-            (bad.length ? `：${bad.map((i) => `${i.id}(${i.error ?? "?"})`).join("；")}` : ""));
+        if (autoInstall) {
+            const bad = (r.installed ?? []).filter((i) => !i.ok);
+            console.log(`[catalog] 插件目录预同步完成：安装 ${(r.installed ?? []).length - bad.length} 成功 / ${bad.length} 失败` +
+                (bad.length ? `：${bad.map((i) => `${i.id}(${i.error ?? "?"})`).join("；")}` : ""));
+        }
+        else {
+            console.log(`[catalog] 插件市场列表预同步完成（共 ${(r.entries ?? []).length} 个条目，按需安装）`);
+        }
     });
 }
 // Local control socket (status / quiesce / unquiesce) — same data dir the

package/dist/server/soft-cap.js

@@ -20,12 +20,46 @@ export const SOFT_CAP_MIN_TOKENS = 2000;
 export const SOFT_CAP_MIN_HEADROOM = 2048;
 /** 单客户端最多存多少条按模型覆盖（防手滑粘贴刷爆 client-state）。 */
 export const SOFT_CAP_MAX_OVERRIDES = 64;
-/** 归一化全局软上限：非数值/<=0 = 关闭；钳制到 [0, 10_000_000] 整数。 */
+/** 归一化全局软上限：支持数字或带单位字符串（如 "300k", "1.5m", "300,000"）；
+ *  <= 1000 的正数智能识别为 K tokens（如 300 -> 300,000）；<=0 或非法 = 关闭；
+ *  钳制到 [0, 10_000_000] 整数。纯函数。 */
 export function normalizeSoftCapTokens(v) {
-    const n = Math.floor(Number(v));
-    if (!Number.isFinite(n) || n <= 0)
+    if (v === null || v === undefined)
         return 0;
-    return Math.min(10_000_000, n);
+    if (typeof v === "number") {
+        if (!Number.isFinite(v) || v <= 0)
+            return 0;
+        const n = Math.floor(v);
+        if (n <= 1000)
+            return n * 1000;
+        return Math.min(10_000_000, n);
+    }
+    const s = String(v)
+        .trim()
+        .toLowerCase()
+        .replace(/[,_\s]/g, "");
+    if (!s)
+        return 0;
+    const m = s.match(/^(\d+(?:\.\d+)?)([km])?$/);
+    if (!m)
+        return 0;
+    const num = parseFloat(m[1]);
+    if (!Number.isFinite(num) || num <= 0)
+        return 0;
+    const unit = m[2];
+    let tokens;
+    if (unit === "k") {
+        tokens = Math.floor(num * 1_000);
+    }
+    else if (unit === "m") {
+        tokens = Math.floor(num * 1_000_000);
+    }
+    else {
+        tokens = Math.floor(num);
+        if (tokens <= 1000)
+            tokens *= 1000;
+    }
+    return Math.min(10_000_000, Math.max(0, tokens));
 }
 /** 归一化按模型覆盖：key = "provider/id" 非空（≤200 字），value 走
  *  normalizeSoftCapTokens；0 值条目丢弃（= 用全局）；上限 64 条。纯函数。 */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-web-ui",
-	"version": "0.93.0",
+	"version": "0.94.0",
 	"description": "Just open your browser to get all your work done — browser cockpit for AI coding agents (chat, code, files, terminal, Git in one tab)",
 	"license": "MIT",
 	"author": {

package/web/dist/assets/{TerminalPanel-C1A23aI-.js → TerminalPanel-B-CMQuzm.js}

@@ -1,3 +1,3 @@
-import{r as e}from"./rolldown-runtime-hePW80VL.js";import{i as t,t as n}from"./react-CR5VJ85Q.js";import{a as r,c as i,d as a,f as o,g as s,h as c,i as l,l as u,m as d,o as f,p,r as m,s as h,t as g,u as _}from"./index-B48QWf0I.js";import{n as v,t as y}from"./xterm-Cf5xxe4g.js";var b=e(t(),1);function x(e,t){return Math.abs(t)>10&&Math.abs(t)>Math.abs(e)*1.2}function S(e,t){return e-t}var C=n();function w(e){let t=null;return{clean:e.replace(/\r?\n?\[pi-term-exit:(-?\d+)\]\r?\n?/g,(e,n)=>(t=Number(n),`\r
+import{r as e}from"./rolldown-runtime-hePW80VL.js";import{i as t,t as n}from"./react-CR5VJ85Q.js";import{a as r,c as i,d as a,f as o,g as s,h as c,i as l,l as u,m as d,o as f,p,r as m,s as h,t as g,u as _}from"./index-18jK6al2.js";import{n as v,t as y}from"./xterm-Cf5xxe4g.js";var b=e(t(),1);function x(e,t){return Math.abs(t)>10&&Math.abs(t)>Math.abs(e)*1.2}function S(e,t){return e-t}var C=n();function w(e){let t=null;return{clean:e.replace(/\r?\n?\[pi-term-exit:(-?\d+)\]\r?\n?/g,(e,n)=>(t=Number(n),`\r
 `)).replace(/\r?\n?\x1b\[90m\[(?:进程已退出，退出码 |Process exited with code )-?\d+\]\x1b\[0m\r?\n?/g,`\r
 `),exitCode:t}}function T({conversationId:e,terminalId:t,command:n,cwd:i,title:a,agentBash:o,active:s,running:c,exitCode:u,register:d}){let p=(0,b.useRef)(null),h=(0,b.useRef)(null),{locale:g}=f(),_=(0,b.useRef)(g);_.current=g;let T=n?JSON.stringify(n):``,E=(0,b.useRef)(c===!1);(0,b.useEffect)(()=>{let c=p.current;if(!c)return;let u=new v({theme:l(),fontFamily:`"SF Mono", "JetBrains Mono", ui-monospace, Menlo, Consolas, monospace`,fontSize:13,cursorBlink:!0,scrollback:8e3}),f=new y;u.loadAddon(f),u.open(c),h.current={term:u,fit:f},s&&u.focus();let g=()=>{u.options.theme=l()};window.addEventListener(m,g),u.attachCustomKeyEventHandler(e=>{if(e.type!==`keydown`)return!0;let t=e.key?.toLowerCase();if((e.ctrlKey||e.metaKey)&&t===`v`)return!1;if(e.ctrlKey&&!e.shiftKey&&!e.altKey&&t===`c`&&u.hasSelection()){let e=u.textarea;return e&&(e.value=u.getSelection(),e.select()),!1}return!0});let b=d(e,t,{write:e=>u.write(w(e).clean),dispose:()=>u.dispose()}),C=()=>{try{f.fit(),r({type:`terminal_resize`,terminalId:t,conversationId:e,cols:u.cols,rows:u.rows})}catch{}},T=requestAnimationFrame(()=>{try{f.fit()}catch{}E.current||r(n?{type:`run_command`,terminalId:t,conversationId:e,command:n,cols:u.cols,rows:u.rows}:{type:`terminal_create`,terminalId:t,title:a,locale:_.current,agentBash:o,conversationId:e,cwd:i,cols:u.cols,rows:u.rows})}),D=u.onData(n=>{r({type:`terminal_input`,terminalId:t,conversationId:e,data:n})}),O=u.element,k=null,A=0,j=0,M=0,N=!1,P=e=>{if(e.touches.length!==1){k=null,N=!1;return}let t=e.touches[0];k=t.identifier,A=t.clientX,j=t.clientY,M=t.clientY,N=!1},F=e=>{if(k===null||e.touches.length!==1)return;let t=e.touches[0];if(t.identifier!==k)return;if(!N){if(!x(t.clientX-A,t.clientY-j))return;N=!0}e.preventDefault();let n=S(M,t.clientY);M=t.clientY,n!==0&&typeof WheelEvent<`u`&&(c.querySelector(`.xterm-viewport`)??O)?.dispatchEvent(new WheelEvent(`wheel`,{bubbles:!0,cancelable:!0,deltaY:n,deltaMode:0,clientX:t.clientX,clientY:t.clientY}))},I=e=>{if(k!==null){if(e.touches.length>0){k=null,N=!1;return}k=null,N=!1}};O?.addEventListener(`touchstart`,P,{passive:!0}),O?.addEventListener(`touchmove`,F,{passive:!1}),O?.addEventListener(`touchend`,I),O?.addEventListener(`touchcancel`,I);let L=null;return typeof ResizeObserver<`u`&&(L=new ResizeObserver(()=>{c.offsetWidth>0&&c.offsetHeight>0&&C()}),L.observe(c)),()=>{cancelAnimationFrame(T),D.dispose(),O?.removeEventListener(`touchstart`,P),O?.removeEventListener(`touchmove`,F),O?.removeEventListener(`touchend`,I),O?.removeEventListener(`touchcancel`,I),window.removeEventListener(m,g),L?.disconnect(),b(),u.dispose(),h.current=null}},[e,t,T,d]),(0,b.useEffect)(()=>{if(!s)return;let n=requestAnimationFrame(()=>{let n=h.current;if(n){try{n.fit.fit(),r({type:`terminal_resize`,terminalId:t,conversationId:e,cols:n.term.cols,rows:n.term.rows})}catch{}n.term.focus()}});return()=>cancelAnimationFrame(n)},[s]);let{t:D}=f(),O=(0,b.useRef)(void 0);return(0,b.useEffect)(()=>{if(c===O.current||(O.current=c,c!==!1))return;let e=h.current;e&&e.term.write(`\r\n\x1b[90m${D(`exitBanner`,{code:u??``})}\x1b[0m\r\n`)},[c,t,u]),(0,C.jsx)(`div`,{ref:p,className:`term-xterm ${s?``:`hidden`}`})}var E={name:``,command:``,cwd:"${pwd}"};function D({chat:e,terminal:t,uiTerminalToolbar:n,onUiAction:l}){let f=h(),[m,v]=(0,b.useState)(null),[y,x]=(0,b.useState)(!1),[S,w]=(0,b.useState)(!1),[D,O]=(0,b.useState)(null),[k,A]=(0,b.useState)(E),[j,M]=(0,b.useState)(null),N=(0,b.useRef)(null),[P,F]=(0,b.useState)(!0),[I,L]=(0,b.useState)(null),[R,z]=(0,b.useState)(``);(0,b.useEffect)(()=>{e.terminals.length===0?v(null):e.terminals.some(e=>e.id===m)||v(e.terminals[e.terminals.length-1].id)},[e.terminals,m]),(0,b.useEffect)(()=>{e.terminalActiveId&&(v(e.terminalActiveId),x(!1))},[e.terminalActiveId]),(0,b.useEffect)(()=>()=>{N.current&&clearTimeout(N.current)},[]);let B=e.terminals.filter(e=>!e.agentBash),V=e.terminals.filter(e=>e.agentBash),H=n=>{if(!e.ready)return;let r=i(),a=e.activeConversationId||e.state?.conversationId||``;t.create({...n,id:r,conversationId:a,cols:n.cols??80,rows:n.rows??24,running:!0,exitCode:null}),v(r),x(!1)},U=()=>H({title:f(`terminalTitle`,{n:B.length+1}),cwd:e.state?.cwd??``}),W=n=>{let i=n.name||n.command,a=e.terminals.find(e=>e.title===i);if(a){t.restart(a.id),v(a.id),r({type:`run_command`,terminalId:a.id,conversationId:a.conversationId,command:n,cols:80,rows:24});return}H({title:i,cwd:e.state?.cwd??``,command:n})},G=n=>{let i=e.terminals.find(e=>e.id===n);if(i&&r({type:`terminal_kill`,terminalId:n,conversationId:i.conversationId}),t.close(n),m===n){let t=e.terminals.filter(e=>e.id!==n);v(t.length>0?t[t.length-1].id:null)}},K=e=>(0,C.jsxs)(`div`,{className:`term-tab ${e.id===m?`active`:``}`,children:[(0,C.jsxs)(`button`,{type:`button`,className:`term-tab-main`,title:`${e.cwd}${e.command?`\n> ${e.command.command}`:``}`,onClick:()=>{I||(v(e.id),x(!1))},children:[(0,C.jsx)(`span`,{className:`term-tab-dot ${e.running?`run`:`exit`}`}),(0,C.jsxs)(`span`,{className:`term-tab-title`,children:[I===e.id?(0,C.jsx)(`input`,{autoFocus:!0,className:`term-tab-rename-input`,value:R,placeholder:e.title,onClick:e=>e.stopPropagation(),onChange:e=>z(e.target.value),onKeyDown:t=>{if(t.stopPropagation(),t.key===`Enter`&&!t.nativeEvent.isComposing){let t=R.trim();t&&r({type:`rename_terminal`,terminalId:e.id,conversationId:e.conversationId,title:t}),L(null)}else t.key===`Escape`&&L(null)},onBlur:()=>L(null)}):e.title,!e.running&&(0,C.jsx)(`span`,{className:`term-tab-exit`,children:f(`exited`,{code:e.exitCode===null?``:` ${e.exitCode}`})})]})]}),(0,C.jsx)(`button`,{type:`button`,className:`term-tab-close term-tab-rename`,title:f(`renameTerminal`),onClick:t=>{t.stopPropagation(),z(e.title),L(e.id)},children:(0,C.jsx)(u,{})}),(0,C.jsx)(`button`,{type:`button`,className:`term-tab-close`,title:f(`closeTerminal`),onClick:()=>G(e.id),children:(0,C.jsx)(s,{})})]},e.id),q=()=>{w(!0),O(null),A(E)},J=t=>{let n=e.commands[t];n&&(w(!1),O(t),A({name:n.name,command:n.command,cwd:n.cwd??``}))},Y=()=>{w(!1),O(null)},X=()=>{let t=k.name.trim(),n=k.command.trim();if(!t||!n)return;let i={name:t,command:n,cwd:k.cwd.trim()||void 0},a=S?[...e.commands,i]:D===null?e.commands:e.commands.map((e,t)=>t===D?i:e);r({type:`save_commands`,commands:a}),Y()},Z=t=>{if(j===t){let n=e.commands.filter((e,n)=>n!==t);r({type:`save_commands`,commands:n}),M(null),N.current&&clearTimeout(N.current)}else M(t),N.current&&clearTimeout(N.current),N.current=setTimeout(()=>M(null),2500)},ee=S||D!==null,te=n===void 0?[`host:term-cmd-refresh`,`host:term-cmd-new`,`host:term-tab-new`].map(e=>({id:e,source:`host`})):n.filter(e=>!e.hidden),Q=(e,t)=>{let n=new Set(e);return te.filter(e=>n.has(e.id)||t&&e.source!==`host`)},$={"host:term-cmd-refresh":(0,C.jsx)(`button`,{type:`button`,className:`panel-refresh`,title:f(`rerun`),onClick:()=>r({type:`list_commands`}),children:(0,C.jsx)(p,{})}),"host:term-cmd-new":(0,C.jsx)(`button`,{type:`button`,className:`panel-new`,title:f(`newCommand`),onClick:q,children:(0,C.jsx)(o,{})}),"host:term-tab-new":(0,C.jsx)(`button`,{type:`button`,className:`panel-new`,title:f(`newTerminal`),onClick:U,children:(0,C.jsx)(o,{})})};return(0,C.jsxs)(`div`,{className:`terminal-view`,children:[(0,C.jsxs)(`aside`,{className:`term-side term-commands ${y?`open`:``}`,children:[(0,C.jsxs)(`div`,{className:`panel-header`,children:[(0,C.jsx)(`span`,{className:`panel-title`,children:f(`commands`)}),(0,C.jsx)(`div`,{className:`panel-header-actions`,children:g(Q([`host:term-cmd-refresh`,`host:term-cmd-new`],!1),$,l)})]}),(0,C.jsx)(`div`,{className:`panel-body`,children:ee?(0,C.jsxs)(`div`,{className:`cmd-form`,children:[(0,C.jsx)(`label`,{htmlFor:`cmd-name`,children:f(`name`)}),(0,C.jsx)(`input`,{id:`cmd-name`,className:`cmd-input`,value:k.name,placeholder:f(`exampleName`),autoFocus:!0,onChange:e=>A({...k,name:e.target.value})}),(0,C.jsx)(`label`,{htmlFor:`cmd-command`,children:f(`command`)}),(0,C.jsx)(`input`,{id:`cmd-command`,className:`cmd-input`,value:k.command,placeholder:f(`exampleCommand`),onChange:e=>A({...k,command:e.target.value}),onKeyDown:e=>{e.key===`Enter`&&!e.nativeEvent.isComposing&&X()}}),(0,C.jsxs)(`label`,{htmlFor:`cmd-cwd`,children:[f(`directory`),` `,(0,C.jsx)(`span`,{className:`cmd-hint`,children:f(`cwdHint`)})]}),(0,C.jsx)(`input`,{id:`cmd-cwd`,className:`cmd-input`,value:k.cwd,placeholder:"${pwd}",onChange:e=>A({...k,cwd:e.target.value}),onKeyDown:e=>{e.key===`Enter`&&!e.nativeEvent.isComposing&&X()}}),(0,C.jsxs)(`div`,{className:`cmd-form-actions`,children:[(0,C.jsx)(`button`,{type:`button`,className:`btn`,onClick:Y,children:f(`cancel`)}),(0,C.jsx)(`button`,{type:`button`,className:`btn primary`,disabled:!k.name.trim()||!k.command.trim(),onClick:X,children:f(`save`)})]})]}):(0,C.jsxs)(C.Fragment,{children:[e.commands.length===0&&(0,C.jsx)(`div`,{className:`panel-empty`,children:f(`noCommands`)}),e.commands.map((e,t)=>(0,C.jsxs)(`div`,{className:`cmd-item`,children:[(0,C.jsx)(`button`,{type:`button`,className:`cmd-run`,title:f(`clickToRun`),onClick:()=>W(e),children:(0,C.jsx)(a,{})}),(0,C.jsxs)(`button`,{type:`button`,className:`cmd-main`,title:f(`clickToRun`),onClick:()=>W(e),children:[(0,C.jsx)(`span`,{className:`cmd-name`,children:e.name}),(0,C.jsx)(`span`,{className:`cmd-command`,children:e.command}),e.cwd&&(0,C.jsx)(`span`,{className:`cmd-cwd`,children:e.cwd})]}),(0,C.jsx)(`button`,{type:`button`,className:`cmd-act`,title:f(`edit`),onClick:()=>J(t),children:(0,C.jsx)(u,{})}),(0,C.jsx)(`button`,{type:`button`,className:`cmd-act del ${j===t?`confirm`:``}`,title:f(`delete`),onClick:()=>Z(t),children:j===t?f(`confirmQ`):(0,C.jsx)(c,{})})]},t))]})}),(0,C.jsxs)(`div`,{className:`term-tabs-block`,children:[(0,C.jsxs)(`div`,{className:`panel-header`,children:[(0,C.jsx)(`span`,{className:`panel-title`,children:f(`terminal`)}),g(Q([`host:term-tab-new`],!0),$,l)]}),(0,C.jsxs)(`div`,{className:`panel-body`,children:[e.terminals.length===0&&(0,C.jsx)(`div`,{className:`panel-empty`,children:f(`noTerminal`)}),B.map(K),V.length>0&&(0,C.jsxs)(`div`,{className:`term-folder`,children:[(0,C.jsxs)(`button`,{type:`button`,className:`term-folder-header ${P?`open`:``}`,title:f(`aiBashGroup`),onClick:()=>F(e=>!e),children:[(0,C.jsx)(`span`,{className:`term-folder-caret`,children:P?`▾`:`▸`}),(0,C.jsx)(`span`,{className:`term-folder-title`,children:f(`aiBashGroup`)}),(0,C.jsx)(`span`,{className:`term-folder-count`,children:V.length})]}),P&&(0,C.jsx)(`div`,{className:`term-folder-body`,children:V.map(K)})]})]})]})]}),(0,C.jsxs)(`div`,{className:`term-main`,children:[y&&(0,C.jsx)(`div`,{className:`drawer-backdrop`,onClick:()=>x(!1)}),(0,C.jsx)(`button`,{type:`button`,className:`term-side-toggle`,title:f(`commands`),onClick:()=>x(e=>!e),children:(0,C.jsx)(_,{})}),e.terminals.length===0?(0,C.jsxs)(`div`,{className:`term-empty`,children:[(0,C.jsx)(d,{className:`term-empty-icon`}),(0,C.jsx)(`div`,{className:`term-empty-title`,children:f(`builtinTerminal`)}),(0,C.jsx)(`div`,{className:`term-empty-sub`,children:f(`termEmptySub`)})]}):e.terminals.map(e=>(0,C.jsx)(T,{conversationId:e.conversationId,terminalId:e.id,command:e.command,cwd:e.cwd,title:e.title,agentBash:e.agentBash,active:e.id===m,running:e.running,exitCode:e.exitCode,register:t.register},`${e.conversationId}:${e.id}`))]})]})}export{D as TerminalPanel};