dsh-code-server-app 0.3.23 → 0.3.25

package/lib/index.js

@@ -744,15 +744,159 @@ export async function apply(ctx, config) {
   });
   /** 面板的授权决策登记表 + agent 作用域拦截器(见 lib/bridge-approval.mjs)。 */
   const bridgeApprovalBoard = createApprovalBoard();
-  /** 面板最近一次声明 watch 的时间/id:据此判断"面板是不是正在看"(关掉就不拦截授权)。 */
-  const bridgeWatch = { ids: [], at: 0 };
+  /**
+   * 谁在"看着这个会话" —— 授权拦截据此决定要不要抢答(没人看就直接交给官方链路):
+   *   - `ids`:编辑器扩展面板声明要看的会话(每趟 /sync 上报);
+   *   - `dialogIds`:DSH 页面里的对话框(0.3.24)声明要看的会话;
+   *   - `at`:最近一次声明的时间(超过 5s 视为没人看)。
+   */
+  const bridgeWatch = { ids: [], dialogIds: [], at: 0 };
+
+  /** 当前所有"在看"的会话(去重)。 */
+  function watchedSessions() {
+    const all = [...bridgeWatch.ids, ...bridgeWatch.dialogIds];
+    return [...new Set(all.filter((id) => typeof id === 'string' && id !== ''))].slice(0, 4);
+  }
+  /** 现在有没有人在看(授权拦截的唯一判据)。 */
+  function hasWatcher() {
+    return watchedSessions().length > 0 && Date.now() - bridgeWatch.at < 5000;
+  }
+
   const bridgeApproval = createApprovalInterceptor({
     board: bridgeApprovalBoard,
     holdMs: DEFAULT_HOLD_MS,
-    hasPanel: () => bridgeWatch.ids.length > 0 && Date.now() - bridgeWatch.at < 5000,
+    hasPanel: hasWatcher,
     log: (message) => console.warn(`[code-server] 编辑器桥授权:${message}`),
   });
 
+  /**
+   * 「问 DSH」对话框的宿主侧状态(0.3.24)。
+   *
+   * 对话渲染从编辑器的 webview 面板搬到了 **DSH 页面里的浮动对话框**(client 半部,见 src/factory.js):
+   * 面板是编辑器里的一个 tab/一列,而用户要的是"像 DSH 那样的对话框"。host 这边只负责:
+   *   - 打开/关闭状态(编辑器扩展右键 → 桥 `/event` 上报 `ask-open`);
+   *   - 状态与动作的 HTTP 面(`/api/code-server/ask/*`,与 DSH 同源、吃它的 cookie/Origin 校验);
+   *   - 把面板产物(thread.js / thread.css)交给对话框注入(Lib 版本与 DSH 界面同版本,见 build-webview.mjs)。
+   */
+  const askDialog = { open: false, mode: 'selection', at: 0, sessionId: null, polls: 0, lastPollAt: 0 };
+
+  /**
+   * 对话框"活着吗" —— **能力位必须以此为准**(0.3.25)。
+   *
+   * 0.3.24 的教训:宿主无条件报 `askDialog: true`,扩展于是不再开编辑器面板;而客户端半部只要没跑起来
+   * (浏览器还缓存着旧 bundle / 没硬刷新),就**没有任何一方在看这个会话** ⇒ 授权悄悄落到 DSH 界面的
+   * 官方卡片,用户在编辑器里什么都看不到。现在只有**真的收到过 `/ask/state` 轮询**(5 秒内)才算有
+   * 这个能力;否则扩展退回编辑器面板 —— 那是验证过、能看能点的 UI。
+   */
+  function askDialogLive() {
+    return askDialog.polls > 0 && Date.now() - askDialog.lastPollAt < 5000;
+  }
+
+  /** 缓存里的活动编辑器 → 提问上下文(mode 决定带不带行号/选区,与扩展侧 0.3.21 的语义一致)。 */
+  function askContextFromCache(mode) {
+    const cached = bridgeContext.get();
+    const active = cached === null ? null : cached.context?.active ?? null;
+    if (active === null || active === undefined) return null;
+    const selection = active.selection ?? null;
+    const selectedText = typeof active.selectedText === 'string' ? active.selectedText : '';
+    const hasSelection = mode === 'selection' && selection !== null && selectedText !== '';
+    return {
+      file: typeof active.path === 'string' && active.path !== '' ? active.path : null,
+      lineStart: hasSelection ? selection.startLine ?? null : null,
+      lineEnd: hasSelection ? selection.endLine ?? null : null,
+      selection: hasSelection ? selectedText : null,
+      languageId: typeof active.language === 'string' && active.language !== '' ? active.language : null,
+    };
+  }
+
+  /** 对话框那一行上下文描述(标题栏用)。 */
+  function askContextLine(mode) {
+    const context = askContextFromCache(mode);
+    if (context === null || context.file === null) return '来自编辑器';
+    const base = context.file.replace(/^.*[\\/]/, '');
+    const where = Number.isSafeInteger(context.lineStart)
+      ? `${base}:${context.lineStart}${Number.isSafeInteger(context.lineEnd) && context.lineEnd !== context.lineStart ? `-${context.lineEnd}` : ''}`
+      : base;
+    return mode === 'file' ? `来自编辑器:${where} · 针对当前文件` : `来自编辑器:${where} · 针对选中内容`;
+  }
+
+  /**
+   * 对话框要的状态 —— **形状必须与面板载荷一致**(`lib/ask-panel.js` 的 `applyPayload`:
+   * 扁平的 entries / approvals / …),因为对话框里跑的就是同一个面板应用。
+   */
+  function askState() {
+    const watch = watchedSessions();
+    const snapshot = bridgeThread.supported()
+      ? bridgeThread.snapshot(watch)
+      : { available: false, sessionId: null, cursor: null, rev: 0, entries: [], error: '宿主没有 sessionController.follow(DSH 版本过旧)' };
+    return {
+      ok: true,
+      open: askDialog.open,
+      mode: askDialog.mode,
+      contextText: askContextLine(askDialog.mode),
+      entries: Array.isArray(snapshot.entries) ? snapshot.entries : [],
+      available: snapshot.available === true,
+      threadError: typeof snapshot.error === 'string' && snapshot.error !== '' ? snapshot.error : null,
+      approvals: bridgeApprovalBoard.snapshot(),
+      approvalHoldMs: DEFAULT_HOLD_MS,
+      status: 'idle',
+      statusText: '',
+      error: null,
+      sessionId: snapshot.sessionId ?? askDialog.sessionId ?? null,
+      uiVersion: uiVersion(),
+      dshVersion: dshVersion(),
+    };
+  }
+
+  /** 修订号:对话条目 / 待决授权 / 开关状态任何一处变了就变。 */
+  function askRevision() {
+    return bridgeThread.rev(watchedSessions()) * 8 + bridgeApprovalBoard.rev() * 8 + (askDialog.open ? 1 : 0) + (askDialog.mode === 'file' ? 2 : 0);
+  }
+
+  /** 对话框刷新它的"我在看"时间戳(每趟 /state 都算一次)。 */
+  function refreshDialogWatch() {
+    bridgeWatch.dialogIds = askDialog.open && askDialog.sessionId !== null ? [askDialog.sessionId] : [];
+    bridgeWatch.at = Date.now();
+  }
+
+  /**
+   * 回答一条待决授权 —— 桥的路由与对话框的路由共用同一套校验(见 lib/bridge-approval.mjs 的安全约束)。
+   * @returns {{status: number, body: object}}
+   */
+  function answerApproval(id, outcome) {
+    if (typeof id !== 'string' || id === '') return { status: 400, body: { ok: false, error: '需要 id 字段' } };
+    if (!PANEL_OUTCOMES.includes(outcome)) {
+      return { status: 400, body: { ok: false, error: `outcome 只能取 ${PANEL_OUTCOMES.join(' | ')}` } };
+    }
+    if (bridgeApprovalBoard.get(id) === null) return { status: 409, body: { ok: false, error: '未知或已处理的授权请求' } };
+    const ok = bridgeApprovalBoard.answer(id, outcome);
+    return { status: ok ? 200 : 409, body: { ok, outcome: ok ? outcome : null } };
+  }
+
+  /** 面板产物(thread.js / thread.css):对话框把它们注入 DSH 页面,所以由 host 读盘给文本。 */
+  let askBundleCache = null;
+  function askBundle() {
+    if (askBundleCache !== null) return askBundleCache;
+    const dir = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'assets', 'extensions', 'dshcs-editor-bridge', 'webview');
+    const read = (name) => {
+      try {
+        return fs.readFileSync(path.join(dir, name), 'utf8');
+      } catch {
+        return null;
+      }
+    };
+    const js = read('thread.js');
+    const css = read('thread.css');
+    // 产物缺失(打包漏了 build:webview)→ 明确报出来,不返回半个面板。
+    if (js === null || css === null) {
+      console.warn(`[code-server] 「问 DSH」对话框的产物缺失:${dir}(请在源码里跑 pnpm run build:webview)`);
+      return null;
+    }
+    askBundleCache = { js, css };
+    return askBundleCache;
+  }
+
+
   /** 本部署的 DSH 版本(诊断用;面板要的是下面那个"界面版本")。 */
   function dshVersion() {
     try {
@@ -1746,14 +1890,21 @@ export async function apply(ctx, config) {
     const watch = Array.isArray(body.watch) ? body.watch.filter((id) => typeof id === 'string' && id !== '') : [];
     bridgeWatch.ids = watch.slice(0, 4);
     bridgeWatch.at = Date.now();
-    bridgeThread.sync(bridgeWatch.ids);
+    bridgeThread.sync(watchedSessions());
+    // 请求过对话框、客户端半部却从没来问过 → 说清楚原因(多半是浏览器还缓存着旧的客户端 bundle)。
+    if (askDialog.open && !askDialogLive() && askDialog.warned !== true) {
+      askDialog.warned = true;
+      console.warn('[code-server] 请求了「问 DSH」对话框,但客户端半部没有轮询 /ask/state:'
+        + '浏览器可能还在用旧的客户端 bundle(硬刷新 / 清 Code Cache)。'
+        + '此期间提问会退回编辑器面板,授权也在面板里批。');
+    }
     // 对话流走独立字段:每个会话给有界条目(见 lib/bridge-thread.mjs),
     // 授权待决列表也一并回去(面板显示卡片)。
     return jsonResponse({
       ok: true,
       events,
       thread: bridgeThread.supported()
-        ? bridgeThread.snapshot(bridgeWatch.ids)
+        ? bridgeThread.snapshot(watchedSessions())
         : { available: false, sessionId: null, cursor: null, entries: [], error: '宿主没有 sessionController.follow(DSH 版本过旧)' },
       approvals: bridgeApprovalBoard.snapshot(),
       // 授权卡片要在面板上倒计时,窗口长度由 host 给(面板不猜)。
@@ -1761,6 +1912,11 @@ export async function apply(ctx, config) {
       dshVersion: dshVersion(),
       // 界面版本:面板据此提示"内置渲染器与当前 DSH 界面版本不一致"。
       uiVersion: uiVersion(),
+      // 能力探测(0.3.24;0.3.25 起以"客户端半部真的在轮询"为准):
+      // 只有对话框活着的时候才让扩展走 ask-open;否则扩展开编辑器面板(那里也能批授权)。
+      askDialog: askDialogLive(),
+      // 诊断用:请求过对话框但客户端没响应(浏览器缓存旧 bundle?)。
+      askDialogRequested: askDialog.open,
     });
   }
 
@@ -1821,17 +1977,99 @@ export async function apply(ctx, config) {
     } catch {
       return jsonResponse({ ok: false, error: '请求体不是合法 JSON' }, 400);
     }
-    const id = typeof body.id === 'string' ? body.id : '';
-    const outcome = typeof body.outcome === 'string' ? body.outcome : '';
-    if (id === '') return jsonResponse({ ok: false, error: '需要 id 字段' }, 400);
-    if (!PANEL_OUTCOMES.includes(outcome)) {
-      return jsonResponse({ ok: false, error: `outcome 只能取 ${PANEL_OUTCOMES.join(' | ')}` }, 400);
+    const verdict = answerApproval(
+      typeof body.id === 'string' ? body.id : '',
+      typeof body.outcome === 'string' ? body.outcome : '',
+    );
+    return jsonResponse(verdict.body, verdict.status);
+  }
+
+  // ---------------------------------------------------------------- 「问 DSH」对话框(client 半部)
+
+  /** 对话框每 900ms 问一次:给修订号,没变就只回一个数字(不重传几十 KB 的对话流)。 */
+  async function handleAskState(request) {
+    // 这一条就是"客户端半部活着"的证据(能力位 askDialog 以它为准,见 askDialogLive)。
+    askDialog.polls += 1;
+    askDialog.lastPollAt = Date.now();
+    if (askDialog.polls === 1) {
+      console.log('[code-server] 「问 DSH」对话框已连上客户端半部:/ask/state 开始轮询');
     }
-    if (bridgeApprovalBoard.get(id) === null) {
-      return jsonResponse({ ok: false, error: '未知或已处理的授权请求' }, 409);
+    refreshDialogWatch();
+    const current = askRevision();
+    let rev = null;
+    try {
+      const raw = new URL(request.url).searchParams.get('rev');
+      const parsed = raw === null ? Number.NaN : Number.parseInt(raw, 10);
+      if (Number.isSafeInteger(parsed) && parsed >= 0) rev = parsed;
+    } catch {
+      rev = null;
     }
-    const ok = bridgeApprovalBoard.answer(id, outcome);
-    return jsonResponse({ ok, outcome: ok ? outcome : null }, ok ? 200 : 409);
+    if (rev !== null && rev === current) return jsonResponse({ ok: true, changed: false, rev: current });
+    return jsonResponse({ ...askState(), changed: true, rev: current });
+  }
+
+  /** 对话框发一条提问:上下文取宿主缓存里的编辑器状态(扩展每 600ms 上报)。 */
+  async function handleAskSend(request) {
+    let body;
+    try {
+      body = await readJsonBody(request);
+    } catch {
+      return jsonResponse({ ok: false, error: '请求体不是合法 JSON' }, 400);
+    }
+    const text = typeof body.text === 'string' ? body.text.trim() : '';
+    if (text === '') return jsonResponse({ ok: false, error: '需要 text 字段(要问 DSH 的话)' }, 400);
+    const mode = body.mode === 'file' ? 'file' : askDialog.mode;
+    const context = askContextFromCache(mode);
+    const result = await deliverEditorPrompt(ctx, {
+      text,
+      file: context === null ? null : context.file,
+      lineStart: context === null ? null : context.lineStart,
+      lineEnd: context === null ? null : context.lineEnd,
+      selection: context === null ? null : context.selection,
+      languageId: context === null ? null : context.languageId,
+    });
+    if (result.ok === true && typeof result.sessionId === 'string' && result.sessionId !== '') {
+      askDialog.sessionId = result.sessionId;
+      askDialog.mode = mode;
+      refreshDialogWatch();
+      bridgeThread.watch(result.sessionId);
+      bridgeApproval.intercept(result.agent, result.sessionId);
+    }
+    const { agent: _agent, ...payload } = result;
+    void _agent;
+    return jsonResponse(payload, result.ok === true ? 200 : (result.code === 'NO_AGENT' ? 409 : 200));
+  }
+
+  /** 对话框回答授权(与桥的 /approve 同一套校验)。 */
+  async function handleAskApprove(request) {
+    let body;
+    try {
+      body = await readJsonBody(request);
+    } catch {
+      return jsonResponse({ ok: false, error: '请求体不是合法 JSON' }, 400);
+    }
+    const verdict = answerApproval(
+      typeof body.id === 'string' ? body.id : '',
+      typeof body.outcome === 'string' ? body.outcome : '',
+    );
+    return jsonResponse(verdict.body, verdict.status);
+  }
+
+  /** 对话框关掉:不再看会话 ⇒ 待决授权按"没人看"交回官方链路(拦截器的轮询会立刻放行)。 */
+  async function handleAskClose() {
+    askDialog.open = false;
+    askDialog.sessionId = null;
+    refreshDialogWatch();
+    return jsonResponse({ ok: true });
+  }
+
+  /** 面板产物(thread.js / thread.css)给对话框注入用。 */
+  async function handleAskBundle() {
+    const bundle = askBundle();
+    if (bundle === null) {
+      return jsonResponse({ ok: false, error: '面板产物缺失:请在插件源码里跑 pnpm run build:webview,或重装插件' }, 503);
+    }
+    return jsonResponse({ ok: true, rev: askRevision(), ...bundle });
   }
 
   async function handleBridgeEvent(request) {
@@ -1840,6 +2078,15 @@ export async function apply(ctx, config) {
     const body = await readJsonBody(request);
     const kind = typeof body.kind === 'string' ? body.kind : '';
     if (kind === '') return jsonResponse({ ok: false, error: '需要 kind 字段' }, 400);
+    // 右键「问 DSH」→ 扩展上报 ask-open:host 打开 DSH 页面里的对话框(client 半部轮询到就拿去显示)。
+    if (kind === 'ask-open') {
+      askDialog.open = true;
+      askDialog.mode = body.mode === 'file' ? 'file' : 'selection';
+      askDialog.at = Date.now();
+      refreshDialogWatch();
+      appendLog(`[bridge] ask-open mode=${askDialog.mode}\n`);
+      return jsonResponse({ ok: true, mode: askDialog.mode, contextText: askContextLine(askDialog.mode) });
+    }
     // 扩展上报的编辑器侧事件(打开/关闭文件等):目前只进日志尾,供诊断时回看。
     appendLog(`[bridge] ${kind}${typeof body.path === 'string' ? ` ${body.path}` : ''}\n`);
     return jsonResponse({ ok: true });
@@ -1854,6 +2101,13 @@ 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 },
+    // ---- 「问 DSH」对话框(0.3.24):DSH 页面里的 client 半部调这几条 ----
+    // 这里**在 /api 下**是对的:调用方是 DSH 页面自己(同源 + cookie),与扩展宿主(必须走本机 IPC)不同。
+    { path: `${API_BASE}/ask/state`, methods: ['GET'], fetch: handleAskState },
+    { path: `${API_BASE}/ask/send`, methods: ['POST'], fetch: handleAskSend },
+    { path: `${API_BASE}/ask/approve`, methods: ['POST'], fetch: handleAskApprove },
+    { path: `${API_BASE}/ask/close`, methods: ['POST'], fetch: handleAskClose },
+    { path: `${API_BASE}/ask/bundle`, methods: ['GET'], fetch: handleAskBundle },
     // ---- 编辑器桥的 4 条路由**不在 /api 下**(0.3.9 修正)----
     // 原因:Connection 给 `/api` 装了 cookie fence(无 cookie → 401),而扩展宿主是 Node 进程、
     // 永远拿不到浏览器 cookie ⇒ 挂在这里的路由根本到不了(实测:带令牌也被 401/405 挡回)。

package/package.json

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

package/vendor/VENDOR.json

@@ -3,7 +3,7 @@
   "vscodeVersion": "1.137.0",
   "productPath": "stable-b11dabdaca0d3369986975be285db92c8795cea5",
   "layout": "vscode-only",
-  "preparedAt": "2026-09-13T08:52:39.438Z",
+  "preparedAt": "2026-09-13T09:25:27.979Z",
   "source": "registry",
   "node": "v24.21.0",
   "platform": "win32",