pi-web-ui 0.71.0 → 0.73.0

package/dist/server/client-state.js

@@ -331,6 +331,62 @@ export class ClientStateStore {
         }
         this.save();
     }
+    /** Remove one provider from EVERY project's saved keys (all clients, all
+     *  cwds) — e.g. the provider was cleared and returned to unconfigured.
+     *  Returns the number of entries removed. */
+    deleteProviderEverywhere(provider) {
+        const all = this.load();
+        let removed = 0;
+        for (const state of Object.values(all)) {
+            const map = state.projectProviderKeys;
+            if (!map)
+                continue;
+            for (const [cwd, inner] of Object.entries(map)) {
+                if (inner && provider in inner) {
+                    delete inner[provider];
+                    removed++;
+                    if (Object.keys(inner).length === 0)
+                        delete map[cwd];
+                }
+            }
+            if (map && Object.keys(map).length === 0)
+                delete state.projectProviderKeys;
+        }
+        if (removed > 0)
+            this.save();
+        return removed;
+    }
+    /** Fix every project that still references a deleted key: point it at the
+     *  key that took over (`newActive`), or drop the reference when the
+     *  provider has no keys left (`newActive` null). A key deletion made in
+     *  one project must not keep haunting every other project that once used
+     *  the same key on every project switch. Returns entries touched. */
+    repointDeletedKeyEverywhere(provider, deletedKeyName, newActive) {
+        const all = this.load();
+        let touched = 0;
+        for (const state of Object.values(all)) {
+            const map = state.projectProviderKeys;
+            if (!map)
+                continue;
+            for (const [cwd, inner] of Object.entries(map)) {
+                if (inner?.[provider] !== deletedKeyName)
+                    continue;
+                if (newActive)
+                    inner[provider] = newActive;
+                else {
+                    delete inner[provider];
+                    if (Object.keys(inner).length === 0)
+                        delete map[cwd];
+                }
+                touched++;
+            }
+            if (map && Object.keys(map).length === 0)
+                delete state.projectProviderKeys;
+        }
+        if (touched > 0)
+            this.save();
+        return touched;
+    }
     /** Get the model the user last selected in a project, or undefined. */
     getProjectModel(clientId, cwd) {
         return this.load()[clientId]?.projectModels?.[cwd];

package/dist/server/dsh/dsh-agent-service.js

@@ -1560,6 +1560,65 @@ export class DshClientSession {
             textEn: "The DSH engine cannot stop bash alone (stop the whole conversation instead)",
         });
     }
+    /** 手动重试上次失败的模型调用：找到最后一条用户提问并重发一次
+     *  （DSH 运行时以 prompt 驱动回合，无 triggerTurn 语义）。流式中 /
+     *  无可重试失败时只发 notice 拒绝。 */
+    async retryLast() {
+        const conv = this.conv;
+        try {
+            if (this.quiesceBlocked())
+                return;
+            if (conv.isStreaming) {
+                this.emit({
+                    type: "notice",
+                    level: "info",
+                    text: "对话正在生成中，无需重试",
+                    textEn: "The conversation is still generating — no need to retry",
+                });
+                return;
+            }
+            let failed = false;
+            for (let i = conv.messages.length - 1; i >= 0; i--) {
+                const m = conv.messages[i];
+                if (m.role !== "assistant")
+                    continue;
+                failed = !!m.errorMessage;
+                break;
+            }
+            if (!failed) {
+                this.emit({
+                    type: "notice",
+                    level: "info",
+                    text: "没有可重试的失败：上一轮没有报错结束",
+                    textEn: "Nothing to retry: the last turn did not end with an error",
+                });
+                return;
+            }
+            let lastUser = "";
+            for (let i = conv.messages.length - 1; i >= 0; i--) {
+                const m = conv.messages[i];
+                if (m.role !== "user")
+                    continue;
+                lastUser = m.content
+                    .map((c) => ("text" in c ? c.text : ""))
+                    .join("")
+                    .trim();
+                if (lastUser)
+                    break;
+            }
+            const lang = this.getLang();
+            await this.prompt(lastUser || pick(lang, "请继续", "Please continue", "dsh.prompt.continue"));
+        }
+        catch (err) {
+            this.emit({
+                type: "notice",
+                level: "error",
+                text: `手动重试失败：${err.message}`,
+                textEn: `Manual retry failed: ${err.message}`,
+            });
+        }
+        this.flushSnapshot();
+    }
     // -----------------------------------------------------------------------
     // 后台任务
     // -----------------------------------------------------------------------
@@ -1683,7 +1742,9 @@ export class DshClientSession {
             });
         }
     }
-    async dismissConversation(id) {
+    async dismissConversation(id, _withFinishedSubagents, force) {
+        // DSH 引擎无第一方子代理：withFinishedSubagents 恒为 no-op（签名与标准引擎对齐）。
+        // force 放行 active/终端限制；运行中仍拒绝（DSH 单 runtime 无法单独 abort 一个对话，请先点停止）。
         const conv = this.convs.get(id);
         if (!conv) {
             this.emit({
@@ -1694,7 +1755,7 @@ export class DshClientSession {
             });
             return;
         }
-        if (id === this.activeId) {
+        if (id === this.activeId && !force) {
             this.emit({
                 type: "notice",
                 level: "warning",
@@ -1716,7 +1777,7 @@ export class DshClientSession {
             });
             return;
         }
-        if (conv.terminals.list().length > 0) {
+        if (conv.terminals.list().length > 0 && !force) {
             this.emit({
                 type: "notice",
                 level: "warning",
@@ -1725,10 +1786,37 @@ export class DshClientSession {
             });
             return;
         }
+        // force + active：先让出 active（切到其他对话或新建），再移除。
+        if (id === this.activeId) {
+            const other = [...this.convs.values()].find((c) => c.id !== id);
+            if (other)
+                await this.switchConversation(other.id);
+            else
+                await this.newChat();
+            if (id === this.activeId) {
+                this.emit({
+                    type: "notice",
+                    level: "warning",
+                    text: `当前对话「${conv.title}」暂时无法移出（无法创建接替对话）`,
+                    textEn: `Cannot dismiss the active conversation "${conv.title}" right now (no replacement chat available)`,
+                });
+                return;
+            }
+        }
         this.removeConversation(id);
         this.emitConversations();
         this.flushSnapshot();
     }
+    /** DSH 引擎无第一方子代理（emitConversations 恒 isSubagent:false）：批量
+     *  关闭退化为空操作提示，保持与 pi 引擎同一 wire 行为。 */
+    async dismissFinishedSubagents(_parentId) {
+        this.emit({
+            type: "notice",
+            level: "info",
+            text: "没有可关闭的已结束子代理",
+            textEn: "No finished subagents to dismiss",
+        });
+    }
     /** 切换会话：读 JSONL 回放 → 新建 conversation（同一 sessionId 续聊）。 */
     async switchSession(path) {
         try {
@@ -2970,6 +3058,14 @@ export class DshClientSession {
     async listModelsConfig() {
         this.emit({ type: "models_config", providers: [] });
     }
+    async reloadModelsConfig() {
+        this.emit({
+            type: "notice",
+            level: "warning",
+            text: "DSH 引擎不支持自定义 provider",
+            textEn: "The DSH engine does not support custom providers",
+        });
+    }
     async saveModelConfig(_providerId, _config) {
         this.emit({
             type: "notice",

package/dist/server/index.js

@@ -705,6 +705,9 @@ wss.on("connection", (ws) => {
             case "abort_bash":
                 void cs.abortBash();
                 break;
+            case "retry_last":
+                void cs.retryLast();
+                break;
             case "kill_background_server":
                 void cs.killBackgroundServer(msg.port, msg.taskId);
                 break;
@@ -753,7 +756,10 @@ wss.on("connection", (ws) => {
                 void cs.renameConversation(msg.id, msg.name);
                 break;
             case "dismiss_conversation":
-                void cs.dismissConversation(msg.id);
+                void cs.dismissConversation(msg.id, msg.withFinishedSubagents, msg.force);
+                break;
+            case "dismiss_finished_subagents":
+                void cs.dismissFinishedSubagents(msg.parentId);
                 break;
             case "switch_session":
                 void cs.switchSession(msg.path);
@@ -835,6 +841,9 @@ wss.on("connection", (ws) => {
             case "list_models_config":
                 void cs.listModelsConfig();
                 break;
+            case "reload_models_config":
+                void cs.reloadModelsConfig();
+                break;
             case "save_model_config":
                 void cs.saveModelConfig(msg.providerId, msg.config);
                 break;
@@ -941,6 +950,7 @@ wss.on("connection", (ws) => {
                     visionBridgePromptMode: msg.visionBridgePromptMode,
                     visionBridgePrompt: msg.visionBridgePrompt,
                     subagentDefaultModel: msg.subagentDefaultModel,
+                    retryMaxAttempts: msg.retryMaxAttempts,
                     reviewPrompt: msg.reviewPrompt,
                     reviewDisabledSkills: msg.reviewDisabledSkills,
                     markersEnabled: msg.markersEnabled,

package/dist/server/model-admin.js

@@ -57,6 +57,70 @@ function stripJsonComments(src) {
     }
     return out;
 }
+/** Merge a UI-submitted provider config into the existing models.json entry.
+ *
+ * 表单（`UiProviderConfig`）只承载 UI 认识的字段：provider 级 name/api/baseUrl/
+ * apiKey/authHeader，模型级 id/name/reasoning/input/contextWindow/maxTokens。
+ * models.json 里还可能有 UI 不认识的字段——provider 级 headers（浏览器拿不到，
+ * 见 listModelsConfig）、模型级 api/baseUrl/cost/compat/thinkingLevelMap（手写或
+ * 脚本写入，pi-ai 靠它们决定请求地址与推理格式）。按表单整体重建条目会把这些字段
+ * 静默抹掉，可能把可用的配置改坏：模型级 baseUrl 丢失后会回退到对该 api 适配器
+ * 无效的地址（例如 opencode-go 的 anthropic baseUrl），请求直接打到不存在的路径。
+ *
+ * 所以这里以已有条目为底、表单字段覆盖：表单没提到的字段原样保留，表单清空的可选
+ * 字段才真正删除；`models` 仍是「表单即全集」——表单里删掉的 id 会被移除。
+ */
+export function mergeProviderConfigEntry(prevEntry, config, models) {
+    const prevModels = new Map();
+    if (Array.isArray(prevEntry?.models)) {
+        for (const entry of prevEntry.models) {
+            if (!entry || typeof entry !== "object")
+                continue;
+            const id = entry.id;
+            if (typeof id === "string" && id.trim())
+                prevModels.set(id.trim(), entry);
+        }
+    }
+    const mergedModels = models.map((model) => {
+        // 旧条目同 id 的字段（api/baseUrl/cost/compat/…）先铺底，表单字段覆盖。
+        const merged = { ...(prevModels.get(model.id) ?? {}), id: model.id };
+        if (model.name?.trim())
+            merged.name = model.name.trim();
+        else
+            delete merged.name;
+        if (model.reasoning)
+            merged.reasoning = true;
+        else
+            delete merged.reasoning;
+        if (model.input?.length)
+            merged.input = model.input;
+        else
+            delete merged.input;
+        if (model.contextWindow)
+            merged.contextWindow = Number(model.contextWindow);
+        else
+            delete merged.contextWindow;
+        if (model.maxTokens)
+            merged.maxTokens = Number(model.maxTokens);
+        else
+            delete merged.maxTokens;
+        return merged;
+    });
+    const mergedEntry = { ...prevEntry };
+    const apply = (key, value) => {
+        if (value === undefined)
+            delete mergedEntry[key];
+        else
+            mergedEntry[key] = value;
+    };
+    apply("name", config.name?.trim() || undefined);
+    apply("api", config.api?.trim() || undefined);
+    apply("baseUrl", config.baseUrl?.trim() || undefined);
+    apply("apiKey", config.apiKey?.trim() || undefined);
+    apply("authHeader", config.authHeader ? true : undefined);
+    mergedEntry.models = mergedModels;
+    return mergedEntry;
+}
 /** Numeric metadata value (NaN/string "unknown" → undefined). */
 function numMeta(v) {
     return typeof v === "number" && Number.isFinite(v) ? v : undefined;
@@ -177,6 +241,21 @@ export class ModelAdminService {
         const data = this.readProviderKeys();
         return data[provider]?.activeKeyName ?? null;
     }
+    /** Whether a named key still exists for a provider (no side effects, no
+     *  notices). Restore paths use this to drop stale per-project references
+     *  silently instead of going through activate (which notifies). */
+    hasProviderKey(provider, keyName) {
+        const pid = provider.trim();
+        const targetName = keyName.trim();
+        if (!pid || !targetName)
+            return false;
+        try {
+            return this.readProviderKeys()[pid]?.keys.some((k) => k.name === targetName) ?? false;
+        }
+        catch {
+            return false;
+        }
+    }
     /** Seed a provider's key list from an EXISTING auth.json credential (legacy
      *  configs written before the multi-key store existed) so the store stays
      *  authoritative and the UI shows the current active key immediately even
@@ -373,36 +452,44 @@ export class ModelAdminService {
         this.host.flushSnapshot();
     }
     /** Make a stored API key the ACTIVE one for a built-in provider by NAME (the
-     *  server resolves the stored value from the name). */
-    async activateProviderKey(provider, keyName) {
+     *  server resolves the stored value from the name). Returns true when the
+     *  key is (now) active, false when it doesn't exist or the switch failed.
+     *  `silent` suppresses all notices — for automatic project restores, which
+     *  must self-heal stale references without spamming the user. */
+    async activateProviderKey(provider, keyName, opts) {
         const pid = provider.trim();
         const targetName = keyName.trim();
+        const silent = opts?.silent === true;
+        const notice = (msg) => {
+            if (!silent)
+                this.host.emit(msg);
+        };
         try {
             const data = this.readProviderKeys();
             const entry = data[pid];
             const target = entry?.keys.find((k) => k.name === targetName);
             if (!target) {
-                this.host.emit({
+                notice({
                     type: "notice",
                     level: "error",
                     text: `${pid} 的密钥「${targetName}」不存在`,
                     textEn: `Key "${targetName}" for ${pid} does not exist`,
                 });
-                return;
+                return false;
             }
             if (entry.activeKeyName === targetName) {
-                this.host.emit({
+                notice({
                     type: "notice",
                     level: "info",
                     text: `「${targetName}」已是当前密钥`,
                     textEn: `"${targetName}" is already the active key`,
                 });
-                return;
+                return true;
             }
             entry.activeKeyName = targetName;
             this.writeProviderKeys(data);
             await this.applyActiveKey(pid, target.apiKey);
-            this.host.emit({
+            notice({
                 type: "notice",
                 level: "info",
                 text: `⚡ 已切换到 ${pid} 的「${targetName}」`,
@@ -411,16 +498,21 @@ export class ModelAdminService {
             await this.host.pushModels();
             await this.listProviders();
             this.listProviderKeys();
+            return true;
         }
         catch (err) {
-            this.host.emit({
+            notice({
                 type: "notice",
                 level: "error",
                 text: `切换密钥失败：${err.message}`,
                 textEn: `Failed to switch key: ${err.message}`,
             });
+            return false;
+        }
+        finally {
+            if (!silent)
+                this.host.flushSnapshot();
         }
-        this.host.flushSnapshot();
     }
     /** Remove a stored API key by NAME. If it was active, the first remaining key
      *  becomes active (or the provider returns to unconfigured when no key is left). */
@@ -793,6 +885,31 @@ export class ModelAdminService {
         });
         this.host.emit({ type: "models_config", providers: list });
     }
+    /** Re-read models.json from disk (hand/script edits outside the UI) and
+     *  repush — same refresh tail that save_model_config runs. */
+    async reloadModelsConfig() {
+        try {
+            await this.host.modelRuntime().refresh();
+            this.host.invalidatePiConfig();
+            await this.listModelsConfig();
+            await this.host.pushModels();
+            this.host.emit({
+                type: "notice",
+                level: "info",
+                text: "🔄 已从磁盘重新加载模型配置",
+                textEn: "🔄 Reloaded model config from disk",
+            });
+        }
+        catch (err) {
+            this.host.emit({
+                type: "notice",
+                level: "error",
+                text: `重新加载模型配置失败：${err.message}`,
+                textEn: `Failed to reload model config: ${err.message}`,
+            });
+        }
+        this.host.flushSnapshot();
+    }
     /** Numeric metadata value (NaN/string "unknown" → undefined). */
     static numMeta(v) {
         return typeof v === "number" && Number.isFinite(v) ? v : undefined;
@@ -988,7 +1105,11 @@ export class ModelAdminService {
             const { providers } = this.readModelsConfig();
             // models.json 原始形状是 Record<string, unknown>——按已保存条目的结构断言
             const saved = providers[pid];
-            if (!saved?.baseUrl?.trim()) {
+            // 纯覆盖条目（只改 models，没有 provider 级 baseUrl）回退到运行时
+            // 已知的地址——内置 provider 的 baseUrl 本来就不在 models.json 里。
+            // 注意只拿来探测用，不写回磁盘：保持条目仍是纯覆盖。
+            const baseUrl = saved?.baseUrl?.trim() || (this.host.modelRuntime().getProvider(pid)?.baseUrl ?? "").trim() || undefined;
+            if (!saved || !baseUrl) {
                 this.host.emit({
                     type: "notice",
                     level: "warning",
@@ -997,7 +1118,7 @@ export class ModelAdminService {
                 });
                 return done(false, { error: "provider missing or no baseUrl" });
             }
-            const fetched = await ModelAdminService.probeModelsEndpoint(saved.baseUrl, saved.apiKey, saved.authHeader === true ? true : undefined, saved.api, saved.headers, lang);
+            const fetched = await ModelAdminService.probeModelsEndpoint(baseUrl, saved.apiKey, saved.authHeader === true ? true : undefined, saved.api, saved.headers, lang);
             // Merge: manual values win; fetched fills blanks and appends new ids.
             const prev = new Map((saved.models ?? []).map((m) => [m.id, m]));
             let added = 0;
@@ -1078,18 +1199,9 @@ export class ModelAdminService {
         }
         try {
             const { providers } = this.readModelsConfig();
-            // headers never reach the browser, so the incoming config can't carry
-            // them — preserve the previously stored values when they are absent.
-            const prevHeaders = providers[pid]?.headers;
-            providers[pid] = {
-                ...(config.name?.trim() ? { name: config.name.trim() } : {}),
-                ...(config.api?.trim() ? { api: config.api.trim() } : {}),
-                ...(config.baseUrl?.trim() ? { baseUrl: config.baseUrl.trim() } : {}),
-                ...(config.apiKey?.trim() ? { apiKey: config.apiKey.trim() } : {}),
-                ...(config.authHeader ? { authHeader: true } : {}),
-                ...(prevHeaders && Object.keys(prevHeaders).length > 0 ? { headers: prevHeaders } : {}),
-                models,
-            };
+            // 合并而不是重建：UI 认识之外的字段（provider 级 headers、模型级 api/
+            // baseUrl/cost/compat/thinkingLevelMap）必须原样保留，见 mergeProviderConfigEntry。
+            providers[pid] = mergeProviderConfigEntry(providers[pid], config, models);
             mkdirSync(this.host.agentDir, { recursive: true });
             writeFileSync(this.modelsConfigPath(), JSON.stringify({ providers }, null, 2) + "\n");
             // Allow a custom models.json entry to reuse the provider credential

package/dist/server/patch-remote-catalog.js

@@ -0,0 +1,59 @@
+/**
+ * Remote-catalog merge patch for @earendil-works/pi-coding-agent.
+ *
+ * The SDK composes each built-in provider's model list as
+ *     mergeModels(builtinStaticCatalog, pi.devRemoteCatalog)
+ * which is a UNION: same-id entries get replaced by the newer pi.dev row, new
+ * ids are appended, but stale built-in models are kept forever (and the UI
+ * reports "新增 N 个模型" when the overlay grows).
+ *
+ * pi-web-ui wants the picker to mirror the OFFICIAL remote catalog exactly —
+ * an "ensure latest, no merge, no 'new N' noise" behavior. This module rewrites
+ * the installed copy of remote-catalog-provider.js so the remote overlay
+ * REPLACES the built-in catalog entirely whenever pi.dev data is present:
+ *     getModels: () => (dynamicModels.length > 0 ? dynamicModels : provider.getModels())
+ * (the built-in catalog only serves as fallback while no remote data has been
+ * received yet, so the list can never be empty).
+ *
+ * Same pattern as patch-node-pty.ts: idempotent (checks before rewriting),
+ * best-effort (a read-only node_modules or an SDK version whose source no
+ * longer matches the search strings just skips the patch and keeps the SDK's
+ * default union semantics — never a crash). MUST be imported before the SDK
+ * modules are first loaded (agent-service.ts imports this first).
+ */
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
+/** Old fragment that performs the union merge (single occurrence in the file). */
+const OLD = "getModels: () => mergeModels(provider.getModels(), dynamicModels),";
+/** Replacement: whole-replace with the remote catalog when available. */
+const NEW = "getModels: () => (dynamicModels.length > 0 ? dynamicModels : provider.getModels()),";
+/** Absolute path of the installed remote-catalog-provider.js, or null. */
+function remoteCatalogFile() {
+    try {
+        // import.meta.resolve honors the package "exports" (import condition) → dist/index.js;
+        // remote-catalog-provider.js lives next to it in dist/core/.
+        const entry = fileURLToPath(import.meta.resolve("@earendil-works/pi-coding-agent"));
+        return join(dirname(entry), "core", "remote-catalog-provider.js");
+    }
+    catch {
+        return null;
+    }
+}
+function applyPatch() {
+    try {
+        const file = remoteCatalogFile();
+        if (!file || !existsSync(file))
+            return;
+        const src = readFileSync(file, "utf8");
+        if (src.includes(NEW))
+            return; // already patched
+        if (!src.includes(OLD))
+            return; // unexpected SDK content — leave alone
+        writeFileSync(file, src.replace(OLD, NEW), "utf8");
+    }
+    catch {
+        // best-effort — without the patch the SDK keeps its default union merge
+    }
+}
+applyPatch();

package/dist/server/protocol-version.js

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

package/dist/server/subagents.js

@@ -68,8 +68,14 @@ export function withSubagentOwner(host, ownerId) {
  * 子代理工具集（注册进每个会话的 customTools，供主 agent 驱动子代理）。
  * 用 `subagent_*` 前缀命名，避免与第三方 pi-subagents 的
  * `Agent`/`get_subagent_result`/`steer_subagent` 冲突。
+ *
+ * `selfConvId`（可选）：这套工具所注册进的会话 convId。`subagent_wait_all`
+ * 永远排除调用者自身——子代理会话上同样注册了全套工具，不传 runIds 时
+ * 「全部」会含它自己，而它正在执行本工具（streaming=true），不排除就是
+ * 自己等自己、永远到超时（self-wait deadlock）。主会话调用时传它自己的
+ * 普通对话 id 即可（不在子代理列表里，delete 是 no-op）。
  */
-export function makeSubagentTools(host, lang) {
+export function makeSubagentTools(host, lang, selfConvId) {
     const getLang = lang ?? host.lang ?? (() => "en");
     const text = (t, details = {}) => ({
         content: [{ type: "text", text: t }],
@@ -232,11 +238,13 @@ export function makeSubagentTools(host, lang) {
             label: "Wait for subagents",
             description: bilingual("Wait for multiple subagents to finish at once (blocks this round until all reach a terminal state or time out), " +
                 "then summarize each result/error — no need to poll subagent_get_result. Pass runIds for specific subagents " +
-                "(convIds returned by subagent_spawn); omit = wait for all currently running ones. On timeout or abort of this " +
-                "round, returns the remaining unfinished list; call again to continue waiting. " +
+                "(convIds returned by subagent_spawn); omit = wait for all currently running ones. The calling session itself " +
+                "is never waited on (a subagent calling this without runIds won't deadlock on itself). " +
+                "On timeout or abort of this round, returns the remaining unfinished list; call again to continue waiting. " +
                 "Good for: collecting parallel subagents.", "一次性等待多个子代理全部完成（阻塞本回合直到它们都到达终态或超时），然后汇总返回每个的结果/错误——" +
                 "不用反复调 subagent_get_result 轮询。传 runIds 指定要等的子代理（subagent_spawn 返回的 convId）；" +
-                "不传 = 等当前全部运行中的子代理。超时或本轮被中止时返回剩余未完成名单，可再次调用继续等。" +
+                "不传 = 等当前全部运行中的子代理。调用者自身永不计入等待（子代理不传 runIds 时不会等自己）。" +
+                "超时或本轮被中止时返回剩余未完成名单，可再次调用继续等。" +
                 "适合：并行派发多个子代理后收口。"),
             promptSnippet: "wait for multiple subagents to finish (no polling) and get all results",
             parameters: Type.Object({
@@ -251,6 +259,15 @@ export function makeSubagentTools(host, lang) {
             }),
             execute: async (_id, p, signal) => {
                 const wanted = new Set(p.runIds && p.runIds.length > 0 ? p.runIds : host.listSubagents().map((r) => r.convId));
+                // 调用者自身永不等待：子代理调本工具时它自己正在 streaming，不排除
+                // 就是自己等自己、永远到超时（self-wait deadlock）。主会话的普通
+                // 对话 id 不在子代理列表里，delete 是 no-op。
+                if (selfConvId)
+                    wanted.delete(selfConvId);
+                if (wanted.size === 0) {
+                    const emptyLang = getLang();
+                    return text(pick(emptyLang, "没有需要等待的子代理（调用者自身不计入等待）。", "No subagents to wait for (the calling session itself is never waited on).", "subagents.wait.empty"));
+                }
                 const timeoutMs = Math.min(Math.max(p.timeoutSeconds ?? 600, 1), Math.floor(WAIT_CAP_MS / 1000)) * 1000;
                 const waitStart = Date.now();
                 const deadline = waitStart + timeoutMs;
@@ -327,6 +344,36 @@ export function makeSubagentTools(host, lang) {
 function shortId(id) {
     return id.slice(0, 8);
 }
+/**
+ * 收集 root 的传递子代理后代 id（parentId 链向上能走到 root 的；含嵌套的嵌套）。
+ * root 自身不含；非子代理对话不含（普通对话不参与子代理清理口径）。
+ * parentId 环（理论上不应出现）按 visited 截断，不会死循环。
+ * 纯函数：后端 dismiss 流程与单测共用（前端左栏按同样口径镜像实现，见
+ * LeftPanel finishedSubagentCount）。
+ */
+export function collectSubagentDescendantIds(items, rootId) {
+    const byId = new Map(items.map((c) => [c.id, c]));
+    const out = [];
+    for (const c of items) {
+        if (!c.isSubagent || c.id === rootId)
+            continue;
+        let cur = c;
+        const seen = new Set();
+        while (cur?.parentId) {
+            if (cur.parentId === rootId) {
+                out.push(c.id);
+                break;
+            }
+            if (seen.has(cur.parentId))
+                break;
+            seen.add(cur.parentId);
+            cur = byId.get(cur.parentId);
+            if (!cur)
+                break;
+        }
+    }
+    return out;
+}
 /** 人类可读的终态判定：报错 > 中止 > done > running。 */
 function subagentVerdict(r, lang = "en") {
     if (r.error)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-web-ui",
-	"version": "0.71.0",
+	"version": "0.73.0",
 	"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": {
@@ -63,6 +63,9 @@
 		"test:unit": "vitest run",
 		"test:smoke": "node tests/run-smoke.mjs",
 		"check:protocol": "node scripts/check-protocol-sync.mjs",
+		"i18n:diff": "node scripts/i18n-diff.mjs",
+		"release:notes": "node scripts/release-notes.mjs",
+		"changelog:i18n": "node scripts/release-notes.mjs --unreleased",
 		"test:freeze": "node tests/freeze-test.mjs",
 		"start": "node dist/server/index.js",
 		"format": "prettier --write server/ web/src/ extensions/ scripts/ bin/ tests/*.mjs tests/unit/ *.mjs",

package/themes/cyberpunk.css

@@ -93,5 +93,5 @@
 	--chip-bg: color-mix(in srgb, var(--bg-elev2) var(--wallpaper-panel-alpha, 62%), transparent);
 	--msgs-bg: color-mix(in srgb, var(--bg-elev) var(--wallpaper-panel-alpha, 62%), transparent);
 	--inputbox-bg: color-mix(in srgb, var(--bg-elev2) var(--wallpaper-panel-alpha, 62%), transparent);
-	--menu-bg: var(--chip-bg);
+	--menu-bg: var(--bg-elev2);
 }