freestyle-sandboxes 0.1.30 → 0.1.32

package/cli.mjs

@@ -64,6 +64,26 @@ ${line}
   }
   fs.writeFileSync(envPath, next, { encoding: "utf-8" });
 }
+function removeRefreshTokenFromDotenv() {
+  const envPath = path.join(process.cwd(), ".env");
+  if (!fs.existsSync(envPath)) {
+    return false;
+  }
+  const existing = fs.readFileSync(envPath, "utf-8");
+  const lines = existing.split(/\r?\n/);
+  const nextLines = lines.filter(
+    (line) => !line.startsWith(`${STACK_REFRESH_TOKEN_ENV_KEY}=`)
+  );
+  if (nextLines.length === lines.length) {
+    return false;
+  }
+  const next = nextLines.filter((line) => line.length > 0).join("\n");
+  fs.writeFileSync(envPath, next.length > 0 ? `${next}
+` : "", {
+    encoding: "utf-8"
+  });
+  return true;
+}
 function walkUpDirectories(startDir) {
   const result = [];
   let current = path.resolve(startDir);
@@ -148,6 +168,9 @@ function discoverStackConfigFromWorkspace() {
   }
   return discovered;
 }
+function resolveAuthFilePath() {
+  return process.env.FREESTYLE_STACK_AUTH_FILE ?? path.join(os.homedir(), ".freestyle", "stack-auth.json");
+}
 function resolveStackConfig() {
   const discovered = discoverStackConfigFromWorkspace();
   const projectId = process.env.FREESTYLE_STACK_PROJECT_ID ?? process.env.NEXT_PUBLIC_STACK_PROJECT_ID ?? process.env.VITE_STACK_PROJECT_ID ?? discovered.projectId ?? DEFAULT_STACK_PROJECT_ID;
@@ -156,8 +179,8 @@ function resolveStackConfig() {
     return null;
   }
   const stackApiUrl = (process.env.FREESTYLE_STACK_API_URL ?? DEFAULT_STACK_API_URL).replace(/\/+$/, "");
-  const appUrl = (process.env.FREESTYLE_STACK_APP_URL ?? DEFAULT_STACK_APP_URL).replace(/\/+$/, "");
-  const authFilePath = process.env.FREESTYLE_STACK_AUTH_FILE ?? path.join(os.homedir(), ".freestyle", "stack-auth.json");
+  const appUrl = (process.env.FREESTYLE_STACK_APP_URL ?? process.env.FREESTYLE_DASHBOARD_URL ?? DEFAULT_STACK_APP_URL).replace(/\/+$/, "");
+  const authFilePath = process.env.FREESTYLE_STACK_AUTH_FILE ?? resolveAuthFilePath();
   return {
     stackApiUrl,
     appUrl,
@@ -185,21 +208,23 @@ function loadStoredAuth(config) {
     }
     return {
       refreshToken: auth.refreshToken,
-      updatedAt: typeof auth.updatedAt === "number" ? auth.updatedAt : Date.now()
+      updatedAt: typeof auth.updatedAt === "number" ? auth.updatedAt : Date.now(),
+      defaultTeamId: typeof auth.defaultTeamId === "string" ? auth.defaultTeamId : void 0
     };
   } catch {
     return null;
   }
 }
-function persistAuth(config, refreshToken) {
+function persistAuth(config, auth) {
   const dirPath = path.dirname(config.authFilePath);
   fs.mkdirSync(dirPath, { recursive: true });
   fs.writeFileSync(
     config.authFilePath,
     JSON.stringify(
       {
-        refreshToken,
-        updatedAt: Date.now()
+        refreshToken: auth.refreshToken,
+        updatedAt: auth.updatedAt,
+        defaultTeamId: auth.defaultTeamId
       },
       null,
       2
@@ -215,6 +240,23 @@ function clearStoredAuth(config) {
   } catch {
   }
 }
+function logoutCliAuth(options) {
+  const authFilePath = resolveAuthFilePath();
+  let clearedStored = false;
+  try {
+    if (fs.existsSync(authFilePath)) {
+      fs.unlinkSync(authFilePath);
+      clearedStored = true;
+    }
+  } catch {
+  }
+  let clearedDotenv = false;
+  if (options?.removeFromDotenv) {
+    clearedDotenv = removeRefreshTokenFromDotenv();
+  }
+  delete process.env[STACK_REFRESH_TOKEN_ENV_KEY];
+  return { clearedStored, clearedDotenv };
+}
 function tryOpenBrowser(url) {
   try {
     if (process.platform === "darwin") {
@@ -346,7 +388,11 @@ async function getStackAccessTokenForCli(options) {
   let refreshToken = refreshTokenFromEnv ?? stored?.refreshToken;
   if (!refreshToken) {
     refreshToken = await startCliLogin(config);
-    persistAuth(config, refreshToken);
+    const auth = {
+      refreshToken,
+      updatedAt: Date.now()
+    };
+    persistAuth(config, auth);
     persistRefreshTokenToDotenv(refreshToken, options);
   }
   let refreshed = await refreshStackAccessToken(config, refreshToken);
@@ -355,7 +401,12 @@ async function getStackAccessTokenForCli(options) {
       clearStoredAuth(config);
     }
     refreshToken = await startCliLogin(config);
-    persistAuth(config, refreshToken);
+    const auth = {
+      refreshToken,
+      updatedAt: Date.now(),
+      defaultTeamId: stored?.defaultTeamId
+    };
+    persistAuth(config, auth);
     persistRefreshTokenToDotenv(refreshToken, options);
     refreshed = await refreshStackAccessToken(config, refreshToken);
   }
@@ -363,26 +414,153 @@ async function getStackAccessTokenForCli(options) {
     throw new Error("Failed to authenticate.");
   }
   if (refreshed.refreshToken && refreshed.refreshToken !== refreshToken) {
-    persistAuth(config, refreshed.refreshToken);
+    const auth = {
+      refreshToken: refreshed.refreshToken,
+      updatedAt: Date.now(),
+      defaultTeamId: stored?.defaultTeamId
+    };
+    persistAuth(config, auth);
     persistRefreshTokenToDotenv(refreshed.refreshToken, options);
   }
   return refreshed.accessToken;
 }
+function getDashboardApiUrl() {
+  return process.env.FREESTYLE_DASHBOARD_URL || "https://dash.freestyle.sh";
+}
+async function callDashboardApi(endpoint, accessToken, body) {
+  const response = await fetch(`${getDashboardApiUrl()}${endpoint}`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      data: {
+        accessToken,
+        ...body
+      }
+    })
+  });
+  if (!response.ok) {
+    throw new Error(
+      `Dashboard API call failed: ${response.status} ${response.statusText}`
+    );
+  }
+  return response.json();
+}
+async function getTeamsForCli() {
+  const config = resolveStackConfig();
+  if (!config) {
+    throw new Error(
+      "Stack Auth is not configured. Please check your environment variables."
+    );
+  }
+  const stored = loadStoredAuth(config);
+  if (!stored?.refreshToken) {
+    throw new Error(
+      "No authentication found. Please run 'freestyle login' first."
+    );
+  }
+  const tokenResponse = await refreshStackAccessToken(
+    config,
+    stored.refreshToken
+  );
+  if (!tokenResponse) {
+    throw new Error("Failed to refresh access token.");
+  }
+  const teams = await callDashboardApi("/api/cli/teams", tokenResponse.accessToken);
+  return teams;
+}
+async function setDefaultTeam(teamId) {
+  const config = resolveStackConfig();
+  if (!config) {
+    throw new Error(
+      "Stack Auth is not configured. Please check your environment variables."
+    );
+  }
+  const stored = loadStoredAuth(config);
+  if (!stored?.refreshToken) {
+    throw new Error(
+      "No authentication found. Please run 'freestyle login' first."
+    );
+  }
+  const auth = {
+    refreshToken: stored.refreshToken,
+    updatedAt: Date.now(),
+    defaultTeamId: teamId
+  };
+  persistAuth(config, auth);
+}
+function getDefaultTeamId() {
+  const config = resolveStackConfig();
+  if (!config) {
+    return void 0;
+  }
+  const stored = loadStoredAuth(config);
+  return stored?.defaultTeamId;
+}
 
-async function getFreestyleClient() {
-  const apiKey = process.env.FREESTYLE_API_KEY;
-  const baseUrl = process.env.FREESTYLE_API_URL;
-  if (apiKey) {
-    return new Freestyle({ apiKey, baseUrl });
+function createProxyFetch(accessToken, teamId) {
+  const dashboardApiUrl = process.env.FREESTYLE_DASHBOARD_URL || "https://dash.freestyle.sh";
+  return async (url, init) => {
+    const urlObj = typeof url === "string" ? new URL(url) : url instanceof URL ? url : new URL(url.url);
+    const path2 = urlObj.pathname + urlObj.search;
+    const proxyResponse = await fetch(`${dashboardApiUrl}/api/proxy/request`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        data: {
+          accessToken,
+          teamId,
+          path: path2.startsWith("/") ? path2.substring(1) : path2,
+          method: init?.method || "GET",
+          headers: init?.headers ? Object.fromEntries(new Headers(init.headers).entries()) : {},
+          body: init?.body ? init.body.toString() : void 0
+        }
+      })
+    });
+    if (!proxyResponse.ok) {
+      const errorText = await proxyResponse.text();
+      return new Response(errorText, {
+        status: proxyResponse.status,
+        statusText: proxyResponse.statusText
+      });
+    }
+    const data = await proxyResponse.json();
+    return new Response(JSON.stringify(data), {
+      status: 200,
+      headers: { "Content-Type": "application/json" }
+    });
+  };
+}
+async function getFreestyleClient(teamId) {
+  const directApiKey = process.env.FREESTYLE_API_KEY;
+  if (directApiKey) {
+    const baseUrl2 = process.env.FREESTYLE_API_URL;
+    return new Freestyle({ apiKey: directApiKey, baseUrl: baseUrl2 });
   }
   const accessToken = await getStackAccessTokenForCli();
-  if (accessToken) {
-    return new Freestyle({ accessToken, baseUrl });
+  if (!accessToken) {
+    console.error(
+      "Error: No API key found. Please run 'freestyle login' or set FREESTYLE_API_KEY in your .env file."
+    );
+    process.exit(1);
   }
-  console.error(
-    "Error: FREESTYLE_API_KEY is required. Set it in your current folder's .env file."
-  );
-  process.exit(1);
+  const resolvedTeamId = getDefaultTeamId();
+  if (!resolvedTeamId) {
+    console.error(
+      "Error: No team selected. Please run 'freestyle login' to set a default team."
+    );
+    process.exit(1);
+  }
+  const baseUrl = process.env.FREESTYLE_API_URL || "https://api.freestyle.sh";
+  return new Freestyle({
+    apiKey: "placeholder",
+    // Need something to pass validation
+    baseUrl,
+    fetch: createProxyFetch(accessToken, resolvedTeamId)
+  });
 }
 function handleError(error) {
   if (error.response) {
@@ -405,13 +583,13 @@ function formatTable(headers, rows) {
     const maxRowWidth = Math.max(...rows.map((r) => (r[i] || "").length));
     return Math.max(h.length, maxRowWidth);
   });
-  const headerRow = headers.map((h, i) => h.padEnd(colWidths[i])).join("  ");
+  const headerRow = headers.map((h, i) => h.padEnd(colWidths[i] || 0)).join("  ");
   const separator = colWidths.map((w) => "-".repeat(w)).join("  ");
   console.log(headerRow);
   console.log(separator);
   rows.forEach((row) => {
     console.log(
-      row.map((cell, i) => (cell || "").padEnd(colWidths[i])).join("  ")
+      row.map((cell, i) => (cell || "").padEnd(colWidths[i] || 0)).join("  ")
     );
   });
 }
@@ -1675,6 +1853,58 @@ const loginCommand = {
       } else {
         console.log("\u2713 Saved refresh token to global CLI auth store");
       }
+      console.log("Fetching teams...");
+      const teams = await getTeamsForCli();
+      if (teams.length === 0) {
+        console.log(
+          "\u26A0\uFE0F  No teams found. You may need to create a team in the dashboard."
+        );
+        return;
+      }
+      const defaultTeam = teams[0];
+      console.log(`Setting up default team: ${defaultTeam.displayName}`);
+      await setDefaultTeam(defaultTeam.id);
+      console.log(
+        `\u2713 Default team configured: ${defaultTeam.displayName} (${defaultTeam.id})`
+      );
+      console.log("You can now use the CLI to manage resources.");
+      if (teams.length > 1) {
+        console.log(
+          `
+\u2139\uFE0F  You have ${teams.length} teams. Use 'freestyle team switch' to change teams.`
+        );
+      }
+    } catch (error) {
+      handleError(error);
+    }
+  }
+};
+
+const logoutCommand = {
+  command: "logout",
+  describe: "Sign out the CLI",
+  builder: (yargs) => {
+    return yargs.option("dotenv", {
+      type: "boolean",
+      description: "Remove the refresh token from the current folder's .env",
+      default: false
+    });
+  },
+  handler: async (argv) => {
+    loadEnv();
+    const args = argv;
+    try {
+      const result = logoutCliAuth({ removeFromDotenv: args.dotenv });
+      if (!result.clearedStored && !result.clearedDotenv) {
+        console.log("No stored credentials found.");
+        return;
+      }
+      if (result.clearedStored) {
+        console.log("\u2713 Cleared CLI credentials");
+      }
+      if (result.clearedDotenv) {
+        console.log("\u2713 Removed refresh token from .env");
+      }
     } catch (error) {
       handleError(error);
     }
@@ -1682,4 +1912,4 @@ 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();
+yargs(hideBin(process.argv)).scriptName("freestyle").usage("$0 <command> [options]").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();

package/index.cjs

@@ -3772,7 +3772,7 @@ class ApiClient {
     if (this.apiKey) {
       headers["Authorization"] = `Bearer ${this.apiKey}`;
     } else if (this.accessToken) {
-      headers["X-Freestyle-Identity-Access-Token"] = this.accessToken;
+      headers["Authorization"] = `Bearer ${this.accessToken}`;
     }
     return headers;
   }
@@ -3820,33 +3820,82 @@ class ApiClient {
     return this.fetchFn(url, finalOptions);
   }
   getRaw(path, options) {
-    const url = this.buildUrl(path, options?.params, options?.query);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
     return this.requestRaw("GET", url, void 0, options?.headers);
   }
   get(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("GET", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "GET",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
   post(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("POST", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "POST",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
   put(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("PUT", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "PUT",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
   delete(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("DELETE", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "DELETE",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
   patch(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("PATCH", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "PATCH",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
 }
 

package/index.mjs

@@ -3770,7 +3770,7 @@ class ApiClient {
     if (this.apiKey) {
       headers["Authorization"] = `Bearer ${this.apiKey}`;
     } else if (this.accessToken) {
-      headers["X-Freestyle-Identity-Access-Token"] = this.accessToken;
+      headers["Authorization"] = `Bearer ${this.accessToken}`;
     }
     return headers;
   }
@@ -3818,33 +3818,82 @@ class ApiClient {
     return this.fetchFn(url, finalOptions);
   }
   getRaw(path, options) {
-    const url = this.buildUrl(path, options?.params, options?.query);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
     return this.requestRaw("GET", url, void 0, options?.headers);
   }
   get(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("GET", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "GET",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
   post(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("POST", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "POST",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
   put(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("PUT", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "PUT",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
   delete(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("DELETE", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "DELETE",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
   patch(path, ...args) {
     const options = args[0];
-    const url = this.buildUrl(path, options?.params, options?.query);
-    return this.request("PATCH", url, options?.body, options?.headers);
+    const url = this.buildUrl(
+      path,
+      options?.params,
+      options?.query
+    );
+    return this.request(
+      "PATCH",
+      url,
+      options?.body,
+      options?.headers
+    );
   }
 }
 

package/package.json

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