dsh-code-server-app 0.3.43 → 0.3.45

package/lib/index.js

@@ -35,7 +35,7 @@ import {
   vsRoot,
   vsServerEntry,
 } from './vendor.js';
-import { aliasNodePathDirs, ensureRuntimeLayout, resolveRuntime, runtimePackageName, verifyNatives } from './native.js';
+import { ensureRuntimeLayout, nativeRuntimeStatus } from './native.js';
 import { MOUNT_PATH, mountOnWebServer } from './serve-dsh.mjs';
 import { DEFAULT_CLAIM_EXTENSIONS, describeClaimPolicy, normalizeClaimExtensions } from './claim-types.js';
 import {
@@ -427,13 +427,12 @@ function envCheck() {
   const root = vsRoot();
   const entry = vsServerEntry();
   const inner = checkInnerDeps();
-  const runtime = resolveRuntime();
-  const natives = verifyNatives(runtime !== null ? runtime.modules : []);
+  const natives = nativeRuntimeStatus();
   const installed = root !== null ? readTreeVersion(root) : null;
   const vendored = vendoredVersion();
   return {
     ok: entry !== null && inner.missing.length === 0
-      && runtime !== null && natives.missing.length === 0,
+      && natives.resolved > 0 && natives.missing.length === 0,
     tree: root !== null ? root.replace(/\\/g, '/') : null,
     entry: entry !== null ? entry.replace(/\\/g, '/') : null,
     productPath: productPath(root),
@@ -442,16 +441,14 @@ function envCheck() {
     treeVersion: installed,
     vendored,
     upToDate: installed !== null && vendored !== null && installed === vendored,
-    // 本平台预编译原生产物(平台聚合包 + 它带回原始名字的原生模块)
-    nativeRuntime: runtime !== null
-      ? {
-        name: runtime.name,
-        source: 'package',
-        version: runtime.version,
-        packages: natives.resolved.length,
-        missing: natives.missing,
-      }
-      : { name: runtimePackageName(), source: null, version: null, packages: 0, missing: [] },
+    // 本平台预编译原生产物(重打包子包按真名装进依赖图,运行时按原名补 junction)
+    nativeRuntime: {
+      name: natives.name,
+      source: natives.source,
+      version: natives.version,
+      packages: natives.resolved,
+      missing: natives.missing,
+    },
     node: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -1650,14 +1647,9 @@ export async function apply(ctx, config) {
     // ?v= 缓存击穿标记:按"插件版本 + VS Code 树"生成 —— 只在真升级时让渲染器丢掉旧 bundle,
     // 平时正常命中缓存(workbench.js 有 18MB,每次启动都重拉不划算)。
     env.DSHCS_HTML_TAG = `${pluginVersion()}-${productPath() ?? 'dev'}`.replace(/[^A-Za-z0-9._-]/g, '');
-    // pnpm 会把带 os/cpu 限定的原生包嵌套装在平台聚合包下(如 <profile>/node_modules/@<scope>/
-    // dsh-code-server-runtime-<平台>-<架构>/node_modules/@vscode/spdlog),那些目录不在 VS Code
-    // 树的向上查找链里 → 用 NODE_PATH 让子进程的 require 找得到(CJS;ESM 由 ensureAliasLinks 的 junction 负责)。
-    const nodePathDirs = aliasNodePathDirs();
-    if (nodePathDirs.length > 0) {
-      const existing = typeof env.NODE_PATH === 'string' && env.NODE_PATH !== '' ? env.NODE_PATH.split(path.delimiter) : [];
-      env.NODE_PATH = [...new Set([...nodePathDirs, ...existing])].join(path.delimiter);
-    }
+    // 0.3.45 起不再需要给子进程加 NODE_PATH:重打包原生包按**真名**挂在插件依赖上,而它们要的
+    // **原始名字**(node-pty / @vscode/sqlite3 …)由 ensureRuntimeLayout() 在树里补 junction ——
+    // 目录链同时满足 ESM import 与 CJS require,NODE_PATH 只对 CJS 生效且属兜底。
 
     let proc;
     try {
@@ -1781,7 +1773,7 @@ export async function apply(ctx, config) {
       parts.push(`内部依赖未装全(缺 ${missing.length} 个:${missing.slice(0, 5).join(', ')}${missing.length > 5 ? ' …' : ''})`);
     }
     if (env.nativeRuntime !== null && env.nativeRuntime.source === null) {
-      parts.push(`平台预编译包未安装(${env.nativeRuntime.name})`);
+      parts.push(`预编译原生模块未安装(${env.nativeRuntime.name})`);
     } else if (Array.isArray(env.nativeRuntime?.missing) && env.nativeRuntime.missing.length > 0) {
       parts.push(`原生模块解析失败:${env.nativeRuntime.missing.slice(0, 5).join(', ')}`);
     }

package/lib/native.js

@@ -1,90 +1,93 @@
-// lib/native.js — 平台聚合包(预编译原生模块)的定位与校验。
+// lib/native.js — 预编译原生模块(重打包子包)的定位、校验与目录链还原。
 //
-// 模型(0.1.36 起):VS Code 内部依赖里那批「pnpm 拒绝安装」的原生包(node-pty /
-// @vscode/sqlite3 / kerberos / koffi / ssh2 / cpu-features / @parcel/watcher /
-// @vscode/windows-* …)在打包期由 scripts/vendor-repacks.mjs 重打包成
-// @<scope>/dshcs-<名字>[-<平台>-<架构>],再由平台聚合包
-//   @<scope>/dsh-code-server-runtime-<平台>-<架构>
-// 用 npm: 别名把它们装回**原始名字**。聚合包挂在插件 package.json 的
-// optionalDependencies 上(os/cpu 限定)→ pnpm 一条命令按架构自动选中。
+// 模型(0.3.45 起,取代 0.1.36 的「平台聚合包 + npm: 别名」):
+//   VS Code 内部依赖里那批「pnpm 拒绝安装」的原生包(node-pty / @vscode/sqlite3 / kerberos /
+//   koffi / ssh2 / cpu-features / @parcel/watcher / @vscode/windows-* …)在打包期由
+//   scripts/vendor-repacks.mjs 重打包成 @<scope>/dshcs-<名字>[-<平台>-<架构>],并**直接挂在插件
+//   依赖上**:
+//     · 平台无关的重打包包 → 插件 `dependencies`(真名,如 @<scope>/dshcs-node-pty);
+//     · 平台专属的重打包包 → 插件 `optionalDependencies`(真名 + 包自带 os/cpu,每平台一份,
+//       包管理器按架构自动选中,不匹配的在 lockfile 里是 optional ⇒ 缺失是允许的)。
 //
-// 本模块只做三件事:
-//   1. 找到本平台聚合包(以及它的依赖清单 = 期望可解析的原生模块名);
-//   2. 从 code-server 运行位置出发校验这些模块是否真的能 require 到;
-//   3. 必要时在 code-server 树里补齐别名 junction(ESM import 不认 NODE_PATH,只能靠目录链)。
+//   为什么不沿用聚合包:聚合包把 16 个包挂在**可选子树**里,靠 `npm:` 别名还原原始名字;
+//   而 dsh-desktop 的依赖图校验器在 `pnpm add` 之后立刻校验,偏偏 pnpm 的增量 hoisted 安装会
+//   漏链这类「可选子树里的别名包」(实测 16 个漏 9 个,报 requires missing @microsoft/mxc-sdk)。
+//   直接依赖(真名)在同一套设置下 100% 装上 ⇒ 改用直接依赖 + 运行时补 junction。
+//   实测证据与复现命令见 docs/desktop-first-install-root-cause.md。
+//
+//   「原名 → 真包」的表由打包期写进 lib/vendored.json(随包发布),本模块运行时只读它。
+//
+// 本模块只做四件事:
+//   1. 读 lib/vendored.json → 本平台期望可解析的「原名 → 真包」表;
+//   2. 从 code-server 运行位置出发校验这些原名是否真的能 require/import 到;
+//   3. 解析不到的在树里补 junction(ESM 不认 NODE_PATH,只认目录链);
+//   4. 给环境检测卡片一份状态汇总。
 import { createRequire } from 'node:module';
 import { existsSync, readFileSync, mkdirSync, symlinkSync, lstatSync, rmSync } from 'node:fs';
 import { dirname, join } from 'node:path';
-import { PACKAGE_ROOT, codeServerRoot, profileRootOf } from './vendor.js';
+import { PACKAGE_ROOT, codeServerRoot } from './vendor.js';
 
 const require_ = createRequire(import.meta.url);
+/** 打包期由 scripts/vendor-repacks.mjs 写出的重打包表。 */
+const VENDORED_FILE = join(PACKAGE_ROOT, 'lib', 'vendored.json');
 
 /** 平台目录名,如 win32-arm64。 */
 export function platformKey(platform = process.platform, arch = process.arch) {
   return `${platform}-${arch}`;
 }
 
-/** 本平台聚合包名(取插件 optionalDependencies 中匹配 <平台>-<架构> 的那个)。 */
-export function runtimePackageName(platform = process.platform, arch = process.arch) {
-  const key = platformKey(platform, arch);
+/** 读重打包表。
+ *  @returns {{scope:string, targets:string[], modules:{alias:string,package:string,version?:string,platform?:boolean}[]}} */
+export function readVendoredTable() {
   try {
-    const pkg = JSON.parse(readFileSync(join(PACKAGE_ROOT, 'package.json'), 'utf8'));
-    const declared = { ...(pkg.optionalDependencies ?? {}), ...(pkg.dependencies ?? {}) };
-    const hit = Object.keys(declared).find((name) => /^@[^/]+\/dsh-code-server-runtime-/.test(name) && name.endsWith(`-${key}`));
-    if (hit !== undefined) return hit;
-  } catch { /* 回退默认 scope */ }
-  return `@jinsiyu/dsh-code-server-runtime-${key}`;
+    const doc = JSON.parse(readFileSync(VENDORED_FILE, 'utf8'));
+    const modules = Array.isArray(doc?.modules)
+      ? doc.modules.filter((m) => m !== null && typeof m === 'object'
+        && typeof m.alias === 'string' && m.alias !== ''
+        && typeof m.package === 'string' && m.package !== '')
+      : [];
+    return {
+      scope: typeof doc?.scope === 'string' && doc.scope !== '' ? doc.scope : '@jinsiyu',
+      targets: Array.isArray(doc?.targets) ? doc.targets.filter((t) => typeof t === 'string') : [],
+      modules,
+    };
+  } catch {
+    return { scope: '@jinsiyu', targets: [], modules: [] };
+  }
 }
 
-/** 定位已安装的平台聚合包。
- *  @returns {{name:string, version:string|null, root:string, modules:string[]}|null} */
-export function resolveRuntime() {
-  const name = runtimePackageName();
-  const candidates = [];
-  try {
-    candidates.push(dirname(require_.resolve(`${name}/package.json`)));
-  } catch { /* 未安装 */ }
-  const profileRoot = profileRootOf();
-  for (const root of [join(PACKAGE_ROOT, 'node_modules'), profileRoot !== null ? join(profileRoot, 'node_modules') : null, PACKAGE_ROOT]) {
-    if (root !== null) candidates.push(join(root, name));
-  }
-  for (const root of candidates) {
-    const manifestPath = join(root, 'package.json');
-    if (!existsSync(manifestPath)) continue;
-    try {
-      const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'));
-      const modules = Object.keys({ ...(manifest.dependencies ?? {}), ...(manifest.optionalDependencies ?? {}) });
-      return { name, version: typeof manifest.version === 'string' ? manifest.version : null, root, modules };
-    } catch { /* 尝试下一个 */ }
-  }
-  return null;
+/** 某个条目在指定平台的**真包名**(平台专属的按 `-<平台>-<架构>` 拼后缀)。 */
+export function vendoredPackageName(entry, platform = process.platform, arch = process.arch) {
+  return entry.platform === true ? `${entry.package}-${platformKey(platform, arch)}` : entry.package;
+}
+
+/** 本平台期望装在依赖图里的重打包子包(原名 + 真名),按原名排序。
+ *  @returns {{alias:string, packageName:string, version:string|null, platform:boolean}[]} */
+export function vendoredEntries(platform = process.platform, arch = process.arch) {
+  return readVendoredTable().modules
+    .map((m) => ({
+      alias: m.alias,
+      packageName: vendoredPackageName(m, platform, arch),
+      version: typeof m.version === 'string' ? m.version : null,
+      platform: m.platform === true,
+    }))
+    .sort((a, b) => a.alias.localeCompare(b.alias));
 }
 
-/** 解析原生/别名模块时的锚点目录:
+/** 解析原生模块时的锚点目录:
  *   ① code-server 运行根(树自带 node_modules);
- *   ② 平台聚合包目录 —— pnpm 会把带 os/cpu 限定的包**嵌套装在聚合包下**
- *      (`<profile>/node_modules/@<scope>/dsh-code-server-runtime-<平台>-<架构>/node_modules/<别名>`),
- *      既不在 profile 根也不在 code-server 树里,所以要单独作为锚点(运行时用 NODE_PATH 覆盖同一批目录)。
- *  @returns {string[]} */
+ *   ② 插件包根 —— 重打包子包挂在插件依赖上(profile 根或插件自己的 node_modules),
+ *      从插件清单出发的解析链才看得到它们。 */
 export function nativeSearchRoots() {
   const roots = [];
   const cs = codeServerRoot();
   if (cs !== null) roots.push(cs);
-  const runtime = resolveRuntime();
-  if (runtime !== null) roots.push(runtime.root);
+  roots.push(PACKAGE_ROOT);
   return roots;
 }
 
-/** 运行时需要加进 NODE_PATH 的目录(平台聚合包下嵌套的别名包)。
- *  @returns {string[]} */
-export function aliasNodePathDirs() {
-  const runtime = resolveRuntime();
-  if (runtime === null) return [];
-  const dir = join(runtime.root, 'node_modules');
-  return existsSync(dir) ? [dir] : [];
-}
-
 /** 解析某个模块的包目录(依次尝试各锚点;先 `<name>/package.json`,再模块入口)。
+ *  @param {string} name 真包名(重打包子包名),如 `@jinsiyu/dshcs-node-pty`
  *  @returns {string|null} */
 export function resolveNativeDir(name) {
   for (const root of nativeSearchRoots()) {
@@ -101,22 +104,23 @@ export function resolveNativeDir(name) {
   return null;
 }
 
-/** 从 code-server 运行位置(与聚合包目录)校验原生模块能否解析。
- *  先试 `<name>/package.json`(ESM-only 包没有 require 入口,如 @microsoft/mxc-sdk),
- *  再退回 `<name>` 本身。
- *  @param {string[]} modules 期望的原生模块名(通常来自聚合包依赖清单)
+/** 从 code-server 运行位置校验原生模块能否解析(名字用「原名」,即 VS Code 实际 import 的名字)。
+ *  先试 `<name>/package.json`(ESM-only 包没有 require 入口,如 @microsoft/mxc-sdk),再退回 `<name>` 本身。
+ *  @param {string[]} modules 期望的原生模块名(别名)
  *  @returns {{resolved:string[], missing:string[]}} */
 export function verifyNatives(modules) {
+  const csRoot = codeServerRoot();
   const resolved = [];
   const missing = [];
   for (const name of modules) {
-    if (resolveNativeDir(name) !== null) resolved.push(name);
+    const ok = csRoot !== null && resolvesFromRoot(csRoot, name);
+    if (ok) resolved.push(name);
     else missing.push(name);
   }
   return { resolved, missing };
 }
 
-/** 某个模块能否**只靠 code-server 运行根**(含其祖先 node_modules)解析。 */
+/** 某个名字能否**只靠 code-server 运行根**(含其祖先 node_modules)解析。 */
 function resolvesFromRoot(root, name) {
   try {
     const from = createRequire(join(root, 'package.json'));
@@ -130,34 +134,33 @@ function resolvesFromRoot(root, name) {
   return false;
 }
 
-/** 确保聚合包带回的别名模块能被 **code-server 树**解析。
+/** 确保重打包子包能被 **code-server 树**按**原始名字**解析。
  *
- *  为什么必须做:pnpm 会把带 `os`/`cpu` 限定的包**嵌套装在聚合包自己的 node_modules 下**
- *  (如 `<profile>/node_modules/@<scope>/dsh-code-server-runtime-win32-arm64/node_modules/@vscode/windows-registry`),
- *  而 VS Code 的 `lib/vscode/out/server-main.js` 用 **ESM `import`** 加载这些包 —— ESM 不认
- *  `NODE_PATH`(那是 CJS 的兜底),只认目录链。所以这里在 `<codeServerRoot>/node_modules` 下
- *  为每个「从树里解析不到」的别名补一个 junction,指向聚合包内的真实目录。
+ *  为什么必须做:重打包子包的真名是 `@<scope>/dshcs-<名字>`,而 VS Code 的
+ *  `lib/vscode/out/server-main.js` 用 **ESM `import`** 加载 `node-pty` / `@vscode/sqlite3` 这类原名 ——
+ *  ESM 不认 `NODE_PATH`(那是 CJS 的兜底),只认目录链。所以这里在 `<树根>/node_modules` 下为每个
+ *  「从树里解析不到」的原名补一个 junction,指向插件依赖图里的真实目录。
  *  幂等、可重复调用;插件重装后由下次激活/启动自愈。
  *  @returns {{created:string[], failed:string[]}} */
 export function ensureAliasLinks() {
-  const runtime = resolveRuntime();
   const csRoot = codeServerRoot();
-  if (runtime === null || csRoot === null) return { created: [], failed: [] };
+  if (csRoot === null) return { created: [], failed: [] };
   const linkRoot = join(csRoot, 'node_modules');
   const created = [];
   const failed = [];
-  for (const alias of runtime.modules) {
-    if (resolvesFromRoot(csRoot, alias)) continue; // 目录链已能看到(profile 根或树内),无需补
-    const target = resolveNativeDir(alias);
-    if (target === null) continue; // 该平台包没装上 → 交给 envCheck 报缺
-    const link = join(linkRoot, alias);
+  for (const entry of vendoredEntries()) {
+    if (resolvesFromRoot(csRoot, entry.alias)) continue; // 目录链已能看到(profile 根或树内),无需补
+    const target = resolveNativeDir(entry.packageName);
+    if (target === null) continue; // 该平台子包没装上 → 交给 envCheck 报缺
+    const link = join(linkRoot, entry.alias);
     try {
-      if (existsSync(link)) continue;
+      if (existsSync(join(link, 'package.json'))) continue; // 链接有效(真实目录或有效 junction)
+      if (pathEntryExists(link)) rmSync(link, { recursive: true, force: true }); // 断链(树被重装过)→ 清掉重建
       mkdirSync(dirname(link), { recursive: true });
       symlinkSync(target, link, process.platform === 'win32' ? 'junction' : 'dir');
-      created.push(alias);
+      created.push(entry.alias);
     } catch (error) {
-      failed.push(`${alias}: ${error && error.message ? error.message : String(error)}`);
+      failed.push(`${entry.alias}: ${error && error.message ? error.message : String(error)}`);
     }
   }
   return { created, failed };
@@ -251,7 +254,7 @@ export function ensureInnerModuleLinks() {
   return { created, failed };
 }
 
-/** 一次性补齐两类链接:VS Code 内部依赖目录 + 聚合包别名。 */
+/** 一次性补齐两类链接:VS Code 内部依赖目录 + 重打包子包的原始名字。 */
 export function ensureRuntimeLayout() {
   const inner = ensureInnerModuleLinks();
   const aliases = ensureAliasLinks();
@@ -260,3 +263,28 @@ export function ensureRuntimeLayout() {
     failed: [...inner.failed, ...aliases.failed],
   };
 }
+
+/** 本平台预编译原生包的状态汇总(环境检测卡片用)。
+ *  @returns {{name:string, source:'package'|null, version:string|null, modules:number, packages:number,
+ *             resolved:number, missing:string[], missingPackages:string[]}} */
+export function nativeRuntimeStatus(platform = process.platform, arch = process.arch) {
+  const table = readVendoredTable();
+  const entries = vendoredEntries(platform, arch);
+  const installed = [];
+  const missingPackages = [];
+  for (const entry of entries) {
+    if (resolveNativeDir(entry.packageName) !== null) installed.push(entry);
+    else missingPackages.push(entry);
+  }
+  const { resolved, missing } = verifyNatives(entries.map((entry) => entry.alias));
+  return {
+    name: `${table.scope}/dshcs-*-${platformKey(platform, arch)}`,
+    source: installed.length > 0 ? 'package' : null,
+    version: null,
+    modules: entries.length,
+    packages: installed.length,
+    resolved: resolved.length,
+    missing,
+    missingPackages: missingPackages.map((entry) => entry.packageName),
+  };
+}

package/lib/vendor.js

@@ -10,7 +10,9 @@
 //   - VS Code 内部依赖(约 1GB)与需编译的原生模块仍由包管理器安装:
 //     纯 JS 部分写在插件 package.json 的 dependencies;
 //     pnpm 拒绝安装的原生包由 scripts/vendor-repacks.mjs 重打包成 @<scope>/dshcs-*,
-//     再由平台聚合包 @<scope>/dsh-code-server-runtime-<platform>-<arch> 用 npm: 别名装回原名字;
+//     并**直接挂在插件依赖上**(平台无关的 → dependencies;平台专属的 → optionalDependencies,
+//     包自带 os/cpu 按架构自动选)。原始名字由 lib/native.js 按 lib/vendored.json 补 junction ——
+//     0.3.45 起不再有平台聚合包,原因见 docs/desktop-first-install-root-cause.md;
 //   - 插件包内 `vendor/vscode/` 只作为**开发期/兼容**回退(发布包不含 vendor)。
 import { createRequire } from 'node:module';
 import { existsSync, readFileSync } from 'node:fs';

package/lib/vendored.json

@@ -0,0 +1,99 @@
+{
+  "schemaVersion": 1,
+  "generatedBy": "scripts/vendor-repacks.mjs",
+  "scope": "@jinsiyu",
+  "targets": [
+    "win32-arm64",
+    "win32-x64"
+  ],
+  "modules": [
+    {
+      "alias": "@microsoft/mxc-sdk",
+      "package": "@jinsiyu/dshcs-microsoft-mxc-sdk",
+      "version": "0.8.0"
+    },
+    {
+      "alias": "@parcel/watcher",
+      "package": "@jinsiyu/dshcs-parcel-watcher",
+      "version": "2.5.6"
+    },
+    {
+      "alias": "@vscode/deviceid",
+      "package": "@jinsiyu/dshcs-vscode-deviceid",
+      "version": "0.1.5",
+      "platform": true
+    },
+    {
+      "alias": "@vscode/fs-copyfile",
+      "package": "@jinsiyu/dshcs-vscode-fs-copyfile",
+      "version": "2.0.0"
+    },
+    {
+      "alias": "@vscode/native-watchdog",
+      "package": "@jinsiyu/dshcs-vscode-native-watchdog",
+      "version": "1.4.6",
+      "platform": true
+    },
+    {
+      "alias": "@vscode/proxy-agent",
+      "package": "@jinsiyu/dshcs-vscode-proxy-agent",
+      "version": "0.44.0"
+    },
+    {
+      "alias": "@vscode/spdlog",
+      "package": "@jinsiyu/dshcs-vscode-spdlog",
+      "version": "0.15.8",
+      "platform": true
+    },
+    {
+      "alias": "@vscode/sqlite3",
+      "package": "@jinsiyu/dshcs-vscode-sqlite3",
+      "version": "5.1.12-vscode",
+      "platform": true
+    },
+    {
+      "alias": "@vscode/windows-ca-certs",
+      "package": "@jinsiyu/dshcs-vscode-windows-ca-certs",
+      "version": "0.3.4",
+      "platform": true
+    },
+    {
+      "alias": "@vscode/windows-process-tree",
+      "package": "@jinsiyu/dshcs-vscode-windows-process-tree",
+      "version": "0.8.0",
+      "platform": true
+    },
+    {
+      "alias": "@vscode/windows-registry",
+      "package": "@jinsiyu/dshcs-vscode-windows-registry",
+      "version": "1.2.0",
+      "platform": true
+    },
+    {
+      "alias": "cpu-features",
+      "package": "@jinsiyu/dshcs-cpu-features",
+      "version": "0.0.10"
+    },
+    {
+      "alias": "kerberos",
+      "package": "@jinsiyu/dshcs-kerberos",
+      "version": "2.1.1-dshcs.1",
+      "platform": true
+    },
+    {
+      "alias": "koffi",
+      "package": "@jinsiyu/dshcs-koffi",
+      "version": "3.1.2"
+    },
+    {
+      "alias": "node-pty",
+      "package": "@jinsiyu/dshcs-node-pty",
+      "version": "1.2.0-beta.15"
+    },
+    {
+      "alias": "ssh2",
+      "package": "@jinsiyu/dshcs-ssh2",
+      "version": "1.17.0"
+    }
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.3.43",
+  "version": "0.3.45",
   "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": {
@@ -50,6 +50,7 @@
     "lib/serve-dsh.mjs",
     "lib/vendor.js",
     "lib/native.js",
+    "lib/vendored.json",
     "assets/favicon.ico",
     "assets/favicon.svg",
     "assets/extensions/dshcs-open-file",
@@ -63,6 +64,28 @@
     "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",
@@ -89,6 +112,14 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@jinsiyu/dshcs-cpu-features": "0.0.10",
+    "@jinsiyu/dshcs-koffi": "3.1.2",
+    "@jinsiyu/dshcs-microsoft-mxc-sdk": "0.8.0",
+    "@jinsiyu/dshcs-node-pty": "1.2.0-beta.15",
+    "@jinsiyu/dshcs-parcel-watcher": "2.5.6",
+    "@jinsiyu/dshcs-ssh2": "1.17.0",
+    "@jinsiyu/dshcs-vscode-fs-copyfile": "2.0.0",
+    "@jinsiyu/dshcs-vscode-proxy-agent": "0.44.0",
     "@jinsiyu/dshcs-vscode-server": "4.137.0",
     "@microsoft/1ds-core-js": "3.2.13",
     "@microsoft/1ds-post-js": "3.2.13",
@@ -127,27 +158,21 @@
     "zod": "4.4.3"
   },
   "optionalDependencies": {
-    "@jinsiyu/dsh-code-server-runtime-win32-arm64": "^0.3.10",
-    "@jinsiyu/dsh-code-server-runtime-win32-x64": "^0.3.10"
-  },
-  "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",
-    "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"
+    "@jinsiyu/dshcs-kerberos-win32-arm64": "2.1.1-dshcs.1",
+    "@jinsiyu/dshcs-kerberos-win32-x64": "2.1.1-dshcs.1",
+    "@jinsiyu/dshcs-vscode-deviceid-win32-arm64": "0.1.5",
+    "@jinsiyu/dshcs-vscode-deviceid-win32-x64": "0.1.5",
+    "@jinsiyu/dshcs-vscode-native-watchdog-win32-arm64": "1.4.6",
+    "@jinsiyu/dshcs-vscode-native-watchdog-win32-x64": "1.4.6",
+    "@jinsiyu/dshcs-vscode-spdlog-win32-arm64": "0.15.8",
+    "@jinsiyu/dshcs-vscode-spdlog-win32-x64": "0.15.8",
+    "@jinsiyu/dshcs-vscode-sqlite3-win32-arm64": "5.1.12-vscode",
+    "@jinsiyu/dshcs-vscode-sqlite3-win32-x64": "5.1.12-vscode",
+    "@jinsiyu/dshcs-vscode-windows-ca-certs-win32-arm64": "0.3.4",
+    "@jinsiyu/dshcs-vscode-windows-ca-certs-win32-x64": "0.3.4",
+    "@jinsiyu/dshcs-vscode-windows-process-tree-win32-arm64": "0.8.0",
+    "@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"
   }
-}
+}