Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions src/__tests__/renderer/hooks/useAgentListeners.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,39 @@ describe('useAgentListeners', () => {
expect(agentErrorOpen).toBe(false);
});

it('clears agentSessionId on session_not_found so next prompt starts fresh', () => {
const deps = createMockDeps();
const tab = createMockTab({
id: 'tab-1',
agentSessionId: 'stale-session-abc123',
});
const session = createMockSession({
id: 'sess-1',
state: 'busy',
aiTabs: [tab],
activeTabId: 'tab-1',
agentSessionId: 'stale-session-abc123',
});
useSessionStore.setState({
sessions: [session],
activeSessionId: 'sess-1',
});

renderHook(() => useAgentListeners(deps));

onAgentErrorHandler?.('sess-1-ai-tab-1', {
...baseError,
type: 'session_not_found',
});

const updated = useSessionStore.getState().sessions.find((s) => s.id === 'sess-1');
const updatedTab = updated?.aiTabs.find((t) => t.id === 'tab-1');
// Tab-level agentSessionId must be cleared
expect(updatedTab?.agentSessionId).toBeUndefined();
// Session-level agentSessionId must also be cleared
expect(updated?.agentSessionId).toBeUndefined();
});

it('appends error log entry to the target tab', () => {
const deps = createMockDeps();
const tab = createMockTab({ id: 'tab-1', logs: [] });
Expand Down
6 changes: 6 additions & 0 deletions src/renderer/hooks/agent/useAgentListeners.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,10 @@ export function useAgentListeners(deps: UseAgentListenersDeps): void {
...tab,
logs: [...tab.logs, errorLogEntry],
agentError: isSessionNotFound ? undefined : agentError,
// Clear stale agentSessionId so the next prompt
// starts a fresh session instead of trying to
// --resume the deleted one (infinite loop).
...(isSessionNotFound ? { agentSessionId: undefined } : {}),
}
: tab
)
Expand All @@ -1220,6 +1224,8 @@ export function useAgentListeners(deps: UseAgentListenersDeps): void {
return {
...s,
aiTabs: updatedAiTabs,
// Also clear session-level agentSessionId
agentSessionId: undefined,
};
}

Expand Down
Loading