freestyle-sandboxes 0.1.34 → 0.1.36

package/cli.mjs

@@ -457,7 +457,7 @@ async function getTeamsForCli() {
   const stored = loadStoredAuth(config);
   if (!stored?.refreshToken) {
     throw new Error(
-      "No authentication found. Please run 'freestyle login' first."
+      "No authentication found. Please run 'npx freestyle-sandboxes@latest login' first."
     );
   }
   const tokenResponse = await refreshStackAccessToken(
@@ -480,7 +480,7 @@ async function setDefaultTeam(teamId) {
   const stored = loadStoredAuth(config);
   if (!stored?.refreshToken) {
     throw new Error(
-      "No authentication found. Please run 'freestyle login' first."
+      "No authentication found. Please run 'npx freestyle-sandboxes@latest login' first."
     );
   }
   const auth = {
@@ -499,6 +499,51 @@ function getDefaultTeamId() {
   return stored?.defaultTeamId;
 }
 
+function normalizeCliProxyErrorWithStatus(errorText, status) {
+  const fallbackCode = status === 400 ? "BAD_REQUEST" : status === 401 ? "UNAUTHORIZED_ERROR" : status === 403 ? "FORBIDDEN" : "INTERNAL_ERROR";
+  try {
+    const parsed = JSON.parse(errorText);
+    if (typeof parsed.code === "string" && typeof parsed.message === "string") {
+      return {
+        body: JSON.stringify(parsed),
+        contentType: "application/json"
+      };
+    }
+    const message2 = [parsed.error, parsed.message, parsed.reason].find(
+      (value) => typeof value === "string" && value.length > 0
+    );
+    if (message2) {
+      const normalized2 = fallbackCode === "UNAUTHORIZED_ERROR" ? {
+        code: fallbackCode,
+        message: message2,
+        route: "/api/proxy/request",
+        reason: message2
+      } : {
+        code: fallbackCode,
+        message: message2
+      };
+      return {
+        body: JSON.stringify(normalized2),
+        contentType: "application/json"
+      };
+    }
+  } catch {
+  }
+  const message = errorText || "Request failed";
+  const normalized = fallbackCode === "UNAUTHORIZED_ERROR" ? {
+    code: fallbackCode,
+    message,
+    route: "/api/proxy/request",
+    reason: message
+  } : {
+    code: fallbackCode,
+    message
+  };
+  return {
+    body: JSON.stringify(normalized),
+    contentType: "application/json"
+  };
+}
 function createProxyFetch(accessToken, teamId) {
   const dashboardApiUrl = process.env.FREESTYLE_DASHBOARD_URL || "https://dash.freestyle.sh";
   return async (url, init) => {
@@ -522,9 +567,16 @@ function createProxyFetch(accessToken, teamId) {
     });
     if (!proxyResponse.ok) {
       const errorText = await proxyResponse.text();
-      return new Response(errorText, {
+      const normalizedError = normalizeCliProxyErrorWithStatus(
+        errorText,
+        proxyResponse.status
+      );
+      return new Response(normalizedError.body, {
         status: proxyResponse.status,
-        statusText: proxyResponse.statusText
+        statusText: proxyResponse.statusText,
+        headers: {
+          "Content-Type": normalizedError.contentType
+        }
       });
     }
     const data = await proxyResponse.json();
@@ -543,14 +595,14 @@ async function getFreestyleClient(teamId) {
   const accessToken = await getStackAccessTokenForCli();
   if (!accessToken) {
     console.error(
-      "Error: No API key found. Please run 'freestyle login' or set FREESTYLE_API_KEY in your .env file."
+      "Error: No API key found. Please run 'npx freestyle-sandboxes@latest login' or set FREESTYLE_API_KEY in your .env file."
     );
     process.exit(1);
   }
   const resolvedTeamId = process.env.FREESTYLE_TEAM_ID ?? getDefaultTeamId();
   if (!resolvedTeamId) {
     console.error(
-      "Error: No team selected. Please run 'freestyle login' to set a default team."
+      "Error: No team selected. Please run 'npx freestyle-sandboxes@latest login' to set a default team."
     );
     process.exit(1);
   }
@@ -1911,6 +1963,25 @@ const logoutCommand = {
   }
 };
 
+const whoamiCommand = {
+  command: "whoami",
+  describe: "Display information about the currently authenticated user",
+  builder: (yargs) => yargs,
+  handler: async (_argv) => {
+    loadEnv();
+    try {
+      const client = await getFreestyleClient();
+      const info = await client.whoami();
+      console.log(`Account ID: ${info.accountId}`);
+      if (info.identityId) {
+        console.log(`Identity ID: ${info.identityId}`);
+      }
+    } catch (e) {
+      handleError(e);
+    }
+  }
+};
+
 dotenv.config({ quiet: true });
 yargs(hideBin(process.argv)).scriptName("freestyle").usage("$0 <command> [options]").option("team", {
   type: "string",
@@ -1920,4 +1991,4 @@ yargs(hideBin(process.argv)).scriptName("freestyle").usage("$0 <command> [option
   if (argv.team && typeof argv.team === "string") {
     process.env.FREESTYLE_TEAM_ID = argv.team;
   }
-}).command(vmCommand).command(gitCommand).command(domainsCommand).command(cronCommand).command(loginCommand).command(logoutCommand).command(deployCommand).command(runCommand).demandCommand(1, "You need to specify a command").help().alias("help", "h").version().alias("version", "v").strict().parse();
+}).command(vmCommand).command(gitCommand).command(domainsCommand).command(cronCommand).command(loginCommand).command(logoutCommand).command(whoamiCommand).command(deployCommand).command(runCommand).demandCommand(1, "You need to specify a command").help().alias("help", "h").version().alias("version", "v").strict().parse();