dsh-code-server-app 0.3.45 → 0.3.47

package/lib/serve-dsh.mjs

@@ -1,162 +1,162 @@
-/**
- * lib/serve-dsh.mjs — 把 VS Code server 挂到 DSH 自身 HTTP 端口上的两段式注册(serve=dsh)。
- *
- *   ctx.webServer.register({ kind: 'prefix', path: '/code-server', handler })     ← HTTP
- *   ctx.webServer.registerUpgrade({ path: '/code-server/<productPath>', handler }) ← WebSocket(精确匹配)
- *
- * 两条路径都必须先过 ctx.connection.requestRejection():DSH 的 webServer 本身不做任何校验,
- * 防护是逐路由的(Host/Origin fence + 浏览器 cookie 认证),缺了它 IDE 会成为源站上唯一的无认证面。
- *
- * 转发策略(Phase 0 实测):**剥掉挂载前缀**后转给 launcher 的命名管道 —— VS Code 侧保持根挂载,
- * 与今天已验证的配置完全一致;客户端渲染出的资源引用全是相对路径,浏览器按 /code-server/ 解析,
- * 因此同一套 prefix 路由就能覆盖 HTML、静态资源、vscode-remote-resource 与 /_static/*。
- *
- * 已知退化:转发端口(/proxy/:port)的 WebSocket 无法用精确升级路由覆盖(端口号在路径里),
- * 需要 DSH 上游提供 prefix upgrade;HTTP 转发端口不受影响。
- */
-
-import { request as httpRequest } from 'node:http';
-import { connect } from 'node:net';
-
-export const MOUNT_PATH = '/code-server';
-
-/** 前缀匹配(与 DSH webServer 的 prefix 语义一致:命中 p 与 p/<anything>)。 */
-function matchesPrefix(pathname, prefix) {
-  return pathname === prefix || pathname.startsWith(`${prefix}/`);
-}
-
-/** 把 /code-server/xxx 转成上游要的 /xxx(空则 '/'),保留 query。 */
-function stripPrefix(url, prefix) {
-  const rest = url.slice(prefix.length);
-  return rest === '' ? '/' : rest;
-}
-
-function rejectionOf(connection, req) {
-  try {
-    return connection.requestRejection({ headers: req.headers }) ?? undefined;
-  } catch (error) {
-    return { error };
-  }
-}
-
-/** 转发目标的两种形态:命名管道(kind:'pipe')或回环 TCP(kind:'tcp')。
- *  注意 http.request 用 socketPath、net.connect 用 path —— 两者键名不同,必须在这里翻译。 */
-function httpOptions(target, extra) {
-  return target.kind === 'pipe'
-    ? { socketPath: target.pipe, ...extra }
-    : { host: target.host, port: target.port, ...extra };
-}
-
-function connectTo(target, onConnect) {
-  return target.kind === 'pipe'
-    ? connect({ path: target.pipe }, onConnect)
-    : connect({ host: target.host, port: target.port }, onConnect);
-}
-
-/**
- * 注册 IDE 的同源挂载点。
- * @param {object} options
- * @param {object} options.webServer - DSH webServer 服务(register / registerUpgrade)
- * @param {object} options.connection - DSH connection 服务(requestRejection)
- * @param {() => ({socketPath: string} | {host: string, port: number} | null)} options.getTarget
- *   当前 launcher 的转发目标(命名管道为主;loopback TCP 用于测试/回退)
- * @param {string} options.productPath - VS Code 客户端路径(quality-commit)
- * @param {string} [options.mount] - 挂载前缀,默认 /code-server
- * @param {(msg: string) => void} [options.log]
- * @returns {{ disposers: (() => void)[], upgradePath: string }}
- */
-export function mountOnWebServer({ webServer, connection, getTarget, productPath, mount = MOUNT_PATH, log = () => {} }) {
-  const upgradePath = `${mount}/${productPath}`;
-  const disposers = [];
-
-  /** 请求被 fence 拒绝时按 DSH 的约定回 401/403(upgrade 走裸 socket)。 */
-  function fence(req) {
-    const rejection = rejectionOf(connection, req);
-    if (rejection === undefined) return null;
-    if (typeof rejection === 'object' && rejection.error !== undefined) {
-      log(`requestRejection 抛错,按 403 处理: ${rejection.error?.message ?? rejection.error}`);
-      return 403;
-    }
-    return rejection;
-  }
-
-  disposers.push(webServer.register({
-    kind: 'prefix',
-    path: mount,
-    handler: (req, res) => {
-      try {
-        const pathname = new URL(req.url ?? '/', 'http://x').pathname;
-        if (!matchesPrefix(pathname, mount)) { res.writeHead(404); res.end(); return; }
-        const status = fence(req);
-        if (status !== null) {
-          res.writeHead(status, { 'content-type': 'text/plain; charset=utf-8' });
-          res.end(status === 401 ? 'unauthorized\n' : 'forbidden\n');
-          return;
-        }
-        const target = getTarget();
-        if (target === null) {
-          res.writeHead(503, { 'content-type': 'text/plain; charset=utf-8' });
-          res.end('code-server 未启动\n');
-          return;
-        }
-        const upstream = httpRequest(httpOptions(target, {
-          method: req.method,
-          path: stripPrefix(req.url ?? '/', mount),
-          headers: req.headers,
-        }), (upstreamRes) => {
-          res.writeHead(upstreamRes.statusCode ?? 502, upstreamRes.headers);
-          upstreamRes.pipe(res);
-        });
-        upstream.on('error', (error) => {
-          log(`HTTP 转发失败(${req.method} ${req.url}): ${error.message}`);
-          if (!res.headersSent) res.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' });
-          if (!res.writableEnded) res.end('code-server 不可达\n');
-        });
-        req.on('aborted', () => upstream.destroy());
-        req.pipe(upstream);
-      } catch (error) {
-        // 路由回调里的异常绝不能冒泡到 DSH 的 webServer(会变成未捕获异常)
-        log(`HTTP 挂载点异常(${req.method} ${req.url}): ${error && error.stack ? error.stack : error}`);
-        if (!res.headersSent) res.writeHead(500, { 'content-type': 'text/plain; charset=utf-8' });
-        if (!res.writableEnded) res.end('code-server 挂载点异常\n');
-      }
-    },
-  }));
-
-  disposers.push(webServer.registerUpgrade({
-    path: upgradePath,
-    handler: (req, socket, head) => {
-      try {
-        const status = fence(req);
-        if (status !== null) {
-          socket.end(`HTTP/1.1 ${status} ${status === 401 ? 'Unauthorized' : 'Forbidden'}\r\nConnection: close\r\n\r\n`);
-          return;
-        }
-        const target = getTarget();
-        if (target === null) { socket.destroy(); return; }
-        const upstream = connectTo(target, () => {
-          const lines = [`GET ${stripPrefix(req.url ?? '/', mount)} HTTP/1.1`];
-          for (let i = 0; i < req.rawHeaders.length; i += 2) {
-            lines.push(`${req.rawHeaders[i]}: ${req.rawHeaders[i + 1]}`);
-          }
-          upstream.write(`${lines.join('\r\n')}\r\n\r\n`);
-          if (head !== undefined && head.length > 0) upstream.write(head);
-          upstream.pipe(socket);
-          socket.pipe(upstream);
-        });
-        upstream.on('error', (error) => { log(`WS 转发失败(${req.url}): ${error.message}`); socket.destroy(); });
-        socket.on('error', () => upstream.destroy());
-        socket.on('close', () => upstream.destroy());
-      } catch (error) {
-        log(`WS 挂载点异常(${req.url}): ${error && error.stack ? error.stack : error}`);
-        socket.destroy();
-      }
-    },
-  }));
-
-  log(`已挂载 ${mount}/ (HTTP prefix)+ ${upgradePath} (WS exact)`);
-  return {
-    upgradePath,
-    disposers,
-  };
-}
+/**
+ * lib/serve-dsh.mjs — 把 VS Code server 挂到 DSH 自身 HTTP 端口上的两段式注册(serve=dsh)。
+ *
+ *   ctx.webServer.register({ kind: 'prefix', path: '/code-server', handler })     ← HTTP
+ *   ctx.webServer.registerUpgrade({ path: '/code-server/<productPath>', handler }) ← WebSocket(精确匹配)
+ *
+ * 两条路径都必须先过 ctx.connection.requestRejection():DSH 的 webServer 本身不做任何校验,
+ * 防护是逐路由的(Host/Origin fence + 浏览器 cookie 认证),缺了它 IDE 会成为源站上唯一的无认证面。
+ *
+ * 转发策略(Phase 0 实测):**剥掉挂载前缀**后转给 launcher 的命名管道 —— VS Code 侧保持根挂载,
+ * 与今天已验证的配置完全一致;客户端渲染出的资源引用全是相对路径,浏览器按 /code-server/ 解析,
+ * 因此同一套 prefix 路由就能覆盖 HTML、静态资源、vscode-remote-resource 与 /_static/*。
+ *
+ * 已知退化:转发端口(/proxy/:port)的 WebSocket 无法用精确升级路由覆盖(端口号在路径里),
+ * 需要 DSH 上游提供 prefix upgrade;HTTP 转发端口不受影响。
+ */
+
+import { request as httpRequest } from 'node:http';
+import { connect } from 'node:net';
+
+export const MOUNT_PATH = '/code-server';
+
+/** 前缀匹配(与 DSH webServer 的 prefix 语义一致:命中 p 与 p/<anything>)。 */
+function matchesPrefix(pathname, prefix) {
+  return pathname === prefix || pathname.startsWith(`${prefix}/`);
+}
+
+/** 把 /code-server/xxx 转成上游要的 /xxx(空则 '/'),保留 query。 */
+function stripPrefix(url, prefix) {
+  const rest = url.slice(prefix.length);
+  return rest === '' ? '/' : rest;
+}
+
+function rejectionOf(connection, req) {
+  try {
+    return connection.requestRejection({ headers: req.headers }) ?? undefined;
+  } catch (error) {
+    return { error };
+  }
+}
+
+/** 转发目标的两种形态:命名管道(kind:'pipe')或回环 TCP(kind:'tcp')。
+ *  注意 http.request 用 socketPath、net.connect 用 path —— 两者键名不同,必须在这里翻译。 */
+function httpOptions(target, extra) {
+  return target.kind === 'pipe'
+    ? { socketPath: target.pipe, ...extra }
+    : { host: target.host, port: target.port, ...extra };
+}
+
+function connectTo(target, onConnect) {
+  return target.kind === 'pipe'
+    ? connect({ path: target.pipe }, onConnect)
+    : connect({ host: target.host, port: target.port }, onConnect);
+}
+
+/**
+ * 注册 IDE 的同源挂载点。
+ * @param {object} options
+ * @param {object} options.webServer - DSH webServer 服务(register / registerUpgrade)
+ * @param {object} options.connection - DSH connection 服务(requestRejection)
+ * @param {() => ({socketPath: string} | {host: string, port: number} | null)} options.getTarget
+ *   当前 launcher 的转发目标(命名管道为主;loopback TCP 用于测试/回退)
+ * @param {string} options.productPath - VS Code 客户端路径(quality-commit)
+ * @param {string} [options.mount] - 挂载前缀,默认 /code-server
+ * @param {(msg: string) => void} [options.log]
+ * @returns {{ disposers: (() => void)[], upgradePath: string }}
+ */
+export function mountOnWebServer({ webServer, connection, getTarget, productPath, mount = MOUNT_PATH, log = () => {} }) {
+  const upgradePath = `${mount}/${productPath}`;
+  const disposers = [];
+
+  /** 请求被 fence 拒绝时按 DSH 的约定回 401/403(upgrade 走裸 socket)。 */
+  function fence(req) {
+    const rejection = rejectionOf(connection, req);
+    if (rejection === undefined) return null;
+    if (typeof rejection === 'object' && rejection.error !== undefined) {
+      log(`requestRejection 抛错,按 403 处理: ${rejection.error?.message ?? rejection.error}`);
+      return 403;
+    }
+    return rejection;
+  }
+
+  disposers.push(webServer.register({
+    kind: 'prefix',
+    path: mount,
+    handler: (req, res) => {
+      try {
+        const pathname = new URL(req.url ?? '/', 'http://x').pathname;
+        if (!matchesPrefix(pathname, mount)) { res.writeHead(404); res.end(); return; }
+        const status = fence(req);
+        if (status !== null) {
+          res.writeHead(status, { 'content-type': 'text/plain; charset=utf-8' });
+          res.end(status === 401 ? 'unauthorized\n' : 'forbidden\n');
+          return;
+        }
+        const target = getTarget();
+        if (target === null) {
+          res.writeHead(503, { 'content-type': 'text/plain; charset=utf-8' });
+          res.end('code-server 未启动\n');
+          return;
+        }
+        const upstream = httpRequest(httpOptions(target, {
+          method: req.method,
+          path: stripPrefix(req.url ?? '/', mount),
+          headers: req.headers,
+        }), (upstreamRes) => {
+          res.writeHead(upstreamRes.statusCode ?? 502, upstreamRes.headers);
+          upstreamRes.pipe(res);
+        });
+        upstream.on('error', (error) => {
+          log(`HTTP 转发失败(${req.method} ${req.url}): ${error.message}`);
+          if (!res.headersSent) res.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' });
+          if (!res.writableEnded) res.end('code-server 不可达\n');
+        });
+        req.on('aborted', () => upstream.destroy());
+        req.pipe(upstream);
+      } catch (error) {
+        // 路由回调里的异常绝不能冒泡到 DSH 的 webServer(会变成未捕获异常)
+        log(`HTTP 挂载点异常(${req.method} ${req.url}): ${error && error.stack ? error.stack : error}`);
+        if (!res.headersSent) res.writeHead(500, { 'content-type': 'text/plain; charset=utf-8' });
+        if (!res.writableEnded) res.end('code-server 挂载点异常\n');
+      }
+    },
+  }));
+
+  disposers.push(webServer.registerUpgrade({
+    path: upgradePath,
+    handler: (req, socket, head) => {
+      try {
+        const status = fence(req);
+        if (status !== null) {
+          socket.end(`HTTP/1.1 ${status} ${status === 401 ? 'Unauthorized' : 'Forbidden'}\r\nConnection: close\r\n\r\n`);
+          return;
+        }
+        const target = getTarget();
+        if (target === null) { socket.destroy(); return; }
+        const upstream = connectTo(target, () => {
+          const lines = [`GET ${stripPrefix(req.url ?? '/', mount)} HTTP/1.1`];
+          for (let i = 0; i < req.rawHeaders.length; i += 2) {
+            lines.push(`${req.rawHeaders[i]}: ${req.rawHeaders[i + 1]}`);
+          }
+          upstream.write(`${lines.join('\r\n')}\r\n\r\n`);
+          if (head !== undefined && head.length > 0) upstream.write(head);
+          upstream.pipe(socket);
+          socket.pipe(upstream);
+        });
+        upstream.on('error', (error) => { log(`WS 转发失败(${req.url}): ${error.message}`); socket.destroy(); });
+        socket.on('error', () => upstream.destroy());
+        socket.on('close', () => upstream.destroy());
+      } catch (error) {
+        log(`WS 挂载点异常(${req.url}): ${error && error.stack ? error.stack : error}`);
+        socket.destroy();
+      }
+    },
+  }));
+
+  log(`已挂载 ${mount}/ (HTTP prefix)+ ${upgradePath} (WS exact)`);
+  return {
+    upgradePath,
+    disposers,
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.3.45",
+  "version": "0.3.47",
   "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": {
@@ -64,34 +64,14 @@
     "README.md",
     "README.en.md"
   ],
-  "scripts": {
-    "vendor:vscode": "node scripts/vendor-vscode-server.mjs",
-    "vendor:latest": "node scripts/vendor-vscode-server.mjs --force",
-    "vendor:check": "node scripts/vendor-vscode-server.mjs --check",
-    "vendor:code-server": "node scripts/vendor-code-server.mjs",
-    "repack:build": "node scripts/vendor-repacks.mjs",
-    "publish:repacks": "node scripts/publish-repacks.mjs",
-    "publish:plugin": "node scripts/publish-plugin.mjs",
-    "promote": "node scripts/promote.mjs",
-    "prepack": "node scripts/vendor-vscode-server.mjs && node scripts/build-webview.mjs",
-    "build:client": "node scripts/build-client.mjs",
-    "build:webview": "node scripts/build-webview.mjs",
-    "test:apply": "node scripts/test-plugin-apply.mjs",
-    "test:launcher-routes": "node scripts/test-launcher-routes.mjs",
-    "test:fullscreen": "node scripts/test-sidebar-fullscreen.mjs",
-    "test:claim-types": "node scripts/test-claim-types.mjs",
-    "test:workspace-switch": "node scripts/test-workspace-switch.mjs",
-    "test:bridge-routes": "node scripts/test-bridge-routes.mjs",
-    "test:bridge-extension": "node scripts/test-bridge-extension.mjs",
-    "test:webview": "node scripts/test-webview-bundle.mjs",
-    "test:vendored": "node scripts/test-vendored-table.mjs"
-  },
   "devDependencies": {
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-theme": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.6-alpha.1",
+    "@deepseek-ai/dsh-client-ui-theme": "0.1.6-alpha.1",
+    "@deepseek-ai/schemastery": "3.18.2",
     "@shikijs/langs": "4.3.1",
     "anser": "2.3.5",
     "clsx": "2.0.0",
+    "diff": "9.0.0",
     "esbuild": "^0.25.0",
     "katex": "0.16.47",
     "mdast-util-from-markdown": "2.0.3",
@@ -138,17 +118,21 @@
     "@xterm/addon-webgl": "0.20.0-beta.299",
     "@xterm/headless": "6.1.0-beta.302",
     "@xterm/xterm": "6.1.0-beta.303",
+    "bindings": "1.5.0",
     "cookie": "0.7.2",
     "detect-libc": "2.1.2",
+    "fs-extra": "11.4.0",
     "http-proxy-agent": "7.0.0",
     "https-proxy-agent": "7.0.2",
     "jschardet": "3.1.4",
     "minimist": "1.2.8",
+    "mkdirp": "1.0.4",
     "node-addon-api": "6.1.0",
     "tar": "7.5.22",
     "tas-client": "0.4.3",
     "tslib": "2.8.1",
     "typescript": "6.0.3",
+    "uuid": "14.0.2",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "3.1.0",
     "vscode-textmate": "9.3.2",
@@ -174,5 +158,29 @@
     "@jinsiyu/dshcs-vscode-windows-process-tree-win32-x64": "0.8.0",
     "@jinsiyu/dshcs-vscode-windows-registry-win32-arm64": "1.2.0",
     "@jinsiyu/dshcs-vscode-windows-registry-win32-x64": "1.2.0"
+  },
+  "scripts": {
+    "test": "node scripts/run-all-tests.mjs",
+    "test:all": "node scripts/run-all-tests.mjs",
+    "test:installed": "node scripts/test-installed.mjs",
+    "vendor:vscode": "node scripts/vendor-vscode-server.mjs",
+    "vendor:latest": "node scripts/vendor-vscode-server.mjs --force",
+    "vendor:check": "node scripts/vendor-vscode-server.mjs --check",
+    "vendor:code-server": "node scripts/vendor-code-server.mjs",
+    "repack:build": "node scripts/vendor-repacks.mjs",
+    "publish:repacks": "node scripts/publish-repacks.mjs",
+    "publish:plugin": "node scripts/publish-plugin.mjs",
+    "promote": "node scripts/promote.mjs",
+    "build:client": "node scripts/build-client.mjs",
+    "build:webview": "node scripts/build-webview.mjs",
+    "test:apply": "node scripts/test-plugin-apply.mjs",
+    "test:launcher-routes": "node scripts/test-launcher-routes.mjs",
+    "test:fullscreen": "node scripts/test-sidebar-fullscreen.mjs",
+    "test:claim-types": "node scripts/test-claim-types.mjs",
+    "test:workspace-switch": "node scripts/test-workspace-switch.mjs",
+    "test:bridge-routes": "node scripts/test-bridge-routes.mjs",
+    "test:bridge-extension": "node scripts/test-bridge-extension.mjs",
+    "test:webview": "node scripts/test-webview-bundle.mjs",
+    "test:vendored": "node scripts/test-vendored-table.mjs"
   }
-}
+}

package/scripts/vendor-repacks.mjs

@@ -283,8 +283,14 @@ function prepareSourceTree() {
   rmSync(tmp, { recursive: true, force: true });
   mkdirSync(tmp, { recursive: true });
   console.log(`[repack] 准备完整源树 code-server@${vendorVersion} → ${tmp}`);
+  // **必须显式 --prefix**:不给它时 npm 会往上找"最近的 package.json"当项目根 —— 而 tmp 就在
+  // 仓库目录里面(<pkgRoot>/.vendor-tmp/repack-src-<pid>),于是包被装进 <pkgRoot>/node_modules,
+  // 而下面按 <tmp>/node_modules/code-server 去找 ⇒ readJson() 拿到 null ⇒ analyze() 读
+  // `.dependencies` 时直接 TypeError。2026-09-16 在 ubuntu-latest 上实测到:日志里连
+  // 「解包内部依赖」都没有(innerDirs 是空的),因为树根本不在那儿。vendor-vscode-server.mjs
+  // 的同一步带了 --prefix,所以那条路一直是对的 —— 这里补齐。
   npm(['install', `code-server@${vendorVersion}`, '--ignore-scripts', '--omit=dev',
-    '--no-audit', '--no-fund', '--no-save'], tmp);
+    '--no-audit', '--no-fund', '--no-save', '--prefix', tmp], tmp);
   const tree = join(tmp, 'node_modules', 'code-server');
   const innerDirs = [join('lib', 'vscode'), join('lib', 'vscode', 'extensions')]
     .map((rel) => join(tree, rel))

package/vendor/VENDOR.json

@@ -3,10 +3,10 @@
   "vscodeVersion": "1.137.0",
   "productPath": "stable-b11dabdaca0d3369986975be285db92c8795cea5",
   "layout": "vscode-only",
-  "preparedAt": "2026-09-13T13:24:33.857Z",
+  "preparedAt": "2026-09-16T15:37:21.154Z",
   "source": "registry",
-  "node": "v24.21.0",
-  "platform": "win32",
-  "arch": "arm64",
+  "node": "v24.20.0",
+  "platform": "linux",
+  "arch": "x64",
   "sizeMB": 197.9
 }