dsh-code-server-app 0.3.18 → 0.3.19

package/README.en.md

@@ -198,11 +198,17 @@ only the editor knows, and lets editor gestures drive the current session.
 | Direction | Capability | Mechanism |
 |---|---|---|
 | editor → agent | **unsaved buffers** (disk ≠ what the user sees), active file and selection, **language-server diagnostics** with `file:line`, source and code | agent tools `editor_context` / `editor_diagnostics`; plus a notice attached before writing a dirty file |
-| editor → DSH | select code → context menu **"DSH: ask about selection"** → the message lands in the current session (with `file:line` and a fenced block) | extension command `dsh-code-server.askAboutSelection` |
+| editor → DSH | select code → context menu **"DSH: ask about selection"** → an **ask panel** opens (carrying `file:line` and the selection); the question enters the current session as **user input**, and the reply is mirrored back into the panel | extension command `dsh-code-server.askAboutSelection` (one of the **top two** editor context-menu items) + a webview panel + `POST /ask` + the `answers` field of `/sync` |
 | agent → editor | the agent changed a file → a **native diff** opens; if that buffer has unsaved changes you get a warning and **no overwrite** | host watches `tools/result`, the extension polls and opens the diff |
 
 - The tools are only registered while the bridge is live (so the model never sees an unusable tool), and the
   system-prompt section renders only then too.
+- **Ask panel** (extension 0.2.0): the context-menu command no longer pops a one-line input box but opens a panel —
+  transcript on top, input at the bottom. The selection is captured **at send time** (so you can change it while the
+  panel stays open), and the reply refreshes with the same polling round trip: no need to switch back to the DSH UI.
+- The question enters the DSH session as a **plain user message** (`source: { kind: 'user' }`, host 0.3.19): earlier
+  versions used `{kind:'plugin'}`, which DSH renders as a *context update* — it did not look like something the user
+  said. Provenance stays in the first line of the text: `From the editor: <file>:<line>`.
 - **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).

package/README.md

@@ -194,10 +194,15 @@ DSH 用**资源地址**命名文件,`openFile` 只负责把地址交给右侧栏
 | 方向 | 能力 | 落地方式 |
 |---|---|---|
 | 编辑器 → agent | **未保存缓冲区**(磁盘内容 ≠ 用户所见)、活动文件与选区、**语言服务器诊断**(含 file:line、来源、code) | agent 工具 `editor_context` / `editor_diagnostics`;写脏文件前额外附一条提醒 |
-| 编辑器 → DSH | 选中代码 → 右键「DSH: 针对选中内容提问」→ 消息进入当前会话(带 `文件:行` 与代码块) | 扩展命令 `dsh-code-server.askAboutSelection`(编辑器右键菜单 + 命令面板) |
+| 编辑器 → DSH | 选中代码 → 右键「DSH: 针对选中内容提问」→ 打开**提问面板**(带 `文件:行` 与选中内容);提问以**用户输入**进当前会话,回答**同步显示回面板** | 命令 `dsh-code-server.askAboutSelection`(编辑器右键菜单**最上面两条**之一)+ webview 面板 + `POST /ask` + `/sync` 的 `answers` 字段 |
 | agent → 编辑器 | agent 改了哪个文件 → 开**原生 diff** 审阅;缓冲区有未保存改动时**告警而不覆盖** | host 观察 `tools/result`,扩展轮询后开 diff + 非模态告警 |
 
 - 工具只在桥就绪时注册(IDE 没起来时模型看不到"有个用不了的工具");提示词段落也只在桥存活时渲染。
+- **提问面板**(扩展 0.2.0 起):右键命令不再弹一行输入框,而是一个面板 —— 上面是问答记录、下面是输入框;
+  发送时**现取当前选区**(可以在面板开着的同时改选区再问);回答跟着轮询一起刷新,不用切回 DSH 界面。
+- 提问进 DSH 会话时是**普通用户消息**(`source: { kind: 'user' }`,host 0.3.19 修正):早期版本用
+  `{kind:'plugin'}` 会被 DSH 渲染成"上下文更新",看起来不像自己说的话;来源信息靠正文首行
+  `From the editor: <file>:<行>` 保留。
 - **全部只读**:桥不写文件、不改文档、不执行命令。agent 的写操作仍然全部走它自己的 `fs` 工具,
   桥只是"知道它写了什么"。
 - 编辑器侧的入口还有状态栏的 `$(plug) DSH`(连通时显示,点击打开日志),日志在输出面板

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

@@ -1,9 +1,11 @@
 // dshcs-editor-bridge —— 编辑器桥的扩展侧(由 dsh-code-server-app 插件安装)
 //
 // 职责边界(与 host 侧 lib/bridge.mjs / bridge-tools.mjs 的分工):
-//   - **本扩展**是唯一知道"用户此刻看到什么"的一方,所以 /context 与 /diagnostics 的数据在这里采集;
-//   - **host** 负责鉴权、给 agent 提供工具、观察 agent 的写操作;
-//   - 方向 host → 扩展 的事件走 **轮询**(host 推环形缓冲,这里 GET /events?since=N)。
+//   - **本扩展**是唯一知道"用户此刻看到什么"的一方,所以编辑器状态(活动文件/选区/脏缓冲区/诊断)
+//     在这里采集;
+//   - **host** 负责鉴权、给 agent 提供工具、观察 agent 的写操作,并把 agent 的回复同步回来;
+//   - 双向流量都走 **一趟轮询**(`POST /sync`:上报状态 + 取回事件与回复)。没有第二个定时器,
+//     也没有 SSE/WS —— 扩展宿主不监听端口,host 反向请求不到它。
 //
 // 三条硬规则:
 //   1. **只读**:本扩展只读编辑器状态,不写文件、不执行命令、不应用编辑(host 侧命名空间同理只读)。
@@ -11,6 +13,9 @@
 //      就什么都不做。状态栏不显示任何东西,更不弹通知。
 //   3. **绝不覆盖未保存改动**:agent 改了文件而该文档是脏的就只告警 + 给 diff,由用户决定。
 //
+// 「问 DSH」面板(0.2.0):右键命令打开一个 webview,提问走 `/ask`(host 侧以**用户输入**进对话),
+// 回答随 `/sync` 的 `answers` 字段回到面板(纯逻辑在 lib/ask-panel.js,可单测)。
+//
 // 只依赖 `vscode` 与 Node 内置模块;纯逻辑在 lib/ 下且不 require('vscode'),便于单测。
 
 'use strict';
@@ -26,6 +31,15 @@ const {
 } = require('./lib/bridge-client.js');
 const { createProjector } = require('./lib/context-model.js');
 const { createDiffCache, describeChange } = require('./lib/diff-model.js');
+const {
+  applyAnswers,
+  createPanelState,
+  describeContext,
+  panelPayload,
+  pushQuestion,
+  renderPanelHtml,
+  statusText,
+} = require('./lib/ask-panel.js');
 
 /** 状态栏项(仅在桥连通时显示)。 */
 let statusBar = null;
@@ -37,6 +51,8 @@ let client = null;
 let pollTimer = null;
 /** 上次成功轮询的时间(状态栏 tooltip 用)。 */
 let lastPollAt = 0;
+/** 「问 DSH」面板:null = 没开。`{panel, state}`(状态模型见 lib/ask-panel.js)。 */
+let askPanel = null;
 /** 是否已经确认过 host 端点可达(避免把"IDE 刚起、扩展先加载"误判为断线)。 */
 let connected = false;
 /** 诊断集合缓存:host 请求时现算,这里只做"有没有变化"的计数上报。 */
@@ -361,6 +377,11 @@ async function pollOnce() {
     await handleEvent(event);
   }
   if ((result.events ?? []).length > 0) client.persist();
+  // 回答同步:host 把 agent 的正文放在 answers 里(见 lib/bridge-answer.mjs),
+  // 面板每趟轮询刷新一次 —— 不需要第二个定时器,也不需要流式协议。
+  if (askPanel !== null && result.answers !== undefined) {
+    if (applyAnswers(askPanel.state, result.answers, askPanel.state.sessionId)) refreshAskPanel();
+  }
 }
 
 function startPolling(context) {
@@ -386,51 +407,121 @@ function updateStatusBar() {
   }
 }
 
-// ---------------------------------------------------------------- 命令
+// ---------------------------------------------------------------- 命令 / 提问面板
 
-/** 选中内容 → DSH(编辑器→DSH 的主入口)。 */
-async function askAboutSelection() {
+/** 当前编辑器上下文(发送时现取一次:用户可以在面板开着的同时换选区)。 */
+function captureAskContext() {
   const editor = vscode.window.activeTextEditor;
-  if (editor === undefined || editor === null) {
-    vscode.window.showInformationMessage('没有活动的编辑器。');
-    return;
-  }
-  if (client === null || client.isDormant()) {
-    vscode.window.showInformationMessage('编辑器桥未启用:请在 DSH 里打开 Code Server 标签后重试。');
-    return;
-  }
+  if (editor === undefined || editor === null) return null;
   const doc = editor.document;
   const selection = editor.selection;
   const hasSelection = selection !== undefined && selection !== null && selection.isEmpty === false;
   const selectedText = hasSelection ? doc.getText(selection) : '';
-  const question = await vscode.window.showInputBox({
-    title: hasSelection ? '问 DSH(带选中内容)' : '问 DSH(当前文件)',
-    prompt: `${path.basename(doc.fileName)}${hasSelection ? ` 第 ${selection.start.line + 1}-${selection.end.line + 1} 行` : ''}`,
-    placeHolder: '例如:这段逻辑有什么问题?',
-    ignoreFocusOut: true,
-  });
-  if (question === undefined || question.trim() === '') return;
+  return {
+    file: doc.uri.scheme === 'file' ? doc.uri.fsPath : null,
+    lineStart: hasSelection
+      ? selection.start.line + 1
+      : (doc.isDirty ? null : selection.active.line + 1),
+    lineEnd: hasSelection ? selection.end.line + 1 : null,
+    selection: selectedText === '' ? null : selectedText,
+    languageId: doc.languageId ?? null,
+  };
+}
+
+/** 把状态推给面板(增量更新:输入框与滚动位置都不受影响)。 */
+function refreshAskPanel() {
+  if (askPanel === null) return;
+  const payload = panelPayload(askPanel.state);
+  payload.contextText = askPanel.state.context === null
+    ? '来自编辑器'
+    : `来自编辑器:${describeContext(askPanel.state.context)}`;
+  payload.statusText = askPanel.state.status === 'error'
+    ? (askPanel.state.error ?? '出错了')
+    : statusText(askPanel.state);
+  void askPanel.panel.webview.postMessage(payload);
+}
+
+/** 面板收到一条提问:投递到 DSH,并把这一轮放进状态里等回答。 */
+async function sendAskFromPanel(text) {
+  if (askPanel === null || client === null) return;
+  const context = captureAskContext() ?? askPanel.state.context;
+  const turn = pushQuestion(askPanel.state, text, context);
+  refreshAskPanel();
   try {
     const result = await client.ask({
-      text: question.trim(),
-      file: doc.uri.scheme === 'file' ? doc.uri.fsPath : null,
-      lineStart: hasSelection ? selection.start.line + 1 : (doc.isDirty ? null : editor.selection.active.line + 1),
-      lineEnd: hasSelection ? selection.end.line + 1 : null,
-      selection: selectedText === '' ? null : selectedText,
-      languageId: doc.languageId ?? null,
+      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) {
-      vscode.window.setStatusBarMessage('$(check) 已发送给 DSH', 3000);
+      askPanel.state.sessionId = typeof result.sessionId === 'string' ? result.sessionId : null;
+      askPanel.state.status = 'thinking';
       log(`已投递编辑器消息(session=${result.sessionId ?? '?'})`);
     } else {
-      vscode.window.showWarningMessage(`未投递:${result.error ?? '未知原因'}`);
+      askPanel.state.status = 'error';
+      askPanel.state.error = `未投递:${result.error ?? '未知原因'}`;
+      turn.error = askPanel.state.error;
     }
   } catch (error) {
     const status = error && error.status;
-    if (status === 409) vscode.window.showWarningMessage('DSH 里没有可投递的会话:请先打开或新建一个会话。');
-    else if (status === 401 || status === 503) vscode.window.showWarningMessage('编辑器桥尚未就绪,请稍后重试。');
-    else vscode.window.showWarningMessage(`投递失败:${error && error.message ? error.message : error}`);
+    const message = status === 409
+      ? 'DSH 里没有可投递的会话:请先在 DSH 里打开或新建一个会话。'
+      : (status === 401 || status === 503
+        ? '编辑器桥尚未就绪,请稍后重试。'
+        : `投递失败:${error && error.message ? error.message : error}`);
+    // 桥没就绪时挂断会话:面板据此显示原因,轮询恢复后下一次发送即可。
+    askPanel.state.status = 'error';
+    askPanel.state.error = message;
+    turn.error = message;
+  }
+  refreshAskPanel();
+}
+
+/** 打开(或聚焦)「问 DSH」面板。上下文只用来显示;真正的上下文在发送时现取。 */
+function openAskPanel(context) {
+  const contextInfo = context ?? captureAskContext();
+  if (askPanel === null) {
+    const panel = vscode.window.createWebviewPanel(
+      'dshAsk',
+      'DSH 提问',
+      { viewColumn: vscode.ViewColumn.Beside, preserveFocus: false },
+      { enableScripts: true, retainContextWhenHidden: true },
+    );
+    askPanel = { panel, state: createPanelState() };
+    panel.webview.html = renderPanelHtml({
+      cspSource: panel.webview.cspSource,
+      nonce: crypto.randomBytes(16).toString('base64url'),
+    });
+    panel.webview.onDidReceiveMessage((message) => {
+      if (message === null || typeof message !== 'object') return;
+      if (message.type === 'ready') {
+        refreshAskPanel();
+        return;
+      }
+      if (message.type === 'ask' && typeof message.text === 'string') {
+        const text = message.text.trim();
+        if (text !== '') void sendAskFromPanel(text);
+      }
+    });
+    panel.onDidDispose(() => {
+      askPanel = null;
+    });
+  }
+  askPanel.state.context = contextInfo;
+  askPanel.panel.reveal(vscode.ViewColumn.Beside, false);
+  refreshAskPanel();
+}
+
+/** 选中内容 → DSH(编辑器→DSH 的主入口):打开面板并带上当前上下文。 */
+async function askAboutSelection() {
+  if (client === null || client.isDormant()) {
+    vscode.window.showInformationMessage('编辑器桥未启用:请在 DSH 里打开 Code Server 标签后重试。');
+    return;
   }
+  openAskPanel(captureAskContext());
 }
 
 /** 整个文件 → DSH(不需要选中)。 */

package/assets/extensions/dshcs-editor-bridge/lib/ask-panel.js

@@ -0,0 +1,230 @@
+// dshcs-editor-bridge / lib/ask-panel.js —— 「问 DSH」面板(0.2.0)
+//
+// 纯逻辑 + HTML 生成,**不 require('vscode')**,所以能在普通 Node 里单测
+// (scripts/test-bridge-extension.mjs)。与 VS Code 交互的部分在 extension.js。
+//
+// 为什么要有这个面板:0.3.0–0.3.18 的提问是「输入框 → 发送 → 一条状态栏提示」,
+// 用户在编辑器里问完必须切回 DSH 界面才看得到回答。面板把三件事放在一处:
+//   ① 带着上下文提问(文件:行 + 选中内容,发送时再取一次当前选区);
+//   ② 提问以**用户输入**的形态进 DSH 会话(host 侧 bridge-session.mjs 的 source.kind='user');
+//   ③ 回答**同步显示在这里** —— host 把 agent 的正文随 /sync 的 answers 字段推回来
+//      (见 lib/bridge-answer.mjs),面板每趟轮询刷新一次,不需要第二个定时器。
+
+'use strict';
+
+/** 面板里最多保留多少轮问答(超过丢最旧的:这是对话窗口,不是存档)。 */
+const MAX_TURNS = 20;
+
+/** 单条消息渲染上限(回答太长时截断,避免 webview 卡)。 */
+const MAX_MESSAGE_CHARS = 20000;
+
+/** HTML 转义:面板里所有用户/模型文本都必须走它(webview 里就是 XSS 面)。 */
+function escapeHtml(text) {
+  return String(text)
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;');
+}
+
+/**
+ * 面板状态模型(纯数据,便于单测)。
+ * @returns {{turns: Array<{question: string, answer: string, done: boolean, error: string|null}>,
+ *            context: object|null, status: string, sessionId: string|null}}
+ */
+function createPanelState() {
+  return { turns: [], context: null, status: 'idle', sessionId: null };
+}
+
+/** 追加一次提问(开始新一轮)。 */
+function pushQuestion(state, question, context) {
+  state.turns.push({ question, answer: '', done: false, error: null });
+  while (state.turns.length > MAX_TURNS) state.turns.shift();
+  state.context = context ?? state.context;
+  state.status = 'sending';
+  state.sessionId = null;
+  return state.turns[state.turns.length - 1];
+}
+
+/** 最后一次提问对应的轮次(没有就返回 null)。 */
+function currentTurn(state) {
+  return state.turns.length === 0 ? null : state.turns[state.turns.length - 1];
+}
+
+/**
+ * 把 host 推回来的 answers 应用到状态上。
+ * `answers` 是 `[{sessionId, text, done, at}]`(见 lib/bridge-answer.mjs);只认**本面板登记的会话**。
+ * @returns {boolean} 是否有变化(调用方据此决定要不要刷新 webview)
+ */
+function applyAnswers(state, answers, sessionId) {
+  const target = sessionId ?? state.sessionId;
+  if (target === null || target === undefined || !Array.isArray(answers)) return false;
+  const entry = answers.find((item) => item !== null && typeof item === 'object' && item.sessionId === target);
+  if (entry === undefined) return false;
+  const turn = currentTurn(state);
+  if (turn === null) return false;
+  const text = typeof entry.text === 'string' ? entry.text.slice(0, MAX_MESSAGE_CHARS) : '';
+  const done = entry.done === true;
+  const changed = turn.answer !== text || turn.done !== done || state.status !== (done ? 'idle' : 'thinking');
+  turn.answer = text;
+  turn.done = done;
+  state.status = done ? 'idle' : 'thinking';
+  return changed;
+}
+
+/** 状态 → 面板可渲染的 JSON(postMessage 的载荷)。 */
+function panelPayload(state) {
+  return {
+    type: 'state',
+    status: state.status,
+    context: state.context,
+    turns: state.turns.map((turn) => ({
+      question: turn.question,
+      answer: turn.answer,
+      done: turn.done === true,
+      error: turn.error ?? null,
+    })),
+  };
+}
+
+/** 上下文描述(标题栏那一行):文件:行 + 选区行数。 */
+function describeContext(context) {
+  if (context === null || context === undefined) return '';
+  const name = typeof context.file === 'string' && context.file !== '' ? context.file : '(当前文件)';
+  const base = name.replace(/^.*[\\/]/, '');
+  if (Number.isSafeInteger(context.lineStart)) {
+    const range = Number.isSafeInteger(context.lineEnd) && context.lineEnd !== context.lineStart
+      ? `${context.lineStart}-${context.lineEnd}`
+      : `${context.lineStart}`;
+    return `${base}:${range}`;
+  }
+  return base;
+}
+
+/**
+ * 面板 HTML(一次性的外壳;之后靠 postMessage 增量更新,避免把用户正在输入的内容冲掉)。
+ * @param {{cspSource: string, nonce: string}} options
+ */
+function renderPanelHtml({ cspSource, nonce }) {
+  return `<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src ${cspSource} 'unsafe-inline'; script-src 'nonce-${nonce}';">
+<title>DSH 提问</title>
+<style>
+  :root { color-scheme: light dark; }
+  body { margin: 0; font-family: var(--vscode-font-family); font-size: var(--vscode-font-size, 13px);
+         color: var(--vscode-foreground); background: var(--vscode-editor-background); display: flex; flex-direction: column; height: 100vh; }
+  header { padding: 8px 12px; border-bottom: 1px solid var(--vscode-panel-border, #8884); font-size: 12px; opacity: .85; }
+  #log { flex: 1; overflow-y: auto; padding: 12px; }
+  .turn { margin-bottom: 16px; }
+  .q { background: var(--vscode-input-background); border: 1px solid var(--vscode-input-border, #8884);
+       border-radius: 6px; padding: 6px 8px; white-space: pre-wrap; word-break: break-word; }
+  .a { margin-top: 8px; padding: 2px 2px 0 8px; border-left: 2px solid var(--vscode-focusBorder, #8886);
+       white-space: pre-wrap; word-break: break-word; }
+  .a.empty { opacity: .5; font-style: italic; }
+  .err { color: var(--vscode-errorForeground, #f66); margin-top: 6px; white-space: pre-wrap; }
+  footer { border-top: 1px solid var(--vscode-panel-border, #8884); padding: 8px; display: flex; gap: 8px; align-items: flex-end; }
+  textarea { flex: 1; resize: vertical; min-height: 54px; max-height: 40vh; padding: 6px 8px; box-sizing: border-box;
+             color: var(--vscode-input-foreground); background: var(--vscode-input-background);
+             border: 1px solid var(--vscode-input-border, #8884); border-radius: 4px; font-family: inherit; font-size: inherit; }
+  button { padding: 6px 14px; border: none; border-radius: 4px; cursor: pointer;
+           color: var(--vscode-button-foreground); background: var(--vscode-button-background); }
+  button:disabled { opacity: .5; cursor: default; }
+  #status { padding: 0 12px 8px; font-size: 12px; opacity: .8; min-height: 16px; }
+</style>
+</head>
+<body>
+<header id="ctx">来自编辑器</header>
+<div id="log"></div>
+<div id="status"></div>
+<footer>
+  <textarea id="box" placeholder="问 DSH…(Enter 发送,Shift+Enter 换行)"></textarea>
+  <button id="send">发送</button>
+</footer>
+<script nonce="${nonce}">
+  const vscode = acquireVsCodeApi();
+  const log = document.getElementById('log');
+  const ctx = document.getElementById('ctx');
+  const status = document.getElementById('status');
+  const box = document.getElementById('box');
+  const send = document.getElementById('send');
+
+  function render(state) {
+    ctx.textContent = state.contextText || '来自编辑器';
+    const atBottom = log.scrollHeight - log.scrollTop - log.clientHeight < 40;
+    log.textContent = '';
+    for (const turn of state.turns) {
+      const wrap = document.createElement('div');
+      wrap.className = 'turn';
+      const q = document.createElement('div');
+      q.className = 'q';
+      q.textContent = turn.question;
+      wrap.appendChild(q);
+      const a = document.createElement('div');
+      a.className = 'a' + (turn.answer ? '' : ' empty');
+      a.textContent = turn.answer || (turn.error ? '' : (turn.done ? '(没有文字回答)' : '思考中…'));
+      wrap.appendChild(a);
+      if (turn.error) {
+        const err = document.createElement('div');
+        err.className = 'err';
+        err.textContent = turn.error;
+        wrap.appendChild(err);
+      }
+      log.appendChild(wrap);
+    }
+    status.textContent = state.statusText || '';
+    send.disabled = state.status === 'sending';
+    if (atBottom) log.scrollTop = log.scrollHeight;
+  }
+
+  function submit() {
+    const text = box.value.trim();
+    if (text === '') return;
+    vscode.postMessage({ type: 'ask', text });
+    box.value = '';
+  }
+  send.addEventListener('click', submit);
+  box.addEventListener('keydown', (event) => {
+    if (event.key === 'Enter' && !event.shiftKey) { event.preventDefault(); submit(); }
+  });
+  window.addEventListener('message', (event) => { if (event.data && event.data.type === 'state') render(event.data); });
+  // 出错就写在状态行上:面板静默空白是最难查的一种失败。
+  window.addEventListener('error', (event) => {
+    status.textContent = '面板脚本出错:' + (event && event.message ? event.message : '未知');
+  });
+  window.addEventListener('unhandledrejection', (event) => {
+    status.textContent = '面板脚本出错:' + (event && event.reason ? String(event.reason) : '未知');
+  });
+  vscode.postMessage({ type: 'ready' });
+  box.focus();
+</script>
+</body>
+</html>`;
+}
+
+/** 状态 → 状态行文案(扩展侧组装,面板只显示)。 */
+function statusText(state) {
+  switch (state.status) {
+    case 'sending': return '发送中…';
+    case 'thinking': return 'DSH 正在回答…';
+    case 'error': return '出错了';
+    default: return '';
+  }
+}
+
+module.exports = {
+  MAX_TURNS,
+  MAX_MESSAGE_CHARS,
+  escapeHtml,
+  createPanelState,
+  pushQuestion,
+  currentTurn,
+  applyAnswers,
+  panelPayload,
+  describeContext,
+  renderPanelHtml,
+  statusText,
+};

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

@@ -277,7 +277,10 @@ function createClient(options) {
         for (const event of events) {
           if (Number.isSafeInteger(event.seq) && event.seq > since) since = event.seq;
         }
-        return { ok: true, events };
+        // answers = 「问过 DSH 的会话」的最新回复(0.3.19)。提问框靠它就地显示回答,
+        // 所以必须原样透传 —— 它走独立字段而不是事件环形缓冲(见 host 侧 lib/bridge-answer.mjs)。
+        const answers = body !== null && Array.isArray(body.answers) ? body.answers : [];
+        return { ok: true, events, answers };
       } catch (error) {
         return { ok: false, error: error.message, status: error.status, code: error.code };
       }

package/assets/extensions/dshcs-editor-bridge/package.json

@@ -2,7 +2,7 @@
   "name": "dshcs-editor-bridge",
   "displayName": "DSH Editor Bridge",
   "description": "只读地把编辑器状态(未保存缓冲区、诊断、活动选区)提供给 DSH,并让编辑器里的动作驱动 DSH 会话。由 dsh-code-server-app 插件安装,可禁用。",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "publisher": "dsh-code-server-app",
   "license": "MIT",
   "private": true,
@@ -21,14 +21,12 @@
       {
         "command": "dsh-code-server.askAboutSelection",
         "title": "DSH: 针对选中内容提问",
-        "category": "DSH",
-        "icon": "$(comment-discussion)"
+        "category": "DSH"
       },
       {
         "command": "dsh-code-server.askAboutFile",
         "title": "DSH: 针对当前文件提问",
-        "category": "DSH",
-        "icon": "$(comment)"
+        "category": "DSH"
       },
       {
         "command": "dsh-code-server.showBridgeLog",
@@ -47,17 +45,6 @@
           "command": "dsh-code-server.askAboutFile",
           "group": "navigation@-1"
         }
-      ],
-      "editor/title": [
-        {
-          "command": "dsh-code-server.askAboutSelection",
-          "when": "editorHasSelection",
-          "group": "navigation@-2"
-        },
-        {
-          "command": "dsh-code-server.askAboutFile",
-          "group": "navigation@-1"
-        }
       ]
     }
   },

package/lib/bridge-answer.mjs

@@ -0,0 +1,155 @@
+/**
+ * lib/bridge-answer.mjs — 把 agent 的回复同步回编辑器(0.3.19)。
+ *
+ * 方向:DSH → 编辑器。用户在编辑器里问了一句之后,当然想**在原地**看到回答,而不是切回 DSH 界面。
+ * 桥本来就是"扩展每 600ms 拉一次 `/sync`",所以回复走同一趟,新增一个字段而不是挤进事件环形缓冲:
+ *
+ *   `/sync` 响应 = `{ ok, events, answers }`
+ *   `answers` = `[{ sessionId, text, done, at }]` —— **每个会话只保留最新一条**,
+ *   且每次都是"到目前为止的完整正文"(不是增量)。这样:
+ *     · 事件环形缓冲(64 条)不被正文挤爆 —— `agent-edit` 那些提示不会因此丢掉;
+ *     · 丢中间态无所谓 —— 面板永远渲染最新那条完整正文,不需要做增量合并;
+ *
+ * 数据来源(都是 agent 作用域的事件,根上下文监听器能看到所有 agent):
+ *   - `agent/assistant-stream` 的 `text-delta` 帧 → 累积正文(**不含 reasoning**);
+ *   - `agent/status` → `idle`(这一轮跑完了)→ 标记 `done:true`。
+ *
+ * 只同步"**被编辑器问过**的会话"(ask 时登记 sessionId):别的会话在 DSH 界面里聊得再多,
+ * 也不该往桥里塞数据。会话数有上限,超了丢最旧的。
+ */
+
+/** 每个会话保留的最新回复;超过这么多会话就丢最旧的(编辑器里问过的会话不会有几个)。 */
+export const MAX_TRACKED_SESSIONS = 8;
+
+/** 回复正文上限:面板只用来显示,超长截断(避免一次 sync 把响应撑大)。 */
+export const MAX_ANSWER_CHARS = 20000;
+
+/** 累积器的实现:`registerBridgeAnswers` 用它,测试也直接用它。 */
+export function createAnswerBoard({ maxSessions = MAX_TRACKED_SESSIONS } = {}) {
+  /** sessionId → { text, done, at }(插入顺序即新旧顺序) */
+  const entries = new Map();
+
+  return {
+    /** ask 成功时登记:之后这个会话的回复才会同步给编辑器。 */
+    track(sessionId) {
+      if (typeof sessionId !== 'string' || sessionId === '') return false;
+      entries.delete(sessionId);
+      entries.set(sessionId, { text: '', done: false, at: Date.now() });
+      while (entries.size > maxSessions) entries.delete(entries.keys().next().value);
+      return true;
+    },
+    /** 追加一段正文(只在已登记的会话上生效)。 */
+    append(sessionId, text) {
+      if (typeof text !== 'string' || text === '' || !entries.has(sessionId)) return false;
+      const current = entries.get(sessionId);
+      const next = current.text + text;
+      entries.set(sessionId, {
+        text: next.length > MAX_ANSWER_CHARS ? next.slice(-MAX_ANSWER_CHARS) : next,
+        done: false,
+        at: Date.now(),
+      });
+      return true;
+    },
+    /** 一轮跑完(或出错):定稿。 */
+    finish(sessionId) {
+      const current = entries.get(sessionId);
+      if (current === undefined) return false;
+      entries.set(sessionId, { ...current, done: true, at: Date.now() });
+      return true;
+    },
+    /** 新的一轮开始:清掉上一次的正文,避免新旧回答拼在一起。 */
+    restart(sessionId) {
+      if (!entries.has(sessionId)) return false;
+      entries.set(sessionId, { text: '', done: false, at: Date.now() });
+      return true;
+    },
+    /** 给 `/sync` 的快照(数组顺序 = 登记顺序)。 */
+    snapshot() {
+      return [...entries.entries()].map(([sessionId, value]) => ({ sessionId, ...value }));
+    },
+    /** 某会话当前状态(诊断/测试用)。 */
+    get(sessionId) {
+      return entries.get(sessionId) ?? null;
+    },
+    size() {
+      return entries.size;
+    },
+  };
+}
+
+/** 从 agent 对象取会话 id(与 lib/bridge-session.mjs 同一套取值规则)。 */
+export function sessionIdOf(agent) {
+  if (agent === null || agent === undefined) return null;
+  if (agent.session !== undefined && agent.session !== null && typeof agent.session === 'object') {
+    return agent.session.id ?? agent.id ?? null;
+  }
+  return agent.id ?? null;
+}
+
+/**
+ * 订阅 agent 事件,把回复喂进 board。
+ *
+ * @param {object} ctx cordis 上下文(需要 `on`)
+ * @param {{board: ReturnType<typeof createAnswerBoard>, log?: (message: string) => void}} deps
+ * @returns {() => void} 注销函数(永不抛)
+ */
+export function registerBridgeAnswers(ctx, deps) {
+  const { board } = deps;
+  const log = deps.log ?? (() => {});
+  if (ctx === undefined || ctx === null || typeof ctx.on !== 'function') return () => {};
+  const disposers = [];
+  /** sessionId → 上次看到的 turn(换轮时重新累积正文)。 */
+  const lastTurn = new Map();
+  const on = (event, handler) => {
+    try {
+      const dispose = ctx.on(event, handler);
+      if (typeof dispose === 'function') disposers.push(dispose);
+    } catch (err) {
+      log(`订阅 ${event} 失败:${err && err.message ? err.message : String(err)}`);
+    }
+  };
+
+  on('agent/assistant-stream', (payload) => {
+    try {
+      const agent = payload?.agent;
+      const frame = payload?.frame;
+      if (frame?.type !== 'chunk') return;
+      const chunk = frame.chunk;
+      // 只同步**正文**:reasoning 是模型的内心戏,不该出现在编辑器的提问框里。
+      if (chunk?.type !== 'text-delta' || typeof chunk.text !== 'string' || chunk.text === '') return;
+      const sessionId = sessionIdOf(agent);
+      if (sessionId === null) return;
+      // 换了一轮(turn 变了)就重新累积:新问题给的是新回答,不该和上一轮拼在一起。
+      const turn = Number.isSafeInteger(frame.turn) ? frame.turn : null;
+      if (turn !== null && lastTurn.get(sessionId) !== turn) {
+        lastTurn.set(sessionId, turn);
+        board.restart(sessionId);
+      }
+      board.append(sessionId, chunk.text);
+    } catch (err) {
+      // 同步失败绝不影响 agent 的一轮(这与 lib/bridge-observe.mjs 同一策略)。
+      log(`同步回复失败:${err && err.message ? err.message : String(err)}`);
+    }
+  });
+
+  on('agent/status', (payload) => {
+    try {
+      if (payload?.status !== 'idle') return;
+      const sessionId = sessionIdOf(payload?.agent);
+      if (sessionId === null) return;
+      board.finish(sessionId);
+    } catch (err) {
+      log(`收尾回复失败:${err && err.message ? err.message : String(err)}`);
+    }
+  });
+
+  return () => {
+    for (const dispose of disposers) {
+      try {
+        dispose();
+      } catch {
+        // 注销失败无关正确性
+      }
+    }
+  };
+}

package/lib/bridge-session.mjs

@@ -1,8 +1,8 @@
 /**
- * lib/bridge-session.mjs — 把编辑器里的动作投递成 DSH 的一条用户消息(0.3.0)。
+ * lib/bridge-session.mjs — 把编辑器里的动作投递成 DSH 的一条**用户消息**(0.3.0;0.3.19 起以用户输入呈现)。
  *
  * 方向:编辑器 → DSH。用户在编辑器里选中一段代码、说一句"这个函数为什么是错的",
- * 这句话应当出现在**当前会话**里,并且带上文件:行与选区文本。
+ * 这句话应当出现在**当前会话**里(就像用户自己敲进去的),并且带上文件:行与选区文本。
  *
  * 投递目标的选取顺序(都通过 `ctx.get(...)` 特性探测,DSH 版本差异不会炸主流程):
  *   1. `ctx.agents.currentInitiator()` —— 正在跑的那次驱动链的 agent(最贴近"当前会话");
@@ -122,9 +122,14 @@ export async function deliverEditorPrompt(ctx, input) {
   const text = composeEditorPrompt(input);
   let message;
   try {
+    // **以"用户输入"进对话(0.3.19)**:`source:{kind:'user'}` 让 DSH 把它渲染成用户消息。
+    // 0.3.0–0.3.18 用的是 `{kind:'plugin', form:'notice', summary:'来自编辑器'}` ——
+    // `MessageSourceMap.plugin` 是 `plugin + ContextFormed`,DSH 会把它当成**上下文更新**,
+    // 于是用户在界面里看到的不是"自己说的话"。来源信息不丢:正文第一行仍是
+    // `From the editor: <file>:<行>`,扩展侧面板也标着"来自编辑器"。
     message = createUserMessage({
       content: [{ type: 'text', text }],
-      source: { kind: 'plugin', plugin: SOURCE_PLUGIN, form: 'notice', summary: '来自编辑器' },
+      source: { kind: 'user' },
     });
   } catch (err) {
     return { ok: false, code: 'BAD_MESSAGE', error: `构造消息失败:${err && err.message ? err.message : String(err)}` };

package/lib/index.js

@@ -54,6 +54,7 @@ import { bridgeEndpointPath, startBridgeListener } from './bridge-ipc.mjs';
 import { registerEditorPrompt, registerEditorTools, setPromptLiveProbe } from './bridge-tools.mjs';
 import { deliverEditorPrompt } from './bridge-session.mjs';
 import { registerBridgeObserver } from './bridge-observe.mjs';
+import { createAnswerBoard, registerBridgeAnswers } from './bridge-answer.mjs';
 
 // schemastery 由 DSH 部署自带(官方核心依赖),仿 auto-open-web 的解析策略:
 // 常规 import 优先,不可用时回退到全局 npm 布局的 DSH 部署副本。
@@ -722,10 +723,14 @@ export async function apply(ctx, config) {
   let bridgePromptDispose = null;
   /** agent 写操作观察器的 disposer。 */
   let bridgeObserveDispose = null;
+  /** agent 回复同步(提问框)的 disposer。 */
+  let bridgeAnswerDispose = null;
   /** 推给编辑器的事件环形缓冲(tools/result → 扩展轮询)。 */
   const bridgeEvents = createEventRing();
   /** 编辑器状态缓存:扩展在每次 /sync 里推上来,agent 的工具调用来读它。 */
   const bridgeContext = createContextCache();
+  /** 「问过 DSH 的会话」的最新回复(随 /sync 的 answers 同步回编辑器提问框)。 */
+  const bridgeAnswers = createAnswerBoard();
 
   /** 本次启动生成的新桥令牌;null = 本实例没有令牌(adopt 旧实例时会回读 bridge.json)。 */
   let bridgeToken = null;
@@ -850,6 +855,12 @@ export async function apply(ctx, config) {
     isLive: () => bridgeMeta !== null && !bridgeContext.isStale(),
   });
 
+  // 把 agent 的回复同步给编辑器里的「提问框」(0.3.19):正文随 /sync 的 answers 字段回去。
+  bridgeAnswerDispose = registerBridgeAnswers(ctx, {
+    board: bridgeAnswers,
+    log: (message) => console.warn(`[code-server] 编辑器桥回复同步:${message}`),
+  });
+
   /** 桥配置要写的目录(可能有**两个**):
    *
    *  ① `<extensionsDir>/.dshcs-bridge/` —— 权威位置;host 侧 /status 与诊断都指向它,
@@ -1661,7 +1672,9 @@ export async function apply(ctx, config) {
     }
     const events = bridgeEvents.since(since);
     bridgeEvents.reset();
-    return jsonResponse({ ok: true, events });
+    // 回复走独立字段(不是事件环形缓冲):每个会话只给**最新一条完整正文**,
+    // 这样丢中间态无所谓、也不会把 agent-edit 事件挤掉(见 lib/bridge-answer.mjs)。
+    return jsonResponse({ ok: true, events, answers: bridgeAnswers.snapshot() });
   }
 
   async function handleBridgeAsk(request) {
@@ -1689,6 +1702,10 @@ export async function apply(ctx, config) {
       selection,
       languageId: typeof body.languageId === 'string' ? body.languageId : null,
     });
+    // 登记这个会话:之后它的回复会随 /sync 同步回编辑器(见 lib/bridge-answer.mjs)。
+    if (result.ok === true && typeof result.sessionId === 'string' && result.sessionId !== '') {
+      bridgeAnswers.track(result.sessionId);
+    }
     return jsonResponse(result, result.ok === true ? 200 : (result.code === 'NO_AGENT' ? 409 : 200));
   }
 
@@ -1728,6 +1745,7 @@ export async function apply(ctx, config) {
       disposeKilled = true;
       stopPolling();
       bridgeObserveDispose = disposeSafely(bridgeObserveDispose);
+      bridgeAnswerDispose = disposeSafely(bridgeAnswerDispose);
       bridgePromptDispose = disposeSafely(bridgePromptDispose);
       clearBridgeRuntime();
       for (const d of disposers) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "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": {
@@ -43,6 +43,7 @@
     "lib/bridge-tools.mjs",
     "lib/bridge-session.mjs",
     "lib/bridge-observe.mjs",
+    "lib/bridge-answer.mjs",
     "lib/dsh-resolve.mjs",
     "lib/launcher.mjs",
     "lib/serve-dsh.mjs",

package/vendor/VENDOR.json

@@ -3,7 +3,7 @@
   "vscodeVersion": "1.137.0",
   "productPath": "stable-b11dabdaca0d3369986975be285db92c8795cea5",
   "layout": "vscode-only",
-  "preparedAt": "2026-09-13T06:01:07.076Z",
+  "preparedAt": "2026-09-13T06:39:47.464Z",
   "source": "registry",
   "node": "v24.21.0",
   "platform": "win32",