pi-web-ui 0.91.0 → 0.93.0

package/dist/server/files-service.js

@@ -5,7 +5,7 @@
  * 全部为无状态 fs 操作 + 两个自持的 watcher（当前列出目录、git dir），
  * 经 FilesHost 回调与 ClientSession 解耦。
  */
-import { mkdirSync, readFileSync, statSync, writeFileSync, watch } from "node:fs";
+import { Dirent, mkdirSync, readFileSync, statSync, writeFileSync, watch } from "node:fs";
 import { homedir } from "node:os";
 import { resolve, relative, sep } from "node:path";
 import { pick } from "./i18n.js";
@@ -57,7 +57,7 @@ export function isAbsoluteWirePath(p) {
  *  不产生结尾斜杠，这里只对补全/直接输入做防御性清理。 */
 export function normWirePath(p) {
     if (p.endsWith("/") && p !== "/")
-        return p.slice(0, -1);
+        return p.replace(/\/+$/, "") || "/";
     return p;
 }
 /** wire 绝对路径（"C:/Users/x" / "/Users/x" / "C:"）→ 原生绝对路径。
@@ -74,7 +74,7 @@ export function wireToAbs(wire) {
 /** 机器浏览模式下某目录的父级 wire 路径：盘符根（"C:"）→ 机器根；posix "/" 无父级。 */
 export function absoluteParent(wire) {
     const s = normWirePath(wire);
-    if (s === "" || s === MACHINE_ROOT)
+    if (s === "" || s === MACHINE_ROOT || s === "/")
         return null;
     const i = s.lastIndexOf("/");
     if (i < 0)
@@ -150,8 +150,9 @@ export function workspacePath(root, raw) {
  * system dirs (C:\$Recycle.Bin, Program Files internals, OneDrive placeholders)
  * throw EPERM/EACCES on open — that must not kill the panel, so it degrades
  * to an empty listing plus a warning. Directory symlinks/junctions are
- * followed so mklink /D folders stay navigable; broken links still show as
- * files instead of vanishing. The cap is 4x posix and truncation is reported
+ * followed (all platforms — Android/Termux's ~/storage/* entries are symlinks
+ * too) so folder links stay navigable; broken links still show as files
+ * instead of vanishing. The cap is 4x posix and truncation is reported
  * via `truncated` instead of happening silently.
  */
 async function readDirForUI(abs, rel) {
@@ -178,10 +179,10 @@ async function readDirForUI(abs, rel) {
         if (ignored.has(d.name))
             continue;
         let type;
-        if (IS_WIN32 && d.isSymbolicLink()) {
-            // mklink /D symlinks and junctions are reparse points — libuv
-            // classifies them as links, so isDirectory() is false. Follow the
-            // target so folder links stay navigable; broken links still show.
+        if (d.isSymbolicLink()) {
+            // Symlinks (mklink /D reparse points on win32, but also the directory
+            // links under Termux's ~/storage) are followed on ALL platforms so
+            // folder links stay navigable; broken links still show as files.
             try {
                 const st = await fs.stat(join(abs, d.name));
                 type = st.isDirectory() ? "dir" : "file";
@@ -210,6 +211,26 @@ async function readDirForUI(abs, rel) {
         out.length = MAX;
     return { entries: out, truncated };
 }
+/** dirent → FileEntry classification: directory symlinks are resolved via
+ *  stat() on ALL platforms (#262 — Termux's ~/storage/* entries are symlinks;
+ *  the directory-only cwd picker renders an empty list if they type as files). */
+async function classifyDirent(d, absDir) {
+    const fs = await import("node:fs/promises");
+    const { join } = await import("node:path");
+    let type;
+    if (d.isSymbolicLink()) {
+        try {
+            type = (await fs.stat(join(absDir, d.name))).isDirectory() ? "dir" : "file";
+        }
+        catch {
+            type = "file"; // broken link
+        }
+    }
+    else {
+        type = d.isDirectory() ? "dir" : "file";
+    }
+    return { name: d.name, type };
+}
 export class FilesService {
     host;
     // ---- 当前列出目录的 watcher ----
@@ -248,6 +269,24 @@ export class FilesService {
             }
             return out;
         }
+        // Android/Termux: "/" itself is not listable (even `ls /` is denied),
+        // so fall back to $HOME + shared storage as the machine-root landing
+        // spots — otherwise machine browsing is a dead end on Android.
+        try {
+            await fsp.readdir("/");
+        }
+        catch {
+            const home = homedir();
+            const out = [{ name: home, path: home, type: "dir" }];
+            try {
+                await fsp.readdir("/storage/emulated/0");
+                out.push({ name: "/storage/emulated/0", path: "/storage/emulated/0", type: "dir" });
+            }
+            catch {
+                // no shared storage
+            }
+            return out;
+        }
         return [{ name: "/", path: "/", type: "dir" }];
     }
     /** 单字段错误文本的语言（host 未接线时英文默认）。 */
@@ -286,7 +325,13 @@ export class FilesService {
     async listFiles(relPath) {
         const { resolve, sep, relative } = await import("node:path");
         const root = resolve(this.host.getCwd());
-        const raw = relPath ?? "";
+        let raw = relPath ?? "";
+        // Expand a leading "~/" (path-bar input) to the home directory — same
+        // rules as completePath/makeDir. The result is absolute, so it lands in
+        // the machine-browse branch below; wire paths always use "/".
+        if (raw === "~" || raw.startsWith("~/") || raw.startsWith("~\\")) {
+            raw = (raw === "~" ? homedir() : homedir() + raw.slice(1)).split(sep).join("/");
+        }
         // ---- 机器根（此电脑：盘符列表）—— 工作区之上的虚拟层 ----
         if (raw === MACHINE_ROOT || raw === MACHINE_ROOT + "/") {
             const entries = await this.machineRootEntries();
@@ -342,11 +387,12 @@ export class FilesService {
         else {
             this.watchDir(target, rel);
         }
+        const rootWire = normWirePath(root.split(sep).join("/"));
         this.host.emit({
             type: "files",
             path: rel === "" ? "" : rel,
-            // 工作区根也允许「上一级」→ 机器根（Windows 换盘符 / posix 到 /）。
-            parent: rel === "" ? MACHINE_ROOT : rel.includes("/") ? rel.slice(0, rel.lastIndexOf("/")) : "",
+            // 工作区根也允许「上一级」→ 项目文件夹的上一级（盘符根则到机器根，posix 根无父级）。
+            parent: rel === "" ? absoluteParent(rootWire) : rel.includes("/") ? rel.slice(0, rel.lastIndexOf("/")) : "",
             entries,
             truncated,
         });
@@ -399,14 +445,25 @@ export class FilesService {
                 if (ignored.has(d.name))
                     continue;
                 const childRel = rel ? `${rel}/${d.name}` : d.name;
+                let isDir = d.isDirectory();
+                if (d.isSymbolicLink()) {
+                    // Follow directory symlinks (Termux's ~/storage/*); the depth
+                    // cap doubles as a symlink-cycle guard, budgets bound the cost.
+                    try {
+                        isDir = (await fsp.stat(join(abs, d.name))).isDirectory();
+                    }
+                    catch {
+                        isDir = false; // broken link — treat as file
+                    }
+                }
                 if (d.name.toLowerCase().includes(q)) {
                     results.push({
                         path: childRel,
                         name: d.name,
-                        type: d.isDirectory() ? "dir" : "file",
+                        type: isDir ? "dir" : "file",
                     });
                 }
-                if (d.isDirectory()) {
+                if (isDir) {
                     await walk(join(abs, d.name), childRel, depth + 1);
                 }
             }
@@ -1344,13 +1401,8 @@ export class FilesService {
                         empty();
                         return;
                     }
-                    const items = dirents
-                        .filter((d) => !ignoredEntries().has(d.name))
-                        .map((d) => ({
-                        name: d.name,
-                        path: `${drive}/${d.name}`,
-                        type: (d.isDirectory() ? "dir" : "file"),
-                    }))
+                    const items = (await Promise.all(dirents.filter((d) => !ignoredEntries().has(d.name)).map((d) => classifyDirent(d, `${drive}\\`))))
+                        .map((e) => ({ ...e, path: `${drive}/${e.name}` }))
                         .sort((a, b) => {
                         const aHidden = a.name.startsWith(".");
                         const bHidden = b.name.startsWith(".");
@@ -1391,14 +1443,14 @@ export class FilesService {
                 return;
             }
             const { join } = await import("node:path");
-            const completions = dirents
+            const completions = (await Promise.all(dirents
                 .filter((d) => d.name.startsWith(prefix) && !ignoredEntries().has(d.name))
-                .map((d) => ({
-                name: d.name,
+                .map((d) => classifyDirent(d, dirPart))))
+                .map((e) => ({
+                ...e,
                 // Windows users type backslashes — normalize the completion to the
                 // wire format ("/") so the picked path round-trips cleanly.
-                path: IS_WIN32 ? join(dirPart, d.name).split(sep).join("/") : dirPart + d.name,
-                type: (d.isDirectory() ? "dir" : "file"),
+                path: IS_WIN32 ? join(dirPart, e.name).split(sep).join("/") : dirPart + e.name,
             }))
                 .sort((a, b) => {
                 const aHidden = a.name.startsWith(".");

package/dist/server/http-proxy.js

@@ -0,0 +1,72 @@
+/**
+ * server/http-proxy.ts
+ *
+ * Propagates HTTP proxy settings from ~/.pi/agent/settings.json and environment
+ * variables (HTTP_PROXY / HTTPS_PROXY / ALL_PROXY) to process.env and sets up
+ * undici's global dispatcher with EnvHttpProxyAgent, ensuring that Node's
+ * native fetch() and SDK HTTP calls route through the configured proxy.
+ */
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { EventEmitter } from "node:events";
+import * as undici from "undici";
+/** Read proxy settings from settings.json and environment. */
+export function resolveProxySettings(agentDir) {
+    let httpProxy;
+    const settingsPath = join(agentDir, "settings.json");
+    if (existsSync(settingsPath)) {
+        try {
+            const parsed = JSON.parse(readFileSync(settingsPath, "utf-8"));
+            if (typeof parsed.httpProxy === "string" && parsed.httpProxy.trim()) {
+                httpProxy = parsed.httpProxy.trim();
+            }
+        }
+        catch {
+            /* ignore parse error */
+        }
+    }
+    return {
+        httpProxy,
+        envHttpProxy: process.env.HTTP_PROXY,
+        envHttpsProxy: process.env.HTTPS_PROXY,
+        envAllProxy: process.env.ALL_PROXY,
+    };
+}
+/**
+ * Initialize HTTP proxy support:
+ * 1. If httpProxy is present in settings.json and env is not set, populate HTTP_PROXY and HTTPS_PROXY.
+ * 2. If any proxy is configured (settings or env), set up undici's global dispatcher with EnvHttpProxyAgent
+ *    so that global fetch() uses the proxy.
+ */
+export function initHttpProxy(agentDir) {
+    const config = resolveProxySettings(agentDir);
+    if (config.httpProxy) {
+        process.env.HTTP_PROXY ??= config.httpProxy;
+        process.env.HTTPS_PROXY ??= config.httpProxy;
+    }
+    const effectiveProxy = process.env.HTTPS_PROXY || process.env.HTTP_PROXY || process.env.ALL_PROXY;
+    if (!effectiveProxy) {
+        return { active: false };
+    }
+    try {
+        const dispatcher = withUndiciErrorListener(new undici.EnvHttpProxyAgent({
+            allowH2: false,
+            proxyTunnel: true,
+            bodyTimeout: 300_000,
+            headersTimeout: 300_000,
+        }));
+        undici.setGlobalDispatcher(dispatcher);
+        undici.install?.();
+        return { active: true, proxyUrl: effectiveProxy };
+    }
+    catch (err) {
+        console.warn("[proxy] Failed to configure global undici proxy dispatcher:", err);
+        return { active: false, proxyUrl: effectiveProxy };
+    }
+}
+function withUndiciErrorListener(dispatcher) {
+    if (dispatcher instanceof EventEmitter) {
+        dispatcher.on("error", () => { });
+    }
+    return dispatcher;
+}

package/dist/server/index.js

@@ -16,7 +16,7 @@
  *   all share one conversation list per project.
  *   PI_CODING_AGENT_DIR  pi config dir (auth/models/skills) — passed to the SDK
  */
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync } from "node:fs";
 import { stat } from "node:fs/promises";
 import { createServer, request as proxyRequest } from "node:http";
 import { createConnection } from "node:net";
@@ -28,11 +28,12 @@ import express from "express";
 import compression from "compression";
 import { WebSocket, WebSocketServer } from "ws";
 import { VERSION, getAgentDir } from "@earendil-works/pi-coding-agent";
+import { sdkCopies, sdkOriginNote } from "./sdk-origin.js";
 import { PROTOCOL_VERSION } from "./protocol-version.js";
 import { AgentService, workspacePath, QuiesceRejectedError } from "./agent-service.js";
 import { WS_MAX_PAYLOAD_BYTES, isAbsoluteWirePath, wireToAbs } from "./files-service.js";
 import { registerFileTransferRoutes } from "./file-transfer-routes.js";
-import { previewKind } from "./text-sniff.js";
+import { isAudioFile, previewKind } from "./text-sniff.js";
 import { startControlServer } from "./control-socket.js";
 import { scheduleUploadCleanup } from "./uploads.js";
 import { ensureWindowsBash, windowsBashDir } from "./ensure-bash.js";
@@ -49,7 +50,8 @@ import { McpBridge } from "./mcp-bridge.js";
 import { createMcpHotReload } from "./mcp-hot-reload.js";
 import { createHostMetricsSampler } from "./host-metrics.js";
 import { SchedulerStore } from "./scheduler-tasks.js";
-import { buildPiWebTokenCookie, isTlsRequest } from "./auth-cookie.js";
+import { initHttpProxy } from "./http-proxy.js";
+import { buildPiWebTokenCookie, decodeCookieToken, isTlsRequest } from "./auth-cookie.js";
 /** Strip npm-injected env (`npm start` exports `npm_config_*` / `npm_package_*` /
  *  `npm_lifecycle_*` into every child). Anything this server spawns — shells,
  *  `pi update` — would otherwise inherit `npm_config_allow_scripts`, which npm
@@ -81,6 +83,18 @@ function cliFlag(name) {
 const PORT = Number(cliFlag("--port") ?? process.env.PI_WEB_PORT ?? 8787);
 const CWD = resolve(cliFlag("--cwd") ?? process.env.PI_WEB_CWD ?? process.cwd());
 const DATA_DIR = resolve(cliFlag("--data-dir") ?? process.env.PI_WEB_DATA_DIR ?? join(homedir(), ".pi-web"));
+// The data dir is where the control socket, client state, plugins, themes and
+// uploads live, but nothing guarantees it exists on a first run (a fresh
+// `server install` never creates it). The control socket binds at startup —
+// before any store gets a chance to mkdir its own subdirectory — and bind()
+// into a missing directory fails with EACCES, silently disabling the whole
+// control channel (status/quiesce) for that process. Create it up front.
+try {
+    mkdirSync(DATA_DIR, { recursive: true });
+}
+catch (err) {
+    console.warn(`[data] 无法创建数据目录 ${DATA_DIR}: ${err.message}`);
+}
 // Dev-no-cache setting read without a ClientStateStore instance (the index.html
 // route runs before any client attaches). Reads the same global settings blob.
 function readDevNoCacheSetting() {
@@ -161,6 +175,11 @@ function buildId() {
 // <SESSION_DIR_ROOT>/--<cwd>--/, shared with the pi CLI/TUI (getAgentDir
 // honors PI_CODING_AGENT_DIR).
 const SESSION_DIR_ROOT = join(getAgentDir(), "sessions");
+// Propagate pi agent's httpProxy setting and environment proxies to undici/fetch
+const proxyInfo = initHttpProxy(getAgentDir());
+if (proxyInfo.active) {
+    console.log(`[proxy] Outbound HTTP proxy enabled: ${proxyInfo.proxyUrl}`);
+}
 // Windows 轻量 bash 兜底：把 <home>/.pi-web/bin 前置到 PATH（SDK 的 bash 工具经
 // findBashOnPath 会找到其中的 bash.exe），并在无 Git Bash 时后台下载 busybox-w32。
 // 终端面板的 shell 探测链也已包含该目录（见 terminals.ts resolveShell）。
@@ -191,8 +210,17 @@ function requestTokens(req) {
     if (typeof cookie === "string") {
         for (const part of cookie.split(";")) {
             const [k, ...rest] = part.trim().split("=");
-            if (k === "pi_web_token")
-                out.push(rest.join("=").trim());
+            if (k !== "pi_web_token")
+                continue;
+            // 我们下发的是 encodeURIComponent 后的值（issue #261），而手写 / 旧客户端的
+            // 明文 cookie 也可能出现（`=` 在值里合法，按首个 = 切分）；两种候选都进池子。
+            const raw = rest.join("=").trim();
+            if (!raw)
+                continue;
+            out.push(raw);
+            const decoded = decodeCookieToken(raw);
+            if (decoded !== raw)
+                out.push(decoded);
         }
     }
     return out.filter(Boolean);
@@ -200,7 +228,9 @@ function requestTokens(req) {
 function tokenOk(req) {
     return requestTokens(req).includes(AUTH_TOKEN);
 }
-/** 请求携带的 pi_web_token cookie 值（未带/损坏时为空串）。 */
+/** 请求携带的 pi_web_token cookie 的**口令值**（未带/损坏时为空串）。
+ *  已解码：下发时是 `encodeURIComponent` 过的（issue #261），所以这里拿到的是
+ *  可直接与 `AUTH_TOKEN` 比较的原文。 */
 function cookieToken(req) {
     const cookie = req.headers.cookie;
     if (typeof cookie !== "string")
@@ -208,7 +238,7 @@ function cookieToken(req) {
     for (const part of cookie.split(";")) {
         const [k, ...rest] = part.trim().split("=");
         if (k === "pi_web_token")
-            return rest.join("=").trim();
+            return decodeCookieToken(rest.join("=").trim());
     }
     return "";
 }
@@ -235,7 +265,10 @@ if (AUTH_TOKEN) {
         // Secure 只在 TLS 连接上加：常加会让明文 HTTP（默认 loopback）收不到 cookie。
         const secure = isTlsRequest(req);
         if (ok) {
-            if (cookie !== encodeURIComponent(AUTH_TOKEN)) {
+            // cookieToken 已解码成原文（issue #261），所以直接和原始口令比 ——
+            // 以前拿 `encodeURIComponent(AUTH_TOKEN)` 比，含 `=` / 非 ASCII 的口令
+            // 永远不相等（于是每个请求都重发 cookie，且带 cookie 的请求反而 401）。
+            if (cookie !== AUTH_TOKEN) {
                 res.setHeader("Set-Cookie", buildPiWebTokenCookie(encodeURIComponent(AUTH_TOKEN), 31536000, secure));
             }
         }
@@ -272,14 +305,25 @@ const SERVICE_INFO = toServiceInfo(ORIGIN);
 const TABS = parseTabs();
 registerFileTransferRoutes(app, (clientId) => service.get(clientId)?.cwd);
 app.get("/api/health", (_req, res) => {
-    res.json({ ok: true, piVersion: VERSION, cwd: CWD, pid: process.pid, engine: ENGINE });
+    res.json({
+        ok: true,
+        piVersion: VERSION,
+        // issue #260：服务实际加载的是自带副本，不是全局 pi CLI 那份。这里把两份都报出来，
+        // 用户就不用猜「为什么升了全局 SDK 不生效」。（纯新增字段，piVersion 语义不变。）
+        piSdkCopies: sdkCopies(),
+        cwd: CWD,
+        pid: process.pid,
+        engine: ENGINE,
+    });
 });
 /**
  * Stream a workspace file over HTTP.
  *
  * Media preview (no download param): only image/video kinds are served —
  * text goes over the WebSocket, and exe/jar/etc. are never exposed here.
- * express's sendFile handles Range requests, so video seeking works.
+ * Audio files (isAudioFile: browser-playable containers only) are allowed too
+ * so present_files cards and the preview dialog can inline-play them.
+ * express's sendFile handles Range requests, so video/audio seeking works.
  *
  * Download (?download=1): any file kind is served with
  * Content-Disposition: attachment so the browser saves it instead of
@@ -316,7 +360,8 @@ app.get("/api/file", async (req, res) => {
         // allowlist them explicitly here.
         const lower = name.toLowerCase();
         const isHtmlPreview = lower.endsWith(".html") || lower.endsWith(".htm") || lower.endsWith(".xhtml");
-        if (!isDownload && kind !== "image" && kind !== "video" && !isHtmlPreview) {
+        const isAudioPreview = isAudioFile(name);
+        if (!isDownload && kind !== "image" && kind !== "video" && !isHtmlPreview && !isAudioPreview) {
             res.status(400).end("not a previewable media file");
             return;
         }
@@ -1483,6 +1528,17 @@ wss.on("connection", (ws) => {
             case "get_commands":
                 void cs.pushSlashCommands();
                 break;
+            case "get_tool_info":
+                // 工具卡右键菜单的「显示工具详细信息」：按需取一次工具定义（不进快照）。
+                // 引擎没实现（或旧版服务端）时回一条 unsupported，前端据此显示「不支持」
+                // 而不是永远转圈。
+                if (typeof cs.getToolInfo === "function") {
+                    void cs.getToolInfo(msg.name);
+                }
+                else {
+                    send({ type: "tool_info", name: msg.name, found: false, unsupported: true });
+                }
+                break;
             case "list_sessions":
                 void cs.refreshSessions();
                 break;
@@ -1504,6 +1560,11 @@ wss.on("connection", (ws) => {
             case "dismiss_conversation":
                 void cs.dismissConversation(msg.id, msg.withFinishedSubagents, msg.force);
                 break;
+            case "persist_conversation":
+                if (typeof cs.persistConversation === "function") {
+                    void cs.persistConversation(msg.id);
+                }
+                break;
             case "dismiss_finished_subagents":
                 void cs.dismissFinishedSubagents(msg.parentId);
                 break;
@@ -1609,6 +1670,12 @@ wss.on("connection", (ws) => {
             case "set_model":
                 void cs.setModel(msg.modelId);
                 break;
+            case "set_default_model":
+                void cs.setDefaultModel?.(msg.modelId);
+                break;
+            case "clear_default_model":
+                cs.clearDefaultModel?.();
+                break;
             case "set_thinking":
                 cs.setThinking(msg.level);
                 break;
@@ -1727,6 +1794,12 @@ wss.on("connection", (ws) => {
             case "clone_provider":
                 void cs.cloneProvider(msg.provider, msg.reqId);
                 break;
+            case "enrich_models":
+                void cs.enrichModels(msg.reqId, msg.ids, msg.hints);
+                break;
+            case "abort_enrich_models":
+                cs.abortEnrichModels(msg.reqId);
+                break;
             case "list_provider_keys":
                 cs.listProviderKeys();
                 break;
@@ -1814,12 +1887,15 @@ wss.on("connection", (ws) => {
                     terminalToolsEnabled: msg.terminalToolsEnabled,
                     terminalBash: msg.terminalBash,
                     terminalBashIdleMs: msg.terminalBashIdleMs,
+                    toolWatchdogTimeoutMs: msg.toolWatchdogTimeoutMs,
+                    readDirEnabled: msg.readDirEnabled,
                     editSoftEnabled: msg.editSoftEnabled,
                     questionnaireEnabled: msg.questionnaireEnabled,
                     parallelReminderEnabled: msg.parallelReminderEnabled,
                     goalModeEnabled: msg.goalModeEnabled,
                     thinkingWrap: msg.thinkingWrap,
                     toolsWrap: msg.toolsWrap,
+                    toolImagesEnabled: msg.toolImagesEnabled,
                     devNoCache: msg.devNoCache,
                     autoReload: msg.autoReload,
                     skillsFullText: msg.skillsFullText,
@@ -2294,6 +2370,13 @@ httpServer.listen(PORT, HOST, () => {
     console.log(`    workspace   : ${CWD}`);
     console.log(`    session dir : ${SESSION_DIR_ROOT}`);
     console.log(`    pi SDK      : v${VERSION}`);
+    // issue #260：全局那份 pi SDK 不是服务在用的那份（自带副本赢在 Node 解析顺序上）。
+    // 不提示的话，用户会以为 `npm i -g @earendil-works/pi-coding-agent@latest` 生效了。
+    const sdkNote = sdkOriginNote(sdkCopies(), VERSION);
+    if (sdkNote) {
+        console.log(`    pi SDK note : ${sdkNote}`);
+        console.log(`                  Upgrading the global pi CLI does not change this server — upgrade pi-web-ui instead.`);
+    }
     console.log(`    bind        : ${HOST}:${PORT}`);
     console.log("");
 });