Skip to content

fix: Fix session retry and error message formatting #985

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
charlesvien merged 1 commit into from
Feb 23, 2026
Merged

fix: Fix session retry and error message formatting #985

Show file tree
Hide file tree
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
13 changes: 10 additions & 3 deletions apps/twig/src/renderer/features/sessions/components/SessionView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ interface SessionViewProps {
onCancelPrompt: () => void;
repoPath?: string | null;
hasError?: boolean;
errorTitle?: string;
errorMessage?: string;
onRetry?: () => void;
onDelete?: () => void;
Expand All @@ -62,6 +63,7 @@ export function SessionView({
onCancelPrompt,
repoPath,
hasError = false,
errorTitle,
errorMessage = DEFAULT_ERROR_MESSAGE,
onRetry,
onDelete,
Expand Down Expand Up @@ -380,11 +382,16 @@ export function SessionView({
className="absolute inset-0 bg-gray-1"
>
<Warning size={32} weight="duotone" color="var(--red-9)" />
{errorTitle && (
<Text size="3" weight="bold" align="center" color="red">
{errorTitle}
</Text>
)}
<Text
size="3"
weight="medium"
size={errorTitle ? "2" : "3"}
weight={errorTitle ? "regular" : "medium"}
align="center"
color="red"
color={errorTitle ? "gray" : "red"}
className="max-w-md px-4"
>
{errorMessage}
Expand Down
7 changes: 4 additions & 3 deletions apps/twig/src/renderer/features/sessions/service/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,8 @@ export class SessionService {
const taskRunId = latestRun?.id ?? `error-${taskId}`;
const session = this.createBaseSession(taskRunId, taskId, taskTitle);
session.status = "error";
session.errorMessage = `Failed to connect to the agent: ${message}`;
session.errorTitle = "Failed to connect";
session.errorMessage = message;

if (latestRun?.log_url) {
try {
Expand Down Expand Up @@ -487,9 +488,11 @@ export class SessionService {
taskRunId: string,
taskTitle: string,
errorMessage: string,
errorTitle?: string,
): void {
const session = this.createBaseSession(taskRunId, taskId, taskTitle);
session.status = "error";
session.errorTitle = errorTitle;
session.errorMessage = errorMessage;
sessionStoreSetters.setSession(session);
}
Expand Down Expand Up @@ -1365,8 +1368,6 @@ export class SessionService {
if (session) {
await this.teardownSession(session.taskRunId);
}
// Clear from connecting tasks as well
this.connectingTasks.delete(taskId);
}

/**
Expand Down
1 change: 1 addition & 0 deletions apps/twig/src/renderer/features/sessions/stores/sessionStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface AgentSession {
events: AcpMessage[];
startedAt: number;
status: "connecting" | "connected" | "disconnected" | "error";
errorTitle?: string;
errorMessage?: string;
isPromptPending: boolean;
logUrl?: string;
Expand Down
5 changes: 3 additions & 2 deletions apps/twig/src/renderer/features/task-detail/components/TaskLogsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
const isRunning =
session?.status === "connected" || session?.status === "connecting";
const hasError = session?.status === "error";
const errorTitle = session?.errorTitle;
const errorMessage = session?.errorMessage;

const events = session?.events ?? [];
Expand Down Expand Up @@ -236,8 +237,7 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
const handleRetry = useCallback(async () => {
if (!repoPath) return;
await getSessionService().clearSessionError(taskId);
getSessionService().connectToTask({ task, repoPath });
}, [taskId, repoPath, task]);
}, [taskId, repoPath]);

const handleDelete = useCallback(() => {
const hasWorktree = workspace?.mode === "worktree";
Expand Down Expand Up @@ -322,6 +322,7 @@ export function TaskLogsPanel({ taskId, task }: TaskLogsPanelProps) {
onCancelPrompt={handleCancelPrompt}
repoPath={repoPath}
hasError={isCloud ? false : hasError}
errorTitle={isCloud ? undefined : errorTitle}
errorMessage={isCloud ? undefined : errorMessage}
onRetry={handleRetry}
onDelete={handleDelete}
Expand Down
Loading