@supatest/cli 0.0.30 → 0.0.32

package/dist/index.js

@@ -5522,7 +5522,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = "0.0.30";
+    CLI_VERSION = "0.0.32";
   }
 });
 
@@ -6466,6 +6466,7 @@ var init_agent = __esm({
     await init_config();
     init_command_discovery();
     init_error_logger();
+    init_logger();
     init_mcp_loader();
     init_project_instructions();
     CoreAgent = class {
@@ -6531,6 +6532,7 @@ ${projectInstructions}`,
           "ANTHROPIC_BASE_URL",
           "ANTHROPIC_AUTH_TOKEN",
           "CLAUDE_CODE_AUTH_TOKEN",
+          "CLAUDE_CODE_OAUTH_TOKEN",
           "CLAUDE_API_KEY"
         ]);
         for (const [key, value] of Object.entries(process.env)) {
@@ -6538,12 +6540,32 @@ ${projectInstructions}`,
             cleanEnv[key] = value;
           }
         }
-        const internalConfigDir = join6(homedir2(), ".supatest", "claude-internal");
-        cleanEnv.CLAUDE_CONFIG_DIR = internalConfigDir;
-        cleanEnv.ANTHROPIC_API_KEY = config2.supatestApiKey || "";
-        cleanEnv.ANTHROPIC_BASE_URL = process.env.ANTHROPIC_BASE_URL || "";
+        logger.debug("[agent] Setting up authentication", {
+          useClaudeMax: !!config2.oauthToken,
+          hasSupatestApiKey: !!config2.supatestApiKey,
+          supatestApiKeyPrefix: config2.supatestApiKey ? config2.supatestApiKey.slice(0, 15) + "..." : null,
+          anthropicBaseUrl: process.env.ANTHROPIC_BASE_URL
+        });
+        if (config2.oauthToken) {
+          cleanEnv.ANTHROPIC_API_KEY = "";
+          cleanEnv.ANTHROPIC_BASE_URL = "";
+          this.presenter.onLog(`Auth: Using Claude Max (default Claude Code credentials)`);
+          logger.debug("[agent] Claude Max mode: Using default ~/.claude/ config, cleared ANTHROPIC_API_KEY and ANTHROPIC_BASE_URL");
+        } else {
+          const internalConfigDir = join6(homedir2(), ".supatest", "claude-internal");
+          cleanEnv.CLAUDE_CONFIG_DIR = internalConfigDir;
+          cleanEnv.ANTHROPIC_API_KEY = config2.supatestApiKey || "";
+          cleanEnv.ANTHROPIC_BASE_URL = process.env.ANTHROPIC_BASE_URL || "";
+          this.presenter.onLog(`Auth: Using Supatest API key${process.env.ANTHROPIC_BASE_URL ? ` (base: ${process.env.ANTHROPIC_BASE_URL})` : ""}`);
+          logger.debug("[agent] API key mode: Set ANTHROPIC_API_KEY, ANTHROPIC_BASE_URL, and CLAUDE_CONFIG_DIR");
+        }
         cleanEnv.ANTHROPIC_AUTH_TOKEN = "";
         cleanEnv.CLAUDE_CODE_AUTH_TOKEN = "";
+        logger.debug("[agent] Final auth env vars", {
+          ANTHROPIC_API_KEY: cleanEnv.ANTHROPIC_API_KEY ? cleanEnv.ANTHROPIC_API_KEY.slice(0, 15) + "..." : "(not set)",
+          ANTHROPIC_BASE_URL: cleanEnv.ANTHROPIC_BASE_URL || "(not set)",
+          CLAUDE_CONFIG_DIR: cleanEnv.CLAUDE_CONFIG_DIR || "(using default ~/.claude/)"
+        });
         cleanEnv.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS = "1";
         const queryOptions = {
           // AbortController for cancellation support
@@ -6616,6 +6638,13 @@ ${projectInstructions}`,
           return expiredPatterns.some((pattern) => lowerError.includes(pattern));
         };
         const runQuery = async (options) => {
+          logger.debug("[agent] Starting query", {
+            model: options.model,
+            maxTurns: options.maxTurns,
+            permissionMode: options.permissionMode,
+            hasResume: !!options.resume,
+            cwd: options.cwd
+          });
           const queryIterator = query({ prompt, options });
           if (this.messageBridge) {
             queryIterator.streamInput(this.messageBridge).catch((err) => {
@@ -6738,16 +6767,24 @@ ${projectInstructions}`,
         };
         try {
           await runQuery(queryOptions);
+          logger.debug("[agent] Query completed successfully");
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
+          logger.debug("[agent] Query error caught", {
+            errorName: error instanceof Error ? error.name : "unknown",
+            errorMessage,
+            stack: error instanceof Error ? error.stack?.slice(0, 500) : void 0
+          });
           const isAbortError = error instanceof Error && error.name === "AbortError" || errorMessage.toLowerCase().includes("aborted");
           if (isAbortError) {
             wasInterrupted = true;
+            logger.debug("[agent] Query was aborted by user");
           } else if (config2.providerSessionId && isSessionExpiredError(errorMessage)) {
             const expiredMessage = "Can't continue conversation older than 30 days. Please start a new session.";
             this.presenter.onError(expiredMessage, true);
             hasError = true;
             errors.push(expiredMessage);
+            logger.debug("[agent] Session expired error");
           } else {
             logError(error, {
               source: "CoreAgent.run",
@@ -6759,6 +6796,7 @@ ${projectInstructions}`,
             this.presenter.onError(errorMessage, true);
             hasError = true;
             errors.push(errorMessage);
+            logger.debug("[agent] General error, logged to error-logger");
           }
         } finally {
           this.messageBridge?.close();
@@ -8334,21 +8372,21 @@ var init_encryption = __esm({
 });
 
 // src/utils/token-storage.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync4, unlinkSync as unlinkSync2, writeFileSync } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join7 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync5, unlinkSync as unlinkSync2, writeFileSync } from "fs";
+import { homedir as homedir5 } from "os";
+import { join as join8 } from "path";
 function getTokenFilePath() {
   const apiUrl = process.env.SUPATEST_API_URL || PRODUCTION_API_URL;
   if (apiUrl === PRODUCTION_API_URL) {
-    return join7(CONFIG_DIR, "token.json");
+    return join8(CONFIG_DIR, "token.json");
   }
-  return join7(CONFIG_DIR, "token.local.json");
+  return join8(CONFIG_DIR, "token.local.json");
 }
 function isV2Format(stored) {
   return "version" in stored && stored.version === 2;
 }
 function ensureConfigDir() {
-  if (!existsSync5(CONFIG_DIR)) {
+  if (!existsSync6(CONFIG_DIR)) {
     mkdirSync2(CONFIG_DIR, { recursive: true, mode: 448 });
   }
 }
@@ -8368,11 +8406,11 @@ function saveToken(token, expiresAt) {
 }
 function loadToken() {
   const tokenFile = getTokenFilePath();
-  if (!existsSync5(tokenFile)) {
+  if (!existsSync6(tokenFile)) {
     return null;
   }
   try {
-    const data = readFileSync4(tokenFile, "utf8");
+    const data = readFileSync5(tokenFile, "utf8");
     const stored = JSON.parse(data);
     let payload;
     if (isV2Format(stored)) {
@@ -8401,7 +8439,7 @@ function loadToken() {
 }
 function removeToken() {
   const tokenFile = getTokenFilePath();
-  if (existsSync5(tokenFile)) {
+  if (existsSync6(tokenFile)) {
     unlinkSync2(tokenFile);
   }
 }
@@ -8410,10 +8448,10 @@ var init_token_storage = __esm({
   "src/utils/token-storage.ts"() {
     "use strict";
     init_encryption();
-    CONFIG_DIR = join7(homedir4(), ".supatest");
+    CONFIG_DIR = join8(homedir5(), ".supatest");
     PRODUCTION_API_URL = "https://code-api.supatest.ai";
     STORAGE_VERSION = 2;
-    TOKEN_FILE = join7(CONFIG_DIR, "token.json");
+    TOKEN_FILE = join8(CONFIG_DIR, "token.json");
   }
 });
 
@@ -10960,8 +10998,8 @@ var init_useOverlayEscapeGuard = __esm({
 });
 
 // src/ui/App.tsx
-import { execSync as execSync5 } from "child_process";
-import { homedir as homedir5 } from "os";
+import { execSync as execSync6 } from "child_process";
+import { homedir as homedir6 } from "os";
 import { Box as Box23, Text as Text21, useApp as useApp2, useStdout as useStdout2 } from "ink";
 import Spinner3 from "ink-spinner";
 import React26, { useEffect as useEffect13, useRef as useRef4, useState as useState13 } from "react";
@@ -10994,14 +11032,14 @@ var init_App = __esm({
     init_theme();
     getGitBranch2 = () => {
       try {
-        return execSync5("git rev-parse --abbrev-ref HEAD", { encoding: "utf8" }).trim();
+        return execSync6("git rev-parse --abbrev-ref HEAD", { encoding: "utf8" }).trim();
       } catch {
         return "";
       }
     };
     getCurrentFolder2 = (configCwd) => {
       const cwd = configCwd || process.cwd();
-      const home = homedir5();
+      const home = homedir6();
       if (cwd.startsWith(home)) {
         return `~${cwd.slice(home.length)}`;
       }
@@ -12369,12 +12407,77 @@ Updating Supatest CLI ${CLI_VERSION} \u2192 ${latest}...`);
 
 // src/index.ts
 init_banner();
+
+// src/utils/claude-max.ts
+init_logger();
+import { execSync as execSync4 } from "child_process";
+import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join7 } from "path";
+function isClaudeMaxAvailable() {
+  const platform2 = process.platform;
+  logger.debug("[claude-max] Checking Claude Code credentials", { platform: platform2 });
+  if (platform2 === "darwin") {
+    return checkMacOSKeychain();
+  } else {
+    return checkCredentialsFile();
+  }
+}
+function checkMacOSKeychain() {
+  try {
+    const credentialsJson = execSync4(
+      'security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null',
+      { encoding: "utf-8" }
+    ).trim();
+    if (!credentialsJson) {
+      logger.debug("[claude-max] No credentials found in macOS keychain");
+      return false;
+    }
+    const credentials = JSON.parse(credentialsJson);
+    const hasOauth = !!credentials.claudeAiOauth?.accessToken;
+    logger.debug("[claude-max] macOS keychain credentials check", {
+      hasOauth,
+      hasRefreshToken: !!credentials.claudeAiOauth?.refreshToken
+    });
+    return hasOauth;
+  } catch (error) {
+    logger.debug("[claude-max] Error checking macOS keychain", {
+      error: error instanceof Error ? error.message : String(error)
+    });
+    return false;
+  }
+}
+function checkCredentialsFile() {
+  try {
+    const credentialsPath = join7(homedir4(), ".claude", ".credentials.json");
+    if (!existsSync5(credentialsPath)) {
+      logger.debug("[claude-max] Credentials file not found", { path: credentialsPath });
+      return false;
+    }
+    const credentialsJson = readFileSync4(credentialsPath, "utf-8");
+    const credentials = JSON.parse(credentialsJson);
+    const hasOauth = !!credentials.claudeAiOauth?.accessToken;
+    logger.debug("[claude-max] Credentials file check", {
+      path: credentialsPath,
+      hasOauth,
+      hasRefreshToken: !!credentials.claudeAiOauth?.refreshToken
+    });
+    return hasOauth;
+  } catch (error) {
+    logger.debug("[claude-max] Error checking credentials file", {
+      error: error instanceof Error ? error.message : String(error)
+    });
+    return false;
+  }
+}
+
+// src/index.ts
 init_error_logger();
 init_logger();
 
 // src/utils/node-version.ts
 init_logger();
-import { execSync as execSync4 } from "child_process";
+import { execSync as execSync5 } from "child_process";
 var MINIMUM_NODE_VERSION2 = 18;
 function parseVersion2(versionString) {
   const cleaned = versionString.trim().replace(/^v/, "");
@@ -12391,7 +12494,7 @@ function parseVersion2(versionString) {
 }
 function getNodeVersion2() {
   try {
-    const versionOutput = execSync4("node --version", {
+    const versionOutput = execSync5("node --version", {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"]
     });
@@ -12505,10 +12608,10 @@ var program = new Command();
 program.name("supatest").description(
   "AI-powered task automation CLI for CI/CD - fix tests, lint issues, and more"
 ).version(CLI_VERSION).argument("[task]", "Task description or prompt for the AI agent").option("-l, --logs <file>", "Path to log file to analyze").option("--stdin", "Read logs from stdin").option("-C, --cwd <path>", "Working directory for the agent", process.cwd()).option(
-  "-m, --max-iterations <number>",
+  "-m, --claude-max-iterations <number>",
   "Maximum number of iterations",
   "100"
-).option("--supatest-api-key <key>", "Supatest API key (or use SUPATEST_API_KEY env)").option("--supatest-api-url <url>", "Supatest API URL (or use SUPATEST_API_URL env, defaults to https://code-api.supatest.ai)").option("--headless", "Run in headless mode (for CI/CD, minimal output)").option("--verbose", "Enable verbose logging").option("--model <model>", "Claude model to use (or use ANTHROPIC_MODEL_NAME env)").action(async (task, options) => {
+).option("--supatest-api-key <key>", "Supatest API key (or use SUPATEST_API_KEY env)").option("--supatest-api-url <url>", "Supatest API URL (or use SUPATEST_API_URL env, defaults to https://code-api.supatest.ai)").option("--headless", "Run in headless mode (for CI/CD, minimal output)").option("--verbose", "Enable verbose logging").option("--model <model>", "Claude model to use (or use ANTHROPIC_MODEL_NAME env)").option("--claude-max", "Use Claude Max subscription (requires Claude Code to be logged in)").action(async (task, options) => {
   try {
     checkNodeVersion2();
     await checkAndAutoUpdate();
@@ -12543,7 +12646,19 @@ program.name("supatest").description(
       process.exit(1);
     }
     let supatestApiKey;
+    let oauthToken;
     const supatestApiUrl = options.supatestApiUrl || config.supatestApiUrl;
+    if (options.claudeMax) {
+      if (!isClaudeMaxAvailable()) {
+        logger.error("Claude Max not available. Please ensure:");
+        logger.error("  1. Claude Code is installed");
+        logger.error("  2. You are logged in with a Claude Max subscription");
+        logger.error("  3. Run 'claude' and authenticate if needed");
+        process.exit(1);
+      }
+      oauthToken = "use-claude-max";
+      logger.info("Using Claude Max subscription for LLM calls");
+    }
     if (isHeadlessMode) {
       supatestApiKey = normalizeSupatestKey(
         options.supatestApiKey || config.supatestApiKey,
@@ -12551,7 +12666,7 @@ program.name("supatest").description(
       );
       if (!supatestApiKey) {
         logger.error(
-          "API key required in CI/headless mode. Please either:"
+          "Supatest API key required in CI/headless mode. Please either:"
         );
         logger.error("  1. Set SUPATEST_API_KEY environment variable");
         logger.error("  2. Use --supatest-api-key option");
@@ -12593,7 +12708,8 @@ program.name("supatest").description(
         verbose: options.verbose || false,
         cwd: options.cwd,
         systemPromptAppend: config.headlessSystemPrompt,
-        selectedModel
+        selectedModel,
+        oauthToken
       });
       process.exit(result.success ? 0 : 1);
     } else {
@@ -12608,7 +12724,8 @@ program.name("supatest").description(
         verbose: options.verbose || false,
         cwd: options.cwd,
         systemPromptAppend: config.interactiveSystemPrompt,
-        selectedModel
+        selectedModel,
+        oauthToken
       });
     }
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supatest/cli",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "Supatest CLI - AI-powered task automation for CI/CD",
   "type": "module",
   "bin": {