dsh-code-server-app 0.3.10 → 0.3.12

package/README.en.md

@@ -206,6 +206,12 @@ only the editor knows, and lets editor gestures drive the current session.
 - **Everything is read-only**: the bridge never writes files, applies edits, or runs commands. The agent's writes
   still go through its own `fs` tools; the bridge only *knows about* them.
 - Status bar shows `$(plug) DSH` while connected (click it for the log in the "DSH Editor Bridge" output channel).
+- **The extension ships as a built-in** (fixed in 0.3.12): `dshcs-editor-bridge` is installed into
+  `<tree>/lib/vscode/extensions/` next to `dshcs-open-file`. 0.3.0–0.3.11 installed it as a *user* extension
+  instead, and the VS Code server marks any extension that sits in the user extensions folder but in no profile
+  manifest as removed (`.obsolete`, log line `Marked extension as removed`) and then skips it forever — re-marked on
+  every start, so **the bridge never reported any state**. To turn the bridge off use the plugin setting
+  `editorBridge=false` (no mount, no tools) rather than uninstalling the extension from the Extensions view.
 
 ### The channels (since 0.3.9 they live on DSH's webServer under `/code-server-bridge`)
 
@@ -215,6 +221,8 @@ extension → host   POST /code-server-bridge/ask     push an editor question in
 extension → host   GET  /code-server-bridge/health  unauthenticated liveness probe
 extension → host   POST /code-server-bridge/event   extension reports open/close etc. (host log tail)
 host → extension   <extensionsDir>/.dshcs-bridge/bridge.json   base URL + token, re-read by the extension every 5s
+                   (the directory is announced via the host-injected `DSHCS_EXTENSIONS_DIR` — the extension lives in
+                   the built-in tree now, so it cannot derive it from its own path)
 ```
 
 > **Why not under `/api` (fixed in 0.3.9)**: Connection puts a Host/Origin/cookie fence on `/api`
@@ -670,6 +678,10 @@ What remains on the plugin side:
   line explains it). **File opening is unaffected**: it uses the signal file and works regardless of mode.
   Up to 0.3.7 the bridge was registered under `/api/code-server/bridge/*` and was killed by Connection's cookie
   fence (401) — that was a bug.
+- **`/code-server-bridge/health`'s `bridge` field does not mean the extension is running** (clarified in 0.3.12):
+  it only says the bridge *target* is configured. Whether the extension actually runs shows up in the exthost log
+  or by simply calling `editor_context` — 0.3.0–0.3.11 sat in the state "health says bridge:true, extension never
+  loaded" (cause above: the user-level install was marked `.obsolete`).
 - **Bridged state can lag by up to 600 ms**, and the tools say "stale" rather than serving data older than 10 s.
 - **Unsaved buffers are reported, not taken over.** The agent still edits via its own `fs` tools, i.e. against
   disk. What the bridge adds is a notice *before* writing a dirty file, a diff *after*, and a warning instead of

package/README.md

@@ -202,6 +202,11 @@ DSH 用**资源地址**命名文件,`openFile` 只负责把地址交给右侧栏
   桥只是"知道它写了什么"。
 - 编辑器侧的入口还有状态栏的 `$(plug) DSH`(连通时显示,点击打开日志),日志在输出面板
   「DSH Editor Bridge」里 —— 出问题时先看它。
+- **扩展装在内置目录**(0.3.12 修正):`dshcs-editor-bridge` 与 `dshcs-open-file` 一样装进
+  `<树>/lib/vscode/extensions/`。0.3.0–0.3.11 装的是用户级目录,而 VS Code 服务端会把
+  "在用户扩展目录里、不在任何 profile 清单里"的扩展标进 `.obsolete`(日志 `Marked extension as removed`)
+  并永远跳过它 —— 每一轮启动都再标一次,**桥因此从来没有上报过状态**。
+  要关掉桥请用插件设置 `editorBridge=false`(不挂桥、不注册工具),不要再指望在扩展视图里卸载它。
 
 ### 三条通道(0.3.9 起走 DSH webServer 的 `/code-server-bridge`)
 
@@ -211,6 +216,7 @@ DSH 用**资源地址**命名文件,`openFile` 只负责把地址交给右侧栏
 扩展 → host     GET  /code-server-bridge/health 无鉴权探活(便于重启后一眼确认)
 扩展 → host     POST /code-server-bridge/event  扩展上报打开/关闭文件等(进 host 日志尾)
 host  → 扩展    <extensionsDir>/.dshcs-bridge/bridge.json  base URL + 令牌(扩展每 5s 重读)
+                (目录由 host 注入的 `DSHCS_EXTENSIONS_DIR` 告知 —— 扩展装在内置目录里,自己推不出来)
 ```
 
 > **为什么不在 `/api` 下(0.3.9 修正)**:Connection 给 `/api` 装了 Host/Origin/cookie fence
@@ -651,6 +657,9 @@ desktop profile 由 `apps/desktop-host` 把 `/api/*` 交给同一个 `createShar
   (status 的 `bridge.supported=false`,host 不写 `bridge.json`,日志里说明一次)。
   **文件打开不受影响**:它走信号文件,与 serve 模式和 webServer 都无关。
   0.3.7 及以前把桥挂在 `/api/code-server/bridge/*`,被 Connection 的 cookie fence 401 挡死 —— 那是个 bug。
+- **`/code-server-bridge/health` 的 `bridge` 字段不代表扩展在跑**(0.3.12 澄清):它只表示"桥的目标已就绪"。
+  扩展是否真的在跑,看 exthost 日志里有没有它的激活记录,或直接用 `editor_context` 试一次 ——
+  0.3.0–0.3.11 就是"health 说 bridge:true、扩展却从没被加载"的状态(原因见上:用户级安装被标 `.obsolete`)。
 - **桥的状态有最多 600ms 滞后**:扩展每 600ms 推一次;超过 10s 没更新时工具会明说"状态已过期"
   而不是拿旧数据当新数据(例如用户在 IDE 里关掉面板之后)。
 - **未保存缓冲区是"上报"而不是"接管"**:agent 仍然通过它自己的 `fs` 工具按磁盘内容编辑。

package/assets/extensions/dshcs-editor-bridge/extension.js

@@ -74,12 +74,6 @@ function log(message) {
   if (output !== null) output.appendLine(`[${new Date().toISOString()}] ${message}`);
 }
 
-/** 取扩展所在目录(桥配置与它同级:extensionsDir/.dshcs-bridge/)。 */
-function extensionDir() {
-  // __dirname = <extensionsDir>/dshcs-editor-bridge/lib  → 上溯两级即 extensionsDir
-  return path.resolve(__dirname, '..', '..');
-}
-
 /** 是否落在某个工作区文件夹内(不能把 workspaceFolder 之外的路径喂给 DSH)。 */
 function isInWorkspace(fsPath) {
   try {
@@ -462,7 +456,10 @@ function activate(context) {
     vscode.workspace.registerTextDocumentContentProvider('dshcs-old', oldSideProvider),
   );
 
-  client = createClient({ extensionsDir: extensionDir() });
+  // 配置目录由 bridge-client 统一解析(host 注入的 DSHCS_EXTENSIONS_DIR → 自身位置反推)。
+  // **不要在这里自己算**:0.3.0–0.3.11 那段 `resolve(__dirname,'..','..')` 比 <extensionsDir>
+  // 还高一级,任何布局都读不到 bridge.json ⇒ 桥一直休眠(见 docs 第 18 节)。
+  client = createClient();
   if (client.refresh() === null) {
     log('未找到桥配置(休眠)。DSH 插件启用编辑器桥并启动 IDE 后,这里会自动连上。');
   } else {

package/assets/extensions/dshcs-editor-bridge/lib/bridge-client.js

@@ -36,15 +36,32 @@ const CONFIG_REREAD_MS = 5000;
 
 const TOKEN_RE = /^[0-9A-Za-z_-]{16,128}$/;
 
-/** 桥配置路径;`extensionsDir` 可由调用方给(测试用),默认从 __dirname 反推。 */
+/** 桥配置所在目录(=`<extensionsDir>/.dshcs-bridge`)。
+ *
+ *  取值顺序(0.3.12 修正 —— 这里以前写错了,是"桥永远休眠"的另一半原因):
+ *   1. **host 注入的 `DSHCS_EXTENSIONS_DIR`**(launcher 的 env 会被扩展宿主继承,与 dshcs-open-file
+ *      用 `DSHCS_OPEN_FILE_SIGNAL` 是同一套做法)。0.3.12 起桥扩展装在**内置**目录(树里),
+ *      与 <extensionsDir> 不再同级,只能靠 host 告诉它;
+ *   2. 调用方显式给的 `extensionsDir`(测试用);
+ *   3. 从本文件反推:`<extensionsDir>/dshcs-editor-bridge/lib/` 上溯两级。
+ *      —— 注意 `extension.js` 曾自己算过一次,算成了三级(比 <extensionsDir> 还高一级),
+ *      即使按老的用户级布局也读不到配置。计算只留在这里一处。
+ */
+function defaultExtensionsDir() {
+  const fromEnv = process.env.DSHCS_EXTENSIONS_DIR;
+  if (typeof fromEnv === 'string' && fromEnv.trim() !== '') return fromEnv;
+  return path.resolve(__dirname, '..', '..');
+}
+
+/** 桥配置路径;`extensionsDir` 可由调用方给(测试用),默认见 `defaultExtensionsDir`。 */
 function bridgeFile(extensionsDir) {
-  const dir = extensionsDir ?? path.resolve(__dirname, '..', '..');
+  const dir = extensionsDir ?? defaultExtensionsDir();
   return path.join(dir, BRIDGE_DIRNAME, BRIDGE_FILENAME);
 }
 
 /** 扩展自己的小状态文件(since 游标),与桥配置同目录。 */
 function stateFile(extensionsDir) {
-  const dir = extensionsDir ?? path.resolve(__dirname, '..', '..');
+  const dir = extensionsDir ?? defaultExtensionsDir();
   return path.join(dir, BRIDGE_DIRNAME, STATE_FILENAME);
 }
 
@@ -236,6 +253,7 @@ module.exports = {
   CONFIG_REREAD_MS,
   REQUEST_TIMEOUT_MS,
   BridgeError,
+  defaultExtensionsDir,
   bridgeFile,
   stateFile,
   readBridgeConfig,

package/lib/index.js

@@ -185,13 +185,13 @@ function launcherPath() {
 /** 扩展安装目标:`placement: 'builtin'` 时优先 VS Code「内置扩展」目录 = <树>/lib/vscode/extensions
  *  (位于程序内置目录的扩展被 VS Code 视为内置——用户视图显示为"内置",**不能卸载**);
  *  `placement: 'user'` 时只用 --extensions-dir(用户级扩展,可被用户禁用/卸载)。
- *  返回 { dst, builtin }——builtin=true 时是核心路径;找不到树时回退用户级。 */
-function extensionTarget(extensionsDir, name, placement = 'builtin') {
+ *  返回 { dst, builtin }——builtin=true 时是核心路径;找不到树时回退用户级。
+ *  `treeRoot` 可注入(测试用):默认 `vsRoot()`,注入后测试不会碰真实树。 */
+function extensionTarget(extensionsDir, name, placement = 'builtin', treeRoot = vsRoot()) {
   if (placement === 'builtin') {
     try {
-      const root = vsRoot();
-      if (root !== null) {
-        const vscodeExt = path.join(root, 'lib', 'vscode', 'extensions');
+      if (treeRoot !== null) {
+        const vscodeExt = path.join(treeRoot, 'lib', 'vscode', 'extensions');
         if (fs.existsSync(vscodeExt)) {
           return { dst: path.join(vscodeExt, name), builtin: true };
         }
@@ -203,12 +203,19 @@ function extensionTarget(extensionsDir, name, placement = 'builtin') {
 
 /** 树内自带扩展清单。
  *  - dshcs-open-file:host 信号文件 → VS Code 打开文件(可带行号)。**内置**(用户不需要看到它)。
- *  - dshcs-editor-bridge(0.3.0):编辑器桥的扩展侧。**必须用户级** —— 它是可选能力,
- *    用户得有办法一键禁用;内置扩展按 VS Code 语义不能禁用。代价是用户可能卸载它,
- *    这没关系:host 侧本来就按"桥不可用"降级。 */
+ *  - dshcs-editor-bridge(0.3.0):编辑器桥的扩展侧。**必须内置**(0.3.12 修正;0.3.0–0.3.11 是用户级)。
+ *    为什么"直接往 <extensions-dir> 拷目录"装不进用户级:VS Code 服务端启动时
+ *    `ExtensionsWatcher.initialize()` → `deleteExtensionsNotInProfiles()` 会把
+ *    「在用户扩展目录里、但不在任何 profile 的 extensions.json 里」的扩展写进 `<extensions-dir>/.obsolete`
+ *    (服务端日志 `Marked extension as removed dsh-code-server-app.dshcs-editor-bridge-0.1.0`),
+ *    扫描器从此不再看它;下一轮它自然又不在 profile 里 ⇒ **每启动一次就再标一次,自锁**。
+ *    实测(本机 profile,10 次启动 10 条标记)与源码位置:`out/server-main.js` 的
+ *    `ExtensionsWatcher#initialize` / `ExtensionsScannerService#setExtensionsForRemoval`。
+ *    内置目录(<树>/lib/vscode/extensions,与 dshcs-open-file 同处)不参与 profile 机制。
+ *    用户的"关掉它"由插件设置 `editorBridge=false`(不挂桥、不注册工具)承担,不再依赖 VS Code 的卸载。 */
 const BUNDLED_EXTENSIONS = [
   { name: 'dshcs-open-file', placement: 'builtin' },
-  { name: 'dshcs-editor-bridge', placement: 'user' },
+  { name: 'dshcs-editor-bridge', placement: 'builtin' },
 ];
 
 /** 递归列出扩展源目录里的文件(相对路径,posix 分隔)。
@@ -233,19 +240,56 @@ export function listExtensionFiles(srcDir) {
   return out;
 }
 
+/** 清掉 VS Code 写给本插件扩展的"已移除"标记(`<extensions-dir>/.obsolete`)。
+ *  机制:`ExtensionsWatcher.initialize()` 把"在用户扩展目录里、不在任何 profile 里"的扩展标成 removed,
+ *  扫描器随后永远跳过它 ⇒ **自锁**(见 BUNDLED_EXTENSIONS 的注释)。0.3.0–0.3.11 的桥扩展就卡在这里:
+ *  文件装全了、路由通了,扩展却一次都没被加载(`editor_context` 永远报"扩展还没有上报状态")。
+ *  别的扩展的条目原样保留;清空后直接删掉文件(VS Code 需要时会自己重建)。
+ *  导出供测试直接验。 */
+export function clearObsoleteMarkers(extensionsDir, ids) {
+  const file = path.join(extensionsDir, '.obsolete');
+  if (ids.length === 0 || !fs.existsSync(file)) return [];
+  let map;
+  try {
+    map = JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch {
+    return [];
+  }
+  if (map === null || typeof map !== 'object' || Array.isArray(map)) return [];
+  const cleared = [];
+  for (const key of Object.keys(map)) {
+    if (ids.some((id) => key === id || key.startsWith(`${id}-`))) {
+      delete map[key];
+      cleared.push(key);
+    }
+  }
+  if (cleared.length === 0) return [];
+  try {
+    if (Object.keys(map).length === 0) fs.rmSync(file, { force: true });
+    else fs.writeFileSync(file, JSON.stringify(map), 'utf8');
+  } catch {
+    // 清标记失败不该拦住安装:扩展仍会被扫描器跳过,但文件是新的(下次启动还会再试)
+  }
+  return cleared;
+}
+
 /** 内置扩展安装:每次启动调用 —— 缺失**或内容有变化**即同步(自愈,且插件升级后能更新已装的旧副本)。
  *  源目录里已不存在的文件会从目标里删掉(否则旧版本的 `lib/` 会一直留着)。
- *  同时清理"放错位置"的旧副本(用户级/内置两份同时存在会让 VS Code 打架)。
- *  导出供测试直接调(apply 期不装扩展,只有 start 才装)。 */
-export function installBundledExtensions(extensionsDir, userDataDir) {
+ *  同时清理"放错位置"的旧副本(用户级/内置两份同时存在会让 VS Code 打架),并清掉 `.obsolete` 自锁标记。
+ *  导出供测试直接调(apply 期不装扩展,只有 start 才装);`options.treeRoot` 供测试注入假树。 */
+export function installBundledExtensions(extensionsDir, userDataDir, options = {}) {
   const here = path.dirname(fileURLToPath(import.meta.url));
+  const treeRoot = options.treeRoot === undefined ? vsRoot() : options.treeRoot;
+  const managedIds = [];
   for (const ext of BUNDLED_EXTENSIONS) {
     try {
       const src = path.join(here, '..', 'assets', 'extensions', ext.name);
       const manifest = path.join(src, 'package.json');
       if (!fs.existsSync(manifest)) continue;
+      const manifestJson = JSON.parse(fs.readFileSync(manifest, 'utf8'));
+      managedIds.push(`${manifestJson.publisher ?? 'dsh-code-server-app'}.${manifestJson.name ?? ext.name}`);
       const files = listExtensionFiles(src);
-      const target = extensionTarget(extensionsDir, ext.name, ext.placement);
+      const target = extensionTarget(extensionsDir, ext.name, ext.placement, treeRoot);
       const dst = target.dst;
       const stale = files.filter((name) => {
         const to = path.join(dst, name);
@@ -280,8 +324,8 @@ export function installBundledExtensions(extensionsDir, userDataDir) {
         };
         walkDst('');
       }
-      // 清理放错位置的副本:dshcs-open-file 的旧用户级副本 / 编辑器桥的错误内置副本。
-      const wrong = extensionTarget(extensionsDir, ext.name, ext.placement === 'builtin' ? 'user' : 'builtin');
+      // 清理放错位置的副本:编辑器桥的旧用户级副本(0.3.11 及更早)/ dshcs-open-file 的旧用户级副本。
+      const wrong = extensionTarget(extensionsDir, ext.name, ext.placement === 'builtin' ? 'user' : 'builtin', treeRoot);
       if (wrong.dst !== dst && fs.existsSync(wrong.dst)) {
         fs.rmSync(wrong.dst, { recursive: true, force: true });
         console.log(`[code-server] 清理放错位置的扩展副本 ${wrong.dst}(${ext.name} 应装在${target.builtin ? '内置' : '用户级'}目录)`);
@@ -292,6 +336,11 @@ export function installBundledExtensions(extensionsDir, userDataDir) {
       console.warn(`[code-server] bundled extension ${ext.name} install failed:`, err && err.message ? err.message : String(err));
     }
   }
+  const cleared = clearObsoleteMarkers(extensionsDir, managedIds);
+  if (cleared.length > 0) {
+    console.log(`[code-server] 清掉 VS Code 的"已移除"标记(.obsolete):${cleared.join(',')}`
+      + '(留着的话扫描器会永远跳过这些扩展,编辑器桥就永远没有状态)');
+  }
   void userDataDir;
 }
 
@@ -1209,6 +1258,11 @@ export async function apply(ctx, config) {
     const env = { ...process.env };
     // 内置扩展信号文件路径(host → 扩展 打开文件)
     env.DSHCS_OPEN_FILE_SIGNAL = openFileSignalPath(userDataDir);
+    // 扩展目录(host → 扩展 找桥配置 `/.dshcs-bridge/bridge.json`)。
+    // **必须注入**:0.3.12 起桥扩展装在**内置**目录(树里),与 <extensionsDir> 不同级,
+    // 扩展再也不能靠"自己的路径上溯两级"找到配置(0.3.0–0.3.11 那个上溯是错的,多上溯了一级,
+    // 就算装在用户级也读不到配置 ⇒ 桥一直是休眠态)。
+    env.DSHCS_EXTENSIONS_DIR = extensionsDir;
     // ?v= 缓存击穿标记:按"插件版本 + VS Code 树"生成 —— 只在真升级时让渲染器丢掉旧 bundle,
     // 平时正常命中缓存(workbench.js 有 18MB,每次启动都重拉不划算)。
     env.DSHCS_HTML_TAG = `${pluginVersion()}-${productPath() ?? 'dev'}`.replace(/[^A-Za-z0-9._-]/g, '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "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. 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": {
@@ -34,9 +34,6 @@
   "engines": {
     "node": ">=24"
   },
-  "peerDependencies": {
-    "@deepseek-ai/dsh": ">=0.1.2-rc.1"
-  },
   "files": [
     "lib/index.js",
     "lib/client.js",

package/vendor/VENDOR.json

@@ -3,7 +3,7 @@
   "vscodeVersion": "1.137.0",
   "productPath": "stable-b11dabdaca0d3369986975be285db92c8795cea5",
   "layout": "vscode-only",
-  "preparedAt": "2026-09-12T17:04:12.601Z",
+  "preparedAt": "2026-09-12T17:39:03.492Z",
   "source": "registry",
   "node": "v24.21.0",
   "platform": "win32",