dsh-code-server-app 0.3.22 → 0.3.24

package/README.en.md

@@ -209,21 +209,32 @@ only the editor knows, and lets editor gestures drive the current session.
 
 - The tools are only registered while the bridge is live (so the model never sees an unusable tool), and the
   system-prompt section renders only then too.
-- **Ask panel** (extension 0.2.0; since 0.2.3 the body goes through the official renderer): the context-menu command
-  no longer pops a one-line input box but opens a panel — that session's **new content** on top, input at the bottom.
-  The selection is captured **at send time** (so you can change it while the panel stays open).
+- **Ask panel** (extension 0.2.0; the official renderer since 0.2.3; a **floating dialog over the DSH UI since
+  0.2.5**): the context-menu command no longer opens a panel inside the editor (that is always a tab or a column,
+  never a dialog) — the plugin's client half pops up a draggable, resizable floating chat window in the DSH page
+  itself (bottom-right, ✕ closes it), leaving the editor layout alone. Hosts without that capability fall back to
+  the in-editor webview panel. The selection can still be changed while the dialog stays open.
   The two commands **remember their intent** (0.3.21): "ask about selection" carries a **line range + selection text**
   only when something is actually selected, while "ask about file" **never carries line numbers or a selection** — the
   cursor line is irrelevant to the question and only misleads the agent. With no selection, the selection command also
   degrades to the plain file.
+- **Injected context is collapsed** (0.3.24): the location line plus the selection code block the bridge adds to the
+  message are split out into a collapsed Context row (click it to see the code), while the bubble keeps only the user's
+  own words — the same treatment the DSH UI gives injected context.
 - **The panel renders exactly what DSH renders** (0.3.22): the panel bundles DSH's official Markdown renderer
   (`MarkdownText` from `@deepseek-ai/dsh-client-ui-primitives`) plus the official design tokens — the same
   micromark/mdast pipeline, the same incremental streaming parser, the same shiki highlighting (boot set:
   typescript / shellscript / json), KaTeX math and the same heading/table typography. Only **new content** is
   rendered (from the moment the panel subscribes); history is **not replayed** and there is no "load earlier".
-- **Approvals are handled right in the panel** (0.3.22): while the panel is open, that session's approval requests
-  ask the panel first (8 s by default). Clicking "allow once" / "reject" settles it immediately; if nobody answers,
-  the request is handed back **unchanged** to the official path (the DSH UI shows the same card).
+- **Thinking shows up like in DSH** (0.3.23): assistant reasoning becomes a Think row — **collapsed by default**,
+  showing its first line (or the latest line while streaming) and expanding on a row click, built from the official
+  `DisclosureRow` plus the official think icon and typography language.
+- **Approvals are handled right in the panel** (0.3.22; window fixed in 0.3.23): while the panel is open, that
+  session's approval requests ask the panel first (5 minutes by default). Clicking "allow once" / "reject" settles it
+  immediately; **closing the panel** or letting the window expire hands the request back **unchanged** to the official
+  path (the DSH UI shows the same card). 0.3.22's 8-second window was far too short for a human — the buttons went
+  grey before anyone could click (reported as "the approval box stopped working"); the window is now 5 minutes and
+  closing the panel hands off immediately instead of waiting it out.
   **Nothing is ever auto-approved** — `allowed-once` can only come from a click, and there is no "always allow".
 - The question enters the DSH session as a **plain user message** (`source: { kind: 'user' }`, host 0.3.19): earlier
   versions used `{kind:'plugin'}`, which DSH renders as a *context update* — it did not look like something the user
@@ -263,7 +274,7 @@ The three `/sync` fields the panel actually consumes (0.3.22):
 |---|---|---|
 | `thread` | **new content** entries (user / assistant / tool / approval) of the session the panel watches; bounded: ≤120 entries per session, ≤8000 chars per body, ≤4 watched sessions | assistant bodies go to the official renderer; tools and approvals become compact summary rows |
 | `approvals` | pending approval requests `[{id, toolName, reason, at}]` (≤4) | renders the card with a countdown; a click posts `/approve` |
-| `approvalHoldMs` / `uiVersion` | the approval window (8000 ms by default) / the DSH UI version | countdown basis; a renderer-version mismatch is surfaced in the panel |
+| `approvalHoldMs` / `uiVersion` | the approval window (300000 ms = 5 minutes by default) / the DSH UI version | countdown basis; a renderer-version mismatch is surfaced in the panel |
 
 > **Why not HTTP (settled in 0.3.13, all three measured)**
 > 1. **Desktop has no HTTP surface at all**: the renderer calls `host.fetch()` through Electron IPC
@@ -304,7 +315,8 @@ user**, so:
    **no free text, paths, or command arguments**, so it can answer questions but never start an action;
    (b) `id` must belong to a request this process created and that is **still pending** (single use);
    (c) `outcome` accepts only `allowed-once` / `rejected` — there is **no "always allow"**;
-   (d) when no panel is watching, or the window (8 s by default) expires, the request goes **back to the official
+   (d) when no panel is watching, the panel is closed, or the window (5 minutes by default) expires, the request goes
+   **back to the official
    path** — never auto-approved (DSH's `approval/request` itself fails closed; this bridge can only keep
    "nobody answered" as "nobody answered"). `pnpm test:webview` asserts these four plus the host-side whitelist.
 3. **Any request carrying `Origin` gets 403.** Browsers always send one (including a sandboxed iframe's literal
@@ -760,9 +772,10 @@ What remains on the plugin side:
 - **Panel assets are pinned to the DSH version**: the renderer is bundled against the UI version of the deployed
   DSH, so after upgrading DSH you must rebuild the panel (`pnpm run build:webview`; the build fails loudly on a
   version mismatch). The panel also shows a mismatch notice at runtime instead of silently using the wrong renderer.
-- **The approval window in the panel is 8 seconds**: while the panel is open, approvals ask the panel first and are
-  handed back to the DSH UI after 8 s — once handed back, that request can **only** be answered in the DSH UI (the
-  panel card says "handed to the DSH UI").
+- **The approval window in the panel is 5 minutes**: while the panel is open, approvals ask the panel first (the card
+  shows a countdown); **closing the panel** or letting the 5 minutes run out hands the request back to the DSH UI —
+  after that, that request can **only** be answered there (the card disappears from the panel and the thread keeps an
+  audit row).
 - **Unsaved buffers are reported, not taken over.** The agent still edits via its own `fs` tools, i.e. against
   disk. What the bridge adds is a notice *before* writing a dirty file, a diff *after*, and a warning instead of
   an overwrite. It does not decide whether the user saves — that would mean changing the agent's read path,

package/README.md

@@ -203,17 +203,25 @@ DSH 用**资源地址**命名文件,`openFile` 只负责把地址交给右侧栏
 | agent → 编辑器 | agent 改了哪个文件 → 开**原生 diff** 审阅;缓冲区有未保存改动时**告警而不覆盖** | host 观察 `tools/result`,扩展轮询后开 diff + 非模态告警 |
 
 - 工具只在桥就绪时注册(IDE 没起来时模型看不到"有个用不了的工具");提示词段落也只在桥存活时渲染。
-- **提问面板**(扩展 0.2.0 起;0.2.3 起正文走官方渲染器):右键命令不再弹一行输入框,而是一个面板 ——
-  上面是该会话的**新内容**、下面是输入框;发送时**现取当前选区**(可以在面板开着的同时改选区再问)。
+- **提问面板**(扩展 0.2.0 起;0.2.3 起正文走官方渲染器;0.2.5 起是**浮在 DSH 界面上的对话框**):
+  右键命令不再开编辑器里的面板(那是编辑器的一个 tab/一列,怎么开都不像对话框),而是让 DSH 页面里的
+  插件客户端弹出一个**可拖动、可缩放的浮动对话窗**(右下角,✕ 关闭),不占编辑器版面;
+  面板开着的**同时**还能改选区再问。老宿主(探测不到对话框能力)才退回编辑器里的 webview 面板。
   两个命令的**意图分开记**(0.3.21):「针对选中内容提问」只有真的选了内容才带**行区间 + 选区正文**;
   「针对当前文件提问」**永远不带行号、不带选区** —— 光标停在哪一行跟问题无关,行号只会误导 agent;
   没选区时用选中命令提问也会退化成纯文件。
+- **注入的上下文是折叠的**(0.3.24):桥拼进消息的位置行 + 选区代码块会被拆出来,显示成一行默认收起的
+  「上下文」(点开才看得到那段代码),气泡里只留你的原话 —— 与 DSH 界面处理注入上下文的方式一致。
 - **面板里的正文就是 DSH 的渲染结果**(0.3.22):面板打包了 DSH 官方的 markdown 渲染器
   (`@deepseek-ai/dsh-client-ui-primitives` 的 `MarkdownText`)与官方设计令牌 —— 同一套 micromark/mdast 管线、
   同一个增量流式解析器、同一个 shiki 高亮(启动集 typescript / shellscript / json)、KaTeX 公式、同样的标题与表格排版。
   只渲染**新内容**(从面板订阅那一刻起),**不重放历史**、没有"加载更早"。
-- **授权就在面板里处理**(0.3.22):面板打开着的时候,该会话的授权请求**先问面板**(默认 8 秒),
-  点「允许一次」/「拒绝」立刻生效;没人答就把请求**原样交回官方链路**(DSH 界面照旧弹卡)。
+- **思考过程也照官方显示**(0.3.23):助手的 reasoning 以「思考」行出现 —— **默认收起**、收起时显示首行
+  (流式时显示最新一行)、点整行展开全文,用的就是官方 `DisclosureRow` + 官方的思考图标与排版语言。
+- **授权就在面板里处理**(0.3.22;0.3.23 修好窗口):面板打开着的时候,该会话的授权请求**先问面板**(默认 5 分钟),
+  点「允许一次」/「拒绝」立刻生效;**关掉面板**或等满窗口就把请求**原样交回官方链路**(DSH 界面照旧弹卡)。
+  0.3.22 的 8 秒窗口对人来说太短 —— 卡片还没读完按钮就灰了(实测反馈「授权框失效了」),现在窗口是 5 分钟,
+  而且面板一关就立刻交回、不干等。
   **永不自动放行** —— `allowed-once` 只能来自你的一次点击,面板里没有"以后都允许"这种入口。
 - 提问进 DSH 会话时是**普通用户消息**(`source: { kind: 'user' }`,host 0.3.19 修正):早期版本用
   `{kind:'plugin'}` 会被 DSH 渲染成"上下文更新",看起来不像自己说的话;来源信息靠正文首行
@@ -251,7 +259,7 @@ host  → 扩展    <extensionsDir>/.dshcs-bridge/bridge.json  端点 + 令牌(
 |---|---|---|
 | `thread` | 被面板 `watch` 的会话的**新内容**条目(user / assistant / tool / approval),有界:每会话 ≤120 条、单条正文 ≤8000 字符、同时 watch ≤4 个会话 | 助手正文交给官方渲染器;工具与授权是紧凑摘要行 |
 | `approvals` | 待决授权请求 `[{id, toolName, reason, at}]`(≤4 条) | 弹卡片 + 倒计时;点按后 `POST /approve` |
-| `approvalHoldMs` / `uiVersion` | 授权窗口长度(默认 8000ms)/ DSH 界面版本 | 倒计时基准;渲染器版本不一致时提示 |
+| `approvalHoldMs` / `uiVersion` | 授权窗口长度(默认 300000ms = 5 分钟)/ DSH 界面版本 | 倒计时基准;渲染器版本不一致时提示 |
 
 > **为什么不是 HTTP(0.3.13 定论,三条都实测过)**
 > 1. **desktop 根本没有 HTTP 面**:渲染进程经 Electron IPC 调 `host.fetch()`
@@ -286,7 +294,7 @@ host 反向请求不到它。所以编辑器状态只能在扩展主动发起的
    (a) 只能**回答**已经存在的授权请求,请求体只有 `{id, outcome}`,**不接受任何自由文本 / 路径 / 命令参数**
    —— 它只能"回答问题",不能"发起动作";(b) `id` 必须是本进程自己发起、且**仍未决**的请求(用后即废);
    (c) `outcome` 只接受 `allowed-once` / `rejected`,**没有"永久允许"**;
-   (d) 没有面板在看 / 窗口超时(默认 8s)→ **交回官方链路**,绝不自动放行
+   (d) 没有面板在看 / 面板关掉 / 窗口超时(默认 5 分钟)→ **交回官方链路**,绝不自动放行
    (DSH 的 `approval/request` 本身 fail closed,这里只能把"没人答"保持成"没人答")。
    `pnpm test:webview-bundle` 里有针对这四条与宿主侧白名单的断言。
 3. **带 `Origin` 的请求一律 403。** 浏览器发起必带 Origin(含沙箱 iframe 的 `Origin: null`),
@@ -732,8 +740,8 @@ desktop profile 由 `apps/desktop-host` 把 `/api/*` 交给同一个 `createShar
 - **面板产物与 DSH 版本绑定**:渲染器按构建时 DSH 部署的界面版本打包,DSH 升级后**要重打面板**
   (`pnpm run build:webview`;构建脚本会在版本不一致时直接报错)。运行期面板顶部也会提示版本不一致,
   不会悄悄用错版本的渲染器。
-- **面板里的授权窗口是 8 秒**:面板打开着的时候授权先问面板,8 秒没人答就交回 DSH 界面
-  —— 交回之后这一条**只能**在 DSH 界面里处理(面板上的卡片会显示"已交给 DSH 界面")。
+- **面板里的授权窗口是 5 分钟**:面板打开着的时候授权先问面板(卡片上有倒计时);**关掉面板**或等满 5 分钟
+  就交回 DSH 界面 —— 交回之后这一条**只能**在 DSH 界面里处理(卡片从面板消失,对话流里留一行授权审计)。
 
 - ~~子路径不支持~~ **已不成立(0.2.0 实测更正)**:VS Code 渲染出的 workbench HTML 里
   **资源引用全是相对路径**(实测 9 条引用中绝对路径 0 条,`serverBasePath="."`、`rootEndpoint="."`),

package/assets/extensions/dshcs-editor-bridge/extension.js

@@ -58,6 +58,8 @@ let pollTimer = null;
 let lastPollAt = 0;
 /** 「问 DSH」面板:null = 没开。`{panel, state, mode}`(状态模型见 lib/ask-panel.js)。 */
 let askPanel = null;
+/** 宿主是否支持 DSH 页面里的悬浮对话框(0.2.5;/sync 的 askDialog 字段)。 */
+let askDialogSupported = false;
 /** 扩展根目录(activate 时记下;面板要按它取 webview 产物 URI)。 */
 let extensionRoot = null;
 /** 是否已经确认过 host 端点可达(避免把"IDE 刚起、扩展先加载"误判为断线)。 */
@@ -388,6 +390,11 @@ async function pollOnce() {
     await handleEvent(event);
   }
   if ((result.events ?? []).length > 0) client.persist();
+  // 能力探测:宿主支持悬浮对话框(0.3.24)⇒ 右键提问不再开编辑器面板。
+  if (result.askDialog === true && !askDialogSupported) {
+    askDialogSupported = true;
+    log('宿主支持 DSH 页面里的对话对话框:右键提问将浮在 DSH 界面上(不再开编辑器面板)');
+  }
   // 对话流 + 授权待决:host 每趟把被观看会话的**新内容**与待决授权一起回来
   // (见 host 侧 lib/bridge-thread.mjs / lib/bridge-approval.mjs),面板有变化才重画。
   if (askPanel !== null && applySync(askPanel.state, result)) refreshAskPanel();
@@ -539,8 +546,10 @@ function openAskPanel(mode = 'selection') {
     }
     const panel = vscode.window.createWebviewPanel(
       'dshAsk',
-      'DSH 提问',
-      { viewColumn: vscode.ViewColumn.Beside, preserveFocus: false },
+      'DSH 对话',
+      // 对话框形状(0.2.4):开在**当前编辑器组**,占满工作台宽度 —— 不再用 `Beside` 挤成一条侧栏。
+      // 面板内容自己居中限宽,看起来就是编辑器上的一扇对话窗;右上角的 ✕ 关掉它。
+      { viewColumn: vscode.ViewColumn.Active, preserveFocus: false },
       {
         enableScripts: true,
         retainContextWhenHidden: true,
@@ -568,6 +577,11 @@ function openAskPanel(mode = 'selection') {
       }
       if (message.type === 'approve' && typeof message.id === 'string') {
         void decideApproval(message.id, message.outcome);
+        return;
+      }
+      if (message.type === 'close') {
+        // 面板上的 ✕:关掉它(= 不再看这个会话 ⇒ 待决授权立刻交回 DSH 界面,不用干等窗口)。
+        panel.dispose();
       }
     });
     panel.onDidDispose(() => {
@@ -576,7 +590,8 @@ function openAskPanel(mode = 'selection') {
   }
   askPanel.state.context = contextInfo;
   askPanel.mode = mode;
-  askPanel.panel.reveal(vscode.ViewColumn.Beside, false);
+  // 已经开着就提到前面(对话框不重复开)。
+  askPanel.panel.reveal(vscode.ViewColumn.Active, false);
   refreshAskPanel();
 }
 
@@ -600,6 +615,20 @@ async function openAskPanelFor(mode) {
     vscode.window.showInformationMessage('没有活动的编辑器:请先打开一个文件。');
     return;
   }
+  // 0.2.5 起优先用 **DSH 页面里的悬浮对话框**(用户要的"对话框形式":浮在 DSH 界面上,不占编辑器版面)。
+  // 宿主能力由 /sync 的 askDialog 字段探测;老宿主(探测不到)才退回编辑器里的 webview 面板。
+  if (askDialogSupported) {
+    try {
+      const result = await client.askOpen(mode);
+      if (result !== null && result.ok === true) {
+        log(`已请宿主打开对话对话框(mode=${mode}${typeof result.contextText === 'string' ? `,${result.contextText}` : ''})`);
+        return;
+      }
+      log(`宿主没有打开对话框(${result !== null && result.error ? result.error : '未知原因'})→ 退回编辑器面板`);
+    } catch (error) {
+      log(`ask-open 失败(${error && error.message ? error.message : error}) → 退回编辑器面板`);
+    }
+  }
   openAskPanel(mode);
 }
 

package/assets/extensions/dshcs-editor-bridge/lib/ask-panel.js

@@ -74,6 +74,10 @@ function cleanEntry(raw) {
   return {
     role,
     text,
+    // 思考过程(0.3.23):渲染成默认收起的「思考」行。
+    thinking: typeof raw.thinking === 'string' ? raw.thinking.slice(0, MAX_TEXT) : '',
+    // 注入的上下文(0.3.24):桥自己拼的位置行 + 选区代码块,渲染成默认收起的「上下文」行。
+    context: typeof raw.context === 'string' ? raw.context.slice(0, MAX_TEXT) : '',
     streaming: raw.streaming === true,
     name: typeof raw.name === 'string' ? raw.name : null,
     summary: typeof raw.summary === 'string' ? raw.summary : null,
@@ -84,13 +88,21 @@ function cleanEntry(raw) {
 }
 
 /**
- * 条目签名:正文只会"流式变长"或"被耐久消息原地替换"(此时 streaming 翻转),
+ * 条目签名:正文/思考只会"流式变长"或"被耐久消息原地替换"(此时 streaming 翻转),
  * 所以 角色 + 状态 + 长度 + 是否流式 足够判变化,不必每趟比对几十 KB 文本。
  */
 function entriesSignature(entries) {
   const parts = [];
   for (const entry of entries) {
-    parts.push(`${entry.role}:${entry.status ?? ''}:${entry.streaming ? 1 : 0}:${entry.text.length}:${entry.summary === null ? '' : entry.summary.length}`);
+    parts.push([
+      entry.role,
+      entry.status ?? '',
+      entry.streaming ? 1 : 0,
+      entry.text.length,
+      entry.thinking.length,
+      entry.context.length,
+      entry.summary === null ? '' : entry.summary.length,
+    ].join(':'));
   }
   return `${entries.length}|${parts.join(',')}`;
 }
@@ -100,6 +112,8 @@ function pendingEntries(state) {
   return state.pending.map((item) => ({
     role: 'user',
     text: item.text,
+    thinking: '',
+    context: '',
     streaming: false,
     name: null,
     summary: null,
@@ -364,9 +378,9 @@ function renderPanelHtml({ cspSource, nonce, scriptUri, styleUri }) {
 <meta charset="utf-8">
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src ${cspSource} data:; font-src ${cspSource}; style-src ${cspSource} 'unsafe-inline'; script-src 'nonce-${nonce}';">
 <link rel="stylesheet" href="${style}">
-<title>DSH 提问</title>
+<title>DSH 对话</title>
 </head>
-<body>
+<body class="dshcs-panel">
 <div id="root"></div>
 <script nonce="${nonce}" src="${script}"></script>
 </body>

package/assets/extensions/dshcs-editor-bridge/lib/bridge-client.js

@@ -290,11 +290,24 @@ function createClient(options) {
           approvals: body !== null && Array.isArray(body.approvals) ? body.approvals : [],
           approvalHoldMs: body !== null && Number.isSafeInteger(body.approvalHoldMs) ? body.approvalHoldMs : undefined,
           uiVersion: body !== null && typeof body.uiVersion === 'string' ? body.uiVersion : undefined,
+          // 能力探测(0.3.24):宿主支持 DSH 页面里的悬浮对话框 ⇒ 提问改走 ask-open 事件(不开 webview 面板)。
+          askDialog: body !== null && body.askDialog === true,
         };
       } catch (error) {
         return { ok: false, error: error.message, status: error.status, code: error.code };
       }
     },
+    /**
+     * 请宿主打开 DSH 页面里的「问 DSH」对话框(0.3.24)。
+     * 只上报警图(mode),上下文由宿主从它自己的编辑器状态缓存里取 —— 扩展不用重复发一份。
+     */
+    async askOpen(mode) {
+      return request(`${BRIDGE_BASE}/event`, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ kind: 'ask-open', mode: mode === 'file' ? 'file' : 'selection' }),
+      });
+    },
     /** 把"选中内容 + 问题"投给 DSH 的当前会话。 */
     async ask(payload) {
       return request(`${BRIDGE_BASE}/ask`, {

package/assets/extensions/dshcs-editor-bridge/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dshcs-editor-bridge",
   "displayName": "DSH Editor Bridge",
-  "description": "只读地把编辑器状态(未保存缓冲区、诊断、活动选区)提供给 DSH,并让编辑器里的动作驱动 DSH 会话;0.2.3 起「问 DSH」面板用 DSH 官方 markdown 渲染器显示该会话的新内容,并可就地回答授权请求(写工作区外文件 / 执行命令)。由 dsh-code-server-app 插件安装,可禁用。",
-  "version": "0.2.3",
+  "description": "只读地把编辑器状态(未保存缓冲区、诊断、活动选区)提供给 DSH;右键提问打开 DSH 页面里的悬浮对话对话框(0.2.5;老宿主退回编辑器面板),正文/思考/上下文都用 DSH 官方渲染器,并可就地回答授权请求。由 dsh-code-server-app 插件安装,可禁用。",
+  "version": "0.2.5",
   "publisher": "dsh-code-server-app",
   "license": "MIT",
   "private": true,

package/assets/extensions/dshcs-editor-bridge/webview/THIRD-PARTY.md

@@ -11,9 +11,9 @@
 | react | 18.3.1 | MIT |
 | react-dom | 18.3.1 | MIT |
 
-生成时间:2026-09-13T08:28:22.125Z
+生成时间:2026-09-13T09:15:47.607Z
 渲染器:@deepseek-ai/dsh-client-ui-primitives@0.1.5-rc.2(DSH 部署的界面版本:0.1.5-rc.2)
-设计令牌:@deepseek-ai/dsh-client-ui-theme@0.1.5-rc.2(5 段)
+设计令牌:@deepseek-ai/dsh-client-ui-theme@0.1.5-rc.2(11 段)
 KaTeX:已打包(公式排版与 DSH 界面一致)
 shiki 语法:typescript / shellscript / json(与 DSH 启动集一致)
 令牌自检:通过

package/assets/extensions/dshcs-editor-bridge/webview/src/app.jsx

@@ -26,6 +26,13 @@ const RENDERER_PACKAGE = typeof __DSHCS_RENDERER_PACKAGE__ === 'string' ? __DSHC
 
 const vscode = acquireVsCodeApi();
 
+/** 宿主形态(0.2.5):`'dsh'` = 跑在 DSH 页面里的浮动对话框里,否则是 VS Code webview 面板。 */
+const HOST = typeof window.__DSHCS_HOST__ === 'string' ? window.__DSHCS_HOST__ : 'webview';
+/** 挂载点:对话框把它的容器交进来;webview 里就是 #root。 */
+const MOUNT = window.__DSHCS_MOUNT__ instanceof HTMLElement
+  ? window.__DSHCS_MOUNT__
+  : document.getElementById('root');
+
 /** 面板外壳的初始视图状态。 */
 const INITIAL = panel.createViewState();
 
@@ -40,7 +47,17 @@ function App() {
   const stickRef = useRef(true);
   const boxRef = useRef(null);
 
-  // 扩展 → 面板的消息。
+  // 对话框形态:壳子直接推状态(同一个 window,不走 postMessage —— DSH 页面里 postMessage 是公共广播)。
+  useEffect(() => {
+    if (HOST !== 'dsh') return undefined;
+    window.__DSHCS_ASK_PUSH__ = (payload) => {
+      if (payload === null || typeof payload !== 'object') return;
+      setView((prev) => panel.applyPayload(prev, { ...payload, type: 'state' }));
+    };
+    return () => { delete window.__DSHCS_ASK_PUSH__; };
+  }, []);
+
+  // 扩展 → 面板的消息(webview 形态)。
   useEffect(() => {
     const onMessage = (event) => {
       const data = event.data;
@@ -62,7 +79,9 @@ function App() {
   }, []);
 
   // 暗色主题:官方令牌表用 body[data-ds-dark-theme] 切换调色板。
+  // **只在 webview 里做**:在 DSH 页面里那个属性属于 DSH 自己,面板不能去改它(会翻掉整个界面主题)。
   useEffect(() => {
+    if (HOST === 'dsh') return undefined;
     const sync = () => {
       const dark = document.body.classList.contains('vscode-dark')
         || document.body.classList.contains('vscode-high-contrast');
@@ -143,8 +162,18 @@ function App() {
   return (
     <div className="dshcs-app">
       <header className="dshcs-header">
+        <span className="dshcs-title">DSH</span>
         <span className="dshcs-where">{view.contextText}</span>
         {RENDERER_VERSION === '' ? null : <span className="dshcs-version">渲染器 {RENDERER_VERSION}</span>}
+        <button
+          type="button"
+          className="dshcs-close"
+          title="关闭(Shift+Esc)"
+          aria-label="关闭"
+          onClick={() => vscode.postMessage({ type: 'close' })}
+        >
+          ✕
+        </button>
       </header>
 
       {view.threadError === null ? null : <div className="dshcs-warn">{view.threadError}</div>}
@@ -152,7 +181,7 @@ function App() {
 
       <main className="dshcs-log" ref={logRef} onScroll={onScroll}>
         {view.entries.length === 0
-          ? <div className="dshcs-empty">在下面提问:DSH 的回答会像 DSH 界面那样显示在这里。</div>
+          ? <div className="dshcs-empty">在下面提问:DSH 的回答会像 DSH 界面那样显示在这里(思考折叠、正文按官方渲染)。</div>
           : view.entries.map((entry, index) => (
             <ThreadEntry key={`${entry.role}-${index}-${entry.callId ?? entry.approvalId ?? ''}`} entry={entry} />
           ))}
@@ -186,4 +215,8 @@ function App() {
   );
 }
 
-createRoot(document.getElementById('root')).render(<App />);
+if (MOUNT === null || MOUNT === undefined) {
+  console.error('[dshcs] 面板挂载点不存在(#root 或 window.__DSHCS_MOUNT__)');
+} else {
+  createRoot(MOUNT).render(<App />);
+}

package/assets/extensions/dshcs-editor-bridge/webview/src/approval.jsx

@@ -1,32 +1,41 @@
-// dshcs-editor-bridge / webview/src/approval.jsx —— 待决授权卡片(0.2.3)
+// dshcs-editor-bridge / webview/src/approval.jsx —— 待决授权卡片(0.2.3;0.2.4 修"失效")
 //
 // 背景(见 lib/bridge-approval.mjs):DSH 的敏感动作(写工作区外的文件、执行命令)会走
 // `approval/request` 这条 agent 作用域的 waterfall。面板在旁边看的时候先接住它:
 //   - 用户在这张卡片上点「允许一次 / 拒绝」→ 立刻生效(官方卡片不再出现);
-//   - 窗口内没人答(倒计时走完)→ 交回官方链路,DSH 界面里照旧弹同一张卡片。
+//   - **面板关掉**(或等满宿主给的窗口,默认 5 分钟)→ 交回官方链路,DSH 界面里照旧弹同一张卡片。
+//
+// 0.2.3 的教训(用户实测:"授权框失效了"):卡片自己按 8 秒判过期 → 读完再点,按钮已经是灰的。
+// 现在**不再由前端判过期**:只要卡片还在(宿主这边仍未决),按钮就可点;请求被交回官方链路时
+// 它会从 `approvals` 里消失,面板改为显示审计行。倒计时只是"还有多久交回官方链路"的提示,
+// 不再决定能不能点。
 //
 // 卡片只做两件事:**显示**这次请求要干什么(工具名 + 原因),**回答**它。
 // 没有任何"记住这次选择""以后都允许"的入口 —— 授权只对这一次动作有效。
 
-/** 毫秒 → 剩余秒数(向上取整,0 表示已过期)。 */
-function secondsLeft(item, holdMs, now) {
-  const deadline = (Number.isSafeInteger(item.at) ? item.at : now) + holdMs;
-  return Math.max(0, Math.ceil((deadline - now) / 1000));
+/** 剩余时间文案(超过一分钟就 mm:ss,避免秒数跳动带来的紧张感)。 */
+function remainingText(item, holdMs, now) {
+  const at = Number.isSafeInteger(item.at) ? item.at : now;
+  const left = Math.max(0, at + holdMs - now);
+  if (left === 0) return '已交回 DSH 界面';
+  const totalSeconds = Math.ceil(left / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return minutes > 0
+    ? `${minutes} 分 ${String(seconds).padStart(2, '0')} 秒后交回 DSH 界面`
+    : `${seconds} 秒后交回 DSH 界面`;
 }
 
 export function ApprovalCard({ item, holdMs, now, decided, onDecide }) {
-  const left = secondsLeft(item, holdMs, now);
-  const expired = left <= 0;
   const choice = decided ?? null;
-  const locked = expired || choice !== null;
+  // 已提交(点了但宿主还没确认):锁住按钮避免连点;这张卡片何时消失由宿主决定。
+  const locked = choice !== null;
 
   return (
     <div className="dshcs-approval" data-decided={choice ?? undefined}>
       <div className="dshcs-approval-head">
         <span className="dshcs-approval-title">需要你的授权</span>
-        <span className="dshcs-approval-timer">
-          {expired ? '已交给 DSH 界面' : `${left}s 后交给 DSH 界面`}
-        </span>
+        <span className="dshcs-approval-timer">{remainingText(item, holdMs, now)}</span>
       </div>
       <div className="dshcs-approval-body">
         <span className="dshcs-approval-tool">{item.toolName}</span>
@@ -39,14 +48,13 @@ export function ApprovalCard({ item, holdMs, now, decided, onDecide }) {
         <button type="button" disabled={locked} onClick={() => onDecide(item.id, 'rejected')}>
           拒绝
         </button>
-        {choice === null ? null : (
-          <span className="dshcs-approval-note">
-            {choice === 'allowed-once' ? '已允许一次(DSH 继续执行)' : '已拒绝'}
-          </span>
-        )}
-        {choice === null && expired ? (
-          <span className="dshcs-approval-note">这条请求已交给 DSH 界面,请在那边处理</span>
-        ) : null}
+        {choice === null
+          ? <span className="dshcs-approval-note">只对这一次动作有效;关掉面板即交回 DSH 界面</span>
+          : (
+            <span className="dshcs-approval-note">
+              {choice === 'allowed-once' ? '已允许一次(DSH 继续执行)' : '已拒绝'}
+            </span>
+          )}
       </div>
     </div>
   );