@mzzsfy/dsh-session-manager 0.9.2 → 0.9.3

package/README.md

@@ -89,4 +89,4 @@ node scripts/dev-link.mjs dsh-session-manager   # 仓库根执行:归一 profile
 
 ## dsh 版本兼容
 
-三版本全部通过:会话树渲染、归档入口、激活 live、diagnostics 0 findings。
+0.1.2-rc.1 / 0.1.5-rc.3 通过:归档入口、激活 live、diagnostics 0 findings。0.1.7-rc.1 上宿主服务拓扑变化(workspaceRegistry 激活链)导致本包七项 inject 未满足、HTTP 面 404,功能待宿主 rc 线定型后专项对齐(详见包内 兼容性测试.md 与仓库兼容性进度文档 FIND-RC1-1)。

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mzzsfy/dsh-session-manager",
   "description": "会话自动归档与管理:超期自动归档、归档面板、删除进系统回收站、还原后一键重挂载",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "type": "module",
   "main": "src/index.js",
   "exports": {

package/src/index.js

@@ -98,6 +98,21 @@ const SETTINGS_SCHEMA = schemastery.object({
     .description('周期评估间隔小时数,0 表示关闭周期评估;变更经周期 tick 对账,关闭即时暂停、重启用最迟下个 tick 生效'),
 })
 
+// 0.1.7 宿主以静态 Config 导出生成设置节表单(maintain 同构);legacy 宿主经
+// settings.register 注册同名命名空间。根级 volatile 包装:0.1.7 下整节为 live
+// 表单,节写经 loader 原地热更;旧宿主 schemastery 无 volatile 方法,特性检测原样返回
+export const Config = volatileWrap(SETTINGS_SCHEMA)
+
+function volatileWrap(schema) {
+  return typeof schema.volatile === 'function' ? schema.volatile() : schema
+}
+
+// volatile ref 动态解包(get 协议):0.1.7 下 apply 入参 config 为整节单 ref;
+// legacy 宿主 config 为普通对象原样透传
+function unwrapVolatile(value) {
+  return typeof value?.get === 'function' ? value.get() : value
+}
+
 function sendJson(res, status, payload) {
   res.writeHead(status, { 'content-type': 'application/json; charset=utf-8' })
   res.end(JSON.stringify(payload))
@@ -114,9 +129,12 @@ function respondError(ctx, res, error) {
   sendJson(res, 400, { error: message })
 }
 
-function readSettings(ctx) {
+function readSettings(ctx, config) {
   const settings = ctx.get('settings')
-  const value = settings ? settings.get(NAMESPACE) : undefined
+  // 双形读(maintain 同构):legacy settings 命名空间 get;0.1.7+ apply 入参
+  // config 整节解包。方法面守卫兼防:服务在但缺 get(宿主升级变更面)时回落默认值,
+  // 防 timer 回调抛错崩进程
+  const value = settings && typeof settings.get === 'function' ? settings.get(NAMESPACE) : unwrapVolatile(config)
   const days = Number(value && value.autoArchiveDays)
   const hours = Number(value && value.autoArchiveIntervalHours)
   return {
@@ -228,7 +246,7 @@ export function apply(ctx, config) {
   // 活跃会话零 IO。返回是否真正启动:被门闩/关闭挡下的调用方(周期 tick)保持到期态
   // 由下个 tick 重试,不得据此重排周期
   function evaluateArchives(cwd) {
-    const { days } = readSettings(ctx)
+    const { days } = readSettings(ctx, config)
     if (days === 0 || evaluating) return false
     evaluating = true
     let timeoutGuard
@@ -624,7 +642,7 @@ export function apply(ctx, config) {
       handler: async (req, res) => {
         try {
           if (req.method === 'GET') {
-            const current = readSettings(ctx)
+            const current = readSettings(ctx, config)
             sendJson(res, 200, { days: current.days, intervalHours: current.intervalHours })
             return
           }
@@ -636,11 +654,20 @@ export function apply(ctx, config) {
             throw new Error(MESSAGES.badJsonBody)
           }
           const patch = readAutoArchivePatch(body)
+          // 双形写(maintain 同构,判定延迟到使用点):legacy 方法面以 register 为准
+          // (0.1.7 的 settings.update 名义在场但按命名空间找条目必败,不可作判据);
+          // 0.1.7+ 走 configEditor.edit 落 profile 条目(fiber.entry,与命名空间解耦)。
+          // await 保证回显为新值,persist 失败走 respondError
           const settings = ctx.get('settings')
-          if (!settings) throw new Error('宿主设置服务不可用')
-          // update 异步落盘后才提交新值:await 保证回显为新值,persist 失败走 respondError
-          await settings.update(NAMESPACE, patch)
-          const current = readSettings(ctx)
+          if (typeof settings?.register === 'function' && typeof settings?.update === 'function') {
+            await settings.update(NAMESPACE, patch)
+          } else {
+            const editor = ctx.get('configEditor')
+            const entry = ctx.fiber?.entry
+            if (!editor || typeof editor.edit !== 'function' || !entry) throw new Error('宿主设置服务不可用')
+            await editor.edit(entry, (current) => ({ ...current, ...patch }))
+          }
+          const current = readSettings(ctx, config)
           sendJson(res, 200, { days: current.days, intervalHours: current.intervalHours })
         } catch (error) {
           respondError(ctx, res, error)
@@ -735,13 +762,13 @@ export function apply(ctx, config) {
     let nextDueAt = null
     let lastArmedAt = 0
     const scheduleNext = () => {
-      const { intervalHours } = readSettings(ctx)
+      const { intervalHours } = readSettings(ctx, config)
       lastArmedAt = Date.now()
       nextDueAt = intervalHours > 0 ? lastArmedAt + intervalHours * HOUR_MS : null
     }
     try {
       const dispose = timerCtx.interval(() => {
-        const { intervalHours } = readSettings(ctx)
+        const { intervalHours } = readSettings(ctx, config)
         // 设置变更对账:0 即时暂停;缺失 due(0 重启用)时补排,防周期轮静默死亡;
         // 缩短间隔时以 lastArmedAt 锚定前移,最长等新间隔而非等满旧周期
         if (intervalHours === 0) {
@@ -769,6 +796,15 @@ export function apply(ctx, config) {
   })
 
   ctx.inject(['settings'], (settingsCtx) => {
+    // 方法面守卫:settings 服务在但缺 register(宿主升级变更面)时跳过注册,
+    // 周期轮与启动补扫按 readSettings 的默认值降级运行,不因服务形变炸 fiber;
+    // 0.1.7 关闭原生自动设置页,设置面由本包自带分区承担(maintain 同构)
+    if (typeof settingsCtx.settings.register !== 'function') {
+      if (typeof settingsCtx.settings?.configure === 'function') {
+        settingsCtx.effect(() => settingsCtx.settings.configure({ auto: false }, ctx.fiber))
+      }
+      return
+    }
     settingsCtx.settings.register(NAMESPACE, SETTINGS_SCHEMA, { base: config })
     // 启动补扫不依赖定时服务:settings 就绪即评估一轮,清掉停机期间积压的超期会话
     evaluateArchives()

package/test/index.test.mjs

@@ -118,16 +118,20 @@ function makeCtx({
   openRejected,
   workspaces,
   settingsValue,
+  settingsService: settingsServiceOverride,
   timerAvailable,
   readSessions,
+  configRef,
+  configEditor,
 }) {
   const routes = []
   const eventHandlers = {}
   const pendingInjects = []
+  const disposers = []
   const ledgerDomain = ledger === undefined ? makeLedgerDomain([]) : ledger
   const workspaceList = workspaces || []
   const settingsState = { value: settingsValue }
-  const settingsService = {
+  const settingsService = settingsServiceOverride ?? {
     get: () => settingsState.value,
     register: () => ({ resolved: undefined }),
     // 宿主 update 为异步串行:合并进微任务队列后生效,读旧值发生在 flush 前
@@ -173,7 +177,12 @@ function makeCtx({
   const base = {
     effect: (fn) => fn(),
     inject: (_deps, fn) => { pendingInjects.push(fn) },
-    get: (name) => ({ agents, sessionPersistence, settings: settingsService }[name]),
+    // fiber 桩:0.1.7 configure 装配以本条目 fiber 为 owner
+    fiber: { entry: { options: { id: 'session-manager', name: '@mzzsfy/dsh-session-manager' } } },
+    get: (name) => {
+      if (name === 'configEditor') return configEditor
+      return { agents, sessionPersistence, settings: settingsService }[name]
+    },
     on: (event, handler) => { eventHandlers[event] = handler },
     // 日志桩:partial 降级点(logger.warn)在测试中可执行且可断言,不再被 undefined 短路
     logger: { warns: [], warn(message) { this.warns.push(message) }, infos: [], info(message) { this.infos.push(message) } },
@@ -188,7 +197,7 @@ function makeCtx({
       return services[prop]
     },
   })
-  apply(ctx, undefined)
+  apply(ctx, configRef)
   return {
     handlers: new Map(routes.map((route) => [route.path, route.handler])),
     eventHandlers,
@@ -199,7 +208,15 @@ function makeCtx({
     readCounts,
     // 模拟宿主 settings 与 timer 服务激活:触发 inject 回调(注册 + 启动补扫 + 周期武装)
     activateSettings: () => {
-      const injected = { settings: settingsService, interval: timerAvailable === false ? undefined : intervalStub }
+      const injected = {
+        settings: settingsService,
+        interval: timerAvailable === false ? undefined : intervalStub,
+        // 注入上下文的 effect 桩:0.1.7 分支经它注册 configure 装配
+        effect(fn) {
+          const disposer = fn()
+          if (typeof disposer === 'function') disposers.push(disposer)
+        },
+      }
       while (pendingInjects.length > 0) pendingInjects.shift()(injected)
     },
   }
@@ -812,6 +829,42 @@ test('周期评估:间隔设置运行时变更经 tick 对账(0 重启用 / 关
   }
 })
 
+test('settings 方法面缺失(0.1.7 SettingsForms 形态):tick 与 status 路由不抛错,配置回落默认', skipMissingDeps, async () => {
+  const dir = await mkdtemp(path.join(tmpdir(), 'sm-methodface-'))
+  // 宿主 0.1.7-alpha.1 将 settings 服务换形为 SettingsForms:缺 get/register,仅剩 update。
+  // 旧形态直接 settings.get 会在 timer 回调抛 TypeError 崩进程(实测事故),守卫后应回落默认值
+  const DAY_MS = 24 * 60 * 60 * 1000
+  const TICK_MS = 60 * 1000
+  mock.timers.enable({ apis: ['setInterval', 'Date'], now: Date.now() })
+  try {
+    const artifact = path.join(dir, 'a.jsonl')
+    await writeFile(artifact, '{"header":1}\n{"event":0}\n')
+    const stale = Date.now() - 30 * DAY_MS
+    await utimes(artifact, stale / 1000, stale / 1000)
+    const settingsForms = { update: async () => {} }
+    const { activateSettings, handlers, registry } = makeCtx({
+      archivedIds: [],
+      headers: [{ id: 'a', cwd: 'C:\\x', createdAt: stale }],
+      agents: new Map(),
+      settingsService: settingsForms,
+      sessionPersistence: { locate: () => ({ path: artifact }) },
+    })
+    activateSettings()
+    // 守卫生效:配置读不到回落默认(days=7,intervalHours=24),30 天超期夹具到期即按默认轮归档
+    mock.timers.tick(DAY_MS + TICK_MS)
+    await waitFor(() => registry.archiveCalls.includes('a'))
+    assert.deepEqual(registry.archiveCalls, ['a'], '配置缺失按默认间隔正常评估,不因服务形变停摆')
+    // status 路由读设置不抛:回默认 days/intervalHours
+    const statusHandler = handlers.get('/api/session-manager/status')
+    const res = response()
+    await statusHandler(request('s1', 'GET'), res)
+    assert.equal(res.status, 200)
+  } finally {
+    mock.timers.reset()
+    await rm(dir, { recursive: true, force: true })
+  }
+})
+
 test('周期评估:缩短间隔经 earliest 钳制前移,不等满旧周期', skipMissingDeps, async () => {
   const dir = await mkdtemp(path.join(tmpdir(), 'sm-shorten-'))
   const TICK_MS = 60 * 1000
@@ -1728,3 +1781,103 @@ test('自动归档配置提交判定:client 与 core 镜像同源,提交守卫
   assert.match(clientSource, /classifyAutoArchiveInput\(committed\[field\], text\)/, 'commit 必须以 committed[field] 为守卫基准')
 })
 
+
+// --- 0.1.7 settings 面双形适配(maintain a913c2c 同构) ---
+
+test('Config 导出契约:根级 volatile 包装,validate 产整节单 ref,默认值对拍', () => {
+  // Given 静态 Config 导出(0.1.7 节表单事实源)
+  assert.ok(indexModule.Config, 'Config 导出必须在场')
+  // When 空配置校验
+  const resolved = indexModule.Config['~standard'].validate({})
+  // Then 产整节单 ref(get 协议),字段为 schema 默认值
+  assert.equal(resolved.issues, undefined)
+  const section = resolved.value.get()
+  assert.equal(section.autoArchiveDays, DEFAULT_AUTO_ARCHIVE_DAYS)
+  assert.equal(section.autoArchiveIntervalHours, DEFAULT_AUTO_ARCHIVE_INTERVAL_HOURS)
+  // When 显式值校验
+  // Then 值透传
+  const provided = indexModule.Config['~standard'].validate({ autoArchiveDays: 3 }).value.get()
+  assert.equal(provided.autoArchiveDays, 3)
+})
+
+test('0.1.7 形态:settings 无 get/register 时读回落 config ref 节值', skipMissingDeps, async () => {
+  // Given settingsForms 只有 update(0.1.7 真实方法面)+ config ref 携带用户值
+  const settingsForms = { update: async () => {} }
+  const configRef = { get: () => ({ autoArchiveDays: 3, autoArchiveIntervalHours: 12 }) }
+  const { handlers } = makeCtx({
+    archivedIds: [],
+    headers: [{ id: 's1', cwd: 'C:\\x', createdAt: 0 }],
+    agents: new Map(),
+    settingsService: settingsForms,
+    configRef,
+  })
+  // When GET auto-archive
+  const res = response()
+  await handlers.get('/api/session-manager/auto-archive')(getRequest2('/api/session-manager/auto-archive', 'GET'), res)
+  // Then 返回 config 节值而非默认
+  assert.deepEqual(res.body, { days: 3, intervalHours: 12 })
+})
+
+test('0.1.7 形态:auto-archive POST 经 configEditor.edit 落 fiber.entry 并回显新值', skipMissingDeps, async () => {
+  // Given settingsForms 只有 update + configEditor 桩(合并写回 configStore)
+  const settingsForms = { update: async () => {} }
+  const configStore = { autoArchiveDays: 7 }
+  const editCalls = []
+  const configRef = { get: () => ({ ...configStore }) }
+  const { handlers } = makeCtx({
+    archivedIds: [],
+    headers: [{ id: 's1', cwd: 'C:\\x', createdAt: 0 }],
+    agents: new Map(),
+    settingsService: settingsForms,
+    configRef,
+    configEditor: {
+      async edit(entry, change) {
+        editCalls.push(entry)
+        const next = change({ ...configStore }, {})
+        for (const [key, value] of Object.entries(next)) configStore[key] = value
+      },
+    },
+  })
+  // When POST 写 days
+  const changed = await postJson(handlers, '/api/session-manager/auto-archive', { days: 3 })
+  // Then edit 定位本条目,合并写回,响应回显新值
+  assert.deepEqual(changed.body, { days: 3, intervalHours: DEFAULT_AUTO_ARCHIVE_INTERVAL_HOURS })
+  assert.equal(editCalls.length, 1)
+  assert.equal(editCalls[0].options.id, 'session-manager')
+  assert.equal(configStore.autoArchiveDays, 3)
+})
+
+test('0.1.7 形态:configEditor 缺失即 400 拒写,配置不变', skipMissingDeps, async () => {
+  // Given settingsForms 只有 update 且无 configEditor
+  const settingsForms = { update: async () => {} }
+  const configRef = { get: () => ({}) }
+  const { handlers } = makeCtx({
+    archivedIds: [],
+    headers: [{ id: 's1', cwd: 'C:\\x', createdAt: 0 }],
+    agents: new Map(),
+    settingsService: settingsForms,
+    configRef,
+  })
+  // When POST 写 days
+  const denied = await postJson(handlers, '/api/session-manager/auto-archive', { days: 3 })
+  // Then 400 错误响应
+  assert.equal(denied.status, 400)
+  assert.ok(denied.body.error)
+})
+
+test('0.1.7 形态:settings.configure 在场即关闭原生自动页', skipMissingDeps, () => {
+  // Given settingsForms 带 configure 无 register
+  const configureCalls = []
+  const settingsForms = { configure: (presentation, owner) => { configureCalls.push({ presentation, owner }); return () => {} } }
+  const { activateSettings } = makeCtx({
+    archivedIds: [],
+    headers: [],
+    agents: new Map(),
+    settingsService: settingsForms,
+  })
+  // When 激活 settings 注入
+  activateSettings()
+  // Then 关闭自动页
+  assert.equal(configureCalls.length, 1)
+  assert.deepEqual(configureCalls[0].presentation, { auto: false })
+})