agent-bot/takt
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

並列実行時のタスク実行時間上限撤廃

Browse Source
This commit is contained in:
nrslib 2026-02-09 13:08:41 +09:00
parent de89882c7f
commit 7d02d939e0
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/features/tasks/execute/pieceExecution.ts
View File

@ -309,7 +309,7 @@ export async function executePiece(
const additionalIterations = Number.parseInt(input, 10); const additionalIterations = Number.parseInt(input, 10);
if (Number.isInteger(additionalIterations) && additionalIterations > 0) { if (Number.isInteger(additionalIterations) && additionalIterations > 0) {
pieceConfig.maxIterations += additionalIterations; pieceConfig.maxIterations = request.maxIterations + additionalIterations;
return additionalIterations; return additionalIterations;
} }

22
src/features/tasks/execute/taskExecution.ts
View File

@ -23,7 +23,6 @@ import { resolveTaskExecution } from './resolveTask.js';
export type { TaskExecutionOptions, ExecuteTaskOptions }; export type { TaskExecutionOptions, ExecuteTaskOptions };
const log = createLogger('task'); const log = createLogger('task');
const TASK_TIMEOUT_MS = 60 * 60 * 1000;
/** /**
* Resolve a GitHub issue from task data's issue number. * Resolve a GitHub issue from task data's issue number.
@ -110,9 +109,7 @@ export async function executeAndCompleteTask(
const executionLog: string[] = []; const executionLog: string[] = [];
const taskAbortController = new AbortController(); const taskAbortController = new AbortController();
const externalAbortSignal = parallelOptions?.abortSignal; const externalAbortSignal = parallelOptions?.abortSignal;
const taskTimeoutMs = externalAbortSignal ? TASK_TIMEOUT_MS : undefined;
const taskAbortSignal = externalAbortSignal ? taskAbortController.signal : undefined; const taskAbortSignal = externalAbortSignal ? taskAbortController.signal : undefined;
let timeoutId: ReturnType<typeof setTimeout> | undefined;
const onExternalAbort = (): void => { const onExternalAbort = (): void => {
taskAbortController.abort(); taskAbortController.abort();
@ -143,21 +140,7 @@ export async function executeAndCompleteTask(
taskColorIndex: parallelOptions?.taskColorIndex, taskColorIndex: parallelOptions?.taskColorIndex,
}); });
const timeoutPromise = taskTimeoutMs && taskTimeoutMs > 0 const taskSuccess = await taskRunPromise;
? new Promise<boolean>((_, reject) => {
timeoutId = setTimeout(() => {
taskAbortController.abort();
reject(new Error(`Task timed out after ${Math.floor(taskTimeoutMs / 60000)} minutes`));
}, taskTimeoutMs);
})
: undefined;
const taskSuccess = timeoutPromise
? await Promise.race<boolean>([
taskRunPromise,
timeoutPromise,
])
: await taskRunPromise;
const completedAt = new Date().toISOString(); const completedAt = new Date().toISOString();
if (taskSuccess && isWorktree) { if (taskSuccess && isWorktree) {
@ -227,9 +210,6 @@ export async function executeAndCompleteTask(
error(`Task "${task.name}" error: ${getErrorMessage(err)}`); error(`Task "${task.name}" error: ${getErrorMessage(err)}`);
return false; return false;
} finally { } finally {
if (timeoutId !== undefined) {
clearTimeout(timeoutId);
}
if (externalAbortSignal) { if (externalAbortSignal) {
externalAbortSignal.removeEventListener('abort', onExternalAbort); externalAbortSignal.removeEventListener('abort', onExternalAbort);
} }