dsh-code-server-app 0.3.35 → 0.3.37

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

@@ -11,7 +11,7 @@
 | react | 18.3.1 | MIT |
 | react-dom | 18.3.1 | MIT |
 
-生成时间:2026-09-13T12:19:47.070Z
+生成时间:2026-09-13T12:38:24.712Z
 渲染器:@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(11 段)
 KaTeX:已打包(公式排版与 DSH 界面一致)

package/lib/bridge-approval.mjs

@@ -137,13 +137,24 @@ export function createApprovalInterceptor(deps) {
    */
   async function waitForDecision(decision) {
     const deadline = Date.now() + holdMs;
+    let loggedStillWaiting = false;
     for (;;) {
       const remaining = deadline - Date.now();
-      if (remaining <= 0) return undefined;
+      if (remaining <= 0) {
+        log('等待期间没人作答:窗口到点,交回 DSH 界面');
+        return undefined;
+      }
       const outcome = await Promise.race([decision, sleep(Math.min(pollMs, remaining))]);
       if (outcome !== undefined) return outcome;
       // 面板关掉了(用户关掉 webview / 换了会话)→ 立刻交回官方链路,不干等窗口结束。
-      if (!hasPanel()) return undefined;
+      if (!hasPanel()) {
+        log('等待期间判据翻成 false(不再有人看):立刻交回 DSH 界面 —— 若卡片因此跑到 DSH 侧,这就是原因');
+        return undefined;
+      }
+      if (!loggedStillWaiting) {
+        loggedStillWaiting = true;
+        log('已接住授权,正在等面板/对话框作答(此后再翻 false 会立刻放手)');
+      }
     }
   }
 
@@ -191,7 +202,12 @@ export function createApprovalInterceptor(deps) {
       if (registered.has(agent)) return registered.get(agent);
       let dispose = () => {};
       try {
-        const result = scope.on('approval/request', handle);
+        // **必须 prepend**(0.3.36):DSH 的客户端审批卡片是一个更早注册的 waterfall 监听器
+        // (packages/client/ui-approval/src/client/index.ts:90 的 ctx.remote.$on),它在用户点击前不会返回
+        // ⇒ 我们的监听器排在他后面就永远轮不到(实测:日志里连 hasPanel() 都没被调用过)。
+        // prepend 之后我们排在最前:能答就答,答不了 next() 原样交回官方卡片。
+        // 派发点与作用域见 packages/interaction/user-approval/src/index.ts:275(scopeTarget(req.agent, req.agent))。
+        const result = scope.on('approval/request', handle, { prepend: true });
         if (typeof result === 'function') dispose = result;
       } catch (err) {
         log(`注册授权拦截失败(${sessionId}):${err && err.message ? err.message : String(err)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.3.35",
+  "version": "0.3.37",
   "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": {

package/vendor/VENDOR.json

@@ -3,7 +3,7 @@
   "vscodeVersion": "1.137.0",
   "productPath": "stable-b11dabdaca0d3369986975be285db92c8795cea5",
   "layout": "vscode-only",
-  "preparedAt": "2026-09-13T12:19:45.959Z",
+  "preparedAt": "2026-09-13T12:38:23.539Z",
   "source": "registry",
   "node": "v24.21.0",
   "platform": "win32",