@supatest/cli 0.0.12 → 0.0.14

package/dist/index.js

@@ -3872,6 +3872,7 @@ var init_project_instructions = __esm({
 
 // src/core/agent.ts
 import { createRequire } from "module";
+import { homedir } from "os";
 import { dirname, join as join2 } from "path";
 import { query } from "@anthropic-ai/claude-agent-sdk";
 var CoreAgent;
@@ -3932,6 +3933,8 @@ ${projectInstructions}`
             cleanEnv[key] = value;
           }
         }
+        const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR || join2(homedir(), ".supatest", "claude-config");
+        cleanEnv.CLAUDE_CONFIG_DIR = claudeConfigDir;
         cleanEnv.ANTHROPIC_API_KEY = config2.supatestApiKey || "";
         cleanEnv.ANTHROPIC_BASE_URL = process.env.ANTHROPIC_BASE_URL || "";
         cleanEnv.ANTHROPIC_AUTH_TOKEN = "";
@@ -4447,6 +4450,12 @@ var init_api_client = __esm({
       hasApiKey() {
         return !!this.apiKey;
       }
+      /**
+       * Get the current API key (used to refresh auth during a session)
+       */
+      getApiKey() {
+        return this.apiKey;
+      }
       /**
        * Create a new CLI session on the backend
        * @param title - The session title
@@ -4570,13 +4579,13 @@ var init_api_client = __esm({
         return data;
       }
       /**
-       * Get messages for a session
+       * Get queries for a session
        * @param sessionId - The session ID
-       * @returns Messages with pagination info
+       * @returns Queries for the session
        */
-      async getSessionMessages(sessionId) {
-        const url = `${this.apiUrl}/v1/sessions/${sessionId}/messages`;
-        logger.debug(`Fetching messages for session: ${sessionId}`);
+      async getSessionQueries(sessionId) {
+        const url = `${this.apiUrl}/v1/sessions/${sessionId}/queries`;
+        logger.debug(`Fetching queries for session: ${sessionId}`);
         const response = await fetch(url, {
           method: "GET",
           headers: {
@@ -4589,7 +4598,7 @@ var init_api_client = __esm({
         }
         const data = await response.json();
         logger.debug(
-          `Fetched ${data.messages.length} messages for session: ${sessionId}`
+          `Fetched ${data.queries.length} queries for session: ${sessionId}`
         );
         return data;
       }
@@ -4658,7 +4667,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = "0.0.12";
+    CLI_VERSION = "0.0.14";
   }
 });
 
@@ -4733,7 +4742,7 @@ var init_encryption = __esm({
 
 // src/utils/token-storage.ts
 import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, unlinkSync, writeFileSync } from "fs";
-import { homedir } from "os";
+import { homedir as homedir2 } from "os";
 import { join as join4 } from "path";
 function getTokenFilePath() {
   const apiUrl = process.env.SUPATEST_API_URL || PRODUCTION_API_URL;
@@ -4808,7 +4817,7 @@ var init_token_storage = __esm({
   "src/utils/token-storage.ts"() {
     "use strict";
     init_encryption();
-    CONFIG_DIR = join4(homedir(), ".supatest");
+    CONFIG_DIR = join4(homedir2(), ".supatest");
     PRODUCTION_API_URL = "https://code-api.supatest.ai";
     STORAGE_VERSION = 2;
     TOKEN_FILE = join4(CONFIG_DIR, "token.json");
@@ -5170,7 +5179,15 @@ function startCallbackServer(port, expectedState) {
       }
     });
     server.on("error", (error) => {
-      reject(error);
+      if (error.code === "EADDRINUSE") {
+        const portError = new Error(
+          "Something went wrong. Please restart the CLI and try again."
+        );
+        portError.code = "EADDRINUSE";
+        reject(portError);
+      } else {
+        reject(error);
+      }
     });
     const timeout = setTimeout(() => {
       server.close();
@@ -5424,7 +5441,13 @@ ${loginUrl}
     console.log("\n\u2705 Login successful!\n");
     return result;
   } catch (error) {
-    console.error("\n\u274C Login failed:", error.message, "\n");
+    const err = error;
+    if (err.code === "EADDRINUSE") {
+      console.error("\n\u274C Login failed: Something went wrong.");
+      console.error("   Please restart the CLI and try again.\n");
+    } else {
+      console.error("\n\u274C Login failed:", error.message, "\n");
+    }
     throw error;
   }
 }
@@ -7066,6 +7089,9 @@ function highlightTreeToString(node) {
   if (node.type === "text") {
     return node.value;
   }
+  if (node.type === "root" && node.children) {
+    return node.children.map(highlightTreeToString).join("");
+  }
   if (node.type === "element") {
     const className = node.properties?.className?.[0] || "";
     let content = "";
@@ -7352,7 +7378,8 @@ var init_ErrorMessage = __esm({
       type = "error"
     }) => {
       const { icon, color } = getErrorStyle(type);
-      return /* @__PURE__ */ React11.createElement(Box9, { flexDirection: "row", marginTop: 1 }, /* @__PURE__ */ React11.createElement(Text9, { color }, icon, " ", message));
+      const displayMessage = type === "error" ? "Tool call failed" : message;
+      return /* @__PURE__ */ React11.createElement(Box9, { flexDirection: "row", marginTop: 1 }, /* @__PURE__ */ React11.createElement(Text9, { color }, icon, " ", displayMessage));
     };
   }
 });
@@ -7913,8 +7940,9 @@ var init_useOverlayEscapeGuard = __esm({
 
 // src/ui/App.tsx
 import { execSync as execSync3 } from "child_process";
-import { homedir as homedir2 } from "os";
+import { homedir as homedir3 } from "os";
 import { Box as Box18, Text as Text17, useApp } from "ink";
+import Spinner3 from "ink-spinner";
 import React20, { useEffect as useEffect7, useRef as useRef3, useState as useState6 } from "react";
 var getGitBranch, getCurrentFolder, AppContent, App;
 var init_App = __esm({
@@ -7938,6 +7966,7 @@ var init_App = __esm({
     init_useModeToggle();
     init_useOverlayEscapeGuard();
     init_auth();
+    init_theme();
     getGitBranch = () => {
       try {
         return execSync3("git rev-parse --abbrev-ref HEAD", { encoding: "utf8" }).trim();
@@ -7947,7 +7976,7 @@ var init_App = __esm({
     };
     getCurrentFolder = () => {
       const cwd = process.cwd();
-      const home = homedir2();
+      const home = homedir3();
       if (cwd.startsWith(home)) {
         return `~${cwd.slice(home.length)}`;
       }
@@ -7967,6 +7996,7 @@ var init_App = __esm({
       const inputPromptRef = useRef3(null);
       const [showSessionSelector, setShowSessionSelector] = useState6(false);
       const [showModelSelector, setShowModelSelector] = useState6(false);
+      const [isLoadingSession, setIsLoadingSession] = useState6(false);
       const [authState, setAuthState] = useState6(
         () => config2.supatestApiKey ? "authenticated" /* Authenticated */ : "unauthenticated" /* Unauthenticated */
       );
@@ -8127,15 +8157,13 @@ var init_App = __esm({
           onSubmitTask(task);
         }
       };
-      const handleSessionSelect = (session) => {
+      const handleSessionSelect = async (session) => {
         setShowSessionSelector(false);
-        addMessage({
-          type: "assistant",
-          content: `Switching to session: ${session.title || "Untitled"} (${session.id})`
-        });
+        setIsLoadingSession(true);
         if (onResumeSession) {
-          onResumeSession(session);
+          await onResumeSession(session);
         }
+        setIsLoadingSession(false);
       };
       const handleSessionSelectorCancel = () => {
         markOverlayClosed();
@@ -8248,6 +8276,7 @@ var init_App = __esm({
             onSelect: handleSessionSelect
           }
         ),
+        isLoadingSession && /* @__PURE__ */ React20.createElement(Box18, { borderColor: "cyan", borderStyle: "round", flexDirection: "column", padding: 1 }, /* @__PURE__ */ React20.createElement(Box18, { flexDirection: "row" }, /* @__PURE__ */ React20.createElement(Box18, { width: 2 }, /* @__PURE__ */ React20.createElement(Text17, { color: theme.text.accent }, /* @__PURE__ */ React20.createElement(Spinner3, { type: "dots" }))), /* @__PURE__ */ React20.createElement(Text17, { bold: true, color: "cyan" }, "Loading session...")), /* @__PURE__ */ React20.createElement(Text17, { color: theme.text.dim }, "Fetching queries and context")),
         showModelSelector && /* @__PURE__ */ React20.createElement(
           ModelSelector,
           {
@@ -8262,7 +8291,7 @@ var init_App = __esm({
             onLogin: handleLogin
           }
         ),
-        /* @__PURE__ */ React20.createElement(Box18, { flexDirection: "column" }, /* @__PURE__ */ React20.createElement(QueuedMessageDisplay, { messageQueue: queuedTasks }), !showAuthDialog && /* @__PURE__ */ React20.createElement(AuthBanner, { authState }), showInput && !showSessionSelector && !showAuthDialog && !showHelp && !showModelSelector && /* @__PURE__ */ React20.createElement(Box18, { flexDirection: "column", marginTop: 0, width: "100%" }, exitWarning && /* @__PURE__ */ React20.createElement(Box18, { marginBottom: 0, paddingX: 1 }, /* @__PURE__ */ React20.createElement(Text17, { color: "yellow" }, exitWarning)), /* @__PURE__ */ React20.createElement(
+        /* @__PURE__ */ React20.createElement(Box18, { flexDirection: "column" }, /* @__PURE__ */ React20.createElement(QueuedMessageDisplay, { messageQueue: queuedTasks }), !showAuthDialog && /* @__PURE__ */ React20.createElement(AuthBanner, { authState }), showInput && !showSessionSelector && !showAuthDialog && !showHelp && !showModelSelector && !isLoadingSession && /* @__PURE__ */ React20.createElement(Box18, { flexDirection: "column", marginTop: 0, width: "100%" }, exitWarning && /* @__PURE__ */ React20.createElement(Box18, { marginBottom: 0, paddingX: 1 }, /* @__PURE__ */ React20.createElement(Text17, { color: "yellow" }, exitWarning)), /* @__PURE__ */ React20.createElement(
           InputPrompt,
           {
             currentFolder,
@@ -8344,6 +8373,69 @@ function getToolDescription2(toolName, input) {
       return toolName;
   }
 }
+function convertQueriesToUIMessages(queries) {
+  const uiMessages = [];
+  const sortedQueries = [...queries].sort((a, b2) => a.sequence - b2.sequence);
+  for (const query2 of sortedQueries) {
+    const timestamp = new Date(query2.startedAt).getTime();
+    if (query2.content?.userMessage) {
+      for (const block of query2.content.userMessage) {
+        if (block.type === "text") {
+          uiMessages.push({
+            id: `${query2.id}-user-${uiMessages.length}`,
+            type: "user",
+            content: block.text,
+            timestamp
+          });
+        }
+      }
+    }
+    if (query2.content?.turns) {
+      const toolResults = /* @__PURE__ */ new Map();
+      for (const turn of query2.content.turns) {
+        if (turn.toolResults) {
+          for (const block of turn.toolResults) {
+            if (block.type === "tool_result" && block.tool_use_id) {
+              toolResults.set(block.tool_use_id, block.content);
+            }
+          }
+        }
+      }
+      for (const turn of query2.content.turns) {
+        for (const block of turn.assistant) {
+          if (block.type === "text") {
+            uiMessages.push({
+              id: `${query2.id}-assistant-${uiMessages.length}`,
+              type: "assistant",
+              content: block.text,
+              timestamp
+            });
+          } else if (block.type === "thinking") {
+            uiMessages.push({
+              id: `${query2.id}-thinking-${uiMessages.length}`,
+              type: "thinking",
+              content: block.thinking,
+              timestamp
+            });
+          } else if (block.type === "tool_use") {
+            const toolResult = toolResults.get(block.id);
+            uiMessages.push({
+              id: `${query2.id}-tool-${uiMessages.length}`,
+              type: "tool",
+              content: getToolDescription2(block.name, block.input),
+              toolName: block.name,
+              toolInput: block.input,
+              toolResult,
+              toolUseId: block.id,
+              timestamp
+            });
+          }
+        }
+      }
+    }
+  }
+  return uiMessages;
+}
 async function runInteractive(config2) {
   let success = false;
   let unmountFn = null;
@@ -8467,10 +8559,11 @@ var init_interactive = __esm({
         const runAgent2 = async () => {
           setIsAgentRunning(true);
           try {
+            const supatestApiKey = apiClient.getApiKey?.() || config2.supatestApiKey || "";
             const proxyUrl = config2.supatestApiUrl || "https://code-api.supatest.ai";
             const baseUrl = `${proxyUrl}/v1/sessions/${sessionId}/anthropic`;
             process.env.ANTHROPIC_BASE_URL = baseUrl;
-            process.env.ANTHROPIC_API_KEY = config2.supatestApiKey;
+            process.env.ANTHROPIC_API_KEY = supatestApiKey;
             const presenter = new ReactPresenter(
               {
                 addMessage: (msg) => {
@@ -8502,6 +8595,7 @@ var init_interactive = __esm({
             );
             const runConfig = {
               ...config2,
+              supatestApiKey,
               mode: agentMode,
               planFilePath,
               selectedModel,
@@ -8625,61 +8719,9 @@ var init_interactive = __esm({
                 });
                 return;
               }
-              const response = await apiClient.getSessionMessages(session.id);
-              const apiMessages = response.messages;
-              const toolResults = /* @__PURE__ */ new Map();
-              for (const msg of apiMessages) {
-                const contentBlocks = msg.content;
-                if (!contentBlocks) continue;
-                for (const block of contentBlocks) {
-                  if (block.type === "tool_result" && block.tool_use_id) {
-                    let resultText = "";
-                    if (typeof block.content === "string") {
-                      resultText = block.content;
-                    } else if (Array.isArray(block.content)) {
-                      resultText = block.content.map((c2) => c2.text || "").join("\n");
-                    }
-                    toolResults.set(block.tool_use_id, resultText);
-                  }
-                }
-              }
-              const uiMessages = apiMessages.flatMap((msg) => {
-                const messages = [];
-                const contentBlocks = msg.content;
-                if (!contentBlocks || contentBlocks.length === 0) {
-                  return [];
-                }
-                for (const block of contentBlocks) {
-                  if (block.type === "text") {
-                    messages.push({
-                      id: `${msg.id}-${messages.length}`,
-                      type: msg.role,
-                      content: block.text,
-                      timestamp: new Date(msg.createdAt).getTime()
-                    });
-                  } else if (block.type === "thinking") {
-                    messages.push({
-                      id: `${msg.id}-${messages.length}`,
-                      type: "thinking",
-                      content: block.thinking,
-                      timestamp: new Date(msg.createdAt).getTime()
-                    });
-                  } else if (block.type === "tool_use") {
-                    const toolResult = toolResults.get(block.id);
-                    messages.push({
-                      id: `${msg.id}-${messages.length}`,
-                      type: "tool",
-                      content: getToolDescription2(block.name, block.input),
-                      toolName: block.name,
-                      toolInput: block.input,
-                      toolResult,
-                      toolUseId: block.id,
-                      timestamp: new Date(msg.createdAt).getTime()
-                    });
-                  }
-                }
-                return messages;
-              });
+              const response = await apiClient.getSessionQueries(session.id);
+              const queries = response.queries;
+              const uiMessages = convertQueriesToUIMessages(queries);
               setSessionId(session.id);
               setContextSessionId(session.id);
               if (session.providerSessionId) {
@@ -8705,7 +8747,7 @@ var init_interactive = __esm({
               uiMessages.push({
                 id: `resume-info-${Date.now()}`,
                 type: "error",
-                content: `Resumed session: ${session.title || "Untitled"} (${apiMessages.length} messages loaded)`,
+                content: `Resumed session: ${session.title || "Untitled"} (${queries.length} queries loaded)`,
                 errorType: "info",
                 timestamp: Date.now()
               });
@@ -9432,6 +9474,36 @@ async function readStdin() {
 // src/index.ts
 init_token_storage();
 init_version();
+var looksLikeAnthropicKey = (key) => !!key && key.startsWith("sk-ant-");
+var normalizeSupatestKey = (key, { isHeadless }) => {
+  if (!key) return void 0;
+  if (looksLikeAnthropicKey(key)) {
+    const message = "Detected an Anthropic API key. Use a Supatest API key (sk_test_/sk_live_) or run `supatest login` for a CLI token.";
+    if (isHeadless) {
+      logger.error(message);
+      process.exit(1);
+    } else {
+      logger.warn(`${message} Ignoring the provided key and prompting for login.`);
+      return void 0;
+    }
+  }
+  return key;
+};
+process.on("uncaughtException", (error) => {
+  logger.error(`Uncaught exception: ${error.message}`);
+  if (error.stack) {
+    console.error(error.stack);
+  }
+  process.exit(1);
+});
+process.on("unhandledRejection", (reason, promise) => {
+  const errorMessage = reason instanceof Error ? reason.message : String(reason);
+  logger.error(`Unhandled promise rejection: ${errorMessage}`);
+  if (reason instanceof Error && reason.stack) {
+    console.error(reason.stack);
+  }
+  process.exit(1);
+});
 var program = new Command();
 program.name("supatest").description(
   "AI-powered task automation CLI for CI/CD - fix tests, lint issues, and more"
@@ -9475,7 +9547,10 @@ program.name("supatest").description(
     let supatestApiKey;
     const supatestApiUrl = options.supatestApiUrl || config.supatestApiUrl;
     if (isHeadlessMode) {
-      supatestApiKey = options.supatestApiKey || config.supatestApiKey;
+      supatestApiKey = normalizeSupatestKey(
+        options.supatestApiKey || config.supatestApiKey,
+        { isHeadless: true }
+      );
       if (!supatestApiKey) {
         logger.error(
           "API key required in CI/headless mode. Please either:"
@@ -9489,7 +9564,10 @@ program.name("supatest").description(
       if (cliToken) {
         supatestApiKey = cliToken;
       } else {
-        supatestApiKey = options.supatestApiKey || config.supatestApiKey;
+        supatestApiKey = normalizeSupatestKey(
+          options.supatestApiKey || config.supatestApiKey,
+          { isHeadless: false }
+        );
       }
     }
     let selectedModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supatest/cli",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "Supatest CLI - AI-powered task automation for CI/CD",
   "type": "module",
   "bin": {
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.1.58",
-    "@anthropic-ai/sdk": "^0.71.0",
+    "@anthropic-ai/claude-agent-sdk": "^0.1.61",
+    "@anthropic-ai/sdk": "^0.71.2",
     "@types/inquirer": "^9.0.0",
     "ansi-escapes": "^7.0.0",
     "boxen": "^8.0.1",