fix: 全仓库第二轮审计修复 - 四区域50项中等问题+5项严重

AI 网关 (15项):
- GeminiProvider 同步 SDK 改 asyncio.to_thread 非阻塞
- auth.py httpx.get 改异步 + JWKS 失败转 AuthenticationError
- CostTracker.record 接入 fallback 链（预算控制生效）
- multimodal_video Content-Length 异常保护
- SSE 错误信息脱敏 + 流式总体 300s 超时上限
- 限流改原子 INCR 消除 TOCTOU
- fallback 预算系数 1.5→3.0
- prompt_guard 跳过 base64/超长字段
- 流式首 token 探测仅超时重试 + 确定性错误直接切换
- KeyPool 多 Key 轮询接入请求路径
- 熔断器 HALF_OPEN 用 Condition 协调 + 指标接入
- 流式链 _FEATURE_CONTEXT 成功路径不清空

Electron (9项):
- db:batch 列名过滤 + 走 SqliteRepository 序列化
- Ollama baseUrl SSRF 防护（仅 localhost）
- MCP Bridge 请求 30s 超时
- import:parse-pdf 路径边界校验
- 停止录制等渲染确认再关流（修丢尾帧）
- 日志 30 天轮转 + 孤儿录制文件清理
- FTS 索引重建改异步 + 增量队列

前端 (21项):
- 番茄钟墙钟分支补 phase/completedCount/成就/珊瑚
- totalPausedMs 跨轮重置 + exitImmersive 补 pausedAt
- 入籍重试跳过已安放概念（幂等）
- 闪卡复习走 createWithLog 同步链路
- OfflineQueue 事务内原子版本号
- Profile blob URL revoke + 加密备份错误精准提示
- useAIBalance TimeoutError 分支
- SyncEngine 独立 paused 标志
- 导入备份重置 CRDT 引擎
- adaptiveEngine 清理 timer + AbortSignal
- conflictCount 快照重置 + 初始在线状态修正
- NetworkManager 延迟通知 + 引用计数心跳
- ClearDataSection 补连字符键 + 重置模式
- relearn 重置 cardStartTime + 进度语义修正

同步服务 (13项):
- Push 版本检查移入事务+行锁（TOCTOU）
- 增量查询 LIMIT 1000 + hasMore
- Redis TTL + SetDeviceOffline
- DB 连接池参数 + 优雅关闭 + 请求体 1MB 上限
- Operation 幂等唯一索引 + skipped
- 批量 push 单事务 + DB 错误日志化
- WS 查库异步化 + 连接数上限 + deviceID 白名单
- 广播携带 ServerSeqNo 统一游标语义

Author: Aparencia

client/electron/ai/ollama/config.ts

@@ -56,6 +56,43 @@ const DEFAULT_CONFIG: OllamaConfig = {
   registryMirror: '',
 };
 
+// ================================================================
+// baseUrl 安全校验（SSRF 防护）
+// ================================================================
+
+/**
+ * 校验 Ollama baseUrl — 仅允许本机回环地址，拒绝其他所有主机名/IP。
+ * 防止渲染进程把 baseUrl 指向内网或公网地址（SSRF 攻击面）。
+ * 允许：http://localhost:* / http://127.0.0.1:* / http://[::1]:*
+ * （含 WHATWG URL 规范化的 IPv4-mapped 形式 ::ffff:127.0.0.1）
+ * @returns 违规原因；null 表示通过 / Return block reason or null
+ */
+export function validateOllamaBaseUrl(rawUrl: string): string | null {
+  let parsed: URL;
+  try {
+    parsed = new URL(rawUrl);
+  } catch {
+    return 'URL 格式无效';
+  }
+  if (parsed.protocol !== 'http:') {
+    return '仅支持 http:// 协议';
+  }
+  // hostname 已去除 []，IPv6 形如 ::1，IPv4-mapped 形如 ::ffff:127.0.0.1
+  const host = parsed.hostname.toLowerCase().replace(/^\[|\]$/g, '');
+  const isLoopback =
+    host === 'localhost' ||
+    host === '127.0.0.1' ||
+    host === '::1' ||
+    host === '0:0:0:0:0:0:0:1' ||
+    // IPv4-mapped IPv6（::ffff:127.0.0.1）规范化后必须一并放行（仍指向本机）
+    host === '::ffff:127.0.0.1' ||
+    host === '::ffff:7f00:1';
+  if (!isLoopback) {
+    return '仅允许连接本机 Ollama 服务（localhost / 127.0.0.1 / [::1]）';
+  }
+  return null;
+}
+
 // ================================================================
 // 运行时状态
 // ================================================================
@@ -91,7 +128,9 @@ export async function loadOllamaConfig(): Promise<void> {
     const parsed = JSON.parse(raw);
     _config = {
       enabled: typeof parsed.enabled === 'boolean' ? parsed.enabled : DEFAULT_CONFIG.enabled,
+      // SEC: 持久化文件中的 baseUrl 同样校验——防止历史/被篡改配置绕过 SSRF 防护
       baseUrl: typeof parsed.baseUrl === 'string' && parsed.baseUrl.trim()
+        && validateOllamaBaseUrl(parsed.baseUrl.trim()) === null
         ? parsed.baseUrl.trim().replace(/\/$/, '')
         : DEFAULT_CONFIG.baseUrl,
       models: {
@@ -115,11 +154,19 @@ export async function loadOllamaConfig(): Promise<void> {
  */
 export async function updateOllamaConfig(partial: Partial<OllamaConfig>): Promise<OllamaConfig> {
   const current = getOllamaConfig();
+  // SEC: baseUrl SSRF 校验——仅允许本机回环地址，违规直接拒绝更新
+  let nextBaseUrl = current.baseUrl;
+  if (partial.baseUrl) {
+    const trimmed = partial.baseUrl.trim().replace(/\/$/, '');
+    const blockReason = validateOllamaBaseUrl(trimmed);
+    if (blockReason) {
+      throw new Error(`[Ollama] baseUrl 校验失败：${blockReason}`);
+    }
+    nextBaseUrl = trimmed;
+  }
   const updated: OllamaConfig = {
     enabled: partial.enabled ?? current.enabled,
-    baseUrl: partial.baseUrl
-      ? partial.baseUrl.trim().replace(/\/$/, '')
-      : current.baseUrl,
+    baseUrl: nextBaseUrl,
     models: {
       text: partial.models?.text ?? current.models.text,
       vision: partial.models?.vision ?? current.models.vision,

client/electron/db/dbIpcHandlers.ts

@@ -251,28 +251,38 @@ export function registerDbIpcHandlers(): void {
   });
 
   /** db:batch — 批量操作：事务执行 */
+  // SEC(M13): insert/update 分支先经 repo.filterAllowedColumns() 过滤非法列名，
+  // 再拼入 SQL（repo 内部统一使用 q() 包裹列名，防列名注入）
+  // SEC(M17): 直接调用 repo.create()/repo.update() 替代手写 SQL，
+  // JSON 字段会经 entityToRow 序列化、boolean 字段正确映射为 INTEGER 0/1
   safeHandle('db:batch', async (_event, params: { operations: Array<{ type: string; table: string; [key: string]: unknown }> }) => {
     const dbConn = getConnection();
 
     const txn = dbConn.transaction(() => {
       for (const op of params.operations) {
         const tableName = resolveTable(op.table as string);
         switch (op.type) {
-          case 'insert': {
+          // 'create' 为渲染进程 IpcStorageAdapter.bulkCreate 使用的类型名（兼容映射）
+          case 'insert':
+          case 'create': {
+            const repo = new SqliteRepository<SqliteRow>(tableName);
             const item = op.item as Record<string, unknown>;
-            const cols = Object.keys(item);
-            const placeholders = cols.map(() => '?').join(', ');
-            const sql = `INSERT INTO "${tableName}" (${cols.map((c) => `"${c}"`).join(', ')}) VALUES (${placeholders})`;
-            dbConn.prepare(sql).run(...Object.values(item));
+            const sanitized = repo.filterAllowedColumns(item);
+            if (Object.keys(sanitized).length === 0) {
+              throw new Error(`[DB] Batch insert has no allowed columns for table "${tableName}"`);
+            }
+            if (!sanitized.id) {
+              throw new Error(`[DB] Batch insert requires an "id" field for table "${tableName}"`);
+            }
+            repo.create(sanitized as Omit<SqliteRow, 'id'> & { id: string });
             break;
           }
           case 'update': {
+            const repo = new SqliteRepository<SqliteRow>(tableName);
             const changes = op.changes as Record<string, unknown>;
-            const entries = Object.entries(changes);
-            if (entries.length === 0) break;
-            const setClauses = entries.map(([col]) => `"${col}" = ?`).join(', ');
-            const sql = `UPDATE "${tableName}" SET ${setClauses} WHERE id = ?`;
-            dbConn.prepare(sql).run(...entries.map(([, v]) => v), op.id as string);
+            const sanitized = repo.filterAllowedColumns(changes);
+            if (Object.keys(sanitized).length === 0) break;
+            repo.update(op.id as string, sanitized);
             break;
           }
           case 'delete':

client/electron/db/fts5Search.ts

@@ -45,6 +45,50 @@ CREATE VIRTUAL TABLE IF NOT EXISTS fts_content USING fts5(
   tokenize='unicode61 remove_diacritics 2'
 );`;
 
+// ================================================================
+// 就绪状态与增量写入队列（M21）
+// ================================================================
+
+/**
+ * FTS 索引是否已就绪。启动时全量重建在 setTimeout 中异步执行，
+ * 完成前为 false——期间增量写入（indexDocument/removeDocument）
+ * 进入 pendingFtsOps 队列，待 setFtsIndexReady(true) 时统一 flush，
+ * 保证不丢索引也不阻塞业务写入。
+ */
+let ftsIndexReady = false;
+
+/** 重建完成前积压的增量索引操作 */
+const pendingFtsOps: Array<() => void> = [];
+
+/** 设置索引就绪状态；置 true 时 flush 积压队列 */
+export function setFtsIndexReady(ready: boolean): void {
+  ftsIndexReady = ready;
+  if (!ready) return;
+  const ops = pendingFtsOps.splice(0);
+  for (const op of ops) {
+    try {
+      op();
+    } catch (err) {
+      // 单个积压操作失败不阻塞其余 flush
+      logger.warn(`[FTS5] Flush queued index op failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+}
+
+/** 索引是否已就绪（重建完成） */
+export function isFtsIndexReady(): boolean {
+  return ftsIndexReady;
+}
+
+/** 就绪则立即执行，否则入队等待重建完成 */
+function whenFtsReady(op: () => void): void {
+  if (ftsIndexReady) {
+    op();
+  } else {
+    pendingFtsOps.push(op);
+  }
+}
+
 // ================================================================
 // 公共 API
 // ================================================================
@@ -55,19 +99,23 @@ export function initializeFTS(db: Database.Database): void {
   logger.info('[FTS5] Full-text search virtual table initialized');
 }
 
-/** 索引或更新一条文档（先删后插保证幂等） */
+/** 索引或更新一条文档（先删后插保证幂等；M21: 重建完成前入队延迟执行） */
 export function indexDocument(table: string, id: string, title: string, content: string): void {
-  const db = getConnection();
-  db.prepare(`DELETE FROM fts_content WHERE id = ? AND table_name = ?`).run(id, table);
-  db.prepare(`INSERT INTO fts_content (id, table_name, title, content) VALUES (?, ?, ?, ?)`)
-    .run(id, table, title, content);
+  whenFtsReady(() => {
+    const db = getConnection();
+    db.prepare(`DELETE FROM fts_content WHERE id = ? AND table_name = ?`).run(id, table);
+    db.prepare(`INSERT INTO fts_content (id, table_name, title, content) VALUES (?, ?, ?, ?)`)
+      .run(id, table, title, content);
+  });
 }
 
-/** 从全文索引中删除一条文档 */
+/** 从全文索引中删除一条文档（M21: 重建完成前入队延迟执行） */
 export function removeDocument(table: string, id: string): void {
-  getConnection()
-    .prepare(`DELETE FROM fts_content WHERE id = ? AND table_name = ?`)
-    .run(id, table);
+  whenFtsReady(() => {
+    getConnection()
+      .prepare(`DELETE FROM fts_content WHERE id = ? AND table_name = ?`)
+      .run(id, table);
+  });
 }
 
 /**

client/electron/importHandlers.ts

@@ -11,7 +11,7 @@
  * URLs are restricted to HTTP(S) with SSRF guard + 10s timeout. All
  * failures return Result objects so the UI can fall back to manual paste.
  */
-import { dialog } from 'electron';
+import { app, dialog } from 'electron';
 import * as path from 'path';
 import { readFile, stat } from 'fs/promises';
 import { randomUUID } from 'crypto';
@@ -203,6 +203,18 @@ export function registerImportHandlers(): void {
       filePath = picked.filePaths[0];
     } else {
       filePath = payload.filePath;
+      // SEC(M16): 路径边界检查——仅允许 userData 或 temp 目录下的文件
+      // （path.relative 方式参考 storageIpcHandlers.ts，防兄弟目录/穿越绕过）
+      const appDataPath = app.getPath('userData');
+      const tempPath = app.getPath('temp');
+      const resolvedPath = path.resolve(filePath);
+      const relToApp = path.relative(appDataPath, resolvedPath);
+      const relToTemp = path.relative(tempPath, resolvedPath);
+      const isInApp = !relToApp.startsWith('..') && !path.isAbsolute(relToApp);
+      const isInTemp = !relToTemp.startsWith('..') && !path.isAbsolute(relToTemp);
+      if (!isInApp && !isInTemp) {
+        return { success: false, error: '不允许读取该路径的文件' };
+      }
     }
 
     try {

client/electron/logger.ts

@@ -17,6 +17,36 @@ class Logger {
   private stream: fs.WriteStream | null = null;
   private initialized = false;
 
+  /**
+   * 清理超过 maxAgeMs 的过期日志文件（M19）
+   * 文件名格式 app-<ISO 时间戳>.log（如 app-2026-08-04T12-34-56-789Z.log），
+   * 解析其中的时间戳并删除早于保留期的文件；无法解析的文件跳过不删
+   */
+  private cleanupOldLogs(logsDir: string, maxAgeMs: number): void {
+    let removed = 0;
+    try {
+      const cutoff = Date.now() - maxAgeMs;
+      for (const file of fs.readdirSync(logsDir)) {
+        const m = file.match(/^app-(.+\.log)$/);
+        if (!m) continue;
+        // 还原 ISO 时间戳：2026-08-04T12-34-56-789Z → 2026-08-04T12:34:56.789Z
+        // （仅替换时间段的 -，日期部分的 - 保留，故从尾部锚定匹配）
+        const iso = m[1].replace(/(\d{2})-(\d{2})-(\d{2})-(\d{3})Z$/, '$1:$2:$3.$4Z');
+        const fileTime = new Date(iso).getTime();
+        if (Number.isNaN(fileTime)) continue; // 无法解析的文件名跳过
+        if (fileTime < cutoff) {
+          fs.unlinkSync(path.join(logsDir, file));
+          removed++;
+        }
+      }
+    } catch (err) {
+      console.error('[Logger] Failed to cleanup old log files:', err);
+    }
+    if (removed > 0) {
+      console.log(`[Logger] Cleaned up ${removed} log file(s) older than ${maxAgeMs / 86400000} days`);
+    }
+  }
+
   /** 初始化日志目录和文件流（异步，需在 app ready 后调用） */
   async initLogger(): Promise<void> {
     if (this.initialized) return;
@@ -26,6 +56,9 @@ class Logger {
       const logsDir = path.join(app.getPath('userData'), 'logs');
       await mkdir(logsDir, { recursive: true });
 
+      // M19: 日志轮转——启动时清理超过 30 天的历史日志文件
+      this.cleanupOldLogs(logsDir, 30 * 24 * 60 * 60 * 1000);
+
       const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
       const logFile = path.join(logsDir, `app-${timestamp}.log`);
       this.stream = fs.createWriteStream(logFile, { flags: 'a' });

client/electron/main.ts

@@ -30,7 +30,7 @@ import { mcpManager } from './mcpManager.js';
 import { registerMemoryServerConsentHandlers } from './memoryServerConsent.js';
 import { initialize, close as closeDb } from './db/sqliteService.js';
 import { initializeSchema } from './db/schema.js';
-import { initializeFTS, rebuildIndex, collectIndexableData } from './db/fts5Search.js';
+import { initializeFTS, rebuildIndex, collectIndexableData, setFtsIndexReady } from './db/fts5Search.js';
 import { resolveDbPath } from './db/storageConfig.js';
 import { registerMigrationHandlers } from './db/migration.js';
 import { registerImportHandlers } from './importHandlers.js';
@@ -165,9 +165,21 @@ if (!gotTheLock) {
     initializeFTS(sqliteDb);
     // 启动时构建存量索引——从 notes/flashcards/feynman_notes 等表读取已有数据，
     // 填充 FTS5 虚拟表，使搜索功能立即可用（而非等待用户触发增量更新）
-    const indexData = collectIndexableData(sqliteDb);
-    rebuildIndex(indexData);
-    logger.info(`[DB] SQLite initialized and schema ready (FTS5 enabled, ${indexData.reduce((sum, t) => sum + t.rows.length, 0)} documents indexed)`);
+    // M21: 全量重建放入 setTimeout 异步执行，不阻塞启动关键路径（窗口创建等）；
+    // 期间增量索引写入（indexDocument/removeDocument）自动进入队列，
+    // 重建完成后由 setFtsIndexReady(true) 统一 flush，不丢索引
+    setTimeout(() => {
+      try {
+        const indexData = collectIndexableData(sqliteDb);
+        rebuildIndex(indexData);
+        logger.info(`[DB] FTS5 index rebuilt: ${indexData.reduce((sum, t) => sum + t.rows.length, 0)} documents indexed`);
+      } catch (err) {
+        logger.warn(`[FTS5] Startup index rebuild failed (non-fatal): ${err instanceof Error ? err.message : String(err)}`);
+      } finally {
+        setFtsIndexReady(true);
+      }
+    }, 0);
+    logger.info('[DB] SQLite initialized and schema ready (FTS5 enabled)');
 
     // v1.0.0: 注册数据迁移 IPC handlers（IndexedDB → SQLite）
     registerMigrationHandlers(safeHandle);

client/electron/mcpManager.ts

@@ -28,6 +28,13 @@ import {
   type BridgeRequest, type BridgeResponse, type McpToolInfo, type ServerName,
 } from './mcpEnv.js';
 
+// ================================================================
+// 常量
+// ================================================================
+
+/** 单次请求超时（ms）——bridge 无响应时拒绝并清理 pending，防请求悬挂 */
+const REQUEST_TIMEOUT_MS = 30_000;
+
 // ================================================================
 // 管理器
 // ================================================================
@@ -190,6 +197,8 @@ class McpManager {
 
   /**
    * 向 bridge 发送请求并等待响应
+   * SEC(M15): 30s 超时兜底——bridge 挂起/失联时拒绝请求并清理 pending 条目，
+   * 避免调用方（渲染进程 await）无限悬挂
    */
   private sendRequest(method: BridgeRequest['method'], params: Record<string, unknown>): Promise<unknown> {
     return new Promise((resolve, reject) => {
@@ -201,11 +210,29 @@ class McpManager {
       const id = `req_${++this.requestCounter}`;
       const request: BridgeRequest = { id, method, params };
 
-      this.pending.set(id, { resolve, reject });
+      // 超时定时器：resolve/reject 任意路径都会通过包装函数清理
+      const timeoutId = setTimeout(() => {
+        if (this.pending.has(id)) {
+          this.pending.delete(id);
+          reject(new Error(`[MCP] Request ${id} (${method}) timed out after ${REQUEST_TIMEOUT_MS}ms`));
+        }
+      }, REQUEST_TIMEOUT_MS);
+
+      this.pending.set(id, {
+        resolve: (value: unknown) => {
+          clearTimeout(timeoutId);
+          resolve(value);
+        },
+        reject: (reason: Error) => {
+          clearTimeout(timeoutId);
+          reject(reason);
+        },
+      });
 
       this.bridge.send(request, (err) => {
         if (err) {
           this.pending.delete(id);
+          clearTimeout(timeoutId);
           reject(new Error(`Failed to send request: ${err.message}`));
         }
       });

client/electron/mediaCaptureHandlers.ts

@@ -12,7 +12,7 @@ import { AudioCapture, listAudioSources } from './audioCapture.js';
 import { listMicrophoneDevices } from './audio/microphoneProvider.js';
 import type { AudioCaptureOptions, AudioChunk } from './audioCapture.js';
 import type { AudioSourcePreference } from '../src/lib/capture/audioSourceStrategy.js';
-import { VideoRecorder } from './videoRecorder.js';
+import { VideoRecorder, cleanupOrphanRecordings } from './videoRecorder.js';
 import type { VideoRecordOptions } from './videoRecorder.js';
 import { safeHandle, getMainWindowId } from './ipcUtils.js';
 import { logger } from './logger.js';
@@ -45,6 +45,10 @@ function verifySender(senderId: number, channel: string): boolean {
  * 注册音频捕获与视频录制相关的 IPC handler
  */
 export function registerMediaCaptureHandlers(): void {
+  // ---- 启动清理（M20）----
+  // 崩溃/强杀残留的孤儿录制文件在注册时回收（仅清 24h 前的），防临时目录堆积
+  cleanupOrphanRecordings();
+
   // ---- 系统音频捕获 ----
 
   safeHandle('audio_list_sources', async () => {