Files
thzxx 97a3d3d53b fix: 全面修复审计问题并优化系统提示词
**崩溃/挂死修复 (5):**
- 统一 TrayManager.isQuitting 变量,修复 Cmd+Q 无法退出
- useAgentStream 闭包过期快照 → 每次 getState()
- Agnes chatStream 添加 AbortSignal.timeout
- SSE JSON.parse 添加 try-catch 保护
- Orchestrator setTools 污染 → save/restore 模式

**功能修复 (14):**
- 上下文压缩实现 (每5轮 COMPRESSING 状态)
- 修复 requestId 硬编码空串
- ConfigService.set() 保留已有 category
- MemoryManager 新增 working 类型搜索
- PromptInjectionDefender 补全 sanitize()
- Ollama: 补全 dynamicReminders + reasoningContent
- openai-format: 所有 assistant 消息保留 reasoningContent
- SSE: finish_reason 时提前 flush tool_calls
- DeepSeek thinking effort 映射注释
- Ollama done_reason load→stop
- RateLimitHook >= 边界修复
- WorkspaceService isValid 首次启动修复
- sessions:archive IPC handler
- 托盘/窗口图标路径生产环境修复

**系统提示词优化:**
- SOUL.md 存在时不显示兜底身份,原文放最前
- 兜底身份改为中文 (MetonaAI 自身描述)
- 用户文本在前,附件内容在后

**文件上传:**
- 非图片文件不再 base64 编码,保留 JSON 结构
- 用户文本优先于文件内容

**UI 修复:**
- 首页 Logo 路径修复 (public/ + 相对路径)
- TokenUsage contextWindow 动态计算 (Provider 感知)
- 切换 Provider 同步 contextWindow
- 托盘图标始终显示 Logo (状态由右键菜单展示)
2026-06-30 23:17:38 +08:00

224 lines
5.3 KiB
TypeScript

/**
* Tray Manager — 系统托盘管理
*
* 职责:
* 1. 创建系统托盘图标
* 2. 托盘右键菜单(新建会话、显示窗口、退出)
* 3. 托盘图标状态指示(空闲/思考中/执行中)
* 4. 点击托盘图标显示/隐藏窗口
*
* @see docs/MetonaAI-Desktop UI UX 设计集成方案.html — 窗口管理
*/
import { Tray, Menu, BrowserWindow, app, nativeImage, Notification } from 'electron';
import { join } from 'path';
import { existsSync } from 'fs';
import log from 'electron-log';
export type TrayStatus = 'idle' | 'thinking' | 'executing' | 'error';
export class TrayManager {
private tray: Tray | null = null;
private mainWindow: BrowserWindow | null = null;
private currentStatus: TrayStatus = 'idle';
private static isQuitting = false;
constructor(private resourcesPath: string) {}
/**
* 初始化系统托盘
*/
initialize(mainWindow: BrowserWindow): void {
this.mainWindow = mainWindow;
// 创建托盘图标
const iconPath = this.getTrayIconPath();
if (!iconPath) {
log.warn('Tray icon not found, skipping tray initialization');
return;
}
this.tray = new Tray(iconPath);
this.tray.setToolTip('MetonaAI Desktop');
// 构建右键菜单
this.updateContextMenu();
// 点击托盘图标:显示/隐藏窗口
this.tray.on('click', () => {
if (this.mainWindow) {
if (this.mainWindow.isVisible()) {
this.mainWindow.hide();
} else {
this.mainWindow.show();
this.mainWindow.focus();
}
}
});
// 窗口关闭时隐藏到托盘(不退出)
mainWindow.on('close', (event) => {
if (!TrayManager.isQuitting) {
event.preventDefault();
mainWindow.hide();
}
});
log.info('System tray initialized');
}
/**
* 标记应用正在退出(窗口关闭时不阻止)
*/
static markQuitting(): void {
TrayManager.isQuitting = true;
}
/**
* 更新托盘状态
*/
setStatus(status: TrayStatus): void {
if (!this.tray) return;
this.currentStatus = status;
const statusLabels: Record<TrayStatus, string> = {
idle: 'MetonaAI — 空闲',
thinking: 'MetonaAI — 思考中...',
executing: 'MetonaAI — 执行中...',
error: 'MetonaAI — 错误',
};
this.tray.setToolTip(statusLabels[status]);
this.updateContextMenu();
// 更新图标(如果有多状态图标)
this.updateTrayIcon(status);
}
/**
* 发送系统通知
*/
sendNotification(title: string, body: string, onClick?: () => void): void {
if (!Notification.isSupported()) return;
const notification = new Notification({
title,
body,
icon: this.getTrayIconPath() ?? undefined,
});
if (onClick) {
notification.on('click', onClick);
}
notification.show();
}
/**
* 销毁托盘
*/
destroy(): void {
if (this.tray) {
this.tray.destroy();
this.tray = null;
}
}
// ===== 私有方法 =====
/**
* 获取托盘图标路径
*
* 优先级:process.resourcesPath(打包后)> resourcesPath 参数(开发模式) > __dirname fallback
*/
private getTrayIconPath(): string | null {
const searchDirs: string[] = [
join(process.resourcesPath || '', 'app.asar.unpacked', 'assets'),
join(process.resourcesPath || '', 'assets'),
this.resourcesPath,
join(__dirname, '../../assets'),
];
const candidates = ['logo.ico', 'logo.png', 'icon.ico', 'icon.png'];
for (const dir of searchDirs) {
for (const name of candidates) {
const fullPath = join(dir, name);
if (existsSync(fullPath)) return fullPath;
}
}
return null;
}
/**
* 更新托盘图标
*
* 始终使用原始 logo 图标(状态已在右键菜单中显示,图标保持品牌识别)。
*/
private updateTrayIcon(_status: TrayStatus): void {
if (!this.tray) return;
const basePath = this.getTrayIconPath();
if (!basePath) return;
const image = nativeImage.createFromPath(basePath);
this.tray.setImage(image.resize({ width: 16, height: 16 }));
}
/**
* 更新右键菜单
*/
private updateContextMenu(): void {
if (!this.tray) return;
const statusIcons: Record<TrayStatus, string> = {
idle: '⚪',
thinking: '🔵',
executing: '🟢',
error: '🔴',
};
const contextMenu = Menu.buildFromTemplate([
{
label: `MetonaAI Desktop`,
enabled: false,
},
{
label: `状态: ${statusIcons[this.currentStatus]} ${this.currentStatus}`,
enabled: false,
},
{ type: 'separator' },
{
label: '显示窗口',
click: () => {
if (this.mainWindow) {
this.mainWindow.show();
this.mainWindow.focus();
}
},
},
{
label: '新建会话',
click: () => {
if (this.mainWindow) {
this.mainWindow.show();
this.mainWindow.focus();
this.mainWindow.webContents.send('tray:newSession');
}
},
},
{ type: 'separator' },
{
label: '退出',
click: () => {
TrayManager.isQuitting = true;
app.quit();
},
},
]);
this.tray.setContextMenu(contextMenu);
}
}