在 PR #471(file-trace)基础上的演进: - 合并 tab:git tab(id 保留,兼容持久化布局)升级为「文件变动」双视角 tab——Git 视角(原 GitView 全部能力:staged/unstaged/提交/历史/worktree· 子仓库选择/右键菜单/确认弹窗)+ 本轮文件视角(原 file-trace:会话事件 日志实时折叠的模型读写编辑记录,按文件分组、新增类型筛选 chips、相对 时间);file-trace tab 移除(未随任何版本发布)。 - 统一 diff 组件:新 src/client/diff/ 模块(rows.ts 引擎 + DiffRows/ DiffFiles 渲染器 + highlight.ts 语法着色)——git diff 与会话操作 diff 共用一套渲染:mod 改写配对(del-run/add-run 对半标蓝)、行内字符级 高亮(修复了旧实现旧侧失配不高亮的问题,改为行对象身份键)、上下文 hunk 折叠、git hunk 间未输出区间按行号范围生成不可展开折叠、语法着色 色相落位 diff 三色空档、+n −m 统计 chips、行底色 tint;DiffTab 改用 该栈(git diff tab 从此也有高亮)。 - 交互:两视角共用底部可拖拽预览面板(点击文件/提交/操作即预览,不再 直接开 diff tab;面板可刷新、可键盘/拖拽调高、git 目标可一键展开为 独立 diff tab);视角选择与面板高度持久化在 tab.meta;git 行 XY 徽章 按状态字母着色;选中行高亮。 - i18n:fileTrace* 十键重命名为 changes* 前缀,git 键值更新为「文件 变动」,新增 7 键(视角/筛选/面板操作),全部 21 个词典同步。 - 结构:src/client/changes/(ChangesTab/GitLens/SessionLens/DiffPane/ ops)+ src/client/diff/;GitView/DiffView/filetrace/ 删除;git 样式 从 sidebar.module.css 迁至 changes.module.css。 - 测试:builtins 8→7(git tab 承接 badge pin)、diff-rows(unified 转换/mod 配对/间隙折叠/统计)、changes-tab(壳交互 jsdom)、 diff-files-collapse(原 DiffView 折叠行为钉住)、changes-ops(原 filetrace 数据层)、git-view-worktree 迁移至 GitLens;全量 1122 通过。 - 文档:README ×2 功能矩阵合并、external-plugin-guide §4.4 与内置清单 7 tab、mount e2e 菜单标题同步。
127 lines
5.8 KiB
TypeScript
127 lines
5.8 KiB
TypeScript
/**
|
|
* Changes tab session-lens data layer: event-log folding into file
|
|
* operations, plus a sanity pass over the shared diff/highlight engines
|
|
* (their full behavior suites live in the standalone dsh-file-trace plugin).
|
|
*/
|
|
import { describe, expect, it } from 'vitest'
|
|
import { extractFileOps, groupByFile, knownContentBefore, parseReadLines } from '../src/client/changes/ops.ts'
|
|
import { diffLines, buildDiffSegments, coalesceInline, diffInline } from '../src/client/diff/rows.ts'
|
|
import { langOfPath, scanLine } from '../src/client/diff/highlight.ts'
|
|
import type { SidebarSessionEvent } from '../src/context-types.ts'
|
|
|
|
/** One synthetic session event. */
|
|
function ev(type: string, seq: number, time: number, data: Record<string, unknown>): SidebarSessionEvent {
|
|
return { type, seq, time, data }
|
|
}
|
|
|
|
/** A tool/call event. */
|
|
function call(seq: number, name: string, callId: string, args: unknown, time = seq): SidebarSessionEvent {
|
|
return ev('tool/call', seq, time, { name, callId, arguments: JSON.stringify(args) })
|
|
}
|
|
|
|
/** A tool/result event carrying one tool-result block with inner text. */
|
|
function result(seq: number, callId: string, text: string, isError = false, time = seq): SidebarSessionEvent {
|
|
return ev('tool/result', seq, time, {
|
|
message: {
|
|
source: { kind: 'tool', callId },
|
|
content: [{ type: 'tool-result', isError, content: [{ type: 'text', text }] }],
|
|
},
|
|
})
|
|
}
|
|
|
|
describe('extractFileOps', () => {
|
|
it('seeds running ops from tool/call and settles them from tool/result', () => {
|
|
const ops = extractFileOps([
|
|
call(1, 'write', 'w1', { file_path: 'a.ts', content: 'body' }),
|
|
result(2, 'w1', '<path>a.ts</path>\n<type>file</type>\n<content>\nbody\n</content>'),
|
|
])
|
|
expect(ops).toHaveLength(1)
|
|
expect(ops[0]!.running).toBe(false)
|
|
expect(ops[0]!.isError).toBe(false)
|
|
expect(ops[0]!.content).toBe('body')
|
|
})
|
|
|
|
it('captures the error text of an errored result for every kind', () => {
|
|
const ops = extractFileOps([
|
|
call(1, 'write', 'w', { file_path: 'a', content: 'x' }),
|
|
result(2, 'w', '写入失败:目标只读', true),
|
|
call(3, 'read', 'r', { file_path: 'b' }),
|
|
result(4, 'r', 'cannot read "b": not found', true),
|
|
])
|
|
expect(ops.every(op => op.isError && op.errorText !== undefined)).toBe(true)
|
|
expect(ops.find(op => op.kind === 'read')?.errorText).toBe('cannot read "b": not found')
|
|
})
|
|
|
|
it('keeps a call without result as running, and reads capture their content', () => {
|
|
const ops = extractFileOps([
|
|
call(1, 'read', 'r1', { file_path: 'a.ts' }),
|
|
result(2, 'r1', '<path>a.ts</path>\n<type>file</type>\n<content>\n1: hello\n\n(End of file - total 1 lines)\n</content>'),
|
|
call(3, 'edit', 'e1', { file_path: 'c.ts', old_string: 'x', new_string: 'y' }),
|
|
])
|
|
const read = ops.find(op => op.callId === 'r1')
|
|
expect(read?.running).toBe(false)
|
|
expect(read?.read).toContain('1: hello')
|
|
const edit = ops.find(op => op.callId === 'e1')
|
|
expect(edit?.running).toBe(true)
|
|
expect(edit?.edit).toEqual({ oldString: 'x', newString: 'y' })
|
|
})
|
|
|
|
it('ignores non-file tools and unrelated results, newest first', () => {
|
|
const ops = extractFileOps([
|
|
call(1, 'pwsh', 'p', { command: 'ls' }),
|
|
result(2, 'unknown-call', 'orphan'),
|
|
call(3, 'read', 'r', { file_path: 'z.ts' }),
|
|
])
|
|
expect(ops.map(op => op.callId)).toEqual(['r'])
|
|
})
|
|
|
|
it('groups by file newest-first and recovers prior write content', () => {
|
|
const ops = extractFileOps([
|
|
call(1, 'write', 'w1', { file_path: 'a.ts', content: 'first' }),
|
|
call(2, 'write', 'w2', { file_path: 'a.ts', content: 'second' }),
|
|
call(3, 'write', 'w3', { file_path: 'b.ts', content: 'x' }),
|
|
])
|
|
expect([...groupByFile(ops).keys()]).toEqual(['b.ts', 'a.ts'])
|
|
expect(knownContentBefore(ops, 'a.ts', ops.find(op => op.callId === 'w2')!)).toBe('first')
|
|
})
|
|
})
|
|
|
|
describe('parseReadLines', () => {
|
|
it('recovers real line numbers from the read envelope', () => {
|
|
const lines = parseReadLines('<path>a.ts</path>\n<type>file</type>\n<content>\n10: x\n11: y\n\n(Showing lines 10-11 of 20. Use offset=12 to continue.)\n</content>')
|
|
expect(lines).toEqual([{ line: 10, text: 'x' }, { line: 11, text: 'y' }])
|
|
})
|
|
})
|
|
|
|
describe('ported diff/highlight engines (sanity)', () => {
|
|
it('diffLines pairs a rewrite as mod and folds context into hunks', () => {
|
|
const rows = diffLines('hello world', 'hello dsh')
|
|
expect(rows.map(r => r.kind)).toEqual(['mod', 'mod'])
|
|
const before = Array.from({ length: 6 }, (_, i) => ({ kind: 'context' as const, oldLine: i + 1, newLine: i + 1, text: 'c' + String(i) }))
|
|
const change = [{ kind: 'mod' as const, oldLine: 7, newLine: 7, text: 'X' }]
|
|
const after = Array.from({ length: 8 }, (_, i) => ({ kind: 'context' as const, oldLine: i + 8, newLine: i + 8, text: 'c' + String(i + 8) }))
|
|
const segments = buildDiffSegments([...before, ...change, ...after], 3)
|
|
expect(segments.map(s => s.kind)).toEqual(['fold', 'hunk', 'fold'])
|
|
})
|
|
|
|
it('coalesces the ported prefix/suffix inline diff into runs', () => {
|
|
const { old: oldSide } = diffInline('hello world', 'hello dsh')
|
|
expect(coalesceInline(oldSide)).toEqual([
|
|
{ text: 'hello ', changed: false },
|
|
{ text: 'world', changed: true },
|
|
])
|
|
})
|
|
|
|
it('highlights keywords and threads block-comment state', () => {
|
|
expect(langOfPath('a.cpp')).toBe('cpp')
|
|
const open = scanLine('/* header', 'cpp')
|
|
expect(open.inBlock).toBe(true)
|
|
const mid = scanLine(' * interior note', 'cpp', true)
|
|
expect(mid.tokens).toEqual([{ text: ' * interior note', type: 'comment' }])
|
|
const code = scanLine('int main() { return 42; } // done', 'cpp')
|
|
expect(code.tokens).toContainEqual({ text: 'int', type: 'keyword' })
|
|
expect(code.tokens).toContainEqual({ text: '42', type: 'number' })
|
|
expect(code.tokens).toContainEqual({ text: '// done', type: 'comment' })
|
|
})
|
|
})
|