@oversk7/pi-web-dsh-style 1.1.0 → 1.1.1

package/README.md

@@ -1,5 +1,7 @@
 # @oversk7/pi-web-dsh-style
 
+[GitHub 源码](https://github.com/oversk7/pi-web-dsh-style) · [问题与建议](https://github.com/oversk7/pi-web-dsh-style/issues) · [npm](https://www.npmjs.com/package/@oversk7/pi-web-dsh-style) · [Pi 扩展目录](https://pi.dev/packages/@oversk7/pi-web-dsh-style)
+
 采用 DeepSeek Harness（DSH）视觉风格、面向 Windows 的非官方 Pi Coding Agent 本地浏览器界面扩展。后端使用 Pi 的公开 RPC 模式，每个会话对应独立的 RPC 进程；历史会话可直接从 Pi 会话文件恢复和渲染。
 
 > 仅承诺 Windows 10/11。首次启动只监听 `127.0.0.1`；电脑网页的“设置 → 手机访问”可配置仅本机、局域网和服务器中转。之后 `pi --web` 使用已保存的模式。
@@ -143,6 +145,12 @@ npm login --registry=https://registry.npmjs.org
 npm publish --access public --tag latest
 ```
 
+## 反馈与相关扩展
+
+欢迎通过 [GitHub Issues](https://github.com/oversk7/pi-web-dsh-style/issues) 反馈问题、提出建议，或分享使用场景。报告问题时，请附上扩展版本、Pi 版本、Windows 版本和复现步骤；涉及手机访问时，请说明使用的是局域网还是服务器中转。
+
+同一作者的 [pi-pwsh-notify](https://github.com/oversk7/pi-pwsh-notify) 为 Pi 提供 Windows PowerShell 7 工具，以及后台任务完成自动通知功能。
+
 ## 许可证
 
 原创代码使用 MIT License。Web UI 的部分样式和设计 token 改编自 DeepSeek Harness，字体资源来自 KaTeX，代码高亮使用 highlight.js。完整归属与许可证见 [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md)。

package/package.json

@@ -1,10 +1,18 @@
 {
   "name": "@oversk7/pi-web-dsh-style",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "An unofficial DSH-styled Windows browser UI for pi coding agent with configurable LAN and native frp relay access",
   "type": "module",
   "license": "MIT",
   "author": "oversk7",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/oversk7/pi-web-dsh-style.git"
+  },
+  "homepage": "https://github.com/oversk7/pi-web-dsh-style#readme",
+  "bugs": {
+    "url": "https://github.com/oversk7/pi-web-dsh-style/issues"
+  },
   "keywords": [
     "pi-package",
     "pi-coding-agent",

package/server.ts

@@ -23,7 +23,7 @@ import { isLocalRequest, WebAccess } from "./network-access.ts";
 import { FrpProcess } from "./frp-process.ts";
 import { loadTerminalProxy, saveTerminalProxy, validateTerminalProxy, type TerminalProxySettings } from "./terminal-proxy.ts";
 import { frpcConfig, loadNetworkSettings, proxyForNetwork, publicNetworkSettings, relayServerFiles, resolveFrpc, saveNetworkSettings, updateNetworkSettings, type NetworkMode, type NetworkSettings } from "./network-settings.ts";
-import { closeSseClient, createSseClient, sendSseEvent, type SseClient } from "./sse-channel.ts";
+import { closeSseClient, createSseClient, createSnapshotScheduler, sendSseEvent, type SseClient } from "./sse-channel.ts";
 import { closeAllPiRpcs, spawnPiRpc, type Json, type PiRpc } from "./pi-rpc.ts";
 import { loadLocalSession } from "./local-session.ts";
 import { loadJsonWithLegacyMigration, writeJsonAtomically, writeTextAtomically } from "./state-store.ts";
@@ -666,7 +666,14 @@ function setPendingQueue(record: RuntimeSession, queue: RpcQueueSnapshot): void
   };
 }
 
+const snapshotScheduler = createSnapshotScheduler<RuntimeSession>(emitSessionSnapshot);
+
 function broadcastSessionSnapshot(record: RuntimeSession): void {
+  if (shuttingDown) return;
+  snapshotScheduler.schedule(record.id, record, !record.streaming || record.dialogs.length > 0);
+}
+
+function emitSessionSnapshot(record: RuntimeSession): void {
   broadcastEvent({
     type: "snapshot",
     sessionId: record.id,
@@ -1361,8 +1368,7 @@ async function applyPendingSettings(record: RuntimeSession): Promise<void> {
       await proc.send({ type: "set_model", provider: pending.provider, modelId: pending.modelId });
       record.pendingModel = undefined;
     } catch (error) {
-      console.error("[pi-web] applying pending model failed:", error);
-      record.pendingModel = undefined;
+      throw new Error(`无法使用模型 ${pending.provider}/${pending.modelId}，请在模型菜单中选择当前可用的模型：${error instanceof Error ? error.message : String(error)}`);
     }
   }
   if (record.pendingThinkingLevel) {
@@ -1420,9 +1426,16 @@ async function ensureProcess(record: RuntimeSession): Promise<void> {
       broadcastWorkspaces();
       evictIdleProcesses();
     } catch (error) {
+      if (record.proc === proc) record.proc = undefined;
+      try {
+        await proc.close(2500);
+      } catch (closeError) {
+        console.error("[pi-web] closing failed session process:", closeError);
+      }
       record.status = "error";
       record.error = error instanceof Error ? error.message : String(error);
       broadcastSessionSnapshot(record);
+      throw error;
     } finally {
       record.starting = undefined;
     }
@@ -1563,6 +1576,7 @@ async function deleteWorkspaceSession(workspace: Workspace, sessionId: string):
     candidate.updatedAt = updatedAt;
   }
   state.sessions = state.sessions.filter((session) => session.id !== sessionId);
+  snapshotScheduler.cancel(sessionId);
   sessions.delete(sessionId);
   if (state.currentSessionId === sessionId) state.currentSessionId = undefined;
   scheduleSave();
@@ -1576,14 +1590,23 @@ async function createSession(
 ): Promise<RuntimeSession> {
   const ws = state.workspaces.find((w) => w.id === workspaceId);
   if (!ws) throw new Error("workspace not found");
+  const info = modelInfoFromCatalog(
+    await discoverFreshModelCatalog(ws.path),
+    preferences.model,
+    preferences.thinkingLevel,
+  );
+  const selected = info.defaultModel as Json | undefined;
+  const model = selected && typeof selected.provider === "string" && typeof selected.id === "string"
+    ? { provider: selected.provider, modelId: selected.id }
+    : undefined;
   const id = randomUUID();
   const cleanTitle = (title ?? "").trim().replace(/\s+/g, " ").slice(0, 60) || "新会话";
   const stored: StoredSession = {
     id,
     workspaceId,
     title: cleanTitle,
-    model: preferences.model,
-    thinkingLevel: preferences.thinkingLevel,
+    model,
+    thinkingLevel: info.thinkingLevel,
     needsAttention: false,
     createdAt: nowIso(),
     updatedAt: nowIso(),
@@ -1608,29 +1631,11 @@ async function createSession(
     streaming: false,
     needsAttention: false,
     lastUsed: Date.now(),
-    pendingModel: preferences.model,
-    pendingThinkingLevel: preferences.thinkingLevel,
+    pendingModel: model,
+    pendingThinkingLevel: info.thinkingLevel,
   };
-  applyCachedModelInfo(record);
+  applyModelInfo(record, info);
   applyCachedCommands(record);
-  if (preferences.model) {
-    const full = (record.models as Json[]).find(
-      (model) => model?.provider === preferences.model?.provider && model.id === preferences.model?.modelId,
-    );
-    record.state = {
-      ...(record.state ?? {}),
-      model: full ?? { provider: preferences.model.provider, id: preferences.model.modelId, name: preferences.model.modelId },
-    };
-    if (full) record.thinkingLevels = supportedThinkingLevels(full);
-  }
-  if (preferences.thinkingLevel) {
-    const effectiveLevel = record.thinkingLevels.includes(preferences.thinkingLevel)
-      ? preferences.thinkingLevel
-      : record.thinkingLevels.includes("off") ? "off" : record.thinkingLevels[0] ?? "off";
-    record.pendingThinkingLevel = effectiveLevel;
-    stored.thinkingLevel = effectiveLevel;
-    record.state = { ...(record.state ?? {}), thinkingLevel: effectiveLevel };
-  }
   sessions.set(id, record);
   scheduleSave();
   broadcastWorkspaces();
@@ -2521,14 +2526,19 @@ async function handleApi(req: import("node:http").IncomingMessage, res: ServerRe
       && typeof requestedModel.modelId === "string"
       ? { provider: requestedModel.provider, modelId: requestedModel.modelId }
       : undefined;
-    const record = await createSession(
-      ws.id,
-      typeof body.title === "string" ? body.title : undefined,
-      {
-        model,
-        thinkingLevel: typeof body.thinkingLevel === "string" ? body.thinkingLevel : undefined,
-      },
-    );
+    let record: RuntimeSession;
+    try {
+      record = await createSession(
+        ws.id,
+        typeof body.title === "string" ? body.title : undefined,
+        {
+          model,
+          thinkingLevel: typeof body.thinkingLevel === "string" ? body.thinkingLevel : undefined,
+        },
+      );
+    } catch (error) {
+      return sendJson(res, 500, { error: error instanceof Error ? error.message : String(error) });
+    }
     state.currentWorkspaceId = ws.id;
     state.currentSessionId = record.id;
     scheduleSave();
@@ -3261,6 +3271,7 @@ function shutdown(): Promise<void> {
 }
 
 async function shutdownServer(): Promise<void> {
+  snapshotScheduler.clear();
   await networkChange;
   await stopRelay();
   for (const client of [...sseClients]) {

package/sse-channel.ts

@@ -1,5 +1,42 @@
 export type SseEvent = Record<string, unknown>;
 
+// Coalesce before serializing full histories, so a burst of tokens does not
+// become a queue of obsolete snapshots on a slower relay connection.
+export function createSnapshotScheduler<T>(emit: (value: T) => void, intervalMs = 100) {
+  const pending = new Map<string, { timer: ReturnType<typeof setTimeout>; latest?: T }>();
+  function cancel(key: string): void {
+    const entry = pending.get(key);
+    if (entry) clearTimeout(entry.timer);
+    pending.delete(key);
+  }
+  return {
+    schedule(key: string, value: T, immediate = false): void {
+      if (immediate) {
+        cancel(key);
+        emit(value);
+        return;
+      }
+      const current = pending.get(key);
+      if (current) {
+        current.latest = value;
+        return;
+      }
+      const entry: { timer: ReturnType<typeof setTimeout>; latest?: T } = {
+        timer: setTimeout(() => {
+          pending.delete(key);
+          if (entry.latest !== undefined) emit(entry.latest);
+        }, intervalMs),
+      };
+      pending.set(key, entry);
+      emit(value);
+    },
+    cancel,
+    clear(): void {
+      for (const key of pending.keys()) cancel(key);
+    },
+  };
+}
+
 export interface SseWritable {
   write(payload: string): boolean;
   once(event: "drain", listener: () => void): unknown;

package/web/app.js

@@ -17,6 +17,7 @@ const S = {
   currentSessionId: null,
   snapshots: new Map(),
   newSessionSnapshot: null,
+  newSessionPreferenceWorkspaceId: null,
   collapsed: new Set(),
   expandedSessionLists: new Set(),
   sidebarCollapsed: localStorage.getItem("pi-web-sidebar-collapsed") === "1",
@@ -31,6 +32,7 @@ const S = {
   search: "",
   searchOpen: false,
   loadingSession: null,
+  pendingCreation: null,
   pendingSends: new Map(),
   withdrawingQueueItems: new Set(),
   dequeueSessions: new Set(),
@@ -313,6 +315,7 @@ function currentSnapshot() {
 }
 
 function draftKey(sessionId = S.currentSessionId, workspaceId = S.currentWorkspaceId) {
+  if (!sessionId && S.pendingCreation?.generation === S.openGeneration && workspaceId === S.pendingCreation.workspaceId) return S.pendingCreation.draftKey;
   return sessionId ? `session:${sessionId}` : `new:${workspaceId || "default"}`;
 }
 
@@ -806,7 +809,7 @@ function renderHero() {
               <span class="pXSMma_headlineText">和你的代码库对话</span>
               <span class="pXSMma_previewBadge">Web 预览版</span>
             </div>
-            <div class="pXSMma_body"></div>
+            <div class="pXSMma_body">${S.pendingCreation?.generation === S.openGeneration ? '<div class="gdEzaW_retryRow" role="status"><span class="gdEzaW_retryText">正在创建会话…</span></div>' : ""}</div>
           </div></div>
           <div class="wSkVaW_heroWorkspaceRow">
             <div class="pXSMma_workspaceRow">${renderWorkspacePicker()}</div>
@@ -864,7 +867,7 @@ function renderComposerBar(hero = false) {
   const level = state.thinkingLevel || null;
   const streaming = Boolean(snap.session?.streaming);
   const waitingForDialog = Boolean(snap.dialogs?.length);
-  const disabled = (!S.currentSessionId && !hero) || Boolean(S.loadingSession && !hero) || waitingForDialog;
+  const disabled = (!S.currentSessionId && !hero) || Boolean(S.loadingSession && !hero) || S.pendingCreation?.generation === S.openGeneration || waitingForDialog;
   const inputPlaceholder = waitingForDialog ? "请先回答对话中的问题" : "给智能体发消息";
   const rawContextPct = snap.stats?.contextUsage?.percent;
   const hasContextPct = typeof rawContextPct === "number" && Number.isFinite(rawContextPct);
@@ -2987,6 +2990,14 @@ async function loadBootstrap() {
     messages: [],
     dialogs: [],
   };
+  if (!S.currentSessionId && S.currentWorkspaceId) {
+    try {
+      const defaults = await post(`/api/workspaces/${encodeURIComponent(S.currentWorkspaceId)}/models`, {});
+      S.newSessionSnapshot = { ...S.newSessionSnapshot, ...defaults };
+    } catch (error) {
+      console.error("[pi-web] loading new session defaults failed:", error);
+    }
+  }
   renderApp();
   if (S.currentSessionId) await openSession(S.currentSessionId, { silent: true });
 }
@@ -2998,8 +3009,8 @@ async function openSession(id, opts = {}) {
   ++S.historyGeneration;
   S.conversationTab = "conversation";
   S.historyView = null;
-  const generation = ++S.openGeneration;
   if (!opts.skipRemember) rememberCurrentDraft();
+  const generation = ++S.openGeneration;
   S.currentSessionId = id;
   S.loadingSession = id;
   if (!opts.silent) {
@@ -3017,7 +3028,7 @@ async function openSession(id, opts = {}) {
   renderSidebar();
   renderConversation();
   try {
-    const data = await post(`/api/sessions/${encodeURIComponent(id)}/open`);
+    const data = opts.initialSnapshot ?? await post(`/api/sessions/${encodeURIComponent(id)}/open`);
     S.snapshots.set(id, data);
     if (generation !== S.openGeneration) return;
     const ws = data.session?.workspaceId;
@@ -3033,28 +3044,74 @@ async function openSession(id, opts = {}) {
 }
 
 async function createAndOpenSession(workspaceId, title, options = {}) {
+  if (S.pendingCreation) return null;
+  const source = S.newSessionPreferenceWorkspaceId === workspaceId && !S.currentSessionId
+    ? S.newSessionSnapshot : null;
+  const previous = {
+    sessionId: S.currentSessionId, workspaceId: S.currentWorkspaceId,
+    conversationTab: S.conversationTab, historyView: S.historyView,
+    draft: S.draft, attachments: [...S.draftAttachments],
+  };
+  rememberCurrentDraft();
+  const generation = ++S.openGeneration;
+  const pending = { generation, workspaceId, draftKey: `creating:${generation}` };
+  S.pendingCreation = pending;
+  closeMobileSidebar();
+  closeCommandMenu();
+  ++S.historyGeneration;
+  S.conversationTab = "conversation";
+  S.historyView = null;
+  S.currentSessionId = null;
+  S.currentWorkspaceId = workspaceId;
+  S.loadingSession = null;
+  sessionStorage.removeItem("pi-web-current-session");
+  if (!options.keepDraft) {
+    S.draft = "";
+    S.draftAttachments = [];
+  }
+  renderSidebar();
+  renderConversation();
   try {
-    const source = currentSnapshot();
-    const model = source.state?.model;
+    const model = source?.state?.model;
     const data = await post(`/api/workspaces/${encodeURIComponent(workspaceId)}/sessions`, {
       title,
       model: model?.provider && model?.id ? { provider: model.provider, modelId: model.id } : undefined,
-      thinkingLevel: source.state?.thinkingLevel || undefined,
+      thinkingLevel: source?.state?.thinkingLevel || undefined,
     });
     const id = data.session?.id;
     if (!id) throw new Error("create session failed");
     S.snapshots.set(id, data);
-    if (!options.keepDraft) {
-      rememberCurrentDraft();
-      S.draft = "";
-      S.draftAttachments = [];
+    if (generation !== S.openGeneration) {
+      // Navigation owns the composer now; retain any pending draft with the created session.
+      const draft = S.drafts.get(pending.draftKey);
+      const attachments = S.attachmentDrafts.get(pending.draftKey);
+      if (draft) S.drafts.set(draftKey(id), draft);
+      if (attachments) S.attachmentDrafts.set(draftKey(id), attachments);
+      return null;
     }
-    S.currentWorkspaceId = workspaceId;
-    await openSession(id, { silent: true, skipRemember: !options.keepDraft });
-    return id;
+    S.newSessionPreferenceWorkspaceId = null;
+    await openSession(id, { silent: true, skipRemember: true, initialSnapshot: data });
+    return generation + 1 === S.openGeneration && S.currentSessionId === id ? id : null;
   } catch (error) {
-    alert(`新建会话失败：${error.message}`);
+    if (generation === S.openGeneration) {
+      S.pendingCreation = null;
+      S.currentSessionId = previous.sessionId;
+      S.currentWorkspaceId = previous.workspaceId;
+      S.loadingSession = null;
+      S.conversationTab = previous.conversationTab;
+      S.historyView = previous.historyView;
+      S.draftAttachments = previous.attachments;
+      setDraftValue(previous.draft);
+      if (previous.sessionId) sessionStorage.setItem("pi-web-current-session", previous.sessionId);
+      renderSidebar();
+      renderConversation();
+      alert(`新建会话失败：${error.message}`);
+    }
     return null;
+  } finally {
+    if (S.pendingCreation === pending) S.pendingCreation = null;
+    S.drafts.delete(pending.draftKey);
+    S.attachmentDrafts.delete(pending.draftKey);
   }
 }
 
@@ -3875,7 +3932,10 @@ async function selectModelFromCommand(reference) {
   if (sessionId) await post(`/api/sessions/${encodeURIComponent(sessionId)}/set_model`, { provider: model.provider, modelId: model.id });
   const next = { ...snapshotFor(sessionId), state: { ...(snapshotFor(sessionId).state || {}), model, thinkingLevel }, thinkingLevels };
   if (sessionId) S.snapshots.set(sessionId, next);
-  else if (!S.currentSessionId && S.currentWorkspaceId === workspaceId) S.newSessionSnapshot = next;
+  else if (!S.currentSessionId && S.currentWorkspaceId === workspaceId) {
+    S.newSessionSnapshot = next;
+    S.newSessionPreferenceWorkspaceId = workspaceId;
+  }
   queueRender(true);
   showToast(`模型已切换为 ${model.provider}/${model.id}`);
 }
@@ -3894,7 +3954,10 @@ async function selectThinkingFromCommand(value) {
   if (sessionId) await post(`/api/sessions/${encodeURIComponent(sessionId)}/set_thinking_level`, { level });
   const next = { ...snapshotFor(sessionId), state: { ...(snapshotFor(sessionId).state || {}), thinkingLevel: level } };
   if (sessionId) S.snapshots.set(sessionId, next);
-  else S.newSessionSnapshot = next;
+  else {
+    S.newSessionSnapshot = next;
+    S.newSessionPreferenceWorkspaceId = S.currentWorkspaceId;
+  }
   queueRender(true);
   showToast(`思考强度已切换为 ${level}`);
 }
@@ -4003,6 +4066,7 @@ async function executeLocalSlashCommand(text) {
 }
 
 async function sendDraft() {
+  if (S.pendingCreation) return;
   if (S.clipboardBusy) return showToast("正在上传并解析文件，请稍候", "warning");
   const text = S.draft.trim();
   const attachments = [...S.draftAttachments];
@@ -4027,6 +4091,7 @@ async function sendDraft() {
     showToast(error.message || String(error), "error");
     return;
   }
+  if (S.pendingCreation) return;
   let sessionId = S.currentSessionId;
   if (!sessionId) {
     const ws = currentWorkspace();
@@ -4385,11 +4450,17 @@ async function onClick(ev) {
       ++S.openGeneration;
       S.currentSessionId = null;
       S.loadingSession = null;
+      S.newSessionPreferenceWorkspaceId = null;
       loadCurrentDraftValue();
+      try {
+        await refreshModelCatalog(null, S.currentWorkspaceId, { state: null });
+      } catch (error) {
+        console.error("[pi-web] loading workspace models failed:", error);
+      }
       queueRender(true);
     }
   } else if (action === "brand") {
-    if (S.currentSessionId) {
+    if (S.currentSessionId || S.pendingCreation?.generation === S.openGeneration) {
       rememberCurrentDraft();
       ++S.openGeneration;
       S.currentSessionId = null;
@@ -4528,6 +4599,7 @@ async function onClick(ev) {
         state: { ...(snap.state || {}), model: selected, thinkingLevel },
         thinkingLevels,
       };
+      S.newSessionPreferenceWorkspaceId = S.currentWorkspaceId;
     }
     closePopovers();
     queueRender(true);
@@ -4546,6 +4618,7 @@ async function onClick(ev) {
         ...S.newSessionSnapshot,
         state: { ...(S.newSessionSnapshot.state || {}), thinkingLevel: target.dataset.level },
       };
+      S.newSessionPreferenceWorkspaceId = S.currentWorkspaceId;
     }
     closePopovers();
     queueRender(true);
@@ -4964,12 +5037,14 @@ function requireLogin() {
 }
 
 let eventSource;
+let eventWatchdog;
+let lastEventAt = 0;
 let resyncPending;
 
 async function resyncAfterReconnect() {
   if (resyncPending) return resyncPending;
   resyncPending = (async () => {
-    const boot = await api("/api/bootstrap");
+    const boot = await api("/api/bootstrap", { signal: AbortSignal.timeout(15_000) });
     S.workspaces = applySavedWorkspaceOrder(boot.workspaces || []);
     S.serverInstanceId = boot.instanceId || null;
     S.lanEnabled = boot.lanEnabled === true;
@@ -4981,7 +5056,9 @@ async function resyncAfterReconnect() {
     const generation = S.openGeneration;
     if (id && S.workspaces.some((workspace) => workspace.sessions?.some((session) => session.id === id))) {
       const before = S.snapshots.get(id);
-      const data = await post(`/api/sessions/${encodeURIComponent(id)}/open`);
+      const data = await api(`/api/sessions/${encodeURIComponent(id)}/open`, {
+        method: "POST", body: "{}", signal: AbortSignal.timeout(15_000),
+      });
       if (S.snapshots.get(id) === before) S.snapshots.set(id, data);
     } else if (id && generation === S.openGeneration) {
       rememberCurrentDraft();
@@ -5001,8 +5078,21 @@ function connectEvents() {
   eventSource?.close();
   const es = new EventSource("/api/events");
   eventSource = es;
-  es.onopen = () => { void resyncAfterReconnect(); };
+  lastEventAt = Date.now();
+  clearInterval(eventWatchdog);
+  // Heartbeats arrive every 25s, including when the model is idle. Some mobile
+  // networks leave a dead stream open without notifying EventSource.
+  eventWatchdog = setInterval(() => {
+    if (document.hidden || loginPromise || eventSource !== es) return;
+    if (Date.now() - lastEventAt > 60_000) connectEvents();
+  }, 5_000);
+  es.onopen = () => {
+    lastEventAt = Date.now();
+    void resyncAfterReconnect();
+  };
   es.onmessage = (ev) => {
+    if (eventSource !== es) return;
+    lastEventAt = Date.now();
     try {
       const event = JSON.parse(ev.data);
       if (event.type === "heartbeat") return;