dsh-code-server-app 0.3.19 → 0.3.21

package/README.en.md

@@ -206,9 +206,13 @@ only the editor knows, and lets editor gestures drive the current session.
 - **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 two commands **remember their intent** (0.3.21): "ask about selection" carries a **line range + selection text**
+  only when something is actually selected, while "ask about file" **never carries line numbers or a selection** — the
+  cursor line is irrelevant to the question and only misleads the agent. With no selection, the selection command also
+  degrades to the plain file.
 - 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>`.
+  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

@@ -200,9 +200,12 @@ DSH 用**资源地址**命名文件,`openFile` 只负责把地址交给右侧栏
 - 工具只在桥就绪时注册(IDE 没起来时模型看不到"有个用不了的工具");提示词段落也只在桥存活时渲染。
 - **提问面板**(扩展 0.2.0 起):右键命令不再弹一行输入框,而是一个面板 —— 上面是问答记录、下面是输入框;
   发送时**现取当前选区**(可以在面板开着的同时改选区再问);回答跟着轮询一起刷新,不用切回 DSH 界面。
+  两个命令的**意图分开记**(0.3.21):「针对选中内容提问」只有真的选了内容才带**行区间 + 选区正文**;
+  「针对当前文件提问」**永远不带行号、不带选区** —— 光标停在哪一行跟问题无关,行号只会误导 agent;
+  没选区时用选中命令提问也会退化成纯文件。
 - 提问进 DSH 会话时是**普通用户消息**(`source: { kind: 'user' }`,host 0.3.19 修正):早期版本用
   `{kind:'plugin'}` 会被 DSH 渲染成"上下文更新",看起来不像自己说的话;来源信息靠正文首行
-  `From the editor: <file>:<行>` 保留。
+  `From the editor: <file>[:<行>]` 保留。
 - **全部只读**:桥不写文件、不改文档、不执行命令。agent 的写操作仍然全部走它自己的 `fs` 工具,
   桥只是"知道它写了什么"。
 - 编辑器侧的入口还有状态栏的 `$(plug) DSH`(连通时显示,点击打开日志),日志在输出面板

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

@@ -34,6 +34,7 @@ const { createDiffCache, describeChange } = require('./lib/diff-model.js');
 const {
   applyAnswers,
   createPanelState,
+  currentTurn,
   describeContext,
   panelPayload,
   pushQuestion,
@@ -379,8 +380,17 @@ async function pollOnce() {
   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();
+  if (askPanel !== null) {
+    if (result.answers === undefined) {
+      // 旧版 host(≤0.3.18)没有这个字段:此时面板会永远停在"正在回答…",必须说出原因。
+      askPanel.stalePolls = (askPanel.stalePolls ?? 0) + 1;
+      if (askPanel.stalePolls === 15 && askPanel.state.sessionId !== null && askPanel.state.status === 'thinking') {
+        failAskPanel('宿主没有回复同步能力(插件版本过旧?):请重启 dsh web 让 host 侧升级到 0.3.19 以上');
+      }
+    } else {
+      askPanel.stalePolls = 0;
+      if (applyAnswers(askPanel.state, result.answers, askPanel.state.sessionId)) refreshAskPanel();
+    }
   }
 }
 
@@ -409,19 +419,25 @@ function updateStatusBar() {
 
 // ---------------------------------------------------------------- 命令 / 提问面板
 
-/** 当前编辑器上下文(发送时现取一次:用户可以在面板开着的同时换选区)。 */
-function captureAskContext() {
+/**
+ * 当前编辑器上下文(发送时现取一次:用户可以在面板开着的同时换选区)。
+ *
+ * @param {'selection'|'file'} mode 提问意图:
+ *   - `selection`(「针对选中内容提问」):有选区就带上**行区间 + 选区正文**;
+ *     没有选区时退化成**纯文件**(不带行号 —— 光标停在哪一行跟问题无关,行号只会误导 agent);
+ *   - `file`(「针对当前文件提问」):**永远不带行号、不带选区**,只给文件路径。
+ */
+function captureAskContext(mode) {
   const editor = vscode.window.activeTextEditor;
   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 hasSelection = mode === 'selection'
+    && selection !== undefined && selection !== null && selection.isEmpty === false;
   const selectedText = hasSelection ? doc.getText(selection) : '';
   return {
     file: doc.uri.scheme === 'file' ? doc.uri.fsPath : null,
-    lineStart: hasSelection
-      ? selection.start.line + 1
-      : (doc.isDirty ? null : selection.active.line + 1),
+    lineStart: hasSelection ? selection.start.line + 1 : null,
     lineEnd: hasSelection ? selection.end.line + 1 : null,
     selection: selectedText === '' ? null : selectedText,
     languageId: doc.languageId ?? null,
@@ -441,10 +457,22 @@ function refreshAskPanel() {
   void askPanel.panel.webview.postMessage(payload);
 }
 
+/** 面板进入错误态:状态行 + 当前轮都标上原因(绝不静默)。 */
+function failAskPanel(message) {
+  if (askPanel === null) return;
+  askPanel.state.status = 'error';
+  askPanel.state.error = message;
+  const turn = currentTurn(askPanel.state);
+  if (turn !== null) turn.error = message;
+  log(message);
+  refreshAskPanel();
+}
+
 /** 面板收到一条提问:投递到 DSH,并把这一轮放进状态里等回答。 */
 async function sendAskFromPanel(text) {
   if (askPanel === null || client === null) return;
-  const context = captureAskContext() ?? askPanel.state.context;
+  // 用面板自己的意图(selection / file)取上下文:文件级提问永远不带行号。
+  const context = captureAskContext(askPanel.mode) ?? askPanel.state.context;
   const turn = pushQuestion(askPanel.state, text, context);
   refreshAskPanel();
   try {
@@ -480,9 +508,12 @@ async function sendAskFromPanel(text) {
   refreshAskPanel();
 }
 
-/** 打开(或聚焦)「问 DSH」面板。上下文只用来显示;真正的上下文在发送时现取。 */
-function openAskPanel(context) {
-  const contextInfo = context ?? captureAskContext();
+/**
+ * 打开(或聚焦)「问 DSH」面板。
+ * @param {'selection'|'file'} mode 提问意图(决定发送时带不带行号/选区),见 captureAskContext。
+ */
+function openAskPanel(mode = 'selection') {
+  const contextInfo = captureAskContext(mode);
   if (askPanel === null) {
     const panel = vscode.window.createWebviewPanel(
       'dshAsk',
@@ -490,7 +521,7 @@ function openAskPanel(context) {
       { viewColumn: vscode.ViewColumn.Beside, preserveFocus: false },
       { enableScripts: true, retainContextWhenHidden: true },
     );
-    askPanel = { panel, state: createPanelState() };
+    askPanel = { panel, state: createPanelState(), mode };
     panel.webview.html = renderPanelHtml({
       cspSource: panel.webview.cspSource,
       nonce: crypto.randomBytes(16).toString('base64url'),
@@ -511,22 +542,32 @@ function openAskPanel(context) {
     });
   }
   askPanel.state.context = contextInfo;
+  askPanel.mode = mode;
   askPanel.panel.reveal(vscode.ViewColumn.Beside, false);
   refreshAskPanel();
 }
 
 /** 选中内容 → DSH(编辑器→DSH 的主入口):打开面板并带上当前上下文。 */
 async function askAboutSelection() {
+  await openAskPanelFor('selection');
+}
+
+/** 整个文件 → DSH(不带选中、**不带行号**)。 */
+async function askAboutFile() {
+  await openAskPanelFor('file');
+}
+
+/** 两个命令的公共前置检查(桥可用 + 有活动编辑器)。 */
+async function openAskPanelFor(mode) {
   if (client === null || client.isDormant()) {
     vscode.window.showInformationMessage('编辑器桥未启用:请在 DSH 里打开 Code Server 标签后重试。');
     return;
   }
-  openAskPanel(captureAskContext());
-}
-
-/** 整个文件 → DSH(不需要选中)。 */
-async function askAboutFile() {
-  await askAboutSelection();
+  if (captureAskContext(mode) === null) {
+    vscode.window.showInformationMessage('没有活动的编辑器:请先打开一个文件。');
+    return;
+  }
+  openAskPanel(mode);
 }
 
 function showBridgeLog() {

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.2.0",
+  "version": "0.2.2",
   "publisher": "dsh-code-server-app",
   "license": "MIT",
   "private": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-code-server-app",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "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-13T06:39:47.464Z",
+  "preparedAt": "2026-09-13T07:25:18.352Z",
   "source": "registry",
   "node": "v24.21.0",
   "platform": "win32",