dsh-vscode-mode 0.15.7 → 0.15.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-mode",
-  "version": "0.15.7",
+  "version": "0.15.9",
   "description": "DSH 上的类 VSCode 编码体验：Monaco 编辑器（文件页签/QuickOpen/状态栏，可驻 DSH 0.1.5+ 官方右侧 Sidebar 与对话同屏）+ 命令栏（Ctrl+Shift+P）与可扩展指令系统 + VS Code 兼容代码片段（.code-snippets 全局/项目，IntelliSense 展开）+ Agent 编辑差异审查（整文件差异/采纳/拒绝/归档/回滚）+ SVN 集成（侧栏变更面板/日志弹窗/并排差异）+ 语言服务器（LSP）智能（跳转定义/引用/hover/大纲 + VSIX 扩展市场安装），状态持久化到工作区旁车，界面状态（页签/光标/侧栏/编辑 Tab/导航历史）镜像到 DSH home 跨重启恢复",
   "icon": "assets/icon.svg",
   "keywords": [

package/src/client/index.ts

@@ -67,6 +67,7 @@ import { disposeAiInline } from './ai/inlineProvider.js'
 import { readSessionScope, subscribeScope } from './sessionScope.js'
 import { installPlanBridge } from './planBridge.js'
 import { installPageReload } from './pageReload.js'
+import { installUpdateNotice } from './updateNotice.js'
 import { flushPageState, flushUiState, hydrateUiState, installUiStatePersist, onUiStateReady, reportUiStateEvent, uiStateSettled } from './state/uiStatePersist.js'
 import { workspaceScopeOf } from './state/scopeStore.js'
 import { dapStore } from './dap/store.js'
@@ -195,6 +196,9 @@ export async function apply(ctx: any): Promise<void> {
   }
   ctx.effect(() => installPageReload(flushPageState, notifyReload), 'vscode-mode: guarded page reload')
 
+  // 可用更新主动提醒：启动延迟 + 抖动后检查 registry，有新版本且未提醒过时 toast（失败静默）
+  installUpdateNotice(ctx, schedule)
+
   const registry: FileOpenerRegistry = createFileOpenerRegistry()
   const workspaces = ctx.get('workspaces')
   const sessions = ctx.get('sessions')

package/src/client/sessionError.ts

@@ -0,0 +1,38 @@
+/**
+ * dsh-vscode-mode client — 会话缺失错误识别与友好文案。
+ * 跨端场景：桌面端与 Web 端各自运行独立 DSH 实例，会话列表跨实例可见，
+ * 但会话仅在一端激活；另一端发起的 edrv.* RPC 会被 host requireSession
+ * 以「会话不存在」拒绝。此处把该错误归类为终态提示（非反复重试可解），
+ * 并给出引导文案，替代裸错误卡死观感。
+ * 作者 ddj 2026年10月16号
+ */
+import { SESSION_MISSING_ERROR } from '../shared/rpc.js'
+
+/**
+ * 判断错误文案是否为「会话不存在」类错误。
+ * @author ddj 2026年10月16号
+ * @param text 任意错误文本（host 业务 error、异常 message 等原始形态）
+ * @returns 命中规范文案（含拼接形态，如「会话不存在：路径」）返回 true；空值安全
+ */
+export function isSessionMissingError(text: unknown): boolean {
+  return String(text ?? '').includes(SESSION_MISSING_ERROR)
+}
+
+/**
+ * 会话缺失提示标题（编辑区终态面板与侧栏红条共用）。
+ * @author ddj 2026年10月16号
+ * @returns 简短标题文案
+ */
+export function sessionMissingTitle(): string {
+  return '会话在当前端不可用'
+}
+
+/**
+ * 会话缺失提示详情：说明成因并给出引导（去持有端查看，或在本端打开会话后重试）。
+ * @author ddj 2026年10月16号
+ * @returns 多句详情文案
+ */
+export function sessionMissingDetail(): string {
+  return '该会话可能正被其他 DSH 实例（桌面端 / Web 端）占用，或尚未在当前实例激活。' +
+    '请在持有该会话的一端查看，或在本端打开该会话后重试。'
+}

package/src/client/sidebar/panels/FileExplorer.ts

@@ -13,6 +13,7 @@
 import React from 'react'
 import { IconFolderClose16, IconFolderOpen16, IconRefreshOutline16, fileIconEl } from '../../ui/icons.js'
 import { rpc } from '../../rpc.js'
+import { isSessionMissingError, sessionMissingDetail, sessionMissingTitle } from '../../sessionError.js'
 import { ContextMenu } from '../../ui/ContextMenu.js'
 import { buildTreeMenu } from '../contextMenu.js'
 import { explorerLoad, explorerSave } from '../../state/explorerCache.js'
@@ -423,7 +424,12 @@ export function FileExplorer(props) {
   const updateHint = !ctx?.svn?.svnCli ? 'SVN CLI 不可用' : !ctx?.openSvnUpdate ? 'SVN 更新窗口不可用' : '更新项目（打开 SVN 更新窗口）'
 
   const errorList = Object.entries(errors)
-  const errorText = errorList.length ? errorList[0][1] : null
+  // 跨端会话缺失：裸错误替换为友好标题 + 详情（重试仍保留，会话在本端可用后即恢复）
+  const rawErrorText = errorList.length ? errorList[0][1] : null
+  const sessionMissing = isSessionMissingError(rawErrorText)
+  const errorText = rawErrorText === null
+    ? null
+    : sessionMissing ? sessionMissingTitle() + '：' + sessionMissingDetail() : rawErrorText
 
   return React.createElement('div', { className: 'edrv-side-panel', onContextMenu: onPanelContext },
     React.createElement('div', { className: 'edrv-side-head' },

package/src/client/state/editorFindState.ts

@@ -1,4 +1,9 @@
-/** Workspace-local Ctrl+F state bridge; ddj 2026年10月09号. */
+/**
+ * Workspace-local Ctrl+F state bridge; ddj 2026年10月09号.
+ *
+ * 快照键语义（ddj 2026年10月16号）：键由调用方传入（findKey），不再限定为工作区 scope——
+ * 编辑器按分组隔离搜索框时传「scope + 分组 id」组合键；旧调用传 scope 时行为完全不变。
+ */
 export interface FindSnapshot {
   searchString: string
   isRevealed: boolean
@@ -58,17 +63,17 @@ function applyFind(controller: FindController, saved: FindSnapshot): Promise<unk
 /** @public @author ddj 2026年10月09号 @param editor Monaco editor. @returns Model-switch bridge; dispose releases the native listener. */
 export function createFindBridge(editor: FindEditor) {
   const controller = controllerOf(editor)
-  let scope: string | null = null
+  let findKey: string | null = null
   let paused = true
   let disposed = false
 
-  /** @private @author ddj 2026年10月09号 Capture only user changes, not model-reset or restoration events. */
+  /** @private @author ddj 2026年10月16号 Capture only user changes into the current findKey bucket, not model-reset or restoration events. */
   function capture(): void {
-    if (disposed || paused || !scope || !controller) return
+    if (disposed || paused || !findKey || !controller) return
     try {
       const saved = snapshotOf(controller.getState())
-      snapshots.delete(scope)
-      snapshots.set(scope, saved)
+      snapshots.delete(findKey)
+      snapshots.set(findKey, saved)
       if (snapshots.size > 20) snapshots.delete(snapshots.keys().next().value!)
     } catch { /* A disposed contribution must not interrupt view capture. */ }
   }
@@ -77,11 +82,11 @@ export function createFindBridge(editor: FindEditor) {
   /** @public @author ddj 2026年10月09号 Save before setModel; suppress Monaco's per-model option resets. */
   function pause(): void { capture(); paused = true }
 
-  /** @public @author ddj 2026年10月09号 @param nextScope Workspace owning the bound model. Restore with moveCursor=false; no per-file range or match index. */
-  function resume(nextScope: string): void {
+  /** @public @author ddj 2026年10月16号 @param nextKey Bucket owning the bound view（scope 或 scope+分组 id 组合键）. Restore with moveCursor=false; no per-file range or match index. */
+  function resume(nextKey: string): void {
     if (disposed || !controller) return
-    scope = nextScope
-    const saved = snapshots.get(scope) ?? {
+    findKey = nextKey
+    const saved = snapshots.get(findKey) ?? {
       searchString: '', isRevealed: false, matchCase: false, wholeWord: false, isRegex: false,
     }
     try {

package/src/client/state/editorViewState.ts

@@ -14,6 +14,8 @@ export interface ViewEditor extends FindEditor {
 export function createViewKeeper(editor: ViewEditor) {
   const find = createFindBridge(editor)
   let bound: { scope: string; path: string; model: unknown } | null = null
+  // Ctrl+F 快照键跟随最近一次 bind（默认回退 scope）；编辑器跨分组复用时按组存取搜索框状态
+  let lastFindKey: string | null = null
   let disposed = false
 
   /** @public @author ddj 2026年10月09号 @param path Optional expected path; mismatches never write a snapshot under the wrong file. Persist viewport even if cursor never moved. */
@@ -27,20 +29,21 @@ export function createViewKeeper(editor: ViewEditor) {
     } catch { /* A missing/disposed model must not overwrite a valid snapshot. */ }
   }
 
-  /** @public @author ddj 2026年10月09号 @param scope Model workspace. @param path Cache path. @param model Ready text model. Restore only on identity change, before explicit navigation effects. */
-  function bind(scope: string, path: string, model: unknown): void {
+  /** @public @author ddj 2026年10月16号 @param scope Model workspace. @param path Cache path. @param model Ready text model. @param findKey Optional Ctrl+F snapshot bucket（scope+分组 id）；缺省沿用 scope. Restore only on identity change, before explicit navigation effects. */
+  function bind(scope: string, path: string, model: unknown, findKey?: string): void {
     if (disposed || !path || !model) return
     if (bound?.scope === scope && bound.path === path && bound.model === model
-      && editor.getModel() === model) return
+      && editor.getModel() === model && (findKey === undefined || findKey === lastFindKey)) return
     save()
     find.pause()
     if (editor.getModel() !== model) editor.setModel(model)
     bound = { scope, path, model }
+    lastFindKey = findKey ?? scope
     const state = viewStatesLoad(scope)[path]
     if (state) {
       try { editor.restoreViewState(state) } catch { /* Stale fold ranges may be invalid. */ }
     }
-    find.resume(scope)
+    find.resume(lastFindKey)
   }
 
   /** @public @author ddj 2026年10月09号 Save before dispose/ref clearing; repeated cleanup is a no-op. */

package/src/client/styles/editor.css

@@ -23,6 +23,9 @@
 [data-edrv-view] .edrv-pathbar .edrv-pb-full { flex: 1; min-width: 0; color: var(--dsw-alias-label-tertiary, #9aa5b1); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; direction: rtl; text-align: left; }
 [data-edrv-view] .edrv-pathbar .edrv-pb-meta { flex-shrink: 0; font-size: 11px; color: var(--dsw-alias-label-tertiary, #9aa5b1); font-variant-numeric: tabular-nums; }
 [data-edrv-view] .edrv-pathbar .edrv-pb-status { color: var(--dsw-alias-label-secondary, #52606d); }
+/* 非焦点分组的静态路径条（GroupPathbar）：可点击聚焦所属组，悬停给反馈 @author ddj 2026-10-16 */
+[data-edrv-view] .edrv-pathbar[data-edrv-pb-static] { cursor: pointer; }
+[data-edrv-view] .edrv-pathbar[data-edrv-pb-static]:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.06)); }
 [data-edrv-view] .edrv-pb-update { display: inline-flex; align-items: center; gap: 4px; height: 20px; flex: none; padding: 0 6px; border: 1px solid var(--dsw-alias-border-l1, #d9e0e4); border-radius: 4px; background: var(--dsw-alias-bg-layer-2, #f1f4f5); color: var(--dsw-alias-label-secondary, #485762); font-size: 11px; cursor: pointer; }
 [data-edrv-view] .edrv-pb-update:hover { background: var(--dsw-alias-interactive-bg-hover, #e7edf0); }
 [data-edrv-view] .edrv-pb-update:focus-visible { outline: 2px solid var(--dsw-alias-brand-primary, #2869b4); outline-offset: 1px; }

package/src/client/ui/EditorPane.ts

@@ -61,14 +61,34 @@ export function bindPaneView(editor: ViewEditor, scope: string, path: string, mo
 
 export interface PassiveProps {
   path: string | null
-  mount(host: HTMLDivElement, path: string): (() => void) | undefined
+  groupId?: string
+  mount(host: HTMLDivElement, path: string, groupId?: string): (() => void) | undefined
 }
 
-/** @public @author ddj 2026年10月14号 @param props Workbench-owned mounting contract. @returns Independent visible file view without global command listeners. */
+/**
+ * 非焦点分组的静态路径条：让路径条在每个编辑分组常驻（分组高度不随焦点切换变化）。
+ * 只读展示文件名 + 完整路径，点击聚焦所属组（与 passive 编辑器 pointerdown 同语义）。
+ * @public @author ddj 2026年10月16号
+ * @param props path 当前组活动文件（null 显示占位）；onFocus 点击回调。
+ * @returns 恒定 26px 高的路径条元素。
+ */
+export function GroupPathbar(props: { path: string | null; onFocus?(): void }): React.ReactElement {
+  const name = props.path ? props.path.split(/[\\/]/).pop() : '未打开文件'
+  return React.createElement('div', {
+    className: 'edrv-pathbar', 'data-edrv-pb-static': '1',
+    title: props.path || '此分页未打开文件', onClick: props.onFocus,
+  },
+  React.createElement('span', { className: 'edrv-pb-name' }, name),
+  React.createElement('span', { className: 'edrv-pb-full' }, props.path || ''))
+}
+
+/** @public @author ddj 2026年10月16号 @param props Workbench-owned mounting contract. @returns Independent visible file view without global command listeners. */
 export function PassiveEditor(props: PassiveProps): React.ReactElement {
   const host = React.useRef<HTMLDivElement>(null)
+  const groupRef = React.useRef(props.groupId)
+  groupRef.current = props.groupId
   React.useLayoutEffect(() => {
-    if (host.current && props.path) return props.mount(host.current, props.path)
+    if (host.current && props.path) return props.mount(host.current, props.path, groupRef.current)
   }, [props.path, props.mount])
   return React.createElement('div', { ref: host, className: 'edrv-passive-view' })
 }

package/src/client/ui/EditorView.ts

@@ -9,7 +9,7 @@
  */
 import React from 'react'
 import { createPortal } from 'react-dom'
-import { EditorPane, EditorSplit, PassiveEditor } from './EditorPane.js'
+import { EditorPane, EditorSplit, PassiveEditor, GroupPathbar } from './EditorPane.js'
 import { FloatingEditor } from './FloatingEditor.js'
 import { FloatingWindow } from './FloatingWindow.js'
 import { createLayout, parseLayout, syncTabs, ownerOf, focusGroup, moveTab, returnGroup, GROUP_LIMIT, MAIN_GROUP } from '../state/editorLayout.js'
@@ -118,6 +118,7 @@ import { buildBpMenu } from '../dap/bpMenu.js'
 import { clampToolbarPosition, loadToolbarPosition, saveToolbarPosition } from '../dap/toolbarDrag.js'
 import { editorModelPathOf } from '../dap/modelPath.js'
 import { dapTrace } from '../dap/trace.js'
+import { isSessionMissingError, sessionMissingDetail, sessionMissingTitle } from '../sessionError.js'
 
 /**
  * 只在 Lua 注解类型槽开启注释自动建议；跨文件/离开类型槽立即恢复默认。
@@ -1897,6 +1898,37 @@ export function EditorView(props) {
     loadContent(active, sessionId)
   }, [active, sessionId])
 
+  /**
+   * 切换焦点分组时同步重置内容状态（与 setWorkbench 同批渲染）。
+   *
+   * 为什么不能只靠上面的 active effect：它在本轮 commit **之后**才执行——而 mountFull 在 commit 阶段
+   * 就把 fullHost 搬进新焦点组，导致新组先 paint 一帧旧组文件内容（用户所见「内容串组」闪烁）。
+   *
+   * 两个分支（ddj 2026年10月16号）：
+   * - 新组文件 model 已缓存 → 直接用缓存内容 seed（同批渲染即最终内容，无 loading 帧 → 切组零空白）；
+   * - 未缓存 → setContent(null)（loading 帧），避免旧内容串组。
+   * 之后 active effect 的 loadContent 照常校验/接管（缓存分支 value 相同，React 不会多渲染）。
+   */
+  const resetContentForSwitch = (nextPath) => {
+    const cached = nextPath ? modelsRef.current.get(nextPath) : null
+    if (cached) {
+      setContent(cached.getValue())
+      setContentPath(nextPath)
+      setLoadStage((prev) => ({ progress: Math.max(prev.progress, 84), message: '文件已读取，准备创建编辑器…' }))
+      setStatus('已加载')
+      return
+    }
+    setContent(null)
+    setContentPath(null)
+    setLoadStage({ progress: 10, message: '准备读取文件…' })
+    setStatus('加载中…')
+    setImageSrc(null)
+    setImgSize(null)
+    setImgBroken(false)
+    setPdfBytes(null)
+    setLoadError(null)
+  }
+
   // 页签右键菜单的 Esc 关闭由 ContextMenu 组件自己处理（capture 监听），此处不再重复挂监听
 
   React.useEffect(() => {
@@ -2190,7 +2222,7 @@ export function EditorView(props) {
     if (!monaco || !editorRef.current || !active || !contentReady) return
     const ed = editorRef.current
     const model = getModel(active, content)
-    viewKeeperRef.current?.bind(String(scope), active, model)
+    viewKeeperRef.current?.bind(String(scope), active, model, findKeyOf(scope, focusedGroupOf(active)))
     syncTypeSuggest(ed, monaco)
     setLoadStage((prev) => ({ progress: Math.max(96, prev.progress), message: '创建编辑器视图…' }))
   }, [monaco, scope, active, content, contentReady, mdPreviewing, svnDiff])
@@ -2290,8 +2322,9 @@ export function EditorView(props) {
       language: 'plaintext',
       theme: themeNameOf(),
       fontFamily: 'var(--ds-font-family-code, ui-monospace, monospace)',
-      fontSize: 13,
-      lineHeight: 20,
+      // 16px/21px：与 md 预览渲染态同字号，切分页/切组时观感不再跳变（ddj 2026-10-16）
+      fontSize: 16,
+      lineHeight: 21,
       minimap: { enabled: !side, scale: 1 },
       glyphMargin: true,
       lineDecorationsWidth: 16,
@@ -3703,16 +3736,21 @@ export function EditorView(props) {
     saveViewState()
     recordNav()
     const next = focusGroup(benchRef.current, group, path)
+    const nextActive = next.groups.find((item) => item.id === group)?.active ?? null
+    // 新焦点组文件与当前 contentPath 不同才重置：同文件聚焦无内容切换；缓存命中同步 seed（零空白），未命中清空防串组
+    if (nextActive && nextActive !== activeRef.current) resetContentForSwitch(nextActive)
     setWorkbench(next)
     setPlanActive(null)
-    setDiskActive(next.groups.find((item) => item.id === group)?.active ?? null)
+    setDiskActive(nextActive)
   }
   /** @private @author ddj 2026年10月14号 @param next Atomic layout. Accept ownership without close/save side effects. */
   function acceptLayout(next) {
     saveViewState()
+    const nextActive = next.groups.find((group) => group.id === next.focused)?.active ?? null
+    if (nextActive && nextActive !== activeRef.current) resetContentForSwitch(nextActive)
     setWorkbench(next)
     setPlanActive(null)
-    setDiskActive(next.groups.find((group) => group.id === next.focused)?.active ?? null)
+    setDiskActive(nextActive)
   }
   /** @private @author ddj 2026年10月14号 @param path File. @param edge Split direction. Move the file into a new group. */
   function splitTab(path, edge) {
@@ -3764,9 +3802,62 @@ export function EditorView(props) {
   }
   /** @private @author ddj 2026年10月14号 @param host Group body. Keep the full editor subtree stable while changing group/window ownership. */
   function mountFull(host) { if (host && fullHost.parentElement !== host) { host.appendChild(fullHost); editorRef.current?.layout() } }
-  /** @private @author ddj 2026年10月14号 @param host Passive body. @param path Canonical file. @returns View-only cleanup, models remain workbench-owned. */
-  function mountPassive(host, path) {
-    let disposed = false, keeper = null, subscription = null, observer = null
+  /** @private @author ddj 2026年10月16号 @param editor Passive editor instance. @param host Passive view container. @param path Canonical file of this group. @returns Gutter cleanup（断点装饰订阅 + 右键捕获解除）. 断点 glyph 列每分页可用：装饰/左键切换/hover 预览/右键菜单与焦点编辑器同语义。 */
+  function bindBpGutter(editor, host, path) {
+    const m = window.monaco
+    const GUTTER = m.editor?.MouseTargetType?.GUTTER_GLYPH_MARGIN ?? 2
+    const bpListOf = () => (dapStore.bpMapOf(dapScopeRef.current)[path] ?? [])
+
+    const applyBp = () => {
+      const map = dapStore.bpMapOf(dapScopeRef.current)
+      const unverified = bpLinesOf(map, path).filter((line) => dapStore.ackOf(path, line)?.verified === false)
+      applyBpDecorations(editor, bpLinesOf(map, path), bpDisabledLinesOf(map, path), unverified)
+    }
+    applyBp()
+    const unsubscribeBp = dapStore.subscribe(applyBp)
+
+    editor.onMouseDown((e) => {
+      if (!e?.event?.leftButton) return
+      const target = e?.target
+      if (!target || target.type !== GUTTER) return
+      const line = target.position?.lineNumber
+      if (line) dapToggleRef.current?.(path, line)
+    })
+    editor.onMouseMove((e) => {
+      const target = e?.target
+      const line = hintLineFor(target?.type, target?.position?.lineNumber, bpListOf().map((it) => it.line))
+      setHintLine(editor, line || null)
+    })
+    editor.onMouseLeave(() => setHintLine(editor, null))
+
+    const glyphHit = (ev) => {
+      if (!editor.getTargetAtClientPoint) return null
+      const rect = editor.getDomNode?.()?.getBoundingClientRect?.()
+      const layout = editor.getLayoutInfo?.()
+      if (!rect || !layout) return null
+      const relX = ev.clientX - rect.left
+      if (relX < layout.glyphMarginLeft || relX > layout.glyphMarginLeft + layout.glyphMarginWidth) return null
+      const target = editor.getTargetAtClientPoint(ev.clientX, ev.clientY)
+      if (!target || target.type !== GUTTER) return null
+      return target.position?.lineNumber ?? null
+    }
+    const onCtx = (ev) => {
+      const line = glyphHit(ev)
+      if (!line) return
+      const entry = bpListOf().find((it) => it.line === line)
+      ev.preventDefault()
+      ev.stopPropagation()
+      setDapBpMenu({
+        x: ev.clientX, y: ev.clientY, path, line,
+        hasBp: !!entry, enabled: entry ? entry.enabled !== false : true, isLogpoint: !!(entry && entry.logMessage),
+      })
+    }
+    host.addEventListener('contextmenu', onCtx, true)
+    return () => { unsubscribeBp?.(); host.removeEventListener('contextmenu', onCtx) }
+  }
+  /** @private @author ddj 2026年10月16号 @param host Passive body. @param path Canonical file. @param groupId Owning group id（find 快照按组隔离）. @returns View-only cleanup, models remain workbench-owned. */
+  function mountPassive(host, path, groupId) {
+    let disposed = false, keeper = null, subscription = null, observer = null, unbindGutter = null
     const focus = () => { const owner = ownerOf(benchRef.current, path); if (owner) selectGroup(owner.id, path) }
     host.addEventListener('pointerdown', focus)
     if (isPdfPath(path) && pdfNodes.current.has(path)) {
@@ -3791,9 +3882,13 @@ export function EditorView(props) {
       if (!window.monaco) { host.textContent = '编辑器正在加载'; return }
       const model = cached || getModel(path, result.content)
       if (result.version) { revRef.current[path] = result.version; recordBaseline(scope, path, result.version) }
-      const editor = window.monaco.editor.create(host, { model, automaticLayout: true, minimap: { enabled: false }, scrollBeyondLastLine: false })
+      const editor = window.monaco.editor.create(host, { model, automaticLayout: true, minimap: { enabled: false }, scrollBeyondLastLine: false, glyphMargin: true,
+        // 与焦点编辑器（ensureEditor）同观感参数：字号/行高/顶部留白（side 形态 6，tab 形态 8）/装饰宽度，切分页行号位置不跳变（ddj 2026-10-16）
+        fontFamily: 'var(--ds-font-family-code, ui-monospace, monospace)', fontSize: 16, lineHeight: 21,
+        lineDecorationsWidth: 16, padding: { top: layoutRef.current === 'side' ? 6 : 8 } })
+      const unbindGutter = bindBpGutter(editor, host, path)
       keeper = createViewKeeper(editor)
-      keeper.bind(scope, path, model)
+      keeper.bind(scope, path, model, groupId ? findKeyOf(scope, groupId) : undefined)
       paneEditors.current.set(path, editor)
       const store = documents()
       store.bind(path, model, revRef.current[path])
@@ -3801,11 +3896,15 @@ export function EditorView(props) {
       observer = new ResizeObserver(() => editor.layout())
       observer.observe(host)
     }).catch((failure) => { if (!disposed) host.textContent = '文件加载失败：' + String(failure) })
-    return () => { disposed = true; host.removeEventListener('pointerdown', focus); observer?.disconnect(); subscription?.dispose(); keeper?.dispose(); paneEditors.current.delete(path) }
+    return () => { disposed = true; host.removeEventListener('pointerdown', focus); unbindGutter?.(); observer?.disconnect(); subscription?.dispose(); keeper?.dispose(); paneEditors.current.delete(path) }
   }
   const passiveOps = React.useRef(mountPassive)
   passiveOps.current = mountPassive
-  const passiveMount = React.useCallback((host, path) => passiveOps.current(host, path), [])
+  const passiveMount = React.useCallback((host, path, groupId) => passiveOps.current(host, path, groupId), [])
+  /** @private @author ddj 2026年10月16号 @param scope Workspace scope. @param groupId Editor group id. @returns Ctrl+F snapshot bucket key isolating find state per group. */
+  function findKeyOf(scope, groupId) { return String(scope) + '\u0000' + String(groupId) }
+  /** @private @author ddj 2026年10月16号 @param active Active file path. @returns Owning group id, falling back to the focused group. */
+  function focusedGroupOf(active) { return ownerOf(benchRef.current, active)?.id ?? benchRef.current.focused }
   /** @private @author ddj 2026年10月14号 @param node Split branch. @param ratio Updated branch ratio. */
   function changeRatio(node, ratio) {
     const replace = (current) => current === node ? { ...current, ratio } : 'group' in current ? current : { ...current, first: replace(current.first), second: replace(current.second) }
@@ -3817,7 +3916,9 @@ export function EditorView(props) {
     if (!group) return null
     const focused = id === workbench.focused
     return React.createElement(EditorPane, { key: id, group, focused, dirty: dirtyMap, onSelect: selectGroup, onClose: closeTab, onMenu: paneMenu, onDrag: dragTab, consumeClick: consumeDrag },
-      focused ? React.createElement('div', { className: 'edrv-full-slot', ref: mountFull }) : React.createElement(PassiveEditor, { key: String(scope) + ':' + group.active, path: group.active, mount: passiveMount }))
+      focused ? React.createElement('div', { className: 'edrv-full-slot', ref: mountFull }) : React.createElement(React.Fragment, null,
+        React.createElement(GroupPathbar, { path: group.active, onFocus: () => selectGroup(id) }),
+        React.createElement(PassiveEditor, { key: String(scope) + ':' + group.active, path: group.active, groupId: id, mount: passiveMount })))
   }
   /** @private @author ddj 2026年10月14号 @param node Layout subtree. @returns Recursive resizable panes. */
   function renderTree(node) {
@@ -4024,6 +4125,18 @@ export function EditorView(props) {
     body = React.createElement('div', { className: 'edrv-empty' },
       React.createElement('div', null, '暂无打开的文件'),
       React.createElement('div', { style: { fontSize: 12 } }, '使用右上搜索框 (' + (chordOf('edrv.quickOpen') ?? 'Ctrl+P') + ') 打开工作区文件；' + (chordOf('edrv.showCommands') ?? 'Ctrl+Shift+P') + ' 打开命令栏；agent 修改文件后顶部会出现差异角标'))
+  } else if (content === null && loadError && isSessionMissingError(loadError)) {
+    // 跨端会话缺失：终态提示而非加载失败卡死（会话仅在一端激活，本端 RPC 均被拒）
+    body = React.createElement('div', { className: 'edrv-empty edrv-loading', 'aria-live': 'polite' },
+      React.createElement('div', { className: 'edrv-loading-title' }, sessionMissingTitle()),
+      React.createElement('div', { style: { fontSize: 12, maxWidth: 420, lineHeight: 1.6 } }, sessionMissingDetail()),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: () => {
+        setLoadError(null)
+        setContent(null)
+        setContentPath(null)
+        setLoadStage({ progress: 10, message: '重新读取文件…' })
+        loadContent(active, sessionId)
+      } }, '重试'))
   } else if (content === null && loadError) {
     body = loadingBody('文件加载失败：' + loadError, 0, () => {
       setLoadError(null)
@@ -4346,10 +4459,12 @@ export function EditorView(props) {
         React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', title: '复制安装命令', onClick: copyInstallCmd }, '复制命令'),
         React.createElement('button', { className: 'edrv-side-hint-close', title: '关闭提示', 'aria-label': '关闭提示', onClick: dismissHint }, '×'))
     : null
-  const fullView = createPortal(React.createElement(React.Fragment, null, pathBar, sideHintEl, diskBanner(), editorArea, statusBar), fullHost, 'edrv-full-editor')
+  // 底部状态栏共用一整条：挂在 mainCol 层级（所有分组之下），不随焦点分组搬家（ddj 2026-10-16）
+  const fullView = createPortal(React.createElement(React.Fragment, null, pathBar, sideHintEl, diskBanner(), editorArea), fullHost, 'edrv-full-editor')
   const mainCol = React.createElement('div', { className: 'edrv-main-col edrv-workbench', style: { flex: 1, minWidth: 0, minHeight: 0, display: 'flex', flexDirection: 'column', overflow: 'hidden' } },
     React.createElement('div', { className: 'edrv-workbench-tools' }, tabRow),
     renderTree(workbench.tree), fullView,
+    statusBar,
     workbench.floats.map((item, layer) => React.createElement(FloatingEditor, { key: item.group, owner: String(scope), group: item.group, rect: item, layer, focused: item.group === workbench.focused, onBounds: floatBounds, onFocus: selectGroup, onReturn: returnPane }, renderGroup(item.group))),
     dragPreview ? createPortal(React.createElement(React.Fragment, null,
       dragPreview.rect ? React.createElement('div', { className: 'edrv-drag-overlay', style: dragPreview.rect }, React.createElement('span', { className: 'edrv-drop-label' }, dragPreview.label)) : null,

package/src/client/ui/McpSettings.ts

@@ -115,6 +115,9 @@ function GeneralSettings({ registry, getShortcuts }) {
   const [devForm, setDevForm] = React.useState(null)
   const [devBusy, setDevBusy] = React.useState(false)
   const [devMessage, setDevMessage] = React.useState('')
+  const [updateState, setUpdateState] = React.useState(null) // { current, latest, hasUpdate }
+  const [updateBusy, setUpdateBusy] = React.useState(false)
+  const [updateMessage, setUpdateMessage] = React.useState('')
   const [minW, setMinW] = React.useState(SIDEBAR_MIN_DEFAULT)
   const [minDraft, setMinDraft] = React.useState(null) // 输入草稿（null=跟随已保存值；blur/Enter 提交）
   const [limit, setLimit] = React.useState(EDITOR_LIMIT_DEFAULT)
@@ -198,6 +201,27 @@ function GeneralSettings({ registry, getShortcuts }) {
       setDevMessage(result.restart ? '已切换为正式版，重启 DSH 后生效。' : '已关闭开发形态。')
     }).catch((e) => setDevMessage('关闭失败：' + String(e))).finally(() => setDevBusy(false))
   }
+  /** 检查 npm registry 是否有比当前版本更新的发布（结果落 updateState）。 */
+  const runUpdateCheck = () => {
+    setUpdateBusy(true)
+    setUpdateMessage('')
+    rpc('vscode.updateCheck', {}).then((result) => {
+      if (!result.ok) { setUpdateMessage('检查失败：' + String(result.error)); return }
+      setUpdateState({ current: result.current ?? '', latest: result.latest ?? '', hasUpdate: result.hasUpdate === true })
+      setUpdateMessage(result.hasUpdate ? '发现新版本 v' + result.latest : '已是最新版本。')
+    }).catch((e) => setUpdateMessage('检查失败：' + String(e))).finally(() => setUpdateBusy(false))
+  }
+  /** 触发官方 pluginManager「先删后装」自我更新（页面会断开，成功与否均不再回报本页）。 */
+  const runSelfUpdate = () => {
+    const target = updateState?.latest ?? ''
+    if (!window.confirm('更新到 v' + target + '：更新中插件会先卸载再安装，页面将短暂断开，完成后请刷新页面或重启 DSH。\n注意：若安装失败（如断网），插件会保持未安装状态，可在官方插件管理页重新安装恢复。确认更新？')) return
+    setUpdateBusy(true)
+    setUpdateMessage('')
+    rpc('vscode.updateSelf', {}).then((result) => {
+      if (!result.ok) { setUpdateMessage('更新失败：' + String(result.error)); setUpdateBusy(false); return }
+      setUpdateMessage('更新已开始，页面即将断开；完成后请刷新页面或重启 DSH。')
+    }).catch((e) => { setUpdateMessage('更新失败：' + String(e)); setUpdateBusy(false) })
+  }
   /**
    * 唤起官方快捷键弹窗（键位统一归官方机制；入口不可用时展示手动打开方式）。
    * @author ddj 2026年09月28号
@@ -215,6 +239,17 @@ function GeneralSettings({ registry, getShortcuts }) {
       React.createElement('button', { className: 'vsm-devform-close', disabled: devBusy, onClick: closeDevForm }, devBusy ? '切换中…' : '关闭开发形态'),
     ),
   ) : null
+  const updateRow = React.createElement('div', { className: 'vsm-general-row' },
+    React.createElement('span', null, '插件更新',
+      React.createElement('small', { className: 'vsm-devform-note' },
+        '当前版本 v' + (updateState?.current ?? '') + (devForm?.enabled ? '；开发形态下请走工作区同步流程' : ''))),
+    React.createElement('div', { className: 'vsm-devform-actions' },
+      updateMessage && React.createElement('small', { className: 'vsm-devform-msg' }, updateMessage),
+      updateState?.hasUpdate
+        ? React.createElement('button', { disabled: updateBusy || devForm?.enabled === true, onClick: runSelfUpdate, title: devForm?.enabled ? '开发形态下请走工作区同步流程' : undefined }, updateBusy ? '更新中…' : '更新到 v' + (updateState.latest ?? ''))
+        : React.createElement('button', { disabled: updateBusy || devForm?.enabled === true, onClick: runUpdateCheck, title: devForm?.enabled ? '开发形态下请走工作区同步流程' : undefined }, updateBusy ? '检查中…' : '检查更新'),
+    ),
+  )
   return React.createElement('section', { className: 'vsm-general-page' },
     React.createElement('h2', null, '通用'),
     React.createElement('p', null, '配置 DSH 对话中文件链接的打开工具。工具由当前运行时自动扫描。'),
@@ -225,6 +260,7 @@ function GeneralSettings({ registry, getShortcuts }) {
       React.createElement('div', { className: 'vsm-panel-body' },
         React.createElement('label', { className: 'vsm-general-row' }, React.createElement('span', null, '文件链接使用工具'), React.createElement('select', { value: currentOption, disabled: loading || unavailable || notReady || busy || snapshot?.writable === false, onChange: (event) => save(event.target.value) }, options.map((item) => React.createElement('option', { key: item.id, value: item.id }, item.label))), loading && React.createElement('small', null, '读取中…')),
         devFormRow,
+        updateRow,
       ),
     ),
     React.createElement('section', { className: 'vsm-panel' },

package/src/client/updateNotice.ts

@@ -0,0 +1,64 @@
+/**
+ * dsh-vscode-mode client — 可用更新主动提醒：启动延迟 + 抖动后检查 registry 新版本，
+ * 有更新且该版本未提醒过时经 toastDom 弹提示（每版本一次，localStorage 去重）。
+ * 设计：检查失败静默（不打扰）；开发形态（link: 安装）下不提醒（应走工作区同步）。
+ * 作者 ddj 2026-10-16
+ */
+import { rpc } from './rpc.js'
+import { toastDom } from './externalOpen.js'
+import { PLUGIN_NAME } from '../compat.js'
+
+/** localStorage 去重键：值为已提醒过的最新版本号。 */
+const NOTICE_KEY = 'vsm-update-notice'
+
+/** 启动后首次检查的延迟（毫秒）。 */
+const NOTICE_DELAY_MS = 30000
+
+/** 抖动上限（毫秒）：避免多客户端同时请求 registry。 */
+const NOTICE_JITTER_MS = 30000
+
+/**
+ * 读取开发形态状态（客户端侧经 RPC 查询；失败按未开启处理）。
+ * @private
+ * @author ddj 2026年10月16号
+ * @returns devForm.enabled 是否为 true
+ */
+async function devFormEnabled(): Promise<boolean> {
+  try {
+    const result = await rpc('vscode.devFormGet', {})
+    return result.ok === true && (result.devForm as { enabled?: boolean } | undefined)?.enabled === true
+  } catch {
+    return false
+  }
+}
+
+/**
+ * 执行一次可用更新检查并在需要时弹 toast 提醒（同版本只提醒一次）。
+ * @private
+ * @author ddj 2026年10月16号
+ */
+async function checkAndNotify(): Promise<void> {
+  if (await devFormEnabled()) return
+  const result = await rpc('vscode.updateCheck', {})
+  if (result.ok !== true || result.hasUpdate !== true) return
+  const latest = String(result.latest ?? '')
+  if (!latest) return
+  let storage: Storage | null = null
+  try { storage = window.localStorage } catch { /* 隐私模式等场景静默降级 */ }
+  if (storage?.getItem(NOTICE_KEY) === latest) return
+  storage?.setItem(NOTICE_KEY, latest)
+  toastDom(PLUGIN_NAME + ' 有可用更新：v' + latest + '（设置页「文件与安装」可一键更新）')
+}
+
+/**
+ * 装配更新提醒：启动 30s + 0~30s 抖动后检查一次；失败静默。
+ * @public
+ * @author ddj 2026年10月16号
+ * @param ctx DSH client 上下文
+ * @param schedule 定时器注入（ctx.timeout），便于测试与生命周期统一
+ */
+export function installUpdateNotice(ctx: { timeout(fn: () => void, ms: number): unknown }, schedule: (fn: () => void, ms: number) => void): void {
+  schedule(() => {
+    void checkAndNotify().catch(() => { /* 检查失败静默，不打扰 */ })
+  }, NOTICE_DELAY_MS + Math.floor(Math.random() * NOTICE_JITTER_MS))
+}

package/src/lsp/rpc.ts

@@ -15,6 +15,7 @@ import { onRuntimeProvisioned, envInstallStates } from './dotnetProvision.js'
 import { envRequirementsFor, installRequirement } from './envRequirements.js'
 import type { LspManager } from './manager.js'
 import type { RpcHandlerMap } from '../shared/rpc.js'
+import { SESSION_MISSING_ERROR, SESSION_NO_WORKSPACE_ERROR } from '../shared/rpc.js'
 import type { LspLocation, LspServerStatus } from '../shared/lsp.js'
 import { installFromMarket, installVsixFile, listInstalled, marketGet, marketSearch, uninstall, updateExtension, type ExtInfo } from './extmgr.js'
 import { toWorkspacePath } from './uri.js'
@@ -152,9 +153,9 @@ export function createLspRpc(deps: LspRpcDeps): { handlers: Partial<RpcHandlerMa
   /** 解析会话与工作区根（失败 → null + error）。 */
   const rootOf = async (sessionId: string | undefined): Promise<{ root: string; sessionId: string } | { err: string }> => {
     const session = sessionOf(ctx, sessionId)
-    if (!session) return { err: '会话不存在' }
+    if (!session) return { err: SESSION_MISSING_ERROR }
     const cwd = cwdOf(session)
-    if (!cwd) return { err: '会话无工作区' }
+    if (!cwd) return { err: SESSION_NO_WORKSPACE_ERROR }
     try {
       const root = await searchRoot(ctx, session)
       const sid = typeof session.id === 'string' && session.id ? session.id : sessionId ?? ''