dsh-code-server-app 0.3.8 → 0.3.9

package/README.en.md

@@ -207,32 +207,42 @@ only the editor knows, and lets editor gestures drive the current session.
   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 three channels
+### The channels (since 0.3.9 they live on DSH's webServer under `/code-server-bridge`)
 
 ```
-extension → host   POST /api/code-server/bridge/sync    one round trip: push editor state + take pending events
-extension → host   POST /api/code-server/bridge/ask     push an editor question into the current session
-extension → host   GET  /api/code-server/bridge/health  unauthenticated liveness probe
-host → extension   POST /api/code-server/bridge/event   extension reports open/close etc. (host log tail)
-host → extension   <extensionsDir>/.dshcs-bridge/bridge.json   port + token, re-read by the extension every 5s
+extension → host   POST /code-server-bridge/sync    one round trip: push editor state + take pending events
+extension → host   POST /code-server-bridge/ask     push an editor question into the current session
+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
 ```
 
+> **Why not under `/api` (fixed in 0.3.9)**: Connection puts a Host/Origin/cookie fence on `/api`
+> (`requestRejection` in `packages/client/connection/src/index.ts` → 401 without a cookie), while the bridge's
+> client is a **Node process inside the extension host** — it can never hold a browser cookie, so its requests were
+> rejected before ever reaching the plugin's route. Measured on 0.3.7: the extension polled
+> `/api/code-server/bridge/sync` and got either 405 (it reached the launcher/VS Code instead) or 401 (the /api
+> fence) — the bridge had never actually synced. It now mounts on DSH's own webServer with its own token as the
+> only gate. The cost: the bridge needs DSH to provide `webServer` — **the web profile has it, desktop does not**.
+> On desktop the host writes no `bridge.json` (dormant beats pointing at a dead address) and says so in the log;
+> **file opening is unaffected** (it uses the signal file and works in every mode).
+
 **Why state is pushed, not pulled**: the extension host is a child process of the VS Code server and **listens on
 no port** — the host cannot call into it. Editor state therefore rides the extension's own polling request, and
 the host caches it for the tools (at most one 600 ms cycle behind; older than 10 s and the tool says so instead
 of passing stale data off as fresh).
 
-**Why no SSE/WebSocket**: `ctx.connection.fetch.register` only allows `GET | HEAD | POST` (streaming would need
-the WS mux already owned by `dsh-api-gateway`). Polling also buys two useful properties: it is idempotent (a
-dropped event only costs one notification — the data always lives in the editor) and the cached state is
-inherently fresh.
+**Why no SSE/WebSocket**: the extension host has no HTTP server of its own, and everything DSH can offer is
+request/response (the Connection fetch channel allows only `GET | HEAD | POST`; streaming would need the WS mux
+already owned by `dsh-api-gateway`). Polling also buys two useful properties: it is idempotent (a dropped event
+only costs one notification — the data always lives in the editor) and the cached state is inherently fresh.
 
 ### Security model (four invariants; read before touching `lib/bridge.mjs`)
 
 The token lives in `<extensionsDir>/.dshcs-bridge/bridge.json`, **readable by any process of the same local
 user**, so:
 
-1. **`/api/code-server/bridge/*` is permanently read-only.** No route writes files, edits documents, or runs
+1. **`/code-server-bridge/*` is permanently read-only.** No route writes files, edits documents, or runs
    commands. A leaked token is therefore bounded to "sees information that is in the editor" and **can never**
    become arbitrary file writes or command execution. A whitelist assertion in `scripts/test-bridge-routes.mjs`
    guards this.
@@ -574,10 +584,10 @@ Host/Origin fence and browser auth); in the desktop profile `apps/desktop-host`
 | POST | `/api/code-server/stop` | Stop and recycle the process tree |
 | POST | `/api/code-server/setup` | **Compatibility no-op**: since 0.1.36 dependencies are installed by the package manager, so this only re-runs the env self-check and returns |
 | POST | `/api/code-server/open-file` | body `{ file }` — writes the signal consumed by the built-in `dshcs-open-file` extension to open the file in code-server |
-| GET | `/api/code-server/bridge/health` | **unauthenticated**: `{ ok, bridge, pid, url }` — liveness only, no editor data |
-| POST | `/api/code-server/bridge/sync` | editor bridge: the extension pushes state (`{context, diagnostics, workspace, at}`) and takes back events; `?since=<seq>` is the event cursor. Requires `x-dshcs-bridge-token` |
-| POST | `/api/code-server/bridge/ask` | editor bridge: push an editor question into the current session (`{text, file?, lineStart?, lineEnd?, selection?, languageId?}`); **409** when no session can receive it |
-| POST | `/api/code-server/bridge/event` | editor bridge: extension reports open/close and similar (host log tail). Requires the token |
+| GET | `/code-server-bridge/health` | editor-bridge liveness (**unauthenticated**; no editor data). Mounted on DSH's webServer, not under `/api` |
+| POST | `/code-server-bridge/sync` | editor bridge: the extension pushes state (`{context, diagnostics, workspace, at}`) and takes back events; `?since=<seq>` is the event cursor. Requires `x-dshcs-bridge-token`, and **any Origin header is 403** |
+| POST | `/code-server-bridge/ask` | editor bridge: push an editor question into the current session (`{text, file?, lineStart?, lineEnd?, selection?, languageId?}`); **409** when no session can receive it |
+| POST | `/code-server-bridge/event` | editor bridge: extension reports open/close and similar (host log tail). Requires the token |
 
 > All four bridge routes carry their own token check — they **cannot** rely on DSH's cookie fence, because the
 > extension host has no browser cookie — and they are read-only by construction. See "Working with DSH" above.
@@ -653,9 +663,13 @@ What remains on the plugin side:
 
 ## Known limitations
 
-- **The editor bridge only works under `serve: loopback`.** `serve: dsh` is a named-pipe mode with no dedicated
-  port, so the bridge's "loopback host + own token" model does not apply: it stays disabled there
-  (`bridge.supported=false` in `status`). Use the default `loopback` when you want the integration.
+- **The editor bridge needs DSH to provide `webServer`** (corrected in 0.3.9): its client is a Node process inside
+  the extension host, which can only reach DSH over HTTP at DSH's own origin (the bridge mounts under
+  `BRIDGE_BASE` with its own token). **The web profile has webServer (both `serve: dsh` and loopback) → the bridge
+  works; desktop has none → it stays disabled** (`bridge.supported=false`, no `bridge.json` is written, one log
+  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.
 - **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

@@ -203,34 +203,47 @@ DSH 用**资源地址**命名文件,`openFile` 只负责把地址交给右侧栏
 - 编辑器侧的入口还有状态栏的 `$(plug) DSH`(连通时显示,点击打开日志),日志在输出面板
   「DSH Editor Bridge」里 —— 出问题时先看它。
 
-### 三条通道
+### 三条通道(0.3.9 起走 DSH webServer 的 `/code-server-bridge`)
 
 ```
-扩展 → host     POST /api/code-server/bridge/sync   一趟来回:上报编辑器状态 + 取回待处理事件
-扩展 → host     POST /api/code-server/bridge/ask    把编辑器里的提问投进当前会话
-扩展 → host     GET  /api/code-server/bridge/health 无鉴权探活(便于重启后一眼确认)
-host  → 扩展    POST /api/code-server/bridge/event  扩展上报打开/关闭文件等(进 host 日志尾)
-host  → 扩展    <extensionsDir>/.dshcs-bridge/bridge.json  端口 + 令牌(扩展每 5s 重读)
+扩展 → host     POST /code-server-bridge/sync   一趟来回:上报编辑器状态 + 取回待处理事件
+扩展 → host     POST /code-server-bridge/ask    把编辑器里的提问投进当前会话
+扩展 → host     GET  /code-server-bridge/health 无鉴权探活(便于重启后一眼确认)
+扩展 → host     POST /code-server-bridge/event  扩展上报打开/关闭文件等(进 host 日志尾)
+host  → 扩展    <extensionsDir>/.dshcs-bridge/bridge.json  base URL + 令牌(扩展每 5s 重读)
 ```
 
+> **为什么不在 `/api` 下(0.3.9 修正)**:Connection 给 `/api` 装了 Host/Origin/cookie fence
+> (`packages/client/connection/src/index.ts` 里 `requestRejection` → 无 cookie 即 401),而桥的客户端
+> 是扩展宿主里的 **Node 进程** —— 它永远拿不到浏览器 cookie,请求在到达插件路由之前就被挡掉了。
+> 实测(0.3.7):扩展按 `/api/code-server/bridge/sync` 轮询,要么 405(打到 launcher/VS Code)、
+> 要么 401(打到 DSH 的 /api fence),**桥从来没有真正同步过**。
+> 现在桥挂在 DSH 自己的 webServer 前缀下,鉴权完全由桥自己的令牌承担(见下)。
+> 代价:桥需要 DSH 提供 `webServer` —— **web profile 有,desktop 没有**。
+> desktop 下 host 不写 `bridge.json`(宁可休眠,不可指向死地址),并在日志里说明;
+> **文件打开不受影响**(它走信号文件,与 serve 模式无关)。
+
 **为什么状态是"推"而不是"拉"**:扩展宿主是 VS Code server 的一个子进程,**不监听任何端口** ——
 host 反向请求不到它。所以编辑器状态只能在扩展主动发起的那趟轮询里带上来,host 缓存后给工具读
 (缓存滞后最多一个轮询周期 600ms,超过 10s 没更新就判为过期,工具会明说"状态已过期");
 
-**为什么不用 SSE/WebSocket**:`ctx.connection.fetch.register` 的 methods 只允许 `GET | HEAD | POST`
-(流式要另走已被 `dsh-api-gateway` 占用的 WS mux)。轮询反而给了两条好性质:幂等(丢一次事件只是
-少一次提示,数据本身永远在编辑器里),以及状态天然最新(每趟都刷新)。
+**为什么不用 SSE/WebSocket**:扩展宿主里没有 HTTP 服务器,而 DSH 侧能给的无非是请求/响应
+(Connection 的 fetch 通道只允许 `GET | HEAD | POST`,流式要另走已被 `dsh-api-gateway` 占用的 WS mux)。
+轮询反而给了两条好性质:幂等(丢一次事件只是少一次提示,数据本身永远在编辑器里),以及状态天然最新(每趟都刷新)。
 
 ### 安全模型(四条不变量,改 `lib/bridge.mjs` 之前先读)
 
 桥的令牌写在 `<extensionsDir>/.dshcs-bridge/bridge.json`(**对本机同用户进程可读**),所以:
 
-1. **`/api/code-server/bridge/*` 永久只读。** 没有写文件、改文档、执行命令的路由。
+1. **`/code-server-bridge/*` 永久只读。** 没有写文件、改文档、执行命令的路由。
    令牌泄露的爆炸半径被封在"看到编辑器里的信息",**不会**变成任意文件写/任意命令执行。
-   `scripts/test-bridge-routes.mjs` 里有一条白名单断言盯着这件事。
+   `scripts/test-bridge-routes.mjs` 里有一条白名单断言盯着这件事(未知后缀一律 404)。
 2. **带 `Origin` 的请求一律 403。** 浏览器发起必带 Origin(含沙箱 iframe 的 `Origin: null`),
    扩展宿主是 Node 进程、不带。判定顺序上 Origin **先于令牌** —— 否则等于给浏览器一个
    "令牌猜对没有"的 oracle。
+   实现细节:Node 路由 → Fetch 适配器把**原始 headers** 挂在 request 上(`dshcsRawHeaders`),
+   因为 undici 的 `Request` 构造器会把 `origin` 当 forbidden header 归一化掉 —— 读 `request.headers`
+   会让这道 403 静默失效(测试里有这条实测记录)。
 3. **路径收敛在编辑器当前工作区**(`workspaceFolder` 之外的诊断直接丢弃)。
 4. **有界**:诊断默认 200 条 / 单条截断 500 字符 / 上报体上限 256KB / 事件环形缓冲 64 条。
 
@@ -574,15 +587,15 @@ desktop profile 由 `apps/desktop-host` 把 `/api/*` 交给同一个 `createShar
 | POST | `/api/code-server/stop` | 停止并回收进程树 |
 | POST | `/api/code-server/setup` | **兼容空操作**:0.1.36 起依赖由包管理器安装,调用只重新自检 `env` 并返回 |
 | POST | `/api/code-server/open-file` | body `{ file }` — 写信号文件,由内置扩展 `dshcs-open-file` 在 code-server 中打开 |
-| GET | `/api/code-server/bridge/health` | **无鉴权**:`{ ok, bridge, pid, url }`。只回答"桥活着吗",不含任何编辑器数据 |
-| POST | `/api/code-server/bridge/sync` | 编辑器桥:扩展上报状态(`{context, diagnostics, workspace, at}`)并取回事件;`?since=<seq>` 是事件游标。需 `x-dshcs-bridge-token` |
-| POST | `/api/code-server/bridge/ask` | 编辑器桥:把编辑器里的提问投进当前会话(`{text, file?, lineStart?, lineEnd?, selection?, languageId?}`);没有可投递的会话时回 **409** |
-| POST | `/api/code-server/bridge/event` | 编辑器桥:扩展上报打开/关闭文件等(进 host 日志尾)。需令牌 |
+| GET | `/code-server-bridge/health` | 编辑器桥探活(**无鉴权**;只回答"桥活着吗",不含任何编辑器数据)。挂 DSH 的 webServer,不在 `/api` 下 |
+| POST | `/code-server-bridge/sync` | 编辑器桥:扩展上报状态(`{context, diagnostics, workspace, at}`)并取回事件;`?since=<seq>` 是事件游标。需 `x-dshcs-bridge-token`,**带 Origin 一律 403** |
+| POST | `/code-server-bridge/ask` | 编辑器桥:把编辑器里的提问投进当前会话(`{text, file?, lineStart?, lineEnd?, selection?, languageId?}`);没有可投递的会话时回 **409** |
+| POST | `/code-server-bridge/event` | 编辑器桥:扩展上报打开/关闭文件等(进 host 日志尾)。需令牌 |
 
 > 桥的四条路由都自带令牌鉴权(它们**不依赖** DSH 的 cookie fence —— 扩展宿主拿不到浏览器 cookie),
-> 且永远只读。前面的守护规则与取舍见「与 DSH 的协同」。
+> 且永远只读。这也是它们**不能**挂在 `/api` 下的原因(见「与 DSH 的协同」)。
 
-> 插件不再注册 `/code-server/*` 这类 webServer 专有路由;code-server 图标已内联为 data URI(client bundle 内),
+> 除桥之外,插件不再注册任何插件自有 HTTP 路由;code-server 图标已内联为 data URI(client bundle 内),
 > 因此客户端不请求任何插件自有 HTTP 资源。
 
 ## DSH Desktop(无 webServer)
@@ -632,9 +645,12 @@ desktop profile 由 `apps/desktop-host` 把 `/api/*` 交给同一个 `createShar
 
 ## 已知限制
 
-- **编辑器桥只在 `serve: loopback` 下工作**:`serve: dsh` 是管道模式、没有独立端口,桥的
-  "回环 Host + 独立令牌"模型不适用 → 该模式下自动不启用(status 的 `bridge.supported=false`)。
-  需要协同能力就用默认的 `loopback`(0.2.0 起也是默认)。
+- **编辑器桥需要 DSH 提供 `webServer`**(0.3.9 修正):桥的客户端是扩展宿主里的 Node 进程,
+  它只能通过 HTTP 打到 DSH 自己的 origin(桥挂在 `BRIDGE_BASE` 前缀下,自带令牌鉴权)。
+  **web profile(`serve: dsh` 或 loopback 都行)有 webServer → 桥可用;desktop 没有 → 不启用**
+  (status 的 `bridge.supported=false`,host 不写 `bridge.json`,日志里说明一次)。
+  **文件打开不受影响**:它走信号文件,与 serve 模式和 webServer 都无关。
+  0.3.7 及以前把桥挂在 `/api/code-server/bridge/*`,被 Connection 的 cookie fence 401 挡死 —— 那是个 bug。
 - **桥的状态有最多 600ms 滞后**:扩展每 600ms 推一次;超过 10s 没更新时工具会明说"状态已过期"
   而不是拿旧数据当新数据(例如用户在 IDE 里关掉面板之后)。
 - **未保存缓冲区是"上报"而不是"接管"**:agent 仍然通过它自己的 `fs` 工具按磁盘内容编辑。

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

@@ -499,7 +499,7 @@ function activate(context) {
   // 实际方向是:本扩展在每次轮询里 `POST <BRIDGE_BASE>/sync`,把状态推上去、
   // 同时取回 host 的待处理事件(agent 改了哪个文件)。host 侧缓存状态供 agent 工具读。
   // 见 lib/bridge-client.js 的 sync() 与 lib/bridge.mjs 顶部的通道说明。
-  // **路径是 /code-server-bridge,不是 /api/...**(0.3.8 修正):/api 那层要求浏览器 cookie,
+  // **路径是 /code-server-bridge,不是 /api/...**(0.3.9 修正):/api 那层要求浏览器 cookie,
   // 扩展宿主拿不到 ⇒ 请求永远到不了插件路由。
 
   // 命令

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

@@ -23,7 +23,7 @@ const path = require('path');
 const BRIDGE_DIRNAME = '.dshcs-bridge';
 const BRIDGE_FILENAME = 'bridge.json';
 /** 桥的挂载前缀。**故意不在 `/api` 下**:那层有 Connection 的 cookie fence,扩展宿主(Node 进程)
- *  拿不到浏览器 cookie,请求会在到达插件路由之前被 401(0.3.8 修正)。 */
+ *  拿不到浏览器 cookie,请求会在到达插件路由之前被 401(0.3.9 修正)。 */
 const BRIDGE_BASE = '/code-server-bridge';
 const TOKEN_HEADER = 'x-dshcs-bridge-token';
 const STATE_FILENAME = 'extension-state.json';

package/lib/bridge.mjs

@@ -51,7 +51,7 @@ export const BRIDGE_FILENAME = 'bridge.json';
 
 /** 桥路由前缀。
  *
- *  **故意不放在 `/api` 下(0.3.8 修正)**:Connection 给 `/api` 装了 Host/Origin/cookie fence
+ *  **故意不放在 `/api` 下(0.3.9 修正)**:Connection 给 `/api` 装了 Host/Origin/cookie fence
  *  (`packages/client/connection/src/index.ts`:`requestRejection` → 无 cookie 即 401),而桥的客户端是
  *  VS Code 扩展宿主里的一个 Node 进程 —— 它**永远拿不到浏览器 cookie**,请求在到达插件路由之前就被挡掉了。
  *  实测(0.3.7):扩展按 `/api/code-server/bridge/sync` 轮询,请求要么 405(打到 launcher/VS Code)、

package/lib/index.js

@@ -640,7 +640,7 @@ export async function apply(ctx, config) {
 
   /** 本次启动生成的新桥令牌;null = 本实例没有令牌(adopt 旧实例时会回读 bridge.json)。 */
   let bridgeToken = null;
-  /** 桥的 webServer 挂载点(0.3.8)。null = 本部署没有可挂载的 HTTP 面(desktop)。 */
+  /** 桥的 webServer 挂载点(0.3.9)。null = 本部署没有可挂载的 HTTP 面(desktop)。 */
   let bridgeMountDispose = null;
   /** "桥不可用"只提示一次,避免每次起停都刷屏。 */
   let bridgeUnavailableLogged = false;
@@ -854,7 +854,7 @@ export async function apply(ctx, config) {
       dshMount = null;
       console.error(`[code-server] serve=dsh 挂载失败(将回退 loopback):${error && error.message ? error.message : error}`);
     }
-    // 编辑器桥(0.3.8):挂在自己的前缀上,自带令牌 —— 走 /api 会被 Connection 的 cookie fence 401
+    // 编辑器桥(0.3.9):挂在自己的前缀上,自带令牌 —— 走 /api 会被 Connection 的 cookie fence 401
     // (扩展宿主是 Node 进程,没有浏览器 cookie),详见 bridgeOrigin() 的注释。
     try {
       bridgeMountDispose = wsCtx.webServer.register({
@@ -1566,7 +1566,7 @@ export async function apply(ctx, config) {
     { path: `${API_BASE}/setup`, methods: ['POST'], fetch: handleSetup },
     { path: `${API_BASE}/open-file`, methods: ['POST'], fetch: handleOpenFile },
     { path: `${API_BASE}/ui-mode`, methods: ['POST'], fetch: handleUiMode },
-    // ---- 编辑器桥的 4 条路由**不在 /api 下**(0.3.8 修正)----
+    // ---- 编辑器桥的 4 条路由**不在 /api 下**(0.3.9 修正)----
     // 原因:Connection 给 `/api` 装了 cookie fence(无 cookie → 401),而扩展宿主是 Node 进程、
     // 永远拿不到浏览器 cookie ⇒ 挂在这里的路由根本到不了(实测:带令牌也被 401/405 挡回)。
     // 现在挂到 DSH webServer 的 `${BRIDGE_BASE}/*`,自带桥令牌鉴权(见该处注释与 lib/bridge.mjs 的安全不变量)。

package/package.json

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

package/vendor/VENDOR.json

@@ -3,7 +3,7 @@
   "vscodeVersion": "1.137.0",
   "productPath": "stable-b11dabdaca0d3369986975be285db92c8795cea5",
   "layout": "vscode-only",
-  "preparedAt": "2026-09-12T16:19:04.694Z",
+  "preparedAt": "2026-09-12T16:34:30.093Z",
   "source": "registry",
   "node": "v24.21.0",
   "platform": "win32",