dsh-vscode-mode 0.14.4 → 0.14.5

package/src/client/planBridge.ts

@@ -0,0 +1,178 @@
+/** Optional DSH plan integration; no provider or approval UI replacement. @author ddj 2026年10月08号 */
+import React from 'react'
+import { requestOpen } from './openReceipt.js'
+import { createPlanFeed, clearPlanState, isPlanAddress, planDocument, type PlanWindow, type PlanOpen } from './planState.js'
+import { detectOfficial, OFFICIAL_SLOT_NAME, type OfficialSidebar } from './officialSidebar.js'
+import { readSessionScope, subscribeScope } from './sessionScope.js'
+import { log } from './log.js'
+
+interface PlanContext {
+  get: (name: string) => unknown
+  slots: { inject: (name: string, callback: () => unknown) => unknown; register: (spec: object, body: unknown) => unknown }
+}
+interface EventSource { getSnapshot: () => PlanWindow; subscribe: (listener: () => void) => () => void }
+interface Sessions { binding?: (id: string) => { eventSource: EventSource } | undefined }
+interface PlanTab { navigation?: { address?: string; revision?: number; params?: { planReview?: unknown } }; actions?: { close?: () => void } }
+interface PlanProps {
+  sessionId?: string
+  useTabInfo?: () => { tab?: PlanTab }
+  useResource?: (address: string) => { status: string; value?: unknown }
+}
+const CLAIM_ID = 'dsh-vscode-mode/plan'
+const CLAIM_KIND = 'edrvPlan'
+const EMPTY_RESOURCE = { status: 'none' }
+
+/** @private @author ddj 2026年10月08号 @param ctx Optional context. @param name Service name. @returns Service or undefined without gating plugin activation. */
+function optional(ctx: PlanContext, name: string): unknown {
+  try { return ctx.get(name) } catch { return undefined }
+}
+/** @private @author ddj 2026年10月08号 @param tab Current tab. @returns Native plan fallback options, preserving transient review parameters. */
+function nativeOptions(tab: PlanTab | undefined): { kind: string; params?: unknown } {
+  return { kind: 'plan', params: tab?.navigation?.params }
+}
+/** @private @author ddj 2026年10月08号 @param ctx Optional context. @param official Sidebar services. @returns Transfer component with native fallback and cancellable receipts. */
+function planRouter(ctx: PlanContext, official: OfficialSidebar) {
+  const transfers = new Map<string, { controller: AbortController; sessionId: string }>()
+  /** @private @author ddj 2026年10月08号 @param all Plugin disposal. Cancel scope-stale transfers, not transfers merely hidden by the editor mount. */
+  function cancel(all = false): void {
+    for (const [key, transfer] of transfers) {
+      if (!all && transfer.sessionId === readSessionScope(ctx).sessionId) continue
+      transfer.controller.abort()
+      transfers.delete(key)
+    }
+  }
+  /** @private @author ddj 2026年10月08号 React to owning-session changes without cancelling on unrelated list updates. */
+  function scopeChanged(): void { cancel() }
+  const offScope = subscribeScope(ctx, scopeChanged)
+  /** @private @author ddj 2026年10月08号 @param props Official slot props. @returns Transfer status; only closes after preview readiness. */
+  function PlanRouter(props: PlanProps) {
+    const tab = props.useTabInfo?.()?.tab
+    const nav = tab?.navigation
+    const address = nav?.address ?? ''
+    const resource = props.useResource?.(address) ?? EMPTY_RESOURCE
+    const review = nav?.params?.planReview
+    const plan = planDocument(address, review ?? ('value' in resource ? resource.value : undefined))
+    const [failed, setFailed] = React.useState(false)
+    const done = React.useRef('')
+    const key = address + ':' + nav?.revision
+
+    /** @private @author ddj 2026年10月08号 Restore the official plan viewer; never re-claim our own fallback. */
+    function openNative(): void {
+      if (typeof official.service.openResource !== 'function') return
+      try {
+        official.service.openResource(address, nativeOptions(tab))
+        tab?.actions?.close?.()
+      } catch (error) { log.warn('计划官方查看器回退失败：' + String(error)) }
+    }
+    React.useEffect(() => {
+      if (!plan || done.current === key || props.sessionId !== readSessionScope(ctx).sessionId) return
+      const transferKey = props.sessionId + ':' + key
+      if (transfers.has(transferKey)) return
+      const controller = new AbortController()
+      transfers.set(transferKey, { controller, sessionId: props.sessionId! })
+      done.current = key
+      setFailed(false)
+      let mounted = true
+      /** @private @author ddj 2026年10月08号 @param ok Preview readiness. Preserve the resource tab on failure; a successful cold mount may already have hidden this component. */
+      function finish(ok: boolean): void {
+        transfers.delete(transferKey)
+        if (controller.signal.aborted) return
+        if (ok) tab?.actions?.close?.()
+        else if (mounted) setFailed(true)
+      }
+      /** @private @author ddj 2026年10月08号 @param error Unexpected routing failure. Keep the official fallback visible. */
+      function reject(error: unknown): void { log.warn('计划预览转发失败：' + String(error)); finish(false) }
+      void requestOpen(null, undefined, undefined, props.sessionId, { plan, preview: true, signal: controller.signal }).then(finish, reject)
+      return () => { mounted = false }
+    }, [key, plan?.markdown, props.sessionId])
+    const unavailable = failed || (!plan && ['none', 'failed'].includes(resource.status))
+    return React.createElement('div', { className: 'edrv-empty' },
+      React.createElement('div', null, unavailable ? '计划暂未能在文件编辑器打开' : '正在打开计划预览…'),
+      React.createElement('button', { className: 'edrv-pill edrv-pill-ghost', onClick: openNative }, '在官方计划查看器打开'))
+  }
+  return { body: PlanRouter, dispose: () => { offScope(); cancel(true) } }
+}
+/** @private @author ddj 2026年10月08号 @param ctx Context. @param official Optional sidebar. @returns Atomic claim disposer; failures retain official ownership. */
+function registerPlan(ctx: PlanContext, official: OfficialSidebar): () => void {
+  const offType = official.tabs.register({
+    id: CLAIM_ID, kind: CLAIM_KIND, priority: 'extension',
+    patterns: ['dsh-resource://plan/**', 'dsh-resource://plan-review/**'],
+    canOpen: isPlanAddress, title: () => '计划预览',
+  })
+  const router = planRouter(ctx, official)
+  try {
+    const offBody = ctx.slots.inject(OFFICIAL_SLOT_NAME, () => ctx.slots.register({ name: OFFICIAL_SLOT_NAME, key: CLAIM_ID }, router.body))
+    return () => { router.dispose(); if (typeof offBody === 'function') offBody(); offType() }
+  } catch (error) { router.dispose(); offType(); throw error }
+}
+/** @private @author ddj 2026年10月08号 @param ctx Context. @returns Current-session feed subscription, cancelling pending opens on scope change. */
+function watchPlans(ctx: PlanContext): () => void {
+  let source: EventSource | undefined
+  let owner = ''
+  let workspace = ''
+  let offFeed: (() => void) | undefined
+  let controller = new AbortController()
+
+  /** @private @author ddj 2026年10月08号 @param id Owning session. @returns Valid borrowed feed, or undefined on older/incompatible services. */
+  function sourceOf(id: string): EventSource | undefined {
+    try {
+      const sessions = optional(ctx, 'sessions') as Sessions | undefined
+      if (!id || typeof sessions?.binding !== 'function') return undefined
+      const feed = sessions.binding(id)?.eventSource
+      return typeof feed?.getSnapshot === 'function' && typeof feed.subscribe === 'function' ? feed : undefined
+    } catch { return undefined }
+  }
+  /** @private @author ddj 2026年10月08号 @param open Live plan target. Opens only in the still-current owning session. */
+  function openPlan(open: PlanOpen): void {
+    if (readSessionScope(ctx).sessionId !== owner || controller.signal.aborted) return
+    void requestOpen(open.path ?? null, undefined, undefined, owner, { preview: true, plan: open.plan, signal: controller.signal })
+      .catch(report)
+  }
+  /** @private @author ddj 2026年10月08号 @param error Open failure. Report without disrupting the Session event publisher. */
+  function report(error: unknown): void { log.warn('计划自动预览失败：' + String(error)) }
+  /** @private @author ddj 2026年10月08号 Borrow the retained binding, baseline history, and follow append deltas only. */
+  function attach(): void {
+    const scope = readSessionScope(ctx)
+    const id = scope.sessionId ?? ''
+    const cwd = scope.cwd ?? ''
+    const next = sourceOf(id)
+    if (next === source && id === owner && cwd === workspace) return
+    offFeed?.()
+    controller.abort()
+    controller = new AbortController()
+    source = next; owner = id; workspace = cwd
+    if (!next || !id) return
+    const feed = createPlanFeed(id, cwd)
+    try { feed.consume(next.getSnapshot()) } catch (error) { source = undefined; report(error); return }
+    /** @private @author ddj 2026年10月08号 Process a single synchronous window delta; no history scans. */
+    function consume(): void {
+      try { for (const open of feed.consume(next!.getSnapshot())) openPlan(open) } catch (error) { report(error) }
+    }
+    try { offFeed = next.subscribe(consume) } catch (error) { source = undefined; report(error) }
+  }
+  const offScope = subscribeScope(ctx, attach)
+  attach()
+  return () => { offScope(); offFeed?.(); controller.abort() }
+}
+/** @public @author ddj 2026年10月08号
+ * Install optional plan routing and live generation detection with bounded service-arrival retries.
+ * @param ctx Client context. @param schedule Lifecycle-owned timer scheduler. @returns Full cleanup for HMR/unload.
+ */
+export function installPlanBridge(ctx: PlanContext, schedule: (fn: () => void, delay: number) => unknown): () => void {
+  let disposed = false
+  let left = 15
+  let offClaim: (() => void) | undefined
+  const offWatch = watchPlans(ctx)
+  /** @private @author ddj 2026年10月08号 Probe optional sidebar once, then bounded retries; never hold activation pending. */
+  function probe(): void {
+    if (disposed || offClaim) return
+    const official = detectOfficial(ctx)
+    if (official) {
+      try { offClaim = registerPlan(ctx, official); return } catch (error) { log.warn('计划接入降级：' + String(error)) }
+    }
+    left -= 1
+    if (left > 0) schedule(probe, 2000)
+  }
+  probe()
+  return () => { disposed = true; offWatch(); offClaim?.(); clearPlanState() }
+}

package/src/client/planState.ts

@@ -0,0 +1,129 @@
+/** Plan identities and live-only event reduction. @author ddj 2026年10月08号 */
+export interface PlanDocument { address: string; markdown: string; title: string }
+export interface PlanOpen { path?: string; plan?: PlanDocument }
+export interface PlanEntry { type?: string; event: { type: string; seq?: number; data: unknown } }
+export interface PlanWindow { revision: number; entries: readonly PlanEntry[]; change: { kind: string; entries?: readonly PlanEntry[] } }
+const associated = new Map<string, Set<string>>()
+
+/** @private @author ddj 2026年10月08号 @param value JSON candidate. @returns Object or empty record. */
+function record(value: unknown): Record<string, unknown> {
+  return value !== null && typeof value === 'object' ? value as Record<string, unknown> : {}
+}
+/** @private @author ddj 2026年10月08号 @param value Tool arguments. @returns Parsed object, never throws. */
+function argsOf(value: unknown): Record<string, unknown> {
+  if (typeof value !== 'string') return record(value)
+  try { return record(JSON.parse(value)) } catch { return {} }
+}
+/** @private @author ddj 2026年10月08号 @param path Path identity. @returns Slash-normalized, Windows-case-folded identity. */
+function pathKey(path: string): string {
+  const value = path.replace(/\\/g, '/').replace(/\/+$/, '')
+  return /^(?:[a-z]:\/|\/\/)/i.test(value) ? value.toLowerCase() : value
+}
+/** @private @author ddj 2026年10月08号 @param path File path. @param cwd Workspace. @returns Absolute association identity. */
+function absoluteKey(path: string, cwd = ''): string {
+  return pathKey(/^(?:[a-z]:[\\/]|\/)/i.test(path) || !cwd ? path : cwd + '/' + path.replace(/^\.\//, ''))
+}
+/** @public @author ddj 2026年10月08号 @param path File path. @param cwd Workspace. @param sessionId Association owner. @returns Whether a Markdown file belongs to a plan directory or explicit submission. */
+export function isPlanPath(path: string, cwd = '', sessionId = ''): boolean {
+  if (!/\.(?:md|markdown)$/i.test(path) || path.replace(/\\/g, '/').split('/').includes('..')) return false
+  const key = absoluteKey(path, cwd)
+  const root = cwd ? pathKey(cwd) + '/plans/' : 'plans/'
+  return key.startsWith(root) || /(?:^|\/)\.dsh\/plans\//.test(key)
+    || Boolean(associated.get(sessionId)?.has(key))
+}
+/** @public @author ddj 2026年10月08号 @param address Official resource address. @returns Whether this is an official plan resource, without treating it as a disk path. */
+export function isPlanAddress(address: unknown): address is string {
+  if (typeof address !== 'string') return false
+  try {
+    const segments = address.split('/').slice(3).map(decodeURIComponent)
+    if (segments.some((value) => !value || /[\\/]/.test(value))) return false
+    if (address.startsWith('dsh-resource://plan-review/')) return segments.length === 2
+    if (!address.startsWith('dsh-resource://plan/')) return false
+    return segments.length === 2 || (segments.length === 5 && segments[0] === 'subagent'
+      && ['one-shot', 'continuable', 'unknown'].includes(segments[3]))
+  } catch { return false }
+}
+/** @public @author ddj 2026年10月08号 @param address Official address. @param value Provider or review payload. @returns Valid complete read-only plan, if available. */
+export function planDocument(address: string, value: unknown): PlanDocument | undefined {
+  const data = record(value)
+  if (!isPlanAddress(address) || typeof data.markdown !== 'string') return undefined
+  const title = /^#\s+(\S[^\r\n]*)/.exec(data.markdown.trim())?.[1]
+  if (!title) return undefined
+  return { address, markdown: data.markdown, title }
+}
+/** @private @author ddj 2026年10月08号 @param sessionId Current session. @param path Explicit plan path. @param cwd Workspace. Stores bounded associations, not file contents. */
+function associate(sessionId: string, path: string, cwd: string): void {
+  const paths = associated.get(sessionId) ?? new Set<string>()
+  paths.add(absoluteKey(path, cwd))
+  if (paths.size > 128) paths.delete(paths.values().next().value!)
+  associated.set(sessionId, paths)
+  if (associated.size > 32) associated.delete(associated.keys().next().value!)
+}
+/** @public @author ddj 2026年10月08号 Clear associations when the plugin unloads. */
+export function clearPlanState(): void { associated.clear() }
+
+/** @public @author ddj 2026年10月08号
+ * Reduce only live append deltas; hydration, pagination, reconnect and duplicate sequences never open plans.
+ * @param sessionId Feed owner. @param cwd Workspace. @returns Revision-aware reducer.
+ */
+export function createPlanFeed(sessionId: string, cwd = '') {
+  let revision: number | undefined
+  let watermark = -1
+  const pending = new Map<string, { name: string; args: Record<string, unknown> }>()
+  const seen = new Set<string>()
+
+  /** @private @author ddj 2026年10月08号 @param entry Durable entry. @param live Whether opening is permitted. @returns New plan open, if any. */
+  function reduce(entry: PlanEntry, live: boolean): PlanOpen | undefined {
+    const event = entry.event
+    const data = record(event.data)
+    const result = event.type === 'tool/result' ? record(data.message) : data
+    const id = event.type === 'tool/result' ? result.toolCallId : data.subCallId ?? data.callId
+    if (typeof id !== 'string') return undefined
+    const isCall = event.type === 'tool/call' || event.type === 'tool/ptc-dispatch-start'
+    const settled = event.type === 'tool/result' || event.type === 'tool/ptc-dispatch'
+    if (!isCall && !settled) return undefined
+    const args = argsOf(data.arguments)
+    if (isCall) pending.set(id, { name: String(data.name), args })
+    const call = event.type === 'tool/result' ? pending.get(id) : { name: String(data.name), args }
+    if (settled) pending.delete(id)
+    if (!call || !live || seen.has(id) || result.isError === true || data.error) return undefined
+    if (call.name === 'exit_plan_mode') {
+      if (event.type === 'tool/result') return undefined
+      const address = 'dsh-resource://plan/' + encodeURIComponent(sessionId) + '/' + encodeURIComponent(id)
+      const plan = planDocument(address, { markdown: call.args.plan })
+      if (plan) { remember(id); return { plan } }
+      return undefined
+    }
+    if (!settled || !['write', 'edit'].includes(call.name) || typeof call.args.file_path !== 'string') return undefined
+    const path = call.args.file_path
+    if (call.name === 'write' && typeof call.args.content === 'string' && /^#\s*计划[：:]/.test(call.args.content.trim())) associate(sessionId, path, cwd)
+    if (!isPlanPath(path, cwd, sessionId)) return undefined
+    remember(id)
+    return { path }
+  }
+  /** @private @author ddj 2026年10月08号 @param id Handled call. Bound retained identities and incomplete calls. */
+  function remember(id: string): void {
+    seen.add(id)
+    if (seen.size > 256) seen.delete(seen.values().next().value!)
+  }
+  /** @public @author ddj 2026年10月08号 @param snapshot Event window. @returns Live opens, in durable order. */
+  function consume(snapshot: PlanWindow): PlanOpen[] {
+    if (snapshot.revision === revision) return []
+    const baseline = revision === undefined || snapshot.change.kind === 'replace'
+    revision = snapshot.revision
+    if (baseline) pending.clear()
+    const entries = baseline ? snapshot.entries : snapshot.change.kind === 'append' ? snapshot.change.entries ?? [] : []
+    const opens: PlanOpen[] = []
+    for (const entry of entries) {
+      if (entry.type === 'transient') continue
+      const seq = entry.event.seq
+      const live = !baseline && (seq === undefined || seq > watermark)
+      if (seq !== undefined) watermark = Math.max(watermark, seq)
+      const open = reduce(entry, live)
+      if (open) opens.push(open)
+    }
+    while (pending.size > 256) pending.delete(pending.keys().next().value!)
+    return opens
+  }
+  return { consume }
+}

package/src/client/receiptState.ts

@@ -87,6 +87,7 @@ export function receiptReadyFor(request: EditorRequest, view: ReceiptView): bool
   if (view.kind === 'pdf') return view.pdfLoaded
   if (!view.contentReady || !view.contentPath || receiptPath(view.contentPath, view.cwd) !== receiptPath(request.path, view.cwd)) return false
   const positioned = request.line != null || request.column != null
+  if (request.preview === true && !positioned && view.kind !== 'markdown') return false
   if (view.kind === 'markdown') return !positioned
   return view.modelMatches && (!positioned || view.positionMatches)
 }

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, normalizeForCompare, normalizeHunk, preciseHunk, splitLines } from '../../shared/diff.js'
+import { applyLocations, fingerprint, locateHunks, lineBefore, normalizeForCompare, normalizeHunk, preciseHunk, splitLines } from '../../shared/diff.js'
 import { ST, noopHunk, statusAt } from './records.js'
 import type { Status } from './records.js'
 
@@ -14,6 +14,8 @@ export interface Region {
   idx: number
   start?: number
   end?: number
+  /** 原快照中的 1 基行号；历史证据不足时不伪造为当前行号。 */
+  oldStart?: number
   oldLines: string[]
   newLines: string[]
   whole?: boolean
@@ -64,6 +66,77 @@ 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 }
 }
 
+/**
+ * 从执行后快照反向验证原文本，计算每块原行号（而非当前文件行号）。
+ * @private @author ddj 2026年10月09号
+ * @param rec 审查记录
+ * @returns 按 hunk 索引的原行号；不完整/指纹冲突时全部留空
+ */
+function oldStartsOf(rec: RecordView): Array<number | undefined> {
+  if (typeof rec.after !== 'string' || rec.create) return []
+  const hunks = rec.hunks.map((_, index) => preciseHunk(rec, index))
+  if (hunks.some((hunk) => !hunk || hunk.oldText === null)) return []
+  const locations = locateHunks(rec.after, hunks as Hunk[])
+  // 没有原指纹时，要求每块有验证过的快照坐标，避免重复 newText 被猜中。
+  for (const location of locations) {
+    const hunk = location.hunk
+    if (!location.matched || location.end > rec.after.length || location.end - location.start !== hunk.newText.length) return []
+    if (!rec.baseFingerprint && (hunk.afterStart !== location.start || hunk.afterEnd !== location.end)) return []
+  }
+  const original = applyLocations(rec.after, locations, true)
+  if (original.stale.length || (rec.baseFingerprint && fingerprint(original.content) !== rec.baseFingerprint)) return []
+  const breaks: number[] = []
+  for (let index = rec.after.indexOf('\n'); index >= 0; index = rec.after.indexOf('\n', index + 1)) breaks.push(index)
+  const starts: Array<number | undefined> = []
+  let shift = 0
+  for (const location of locations.slice().sort((a, b) => a.start - b.start)) {
+    starts[location.idx] = lineAt(breaks, location.start) + shift + 1
+    const hunk = location.hunk
+    shift += lineBefore(hunk.oldText!, hunk.oldText!.length) - lineBefore(hunk.newText, hunk.newText.length)
+  }
+  return starts
+}
+
+/**
+ * 将快照坐标一次性映射到 LF/BOM 归一化坐标，避免每块扫描文件前缀。
+ * @private @author ddj 2026年10月09号
+ * @param after 已确认相同的原始快照 @param hunks 块集合
+ * @returns 原偏移到展示偏移的映射；O(文本长度 + 块数 log 块数)
+ */
+function offsetsOf(after: string | undefined, hunks: Hunk[]): Map<number, number> {
+  const offsets = new Map<number, number>()
+  if (after === undefined) return offsets
+  const points = hunks.flatMap((hunk) => [hunk.afterStart, hunk.afterEnd])
+    .filter((point): point is number => Number.isInteger(point) && point! >= 0 && point! <= after.length)
+    .sort((a, b) => a - b)
+  let cursor = 0
+  let removed = 0
+  for (const point of points) {
+    while (cursor < point) {
+      if ((cursor === 0 && after[cursor] === '\uFEFF') || (after[cursor] === '\r' && after[cursor + 1] === '\n')) removed++
+      cursor++
+    }
+    offsets.set(point, point - removed)
+  }
+  return offsets
+}
+
+/**
+ * 保留可验证的归一化快照坐标，让纯删除也能在 CRLF/BOM 文本中定位。
+ * @private @author ddj 2026年10月09号
+ * @param hunk 原始块 @param after 已确认与当前文本相同的执行后快照 @param offsets 展示偏移映射
+ * @returns 展示用块；快照已变化时不借用删除点
+ */
+function viewHunk(hunk: Hunk, after: string | undefined, offsets: Map<number, number>): Hunk {
+  const normalized = normalizeHunk(hunk)
+  if (after === undefined) return normalized
+  const start = hunk.afterStart
+  const end = hunk.afterEnd
+  if (!Number.isInteger(start) || !Number.isInteger(end) || start! < 0 || end! < start! || end! > after.length) return normalized
+  if (after.slice(start, end) !== hunk.newText) return normalized
+  return { ...normalized, afterStart: offsets.get(start!), afterEnd: offsets.get(end!) }
+}
+
 /**
  * 计算文件内各差异区域（行范围 + old/new + 状态），用于行内绿标注与 DiffBox。
  * 定位统一基于归一化文本（剥 BOM、CRLF→LF）：外部工具可能改变行尾/BOM，
@@ -87,10 +160,13 @@ export function diffRegions(records: RecordView[], content: string | null): Regi
       }
       continue
     }
+    const oldStarts = oldStartsOf(rec)
+    const snapshot = typeof rec.after === 'string' && normalizeForCompare(rec.after) === normalized ? rec.after : undefined
+    const offsets = offsetsOf(snapshot, rec.hunks)
     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: normalizeHunk(hunk) })
+      if (hunk && !noopHunk(rec, hunk)) entries.push({ idx: i, hunk: viewHunk(hunk, snapshot, offsets) })
     }
     const locations = locateHunks(normalized, entries.map((entry) => entry.hunk))
     for (let i = 0; i < entries.length; i++) {
@@ -105,8 +181,12 @@ export function diffRegions(records: RecordView[], content: string | null): Regi
       const oldLines = entry.hunk.oldText === null ? [] : entry.hunk.oldText.split('\n')
       const newLines = entry.hunk.newText.split('\n')
       const trimmed = trimCommonLines(oldLines, newLines)
+      // 保留尾换行的公共空行裁剪，但空字符串自身不制造增删占位行。
+      if (entry.hunk.oldText === '') trimmed.oldLines = []
+      if (entry.hunk.newText === '') trimmed.newLines = []
       const regionStart = start + trimmed.shift
-      regions.push({ callId: rec.callId, idx: entry.idx, start: regionStart, end: regionStart + trimmed.newLines.length, oldLines: trimmed.oldLines, newLines: trimmed.newLines, status, create: false, rec, superseded: rec.superseded === true })
+      const oldStart = oldStarts[entry.idx] === undefined ? undefined : oldStarts[entry.idx]! + trimmed.shift
+      regions.push({ callId: rec.callId, idx: entry.idx, start: regionStart, end: regionStart + trimmed.newLines.length, oldStart, oldLines: trimmed.oldLines, newLines: trimmed.newLines, status, create: false, rec, superseded: rec.superseded === true })
     }
   }
   regions.sort((a, b) => (a.start ?? Infinity) - (b.start ?? Infinity))

package/src/client/styles/editor.css

@@ -61,15 +61,16 @@
 [data-edrv-view] .edrv-chip-btn:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }
 [data-edrv-view] .edrv-chip-btn:disabled { opacity: .35; cursor: default; }
 [data-edrv-view] .edrv-chip-btn:disabled:hover { background: transparent; }
-[data-edrv-view] .edrv-mn-add-line { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.10)); }
-[data-edrv-view] .edrv-mn-gutter-add { color: var(--dsw-alias-state-success-primary, #0f9d58) !important; font-weight: 700; display: flex !important; align-items: center; justify-content: center; }
+/* 行内和原生 Monaco diff 共用主题色盘；不再借用普通 hover 的灰底。 */
+[data-edrv-view] .edrv-mn-add-line { background: var(--edrv-diff-add, #e6f4e8); }
+[data-edrv-view] .edrv-mn-gutter-add { background: var(--edrv-diff-add, #e6f4e8); color: var(--dsw-alias-state-success-primary, #0f9d58) !important; display: flex !important; align-items: center; justify-content: center; }
 [data-edrv-view] .edrv-mn-gutter-add::before { content: "+"; }
-[data-edrv-view] .edrv-del-zone { background: var(--dsw-alias-interactive-bg-hover-danger, rgba(217,83,79,.14)); border-top: 1px solid var(--dsw-alias-state-error-primary, rgba(217,83,79,.35)); border-bottom: 1px solid var(--dsw-alias-state-error-primary, rgba(217,83,79,.35)); box-shadow: inset 0 0 0 1px var(--dsw-alias-interactive-bg-hover-danger, rgba(217,83,79,.12)); }
-[data-edrv-view] .edrv-del-row { white-space: pre; font-family: var(--ds-font-family-code, ui-monospace, monospace); font-size: 12.5px; line-height: 20px; color: var(--dsw-alias-state-error-primary, #c0392b); }
+[data-edrv-view] .edrv-del-zone, [data-edrv-view] .edrv-del-margin { background: var(--edrv-diff-del, #fbe7e3); color: var(--edrv-diff-fg, #1e1e1e); }
+[data-edrv-view] .edrv-del-row { white-space: pre; height: var(--edrv-line-height, 20px); line-height: var(--edrv-line-height, 20px); }
 [data-edrv-view] .edrv-del-text { display: inline-block; white-space: pre; }
-[data-edrv-view] .edrv-minus-overlay { position: absolute; left: 0; top: 0; width: 100%; height: 100%; max-width: 100%; overflow: visible; pointer-events: none; z-index: 6; }
-[data-edrv-view] .edrv-minus-item { position: absolute; box-sizing: border-box; max-width: 100%; overflow: hidden; }
-[data-edrv-view] .edrv-minus-item::before { content: ''; position: absolute; left: 4px; top: 50%; width: 8px; height: 2px; transform: translateY(-50%); border-radius: 2px; background: var(--dsw-alias-state-error-primary, #d9534f); }
+[data-edrv-view] .edrv-del-margin-row { position: relative; height: var(--edrv-line-height, 20px); line-height: var(--edrv-line-height, 20px); }
+[data-edrv-view] .edrv-del-number { position: absolute; left: var(--edrv-number-left); width: var(--edrv-number-width); color: var(--edrv-diff-number, #6c6c6c); text-align: right; }
+[data-edrv-view] .edrv-del-marker { position: absolute; left: var(--edrv-marker-left); width: var(--edrv-marker-width); color: var(--dsw-alias-state-error-primary, #d9534f); text-align: center; }
 [data-edrv-view] .edrv-monaco-host { flex: 1 1 auto; min-width: 0; min-height: 0; position: relative; overflow: hidden; }
 [data-edrv-view] .edrv-monaco-host > div { position: absolute; inset: 0; min-width: 0; min-height: 0; }
 [data-edrv-view] .edrv-imgview { flex: 1 1 auto; min-width: 0; min-height: 0; display: flex; flex-direction: column; overflow: hidden; }

package/src/client/ui/ClaimRouter.ts

@@ -78,7 +78,7 @@ export function createClaimRouter(spec) {
       const line = resolveNavLine(navigation?.params)
       let left = FORWARD_ATTEMPTS
       const attempt = () => {
-        if (forwardToEditor(service, parsed.path, line)) {
+        if (forwardToEditor(service, parsed.path, line, navigation?.params?.preview)) {
           closeTab(tab)
           return
         }