@oversk7/pi-web-dsh-style 0.1.0-alpha.1 → 1.0.0

package/README.md

@@ -2,14 +2,14 @@
 
 采用 DeepSeek Harness（DSH）视觉风格、面向 Windows 的非官方 Pi Coding Agent 本地浏览器界面扩展。后端使用 Pi 的公开 RPC 模式，每个会话对应独立的 RPC 进程；历史会话可直接从 Pi 会话文件恢复和渲染。
 
-> 当前版本为 alpha，仅承诺 Windows 10/11。服务只监听 `127.0.0.1`，不应通过端口转发或反向代理暴露到局域网或公网。
+> 当前正式版本为 1.0.0，仅承诺 Windows 10/11。服务只监听 `127.0.0.1`，不应通过端口转发或反向代理暴露到局域网或公网。
 
 ## 安装
 
-需要 Node.js 22.19 或更高版本，以及 Pi Coding Agent 0.84.4 或更高版本。
+需要 Node.js 22.19 或更高版本，以及 Pi Coding Agent 0.85.0 或更高版本。
 
 ```powershell
-pi install npm:@oversk7/pi-web-dsh-style@alpha
+pi install npm:@oversk7/pi-web-dsh-style
 ```
 
 也可以从源码目录安装：
@@ -41,14 +41,23 @@ pi --web
 
 - 多工作区、多会话和后台会话并行运行。
 - 按需启动 Pi RPC 进程，最多保留一个空闲进程。
+- Windows 会话使用 Job Object 托管进程树：停止 Web 或宿主退出时，清理 RPC 及其启动的后台服务、子进程和孙进程。
 - 模型、思考等级、中断、压缩和扩展交互对话框。
 - 运行中逐条显示待处理消息，可单条撤回并重新编辑；`Alt+Q` 可将全部队列消息恢复到输入框。
-- 会话历史、分支树、对话回溯及 `pi-rewind` 文件恢复。
+- 会话历史保留完整分支与检查点，支持回溯后返回切换前的位置，以及 `pi-rewind` 文件恢复。
 - Windows 系统剪贴板图片和文本粘贴。
 - 会话中的本地文件链接可在右侧分栏预览，支持语法高亮、行定位和拖拽调整宽度。
 - 设置面板内更新扩展并热重载 Pi 运行时，无需退出 Web UI。
 - 会话 HTML 导出。
 
+## 进程生命周期
+
+`/web --stop`、宿主 Pi 退出或运行时重载会关闭 Web 会话进程及其后代，包括 detached 后台进程；即使宿主被强制结束，Windows 托管进程也会检测到宿主退出并清理整棵进程树。不会扫描或结束工作区外独立启动的进程，也不会结束其他 Pi 实例。
+
+单个 RPC 进程退出、异常终止或被空闲进程回收时，它启动的后台进程也会一起结束。需要独立于会话长期运行的服务，应从 Web 会话之外的终端启动。通过系统服务管理器、计划任务等外部机制启动的进程不属于此进程树。
+
+只关闭浏览器标签页不会停止 Web 服务或后台会话；要结束它们，请执行 `/web --stop` 或退出宿主 Pi。进程托管依赖 Windows 10/11 自带的 Windows PowerShell 和 Win32 Job Object；如果无法建立托管，RPC 启动会失败，不会回退为无托管进程。
+
 ## 数据与升级
 
 运行状态保存在：
@@ -78,11 +87,11 @@ npm run verify
 npm pack --dry-run
 ```
 
-发布 alpha：
+发布正式版：
 
 ```powershell
 npm login --registry=https://registry.npmjs.org
-npm publish --access public --tag alpha
+npm publish --access public --tag latest
 ```
 
 ## 许可证

package/index.ts

@@ -128,9 +128,10 @@ export default function (pi: ExtensionAPI) {
       const targetId = args.trim();
       if (!targetId || !ctx.sessionManager.getEntry(targetId)) throw new Error("会话树节点不存在");
       await ctx.waitForIdle();
+      const fromId = ctx.sessionManager.getLeafId();
       const result = await ctx.navigateTree(targetId, { summarize: false });
       if (result.cancelled) throw new Error("会话回溯已取消");
-      pi.appendEntry("pi-web-tree-navigation", { targetId });
+      pi.appendEntry("pi-web-tree-navigation", { targetId, fromId });
     },
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oversk7/pi-web-dsh-style",
-  "version": "0.1.0-alpha.1",
+  "version": "1.0.0",
   "description": "An unofficial DSH-styled local Windows browser UI extension for pi coding agent",
   "type": "module",
   "license": "MIT",
@@ -31,6 +31,7 @@
     "state-store.ts",
     "transcript.ts",
     "windows-clipboard.ts",
+    "windows-rpc-job.ps1",
     "web/",
     "README.md",
     "LICENSE",
@@ -62,7 +63,7 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org",
-    "tag": "alpha"
+    "tag": "latest"
   },
   "dependencies": {
     "highlight.js": "^11.12.0"

package/pi-rpc.ts

@@ -2,6 +2,7 @@ import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 import { join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import { getPackageDir } from "@earendil-works/pi-coding-agent";
 
 export type Json = Record<string, any>;
@@ -14,6 +15,11 @@ export interface PiRpc {
 }
 
 const REQUEST_TIMEOUT = 120_000;
+const activeRpcs = new Set<PiRpc>();
+
+export async function closeAllPiRpcs(): Promise<void> {
+  await Promise.all([...activeRpcs].map((rpc) => rpc.close()));
+}
 
 function safeJsonParse(line: string): Json | undefined {
   try {
@@ -79,28 +85,47 @@ export function spawnPiRpc(options: PiRpcSpawnOptions): PiRpc {
     args.push("--session-id", options.sessionId);
   }
   if (options.name) args.push("--name", options.name);
-  const child = spawn(process.execPath, [launch.entry, ...args], {
+  const windows = process.platform === "win32";
+  const executable = windows
+    ? join(process.env.SystemRoot || "C:\\Windows", "System32", "WindowsPowerShell", "v1.0", "powershell.exe")
+    : process.execPath;
+  const childArgs = windows
+    ? ["-NoLogo", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-File", fileURLToPath(new URL("./windows-rpc-job.ps1", import.meta.url))]
+    : [launch.entry, ...args];
+  const child = spawn(executable, childArgs, {
     cwd: options.cwd,
-    env: { ...process.env, NO_COLOR: "1", PI_TELEMETRY: "0" },
+    env: {
+      ...process.env, NO_COLOR: "1", PI_TELEMETRY: "0",
+      ...(windows ? { PI_WEB_RPC_JOB: JSON.stringify({ ownerPid: process.pid, executable: process.execPath, args: [launch.entry, ...args], cwd: options.cwd }) } : {}),
+    },
     stdio: ["pipe", "pipe", "pipe"],
     windowsHide: true,
+    detached: !windows,
   });
 
   const handlers = new Set<(event: Json) => void>();
   const pending = new Map<string, { resolve: (v: Json) => void; reject: (e: Error) => void; timer: ReturnType<typeof setTimeout> }>();
   let buffer = "";
   let closed = false;
+  let closing: Promise<void> | undefined;
   let spawnError: Error | undefined;
   let resolveExit: (() => void) | undefined;
   const exitPromise = new Promise<void>((resolve) => {
     resolveExit = resolve;
   });
 
+  const killProcessTree = (): void => {
+    if (!windows && child.pid) {
+      try { process.kill(-child.pid, "SIGKILL"); } catch { /* The process group may already be gone. */ }
+    }
+    child.kill();
+  };
+
   const forceClose = (reason: string): void => {
     if (closed) return;
     closed = true;
     try {
-      child.kill();
+      killProcessTree();
     } catch {
       // ignore
     }
@@ -114,6 +139,7 @@ export function spawnPiRpc(options: PiRpcSpawnOptions): PiRpc {
 
   child.on("error", (error) => {
     spawnError = error;
+    activeRpcs.delete(rpc);
     closed = true;
     resolveExit?.();
     for (const [, p] of pending) {
@@ -180,6 +206,8 @@ export function spawnPiRpc(options: PiRpcSpawnOptions): PiRpc {
   });
 
   child.on("exit", (code, signal) => {
+    activeRpcs.delete(rpc);
+    if (!windows) killProcessTree();
     closed = true;
     resolveExit?.();
     for (const [, p] of pending) {
@@ -190,10 +218,10 @@ export function spawnPiRpc(options: PiRpcSpawnOptions): PiRpc {
     for (const handler of handlers) handler({ type: "process_exit", code: code ?? undefined, signal: signal ?? undefined });
   });
 
-  return {
+  const rpc: PiRpc = {
     send<T = unknown>(command: Json, timeoutMs = REQUEST_TIMEOUT): Promise<T> {
       if (spawnError) return Promise.reject(spawnError);
-      if (closed) return Promise.reject(new Error("pi rpc process is not running"));
+      if (closed || closing) return Promise.reject(new Error("pi rpc process is not running"));
       const id = randomUUID();
       const payload = { ...command, id };
       return new Promise<T>((resolve, reject) => {
@@ -213,41 +241,51 @@ export function spawnPiRpc(options: PiRpcSpawnOptions): PiRpc {
     },
     write(message: Json): void {
       if (spawnError) throw spawnError;
-      if (closed) throw new Error("pi rpc process is not running");
+      if (closed || closing) throw new Error("pi rpc process is not running");
       child.stdin.write(`${JSON.stringify(message)}\n`);
     },
     onEvent(handler) {
       handlers.add(handler);
       return () => handlers.delete(handler);
     },
-    async close(timeoutMs = 3000) {
+    close(timeoutMs = 3000) {
+      if (closing) return closing;
       if (closed) return exitPromise;
-      let timeout: ReturnType<typeof setTimeout> | undefined;
-      let forced = false;
-      const timeoutPromise = new Promise<void>((resolve) => {
-        timeout = setTimeout(() => {
-          forced = true;
-          forceClose("pi rpc close timed out");
-          resolve();
-        }, timeoutMs);
-        timeout.unref();
-      });
+      closing = closeProcess(timeoutMs);
+      return closing;
+    },
+  };
+  activeRpcs.add(rpc);
+  return rpc;
+
+  async function closeProcess(timeoutMs: number): Promise<void> {
+    let timeout: ReturnType<typeof setTimeout> | undefined;
+    let forced = false;
+    const timeoutPromise = new Promise<void>((resolve) => {
+      timeout = setTimeout(() => {
+        forced = true;
+        forceClose("pi rpc close timed out");
+        resolve();
+      }, timeoutMs);
+    });
+    try {
+      child.stdin.end();
+    } catch {
+      // The RPC may have already closed its input.
+    }
+    await Promise.race([exitPromise, timeoutPromise]);
+    if (timeout) clearTimeout(timeout);
+    if (forced) {
       try {
-        child.stdin.end();
-      } catch {
-        // ignore
-      }
-      await Promise.race([exitPromise, timeoutPromise]);
-      if (timeout) clearTimeout(timeout);
-      if (forced) {
         await Promise.race([
           exitPromise,
-          new Promise<void>((resolve) => {
-            const timer = setTimeout(resolve, 1000);
-            timer.unref();
+          new Promise<never>((_resolve, reject) => {
+            timeout = setTimeout(() => reject(new Error("pi rpc process tree did not exit after forced shutdown")), 1000);
           }),
         ]);
+      } finally {
+        if (timeout) clearTimeout(timeout);
       }
-    },
-  };
+    }
+  }
 }

package/server.ts

@@ -18,7 +18,7 @@ import {
 } from "./abort-session.ts";
 import { ImageAttachmentStore } from "./attachment-store.ts";
 import { closeSseClient, createSseClient, sendSseEvent, type SseClient } from "./sse-channel.ts";
-import { spawnPiRpc, type Json, type PiRpc } from "./pi-rpc.ts";
+import { closeAllPiRpcs, spawnPiRpc, type Json, type PiRpc } from "./pi-rpc.ts";
 import { loadLocalSession } from "./local-session.ts";
 import { loadJsonWithLegacyMigration, writeJsonAtomically } from "./state-store.ts";
 import { buildFilePreview } from "./file-preview.ts";
@@ -136,6 +136,7 @@ interface HistoryNode {
   role?: string;
   customType?: string;
   navigationTargetId?: string;
+  navigationFromId?: string;
   text: string;
   timestamp?: string;
   label?: string;
@@ -212,6 +213,7 @@ let sseClients = new Set<SseClient>();
 let state: StateFile = { version: 1, workspaces: [], sessions: [] };
 let stateSaveChain: Promise<void> = Promise.resolve();
 let shuttingDown = false;
+let shutdownPromise: Promise<void> | undefined;
 let heartbeat: ReturnType<typeof setInterval> | undefined;
 
 const MAX_IDLE_PROCESSES = 1;
@@ -302,7 +304,7 @@ function historyEntrySummary(entry: Json): { role?: string; customType?: string;
   return { text: String(entry.type ?? "会话节点") };
 }
 
-function flattenHistoryTree(treeValue: unknown, leafValue: unknown): { nodes: HistoryNode[]; leafId: string | null } {
+export function flattenHistoryTree(treeValue: unknown, leafValue: unknown): { nodes: HistoryNode[]; leafId: string | null } {
   const roots = Array.isArray(treeValue) ? treeValue as Json[] : [];
   const leafId = typeof leafValue === "string" ? leafValue : null;
   const entries = new Map<string, Json>();
@@ -340,12 +342,15 @@ function flattenHistoryTree(treeValue: unknown, leafValue: unknown): { nodes: Hi
       navigationTargetId: entry.type === "custom" && entry.data && typeof entry.data === "object" && typeof (entry.data as Json).targetId === "string"
         ? (entry.data as Json).targetId as string
         : undefined,
+      navigationFromId: entry.type === "custom" && entry.customType === "pi-web-tree-navigation" && entry.data && typeof entry.data === "object" && typeof (entry.data as Json).fromId === "string"
+        ? (entry.data as Json).fromId as string
+        : undefined,
       text: summary.text,
       timestamp: typeof entry.timestamp === "string" ? entry.timestamp : undefined,
       label: typeof item.node.label === "string" ? item.node.label : undefined,
       active,
       current: entry.id === leafId,
-      rewindable: active && summary.role === "user",
+      rewindable: summary.role === "user",
       navigable: entry.id !== leafId,
       branchDepth: item.branchDepth,
       branchStart: item.branchStart,
@@ -386,7 +391,7 @@ function historyEditorText(record: RuntimeSession, entryId: string): string | un
     if (message.role === "user") return rawContentText(message.content);
   }
   if (entry.type === "custom_message") return rawContentText(entry.content);
-  return undefined;
+  return "";
 }
 
 async function pasteSystemClipboard(): Promise<Json> {
@@ -854,6 +859,7 @@ function sameModelCatalog(left: unknown[], right: unknown[]): boolean {
 }
 
 async function discoverFreshModelCatalog(cwd: string): Promise<ModelCatalog> {
+  if (shuttingDown) throw new Error("pi-web 正在关闭，无法启动模型探测进程");
   const key = normalizePath(cwd);
   const existing = modelCatalogRefreshes.get(key);
   if (existing) return existing;
@@ -1343,6 +1349,7 @@ async function applyPendingSettings(record: RuntimeSession): Promise<void> {
 }
 
 async function ensureProcess(record: RuntimeSession): Promise<void> {
+  if (shuttingDown) throw new Error("pi-web 正在关闭，无法启动会话进程");
   record.lastUsed = Date.now();
   if (record.proc) return;
   if (record.starting) return record.starting;
@@ -2957,9 +2964,14 @@ function sigintHook(): void {
   void shutdown();
 }
 
-async function shutdown(): Promise<void> {
-  if (shuttingDown) return;
+function shutdown(): Promise<void> {
+  if (shutdownPromise) return shutdownPromise;
   shuttingDown = true;
+  shutdownPromise = shutdownServer();
+  return shutdownPromise;
+}
+
+async function shutdownServer(): Promise<void> {
   for (const client of [...sseClients]) {
     closeSseClient(client);
     try {
@@ -2969,9 +2981,8 @@ async function shutdown(): Promise<void> {
     }
   }
   sseClients.clear();
-  for (const record of sessions.values()) {
-    await stopSessionProcess(record);
-  }
+  await Promise.all([...sessions.values()].map(stopSessionProcess));
+  await closeAllPiRpcs();
   for (const download of exportDownloads.values()) unlink(download.path).catch(() => {});
   exportDownloads.clear();
   await imageAttachments.close();
@@ -3004,6 +3015,7 @@ export async function startWebServer(options: {
   updateExtensions?: () => Promise<MaintenanceCommandResult>;
   reloadRuntime?: () => Promise<void>;
 } = {}): Promise<string> {
+  if (shutdownPromise) await shutdownPromise;
   const initialCwd = normalizePath(options.defaultCwd ?? process.cwd());
   updateExtensions = options.updateExtensions;
   reloadRuntime = options.reloadRuntime;
@@ -3012,6 +3024,7 @@ export async function startWebServer(options: {
     if (options.open !== false) openBrowser(serverUrl);
     return serverUrl;
   }
+  shutdownPromise = undefined;
   shuttingDown = false;
   await loadState();
   if (options.initialModelInfo?.models.length) {
@@ -3027,6 +3040,7 @@ export async function startWebServer(options: {
   const requestedPort = options.port && Number.isFinite(options.port) ? options.port : DEFAULT_PORT;
   const app = createServer(async (req, res) => {
     try {
+      if (shuttingDown) return sendJson(res, 503, { error: "pi-web 正在关闭" });
       const url = new URL(req.url ?? "/", `http://${req.headers.host ?? `${HOST}:${requestedPort}`}`);
       if (url.pathname.startsWith("/api/")) {
         const handled = await handleApi(req, res, url);

package/web/app.css

@@ -297,7 +297,11 @@ body[data-workspace-dragging] .YDXeBa_projectRow[draggable=true]{cursor:grabbing
 .pi-queuedMessageWithdraw:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:1px}
 .pi-queuedMessageWithdraw:disabled{cursor:wait;opacity:.45}
 .pi-historyView{flex:1;min-height:0;display:flex;flex-direction:column;overflow:hidden;background:var(--dsw-alias-bg-base)}
-.pi-historyHeader{box-sizing:border-box;width:min(100%,860px);flex:none;display:flex;align-items:flex-start;margin:0 auto;padding:24px 22px 14px}
+.pi-historyHeader{box-sizing:border-box;width:min(100%,860px);flex:none;display:flex;align-items:flex-start;justify-content:space-between;flex-wrap:wrap;gap:12px;margin:0 auto;padding:24px 22px 14px}
+.pi-historyReturn{display:inline-flex;align-items:center;gap:6px;max-width:100%;padding:6px 0;color:var(--dsw-alias-state-business-primary);background:transparent;border:0;cursor:pointer;font:500 12px/20px var(--dsw-font-family)}
+.pi-historyReturn svg{flex:none}
+.pi-historyReturn:hover:not(:disabled){text-decoration:underline}
+.pi-historyReturn:disabled{cursor:wait;opacity:.58}
 .pi-historyTitle{color:var(--dsw-alias-label-primary);font-size:16px;font-weight:600;line-height:24px}
 .pi-historySubtitle{margin-top:3px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
 .pi-historyTabs{box-sizing:border-box;width:min(100%,860px);flex:none;display:flex;gap:24px;margin:0 auto;padding:0 22px;border-bottom:1px solid var(--dsw-alias-border-l2)}

package/web/app.js

@@ -2129,21 +2129,14 @@ function historyNodeLabel(node) {
     thinking_level_change: "思考",
     session_info: "会话",
     custom_message: "扩展消息",
+    custom: "扩展状态",
+    label: "标签",
   }[node.type] || "节点";
 }
 
-function visibleHistoryTreeNodes(nodes) {
-  return nodes.filter((node) => (
-    node.role === "user"
-    || node.role === "assistant"
-    || node.type === "compaction"
-    || node.type === "branch_summary"
-    || node.type === "model_change"
-    || node.type === "thinking_level_change"
-    || node.customType === "pi-web-tree-navigation"
-    || node.label
-    || node.current
-  ));
+function historyRewindNodes(nodes) {
+  return nodes.filter((node) => node.rewindable)
+    .sort((a, b) => (Date.parse(b.timestamp) || 0) - (Date.parse(a.timestamp) || 0));
 }
 
 function renderHistoryView(view) {
@@ -2156,13 +2149,26 @@ function renderHistoryView(view) {
   } else if (dialog.error && nodes.length === 0) {
     body = `<div class="pi-historyState pi-historyError">${esc(dialog.error)}</div>`;
   } else if (dialog.mode === "rewind") {
-    const prompts = nodes.filter((node) => node.rewindable).reverse();
+    const prompts = historyRewindNodes(nodes);
     body = prompts.length > 0 ? prompts.map((node, index) => `
-      <button type="button" class="pi-historyPrompt ${dialog.selectedEntryId === node.id ? "pi-historyPromptSelected" : ""}" data-action="history-choose-rewind" data-entry="${esc(node.id)}" data-role="${esc(node.role || "")}" aria-pressed="${dialog.selectedEntryId === node.id}" ${dialog.busyEntryId ? "disabled" : ""}>
+      <button type="button" class="pi-historyPrompt ${dialog.selectedEntryId === node.id ? "pi-historyPromptSelected" : ""}" data-action="history-choose-rewind" data-entry="${esc(node.id)}" data-role="${esc(node.role || "")}" aria-pressed="${dialog.selectedEntryId === node.id}" ${!node.navigable || dialog.busyEntryId ? "disabled" : ""}>
         <span class="pi-historyPromptIndex">${index === 0 ? "最近" : `-${index}`}</span>
-        <span class="pi-historyPromptCopy"><span class="pi-historyPromptText">${esc(node.text || "（空消息）")}</span><span class="pi-historyPromptMeta">${esc(clockLabel(node.timestamp))} · 从这里创建新分支并重新编辑</span></span>
-      </button>`).join("") : `<div class="pi-historyState">当前分支还没有可回溯的用户消息</div>`;
-    const selected = prompts.find((node) => node.id === dialog.selectedEntryId);
+        <span class="pi-historyPromptCopy"><span class="pi-historyPromptText">${esc(node.text || "（空消息）")}</span><span class="pi-historyPromptMeta">${esc(clockLabel(node.timestamp))} · ${node.active ? "当前路径" : "历史分支"}</span></span>
+      </button>`).join("") : `<div class="pi-historyState">当前会话还没有可回溯的用户消息</div>`;
+  } else {
+    body = nodes.length > 0 ? nodes.map((node) => {
+      const depth = Math.min(7, Math.max(0, Number(node.branchDepth) || 0));
+      const disabled = !node.navigable || dialog.busyEntryId;
+      return `<button type="button" class="pi-historyTreeRow ${node.active ? "pi-historyTreeActive" : ""} ${node.current ? "pi-historyTreeCurrent" : ""} ${dialog.selectedEntryId === node.id ? "pi-historyPromptSelected" : ""}" style="--history-indent:${12 + depth * 18}px" data-action="history-choose-rewind" data-entry="${esc(node.id)}" data-role="${esc(node.role || "")}" aria-pressed="${dialog.selectedEntryId === node.id}" ${disabled ? "disabled" : ""}>
+        <span class="pi-historyRail"><span class="pi-historyDot"></span></span>
+        <span class="pi-historyKind">${esc(historyNodeLabel(node))}</span>
+        <span class="pi-historyTreeCopy"><span class="pi-historyTreeText">${esc(node.text || historyNodeLabel(node))}</span><span class="pi-historyTreeMeta">${esc(clockLabel(node.timestamp))}${node.branchCount > 1 ? ` · ${node.branchCount} 个分支` : ""}${node.current ? " · 当前位置" : node.active ? " · 当前路径" : " · 历史分支"}</span></span>
+        ${node.label ? `<span class="pi-historyLabel">${esc(node.label)}</span>` : ""}
+      </button>`;
+    }).join("") : `<div class="pi-historyState">当前会话树为空</div>`;
+  }
+  if (!dialog.loading) {
+    const selected = nodes.find((node) => node.id === dialog.selectedEntryId && node.navigable);
     if (selected) {
       decision = `<div class="pi-historyDecisionWrap"><div class="pi-historyDecision">
         <div class="pi-historyDecisionCopy"><div class="pi-historyDecisionTitle">选择回溯范围</div><div class="pi-historyDecisionText">${esc(selected.text || "（空消息）")}</div></div>
@@ -2173,23 +2179,14 @@ function renderHistoryView(view) {
         </div>
       </div></div>`;
     }
-  } else {
-    const treeNodes = visibleHistoryTreeNodes(nodes);
-    body = treeNodes.length > 0 ? treeNodes.map((node) => {
-      const depth = Math.min(7, Math.max(0, Number(node.branchDepth) || 0));
-      const disabled = !node.navigable || dialog.busyEntryId;
-      return `<button type="button" class="pi-historyTreeRow ${node.active ? "pi-historyTreeActive" : ""} ${node.current ? "pi-historyTreeCurrent" : ""}" style="--history-indent:${12 + depth * 18}px" data-action="history-navigate" data-entry="${esc(node.id)}" data-role="${esc(node.role || "")}" ${disabled ? "disabled" : ""}>
-        <span class="pi-historyRail"><span class="pi-historyDot"></span></span>
-        <span class="pi-historyKind">${esc(historyNodeLabel(node))}</span>
-        <span class="pi-historyTreeCopy"><span class="pi-historyTreeText">${esc(node.text || historyNodeLabel(node))}</span><span class="pi-historyTreeMeta">${esc(clockLabel(node.timestamp))}${node.branchCount > 1 ? ` · ${node.branchCount} 个分支` : ""}${node.current ? " · 当前位置" : node.active ? " · 当前路径" : ""}</span></span>
-        ${node.label ? `<span class="pi-historyLabel">${esc(node.label)}</span>` : ""}
-      </button>`;
-    }).join("") : `<div class="pi-historyState">当前会话树为空</div>`;
   }
+  const current = nodes.find((node) => node.current);
+  const previous = nodes.find((node) => node.id === current?.navigationFromId && node.navigable);
+  const returnButton = previous ? `<button type="button" class="pi-historyReturn" data-action="history-choose-rewind" data-entry="${esc(previous.id)}" data-role="${esc(previous.role || "")}" ${dialog.busyEntryId ? "disabled" : ""}>${ICONS.history}<span>返回切换前的位置</span></button>` : "";
   const errorBanner = dialog.error && nodes.length > 0 ? `<div class="pi-historyErrorBanner" role="alert">${esc(dialog.error)}</div>` : "";
   const busyText = dialog.busyRestoreMode === "all" ? "正在回溯对话和文件…" : "正在切换会话分支…";
   return `<section class="pi-historyView" role="tabpanel" aria-label="会话历史">
-    <div class="pi-historyHeader"><div><div class="pi-historyTitle">会话历史</div><div class="pi-historySubtitle">回溯不会删除记录，离开的内容仍保留在分支树中</div></div></div>
+    <div class="pi-historyHeader"><div><div class="pi-historyTitle">会话历史</div><div class="pi-historySubtitle">${nodes.filter((node) => node.rewindable).length} 条用户消息 · ${nodes.filter((node) => !node.active).length} 个历史分支节点</div></div>${returnButton}</div>
     <div class="pi-historyTabs" role="tablist">
       <button type="button" role="tab" aria-selected="${dialog.mode === "rewind"}" class="pi-historyTab ${dialog.mode === "rewind" ? "pi-historyTabActive" : ""}" data-action="history-mode" data-mode="rewind">回溯</button>
       <button type="button" role="tab" aria-selected="${dialog.mode === "tree"}" class="pi-historyTab ${dialog.mode === "tree" ? "pi-historyTabActive" : ""}" data-action="history-mode" data-mode="tree">会话树</button>
@@ -2231,7 +2228,10 @@ async function navigateHistory(entryId, role, restoreMode) {
   const view = S.historyView;
   const sessionId = view?.sessionId;
   if (!view || !sessionId || view.busyEntryId) return;
-  if (role === "user" && S.draft.trim() && !confirm("当前输入框草稿将被历史消息替换，继续回溯？")) return;
+  if (S.draft.trim()) {
+    const replacesDraft = role === "user" || role === "custom";
+    if (!confirm(replacesDraft ? "当前输入框草稿将被历史消息替换，继续回溯？" : "切换会话节点将清空当前输入框草稿，继续？")) return;
+  }
   S.historyView = { ...view, busyEntryId: entryId, busyRestoreMode: restoreMode || null, error: null };
   renderConversation();
   try {
@@ -2249,7 +2249,7 @@ async function navigateHistory(entryId, role, restoreMode) {
       input?.focus({ preventScroll: true });
       input?.setSelectionRange(input.value.length, input.value.length);
     });
-    if (restoreMode === "all") showToast("已回溯对话和文件，可编辑后重新发送");
+    if (restoreMode === "all") showToast(role === "user" ? "已回溯对话和文件，可编辑后重新发送" : "已切换会话节点并恢复文件");
     else if (restoreMode === "conversation") showToast("已回溯对话，工作区文件保持不变");
     else showToast(role === "user" ? "已回溯到所选消息，可编辑后重新发送" : "已切换到所选会话节点");
   } catch (error) {
@@ -3710,8 +3710,6 @@ async function onClick(ev) {
       S.historyView = { ...S.historyView, selectedEntryId: null, error: null };
       renderConversation();
     }
-  } else if (action === "history-navigate") {
-    await navigateHistory(target.dataset.entry, target.dataset.role);
   } else if (action === "abort") {
     if (sessionId) {
       target.disabled = true;

package/windows-rpc-job.ps1

@@ -0,0 +1,184 @@
+$ErrorActionPreference = 'Stop'
+
+Add-Type -TypeDefinition @'
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Text;
+
+public static class PiWebRpcJob
+{
+    [StructLayout(LayoutKind.Sequential)]
+    struct BasicLimitInformation
+    {
+        public long PerProcessUserTimeLimit;
+        public long PerJobUserTimeLimit;
+        public uint LimitFlags;
+        public UIntPtr MinimumWorkingSetSize;
+        public UIntPtr MaximumWorkingSetSize;
+        public uint ActiveProcessLimit;
+        public UIntPtr Affinity;
+        public uint PriorityClass;
+        public uint SchedulingClass;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct IoCounters
+    {
+        public ulong ReadOperationCount, WriteOperationCount, OtherOperationCount;
+        public ulong ReadTransferCount, WriteTransferCount, OtherTransferCount;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct ExtendedLimitInformation
+    {
+        public BasicLimitInformation BasicLimitInformation;
+        public IoCounters IoInfo;
+        public UIntPtr ProcessMemoryLimit, JobMemoryLimit, PeakProcessMemoryUsed, PeakJobMemoryUsed;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    struct StartupInfo
+    {
+        public uint cb;
+        public string lpReserved, lpDesktop, lpTitle;
+        public uint dwX, dwY, dwXSize, dwYSize, dwXCountChars, dwYCountChars, dwFillAttribute, dwFlags;
+        public ushort wShowWindow, cbReserved2;
+        public IntPtr lpReserved2, hStdInput, hStdOutput, hStdError;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct ExtendedStartupInfo
+    {
+        public StartupInfo StartupInfo;
+        public IntPtr AttributeList;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct ProcessInformation
+    {
+        public IntPtr hProcess, hThread;
+        public uint dwProcessId, dwThreadId;
+    }
+
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern IntPtr OpenProcess(uint access, bool inherit, uint pid);
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    static extern IntPtr CreateJobObject(IntPtr attributes, string name);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern bool SetInformationJobObject(IntPtr job, int infoClass, ref ExtendedLimitInformation info, uint size);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern bool InitializeProcThreadAttributeList(IntPtr list, int count, uint flags, ref IntPtr size);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern bool UpdateProcThreadAttribute(IntPtr list, uint flags, UIntPtr attribute,
+        IntPtr value, UIntPtr size, IntPtr previous, IntPtr returnedSize);
+    [DllImport("kernel32.dll")]
+    static extern void DeleteProcThreadAttributeList(IntPtr list);
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    static extern bool CreateProcess(string application, StringBuilder commandLine, IntPtr processAttributes,
+        IntPtr threadAttributes, bool inheritHandles, uint flags, IntPtr environment,
+        string cwd, ref ExtendedStartupInfo startupInfo, out ProcessInformation processInformation);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern uint ResumeThread(IntPtr thread);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern uint WaitForMultipleObjects(uint count, IntPtr[] handles, bool all, uint milliseconds);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern uint WaitForSingleObject(IntPtr handle, uint milliseconds);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern bool GetExitCodeProcess(IntPtr process, out uint code);
+    [DllImport("kernel32.dll")]
+    static extern bool CloseHandle(IntPtr handle);
+    [DllImport("kernel32.dll")]
+    static extern IntPtr GetStdHandle(int which);
+    [DllImport("kernel32.dll", SetLastError = true)]
+    static extern bool SetHandleInformation(IntPtr handle, uint mask, uint flags);
+
+    static void Check(bool success)
+    {
+        if (!success) throw new Win32Exception(Marshal.GetLastWin32Error());
+    }
+
+    static string Quote(string value)
+    {
+        var result = new StringBuilder("\"");
+        int slashes = 0;
+        foreach (char c in value)
+        {
+            if (c == '\\') { slashes++; continue; }
+            result.Append('\\', c == '"' ? slashes * 2 + 1 : slashes);
+            result.Append(c);
+            slashes = 0;
+        }
+        return result.Append('\\', slashes * 2).Append('"').ToString();
+    }
+
+    public static int Run(uint ownerPid, string executable, string[] args, string cwd)
+    {
+        IntPtr owner = OpenProcess(0x00100000, false, ownerPid);
+        if (owner == IntPtr.Zero) throw new Win32Exception(Marshal.GetLastWin32Error());
+        IntPtr job = IntPtr.Zero;
+        var child = new ProcessInformation();
+        IntPtr attributes = IntPtr.Zero, jobValue = IntPtr.Zero;
+        bool attributesInitialized = false;
+        try
+        {
+            // Acquire the owner's handle before launching, so PID reuse cannot keep this job alive.
+            if (WaitForSingleObject(owner, 0) != 258) return 1;
+            job = CreateJobObject(IntPtr.Zero, null);
+            Check(job != IntPtr.Zero);
+            var limits = new ExtendedLimitInformation();
+            limits.BasicLimitInformation.LimitFlags = 0x00002000; // JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE
+            Check(SetInformationJobObject(job, 9, ref limits, (uint)Marshal.SizeOf(limits)));
+            IntPtr size = IntPtr.Zero;
+            InitializeProcThreadAttributeList(IntPtr.Zero, 1, 0, ref size);
+            attributes = Marshal.AllocHGlobal(size);
+            Check(InitializeProcThreadAttributeList(attributes, 1, 0, ref size));
+            attributesInitialized = true;
+            jobValue = Marshal.AllocHGlobal(IntPtr.Size);
+            Marshal.WriteIntPtr(jobValue, job);
+            Check(UpdateProcThreadAttribute(attributes, 0, new UIntPtr(0x0002000D),
+                jobValue, new UIntPtr((uint)IntPtr.Size), IntPtr.Zero, IntPtr.Zero)); // PROC_THREAD_ATTRIBUTE_JOB_LIST
+            var startup = new ExtendedStartupInfo();
+            startup.AttributeList = attributes;
+            startup.StartupInfo.cb = (uint)Marshal.SizeOf(startup);
+            startup.StartupInfo.dwFlags = 0x00000100; // STARTF_USESTDHANDLES
+            startup.StartupInfo.hStdInput = GetStdHandle(-10);
+            startup.StartupInfo.hStdOutput = GetStdHandle(-11);
+            startup.StartupInfo.hStdError = GetStdHandle(-12);
+            foreach (IntPtr handle in new[] { startup.StartupInfo.hStdInput, startup.StartupInfo.hStdOutput, startup.StartupInfo.hStdError })
+                Check(SetHandleInformation(handle, 1, 1));
+            var commandLine = new StringBuilder(Quote(executable));
+            foreach (string arg in args) commandLine.Append(' ').Append(Quote(arg));
+            // Atomic job assignment also covers the launcher dying during process creation.
+            Check(CreateProcess(executable, commandLine, IntPtr.Zero, IntPtr.Zero, true,
+                0x08080004, IntPtr.Zero, cwd, ref startup, out child)); // NO_WINDOW | EXTENDED_STARTUPINFO_PRESENT | SUSPENDED
+            Check(ResumeThread(child.hThread) != UInt32.MaxValue);
+            uint completed = WaitForMultipleObjects(2, new[] { owner, child.hProcess }, false, UInt32.MaxValue);
+            Check(completed != UInt32.MaxValue);
+            uint code = 1;
+            if (completed == 1) Check(GetExitCodeProcess(child.hProcess, out code));
+            return unchecked((int)code);
+        }
+        finally
+        {
+            if (job != IntPtr.Zero) CloseHandle(job);
+            if (attributesInitialized) DeleteProcThreadAttributeList(attributes);
+            if (attributes != IntPtr.Zero) Marshal.FreeHGlobal(attributes);
+            if (jobValue != IntPtr.Zero) Marshal.FreeHGlobal(jobValue);
+            if (child.hThread != IntPtr.Zero) CloseHandle(child.hThread);
+            if (child.hProcess != IntPtr.Zero) CloseHandle(child.hProcess);
+            CloseHandle(owner);
+        }
+    }
+}
+'@
+
+try {
+    $launch = $env:PI_WEB_RPC_JOB | ConvertFrom-Json
+    Remove-Item Env:PI_WEB_RPC_JOB
+    $code = [PiWebRpcJob]::Run([uint32]$launch.ownerPid, [string]$launch.executable, [string[]]$launch.args, [string]$launch.cwd)
+    exit $code
+} catch {
+    [Console]::Error.WriteLine("pi-web RPC job failed: " + $_.Exception.Message)
+    exit 1
+}