zen-gitsync 2.16.43 → 2.16.44

package/src/ui/server/routes/fs.js

@@ -97,7 +97,11 @@ export function registerFsRoutes({
       // 检查当前目录是否是Git仓库
       try {
         await execGitCommand(['rev-parse', '--is-inside-work-tree']);
+        // 用实时检测结果回写服务端 isGitRepo 标志,自愈启动后目录状态
+        // 发生变化(如外部终端里 git init)导致的 stale false。
+        setIsGitRepo(true);
       } catch (error) {
+        setIsGitRepo(false);
         return res.status(400).json({
           error: '当前目录不是一个Git仓库',
           directory,

package/src/ui/server/routes/gitOps.js

@@ -42,6 +42,7 @@ export function registerGitOpsRoutes({
   clearCommandHistory,
   checkAndClearGitLock,
   getIsGitRepo,
+  setIsGitRepo,
   setRecentPushStatus
 }) {
   // 提交更改
@@ -948,9 +949,8 @@ export function registerGitOpsRoutes({
       // 拼成 origin/<branch> 后进 git 参数位,同样要过 ref 校验
       const safeBranch = assertGitRef(branch, '分支名');
 
-      // 尝试清理 Git 锁文件(破坏性入口:force=true 绕过 mtime 判断,
-      // 仍走 PID liveness 校验——用户主动触发的 reset --hard 不该被
-      // 一个刚崩出来的新孤儿锁挡住)
+      // 仅清理能确认持有进程已退出的孤儿锁。原生 Git 的空锁无法确认
+      // 持有者状态时必须保留,让 Git 自己返回并发锁错误。
       await checkAndClearGitLock({ force: true });
 
       // 执行 git reset --hard origin/branch 命令
@@ -968,9 +968,8 @@ export function registerGitOpsRoutes({
   // 清除本地所有更改，包括未跟踪文件 (git reset --hard && git clean -fd)
   app.post('/api/discard-all-changes', async (req, res) => {
     try {
-      // 尝试清理 Git 锁文件(破坏性入口:force=true 绕过 mtime 判断,
-      // 仍走 PID liveness 校验——用户主动触发的 discard-all 不该被
-      // 一个刚崩出来的新孤儿锁挡住)
+      // 仅清理能确认持有进程已退出的孤儿锁。原生 Git 的空锁无法确认
+      // 持有者状态时必须保留,让 Git 自己返回并发锁错误。
       await checkAndClearGitLock({ force: true });
 
       // 1. 执行 git reset --hard 丢弃已跟踪文件的更改
@@ -1286,23 +1285,15 @@ export function registerGitOpsRoutes({
   // 添加清理Git锁定文件的接口
   app.post('/api/remove-lock', async (req, res) => {
     try {
-      const gitDir = path.join(process.cwd(), '.git')
-      const indexLockFile = path.join(gitDir, 'index.lock')
-
-      // 检查文件是否存在
-      try {
-        await fs.access(indexLockFile)
-        // 如果文件存在，尝试删除它
-        await fs.unlink(indexLockFile)
-        res.json({ success: true, message: '已清理锁定文件' })
-      } catch (error) {
-        // 如果文件不存在，也返回成功
-        if (error.code === 'ENOENT') {
-          res.json({ success: true, message: '没有发现锁定文件' })
-        } else {
-          throw error
-        }
-      }
+      // 统一走带并发保护的锁检查。原生 Git 的 index.lock 通常为空,
+      // 无法确认是否仍被其他工具使用时绝不能直接 unlink。
+      const cleaned = await checkAndClearGitLock({ force: false });
+      res.json({
+        success: cleaned,
+        message: cleaned
+          ? '已清理确认失效的锁定文件'
+          : '未自动删除锁定文件：无法确认没有其他 Git 操作正在运行'
+      });
     } catch (error) {
       logger.error('清理锁定文件失败:', error)
       res.status(500).json({
@@ -1371,6 +1362,12 @@ export function registerGitOpsRoutes({
   app.post('/api/git-init', async (req, res) => {
     try {
       const { stdout } = await execGitCommand(['init']);
+      // git init 成功后立即同步服务端 isGitRepo 标志。
+      // 否则该标志仍是启动时检测的 false,后续 /api/add-remote 等以
+      // getIsGitRepo() 做门禁的接口会误报"当前目录不是Git仓库"。
+      if (typeof setIsGitRepo === 'function') {
+        setIsGitRepo(true);
+      }
       res.json({ success: true, output: stdout.trim() });
     } catch (error) {
       logger.error('git init 失败:', error);

package/src/ui/server/routes/gitRepoFlagSync.test.js

@@ -0,0 +1,129 @@
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// src/ui/server/routes/gitOps.js isGitRepo 标志同步回归测试。
+//
+// 背景 bug:服务端 isGitRepo 是启动时一次性检测的变量。用户在非仓库目录
+// 点"初始化Git仓库"(或"初始化并添加远程")后,/api/git-init 真实创建了 .git,
+// 但标志没有同步,/api/add-remote 用 stale 的 getIsGitRepo() 做门禁,
+// 必然报"当前目录不是Git仓库"。
+//
+// 修复:git-init 成功后 setIsGitRepo(true)。
+// 本文件验证:
+//   1. git-init 成功 → setIsGitRepo(true) 被调用
+//   2. 同一实例内 init 后 add-remote 不再被误拦(完整回归场景)
+//   3. 未 init 的目录 add-remote 仍被正确拦截(门禁本身不回退)
+//   4. add-remote 成功路径正确执行 git remote add
+//
+// 测试不真起 Express,直接调 registerGitOpsRoutes 注入 mock app,
+// 触发最后一个注册的 handler(跳过 express.json() 等中间件)。
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { registerGitOpsRoutes } from './gitOps.js'
+
+/** 最小 express app mock:post(path, ...fns) 只保留最后一个 handler */
+function makeApp() {
+  const handlers = new Map()  // key = "METHOD path" → handler
+  return {
+    get(p, ...fns) { handlers.set(`GET ${p}`, fns[fns.length - 1]) },
+    post(p, ...fns) { handlers.set(`POST ${p}`, fns[fns.length - 1]) },
+    invoke(method, p, req = { body: {} }, res = makeRes()) {
+      const key = `${method} ${p}`
+      const handler = handlers.get(key)
+      assert.ok(handler, `no handler for ${key}`)
+      return handler(req, res, () => {})
+    }
+  }
+}
+function makeRes() {
+  return {
+    statusCode: 200,
+    payload: null,
+    status(c) { this.statusCode = c; return this },
+    json(p) { this.payload = p; return this }
+  }
+}
+
+/** 组装依赖:isGitRepo 是可变闭包变量,模拟服务端标志 */
+function setup({ initialRepo = false } = {}) {
+  const app = makeApp()
+  let isGitRepo = initialRepo
+  const gitCalls = []
+  registerGitOpsRoutes({
+    app,
+    execGitCommand: async (args) => {
+      gitCalls.push(args)
+      if (args[0] === 'init') isGitRepo = true  // git init 真实生效
+      return { stdout: '' }
+    },
+    configManager: { getLockedFiles: async () => [] },
+    execGitAddWithLockFilter: async () => ({}),
+    addCommandToHistory: () => {},
+    clearCommandHistory: () => {},
+    checkAndClearGitLock: async () => true,
+    getIsGitRepo: () => isGitRepo,
+    setIsGitRepo: (v) => { isGitRepo = v },
+    setRecentPushStatus: () => {}
+  })
+  return { app, gitCalls, getFlag: () => isGitRepo }
+}
+
+// ========== 回归:初始化后立即添加远程 ==========
+
+test('gitRepoFlagSync: git-init 成功后同步 setIsGitRepo(true)', async () => {
+  const { app, getFlag } = setup({ initialRepo: false })
+  const res = makeRes()
+  await app.invoke('POST', '/api/git-init', { body: {} }, res)
+  assert.equal(res.payload.success, true)
+  assert.equal(getFlag(), true, 'git-init 成功后服务端标志应立即翻为 true')
+})
+
+test('gitRepoFlagSync: 初始化后立即添加远程不再报"当前目录不是Git仓库"', async () => {
+  const { app, gitCalls } = setup({ initialRepo: false })
+  // 第一步:初始化(模拟"初始化并添加远程"按钮的第一步)
+  const initRes = makeRes()
+  await app.invoke('POST', '/api/git-init', { body: {} }, initRes)
+  assert.equal(initRes.payload.success, true)
+  // 第二步:添加远程(修复前此处被 stale 标志拦下)
+  const addRes = makeRes()
+  await app.invoke('POST', '/api/add-remote', {
+    body: { name: 'origin', url: 'git@gitee.com:flowdash/home2026.git' }
+  }, addRes)
+  assert.equal(addRes.payload.success, true,
+    `add-remote 应成功,实际: ${JSON.stringify(addRes.payload)}`)
+  assert.deepEqual(gitCalls[gitCalls.length - 1],
+    ['remote', 'add', 'origin', 'git@gitee.com:flowdash/home2026.git'])
+})
+
+test('gitRepoFlagSync: 未初始化时 add-remote 仍被门禁拦截', async () => {
+  const { app, gitCalls } = setup({ initialRepo: false })
+  const res = makeRes()
+  await app.invoke('POST', '/api/add-remote', {
+    body: { name: 'origin', url: 'git@gitee.com:flowdash/home2026.git' }
+  }, res)
+  assert.equal(res.payload.success, false)
+  assert.equal(res.payload.error, '当前目录不是Git仓库')
+  assert.equal(gitCalls.length, 0, '非 git 仓库不应执行任何 git 子命令')
+})
+
+test('gitRepoFlagSync: add-remote 正常路径执行 git remote add', async () => {
+  const { app, gitCalls } = setup({ initialRepo: true })
+  const res = makeRes()
+  await app.invoke('POST', '/api/add-remote', {
+    body: { name: 'origin', url: 'https://gitee.com/x/y.git' }
+  }, res)
+  assert.equal(res.payload.success, true)
+  assert.deepEqual(gitCalls[gitCalls.length - 1],
+    ['remote', 'add', 'origin', 'https://gitee.com/x/y.git'])
+})

package/src/ui/server/routes/workbench/agentSessionStore.js

@@ -1,173 +1,173 @@
-// Copyright 2026 xz333221
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// 智能体对话 session 持久化层。
-//
-// 与 ai-split-sessions 不同，这里存储的是完整 agent 对话（含工具调用）。
-// 消息格式兼容 OpenAI chat completions：
-//   - { role: 'system', content: string }
-//   - { role: 'user', content: string | content_parts[] }
-//   - { role: 'assistant', content: string|null, tool_calls?: [{id,type,function:{name,arguments}}] }
-//   - { role: 'tool', tool_call_id, name, content: string }
-//
-// 文件命名: {sessionId}.json，原子写(tmp + rename)。
-// 数据目录: ~/.zen-gitsync/agent-sessions/
-
-import fsp from 'fs/promises';
-import path from 'path';
-import { logger } from './shared.js';
-
-// 数据目录：与 ai-split-sessions 平级
-export const AGENT_SESSIONS_DIR = path.join(
-  path.dirname(path.dirname(path.dirname(path.dirname(new URL(import.meta.url).pathname.replace(/^\//, ''))))),
-  '.zen-gitsync',
-  'agent-sessions'
-);
-// 上面路径在 Windows 下不可靠，改用 os.homedir
-import os from 'os';
-export const AGENT_SESSIONS_DIR_FIXED = path.join(os.homedir(), '.zen-gitsync', 'agent-sessions');
-
-export const MAX_AGENT_SESSIONS = 200;
-export const AGENT_SESSIONS_KEEP = 100;
-
-// 16 字符: 时间戳后 8 位 + 随机 8 位 base36
-export function genAgentSessionId() {
-  return `ag-${Date.now().toString(36).slice(-8)}-${Math.random().toString(36).slice(2, 10)}`;
-}
-
-// 从第一条 user 消息自动生成标题
-export function autoTitle(messages) {
-  for (const m of messages) {
-    if (m.role === 'user') {
-      let text = '';
-      if (typeof m.content === 'string') {
-        text = m.content;
-      } else if (Array.isArray(m.content)) {
-        text = m.content.filter(p => p?.type === 'text').map(p => p.text).join(' ');
-      }
-      text = text.trim();
-      if (text) {
-        // 取第一行，截断到 40 字符
-        const firstLine = text.split('\n')[0].trim();
-        return firstLine.length > 40 ? firstLine.slice(0, 40) + '…' : firstLine;
-      }
-    }
-  }
-  return '(新会话)';
-}
-
-async function readAgentSessionFile(sessionId) {
-  if (!/^ag-[a-z0-9-]{4,32}$/i.test(sessionId)) {
-    const err = new Error('非法 sessionId'); err.statusCode = 400; throw err;
-  }
-  const file = path.join(AGENT_SESSIONS_DIR_FIXED, `${sessionId}.json`);
-  try {
-    return JSON.parse(await fsp.readFile(file, 'utf-8'));
-  } catch (err) {
-    if (err.code === 'ENOENT') {
-      const e = new Error('会话不存在'); e.statusCode = 404; throw e;
-    }
-    throw err;
-  }
-}
-
-async function writeAgentSessionFile(sessionId, data) {
-  await fsp.mkdir(AGENT_SESSIONS_DIR_FIXED, { recursive: true });
-  const file = path.join(AGENT_SESSIONS_DIR_FIXED, `${sessionId}.json`);
-  const tmp = `${file}.tmp.${process.pid}.${Date.now()}`;
-  await fsp.writeFile(tmp, JSON.stringify(data, null, 2), 'utf-8');
-  await fsp.rename(tmp, file);
-}
-
-async function deleteAgentSessionFile(sessionId) {
-  if (!/^ag-[a-z0-9-]{4,32}$/i.test(sessionId)) {
-    const err = new Error('非法 sessionId'); err.statusCode = 400; throw err;
-  }
-  const file = path.join(AGENT_SESSIONS_DIR_FIXED, `${sessionId}.json`);
-  try {
-    await fsp.unlink(file);
-  } catch (err) {
-    if (err.code === 'ENOENT') {
-      const e = new Error('会话不存在'); e.statusCode = 404; throw e;
-    }
-    throw err;
-  }
-}
-
-// 列表只读 metadata
-async function listAgentSessionsMeta() {
-  await fsp.mkdir(AGENT_SESSIONS_DIR_FIXED, { recursive: true });
-  const files = await fsp.readdir(AGENT_SESSIONS_DIR_FIXED);
-  const list = [];
-  for (const f of files) {
-    if (!f.endsWith('.json')) continue;
-    const sid = f.slice(0, -5);
-    try {
-      const file = path.join(AGENT_SESSIONS_DIR_FIXED, f);
-      const stat = await fsp.stat(file);
-      const data = JSON.parse(await fsp.readFile(file, 'utf-8'));
-      list.push({
-        sessionId: data.sessionId || sid,
-        title: data.title || '(无标题)',
-        source: data.source || 'web',  // 'web' | 'cli'
-        cwd: data.cwd || '',
-        model: data.model || '',
-        createdAt: data.createdAt || '',
-        updatedAt: data.updatedAt || '',
-        messageCount: Array.isArray(data.messages) ? data.messages.length : 0,
-        size: stat.size
-      });
-    } catch { /* 跳过坏文件 */ }
-  }
-  list.sort((a, b) => (b.updatedAt || '').localeCompare(a.updatedAt || ''));
-  return list;
-}
-
-async function enforceAgentSessionsRetention() {
-  const files = await fsp.readdir(AGENT_SESSIONS_DIR_FIXED).catch(() => []);
-  const jsonFiles = files.filter(f => f.endsWith('.json'));
-  if (jsonFiles.length < MAX_AGENT_SESSIONS) return;
-  const stats = await Promise.all(jsonFiles.map(async f => {
-    const full = path.join(AGENT_SESSIONS_DIR_FIXED, f);
-    const s = await fsp.stat(full);
-    return { file: full, mtime: s.mtimeMs };
-  }));
-  stats.sort((a, b) => b.mtime - a.mtime);
-  const toDelete = stats.slice(AGENT_SESSIONS_KEEP);
-  await Promise.all(toDelete.map(s => fsp.unlink(s.file).catch(() => {})));
-  if (toDelete.length > 0) {
-    logger.info(`[agent] sessions: cleaned up ${toDelete.length} old files`);
-  }
-}
-
-// 更新会话标题
-async function renameAgentSession(sessionId, title) {
-  const data = await readAgentSessionFile(sessionId);
-  data.title = String(title || '').trim() || '(无标题)';
-  data.updatedAt = new Date().toISOString();
-  await writeAgentSessionFile(sessionId, data);
-  return data;
-}
-
-export const agentSessionStore = {
-  genSessionId: genAgentSessionId,
-  autoTitle,
-  read: readAgentSessionFile,
-  write: writeAgentSessionFile,
-  delete: deleteAgentSessionFile,
-  listMeta: listAgentSessionsMeta,
-  enforceRetention: enforceAgentSessionsRetention,
-  rename: renameAgentSession,
-  DIR: AGENT_SESSIONS_DIR_FIXED,
-};
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// 智能体对话 session 持久化层。
+//
+// 与 ai-split-sessions 不同，这里存储的是完整 agent 对话（含工具调用）。
+// 消息格式兼容 OpenAI chat completions：
+//   - { role: 'system', content: string }
+//   - { role: 'user', content: string | content_parts[] }
+//   - { role: 'assistant', content: string|null, tool_calls?: [{id,type,function:{name,arguments}}] }
+//   - { role: 'tool', tool_call_id, name, content: string }
+//
+// 文件命名: {sessionId}.json，原子写(tmp + rename)。
+// 数据目录: ~/.zen-gitsync/agent-sessions/
+
+import fsp from 'fs/promises';
+import path from 'path';
+import { logger } from './shared.js';
+
+// 数据目录：与 ai-split-sessions 平级
+export const AGENT_SESSIONS_DIR = path.join(
+  path.dirname(path.dirname(path.dirname(path.dirname(new URL(import.meta.url).pathname.replace(/^\//, ''))))),
+  '.zen-gitsync',
+  'agent-sessions'
+);
+// 上面路径在 Windows 下不可靠，改用 os.homedir
+import os from 'os';
+export const AGENT_SESSIONS_DIR_FIXED = path.join(os.homedir(), '.zen-gitsync', 'agent-sessions');
+
+export const MAX_AGENT_SESSIONS = 200;
+export const AGENT_SESSIONS_KEEP = 100;
+
+// 16 字符: 时间戳后 8 位 + 随机 8 位 base36
+export function genAgentSessionId() {
+  return `ag-${Date.now().toString(36).slice(-8)}-${Math.random().toString(36).slice(2, 10)}`;
+}
+
+// 从第一条 user 消息自动生成标题
+export function autoTitle(messages) {
+  for (const m of messages) {
+    if (m.role === 'user') {
+      let text = '';
+      if (typeof m.content === 'string') {
+        text = m.content;
+      } else if (Array.isArray(m.content)) {
+        text = m.content.filter(p => p?.type === 'text').map(p => p.text).join(' ');
+      }
+      text = text.trim();
+      if (text) {
+        // 取第一行，截断到 40 字符
+        const firstLine = text.split('\n')[0].trim();
+        return firstLine.length > 40 ? firstLine.slice(0, 40) + '…' : firstLine;
+      }
+    }
+  }
+  return '(新会话)';
+}
+
+async function readAgentSessionFile(sessionId) {
+  if (!/^ag-[a-z0-9-]{4,32}$/i.test(sessionId)) {
+    const err = new Error('非法 sessionId'); err.statusCode = 400; throw err;
+  }
+  const file = path.join(AGENT_SESSIONS_DIR_FIXED, `${sessionId}.json`);
+  try {
+    return JSON.parse(await fsp.readFile(file, 'utf-8'));
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      const e = new Error('会话不存在'); e.statusCode = 404; throw e;
+    }
+    throw err;
+  }
+}
+
+async function writeAgentSessionFile(sessionId, data) {
+  await fsp.mkdir(AGENT_SESSIONS_DIR_FIXED, { recursive: true });
+  const file = path.join(AGENT_SESSIONS_DIR_FIXED, `${sessionId}.json`);
+  const tmp = `${file}.tmp.${process.pid}.${Date.now()}`;
+  await fsp.writeFile(tmp, JSON.stringify(data, null, 2), 'utf-8');
+  await fsp.rename(tmp, file);
+}
+
+async function deleteAgentSessionFile(sessionId) {
+  if (!/^ag-[a-z0-9-]{4,32}$/i.test(sessionId)) {
+    const err = new Error('非法 sessionId'); err.statusCode = 400; throw err;
+  }
+  const file = path.join(AGENT_SESSIONS_DIR_FIXED, `${sessionId}.json`);
+  try {
+    await fsp.unlink(file);
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      const e = new Error('会话不存在'); e.statusCode = 404; throw e;
+    }
+    throw err;
+  }
+}
+
+// 列表只读 metadata
+async function listAgentSessionsMeta() {
+  await fsp.mkdir(AGENT_SESSIONS_DIR_FIXED, { recursive: true });
+  const files = await fsp.readdir(AGENT_SESSIONS_DIR_FIXED);
+  const list = [];
+  for (const f of files) {
+    if (!f.endsWith('.json')) continue;
+    const sid = f.slice(0, -5);
+    try {
+      const file = path.join(AGENT_SESSIONS_DIR_FIXED, f);
+      const stat = await fsp.stat(file);
+      const data = JSON.parse(await fsp.readFile(file, 'utf-8'));
+      list.push({
+        sessionId: data.sessionId || sid,
+        title: data.title || '(无标题)',
+        source: data.source || 'web',  // 'web' | 'cli'
+        cwd: data.cwd || '',
+        model: data.model || '',
+        createdAt: data.createdAt || '',
+        updatedAt: data.updatedAt || '',
+        messageCount: Array.isArray(data.messages) ? data.messages.length : 0,
+        size: stat.size
+      });
+    } catch { /* 跳过坏文件 */ }
+  }
+  list.sort((a, b) => (b.updatedAt || '').localeCompare(a.updatedAt || ''));
+  return list;
+}
+
+async function enforceAgentSessionsRetention() {
+  const files = await fsp.readdir(AGENT_SESSIONS_DIR_FIXED).catch(() => []);
+  const jsonFiles = files.filter(f => f.endsWith('.json'));
+  if (jsonFiles.length < MAX_AGENT_SESSIONS) return;
+  const stats = await Promise.all(jsonFiles.map(async f => {
+    const full = path.join(AGENT_SESSIONS_DIR_FIXED, f);
+    const s = await fsp.stat(full);
+    return { file: full, mtime: s.mtimeMs };
+  }));
+  stats.sort((a, b) => b.mtime - a.mtime);
+  const toDelete = stats.slice(AGENT_SESSIONS_KEEP);
+  await Promise.all(toDelete.map(s => fsp.unlink(s.file).catch(() => {})));
+  if (toDelete.length > 0) {
+    logger.info(`[agent] sessions: cleaned up ${toDelete.length} old files`);
+  }
+}
+
+// 更新会话标题
+async function renameAgentSession(sessionId, title) {
+  const data = await readAgentSessionFile(sessionId);
+  data.title = String(title || '').trim() || '(无标题)';
+  data.updatedAt = new Date().toISOString();
+  await writeAgentSessionFile(sessionId, data);
+  return data;
+}
+
+export const agentSessionStore = {
+  genSessionId: genAgentSessionId,
+  autoTitle,
+  read: readAgentSessionFile,
+  write: writeAgentSessionFile,
+  delete: deleteAgentSessionFile,
+  listMeta: listAgentSessionsMeta,
+  enforceRetention: enforceAgentSessionsRetention,
+  rename: renameAgentSession,
+  DIR: AGENT_SESSIONS_DIR_FIXED,
+};

package/src/ui/server/utils/instanceRegistry.js

@@ -139,19 +139,46 @@ export function createInstanceRegistry({
     }
   }
 
-  // 读单个 entry 文件。失败/不存在时返回 null。
+  // 读单个 entry 文件。返回值三种：
+  //   { entry }        → 解析成功且为对象
+  //   { corrupt: true }→ 文件存在但内容损坏（非合法 JSON / 非对象）
+  //   null             → 文件不存在或读取失败（IO 错误，不动文件）
+  //
+  // 损坏来源（Windows 实测）：进程被强杀 / 断电时文件长度已扩展但数据未落盘，
+  // 留下全 \x00 的文件。这类文件永远解析失败，若不清理会永久堆积，
+  // 且每次 list()（监控轮询约 5 秒一次）都打一条 warn 刷屏。
   async function readEntry(pid) {
     const fp = entryFilePath(pid);
+    let raw;
     try {
-      const raw = await fsMod.readFile(fp, 'utf-8');
-      const parsed = JSON.parse(raw);
-      if (parsed && typeof parsed === 'object') return parsed;
-      return null;
+      raw = await fsMod.readFile(fp, 'utf-8');
     } catch (err) {
       if (err && (err.code === 'ENOENT' || err.code === 'ENOTDIR')) return null;
       logger.warn(`[instanceRegistry] 读 entry pid=${pid} 失败: ${err?.message || err}`);
       return null;
     }
+    try {
+      const parsed = JSON.parse(raw);
+      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+        return { entry: parsed };
+      }
+      return { corrupt: true };
+    } catch (err) {
+      logger.warn(`[instanceRegistry] entry pid=${pid} 内容损坏(非合法 JSON)，将被清理: ${err?.message || err}`);
+      return { corrupt: true };
+    }
+  }
+
+  // 尽力删除损坏的 entry 文件（失败不抛，只留 warn，下轮再试）
+  async function removeCorruptEntry(pid) {
+    try {
+      await fsMod.unlink(entryFilePath(pid));
+      logger.info(`[instanceRegistry] 已清理损坏的 entry 文件 pid=${pid}`);
+    } catch (err) {
+      if (err && err.code !== 'ENOENT') {
+        logger.warn(`[instanceRegistry] 清理损坏 entry pid=${pid} 失败: ${err?.message || err}`);
+      }
+    }
   }
 
   // 原子写单个 entry 文件：tmp + rename
@@ -189,7 +216,13 @@ export function createInstanceRegistry({
     for (const name of names) {
       if (!isEntryFileName(name)) continue;
       const pid = pidFromFileName(name);
-      const entry = await readEntry(pid);
+      const res = await readEntry(pid);
+      if (res && res.corrupt) {
+        // 损坏文件直接删掉，自愈，避免永久堆积 + 每 5 秒刷 warn
+        await removeCorruptEntry(pid);
+        continue;
+      }
+      const entry = res?.entry;
       if (entry && Number.isInteger(entry.pid)) {
         instances[String(entry.pid)] = entry;
       }
@@ -320,7 +353,12 @@ export function createInstanceRegistry({
       await ensureDir();
       await migrateLegacy();
 
-      const existing = await readEntry(pid);
+      const res = await readEntry(pid);
+      if (res && res.corrupt) {
+        // 损坏文件先清掉，按"条目丢失"走自愈重建
+        await removeCorruptEntry(pid);
+      }
+      const existing = res?.entry || null;
       let entry;
       if (!existing) {
         const canRebuild =