feat: 升级至 v0.3.16 — 工单修复 51 项 + 审查修复 30 项（安全加固/适配器/工具系统/数据层/前端）
This commit is contained in:
@@ -270,62 +270,78 @@ export class DatabaseService {
|
||||
}
|
||||
};
|
||||
|
||||
// 迁移 1: messages 表添加 attachments 列
|
||||
tryAddColumn('messages', 'attachments', 'TEXT', 'attachments');
|
||||
// 迁移 2: audit_logs 表添加 iteration 列
|
||||
tryAddColumn('audit_logs', 'iteration', 'INTEGER', 'iteration');
|
||||
// v0.2.0 迁移 3: audit_logs 表添加 prev_hash 列（链式哈希）
|
||||
tryAddColumn('audit_logs', 'prev_hash', 'TEXT', 'prev_hash');
|
||||
// v0.2.0 迁移 4: audit_logs 表添加 current_hash 列（链式哈希）
|
||||
tryAddColumn('audit_logs', 'current_hash', 'TEXT', 'current_hash');
|
||||
// #33 修复: 整个迁移批次包裹在事务中，保证原子性
|
||||
// 若某个 migration 部分失败（如 ALTER TABLE 成功，CREATE INDEX 失败），
|
||||
// 事务回滚，数据库不会处于部分变更的不一致状态，下次启动可安全重试。
|
||||
// better-sqlite3 的事务是同步原子的，嵌套事务使用 SAVEPOINT 实现。
|
||||
const runAllMigrations = db.transaction(() => {
|
||||
// 迁移 1: messages 表添加 attachments 列
|
||||
tryAddColumn('messages', 'attachments', 'TEXT', 'attachments');
|
||||
// 迁移 2: audit_logs 表添加 iteration 列
|
||||
tryAddColumn('audit_logs', 'iteration', 'INTEGER', 'iteration');
|
||||
// v0.2.0 迁移 3: audit_logs 表添加 prev_hash 列（链式哈希）
|
||||
tryAddColumn('audit_logs', 'prev_hash', 'TEXT', 'prev_hash');
|
||||
// v0.2.0 迁移 4: audit_logs 表添加 current_hash 列（链式哈希）
|
||||
tryAddColumn('audit_logs', 'current_hash', 'TEXT', 'current_hash');
|
||||
|
||||
// C-6 修复 迁移 5: 重建 messages 表，将 content 列从 NOT NULL 改为允许 NULL
|
||||
// @see project_memory.md — Assistant messages with tool_calls must set content to null
|
||||
// SQLite 不支持 ALTER COLUMN，需要重建表
|
||||
try {
|
||||
// 检测 content 列是否有 NOT NULL 约束
|
||||
const columns = db.prepare('PRAGMA table_info(messages)').all() as Array<{ name: string; notnull: number }>;
|
||||
const contentCol = columns.find((c) => c.name === 'content');
|
||||
if (contentCol && contentCol.notnull === 1) {
|
||||
log.info('[DB] Migration: rebuilding messages table to allow NULL content');
|
||||
// C-6 修复 迁移 5: 重建 messages 表，将 content 列从 NOT NULL 改为允许 NULL
|
||||
// @see project_memory.md — Assistant messages with tool_calls must set content to null
|
||||
// SQLite 不支持 ALTER COLUMN，需要重建表
|
||||
try {
|
||||
// 检测 content 列是否有 NOT NULL 约束
|
||||
const columns = db.prepare('PRAGMA table_info(messages)').all() as Array<{ name: string; notnull: number }>;
|
||||
const contentCol = columns.find((c) => c.name === 'content');
|
||||
if (contentCol && contentCol.notnull === 1) {
|
||||
log.info('[DB] Migration: rebuilding messages table to allow NULL content');
|
||||
|
||||
db.exec(`
|
||||
CREATE TABLE IF NOT EXISTS messages_new (
|
||||
id TEXT PRIMARY KEY,
|
||||
session_id TEXT NOT NULL,
|
||||
role TEXT NOT NULL CHECK(role IN ('user', 'assistant', 'system', 'tool')),
|
||||
content TEXT,
|
||||
reasoning_content TEXT,
|
||||
tool_calls TEXT,
|
||||
tool_result TEXT,
|
||||
attachments TEXT,
|
||||
iteration INTEGER,
|
||||
created_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000),
|
||||
FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE
|
||||
);
|
||||
// #33 修复: 重建表的多步骤包裹在嵌套事务中，部分失败时回滚
|
||||
// 避免 CREATE messages_new 成功但 DROP/RENAME 失败导致数据丢失或 schema 不一致
|
||||
const rebuildMessages = db.transaction(() => {
|
||||
db.exec(`
|
||||
CREATE TABLE IF NOT EXISTS messages_new (
|
||||
id TEXT PRIMARY KEY,
|
||||
session_id TEXT NOT NULL,
|
||||
role TEXT NOT NULL CHECK(role IN ('user', 'assistant', 'system', 'tool')),
|
||||
content TEXT,
|
||||
reasoning_content TEXT,
|
||||
tool_calls TEXT,
|
||||
tool_result TEXT,
|
||||
attachments TEXT,
|
||||
iteration INTEGER,
|
||||
created_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000),
|
||||
FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE
|
||||
);
|
||||
|
||||
INSERT INTO messages_new (id, session_id, role, content, reasoning_content, tool_calls, tool_result, attachments, iteration, created_at)
|
||||
SELECT id, session_id, role, content, reasoning_content, tool_calls, tool_result, attachments, iteration, created_at
|
||||
FROM messages;
|
||||
INSERT INTO messages_new (id, session_id, role, content, reasoning_content, tool_calls, tool_result, attachments, iteration, created_at)
|
||||
SELECT id, session_id, role, content, reasoning_content, tool_calls, tool_result, attachments, iteration, created_at
|
||||
FROM messages;
|
||||
|
||||
DROP TABLE messages;
|
||||
ALTER TABLE messages_new RENAME TO messages;
|
||||
`);
|
||||
DROP TABLE messages;
|
||||
ALTER TABLE messages_new RENAME TO messages;
|
||||
`);
|
||||
|
||||
// 重建索引
|
||||
db.exec(`
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_session ON messages(session_id, created_at);
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_role ON messages(role);
|
||||
`);
|
||||
// 重建索引
|
||||
// #42 确认: idx_messages_session 已是 (session_id, created_at) 复合索引，
|
||||
// 覆盖 getMessages 的 WHERE session_id = ? ORDER BY created_at ASC 查询，
|
||||
// 工单描述"仅有 session_id 单字段索引"不准确，无需额外添加 idx_messages_session_timestamp
|
||||
db.exec(`
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_session ON messages(session_id, created_at);
|
||||
CREATE INDEX IF NOT EXISTS idx_messages_role ON messages(role);
|
||||
`);
|
||||
});
|
||||
rebuildMessages();
|
||||
|
||||
log.info('[DB] Migration: messages table rebuilt successfully (content now allows NULL)');
|
||||
log.info('[DB] Migration: messages table rebuilt successfully (content now allows NULL)');
|
||||
}
|
||||
} catch (error) {
|
||||
// L-8 修复: 使用 toErrorMessage 替代重复的三元表达式
|
||||
const msg = toErrorMessage(error);
|
||||
log.warn(`[DB] Migration 5 (messages content NULL) skipped: ${msg}`);
|
||||
// 非致命错误 — 如果迁移失败，NOT NULL 约束仍生效，saveMessage 会保存空字符串
|
||||
}
|
||||
} catch (error) {
|
||||
// L-8 修复: 使用 toErrorMessage 替代重复的三元表达式
|
||||
const msg = toErrorMessage(error);
|
||||
log.warn(`[DB] Migration 5 (messages content NULL) skipped: ${msg}`);
|
||||
// 非致命错误 — 如果迁移失败，NOT NULL 约束仍生效，saveMessage 会保存空字符串
|
||||
}
|
||||
});
|
||||
|
||||
runAllMigrations();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user