improv: error handling

Author: tomasz-stefaniak

core/control-plane/client.ts

@@ -12,10 +12,10 @@ import fetch, { RequestInit, Response } from "node-fetch";
 
 import { OrganizationDescription } from "../config/ProfileLifecycleManager.js";
 import {
+  BaseSessionMetadata,
   IDE,
   ModelDescription,
   Session,
-  BaseSessionMetadata,
 } from "../index.js";
 import { Logger } from "../util/Logger.js";
 
@@ -614,6 +614,7 @@ export class ControlPlaneClient {
     messageQueueLength: number;
     pendingPermission: any;
   } | null> {
+    debugger;
     if (!(await this.isSignedIn())) {
       return null;
     }
@@ -626,12 +627,13 @@ export class ControlPlaneClient {
         },
       );
 
-      return (await resp.json()) as {
+      const result = (await resp.json()) as {
         session: Session;
         isProcessing: boolean;
         messageQueueLength: number;
         pendingPermission: any;
       };
+      return result;
     } catch (e) {
       Logger.error(e, {
         context: "control_plane_get_agent_state",

extensions/vscode/src/extension/VsCodeMessenger.ts

@@ -632,8 +632,26 @@ export class VsCodeMessenger {
         // Fetch the agent state
         const agentState =
           await configHandler.controlPlaneClient.getAgentState(agentSessionId);
-        if (!agentState || !agentState.session) {
-          vscode.window.showErrorMessage("Failed to load agent session state.");
+
+        // Debug what we got back
+        debugger;
+        console.log("Agent state response:", agentState);
+
+        if (!agentState) {
+          vscode.window.showErrorMessage(
+            "Failed to fetch agent state from API. The agent may not exist or you may not have permission.",
+          );
+          return;
+        }
+
+        if (!agentState.session) {
+          console.error(
+            "Agent state is missing session field. Full response:",
+            agentState,
+          );
+          vscode.window.showErrorMessage(
+            "Agent state returned but missing session data. This may be a backend issue.",
+          );
           return;
         }