dsh-code-server-app 0.3.6 → 0.3.7

package/lib/bridge-session.mjs

@@ -18,6 +18,24 @@ import { loadDshExport } from './dsh-resolve.mjs';
 /** 消息来源标记:在会话日志里能一眼看出这条来自编辑器桥。 */
 export const SOURCE_PLUGIN = 'dsh-code-server-app:editor-bridge';
 
+/**
+ * 取一个 DSH 服务。
+ *
+ * **只能走 `ctx.get()`,不能走属性访问**:`ctx.agents` 这类属性访问在服务"存在但对该 fiber
+ * 不可达"时会抛 `cannot get property "agents" without inject`;这条路径跑在路由回调里,
+ * 抛了就变成 500,连"没有可用会话"的 409 提示都给不出来。
+ * (0.3.6 的线上事故同源:`bridge-tools.mjs` 里 `ctx.systemPrompt` 的属性访问让整棵插件树
+ *  加载失败、dsh web 起不来。)
+ */
+function getService(ctx, name) {
+  if (ctx === undefined || ctx === null || typeof ctx.get !== 'function') return undefined;
+  try {
+    return ctx.get(name);
+  } catch {
+    return undefined;
+  }
+}
+
 /** 拼进消息的选区文本上限(超长时截断并注明)。 */
 export const MAX_SELECTION_CHARS = 8000;
 
@@ -58,7 +76,7 @@ export function composeEditorPrompt(input) {
  * @param {object} ctx cordis 上下文
  */
 export function pickAgent(ctx) {
-  const agents = ctx?.agents ?? (typeof ctx?.get === 'function' ? ctx.get('agents') : undefined);
+  const agents = getService(ctx, 'agents');
   if (agents === undefined || agents === null) return null;
   try {
     if (typeof agents.currentInitiator === 'function') {

package/lib/bridge-tools.mjs

@@ -69,6 +69,38 @@ async function loadDefineTool() {
   return loadDshExport('@deepseek-ai/dsh-tools', 'defineTool');
 }
 
+/**
+ * 取一个 DSH 服务。
+ *
+ * **必须走 `ctx.get()`,不能走属性访问**(0.3.6 的真实线上事故:用 `ctx.systemPrompt`
+ * 让整棵插件树加载失败、dsh web 直接起不来)。
+ *
+ * 区别是确定的(cordis `src/reflect.ts`):
+ *   - `ctx.get(name)` → `ReflectService.get()` → `_getImpl()`:服务没提供就返回 `undefined`,
+ *     **永不抛**;
+ *   - `ctx.tools` 这类属性访问 → 走代理的 get trap,服务"存在但对该 fiber 不可达"时
+ *     依次尝试 `internal/get` 瀑布 / `props[prop].get` / `reflect.get(prop,false)`,
+ *     任一失败都会抛 `cannot get property "x" without inject`
+ *     —— 而那是在 `apply()` 里,loader 会因此判定 `failed to apply loader entry` 并终止整个 profile。
+ *
+ * 所以:`ctx.get()` + 判空 = 可选服务的正确姿势;属性访问只对**已声明 inject** 的服务安全。
+ */
+function getService(ctx, name) {
+  if (ctx === undefined || ctx === null || typeof ctx.get !== 'function') return undefined;
+  try {
+    return ctx.get(name);
+  } catch {
+    return undefined; // 连 get 都抛(上下文形态异常)时,退化为"没有这个服务"
+  }
+}
+
+/** 取一个服务上的方法,绑定好 this(避免调用时丢上下文)。 */
+function getServiceMethod(ctx, serviceName, methodName) {
+  const service = getService(ctx, serviceName);
+  if (service === undefined || service === null || typeof service[methodName] !== 'function') return null;
+  return service[methodName].bind(service);
+}
+
 // ---------------------------------------------------------------- 工具值投影
 
 /**
@@ -201,10 +233,11 @@ function bridgeLive(deps) {
  *        (见 lib/bridge.mjs 的 createContextCache —— 扩展在每次 /sync 里刷新它)。
  */
 export async function registerEditorTools(ctx, deps) {
-  const tools = ctx?.tools ?? (typeof ctx?.get === 'function' ? ctx.get('tools') : undefined);
+  const tools = getService(ctx, 'tools');
   if (tools === undefined || tools === null || typeof tools.register !== 'function') return null;
   const defineTool = await loadDefineTool();
   if (defineTool === null) return null;
+  const register = tools.register.bind(tools);
 
   const contextTool = defineTool({
     name: EDITOR_CONTEXT_TOOL,
@@ -281,7 +314,7 @@ export async function registerEditorTools(ctx, deps) {
     }),
   });
 
-  const disposers = [tools.register(contextTool), tools.register(diagnosticsTool)];
+  const disposers = [register(contextTool), register(diagnosticsTool)];
   return () => {
     for (const dispose of disposers) {
       try {
@@ -317,14 +350,25 @@ function bridgeIsLive() {
 
 /**
  * 注册系统提示词段落,返回 disposer(或 null = 该 DSH 没有 systemPrompt 服务)。
+ *
+ * **这里就是 0.3.6 线上事故的位置**:原实现写的是 `ctx?.systemPrompt ?? ctx.get(...)`,
+ * 而属性访问会抛(见 `getService` 的说明)—— 可选链只挡 null/undefined,挡不住抛错,
+ * 于是 `??` 右边的 `ctx.get()` 永远没机会执行,整个 profile 加载失败。
+ * 现在只走 `ctx.get()`,并且对 `section` 调用本身也加保护。
+ *
  * @param {object} ctx cordis 上下文
  */
 export function registerEditorPrompt(ctx) {
-  const systemPrompt = ctx?.systemPrompt ?? (typeof ctx?.get === 'function' ? ctx.get('systemPrompt') : undefined);
-  if (systemPrompt === undefined || systemPrompt === null || typeof systemPrompt.section !== 'function') return null;
-  return systemPrompt.section({
-    name: PROMPT_SECTION,
-    order: PROMPT_ORDER,
-    text: () => (bridgeIsLive() ? PROMPT_TEXT : ''),
-  });
+  const section = getServiceMethod(ctx, 'systemPrompt', 'section');
+  if (section === null) return null;
+  try {
+    return section({
+      name: PROMPT_SECTION,
+      order: PROMPT_ORDER,
+      text: () => (bridgeIsLive() ? PROMPT_TEXT : ''),
+    });
+  } catch (error) {
+    console.warn(`[code-server] 编辑器桥:提示词段落注册失败(不影响其余能力):${error && error.message ? error.message : error}`);
+    return null;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "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-11T15:40:32.321Z",
+  "preparedAt": "2026-09-12T02:24:49.146Z",
   "source": "registry",
   "node": "v24.13.1",
   "platform": "win32",