freestyle-sandboxes 0.1.28 → 0.1.30

package/cli.mjs

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
-import 'dotenv/config';
+import * as dotenv from 'dotenv';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { Freestyle, VmSpec } from './index.mjs';
 import * as fs from 'fs';
 import * as path from 'path';
-import * as dotenv from 'dotenv';
 import * as os from 'os';
 import { spawn } from 'child_process';
 
@@ -17,7 +16,6 @@ const CLI_AUTH_TIMEOUT_MILLIS = 10 * 60 * 1e3;
 const POLL_INTERVAL_MILLIS = 2e3;
 const STACK_REFRESH_TOKEN_ENV_KEY = "FREESTYLE_STACK_REFRESH_TOKEN";
 const STACK_SAVE_TO_DOTENV_ENV_KEY = "FREESTYLE_STACK_SAVE_TO_DOTENV";
-const STACK_CLI_AUTH_ENABLED_ENV_KEY = "FREESTYLE_ENABLE_STACK_CLI_AUTH";
 function isTruthy(value) {
   if (!value) {
     return false;
@@ -25,9 +23,6 @@ function isTruthy(value) {
   const normalized = value.trim().toLowerCase();
   return normalized === "1" || normalized === "true" || normalized === "yes";
 }
-function isStackCliAuthEnabled() {
-  return isTruthy(process.env[STACK_CLI_AUTH_ENABLED_ENV_KEY]);
-}
 function loadRefreshTokenFromDotenv() {
   const refreshToken = process.env[STACK_REFRESH_TOKEN_ENV_KEY];
   if (!refreshToken || typeof refreshToken !== "string") {
@@ -259,15 +254,15 @@ async function startCliLogin(config) {
   if (!initResponse.ok) {
     const errorText = await initResponse.text();
     throw new Error(
-      `Failed to start Stack Auth CLI login (${initResponse.status}). ${errorText || "Check Stack project ID and publishable client key."}`
+      `Failed to start authentication login (${initResponse.status}). ${errorText || "Check project ID and client key configuration."}`
     );
   }
   const initData = await initResponse.json();
   if (!initData.polling_code || !initData.login_code) {
-    throw new Error("Stack Auth CLI login did not return polling/login codes.");
+    throw new Error("Authentication login did not return polling/login codes.");
   }
   const loginUrl = `${config.appUrl}/handler/cli-auth-confirm?login_code=${encodeURIComponent(initData.login_code)}`;
-  console.log("\nStack authentication is required.");
+  console.log("\nAuthentication is required.");
   console.log(`Open this URL to continue:
 ${loginUrl}
 `);
@@ -291,26 +286,27 @@ ${loginUrl}
     );
     if (![200, 201].includes(pollResponse.status)) {
       throw new Error(
-        `Failed while polling Stack Auth CLI login (${pollResponse.status}).`
+        `Failed while polling authentication login (${pollResponse.status}).`
       );
     }
     const pollData = await pollResponse.json();
-    if (pollData.status === "success") {
+    if (pollData.status && pollData.status !== "pending") {
+      console.log("Auth poll status:", pollData.status);
+    }
+    if (pollData.status === "completed" || pollData.status === "success") {
       if (!pollData.refresh_token) {
-        throw new Error(
-          "Stack Auth login completed without a refresh token response."
-        );
+        throw new Error("Login completed without a refresh token response.");
       }
       return pollData.refresh_token;
     }
-    if (pollData.status === "cancelled" || pollData.status === "expired" || pollData.status === "error") {
+    if (pollData.status && pollData.status !== "pending" && pollData.status !== "waiting") {
       throw new Error(
-        pollData.error || `Stack Auth login ${pollData.status}. Please retry.`
+        pollData.error || `Authentication ${pollData.status}. Please retry.`
       );
     }
     await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MILLIS));
   }
-  throw new Error("Timed out waiting for Stack Auth CLI authentication.");
+  throw new Error("Timed out waiting for authentication.");
 }
 async function refreshStackAccessToken(config, refreshToken) {
   const response = await fetch(
@@ -320,7 +316,8 @@ async function refreshStackAccessToken(config, refreshToken) {
       headers: {
         ...clientHeaders(config),
         "x-stack-refresh-token": refreshToken
-      }
+      },
+      body: "{}"
     }
   );
   if (!response.ok) {
@@ -336,9 +333,6 @@ async function refreshStackAccessToken(config, refreshToken) {
   };
 }
 async function getStackAccessTokenForCli(options) {
-  if (!isStackCliAuthEnabled()) {
-    return null;
-  }
   const config = resolveStackConfig();
   if (!config) {
     return null;
@@ -366,7 +360,7 @@ async function getStackAccessTokenForCli(options) {
     refreshed = await refreshStackAccessToken(config, refreshToken);
   }
   if (!refreshed) {
-    throw new Error("Failed to authenticate with Stack Auth.");
+    throw new Error("Failed to authenticate.");
   }
   if (refreshed.refreshToken && refreshed.refreshToken !== refreshToken) {
     persistAuth(config, refreshed.refreshToken);
@@ -381,15 +375,9 @@ async function getFreestyleClient() {
   if (apiKey) {
     return new Freestyle({ apiKey, baseUrl });
   }
-  if (isStackCliAuthEnabled()) {
-    const accessToken = await getStackAccessTokenForCli();
-    if (accessToken) {
-      return new Freestyle({ accessToken, baseUrl });
-    }
-    console.error(
-      "Error: Stack CLI auth is enabled but authentication failed. Run `freestyle login` first."
-    );
-    process.exit(1);
+  const accessToken = await getStackAccessTokenForCli();
+  if (accessToken) {
+    return new Freestyle({ accessToken, baseUrl });
   }
   console.error(
     "Error: FREESTYLE_API_KEY is required. Set it in your current folder's .env file."
@@ -409,7 +397,7 @@ function handleError(error) {
 function loadEnv() {
   const envPath = path.join(process.cwd(), ".env");
   if (fs.existsSync(envPath)) {
-    dotenv.config({ path: envPath });
+    dotenv.config({ path: envPath, quiet: true });
   }
 }
 function formatTable(headers, rows) {
@@ -1638,11 +1626,11 @@ const cronCommand = {
 
 const loginCommand = {
   command: "login",
-  describe: "Authenticate the CLI with Stack Auth",
+  describe: "Authenticate the CLI",
   builder: (yargs) => {
     return yargs.option("save-to-dotenv", {
       type: "boolean",
-      description: "Save the Stack refresh token into the current folder's .env as FREESTYLE_STACK_REFRESH_TOKEN",
+      description: "Save the refresh token into the current folder's .env as FREESTYLE_STACK_REFRESH_TOKEN",
       default: false
     }).option("force", {
       type: "boolean",
@@ -1650,26 +1638,18 @@ const loginCommand = {
       default: false
     }).option("stack-project-id", {
       type: "string",
-      description: "Stack project ID (overrides environment for this run)"
+      description: "Project ID (overrides environment for this run)"
     }).option("stack-publishable-client-key", {
       type: "string",
-      description: "Stack publishable client key (overrides environment for this run)"
+      description: "Publishable client key (overrides environment for this run)"
     }).option("stack-app-url", {
       type: "string",
-      description: "Stack app URL for browser confirmation (default: https://freestyle.sh)"
+      description: "App URL for browser confirmation (default: https://freestyle.sh)"
     });
   },
   handler: async (argv) => {
     loadEnv();
     const args = argv;
-    if (!isStackCliAuthEnabled()) {
-      handleError(
-        new Error(
-          "Stack CLI auth is disabled. Set FREESTYLE_ENABLE_STACK_CLI_AUTH=true to use `freestyle login`."
-        )
-      );
-      return;
-    }
     if (args.stackProjectId) {
       process.env.FREESTYLE_STACK_PROJECT_ID = args.stackProjectId;
     }
@@ -1686,10 +1666,10 @@ const loginCommand = {
       });
       if (!accessToken) {
         throw new Error(
-          "Stack Auth is not configured. Set FREESTYLE_STACK_PROJECT_ID and FREESTYLE_STACK_PUBLISHABLE_CLIENT_KEY."
+          "Authentication is not configured. Set FREESTYLE_STACK_PROJECT_ID and FREESTYLE_STACK_PUBLISHABLE_CLIENT_KEY."
         );
       }
-      console.log("\u2713 Authenticated with Stack Auth");
+      console.log("\u2713 Authenticated");
       if (args.saveToDotenv) {
         console.log("\u2713 Saved refresh token to .env in current directory");
       } else {
@@ -1701,4 +1681,5 @@ const loginCommand = {
   }
 };
 
+dotenv.config({ quiet: true });
 yargs(hideBin(process.argv)).scriptName("freestyle").usage("$0 <command> [options]").command(vmCommand).command(gitCommand).command(domainsCommand).command(cronCommand).command(loginCommand).command(deployCommand).command(runCommand).demandCommand(1, "You need to specify a command").help().alias("help", "h").version().alias("version", "v").strict().parse();

package/index.cjs

@@ -5679,6 +5679,10 @@ const VmBuilder = VmWith;
 function composeCreateVmOptions(arr) {
   const result = {};
   for (const options of arr) {
+    if (options.rootfsSizeGb !== void 0)
+      result.rootfsSizeGb = options.rootfsSizeGb;
+    if (options.memSizeGb !== void 0) result.memSizeGb = options.memSizeGb;
+    if (options.vcpuCount !== void 0) result.vcpuCount = options.vcpuCount;
     if (options.idleTimeoutSeconds !== void 0)
       result.idleTimeoutSeconds = options.idleTimeoutSeconds;
     if (options.waitForReadySignal !== void 0)

package/index.mjs

@@ -5677,6 +5677,10 @@ const VmBuilder = VmWith;
 function composeCreateVmOptions(arr) {
   const result = {};
   for (const options of arr) {
+    if (options.rootfsSizeGb !== void 0)
+      result.rootfsSizeGb = options.rootfsSizeGb;
+    if (options.memSizeGb !== void 0) result.memSizeGb = options.memSizeGb;
+    if (options.vcpuCount !== void 0) result.vcpuCount = options.vcpuCount;
     if (options.idleTimeoutSeconds !== void 0)
       result.idleTimeoutSeconds = options.idleTimeoutSeconds;
     if (options.waitForReadySignal !== void 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freestyle-sandboxes",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "type": "module",
   "exports": {
     "require": {