pi-web-ui 0.47.0 → 0.48.1

package/dist/server/agent-service.js

@@ -17,6 +17,7 @@ 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 { hasPendingWaitSubscription, shouldRetainActive } from "./wait-subscription-scan.js";
 import { syncPluginToolsIntoSession } from "./plugins.js";
 import { SettingsService } from "./settings-service.js";
 import { GoalService } from "./goal-service.js";
@@ -2124,22 +2125,26 @@ export class ClientSession {
         // An isolated reviewer can keep working while the main session is idle;
         // retain that conversation so its review is not disposed when the user
         // switches away without sending another prompt.
-        if (conv.goal.reviewing || conv.wizardRunning) {
-            conv.listed = true;
-            return null;
-        }
-        if (conv.session.isStreaming) {
-            conv.listed = true;
-            return null;
-        }
-        // Terminal state is a reason to keep an otherwise idle conversation alive:
-        // switching chats must not kill a PTY the user or agent may still need.
-        if (conv.terminals.list().length > 0) {
+        // 同时检查磁盘上的未过期 wait-subscription 记录：后台子代理运行结束后
+        // 仍欠本会话一次唤醒回合；此时释放运行时会杀死 pi-subagents 扩展宿主，
+        // 唤醒永远无法送达（会话表现为无限期停摆）。保留是自限的：记录过期后
+        // 不再阻止释放。
+        // Also retain when a non-expired pi-subagents wait-subscription record
+        // exists on disk for this session: a finished background subagent run
+        // still owes this conversation a wake-up turn.
+        const retained = shouldRetainActive({
+            reviewing: conv.goal.reviewing,
+            wizardRunning: conv.wizardRunning,
+            streaming: conv.session.isStreaming,
+            openTerminals: conv.terminals.list().length,
+            listed: conv.listed,
+            promptedSinceActive: conv.promptedSinceActive,
+            hasPendingWake: () => hasPendingWaitSubscription({ sessionId: conv.session.sessionFile }),
+        });
+        if (retained) {
             conv.listed = true;
             return null;
         }
-        if (conv.listed && conv.promptedSinceActive)
-            return null;
         return conv;
     }
     /** Remove a conversation from the running list and free its runtime. The

package/dist/server/wait-subscription-scan.js

@@ -0,0 +1,183 @@
+// ---------------------------------------------------------------------------
+// 挂起 wake 订阅扫描（retain conversations with pending subagent wakes）
+// ---------------------------------------------------------------------------
+// 背景：pi-subagents 扩展在后台异步子代理运行结束后，通过持久化的
+// wait-subscription 记录唤醒父会话（pi.sendMessage({ triggerTurn: true })）。
+// 记录是独立的小 JSON 文件，存放在共享目录
+//   <tmp>/pi-subagents-<scope>/wait-subscriptions/<token>.json
+// 其中 scope 与 pi-subagents/src/shared/types.ts 的 resolveTempScopeId() 一致：
+//   PI_SUBAGENTS_TEMP_ROOT 环境变量优先，否则 uid-N / user-<用户名> /
+//   home-<主目录> / shared（完整 fallback 链见 resolveTempScopeId 注释）。
+// 记录的 sessionId 是会话 .jsonl 文件的绝对路径（AgentSession.sessionFile），
+// 记录自带 expiresAt（毫秒时间戳），因此任何基于它的保留策略都是自限的：
+// 记录过期后即不再触发保留，内存/运行时开销有硬上界。
+//
+// fail-open / fail-closed 决策：只有「能完整解析为合法 wait-subscription 记录、
+// sessionId 匹配且未过期」的文件才算证据（→ fail-closed 保留运行时）。
+// 损坏 JSON、格式不符（含非有限数值，见 parseRecord）、外部会话的记录一律
+// 视为「无证据」（→ fail-open 允许释放）：这些文件无法给出可信的过期时间，
+// 若 fail-closed 会造成运行时永久泄漏；而误释放的最坏后果只是本 bug 已知的
+// 行为（重开聊天时唤醒）。
+// ---------------------------------------------------------------------------
+// Scan for pending "wait subscription" records (pi-subagents). A pending record
+// means the conversation's session is owed a wake-up turn by a finished
+// background subagent run, so its runtime must be kept alive across project /
+// conversation switches. See the Chinese block above for the persistence layout
+// and the fail-open vs fail-closed rationale.
+import { readdirSync, readFileSync } from "node:fs";
+import { homedir, tmpdir, userInfo } from "node:os";
+import path from "node:path";
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+/**
+ * 严格结构校验：任何字段缺失/类型不符（含非有限数值 —— 例如 JSON 里的 1e999
+ * 经 JSON.parse 变成 Infinity）都视为「外部格式」，不算证据（fail-open）。
+ * 非有限 expiresAt 会破坏「记录过期即自限」的不变量，必须挡在校验层。
+ */
+function parseRecord(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return undefined;
+    const record = value;
+    if (record.version !== 1
+        || typeof record.token !== "string"
+        || !UUID_RE.test(record.token)
+        || typeof record.sessionId !== "string"
+        || (record.targetKind !== "async" && record.targetKind !== "foreground")
+        || typeof record.runId !== "string"
+        || typeof record.requestedId !== "string"
+        || typeof record.createdAt !== "number" || !Number.isFinite(record.createdAt)
+        || typeof record.expiresAt !== "number" || !Number.isFinite(record.expiresAt))
+        return undefined;
+    return record;
+}
+function sanitizeTempScopeSegment(value) {
+    const sanitized = value
+        .trim()
+        .replace(/[^A-Za-z0-9._-]+/g, "-")
+        .replace(/^-+|-+$/g, "");
+    return sanitized || "unknown";
+}
+/**
+ * 复刻 pi-subagents 的临时目录 scope（resolveTempScopeId，types.ts:2054）。
+ * Fallback 链与上游逐层对齐：
+ *   1. getuid() 可用 → `uid-<n>`；
+ *   2. USERNAME / USER / LOGNAME 环境变量 → `user-<名>`；
+ *   3. os.userInfo().username（try/catch，抛错则落到下一层）→ `user-<名>`；
+ *   4. USERPROFILE / HOME 环境变量，再退 os.homedir()（非空字符串才用）→
+ *      `home-<主目录>`；
+ *   5. 全部不可得 → "shared"。
+ * Mirror of pi-subagents' temp-scope resolution so both sides agree on the
+ * shared wait-subscriptions directory without importing pi-subagents.
+ * getuid / userInfo / homedir 可注入以便逐层测试（生产用 os 默认值）。
+ */
+export function resolveTempScopeId(env = process.env, getuid = process.getuid?.bind(process), userInfoFn = userInfo, homedirFn = homedir) {
+    if (typeof getuid === "function")
+        return `uid-${getuid()}`;
+    for (const key of ["USERNAME", "USER", "LOGNAME"]) {
+        const value = env[key];
+        if (value)
+            return `user-${sanitizeTempScopeSegment(value)}`;
+    }
+    try {
+        const username = userInfoFn?.().username;
+        if (username)
+            return `user-${sanitizeTempScopeSegment(username)}`;
+    }
+    catch {
+        // Fall through to home-directory-based scoping.
+    }
+    const homedirEnv = env.USERPROFILE ?? env.HOME;
+    if (homedirEnv)
+        return `home-${sanitizeTempScopeSegment(homedirEnv)}`;
+    try {
+        const fallbackHomedir = homedirFn?.();
+        if (fallbackHomedir)
+            return `home-${sanitizeTempScopeSegment(fallbackHomedir)}`;
+    }
+    catch {
+        // Fall through to the last-resort shared scope.
+    }
+    return "shared";
+}
+/** wait-subscriptions 目录默认位置（与 pi-subagents 的推导一致）。 */
+export function resolveSubscriptionsDir(env = process.env) {
+    const configured = env.PI_SUBAGENTS_TEMP_ROOT?.trim();
+    const root = configured
+        ? path.resolve(configured)
+        : path.join(tmpdir(), `pi-subagents-${resolveTempScopeId(env)}`);
+    return path.join(path.dirname(path.join(root, "async-subagent-runs")), "wait-subscriptions");
+}
+/**
+ * 磁盘扫描：该会话是否还有未过期的 wake 订阅记录。
+ * Does the session still have a non-expired wait-subscription record on disk?
+ * 任何 I/O / 解析错误都按「无证据」处理（fail-open，见文件头说明）；
+ * 非 ENOENT 的 I/O 错误会 console.warn 一次（与 pi-subagents :142 对齐），
+ * ENOENT（目录/文件尚不存在）保持静默。
+ */
+export function hasPendingWaitSubscription(options) {
+    const sessionId = options.sessionId;
+    if (!sessionId)
+        return false;
+    const now = options.now ?? Date.now;
+    const warn = options.warn ?? ((message, error) => console.warn(message, error));
+    const isNotFound = (error) => typeof error === "object" && error !== null && "code" in error
+        && error.code === "ENOENT";
+    const dir = options.subscriptionsDir ?? resolveSubscriptionsDir();
+    let files;
+    try {
+        files = readdirSync(dir).filter((file) => file.endsWith(".json"));
+    }
+    catch (error) {
+        if (!isNotFound(error))
+            warn(`Failed to scan wait subscriptions in '${dir}':`, error);
+        return false; // 目录缺失 / 不可读 → 无证据
+    }
+    for (const file of files) {
+        let value;
+        try {
+            value = JSON.parse(readFileSync(path.join(dir, file), "utf-8"));
+        }
+        catch (error) {
+            if (!isNotFound(error))
+                warn(`Failed to read wait subscription '${path.join(dir, file)}':`, error);
+            continue; // 损坏 JSON → 无证据（fail-open）
+        }
+        const record = parseRecord(value);
+        if (!record)
+            continue; // 外部格式 → 无证据
+        // 与 pi-subagents 的读取路径对齐（:154/:326）：文件名必须是
+        // `<token>.json` —— 被重命名过的记录永远不会被上游消费，这里同样
+        // 视为无证据（fail-open），保证与宿主行为一致。
+        // Parity with pi-subagents: only files named `<token>.json` can ever
+        // fire, so renamed records count as no evidence.
+        if (path.basename(file) !== `${record.token}.json`)
+            continue;
+        if (record.sessionId !== sessionId)
+            continue; // 别的会话
+        if (record.expiresAt <= now())
+            continue; // 已过期 → 不再保留
+        return true;
+    }
+    return false;
+}
+/**
+ * 纯函数版置换决策：true = 保留（不得 dispose），false = 调用方可释放。
+ * Pure decision core of displaceActive(): true = retain, false = may dispose.
+ * 顺序与 displaceActive 保持一致：review/wizard → streaming → terminals →
+ * pending wake → listed+continued（「打开后继续过」的会话也保留）。
+ */
+export function shouldRetainActive(input) {
+    if (input.reviewing || input.wizardRunning)
+        return true;
+    if (input.streaming)
+        return true;
+    if (input.openTerminals > 0)
+        return true;
+    const hasPendingWake = typeof input.hasPendingWake === "function"
+        ? input.hasPendingWake()
+        : input.hasPendingWake;
+    if (hasPendingWake)
+        return true;
+    if (input.listed && input.promptedSinceActive)
+        return true;
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-web-ui",
-  "version": "0.47.0",
+  "version": "0.48.1",
   "description": "Web chat interface for the pi coding agent, powered by the pi SDK (@earendil-works/pi-coding-agent) — one-command run, Docker/systemd/launchd deployable",
   "license": "MIT",
   "author": {