Skip to content

fix(web-shell): suppress stale pending prompt refresh errors #6352

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
wenshao merged 1 commit into from
Jul 6, 2026
Merged

fix(web-shell): suppress stale pending prompt refresh errors #6352

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
26 changes: 17 additions & 9 deletions packages/web-shell/client/hooks/useQueuedPrompts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ interface UseQueuedPromptsArgs {

const MAX_COMPLETED_PROMPT_IDS = 100;

type RefreshPendingPromptsResult =
| 'refreshed'
| 'skipped'
| 'superseded'
| 'failed';

function areQueuedPromptsEqual(
left: readonly QueuedPrompt[],
right: readonly QueuedPrompt[],
Expand Down Expand Up @@ -221,26 +227,28 @@ export function useQueuedPrompts({
);

const refreshPendingPrompts = useCallback(
async (targetSessionId = sessionId): Promise<boolean> => {
if (!connected || !targetSessionId) return false;
if (latestSessionIdRef.current !== targetSessionId) return false;
async (
targetSessionId = sessionId,
): Promise<RefreshPendingPromptsResult> => {
if (!connected || !targetSessionId) return 'skipped';
if (latestSessionIdRef.current !== targetSessionId) return 'skipped';
const requestSeq = ++refreshRequestSeqRef.current;
try {
const result = await sessionActions.getPendingPrompts({
sessionId: targetSessionId,
});
if (requestSeq !== refreshRequestSeqRef.current) return false;
if (latestSessionIdRef.current !== targetSessionId) return false;
if (requestSeq !== refreshRequestSeqRef.current) return 'superseded';
if (latestSessionIdRef.current !== targetSessionId) return 'skipped';
syncServerQueuedPrompts(
result.pendingPrompts.filter(
(p) => p.state === 'queued' || p.state === 'running',
),
targetSessionId,
);
return true;
return 'refreshed';
} catch (error) {
console.warn('Failed to refresh pending prompts', error);
return false;
return 'failed';
}
},
[connected, sessionActions, sessionId, syncServerQueuedPrompts],
Expand Down Expand Up @@ -595,7 +603,7 @@ export function useQueuedPrompts({
return false;
}
completionCallbacksRef.current.delete(target.serverPromptId);
if (!(await refreshPendingPrompts(targetSessionId))) {
if ((await refreshPendingPrompts(targetSessionId)) === 'failed') {
setQueuedPromptFlags(target.id, {
isEditing: false,
isRemoving: false,
Expand All @@ -612,7 +620,7 @@ export function useQueuedPrompts({
isEditing: false,
isRemoving: false,
});
if (!(await refreshPendingPrompts(targetSessionId))) {
if ((await refreshPendingPrompts(targetSessionId)) !== 'refreshed') {
restoreQueuedPrompts([target]);
}
reportError(error, fallback);
Expand Down
Loading