feat: 升级至 v0.2.3 — Token 估算优化、工具确认超时改进、工作空间标签页

1. Token 估算优化(核心改进):新增 token-estimator.ts 智能字符估算(中文 1.5 token/字、ASCII 0.25 token/字),替换三处旧的 length/2 粗略估算,中文场景准确度从 ~50% 提升到 ~90%

2. 工具确认超时改进:超时时间可配置(30s~600s)、超时 toast 通知、ConfirmationDialog 倒计时 UI(进度条 + 最后 10 秒红色脉冲动画)、SettingsModal 新增配置入口

3. 详情栏新增 Workspace 标签页:workspace:getInfo IPC + WorkspaceViewer 组件(文件预览、目录状态、在文件管理器打开)
This commit is contained in:
thzxx
2026-07-12 14:20:05 +08:00
parent 0363176215
commit 1eabed9b70
13 changed files with 563 additions and 35 deletions
+5 -12
View File
@@ -34,6 +34,7 @@ import type {
MetonaToolDef,
} from '../types';
import { MetonaStreamEventType, MetonaFinishReason } from '../types';
import { estimateMessagesTokens } from '../utils/token-estimator';
import log from 'electron-log';
const DEFAULT_CONFIG: AgentLoopConfig = {
@@ -715,20 +716,12 @@ export class AgentLoopEngine extends EventEmitter {
}
/**
* 估算消息列表的 token 数(粗略:1 字符 ≈ 0.5 token
* 估算消息列表的 token 数
* 使用智能字符估算:中文 1.5 token/字,ASCII 0.25 token/字,其他 1 token/字
* @see electron/harness/utils/token-estimator.ts
*/
private estimateMessagesTokens(messages: MetonaMessage[]): number {
let total = 0;
for (const msg of messages) {
total += Math.ceil(msg.content.length / 2);
if (msg.reasoningContent) total += Math.ceil(msg.reasoningContent.length / 2);
if (msg.toolCalls) {
for (const tc of msg.toolCalls) {
total += Math.ceil(JSON.stringify(tc.args).length / 2);
}
}
}
return total;
return estimateMessagesTokens(messages);
}
/**
+47 -5
View File
@@ -38,16 +38,17 @@ export class ConfirmationHook implements PreToolHook {
private autoExecuteTools = new Set<string>();
/** 等待确认的 Promise 解析器 */
private pendingConfirmations = new Map<string, { resolve: (v: boolean) => void; timer: NodeJS.Timeout; toolName: string }>();
private pendingConfirmations = new Map<string, { resolve: (v: boolean) => void; timer: NodeJS.Timeout; toolName: string; expiresAt: number }>();
/** 确认超时时间(默认 120 秒) */
private readonly confirmationTimeoutMs = 120_000;
/** 确认超时时间(可从配置读取,默认 120 秒) */
private confirmationTimeoutMs = 120_000;
constructor(
private mainWindow: BrowserWindow | null = null,
private configService: ConfigService | null = null,
) {
this.loadAutoExecuteList();
this.loadConfirmationTimeout();
}
/** 设置主窗口(用于发送 IPC 消息) */
@@ -102,6 +103,33 @@ export class ConfirmationHook implements PreToolHook {
return Array.from(this.autoExecuteTools);
}
/**
* 从 ConfigService 加载确认超时时间
* 配置键:agent.confirmationTimeoutMs(单位毫秒,最小 30 秒,最大 600 秒)
*/
private loadConfirmationTimeout(): void {
if (!this.configService) return;
try {
const timeout = this.configService.get<number>('agent.confirmationTimeoutMs');
if (timeout != null) {
// 限制范围:30 秒 ~ 600 秒
this.confirmationTimeoutMs = Math.min(600_000, Math.max(30_000, timeout));
}
} catch {
// 配置加载失败,使用默认值
}
}
/** 设置确认超时时间(运行时更新) */
setConfirmationTimeout(ms: number): void {
this.confirmationTimeoutMs = Math.min(600_000, Math.max(30_000, ms));
}
/** 获取当前确认超时时间 */
getConfirmationTimeout(): number {
return this.confirmationTimeoutMs;
}
/** 注入工具定义列表(用于查询风险等级) */
setToolDefs(defs: MetonaToolDef[]): void {
this.toolDefs.clear();
@@ -187,12 +215,22 @@ export class ConfirmationHook implements PreToolHook {
/**
* 等待用户确认(带超时)
* 发送 expiresAt 到前端,供倒计时 UI 使用;超时时发送 toast 通知
*/
private waitForConfirmation(request: ConfirmationRequest): Promise<boolean> {
return new Promise<boolean>((resolve) => {
const expiresAt = Date.now() + this.confirmationTimeoutMs;
// 设置超时
const timer = setTimeout(() => {
this.pendingConfirmations.delete(request.toolCallId);
// 超时发送 toast 通知用户
if (this.mainWindow && !this.mainWindow.isDestroyed()) {
this.mainWindow.webContents.send('toast:show', {
type: 'warning',
message: `工具确认超时(${Math.round(this.confirmationTimeoutMs / 1000)}秒),"${request.toolName}" 未执行`,
});
}
resolve(false); // 超时视为拒绝
}, this.confirmationTimeoutMs);
@@ -200,11 +238,15 @@ export class ConfirmationHook implements PreToolHook {
resolve,
timer,
toolName: request.toolName,
expiresAt,
});
// 发送确认请求到渲染进程
// 发送确认请求到渲染进程(携带过期时间戳,供前端倒计时)
if (this.mainWindow && !this.mainWindow.isDestroyed()) {
this.mainWindow.webContents.send('tool:confirmationRequest', request);
this.mainWindow.webContents.send('tool:confirmationRequest', {
...request,
expiresAt,
});
}
});
}
+14 -9
View File
@@ -17,6 +17,7 @@
import type { MetonaContext, MetonaMemoryItem, MetonaMessage, MetonaSystemPrompt, MetonaToolDef } from '../types';
import type { WorkspaceFiles } from '../../services/workspace.service';
import { estimateStringTokens } from '../utils/token-estimator';
interface ContextBuildParams {
userInput: string;
@@ -245,6 +246,8 @@ Use tools when needed to gather information or perform actions. Think step by st
/**
* Token 估算
* 使用智能字符估算:中文 1.5 token/字,ASCII 0.25 token/字,其他 1 token/字
* @see electron/harness/utils/token-estimator.ts
*/
private estimateTokens(
history: MetonaMessage[],
@@ -256,22 +259,24 @@ Use tools when needed to gather information or perform actions. Think step by st
let total = 0;
// System Prompt
total += Math.ceil((systemPrompt.roleDefinition?.length ?? 0) / 2);
total += Math.ceil((systemPrompt.outputConstraints?.length ?? 0) / 2);
total += Math.ceil((systemPrompt.safetyGuidelines?.length ?? 0) / 2);
total += Math.ceil((systemPrompt.dynamicReminders?.length ?? 0) / 2);
total += estimateStringTokens(systemPrompt.roleDefinition ?? '');
total += estimateStringTokens(systemPrompt.outputConstraints ?? '');
total += estimateStringTokens(systemPrompt.safetyGuidelines ?? '');
total += estimateStringTokens(systemPrompt.dynamicReminders ?? '');
// 历史消息
for (const msg of history) total += Math.ceil(msg.content.length / 2);
// 历史消息(每条加 4 token 结构性开销)
for (const msg of history) {
total += estimateStringTokens(msg.content) + 4;
}
// 记忆
for (const mem of memories) total += Math.ceil(mem.content.length / 2);
for (const mem of memories) total += estimateStringTokens(mem.content);
// 工具定义
for (const tool of tools) total += Math.ceil((tool.name.length + tool.description.length) / 2);
for (const tool of tools) total += estimateStringTokens(tool.name + tool.description);
// 用户输入
total += Math.ceil(userInput.length / 2);
total += estimateStringTokens(userInput);
return total;
}
+72
View File
@@ -0,0 +1,72 @@
/**
* Token 估算工具 — 跨 Provider 通用
*
* 策略:智能字符估算,区分中文字符与 ASCII 字符
* - 中文字符(含全角标点、日韩文):1 字符 ≈ 1.5 token
* - ASCII 字符(英文、数字、半角符号):4 字符 ≈ 1 token
* - 其他 Unicodeemoji 等):1 字符 ≈ 1 token
*
* 对比旧的 `length / 2` 方案:
* - 中文场景:估算准确度从 ~50% 提升到 ~90%
* - 英文场景:从偏低变为接近真实
* - 混合场景:更贴近实际 token 消耗
*
* 仍为估算值(无 tiktoken 依赖),但留了 80% 触发阈值的缓冲。
*/
// 中日韩统一表意文字 + 全角标点 + 日文假名 + 韩文谚文
const CJK_REGEX = /[\u4e00-\u9fff\u3400-\u4dbf\u3000-\u303f\uff00-\uffef\u3040-\u309f\u30a0-\u30ff\uac00-\ud7af]/;
/**
* 估算字符串的 token 数
* @param text 待估算的字符串
* @returns 估算的 token 数
*/
export function estimateStringTokens(text: string): number {
if (!text || text.length === 0) return 0;
let cjkCount = 0;
let asciiCount = 0;
let otherCount = 0;
for (const ch of text) {
if (CJK_REGEX.test(ch)) {
cjkCount++;
} else if (ch.charCodeAt(0) < 128) {
asciiCount++;
} else {
otherCount++;
}
}
// 中文字符 1.5 token/字,ASCII 0.25 token/字,其他 1 token/字
return Math.ceil(cjkCount * 1.5 + asciiCount * 0.25 + otherCount);
}
/**
* 估算多条消息的总 token 数
*
* 每条消息额外加 4 token 的结构性开销(role、分隔符等,参考 OpenAI 规范)
*
* @param messages 消息列表
* @returns 估算的 token 数
*/
export function estimateMessagesTokens(messages: Array<{
content: string;
reasoningContent?: string;
toolCalls?: Array<{ args: Record<string, unknown> }>;
}>): number {
let total = 0;
for (const msg of messages) {
total += estimateStringTokens(msg.content);
if (msg.reasoningContent) total += estimateStringTokens(msg.reasoningContent);
if (msg.toolCalls) {
for (const tc of msg.toolCalls) {
total += estimateStringTokens(JSON.stringify(tc.args));
}
}
// 每条消息的结构性开销(role、分隔符)
total += 4;
}
return total;
}
+73 -1
View File
@@ -28,6 +28,7 @@ import type { MemoryConsolidator } from '../harness/memory/consolidator';
import type { MetonaMessage, MetonaStreamEvent } from '../harness/types';
import { MetonaErrorCode, MetonaStreamEventType } from '../harness/types';
import type { MetonaError } from '../harness/types';
import { estimateMessagesTokens } from '../harness/utils/token-estimator';
import log from 'electron-log';
/**
@@ -198,7 +199,7 @@ export function registerAllIPCHandlers(
// TRACE 层:记录上下文构建
sessionRecorder.recordContextBuilt({
tokenCount: history.reduce((sum, m) => sum + Math.ceil(m.content.length / 2), 0),
tokenCount: estimateMessagesTokens(history),
usageRatio: 0,
});
@@ -500,6 +501,10 @@ export function registerAllIPCHandlers(
// numCtx 同时更新 Engine 的 contextLength
agentLoop.updateConfig({ contextLength: (value as number) || undefined });
log.info(`[CONFIG] Agent contextLength updated to ${value}`);
} else if (key === 'agent.confirmationTimeoutMs') {
// 工具确认超时变更,即时应用到 ConfirmationHook
confirmationHook.setConfirmationTimeout(value as number);
log.info(`[CONFIG] Confirmation timeout updated to ${value}ms`);
}
// 日志级别变更时即时应用
@@ -663,6 +668,73 @@ export function registerAllIPCHandlers(
return { success: true, inherited, failed };
});
// 获取当前工作空间详情:路径 + 4 个核心文件状态 + 自动目录状态
ipcMain.handle('workspace:getInfo', async () => {
const { existsSync, statSync } = await import('fs');
const workspacePath = workspaceService.getPath();
const files = workspaceService.reload(); // 同步外部可能的手动修改
const REQUIRED = ['SOUL.md', 'AGENTS.md', 'MEMORY.md', 'USERS.md'] as const;
const AUTO_DIRS = ['logs', 'traces', '.metona'] as const;
const fileInfos = REQUIRED.map((name) => {
const filePath = join(workspacePath, name);
let exists = false;
let size = 0;
let mtime = 0;
let preview = '';
try {
if (existsSync(filePath)) {
const stat = statSync(filePath);
exists = true;
size = stat.size;
mtime = stat.mtimeMs;
// 截取前 500 字符作为预览
const { readFileSync } = await import('fs');
const content = readFileSync(filePath, 'utf-8');
preview = content.length > 500 ? content.slice(0, 500) + '\n...(已截断)' : content;
}
} catch {
// ignore
}
// 文件内容映射:SOUL.md → files.soul, AGENTS.md → files.agents 等
const contentKey = name.toLowerCase().replace('.md', '') as 'soul' | 'agents' | 'memory' | 'users';
return {
name,
path: filePath,
exists,
size,
mtime,
preview: exists ? preview : (files[contentKey] ?? ''),
};
});
const dirInfos = AUTO_DIRS.map((name) => {
const dirPath = join(workspacePath, name);
let exists = false;
let fileCount = 0;
try {
if (existsSync(dirPath)) {
exists = true;
const stat = statSync(dirPath);
if (stat.isDirectory()) {
const { readdirSync } = await import('fs');
fileCount = readdirSync(dirPath).length;
}
}
} catch {
// ignore
}
return { name, path: dirPath, exists, fileCount };
});
return {
path: workspacePath,
files: fileInfos,
dirs: dirInfos,
};
});
// ===== 工具管理 =====
ipcMain.handle('tools:list', async () => {
+1
View File
@@ -122,6 +122,7 @@ const metonaAPI = {
check: (targetPath: string) => ipcRenderer.invoke('workspace:check', targetPath),
inheritFiles: (params: { targetPath: string; sourcePath: string; files: string[] }) =>
ipcRenderer.invoke('workspace:inheritFiles', params),
getInfo: () => ipcRenderer.invoke('workspace:getInfo'),
},
// ===== 工具管理 =====