dsh-mcp-connector 0.2.71 → 0.2.73

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 本项目遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)；首个公开版本从 `0.1.0` 开始。
 
+## [0.2.73] - 2026-10-15
+
+### Fixed
+
+- 兼容 DSH 0.2.1-alpha.1 起的 webStartup 服务，同时保留旧宿主 webRuntime 支持，修复面板正文及 API 路由未挂载导致的空白（#151）。两种服务并存时优先使用 webStartup 的可信主机配置，服务卸载时清理路由。
+- 将插件 API 请求失败与 npm 版本查询失败区分提示，不再把路由不可用统一报告为 npm 网络错误。
+
+## [0.2.72] - 2026-10-14
+
+### Fixed
+
+- 宿主切换面板销毁 iframe 后，按工作区恢复页签、搜索、市场分类、展开章节、工具筛选/分页及列表滚动。状态仅保留在同源宿主当前页面内存，最多 32 个工作区，不保存凭据表单、API 返回或授权弹框；刷新宿主页面即清除。
+- 市场与已安装列表加入请求序列和工作区检查，防止较早响应覆盖新页签/工作区；加载中的滚动归零不覆盖恢复位置。
+- 本次为浏览状态恢复而非 iframe 保活：仍重新拉取数据、重建 SSE，详情和未完成表单不恢复。
+
 ## [0.2.71] - 2026-10-14
 
 ### Added

package/README.en.md

@@ -215,7 +215,7 @@ npm run dev:ui
 
 Every Registry merge regenerates `catalog-stats.json`; an hourly workflow in this repository synchronizes the Chinese and English product copy plus a local stats snapshot. The static npm README updates with package releases, while the live badges above read the Registry directly and therefore stay current without another npm release.
 
-The current public version is [`dsh-mcp-connector@0.2.71`](https://www.npmjs.com/package/dsh-mcp-connector), with [GitHub Release v0.2.71](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.71).
+The current public version is [`dsh-mcp-connector@0.2.73`](https://www.npmjs.com/package/dsh-mcp-connector), with [GitHub Release v0.2.73](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.73).
 
 See [CHANGELOG.md](CHANGELOG.md) for version history and [docs/DESKTOP-E2E.md](docs/DESKTOP-E2E.md) for the Desktop release checklist.
 

package/README.md

@@ -210,7 +210,7 @@ npm run dev:ui
 
 公共 Registry 每次合并后会生成 `catalog-stats.json`；本仓库的定时工作流每小时同步中英文介绍和统计快照。npm 页面中的静态正文随版本发布更新，上方动态统计徽标则直接读取 Registry，可在不发布新 npm 版本时保持实时数量一致。
 
-当前公开版本为 [`dsh-mcp-connector@0.2.71`](https://www.npmjs.com/package/dsh-mcp-connector)，对应 [GitHub Release v0.2.71](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.71)。
+当前公开版本为 [`dsh-mcp-connector@0.2.73`](https://www.npmjs.com/package/dsh-mcp-connector)，对应 [GitHub Release v0.2.73](https://github.com/duhu2000/dsh-mcp-connector/releases/tag/v0.2.73)。
 
 版本能力与变更记录见 [CHANGELOG.md](CHANGELOG.md)。
 Desktop 发版回归见 [docs/DESKTOP-E2E.md](docs/DESKTOP-E2E.md)。

package/docs/DESKTOP-E2E.md

@@ -23,6 +23,13 @@ npm run dev:ui
 
 ## 不自动执行的项目
 
+### 面板浏览状态恢复（#135）
+
+- 在工作区 A 设置市场分类、搜索、展开章节并滚动；切换其他宿主面板再回来，检查恢复。已安装和工具页签（含筛选、分页）分别重复。
+- 切换工作区 B 不应带入 A 的筛选；回到 A 应恢复 A 的状态。慢网络下快速切页签/工作区，旧响应不得覆盖新页面。
+- 返回仍重新读取数据、重建 SSE；这是状态恢复，不是 iframe 常驻。详情、授权弹框、凭据及 JSON 编辑表单不恢复。
+- 浏览状态只在同源宿主当前页面内存保留，最多 32 个工作区；刷新宿主后清空。跨源/受限父页面不可访问时降级为不跨 iframe 生命周期保存。
+
 - 不在 CI 中完成真实 OAuth 登录。
 - 不自动删除旧插件、旧 storage domain 或凭据。
 - 不因探针一次失败直接删除社区条目；定时报告供维护者复核。

package/lib/client.js

@@ -1193,7 +1193,7 @@ window.__ModuleLoader__.load({
 						if (disposed) return;
 						setVersionStatus(status);
 						setVersionCheckBusy(status.checking === true);
-						setVersionCheckFailed(!status.checking && status.sources?.npm?.ok !== true);
+						setVersionCheckFailed(!status.checking && status.sources?.npm?.ok !== true ? "npm" : false);
 						if (status.checking) {
 							schedule(1e3);
 							return;
@@ -1207,7 +1207,7 @@ window.__ModuleLoader__.load({
 						console.warn("[mcp-connector] plugin update check failed:", error);
 						if (!disposed) {
 							setVersionCheckBusy(false);
-							setVersionCheckFailed(true);
+							setVersionCheckFailed("api");
 							schedule(VERSION_CHECK_RETRY_MS);
 						}
 					});
@@ -1668,7 +1668,7 @@ window.__ModuleLoader__.load({
 											versionCheckFailed && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 												className: "mcpConnectorUpdateStatus",
 												"data-tone": "error",
-												children: "暂时无法确认 npm 最新版本，请重试"
+												children: versionCheckFailed === "api" ? "插件 API 不可用，请检查 DSH 宿主兼容性或服务日志" : "暂时无法确认 npm 最新版本，请重试"
 											}),
 											versionStatus?.releasePending && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 												className: "mcpConnectorVersion",

package/lib/index.js

@@ -40,7 +40,7 @@ import { provision, disable, remove, entryIdFor } from './mcp-provision.js';
 import { classifyConnectionError, validateConnectionRecords } from './mcp-validation.js';
 import { listMcpTools, McpHttpError } from './mcp-http.js';
 import { registerTools } from './tools.js';
-import { mountWebRoutes } from './web.js';
+import { injectWebRoutes } from './web.js';
 import { createVersionStatusService } from './version-status.js';
 import { assertSafeUrl, normalizeConnectionDisplayName } from './util.js';
 import { readLegacyGrantCandidates, planLegacyMigration, toConnectorGrant, toConnectionRecords } from './migration.js';
@@ -3445,17 +3445,13 @@ export async function apply(ctx, config) {
   const disposeTools = registerTools(ctx, observableApi);
 
   /* ───────────────────────── web 半区（图形化市场）──────────────────────── */
-  // webServer / webRuntime 仅存在于 web 部署；无此服务时静默跳过（纯对话工具场景仍可用）。
-  let disposeWeb = null;
+  // webServer + 新版 webStartup 或旧版 webRuntime；纯对话部署不挂载 HTTP 路由。
   if (typeof ctx.inject === 'function') {
     try {
-      ctx.inject(['webServer', 'webRuntime'], (wctx) => {
-        disposeWeb = mountWebRoutes(wctx, observableApi, {
-          logger,
-          eventHub: statusEvents,
-          frameAncestors: config.frameAncestors,
-        });
-        logger.info('mcp-connector web UI mounted at /mcp-connector/ui/');
+      injectWebRoutes(ctx, observableApi, {
+        logger,
+        eventHub: statusEvents,
+        frameAncestors: config.frameAncestors,
       });
     } catch (error) {
       logger.warn(`mcp-connector web UI not mounted (webServer unavailable): ${error.message}`);
@@ -3467,7 +3463,6 @@ export async function apply(ctx, config) {
     clearTimeout(discoveryTimer);
     clearInterval(discoveryInterval);
     disposeTools();
-    disposeWeb?.();
     hostGovernance.dispose();
     hostScopes.dispose();
     hostSessionInjection.dispose();

package/lib/web.js

@@ -7,7 +7,7 @@
  *   - GET  /mcp-connector/events 无敏感数据的实时状态 SSE
  *
  * 所有路由都过浏览器信任 fence（loopback + 同源），与 better-sidebar 同一策略。
- * 本模块只依赖 ctx.webServer / ctx.webRuntime；在非 web 部署（无这两个服务）时
+ * 本模块依赖 ctx.webServer 及 webStartup（新版）或 webRuntime（旧版）；非 web 部署时
  * 调用方应跳过挂载，保证插件仍可用于纯对话工具场景。
  *
  * 静态资源响应的 `Content-Security-Policy` 由 `buildCsp()` 生成；其中
@@ -264,13 +264,47 @@ export function buildCsp(frameAncestors) {
 
 /* ───────────────────────── 路由挂载 ───────────────────────── */
 
+/** Alternative dependencies, not an AND: alpha.1 removed webRuntime.
+ * Keep each mount owned by its injection context; prefer webStartup when both exist.
+ */
+export function injectWebRoutes(ctx, api, options = {}) {
+  const candidates = new Map();
+  let active;
+  let dispose;
+  const reconcile = () => {
+    const next = candidates.get('webStartup') ?? candidates.get('webRuntime');
+    if (next === active) return;
+    dispose?.();
+    dispose = undefined;
+    active = next;
+    if (next) {
+      dispose = mountWebRoutes(next.ctx, api, {
+        ...options, trustedHosts: next.trustedHosts,
+      });
+      options.logger?.info?.('mcp-connector web UI mounted at /mcp-connector/ui/');
+    }
+  };
+  for (const name of ['webStartup', 'webRuntime']) {
+    ctx.inject(['webServer', name], (wctx) => {
+      wctx.effect(() => {
+        const candidate = { ctx: wctx, trustedHosts: wctx[name].trustedHosts ?? [] };
+        candidates.set(name, candidate);
+        reconcile();
+        return () => {
+          if (candidates.get(name) === candidate) candidates.delete(name);
+          reconcile();
+        };
+      });
+    });
+  }
+}
+
 /**
- * 挂载 web 路由。`wctx` 为已注入 webServer/webRuntime 的子上下文。
+ * 挂载 web 路由。`wctx` 为已注入 webServer 和对应信任服务的子上下文。
  * `frameAncestors` 为面板可嵌入白名单（缺省 = `['self']`，只有同源页面能内嵌；
  * 桌面壳场景由调用方显式追加外壳源）。返回 disposer（卸载三条 prefix 路由）。
  */
-export function mountWebRoutes(wctx, api, { logger, eventHub, frameAncestors } = {}) {
-  const trustedHosts = wctx.webRuntime?.trustedHosts ?? [];
+export function mountWebRoutes(wctx, api, { logger, eventHub, frameAncestors, trustedHosts = wctx.webStartup?.trustedHosts ?? wctx.webRuntime?.trustedHosts ?? [] } = {}) {
   const fence = (req) => isTrustedWebRequest(req, trustedHosts);
   const csp = buildCsp(frameAncestors);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mcp-connector",
-  "version": "0.2.71",
+  "version": "0.2.73",
   "description": "DeepSeek Harness MCP Connector: connect servers, search tools across active connections, and troubleshoot discovery. Includes a continuously updated catalog; supports OAuth 2.0 PKCE, API keys, Streamable HTTP/stdio, and mcpServers JSON import.",
   "type": "module",
   "main": "lib/index.js",

package/ui/index.html

@@ -628,6 +628,74 @@
   let pendingScopeKey = null;
   let installedItems = [];
 
+  // Same-tab memory only: no credentials, modal contents or API responses are retained.
+  // The Host owns this memory across iframe unmounts; reloading the Host clears it.
+  const viewStateMemory = (() => {
+    try {
+      const host = window.parent;
+      if (host.location.origin !== window.location.origin) return new Map();
+      const key = '__mcpConnectorViewStateV1';
+      if (!(host[key] instanceof host.Map)) host[key] = new host.Map();
+      return host[key];
+    } catch { return new Map(); }
+  })();
+  let viewStateReady = window.parent === window;
+  let viewRenderSequence = 0;
+  let viewStateLoading = false;
+  let pendingViewScroll = null;
+
+  function normalizeViewState(value) {
+    const text = (s) => typeof s === 'string' ? s.slice(0, 500) : '';
+    const category = (s) => CATEGORIES.some((item) => item.value === s) ? s : '';
+    return {
+      view: ['market', 'installed', 'tools'].includes(value?.view) ? value.view : 'market',
+      search: text(value?.search),
+      category: category(value?.category),
+      expanded: Array.isArray(value?.expanded) ? [...new Set(value.expanded.map(category).filter(Boolean))] : [],
+      filter: { connectionKey: text(value?.filter?.connectionKey), serverName: text(value?.filter?.serverName),
+        status: ['', 'pending', 'unknown', 'success', 'failed'].includes(value?.filter?.status) ? value.filter.status : '' },
+      offset: Number.isSafeInteger(value?.offset) && value.offset >= 0 ? Math.min(value.offset, 100000) : 0,
+      scroll: Number.isFinite(value?.scroll) ? Math.max(0, Math.min(value.scroll, 10000000)) : 0,
+    };
+  }
+
+  function viewStateKey() { return JSON.stringify([currentWorkspace?.workspaceId ?? null]); }
+
+  function saveViewState() {
+    if (!viewStateReady || viewStateLoading) return;
+    const key = viewStateKey();
+    viewStateMemory.delete(key);
+    viewStateMemory.set(key, normalizeViewState({ view, search: searchQuery, category: marketCategory,
+      expanded: [...expandedMarketSections], filter: explorerFilter, offset: explorerOffset, scroll: main.scrollTop }));
+    while (viewStateMemory.size > 32) viewStateMemory.delete(viewStateMemory.keys().next().value);
+  }
+
+  function restoreViewState() {
+    const state = normalizeViewState(viewStateMemory.get(viewStateKey()));
+    view = state.view; searchQuery = state.search; searchInput.value = searchQuery;
+    marketCategory = state.category;
+    expandedMarketSections.clear(); state.expanded.forEach((value) => expandedMarketSections.add(value));
+    explorerFilter = state.filter; explorerOffset = state.offset;
+    pendingViewScroll = state.scroll;
+    syncTabs();
+  }
+
+  function beginViewRender() {
+    if (pendingViewScroll === null) saveViewState();
+    viewStateLoading = true;
+    return { sequence: ++viewRenderSequence, workspace: viewStateKey(), view };
+  }
+
+  function isViewRenderCurrent(render) {
+    return render.sequence === viewRenderSequence && render.workspace === viewStateKey() && render.view === view;
+  }
+
+  function finishViewRender(render) {
+    if (!isViewRenderCurrent(render)) return;
+    if (pendingViewScroll !== null) { main.scrollTop = pendingViewScroll; pendingViewScroll = null; }
+    viewStateLoading = false;
+  }
+
   async function call(method, params, { timeoutMs: timeoutOverride } = {}) {
     const controller = new AbortController();
     const timeoutMs = timeoutOverride || API_TIMEOUTS[method] || DEFAULT_API_TIMEOUT_MS;
@@ -716,16 +784,20 @@
       const workspace = event.data.workspace;
       const previousWorkspaceId = currentWorkspace?.workspaceId ?? null;
       const previousWorkspaceOptions = JSON.stringify(availableWorkspaces);
+      const firstContext = !viewStateReady;
+      saveViewState();
       currentWorkspace = workspace && typeof workspace.workspaceId === 'string'
         ? { workspaceId: workspace.workspaceId, title: String(workspace.title || workspace.workspaceId) }
         : null;
       updateAvailableWorkspaces(event.data.workspaces);
-      if ((currentWorkspace?.workspaceId ?? null) !== previousWorkspaceId || JSON.stringify(availableWorkspaces) !== previousWorkspaceOptions) {
+      if (firstContext || (currentWorkspace?.workspaceId ?? null) !== previousWorkspaceId || JSON.stringify(availableWorkspaces) !== previousWorkspaceOptions) {
         explorerSequence++; explorerDetailSequence++;
         explorerData = null; explorerOffset = 0;
         explorerFilter = { connectionKey: '', serverName: '', status: '' };
         closeModal(); closeDetail();
-        if (view === 'tools') main.innerHTML = '';
+        viewStateReady = true;
+        if (firstContext || (currentWorkspace?.workspaceId ?? null) !== previousWorkspaceId) restoreViewState();
+        main.innerHTML = '';
         refresh();
       }
       return;
@@ -1275,10 +1347,13 @@
   }
 
   async function loadMarket({ checkHealth = true, preserveScroll = false } = {}) {
+    const render = beginViewRender();
+    try {
     const previousScrollTop = preserveScroll ? main.scrollTop : 0;
     syncMarketNav();
     main.innerHTML = '<div class="empty">加载中…</div>';
     const [r, status] = await Promise.all([call('catalog', workspaceParams()), call('status', workspaceParams())]);
+    if (!isViewRenderCurrent(render)) return;
     if (status.ok) {
       updateAvailableWorkspaces(status.detail?.scope?.workspaces);
       setTabCount('installed', (status.detail?.items ?? []).length);
@@ -1300,9 +1375,10 @@
     if (checkHealth && !initialHealthCheckStarted && items.some((item) => item.connected?.length > 0)) {
       initialHealthCheckStarted = true;
       call('healthCheck', {}).then(() => {
-        if (view === 'market') loadMarket({ checkHealth: false });
+        if (view === 'market') loadMarket({ checkHealth: false, preserveScroll: true });
       });
     }
+    } finally { finishViewRender(render); }
   }
 
   function connectionLabels(d) {
@@ -1370,6 +1446,8 @@
   const formatObserved = (value) => value ? new Date(value).toLocaleString('zh-CN', { hour12: false }) : '尚无记录';
 
   async function loadToolExplorer() {
+    const render = beginViewRender();
+    try {
     const sequence = ++explorerSequence;
     const workspaceId = currentWorkspace?.workspaceId;
     syncMarketNav();
@@ -1377,7 +1455,7 @@
       main.innerHTML = `<section id="tool-explorer"><p class="hint">搜索当前范围内已启用连接的工具缓存；不会执行工具。最近发现成功不代表每次调用均可成功。</p><div class="explorer-filters"><label>连接<select id="explorer-connection" aria-label="按连接筛选"></select></label><label>服务<select id="explorer-server" aria-label="按服务筛选"></select></label><label>发现状态<select id="explorer-status" aria-label="按发现状态筛选"><option value="">全部状态</option>${Object.entries(EXPLORER_STATUS).map(([key, label]) => `<option value="${key}">${label}</option>`).join('')}</select></label><button class="btn ghost" data-explorer-clear>清除筛选</button></div><p id="explorer-summary" role="status">正在读取缓存…</p><div id="explorer-connections"></div><div id="explorer-results"></div><div id="explorer-pages" class="m-actions"></div></section>`;
     }
     const response = await call('toolExplorer', { ...workspaceParams(), ...explorerFilter, query: searchQuery, offset: explorerOffset, limit: 20 });
-    if (sequence !== explorerSequence || view !== 'tools' || workspaceId !== currentWorkspace?.workspaceId) return;
+    if (!isViewRenderCurrent(render) || sequence !== explorerSequence || view !== 'tools' || workspaceId !== currentWorkspace?.workspaceId) return;
     if (!response.ok) { $('#explorer-summary').textContent = response.message; return; }
     explorerData = response.detail;
     const { connections = [], selectedConnections = [], items = [], total = 0 } = explorerData;
@@ -1392,8 +1470,10 @@
     $('#explorer-connections').innerHTML = `<details ${explorerFilter.connectionKey || !total ? 'open' : ''}><summary>连接状态与故障处理（${selectedConnections.length}）</summary>${selectedConnections.map((c) => `<div class="explorer-card"><strong>${esc(c.connectionName)}</strong><div>${esc(c.serverName)} · ${esc(EXPLORER_STATUS[c.status] || c.status)} · 缓存 ${c.toolCount} 个工具</div><div class="hint">最近发现：${esc(formatObserved(c.checkedAt))}；最后成功：${esc(formatObserved(c.observedAt))}${c.stale ? ' · 缓存超过 24 小时' : ''}${c.cacheTruncated ? ' · 缓存清单已截断' : ''}</div>${c.diagnostic ? `<div>${esc(c.diagnostic.stageLabel)}：${esc(c.diagnostic.message)}<br>建议：${esc(c.diagnostic.action)}</div>` : ''}${c.retryReason === 'auth' ? '<p>鉴权失败已暂停后台重试，请到已安装页更新凭据或重新授权。</p>' : c.nextDiscoveryAt ? `<p class="hint">下次后台发现不早于：${esc(formatObserved(c.nextDiscoveryAt))}（页面保持连接时）</p>` : ''}<div class="m-actions"><button class="btn ghost" data-explorer-action="discover" data-key="${esc(c.connectionKey)}" ${explorerBusy.has(c.connectionKey) ? 'disabled' : ''}>重新发现工具</button><button class="btn ghost" data-explorer-action="check" data-key="${esc(c.connectionKey)}" ${explorerBusy.has(c.connectionKey) ? 'disabled' : ''}>检查连接</button></div></div>`).join('') || '<p>当前筛选下没有连接。</p>'}</details>`;
     $('#explorer-results').innerHTML = items.map((item, index) => `<article class="explorer-card"><strong>${esc(item.name)}</strong>${item.title !== item.name ? `<div>${esc(item.title)}</div>` : ''}<p>${esc(item.description || '暂无描述')}</p><div class="hint">来源：${esc(item.connection.connectorName)} / ${esc(item.connection.connectionName)} / ${esc(item.serverName)}<br>${esc(EXPLORER_STATUS[item.connection.status])} · 最后成功缓存 ${esc(formatObserved(item.observedAt))}${item.stale ? ' · 已超过 24 小时' : ''}</div><button class="btn ghost" data-explorer-detail="${index}">参数详情</button></article>`).join('') || `<p class="empty">${connections.length ? '没有匹配工具。请调整关键词或筛选；也可展开连接状态检查是否尚未发现或读取失败。' : '当前范围没有已启用连接。请先添加连接，或选择对应工作区。'}</p>`;
     $('#explorer-pages').innerHTML = `<button class="btn ghost" data-explorer-page="prev" ${explorerOffset === 0 ? 'disabled' : ''}>上一页</button><span>${Math.floor(explorerOffset / 20) + 1} / ${Math.max(1, Math.ceil(total / 20))}</span><button class="btn ghost" data-explorer-page="next" ${explorerOffset + 20 >= total ? 'disabled' : ''}>下一页</button>`;
+    } finally { finishViewRender(render); }
   }
 
+  main.addEventListener('scroll', () => saveViewState(), { passive: true });
   main.addEventListener('change', (event) => {
     const fields = { 'explorer-connection': 'connectionKey', 'explorer-server': 'serverName', 'explorer-status': 'status' };
     const field = fields[event.target.id];
@@ -1429,10 +1509,13 @@
   });
 
   async function loadInstalled({ preserveScroll = false } = {}) {
+    const render = beginViewRender();
+    try {
     const previousScrollTop = preserveScroll ? main.scrollTop : 0;
     syncMarketNav();
     main.innerHTML = '<div class="empty">加载中…</div>';
     const [r, migration] = await Promise.all([call('status', workspaceParams()), call('migrationPreview', { scanStored: false })]);
+    if (!isViewRenderCurrent(render)) return;
     if (!r.ok) {
       main.innerHTML = `<div class="empty">${esc(r.message)}</div>`;
       if (preserveScroll) main.scrollTop = previousScrollTop;
@@ -1456,6 +1539,7 @@
     const rollbackDisabled = scopeRollbackRevision === null ? 'disabled' : '';
     main.innerHTML = `${migrationHtml}<div class="stats"><span class="count">共 <strong>${filtered.length}</strong> 条连接${searchQuery ? ` · 搜索「${esc(searchQuery)}」` : ''} · 作用域 revision=${scopeRevision}</span><button class="btn ghost" id="scope-rollback" type="button" ${rollbackDisabled} onclick="window.__mcp.rollbackScope()">回滚上次范围变更</button><button class="btn ghost" id="config-backup" type="button" onclick="window.__mcp.openConfigBackup()">配置备份</button><button class="btn ghost" type="button" title="扫描企查查旧 OAuth 插件；不会删除旧插件或原凭据" onclick="window.__mcp.scanLegacy()">检测企查查旧授权</button></div><div class="rows">${filtered.map(rowHtml).join('')}</div>${communityCtaHtml()}`;
     if (preserveScroll) main.scrollTop = previousScrollTop;
+    } finally { finishViewRender(render); }
   }
 
   function rowHtml(r) {
@@ -2425,6 +2509,7 @@
     }
   });
   window.addEventListener('pagehide', () => {
+    saveViewState();
     notifyDetailState(false);
     clearTimeout(statusRefreshTimer);
     statusEventSource?.close();
@@ -2445,6 +2530,7 @@
     const categoryFilter = event.target.closest('[data-category-filter]');
     if (categoryFilter) {
       marketCategory = categoryFilter.dataset.categoryFilter || '';
+      pendingViewScroll = null; main.scrollTop = 0;
       loadMarket({ checkHealth: false });
     }
   });
@@ -2472,6 +2558,7 @@
     const btn = e.target.closest('button[data-view]');
     if (!btn) return;
     view = btn.dataset.view;
+    pendingViewScroll = null; main.scrollTop = 0;
     explorerSequence++; explorerDetailSequence++;
     syncTabs();
     refresh();
@@ -2479,6 +2566,7 @@
 
   searchInput.addEventListener('input', (e) => {
     searchQuery = e.target.value.trim();
+    pendingViewScroll = null; main.scrollTop = 0;
     explorerSequence++; explorerOffset = 0;
     clearTimeout(searchTimer);
     if (view === 'tools') { searchTimer = setTimeout(() => { if (view === 'tools') void loadToolExplorer(); }, 200); return; }
@@ -2486,6 +2574,7 @@
     refresh();
   });
 
+  if (viewStateReady) restoreViewState();
   requestWorkspaceContext();
   connectStatusEvents();
   refresh();