dsh-vscode-mode 0.1.57 → 0.1.59

package/src/client/sidebarBridge.ts

@@ -7,6 +7,7 @@
  */
 
 import React from 'react'
+import { log } from './log.js'
 
 /** betterSidebar 服务名（ctx.get 用；不要加进 inject——缺失会让插件停靠等待）。 */
 export const BETTER_SIDEBAR_SERVICE = 'betterSidebar'
@@ -137,7 +138,7 @@ export function routeSideEditor(path: string | null, focusDiff: boolean): boolea
   try {
     return ensureSideEditor(path, focusDiff) === true
   } catch (error) {
-    console.warn('[dsh-vscode-mode] 侧栏编辑器打开失败（' + String(error) + '），已回退')
+    log.warn('侧栏编辑器打开失败（' + String(error) + '），已回退')
     return false
   }
 }
@@ -177,7 +178,7 @@ export function installSideEditor(options: {
     if (typeof service.isTabEnabled === 'function' && !service.isTabEnabled(SIDE_TAB_ID)) {
       if (!fallbackInstalled) {
         fallbackInstalled = true
-        try { registerLegacyFallback() } catch (error) { console.warn('[dsh-vscode-mode] 回退注册失败（' + String(error) + '）') }
+        try { registerLegacyFallback() } catch (error) { log.warn('回退注册失败（' + String(error) + '）') }
       }
       return false
     }
@@ -192,7 +193,7 @@ export function installSideEditor(options: {
         meta: { openPath: path || undefined, focusDiff },
       }, { sessionId, cwd: scope?.cwd })
     } catch (error) {
-      console.warn('[dsh-vscode-mode] openTab 失败（' + String(error) + '）')
+      log.warn('openTab 失败（' + String(error) + '）')
       return false
     }
     if (sideEditorMounted) {
@@ -215,11 +216,11 @@ export function installSideEditor(options: {
       component: renderTab,
     })
   } catch (error) {
-    console.warn('[dsh-vscode-mode] 侧边栏 Tab 注册失败（' + String(error) + '）')
+    log.warn('侧边栏 Tab 注册失败（' + String(error) + '）')
     // 注册失败 = 侧栏形态不可用：立即回退中央页签，不接管打开路由
     if (!fallbackInstalled) {
       fallbackInstalled = true
-      try { registerLegacyFallback() } catch (inner) { console.warn('[dsh-vscode-mode] 回退注册失败（' + String(inner) + '）') }
+      try { registerLegacyFallback() } catch (inner) { log.warn('回退注册失败（' + String(inner) + '）') }
     }
     return () => {}
   }

package/src/client/state/records.ts

@@ -47,7 +47,7 @@ export function noopHunk(rec: RecordView | undefined, h: Hunk | CallHunk | null
 
 /** 记录是否仍有待处理差异（superseded / 全部已决策 = false）。 */
 export function isRecPending(rec: RecordView): boolean {
-  if (!rec || rec.superseded === true || rec.conflict === true) return false
+  if (!rec || rec.superseded === true) return false
   const perHunk = Array.isArray(rec.decisions?.perHunk) ? rec.decisions.perHunk : []
   if (perHunk.length) {
     // 只认存在至少一个"非空差异且未决策"的 hunk

package/src/client/state/regions.ts

@@ -4,7 +4,7 @@
  * 作者 ddj 2026-08-20
  */
 import type { Hunk, RecordView } from '../../shared/types.js'
-import { locateHunks, lineBefore, preciseHunk, splitLines } from '../../shared/diff.js'
+import { locateHunks, lineBefore, normalizeForCompare, normalizeHunk, preciseHunk, splitLines } from '../../shared/diff.js'
 import { ST, noopHunk, statusAt } from './records.js'
 import type { Status } from './records.js'
 
@@ -46,11 +46,18 @@ export function trimCommonLines(oldLines: string[], newLines: string[]): { oldLi
   return { oldLines: oldLines.slice(prefix, oldLines.length - suffix), newLines: newLines.slice(prefix, newLines.length - suffix), shift: prefix }
 }
 
-/** 计算文件内各差异区域（行范围 + old/new + 状态），用于行内绿标注与 DiffBox。 */
+/**
+ * 计算文件内各差异区域（行范围 + old/new + 状态），用于行内绿标注与 DiffBox。
+ * 定位统一基于归一化文本（剥 BOM、CRLF→LF）：外部工具可能改变行尾/BOM，
+ * 与 edit 工具的 LF hunk 口径不一致会导致定位失败（差异被误标 stale）。
+ * 行号按 \n 计数，归一化不改变行号，展示语义不变。
+ * @author ddj 2026年09月09号
+ */
 export function diffRegions(records: RecordView[], content: string | null): Region[] {
   const regions: Region[] = []
   if (content === null) return regions
-  const lines = splitLines(content)
+  const normalized = normalizeForCompare(content)
+  const lines = splitLines(normalized)
   for (const rec of records) {
     if (rec.create) {
       for (let i = 0; i < rec.hunks.length; i++) {
@@ -63,9 +70,9 @@ export function diffRegions(records: RecordView[], content: string | null): Regi
     const entries: Array<{ idx: number; hunk: Hunk }> = []
     for (let i = 0; i < rec.hunks.length; i++) {
       const hunk = preciseHunk(rec, i)
-      if (hunk && !noopHunk(rec, hunk)) entries.push({ idx: i, hunk })
+      if (hunk && !noopHunk(rec, hunk)) entries.push({ idx: i, hunk: normalizeHunk(hunk) })
     }
-    const locations = locateHunks(content, entries.map((entry) => entry.hunk))
+    const locations = locateHunks(normalized, entries.map((entry) => entry.hunk))
     for (let i = 0; i < entries.length; i++) {
       const entry = entries[i]
       const location = locations[i]
@@ -74,7 +81,7 @@ export function diffRegions(records: RecordView[], content: string | null): Regi
         regions.push({ callId: rec.callId, idx: entry.idx, stale: true, status, create: false, oldLines: entry.hunk.oldText === null ? [] : entry.hunk.oldText.split('\n'), newLines: entry.hunk.newText ? entry.hunk.newText.split('\n') : [], rec, superseded: rec.superseded === true })
         continue
       }
-      const start = countLinesBefore(content, location.start) + 1
+      const start = countLinesBefore(normalized, location.start) + 1
       const oldLines = entry.hunk.oldText === null ? [] : entry.hunk.oldText.split('\n')
       const newLines = entry.hunk.newText.split('\n')
       const trimmed = trimCommonLines(oldLines, newLines)

package/src/client/ui/AiSettings.ts

@@ -0,0 +1,104 @@
+// @ts-nocheck
+/**
+ * dsh-vscode-mode client — AI 补全设置卡片。
+ * 开关 + 模型下拉（edrv.ai.models 目录，按 provider 分组，默认「自动」）+
+ * 思考强度下拉（随所选模型的 efforts 元数据动态渲染：无档位隐藏；含「跟随默认」）。
+ * 保存走 edrv.ai.configUpdate；保存后广播 edrv:ai-config 事件让 provider 即时生效。
+ * 作者 ddj
+ */
+import React from 'react'
+import { rpc } from '../rpc.js'
+import { setAiInlineEnabled } from '../ai/inlineProvider.js'
+
+/**
+ * AI 补全设置卡片（设置页「AI 补全」Tab 主体）。
+ * @author ddj
+ */
+export function AiSettings() {
+  const [cfg, setCfg] = React.useState(null)
+  const [dir, setDir] = React.useState(null)
+  const [note, setNote] = React.useState('')
+  const [error, setError] = React.useState('')
+  const [busy, setBusy] = React.useState(false)
+
+  React.useEffect(() => {
+    Promise.all([rpc('edrv.ai.configGet', {}), rpc('edrv.ai.models', {})])
+      .then(([c, d]) => {
+        if (c.ok) setCfg({ enabled: c.enabled, provider: c.provider, model: c.model, effort: c.effort })
+        else setError(c.error || '配置读取失败')
+        if (d.ok) setDir(d)
+        else setError(d.error || '模型目录读取失败')
+      })
+      .catch((e) => setError(String(e)))
+  }, [])
+
+  /** 所选 provider 下的模型条目（自动路由时取首组供档位参考）。 */
+  const modelsOf = (provider) => {
+    if (!dir?.providers?.length) return []
+    if (!provider) return dir.providers[0]?.models ?? []
+    return dir.providers.find((p) => p.id === provider)?.models ?? []
+  }
+
+  /** 档位可选项：模型无 reasoning 元数据 → 空数组（选择器隐藏）。 */
+  const efforts = (() => {
+    const models = modelsOf(cfg?.provider)
+    return models.find((m) => m.model === cfg?.model)?.efforts ?? models[0]?.efforts ?? []
+  })()
+
+  const save = async (patch) => {
+    setBusy(true)
+    setError('')
+    try {
+      const res = await rpc('edrv.ai.configUpdate', patch)
+      if (!res.ok) throw new Error(res.error || '保存失败')
+      setCfg({ enabled: res.enabled, provider: res.provider, model: res.model, effort: res.effort })
+      setAiInlineEnabled(res.enabled)
+      setNote('已保存')
+      window.dispatchEvent(new CustomEvent('edrv:ai-config', { detail: { enabled: res.enabled } }))
+    } catch (e) {
+      setError(String(e))
+    } finally {
+      setBusy(false)
+    }
+  }
+
+  const toggle = () => save({ enabled: !cfg.enabled })
+
+  const pickModel = (value) => {
+    // 「自动」：provider/model 清空（host 自动取目录首个）；档位保留
+    if (!value) return save({ provider: '', model: '' })
+    const idx = value.indexOf('/')
+    const provider = value.slice(0, idx)
+    const model = value.slice(idx + 1)
+    const efforts = modelsOf(provider).find((m) => m.model === model)?.efforts ?? []
+    // 换模型后原档位可能不属于新模型：档位一并清空（跟随默认）
+    const keep = efforts.some((e) => e.id === cfg.effort)
+    save(keep ? { provider, model } : { provider, model, effort: '' })
+  }
+
+  if (!cfg) return React.createElement('div', { className: 'vsm-mcp-empty' }, error || '正在读取 AI 补全配置…')
+
+  const modelValue = cfg.provider && cfg.model ? cfg.provider + '/' + cfg.model : ''
+  return React.createElement('section', { className: 'vsm-lsp-card' },
+    React.createElement('h3', null, 'AI 自动补全（实验）'),
+    React.createElement('p', { className: 'vsm-lsp-note' }, '编辑停顿后由模型生成内联建议（ghost text），Tab 接受，Alt+\\ 手动触发。每次补全是一次模型调用；建议选择非推理模型，且思考强度选「跟随默认」或最低档以获得更快响应。'),
+    React.createElement('div', { className: 'vsm-lsp-row' },
+      React.createElement('button', { className: cfg.enabled ? 'vsm-primary' : '', disabled: busy, onClick: toggle },
+        cfg.enabled ? '已开启（点击关闭）' : '已关闭（点击开启）'),
+    ),
+    React.createElement('div', { className: 'vsm-lsp-row' },
+      React.createElement('label', null, '模型',
+        React.createElement('select', { value: modelValue, disabled: busy || !dir?.providers?.length, onChange: (e) => pickModel(e.target.value) },
+          React.createElement('option', { value: '' }, dir?.providers?.length ? '自动（取第一个可用模型）' : '无可用模型'),
+          (dir?.providers ?? []).flatMap((p) => p.models.map((m) => React.createElement('option', { key: p.id + '/' + m.model, value: p.id + '/' + m.model }, p.name + ' · ' + m.name)))),
+      ),
+      efforts.length ? React.createElement('label', null, '思考强度',
+        React.createElement('select', { value: cfg.effort, disabled: busy, onChange: (e) => save({ effort: e.target.value }) },
+          React.createElement('option', { value: '' }, '跟随默认'),
+          efforts.map((e) => React.createElement('option', { key: e.id, value: e.id }, e.name))),
+      ) : null,
+    ),
+    note && React.createElement('div', { className: 'vsm-compat-item ok' }, React.createElement('span', { className: 'vsm-compat-name' }, note)),
+    error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
+  )
+}

package/src/client/ui/EditorView.ts

@@ -33,6 +33,7 @@ import { CACHE_KEY } from '../paths.js'
 import { bindLspEditor, runGoToDefinition, runFindReferences, hideReferencesOverlay } from '../monaco/lsp/providers.js'
 import { bindLspUnderline } from '../monaco/lsp/underline.js'
 import { onLspProgress, refreshStatus } from '../monaco/lsp/index.js'
+import { setupAiInline, trackAiEditor, aiInlineEnabled } from '../ai/inlineProvider.js'
 
 /**
  * 中央编辑区：文件页签（脏点/关闭/打开路径）+ Ctrl+P 搜索 + Monaco 编辑器 +
@@ -66,6 +67,9 @@ export function EditorView(props) {
   const pdfHostRef = React.useRef(null) // PDF 面板外壳 div（命令式控制器接管）
   const [status, setStatus] = React.useState('')
   const [lspServers, setLspServers] = React.useState([])
+  // AI 补全状态（底部状态栏段）：{ state: idle|busy|ok|error, detail, enabled }
+  const [aiStatus, setAiStatus] = React.useState({ state: 'idle', detail: null, enabled: false })
+  const aiStatusTimer = React.useRef(null)
   const [error, setError] = React.useState(null)
   const [loadError, setLoadError] = React.useState(null)
   const [loadStage, setLoadStage] = React.useState({ progress: 0, message: '准备加载编辑器…' })
@@ -496,6 +500,26 @@ export function EditorView(props) {
     return () => { unsubscribe(); clearInterval(timer) }
   }, [sessionId])
 
+  // AI 补全状态事件：busy/ok/error/idle 即时上栏；ok 3s、error 10s 后回落就绪
+  React.useEffect(() => {
+    const apply = (state, detail) => {
+      if (aiStatusTimer.current) { clearTimeout(aiStatusTimer.current); aiStatusTimer.current = null }
+      setAiStatus((prev) => ({ state, detail: detail ?? null, enabled: state === 'config' ? detail?.enabled === true : prev.enabled }))
+      if (state === 'ok') aiStatusTimer.current = setTimeout(() => setAiStatus((p) => (p.state === 'ok' ? { ...p, state: 'idle' } : p)), 3000)
+      else if (state === 'error') aiStatusTimer.current = setTimeout(() => setAiStatus((p) => (p.state === 'error' ? { ...p, state: 'idle' } : p)), 10000)
+    }
+    const onAiStatus = (e) => { if (e?.detail?.state) apply(e.detail.state, e.detail.detail) }
+    const onAiConfig = (e) => apply('config', { enabled: e?.detail?.enabled === true })
+    window.addEventListener('edrv:ai-status', onAiStatus)
+    window.addEventListener('edrv:ai-config', onAiConfig)
+    apply('config', { enabled: aiInlineEnabled() })
+    return () => {
+      window.removeEventListener('edrv:ai-status', onAiStatus)
+      window.removeEventListener('edrv:ai-config', onAiConfig)
+      if (aiStatusTimer.current) clearTimeout(aiStatusTimer.current)
+    }
+  }, [])
+
   React.useEffect(() => {
     const onOpen = (e) => {
       const p = e?.detail?.path
@@ -776,7 +800,12 @@ export function EditorView(props) {
       const progress = stage.phase === 'ready' ? 70 : Math.round(10 + stage.progress * 0.6)
       setLoadStage((prev) => ({ progress: Math.max(prev.progress, progress), message: stage.message }))
     }
-    loadMonaco(onProgress).then((m) => { if (alive) setMonaco(m) }).catch((e) => {
+    loadMonaco(onProgress).then((m) => {
+      if (!alive) return
+      setMonaco(m)
+      // AI 内联补全 provider 注册 + 开关初始化（幂等）
+      setupAiInline(m)
+    }).catch((e) => {
       if (alive) {
         setMonacoErr(String(e?.message ?? e))
         setStatus('Monaco 不可用')
@@ -943,6 +972,8 @@ export function EditorView(props) {
       smoothScrolling: true,
       cursorBlinking: 'smooth',
       padding: { top: side ? 6 : 8 },
+      // AI 内联补全（ghost text）：开关经 edrv.ai.configGet 拉取；provider 见 client/ai/inlineProvider
+      inlineSuggest: { enabled: true },
     })
     // 保存改由窗口级快捷键监听执行（键位可配置；见上方 edrv.save 监听）
     ed.onDidChangeModelContent(() => {
@@ -1014,6 +1045,11 @@ export function EditorView(props) {
     ed.addCommand(m.KeyCode.F12, () => { void runGoToDefinition(ed) })
     bindLspEditor(ed)
     bindLspUnderline(ed, m)
+    // AI 补全：编辑器实例登记（差异静默判定用）+ Alt+\ 手动触发 ghost text
+    trackAiEditor(ed)
+    ed.addCommand(m.KeyMod.Alt | m.KeyCode.Backslash, () => {
+      ed.trigger('edrv-ai', 'editor.action.inlineSuggest.trigger', null)
+    })
     // hover 差异块 → 浮出 Keep/Undo（req：鼠标移到编辑区差异块时显示）
     // 防闪烁：① 区域不变不 setState（浮窗锚定差异块起始行，不跟随鼠标）；② 延迟隐藏；
     // ③ 浮窗自身 onMouseEnter 取消隐藏计时（鼠标在浮窗与编辑器间移动不闪）。
@@ -1437,14 +1473,39 @@ export function EditorView(props) {
     ? 'LSP ' + lspLanguage + ' · ' + (lspPhaseText[lspServer.phase] ?? lspServer.phase) + ' · ' + (lspSourceText[lspServer.source] ?? lspServer.source)
     : 'LSP ' + lspLanguage + ' · 未启动'
   const lspProgress = typeof lspServer?.progress === 'number' ? Math.round(lspServer.progress) : null
-  const lspFooter = (lspLanguage === 'lua' || lspLanguage === 'csharp')
-    ? React.createElement('div', { className: 'edrv-statusbar', title: lspServer?.progressMessage || lspLabel },
+  // 状态段行内样式：单行状态栏内的一段；LSP 段弹性占满空闲宽度，把后续段推到行尾
+  const lspSegStyle = { display: 'inline-flex', alignItems: 'center', gap: '10px', minWidth: 0, flex: '1 1 auto' }
+  const lspSeg = (lspLanguage === 'lua' || lspLanguage === 'csharp')
+    ? React.createElement('span', { className: 'edrv-status-seg', style: lspSegStyle, title: lspServer?.progressMessage || lspLabel },
         React.createElement('span', { className: 'edrv-lsp-status-dot ' + (lspServer?.phase === 'ready' ? 'ready' : lspServer?.phase === 'indexing' || lspServer?.phase === 'starting' ? 'busy' : 'idle') }),
         React.createElement('span', { className: 'edrv-sp-lsp' }, lspLabel),
         lspServer?.progressMessage ? React.createElement('span', { className: 'edrv-sp-progress-message' }, lspServer.progressMessage) : null,
         lspProgress !== null ? React.createElement('span', { className: 'edrv-sp-progress' }, lspProgress + '%') : null)
     : null
 
+  // AI 补全状态段（全语言可用，不随 LSP 语言过滤）：就绪/请求中/完成·耗时/失败原因
+  const aiEnabled = aiStatus.enabled
+  const aiState = aiStatus.state
+  const aiDotCls = aiState === 'busy' ? 'busy' : aiState === 'ok' ? 'ready' : aiState === 'error' ? 'idle' : 'ready'
+  const aiMsText = aiStatus.detail && aiStatus.detail.ms != null ? (aiStatus.detail.ms / 1000).toFixed(1) + 's' : ''
+  const aiNote = aiStatus.detail && aiStatus.detail.note ? String(aiStatus.detail.note) : ''
+  const aiLabel = !aiEnabled ? 'AI 补全 · 关'
+    : aiState === 'busy' ? 'AI 补全请求中…'
+    : aiState === 'ok' ? 'AI 补全完成' + (aiMsText ? ' · ' + aiMsText : '')
+    : aiState === 'error' ? 'AI 补全失败 · ' + aiNote.slice(0, 48)
+    : 'AI 补全就绪'
+  const aiSegStyle = { display: 'inline-flex', alignItems: 'center', gap: '10px', minWidth: 0, flex: '0 0 auto' }
+  const aiSeg = (active && aiEnabled !== null)
+    ? React.createElement('span', { className: 'edrv-status-seg', style: aiSegStyle, title: aiState === 'error' && aiNote ? aiNote : 'AI 自动补全（设置页「AI 补全」可配置）' },
+        React.createElement('span', { className: 'edrv-lsp-status-dot ' + (!aiEnabled ? 'idle' : aiDotCls) }),
+        React.createElement('span', { className: 'edrv-sp-lsp' }, aiLabel))
+    : null
+
+  // 底部状态栏：单行多段——LSP 段居左（弹性吸收空闲宽度），AI 段固定右对齐
+  const statusBar = (lspSeg || aiSeg)
+    ? React.createElement('div', { className: 'edrv-statusbar' }, lspSeg, aiSeg)
+    : null
+
   // 导航历史按钮：目标条目名（tooltip 提示下一步会回到哪个文件）
   const navBackTarget = navRef.current.peekBack()
   const navForwardTarget = navRef.current.peekForward()
@@ -1662,7 +1723,7 @@ export function EditorView(props) {
     tabRow,
     sideHintEl,
     editorArea,
-    lspFooter)
+    statusBar)
   // 编辑器根节点按 composer 顶部边界动态限高，底部对话区域继续由 DSH 原生渲染。
   // 侧栏形态由面板容器给高（100%），不做 composer 几何同步。
   const editorRow = React.createElement('div', { className: 'edrv-editor-row' },

package/src/client/ui/McpSettings.ts

@@ -15,6 +15,7 @@ import { KeybindingsPanel } from './KeybindingsPanel.js'
 import { LspSettings } from './LspSettings.js'
 import { PerfSettings } from './PerfSettings.js'
 import { IntegrationSettings } from './IntegrationSettings.js'
+import { AiSettings } from './AiSettings.js'
 
 const EMPTY = { serverName: '', transport: 'stdio', command: '', args: '', cwd: '', url: '', headers: '' }
 
@@ -429,10 +430,11 @@ export function McpSettings(props) {
     refreshGlobal, toggleGlobal, removeGlobal, refreshProject, toggleProject, removeProject })
   else if (tab === 'compat') body = React.createElement(CompatSection, { getSummary: compatSummary })
   else if (tab === 'lsp') body = React.createElement(LspSettings, null)
+  else if (tab === 'ai') body = React.createElement(AiSettings, null)
   else body = React.createElement(PerfSettings, null)
   return React.createElement('section', { className: 'vsm-mcp-page' },
     React.createElement('header', { className: 'vsm-mcp-header' }, React.createElement('div', null, React.createElement('h2', null, 'VSCodeMode'), React.createElement('p', null, '管理当前 profile 与各项目的 Model Context Protocol 服务。'))),
-    React.createElement('nav', { className: 'vsm-mcp-tabs' }, React.createElement('button', { className: tab === 'general' ? 'active' : '', onClick: () => setTab('general') }, '通用'), React.createElement('button', { className: tab === 'keys' ? 'active' : '', onClick: () => setTab('keys') }, '快捷键'), React.createElement('button', { className: tab === 'mcp' ? 'active' : '', onClick: () => setTab('mcp') }, 'MCP 管理'), React.createElement('button', { className: tab === 'lsp' ? 'active' : '', onClick: () => setTab('lsp') }, '语言服务器'), React.createElement('button', { className: tab === 'perf' ? 'active' : '', onClick: () => setTab('perf') }, '性能优化'), React.createElement('button', { className: tab === 'compat' ? 'active' : '', onClick: () => setTab('compat') }, '兼容性')),
+    React.createElement('nav', { className: 'vsm-mcp-tabs' }, React.createElement('button', { className: tab === 'general' ? 'active' : '', onClick: () => setTab('general') }, '通用'), React.createElement('button', { className: tab === 'keys' ? 'active' : '', onClick: () => setTab('keys') }, '快捷键'), React.createElement('button', { className: tab === 'mcp' ? 'active' : '', onClick: () => setTab('mcp') }, 'MCP 管理'), React.createElement('button', { className: tab === 'lsp' ? 'active' : '', onClick: () => setTab('lsp') }, '语言服务器'), React.createElement('button', { className: tab === 'ai' ? 'active' : '', onClick: () => setTab('ai') }, 'AI 补全'), React.createElement('button', { className: tab === 'perf' ? 'active' : '', onClick: () => setTab('perf') }, '性能优化'), React.createElement('button', { className: tab === 'compat' ? 'active' : '', onClick: () => setTab('compat') }, '兼容性')),
     error && React.createElement('div', { className: 'vsm-mcp-error vsm-mcp-banner' }, error),
     body,
   )

package/src/debugLog.ts

@@ -0,0 +1,84 @@
+/**
+ * dsh-vscode-mode host — 诊断文件通道（client 上报 → 缓冲批量落盘）。
+ * 通道：edrv.debug RPC → 内存缓冲（满/空闲触发）→ 串行读改写
+ *       `~/.dsh/dsh-vscode-mode/logs/debug.<cwdHash>.log`（512KB 上限截断保留尾部）。
+ * 设计：console 不一定落盘，文件可靠；写失败静默忽略（调试日志不阻塞业务）。
+ * 迁移自 src/rpc.ts（enqueueDebug/flushDebug），逻辑一字不改，仅终端回显改走统一日志器。
+ * 作者 ddj 2026-09-08
+ */
+import { mkdir, readFile, rm, writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { DEBUG_LOG, debugLogFile, pluginLogRoot } from './paths.js'
+import { log } from './log.js'
+import type { Ctx } from './store.js'
+
+/** cwd → 内存缓冲：行数组 + 累计字节数 + 待触发 flush 定时器（攒批落盘，避免每条日志全文件读改写）。 */
+const debugBuffers = new Map<string, { lines: string[]; len: number; timer: ReturnType<typeof setTimeout> | null }>()
+/** cwd → Promise 链：串行化 debug 日志落盘（fs read+write 非原子，避免并发丢行）。 */
+const debugWriteQueues = new Map<string, Promise<void>>()
+/** debug 日志单文件上限：超限截断保留尾部，防文件无限增长拖慢每次追加。 */
+const DEBUG_LOG_CAP = 512 * 1024
+/** debug 日志批量缓冲上限：攒满即落盘（一次读改写），上限内不逐条写文件。 */
+const DEBUG_BUF_CAP = 32 * 1024
+/** debug 日志空闲 flush 延迟：缓冲未满时，静默一段时间后落盘一次。 */
+const DEBUG_FLUSH_IDLE_MS = 1000
+/** cwd → 已清理旧工作区 debug 日志标记（一次性）。 */
+const debugLegacyCleaned = new Set<string>()
+/** 诊断回显日志器（终端回显统一带 `[dsh-vscode-mode:debug]` 前缀）。 */
+const debugLog = log.child('debug')
+
+/**
+ * 批量落盘一条 debug 日志缓冲：读旧文件 → 追加 → 超上限截断保留尾部 → 一次写回。
+ * 串行链保证同一 cwd 的读改写不交错丢行；写失败静默忽略（调试日志不阻塞业务）。
+ * @author ddj 2026年09月08号
+ * @param cwd 工作区（日志落 ~/.dsh/dsh-vscode-mode/logs/debug.<cwdHash>.log）
+ * @param batch 本批日志行
+ */
+function flushDebug(cwd: string, batch: string[]): Promise<void> {
+  const prev = debugWriteQueues.get(cwd) ?? Promise.resolve()
+  const task = prev.then(async () => {
+    try {
+      await mkdir(pluginLogRoot(), { recursive: true })
+      const target = debugLogFile(cwd)
+      const old = await readFile(target, 'utf8').catch(() => '')
+      const appended = old + batch.map((l) => new Date().toISOString() + ' ' + l + '\n').join('')
+      const next = appended.length > DEBUG_LOG_CAP ? appended.slice(-Math.floor(DEBUG_LOG_CAP / 2)) : appended
+      await writeFile(target, next, 'utf8')
+      // 迁移后一次性清理旧工作区 debug 日志（best-effort）
+      if (!debugLegacyCleaned.has(cwd)) {
+        debugLegacyCleaned.add(cwd)
+        await rm(join(cwd, DEBUG_LOG), { force: true }).catch(() => {})
+      }
+    } catch (e) { /* 写日志失败忽略 */ }
+  })
+  debugWriteQueues.set(cwd, task)
+  return task
+}
+
+/**
+ * 记录一条 client 上报的诊断日志：入队缓冲批量落盘 + 终端回显（`[dsh-vscode-mode:debug]` 前缀）。
+ * @author ddj 2026年09月08号
+ * @param _ctx DSH 上下文（入参保留：诊断通道按 cwd 隔离，当前不需要 ctx，未来过滤用）
+ * @param cwd 工作区（日志文件按 cwd hash 隔离）
+ * @param text 单条日志文本（不含换行）
+ */
+export function debugRecord(_ctx: Ctx, cwd: string, text: string): void {
+  const st = debugBuffers.get(cwd) ?? { lines: [], len: 0, timer: null }
+  st.lines.push(text)
+  st.len += text.length
+  const flush = () => {
+    st.timer = null
+    const batch = st.lines
+    st.lines = []
+    st.len = 0
+    void flushDebug(cwd, batch)
+  }
+  if (st.len >= DEBUG_BUF_CAP) {
+    if (st.timer) clearTimeout(st.timer)
+    flush()
+  } else if (!st.timer) {
+    st.timer = setTimeout(flush, DEBUG_FLUSH_IDLE_MS)
+  }
+  debugBuffers.set(cwd, st)
+  debugLog.error(text)
+}

package/src/fileOpenSettings.ts

@@ -10,12 +10,22 @@
 import type { Ctx } from './store.js'
 import { KEYBINDING_DEFAULTS } from './shared/keybindings.js'
 import { INTEGRATION_BASE_DEFAULT } from './shared/integration.js'
+import type { AiConfigPatch, AiConfigView } from './shared/ai.js'
+import { log } from './log.js'
 
 export const FILE_OPEN_SETTINGS_NS = 'dsh-vscode-mode'
 export const FILE_OPEN_DEFAULT = 'auto'
 export interface FileOpenSettings { fileOpenTool: string; integrationBaseUrl: string }
 export interface FileOpenSettingsState { value: string; revision?: number; update: (value: string, expectedRevision?: number) => Promise<void> }
 
+/** AI 内联补全配置默认值（默认关闭；路由空 = 自动；档位空 = 跟随模型默认）。 */
+export const AI_CONFIG_DEFAULT: { enabled: boolean; provider: string; model: string; effort: string } = {
+  enabled: false,
+  provider: '',
+  model: '',
+  effort: '',
+}
+
 type SettingsProvider = {
   update?: (ns: string, patch: object, expectedRevision?: number) => Promise<void>
   describe?: (options?: unknown) => Array<{ ns?: string; value?: unknown; revision?: number }>
@@ -121,7 +131,7 @@ export async function runSettingsInstall(
     /* 装载失败按缺失处理 */
   }
   if (!deps) {
-    console.warn('[dsh-vscode-mode] 设置依赖不可用，section ' + ns + ' 未安装（配置回退）')
+    log.warn('设置依赖不可用，section ' + ns + ' 未安装（配置回退）')
     return recordInstall('none', INSTALL_NONE)
   }
   const legacy = deps.installSettingsSection
@@ -130,7 +140,7 @@ export async function runSettingsInstall(
       legacy(ctx, ns, schema, entry, hooks)
       return recordInstall('legacy', INSTALL_LEGACY)
     } catch (error) {
-      console.warn('[dsh-vscode-mode] legacy 设置安装失败，尝试服务路由：' + String(error))
+      log.warn('legacy 设置安装失败，尝试服务路由：' + String(error))
     }
   }
   const ctxInject = (ctx as unknown as { inject?: (services: string[], callback: (sctx: unknown) => void) => unknown }).inject
@@ -141,7 +151,7 @@ export async function runSettingsInstall(
       const provider = typeof sc.get === 'function' ? sc.get('settings') : sc.settings
       const install = (provider as { installSection?: unknown } | undefined)?.installSection
       if (typeof install !== 'function') {
-        console.warn('[dsh-vscode-mode] settings 服务无 installSection（DSH 版本 API 变化），section ' + ns + ' 降级为配置值')
+        log.warn('settings 服务无 installSection（DSH 版本 API 变化），section ' + ns + ' 降级为配置值')
         recordInstall('none', INSTALL_NONE)
         return
       }
@@ -149,12 +159,12 @@ export async function runSettingsInstall(
         install.call(provider, ctx, ns, schema, entry, hooks)
         recordInstall('service', INSTALL_SERVICE)
       } catch (error) {
-        console.warn('[dsh-vscode-mode] settings.installSection 安装失败（' + String(error) + '），section ' + ns + ' 降级为配置值')
+        log.warn('settings.installSection 安装失败（' + String(error) + '），section ' + ns + ' 降级为配置值')
         recordInstall('none', INSTALL_NONE)
       }
     })
   } catch (error) {
-    console.warn('[dsh-vscode-mode] settings 服务路由不可用（' + String(error) + '）')
+    log.warn('settings 服务路由不可用（' + String(error) + '）')
     return recordInstall('none', INSTALL_NONE)
   }
   // inject 回调若同步执行（settings 已就绪）会覆写观测值；仍未执行（unknown）时乐观按 service 记录
@@ -218,6 +228,11 @@ export async function installOpenSettingsSection(
     keybindings: deps.z.object(keybindingsShape(deps.z)).default({ ...KEYBINDING_DEFAULTS }),
     sidebarMinWidth: deps.z.number().default(300),
     integrationBaseUrl: deps.z.string().default(INTEGRATION_BASE_DEFAULT),
+    // AI 内联补全（默认关；provider/model 空 = 自动路由；effort 空 = 跟随模型默认）
+    aiInline: deps.z.boolean().default(AI_CONFIG_DEFAULT.enabled),
+    aiProvider: deps.z.string().default(AI_CONFIG_DEFAULT.provider),
+    aiModel: deps.z.string().default(AI_CONFIG_DEFAULT.model),
+    aiEffort: deps.z.string().default(AI_CONFIG_DEFAULT.effort),
   })
   const strategy = await runSettingsInstall(ctx, ns, schema, entry, {
     setSource: (source) => hooks.setSource(source as () => FileOpenSettings),
@@ -226,15 +241,26 @@ export async function installOpenSettingsSection(
   return strategy === 'legacy' || strategy === 'service'
 }
 
+/** AI 配置脏值读取（settings 未就绪时回退默认）。 */
+function aiValueOf(stored: unknown): { enabled: boolean; provider: string; model: string; effort: string } {
+  const raw = (stored ?? {}) as Record<string, unknown>
+  return {
+    enabled: raw.aiInline === true,
+    provider: typeof raw.aiProvider === 'string' ? raw.aiProvider : AI_CONFIG_DEFAULT.provider,
+    model: typeof raw.aiModel === 'string' ? raw.aiModel : AI_CONFIG_DEFAULT.model,
+    effort: typeof raw.aiEffort === 'string' ? raw.aiEffort : AI_CONFIG_DEFAULT.effort,
+  }
+}
+
 /**
  * 注册设置命名空间，并提供 host 侧的读取与更新状态。
  * @author ddj 2026年08月24号
  * @param ctx DSH host 上下文
  * @param config 插件组合配置
  * @param onChange 设置变化回调
- * @returns 设置状态
+ * @returns 设置状态（fileOpenTool 值 + AI 补全配置读写）
  */
-export function setupOpenSettings(ctx: Ctx, config: unknown, onChange: (value: string) => void): FileOpenSettingsState {
+export function setupOpenSettings(ctx: Ctx, config: unknown, onChange: (value: string) => void): FileOpenSettingsState & { ai: () => AiConfigView; aiUpdate: (patch: AiConfigPatch, expectedRevision?: number) => Promise<AiConfigView> } {
   let current = configValue(config)
   let revision: number | undefined
   let provider: SettingsProvider | undefined
@@ -246,9 +272,25 @@ export function setupOpenSettings(ctx: Ctx, config: unknown, onChange: (value: s
   const setSource = (source: () => FileOpenSettings): void => notify(source().fileOpenTool)
   const settingsChange = (): void => syncRevision()
 
-  void installOpenSettingsSection(ctx, FILE_OPEN_SETTINGS_NS, { fileOpenTool: current, integrationBaseUrl: baseValueOf(config) }, { setSource, onChange: settingsChange })
+  /** AI 配置当前值（settings 未就绪回退默认）。 */
+  let aiCurrent: AiConfigView = { ...AI_CONFIG_DEFAULT }
+  const aiSync = (): void => {
+    const descriptor = provider?.describe?.({ redactSecrets: true })?.find((item: { ns?: string }) => item.ns === FILE_OPEN_SETTINGS_NS)
+    const stored = descriptor?.value
+    aiCurrent = stored !== undefined ? aiValueOf(stored) : aiCurrent
+  }
+
+  void installOpenSettingsSection(ctx, FILE_OPEN_SETTINGS_NS, { fileOpenTool: current, integrationBaseUrl: baseValueOf(config) }, {
+    setSource: (source) => {
+      notify(source().fileOpenTool)
+      aiCurrent = aiValueOf(source())
+      syncRevision()
+    },
+    onChange: settingsChange,
+  })
   ctx.inject?.(['settings'], (settingsCtx: Ctx) => {
     provider = settingsCtx.get('settings')
+    aiSync()
     syncRevision()
   })
 
@@ -264,6 +306,26 @@ export function setupOpenSettings(ctx: Ctx, config: unknown, onChange: (value: s
       notify(stored?.fileOpenTool ?? next)
       syncRevision()
     },
+    ai: () => aiCurrent,
+    aiUpdate: async (patch: AiConfigPatch, expectedRevision?: number): Promise<AiConfigView> => {
+      if (!provider?.update) {
+        // settings 不可用：内存态生效（重启回落默认），保持与 fileOpenTool 的降级语义一致
+        if (patch.enabled !== undefined) aiCurrent.enabled = patch.enabled
+        if (patch.provider !== undefined) aiCurrent.provider = patch.provider
+        if (patch.model !== undefined) aiCurrent.model = patch.model
+        if (patch.effort !== undefined) aiCurrent.effort = patch.effort
+        return aiCurrent
+      }
+      const stored = { ...aiCurrent }
+      const body: Record<string, unknown> = {}
+      if (patch.enabled !== undefined) { stored.enabled = patch.enabled; body.aiInline = patch.enabled }
+      if (patch.provider !== undefined) { stored.provider = patch.provider; body.aiProvider = patch.provider }
+      if (patch.model !== undefined) { stored.model = patch.model; body.aiModel = patch.model }
+      if (patch.effort !== undefined) { stored.effort = patch.effort; body.aiEffort = patch.effort }
+      await provider.update(FILE_OPEN_SETTINGS_NS, body, expectedRevision)
+      aiSync()
+      return aiCurrent
+    },
   }
 }
 

package/src/host-deps.d.ts

@@ -12,3 +12,6 @@ declare module '@deepseek-ai/schemastery' {
 // settingsNamespace，0.1.2-alpha 起移除（改由 settings 服务 installSection 方法承载）。
 // fileOpenSettings.ts 以动态导入 + 属性探测方式访问，见 SettingsDeps.installSettingsSection。
 
+// @deepseek-ai/dsh-llm 不在此声明（ambient 模块无法被 import 且与 Ctx=any 惯例冲突）：
+// AI 补全消费的最小类型面见 src/ai/llmTypes.ts，运行时值经 ctx.get('llm') 获取。
+