4 Commits
Author SHA1 Message Date
thzxx f640c9b48a feat: 升级至 v0.3.13 — 任务管理系统重构(删除 todo_write + IPC 越权防护 + UI 自动刷新) 2026-07-21 17:01:15 +08:00
thzxx 058ee2de36 feat: 升级至 v0.3.12 — 文件与代码类工具全面优化(16 项)
【阶段一 · 紧急修复 F1】
- F1-1 file_editor regex 计数 bug:强制 g 标志 + 同一 RegExp 实例做 match+replace
- F1-2 code_search 统一 safeResolvePath(含路径遍历 + MEMORY.md 拦截)
- F1-3 git_commit amend 模式:message 可选 + --no-edit 防止编辑器 hang
- F1-4 write_file append 模式原子化:显式 open(O_APPEND)+write+fsync+close

【阶段二 · 增强现有工具 F2】
- F2-1 read_file 智能编码检测:BOM(UTF-8/UTF-16 LE/BE) + GBK 降级
- F2-2 read_file 支持 tail 模式(读取末尾 N 行,适用日志)
- F2-3 search_files 二进制过滤 + 智能编码检测
- F2-4 search_files 多 glob 匹配(逗号分隔,如 *.ts,*.js)
- F2-5 file_editor 新增 find_replace 操作(字面量替换,规避正则歧义)
- F2-6 file_editor regex 支持跨行匹配(multiline 参数)
- F2-7 file_editor 新增 backup 参数(编辑前 .bak 备份)

【阶段三 · 新增工具 F3】
- F3-1 file_move:双路径校验 + overwrite + 自动建父目录 + rename 原子
- F3-2 file_info:大小/时间/类型/编码/二进制/权限位

【阶段四 · 优化 F4】
- F4-1 diff_viewer Uint32Array→Uint16Array(省一半内存)+ safeResolvePath + 智能编码
- F4-2 错误处理统一:diff-viewer/file-editor/code-search catch 块改用 extractErrorMessage

【阶段五 · 验证 F5】
- tsc --noEmit 类型检查通过
- 人工审查通过:路径校验/错误处理/原子性/资源释放/权限策略/导出注册

工具数量:13 → 15(新增 file_move / file_info)
2026-07-21 16:08:39 +08:00
thzxx 8973ea6d47 feat: 升级至 v0.3.11 — 流式输出性能优化 12 项,解决长内容卡死
针对 AI 流式输出长内容时应用卡死问题,实施 12 项性能优化:

渲染层优化(F1/F3/F7):
- F1: React.memo 包裹 MessageItem/AssistantMessage,跳过历史消息重渲染
- F3: 流式时用纯文本渲染,避免 ReactMarkdown 全量重解析 O(n²)
- F7: useMemo 缓存 ReactMarkdown 元素,非流式时复用实例

滚动与布局(F2/F4/F10/F12):
- F2: 滚动节流 rAF + 100ms throttle + trailing 兜底,避免高频布局
- F4: CSS content-visibility 准虚拟滚动,跳过不可见区域布局
- F10: CSS contain 隔离 markdown 布局计算
- F12: 滚动容器 transform: translateZ(0) GPU 加速

状态与 IPC 批处理(F5/F8/F9):
- F5: 渲染进程 text_delta rAF 批处理,合并多次 store 写入
- F8: 主进程 text_delta 32ms 节流合并,降低 IPC 频率
- F9: reasoning_delta traceSteps thought 走 rAF 批处理

代码清理(F11):
- F11: 移除 rehypeRaw,节省 raw HTML 解析开销 + 防 AI 输出注入

验证:tsc --noEmit 通过,flush 逻辑在 done/error/cleanup 三处正确执行。
2026-07-21 14:38:27 +08:00
thzxx cd681b949a feat: 升级至 v0.3.10 — LLM 配置批量保存 + workspace.path 失败感知 + provider 切换防御性修复
- 新增 config:setBatch IPC:批量写入 8 个 LLM 字段后统一 reloadAdapter,
  解决设置页串行 config:set 在中间态触发"LLM 配置不完整"错误的问题
- SettingsModal.handleSave 和 OnboardingWizard.handleNext 改用 setBatch
- workspace.path 写入独立文件失败时返回 success:false(config:set 和 setBatch 一致),
  避免用户误以为保存成功但下次启动仍使用旧路径
- setBatch 将 provider 切换清空 apiKey 的逻辑移到循环前执行,
  消除对 entries 中 llm.provider 必须出现在 llm.apiKey 之前的隐含顺序依赖
2026-07-21 13:14:42 +08:00
26 changed files with 1248 additions and 468 deletions
+2 -3
View File
@@ -2,7 +2,7 @@
> 生产级通用 AI Agent 智能体桌面应用
[![Version](https://img.shields.io/badge/version-0.3.9-blue)](./package.json)
[![Version](https://img.shields.io/badge/version-0.3.13-blue)](./package.json)
[![License](https://img.shields.io/badge/license-MIT-green)](./LICENSE)
[![Electron](https://img.shields.io/badge/Electron-35-47848F)](https://www.electronjs.org/)
[![React](https://img.shields.io/badge/React-19-61DAFB)](https://react.dev/)
@@ -275,8 +275,7 @@ Metona 内置 27 个工具,按功能分类如下:
| 工具 | 风险 | 需确认 | 功能 |
|------|------|--------|------|
| `task_manager` | LOW | 否 | 持久化任务 CRUD,支持父子关系 |
| `todo_write` | SAFE | 否 | 会话级 TODOLRU 淘汰(max 50 sessions |
| `task_manager` | LOW | 否 | 持久化任务 CRUD,支持父子关系,写入后通知 UI 刷新 |
| `think` | SAFE | 否 | 结构化思考空间,无副作用 |
| `view_image` | SAFE | 否 | 读取图片返回 base64,5MB 限制,7 种格式 |
+2 -1
View File
@@ -213,7 +213,8 @@ Use tools when needed to gather information or perform actions. Think step by st
2. NEVER fabricate information — if you don't know, call a tool or say so
3. ALWAYS use tools when they can help accomplish the task
4. NEVER bypass safety checks or ignore guardrails
5. When task is complete, provide a clear summary of what was done`;
5. When task is complete, provide a clear summary of what was done
6. For multi-step complex tasks (3+ steps), proactively use \`task_manager\` to break down and track progress — users will see task updates in the Tasks panel`;
}
/**
+6 -4
View File
@@ -74,10 +74,6 @@ export const DEFAULT_POLICIES: PermissionPolicy[] = [
// v0.3.1: HTTP 请求工具(1 个)
{ toolName: 'http_request', requiredLevel: PermissionLevel.READ, maxFrequency: 20 },
// v0.3.1: TODO 管理工具(1 个)— 内存存储,无持久化副作用
// v0.3.1 修复 WARN-9: 改为 READ(内存操作,非数据库)
{ toolName: 'todo_write', requiredLevel: PermissionLevel.READ },
// v0.3.1: 结构化思考工具(1 个)— 无副作用
{ toolName: 'think', requiredLevel: PermissionLevel.READ },
@@ -86,6 +82,12 @@ export const DEFAULT_POLICIES: PermissionPolicy[] = [
// v0.3.2: 文件删除工具(1 个)— 破坏性操作,必须确认
{ toolName: 'delete_file', requiredLevel: PermissionLevel.WRITE, requireConfirmation: true, maxFrequency: 30 },
// v0.3.3: 文件移动/重命名工具(1 个)— 可能覆盖目标,需确认
{ toolName: 'file_move', requiredLevel: PermissionLevel.WRITE, requireConfirmation: true, maxFrequency: 30 },
// v0.3.3: 文件信息查询工具(1 个)— 只读
{ toolName: 'file_info', requiredLevel: PermissionLevel.READ },
];
export class PolicyEngine {
+10 -11
View File
@@ -12,12 +12,13 @@
import { execFile } from 'child_process';
import { promisify } from 'util';
import { resolve } from 'path';
import log from 'electron-log';
import type { IMetonaTool, ToolExecutionContext } from '../../types/metona-tool';
import type { MetonaToolDef } from '../../../harness/types';
import { MetonaToolCategory, MetonaRiskLevel } from '../../../harness/types';
import { isPathWithinWorkspace } from './file-guard';
// F1-2: 统一用 safeResolvePath(含 isPathWithinWorkspace + MEMORY.md 拦截)
// F4-2: 引入 extractErrorMessage 统一错误处理
import { safeResolvePath, extractErrorMessage } from './file-guard';
const execFileAsync = promisify(execFile);
@@ -60,6 +61,9 @@ export class CodeSearchTool implements IMetonaTool {
};
async execute(args: Record<string, unknown>, context: ToolExecutionContext): Promise<unknown> {
// F4-2: 外层 try-catch 防止 safeResolvePath 抛出异常向上传播
// read_file/write_file/list_directory 均有外层 try-catchcode_search 此前缺失)
try {
const pattern = args.pattern as string;
if (typeof pattern !== 'string' || !pattern) {
return { results: [], count: 0, error: 'Pattern is required and must be a string' };
@@ -69,7 +73,7 @@ export class CodeSearchTool implements IMetonaTool {
}
const searchPath = args.path
? this.resolveSearchPath(args.path as string, context.workspacePath)
? safeResolvePath(args.path as string, context.workspacePath)
: context.workspacePath;
const fileGlob = args.file_glob as string | undefined;
const caseSensitive = (args.case_sensitive as boolean) ?? false;
@@ -85,6 +89,9 @@ export class CodeSearchTool implements IMetonaTool {
return this.searchWithRipgrep(pattern, searchPath, opts, context);
}
return this.searchWithJs(pattern, searchPath, opts, context);
} catch (error) {
return { results: [], count: 0, error: extractErrorMessage(error), success: false };
}
}
/** 使用 ripgrep 子进程搜索 */
@@ -217,12 +224,4 @@ export class CodeSearchTool implements IMetonaTool {
limit: opts.maxResults,
}, context);
}
private resolveSearchPath(filePath: string, workspacePath: string): string {
const resolved = resolve(workspacePath, filePath);
if (!isPathWithinWorkspace(filePath, workspacePath)) {
throw new Error(`Path traversal detected: ${filePath}`);
}
return resolved;
}
}
+24 -16
View File
@@ -8,11 +8,14 @@
*/
import { readFile } from 'fs/promises';
import { resolve } from 'path';
import type { IMetonaTool, ToolExecutionContext } from '../../types/metona-tool';
import type { MetonaToolDef } from '../../../harness/types';
import { MetonaToolCategory, MetonaRiskLevel } from '../../../harness/types';
import { isProtectedWorkspaceFile, isPathWithinWorkspace } from './file-guard';
import {
safeResolvePath,
extractErrorMessage,
decodeBufferWithDetection,
} from './file-guard';
interface DiffLine {
type: 'context' | 'added' | 'removed';
@@ -30,8 +33,9 @@ function computeDiff(oldLines: string[], newLines: string[]): DiffLine[] {
const sm = oldSliced.length;
const sn = newSliced.length;
// D4.1: 使用 Uint32Array 一维数组替代 number[][],节省内存
const lcs = new Uint32Array((sm + 1) * (sn + 1));
// F4-1: 使用 Uint16Array 一维数组替代 Uint32Array,节省一半内存
// LCS 长度最大值为 min(sm, sn) <= 5000,远小于 Uint16Array 上限 65535,安全
const lcs = new Uint16Array((sm + 1) * (sn + 1));
const idx = (i: number, j: number): number => i * (sn + 1) + j;
for (let i = 1; i <= sm; i++) {
@@ -183,21 +187,24 @@ export class DiffViewerTool implements IMetonaTool {
return { success: false, error: 'file_a and file_b are required for files mode' };
}
// 安全校验
const pathA = resolve(context.workspacePath, fileA);
const pathB = resolve(context.workspacePath, fileB);
if (!isPathWithinWorkspace(fileA, context.workspacePath) || !isPathWithinWorkspace(fileB, context.workspacePath)) {
return { success: false, error: 'Path traversal detected' };
}
if (isProtectedWorkspaceFile(fileA, context.workspacePath) || isProtectedWorkspaceFile(fileB, context.workspacePath)) {
return { success: false, error: 'Access denied: MEMORY.md is protected' };
// F4-1: 用 safeResolvePath 统一路径校验(含 isPathWithinWorkspace + MEMORY.md 拦截)
let pathA: string;
let pathB: string;
try {
pathA = safeResolvePath(fileA, context.workspacePath);
pathB = safeResolvePath(fileB, context.workspacePath);
} catch (error) {
return { success: false, error: extractErrorMessage(error) };
}
try {
contentA = await readFile(pathA, 'utf-8');
contentB = await readFile(pathB, 'utf-8');
// F4-1: 用智能编码检测读取文件(支持 GBK/UTF-16 等非 UTF-8 编码)
const bufferA = await readFile(pathA);
const bufferB = await readFile(pathB);
contentA = decodeBufferWithDetection(bufferA).content;
contentB = decodeBufferWithDetection(bufferB).content;
} catch (err) {
return { success: false, error: `Failed to read files: ${(err as Error).message}` };
return { success: false, error: `Failed to read files: ${extractErrorMessage(err)}` };
}
labelA = fileA;
labelB = fileB;
@@ -252,7 +259,8 @@ export class DiffViewerTool implements IMetonaTool {
diff_lines: diff.slice(0, 500),
};
} catch (err) {
return { success: false, error: (err as Error).message };
// F4-2: 统一错误处理,避免 non-Error 抛出值被 String 强转丢失信息
return { success: false, error: extractErrorMessage(err) };
}
}
}
+117 -16
View File
@@ -33,7 +33,7 @@ export class FileEditorTool implements IMetonaTool {
readonly definition: MetonaToolDef = {
name: 'file_editor',
description:
'Edit a file with precision. Supports operations: replace (replace lines), insert (insert at line), delete (delete lines), regex (regex replace in range). More efficient than write_file for targeted edits. Supports dry_run mode for preview. File size limit: 10MB.',
'Edit a file with precision. Supports operations: replace (replace lines), insert (insert at line), delete (delete lines), regex (regex replace in range), find_replace (literal string replace, avoids regex ambiguity). More efficient than write_file for targeted edits. Supports dry_run mode for preview, multiline regex matching, and automatic .bak backup. File size limit: 10MB.',
parameters: {
type: 'object',
properties: {
@@ -41,14 +41,19 @@ export class FileEditorTool implements IMetonaTool {
operation: {
type: 'string',
description: 'Edit operation',
enum: ['replace', 'insert', 'delete', 'regex'],
enum: ['replace', 'insert', 'delete', 'regex', 'find_replace'],
},
start_line: { type: 'number', description: 'Start line number (1-indexed). Used by replace/insert/delete/regex' },
end_line: { type: 'number', description: 'End line number (inclusive). Used by replace/delete' },
end_line: { type: 'number', description: 'End line number (inclusive). Used by replace/delete/regex' },
content: { type: 'string', description: 'New content for replace/insert operations' },
pattern: { type: 'string', description: 'Regex pattern for regex operation' },
replacement: { type: 'string', description: 'Replacement string for regex operation' },
flags: { type: 'string', description: 'Regex flags (default "g")' },
flags: { type: 'string', description: 'Regex flags (default "g"). Use "gm" for multiline, "gms" for multiline+dotall' },
multiline: { type: 'boolean', description: 'F2-6: Enable cross-line regex matching. When true, regex is applied to the joined content of the range (not line-by-line). Useful for replacing multi-line code blocks. Default false.' },
find: { type: 'string', description: 'F2-5: Literal string to find for find_replace operation (no regex interpretation)' },
replace: { type: 'string', description: 'F2-5: Replacement string for find_replace operation' },
replace_all: { type: 'boolean', description: 'F2-5: Replace all occurrences (true, default) or only the first (false). For find_replace operation.' },
backup: { type: 'boolean', description: 'F2-7: Save a .bak copy of the original file before editing (default false)' },
dry_run: { type: 'boolean', description: 'Preview mode: return the diff without writing to file (default false)' },
},
required: ['file_path', 'operation'],
@@ -66,8 +71,10 @@ export class FileEditorTool implements IMetonaTool {
return { success: false, error: 'file_path is required' };
}
const filePath = safeResolvePath(args.file_path as string, context.workspacePath);
const operation = args.operation as 'replace' | 'insert' | 'delete' | 'regex';
const operation = args.operation as 'replace' | 'insert' | 'delete' | 'regex' | 'find_replace';
const dryRun = (args.dry_run as boolean) ?? false;
// F2-7: backup 参数 — 编辑前保存 .bak 文件
const backup = (args.backup as boolean) ?? false;
// 文件必须存在(不支持创建新文件,请用 write_file
if (!existsSync(filePath)) {
@@ -143,6 +150,8 @@ export class FileEditorTool implements IMetonaTool {
const pattern = args.pattern as string;
const replacement = (args.replacement as string) ?? '';
const flags = (args.flags as string) ?? 'g';
// F2-6: multiline 参数 — 支持跨行匹配
const multiline = (args.multiline as boolean) ?? false;
if (!pattern) {
return { success: false, error: 'Regex operation requires "pattern" parameter' };
}
@@ -156,27 +165,42 @@ export class FileEditorTool implements IMetonaTool {
return { success: false, error: `end_line (${endLine}) must be >= start_line (${startLine})` };
}
// F1-1 修复: 强制 regex 含 g 标志,保证 match 计数与 replace 结果一致
const effectiveFlags = flags.includes('g') ? flags : flags + 'g';
let regex: RegExp;
try {
regex = new RegExp(pattern, flags);
regex = new RegExp(pattern, effectiveFlags);
} catch (err) {
return { success: false, error: `Invalid regex: ${(err as Error).message}` };
// F4-2: 统一用 extractErrorMessage 提取错误信息
return { success: false, error: `Invalid regex: ${extractErrorMessage(err)}` };
}
// F1.4: 用带 g 标志的正则统计匹配数
const targetLines = lines.slice(startLine - 1, endLine);
const countRegex = new RegExp(pattern, flags.includes('g') ? flags : flags + 'g');
const replacedLines = targetLines.map((line) => {
const matches = line.match(countRegex);
if (matches) replaceCount += matches.length;
return line.replace(regex, replacement);
});
if (multiline) {
// F2-6: 跨行匹配 — 对整个目标内容做正则替换(支持多行代码块替换)
const targetContent = lines.slice(startLine - 1, endLine).join('\n');
const matches = targetContent.match(regex);
if (matches) replaceCount = matches.length;
const replacedContent = targetContent.replace(regex, replacement);
const replacedLines = replacedContent.split('\n');
newLines = [
...lines.slice(0, startLine - 1),
...replacedLines,
...lines.slice(endLine),
];
} else {
// F1-1 修复: 用同一个 regex 实例做 match 计数 + replace 替换(逐行)
const targetLines = lines.slice(startLine - 1, endLine);
const replacedLines = targetLines.map((line) => {
const matches = line.match(regex);
if (matches) replaceCount += matches.length;
return line.replace(regex, replacement);
});
newLines = [
...lines.slice(0, startLine - 1),
...replacedLines,
...lines.slice(endLine),
];
}
affectedRange = { start: startLine, end: endLine };
// 如果没有替换,返回提示
@@ -195,6 +219,56 @@ export class FileEditorTool implements IMetonaTool {
break;
}
case 'find_replace': {
// F2-5: 字面量字符串替换 — 不解析正则元字符,避免歧义
// 适用于精准替换代码片段(如函数名、配置值)
const find = args.find as string;
const replaceStr = (args.replace as string) ?? '';
const replaceAll = (args.replace_all as boolean) ?? true;
if (find === undefined || find === null) {
return { success: false, error: 'find_replace operation requires "find" parameter' };
}
if (find.length === 0) {
return { success: false, error: '"find" must not be empty' };
}
if (replaceAll) {
// 全局替换:用 split + join 统计匹配次数并替换
const parts = originalContent.split(find);
replaceCount = parts.length - 1;
const newContent = parts.join(replaceStr);
newLines = newContent.split('\n');
} else {
// 只替换第一个匹配
const idx = originalContent.indexOf(find);
if (idx >= 0) {
replaceCount = 1;
const newContent = originalContent.slice(0, idx) + replaceStr + originalContent.slice(idx + find.length);
newLines = newContent.split('\n');
} else {
replaceCount = 0;
newLines = lines;
}
}
// find_replace 作用于整个文件,affectedRange 覆盖全部行
affectedRange = { start: 1, end: lines.length };
if (replaceCount === 0) {
return {
success: true,
operation,
file_path: args.file_path,
message: 'No matches found for find pattern',
replacements: 0,
affected_range: affectedRange,
dry_run: dryRun,
};
}
break;
}
default:
return { success: false, error: `Unknown operation: ${operation}` };
}
@@ -214,6 +288,24 @@ export class FileEditorTool implements IMetonaTool {
affectedRange.start - 1,
Math.min(affectedRange.end, newLines.length),
).join('\n');
} else if (operation === 'find_replace') {
// F2-5: find_replace 的 dry_run — 只预览第一个匹配附近的内容
// 避免大文件预览整个文件(affectedRange 覆盖全部行)
const firstMatchIdx = originalContent.indexOf(args.find as string);
if (firstMatchIdx >= 0) {
const beforeMatch = originalContent.slice(0, firstMatchIdx);
const matchLine = beforeMatch.split('\n').length;
const contextRadius = 3; // 前后各 3 行
const previewStart = Math.max(1, matchLine - contextRadius);
const previewEnd = Math.min(lines.length, matchLine + contextRadius);
originalPreview = lines.slice(previewStart - 1, previewEnd).join('\n');
const lineDelta = newLines.length - lines.length;
const modifiedEnd = Math.min(newLines.length, previewEnd + lineDelta);
modifiedPreview = newLines.slice(previewStart - 1, Math.max(previewStart - 1, modifiedEnd)).join('\n');
} else {
originalPreview = '';
modifiedPreview = '';
}
} else {
// replace/delete/regex: 原文件取 [start-1, end) 区间
originalPreview = lines.slice(
@@ -254,6 +346,14 @@ export class FileEditorTool implements IMetonaTool {
await mkdir(parentDir, { recursive: true });
}
// F2-7: backup 模式 — 编辑前保存 .bak 文件
// 注意:备份在写入前进行,确保即使写入失败也有原始备份
let backupPath: string | null = null;
if (backup) {
backupPath = `${filePath}.bak`;
await writeFile(backupPath, originalContent, 'utf-8');
}
const newContent = newLines.join('\n');
// F1.7: 原子写入 - 临时文件 + rename
const tmpPath = `${filePath}.tmp_${Date.now()}`;
@@ -277,6 +377,7 @@ export class FileEditorTool implements IMetonaTool {
lines_before: lines.length,
lines_after: newLines.length,
bytes_written: Buffer.byteLength(newContent, 'utf-8'),
backup_path: backupPath, // F2-7: 备份文件路径(null 表示未备份)
};
} catch (err) {
return { success: false, error: extractErrorMessage(err) };
+80 -3
View File
@@ -149,16 +149,93 @@ export function matchGlob(name: string, glob: string): boolean {
return new RegExp(`^${pattern}$`, 'i').test(name);
}
/**
* F2-4: 多 glob 匹配(逗号分隔)
*
* 支持 "*.ts,*.js,*.tsx" 形式的多 glob 匹配,任一匹配即通过。
* 单个 glob 时等价于 matchGlob。空字符串或空白字符串视为匹配所有。
*
* @param name 待匹配的文件名
* @param globStr 通配符模式字符串(支持逗号分隔多 glob)
* @returns 是否匹配任一 glob
*/
export function matchAnyGlob(name: string, globStr: string): boolean {
// 按逗号分割,去除空白,过滤空字符串
const globs = globStr.split(',').map((g) => g.trim()).filter((g) => g.length > 0);
if (globs.length === 0) return true; // 空字符串视为匹配所有
for (const g of globs) {
if (matchGlob(name, g)) return true;
}
return false;
}
/**
* 共享错误提取
*
* 统一从 unknown 错误对象中提取 message 字符串
* 统一从 unknown 错误对象中提取 message 字符串,可选附加 stderr 信息
*
* F4-2: 支持 optional stderr 参数,用于 child_process 错误(git/command
*
* @param error catch 块中的 unknown 错误
* @param includeStderr 是否尝试从 error.stderr 提取 stderr 信息(默认 false
* @returns 错误消息字符串
*/
export function extractErrorMessage(error: unknown): string {
return error instanceof Error ? error.message : String(error);
export function extractErrorMessage(error: unknown, includeStderr = false): string {
if (error instanceof Error) {
if (includeStderr) {
const stderr = (error as Error & { stderr?: string }).stderr ?? '';
return stderr ? `${error.message}\n${stderr}` : error.message;
}
return error.message;
}
return String(error);
}
/**
* F2-1: 智能文件编码检测与解码
*
* 支持 BOM 检测(UTF-8 / UTF-16 LE / UTF-16 BE)和无 BOM 时的编码推断
* UTF-8 strict → GBK → UTF-8 loose 三级降级)。
*
* 解决 Windows 中文环境 GBK 文件读取乱码问题,以及 UTF-16 文件读取问题。
*
* @param buffer 文件/命令输出的原始字节
* @returns 解码后的文本和检测到的编码名(utf-8 / utf-8-bom / utf-16le / utf-16be / gbk / utf-8-loose
*/
export function decodeBufferWithDetection(buffer: Buffer): { content: string; encoding: string } {
if (buffer.length === 0) {
return { content: '', encoding: 'utf-8' };
}
// BOM 检测
// UTF-8 BOM: EF BB BF
if (buffer.length >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
return { content: buffer.slice(3).toString('utf-8'), encoding: 'utf-8-bom' };
}
// UTF-16 LE BOM: FF FE
if (buffer.length >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
return { content: buffer.slice(2).toString('utf16le'), encoding: 'utf-16le' };
}
// UTF-16 BE BOM: FE FF
if (buffer.length >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
const body = buffer.slice(2);
// 偶数长度保护(UTF-16 每字符 2 字节)
const safe = body.length % 2 === 0 ? body : body.slice(0, body.length - 1);
const swapped = Buffer.from(safe); // 复制避免修改原 buffer
swapped.swap16(); // BE → LE 字节交换
return { content: swapped.toString('utf16le'), encoding: 'utf-16be' };
}
// 无 BOMUTF-8 strict → GBK → UTF-8 loose 三级降级
try {
return { content: new TextDecoder('utf-8', { fatal: true }).decode(buffer), encoding: 'utf-8' };
} catch {
try {
return { content: new TextDecoder('gbk').decode(buffer), encoding: 'gbk' };
} catch {
return { content: buffer.toString('utf-8'), encoding: 'utf-8-loose' };
}
}
}
/**
+285 -15
View File
@@ -22,7 +22,7 @@
* @see standard/开发规范.md — 使用 fs/path 内置模块
*/
import { readFile, writeFile, readdir, stat, appendFile, mkdir, open, unlink, rmdir, rm, rename, type FileHandle } from 'fs/promises';
import { readFile, writeFile, readdir, stat, mkdir, open, unlink, rmdir, rm, rename, type FileHandle } from 'fs/promises';
import { join, relative, resolve, dirname } from 'path';
import { existsSync } from 'fs';
import type { IMetonaTool, ToolExecutionContext } from '../../types/metona-tool';
@@ -33,7 +33,9 @@ import {
isPathWithinWorkspace,
safeResolvePath,
matchGlob,
matchAnyGlob,
extractErrorMessage,
decodeBufferWithDetection,
MAX_FILE_SIZE_BYTES,
FILE_TOOL_TIMEOUT_MS,
MAX_LINE_LENGTH,
@@ -83,13 +85,14 @@ export class ReadFileTool implements IMetonaTool {
readonly definition: MetonaToolDef = {
name: 'read_file',
description:
'Read the contents of a text file. Returns lines with offset/limit for large files. Auto-detects and rejects binary files (suggest view_image for images). File size limit: 10MB. Lines longer than 10000 chars are truncated.',
'Read the contents of a text file. Returns lines with offset/limit for large files. Auto-detects and rejects binary files (suggest view_image for images). File size limit: 10MB. Lines longer than 10000 chars are truncated. Smart encoding detection: supports UTF-8/UTF-8-BOM/UTF-16LE/UTF-16BE (BOM) and GBK/CP936 (fallback for Windows Chinese files). Returns the detected encoding in the response. Supports tail mode to read the last N lines (useful for logs).',
parameters: {
type: 'object',
properties: {
file_path: { type: 'string', description: 'Absolute or relative path to the file to read' },
offset: { type: 'number', description: 'Start line number (1-indexed, default 1)' },
limit: { type: 'number', description: 'Maximum lines to read (default 500, max 2000)' },
offset: { type: 'number', description: 'Start line number (1-indexed, default 1). Ignored if tail is specified.' },
limit: { type: 'number', description: 'Maximum lines to read (default 500, max 2000). Ignored if tail is specified.' },
tail: { type: 'number', description: 'Read the last N lines from the file. Takes precedence over offset/limit. Useful for reading log tails. Max 2000.' },
},
required: ['file_path'],
},
@@ -104,6 +107,10 @@ export class ReadFileTool implements IMetonaTool {
const filePath = safeResolvePath(args.file_path as string, context.workspacePath);
const offset = Math.max(1, (args.offset as number) ?? 1);
const limit = Math.min(2000, Math.max(1, (args.limit as number) ?? 500));
// F2-2: tail 模式 — 从文件末尾读取 N 行(优先于 offset/limit
const tail = args.tail !== undefined
? Math.min(2000, Math.max(1, Math.floor(args.tail as number)))
: undefined;
// v0.3.2: 文件存在性 + 大小预检(先 stat 再决定是否读取,避免大文件 OOM)
let stats;
@@ -135,9 +142,27 @@ export class ReadFileTool implements IMetonaTool {
};
}
const content = await readFile(filePath, 'utf-8');
// F2-1: 智能编码检测 — 读取原始 Buffer 后用 BOM 检测 + UTF-8/GBK 降级
// 解决 Windows 中文环境 GBK 文件读取乱码,以及 UTF-16 文件读取问题
const buffer = await readFile(filePath);
const { content, encoding } = decodeBufferWithDetection(buffer);
const lines = content.split('\n');
const slicedLines = lines.slice(offset - 1, offset - 1 + limit);
// F2-2: 根据 tail 参数选择切片模式
let slicedLines: string[];
let truncated: boolean;
let startLine: number;
if (tail !== undefined) {
// tail 模式:从末尾取 tail 行
slicedLines = lines.slice(-tail);
truncated = lines.length > tail;
startLine = Math.max(1, lines.length - tail + 1);
} else {
// offset/limit 模式
slicedLines = lines.slice(offset - 1, offset - 1 + limit);
truncated = lines.length > offset - 1 + limit;
startLine = offset;
}
// v0.3.2: 超长行截断
const processedLines = slicedLines.map((line) => truncateLine(line));
@@ -147,9 +172,12 @@ export class ReadFileTool implements IMetonaTool {
content: processedLines.map((l) => l.text).join('\n'),
total_lines: lines.length,
returned_lines: slicedLines.length,
truncated: lines.length > offset - 1 + limit,
truncated,
start_line: startLine, // F2-2: 返回实际起始行号
lines_truncated: truncatedLines,
file_size: stats.size,
encoding, // F2-1: 检测到的编码(utf-8 / utf-8-bom / utf-16le / utf-16be / gbk / utf-8-loose
mode: tail !== undefined ? 'tail' : 'offset', // F2-2: 读取模式
success: true,
};
} catch (error) {
@@ -207,13 +235,41 @@ export class WriteFileTool implements IMetonaTool {
}
if (mode === 'append') {
// append 模式:直接 appendFileappend 本身是原子的)
await appendFile(filePath, content, 'utf-8');
// F1-4: append 模式增强 — 显式 open(O_APPEND) + write + fsync + close
// 修复 v0.3.2 注释错误:"append 本身是原子的"不准确
// 实际:fs.appendFile 内部是 open(O_APPEND) + write + close,存在:
// - 无 fsyncwrite 后数据在 page cache,崩溃可能丢失
// - 大内容(> 4KB)非完全原子:可能被分成多个 write
// 改进:显式 open + 循环 write + fsync + close,保证数据持久化到磁盘
// 保持 append 语义(O_APPEND 内核级追加),不改变并发行为
const fileExisted = existsSync(filePath);
const oldSize = fileExisted ? (await stat(filePath)).size : 0;
let fd: FileHandle | null = null;
try {
fd = await open(filePath, 'a');
// 'a' 模式下 write 追加到末尾(O_APPEND 内核级保证)
// 循环写入确保大内容完整写入(单次 write 可能不完整)
const buffer = Buffer.from(content, 'utf-8');
let totalWritten = 0;
while (totalWritten < buffer.length) {
const { bytesWritten } = await fd.write(buffer, totalWritten, buffer.length - totalWritten);
totalWritten += bytesWritten;
}
await fd.sync(); // fsync 保证数据持久化到磁盘
} finally {
if (fd) {
try { await fd.close(); } catch { /* 忽略关闭错误 */ }
}
}
const newStats = await stat(filePath);
return {
bytes_written: contentBytes,
path: filePath,
mode: 'append',
created: !fileExisted,
old_size: oldSize,
new_file_size: newStats.size,
success: true,
};
@@ -256,7 +312,7 @@ export class ListDirectoryTool implements IMetonaTool {
properties: {
dir_path: { type: 'string', description: 'Directory path (default: workspace root)' },
depth: { type: 'number', description: 'Recursive depth (default 1, max 5)' },
glob: { type: 'string', description: 'Filename filter pattern (e.g., "*.ts")' },
glob: { type: 'string', description: 'Filename filter pattern. Supports comma-separated multi-glob (e.g., "*.ts" or "*.ts,*.js,*.tsx")' },
include_hidden: { type: 'boolean', description: 'Include hidden files/dirs starting with "." (default false)' },
},
},
@@ -324,8 +380,8 @@ export class ListDirectoryTool implements IMetonaTool {
await this.listDir(rootPath, fullPath, maxDepth, glob, includeHidden, currentDepth + 1, results, maxEntries);
}
} else {
// glob 过滤仅适用于文件
if (glob && !matchGlob(entry.name, glob)) continue;
// F2-4: glob 过滤仅适用于文件,支持多 glob(逗号分隔,如 "*.ts,*.js"
if (glob && !matchAnyGlob(entry.name, glob)) continue;
const stats = await stat(fullPath);
// v0.3.2: 添加 modified timeISO 字符串)
results.push({
@@ -356,7 +412,7 @@ export class SearchFilesTool implements IMetonaTool {
pattern: { type: 'string', description: 'Search pattern (regex for content, glob for filenames)' },
target: { type: 'string', description: '"content" (default) to search file contents, "files" to search filenames', enum: ['content', 'files'] },
path: { type: 'string', description: 'Search directory (default: workspace root)' },
file_glob: { type: 'string', description: 'Limit to specific file types (e.g., "*.py")' },
file_glob: { type: 'string', description: 'Limit to specific file types. Supports comma-separated multi-glob (e.g., "*.py" or "*.ts,*.js,*.tsx")' },
limit: { type: 'number', description: 'Maximum results (default 50, max 200)' },
context_lines: { type: 'number', description: 'Lines of context to show around content matches (default 0, max 5). Only for target="content".' },
include_hidden: { type: 'boolean', description: 'Include hidden files/dirs starting with "." (default false)' },
@@ -443,7 +499,13 @@ export class SearchFilesTool implements IMetonaTool {
const fileStats = await stat(filePath);
if (fileStats.size > MAX_FILE_SIZE_BYTES) return;
const content = await readFile(filePath, 'utf-8');
// F2-3: 跳过二进制文件(避免读取乱码 + 提升性能)
// 空文件不算二进制,直接放行(size=0 时 isBinaryFile 内部 bytesRead=0 返回 false
if (fileStats.size > 0 && await isBinaryFile(filePath)) return;
// F2-3: 用智能编码检测读取文件(支持 GBK 等非 UTF-8 编码)
const buffer = await readFile(filePath);
const { content } = decodeBufferWithDetection(buffer);
const lines = content.split('\n');
for (let i = 0; i < lines.length; i++) {
if (results.length >= limit) break;
@@ -492,7 +554,8 @@ export class SearchFilesTool implements IMetonaTool {
if (entry.isDirectory()) {
await this.walkDir(fullPath, callback, fileGlob, includeHidden, workspacePath);
} else {
if (fileGlob && !matchGlob(entry.name, fileGlob)) continue;
// F2-4: 支持多 glob(逗号分隔,如 "*.ts,*.js,*.tsx"
if (fileGlob && !matchAnyGlob(entry.name, fileGlob)) continue;
await callback(fullPath, entry.name);
}
}
@@ -613,3 +676,210 @@ export class DeleteFileTool implements IMetonaTool {
}
}
}
// ===== 6. file_move =====
/**
* F3-1: 文件移动/重命名工具
*
* 安全策略:
* 1. 源路径和目标路径都必须在工作空间内(双重 safeResolvePath 校验)
* 2. 受保护文件(MEMORY.md)禁止移动(safeResolvePath 内置拦截)
* 3. 自动创建目标父目录
* 4. 支持覆盖已存在文件(overwrite 参数)
* 5. 禁止移动工作空间根目录
* 6. rename 在同文件系统上是原子操作
*/
export class FileMoveTool implements IMetonaTool {
readonly definition: MetonaToolDef = {
name: 'file_move',
description:
'Move or rename a file or directory. Source and destination must be within workspace. Auto-creates destination parent directory. Use overwrite: true to replace existing destination. Atomic on same filesystem (uses rename).',
parameters: {
type: 'object',
properties: {
source_path: { type: 'string', description: 'Path to the file/directory to move' },
destination_path: { type: 'string', description: 'Destination path' },
overwrite: { type: 'boolean', description: 'Overwrite if destination exists (default false)' },
},
required: ['source_path', 'destination_path'],
},
category: MetonaToolCategory.FILESYSTEM,
riskLevel: MetonaRiskLevel.MEDIUM,
requiresPermission: true,
timeoutMs: FILE_TOOL_TIMEOUT_MS,
};
async execute(args: Record<string, unknown>, context: ToolExecutionContext): Promise<unknown> {
try {
const sourcePath = args.source_path as string;
const destinationPath = args.destination_path as string;
const overwrite = (args.overwrite as boolean) ?? false;
if (!sourcePath || !destinationPath) {
return { error: 'source_path and destination_path are required', success: false };
}
// F3-1: 双路径校验(源和目标都必须在工作空间内 + 非 MEMORY.md
let resolvedSource: string;
let resolvedDest: string;
try {
resolvedSource = safeResolvePath(sourcePath, context.workspacePath);
resolvedDest = safeResolvePath(destinationPath, context.workspacePath);
} catch (error) {
return { error: extractErrorMessage(error), success: false };
}
// 禁止移动工作空间根目录
const workspaceRoot = resolve(context.workspacePath);
if (resolvedSource === workspaceRoot) {
return {
error: 'Cannot move workspace root directory',
source_path: sourcePath,
success: false,
};
}
// 源必须存在
if (!existsSync(resolvedSource)) {
return { error: 'Source not found', path: sourcePath, success: false };
}
// 目标已存在处理
let overwritten = false;
if (existsSync(resolvedDest)) {
if (!overwrite) {
return {
error: 'Destination already exists. Use overwrite: true to replace.',
destination_path: destinationPath,
success: false,
};
}
// overwrite: true — 删除目标
const destStats = await stat(resolvedDest);
if (destStats.isDirectory()) {
await rm(resolvedDest, { recursive: true, force: false });
} else {
await unlink(resolvedDest);
}
overwritten = true;
}
// 自动创建目标父目录
const destParentDir = dirname(resolvedDest);
if (!existsSync(destParentDir)) {
await mkdir(destParentDir, { recursive: true });
}
// 执行移动(rename 在同文件系统上是原子操作)
await rename(resolvedSource, resolvedDest);
const stats = await stat(resolvedDest);
return {
source: sourcePath,
destination: destinationPath,
isDirectory: stats.isDirectory(),
overwritten,
success: true,
};
} catch (error) {
return { error: extractErrorMessage(error), success: false };
}
}
}
// ===== 7. file_info =====
/**
* F3-2: 文件信息查询工具
*
* 返回文件的元信息:大小、时间戳、类型、编码检测、权限位。
* 只读操作,风险等级 SAFE。
*
* 编码检测只读取前 8KB,避免大文件 OOM。
*/
export class FileInfoTool implements IMetonaTool {
readonly definition: MetonaToolDef = {
name: 'file_info',
description:
'Get detailed file information: size, timestamps (created/modified/accessed), type (file/directory/symlink), encoding detection (UTF-8/UTF-16/GBK), binary check, and permission bits.',
parameters: {
type: 'object',
properties: {
file_path: { type: 'string', description: 'Path to the file or directory' },
},
required: ['file_path'],
},
category: MetonaToolCategory.FILESYSTEM,
riskLevel: MetonaRiskLevel.SAFE,
requiresPermission: false,
timeoutMs: FILE_TOOL_TIMEOUT_MS,
};
async execute(args: Record<string, unknown>, context: ToolExecutionContext): Promise<unknown> {
try {
const filePath = safeResolvePath(args.file_path as string, context.workspacePath);
if (!existsSync(filePath)) {
return { error: 'File not found', path: args.file_path, success: false };
}
const stats = await stat(filePath);
const isDir = stats.isDirectory();
const isFile = stats.isFile();
const isSymlink = stats.isSymbolicLink();
const info: Record<string, unknown> = {
path: args.file_path,
absolute_path: filePath,
type: isDir ? 'directory' : isFile ? 'file' : isSymlink ? 'symlink' : 'unknown',
size: stats.size,
created: stats.birthtime.toISOString(),
modified: stats.mtime.toISOString(),
accessed: stats.atime.toISOString(),
mode: stats.mode.toString(8), // 八进制权限位
success: true,
};
// F3-2: 文件类型额外信息(编码 + 二进制检测)
// 只读前 8KB,避免大文件 OOM
if (isFile) {
let fd: FileHandle | null = null;
try {
fd = await open(filePath, 'r');
const buffer = Buffer.alloc(8192);
const { bytesRead } = await fd.read(buffer, 0, 8192, 0);
const actualBuffer = buffer.slice(0, bytesRead);
// 二进制检测(NULL 字节检查)
let isBinary = false;
for (let i = 0; i < bytesRead; i++) {
if (actualBuffer[i] === 0) {
isBinary = true;
break;
}
}
info.is_binary = isBinary;
// 编码检测(仅非二进制文件)
if (!isBinary && bytesRead > 0) {
const { encoding } = decodeBufferWithDetection(actualBuffer);
info.encoding = encoding;
} else if (bytesRead === 0) {
info.encoding = 'utf-8'; // 空文件默认 UTF-8
}
} catch {
// 读取失败,不报告编码信息
} finally {
if (fd) {
try { await fd.close(); } catch { /* 忽略关闭错误 */ }
}
}
}
return info;
} catch (error) {
return { error: extractErrorMessage(error), success: false };
}
}
}
+22 -7
View File
@@ -340,11 +340,11 @@ export class GitLogTool implements IMetonaTool {
export class GitCommitTool implements IMetonaTool {
readonly definition: MetonaToolDef = {
name: 'git_commit',
description: 'Stage files and create a git commit. Supports amending the previous commit. Requires user confirmation.',
description: 'Stage files and create a git commit. Supports amending the previous commit. In amend mode, message is optional (omitting it keeps the original commit message). Requires user confirmation.',
parameters: {
type: 'object',
properties: {
message: { type: 'string', description: 'Commit message' },
message: { type: 'string', description: 'Commit message. Required for new commits. Optional in amend mode (omitting keeps original message).' },
files: {
type: 'array',
items: { type: 'string', description: 'File path to stage' },
@@ -352,7 +352,8 @@ export class GitCommitTool implements IMetonaTool {
},
amend: { type: 'boolean', description: 'Amend the previous commit instead of creating a new one (default false)' },
},
required: ['message'],
// F1-3: message 不再硬性 required — amend 模式下可省略(保留原 message)
// 校验在 execute 内根据 amend 标志动态进行
},
category: MetonaToolCategory.FILESYSTEM,
riskLevel: MetonaRiskLevel.MEDIUM,
@@ -361,12 +362,17 @@ export class GitCommitTool implements IMetonaTool {
};
async execute(args: Record<string, unknown>, context: ToolExecutionContext): Promise<unknown> {
const message = args.message as string;
const message = args.message as string | undefined;
const files = (args.files as string[] | undefined) ?? [];
const amend = (args.amend as boolean) ?? false;
if (!message || message.trim().length === 0) {
return { success: false, error: 'Commit message is required' };
// F1-3: 非 amend 模式必须有 messageamend 模式可省略(保留原 message)
if (!amend && (!message || message.trim().length === 0)) {
return { success: false, error: 'Commit message is required (use amend: true to reuse the previous message)' };
}
// amend 模式下若提供 message,需校验非空字符串
if (amend && message !== undefined && message.trim().length === 0) {
return { success: false, error: 'Commit message must not be empty (or omit message field to keep original)' };
}
try {
@@ -393,9 +399,16 @@ export class GitCommitTool implements IMetonaTool {
const filesChanged = stagedOutput.split('\n').filter((l) => l.length > 0).length;
// 3. 提交(commit 可能触发 hooks,给予更长超时)
// F1-3: amend 模式下若未提供 message,不加 -m 参数(保留原 message
const commitArgs = ['commit'];
if (amend) commitArgs.push('--amend');
if (message && message.trim().length > 0) {
commitArgs.push('-m', message);
} else if (amend) {
// amend + 无 message + 无 --no-edit → git 会打开编辑器要求输入
// 加 --no-edit 明确表示保留原 message(防止 hang 等待编辑器)
commitArgs.push('--no-edit');
}
await runGit(commitArgs, context.workspacePath, 20_000);
// 4. 获取提交 hash 和当前分支
@@ -408,8 +421,10 @@ export class GitCommitTool implements IMetonaTool {
success: true,
commit,
branch,
message,
// F1-3: amend 模式下若未提供 message,返回值为空字符串(实际 message 保留原值)
message: message ?? (amend ? '(amended - original message preserved)' : ''),
filesChanged,
amended: amend,
};
} catch (error) {
if (isNotGitRepoError(error)) {
+9 -6
View File
@@ -1,12 +1,18 @@
/**
* 内置工具导出
*
* v0.3.13: 删除 todo_write 工具(零价值 + 死代码 clearSession + 与 task_manager 功能重叠)
* 工具总数:30 个(29 + DelegateTaskTool
*
* v0.3.3: 从 27 个工具扩展到 29 个工具
* 新增:file_move, file_info
*
* v0.3.2: 从 26 个工具扩展到 27 个工具
* 新增:delete_file
*
* v0.3.1: 从 15 个工具扩展到 26 个工具
* 新增:git_status, git_diff, git_log, git_commit, lint_code, run_tests,
* project_info, http_request, todo_write, think, view_image
* project_info, http_request, think, view_image
*
* v0.2.0: 从 11 个工具扩展到 15 个工具
* 新增:file_editor, code_search, task_manager, diff_viewer
@@ -14,8 +20,8 @@
* @see docs/MetonaAI-Desktop 架构与交互设计.html — 9 个基础工具
*/
// 文件系统工具(5 个)
export { ReadFileTool, WriteFileTool, ListDirectoryTool, SearchFilesTool, DeleteFileTool } from './filesystem';
// 文件系统工具(7 个)
export { ReadFileTool, WriteFileTool, ListDirectoryTool, SearchFilesTool, DeleteFileTool, FileMoveTool, FileInfoTool } from './filesystem';
// v0.2.0: 精准文件编辑工具
export { FileEditorTool } from './file-editor';
// v0.2.0: ripgrep 代码搜索工具
@@ -50,9 +56,6 @@ export { LintCodeTool, RunTestsTool, ProjectInfoTool } from './dev-tools';
// v0.3.1: HTTP 请求工具(1 个)
export { HttpRequestTool } from './http-request';
// v0.3.1: TODO 管理工具(1 个)
export { TodoWriteTool } from './todo';
// v0.3.1: 结构化思考工具(1 个)
export { ThinkTool } from './think';
@@ -82,7 +82,22 @@ export class TaskManagerTool implements IMetonaTool {
timeoutMs: 10_000,
};
constructor(private getDB: () => Database.Database) {}
constructor(
private getDB: () => Database.Database,
// P2v0.3.13): 写入后回调,用于通知 UI 刷新(避免工具层依赖 Electron)
private onTaskChanged?: (sessionId: string) => void,
) {}
/** 写入后触发回调(仅对修改操作) */
private notifyChanged(sessionId: string): void {
if (this.onTaskChanged) {
try {
this.onTaskChanged(sessionId);
} catch {
// 回调失败不影响工具主流程
}
}
}
async execute(args: Record<string, unknown>, context: ToolExecutionContext): Promise<unknown> {
try {
@@ -139,6 +154,9 @@ export class TaskManagerTool implements IMetonaTool {
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`).run(id, sessionId, title, description, 'pending', priority, parentId, null, order, now, now);
// P2: 通知 UI 刷新
this.notifyChanged(sessionId);
return {
success: true,
task: {
@@ -207,6 +225,9 @@ export class TaskManagerTool implements IMetonaTool {
// T3.1: UPDATE 语句加 AND session_id = ? 防止越权
db.prepare(`UPDATE tasks SET ${updates.join(', ')} WHERE id = ? AND session_id = ?`).run(...values);
// P2: 通知 UI 刷新
this.notifyChanged(context.sessionId);
const updated = db.prepare('SELECT * FROM tasks WHERE id = ? AND session_id = ?').get(taskId, context.sessionId) as Record<string, unknown>;
return { success: true, task: mapRow(updated) };
}
@@ -266,6 +287,9 @@ export class TaskManagerTool implements IMetonaTool {
return { success: false, error: `Task not found: ${taskId}` };
}
// P2: 通知 UI 刷新
this.notifyChanged(context.sessionId);
return { success: true, task_id: taskId, completed_at: now };
}
@@ -301,6 +325,9 @@ export class TaskManagerTool implements IMetonaTool {
});
deleteMany();
// P2: 通知 UI 刷新
this.notifyChanged(context.sessionId);
return { success: true, task_id: taskId, deleted: allIds.length };
}
-244
View File
@@ -1,244 +0,0 @@
/**
* TODO 管理工具(1 个)
*
* todo_write — 会话级 TODO 列表管理
*
* 使用内存 Map 存储,按 sessionId 隔离。
* 与 task_manager 区别:todo_write 用于临时思考拆解(内存,会话级),
* task_manager 用于持久化任务跟踪(数据库,跨会话)。
*
* v0.3.1 修复 FAIL-2: 添加 LRU 策略,限制最大会话数 50,
* 超出时淘汰最久未访问的会话。提供 clearSession 静态方法供外部清理。
*
* v0.3.1 修复 WARN-3: 真正的 LRU 实现 — 访问命中时通过 delete + re-insert
* 刷新会话位置,确保活跃会话不被淘汰,仅淘汰最久未访问的会话。
*/
import type { IMetonaTool, ToolExecutionContext } from '../../types/metona-tool';
import type { MetonaToolDef } from '../../../harness/types';
import { MetonaToolCategory, MetonaRiskLevel } from '../../../harness/types';
import log from 'electron-log';
type TodoStatus = 'pending' | 'in_progress' | 'completed';
type TodoPriority = 'high' | 'medium' | 'low';
interface TodoItem {
id: string;
content: string;
status: TodoStatus;
priority: TodoPriority;
createdAt: number;
updatedAt: number;
}
const VALID_STATUSES: TodoStatus[] = ['pending', 'in_progress', 'completed'];
const VALID_PRIORITIES: TodoPriority[] = ['high', 'medium', 'low'];
// v0.3.1 修复 FAIL-2: LRU 策略限制最大会话数,防止内存泄漏
const MAX_SESSIONS = 50;
export class TodoWriteTool implements IMetonaTool {
readonly definition: MetonaToolDef = {
name: 'todo_write',
description: 'Manage a session-level TODO list in memory. Actions: create, update, list, complete, clear. Unlike task_manager (persistent DB), todo_write is for temporary task breakdown within a session and does not persist across sessions.',
parameters: {
type: 'object',
properties: {
action: {
type: 'string',
description: 'Operation type',
enum: ['create', 'update', 'list', 'complete', 'clear'],
},
id: { type: 'string', description: 'TODO item ID (required for update/complete)' },
content: { type: 'string', description: 'TODO content (required for create/update)' },
status: {
type: 'string',
description: 'Status (for update)',
enum: ['pending', 'in_progress', 'completed'],
},
priority: {
type: 'string',
description: 'Priority (for create, default medium)',
enum: ['high', 'medium', 'low'],
},
},
required: ['action'],
},
// v0.3.1 修复 WARN-9: 改为 CUSTOM(内存操作,非数据库)
category: MetonaToolCategory.CUSTOM,
riskLevel: MetonaRiskLevel.SAFE,
requiresPermission: false,
timeoutMs: 5_000,
};
// v0.3.1 修复 FAIL-2: 会话级 TODO 存储 + LRU 淘汰
private static todosBySession = new Map<string, Map<string, TodoItem>>();
private static counter = 0;
/**
* v0.3.1 修复 FAIL-2: 清理指定会话的 TODO(供外部调用,如会话结束时)
*/
static clearSession(sessionId: string): void {
const removed = TodoWriteTool.todosBySession.delete(sessionId);
if (removed) {
log.debug(`[TodoWriteTool] Cleared TODOs for session ${sessionId}`);
}
}
/**
* v0.3.1 修复 FAIL-2: LRU 淘汰 — 超过 MAX_SESSIONS 时删除最久未访问的会话
* Map 的迭代顺序按插入顺序,第一个即最久未访问
*
* v0.3.1 修复 WARN-3: 配合 getSessionMap 的访问刷新位置,实现真正的 LRU。
* 活跃会话因访问而刷新到 Map 末尾,不会被淘汰。
*/
private static evictIfFull(): void {
while (TodoWriteTool.todosBySession.size >= MAX_SESSIONS) {
const oldest = TodoWriteTool.todosBySession.keys().next().value;
if (oldest === undefined) break;
TodoWriteTool.todosBySession.delete(oldest);
log.debug(`[TodoWriteTool] LRU evicted session ${oldest}`);
}
}
async execute(args: Record<string, unknown>, context: ToolExecutionContext): Promise<unknown> {
try {
const action = args.action as string;
switch (action) {
case 'create':
return this.create(args, context);
case 'update':
return this.update(args, context);
case 'list':
return this.list(context);
case 'complete':
return this.complete(args, context);
case 'clear':
return this.clear(context);
default:
return { success: false, error: `Unknown action: ${action}` };
}
} catch (error) {
const errMsg = error instanceof Error ? error.message : String(error);
return { error: errMsg, success: false };
}
}
/**
* 获取指定会话的 TODO Map
*
* v0.3.1 修复 WARN-3: 真正的 LRU — 命中已有会话时通过 delete + re-insert
* 将会话移到 Map 末尾(最近使用位置),防止活跃会话被淘汰。
* 新会话插入前触发 evictIfFull。
*/
private getSessionMap(context: ToolExecutionContext): Map<string, TodoItem> {
const existing = TodoWriteTool.todosBySession.get(context.sessionId);
if (existing) {
// LRU 刷新位置:delete + re-insert → 移到 Map 末尾
TodoWriteTool.todosBySession.delete(context.sessionId);
TodoWriteTool.todosBySession.set(context.sessionId, existing);
return existing;
}
// 新会话插入前检查 LRU 淘汰
TodoWriteTool.evictIfFull();
const map = new Map<string, TodoItem>();
TodoWriteTool.todosBySession.set(context.sessionId, map);
return map;
}
private create(args: Record<string, unknown>, context: ToolExecutionContext): unknown {
const content = args.content as string;
if (!content) {
return { success: false, id: '', todo: null, error: 'content is required for create action' };
}
const priority = (args.priority as TodoPriority) ?? 'medium';
if (!VALID_PRIORITIES.includes(priority)) {
return { success: false, id: '', todo: null, error: `Invalid priority: ${priority}. Must be one of: ${VALID_PRIORITIES.join(', ')}` };
}
const now = Date.now();
const id = `todo_${now}_${TodoWriteTool.counter++}`;
const todo: TodoItem = {
id,
content,
status: 'pending',
priority,
createdAt: now,
updatedAt: now,
};
this.getSessionMap(context).set(id, todo);
return { success: true, id, todo };
}
private update(args: Record<string, unknown>, context: ToolExecutionContext): unknown {
const id = args.id as string;
if (!id) {
return { success: false, id: '', todo: null, error: 'id is required for update action' };
}
const map = this.getSessionMap(context);
const todo = map.get(id);
if (!todo) {
return { success: false, id, todo: null, error: `TODO not found: ${id}` };
}
if (args.content !== undefined) {
todo.content = args.content as string;
}
if (args.status !== undefined) {
const status = args.status as TodoStatus;
if (!VALID_STATUSES.includes(status)) {
return { success: false, id, todo: null, error: `Invalid status: ${status}. Must be one of: ${VALID_STATUSES.join(', ')}` };
}
todo.status = status;
}
if (args.priority !== undefined) {
const priority = args.priority as TodoPriority;
if (!VALID_PRIORITIES.includes(priority)) {
return { success: false, id, todo: null, error: `Invalid priority: ${priority}. Must be one of: ${VALID_PRIORITIES.join(', ')}` };
}
todo.priority = priority;
}
todo.updatedAt = Date.now();
return { success: true, id, todo };
}
private list(context: ToolExecutionContext): unknown {
const map = this.getSessionMap(context);
const todos = Array.from(map.values()).sort((a, b) => a.createdAt - b.createdAt);
return {
todos,
count: todos.length,
pending: todos.filter((t) => t.status === 'pending').length,
completed: todos.filter((t) => t.status === 'completed').length,
};
}
private complete(args: Record<string, unknown>, context: ToolExecutionContext): unknown {
const id = args.id as string;
if (!id) {
return { success: false, id: '', todo: null, error: 'id is required for complete action' };
}
const map = this.getSessionMap(context);
const todo = map.get(id);
if (!todo) {
return { success: false, id, todo: null, error: `TODO not found: ${id}` };
}
todo.status = 'completed';
todo.updatedAt = Date.now();
return { success: true, id, todo };
}
private clear(context: ToolExecutionContext): unknown {
const map = this.getSessionMap(context);
const cleared = map.size;
map.clear();
return { success: true, cleared };
}
}
+271 -12
View File
@@ -11,6 +11,7 @@
import { ipcMain, BrowserWindow, shell, app, dialog } from 'electron';
import { join } from 'path';
import { nanoid } from 'nanoid';
import type { SessionService } from '../services/session.service';
import type { ConfigService } from '../services/config.service';
import type { WorkspaceService } from '../services/workspace.service';
@@ -163,10 +164,73 @@ export function registerAllIPCHandlers(
}
// 监听 Agent Loop 事件
const onStreamEvent = (event: MetonaStreamEvent) => {
if (!mainWindow.isDestroyed()) {
mainWindow.webContents.send('agent:streamEvent', event);
// F8: 主进程 text_delta 节流合并
// 问题:主进程 1:1 转发所有流式事件,text_delta 频率 30-50 次/秒,
// 每次 IPC 调用都有跨进程开销,叠加渲染进程处理成本。
// 方案:在主进程聚合 text_delta,32ms 间隔合并转发(IPC 频率降至 ~30 次/秒)。
// 非 text_delta 事件立即转发(先 flush 缓冲区保证顺序)。
// done/error 时立即 flush,避免最后一段 delta 丢失。
// 与 F5 渲染进程 rAF 批处理叠加,总延迟约 48ms(人眼不敏感)。
let textDeltaBuffer = '';
let lastTextEventMeta: Pick<MetonaStreamEvent, 'requestId' | 'sessionId' | 'iteration' | 'seq' | 'timestamp' | 'runId'> | null = null;
let flushTimer: ReturnType<typeof setTimeout> | null = null;
const flushTextDeltaBuffer = () => {
flushTimer = null;
if (!textDeltaBuffer || !lastTextEventMeta || mainWindow.isDestroyed()) {
textDeltaBuffer = '';
lastTextEventMeta = null;
return;
}
// 构建合并的 text_delta 事件,保留最后一个 delta 的元数据
const mergedEvent: MetonaStreamEvent = {
...lastTextEventMeta,
type: MetonaStreamEventType.TEXT_DELTA,
delta: textDeltaBuffer,
seq: lastTextEventMeta.seq, // 使用最后一个 delta 的 seq
timestamp: Date.now(),
};
mainWindow.webContents.send('agent:streamEvent', mergedEvent);
textDeltaBuffer = '';
lastTextEventMeta = null;
};
const onStreamEvent = (event: MetonaStreamEvent) => {
if (mainWindow.isDestroyed()) return;
// F8: text_delta 聚合,其他事件立即转发(先 flush 保证顺序)
if (event.type === MetonaStreamEventType.TEXT_DELTA && event.delta) {
if (textDeltaBuffer === '') {
lastTextEventMeta = {
requestId: event.requestId,
sessionId: event.sessionId,
iteration: event.iteration,
seq: event.seq,
timestamp: event.timestamp,
runId: event.runId,
};
} else {
// 更新 seq 为最新 delta 的 seq(保证前端 seq 连续性判断)
lastTextEventMeta = {
...lastTextEventMeta!,
seq: event.seq,
timestamp: event.timestamp,
runId: event.runId,
};
}
textDeltaBuffer += event.delta;
if (flushTimer === null) {
flushTimer = setTimeout(flushTextDeltaBuffer, 32);
}
return;
}
// 非 text_delta 事件:先 flush 缓冲区,再立即转发(保证事件顺序)
if (flushTimer !== null) {
clearTimeout(flushTimer);
flushTextDeltaBuffer();
}
mainWindow.webContents.send('agent:streamEvent', event);
};
const onStateChange = (data: { previous?: string; current?: string; sessionId?: string; iteration?: number; state?: string; runId?: string }) => {
@@ -413,6 +477,11 @@ export function registerAllIPCHandlers(
return { success: false, error: (error as Error).message };
} finally {
// F8: 注销前 flush 残留的 text_delta 缓冲区,避免丢失最后一段内容
if (flushTimer !== null) {
clearTimeout(flushTimer);
flushTextDeltaBuffer();
}
agentLoop.off('streamEvent', onStreamEvent);
agentLoop.off('stateChange', onStateChange);
agentLoop.off('compressed', onCompressed);
@@ -756,6 +825,169 @@ export function registerAllIPCHandlers(
log.info(`[CONFIG] Workspace path saved (restart required): ${value}`);
} catch (err) {
log.error('[CONFIG] Failed to save workspace path:', err);
// v0.3.10: 工作空间路径写入失败必须告知用户,否则下次启动仍使用旧路径
// 用户看到"配置已保存"却实际未生效,会误以为配置系统故障
return { success: false, error: `工作空间路径保存失败:${(err as Error).message}` };
}
}
return { success: true };
});
// ===== v0.3.9: 批量保存配置(解决串行保存中间态触发 reloadAdapter 失败问题)=====
// 设计原因:前端设置页一次保存 8 个字段,串行 config:set 会在中间态(如 provider
// 已改但 apiKey 还没保存)触发 reloadAdapter,导致返回"LLM 配置不完整"错误。
// 批量保存:先写入所有字段,最后统一触发一次 reloadAdapter 和 Engine/Orchestrator 同步。
ipcMain.handle('config:setBatch', async (_event, entries: unknown) => {
// 参数校验:必须是 {key, value}[] 非空数组
if (!Array.isArray(entries) || entries.length === 0) {
return { success: false, error: 'Invalid entries: must be non-empty array of {key, value}' };
}
// 逐条校验每个元素的结构和类型
for (const entry of entries) {
if (!entry || typeof entry !== 'object') {
return { success: false, error: 'Invalid entry: must be {key, value} object' };
}
const e = entry as { key?: unknown; value?: unknown };
if (typeof e.key !== 'string' || !e.key.trim()) {
return { success: false, error: 'Invalid config key in batch' };
}
const v = e.value;
if (v !== null && typeof v !== 'string' && typeof v !== 'number' && typeof v !== 'boolean') {
return { success: false, error: `Invalid config value for key "${e.key}": must be string, number, boolean, or null` };
}
}
// 敏感字段脱敏工具(与 config:set 保持一致)
const SENSITIVE_KEY_PATTERNS = ['apikey', 'api_key', 'apitoken', 'token', 'secret', 'password'];
const maskSensitive = (key: string, value: unknown): unknown => {
const isSensitive = SENSITIVE_KEY_PATTERNS.some(p => key.toLowerCase().includes(p));
if (isSensitive && typeof value === 'string' && value.length > 0) {
return value.length > 4 ? '***' + value.slice(-4) : '***';
}
return value;
};
// LLM 相关字段集合(用于判断是否需要 reloadAdapter
const LLM_KEYS = ['llm.provider', 'llm.model', 'llm.apiKey', 'llm.baseURL', 'ollama.numCtx',
'deepseek.contextWindow', 'agnes.contextWindow', 'mimo.contextWindow'];
// 第一步:逐条写入 configService + 审计日志
// 不在此处触发 reloadAdapter,避免中间态失败
let needsReloadAdapter = false;
const engineUpdates: { key: string; value: unknown }[] = [];
let workspacePathValue: string | null = null;
let logLevelValue: 'error' | 'warn' | 'info' | 'debug' | 'verbose' | 'silly' | null = null;
// v0.3.10 防御性修复: Provider 切换时清空 API key 的逻辑必须在循环前执行,
// 不能依赖 entries 中 llm.provider 出现在 llm.apiKey 之前。
// 旧实现:若前端误把 llm.apiKey 放在 llm.provider 之前,会先 set apiKey
// 随后处理 llm.provider 时清空 apiKey,导致用户填写的 apiKey 丢失。
// 新实现:先扫描 entries 找出 llm.provider 的值,与当前值比较,若变化则清空 apiKey,
// 然后循环按 entries 顺序 set(包括 llm.apiKey),最终值正确。
const providerEntry = (entries as Array<{ key: string; value: unknown }>)
.find((e) => e.key === 'llm.provider');
if (providerEntry) {
const oldProvider = configService.get<string>('llm.provider') ?? '';
const newProvider = (providerEntry.value as string) ?? '';
if (oldProvider && newProvider && oldProvider !== newProvider) {
configService.set('llm.apiKey', '');
log.info(`[CONFIG] Provider changed (${oldProvider}${newProvider}), API key cleared (batch mode)`);
}
}
for (const entry of entries) {
const { key, value } = entry as { key: string; value: unknown };
configService.set(key, value);
needsReloadAdapter = needsReloadAdapter || LLM_KEYS.includes(key);
// 收集 Engine/Orchestrator 相关更新(稍后统一应用)
if (key === 'agent.maxIterations' || key === 'agent.totalTimeoutMs' ||
key === 'agent.enableThinking' || key === 'agent.thinkingEffort' ||
key === 'ollama.numCtx' || key === 'deepseek.contextWindow' ||
key === 'agnes.contextWindow' || key === 'mimo.contextWindow' ||
key === 'agent.toolExecutionTimeoutMs' || key === 'agent.confirmationTimeoutMs') {
engineUpdates.push({ key, value });
}
if (key === 'workspace.path' && typeof value === 'string') {
workspacePathValue = value;
}
if (key === 'logging.level' && typeof value === 'string') {
logLevelValue = value as 'error' | 'warn' | 'info' | 'debug' | 'verbose' | 'silly';
}
// 审计日志(脱敏)
auditService.log({
sessionId: '',
eventType: 'config_change',
actor: 'user',
target: key,
details: { value: maskSensitive(key, value) },
outcome: 'success',
});
}
// 第二步:统一触发一次 reloadAdapter(仅在 LLM 配置变更时)
if (needsReloadAdapter) {
const reloadSuccess = reloadAdapter();
if (!reloadSuccess) {
log.warn('[CONFIG] Adapter reload failed after batch config save');
return { success: false, error: 'LLM 配置不完整,请检查 Provider、API Key、Base URL 和 Model 是否都已填写' };
} else {
log.info('[CONFIG] LLM config batch changed, adapter reloaded');
}
}
// 第三步:统一应用 Engine/Orchestrator 更新(取每个 key 的最后值)
// 注意:reloadAdapter 内部已重建 adapter 并同步 contextWindow,此处仅处理非 LLM 字段
// 的 Engine 配置(maxIterations/totalTimeoutMs/enableThinking 等)
for (const { key, value } of engineUpdates) {
if (key === 'agent.maxIterations') {
agentLoop.updateConfig({ maxIterations: value as number });
} else if (key === 'agent.totalTimeoutMs') {
agentLoop.updateConfig({ totalTimeoutMs: value as number });
} else if (key === 'agent.enableThinking') {
agentLoop.updateConfig({ thinkingEnabled: value as boolean });
orchestrator.updateDefaultConfig({ thinkingEnabled: value as boolean });
} else if (key === 'agent.thinkingEffort') {
agentLoop.updateConfig({ thinkingEffort: value as 'low' | 'medium' | 'high' | 'max' });
orchestrator.updateDefaultConfig({ thinkingEffort: value as 'low' | 'medium' | 'high' | 'max' });
} else if (key === 'ollama.numCtx') {
agentLoop.updateConfig({ contextLength: (value as number) || undefined });
orchestrator.updateDefaultConfig({ contextLength: (value as number) || undefined });
} else if (key === 'deepseek.contextWindow' || key === 'agnes.contextWindow' || key === 'mimo.contextWindow') {
const ctxWindow = (value as number) || undefined;
agentLoop.updateConfig({ contextWindow: ctxWindow });
orchestrator.updateDefaultConfig({ contextWindow: ctxWindow });
} else if (key === 'agent.confirmationTimeoutMs') {
confirmationHook.setConfirmationTimeout(value as number);
} else if (key === 'agent.toolExecutionTimeoutMs') {
agentLoop.updateConfig({ toolExecutionTimeoutMs: value as number });
}
}
if (engineUpdates.length > 0) {
log.info(`[CONFIG] Engine/Orchestrator updated with ${engineUpdates.length} config changes (batch mode)`);
}
// 第四步:日志级别即时应用
if (logLevelValue) {
log.transports.file.level = logLevelValue;
log.transports.console.level = logLevelValue;
log.info(`[CONFIG] Log level updated to ${logLevelValue}`);
}
// 第五步:工作空间路径写入独立文件(下次启动生效)
if (workspacePathValue) {
try {
const { writeWorkspacePathToFile } = await import('../main');
writeWorkspacePathToFile(workspacePathValue);
log.info(`[CONFIG] Workspace path saved (restart required): ${workspacePathValue}`);
} catch (err) {
log.error('[CONFIG] Failed to save workspace path:', err);
// v0.3.10: 工作空间路径写入失败必须告知用户,否则下次启动仍使用旧路径
return { success: false, error: `工作空间路径保存失败:${(err as Error).message}` };
}
}
@@ -1336,18 +1568,35 @@ export function registerAllIPCHandlers(
return { success: false, error: 'Invalid parentId' };
}
const db = sessionService.getDB();
const id = `task_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
// P4 统一(v0.3.13: ID 生成方式与 task_manager 工具一致(nanoid
const id = `task_${nanoid(12)}`;
try {
// P4 统一: 计算 order_idx = MAX(同 session+parent 的 order_idx) + 1(与 task_manager 工具一致)
// 注意:parent_id IS NULL 时需要单独处理,COALESCE(NULL, NULL) 仍为 NULL
const parentId = (req.parentId as string | null) ?? null;
let orderIdx = 0;
if (parentId === null) {
const orderRow = db.prepare(
'SELECT COALESCE(MAX(order_idx), -1) AS maxOrder FROM tasks WHERE session_id = ? AND parent_id IS NULL'
).get(req.sessionId) as { maxOrder: number } | undefined;
orderIdx = (orderRow?.maxOrder ?? -1) + 1;
} else {
const orderRow = db.prepare(
'SELECT COALESCE(MAX(order_idx), -1) AS maxOrder FROM tasks WHERE session_id = ? AND parent_id = ?'
).get(req.sessionId, parentId) as { maxOrder: number } | undefined;
orderIdx = (orderRow?.maxOrder ?? -1) + 1;
}
db.prepare(`
INSERT INTO tasks (id, session_id, title, description, status, priority, parent_id, created_at, updated_at)
VALUES (?, ?, ?, ?, 'pending', ?, ?, ?, ?)
INSERT INTO tasks (id, session_id, title, description, status, priority, parent_id, order_idx, created_at, updated_at)
VALUES (?, ?, ?, ?, 'pending', ?, ?, ?, ?, ?)
`).run(
id,
req.sessionId,
req.title,
typeof req.description === 'string' ? req.description : '',
(req.priority as string) ?? 'medium',
(req.parentId as string | null) ?? null,
parentId,
orderIdx,
Date.now(),
Date.now(),
);
@@ -1357,11 +1606,15 @@ export function registerAllIPCHandlers(
}
});
ipcMain.handle('tasks:update', async (_event, id: unknown, updates: unknown) => {
ipcMain.handle('tasks:update', async (_event, id: unknown, updates: unknown, sessionId: unknown) => {
// M-47 修复: 校验 id 和 updates 结构/枚举
if (typeof id !== 'string' || !id) {
return { success: false, error: 'Invalid task id' };
}
// P1 修复(v0.3.13: 补 session_id 越权保护(与 task_manager 工具一致)
if (typeof sessionId !== 'string' || !sessionId) {
return { success: false, error: 'Invalid sessionId' };
}
if (!updates || typeof updates !== 'object') {
return { success: false, error: 'Invalid updates' };
}
@@ -1394,22 +1647,28 @@ export function registerAllIPCHandlers(
if (fields.length === 0) return { success: true };
fields.push('updated_at = ?'); values.push(Date.now());
if (u.status === 'completed') { fields.push('completed_at = ?'); values.push(Date.now()); }
values.push(id);
db.prepare(`UPDATE tasks SET ${fields.join(', ')} WHERE id = ?`).run(...values);
values.push(id, sessionId);
// P1 修复(v0.3.13: WHERE 补 session_id 校验,防越权修改其他会话任务
db.prepare(`UPDATE tasks SET ${fields.join(', ')} WHERE id = ? AND session_id = ?`).run(...values);
return { success: true };
} catch (error) {
return { success: false, error: (error as Error).message };
}
});
ipcMain.handle('tasks:delete', async (_event, id: unknown) => {
ipcMain.handle('tasks:delete', async (_event, id: unknown, sessionId: unknown) => {
// M-48 修复: 校验 id 类型
if (typeof id !== 'string' || !id) {
return { success: false, error: 'Invalid task id' };
}
// P1 修复(v0.3.13: 补 session_id 越权保护
if (typeof sessionId !== 'string' || !sessionId) {
return { success: false, error: 'Invalid sessionId' };
}
const db = sessionService.getDB();
try {
db.prepare('DELETE FROM tasks WHERE id = ?').run(id);
// P1 修复: WHERE 补 session_id 校验
db.prepare('DELETE FROM tasks WHERE id = ? AND session_id = ?').run(id, sessionId);
return { success: true };
} catch (error) {
return { success: false, error: (error as Error).message };
+16 -5
View File
@@ -14,7 +14,7 @@
* @see docs/MetonaAI-Desktop UI UX 设计集成方案.html — 窗口管理
*/
import { app, shell, Menu } from 'electron';
import { app, shell, Menu, BrowserWindow } from 'electron';
import { join } from 'path';
import { existsSync, readFileSync, writeFileSync } from 'fs';
import { electronApp, optimizer } from '@electron-toolkit/utils';
@@ -55,11 +55,13 @@ import {
GitStatusTool, GitDiffTool, GitLogTool, GitCommitTool,
LintCodeTool, RunTestsTool, ProjectInfoTool,
HttpRequestTool,
TodoWriteTool,
ThinkTool,
ViewImageTool,
// v0.3.2 新增工具(1 个)
DeleteFileTool,
// v0.3.3 新增工具(2 个)
FileMoveTool,
FileInfoTool,
} from './harness/tools/built-in';
import { AuditLogHook, MemoryTriggerHook, PermissionCheckHook, RateLimitHook } from './harness/hooks';
import { ConfirmationHook } from './harness/hooks/confirmation-hook';
@@ -206,6 +208,10 @@ async function initialize(): Promise<void> {
// v0.3.2: 文件删除工具(破坏性操作,HIGH + requireConfirmation
toolRegistry.registerBuiltin(new DeleteFileTool());
// v0.3.3: 文件移动/重命名工具 + 文件信息查询工具
toolRegistry.registerBuiltin(new FileMoveTool());
toolRegistry.registerBuiltin(new FileInfoTool());
// v0.2.0: 新增文件工具
toolRegistry.registerBuiltin(new FileEditorTool());
toolRegistry.registerBuiltin(new CodeSearchTool());
@@ -225,7 +231,13 @@ async function initialize(): Promise<void> {
toolRegistry.registerBuiltin(runCommandTool);
// v0.2.0: 任务管理工具
toolRegistry.registerBuiltin(new TaskManagerTool(() => db));
// P2v0.3.13: 注入 onTaskChanged 回调,工具写入后广播 IPC 事件给所有窗口
toolRegistry.registerBuiltin(new TaskManagerTool(() => db, (sessionId) => {
// 广播任务变更事件给所有窗口(UI 订阅后自动刷新)
for (const win of BrowserWindow.getAllWindows()) {
win.webContents.send('task:changed', sessionId);
}
}));
// 注册 Web Browser 统一浏览器工具
toolRegistry.registerBuiltin(new WebBrowserTool());
@@ -241,9 +253,8 @@ async function initialize(): Promise<void> {
toolRegistry.registerBuiltin(new RunTestsTool());
toolRegistry.registerBuiltin(new ProjectInfoTool());
// v0.3.1: 独立工具(4 个)
// v0.3.1: 独立工具(3v0.3.13 删除 todo_write 后
toolRegistry.registerBuiltin(new HttpRequestTool());
toolRegistry.registerBuiltin(new TodoWriteTool());
toolRegistry.registerBuiltin(new ThinkTool());
toolRegistry.registerBuiltin(new ViewImageTool());
+12 -3
View File
@@ -74,9 +74,15 @@ const metonaAPI = {
list: (sessionId?: string) => ipcRenderer.invoke('tasks:list', sessionId),
create: (data: { sessionId: string; title: string; description?: string; priority?: string; parentId?: string }) =>
ipcRenderer.invoke('tasks:create', data),
update: (id: string, updates: { title?: string; description?: string; status?: string; priority?: string; assignedTo?: string }) =>
ipcRenderer.invoke('tasks:update', id, updates),
delete: (id: string) => ipcRenderer.invoke('tasks:delete', id),
update: (id: string, updates: { title?: string; description?: string; status?: string; priority?: string; assignedTo?: string }, sessionId: string) =>
ipcRenderer.invoke('tasks:update', id, updates, sessionId),
delete: (id: string, sessionId: string) => ipcRenderer.invoke('tasks:delete', id, sessionId),
// P2v0.3.13: 订阅任务变更事件(Agent 通过 task_manager 写入后触发)
onTaskChanged: (callback: (sessionId: string) => void) => {
const listener = (_event: unknown, sessionId: string): void => callback(sessionId);
ipcRenderer.on('task:changed', listener);
return () => ipcRenderer.removeListener('task:changed', listener);
},
},
// ===== v0.2.0: 审计日志 =====
@@ -121,6 +127,9 @@ const metonaAPI = {
config: {
get: (key: string) => ipcRenderer.invoke('config:get', key),
set: (key: string, value: unknown) => ipcRenderer.invoke('config:set', key, value),
// v0.3.9: 批量保存配置,避免串行保存中间态触发 reloadAdapter 失败
setBatch: (entries: Array<{ key: string; value: unknown }>) =>
ipcRenderer.invoke('config:setBatch', entries),
},
// ===== 应用工具 =====
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "metona-ai-desktop",
"version": "0.3.9",
"version": "0.3.13",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "metona-ai-desktop",
"version": "0.3.9",
"version": "0.3.13",
"license": "MIT",
"dependencies": {
"@emotion/react": "^11.14.0",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "metona-ai-desktop",
"version": "0.3.9",
"version": "0.3.13",
"description": "MetonaAI Desktop — 生产级通用 AI Agent 智能体桌面应用",
"main": "dist-electron/main/main.js",
"author": "Metona Team",
+64 -17
View File
@@ -5,15 +5,20 @@
* 1. 💭 思考阶段 — ThoughtBlock 自动展开,流式追加 reasoning content
* 2. 🔧 工具调用 — ToolCallCard 展示调用和结果
* 3. ✏️ 回复阶段 — Markdown 渲染,打字光标指示流式输出
*
* F1 性能优化: 使用 React.memo 包裹,避免历史消息在流式 delta 时重渲染。
* 配合 agentStatus 选择器优化:历史消息(isStreaming=false)不订阅真实 agentStatus
* 避免 agentStatus 频繁变化(thinking/executing/idle)触发所有 AssistantMessage 重渲染。
*/
import { useState, useCallback } from 'react';
import { useState, useCallback, memo, useMemo } from 'react';
import { Box, Typography, Avatar, Stack, IconButton, Tooltip } from '@mui/material';
import { Bot, Copy, Check } from 'lucide-react';
import ReactMarkdown from 'react-markdown';
import remarkGfm from 'remark-gfm';
import rehypeHighlight from 'rehype-highlight';
import rehypeRaw from 'rehype-raw';
// F11: 移除 rehypeRaw — 避免解析 raw HTML 的开销 + 安全考虑(防止 AI 输出 HTML 注入)
// 如需恢复内联 HTML 渲染,可重新引入 rehype-raw
import type { ChatMessage } from '@renderer/stores/agent-store';
import { useAgentStore } from '@renderer/stores/agent-store';
import { ThoughtBlock } from './ThoughtBlock';
@@ -27,11 +32,14 @@ interface AssistantMessageProps {
isStreaming?: boolean;
}
export function AssistantMessage({ message, isStreaming }: AssistantMessageProps): React.JSX.Element {
function AssistantMessageImpl({ message, isStreaming }: AssistantMessageProps): React.JSX.Element {
// 直接使用 message.content — updateLastAssistantMessage 已实时更新此字段
const content = message.content;
const [contextMenu, setContextMenu] = useState<{ x: number; y: number } | null>(null);
const agentStatus = useAgentStore((s) => s.agentStatus);
// F1: 历史消息(isStreaming=false)固定返回 'idle',避免 agentStatus 变化触发重渲染
// 逻辑等价:原 isThinking = agentStatus === 'thinking' && isStreaming
// 新 isThinking = agentStatus === 'thinking'agentStatus 在非流式时恒为 'idle'
const agentStatus = useAgentStore((s) => (isStreaming ? s.agentStatus : 'idle'));
const contextMenuItems = createContextMenuItems('message', { content });
@@ -40,6 +48,29 @@ export function AssistantMessage({ message, isStreaming }: AssistantMessageProps
const hasContent = !!content;
const isThinking = agentStatus === 'thinking' && isStreaming;
// F7: useMemo 缓存 ReactMarkdown 元素,避免非流式时因 isStreaming/isLast 变化重新创建元素
// 流式时此元素不被渲染(用纯文本),useMemo 仍会更新但仅创建轻量 React 元素对象
// 非流式时 content 不变,useMemo 复用缓存,避免重新创建 ReactMarkdown 组件实例
const markdownElement = useMemo(() => (
<Box className="prose-metona">
<ReactMarkdown
remarkPlugins={[remarkGfm]}
rehypePlugins={[rehypeHighlight]}
components={{
code({ className, children, ...props }) {
const match = /language-(\w+)/.exec(className ?? '');
// rehype-highlight 会把代码替换为 <span> 高亮元素,需提取纯文本
const codeStr = extractTextContent(children).replace(/\n$/, '');
if (!match) return <code className={className} {...props}>{children}</code>;
return <CodeBlock language={match[1]} code={codeStr} />;
},
}}
>
{content}
</ReactMarkdown>
</Box>
), [content]);
return (
<Stack
direction="row"
@@ -109,23 +140,32 @@ export function AssistantMessage({ message, isStreaming }: AssistantMessageProps
)}
{hasContent ? (
<Box className="prose-metona">
<ReactMarkdown
remarkPlugins={[remarkGfm]}
rehypePlugins={[rehypeHighlight, rehypeRaw]}
components={{
code({ className, children, ...props }) {
const match = /language-(\w+)/.exec(className ?? '');
// rehype-highlight 会把代码替换为 <span> 高亮元素,需提取纯文本
const codeStr = extractTextContent(children).replace(/\n$/, '');
if (!match) return <code className={className} {...props}>{children}</code>;
return <CodeBlock language={match[1]} code={codeStr} />;
},
isStreaming ? (
// F3: 流式时用纯文本渲染,避免 ReactMarkdown 对长内容重新解析导致卡顿。
// 根因:每个 delta 触发 ReactMarkdown 全量重新解析 + rehypeHighlight 高亮,
// 内容长度增加时单次解析耗时 O(n) 退化,30+ delta/秒下呈 O(n²) 卡死。
// 流结束后自动切换到 ReactMarkdown 一次性渲染(一次性 O(n),可接受)。
<Box
component="pre"
className="prose-metona prose-streaming"
sx={{
margin: 0,
padding: 0,
fontFamily: 'inherit',
fontSize: 14,
lineHeight: 1.6,
whiteSpace: 'pre-wrap',
wordBreak: 'break-word',
overflowWrap: 'break-word',
color: 'text.primary',
}}
>
{content}
</ReactMarkdown>
</Box>
) : (
// F7: 使用 useMemo 缓存的 ReactMarkdown 元素
markdownElement
)
) : isStreaming ? (
<Typography variant="body2" sx={{ color: 'text.disabled', fontStyle: 'italic', py: 1 }}>
{isThinking ? '正在思考...' : '正在生成回复...'}
@@ -160,6 +200,13 @@ export function AssistantMessage({ message, isStreaming }: AssistantMessageProps
);
}
/**
* F1: memo 包裹 AssistantMessage。
* - 流式 delta 时仅最后一条 message 引用变化,历史消息跳过 re-render
* - agentStatus 订阅已优化(非流式时返回 'idle'),历史消息不受 agentStatus 变化影响
*/
export const AssistantMessage = memo(AssistantMessageImpl);
function CodeBlock({ language, code }: { language: string; code: string }): React.JSX.Element {
const [copied, setCopied] = useState(false);
const handleCopy = useCallback(async () => {
+14 -1
View File
@@ -2,8 +2,13 @@
* MessageItem — 单条消息路由组件
*
* 根据消息 role 路由到对应的子组件渲染。
*
* F1 性能优化: 使用 React.memo 包裹,避免流式 delta 触发历史消息重渲染。
* 浅比较策略:message 引用变化(store 仅替换最后一条)或 isStreaming 变化时才重渲染。
* 历史消息的 message 引用在 delta 流中保持不变,因此可跳过 re-render。
*/
import { memo } from 'react';
import { Box, Typography, Stack } from '@mui/material';
import { Terminal } from 'lucide-react';
import type { ChatMessage } from '@renderer/stores/agent-store';
@@ -18,7 +23,7 @@ interface MessageItemProps {
isStreaming?: boolean;
}
export function MessageItem({ message, isLast, isStreaming }: MessageItemProps): React.JSX.Element {
function MessageItemImpl({ message, isLast, isStreaming }: MessageItemProps): React.JSX.Element {
switch (message.role) {
case 'user':
return <UserMessage message={message} />;
@@ -41,6 +46,14 @@ export function MessageItem({ message, isLast, isStreaming }: MessageItemProps):
}
}
/**
* F1: memo 默认浅比较 props。
* - message 是对象引用,store 更新最后一条时只替换最后一条,历史消息引用不变 → 跳过 re-render
* - isStreaming 是 boolean,流式过程中值不变(持续 true),流结束才变化一次 → 历史消息仅重渲染一次
* - isLast 是 boolean,仅在最后一条切换时变化
*/
export const MessageItem = memo(MessageItemImpl);
/** ToolMessage — 独立的工具结果消息(role=tool) */
function ToolMessage({ message }: { message: ChatMessage }): React.JSX.Element {
return (
+84 -8
View File
@@ -13,13 +13,72 @@ export function MessageList(): React.JSX.Element {
const isStreaming = useAgentStore((s) => s.isStreaming);
const messagesEndRef = useRef<HTMLDivElement>(null);
// 流式输出时高频触发,使用 throttle 避免滚动卡顿
// F2: 滚动节流优化
// 问题:原实现用 setTimeout(80) debounce + 'smooth',高频 delta 时 trailing 永不触发,
// 且 'smooth' 在长列表上触发主线程布局动画,加剧卡顿。
// 方案:
// - 流式时:100ms 节流 + trailing 兜底 + 'auto' 行为(同步布局,无动画占主线程)
// - 非流式时:立即 'smooth' 滚动(新消息发送/接收完成)
// - 用 rAF 同步到下一帧,与 React 渲染合并,避免一帧内多次布局
const lastScrollRef = useRef(0);
const trailingTimerRef = useRef<number | null>(null);
const rafRef = useRef<number | null>(null);
useEffect(() => {
const timer = setTimeout(() => {
messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
}, 80);
return () => clearTimeout(timer);
}, [messages]);
const now = performance.now();
const elapsed = now - lastScrollRef.current;
// 调度一次 rAF 滚动(自动取消上一次挂起的 rAF)
const doScroll = (behavior: ScrollBehavior) => {
lastScrollRef.current = performance.now();
if (rafRef.current !== null) cancelAnimationFrame(rafRef.current);
rafRef.current = requestAnimationFrame(() => {
rafRef.current = null;
messagesEndRef.current?.scrollIntoView({ behavior });
});
};
// 非流式或首次进入:立即平滑滚动(新消息出现)
if (!isStreaming || lastScrollRef.current === 0) {
if (trailingTimerRef.current !== null) {
clearTimeout(trailingTimerRef.current);
trailingTimerRef.current = null;
}
doScroll('smooth');
return;
}
// 流式中:100ms 节流 + trailing 兜底
if (elapsed >= 100) {
// 已过节流窗口,立即执行
if (trailingTimerRef.current !== null) {
clearTimeout(trailingTimerRef.current);
trailingTimerRef.current = null;
}
doScroll('auto');
} else if (trailingTimerRef.current === null) {
// 在节流窗口内,安排 trailing 滚动(保证最后一次 delta 后到底)
const remaining = 100 - elapsed;
trailingTimerRef.current = window.setTimeout(() => {
trailingTimerRef.current = null;
doScroll('auto');
}, remaining);
}
}, [messages, isStreaming]);
// 组件卸载时清理所有挂起的 timer 和 rAF
useEffect(() => {
return () => {
if (trailingTimerRef.current !== null) {
clearTimeout(trailingTimerRef.current);
trailingTimerRef.current = null;
}
if (rafRef.current !== null) {
cancelAnimationFrame(rafRef.current);
rafRef.current = null;
}
};
}, []);
if (messages.length === 0 && !isStreaming) {
return (
@@ -35,10 +94,27 @@ export function MessageList(): React.JSX.Element {
}
return (
<Box sx={{ flex: 1, overflowY: 'auto', px: 2, py: 3 }}>
// F12: GPU 加速 — transform: translateZ(0) 将滚动容器提升为合成层
// 滚动时由合成器线程处理,避免主线程重绘叠加卡顿
// 风险评估:已确认 chat 目录内无 position: fixed 元素;
// ContextMenu 用 MUI Portal 渲染到 document.body,不受 transform 影响
<Box sx={{ flex: 1, overflowY: 'auto', px: 2, py: 3, transform: 'translateZ(0)' }}>
<Box sx={{ maxWidth: 768, mx: 'auto', display: 'flex', flexDirection: 'column', gap: 3 }}>
{messages.map((msg, i) => (
<MessageItem key={msg.id} message={msg} isLast={i === messages.length - 1} isStreaming={isStreaming} />
// F4: content-visibility 准虚拟滚动
// 浏览器原生支持,不可见区域跳过布局和绘制(DOM 节点保留但渲染开销 O(1))。
// 配合 F1 memo(跳过 re-render)+ F3 流式纯文本,历史消息开销降至最低。
// contain-intrinsic-size 提供估算高度,避免滚动时高度抖动。
// 注:如后续需真正虚拟滚动(移除 DOM 节点),可升级到 react-virtuoso。
<Box
key={msg.id}
sx={{
'content-visibility': 'auto',
'contain-intrinsic-size': 'auto 300px',
}}
>
<MessageItem message={msg} isLast={i === messages.length - 1} isStreaming={isStreaming} />
</Box>
))}
<StreamingIndicator />
<div ref={messagesEndRef} />
+19 -17
View File
@@ -26,23 +26,25 @@ export function OnboardingWizard(): React.JSX.Element | null {
const handleNext = async () => {
if (step < STEPS.length - 1) { setStep(step + 1); return; }
try {
if (window.metona?.config) {
const configSets: Promise<unknown>[] = [];
if (provider.trim()) configSets.push(window.metona.config.set('llm.provider', provider.trim()));
if (baseURL.trim()) configSets.push(window.metona.config.set('llm.baseURL', baseURL.trim()));
if (model.trim()) configSets.push(window.metona.config.set('llm.model', model.trim()));
if (apiKey.trim()) configSets.push(window.metona.config.set('llm.apiKey', apiKey.trim()));
if (workspacePath.trim()) configSets.push(window.metona.config.set('workspace.path', workspacePath.trim()));
configSets.push(window.metona.config.set('onboarding.completed', true));
// M-26 修复: 改用 Promise.allSettled,单个配置写入失败不阻止 onboarding 完成
// 但 onboarding.completed 必须成功,否则用户重启后仍会看到引导
const results = await Promise.allSettled(configSets);
const failedCount = results.filter((r) => r.status === 'rejected').length;
if (failedCount > 0) {
console.error('[OnboardingWizard]', `${failedCount} config(s) failed to save`);
// 用户主动操作失败必须有反馈,否则按钮看起来无响应
import('metona-toast').then((mod) => mod.default.error(`部分配置保存失败(${failedCount} 项),请重试`)).catch(() => {});
// 不调用 setOnboardingCompleted(true),让用户重试
if (window.metona?.config?.setBatch) {
// v0.3.9: 改用批量保存,避免并行 config.set 中间态触发 reloadAdapter 失败
// 旧实现问题:Promise.allSettled 并行 6 个 config.set
// - llm.provider 写入会清空 llm.apiKey(与 llm.apiKey 写入竞态)
// - reloadAdapter 被调用 4 次,中间态必然失败
// - 代码只检查 status === 'rejected',完全忽略 { success: false } 的情况
// - 实际配置失败但前端显示成功并关闭向导
const entries: Array<{ key: string; value: unknown }> = [];
if (provider.trim()) entries.push({ key: 'llm.provider', value: provider.trim() });
if (baseURL.trim()) entries.push({ key: 'llm.baseURL', value: baseURL.trim() });
if (model.trim()) entries.push({ key: 'llm.model', value: model.trim() });
if (apiKey.trim()) entries.push({ key: 'llm.apiKey', value: apiKey.trim() });
if (workspacePath.trim()) entries.push({ key: 'workspace.path', value: workspacePath.trim() });
entries.push({ key: 'onboarding.completed', value: true });
const r = await window.metona.config.setBatch(entries);
if (r && !r.success) {
console.error('[OnboardingWizard]', 'Batch config save failed:', r.error);
import('metona-toast').then((mod) => mod.default.error(r.error ?? '配置保存失败,请重试')).catch(() => {});
return;
}
useAgentStore.getState().setProvider(provider.trim() || 'deepseek', model.trim() || '');
+19 -25
View File
@@ -440,35 +440,29 @@ function LLMSettings() {
}
setSaving(true);
try {
const setConfig = window.metona?.config?.set;
if (!setConfig) {
const setBatch = window.metona?.config?.setBatch;
if (!setBatch) {
import('metona-toast').then((mod) => mod.default.error('配置 API 不可用')).catch(() => {});
return;
}
// 串行保存:避免并发 IPC 调用(reloadAdapter 内部 lastConfigSig 比较会跳过中间态的重载)
const fields: Array<[string, unknown]> = [
['llm.provider', provider],
['llm.model', model],
['llm.apiKey', apiKey],
['llm.baseURL', baseURL],
['ollama.numCtx', numCtx],
['deepseek.contextWindow', dsCtxWindow],
['agnes.contextWindow', agnesCtxWindow],
['mimo.contextWindow', mimoCtxWindow],
// v0.3.9: 批量保存,避免串行保存中间态触发 reloadAdapter 失败
// 旧实现:串行 config:set 8 次,provider 切换后第 1 步会清空 apiKey,
// 此时 reloadAdapter 读到空 apiKey 返回 false,前端 toast 报"配置不全"
// 但所有字段实际已写入,第二次点保存才显示"已保存"。
// 新实现:一次性传所有字段,后端先写入全部,最后统一 reloadAdapter 一次。
const entries: Array<{ key: string; value: unknown }> = [
{ key: 'llm.provider', value: provider },
{ key: 'llm.model', value: model },
{ key: 'llm.apiKey', value: apiKey },
{ key: 'llm.baseURL', value: baseURL },
{ key: 'ollama.numCtx', value: numCtx },
{ key: 'deepseek.contextWindow', value: dsCtxWindow },
{ key: 'agnes.contextWindow', value: agnesCtxWindow },
{ key: 'mimo.contextWindow', value: mimoCtxWindow },
];
let firstError: string | null = null;
for (const [key, value] of fields) {
try {
const r = await setConfig(key, value);
if (r && !r.success && !firstError) {
firstError = r.error ?? '配置保存失败';
}
} catch (err) {
if (!firstError) firstError = (err as Error).message;
}
}
if (firstError) {
import('metona-toast').then((mod) => mod.default.error(firstError!)).catch(() => {});
const r = await setBatch(entries);
if (r && !r.success) {
import('metona-toast').then((mod) => mod.default.error(r.error ?? '配置保存失败')).catch(() => {});
} else {
import('metona-toast').then((mod) => mod.default.success('配置已保存')).catch(() => {});
}
+16 -2
View File
@@ -95,6 +95,18 @@ export function TaskList(): React.JSX.Element {
return () => { loadReqIdRef.current++; };
}, [sessionId, loadTasks]);
// P2v0.3.13: 订阅任务变更事件(Agent 通过 task_manager 工具写入后自动刷新)
useEffect(() => {
if (!window.metona?.tasks?.onTaskChanged) return;
const unsubscribe = window.metona.tasks.onTaskChanged((changedSessionId) => {
// 只刷新当前会话的任务
if (changedSessionId === sessionId) {
loadTasks(sessionId ?? undefined);
}
});
return unsubscribe;
}, [sessionId, loadTasks]);
const handleCreate = async () => {
if (!sessionId) {
// 用户主动操作失败应用 toast(与项目惯例一致)
@@ -132,9 +144,10 @@ export function TaskList(): React.JSX.Element {
const handleToggleComplete = async (task: MetonaTask) => {
if (!window.metona?.tasks?.update) return;
if (!sessionId) return;
const nextStatus: TaskStatus = task.status === 'completed' ? 'pending' : 'completed';
try {
const res = await window.metona.tasks.update(task.id, { status: nextStatus });
const res = await window.metona.tasks.update(task.id, { status: nextStatus }, sessionId);
if (!res.success) {
import('metona-toast').then((mod) => mod.default.error(res.error ?? '更新任务失败')).catch(() => {});
return;
@@ -147,8 +160,9 @@ export function TaskList(): React.JSX.Element {
const handleDelete = async (id: string) => {
if (!window.metona?.tasks?.delete) return;
if (!sessionId) return;
try {
const res = await window.metona.tasks.delete(id);
const res = await window.metona.tasks.delete(id, sessionId);
if (!res.success) {
import('metona-toast').then((mod) => mod.default.error(res.error ?? '删除任务失败')).catch(() => {});
return;
+108 -20
View File
@@ -25,6 +25,66 @@ export function useAgentStream(): void {
useEffect(() => {
if (!window.metona?.agent?.onStreamEvent) return;
// F5: text_delta rAF 批处理
// 问题:每个 text_delta 直接调用 updateLastAssistantMessage + updateLastTraceStep
// 频率 30-50 次/秒,每次触发 store 更新 + React re-render。
// 方案:累积 delta 到缓冲区,用 rAF 每帧 commit 一次,合并多次 store 写入。
// done/error 时立即 flush,避免最后一段 delta 丢失。
// 新迭代卡片创建逻辑(needsNewCard)立即处理,不缓冲。
let textDeltaBuffer = '';
let textBufferSessionId: string | undefined;
let textRafId: number | null = null;
const flushTextDelta = () => {
textRafId = null;
if (!textDeltaBuffer) return;
const delta = textDeltaBuffer;
const bufferedSessionId = textBufferSessionId;
textDeltaBuffer = '';
textBufferSessionId = undefined;
const store = useAgentStore.getState();
// 会话切换保护:如果缓冲时的会话与当前会话不一致,丢弃(避免跨会话污染)
if (bufferedSessionId && store.currentSessionId !== bufferedSessionId) return;
store.updateLastAssistantMessage(delta);
// 无 reasoning 模式下,将文本内容也记入 Trace thought
const messages = store.messages;
const lastMsg = messages[messages.length - 1];
const steps = store.traceSteps;
const step = steps[steps.length - 1];
if (step && lastMsg?.role === 'assistant' && !lastMsg.reasoningContent) {
store.updateLastTraceStep({
thought: (step.thought ?? '') + delta,
});
}
};
// F9: reasoning_delta 的 traceSteps thought 更新走 rAF 批处理
// 问题:reasoning_delta 每个 delta 调用 updateLastTraceStep,频率 10-30 次/秒,
// 触发 TraceViewer 等订阅者 re-render(即使不可见也有 selector 调用开销)。
// 方案:累积 reasoning delta 到缓冲区,rAF 每帧 commit 一次。
// message.reasoningContent 保持即时更新(ThoughtBlock 需实时显示思考内容)。
// 新迭代卡片创建时的 thought 更新保持即时(新卡片需立即显示)。
let traceThoughtBuffer = '';
let traceRafId: number | null = null;
const flushTraceThought = () => {
traceRafId = null;
if (!traceThoughtBuffer) return;
const delta = traceThoughtBuffer;
traceThoughtBuffer = '';
const store = useAgentStore.getState();
const steps = store.traceSteps;
const step = steps[steps.length - 1];
if (step) {
store.updateLastTraceStep({
thought: (step.thought ?? '') + delta,
});
}
};
const unsubscribe = window.metona.agent.onStreamEvent((event: unknown) => {
const data = event as {
type?: string;
@@ -121,13 +181,11 @@ export function useAgentStream(): void {
});
}
// 同步更新当前 Trace 步骤的 thought 字段
const traceSteps = getStore().traceSteps;
const curStep = traceSteps[traceSteps.length - 1];
if (curStep) {
getStore().updateLastTraceStep({
thought: (curStep.thought ?? '') + data.delta,
});
// F9: traceSteps thought 更新走 rAF 批处理(减少 TraceViewer re-render 频率)
// message.reasoningContent 保持即时更新(ThoughtBlock 需实时显示)
traceThoughtBuffer += data.delta;
if (traceRafId === null) {
traceRafId = requestAnimationFrame(flushTraceThought);
}
}
break;
@@ -142,6 +200,11 @@ export function useAgentStream(): void {
const needsNewCard = !last || last.role !== 'assistant' ||
(last.iteration != null && last.iteration !== data.iteration);
if (needsNewCard) {
// F5: 新迭代前先 flush 旧缓冲区(属于上一条消息的 delta)
if (textRafId !== null) {
cancelAnimationFrame(textRafId);
flushTextDelta();
}
getStore().addMessage({
id: genMsgId('assistant'),
role: 'assistant',
@@ -155,19 +218,14 @@ export function useAgentStream(): void {
break;
}
}
// isStreaming 已在 sendMessage 时设置为 true,无需每个 delta 重复设置
getStore().updateLastAssistantMessage(data.delta);
// 无 reasoning 模式下,将文本内容也记入 Trace thought(便于追踪)
// 当 assistant 消息无 reasoningContent 时,持续累积 text delta 到 thought
const messages = getStore().messages;
const lastMsg = messages[messages.length - 1];
const steps = getStore().traceSteps;
const step = steps[steps.length - 1];
if (step && lastMsg?.role === 'assistant' && !lastMsg.reasoningContent) {
getStore().updateLastTraceStep({
thought: (step.thought ?? '') + data.delta,
});
// F5: 累积 delta 到缓冲区,用 rAF 每帧 commit 一次
// 首次缓冲时记录 sessionId(用于会话切换保护)
if (textDeltaBuffer === '') {
textBufferSessionId = data.sessionId;
}
textDeltaBuffer += data.delta;
if (textRafId === null) {
textRafId = requestAnimationFrame(flushTextDelta);
}
}
break;
@@ -305,6 +363,16 @@ export function useAgentStream(): void {
// 流结束
case 'done':
// F5: 流结束前立即 flush 缓冲区,避免最后一段 delta 丢失
if (textRafId !== null) {
cancelAnimationFrame(textRafId);
flushTextDelta();
}
// F9: flush traceThought 缓冲区,避免最后一段 reasoning delta 丢失
if (traceRafId !== null) {
cancelAnimationFrame(traceRafId);
flushTraceThought();
}
getStore().setStreaming(false);
getStore().setCurrentRunId(null);
// 不覆盖 error 状态 — error handler 已设置 agentStatus='error'
@@ -318,6 +386,16 @@ export function useAgentStream(): void {
// 错误
case 'error':
// F5: 错误前立即 flush 缓冲区,保留已接收的内容
if (textRafId !== null) {
cancelAnimationFrame(textRafId);
flushTextDelta();
}
// F9: flush traceThought 缓冲区,保留已接收的 reasoning 内容
if (traceRafId !== null) {
cancelAnimationFrame(traceRafId);
flushTraceThought();
}
getStore().setStreaming(false);
getStore().setCurrentRunId(null);
getStore().setAgentStatus('error');
@@ -335,6 +413,16 @@ export function useAgentStream(): void {
cleanupRef.current = unsubscribe;
return () => {
// F5: 组件卸载时清理挂起的 rAF,并 flush 残留 delta(保留已接收内容)
if (textRafId !== null) {
cancelAnimationFrame(textRafId);
flushTextDelta();
}
// F9: 清理 traceThought 的 rAF
if (traceRafId !== null) {
cancelAnimationFrame(traceRafId);
flushTraceThought();
}
cleanupRef.current?.();
};
}, []);
+4
View File
@@ -187,6 +187,10 @@ code, pre, .font-mono { font-family: 'SF Mono', 'Fira Code', 'Cascadia Code', mo
color: inherit;
line-height: 1.7;
font-size: 14px;
/* F10: CSS containment 隔离布局计算
contain: layout style 隔离 markdown 渲染区域的布局和样式计算,
避免 reflow 扩散到外部容器。不含 paint 以避免裁剪代码块横向滚动溢出。 */
contain: layout style;
}
.prose-metona h1,
+6 -1
View File
@@ -162,6 +162,8 @@ interface MetonaMemoryAPI {
interface MetonaConfigAPI {
get: (key: string) => Promise<unknown>;
set: (key: string, value: unknown) => Promise<{ success: boolean }>;
// v0.3.9: 批量保存配置,避免串行保存中间态触发 reloadAdapter 失败
setBatch: (entries: Array<{ key: string; value: unknown }>) => Promise<{ success: boolean }>;
}
// ===== App API =====
@@ -306,8 +308,11 @@ interface MetonaTasksAPI {
priority?: string;
assignedTo?: string;
},
sessionId: string,
) => Promise<{ success: boolean; error?: string }>;
delete: (id: string) => Promise<{ success: boolean; error?: string }>;
delete: (id: string, sessionId: string) => Promise<{ success: boolean; error?: string }>;
// P2v0.3.13: 订阅任务变更事件
onTaskChanged: (callback: (sessionId: string) => void) => () => void;
}
// ===== v0.2.0: Audit API =====