dsh-vscode-mode 0.1.48 → 0.1.49

package/src/client/styles/editor.css

@@ -295,5 +295,48 @@
 [data-edrv-view] .edrv-search-toggle.on { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.14)); color: var(--dsw-alias-label-primary, #1f2933); border-color: var(--dsw-alias-brand-primary, #0f9d58); }
 [data-edrv-view] .edrv-search-toggle:disabled { opacity: .4; cursor: default; }
 
+/* ===== rules panel (sidebar, Codebuddy rules view) ===== */
+[data-edrv-view] .edrv-rules-panel { display: flex; flex-direction: column; min-height: 0; flex: 1; padding: 6px; gap: 4px; }
+[data-edrv-view] .edrv-rules-tabs { display: flex; align-items: center; gap: 2px; flex: 0 0 auto; }
+[data-edrv-view] .edrv-rules-tab { height: 24px; padding: 0 10px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-secondary, #52606d); font-size: 12px; cursor: pointer; }
+[data-edrv-view] .edrv-rules-tab:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
+[data-edrv-view] .edrv-rules-tab.on { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.14)); color: var(--dsw-alias-label-primary, #1f2933); font-weight: 600; }
+[data-edrv-view] .edrv-rules-new { margin-left: auto; height: 24px; padding: 0 10px; border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); border-radius: 6px; background: var(--dsw-alias-bg-layer-1, #fff); color: var(--dsw-alias-label-primary, #1f2933); font-size: 11px; cursor: pointer; flex-shrink: 0; }
+[data-edrv-view] .edrv-rules-new:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
+[data-edrv-view] .edrv-rules-ws-line { font-size: 11px; color: var(--dsw-alias-label-secondary, #52606d); padding: 0 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; flex: 0 0 auto; user-select: none; }
+[data-edrv-view] .edrv-rules-hint { font-size: 11px; color: var(--dsw-alias-label-tertiary, #9aa5b1); padding: 0 2px; flex: 0 0 auto; }
+[data-edrv-view] .edrv-rules-list { flex: 1; min-height: 0; overflow: auto; }
+[data-edrv-view] .edrv-rules-row { position: relative; padding: 7px 100px 6px 4px; border-bottom: 1px solid var(--dsw-alias-border-l1, #e0e6e8); }
+[data-edrv-view] .edrv-rules-row.off .edrv-rules-file, [data-edrv-view] .edrv-rules-row.off .edrv-rules-desc { opacity: .5; }
+[data-edrv-view] .edrv-rules-main { display: flex; align-items: center; gap: 6px; min-width: 0; cursor: pointer; }
+[data-edrv-view] .edrv-rules-file { font-weight: 600; font-size: 12px; color: var(--dsw-alias-label-primary, #1f2933); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+[data-edrv-view] .edrv-rules-path { font-size: 10px; color: var(--dsw-alias-label-tertiary, #9aa5b1); flex-shrink: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+[data-edrv-view] .edrv-rules-type { flex-shrink: 0; height: 15px; padding: 0 5px; border-radius: 999px; font-size: 10px; line-height: 15px; }
+[data-edrv-view] .edrv-rules-type-always { background: rgba(15,157,88,.15); color: #0b7c46; }
+[data-edrv-view] .edrv-rules-type-auto { background: rgba(79,140,255,.16); color: #3367c9; }
+[data-edrv-view] .edrv-rules-type-manual { background: var(--dsw-alias-bg-layer-2, #f0f4f4); color: var(--dsw-alias-label-secondary, #52606d); }
+[data-edrv-view] .edrv-rules-offtag { font-size: 10px; color: var(--dsw-alias-label-tertiary, #9aa5b1); flex-shrink: 0; }
+[data-edrv-view] .edrv-rules-desc { margin-top: 3px; font-size: 11px; color: var(--dsw-alias-label-secondary, #52606d); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+[data-edrv-view] .edrv-rules-actions { position: absolute; top: 5px; right: 4px; display: flex; align-items: center; gap: 2px; }
+[data-edrv-view] .edrv-rules-act { min-width: 22px; height: 22px; padding: 0 4px; border: none; border-radius: 5px; background: transparent; font-size: 12px; line-height: 1; cursor: pointer; color: var(--dsw-alias-label-secondary, #52606d); }
+[data-edrv-view] .edrv-rules-act:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }
+[data-edrv-view] .edrv-rules-switch { position: relative; width: 30px; height: 16px; border-radius: 999px; border: none; background: #b9c4cc; cursor: pointer; transition: background .15s; flex-shrink: 0; padding: 0; }
+[data-edrv-view] .edrv-rules-switch.on { background: #7c5cff; }
+[data-edrv-view] .edrv-rules-knob { position: absolute; top: 2px; left: 2px; width: 12px; height: 12px; border-radius: 50%; background: #fff; transition: left .15s; }
+[data-edrv-view] .edrv-rules-switch.on .edrv-rules-knob { left: 16px; }
+[data-edrv-view] .edrv-rules-empty { padding: 10px 4px; font-size: 12px; color: var(--dsw-alias-label-tertiary, #9aa5b1); line-height: 1.6; }
+[data-edrv-view] .edrv-rules-err { padding: 6px 8px; border: 1px solid rgba(217,83,79,.4); border-radius: 6px; background: #fdeaea; color: var(--dsw-alias-state-error-primary, #d9534f); font-size: 11px; word-break: break-all; }
+[data-edrv-view] .edrv-rules-editor { display: flex; flex-direction: column; min-height: 0; flex: 1; gap: 6px; }
+[data-edrv-view] .edrv-rules-editor-head { display: flex; align-items: center; justify-content: space-between; font-size: 12px; font-weight: 600; color: var(--dsw-alias-label-primary, #1f2933); flex: 0 0 auto; }
+[data-edrv-view] .edrv-rules-editor-file { display: flex; align-items: center; gap: 6px; font-size: 11px; color: var(--dsw-alias-label-secondary, #52606d); flex: 0 0 auto; }
+[data-edrv-view] .edrv-rules-input { flex: 1; min-width: 0; height: 24px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 11px; outline: none; font-family: var(--ds-font-family-code, ui-monospace, monospace); }
+[data-edrv-view] .edrv-rules-input:focus { border-color: var(--dsw-alias-brand-primary, #4f8cff); }
+[data-edrv-view] .edrv-rules-body { flex: 1; min-height: 0; resize: none; padding: 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 12px; line-height: 1.5; outline: none; font-family: var(--ds-font-family-code, ui-monospace, monospace); }
+[data-edrv-view] .edrv-rules-body:focus { border-color: var(--dsw-alias-brand-primary, #4f8cff); }
+[data-edrv-view] .edrv-rules-editor-hint { font-size: 10px; color: var(--dsw-alias-label-tertiary, #9aa5b1); line-height: 1.5; flex: 0 0 auto; }
+[data-edrv-view] .edrv-rules-editor-foot { display: flex; justify-content: flex-end; flex: 0 0 auto; }
+[data-edrv-view] .edrv-rules-save { height: 24px; padding: 0 14px; border: none; border-radius: 6px; background: var(--dsw-alias-brand-primary, #0f9d58); color: #fff; font-size: 12px; cursor: pointer; }
+[data-edrv-view] .edrv-rules-save:disabled { opacity: .5; cursor: default; }
+
 
 

package/src/client/ui/EditorView.ts

@@ -23,6 +23,7 @@ import { revealInExplorer as revealPathInExplorer } from '../fileReveal.js'
 import { setSidePending, SIDEBAR_INSTALL_CMD } from '../sidebarBridge.js'
 import { upsertViewState, viewStatesLoad, viewStatesSave } from '../state/viewStateCache.js'
 import { bindingsOf, chordOf, matchEvent, useKeybindingsVersion } from '../keybindings.js'
+import { getSidebarMinWidth } from '../sidebarMin.js'
 import { createNavHistory } from '../navHistory.js'
 import { statusOfAdd } from '../addToConversation.js'
 import { CACHE_KEY } from '../paths.js'
@@ -67,7 +68,7 @@ export function EditorView(props) {
   const [fileIdx, setFileIdx] = React.useState(0) // 全局差异文件位置（x/x 文件 显示）
   const [tabMenu, setTabMenu] = React.useState(null) // Tab 右键菜单 { x,y,path }（编辑区右键走 Monaco 原生菜单，无此浮层）
   const [sidebarOn, setSidebarOn] = React.useState(layout !== 'side') // 侧边栏显隐（侧栏形态默认收起）
-  const [sidebarW, setSidebarW] = React.useState(240) // 侧边栏宽度
+  const [sidebarW, setSidebarW] = React.useState(() => getSidebarMinWidth()) // 侧边栏宽度（初值 = 最小宽度，默认 300）
   const [activePanel, setActivePanel] = React.useState('explorer') // 激活面板 id
   const [focusRequest, setFocusRequest] = React.useState(0) // 外部差异聚焦请求版本
   const kbVersion = useKeybindingsVersion() // 快捷键配置版本（tooltip 文案随键位刷新）
@@ -508,6 +509,7 @@ export function EditorView(props) {
   }, [tabs, active, sessionId])
 
   // 侧边栏状态：恢复（显隐/宽度/激活面板）；侧栏形态独立键（默认收起，不共享页签形态偏好）
+  // 宽度下限来自通用设置 sidebarMinWidth（默认 300），恢复值按其重夹
   const sidebarKey = CACHE_KEY.sidebar + (layout === 'side' ? 'side.' : '') + String(sessionId)
   React.useEffect(() => {
     if (!sessionId) return
@@ -516,12 +518,23 @@ export function EditorView(props) {
       if (raw) {
         const saved = JSON.parse(raw)
         if (typeof saved.on === 'boolean') setSidebarOn(saved.on)
-        if (typeof saved.width === 'number') setSidebarW(Math.max(180, Math.min(560, saved.width)))
+        if (typeof saved.width === 'number') setSidebarW(Math.max(getSidebarMinWidth(), Math.min(560, saved.width)))
         if (typeof saved.panel === 'string') setActivePanel(saved.panel)
       }
     } catch (e) { /* 损坏忽略 */ }
   }, [sessionId, sidebarKey])
 
+  // 侧边栏最小宽度设置变更（edrv:sidebar-min-width）→ 更新 minW 并重夹当前宽度
+  const [sidebarMinW, setSidebarMinW] = React.useState(() => getSidebarMinWidth())
+  React.useEffect(() => {
+    const onMinChange = () => {
+      setSidebarMinW(getSidebarMinWidth())
+      setSidebarW((w) => Math.max(getSidebarMinWidth(), w))
+    }
+    window.addEventListener('edrv:sidebar-min-width', onMinChange)
+    return () => window.removeEventListener('edrv:sidebar-min-width', onMinChange)
+  }, [])
+
   // 侧边栏状态持久化
   React.useEffect(() => {
     if (!sessionId) return
@@ -1244,7 +1257,7 @@ export function EditorView(props) {
       'aria-label': '前进',
       onClick: navForward,
     }, '→'),
-    React.createElement('button', { className: 'edrv-chip-btn' + (sidebarOn ? ' edrv-chip-on' : ''), title: '切换侧边栏 (' + (chordOf('edrv.toggleSidebar') ?? 'Ctrl+B') + ')', onClick: () => setSidebarOn((v) => !v) }, '☰'),
+    React.createElement('button', { className: 'edrv-chip-btn' + (sidebarOn ? ' edrv-chip-on' : ''), title: '切换面板区 (' + (chordOf('edrv.toggleSidebar') ?? 'Ctrl+B') + ')，图标列常显', onClick: () => setSidebarOn((v) => !v) }, '☰'),
     React.createElement('button', { className: 'edrv-chip-btn', title: '刷新', onClick: reloadFile }, '⟳'),
     React.createElement(QuickOpen, { sessionId, onOpen: (p) => openFile(p, false) }))
 
@@ -1390,6 +1403,8 @@ export function EditorView(props) {
   const sidebarPanels = props.sidebarPanels
   const sidebarCtx = {
     sessionId,
+    // 当前会话工作区（sessions 快照 byId[sessionId].cwd；规则面板项目 Tab 自动匹配）
+    cwd: props.sessions?.list?.getSnapshot?.()?.byId?.[sessionId]?.cwd ?? null,
     openFile: (p) => openFile(p, false),
     openFileAt,
     activePath: active,
@@ -1432,15 +1447,18 @@ export function EditorView(props) {
   // 编辑器根节点按 composer 顶部边界动态限高，底部对话区域继续由 DSH 原生渲染。
   // 侧栏形态由面板容器给高（100%），不做 composer 几何同步。
   const editorRow = React.createElement('div', { className: 'edrv-editor-row' },
-    (sidebarOn && sidebarPanels
+    (sidebarPanels
       ? React.createElement(SidebarView, {
           registry: sidebarPanels,
           ctx: sidebarCtx,
           activePanel,
           onActive: setActivePanel,
+          visible: sidebarOn,
+          onShow: () => setSidebarOn(true),
           width: sidebarW,
           onWidth: setSidebarW,
           onHide: () => setSidebarOn(false),
+          minWidth: sidebarMinW,
         })
       : null),
     mainCol)

package/src/client/ui/McpSettings.ts

@@ -10,6 +10,7 @@ import type { MpcProject, MpcServer } from '../../shared/mcp.js'
 import '../styles/mcp.css'
 import { availableOpeners, AUTO_OPEN_TOOL } from '../fileOpeners.js'
 import { SettingsContext } from '../settingsContext.js'
+import { normalizeSidebarMinWidth, SIDEBAR_MIN_DEFAULT } from '../sidebarMin.js'
 import { KeybindingsPanel } from './KeybindingsPanel.js'
 import { LspSettings } from './LspSettings.js'
 import { PerfSettings } from './PerfSettings.js'
@@ -122,7 +123,7 @@ function ProjectGroup({ project, busy, onAdd, onRefresh, onToggle, onRemove }) {
   return React.createElement('section', { className: 'vsm-project' }, head, body)
 }
 
-/** 通用设置：选择当前对话文件链接的打开器 + 开发形态开关。 */
+/** 通用设置：选择当前对话文件链接的打开器 + 开发形态开关 + 编辑器布局（侧边栏最小宽度）。 */
 function GeneralSettings({ registry }) {
   const [tool, setTool] = React.useState(AUTO_OPEN_TOOL)
   const [busy, setBusy] = React.useState(false)
@@ -130,6 +131,8 @@ function GeneralSettings({ registry }) {
   const [devForm, setDevForm] = React.useState(null)
   const [devBusy, setDevBusy] = React.useState(false)
   const [devMessage, setDevMessage] = React.useState('')
+  const [minW, setMinW] = React.useState(SIDEBAR_MIN_DEFAULT)
+  const [minDraft, setMinDraft] = React.useState(null) // 输入草稿（null=跟随已保存值；blur/Enter 提交）
   const settings = React.useContext(SettingsContext)
   const snapshot = settings?.getSnapshot?.()
   const loading = !snapshot || snapshot.status === 'loading'
@@ -137,8 +140,10 @@ function GeneralSettings({ registry }) {
   const notReady = snapshot?.status !== 'ready'
   React.useEffect(() => {
     const onChange = () => {
-      const next = settings?.getSnapshot?.().value?.fileOpenTool
+      const snap = settings?.getSnapshot?.()
+      const next = snap?.value?.fileOpenTool
       if (typeof next === 'string') setTool(next)
+      setMinW(normalizeSidebarMinWidth(snap?.value?.sidebarMinWidth))
     }
     onChange()
     return settings?.subscribe?.(onChange)
@@ -153,6 +158,19 @@ function GeneralSettings({ registry }) {
     if (!settings?.set) { setError('设置服务不可用'); setBusy(false); return }
     settings.set('fileOpenTool', value).catch((e) => setError(String(e))).finally(() => setBusy(false))
   }
+  /** 提交侧边栏最小宽度（归一化夹取 180–560 后持久化）。 */
+  const saveMinW = (raw) => {
+    const next = normalizeSidebarMinWidth(raw)
+    setMinW(next); setBusy(true); setError('')
+    if (!settings?.set) { setError('设置服务不可用'); setBusy(false); return }
+    settings.set('sidebarMinWidth', next).catch((e) => setError(String(e))).finally(() => setBusy(false))
+  }
+  /** 结束输入（blur/Enter）时提交草稿。 */
+  const commitMinW = () => {
+    if (minDraft === null) return
+    setMinDraft(null)
+    saveMinW(minDraft)
+  }
   const closeDevForm = () => {
     if (!window.confirm('关闭开发形态：插件将切换为正式版安装（版本依赖 + 删除工作区链接），pnpm 装配后需重启 DSH 生效。确认关闭？')) return
     setDevBusy(true)
@@ -184,6 +202,23 @@ function GeneralSettings({ registry }) {
         devFormRow,
       ),
     ),
+    React.createElement('section', { className: 'vsm-panel' },
+      React.createElement('h3', { className: 'vsm-panel-title' }, '编辑器'),
+      React.createElement('div', { className: 'vsm-panel-body' },
+        React.createElement('label', { className: 'vsm-general-row' },
+          React.createElement('span', null, '侧边栏最小宽度'),
+          React.createElement('input', {
+            type: 'number', min: 180, max: 560, step: 10,
+            value: minDraft ?? minW,
+            disabled: loading || unavailable || notReady || busy || snapshot?.writable === false,
+            title: '180–560 px；拖拽侧边栏低于该宽度时自动隐藏',
+            onChange: (event) => setMinDraft(event.target.value),
+            onBlur: commitMinW,
+            onKeyDown: (event) => { if (event.key === 'Enter') commitMinW() },
+          }),
+          React.createElement('small', null, '180–560 px；拖拽低于该宽度自动隐藏')),
+      ),
+    ),
   )
 }
 

package/src/client/ui/SideEditorTab.ts

@@ -44,5 +44,6 @@ export function SideEditorTab(props) {
     sidebarPanels: props?.sidebarPanels,
     outlineSources: props?.outlineSources,
     fileMenuItems: props?.fileMenuItems,
+    sessions: props?.sessions,
   })
 }

package/src/fileOpenSettings.ts

@@ -28,6 +28,7 @@ export interface SettingsDeps {
     object: (shape: Record<string, unknown>) => { default: (value: Record<string, unknown>) => unknown }
     string: () => { default: (value: string) => unknown }
     boolean: () => { default: (value: boolean) => unknown }
+    number: () => { default: (value: number) => unknown }
   }
 }
 
@@ -208,6 +209,7 @@ export async function installOpenSettingsSection(
   const schema = deps.z.object({
     fileOpenTool: deps.z.string().default(FILE_OPEN_DEFAULT),
     keybindings: deps.z.object(keybindingsShape(deps.z)).default({ ...KEYBINDING_DEFAULTS }),
+    sidebarMinWidth: deps.z.number().default(300),
   })
   const strategy = await runSettingsInstall(ctx, ns, schema, entry, {
     setSource: (source) => hooks.setSource(source as () => FileOpenSettings),

package/src/index.ts

@@ -22,6 +22,7 @@ import { createLspManager } from './lsp/manager.js'
 import { createLspRpc } from './lsp/rpc.js'
 import { installLspSettingsSection } from './lsp/settings.js'
 import { disposeAllServers } from './lsp/transport.js'
+import { installRulesSection } from './rules.js'
 import type { RpcHandlerMap } from './shared/rpc.js'
 import type { Registry } from './registry.js'
 import type { Ctx } from './store.js'
@@ -45,6 +46,9 @@ export function apply(ctx: Ctx, config?: unknown): void {
   const warnings: string[] = []
   setupOpenSettings(ctx, config, () => {})
   void installLspSettingsSection(ctx, {})
+  /** 规则注入 section（~/.dsh/rules 与 <工作区>/.dsh/rules；旧版 DSH 无 systemPrompt 时静默降级）。 */
+  const rulesInstalled = installRulesSection(ctx)
+  if (!rulesInstalled) ctx.logger?.warn?.('[' + name + '] 未检测到 systemPrompt 服务，规则仅可管理不注入')
   /** LSP RPC 与会话清理（一次性创建，tracker 状态跨请求保留）。 */
   const lspRpc = createLspRpc({ ctx, pluginConfig: config, manager: lspManager })
   const lspHandlers: Partial<RpcHandlerMap> = lspRpc.handlers
@@ -77,7 +81,7 @@ export function apply(ctx: Ctx, config?: unknown): void {
     disposeAllServers()
   })
 
-  ctx.logger?.info?.('[' + name + '] 编辑差异审查已装配（/edrv/rpc 路由就绪，项目 MCP 隔离已启用，语言服务器 LSP 已接入）')
+  ctx.logger?.info?.('[' + name + '] 编辑差异审查已装配（/edrv/rpc 路由就绪，项目 MCP 隔离已启用，语言服务器 LSP 已接入，规则注入' + (rulesInstalled ? '已接入' : '未接入') + '）')
 }
 
 /**

package/src/rpc.ts

@@ -28,6 +28,7 @@ import { newSearcher } from './search/orchestrator.js'
 import type { ContentSearcher } from './search/content.js'
 import { newContentSearcher } from './search/content.js'
 import { restoreFile, revertCall, revertHunk } from './revert.js'
+import { rulesList, rulesRead, rulesRemove, rulesSave, rulesToggle } from './rules.js'
 import { listMcp, refreshMcp, removeMcp, saveMcp, toggleMcp } from './mcp.js'
 import { listProjects, projectRefresh, projectRemove, projectSave, projectToggle } from './mcpProject.js'
 import { normalizeFileOpenTool, FILE_OPEN_DEFAULT, FILE_OPEN_SETTINGS_NS } from './fileOpenSettings.js'
@@ -661,6 +662,42 @@ export function buildHandlers(
         return { ok: false, error: '撤销压缩配置失败：' + String(error) }
       }
     },
+    'rules.list': async () => {
+      try {
+        return { ok: true, ...(await rulesList(ctx)) }
+      } catch (error) {
+        return { ok: false, error: '读取规则失败：' + String(error) }
+      }
+    },
+    'rules.read': async (args) => {
+      try {
+        return { ok: true, content: await rulesRead(ctx, args) }
+      } catch (error) {
+        return { ok: false, error: '读取规则失败：' + String(error) }
+      }
+    },
+    'rules.save': async (args) => {
+      try {
+        return { ok: true, rule: await rulesSave(ctx, args) }
+      } catch (error) {
+        return { ok: false, error: '保存规则失败：' + String(error) }
+      }
+    },
+    'rules.remove': async (args) => {
+      try {
+        await rulesRemove(ctx, args)
+        return { ok: true }
+      } catch (error) {
+        return { ok: false, error: '删除规则失败：' + String(error) }
+      }
+    },
+    'rules.toggle': async (args) => {
+      try {
+        return { ok: true, rule: await rulesToggle(ctx, args, args.enabled === true) }
+      } catch (error) {
+        return { ok: false, error: '切换规则失败：' + String(error) }
+      }
+    },
   }
 }