Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🧩 refactor: Extend Step Status To Remaining Cards; Separate Cancelled From Failed (#14873)
Danny Aviladb675209e814
diff --git a/client/src/components/Chat/Messages/Content/Part.tsx b/client/src/components/Chat/Messages/Content/Part.tsxindex adb0e214cf..6c26dcd32a 100644--- a/client/src/components/Chat/Messages/Content/Part.tsx+++ b/client/src/components/Chat/Messages/Content/Part.tsx@@ -226,6 +226,7 @@ const Part = memo(function Part({<ImageGeninitialProgress={toolCall.progress ?? 0.1}isSubmitting={isSubmitting}+ runStepStatus={toolCall.runStepStatus}toolName={toolCall.name}args={toolCall.args ?? ''}output={toolCall.output ?? ''}@@ -278,6 +279,7 @@ const Part = memo(function Part({output={toolCall.output ?? ''}initialProgress={toolCall.progress ?? 0.1}isSubmitting={isSubmitting}+ runStepStatus={toolCall.runStepStatus}attachments={attachments}persistedContent={persistedContent}hideAttachments={hideAttachments}@@ -331,6 +333,7 @@ const Part = memo(function Part({output={toolCall.output ?? ''}initialProgress={toolCall.progress ?? 0.1}isSubmitting={isSubmitting}+ runStepStatus={toolCall.runStepStatus}attachments={attachments}isLast={isLast}onExpand={onToolExpand}@@ -341,6 +344,7 @@ const Part = memo(function Part({<RetrievalCallinitialProgress={toolCall.progress ?? 0.1}isSubmitting={isSubmitting}+ runStepStatus={toolCall.runStepStatus}args={toolCall.args}output={toolCall.output ?? undefined}attachments={attachments}@@ -403,6 +407,7 @@ const Part = memo(function Part({<RetrievalCallinitialProgress={toolCall.progress ?? 0.1}isSubmitting={isSubmitting}+ runStepStatus={toolCall.runStepStatus}output={(toolCall as { output?: string }).output}attachments={attachments}onExpand={onToolExpand}@@ -418,6 +423,7 @@ const Part = memo(function Part({initialProgress={toolCall.progress ?? 0.1}args={toolCall.function.arguments as string}isSubmitting={isSubmitting}+ runStepStatus={toolCall.runStepStatus}toolName={toolCall.function.name}output={toolCall.function.output ?? ''}/>diff --git a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsxindex 1ba67ed557..4bd3c1aebd 100644--- a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx+++ b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx@@ -1,7 +1,12 @@import { useState, useEffect, useRef, useCallback } from 'react';import { AGENT_STYLE_TOOLS } from '.';import { PixelCard } from '@librechat/client';-import type { TAttachment, TFile, TAttachmentMetadata } from 'librechat-data-provider';+import type {+ TAttachment,+ TFile,+ TAttachmentMetadata,+ PartMetadata,+} from 'librechat-data-provider';import { ToolIcon, isError } from '~/components/Chat/Messages/Content/ToolOutput';import Image from '~/components/Chat/Messages/Content/Image';import { useProgress, useLocalize } from '~/hooks';@@ -13,7 +18,18 @@ function computeCancelled(isSubmitting: boolean | undefined,initialProgress: number,hasError: boolean,+ runStepStatus?: PartMetadata['runStepStatus'],): boolean {+ /**+ * The step's own terminal status wins when the run emitted one. Checked+ * first and not gated on `hasError`, so output parsing cannot demote a step+ * the run reported as stopped. Everything below is the pre-existing+ * inference, kept for messages saved before `on_run_step_closed` and for the+ * legacy path that has no submitting signal at all.+ */+ if (runStepStatus != null) {+ return runStepStatus === 'cancelled';+ }if (isSubmitting !== undefined) {return (!isSubmitting && initialProgress < 1) || hasError;}@@ -33,6 +49,7 @@ export default function OpenAIImageGen({output,attachments,hideAttachments = false,+ runStepStatus,}: {initialProgress: number;isSubmitting?: boolean;@@ -41,6 +58,7 @@ export default function OpenAIImageGen({output?: string | null;attachments?: TAttachment[];hideAttachments?: boolean;+ runStepStatus?: PartMetadata['runStepStatus'];}) {const localize = useLocalize();/** Model-authored live label (injected when the tool is opted into@@ -48,11 +66,16 @@ export default function OpenAIImageGen({const intent = useToolCallIntent(_args);const isAgentStyle = toolName != null && AGENT_STYLE_TOOLS.has(toolName);const [agentProgress, setAgentProgress] = useState(initialProgress);- const legacyProgress = useProgress(isAgentStyle ? 1 : initialProgress);- const progress = isAgentStyle ? agentProgress : legacyProgress;+ const isClosed = runStepStatus != null;+ /** Passing 1 in stops `useProgress` scheduling its interval; masking the+ * result makes the terminal value observable on the same render, since the+ * hook settles through 0.99 and a 200ms timeout. */+ const legacyProgress = useProgress(isAgentStyle || isClosed ? 1 : initialProgress);+ const livingProgress = isAgentStyle ? agentProgress : legacyProgress;+ const progress = isClosed ? 1 : livingProgress;const intervalRef = useRef<NodeJS.Timeout | null>(null);- const hasError = typeof output === 'string' && isError(output);+ const hasError = (typeof output === 'string' && isError(output)) || runStepStatus === 'failed';/*** Determines if the image generation was cancelled.@@ -60,7 +83,14 @@ export default function OpenAIImageGen({* - Legacy path (isSubmitting undefined): in-progress (0 < progress < 1) is never cancelled* because legacy image gen lacks a submitting signal — only errors cancel.*/- const cancelled = computeCancelled(isSubmitting, initialProgress, hasError);+ const cancelled = computeCancelled(isSubmitting, initialProgress, hasError, runStepStatus);+ /**+ * An explicit `cancelled` close is authoritative and outranks an+ * error-formatted output — aborting a tool can itself produce one. The+ * legacy inference keeps the opposite precedence, because it folds+ * `hasError` into its own cancellation signal.+ */+ const reportsError = hasError && runStepStatus !== 'cancelled';let width: number | undefined;let height: number | undefined;@@ -133,7 +163,7 @@ export default function OpenAIImageGen({return;}- if (isSubmitting) {+ if (isSubmitting && !isClosed) {setAgentProgress(initialProgress);if (intervalRef.current) {@@ -179,20 +209,20 @@ export default function OpenAIImageGen({clearInterval(intervalRef.current);}};- }, [isSubmitting, initialProgress, quality, isAgentStyle]);+ }, [isSubmitting, initialProgress, quality, isAgentStyle, isClosed]);useEffect(() => {if (!isAgentStyle) {return;}- if (initialProgress >= 1 || cancelled) {+ if (initialProgress >= 1 || cancelled || isClosed) {setAgentProgress(initialProgress);if (intervalRef.current) {clearInterval(intervalRef.current);}}- }, [initialProgress, cancelled, isAgentStyle]);+ }, [initialProgress, cancelled, isAgentStyle, isClosed]);useEffect(() => {updateDimensions();@@ -216,10 +246,10 @@ export default function OpenAIImageGen({<><span className="sr-only" aria-live="polite" aria-atomic="true">{(() => {- if (progress < 1 && !cancelled) {+ if (progress < 1 && !cancelled && !reportsError) {return '';}- if (cancelled && hasError) {+ if (reportsError) {return localize('com_ui_image_gen_failed');}if (cancelled) {@@ -230,7 +260,13 @@ export default function OpenAIImageGen({</span><div className="relative my-1 flex h-5 shrink-0 items-center gap-2"><ToolIcon type="image_gen" isAnimating={isInProgress} />- <ProgressText progress={progress} error={cancelled} toolName={toolName} intent={intent} />+ <ProgressText+ progress={progress}+ error={reportsError}+ cancelled={cancelled}+ toolName={toolName}+ intent={intent}+ /></div>{isAgentStyle && !hideAttachments && (<div className="relative mb-2 flex w-full justify-start">diff --git a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/ProgressText.tsx b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/ProgressText.tsxindex 6fcab36239..39225b7ed0 100644--- a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/ProgressText.tsx+++ b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/ProgressText.tsx@@ -5,11 +5,15 @@ import { cn } from '~/utils';export default function ProgressText({progress,error,+ cancelled,toolName = '',intent,}: {progress: number;error?: boolean;+ /** Stopped rather than failed — kept separate from `error` so a generation+ * the user cancelled is not labelled a failure. */+ cancelled?: boolean;toolName?: string;/** Model-authored label; wins over the phase texts (error state excepted). */intent?: string;@@ -17,9 +21,15 @@ export default function ProgressText({const localize = useLocalize();const getText = () => {+ /** Failure outranks cancellation: the legacy inference folds errors into+ * its cancellation signal, so checking `cancelled` first would relabel a+ * genuine failure as a user stop. */if (error) {return localize('com_ui_image_gen_failed');}+ if (cancelled) {+ return localize('com_ui_cancelled');+ }if (intent != null) {return intent;}diff --git a/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx b/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsxindex d61b84fbe5..8dadf8a502 100644--- a/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx+++ b/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx@@ -9,7 +9,13 @@ import {OGDialogContent,OGDialogDescription,} from '@librechat/client';-import type { Agents, TAttachment, TMessage, TMessageContentParts } from 'librechat-data-provider';+import type {+ Agents,+ TAttachment,+ TMessage,+ TMessageContentParts,+ PartMetadata,+} from 'librechat-data-provider';import type { PartWithIndex } from '~/components/Chat/Messages/Content/ParallelContent';import type { SubagentTickerLine } from '~/utils/subagentContent';import ToolCallGroup from '~/components/Chat/Messages/Content/ToolCallGroup';@@ -36,6 +42,9 @@ interface SubagentCallProps {* tool_call's `progress` and any terminal subagent envelope — to decide* whether the subagent is `running`, `cancelled`, or `finished`. */isSubmitting?: boolean;+ /** Terminal lifecycle status from `on_run_step_closed`, when the run+ * emitted one. Authoritative over the `isSubmitting` inference. */+ runStepStatus?: PartMetadata['runStepStatus'];args?: string | Record<string, unknown>;output?: string | null;attachments?: TAttachment[];@@ -165,6 +174,7 @@ export default function SubagentCall({toolCallId,initialProgress,isSubmitting = false,+ runStepStatus,args,output,attachments,@@ -198,9 +208,25 @@ export default function SubagentCall({* - `running`: the parent is still streaming and no terminal signal has* arrived yet.*/- const hasError = progress?.status === 'error';- const finished = initialProgress >= 1 || progress?.status === 'stop' || hasError;- const cancelled = !isSubmitting && !finished;+ /**+ * A closed run step resolves the tri-state directly. It is the only signal+ * that distinguishes "this subagent was stopped" from "the parent stream+ * ended for some other reason", which the `!isSubmitting` inference below+ * cannot tell apart. That inference stays as the fallback for messages+ * saved before `on_run_step_closed` and endpoints that do not emit it.+ */+ const isClosed = runStepStatus != null;+ /**+ * An explicit `cancelled` close outranks a live `error` phase: aborting a+ * child can surface through its execution as an error, and the run's own+ * status is the authority on why it stopped.+ */+ const hasError =+ (progress?.status === 'error' || runStepStatus === 'failed') && runStepStatus !== 'cancelled';+ const finished = isClosed+ ? runStepStatus !== 'cancelled'+ : initialProgress >= 1 || progress?.status === 'stop' || hasError;+ const cancelled = isClosed ? runStepStatus === 'cancelled' : !isSubmitting && !finished;const running = !finished && !cancelled;/**diff --git a/client/src/components/Chat/Messages/Content/Parts/useToolCallState.ts b/client/src/components/Chat/Messages/Content/Parts/useToolCallState.tsindex 8b26dc7e53..47483c33a4 100644--- a/client/src/components/Chat/Messages/Content/Parts/useToolCallState.ts+++ b/client/src/components/Chat/Messages/Content/Parts/useToolCallState.ts@@ -27,10 +27,6 @@ export default function useToolCallState(): ToolCallState {const autoExpand = useRecoilValue(store.autoExpandTools);const hasOutput = output.length > 0;- /**- * A step the run closed as `failed` is an error even when its output does- * not look like one — the run knows something the output text does not.- */const hasError = (hasOutput && isError(output)) || runStepStatus === 'failed';const hasContent = hasInput || hasOutput;@@ -43,13 +39,13 @@ export default function useToolCallState(}}, [autoExpand, hasContent]);+ const isClosed = runStepStatus != null;/**- * A closed step is terminal by definition, so it must never animate. Forcing- * the bar complete keeps the shimmer from outliving a step that closed- * without ever emitting a completion event.+ * Both halves are load-bearing: passing 1 in stops `useProgress` scheduling+ * its 200ms interval, and masking the result makes the terminal value+ * observable on the same render rather than after the hook settles.*/- const isClosed = runStepStatus != null;- const rawProgress = useProgress(initialProgress);+ const rawProgress = useProgress(isClosed ? 1 : initialProgress);const progress = isClosed ? 1 : rawProgress;const toggleCode = useCallback(() => {setShowCode((prev) => {diff --git a/client/src/components/Chat/Messages/Content/RetrievalCall.tsx b/client/src/components/Chat/Messages/Content/RetrievalCall.tsxindex 9c52fe25c2..7cf5cba8b9 100644--- a/client/src/components/Chat/Messages/Content/RetrievalCall.tsx+++ b/client/src/components/Chat/Messages/Content/RetrievalCall.tsx@@ -3,7 +3,7 @@ import { useRecoilValue } from 'recoil';import { Tools } from 'librechat-data-provider';import { TooltipAnchor } from '@librechat/client';import { FileText, FileSpreadsheet, FileCode, FileImage, File } from 'lucide-react';-import type { TAttachment, TFile } from 'librechat-data-provider';+import type { TAttachment, TFile, PartMetadata } from 'librechat-data-provider';import { useLocalize, useProgress, useExpandCollapse } from '~/hooks';import { ToolIcon, OutputRenderer, isError } from './ToolOutput';import FilePreviewDialog from './FilePreviewDialog';@@ -329,6 +329,7 @@ export default function RetrievalCall({output,attachments,onExpand,+ runStepStatus,}: {initialProgress: number;isSubmitting: boolean;@@ -336,16 +337,36 @@ export default function RetrievalCall({output?: string;attachments?: TAttachment[];onExpand?: () => void;+ runStepStatus?: PartMetadata['runStepStatus'];}) {- const progress = useProgress(initialProgress);+ const isClosed = runStepStatus != null;+ /**+ * Both halves are load-bearing. Passing 1 in stops `useProgress` scheduling+ * its 200ms interval, which it keeps alive for any input below 1. Masking+ * the result makes the terminal value observable on the same render — the+ * hook settles through 0.99 and a 200ms timeout, so a step closing while+ * mounted would otherwise render as still in progress for that window.+ */+ const rawProgress = useProgress(isClosed ? 1 : initialProgress);+ const progress = isClosed ? 1 : rawProgress;const localize = useLocalize();/** Model-authored live label (injected when file_search is opted into* describe_intent); persists as the settled label. The sr-only live* region below deliberately keeps its stable generic value. */const intent = useToolCallIntent(args);- const errorState = typeof output === 'string' && isError(output);- const cancelled = !isSubmitting && initialProgress < 1 && !errorState;+ const errorState = (typeof output === 'string' && isError(output)) || runStepStatus === 'failed';+ /**+ * The step's own terminal status wins when the run emitted one; the+ * `isSubmitting` heuristic is a whole-message inference that cannot tell+ * which step stopped. Authoritative on its own terms — not gated on+ * `errorState`, so output parsing cannot demote a stopped step back into an+ * in-flight state. Fallback retained for messages saved before+ * `on_run_step_closed` and endpoints that do not emit it.+ */+ const cancelled = isClosed+ ? runStepStatus === 'cancelled'+ : !isSubmitting && initialProgress < 1 && !errorState;const hasOutput = !!output && !isError(output);const autoExpand = useRecoilValue(store.autoExpandTools);const [showOutput, setShowOutput] = useState(() => autoExpand && hasOutput);@@ -429,6 +450,12 @@ export default function RetrievalCall({if (cancelled) {return localize('com_ui_cancelled');}+ /** Announced before the success string: a terminal step that errored+ * must not reach the live region as "retrieved files", which would+ * tell a screen-reader user the opposite of what the card shows. */+ if (errorState) {+ return localize('com_ui_failed');+ }return intent ?? localize('com_ui_retrieved_files');})()}</span>@@ -437,7 +464,13 @@ export default function RetrievalCall({progress={progress}onClick={hasOutput ? handleToggleOutput : undefined}inProgressText={intent ?? localize('com_ui_searching_files')}- finishedText={intent ?? localize('com_ui_retrieved_files')}+ /** A cancelled step must not read "Retrieved files" beside a+ * cancellation icon while the live region says "Cancelled". */+ finishedText={+ cancelled+ ? localize('com_ui_cancelled')+ : (intent ?? localize('com_ui_retrieved_files'))+ }errorSuffix={errorState && !cancelled ? localize('com_ui_tool_failed') : undefined}icon={<ToolIcon type="file_search" isAnimating={progress < 1 && !cancelled && !errorState} />diff --git a/client/src/components/Chat/Messages/Content/ToolCall.tsx b/client/src/components/Chat/Messages/Content/ToolCall.tsxindex e6e80d86e0..0be8054663 100644--- a/client/src/components/Chat/Messages/Content/ToolCall.tsx+++ b/client/src/components/Chat/Messages/Content/ToolCall.tsx@@ -139,8 +139,6 @@ export default function ToolCall({window.open(auth, '_blank', 'noopener,noreferrer');}, [auth, isMCPToolCall, mcpServerName, actionId]);- /** A step the run closed as `failed` is an error even when its output text- * does not parse as one. */const hasError = (typeof output === 'string' && isError(output)) || runStepStatus === 'failed';/*** The step's own terminal status wins when the run emitted one. The@@ -184,8 +182,12 @@ export default function ToolCall({return parsedAuthUrl?.hostname ?? '';}, [parsedAuthUrl]);- /** A closed step is terminal, so it must never keep animating. */- const rawProgress = useProgress(initialProgress);+ /**+ * Both halves are load-bearing: passing 1 in stops `useProgress` scheduling+ * its 200ms interval, and masking the result makes the terminal value+ * observable on the same render rather than after the hook settles.+ */+ const rawProgress = useProgress(isClosed ? 1 : initialProgress);const progress = isClosed ? 1 : rawProgress;const showCancelled = cancelled || (errorState && !output);diff --git a/client/src/components/Chat/Messages/Content/WebSearch.tsx b/client/src/components/Chat/Messages/Content/WebSearch.tsxindex d23f3fe438..970512da71 100644--- a/client/src/components/Chat/Messages/Content/WebSearch.tsx+++ b/client/src/components/Chat/Messages/Content/WebSearch.tsx@@ -2,7 +2,12 @@ import { useMemo, useState, useEffect } from 'react';import { useRecoilValue } from 'recoil';import { Tools } from 'librechat-data-provider';import { Globe, ChevronDown } from 'lucide-react';-import type { TAttachment, ValidSource, SearchResultData } from 'librechat-data-provider';+import type {+ TAttachment,+ ValidSource,+ SearchResultData,+ PartMetadata,+} from 'librechat-data-provider';import { FaviconImage, getCleanDomain } from '~/components/Web/SourceHovercard';import { StackedFavicons } from '~/components/Web/Sources';import { useLocalize, useExpandCollapse } from '~/hooks';@@ -85,6 +90,7 @@ export default function WebSearch({output,attachments,onExpand,+ runStepStatus,}: {isLast?: boolean;isSubmitting: boolean;@@ -93,13 +99,17 @@ export default function WebSearch({initialProgress: number;attachments?: TAttachment[];onExpand?: () => void;+ runStepStatus?: PartMetadata['runStepStatus'];}) {const localize = useLocalize();/** Model-authored live label (web_search carries `intent` natively);* persists as the settled label like the other tool cards. */const intent = useToolCallIntent(args);const { searchResults } = useSearchContext();- const error = typeof output === 'string' && output.toLowerCase().includes('error processing');+ const error =+ (typeof output === 'string' && output.toLowerCase().includes('error processing')) ||+ runStepStatus === 'failed';+ const isClosed = runStepStatus != null;// Server tool calls (srvtoolu_) never receive ON_RUN_STEP_COMPLETED, so progress// stays at the default 0.1. Treat the search as complete if attachments have results.@@ -108,15 +118,27 @@ export default function WebSearch({attachments?.some((att) => att.type === Tools.web_search && att[Tools.web_search]) ?? false,[attachments],);- const effectiveProgress = hasResults && !isSubmitting ? 1 : progress;- const cancelled = (!isSubmitting && effectiveProgress < 1) || error === true;+ const effectiveProgress = isClosed || (hasResults && !isSubmitting) ? 1 : progress;+ /**+ * `error` folds into this branch deliberately: an errored search has always+ * rendered as nothing (the `cancelled` early-return below), so a step closed+ * as `failed` lands in the same place rather than inventing a failure UI+ * this component has never had — or worse, falling through to the streaming+ * branch and shimmering forever.+ */+ const cancelled = isClosed+ ? runStepStatus === 'cancelled' || error+ : (!isSubmitting && effectiveProgress < 1) || error === true;- const finalizing = isSubmitting && isLast && effectiveProgress === 1;+ const finalizing = !isClosed && isSubmitting && isLast && effectiveProgress === 1;/** A search that is the message's FINAL part stays "finalizing" only while* the submission is live — afterwards it must settle like any other call,* or the completed label (and its settled intent announcement) never- * renders and the card shimmers forever. */- const complete = effectiveProgress === 1 && !finalizing && (!isLast || !isSubmitting);+ * renders and the card shimmers forever. A closed step settles immediately+ * on its own status instead of waiting for the submission to end. */+ const complete = isClosed+ ? !cancelled+ : effectiveProgress === 1 && !finalizing && (!isLast || !isSubmitting);const ownTurn = useMemo((): string => {if (!attachments) {diff --git a/client/src/components/Chat/Messages/Content/__tests__/OpenAIImageGen.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/OpenAIImageGen.test.tsxindex da143c862b..a056aa6bbf 100644--- a/client/src/components/Chat/Messages/Content/__tests__/OpenAIImageGen.test.tsx+++ b/client/src/components/Chat/Messages/Content/__tests__/OpenAIImageGen.test.tsx@@ -38,8 +38,21 @@ jest.mock('../ToolOutput', () => ({jest.mock('../Parts/OpenAIImageGen/ProgressText', () => ({__esModule: true,- default: ({ progress, error }: { progress: number; error: boolean }) => (- <div data-testid="progress-text" data-progress={progress} data-error={String(error)} />+ default: ({+ progress,+ error,+ cancelled,+ }: {+ progress: number;+ error: boolean;+ cancelled?: boolean;+ }) => (+ <div+ data-testid="progress-text"+ data-progress={progress}+ data-error={String(error)}+ data-cancelled={String(cancelled === true)}+ />),}));@@ -158,6 +171,48 @@ describe('OpenAIImageGen', () => {it('shows cancelled state when not submitting and incomplete', () => {render(<OpenAIImageGen {...defaultProps} isSubmitting={false} initialProgress={0.5} />);const progressText = screen.getByTestId('progress-text');+ expect(progressText).toHaveAttribute('data-cancelled', 'true');+ expect(progressText).toHaveAttribute('data-error', 'false');+ });++ it('reports a run-step cancellation as cancelled, not failed', () => {+ render(<OpenAIImageGen {...defaultProps} isSubmitting={true} runStepStatus="cancelled" />);+ const progressText = screen.getByTestId('progress-text');+ expect(progressText).toHaveAttribute('data-cancelled', 'true');+ expect(progressText).toHaveAttribute('data-error', 'false');+ });++ it('reports a run-step failure as an error even when the output is benign', () => {+ render(<OpenAIImageGen {...defaultProps} isSubmitting={true} runStepStatus="failed" />);+ const progressText = screen.getByTestId('progress-text');+ expect(progressText).toHaveAttribute('data-error', 'true');+ expect(progressText).toHaveAttribute('data-cancelled', 'false');+ });++ it('lets an explicit cancellation outrank an error-formatted output', () => {+ render(+ <OpenAIImageGen+ {...defaultProps}+ output="Error processing tool call"+ isSubmitting={true}+ runStepStatus="cancelled"+ />,+ );+ const progressText = screen.getByTestId('progress-text');+ expect(progressText).toHaveAttribute('data-cancelled', 'true');+ expect(progressText).toHaveAttribute('data-error', 'false');+ });++ it('keeps failure precedence when the legacy inference folds an error into cancellation', () => {+ render(+ <OpenAIImageGen+ {...defaultProps}+ output="Error processing tool call"+ isSubmitting={false}+ initialProgress={0.5}+ />,+ );+ const progressText = screen.getByTestId('progress-text');expect(progressText).toHaveAttribute('data-error', 'true');});});