feat(runtime): add user-controlled turn recovery
This commit is contained in:
@@ -0,0 +1,108 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { AlertTriangle, LoaderCircle, RotateCcw, X } from "lucide-react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { cn } from "@/lib/utils";
|
||||
import type { RecoveryState } from "@/lib/types";
|
||||
|
||||
interface RecoveryNoticeProps {
|
||||
state: RecoveryState;
|
||||
onContinue: () => Promise<void>;
|
||||
onDismiss: () => Promise<void>;
|
||||
}
|
||||
|
||||
export function RecoveryNotice({ state, onContinue, onDismiss }: RecoveryNoticeProps) {
|
||||
const { t } = useTranslation();
|
||||
const [pending, setPending] = useState<"continue" | "dismiss" | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [hiddenRecoveryId, setHiddenRecoveryId] = useState<string | null>(null);
|
||||
useEffect(() => {
|
||||
// A continuation can be interrupted again with the same recovery ID.
|
||||
// Reveal the decision surface when the server returns to a waiting state.
|
||||
if (state.status === "awaiting_user" || state.status === "failed") {
|
||||
setHiddenRecoveryId(null);
|
||||
}
|
||||
}, [state.recovery_id, state.status]);
|
||||
if (state.status === "recovered" || hiddenRecoveryId === state.recovery_id) return null;
|
||||
|
||||
const waiting = state.status === "awaiting_user" || state.status === "failed";
|
||||
const contextUnavailable = state.can_continue === false;
|
||||
const title = state.status === "failed"
|
||||
? t("recovery.failed", { defaultValue: "Task recovery failed" })
|
||||
: waiting
|
||||
? t("recovery.interrupted", { defaultValue: "Task interrupted" })
|
||||
: t("recovery.resuming", { defaultValue: "Restoring interrupted task…" });
|
||||
const detail = state.status === "failed" || contextUnavailable
|
||||
? t("recovery.failedHelp", {
|
||||
defaultValue: "The saved task could not be restored safely. Review it before continuing.",
|
||||
})
|
||||
: waiting
|
||||
? t("recovery.review", { defaultValue: "Review the task before continuing. Tools will not be replayed automatically." })
|
||||
: t("recovery.safeResume", { defaultValue: "Continuing from saved conversation context." });
|
||||
const run = (action: "continue" | "dismiss") => {
|
||||
setPending(action);
|
||||
setError(null);
|
||||
// ``resuming`` is an internal transition, not another task for the user
|
||||
// to monitor. Hide the notice optimistically and only bring it back if
|
||||
// the explicit action is rejected.
|
||||
if (action === "continue") setHiddenRecoveryId(state.recovery_id);
|
||||
const operation = action === "continue" ? onContinue() : onDismiss();
|
||||
void operation.catch(() => {
|
||||
if (action === "continue") setHiddenRecoveryId(null);
|
||||
setError(t("recovery.actionFailed", { defaultValue: "Recovery action failed. Try again." }));
|
||||
}).finally(() => setPending(null));
|
||||
};
|
||||
|
||||
return (
|
||||
<div
|
||||
role={waiting ? "alert" : "status"}
|
||||
aria-live={waiting ? "assertive" : "polite"}
|
||||
aria-busy={state.status === "resuming"}
|
||||
data-recovery-status={state.status}
|
||||
className="mx-auto mb-2 flex w-full max-w-[49.5rem] items-center gap-3 rounded-control border border-border/70 bg-muted/35 px-3 py-2 text-sm transition-[background-color,border-color,opacity,transform] duration-200 ease-out motion-reduce:transition-none animate-in fade-in-0 slide-in-from-bottom-1 duration-200 motion-reduce:animate-none"
|
||||
>
|
||||
{waiting ? (
|
||||
<AlertTriangle className="h-4 w-4 shrink-0 text-amber-600 dark:text-amber-400" aria-hidden />
|
||||
) : (
|
||||
<LoaderCircle className="h-4 w-4 shrink-0 animate-spin text-primary motion-reduce:animate-none" aria-hidden />
|
||||
)}
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="font-medium">
|
||||
{title}
|
||||
</p>
|
||||
<p className={cn(
|
||||
"mt-0.5 text-xs",
|
||||
error ? "text-destructive" : "text-muted-foreground",
|
||||
)}>
|
||||
{error ?? detail}
|
||||
</p>
|
||||
</div>
|
||||
{waiting ? (
|
||||
<div className="flex shrink-0 items-center gap-1.5">
|
||||
<Button
|
||||
type="button"
|
||||
size="sm"
|
||||
variant="outline"
|
||||
disabled={pending !== null}
|
||||
onClick={() => run("dismiss")}
|
||||
>
|
||||
<X className="mr-1 h-3.5 w-3.5" aria-hidden />
|
||||
{t("recovery.dismiss", { defaultValue: "Dismiss" })}
|
||||
</Button>
|
||||
{!contextUnavailable ? (
|
||||
<Button
|
||||
type="button"
|
||||
size="sm"
|
||||
disabled={pending !== null}
|
||||
onClick={() => run("continue")}
|
||||
>
|
||||
<RotateCcw className="mr-1 h-3.5 w-3.5" aria-hidden />
|
||||
{t("recovery.continue", { defaultValue: "Continue" })}
|
||||
</Button>
|
||||
) : null}
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import { FilePreviewAvailabilityProvider } from "@/components/FilePreviewAvailab
|
||||
import { FilePreviewPanel } from "@/components/FilePreviewPanel";
|
||||
import { SessionHandleLabel } from "@/components/SessionHandleLabel";
|
||||
import { PromptNavigator } from "@/components/thread/PromptNavigator";
|
||||
import { RecoveryNotice } from "@/components/thread/RecoveryNotice";
|
||||
import { SessionInfoPopover } from "@/components/thread/SessionInfoPopover";
|
||||
import {
|
||||
ThreadComposer,
|
||||
@@ -763,6 +764,9 @@ export function ThreadShell({
|
||||
isStreaming,
|
||||
runStartedAt,
|
||||
goalState,
|
||||
recoveryState,
|
||||
continueRecovery,
|
||||
dismissRecovery,
|
||||
send,
|
||||
transcribeAudio,
|
||||
stop,
|
||||
@@ -835,8 +839,15 @@ export function ThreadShell({
|
||||
[displayMessages],
|
||||
);
|
||||
const currentGoalState = messagesReady ? goalState : undefined;
|
||||
const currentRunStartedAt = messagesReady ? runStartedAt : null;
|
||||
const turnActive = messagesReady && (isStreaming || currentRunStartedAt !== null);
|
||||
// Decision states freeze the interrupted turn and hand the next action to
|
||||
// the recovery notice. ``resuming`` remains active; ``recovered`` is only
|
||||
// historical metadata and must not suppress a later normal turn.
|
||||
const recoveryNeedsDecision = recoveryState?.status === "awaiting_user"
|
||||
|| recoveryState?.status === "failed";
|
||||
const currentRunStartedAt = messagesReady && !recoveryNeedsDecision ? runStartedAt : null;
|
||||
const turnActive = messagesReady
|
||||
&& !recoveryNeedsDecision
|
||||
&& (isStreaming || currentRunStartedAt !== null);
|
||||
const restoredViewportTurnId = useMemo(
|
||||
() => turnActive ? latestActiveTurnId(displayMessages, currentRunStartedAt) : null,
|
||||
[currentRunStartedAt, displayMessages, turnActive],
|
||||
@@ -1472,6 +1483,13 @@ export function ThreadShell({
|
||||
|
||||
const composer = (
|
||||
<>
|
||||
{recoveryState ? (
|
||||
<RecoveryNotice
|
||||
state={recoveryState}
|
||||
onContinue={continueRecovery}
|
||||
onDismiss={dismissRecovery}
|
||||
/>
|
||||
) : null}
|
||||
{streamError && !hasInlineDeliveryError(messages, streamError) ? (
|
||||
<StreamErrorNotice
|
||||
error={streamError}
|
||||
|
||||
Reference in New Issue
Block a user