dsh-retrace 0.4.29 → 0.4.30

package/README.md

@@ -360,7 +360,7 @@ Read it before filing an issue.
 ### Upgrading
 
 ```bash
-dsh plugin --profile desktop add dsh-retrace@0.4.29
+dsh plugin --profile desktop add dsh-retrace@0.4.30
 # then restart DSH — plugins are not hot-reloaded
 ```
 
@@ -452,6 +452,21 @@ the **host surface**, not by semver alone.
 > arms the native gate; it relies on the running banner plus the dispose notice. The gate is
 > armed only where the host reports that the page really surfaces a native dialog
 > (`quitVeto: true`, i.e. browser pages).
+>
+> **Both criteria must hold** (2026-09-18, second round): the host side is only a
+> *non-objection*, and the client keeps a **veto** — if this page's `navigator.userAgent`
+> contains `Electron`, or the page URL contains `dsh-desktop-` (the external report's shell
+> puts its desktop marker in the query string), the gate is **never** armed. The host-side
+> criteria were widened to four request-level facts: the `x-dsh-desktop-renderer` capability
+> header, a request `User-Agent` containing `Electron`, or a request URL **or `Referer`**
+> containing `dsh-desktop-` — **any one** of them classifies the page as a desktop page. (Our own
+> polling URL carries no query string, so the page marker is in practice read from `Referer`,
+> which a same-origin `fetch` sends by default.) That covers the
+> hosts that expose no desktop evidence at all (the reporter's: a pure-Node harness plus an
+> Electron renderer, where all three older criteria were false, and the old code filed
+> "no evidence at all" as a browser page ⇒ the gate was still armed ⇒ the exit still hung).
+> If Desktop cannot quit, turning off "Exit confirmation (close guard)" in settings recovers
+> immediately (no restart).
 
 > Command surface: `retrace.runningState` (host RPC) + `GET|POST /api/plugins/retrace/runningState` (HTTP).
 

package/README.zh.md

@@ -336,6 +336,15 @@ dsh plugin --profile desktop add dsh-retrace@0.4.26
 > `requestQuit(0) → window.destroy() → app.exit(0)`）上，退出本来就不受影响。页面里分不出
 > 自己属于哪一类，因此**桌面端一律不武装**原生门，保护由运行中横幅 + dispose 提示承担；
 > 只有宿主回报"这个页面会弹原生确认框"（`quitVeto: true`，即普通浏览器页）时才武装。
+>
+> **两道判据都成立才武装**（2026-09-18 第二轮）：宿主那条只是"不反对"，客户端还有**一票否决** ——
+> 本页 `navigator.userAgent` 含 `Electron`，或页面 URL 含 `dsh-desktop-`（外部报告那套壳的查询参数
+> 前缀）⇒ 一律不武装。宿主侧的判据也补成四条请求级证据：能力头 `x-dsh-desktop-renderer` /
+> 请求 UA 含 Electron / 请求 URL **或 `Referer`** 含 `dsh-desktop-`（我们自己的轮询 URL 没有 query，
+> 所以页面标记实际是从 `Referer` 读到的），**任一成立**即判桌面页面。这样"壳什么桌面痕迹
+> 都不给"的宿主（报告人那台：纯 Node 跑 harness + Electron 渲染页，三条旧判据全不成立，
+> 旧实现把"完全没有证据"归成了浏览器页 ⇒ 照旧武装 ⇒ 仍退不掉）也不会再把退出卡住。
+> 桌面端退不掉时，把设置里的「退出确认（关闭守卫）」关掉即可立即恢复（不用重启）。
 
 **未来计划**——agent 业务层规划（运行时守护、中断治理、生态开放接口）**尚未发布**，此节是**计划**而非已上线能力。本 README 描述的是**开发线（main）**，可能领先于 npm 上最新发布版。
 

package/lib/client.bundle.js

@@ -261,6 +261,29 @@ function buildRunningCopy(snapshot, { locale = "zh", labelOf, now = Date.now(),
 function quitVetoOf(snapshot) {
   return snapshot?.quitVeto === true;
 }
+var CLIENT_DESKTOP_URL_MARK = "dsh-desktop-";
+var CLIENT_DESKTOP_UA_RE = /electron/i;
+function clientDesktopEvidence(page = pageEnvironment()) {
+  const ua = typeof page?.userAgent === "string" ? page.userAgent : "";
+  const url = typeof page?.href === "string" ? page.href : "";
+  const electronUa = CLIENT_DESKTOP_UA_RE.test(ua);
+  const urlMark = url.includes(CLIENT_DESKTOP_URL_MARK);
+  return { electronUa, urlMark, desktop: electronUa || urlMark };
+}
+function pageEnvironment() {
+  const g = globalThis;
+  const ua = g?.navigator?.userAgent;
+  const href = g?.location?.href;
+  return {
+    userAgent: typeof ua === "string" ? ua : "",
+    href: typeof href === "string" ? href : ""
+  };
+}
+function shouldArmNativeGate(snapshot, page = pageEnvironment()) {
+  if (snapshot?.surface === "desktop-renderer") return false;
+  if (!quitVetoOf(snapshot)) return false;
+  return !clientDesktopEvidence(page).desktop;
+}
 function createGuardStore({ now = Date.now, armTtlMs = GUARD_ARM_TTL_MS } = {}) {
   let snapshot = null;
   let armedAt = 0;
@@ -472,7 +495,7 @@ var zh = {
   "path.round": "\u7B2C {n} \u8F6E",
   "path.empty": "\uFF08\u5F53\u524D\u6CA1\u6709\u5BF9\u8BDD\u8F6E\u6B21\uFF09",
   "options.closeGuard": "\u9000\u51FA\u786E\u8BA4\uFF08\u5173\u95ED\u5B88\u536B\uFF09",
-  "options.closeGuardDesc": "\u5F00\uFF08\u9ED8\u8BA4\uFF09\uFF1A\u9875\u9762\u5173\u95ED\u524D\u786E\u8BA4\u9000\u51FA\u2014\u2014\u6709\u8FD0\u884C\u4E2D\u4EFB\u52A1\u6216\u672A\u5B8C\u6210\u5BF9\u8BDD\u65F6\u5F3A\u62E6\u5E76\u5217\u51FA\u660E\u7EC6\uFF08\u9632\u8BEF\u5173\u4E22\u8FDB\u5EA6\uFF09\uFF0C\u65E0\u4EFB\u52A1\u65F6\u8F7B\u786E\u8BA4\u4E00\u6B21\u3002\u53EA\u5728\u5BBF\u4E3B\u786E\u8BA4\u4F1A\u663E\u793A\u539F\u751F\u786E\u8BA4\u6846\u7684\u9875\u9762\u4E0A\u6B66\u88C5\uFF08\u666E\u901A\u6D4F\u89C8\u5668\u6807\u7B7E\u9875\uFF1B\u5173\u6389\u672C\u9879\u540C\u65F6\u505C\u7528\u8FD0\u884C\u4E2D\u6A2A\u5E45\uFF09\u3002\u684C\u9762\u7AEF\uFF08DSH Desktop\uFF09\u4E00\u5F8B\u4E0D\u6B66\u88C5\uFF1A\u9000\u51FA\u5165\u53E3\u968F\u7248\u672C/\u5E73\u53F0\u800C\u53D8\u2014\u2014\u5916\u90E8\u62A5\u544A\u7684 0.9.0 \u4E00\u7C7B\u5165\u53E3\u4F1A\u89E6\u53D1\u9875\u9762 beforeunload\uFF0C\u800C\u684C\u9762\u58F3\u672A\u5904\u7406 will-prevent-unload \u21D2 \u5426\u51B3\u88AB\u9759\u9ED8\u541E\u6389\u3001\u9000\u51FA\u5361\u4F4F\uFF1B2.0.9 \u7684\u6258\u76D8\u9879\u8D70 requestQuit\u2192window.destroy\u2192app.exit\uFF0C\u6839\u672C\u4E0D\u7ECF\u8FC7\u5B83\u3002\u9875\u9762\u91CC\u5206\u4E0D\u51FA\u662F\u54EA\u4E00\u7C7B\uFF0C\u6545\u684C\u9762\u4FDD\u62A4\u7531\u8FD0\u884C\u4E2D\u6A2A\u5E45\u627F\u62C5\u3002"
+  "options.closeGuardDesc": "\u5F00\uFF08\u9ED8\u8BA4\uFF09\uFF1A\u9875\u9762\u5173\u95ED\u524D\u786E\u8BA4\u9000\u51FA\u2014\u2014\u6709\u8FD0\u884C\u4E2D\u4EFB\u52A1\u6216\u672A\u5B8C\u6210\u5BF9\u8BDD\u65F6\u5F3A\u62E6\u5E76\u5217\u51FA\u660E\u7EC6\uFF08\u9632\u8BEF\u5173\u4E22\u8FDB\u5EA6\uFF09\uFF0C\u65E0\u4EFB\u52A1\u65F6\u8F7B\u786E\u8BA4\u4E00\u6B21\u3002\u53EA\u5728\u5BBF\u4E3B\u786E\u8BA4\u4F1A\u663E\u793A\u539F\u751F\u786E\u8BA4\u6846\u7684\u9875\u9762\u4E0A\u6B66\u88C5\uFF08\u666E\u901A\u6D4F\u89C8\u5668\u6807\u7B7E\u9875\uFF1B\u5173\u6389\u672C\u9879\u540C\u65F6\u505C\u7528\u8FD0\u884C\u4E2D\u6A2A\u5E45\uFF09\u3002\u684C\u9762\u7AEF\uFF08DSH Desktop\uFF09\u4E00\u5F8B\u4E0D\u6B66\u88C5\uFF1A\u9000\u51FA\u5165\u53E3\u968F\u7248\u672C/\u5E73\u53F0\u800C\u53D8\u2014\u2014\u5916\u90E8\u62A5\u544A\u7684 0.9.0 \u4E00\u7C7B\u5165\u53E3\u4F1A\u89E6\u53D1\u9875\u9762 beforeunload\uFF0C\u800C\u684C\u9762\u58F3\u672A\u5904\u7406 will-prevent-unload \u21D2 \u5426\u51B3\u88AB\u9759\u9ED8\u541E\u6389\u3001\u9000\u51FA\u5361\u4F4F\uFF1B2.0.9 \u7684\u6258\u76D8\u9879\u8D70 requestQuit\u2192window.destroy\u2192app.exit\uFF0C\u6839\u672C\u4E0D\u7ECF\u8FC7\u5B83\u3002\u5224\u636E\u662F\u4E24\u9053\uFF1A\u5BBF\u4E3B\u8BF4\u4F1A\u5F39\u539F\u751F\u6846\uFF08quitVeto\uFF09\uFF0C\u4E14\u672C\u9875\u81EA\u5DF1\u770B\u4E0D\u51FA\u684C\u9762\u75D5\u8FF9\uFF08UA \u65E0 Electron\u3001URL \u65E0 dsh-desktop-\uFF09\u2014\u2014\u4EFB\u4E00\u6761\u4E0D\u6210\u7ACB\u5C31\u4E0D\u6B66\u88C5\uFF1B\u56E0\u6B64\u9875\u9762\u91CC\u5206\u4E0D\u51FA\u662F\u54EA\u4E00\u7C7B\u58F3\u4E5F\u6CA1\u5173\u7CFB\uFF0C\u684C\u9762\u4FDD\u62A4\u7531\u8FD0\u884C\u4E2D\u6A2A\u5E45\u627F\u62C5\u3002\u684C\u9762\u7AEF\u9000\u4E0D\u6389\u65F6\u5148\u5173\u8FD9\u4E00\u9879\uFF08\u7ACB\u5373\u6062\u590D\uFF0C\u4E0D\u7528\u91CD\u542F\uFF09\u3002"
 };
 var en = {
   "action.edit": "Edit",
@@ -619,7 +642,7 @@ var en = {
   "path.round": "Round {n}",
   "path.empty": "(no conversation rounds yet)",
   "options.closeGuard": "Exit confirmation (close guard)",
-  "options.closeGuardDesc": "On (default): confirm before the page closes \u2014 when sessions have running or unfinished work a strong guard lists them (prevents accidental progress loss); otherwise a light one-time confirm. Armed only where the host reports a native confirm dialog (ordinary browser tabs; turning this off also disables the running banner). Desktop (DSH Desktop) never arms it: quit entries differ by version/platform \u2014 the 0.9.0-class entry in the external report does reach page beforeunload, and the shell has no will-prevent-unload handler, so the veto is swallowed silently and the exit hangs; the 2.0.9 tray item goes requestQuit\u2192window.destroy\u2192app.exit and never reaches it. The page cannot tell which one it is, so the running banner carries that protection instead."
+  "options.closeGuardDesc": "On (default): confirm before the page closes \u2014 when sessions have running or unfinished work a strong guard lists them (prevents accidental progress loss); otherwise a light one-time confirm. Armed only where the host reports a native confirm dialog (ordinary browser tabs; turning this off also disables the running banner). Desktop (DSH Desktop) never arms it: quit entries differ by version/platform \u2014 the 0.9.0-class entry in the external report does reach page beforeunload, and the shell has no will-prevent-unload handler, so the veto is swallowed silently and the exit hangs; the 2.0.9 tray item goes requestQuit\u2192window.destroy\u2192app.exit and never reaches it. Two criteria must both hold: the host says a native dialog appears (quitVeto) AND this page shows no desktop evidence itself (no Electron in the UA, no dsh-desktop- in the URL); if either fails it stays unarmed, so it does not matter that the page cannot tell which shell it is \u2014 the running banner carries that protection instead. If Desktop cannot quit, turn this off first (recovers immediately, no restart)."
 };
 function opFailureText(code, message, t) {
   if (code === "agent-busy") return t("error.busy");
@@ -2890,7 +2913,7 @@ function installCloseGuard(t) {
     if (store.isArmed()) return;
     const kind = classifySnapshot(store.get());
     if (kind === "unknown") return;
-    if (!quitVetoOf(store.get())) return;
+    if (!shouldArmNativeGate(store.get())) return;
     try {
       event.preventDefault?.();
     } catch {

package/lib/client.js

@@ -24,7 +24,7 @@ import {
   buildRunningCopy,
   runningLines,
   createGuardStore,
-  quitVetoOf,
+  shouldArmNativeGate,
 } from './close-guard-client.js'
 
 export const name = 'dsh-retrace'
@@ -239,7 +239,7 @@ export const zh = {
   'path.round': '第 {n} 轮',
   'path.empty': '（当前没有对话轮次）',
   'options.closeGuard': '退出确认（关闭守卫）',
-  'options.closeGuardDesc': '开（默认）：页面关闭前确认退出——有运行中任务或未完成对话时强拦并列出明细（防误关丢进度），无任务时轻确认一次。只在宿主确认会显示原生确认框的页面上武装（普通浏览器标签页；关掉本项同时停用运行中横幅）。桌面端（DSH Desktop）一律不武装：退出入口随版本/平台而变——外部报告的 0.9.0 一类入口会触发页面 beforeunload，而桌面壳未处理 will-prevent-unload ⇒ 否决被静默吞掉、退出卡住；2.0.9 的托盘项走 requestQuit→window.destroy→app.exit，根本不经过它。页面里分不出是哪一类，故桌面保护由运行中横幅承担。',
+  'options.closeGuardDesc': '开（默认）：页面关闭前确认退出——有运行中任务或未完成对话时强拦并列出明细（防误关丢进度），无任务时轻确认一次。只在宿主确认会显示原生确认框的页面上武装（普通浏览器标签页；关掉本项同时停用运行中横幅）。桌面端（DSH Desktop）一律不武装：退出入口随版本/平台而变——外部报告的 0.9.0 一类入口会触发页面 beforeunload，而桌面壳未处理 will-prevent-unload ⇒ 否决被静默吞掉、退出卡住；2.0.9 的托盘项走 requestQuit→window.destroy→app.exit，根本不经过它。判据是两道：宿主说会弹原生框（quitVeto），且本页自己看不出桌面痕迹（UA 无 Electron、URL 无 dsh-desktop-）——任一条不成立就不武装；因此页面里分不出是哪一类壳也没关系，桌面保护由运行中横幅承担。桌面端退不掉时先关这一项（立即恢复，不用重启）。',
 }
 /** English dictionary, checked complete against the zh key set. */
 export const en = {
@@ -387,7 +387,7 @@ export const en = {
   'path.round': 'Round {n}',
   'path.empty': '(no conversation rounds yet)',
   'options.closeGuard': 'Exit confirmation (close guard)',
-  'options.closeGuardDesc': 'On (default): confirm before the page closes — when sessions have running or unfinished work a strong guard lists them (prevents accidental progress loss); otherwise a light one-time confirm. Armed only where the host reports a native confirm dialog (ordinary browser tabs; turning this off also disables the running banner). Desktop (DSH Desktop) never arms it: quit entries differ by version/platform — the 0.9.0-class entry in the external report does reach page beforeunload, and the shell has no will-prevent-unload handler, so the veto is swallowed silently and the exit hangs; the 2.0.9 tray item goes requestQuit→window.destroy→app.exit and never reaches it. The page cannot tell which one it is, so the running banner carries that protection instead.',
+  'options.closeGuardDesc': 'On (default): confirm before the page closes — when sessions have running or unfinished work a strong guard lists them (prevents accidental progress loss); otherwise a light one-time confirm. Armed only where the host reports a native confirm dialog (ordinary browser tabs; turning this off also disables the running banner). Desktop (DSH Desktop) never arms it: quit entries differ by version/platform — the 0.9.0-class entry in the external report does reach page beforeunload, and the shell has no will-prevent-unload handler, so the veto is swallowed silently and the exit hangs; the 2.0.9 tray item goes requestQuit→window.destroy→app.exit and never reaches it. Two criteria must both hold: the host says a native dialog appears (quitVeto) AND this page shows no desktop evidence itself (no Electron in the UA, no dsh-desktop- in the URL); if either fails it stays unarmed, so it does not matter that the page cannot tell which shell it is — the running banner carries that protection instead. If Desktop cannot quit, turn this off first (recovers immediately, no restart).',
 }
 
 // ---------------------------------------------------------------------------
@@ -3420,10 +3420,10 @@ function whatBody(what, summaryText, t, { suppressContinue = false, maxLines = n
 //    (装好的 2.0.9 app.asar 全文 0 命中)⇒ 否决被静默吞掉,那里表现为"退出卡住、
 //    只能强退";2.0.9 的托盘项走 requestQuit(0) → window.destroy() → app.exit(code),
 //    不经过 beforeunload,那类版本上退出本来就正常;
-//  - ⇒ 原生门的武装条件 = **宿主明确回报本页承载 quit-veto**(普通浏览器页面)。
-//    页面里分不出宿主属于哪一类,而第一类上否决是静默的(会卡住退出),所以桌面端
-//    一律不武装。承载面由宿主随 runningState 载荷下发(quitVeto === true 才武装;
-//    false/未知都不武装,未知取安全侧)。客户端不再自己猜宿主;
+//  - ⇒ 原生门的武装条件 = **宿主明确回报本页承载 quit-veto**(普通浏览器页面)
+//    **且本页自己看不出桌面痕迹**(UA 无 Electron、URL 无 dsh-desktop-;2026-09-18
+//    第二轮补的客户端一票否决)。承载面由宿主随 runningState 载荷下发
+//    (quitVeto === true 且客户端不否决才武装;false/未知都不武装,未知取安全侧);
 //  - 桌面端的保护 = 运行中横幅(有任务即常驻)+ dispose 提示,两者都与退出路径无关;
 //  - 浏览器 beforeunload 确认框文案/按钮不可自定义(Chromium 统一原生框),
 //    故 A 强拦 = 原生门 + 「取消后」的中文明细模态;B 轻确认 = 原生一次确认。
@@ -3475,7 +3475,8 @@ function installCloseGuard(t) {
       if (!value || !Array.isArray(value.running)) return
       const prev = store.get()
       // quitVeto = 宿主回报的"本页是否承载 quit-veto"(见 close-guard-client.js
-      // quitVetoOf)。**原样缓存宿主的值**:缺字段 = 旧宿主 = 未知 ⇒ 不武装。
+      // shouldArmNativeGate:宿主值 + 客户端一票否决两道)。**原样缓存宿主的值**:
+      // 缺字段 = 旧宿主 = 未知 ⇒ 不武装。
       store.set({ running: value.running, quitVeto: value.quitVeto, surface: value.surface })
       if (runningSig(store.get()) !== runningSig(prev)) ui.dismissed = null
       renderBanner()
@@ -3634,9 +3635,13 @@ function installCloseGuard(t) {
     if (kind === 'unknown') return // 状态未同步(host 不可达/刚启动)→ 不打扰
     // 宿主承载面闸门(2026-09-18 外部 issue #1):桌面 Electron 页面上原生
     // beforeunload 门没有意义(2.0.9 那类入口不经过它;0.9.0 那类入口经过时否决被
-    // 壳静默吞掉、退出卡住)。仅当宿主明确回报 quitVeto === true(普通浏览器页面)
-    // 才武装;false 与未知一律不武装(未知取安全侧)。
-    if (!quitVetoOf(store.get())) return
+    // 壳静默吞掉、退出卡住)。**两道判据都为真才武装**:
+    //   ① 宿主明确回报 quitVeto === true(它认为这是会弹原生确认框的普通浏览器页);
+    //   ② 页面自己**没有**桌面证据(navigator.userAgent 无 Electron 段、URL 无
+    //      `dsh-desktop-` 标记)—— 2026-09-18 第二轮补的**客户端一票否决**:
+    //      报告人那台壳三条宿主判据全不成立 ⇒ 宿主错回 browser/true,只靠 ① 会照旧
+    //      卡死(实测)。false 与未知一律不武装(未知取安全侧)。
+    if (!shouldArmNativeGate(store.get())) return
     // A/B 共用浏览器原生门:returnValue 触发原生确认(Chromium 文案不可自定义,
     // 见 close-guard-client.js 头注释;用户控制可在设置关闭)。
     try { event.preventDefault?.() } catch { /* ignore */ }
@@ -3714,9 +3719,9 @@ export function apply(ctx) {
   const t = ctx.locale.bind(NS)
 
   // 关闭守卫 V2:页面关闭 beforeunload 拦截(A 强拦/B 轻
-  // 确认,运行中状态经 /runningState 轮询缓存)+ 运行中横幅。原生门只在宿主
-  // 回报本页承载 quit-veto 时武装(见 installCloseGuard 段头注释);桌面端的
-  // 可见提示 = 运行中横幅 + dispose 提示(与退出路径无关)。
+  // 确认,运行中状态经 /runningState 轮询缓存)+ 运行中横幅。原生门只在**宿主回报
+  // 本页承载 quit-veto 且客户端不否决**时武装(见 installCloseGuard 段头注释);
+  // 桌面端的可见提示 = 运行中横幅 + dispose 提示(与退出路径无关)。
   // The close guard is DOM-only (no React), so the panel error boundary does not
   // apply to it: fail CLOSED instead — the guard degrades to "not installed"
   // rather than breaking the plugin's activation (and with it the client half).

package/lib/close-guard-client.js

@@ -28,6 +28,15 @@
  * `false`(桌面 Electron 页面)与 `null`/`undefined`(中性态:wire 通道拿不到请求
  * 证据 / 旧版桌面壳)一律不武装 —— 未知取安全侧,避免再次死锁。
  *
+ * ⚠️ **2026-09-18 第二轮(issue #1 复测仍卡死)**:只靠宿主那条还不够 —— 报告人那台
+ * 壳**三条旧判据一条都不成立**,宿主于是回了 `surface="browser"` / `quitVeto=true`,
+ * 客户端照旧武装 ⇒ 仍然退不掉(他抓到的原始回包就是
+ * `{"running":[],"surface":"browser","quitVeto":true}`)。⇒ 客户端加**自己的一票否决**:
+ * `navigator.userAgent` 含 Electron **或**页面 URL 含 `dsh-desktop-`
+ * (报告人那套壳的查询参数前缀)⇒ **一律不武装**,不管宿主怎么说。
+ * 语义 = 宿主说"可以武装"只是**不反对**,两者都为真才武装(见 `shouldArmNativeGate`)。
+ * 这两条是**页面自身**的属性,不需要壳配合,故能兜住"壳什么都不给"的宿主。
+ *
  * 浏览器 beforeunload 确认框文案/按钮不可自定义(Chromium 一律通用原生框)
  * ⇒ 本模块只产出语义/文案数据,选型由 client.js 装配层决定
  * (A 强拦 = 原生门 + 取消后中文明细模态;B 轻确认 = 原生一次确认)。
@@ -152,12 +161,68 @@ export function buildRunningCopy(snapshot, { locale = 'zh', labelOf, now = Date.
  * `false`(桌面 Electron 页面:壳不处理 will-prevent-unload,否决静默)与
  * `null`/`undefined`(中性态)都返回 false —— 未知一律取**不武装**的安全侧。
  * @param {{quitVeto?:boolean|null}} [snapshot] 宿主快照。
- * @returns {boolean} 是否可以在本页武装原生 `beforeunload` 门。
+ * @returns {boolean} 宿主是否"不反对"武装(注意:还要过客户端一票否决,见 shouldArmNativeGate)。
  */
 export function quitVetoOf(snapshot) {
   return snapshot?.quitVeto === true
 }
 
+// ── 客户端一票否决(2026-09-18 第二轮,issue #1 复测仍卡死)────────────────────
+/**
+ * 页面 URL 里的桌面壳标记(与宿主侧 `DESKTOP_URL_MARK` 同值,但这里读的是**页面自己**
+ * 的 location;外部报告那套壳的查询参数长这样:`?token=…&dsh-desktop-mode=advanced&
+ * dsh-desktop-platform=…`)。
+ */
+export const CLIENT_DESKTOP_URL_MARK = 'dsh-desktop-'
+
+/** 页面 `navigator.userAgent` 里的 Electron 段(Electron 渲染页默认带)。 */
+export const CLIENT_DESKTOP_UA_RE = /electron/i
+
+/**
+ * 页面自身的桌面证据(纯函数,可单测):UA 含 Electron,或 URL 含桌面壳标记。
+ * 为什么要有它:宿主侧的判据要壳配合(挂能力头 / 保留 UA / 带 URL 参数),
+ * **页面自己能看见的两条**是最后一道 —— 壳什么都不给、宿主又判错时它兜底。
+ * @param {{userAgent?:string, href?:string}} [page] 默认取本页全局环境。
+ * @returns {{electronUa:boolean, urlMark:boolean, desktop:boolean}}
+ */
+export function clientDesktopEvidence(page = pageEnvironment()) {
+  const ua = typeof page?.userAgent === 'string' ? page.userAgent : ''
+  const url = typeof page?.href === 'string' ? page.href : ''
+  const electronUa = CLIENT_DESKTOP_UA_RE.test(ua)
+  const urlMark = url.includes(CLIENT_DESKTOP_URL_MARK)
+  return { electronUa, urlMark, desktop: electronUa || urlMark }
+}
+
+/** 读本页全局环境(浏览器里 navigator/location 就是全局;取不到一律空串)。 */
+export function pageEnvironment() {
+  const g = globalThis
+  const ua = g?.navigator?.userAgent
+  const href = g?.location?.href
+  return {
+    userAgent: typeof ua === 'string' ? ua : '',
+    href: typeof href === 'string' ? href : '',
+  }
+}
+
+/**
+ * **最终判据**:本页是否可以武装原生 `beforeunload` 门。
+ * 语义 = 宿主说"可以武装"只是**不反对**,客户端还有**一票否决**:两道都为真才武装。
+ *   ① 宿主 `quitVeto === true`(它认为这是会弹原生确认框的普通浏览器页);
+ *   ② 页面自己**没有**桌面证据(UA 无 Electron 段、URL 无 `dsh-desktop-` 标记)。
+ * 任一条不成立 ⇒ 不武装 ⇒ 退化为"仅运行中横幅"(桌面端保护路径,见文件头注释)。
+ * @param {{quitVeto?:boolean|null}} [snapshot] 宿主快照。
+ * @param {{userAgent?:string, href?:string}} [page] 页面环境(默认取本页全局)。
+ */
+export function shouldArmNativeGate(snapshot, page = pageEnvironment()) {
+  // 载荷里若**已经**说这是桌面页(surface=desktop-renderer),那就不用再看别的了 ——
+  // 客户端也读这个字段(实测:此前完全不读它,于是"自相矛盾载荷"
+  // `{surface:'desktop-renderer', quitVeto:true}` + 普通浏览器页仍会被武装。
+  // 当前宿主不产出这对值,但这是**廉价且直击**的一道,留着。)
+  if (snapshot?.surface === 'desktop-renderer') return false
+  if (!quitVetoOf(snapshot)) return false
+  return !clientDesktopEvidence(page).desktop
+}
+
 /**
  * 关闭守卫客户端状态(纯,可单测):快照缓存 + 已放行标记。
  * 「放行」= 用户在一轮关闭手势中已选 [仍关闭];二次触发 beforeunload 时放行,

package/lib/close-guard.js

@@ -49,15 +49,47 @@
  * 通道,不新造)。客户端只在宿主明确回 true 时武装原生门(见
  * lib/close-guard-client.js quitVetoOf)。
  *
- * 判据取**请求级证据**:DSH Desktop 主进程给 renderer 的**每一个** HTTP/WS 请求
- * 挂一个代际能力头(`electron-runtime` 的 installRendererAccessHeader;
+ * 判据取**请求级证据**。能力头(第一条)是外部报告那个 issue 的**第一次修复**:
+ * DSH Desktop 主进程给 renderer 的**每一个** HTTP/WS 请求挂一个代际能力头
+ * (`electron-runtime` 的 installRendererAccessHeader;
  * `webRequest.onBeforeSendHeaders({urls:['<all_urls>']})`,且挂之前先剥掉请求里
- * 同名头 ⇒ 页面 JS 伪造不了)。头在 ⇒ 本请求来自 Desktop 的 Electron 页面;
- * 头不在且宿主看不出 Electron 痕迹 ⇒ 普通浏览器页面。
+ * 同名头 ⇒ 页面 JS 伪造不了)。头在 ⇒ 本请求来自 Desktop 的 Electron 页面。
+ *
+ * ⚠️ **2026-09-18 第二轮(外部 issue #1 复测仍卡死)**:那条修复只对**挂了能力头的
+ * 壳**成立。报告人那台(Dsh Desktop 0.9.0 / Windows)是**纯 Node 跑 harness**
+ * (`node.exe … resources\app\harness-node-entry.mjs`)+ Electron 渲染页,三条旧判据
+ * 逐条实测都不成立(能力头 0 命中;`desktopBrowserAccess`/`desktopRuntime`/
+ * `desktopPnpmBootstrap` 三个服务名 0 命中;`process.versions.electron` 为假)。
+ * 旧实现把"**完全没有证据**"归成了 `BROWSER`(`pageSurfaceOf` 末尾直接 return
+ * BROWSER)⇒ `quitVeto=true` ⇒ 客户端**照旧武装**原生门 ⇒ 仍然退不掉,而且比
+ * 0.9.0 时更隐蔽(空闲也拦)。报告人抓到的原始回包是决定性的:
+ * `{"running":[],"surface":"browser","quitVeto":true}`。
+ *
+ * ⇒ 判据补成**四条请求级证据 + 一条宿主痕迹**,任一请求级证据成立即判桌面页面:
+ *   ① 能力头 `x-dsh-desktop-renderer` 非空(挂了头的壳);
+ *   ② 请求 `user-agent` 含 `Electron`(**页面自身属性**,纯 Node 宿主也读得到);
+ *   ③ 请求 URL 或 **`Referer`** 含 `dsh-desktop-`(报告人那套壳的查询参数前缀
+ *      `?token=…&dsh-desktop-mode=advanced&dsh-desktop-platform=…`)。
+ *      ⚠️ 2026-09-19 复核:我们**自己**的轮询打的是 `ROUTE_BASE+'/runningState'`
+ *      (**无 query**)、wire 通道传 `undefined` ⇒ **URL 这一条对生产请求打不着**;
+ *      同源 fetch 默认 `strict-origin-when-cross-origin` 会在 `Referer` 里带**完整页面 URL**
+ *      ⇒ **Referer 才是宿主侧真能看到页面标记的通道**(两条都留:URL 判据对外部直连调用仍有效);
+ *   ④ 宿主痕迹(进程是 Electron / 注册了桌面专属服务)→ 中性态 `unknown`。
+ *   三条都没有 **且** 宿主没有桌面痕迹 ⇒ 才判 `BROWSER`(真浏览器页照旧武装;
+ *   "把默认翻过来"会把网页端的保护一起关掉,所以补的是**正向判据**而不是翻默认)。
+ *
+ * 客户端另有**一票否决**(lib/close-guard-client.js `shouldArmNativeGate`):页面
+ * 自己的 `navigator.userAgent` 含 Electron 或页面 URL 含 `dsh-desktop-` ⇒ 一律不
+ * 武装。语义 = 宿主说"可以武装"只是"不反对",**两者都为真才武装** —— 两道独立判据
+ * 互为兜底(壳可以把 UA 里的 Electron 段改掉,那就靠宿主侧的能力头/URL 判据)。
  *
  * 已知中性态(默认取**不武装**这一侧):动态桥 wire 通道拿不到请求对象;宿主能看出
- * 自己是 Electron 但请求没带该头(旧版桌面壳/桌面版兼容模式的普通浏览器页)。
- * 两种都判 unknown ⇒ 客户端不武装原生门,退化为"仅运行中横幅"。
+ * 自己是 Electron 但请求没带任何请求级证据(旧版桌面壳/桌面版兼容模式的普通浏览器页)。
+ * 两种都判 unknown(或浏览器页但被客户端否决)⇒ 客户端不武装原生门,退化为
+ * "仅运行中横幅"。
+ *
+ * 探针(`installSurfaceProbe`):把每次判定的**入参与结果**按组合去重写进宿主日志,
+ * 供报告人一次跑完就定位是哪条判据生效(不再互相猜)。
  */
 // unclosedTurns 直接复用 interrupt-guard(该文件零 import,无环),
 // 不再内联复制一份——后续 interrupt-guard 演进(如 reason 感知)自动同步。
@@ -170,6 +202,12 @@ export function sessionRunningState(ctx, sessionId) {
 /** DSH Desktop 主进程给 renderer 每个请求挂的代际能力头(页面 JS 伪造不了)。 */
 export const DESKTOP_RENDERER_HEADER = 'x-dsh-desktop-renderer'
 
+/** 请求 URL 里的桌面壳标记(外部报告那套壳的参数前缀,见文件头 ③)。 */
+export const DESKTOP_URL_MARK = 'dsh-desktop-'
+
+/** 请求 `user-agent` 里的 Electron 段(Electron 渲染页默认带;壳可改 ⇒ 只作三条之一)。 */
+export const DESKTOP_UA_RE = /electron/i
+
 /** 承载面取值。语义见文件头注释。 */
 export const PAGE_SURFACE = Object.freeze({
   /** DSH Desktop 的 Electron 页面:原生 `beforeunload` 门在此静默。 */
@@ -204,32 +242,81 @@ export function desktopHostEvidence(ctx) {
   return false
 }
 
+/**
+ * 大小写不敏感读一个请求头,值统一成字符串(缺失/空一律返回 '')。
+ * Node 的 `req.headers` 名字已小写,但经序列化/代理的形状未必如此 ⇒ 逐键比对。
+ */
+function headerText(headers, name) {
+  if (!headers || typeof headers !== 'object') return ''
+  try {
+    for (const [key, value] of Object.entries(headers)) {
+      if (String(key).toLowerCase() !== name) continue
+      if (typeof value === 'string') return value
+      if (Array.isArray(value)) return value.filter((v) => typeof v === 'string').join(' ')
+      return value === undefined || value === null ? '' : String(value)
+    }
+  } catch { return '' }
+  return ''
+}
+
 /** 请求头里是否带 Desktop renderer 能力头(值不看内容:非空即证据)。 */
 function hasDesktopRendererHeader(headers) {
-  if (!headers || typeof headers !== 'object') return false
-  const present = (value) => {
-    if (typeof value === 'string') return value.length > 0
-    if (Array.isArray(value)) return value.length > 0
-    return Boolean(value)
+  return headerText(headers, DESKTOP_RENDERER_HEADER).length > 0
+}
+
+/** 请求 `user-agent` 是否含 Electron(页面自身属性;纯 Node 宿主也读得到)。 */
+export function isElectronRequest(headers) {
+  return DESKTOP_UA_RE.test(headerText(headers, 'user-agent'))
+}
+
+/** 某个 URL/字符串是否带桌面壳标记(`dsh-desktop-`)。 */
+export function hasDesktopUrlMark(url) {
+  return typeof url === 'string' && url.includes(DESKTOP_URL_MARK)
+}
+
+/**
+ * **页面标记在宿主侧真正看得见的通道 = `Referer`**(2026-09-19 实测指出):
+ * 我们客户端轮询打的是 `ROUTE_BASE + '/runningState'`(**无 query**),wire 通道更是传
+ * `undefined` ⇒ 第三条判据(请求 **URL** 含标记)对**生产请求**永远为假,"函数能过"不等于
+ * "生产可达"。而同源 `fetch` 默认 `strict-origin-when-cross-origin` 会在 `Referer` 里带上
+ * **完整页面 URL**(含 `?…&dsh-desktop-mode=…`)⇒ 那才是宿主侧真能读到页面标记的地方。
+ * 两条都保留:URL 判据对外部/直连调用仍有效,Referer 判据覆盖我们自己的轮询。
+ */
+export function refererOf(headers) {
+  return headerText(headers, 'referer') || headerText(headers, 'referrer')
+}
+
+/**
+ * 判定用的**入参快照**(探针要把它写进日志,故单独成型、可单测)。
+ * @returns {{header:boolean, electronUa:boolean, urlMark:boolean, desktopHost:boolean, ua:string}}
+ */
+export function surfaceEvidenceOf(headers, { desktopHost = false, url = '' } = {}) {
+  const ua = headerText(headers, 'user-agent')
+  return {
+    header: hasDesktopRendererHeader(headers),
+    electronUa: DESKTOP_UA_RE.test(ua),
+    urlMark: hasDesktopUrlMark(url),
+    refererMark: hasDesktopUrlMark(refererOf(headers)),
+    desktopHost: desktopHost === true,
+    // 只留前 160 字符:UA 可能很长,日志不该被它刷屏;够看清有没有 Electron 段。
+    ua: ua.length > 160 ? `${ua.slice(0, 160)}…` : ua,
   }
-  try {
-    // Node 的 req.headers 名字已小写;非 Node 形状(经序列化/代理)按大小写不敏感兜底。
-    for (const [name, value] of Object.entries(headers)) {
-      if (name.toLowerCase() === DESKTOP_RENDERER_HEADER && present(value)) return true
-    }
-  } catch { return false }
-  return false
 }
 
 /**
- * 从**请求头 + 宿主痕迹**判定承载面(纯函数,可单测)。
+ * 从**请求证据 + 宿主痕迹**判定承载面(纯函数,可单测)。
+ * 顺序即优先级:任一请求级证据成立 ⇒ 桌面页面(不武装);都没有才看宿主痕迹。
  * @param {object} [headers] Node `req.headers` 形状;拿不到请求对象时为 undefined。
- * @param {object} [opts] `{ desktopHost }` = desktopHostEvidence(ctx) 的结果。
+ * @param {object} [opts] `{ desktopHost, url }`;url = 该请求的 URL(path+query)。
  * @returns {'desktop-renderer'|'browser'|'unknown'}
  */
-export function pageSurfaceOf(headers, { desktopHost = false } = {}) {
+export function pageSurfaceOf(headers, { desktopHost = false, url = '' } = {}) {
   if (hasDesktopRendererHeader(headers)) return PAGE_SURFACE.DESKTOP_RENDERER
-  // 无能力头。能看出宿主是 Electron ⇒ 中性态(可能是旧版桌面壳没挂头,也可能是
+  if (isElectronRequest(headers)) return PAGE_SURFACE.DESKTOP_RENDERER
+  if (hasDesktopUrlMark(url)) return PAGE_SURFACE.DESKTOP_RENDERER
+  // 页面标记的生产通道(见 refererOf 注释):我们自己的轮询 URL 无 query,标记只在 Referer 里。
+  if (hasDesktopUrlMark(refererOf(headers))) return PAGE_SURFACE.DESKTOP_RENDERER
+  // 无任何请求级证据。能看出宿主是 Electron ⇒ 中性态(可能是旧版桌面壳没挂头,也可能是
   // 桌面版兼容模式下的普通浏览器页;两者分不开)⇒ 交给调用方按安全侧处理。
   if (desktopHost) return PAGE_SURFACE.UNKNOWN
   return PAGE_SURFACE.BROWSER
@@ -246,14 +333,83 @@ export function quitVetoFor(surface) {
 }
 
 /**
- * 给 runningState 载荷用的承载面描述。
+ * 判定 + 入参快照(权威入口;`guardSurfaceOf` 与探针都用它)。
+ * @returns {{surface:string, quitVeto:boolean|null, evidence:object}}
+ */
+export function surfaceDecisionOf(ctx, headers, url) {
+  const desktopHost = desktopHostEvidence(ctx)
+  const evidence = surfaceEvidenceOf(headers, { desktopHost, url })
+  const surface = pageSurfaceOf(headers, { desktopHost, url })
+  return { surface, quitVeto: quitVetoFor(surface), evidence }
+}
+
+// ── 承载面探针(2026-09-18 第二轮:让报告人一次跑完就定位判据)────────────────────
+let surfaceProbeLog = null
+const surfaceProbeSeen = new Map()
+
+/**
+ * 装上承载面探针。**按"入参组合"去重**:同一组合只打印第一次(客户端每 5s 轮询一次,
+ * 不去重会把日志刷爆)。
+ *
+ * 组合空间是**有界的**:判定只看四个布尔(能力头 / UA-Electron / URL 标记 / 宿主桌面
+ * 痕迹)⇒ 最多 16 种组合,故"不刷屏"是结构性的(组合空间有界),不需要额外的条数上限
+ * (那种写法会有死代码 / 写错风险)。
+ * @param {(line:string)=>void} log 宿主日志函数(`ctx.logger.info` 那一层)。
+ */
+export function installSurfaceProbe(log) {
+  surfaceProbeLog = typeof log === 'function' ? log : null
+  surfaceProbeSeen.clear()
+  if (surfaceProbeLog) {
+    surfaceProbeLog(
+      'retrace-close-guard: 承载面探针已启用(按入参组合去重,组合最多 16 种)。判据 = ①能力头 ' +
+      `${DESKTOP_RENDERER_HEADER} ②请求 UA 含 Electron ③请求 URL **或 Referer** 含 ${DESKTOP_URL_MARK}` +
+      '(页面标记在宿主侧真正可见的通道是 Referer —— 我们自己的轮询 URL 无 query) ④宿主桌面痕迹(→unknown)。' +
+      '任一请求级判据成立 ⇒ surface=desktop-renderer / quitVeto=false(客户端不武装原生门)。',
+    )
+  }
+}
+
+/** 卸下探针(dispose/测试用)。 */
+export function uninstallSurfaceProbe() {
+  surfaceProbeLog = null
+  surfaceProbeSeen.clear()
+}
+
+/** 探针状态(测试用:证明"同组合只一次")。 */
+export function surfaceProbeState() {
+  return { installed: surfaceProbeLog !== null, combos: surfaceProbeSeen.size }
+}
+
+/** 按组合去重地把一次判定写进宿主日志。 */
+function reportSurfaceDecision({ surface, quitVeto, evidence }) {
+  if (!surfaceProbeLog) return
+  const key = [
+    surface, quitVeto === null ? 'null' : String(quitVeto),
+    evidence.header ? 'H' : '-', evidence.electronUa ? 'U' : '-',
+    evidence.urlMark ? 'R' : '-', evidence.refererMark ? 'F' : '-', evidence.desktopHost ? 'D' : '-',
+  ].join('|')
+  const times = surfaceProbeSeen.get(key) ?? 0
+  surfaceProbeSeen.set(key, times + 1)
+  if (times > 0) return
+  const yn = (value) => (value ? '有' : '无')
+  surfaceProbeLog(
+    `retrace-close-guard: 承载面判定 surface=${surface} quitVeto=${quitVeto === null ? 'null' : quitVeto} ｜ 入参 ` +
+    `能力头=${yn(evidence.header)} 请求UA-Electron=${yn(evidence.electronUa)} URL标记=${yn(evidence.urlMark)} ` +
+    `Referer标记=${yn(evidence.refererMark)} 宿主桌面痕迹=${yn(evidence.desktopHost)} ｜ UA="${evidence.ua}"`,
+  )
+}
+
+/**
+ * 给 runningState 载荷用的承载面描述(宿主面**唯一的**判定入口)。
  * @param {object} ctx - cordis ctx(用于看宿主痕迹)。
  * @param {object} [headers] - 发起该请求的 `req.headers`;wire/harness 通道传 undefined。
+ * @param {string} [url] - 发起该请求的 URL(path+query);wire/harness 通道传 undefined。
  * @returns {{ surface:string, quitVeto:boolean|null }}
  */
-export function guardSurfaceOf(ctx, headers) {
-  const surface = pageSurfaceOf(headers, { desktopHost: desktopHostEvidence(ctx) })
-  return { surface, quitVeto: quitVetoFor(surface) }
+export function guardSurfaceOf(ctx, headers, url) {
+  const decision = surfaceDecisionOf(ctx, headers, url)
+  reportSurfaceDecision(decision)
+  return { surface: decision.surface, quitVeto: decision.quitVeto }
 }
 
 /**

package/lib/dynamic-client.js

@@ -267,6 +267,29 @@ return {
       function quitVetoOf(snapshot) {
         return snapshot?.quitVeto === true;
       }
+      var CLIENT_DESKTOP_URL_MARK = "dsh-desktop-";
+      var CLIENT_DESKTOP_UA_RE = /electron/i;
+      function clientDesktopEvidence(page = pageEnvironment()) {
+        const ua = typeof page?.userAgent === "string" ? page.userAgent : "";
+        const url = typeof page?.href === "string" ? page.href : "";
+        const electronUa = CLIENT_DESKTOP_UA_RE.test(ua);
+        const urlMark = url.includes(CLIENT_DESKTOP_URL_MARK);
+        return { electronUa, urlMark, desktop: electronUa || urlMark };
+      }
+      function pageEnvironment() {
+        const g = globalThis;
+        const ua = g?.navigator?.userAgent;
+        const href = g?.location?.href;
+        return {
+          userAgent: typeof ua === "string" ? ua : "",
+          href: typeof href === "string" ? href : ""
+        };
+      }
+      function shouldArmNativeGate(snapshot, page = pageEnvironment()) {
+        if (snapshot?.surface === "desktop-renderer") return false;
+        if (!quitVetoOf(snapshot)) return false;
+        return !clientDesktopEvidence(page).desktop;
+      }
       function createGuardStore({ now = Date.now, armTtlMs = GUARD_ARM_TTL_MS } = {}) {
         let snapshot = null;
         let armedAt = 0;
@@ -478,7 +501,7 @@ return {
         "path.round": "\u7B2C {n} \u8F6E",
         "path.empty": "\uFF08\u5F53\u524D\u6CA1\u6709\u5BF9\u8BDD\u8F6E\u6B21\uFF09",
         "options.closeGuard": "\u9000\u51FA\u786E\u8BA4\uFF08\u5173\u95ED\u5B88\u536B\uFF09",
-        "options.closeGuardDesc": "\u5F00\uFF08\u9ED8\u8BA4\uFF09\uFF1A\u9875\u9762\u5173\u95ED\u524D\u786E\u8BA4\u9000\u51FA\u2014\u2014\u6709\u8FD0\u884C\u4E2D\u4EFB\u52A1\u6216\u672A\u5B8C\u6210\u5BF9\u8BDD\u65F6\u5F3A\u62E6\u5E76\u5217\u51FA\u660E\u7EC6\uFF08\u9632\u8BEF\u5173\u4E22\u8FDB\u5EA6\uFF09\uFF0C\u65E0\u4EFB\u52A1\u65F6\u8F7B\u786E\u8BA4\u4E00\u6B21\u3002\u53EA\u5728\u5BBF\u4E3B\u786E\u8BA4\u4F1A\u663E\u793A\u539F\u751F\u786E\u8BA4\u6846\u7684\u9875\u9762\u4E0A\u6B66\u88C5\uFF08\u666E\u901A\u6D4F\u89C8\u5668\u6807\u7B7E\u9875\uFF1B\u5173\u6389\u672C\u9879\u540C\u65F6\u505C\u7528\u8FD0\u884C\u4E2D\u6A2A\u5E45\uFF09\u3002\u684C\u9762\u7AEF\uFF08DSH Desktop\uFF09\u4E00\u5F8B\u4E0D\u6B66\u88C5\uFF1A\u9000\u51FA\u5165\u53E3\u968F\u7248\u672C/\u5E73\u53F0\u800C\u53D8\u2014\u2014\u5916\u90E8\u62A5\u544A\u7684 0.9.0 \u4E00\u7C7B\u5165\u53E3\u4F1A\u89E6\u53D1\u9875\u9762 beforeunload\uFF0C\u800C\u684C\u9762\u58F3\u672A\u5904\u7406 will-prevent-unload \u21D2 \u5426\u51B3\u88AB\u9759\u9ED8\u541E\u6389\u3001\u9000\u51FA\u5361\u4F4F\uFF1B2.0.9 \u7684\u6258\u76D8\u9879\u8D70 requestQuit\u2192window.destroy\u2192app.exit\uFF0C\u6839\u672C\u4E0D\u7ECF\u8FC7\u5B83\u3002\u9875\u9762\u91CC\u5206\u4E0D\u51FA\u662F\u54EA\u4E00\u7C7B\uFF0C\u6545\u684C\u9762\u4FDD\u62A4\u7531\u8FD0\u884C\u4E2D\u6A2A\u5E45\u627F\u62C5\u3002"
+        "options.closeGuardDesc": "\u5F00\uFF08\u9ED8\u8BA4\uFF09\uFF1A\u9875\u9762\u5173\u95ED\u524D\u786E\u8BA4\u9000\u51FA\u2014\u2014\u6709\u8FD0\u884C\u4E2D\u4EFB\u52A1\u6216\u672A\u5B8C\u6210\u5BF9\u8BDD\u65F6\u5F3A\u62E6\u5E76\u5217\u51FA\u660E\u7EC6\uFF08\u9632\u8BEF\u5173\u4E22\u8FDB\u5EA6\uFF09\uFF0C\u65E0\u4EFB\u52A1\u65F6\u8F7B\u786E\u8BA4\u4E00\u6B21\u3002\u53EA\u5728\u5BBF\u4E3B\u786E\u8BA4\u4F1A\u663E\u793A\u539F\u751F\u786E\u8BA4\u6846\u7684\u9875\u9762\u4E0A\u6B66\u88C5\uFF08\u666E\u901A\u6D4F\u89C8\u5668\u6807\u7B7E\u9875\uFF1B\u5173\u6389\u672C\u9879\u540C\u65F6\u505C\u7528\u8FD0\u884C\u4E2D\u6A2A\u5E45\uFF09\u3002\u684C\u9762\u7AEF\uFF08DSH Desktop\uFF09\u4E00\u5F8B\u4E0D\u6B66\u88C5\uFF1A\u9000\u51FA\u5165\u53E3\u968F\u7248\u672C/\u5E73\u53F0\u800C\u53D8\u2014\u2014\u5916\u90E8\u62A5\u544A\u7684 0.9.0 \u4E00\u7C7B\u5165\u53E3\u4F1A\u89E6\u53D1\u9875\u9762 beforeunload\uFF0C\u800C\u684C\u9762\u58F3\u672A\u5904\u7406 will-prevent-unload \u21D2 \u5426\u51B3\u88AB\u9759\u9ED8\u541E\u6389\u3001\u9000\u51FA\u5361\u4F4F\uFF1B2.0.9 \u7684\u6258\u76D8\u9879\u8D70 requestQuit\u2192window.destroy\u2192app.exit\uFF0C\u6839\u672C\u4E0D\u7ECF\u8FC7\u5B83\u3002\u5224\u636E\u662F\u4E24\u9053\uFF1A\u5BBF\u4E3B\u8BF4\u4F1A\u5F39\u539F\u751F\u6846\uFF08quitVeto\uFF09\uFF0C\u4E14\u672C\u9875\u81EA\u5DF1\u770B\u4E0D\u51FA\u684C\u9762\u75D5\u8FF9\uFF08UA \u65E0 Electron\u3001URL \u65E0 dsh-desktop-\uFF09\u2014\u2014\u4EFB\u4E00\u6761\u4E0D\u6210\u7ACB\u5C31\u4E0D\u6B66\u88C5\uFF1B\u56E0\u6B64\u9875\u9762\u91CC\u5206\u4E0D\u51FA\u662F\u54EA\u4E00\u7C7B\u58F3\u4E5F\u6CA1\u5173\u7CFB\uFF0C\u684C\u9762\u4FDD\u62A4\u7531\u8FD0\u884C\u4E2D\u6A2A\u5E45\u627F\u62C5\u3002\u684C\u9762\u7AEF\u9000\u4E0D\u6389\u65F6\u5148\u5173\u8FD9\u4E00\u9879\uFF08\u7ACB\u5373\u6062\u590D\uFF0C\u4E0D\u7528\u91CD\u542F\uFF09\u3002"
       };
       var en = {
         "action.edit": "Edit",
@@ -625,7 +648,7 @@ return {
         "path.round": "Round {n}",
         "path.empty": "(no conversation rounds yet)",
         "options.closeGuard": "Exit confirmation (close guard)",
-        "options.closeGuardDesc": "On (default): confirm before the page closes \u2014 when sessions have running or unfinished work a strong guard lists them (prevents accidental progress loss); otherwise a light one-time confirm. Armed only where the host reports a native confirm dialog (ordinary browser tabs; turning this off also disables the running banner). Desktop (DSH Desktop) never arms it: quit entries differ by version/platform \u2014 the 0.9.0-class entry in the external report does reach page beforeunload, and the shell has no will-prevent-unload handler, so the veto is swallowed silently and the exit hangs; the 2.0.9 tray item goes requestQuit\u2192window.destroy\u2192app.exit and never reaches it. The page cannot tell which one it is, so the running banner carries that protection instead."
+        "options.closeGuardDesc": "On (default): confirm before the page closes \u2014 when sessions have running or unfinished work a strong guard lists them (prevents accidental progress loss); otherwise a light one-time confirm. Armed only where the host reports a native confirm dialog (ordinary browser tabs; turning this off also disables the running banner). Desktop (DSH Desktop) never arms it: quit entries differ by version/platform \u2014 the 0.9.0-class entry in the external report does reach page beforeunload, and the shell has no will-prevent-unload handler, so the veto is swallowed silently and the exit hangs; the 2.0.9 tray item goes requestQuit\u2192window.destroy\u2192app.exit and never reaches it. Two criteria must both hold: the host says a native dialog appears (quitVeto) AND this page shows no desktop evidence itself (no Electron in the UA, no dsh-desktop- in the URL); if either fails it stays unarmed, so it does not matter that the page cannot tell which shell it is \u2014 the running banner carries that protection instead. If Desktop cannot quit, turn this off first (recovers immediately, no restart)."
       };
       function opFailureText(code, message, t) {
         if (code === "agent-busy") return t("error.busy");
@@ -2896,7 +2919,7 @@ return {
           if (store.isArmed()) return;
           const kind = classifySnapshot(store.get());
           if (kind === "unknown") return;
-          if (!quitVetoOf(store.get())) return;
+          if (!shouldArmNativeGate(store.get())) return;
           try {
             event.preventDefault?.();
           } catch {

package/lib/http.js

@@ -297,7 +297,9 @@ export function createRetraceHttpHandler(ctx, { sessions, agents, seam, rollback
    * runningSessions(ctx) 全会话运行中清单(agent/queued/jobs/未闭合轮)。
    * 无 sessionId → { running: [...] };有 → 单会话 runningState。
    * 全会话形状另带 { surface, quitVeto }(承载面,见文件头):**这一段是宿主侧唯一的
-   * 承载面证据来源** —— 请求头带 Desktop renderer 能力头就是 Electron 页面。
+   * 承载面证据来源** —— 请求级四条判据(能力头 / 请求 UA 含 Electron / 请求 URL **或 Referer** 含
+   * `dsh-desktop-`)+ 宿主桌面痕迹;任一请求级判据成立 ⇒ 桌面页面(客户端不武装原生门)。
+   * 注:我们自己的轮询 URL 无 query ⇒ 页面标记实际是从 **Referer** 读到的(见 close-guard.js refererOf)。
    * 纯读,无副作用(守卫只检测+确认,绝不中断/写事件)。
    */
   function handleRunningState(req, res, hostCtx, sessions, agents, searchParams) {
@@ -308,7 +310,10 @@ export function createRetraceHttpHandler(ctx, { sessions, agents, seam, rollback
       const sessionId = searchParams.get('sessionId') ?? ''
       const value = sessionId
         ? sessionRunningState(guardCtx, sessionId)
-        : { running: runningSessions(guardCtx), ...guardSurfaceOf(hostCtx, req?.headers) }
+        // url 一并传 + 宿主自己读 Referer:报告人那套壳把桌面标记放在查询参数里
+        // (`?…&dsh-desktop-mode=…`),而**我们自己的轮询 URL 没有 query** ⇒ 标记只在 Referer 里
+        // (见 close-guard.js refererOf / pageSurfaceOf)。
+        : { running: runningSessions(guardCtx), ...guardSurfaceOf(hostCtx, req?.headers, req?.url) }
       sendJson(res, 200, { ok: true, value })
     } catch (error) {
       sendError(res, error, log)
@@ -512,7 +517,7 @@ export function createRetraceHttpHandler(ctx, { sessions, agents, seam, rollback
         const sid = String(args?.sessionId ?? '')
         return sid
           ? sessionRunningState(guardCtx, sid)
-          : { running: runningSessions(guardCtx), ...guardSurfaceOf(ctx, req?.headers) }
+          : { running: runningSessions(guardCtx), ...guardSurfaceOf(ctx, req?.headers, req?.url) }
       })
     }
     // 客户端半自报（2026-09-14 事故 2 的可见性补丁）：证明"客户端半装载了 + 注册了

package/lib/index.js

@@ -28,7 +28,10 @@ import { createMarkerGuard } from './prewrite-guard.js'
 import { createWatchdog } from './watchdog.js'
 import { createBootPinRetry } from './boot-pin.js'
 import { attachExitWarning } from './interrupt-guard.js'
-import { attachCloseGuard, runningSessions, sessionRunningState, guardSurfaceOf } from './close-guard.js'
+import {
+  attachCloseGuard, runningSessions, sessionRunningState, guardSurfaceOf,
+  installSurfaceProbe, uninstallSurfaceProbe,
+} from './close-guard.js'
 import { sessionBadge as fnvBadge } from './badge.js'
 import { dshAdapter, semanticBadgeOf } from './adapter/dsh.js'
 // span 显式状态结果 → 业务层判定输入的统一下传(单一真相模块)
@@ -404,9 +407,10 @@ export function apply(ctx) {
             return { ok: true, value: sessionRunningState(ctx, sid) }
           }
           // 负载形状与 HTTP 面同构(含宿主承载面)。wire 通道拿不到请求对象 ⇒
-          // guardSurfaceOf(ctx, undefined) 只能靠宿主痕迹判:桌面宿主 → unknown
-          // (客户端不武装原生门,安全侧),web 宿主 → browser。
-          return { ok: true, value: { running: runningSessions(ctx), ...guardSurfaceOf(ctx, undefined) } }
+          // guardSurfaceOf(ctx, undefined, undefined) 只能靠宿主痕迹判:桌面宿主 →
+          // unknown(客户端不武装原生门,安全侧),web 宿主 → browser。**客户端那边
+          // 还有一票否决**(UA/URL),所以这条通道判错也不会把桌面端卡死。
+          return { ok: true, value: { running: runningSessions(ctx), ...guardSurfaceOf(ctx, undefined, undefined) } }
         } catch (error) {
           return { ok: false, error: { code: 'internal', message: String(error) } }
         }
@@ -427,11 +431,18 @@ export function apply(ctx) {
   // host 无关闭前弹窗 seam → 替代路径 = dispose 强提示 + runningState handler(client 可查)。
   const guardClose = attachCloseGuard(ctx, log)
 
+  // 承载面探针(2026-09-18 第二轮,issue #1):把每次判定的**入参(能力头 / 请求 UA /
+  // 请求 URL 标记 / 宿主桌面痕迹)与结果(surface/quitVeto)**按组合去重写进宿主日志。
+  // 用途:报告人跑一次就能确认是哪条判据生效(不必再互相猜是哪一层判反了)。
+  // 只打日志,不改任何判定。
+  installSurfaceProbe(log)
+
   ctx.effect(() => () => {
     disposeRoute()
     disposeHarness()
     watchdog.dispose()
     warnUnclosed()
     guardClose()
+    uninstallSurfaceProbe()
   }, 'dsh-retrace: transports')
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-retrace",
   "description": "Retrace · 回溯 — Recall, edit-and-resend, regenerate, and conversation/artifact versioning (timeline, rollback, fork map) for DeepSeek Harness — Web and Desktop",
-  "version": "0.4.29",
+  "version": "0.4.30",
   "packageManager": "pnpm@11.7.0",
   "type": "module",
   "main": "lib/index.js",