fixes

Author: charlesvien

apps/twig/src/renderer/features/sessions/service/service.test.ts

@@ -90,13 +90,17 @@ vi.mock(
   () => mockSessionConfigStore,
 );
 
+const mockAdapterFns = vi.hoisted(() => ({
+  setAdapter: vi.fn(),
+  getAdapter: vi.fn(),
+  removeAdapter: vi.fn(),
+}));
+
 const mockSessionAdapterStore = vi.hoisted(() => ({
   useSessionAdapterStore: {
     getState: vi.fn(() => ({
       adaptersByRunId: {},
-      setAdapter: vi.fn(),
-      getAdapter: vi.fn(),
-      removeAdapter: vi.fn(),
+      ...mockAdapterFns,
     })),
   },
 }));

apps/twig/src/renderer/features/sessions/service/service.ts

@@ -360,13 +360,28 @@ export class SessionService {
           taskId,
           taskRunId,
         });
-        await this.recreateSession(
-          taskRunId,
-          taskId,
-          taskTitle,
-          repoPath,
-          auth,
-        );
+        try {
+          await this.recreateSession(
+            taskRunId,
+            taskId,
+            taskTitle,
+            repoPath,
+            auth,
+          );
+        } catch (recreateError) {
+          log.error("Failed to recreate session after null reconnect", {
+            taskId,
+            error:
+              recreateError instanceof Error
+                ? recreateError.message
+                : String(recreateError),
+          });
+          this.setErrorSession(
+            taskId,
+            taskRunId,
+            "Failed to start a new session. Please try again.",
+          );
+        }
       }
     } catch (error) {
       const errorMessage =
@@ -375,15 +390,39 @@ export class SessionService {
         taskId,
         error: errorMessage,
       });
-      await this.recreateSession(taskRunId, taskId, taskTitle, repoPath, auth);
+      try {
+        await this.recreateSession(
+          taskRunId,
+          taskId,
+          taskTitle,
+          repoPath,
+          auth,
+        );
+      } catch (recreateError) {
+        log.error("Failed to recreate session after reconnect error", {
+          taskId,
+          error:
+            recreateError instanceof Error
+              ? recreateError.message
+              : String(recreateError),
+        });
+        this.setErrorSession(
+          taskId,
+          taskRunId,
+          errorMessage || "Failed to reconnect. Please try again.",
+        );
+      }
     }
   }
 
   private async teardownSession(taskRunId: string): Promise<void> {
     try {
       await trpcVanilla.agent.cancel.mutate({ sessionId: taskRunId });
-    } catch {
-      // Best-effort — session may already be gone on the main process
+    } catch (error) {
+      log.debug("Cancel during teardown failed (session may already be gone)", {
+        taskRunId,
+        error: error instanceof Error ? error.message : String(error),
+      });
     }
 
     this.unsubscribeFromChannel(taskRunId);
@@ -392,6 +431,17 @@ export class SessionService {
     removePersistedConfigOptions(taskRunId);
   }
 
+  private setErrorSession(
+    taskId: string,
+    taskRunId: string,
+    errorMessage: string,
+  ): void {
+    const session = this.createBaseSession(taskRunId, taskId, "");
+    session.status = "error";
+    session.errorMessage = errorMessage;
+    sessionStoreSetters.setSession(session);
+  }
+
   private async recreateSession(
     oldTaskRunId: string,
     taskId: string,

apps/twig/src/renderer/features/task-detail/components/WorkspaceSetupPrompt.tsx

@@ -48,6 +48,7 @@ export function WorkspaceSetupPrompt({
       } catch (error) {
         log.error("Failed to set up workspace", { error });
         toast.error("Failed to set up workspace. Please try again.");
+      } finally {
         setSelectedPath("");
         setIsSettingUp(false);
       }