dsh-code-server-app 0.3.22 → 0.3.23

package/lib/bridge-approval.mjs

@@ -12,10 +12,13 @@
  *
  * ## 策略(先面板、后官方;绝不自动放行)
  * 只对**被面板 watch 的会话**注册监听(`agent.ctx.on('approval/request', …)`,agent 作用域天然只收本会话):
- *   1. 生成 pending 记录 → 面板随 `/sync` 的 `approvals` 字段看到卡片(工具名 / 原因 / 参数摘要);
- *   2. 等面板决策,最多 `HOLD_MS`(默认 8s):
- *      - 窗口内作答 → **返回该 outcome**(settle;官方卡片不出现,人在编辑器就地处理);
- *      - 无人作答 / 面板没开 → `return next()`,**原样交给官方链路**(DSH 界面照旧弹卡);
+ *   1. 生成 pending 记录 → 面板随 `/sync` 的 `approvals` 字段看到卡片(工具名 / 原因 / 倒计时);
+ *   2. 等面板决策,最多 `HOLD_MS`(**默认 5 分钟** —— 0.3.22 的 8 秒对人不现实:
+ *      卡片出现到用户读完、点下去,8 秒早就过了,表现就是"授权框失效"):
+ *      - 面板作答 → **返回该 outcome**(settle;官方卡片不出现,人在编辑器就地处理);
+ *      - **面板关掉了**(`hasPanel()` 变 false,每 `WATCH_POLL_MS` 检查一次)→ 立刻 `return next()`,
+ *        不干等到窗口结束;
+ *      - 窗口到点仍没人答 → `return next()`,**原样交给官方链路**(DSH 界面照旧弹卡);
  *   3. 永不返回自动授权:`allowed-once` 只能来自用户点击。
  *
  * ## 安全
@@ -25,8 +28,11 @@
  *   - 不接受任何自由文本 / 路径 / 命令参数 —— 这条路由**只能回答既有的问题**,不能发起动作。
  */
 
-/** 面板优先的等待窗口(毫秒);超过就交给官方链路。 */
-export const DEFAULT_HOLD_MS = 8000;
+/** 面板优先的等待窗口(毫秒)。5 分钟:面板就在用户眼前,时间不该成为失败原因。 */
+export const DEFAULT_HOLD_MS = 300000;
+
+/** 等待期间检查"面板还在不在看"的间隔(毫秒):面板一关就立刻交回官方链路,不干等。 */
+export const WATCH_POLL_MS = 500;
 
 /** 同时挂起的授权请求上限(超了直接交给官方,避免堆积)。 */
 export const MAX_PENDING = 4;
@@ -96,6 +102,7 @@ export function createApprovalBoard({ holdMs = DEFAULT_HOLD_MS, maxPending = MAX
  * @param {ReturnType<typeof createApprovalBoard>} deps.board
  * @param {(message: string) => void} [deps.log]
  * @param {number} [deps.holdMs]
+ * @param {number} [deps.pollMs]   检查"面板还在不在看"的间隔
  * @param {() => boolean} deps.hasPanel 面板是否在看着(关掉时立刻交给官方,不做无谓等待)
  * @returns {{intercept: (agent: object, sessionId: string) => () => void}}
  */
@@ -103,10 +110,35 @@ export function createApprovalInterceptor(deps) {
   const board = deps.board;
   const log = deps.log ?? (() => {});
   const holdMs = deps.holdMs ?? DEFAULT_HOLD_MS;
+  const pollMs = deps.pollMs ?? WATCH_POLL_MS;
   const hasPanel = deps.hasPanel ?? (() => true);
   /** agent → disposer(每个被 watch 的 agent 一个监听器) */
   const registered = new Map();
 
+  /** 睡一小段(不占事件循环;unref 掉,别把进程钉住)。 */
+  function sleep(ms) {
+    return new Promise((resolve) => {
+      const timer = setTimeout(resolve, ms);
+      if (typeof timer.unref === 'function') timer.unref();
+    });
+  }
+
+  /**
+   * 等面板决策:面板作答 / 面板关掉 / 窗口到点,三者谁先到算谁。
+   * @returns {Promise<string|undefined>} outcome,或 undefined = 交给官方链路
+   */
+  async function waitForDecision(decision) {
+    const deadline = Date.now() + holdMs;
+    for (;;) {
+      const remaining = deadline - Date.now();
+      if (remaining <= 0) return undefined;
+      const outcome = await Promise.race([decision, sleep(Math.min(pollMs, remaining))]);
+      if (outcome !== undefined) return outcome;
+      // 面板关掉了(用户关掉 webview / 换了会话)→ 立刻交回官方链路,不干等窗口结束。
+      if (!hasPanel()) return undefined;
+    }
+  }
+
   async function handle(request, next) {
     try {
       // 面板没在看:完全不拦截,保持今天的行为。
@@ -123,20 +155,14 @@ export function createApprovalInterceptor(deps) {
         // 上限已满 / id 重复:不抢,交给官方。
         return await next();
       }
-      let timer = null;
-      const timeout = new Promise((resolve) => {
-        timer = setTimeout(() => resolve(undefined), holdMs);
-        if (typeof timer.unref === 'function') timer.unref();
-      });
-      const outcome = await Promise.race([decision, timeout]);
-      if (timer !== null) clearTimeout(timer);
+      const outcome = await waitForDecision(decision);
       if (typeof outcome === 'string' && PANEL_OUTCOMES.includes(outcome)) {
         board.drop(id); // 幂等:answer() 已删过也没关系
         log(`授权由编辑器面板决定:${request.toolName ?? 'tool'} → ${outcome}`);
         return outcome;
       }
       board.drop(id);
-      log(`授权 ${request.toolName ?? 'tool'} 面板未作答(${holdMs}ms),交给 DSH 界面`);
+      log(`授权 ${request.toolName ?? 'tool'} 面板未作答(面板关闭或超过 ${holdMs}ms),交给 DSH 界面`);
       return await next();
     } catch (err) {
       // 拦截器出问题绝不能把授权变成"放行":退回官方链路(它自己会 fail closed)。

package/lib/bridge-thread.mjs

@@ -37,16 +37,28 @@ function clip(text, limit = MAX_TEXT) {
   return text.length > limit ? `${text.slice(0, limit)}…(已截断)` : text;
 }
 
-/** 从消息内容块里取正文(text 块拼接;reasoning / tool-call 不进面板)。 */
-export function textOfContent(content) {
-  if (!Array.isArray(content)) return '';
-  const parts = [];
+/**
+ * 从消息内容块里取**正文**与**思考**(0.3.23 起思考也进面板,默认折叠)。
+ *
+ * DSH 的内容块类型(`packages/llm/llm/src/types.ts`):`{type:'text',text}` 是给用户看的正文,
+ * `{type:'reasoning',text}` 是模型的思考过程 —— 面板以前把它整个丢掉,于是"像官方对话"
+ * 少了最显眼的那一块(官方的 Think 行默认折叠,点开才展开)。
+ */
+export function partsOfContent(content) {
+  if (!Array.isArray(content)) return { text: '', thinking: '' };
+  const texts = [];
+  const thinkings = [];
   for (const block of content) {
-    if (block !== null && typeof block === 'object' && block.type === 'text' && typeof block.text === 'string') {
-      parts.push(block.text);
-    }
+    if (block === null || typeof block !== 'object') continue;
+    if (block.type === 'text' && typeof block.text === 'string') texts.push(block.text);
+    else if (block.type === 'reasoning' && typeof block.text === 'string') thinkings.push(block.text);
   }
-  return clip(parts.join(''));
+  return { text: clip(texts.join('')), thinking: clip(thinkings.join('')) };
+}
+
+/** 只取正文(旧签名保留;思考不进正文)。 */
+export function textOfContent(content) {
+  return partsOfContent(content).text;
 }
 
 /** 工具调用摘要:从原始 JSON 参数里抽一个最有信息量的字段(路径 / 命令首行)。 */
@@ -101,18 +113,32 @@ function push(state, entry) {
   return state.entries.length - 1;
 }
 
-/** 助手流帧(SessionAssistantStreamFrame):只取正文 text-delta。 */
+/**
+ * 助手流帧(SessionAssistantStreamFrame):正文取 `text-delta`,思考取 `reasoning-delta`。
+ *
+ * 两者都累积到**同一个**流式条目上(text / thinking 两个字段),所以面板可以在"思考中"
+ * 就先显示折叠的思考行,正文到了再往下长 —— 与 DSH 界面的观感一致。
+ */
 export function applyStreamFrame(state, frame) {
   if (frame === null || typeof frame !== 'object' || frame.type !== 'chunk') return false;
   const chunk = frame.chunk;
-  if (chunk === null || typeof chunk !== 'object' || chunk.type !== 'text-delta' || typeof chunk.text !== 'string') return false;
+  if (chunk === null || typeof chunk !== 'object' || typeof chunk.text !== 'string') return false;
+  const isText = chunk.type === 'text-delta';
+  const isThinking = chunk.type === 'reasoning-delta';
+  if (!isText && !isThinking) return false;
   const turn = Number.isSafeInteger(frame.turn) ? frame.turn : null;
+  const field = isText ? 'text' : 'thinking';
   if (state.streamingIndex !== null && state.streamingTurn === turn) {
     const current = state.entries[state.streamingIndex];
-    current.text = clip(current.text + chunk.text);
+    current[field] = clip((current[field] ?? '') + chunk.text);
     return true;
   }
-  state.streamingIndex = push(state, { role: 'assistant', text: clip(chunk.text), streaming: true });
+  state.streamingIndex = push(state, {
+    role: 'assistant',
+    text: isText ? clip(chunk.text) : '',
+    thinking: isThinking ? clip(chunk.text) : '',
+    streaming: true,
+  });
   state.streamingTurn = turn;
   return true;
 }
@@ -128,30 +154,31 @@ export function applyEvent(state, event) {
   const data = event.data ?? {};
 
   if (event.type === 'user/message') {
-    const text = textOfContent(data.content);
+    const text = partsOfContent(data.content).text;
     if (text === '') return false;
     push(state, { role: 'user', text });
     return true;
   }
 
   if (event.type === 'assistant/message') {
-    const text = textOfContent(data.message?.content);
+    const { text, thinking } = partsOfContent(data.message?.content);
     const streamingIndex = state.streamingIndex;
     state.streamingIndex = null;
     state.streamingTurn = null;
     if (streamingIndex !== null && state.entries[streamingIndex] !== undefined) {
       // 耐久消息落地:原地替换同一轮的流式临时条目(不重复显示,顺序也不变)。
-      if (text === '') {
+      // 正文与思考都空(例如整轮只有工具调用)→ 撤掉这条临时条目。
+      if (text === '' && thinking === '') {
         state.entries.splice(streamingIndex, 1);
         rebuildIndex(state);
         return true;
       }
-      state.entries[streamingIndex] = { role: 'assistant', text };
+      state.entries[streamingIndex] = { role: 'assistant', text, thinking };
       rebuildIndex(state);
       return true;
     }
-    if (text === '') return false;
-    push(state, { role: 'assistant', text });
+    if (text === '' && thinking === '') return false;
+    push(state, { role: 'assistant', text, thinking });
     return true;
   }
 
@@ -228,6 +255,8 @@ export function threadSnapshot(state) {
     entries: state.entries.map((entry) => ({
       role: entry.role,
       text: entry.text ?? null,
+      // 思考过程(0.3.23):面板渲染成官方那样的折叠行,默认收起。
+      thinking: entry.thinking ?? null,
       streaming: entry.streaming === true,
       name: entry.name ?? null,
       callId: entry.callId ?? null,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.3.22",
-  "description": "VS Code (from a code-server release) inside DSH: a right-sidebar tab driven by the plugin's own launcher over the in-process VS Code server (lib/launcher.mjs). Since 0.3.0 the bundle also ships an editor bridge (assets/extensions/dshcs-editor-bridge): a read-only channel between the in-tree VS Code extension host and DSH, giving the agent what only the editor knows (unsaved buffers, language-server diagnostics, the active selection) and letting editor gestures drive the session. Since 0.3.22 the ask panel renders that session's new content with DSH's own Markdown renderer (pinned to the deployed DSH UI version) and can answer approval requests in place — the bridge's only non-read-only route (POST /approve, constrained to pending in-process requests and the outcomes allowed-once/rejected). The tab claims DSH file addresses (dsh-resource://file/**) by file type (setting claimExtensions), so the product's own produced-file chips, delivered-file previews and inline prose mentions open in the workbench. The IDE is a resident surface moved with Element.moveBefore instead of being remounted, so switching sidebar tabs no longer reloads it. Opening the tab switches the right sidebar to fullscreen by default (setting fullscreenOnOpen). Following a workspace switch is lightweight: the workbench re-navigates with the new ?folder= and the IDE process is not restarted (since 0.2.12). Requires a DSH with the right-sidebar services (sidebarRightTabs/sidebarRight, >= 0.1.5-alpha.1); older DSH versions get a single upgrade notice on the settings page and no other UI. Two serving modes: loopback port (default) or same-origin mount on DSH's own webServer (/code-server, protected by ctx.connection.requestRejection). No code-server Node layer, no argon2, no C++ toolchain.",
+  "version": "0.3.23",
+  "description": "VS Code (from a code-server release) inside DSH: a right-sidebar tab driven by the plugin's own launcher over the in-process VS Code server (lib/launcher.mjs). Since 0.3.0 the bundle also ships an editor bridge (assets/extensions/dshcs-editor-bridge): a read-only channel between the in-tree VS Code extension host and DSH, giving the agent what only the editor knows (unsaved buffers, language-server diagnostics, the active selection) and letting editor gestures drive the session. Since 0.3.22 the ask panel renders that session's new content with DSH's own Markdown renderer (pinned to the deployed DSH UI version); since 0.3.23 it is a full-width dialog with collapsible thinking rows and can answer approval requests in place — the bridge's only non-read-only route (POST /approve, constrained to pending in-process requests and the outcomes allowed-once/rejected; panel-first for 5 minutes, handed back to the official card the moment the panel closes). The tab claims DSH file addresses (dsh-resource://file/**) by file type (setting claimExtensions), so the product's own produced-file chips, delivered-file previews and inline prose mentions open in the workbench. The IDE is a resident surface moved with Element.moveBefore instead of being remounted, so switching sidebar tabs no longer reloads it. Opening the tab switches the right sidebar to fullscreen by default (setting fullscreenOnOpen). Following a workspace switch is lightweight: the workbench re-navigates with the new ?folder= and the IDE process is not restarted (since 0.2.12). Requires a DSH with the right-sidebar services (sidebarRightTabs/sidebarRight, >= 0.1.5-alpha.1); older DSH versions get a single upgrade notice on the settings page and no other UI. Two serving modes: loopback port (default) or same-origin mount on DSH's own webServer (/code-server, protected by ctx.connection.requestRejection). No code-server Node layer, no argon2, no C++ toolchain.",
   "homepage": "https://github.com/jinsiyu/dsh-code-server-app",
   "repository": {
     "type": "git",

package/vendor/VENDOR.json

@@ -3,7 +3,7 @@
   "vscodeVersion": "1.137.0",
   "productPath": "stable-b11dabdaca0d3369986975be285db92c8795cea5",
   "layout": "vscode-only",
-  "preparedAt": "2026-09-13T08:28:20.966Z",
+  "preparedAt": "2026-09-13T08:52:39.438Z",
   "source": "registry",
   "node": "v24.21.0",
   "platform": "win32",