@mzzsfy/dsh-context-manager 0.2.0 → 0.3.0

package/test/core.test.mjs

@@ -59,6 +59,56 @@ test('历史输入提取:多 text block 按行拼接为单条', () => {
   assert.deepEqual(extractUserInputs(events), [{ text: '第一段\n第二段', at: 300 }])
 })
 
+// ── 历史输入:斜杠命令提取(command/run)──
+
+test('历史输入提取:command/run 重组为完整命令行,args 为命令名后 verbatim rawInput', () => {
+  const events = [{
+    type: 'command/run',
+    seq: 2,
+    time: 600,
+    data: { commandId: 'c1', name: 'goal', args: ' 完成目标文档', source: { kind: 'user' } },
+  }]
+  assert.deepEqual(extractUserInputs(events), [{ text: '/goal 完成目标文档', at: 600 }])
+})
+
+test('历史输入提取:command/run 无 args(recordInput: false)产出裸命令名', () => {
+  const events = [{
+    type: 'command/run',
+    seq: 2,
+    time: 600,
+    data: { commandId: 'c1', name: 'think', source: { kind: 'user' } },
+  }]
+  assert.deepEqual(extractUserInputs(events), [{ text: '/think', at: 600 }])
+})
+
+test('历史输入提取:非用户来源的 command/run 不产出', () => {
+  const events = [{
+    type: 'command/run',
+    seq: 2,
+    time: 600,
+    data: { commandId: 'c1', name: 'goal', args: ' x', source: { kind: 'agent' } },
+  }]
+  assert.deepEqual(extractUserInputs(events), [])
+})
+
+test('历史输入提取:畸形 command/run(data 缺失/name 空串/args 非字符串)安全跳过或归一', () => {
+  const noData = { type: 'command/run', seq: 1, time: 100 }
+  const emptyName = { type: 'command/run', seq: 2, time: 200, data: { commandId: 'c1', name: '', source: { kind: 'user' } } }
+  const nonStringArgs = { type: 'command/run', seq: 3, time: 300, data: { commandId: 'c1', name: 'goal', args: 42, source: { kind: 'user' } } }
+  assert.deepEqual(extractUserInputs([noData, emptyName, nonStringArgs]), [{ text: '/goal', at: 300 }])
+})
+
+test('历史输入提取:普通输入与命令混合按事件序全部产出', () => {
+  const events = [
+    userEvent(null, '先看看日志', 100),
+    { type: 'command/run', seq: 2, time: 200, data: { commandId: 'c1', name: 'goal', args: ' 收尾', source: { kind: 'user' } } },
+  ]
+  assert.deepEqual(extractUserInputs(events), [
+    { text: '先看看日志', at: 100 },
+    { text: '/goal 收尾', at: 200 },
+  ])
+})
+
 // ── 历史输入:聚合(G4-G5)──
 
 test('历史输入聚合:同文本去重保留最新时间,按时间倒序', () => {

package/test/index.test.mjs

@@ -482,6 +482,84 @@ test('历史输入路由:产物未变的会话跨对齐零解压(磁盘 extracts
   })
 })
 
+test('历史输入路由:旧版本提取缓存自动重解压(命令历史自愈)', skipMissingDeps, async () => {
+  await withHistoryCacheDir(async (cacheDir) => {
+    const dir = await mkdtemp(path.join(tmpdir(), 'cx-hist-ver-'))
+    const artifactPath = path.join(dir, 'session.jsonl.zstd')
+    await writeFile(artifactPath, 'log-bytes')
+    try {
+      const { stat } = await import('node:fs/promises')
+      const info = await stat(artifactPath)
+      await ensureCacheDir(cacheDir)
+      // 预置旧版本提取器写下的缓存:指纹与产物一致但条目缺命令输入(无 v 字段)
+      await writeWorkspaceCache(cacheDir, 'C:\\x', {
+        entries: [{ text: '旧输入', at: 100, sid: 's1' }],
+        extracts: {
+          s1: { mtimeMs: info.mtimeMs, size: info.size, entries: [{ text: '旧输入', at: 100 }] },
+        },
+      })
+      const commandEvent = {
+        type: 'command/run',
+        seq: 2,
+        time: 200,
+        data: { commandId: 'c1', name: 'goal', args: ' 收尾', source: { kind: 'user' } },
+      }
+      const { handlers, readCounts } = makeCtx({
+        headers: [{ id: 's1', cwd: 'C:\\x', createdAt: 0 }],
+        agents: new Map(),
+        sessionPersistence: { locate: (header) => ({ path: artifactPath }) },
+        readSessions: { s1: [userMessageEvent('旧输入', 100), commandEvent] },
+      })
+      const res = await requestUntil(handlers, '?sessionId=s1&scope=workspace',
+        (body) => body.aligned && body.inputs.some((item) => item.text === '/goal 收尾'))
+      assert.ok(readCounts.get('s1') >= 1, '版本不符触发重解压')
+      assert.deepEqual(res.body.inputs.map((item) => item.text), ['/goal 收尾', '旧输入'])
+    } finally {
+      await rm(dir, { recursive: true, force: true })
+    }
+  })
+})
+
+test('历史输入路由:session 范围版本不符判 stale,聚焦对齐首请求内补齐', skipMissingDeps, async () => {
+  await withHistoryCacheDir(async (cacheDir) => {
+    const dir = await mkdtemp(path.join(tmpdir(), 'cx-hist-ver2-'))
+    const artifactPath = path.join(dir, 'session.jsonl.zstd')
+    await writeFile(artifactPath, 'log-bytes')
+    try {
+      const { stat } = await import('node:fs/promises')
+      const info = await stat(artifactPath)
+      await ensureCacheDir(cacheDir)
+      // 预置旧版本缓存:指纹与产物一致(不改条目则指纹校验判新鲜)但缺 v 字段
+      await writeWorkspaceCache(cacheDir, 'C:\\x', {
+        entries: [{ text: '旧输入', at: 100, sid: 's1' }],
+        extracts: {
+          s1: { mtimeMs: info.mtimeMs, size: info.size, entries: [{ text: '旧输入', at: 100 }] },
+        },
+      })
+      const commandEvent = {
+        type: 'command/run',
+        seq: 2,
+        time: 200,
+        data: { commandId: 'c1', name: 'goal', args: ' 收尾', source: { kind: 'user' } },
+      }
+      const { handlers, readCounts } = makeCtx({
+        headers: [{ id: 's1', cwd: 'C:\\x', createdAt: 0 }],
+        agents: new Map(),
+        sessionPersistence: { locate: (header) => ({ path: artifactPath }) },
+        readSessions: { s1: [userMessageEvent('旧输入', 100), commandEvent] },
+      })
+      // 首请求即 aligned:true 且含命令条目——版本不符走聚焦对齐,单次请求内补齐
+      const res = await requestUntil(handlers, '?sessionId=s1&scope=session',
+        (body) => body.aligned && body.inputs.some((item) => item.text === '/goal 收尾'))
+      assert.equal(res.body.aligned, true, '聚焦对齐快于等待时限,首请求即就绪')
+      assert.deepEqual(res.body.inputs.map((item) => item.text), ['/goal 收尾', '旧输入'])
+      assert.ok(readCounts.get('s1') >= 1, '版本不符触发聚焦重解压')
+    } finally {
+      await rm(dir, { recursive: true, force: true })
+    }
+  })
+})
+
 // ── 历史输入路由:窗口与 subagent 排除 ──
 
 test('历史输入路由:启动对齐只回溯最近 STARTUP_SCAN 个会话,老会话不解压', skipMissingDeps, async () => {
@@ -661,12 +739,12 @@ test('常用提示词:超长截断、上限裁剪、空 text 拒绝', skipMissin
 
 // ── 路由层横切守卫:方法白名单 / JSON 体 / 系统级错误收敛 / 非字符串 text ──
 
-test('横切守卫:6 条路由方法白名单,白名单外一律 405', skipMissingDeps, async () => {
+test('横切守卫:8 条路由方法白名单,白名单外一律 405', skipMissingDeps, async () => {
   await withHistoryCacheDir(async () => {
     const { handlers } = makeCtx({ headers: [{ id: 's1', cwd: 'C:\\x', createdAt: 0 }], agents: new Map() })
     const getOnly = '/api/context/inputs'
     const postOnly = '/api/context/prompts/toggle'
-    const dualMethods = ['/api/context/history-enabled', '/api/context/steer-recall-enabled', '/api/context/fork-enabled', '/api/context/copy-sid-enabled']
+    const dualMethods = ['/api/context/history-enabled', '/api/context/history-button-enabled', '/api/context/steer-recall-enabled', '/api/context/fork-enabled', '/api/context/fork-auto-resend-enabled', '/api/context/copy-sid-enabled']
     // GET-only 路由:POST 拒绝
     const inputsPost = response()
     await handlers.get(getOnly)(request('s1'), inputsPost)
@@ -684,10 +762,10 @@ test('横切守卫:6 条路由方法白名单,白名单外一律 405', skipMissi
   })
 })
 
-test('横切守卫:5 条 POST 路由的非法 JSON 请求体统一 400(badJsonBody)', skipMissingDeps, async () => {
+test('横切守卫:7 条 POST 路由的非法 JSON 请求体统一 400(badJsonBody)', skipMissingDeps, async () => {
   await withHistoryCacheDir(async () => {
     const { handlers } = makeCtx({ headers: [{ id: 's1', cwd: 'C:\\x', createdAt: 0 }], agents: new Map() })
-    const postPaths = ['/api/context/prompts/toggle', '/api/context/history-enabled', '/api/context/steer-recall-enabled', '/api/context/fork-enabled', '/api/context/copy-sid-enabled']
+    const postPaths = ['/api/context/prompts/toggle', '/api/context/history-enabled', '/api/context/history-button-enabled', '/api/context/steer-recall-enabled', '/api/context/fork-enabled', '/api/context/fork-auto-resend-enabled', '/api/context/copy-sid-enabled']
     for (const routePath of postPaths) {
       const res = await postRaw(handlers, routePath, '{oops')
       assert.equal(res.status, 400, routePath + ' 非法 JSON 应回 400')
@@ -804,3 +882,20 @@ test('标题栏复制 sessionId 启停:GET 默认启用,POST 切换经 settings
   await handlers.get('/api/context/copy-sid-enabled')(getRequest2('/api/context/copy-sid-enabled', 'GET'), restored)
   assert.equal(restored.body.enabled, true)
 })
+
+test('输入框历史按钮启停:GET 默认启用,POST 切换经 settings 持久,GET 反映新值', skipMissingDeps, async () => {
+  const { handlers } = makeCtx({ headers: [{ id: 's1', cwd: 'C:\\x', createdAt: 0 }], agents: new Map() })
+  const initial = response()
+  await handlers.get('/api/context/history-button-enabled')(getRequest2('/api/context/history-button-enabled', 'GET'), initial)
+  assert.equal(initial.body.enabled, true, '默认启用')
+  const off = await postJson(handlers, '/api/context/history-button-enabled', { enabled: false })
+  assert.equal(off.body.enabled, false)
+  // settings 持久:重读反映关闭态;POST 回 true 恢复
+  const reread = response()
+  await handlers.get('/api/context/history-button-enabled')(getRequest2('/api/context/history-button-enabled', 'GET'), reread)
+  assert.equal(reread.body.enabled, false, 'settings 持久化关闭态')
+  await postJson(handlers, '/api/context/history-button-enabled', { enabled: true })
+  const restored = response()
+  await handlers.get('/api/context/history-button-enabled')(getRequest2('/api/context/history-button-enabled', 'GET'), restored)
+  assert.equal(restored.body.enabled, true)
+})

package/test/client-fork-family.test.mjs

@@ -1,48 +0,0 @@
-import { test } from 'node:test'
-import assert from 'node:assert/strict'
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
-
-const CLIENT_SRC = readFileSync(fileURLToPath(new URL('../src/client.js', import.meta.url)), 'utf8')
-
-// F1 家族版本环 的客户端契约(源码切片锁定):
-// - 数据源是 sessions.list 快照行(parentSessionId),零新 RPC
-// - 单成员家族/快照缺失不注入
-// - 箭头跳转经 sessions.open(纯打开,不 fork)
-// - 计数器防重复注入,停用 fork 时随 removeAll 一并清除
-
-test('源码契约:家族环数据源为 sessions.list 快照(零新 RPC)', () => {
-  assert.ok(CLIENT_SRC.includes('sessions.list.getSnapshot()'), '家族投影应读会话列表快照')
-  assert.ok(CLIENT_SRC.includes('parent.parentId'), '投影应按快照行 parentId 建链(快照字段名与 wire 不同)')
-})
-
-test('源码契约:快照行主键为 id(与服务 wire 字段名不同源)', () => {
-  const slice = CLIENT_SRC.slice(CLIENT_SRC.indexOf('function sessionFamilyMap'), CLIENT_SRC.indexOf('function familyRing'))
-  assert.ok(slice.includes('item.id'), '快照行主键应取 id')
-})
-
-test('源码契约:编排派生会话(subagent)剔除出家族投影', () => {
-  const slice = CLIENT_SRC.slice(CLIENT_SRC.indexOf('function sessionFamilyMap'), CLIENT_SRC.indexOf('function familyRing'))
-  assert.ok(slice.includes("item.origin === 'subagent'"), 'subagent 会话不是用户的 fork 版本,应整行剔除')
-})
-
-test('源码契约:单成员家族与快照缺失不注入计数器', () => {
-  const slice = CLIENT_SRC.slice(CLIENT_SRC.indexOf('// 家族版本环'), CLIENT_SRC.indexOf('function jumpFamilyMember'))
-  assert.ok(slice.includes('ring && ring.total >= 2'), '成员不足 2 不注入')
-  assert.ok(slice.includes('actionsRow.querySelector'), '注入前应查重')
-})
-
-test('源码契约:箭头跳转经 sessions.open 且不 fork', () => {
-  const jump = CLIENT_SRC.slice(CLIENT_SRC.indexOf('function jumpFamilyMember'), CLIENT_SRC.indexOf('if (typeof MutationObserver'))
-  assert.ok(jump.includes('openFn(target)'), '跳转应调用 open 通道')
-  assert.ok(jump.includes('target !== current.sessionId'), '目标为自身时不切换')
-})
-
-test('源码契约:家族环标记与清除齐备(停用开关一并移除)', () => {
-  assert.ok(CLIENT_SRC.includes("const FAMILY_RING_FLAG = 'data-cx-family-ring'"), '应有家族环标记常量')
-  assert.ok(CLIENT_SRC.includes("querySelectorAll('[' + FORK_BTN_FLAG + ']')"), '清除逻辑存在(环与按钮同排,按钮清除即整排消失)')
-})
-
-test('源码契约:loadFamily 通道旧宿主降级返回 null', () => {
-  assert.ok(CLIENT_SRC.includes('typeof sessions.list.getSnapshot'), '快照面应以能力探测守门')
-})

package/test/core-family.test.mjs

@@ -1,122 +0,0 @@
-import test from 'node:test'
-import assert from 'node:assert/strict'
-
-import {
-  forkFailureText,
-  forkRetryText,
-  sessionFamilyMap,
-  familyRing,
-} from '../src/core.mjs'
-
-// ── fork 锚点解析 ──
-
-test('Given 插件注入消息, When forkRetryText, Then 返回 null', () => {
-  assert.equal(forkRetryText({ source: { kind: 'plugin' }, content: [{ type: 'text', text: 'hi' }] }), null)
-})
-
-test('Given 纯图或空白 user 消息, When forkRetryText, Then 返回 null', () => {
-  assert.equal(forkRetryText({ source: { kind: 'user' }, content: [{ type: 'image', attachment: {} }] }), null)
-  assert.equal(forkRetryText({ source: { kind: 'user' }, content: [{ type: 'text', text: '   ' }] }), null)
-})
-
-test('Given undefined 或畸形 data, When forkRetryText, Then 返回 null', () => {
-  assert.equal(forkRetryText(undefined), null)
-  assert.equal(forkRetryText({}), null)
-  assert.equal(forkRetryText({ source: { kind: 'user' } }), null)
-})
-
-test('Given 多文本块 user 消息, When forkRetryText, Then 按行拼接且跳过图块', () => {
-  const text = forkRetryText({
-    source: { kind: 'user' },
-    content: [
-      { type: 'text', text: '第一行' },
-      { type: 'image', attachment: {} },
-      { type: 'text', text: '第二行' },
-    ],
-  })
-  assert.equal(text, '第一行\n第二行')
-})
-
-test('Given user 消息先于 turn/start(无门), When forkRetryText, Then 照常提取', () => {
-  assert.equal(forkRetryText({ source: { kind: 'user' }, content: [{ type: 'text', text: '首问' }] }), '首问')
-})
-
-// ── 家族谱系投影 ──
-
-test('Given 空/畸形输入, When sessionFamilyMap, Then 返回空 Map', () => {
-  assert.equal(sessionFamilyMap(undefined).size, 0)
-  assert.equal(sessionFamilyMap([]).size, 0)
-  assert.equal(sessionFamilyMap([null, {}, { sessionId: '' }]).size, 0)
-})
-
-test('Given 直链家族 根→A→B, When sessionFamilyMap, Then 各成员链正确且同根', () => {
-  const items = [
-    { sessionId: 'root', updatedAt: 3 },
-    { sessionId: 'a', parentSessionId: 'root', updatedAt: 1 },
-    { sessionId: 'b', parentSessionId: 'a', updatedAt: 2 },
-  ]
-  const chains = sessionFamilyMap(items)
-  assert.deepEqual(chains.get('b').chain, ['root', 'a', 'b'])
-  assert.equal(chains.get('b').root, 'root')
-  assert.equal(chains.get('a').root, 'root')
-  assert.equal(chains.get('root').root, 'root')
-})
-
-test('Given parentSessionId 指向不存在的会话(孤儿), When sessionFamilyMap, Then 视为独立根', () => {
-  const chains = sessionFamilyMap([{ sessionId: 'x', parentSessionId: 'ghost' }])
-  assert.equal(chains.get('x').root, 'x')
-  assert.deepEqual(chains.get('x').chain, ['x'])
-})
-
-test('Given 循环引用, When sessionFamilyMap, Then 不死循环', () => {
-  const chains = sessionFamilyMap([
-    { sessionId: 'p', parentSessionId: 'q' },
-    { sessionId: 'q', parentSessionId: 'p' },
-  ])
-  assert.ok(chains.get('p').chain.length <= 2)
-})
-
-test('Given 编排派生会话(origin=subagent)挂在根下, When sessionFamilyMap, Then subagent 行剔除且不计数', () => {
-  const chains = sessionFamilyMap([
-    { sessionId: 'root', updatedAt: 30 },
-    { sessionId: 'task', parentSessionId: 'root', origin: 'subagent', updatedAt: 20 },
-    { sessionId: 'fork', parentSessionId: 'root', updatedAt: 10 },
-  ])
-  assert.equal(chains.has('task'), false)
-  const ring = familyRing(chains, 'root')
-  assert.deepEqual(ring, { index: 2, total: 2, members: ['fork', 'root'] })
-})
-
-test('Given 整链均为 subagent, When familyRing, Then 单成员返回 null', () => {
-  const chains = sessionFamilyMap([{ sessionId: 'task', origin: 'subagent' }])
-  assert.equal(familyRing(chains, 'task'), null)
-})
-
-// ── 家族环计数 ──
-
-test('Given 家族 3 成员, When familyRing(中间 updatedAt), Then index=2 total=3 members 按 updatedAt 升序', () => {
-  const chains = sessionFamilyMap([
-    { sessionId: 'root', updatedAt: 30 },
-    { sessionId: 'a', parentSessionId: 'root', updatedAt: 10 },
-    { sessionId: 'b', parentSessionId: 'root', updatedAt: 20 },
-  ])
-  const ring = familyRing(chains, 'b')
-  assert.deepEqual(ring, { index: 2, total: 3, members: ['a', 'b', 'root'] })
-})
-
-test('Given 单成员家族, When familyRing, Then 返回 null', () => {
-  const chains = sessionFamilyMap([{ sessionId: 'only' }])
-  assert.equal(familyRing(chains, 'only'), null)
-})
-
-test('Given 目标不在投影内, When familyRing, Then 返回 null', () => {
-  assert.equal(familyRing(new Map(), 'nope'), null)
-  assert.equal(familyRing(undefined, 'nope'), null)
-})
-
-test('Given fork 错误码, When forkFailureText, Then 已知码映射中文未知码透出', () => {
-  assert.equal(forkFailureText('session/fork-unavailable'), '该轮尚未完成,不可分叉')
-  assert.equal(forkFailureText('session/workspace-attach-failed'), '分叉成功,但挂载到工作区失败')
-  assert.equal(forkFailureText('gateway/internal'), '分叉失败: gateway/internal')
-  assert.equal(forkFailureText(undefined), '分叉失败: 未知错误')
-})