Skip to content

fix: detect and abort stalled tool executions; upgrade SDK to 0.1.29 #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
idofrizler merged 1 commit into from
Feb 28, 2026
+79 −33
Merged

fix: detect and abort stalled tool executions; upgrade SDK to 0.1.29 #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
}
},
"dependencies": {
"@github/copilot-sdk": "^0.1.25",
"@github/copilot-sdk": "^0.1.29",
"@xterm/addon-fit": "^0.11.0",
"@xterm/xterm": "^6.0.0",
"electron-log": "^5.4.3",
Expand Down
46 changes: 46 additions & 0 deletions src/main/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,7 @@ function registerSessionEventForwarding(sessionId: string, session: CopilotSessi
requestUserAttention();
} else if (event.type === 'tool.execution_start') {
log.debug(`[${sessionId}] Tool start: ${event.data.toolName} (${event.data.toolCallId})`);
startToolStallTimer(sessionId, event.data.toolName);
mainWindow.webContents.send('copilot:tool-start', {
sessionId,
toolCallId: event.data.toolCallId,
Expand All @@ -861,6 +862,7 @@ function registerSessionEventForwarding(sessionId: string, session: CopilotSessi
});
} else if (event.type === 'tool.execution_complete') {
log.debug(`[${sessionId}] Tool end: ${event.data.toolCallId}`);
clearToolStallTimer(sessionId);
const completeData = event.data as Record<string, unknown>;
mainWindow.webContents.send('copilot:tool-end', {
sessionId,
Expand Down Expand Up @@ -999,6 +1001,44 @@ function stopKeepAlive(): void {
}
}

// Tool execution stall detection - auto-abort sessions with hung tool calls
const TOOL_STALL_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
const sessionToolStallTimers = new Map<string, NodeJS.Timeout>();

function startToolStallTimer(sessionId: string, toolName: string): void {
clearToolStallTimer(sessionId);
const timer = setTimeout(async () => {
sessionToolStallTimers.delete(sessionId);
const sessionState = sessions.get(sessionId);
if (!sessionState) return;
log.warn(
`[${sessionId}] Tool "${toolName}" stalled for ${TOOL_STALL_TIMEOUT_MS / 60000} minutes, aborting`
);
try {
await sessionState.session.abort();
} catch (err) {
log.error(`[${sessionId}] Failed to abort stalled session:`, err);
}
if (mainWindow && !mainWindow.isDestroyed()) {
mainWindow.webContents.send('copilot:error', {
sessionId,
message: `Tool "${toolName}" timed out after ${TOOL_STALL_TIMEOUT_MS / 60000} minutes and was aborted.`,
});
sessionState.isProcessing = false;
mainWindow.webContents.send('copilot:idle', { sessionId });
}
}, TOOL_STALL_TIMEOUT_MS);
sessionToolStallTimers.set(sessionId, timer);
}

function clearToolStallTimer(sessionId: string): void {
const timer = sessionToolStallTimers.get(sessionId);
if (timer) {
clearTimeout(timer);
sessionToolStallTimers.delete(sessionId);
}
}

// Resume a session that has been disconnected
async function resumeDisconnectedSession(
sessionId: string,
Expand Down Expand Up @@ -1177,6 +1217,7 @@ async function startEarlySessionResumption(): Promise<void> {
log.debug(
`[${sessionId}] Tool start: ${event.data.toolName} (${event.data.toolCallId})`
);
startToolStallTimer(sessionId, event.data.toolName);
mainWindow.webContents.send('copilot:tool-start', {
sessionId,
toolCallId: event.data.toolCallId,
Expand All @@ -1185,6 +1226,7 @@ async function startEarlySessionResumption(): Promise<void> {
});
} else if (event.type === 'tool.execution_complete') {
log.debug(`[${sessionId}] Tool end: ${event.data.toolCallId}`);
clearToolStallTimer(sessionId);
const completeData = event.data as Record<string, unknown>;
mainWindow.webContents.send('copilot:tool-end', {
sessionId,
Expand Down Expand Up @@ -2305,6 +2347,7 @@ async function initCopilot(): Promise<void> {
log.debug(
`[${sessionId}] Tool start: ${event.data.toolName} (${event.data.toolCallId})`
);
startToolStallTimer(sessionId, event.data.toolName);
mainWindow.webContents.send('copilot:tool-start', {
sessionId,
toolCallId: event.data.toolCallId,
Expand All @@ -2313,6 +2356,7 @@ async function initCopilot(): Promise<void> {
});
} else if (event.type === 'tool.execution_complete') {
log.debug(`[${sessionId}] Tool end: ${event.data.toolCallId}`);
clearToolStallTimer(sessionId);
const completeData = event.data as Record<string, unknown>;
mainWindow.webContents.send('copilot:tool-end', {
sessionId,
Expand Down Expand Up @@ -4945,6 +4989,7 @@ ipcMain.handle(
requestUserAttention();
} else if (event.type === 'tool.execution_start') {
log.debug(`[${sessionId}] Tool start: ${event.data.toolName} (${event.data.toolCallId})`);
startToolStallTimer(sessionId, event.data.toolName);
mainWindow.webContents.send('copilot:tool-start', {
sessionId,
toolCallId: event.data.toolCallId,
Expand All @@ -4953,6 +4998,7 @@ ipcMain.handle(
});
} else if (event.type === 'tool.execution_complete') {
log.debug(`[${sessionId}] Tool end: ${event.data.toolCallId}`);
clearToolStallTimer(sessionId);
const completeData = event.data as Record<string, unknown>;
mainWindow.webContents.send('copilot:tool-end', {
sessionId,
Expand Down