dsh-code-server-app 0.1.43 → 0.2.0

package/lib/launcher.mjs

@@ -0,0 +1,313 @@
+/**
+ * lib/launcher.mjs — VS Code server 的最小启动器(取代 code-server 的 out/node/** 服务层)。
+ *
+ * 它在**子进程**里加载 <tree>/lib/vscode/out/server-main.js,自建 node:http 把请求交给
+ * VS Code 的 handleRequest/handleUpgrade,并补齐 code-server 原先负责的少量 HTTP 面:
+ *   /healthz           就绪探针(host 轮询;也回传最近一次 upgrade 路径,便于排障)
+ *   /manifest.json     PWA manifest(VS Code server 不提供)
+ *   /_static/*         浏览器静态资源(favicon / PWA 图标 / serviceWorker.js)
+ *   /proxy/:port/…     转发端口 HTTP 代理(Ports 面板;WS 版仅在 loopback 模式可用)
+ *
+ * 为什么是独立进程:VS Code 的 server 会改进程全局(win32 下 import 即 chdir、覆盖
+ * Error.stackTraceLimit、注册 SIGPIPE、patch Module._resolveLookupPaths、多处 process.exit),
+ * 且 node-pty/sqlite 崩溃时必须只带走 IDE,不能带走 DSH host。
+ *
+ * 用法(由 lib/index.js 调用,不面向用户):
+ *   node lib/launcher.mjs --tree <VS Code 树根> --user-data-dir <dir> --extensions-dir <dir> \
+ *        (--port <n> [--host 127.0.0.1] | --pipe <\\.\pipe\name|unix socket>) \
+ *        [--parent-pid <pid>] [--locale zh-cn]
+ *
+ * 就绪信号:stdout 打印 `dshcs-ready <productPath> <mode> <addr>`。
+ */
+
+import { createServer as createHttpServer, request as httpRequest } from 'node:http';
+import { createReadStream, existsSync, mkdirSync, readFileSync, statSync } from 'node:fs';
+import { connect } from 'node:net';
+import { dirname, extname, join, normalize, resolve, sep } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+const HERE = dirname(fileURLToPath(import.meta.url));
+const PACKAGE_ROOT = resolve(HERE, '..');
+
+// ---------------------------------------------------------------- 参数
+
+function parseArgs(argv) {
+  const out = {
+    tree: process.env.DSHCS_VS_ROOT ?? null,
+    userDataDir: null,
+    extensionsDir: null,
+    host: '127.0.0.1',
+    port: null,
+    pipe: null,
+    parentPid: null,
+    locale: null,
+    disableProxy: false,
+  };
+  for (let i = 0; i < argv.length; i += 1) {
+    const a = argv[i];
+    if (a === '--tree') out.tree = argv[++i];
+    else if (a === '--user-data-dir') out.userDataDir = argv[++i];
+    else if (a === '--extensions-dir') out.extensionsDir = argv[++i];
+    else if (a === '--host') out.host = argv[++i];
+    else if (a === '--port') out.port = Number(argv[++i]);
+    else if (a === '--pipe') out.pipe = argv[++i];
+    else if (a === '--parent-pid') out.parentPid = Number(argv[++i]);
+    else if (a === '--locale') out.locale = argv[++i];
+    else if (a === '--disable-proxy') out.disableProxy = true;
+  }
+  return out;
+}
+
+const args = parseArgs(process.argv.slice(2));
+const log = (...parts) => console.log('[dshcs-launcher]', ...parts);
+const fail = (message) => { console.error('[dshcs-launcher] FATAL', message); process.exit(2); };
+
+if (args.tree === null) fail('缺少 --tree(或环境变量 DSHCS_VS_ROOT)');
+const tree = resolve(args.tree);
+const serverMain = join(tree, 'lib', 'vscode', 'out', 'server-main.js');
+if (!existsSync(serverMain)) fail(`不是一棵 VS Code 树(缺少 ${serverMain})`);
+if (args.pipe === null && !Number.isFinite(args.port)) fail('必须给 --port 或 --pipe');
+
+const userDataDir = resolve(args.userDataDir ?? join(PACKAGE_ROOT, '.dshcs-data', 'user-data'));
+const extensionsDir = resolve(args.extensionsDir ?? join(userDataDir, '..', 'extensions'));
+mkdirSync(userDataDir, { recursive: true });
+mkdirSync(extensionsDir, { recursive: true });
+
+const product = (() => {
+  try { return JSON.parse(readFileSync(join(tree, 'lib', 'vscode', 'product.json'), 'utf8')); } catch { return {}; }
+})();
+const productPath = `${product.quality ?? 'oss'}-${product.commit ?? 'dev'}`;
+
+// ---------------------------------------------------------------- 进程护栏(必须 import 前)
+
+process.env.CODE_SERVER_PARENT_PID ??= String(process.pid);
+process.env.VSCODE_HANDLES_SIGPIPE ??= '1';
+process.env.VSCODE_CWD ??= process.cwd();
+
+let vsServer = null;
+const recentUpgrades = [];
+
+async function loadVscodeServer() {
+  const cwdBefore = process.cwd();
+  const mod = await import(pathToFileURL(serverMain).href);
+  // win32 下 server-main 顶层 DB() 会 chdir 到 dirname(process.execPath),立即复位
+  try { if (process.cwd() !== cwdBefore) process.chdir(cwdBefore); } catch { /* ignore */ }
+  const serverModule = await mod.loadCodeWithNls();
+  const codeArgs = {
+    auth: 'none',
+    'user-data-dir': userDataDir,
+    'extensions-dir': extensionsDir,
+    'accept-server-license-terms': true,
+    compatibility: '1.64',
+    'without-connection-token': true,
+    'disable-telemetry': true,
+    'disable-update-check': true,
+    _: [],
+  };
+  if (args.locale !== null) codeArgs.locale = args.locale;
+  return serverModule.createServer(null, codeArgs);
+}
+
+// ---------------------------------------------------------------- 静态资源(/_static/*)
+
+const MIME = {
+  '.svg': 'image/svg+xml; charset=utf-8',
+  '.ico': 'image/x-icon',
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg',
+  '.js': 'text/javascript; charset=utf-8',
+  '.css': 'text/css; charset=utf-8',
+  '.json': 'application/json; charset=utf-8',
+  '.txt': 'text/plain; charset=utf-8',
+  '.webmanifest': 'application/manifest+json',
+};
+
+function serveTreeStatic(urlPath, res) {
+  const rel = decodeURIComponent(urlPath.replace(/^\/_static\/?/, ''));
+  const full = normalize(join(tree, rel));
+  if (full !== tree && !full.startsWith(tree + sep)) { res.writeHead(403); res.end('forbidden'); return; }
+  let stat;
+  try { stat = statSync(full); } catch { res.writeHead(404); res.end(); return; }
+  if (!stat.isFile()) { res.writeHead(404); res.end(); return; }
+  const headers = {
+    'content-type': MIME[extname(full).toLowerCase()] ?? 'application/octet-stream',
+    'cache-control': 'public, max-age=3600',
+  };
+  if (full.endsWith('serviceWorker.js')) headers['service-worker-allowed'] = '/';
+  res.writeHead(200, headers);
+  createReadStream(full).pipe(res);
+}
+
+function manifestBody() {
+  return JSON.stringify({
+    name: product.nameShort ?? 'code-server',
+    short_name: product.nameShort ?? 'code-server',
+    start_url: '.',
+    display: 'fullscreen',
+    display_override: ['window-controls-overlay'],
+    description: 'Run Code on a remote server.',
+    icons: [192, 512].flatMap((size) => ([
+      { src: `./_static/src/browser/media/pwa-icon-${size}.png`, type: 'image/png', sizes: `${size}x${size}`, purpose: 'any' },
+      { src: `./_static/src/browser/media/pwa-icon-maskable-${size}.png`, type: 'image/png', sizes: `${size}x${size}`, purpose: 'maskable' },
+    ])),
+  }, null, 2);
+}
+
+// ---------------------------------------------------------------- 转发端口代理(/proxy/:port、/absproxy/:port)
+
+const PROXY_RE = /^\/(abs)?proxy\/(\d{1,5})(\/.*)?$/;
+
+function proxyTarget(url) {
+  const m = PROXY_RE.exec(new URL(url, 'http://x').pathname);
+  if (m === null) return null;
+  const port = Number(m[2]);
+  if (!Number.isInteger(port) || port <= 0 || port > 65535) return null;
+  const rest = m[3] ?? '/';
+  const search = new URL(url, 'http://x').search;
+  return { port, path: m[1] === 'abs' ? `${rest}${search}` : `${rest}${search}` };
+}
+
+function handleProxy(req, res, target) {
+  const upstream = httpRequest({
+    host: '127.0.0.1',
+    port: target.port,
+    method: req.method,
+    path: target.path,
+    headers: stripHopHeaders(req.headers),
+  }, (upstreamRes) => {
+    res.writeHead(upstreamRes.statusCode ?? 502, upstreamRes.headers);
+    upstreamRes.pipe(res);
+  });
+  upstream.on('error', (error) => {
+    log(`proxy ${target.port} failed: ${error.message}`);
+    if (!res.headersSent) res.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' });
+    res.end(`proxy error: ${error.message}`);
+  });
+  req.pipe(upstream);
+}
+
+function stripHopHeaders(headers) {
+  const out = { ...headers };
+  delete out.connection;
+  delete out['proxy-connection'];
+  return out;
+}
+
+function handleProxyUpgrade(req, socket, head, target) {
+  const upstream = connect({ host: '127.0.0.1', port: target.port }, () => {
+    const lines = [`GET ${target.path} 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.length > 0) upstream.write(head);
+    upstream.pipe(socket);
+    socket.pipe(upstream);
+  });
+  upstream.on('error', (error) => { log(`proxy ws ${target.port} failed: ${error.message}`); socket.destroy(); });
+  socket.on('error', () => upstream.destroy());
+  socket.on('close', () => upstream.destroy());
+}
+
+// ---------------------------------------------------------------- HTTP / WS 分发
+
+const server = createHttpServer((req, res) => {
+  const url = req.url ?? '/';
+  if (url === '/healthz') {
+    res.writeHead(200, { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' });
+    res.end(JSON.stringify({
+      ok: true,
+      productPath,
+      pid: process.pid,
+      mode: args.pipe === null ? 'tcp' : 'pipe',
+      recentUpgrades: recentUpgrades.slice(-3),
+    }));
+    return;
+  }
+  if (url === '/manifest.json') {
+    res.writeHead(200, { 'content-type': 'application/manifest+json; charset=utf-8' });
+    res.end(manifestBody());
+    return;
+  }
+  if (url.startsWith('/_static/')) { serveTreeStatic(url, res); return; }
+  if (!args.disableProxy) {
+    const target = proxyTarget(url);
+    if (target !== null) { handleProxy(req, res, target); return; }
+  }
+  Promise.resolve(vsServer.handleRequest(req, res)).catch((error) => {
+    log(`handleRequest failed: ${error && error.stack ? error.stack : error}`);
+    if (!res.headersSent) res.writeHead(500, { 'content-type': 'text/plain; charset=utf-8' });
+    if (!res.writableEnded) res.end('internal error');
+  });
+});
+
+server.on('upgrade', (req, socket, head) => {
+  const url = req.url ?? '/';
+  recentUpgrades.push(url);
+  if (recentUpgrades.length > 10) recentUpgrades.shift();
+  if (!args.disableProxy) {
+    const target = proxyTarget(url);
+    if (target !== null) { handleProxyUpgrade(req, socket, head, target); return; }
+  }
+  socket.pause();
+  req.ws = socket;
+  req.head = head;
+  try {
+    vsServer.handleUpgrade(req, socket);
+  } catch (error) {
+    log(`handleUpgrade threw: ${error && error.message ? error.message : error}`);
+    socket.destroy();
+  }
+  socket.resume();
+});
+
+// ---------------------------------------------------------------- 生命周期
+
+let shuttingDown = false;
+async function shutdown(reason, code = 0) {
+  if (shuttingDown) return;
+  shuttingDown = true;
+  log(`shutting down (${reason})`);
+  try { await vsServer?.dispose?.(); } catch (error) { log(`dispose failed: ${error && error.message}`); }
+  const done = () => process.exit(code);
+  try { server.close(done); } catch { done(); }
+  setTimeout(() => process.exit(code), 3000).unref();
+}
+
+for (const sig of ['SIGINT', 'SIGTERM']) process.on(sig, () => { void shutdown(sig); });
+
+// 父进程(DSH host)消失 → 自行退出,避免留下孤儿 IDE 进程
+if (Number.isFinite(args.parentPid) && args.parentPid > 0) {
+  const parentPid = args.parentPid;
+  const timer = setInterval(() => {
+    try {
+      process.kill(parentPid, 0);
+    } catch (error) {
+      if (error && error.code === 'ESRCH') void shutdown(`parent ${parentPid} gone`);
+    }
+  }, 5000);
+  timer.unref();
+}
+
+// ---------------------------------------------------------------- 启动
+
+try {
+  vsServer = await loadVscodeServer();
+} catch (error) {
+  fail(`加载 VS Code server 失败: ${error && error.stack ? error.stack : error}`);
+}
+
+const listenTarget = args.pipe === null ? { host: args.host, port: args.port } : args.pipe;
+server.on('error', (error) => { fail(`监听失败(${JSON.stringify(listenTarget)}): ${error.message}`); });
+
+server.listen(listenTarget, () => {
+  const addr = server.address();
+  const shown = typeof addr === 'string' ? addr : `${addr.address}:${addr.port}`;
+  log(`listening on ${shown} (tree=${tree})`);
+  log(`user-data-dir=${userDataDir} extensions-dir=${extensionsDir}`);
+  console.log(`dshcs-ready ${productPath} ${args.pipe === null ? 'tcp' : 'pipe'} ${shown}`);
+});
+
+// 兜底:未捕获异常不应静默留下半死进程
+process.on('uncaughtException', (error) => {
+  console.error('[dshcs-launcher] uncaughtException', error && error.stack ? error.stack : error);
+  void shutdown('uncaughtException', 1);
+});

package/lib/serve-dsh.mjs

@@ -0,0 +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,
+  };
+}

package/lib/vendor.js

@@ -1,15 +1,17 @@
-// lib/vendor.js — 内置 code-server 产物的路径工具(host 与脚本共用)。
+// lib/vendor.js — 内置 VS Code 产物的路径工具(host 与脚本共用)。
 //
-// 模型(0.1.37 起):
-//   - code-server 本体 + 它自己的运行时依赖(约 232MB 解包)打成**平台专属子包**发布:
-//       @<scope>/dshcs-code-server-<platform>-<arch>@<code-server 版本>
-//     (os/cpu 限定,挂在插件 optionalDependencies 上 → pnpm 按架构自动选中);
-//     子包内布局:<pkg>/code-server/{out,lib/vscode,node_modules,…};
+// 模型(重构后,0.2.0 起):
+//   - VS Code 树 + 少量浏览器静态资源打成**平台无关子包**发布:
+//       @<scope>/dshcs-vscode-server@<code-server 版本>
+//     子包内布局:<pkg>/vscode/{lib/vscode,out/browser,src/browser,…};
+//     旧的全量树 @<scope>/dshcs-code-server@<版本> 仍然可作回退(0.1.43 及更早)。
+//   - code-server 的 Node 服务层(out/node/** + 136 个依赖)不再随包发布:
+//     由插件自带的 lib/launcher.mjs 取代(见 docs/analysis-code-server-as-dsh-plugin.md)。
 //   - VS Code 内部依赖(约 1GB)与需编译的原生模块仍由包管理器安装:
-//       纯 JS 部分写在插件 package.json 的 dependencies;
-//       pnpm 拒绝安装的原生包由 scripts/vendor-repacks.mjs 重打包成 @<scope>/dshcs-*,
-//       再由平台聚合包 @<scope>/dsh-code-server-runtime-<platform>-<arch> 用 npm: 别名装回原名字;
-//   - 插件包内 `vendor/code-server/` 只作为**开发期/兼容**回退(0.1.37 起不再随包发布)。
+//     纯 JS 部分写在插件 package.json 的 dependencies;
+//     pnpm 拒绝安装的原生包由 scripts/vendor-repacks.mjs 重打包成 @<scope>/dshcs-*,
+//     再由平台聚合包 @<scope>/dsh-code-server-runtime-<platform>-<arch> 用 npm: 别名装回原名字;
+//   - 插件包内 `vendor/vscode/` 只作为**开发期/兼容**回退(发布包不含 vendor)。
 import { createRequire } from 'node:module';
 import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
@@ -18,8 +20,10 @@ import { fileURLToPath } from 'node:url';
 const here = dirname(fileURLToPath(import.meta.url)); // <pkg>/lib
 const require_ = createRequire(import.meta.url);
 export const PACKAGE_ROOT = resolve(here, '..');
-/** 包内 code-server 树(0.1.36 及更早随包发布;现在仅开发期/兼容回退)。 */
-export const VENDOR_TREE = join(PACKAGE_ROOT, 'vendor', 'code-server');
+/** 包内 VS Code 树(新模型;发布包不含,仅开发期/兼容回退)。 */
+export const VENDOR_TREE = join(PACKAGE_ROOT, 'vendor', 'vscode');
+/** 包内旧全量 code-server 树(0.1.43 及更早;仅兼容回退)。 */
+export const LEGACY_VENDOR_TREE = join(PACKAGE_ROOT, 'vendor', 'code-server');
 const VENDOR_META = join(PACKAGE_ROOT, 'vendor', 'VENDOR.json');
 /** 旧版安装根目录名(0.1.35 及更早);仅用于迁移提示。 */
 export const APP_DIR_NAME = '.code-server-app';
@@ -37,14 +41,31 @@ export function legacyInstallRoot() {
   return profileRoot !== null ? join(profileRoot, APP_DIR_NAME) : null;
 }
 
-/** code-server 本体包名(0.1.38+ 平台无关):取插件 dependencies 里的 @<scope>/dshcs-code-server。 */
-export function codeServerPackageName() {
+function declaredDependencyNames() {
   try {
     const manifest = JSON.parse(readFileSync(join(PACKAGE_ROOT, 'package.json'), 'utf8'));
-    const declared = { ...(manifest.dependencies ?? {}), ...(manifest.optionalDependencies ?? {}) };
-    const hit = Object.keys(declared).find((name) => /^@[^/]+\/dshcs-code-server$/.test(name));
-    if (hit !== undefined) return hit;
-  } catch { /* 回退默认 scope */ }
+    return {
+      ...(manifest.dependencies ?? {}),
+      ...(manifest.optionalDependencies ?? {}),
+    };
+  } catch {
+    return {};
+  }
+}
+
+/** VS Code 树包名(0.2.0+ 平台无关):取插件 dependencies 里的 @<scope>/dshcs-vscode-server。 */
+export function vscodeServerPackageName() {
+  const declared = declaredDependencyNames();
+  const hit = Object.keys(declared).find((name) => /^@[^/]+\/dshcs-vscode-server$/.test(name));
+  if (hit !== undefined) return hit;
+  return '@jinsiyu/dshcs-vscode-server';
+}
+
+/** 旧 code-server 全量树包名(0.1.43 及更早):@<scope>/dshcs-code-server。 */
+export function codeServerPackageName() {
+  const declared = declaredDependencyNames();
+  const hit = Object.keys(declared).find((name) => /^@[^/]+\/dshcs-code-server$/.test(name));
+  if (hit !== undefined) return hit;
   return '@jinsiyu/dshcs-code-server';
 }
 
@@ -53,34 +74,73 @@ export function legacyCodeServerPackageName(platform = process.platform, arch =
   return `@jinsiyu/dshcs-code-server-${platform}-${arch}`;
 }
 
-/** 解析某个包目录下的 code-server 运行根(包内布局:<pkg>/code-server/**)。 */
+/** 解析某个包目录下的 VS Code 树根。
+ *  新布局:<pkg>/vscode/lib/vscode/out/server-main.js;旧布局:<pkg>/code-server/out/node/entry.js。 */
 function rootOfPackage(name) {
   try {
     const manifest = require_.resolve(`${name}/package.json`);
-    const root = join(dirname(manifest), 'code-server');
-    if (existsSync(join(root, 'out', 'node', 'entry.js'))) return root;
+    const base = dirname(manifest);
+    const slim = join(base, 'vscode');
+    if (existsSync(join(slim, 'lib', 'vscode', 'out', 'server-main.js'))) return slim;
+    const legacy = join(base, 'code-server');
+    if (existsSync(join(legacy, 'out', 'node', 'entry.js'))) return legacy;
   } catch { /* 未安装 */ }
   return null;
 }
 
-/** code-server 运行根:① 本体包(0.1.38+ 平台无关)> ② 旧平台子包(0.1.37)> ③ 包内 vendor(开发期)。
- *  @returns {string|null} 绝对路径,如 <profile>\node_modules\@jinsiyu\dshcs-code-server\code-server */
-export function codeServerRoot() {
-  const root = rootOfPackage(codeServerPackageName()) ?? rootOfPackage(legacyCodeServerPackageName());
+/** 是否是一棵「精简 VS Code 树」(含 lib/vscode/out/server-main.js,不含 code-server 服务层)。 */
+export function isVscodeOnlyTree(root) {
+  return root !== null && existsSync(join(root, 'lib', 'vscode', 'out', 'server-main.js'));
+}
+
+/** VS Code 树根(新包 > 旧包 > 旧平台子包 > 包内 vendor/vscode > 包内 vendor/code-server)。
+ *  @returns {string|null} 绝对路径,如 <profile>\node_modules\@jinsiyu\dshcs-vscode-server\vscode */
+export function vsRoot() {
+  const root = rootOfPackage(vscodeServerPackageName())
+    ?? rootOfPackage(codeServerPackageName())
+    ?? rootOfPackage(legacyCodeServerPackageName());
   if (root !== null) return root;
-  if (existsSync(join(VENDOR_TREE, 'out', 'node', 'entry.js'))) return VENDOR_TREE;
+  if (existsSync(join(VENDOR_TREE, 'lib', 'vscode', 'out', 'server-main.js'))) return VENDOR_TREE;
+  if (existsSync(join(LEGACY_VENDOR_TREE, 'out', 'node', 'entry.js'))) return LEGACY_VENDOR_TREE;
   return null;
 }
 
-/** code-server 入口脚本(out/node/entry.js);不可用时返回 null。 */
+/** VS Code server 入口(<树根>/lib/vscode/out/server-main.js);不可用时返回 null。 */
+export function vsServerEntry() {
+  const root = vsRoot();
+  if (root === null) return null;
+  const entry = join(root, 'lib', 'vscode', 'out', 'server-main.js');
+  return existsSync(entry) ? entry : null;
+}
+
+/** VS Code 树根(兼容别名:0.1.43 及更早的调用点用这个名字)。 */
+export function codeServerRoot() {
+  return vsRoot();
+}
+
+/** code-server 入口脚本(旧全量树的 out/node/entry.js);精简树下返回 null。 */
 export function codeServerEntry() {
-  const root = codeServerRoot();
-  return root !== null ? join(root, 'out', 'node', 'entry.js') : null;
+  const root = vsRoot();
+  if (root === null) return null;
+  const entry = join(root, 'out', 'node', 'entry.js');
+  return existsSync(entry) ? entry : null;
 }
 
 /** code-server 运行根(旧名,脚本/调用方沿用)。 */
 export function codeServerTarget() {
-  return codeServerRoot();
+  return vsRoot();
+}
+
+/** VS Code 客户端约定的产品路径(quality-commit);从 product.json 现算,禁止硬编码。 */
+export function productPath(root = vsRoot()) {
+  if (root !== null) {
+    try {
+      const product = JSON.parse(readFileSync(join(root, 'lib', 'vscode', 'product.json'), 'utf8'));
+      return `${product.quality ?? 'oss'}-${product.commit ?? 'dev'}`;
+    } catch { /* 回退 VENDOR.json */ }
+  }
+  const meta = readVendorMeta();
+  return typeof meta?.productPath === 'string' && meta.productPath !== '' ? meta.productPath : null;
 }
 
 export function readTreeVersion(dir) {
@@ -108,10 +168,11 @@ export function vendoredVersion() {
   if (meta !== null && typeof meta.codeServerVersion === 'string' && meta.codeServerVersion !== '') {
     return meta.codeServerVersion;
   }
-  return readTreeVersion(VENDOR_TREE);
+  return readTreeVersion(VENDOR_TREE) ?? readTreeVersion(LEGACY_VENDOR_TREE);
 }
 
-/** code-server 是否可用(平台子包已安装或包内 vendor 在位)。 */
+/** VS Code 树是否可用(包已安装或包内 vendor 在位)。 */
 export function vendorReady() {
-  return codeServerRoot() !== null;
+  return vsRoot() !== null;
 }
+