Skip to content

fix(autorun): resolve paused batch session for resume/skip/abort #726

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
pedramamini merged 3 commits into from
Apr 4, 2026
Merged

fix(autorun): resolve paused batch session for resume/skip/abort #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c724297
fix(autorun): resolve paused batch session for resume/skip/abort
nehaaprasad Apr 3, 2026
6be6151
merge main + fix: remove non-error-paused fallbacks from resolver
pedramamini Apr 4, 2026
5697833
fix: tighten error-paused session resolution and update tests
pedramamini Apr 4, 2026
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
50 changes: 40 additions & 10 deletions src/__tests__/renderer/hooks/useBatchHandlers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import {
import { useBatchProcessor } from '../../../renderer/hooks/batch/useBatchProcessor';
import { useSessionStore } from '../../../renderer/stores/sessionStore';
import { useSettingsStore } from '../../../renderer/stores/settingsStore';
import { useBatchStore } from '../../../renderer/stores/batchStore';
import { useModalStore } from '../../../renderer/stores/modalStore';

// ============================================================================
Expand Down Expand Up @@ -447,8 +448,13 @@ describe('useBatchHandlers', () => {
});

describe('handleSkipCurrentDocument', () => {
it('calls skipCurrentDocument and clears agent error for active batch session', () => {
it('calls skipCurrentDocument for the error-paused session', () => {
mockActiveBatchSessionIds = ['session-2'];
useBatchStore.setState({
batchRunStates: {
'session-2': createDefaultBatchState({ isRunning: true, errorPaused: true }),
},
});
const { result } = renderHook(() => useBatchHandlers(createDeps()));

act(() => {
Expand All @@ -459,9 +465,14 @@ describe('useBatchHandlers', () => {
expect(mockHandleClearAgentError).toHaveBeenCalledWith('session-2');
});

it('falls back to active session when no active batch sessions', () => {
it('prefers active session when it is error-paused', () => {
const session = createMockSession({ id: 'session-1' });
useSessionStore.setState({ sessions: [session], activeSessionId: 'session-1' });
useBatchStore.setState({
batchRunStates: {
'session-1': createDefaultBatchState({ isRunning: true, errorPaused: true }),
},
});
mockActiveBatchSessionIds = [];

const { result } = renderHook(() => useBatchHandlers(createDeps()));
Expand All @@ -474,8 +485,9 @@ describe('useBatchHandlers', () => {
expect(mockHandleClearAgentError).toHaveBeenCalledWith('session-1');
});

it('does nothing when no session ID can be resolved', () => {
it('does nothing when no session is error-paused', () => {
useSessionStore.setState({ sessions: [], activeSessionId: '' });
useBatchStore.setState({ batchRunStates: {} });
mockActiveBatchSessionIds = [];

const { result } = renderHook(() => useBatchHandlers(createDeps()));
Expand All @@ -490,8 +502,13 @@ describe('useBatchHandlers', () => {
});

describe('handleResumeAfterError', () => {
it('calls resumeAfterError and clears agent error for active batch session', () => {
it('calls resumeAfterError for the error-paused session', () => {
mockActiveBatchSessionIds = ['session-2'];
useBatchStore.setState({
batchRunStates: {
'session-2': createDefaultBatchState({ isRunning: true, errorPaused: true }),
},
});
const { result } = renderHook(() => useBatchHandlers(createDeps()));

act(() => {
Expand All @@ -502,9 +519,14 @@ describe('useBatchHandlers', () => {
expect(mockHandleClearAgentError).toHaveBeenCalledWith('session-2');
});

it('falls back to active session when no active batch sessions', () => {
it('prefers active session when it is error-paused', () => {
const session = createMockSession({ id: 'session-1' });
useSessionStore.setState({ sessions: [session], activeSessionId: 'session-1' });
useBatchStore.setState({
batchRunStates: {
'session-1': createDefaultBatchState({ isRunning: true, errorPaused: true }),
},
});
mockActiveBatchSessionIds = [];

const { result } = renderHook(() => useBatchHandlers(createDeps()));
Expand All @@ -517,8 +539,9 @@ describe('useBatchHandlers', () => {
expect(mockHandleClearAgentError).toHaveBeenCalledWith('session-1');
});

it('does nothing when no session ID can be resolved', () => {
it('does nothing when no session is error-paused', () => {
useSessionStore.setState({ sessions: [], activeSessionId: '' });
useBatchStore.setState({ batchRunStates: {} });
mockActiveBatchSessionIds = [];

const { result } = renderHook(() => useBatchHandlers(createDeps()));
Expand All @@ -532,8 +555,13 @@ describe('useBatchHandlers', () => {
});

describe('handleAbortBatchOnError', () => {
it('calls abortBatchOnError and clears agent error for active batch session', () => {
it('calls abortBatchOnError for the error-paused session', () => {
mockActiveBatchSessionIds = ['session-3'];
useBatchStore.setState({
batchRunStates: {
'session-3': createDefaultBatchState({ isRunning: true, errorPaused: true }),
},
});
const { result } = renderHook(() => useBatchHandlers(createDeps()));

act(() => {
Expand All @@ -544,9 +572,10 @@ describe('useBatchHandlers', () => {
expect(mockHandleClearAgentError).toHaveBeenCalledWith('session-3');
});

it('falls back to active session when no active batch sessions', () => {
it('does nothing when no session is error-paused', () => {
const session = createMockSession({ id: 'session-1' });
useSessionStore.setState({ sessions: [session], activeSessionId: 'session-1' });
useBatchStore.setState({ batchRunStates: {} });
mockActiveBatchSessionIds = [];

const { result } = renderHook(() => useBatchHandlers(createDeps()));
Expand All @@ -555,12 +584,13 @@ describe('useBatchHandlers', () => {
result.current.handleAbortBatchOnError();
});

expect(mockAbortBatchOnError).toHaveBeenCalledWith('session-1');
expect(mockHandleClearAgentError).toHaveBeenCalledWith('session-1');
expect(mockAbortBatchOnError).not.toHaveBeenCalled();
expect(mockHandleClearAgentError).not.toHaveBeenCalled();
});

it('does nothing when no session ID can be resolved', () => {
useSessionStore.setState({ sessions: [], activeSessionId: '' });
useBatchStore.setState({ batchRunStates: {} });
mockActiveBatchSessionIds = [];

const { result } = renderHook(() => useBatchHandlers(createDeps()));
Expand Down
43 changes: 34 additions & 9 deletions src/renderer/hooks/batch/useBatchHandlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,27 @@ import { CONDUCTOR_BADGES, getBadgeForTime } from '../../constants/conductorBadg
import { getActiveTab } from '../../utils/tabHelpers';
import { generateId } from '../../utils/ids';
import { useBatchProcessor } from './useBatchProcessor';
import { useBatchStore } from '../../stores/batchStore';
import { consumeGroupChatAutoRun } from '../../utils/groupChatAutoRunRegistry';
import type { RightPanelHandle } from '../../components/RightPanel';
import type { AgentSpawnResult } from '../agent/useAgentExecution';
import * as Sentry from '@sentry/electron/renderer';

/**
* Find the session that is actually paused on error.
* Prefer the active session when it is paused; otherwise pick the first errorPaused session.
* Returns undefined when nothing is error-paused — callers bail via the existing guard.
*/
function resolveBatchSessionIdForPausedError(
batchRunStates: Record<string, BatchRunState>,
activeSessionId: string | undefined
): string | undefined {
if (activeSessionId && batchRunStates[activeSessionId]?.errorPaused) {
return activeSessionId;
}
return Object.keys(batchRunStates).find((id) => batchRunStates[id]?.errorPaused);
}

// ============================================================================
// Dependencies interface
// ============================================================================
Expand Down Expand Up @@ -640,28 +656,37 @@ export function useBatchHandlers(deps: UseBatchHandlersDeps): UseBatchHandlersRe
);

const handleSkipCurrentDocument = useCallback(() => {
const sessionId =
activeBatchSessionIds.length > 0 ? activeBatchSessionIds[0] : activeSession?.id;
// Reads batchRunStates imperatively at call time
const sessionId = resolveBatchSessionIdForPausedError(
useBatchStore.getState().batchRunStates,
activeSession?.id
);
if (!sessionId) return;
skipCurrentDocument(sessionId);
handleClearAgentError(sessionId);
}, [activeBatchSessionIds, activeSession, skipCurrentDocument, handleClearAgentError]);
}, [activeSession, skipCurrentDocument, handleClearAgentError]);

const handleResumeAfterError = useCallback(() => {
const sessionId =
activeBatchSessionIds.length > 0 ? activeBatchSessionIds[0] : activeSession?.id;
// Reads batchRunStates imperatively at call time
const sessionId = resolveBatchSessionIdForPausedError(
useBatchStore.getState().batchRunStates,
activeSession?.id
);
if (!sessionId) return;
resumeAfterError(sessionId);
handleClearAgentError(sessionId);
}, [activeBatchSessionIds, activeSession, resumeAfterError, handleClearAgentError]);
}, [activeSession, resumeAfterError, handleClearAgentError]);

const handleAbortBatchOnError = useCallback(() => {
const sessionId =
activeBatchSessionIds.length > 0 ? activeBatchSessionIds[0] : activeSession?.id;
// Reads batchRunStates imperatively at call time
const sessionId = resolveBatchSessionIdForPausedError(
useBatchStore.getState().batchRunStates,
activeSession?.id
);
if (!sessionId) return;
abortBatchOnError(sessionId);
handleClearAgentError(sessionId);
}, [activeBatchSessionIds, activeSession, abortBatchOnError, handleClearAgentError]);
}, [activeSession, abortBatchOnError, handleClearAgentError]);

// ====================================================================
// Sync auto-run stats from server
Expand Down
Loading