feat: v0.8.3 工作空间切换链路根治 · 思考强度扩档 — 启动TDZ连锁/继承丢数/回显滞后三修复 · xhigh+true档位单源 · 安全防线ready后注册 · 2217 用例全量回归 + 生产模式E2E
This commit is contained in:
@@ -82,7 +82,9 @@ describe('OpenAIAdapter — 推理模型 reasoning_effort', () => {
|
||||
['low', 'low'],
|
||||
['medium', 'medium'],
|
||||
['high', 'high'],
|
||||
['xhigh', 'high'], // v0.8.3: OpenAI 档位封顶 high,xhigh 就近降档
|
||||
['max', 'high'], // max 归一 high
|
||||
['true', 'high'], // v0.8.3: 模型默认档归一 high
|
||||
] as const)('o3-mini effort=%s → reasoning_effort=%s', async (effort, expected) => {
|
||||
const adapter = makeAdapter('o3-mini');
|
||||
mockFetch.mockResolvedValue(okResponse());
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
*
|
||||
* Ollama:
|
||||
* O1 options 映射(num_predict=numTokens、num_ctx=contextLength、stop、top_p)
|
||||
* O2 think 参数 effort 映射(low→"low"、max→true)与未配置时缺省
|
||||
* O2 think 参数 effort 映射(low→"low"、xhigh→"xhigh"、max/true→true)与未配置时缺省
|
||||
* O3 图片归一化(data URI 剥前缀;无 URL 触发下载分支时零网络请求)
|
||||
*
|
||||
* Agnes:
|
||||
@@ -286,7 +286,7 @@ describe('OllamaAdapter — 请求体契约', () => {
|
||||
expect(options.stop).toEqual(['STOP']);
|
||||
});
|
||||
|
||||
it('O2: think 参数 effort 映射(low→"low"、max→true);未开启思考时缺省', async () => {
|
||||
it('O2: think 参数 effort 映射(low→"low"、xhigh→"xhigh"、max/true→true);未开启思考时缺省', async () => {
|
||||
const adapter = makeOllama();
|
||||
const { bodies } = captureFetch();
|
||||
|
||||
@@ -316,12 +316,39 @@ describe('OllamaAdapter — 请求体契约', () => {
|
||||
);
|
||||
expect(bodies[1].think).toBe(true);
|
||||
|
||||
// v0.8.3: xhigh 原样透传(Qwen3 等思考模板原生档);true → 布尔 true(模型默认档)
|
||||
await adapter.send(
|
||||
makeRequest({
|
||||
params: {
|
||||
maxTokens: 4096,
|
||||
temperature: 0,
|
||||
stream: false,
|
||||
thinkingEnabled: true,
|
||||
thinkingEffort: 'xhigh',
|
||||
},
|
||||
}),
|
||||
);
|
||||
expect(bodies[2].think).toBe('xhigh');
|
||||
|
||||
await adapter.send(
|
||||
makeRequest({
|
||||
params: {
|
||||
maxTokens: 4096,
|
||||
temperature: 0,
|
||||
stream: false,
|
||||
thinkingEnabled: true,
|
||||
thinkingEffort: 'true',
|
||||
},
|
||||
}),
|
||||
);
|
||||
expect(bodies[3].think).toBe(true);
|
||||
|
||||
await adapter.send(
|
||||
makeRequest({
|
||||
params: { maxTokens: 4096, temperature: 0, stream: false, thinkingEnabled: false },
|
||||
}),
|
||||
);
|
||||
expect(bodies[2].think).toBeUndefined();
|
||||
expect(bodies[4].think).toBeUndefined();
|
||||
});
|
||||
|
||||
it('O3: data URI 图片剥前缀转纯 base64 数组(无网络下载路径触发)', async () => {
|
||||
@@ -516,8 +543,10 @@ describe('AnthropicAdapter — thinking budget 按 effort 映射矩阵', () => {
|
||||
['low', 1024],
|
||||
['medium', 4096],
|
||||
['high', 16384],
|
||||
['xhigh', 24576], // v0.8.3: 介于 high 与 max 之间
|
||||
// v0.8.1: max_tokens 不再按模型钳制(100_000 原样透传)→ budget = min(32768, floor(100000/2)) = 32768
|
||||
['max', 32768],
|
||||
['true', 16384], // v0.8.3: 模型默认档按 high 同档预算
|
||||
] as const)('effort=%s → budget 为该档值且 < max_tokens', async (effort, expectBudget) => {
|
||||
const adapter = makeAdapter();
|
||||
const { bodies } = captureFetch();
|
||||
@@ -723,9 +752,11 @@ describe('DeepSeekAdapter — thinking 映射矩阵', () => {
|
||||
['low', 'high'],
|
||||
['medium', 'high'],
|
||||
['high', 'high'],
|
||||
['xhigh', 'high'], // v0.8.3: DeepSeek 无 xhigh 档,就近映射 high
|
||||
['max', 'max'],
|
||||
['true', 'high'], // v0.8.3: 模型默认档映射 high
|
||||
] as const)(
|
||||
'effort=%s → reasoning_effort=%s(low/medium 归一 high)',
|
||||
'effort=%s → reasoning_effort=%s(low/medium/xhigh/true 归一 high)',
|
||||
async (effort, expected) => {
|
||||
const adapter = makeAdapter();
|
||||
const { bodies } = captureFetch();
|
||||
|
||||
@@ -730,12 +730,16 @@ export class AnthropicAdapter extends BaseAdapter {
|
||||
}
|
||||
|
||||
// Thinking 模式:budget_tokens(必须小于 max_tokens,此处钳制到一半)
|
||||
// v0.8.3: 新增 xhigh / true 档 —— xhigh 介于 high 与 max 之间取 24576;
|
||||
// true(模型默认档)按 high 同档预算
|
||||
if (thinkingRequested) {
|
||||
const budgetMap: Record<string, number> = {
|
||||
low: 1024,
|
||||
medium: 4096,
|
||||
high: 16384,
|
||||
xhigh: 24576,
|
||||
max: 32768,
|
||||
true: 16384,
|
||||
};
|
||||
const effortBudget = budgetMap[request.params.thinkingEffort ?? 'high'] ?? 16384;
|
||||
// thinking 路径 maxTokensForRequest 恒为数字(Math.max(2048, …) 兜底)
|
||||
|
||||
@@ -206,13 +206,16 @@ export class DeepSeekAdapter extends OpenAICompatibleAdapter {
|
||||
body.thinking = { type: 'disabled' };
|
||||
} else {
|
||||
body.thinking = { type: 'enabled' };
|
||||
// v0.8.3: 新增 xhigh / true 档 —— DeepSeek API 仅 high / max 两档,就近映射 high
|
||||
const effortMap: Record<string, string> = {
|
||||
low: 'high',
|
||||
medium: 'high',
|
||||
high: 'high',
|
||||
xhigh: 'high',
|
||||
max: 'max',
|
||||
true: 'high',
|
||||
};
|
||||
// DeepSeek API 仅支持 high / max 两档,low/medium 映射为 high
|
||||
// DeepSeek API 仅支持 high / max 两档,low/medium/xhigh/true 映射为 high
|
||||
body.reasoning_effort = effortMap[request.params.thinkingEffort ?? 'high'] ?? 'high';
|
||||
// 元信息标注不支持思考但用户开启 —— 告知降级兜底路径(不拦截)
|
||||
if (DeepSeekAdapter.MODEL_INFO[this.config.defaultModel]?.supportsThinking === false) {
|
||||
|
||||
@@ -698,11 +698,17 @@ export class OllamaAdapter extends BaseAdapter {
|
||||
if (request.params.thinkingEnabled) {
|
||||
const modelThinkingSupported = this.cachedThinkingSupport !== false;
|
||||
if (modelThinkingSupported) {
|
||||
// v0.8.3: 新增 xhigh / true 档 —— Qwen3 等新模型思考模板原生支持 xhigh
|
||||
//(旧版仅下发 low/medium/high 时,模板会 500 "Unexpected reasoning effort");
|
||||
// true = 不指定档位(think: true),由模型思考模板用自身默认档。
|
||||
// max 语义为"应用内最高档",Ollama 侧同样以布尔 true 放行给服务端默认。
|
||||
const effortMap: Record<string, string | boolean> = {
|
||||
low: 'low',
|
||||
medium: 'medium',
|
||||
high: 'high',
|
||||
xhigh: 'xhigh',
|
||||
max: true,
|
||||
true: true,
|
||||
};
|
||||
body.think = effortMap[request.params.thinkingEffort ?? 'high'] ?? true;
|
||||
// v0.8.0 P0-3: 思考占用 num_predict 输出预算 —— 预算过小时显式告警
|
||||
|
||||
@@ -149,12 +149,15 @@ export class OpenAIAdapter extends OpenAICompatibleAdapter {
|
||||
}
|
||||
|
||||
// Thinking 模式:推理模型映射 reasoning_effort;非推理模型忽略
|
||||
// v0.8.3: 新增 xhigh / true 档 —— OpenAI API 档位封顶 high,二者就近映射
|
||||
if (request.params.thinkingEnabled && isReasoningModel) {
|
||||
const effortMap: Record<string, string> = {
|
||||
low: 'low',
|
||||
medium: 'medium',
|
||||
high: 'high',
|
||||
xhigh: 'high',
|
||||
max: 'high',
|
||||
true: 'high',
|
||||
};
|
||||
body.reasoning_effort = effortMap[request.params.thinkingEffort ?? 'high'] ?? 'high';
|
||||
// v0.8.0 P0-3: 推理 token 计入 max_completion_tokens —— 用户配置的预算过小时告警
|
||||
|
||||
@@ -4,7 +4,12 @@
|
||||
* 用于 Agent Loop 引擎内部的状态管理和迭代记录。
|
||||
*/
|
||||
|
||||
import type { MetonaToolCall, MetonaToolResult, MetonaThinkingBlock } from '../types';
|
||||
import type {
|
||||
MetonaThinkingEffort,
|
||||
MetonaToolCall,
|
||||
MetonaToolResult,
|
||||
MetonaThinkingBlock,
|
||||
} from '../types';
|
||||
|
||||
// ===== Agent Loop 状态机 =====
|
||||
|
||||
@@ -100,8 +105,8 @@ export interface AgentLoopConfig {
|
||||
maxTokens?: number;
|
||||
/** 是否启用思考模式(默认 true) */
|
||||
thinkingEnabled: boolean;
|
||||
/** 思考强度(默认 'high') */
|
||||
thinkingEffort: 'low' | 'medium' | 'high' | 'max';
|
||||
/** 思考强度(默认 'high';v0.8.3 档位单源见 MetonaThinkingEffort) */
|
||||
thinkingEffort: MetonaThinkingEffort;
|
||||
/** Ollama num_ctx(与「上下文长度」同源:llm.contextWindow,仅 Ollama Provider 下发) */
|
||||
contextLength?: number;
|
||||
/** 工具执行兜底超时(ms,默认 120000),实际取 max(此值, tool.timeoutMs) */
|
||||
|
||||
@@ -11,6 +11,7 @@ export type {
|
||||
MetonaRequestMeta,
|
||||
MetonaSystemPrompt,
|
||||
MetonaGenerationParams,
|
||||
MetonaThinkingEffort,
|
||||
MetonaConstraints,
|
||||
MetonaMessage,
|
||||
MetonaImageContent,
|
||||
|
||||
@@ -38,6 +38,17 @@ export interface MetonaSystemPrompt {
|
||||
|
||||
// ===== 生成参数 =====
|
||||
|
||||
/**
|
||||
* 思考强度档位(v0.8.3 起单一类型源,引擎/引擎配置/UI/各 Adapter 共用)
|
||||
*
|
||||
* - low / medium / high / max:原始四档
|
||||
* - xhigh:v0.8.3 新增 —— Qwen3 等新模型思考模板原生支持 xhigh 档
|
||||
* (Ollama 下原样下发;仅支持 low/medium/high 的 Provider 就近降档映射)
|
||||
* - true:v0.8.3 新增 —— 不指定档位,`think: true` 交给模型思考模板用自身默认
|
||||
* 档(如 Qwen3 默认 xhigh);有显式档位协议的 Provider 就近映射为 high
|
||||
*/
|
||||
export type MetonaThinkingEffort = 'low' | 'medium' | 'high' | 'xhigh' | 'max' | 'true';
|
||||
|
||||
export interface MetonaGenerationParams {
|
||||
/** 最大生成 token 数 */
|
||||
maxTokens?: number;
|
||||
@@ -52,7 +63,7 @@ export interface MetonaGenerationParams {
|
||||
/** 是否启用思考模式 */
|
||||
thinkingEnabled?: boolean;
|
||||
/** 思考强度(替代 thinkingBudget,各 Provider 映射见 Adapter 规范) */
|
||||
thinkingEffort?: 'low' | 'medium' | 'high' | 'max';
|
||||
thinkingEffort?: MetonaThinkingEffort;
|
||||
/** 上下文窗口大小(仅 Ollama 支持 num_ctx) */
|
||||
contextLength?: number;
|
||||
}
|
||||
|
||||
@@ -14,6 +14,8 @@ import { isSensitiveConfigKey } from '../utils/secure-config';
|
||||
import { maskSensitiveValue } from '../utils/mask';
|
||||
// v0.8.1 P2-1: 工具自定义策略解析
|
||||
import { parseToolPolicy } from '../harness/sandbox/permissions';
|
||||
// v0.8.3: 思考强度档位单源(新增 xhigh / true 档)
|
||||
import type { MetonaThinkingEffort } from '../harness/types';
|
||||
// v0.8.0 P1-5: 配置 URL 深校验(域名真实 DNS 解析,拦"解析到云元数据 IP"绕过)
|
||||
import {
|
||||
assertSafeConfigTargetDeep,
|
||||
@@ -21,6 +23,10 @@ import {
|
||||
} from '../harness/tools/built-in/ssrf-guard';
|
||||
// v0.8.1 P0-4: 主进程文案双语
|
||||
import { setMainLocale, mt } from '../utils/main-locale';
|
||||
// v0.8.3: 工作空间路径持久化独立成模块 —— 此前动态 import('../main') 与入口模块
|
||||
// 形成循环依赖,入口求值一旦中断即抛 TDZ "Cannot access 'main' before
|
||||
// initialization",工作空间切换保存随之失败
|
||||
import { writeWorkspacePathToFile } from '../utils/workspace-path';
|
||||
|
||||
/**
|
||||
* v0.7.4 P2-9-C: URL 类配置键 —— 写入时须过 assertSafeConfigTarget 高危目标校验。
|
||||
@@ -149,10 +155,10 @@ export function applyEngineConfigKey(ctx: IPCContext, key: string, value: unknow
|
||||
break;
|
||||
case 'agent.thinkingEffort':
|
||||
agentEngineManager.updateConfigAll({
|
||||
thinkingEffort: value as 'low' | 'medium' | 'high' | 'max',
|
||||
thinkingEffort: value as MetonaThinkingEffort,
|
||||
});
|
||||
orchestrator.updateDefaultConfig({
|
||||
thinkingEffort: value as 'low' | 'medium' | 'high' | 'max',
|
||||
thinkingEffort: value as MetonaThinkingEffort,
|
||||
});
|
||||
break;
|
||||
// v0.7.3 P3-1: enableReflection 接线(此前为死配置)— 引擎 REFLECTING 状态开关
|
||||
@@ -293,7 +299,6 @@ export async function applyConfigSideEffects(
|
||||
);
|
||||
if (workspaceEntry) {
|
||||
try {
|
||||
const { writeWorkspacePathToFile } = await import('../main');
|
||||
writeWorkspacePathToFile(workspaceEntry.value as string);
|
||||
log.info(`[CONFIG] Workspace path saved (restart required): ${workspaceEntry.value}`);
|
||||
} catch (err) {
|
||||
|
||||
@@ -161,7 +161,10 @@ export function registerWorkspaceHandlers(ctx: IPCContext): void {
|
||||
const Database = (await import('better-sqlite3')).default;
|
||||
const srcDb = new Database(srcFile, { readonly: true, fileMustExist: true });
|
||||
try {
|
||||
srcDb.backup(dstFile);
|
||||
// v0.8.3 修复: backup() 返回 Promise,必须 await —— 原实现未等待就
|
||||
// close() 源库,备份被中途掐断:目标库只剩空壳页(继承数据静默丢失,
|
||||
// 重启后全量重建表),且 rejection 无人接住(unhandledRejection FATAL)。
|
||||
await srcDb.backup(dstFile);
|
||||
inherited.push(fileName);
|
||||
log.info(
|
||||
`[WORKSPACE] Inherited ${fileName} (via SQLite backup): ${resolvedSource} → ${resolvedTarget}`,
|
||||
|
||||
+88
-83
@@ -17,7 +17,6 @@
|
||||
import 'dotenv/config';
|
||||
import { app, shell, Menu, BrowserWindow, dialog, session } from 'electron';
|
||||
import { join } from 'path';
|
||||
import { existsSync, readFileSync, writeFileSync } from 'fs';
|
||||
import { electronApp, optimizer } from '@electron-toolkit/utils';
|
||||
import log from 'electron-log';
|
||||
import { DatabaseService } from './services/database.service';
|
||||
@@ -47,6 +46,8 @@ import { OllamaAdapter } from './harness/adapters/ollama.adapter';
|
||||
import { OpenAIAdapter } from './harness/adapters/openai.adapter';
|
||||
import { AnthropicAdapter } from './harness/adapters/anthropic.adapter';
|
||||
import type { IMetonaProviderAdapter } from './harness/types/metona-adapter';
|
||||
// v0.8.3: 思考强度档位单源(新增 xhigh / true 档)
|
||||
import type { MetonaThinkingEffort } from './harness/types';
|
||||
import {
|
||||
ReadFileTool,
|
||||
WriteFileTool,
|
||||
@@ -95,6 +96,10 @@ import { HealthChecker, SLOMonitor } from './utils/slo';
|
||||
// v0.8.1 P0-4: 主进程 toast/通知文案双语(ui.locale 驱动)
|
||||
import { setMainLocale, mt } from './utils/main-locale';
|
||||
// v0.6.4 P4-5: session 级网络代理应用工具(default + agent-browser 分区)
|
||||
// v0.8.3: 工作空间路径持久化独立成模块(消除 main ↔ ipc/shared 循环依赖 ——
|
||||
// 此前 shared.ts 动态 import('../main') 取 writeWorkspacePathToFile,入口模块
|
||||
// 求值一旦中断即抛 TDZ,工作空间切换保存随之报错)
|
||||
import { readWorkspacePathFromFile, writeWorkspacePathToFile } from './utils/workspace-path';
|
||||
|
||||
// ===== 步骤 1: 初始化日志系统(SYS 层)=====
|
||||
log.transports.file.level = 'info';
|
||||
@@ -130,31 +135,6 @@ if (process.env['METONA_USER_DATA_DIR']) {
|
||||
app.setPath('userData', process.env['METONA_USER_DATA_DIR']);
|
||||
}
|
||||
|
||||
// ===== 工作空间路径独立存储(解决 DB 在 workspace 内的鸡生蛋问题)=====
|
||||
const WORKSPACE_CONFIG_FILE = join(app.getPath('userData'), 'workspace-config.json');
|
||||
|
||||
function readWorkspacePathFromFile(): string | null {
|
||||
try {
|
||||
if (existsSync(WORKSPACE_CONFIG_FILE)) {
|
||||
const data = JSON.parse(readFileSync(WORKSPACE_CONFIG_FILE, 'utf-8'));
|
||||
return data.workspacePath ?? null;
|
||||
}
|
||||
} catch {
|
||||
// 忽略读取错误
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function writeWorkspacePathToFile(workspacePath: string): void {
|
||||
try {
|
||||
writeFileSync(WORKSPACE_CONFIG_FILE, JSON.stringify({ workspacePath }, null, 2), 'utf-8');
|
||||
} catch (err) {
|
||||
log.error('Failed to write workspace config file:', err);
|
||||
}
|
||||
}
|
||||
|
||||
export { readWorkspacePathFromFile, writeWorkspacePathToFile };
|
||||
|
||||
let databaseService: DatabaseService | null = null;
|
||||
let trayManager: TrayManager | null = null;
|
||||
let windowManager: WindowManager | null = null;
|
||||
@@ -196,8 +176,14 @@ async function initialize(): Promise<void> {
|
||||
const workspaceService = new WorkspaceService(savedWorkspacePath ?? undefined);
|
||||
const workspaceInfo = workspaceService.initialize();
|
||||
// 持久化工作空间路径(供下次启动读取)
|
||||
// v0.8.3: writeWorkspacePathToFile 改为向上抛错(供切换工作空间场景 toast 告知),
|
||||
// 启动期回写失败非致命 —— 仅日志留痕,不中断初始化。
|
||||
if (savedWorkspacePath !== workspaceInfo.path) {
|
||||
writeWorkspacePathToFile(workspaceInfo.path);
|
||||
try {
|
||||
writeWorkspacePathToFile(workspaceInfo.path);
|
||||
} catch {
|
||||
// 错误已在 writeWorkspacePathToFile 内记录
|
||||
}
|
||||
}
|
||||
log.info(
|
||||
`Workspace: ${workspaceInfo.path} (missing: ${workspaceInfo.missingFiles.join(', ') || 'none'})`,
|
||||
@@ -220,6 +206,19 @@ async function initialize(): Promise<void> {
|
||||
// v0.8.1 P0-4: 主进程语言随 ui.locale 注入(变更经 applyConfigSideEffects 热切换)
|
||||
setMainLocale(configService.get<string>('ui.locale'));
|
||||
|
||||
// v0.8.3: workspace.path 权威源对齐(设置页回显修复)
|
||||
// 切换工作空间时,新路径经 config:set 写入的是旧空间的 DB,而"继承数据库"复制
|
||||
// 发生在该写入之前 —— 新空间的 DB 携带的是滞后一位的旧路径;未继承 DB 的全新
|
||||
// 空间则根本没有该键。重启后设置页从当前空间 DB 读回显,显示的便不是当前空间。
|
||||
// workspace-config.json 是启动权威源(readWorkspacePathFromFile 决定本次加载哪个
|
||||
// 空间),这里把它回写进当前空间 DB,自愈一切来源的漂移(继承复制滞后 / 全新
|
||||
// 空间缺键 / 引导向导写入),保证 config:get('workspace.path') 与实际加载的空间
|
||||
// 永远一致。
|
||||
if (configService.get<string>('workspace.path') !== workspaceInfo.path) {
|
||||
configService.set('workspace.path', workspaceInfo.path);
|
||||
log.info(`[CONFIG] workspace.path synced to loaded workspace: ${workspaceInfo.path}`);
|
||||
}
|
||||
|
||||
// v0.8.1 P2-5: E2E 引导种子(见文件顶部说明;仅 METONA_E2E_SEED_CONFIG 时生效)
|
||||
if (process.env['METONA_E2E_SEED_CONFIG'] === '1') {
|
||||
configService.set('onboarding.completed', true);
|
||||
@@ -476,12 +475,8 @@ async function initialize(): Promise<void> {
|
||||
contextWindow: getContextWindowSetting(),
|
||||
thinkingEnabled: configService.get<boolean>('agent.enableThinking') ?? true,
|
||||
thinkingEffort:
|
||||
(configService.get<string>('agent.thinkingEffort') as
|
||||
| 'low'
|
||||
| 'medium'
|
||||
| 'high'
|
||||
| 'max'
|
||||
| null) ?? 'high',
|
||||
(configService.get<string>('agent.thinkingEffort') as MetonaThinkingEffort | null) ??
|
||||
'high',
|
||||
toolExecutionTimeoutMs: configService.get<number>('agent.toolExecutionTimeoutMs') ?? 120_000,
|
||||
// v0.7.3 P3-1 接线: agent.enableReflection 此前为死配置(引擎读取但全链路
|
||||
// 无置 true 路径)。现注入引擎基线配置,REFLECTING 状态由此开关真实驱动。
|
||||
@@ -627,12 +622,8 @@ async function initialize(): Promise<void> {
|
||||
{
|
||||
thinkingEnabled: configService.get<boolean>('agent.enableThinking') ?? true,
|
||||
thinkingEffort:
|
||||
(configService.get<string>('agent.thinkingEffort') as
|
||||
| 'low'
|
||||
| 'medium'
|
||||
| 'high'
|
||||
| 'max'
|
||||
| null) ?? 'high',
|
||||
(configService.get<string>('agent.thinkingEffort') as MetonaThinkingEffort | null) ??
|
||||
'high',
|
||||
contextLength: getOllamaContextLength(),
|
||||
contextWindow: getContextWindowSetting(),
|
||||
// v0.7.3 P3-1: SubAgent 与主引擎同源消费 enableReflection
|
||||
@@ -1048,8 +1039,11 @@ if (!gotSingleInstanceLock) {
|
||||
// v0.5.0: 启动链路异常兜底 — DB 损坏/工作空间不可写等初始化失败时,
|
||||
// 原实现会静默挂起(渲染进程白屏且无任何用户可见错误)。
|
||||
// 兜底策略:记录日志 + 弹出系统错误对话框 + 退出(exit 1)
|
||||
// v0.8.3: 安全防线在同一 ready 链上先于 initialize 注册(回调按挂载顺序执行)
|
||||
// —— CSP 拦截必须在主窗口发起首个 mainFrame 请求前就位,否则首页响应漏注入。
|
||||
app
|
||||
.whenReady()
|
||||
.then(registerSecurityHardening)
|
||||
.then(initialize)
|
||||
.catch((err) => {
|
||||
log.error('[Startup] Initialization failed:', err);
|
||||
@@ -1072,57 +1066,68 @@ if (!gotSingleInstanceLock) {
|
||||
// 此前主窗口无 CSP、无 permission handler —— notifications/geo/media/clipboard
|
||||
// 等请求全部走 Chromium 默认放行,且渲染层一旦被注入可静默触达敏感能力。
|
||||
// 两条防线均为 deny-by-default 白名单制,任何一条失败都不放大攻击面。
|
||||
{
|
||||
//
|
||||
// v0.8.1 根治: session.defaultSession 必须在 app ready 后才能访问 —— 此前在
|
||||
// 模块加载期(ready 前)直接调用,每次启动都抛 "Session can only be received
|
||||
// when app is ready",权限白名单静默失效(FATAL 日志为证)。防线一延迟到 ready
|
||||
// 后注册,防线真正生效。
|
||||
//
|
||||
// v0.8.3 根治收尾: 防线二(CSP)当时漏改,仍留在模块顶层 —— 生产环境每次启动
|
||||
// 都在此抛 "Session can only be received when app is ready",模块求值中止:
|
||||
// 权限白名单与 CSP 实际从未注册,且打包产物末尾的模块命名空间永不初始化,
|
||||
// 连锁导致 ipc/shared.ts 保存 workspace.path 的动态 import 抛 TDZ
|
||||
// (工作空间切换保存失败,utils/workspace-path.ts 头注有完整因果链)。
|
||||
// 现两条防线统一收敛为 registerSecurityHardening,挂载在 initialize 之前执行;
|
||||
// 单防线失败仅记日志,不阻断启动链。
|
||||
function registerSecurityHardening(): void {
|
||||
// 防线一:权限请求白名单(deny-by-default)
|
||||
// v0.8.1 根治: session.defaultSession 必须在 app ready 后才能访问 —— 此前在
|
||||
// 模块加载期(ready 前)直接调用,每次启动都抛 "Session can only be received
|
||||
// when app is ready",权限白名单静默失效(FATAL 日志为证)。现延迟到 ready 后
|
||||
// 注册,防线真正生效。
|
||||
const ALLOWED_PERMISSIONS = new Set<string>(['clipboard-sanitized-write', 'fullscreen']);
|
||||
void app
|
||||
.whenReady()
|
||||
.then(() => {
|
||||
session.defaultSession.setPermissionRequestHandler((_wc, permission, callback) => {
|
||||
callback(ALLOWED_PERMISSIONS.has(permission));
|
||||
});
|
||||
session.defaultSession.setPermissionCheckHandler((_wc, permission) =>
|
||||
ALLOWED_PERMISSIONS.has(permission),
|
||||
);
|
||||
log.info('[Security] Permission whitelist registered (app ready)');
|
||||
})
|
||||
.catch((err) => {
|
||||
log.error('[Security] Failed to register permission whitelist:', err);
|
||||
try {
|
||||
const ALLOWED_PERMISSIONS = new Set<string>(['clipboard-sanitized-write', 'fullscreen']);
|
||||
session.defaultSession.setPermissionRequestHandler((_wc, permission, callback) => {
|
||||
callback(ALLOWED_PERMISSIONS.has(permission));
|
||||
});
|
||||
session.defaultSession.setPermissionCheckHandler((_wc, permission) =>
|
||||
ALLOWED_PERMISSIONS.has(permission),
|
||||
);
|
||||
log.info('[Security] Permission whitelist registered (app ready)');
|
||||
} catch (err) {
|
||||
log.error('[Security] Failed to register permission whitelist:', err);
|
||||
}
|
||||
|
||||
// 防线二:生产环境 CSP 注入(仅 mainFrame,不触碰 dev server 的 HMR)。
|
||||
// MUI/emotion 需要 style-src 'unsafe-inline'(运行时注入 <style> 标签与 style 属性);
|
||||
// 附件预览/截图使用 data:/blob: 图片;渲染进程本身不直接外联(所有 fetch 在主进程)。
|
||||
if (!process.env['ELECTRON_RENDERER_URL']) {
|
||||
session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
|
||||
if (details.resourceType === 'mainFrame') {
|
||||
callback({
|
||||
responseHeaders: {
|
||||
...details.responseHeaders,
|
||||
'Content-Security-Policy': [
|
||||
[
|
||||
"default-src 'self'",
|
||||
"script-src 'self'",
|
||||
"style-src 'self' 'unsafe-inline'",
|
||||
"img-src 'self' data: blob:",
|
||||
"font-src 'self' data:",
|
||||
"connect-src 'self'",
|
||||
"object-src 'none'",
|
||||
"frame-src 'none'",
|
||||
"base-uri 'self'",
|
||||
"form-action 'none'",
|
||||
].join('; '),
|
||||
],
|
||||
},
|
||||
});
|
||||
} else {
|
||||
callback({ responseHeaders: details.responseHeaders });
|
||||
}
|
||||
});
|
||||
try {
|
||||
session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
|
||||
if (details.resourceType === 'mainFrame') {
|
||||
callback({
|
||||
responseHeaders: {
|
||||
...details.responseHeaders,
|
||||
'Content-Security-Policy': [
|
||||
[
|
||||
"default-src 'self'",
|
||||
"script-src 'self'",
|
||||
"style-src 'self' 'unsafe-inline'",
|
||||
"img-src 'self' data: blob:",
|
||||
"font-src 'self' data:",
|
||||
"connect-src 'self'",
|
||||
"object-src 'none'",
|
||||
"frame-src 'none'",
|
||||
"base-uri 'self'",
|
||||
"form-action 'none'",
|
||||
].join('; '),
|
||||
],
|
||||
},
|
||||
});
|
||||
} else {
|
||||
callback({ responseHeaders: details.responseHeaders });
|
||||
}
|
||||
});
|
||||
log.info('[Security] CSP header injection registered (app ready)');
|
||||
} catch (err) {
|
||||
log.error('[Security] Failed to register CSP header injection:', err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
/**
|
||||
* 工作空间路径独立持久化 — userData/workspace-config.json
|
||||
*
|
||||
* 为什么独立于数据库:agent.db 存放在工作空间目录内,而"工作空间在哪"必须先于
|
||||
* 数据库初始化得知(鸡生蛋问题),因此路径单独落一份 JSON。
|
||||
*
|
||||
* 为什么独立成模块:此前 read/writeWorkspacePathToFile 定义在 main.ts 并由
|
||||
* ipc/shared.ts 动态 import('../main') 取用 —— main ↔ shared 循环依赖。一旦主
|
||||
* 入口模块求值中途崩溃(如 v0.8.2 前的顶层 session 访问),bundle 末尾的模块
|
||||
* 命名空间永不初始化,该动态 import 抛 TDZ "Cannot access 'main' before
|
||||
* initialization",工作空间切换保存随之失败。抽出后为单向依赖,与入口模块
|
||||
* 生命周期解耦。
|
||||
*
|
||||
* 注意:文件路径必须在使用时实时计算(app.getPath('userData')),不能在模块
|
||||
* 顶层缓存 —— E2E 通过 METONA_USER_DATA_DIR 在 main.ts 模块体内重定向 userData,
|
||||
* 而 ESM import 会提升到模块体之前执行,顶层缓存会锁死重定向前的路径。
|
||||
*/
|
||||
|
||||
import { app } from 'electron';
|
||||
import { join } from 'path';
|
||||
import { existsSync, readFileSync, writeFileSync } from 'fs';
|
||||
import log from 'electron-log';
|
||||
|
||||
function getWorkspaceConfigFile(): string {
|
||||
return join(app.getPath('userData'), 'workspace-config.json');
|
||||
}
|
||||
|
||||
export function readWorkspacePathFromFile(): string | null {
|
||||
try {
|
||||
const file = getWorkspaceConfigFile();
|
||||
if (existsSync(file)) {
|
||||
const data = JSON.parse(readFileSync(file, 'utf-8'));
|
||||
return data.workspacePath ?? null;
|
||||
}
|
||||
} catch {
|
||||
// 忽略读取错误
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 写入失败向上抛出(调用方决定是否告知用户):
|
||||
* - 启动路径回写(main.ts):非致命,仅记日志;
|
||||
* - 切换工作空间保存(ipc/shared.ts):必须 toast 告知,否则用户以为切换成功,
|
||||
* 下次启动仍回到旧空间(v0.3.10 契约 —— 此前函数内部吞错,错误上报路径为死代码)。
|
||||
*/
|
||||
export function writeWorkspacePathToFile(workspacePath: string): void {
|
||||
try {
|
||||
writeFileSync(getWorkspaceConfigFile(), JSON.stringify({ workspacePath }, null, 2), 'utf-8');
|
||||
} catch (err) {
|
||||
log.error('Failed to write workspace config file:', err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user