MetonaTeam/metona-ollama-desktop
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: 子代理超时设为0时立即触发，改为Infinity正确禁用

Browse Source
This commit is contained in:
thzxx
2026-06-20 13:32:14 +08:00
parent 950450bc65
commit fd878c5396
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/services/sub-agent.ts
+2 -1
View File
@@ -50,6 +50,7 @@ export async function executeSubAgent(
const model = options.model || state.get<string>('_defaultModel', ''); const model = options.model || state.get<string>('_defaultModel', '');
const maxLoops = options.maxLoops ?? state.get<number>('subAgentMaxLoops', SUB_AGENT_MAX_LOOPS); const maxLoops = options.maxLoops ?? state.get<number>('subAgentMaxLoops', SUB_AGENT_MAX_LOOPS);
const timeout = options.timeout ?? state.get<number>('subAgentTimeout', SUB_AGENT_TIMEOUT); const timeout = options.timeout ?? state.get<number>('subAgentTimeout', SUB_AGENT_TIMEOUT);
const effectiveTimeout = timeout > 0 ? timeout : Infinity; // 0=禁用超时
if (!api || !model) { if (!api || !model) {
return { success: false, error: '未选择模型，无法执行子任务' }; return { success: false, error: '未选择模型，无法执行子任务' };
@@ -73,7 +74,7 @@ ${context ? `\n附加上下文：\n${context}` : ''}`;
while (loopCount < maxLoops) { while (loopCount < maxLoops) {
loopCount++; loopCount++;
if (Date.now() - startTime > timeout) { if (Date.now() - startTime > effectiveTimeout) {
logWarn('子 Agent 超时', `${loopCount} 轮`); logWarn('子 Agent 超时', `${loopCount} 轮`);
return { success: true, content: '子任务执行超时', loops: loopCount, duration: Date.now() - startTime, partial: true }; return { success: true, content: '子任务执行超时', loops: loopCount, duration: Date.now() - startTime, partial: true };
} }