@base44-preview/cli 0.1.7-pr.585.44bc526 → 0.1.7-pr.585.818cbdc

package/dist/cli/index.js

@@ -23352,15 +23352,15 @@ var require_windows = __commonJS((exports, module) => {
     }
     return false;
   }
-  function checkStat(stat, path11, options) {
-    if (!stat.isSymbolicLink() && !stat.isFile()) {
+  function checkStat(stat2, path11, options) {
+    if (!stat2.isSymbolicLink() && !stat2.isFile()) {
       return false;
     }
     return checkPathExt(path11, options);
   }
   function isexe(path11, options, cb) {
-    fs14.stat(path11, function(er, stat) {
-      cb(er, er ? false : checkStat(stat, path11, options));
+    fs14.stat(path11, function(er, stat2) {
+      cb(er, er ? false : checkStat(stat2, path11, options));
     });
   }
   function sync(path11, options) {
@@ -23374,20 +23374,20 @@ var require_mode = __commonJS((exports, module) => {
   isexe.sync = sync;
   var fs14 = __require("fs");
   function isexe(path11, options, cb) {
-    fs14.stat(path11, function(er, stat) {
-      cb(er, er ? false : checkStat(stat, options));
+    fs14.stat(path11, function(er, stat2) {
+      cb(er, er ? false : checkStat(stat2, options));
     });
   }
   function sync(path11, options) {
     return checkStat(fs14.statSync(path11), options);
   }
-  function checkStat(stat, options) {
-    return stat.isFile() && checkMode(stat, options);
+  function checkStat(stat2, options) {
+    return stat2.isFile() && checkMode(stat2, options);
   }
-  function checkMode(stat, options) {
-    var mod = stat.mode;
-    var uid = stat.uid;
-    var gid = stat.gid;
+  function checkMode(stat2, options) {
+    var mod = stat2.mode;
+    var uid = stat2.uid;
+    var gid = stat2.gid;
     var myUid = options.uid !== undefined ? options.uid : process.getuid && process.getuid();
     var myGid = options.gid !== undefined ? options.gid : process.getgid && process.getgid();
     var u = parseInt("100", 8);
@@ -23419,12 +23419,12 @@ var require_isexe = __commonJS((exports, module) => {
       if (typeof Promise !== "function") {
         throw new TypeError("callback not provided");
       }
-      return new Promise(function(resolve3, reject) {
+      return new Promise(function(resolve4, reject) {
         isexe(path11, options || {}, function(er, is) {
           if (er) {
             reject(er);
           } else {
-            resolve3(is);
+            resolve4(is);
           }
         });
       });
@@ -23486,27 +23486,27 @@ var require_which = __commonJS((exports, module) => {
       opt = {};
     const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
     const found = [];
-    const step = (i) => new Promise((resolve3, reject) => {
+    const step = (i) => new Promise((resolve4, reject) => {
       if (i === pathEnv.length)
-        return opt.all && found.length ? resolve3(found) : reject(getNotFoundError(cmd));
+        return opt.all && found.length ? resolve4(found) : reject(getNotFoundError(cmd));
       const ppRaw = pathEnv[i];
       const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
       const pCmd = path11.join(pathPart, cmd);
       const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-      resolve3(subStep(p, i, 0));
+      resolve4(subStep(p, i, 0));
     });
-    const subStep = (p, i, ii) => new Promise((resolve3, reject) => {
+    const subStep = (p, i, ii) => new Promise((resolve4, reject) => {
       if (ii === pathExt.length)
-        return resolve3(step(i + 1));
+        return resolve4(step(i + 1));
       const ext = pathExt[ii];
       isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
         if (!er && is) {
           if (opt.all)
             found.push(p + ext);
           else
-            return resolve3(p + ext);
+            return resolve4(p + ext);
         }
-        return resolve3(subStep(p, i, ii + 1));
+        return resolve4(subStep(p, i, ii + 1));
       });
     });
     return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -248258,7 +248258,7 @@ async function createProjectFilesForExistingProject(options) {
   };
 }
 // src/core/project/deploy.ts
-import { resolve as resolve4 } from "node:path";
+import { resolve as resolve3 } from "node:path";
 
 // src/core/site/api.ts
 async function uploadSite(archivePath) {
@@ -248361,13 +248361,473 @@ async function createArchive(pathToArchive, targetArchivePath) {
     cwd: pathToArchive
   }, ["."]);
 }
-// src/core/site/deploy-app.ts
-import { resolve as resolve3 } from "node:path";
-
+// src/core/site/gate.ts
+var STATIC_DEPLOYMENTS_ENV = "BASE44_STATIC_DEPLOYMENTS";
+function staticDeploymentsEnabled(env2 = process.env) {
+  const value = env2[STATIC_DEPLOYMENTS_ENV];
+  return value === "1" || value === "true";
+}
+// src/core/site/manifest.ts
+import { createHash } from "node:crypto";
+import { readFile as readFile2, stat } from "node:fs/promises";
+import { basename as basename4, join as join15 } from "node:path";
+var MAX_ASSET_SIZE_BYTES = 25 * 1024 * 1024;
+var MAX_ASSET_COUNT = 1e5;
+var ASSETS_IGNORE_FILE = ".assetsignore";
+var ALWAYS_IGNORED = new Set([
+  ASSETS_IGNORE_FILE,
+  "wrangler.json",
+  ".dev.vars"
+]);
+function hashAsset(appId, content) {
+  return createHash("sha256").update(Buffer.from(appId, "utf8")).update(content).digest("hex").slice(0, 32);
+}
+async function buildAssetManifest(assetsDir, appId) {
+  const manifest = {};
+  const filesByHash = new Map;
+  const found = await globby("**/*", {
+    cwd: assetsDir,
+    dot: true,
+    onlyFiles: true,
+    followSymbolicLinks: false,
+    ignoreFiles: [ASSETS_IGNORE_FILE]
+  });
+  const relativeFilePaths = found.filter((path11) => !ALWAYS_IGNORED.has(basename4(path11)));
+  if (relativeFilePaths.length > MAX_ASSET_COUNT) {
+    throw new InvalidInputError(`Too many static assets: found ${relativeFilePaths.length}, the limit is ${MAX_ASSET_COUNT} files.`);
+  }
+  for (const relativePath of relativeFilePaths.sort()) {
+    const absolutePath = join15(assetsDir, ...relativePath.split("/"));
+    const { size } = await stat(absolutePath);
+    if (size > MAX_ASSET_SIZE_BYTES) {
+      throw new InvalidInputError(`Static asset "${relativePath}" is ${size} bytes, which exceeds the 25 MiB per-file limit.`);
+    }
+    const content = await readFile2(absolutePath);
+    const hash2 = hashAsset(appId, content);
+    manifest[`/${relativePath}`] = { hash: hash2, size };
+    if (!filesByHash.has(hash2)) {
+      filesByHash.set(hash2, { absolutePath, hash: hash2, size });
+    }
+  }
+  return { manifest, filesByHash };
+}
 // src/core/site/static-site.ts
 import { readFile as readFile4 } from "node:fs/promises";
 import { join as join16 } from "node:path";
 
+// src/core/utils/git.ts
+var GIT_HASH_PATTERN = /^[a-fA-F0-9]{7,64}$/;
+function isGitCommitHash(value) {
+  return GIT_HASH_PATTERN.test(value);
+}
+
+// src/core/site/upload.ts
+import { readFile as readFile3 } from "node:fs/promises";
+var UPLOAD_CONCURRENCY = 3;
+var MAX_ATTEMPTS_PER_UPLOAD = 3;
+var RETRY_BASE_DELAY_MS = 500;
+async function uploadPresignedAssets(uploads, assets, onProgress) {
+  let uploadedFiles = 0;
+  let nextUpload = 0;
+  const worker = async () => {
+    while (nextUpload < uploads.length) {
+      const upload = uploads[nextUpload++];
+      await uploadPresignedAssetWithRetry(upload, assets);
+      uploadedFiles++;
+      onProgress?.({ uploadedFiles, totalFiles: uploads.length });
+    }
+  };
+  await Promise.all(Array.from({ length: Math.min(UPLOAD_CONCURRENCY, uploads.length) }, worker));
+}
+async function uploadPresignedAssetWithRetry(upload, assets) {
+  const entry = assets.manifest[upload.path];
+  const file2 = entry && assets.filesByHash.get(entry.hash);
+  if (!file2) {
+    throw new InternalError(`Server requested upload of unknown asset path: ${upload.path}`);
+  }
+  const content = await readFile3(file2.absolutePath);
+  let lastError;
+  for (let attempt = 0;attempt < MAX_ATTEMPTS_PER_UPLOAD; attempt++) {
+    if (attempt > 0) {
+      await sleep3(RETRY_BASE_DELAY_MS * 2 ** (attempt - 1));
+    }
+    try {
+      await distribution_default.put(upload.url, {
+        body: new Uint8Array(content),
+        headers: { "Content-Type": upload.contentType },
+        timeout: 120000,
+        retry: 0
+      });
+      return;
+    } catch (error48) {
+      lastError = error48;
+    }
+  }
+  throw await ApiError.fromHttpError(lastError, "uploading static assets");
+}
+function sleep3(ms) {
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
+}
+
+// src/core/site/static-site.ts
+async function deployStaticSite(options) {
+  const { outputDir, gitHash, progress } = options;
+  if (!isGitCommitHash(gitHash)) {
+    throw new InvalidInputError(`'${gitHash}' is not a git commit hash.`);
+  }
+  const assets = await buildAssetManifest(outputDir, getAppContext().id);
+  if (!assets.manifest["/index.html"]) {
+    throw new InvalidInputError(`No index.html found in "${outputDir}" — a static site needs one at the output directory root.`);
+  }
+  const created = await createDeployment({
+    git_hash: gitHash,
+    asset_manifest: assets.manifest
+  });
+  progress?.onAssets?.({
+    totalAssets: Object.keys(assets.manifest).length,
+    newAssets: created.assetUploads?.uploads.length ?? 0
+  });
+  if (created.assetUploads) {
+    await uploadPresignedAssets(created.assetUploads.uploads, assets, progress?.onAssetUpload);
+  }
+  const indexHtml = await readFile4(join16(outputDir, "index.html"));
+  const finalized = await finalizeStaticDeployment(created.deploymentId, new Uint8Array(indexHtml));
+  return { deploymentId: finalized.deploymentId };
+}
+// src/core/project/deploy.ts
+function hasResourcesToDeploy(projectData) {
+  const {
+    project,
+    entities,
+    functions,
+    agents,
+    agentSkills,
+    connectors,
+    authConfig
+  } = projectData;
+  const hasSite = Boolean(project.site?.outputDirectory);
+  const hasEntities = entities.length > 0;
+  const hasFunctions = functions.length > 0;
+  const hasAgents = agents.length > 0;
+  const hasAgentSkills = agentSkills.length > 0;
+  const hasConnectors = connectors.length > 0;
+  const hasAuthConfig = authConfig.length > 0;
+  const hasVisibility = Boolean(project.visibility);
+  return hasEntities || hasFunctions || hasAgents || hasAgentSkills || hasConnectors || hasAuthConfig || hasVisibility || hasSite;
+}
+async function deployAll(projectData, options) {
+  const {
+    project,
+    entities,
+    functions,
+    agents,
+    agentSkills,
+    connectors,
+    authConfig
+  } = projectData;
+  await setAppVisibility(project.visibility);
+  if (project.visibility) {
+    options?.onVisibilitySet?.(project.visibility);
+  }
+  await entityResource.push(entities);
+  await deployFunctionsSequentially(functions, {
+    onStart: options?.onFunctionStart,
+    onResult: options?.onFunctionResult
+  });
+  await agentSkillResource.push(agentSkills);
+  await agentResource.push(agents);
+  await authConfigResource.push(authConfig);
+  const skipConnectorSync = connectors.length === 0 && hasWorkspaceApiKeyAuth();
+  const connectorResults = skipConnectorSync ? [] : (await pushConnectors(connectors)).results;
+  if (project.site?.outputDirectory) {
+    const outputDir = resolve3(project.root, project.site.outputDirectory);
+    const { appUrl } = await deploySite(outputDir);
+    return { appUrl, connectorResults };
+  }
+  return { connectorResults };
+}
+// src/core/clients/base44-client.ts
+var retriedRequests = new WeakSet;
+async function captureRequestBody(request, options) {
+  if (request.body == null) {
+    return;
+  }
+  try {
+    const cloned = request.clone();
+    const text = await cloned.text();
+    options.context.__requestBody = text;
+  } catch {}
+}
+async function handleUnauthorized(request, _options, response) {
+  if (response.status !== 401) {
+    return;
+  }
+  if (hasWorkspaceApiKeyAuth()) {
+    return;
+  }
+  if (retriedRequests.has(request)) {
+    return;
+  }
+  const newAccessToken = await refreshAndSaveTokens();
+  if (!newAccessToken) {
+    return;
+  }
+  retriedRequests.add(request);
+  const requestId = request.headers.get("X-Request-ID");
+  return distribution_default(request.clone(), {
+    headers: {
+      ...requestId && { "X-Request-ID": requestId },
+      Authorization: `Bearer ${newAccessToken}`
+    }
+  });
+}
+var base44Client = distribution_default.create({
+  prefixUrl: getBase44ApiUrl(),
+  headers: {
+    "User-Agent": "Base44 CLI"
+  },
+  hooks: {
+    beforeRequest: [
+      (request) => {
+        request.headers.set("X-Request-ID", randomUUID2());
+      },
+      captureRequestBody,
+      async (request) => {
+        const workspaceApiKey = getWorkspaceApiKeyFromEnv();
+        if (workspaceApiKey && isWorkspaceApiKey(workspaceApiKey)) {
+          request.headers.set("api_key", workspaceApiKey);
+          return;
+        }
+        try {
+          const auth = await readAuth();
+          if (isTokenExpired(auth)) {
+            const newAccessToken = await refreshAndSaveTokens();
+            if (newAccessToken) {
+              request.headers.set("Authorization", `Bearer ${newAccessToken}`);
+              return;
+            }
+          }
+          request.headers.set("Authorization", `Bearer ${auth.accessToken}`);
+        } catch {}
+      }
+    ],
+    afterResponse: [handleUnauthorized]
+  }
+});
+function getAppClient() {
+  const { id } = getAppContext();
+  return base44Client.extend({
+    prefixUrl: new URL(`/api/apps/${id}/`, getBase44ApiUrl()).href
+  });
+}
+function getSandboxClient(appId) {
+  return base44Client.extend({
+    prefixUrl: new URL(`/api/apps/${appId}/sandbox-bridge/`, getBase44ApiUrl()).href
+  });
+}
+// src/core/clients/oauth-client.ts
+import { randomUUID as randomUUID3 } from "node:crypto";
+var oauthClient = distribution_default.create({
+  prefixUrl: getBase44ApiUrl(),
+  headers: {
+    "User-Agent": "Base44 CLI"
+  },
+  hooks: {
+    beforeRequest: [
+      (request) => {
+        request.headers.set("X-Request-ID", randomUUID3());
+      }
+    ]
+  }
+});
+// src/core/auth/api.ts
+async function generateDeviceCode() {
+  const response = await oauthClient.post("oauth/device/code", {
+    json: {
+      client_id: AUTH_CLIENT_ID,
+      scope: "apps:read apps:write sandbox:write"
+    },
+    throwHttpErrors: false
+  });
+  if (!response.ok) {
+    throw new ApiError(`Failed to generate device code: ${response.status} ${response.statusText}`, { statusCode: response.status });
+  }
+  const result = DeviceCodeResponseSchema.safeParse(await response.json());
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid device code response from server", result.error);
+  }
+  return result.data;
+}
+async function getTokenFromDeviceCode(deviceCode) {
+  const searchParams = new URLSearchParams;
+  searchParams.set("grant_type", "urn:ietf:params:oauth:grant-type:device_code");
+  searchParams.set("device_code", deviceCode);
+  searchParams.set("client_id", AUTH_CLIENT_ID);
+  const response = await oauthClient.post("oauth/token", {
+    body: searchParams.toString(),
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded"
+    },
+    throwHttpErrors: false
+  });
+  const json2 = await response.json();
+  if (!response.ok) {
+    const errorResult = OAuthErrorSchema.safeParse(json2);
+    if (!errorResult.success) {
+      throw new SchemaValidationError("Token request failed", errorResult.error);
+    }
+    const { error: error48, error_description } = errorResult.data;
+    if (error48 === "authorization_pending" || error48 === "slow_down") {
+      return null;
+    }
+    throw new ApiError(error_description ?? `OAuth error: ${error48}`, {
+      statusCode: response.status
+    });
+  }
+  const result = TokenResponseSchema.safeParse(json2);
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid token response from server", result.error);
+  }
+  return result.data;
+}
+async function renewAccessToken(refreshToken) {
+  const searchParams = new URLSearchParams;
+  searchParams.set("grant_type", "refresh_token");
+  searchParams.set("refresh_token", refreshToken);
+  searchParams.set("client_id", AUTH_CLIENT_ID);
+  const response = await oauthClient.post("oauth/token", {
+    body: searchParams.toString(),
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded"
+    },
+    throwHttpErrors: false
+  });
+  const json2 = await response.json();
+  if (!response.ok) {
+    const errorResult = OAuthErrorSchema.safeParse(json2);
+    if (!errorResult.success) {
+      throw new ApiError(`Token refresh failed: ${response.statusText}`, {
+        statusCode: response.status
+      });
+    }
+    const { error: error48, error_description } = errorResult.data;
+    throw new ApiError(error_description ?? `OAuth error: ${error48}`, {
+      statusCode: response.status
+    });
+  }
+  const result = TokenResponseSchema.safeParse(json2);
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid token response from server", result.error);
+  }
+  return result.data;
+}
+async function getUserInfo(accessToken) {
+  const response = await oauthClient.get("oauth/userinfo", {
+    headers: { Authorization: `Bearer ${accessToken}` }
+  });
+  if (!response.ok) {
+    throw new ApiError(`Failed to fetch user info: ${response.status}`, {
+      statusCode: response.status
+    });
+  }
+  const result = UserInfoSchema.safeParse(await response.json());
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid UserInfo response from server", result.error);
+  }
+  return result.data;
+}
+// src/cli/commands/auth/login-flow.ts
+async function generateAndDisplayDeviceCode(log, runTask) {
+  const deviceCodeResponse = await runTask("Generating device code...", async () => {
+    return await generateDeviceCode();
+  }, {
+    successMessage: "Device code generated",
+    errorMessage: "Failed to generate device code"
+  });
+  log.info(`Verification code: ${theme.styles.bold(deviceCodeResponse.userCode)}` + `
+Please confirm this code at: ${deviceCodeResponse.verificationUri}`);
+  return deviceCodeResponse;
+}
+async function waitForAuthentication(deviceCode, expiresIn, interval, runTask) {
+  let tokenResponse;
+  try {
+    await runTask("Waiting for authentication...", async () => {
+      await pWaitFor(async () => {
+        const result = await getTokenFromDeviceCode(deviceCode);
+        if (result !== null) {
+          tokenResponse = result;
+          return true;
+        }
+        return false;
+      }, {
+        interval: interval * 1000,
+        timeout: expiresIn * 1000
+      });
+    }, {
+      successMessage: "Authentication completed!",
+      errorMessage: "Authentication failed"
+    });
+  } catch (error48) {
+    if (error48 instanceof Error && error48.message.includes("timed out")) {
+      throw new AuthExpiredError("Authentication timed out. Please try again.");
+    }
+    throw error48;
+  }
+  if (tokenResponse === undefined) {
+    throw new InternalError("Failed to retrieve authentication token.");
+  }
+  return tokenResponse;
+}
+async function saveAuthData(response, userInfo) {
+  const expiresAt = Date.now() + response.expiresIn * 1000;
+  await writeAuth({
+    accessToken: response.accessToken,
+    refreshToken: response.refreshToken,
+    expiresAt,
+    email: userInfo.email,
+    name: userInfo.name
+  });
+}
+async function login({
+  log,
+  runTask
+}) {
+  const deviceCodeResponse = await generateAndDisplayDeviceCode(log, runTask);
+  const token = await waitForAuthentication(deviceCodeResponse.deviceCode, deviceCodeResponse.expiresIn, deviceCodeResponse.interval, runTask);
+  const userInfo = await getUserInfo(token.accessToken);
+  await saveAuthData(token, userInfo);
+  return {
+    outroMessage: `Successfully logged in as ${theme.styles.bold(userInfo.email)}`
+  };
+}
+
+// src/cli/utils/command/middleware.ts
+async function ensureAuth(ctx) {
+  if (hasWorkspaceApiKeyAuth()) {
+    ctx.errorReporter.setContext({
+      user: { email: "workspace-api-key", name: "Workspace API key" }
+    });
+    return;
+  }
+  await seedAuthFromEnv();
+  const loggedIn = await isLoggedIn();
+  if (!loggedIn) {
+    ctx.log.info("You need to login first to continue.");
+    await login(ctx);
+  }
+  try {
+    const userInfo = await readAuth();
+    ctx.errorReporter.setContext({
+      user: { email: userInfo.email, name: userInfo.name }
+    });
+  } catch {}
+}
+async function ensureAppContext(ctx, options = {}) {
+  const appContext = await initAppContext(options);
+  ctx.app = appContext;
+  ctx.errorReporter.setContext({ appId: appContext.id });
+}
+
 // ../../node_modules/is-plain-obj/index.js
 function isPlainObject2(value) {
   if (typeof value !== "object" || value === null) {
@@ -248465,13 +248925,13 @@ var getJoinLength = (uint8Arrays) => {
 var isTemplateString = (templates) => Array.isArray(templates) && Array.isArray(templates.raw);
 var parseTemplates = (templates, expressions) => {
   let tokens = [];
-  for (const [index, template] of templates.entries()) {
+  for (const [index, template2] of templates.entries()) {
     tokens = parseTemplate({
       templates,
       expressions,
       tokens,
       index,
-      template
+      template: template2
     });
   }
   if (tokens.length === 0) {
@@ -248480,11 +248940,11 @@ var parseTemplates = (templates, expressions) => {
   const [file2, ...commandArguments] = tokens;
   return [file2, commandArguments, {}];
 };
-var parseTemplate = ({ templates, expressions, tokens, index, template }) => {
-  if (template === undefined) {
+var parseTemplate = ({ templates, expressions, tokens, index, template: template2 }) => {
+  if (template2 === undefined) {
     throw new TypeError(`Invalid backslash sequence: ${templates.raw[index]}`);
   }
-  const { nextTokens, leadingWhitespaces, trailingWhitespaces } = splitByWhitespaces(template, templates.raw[index]);
+  const { nextTokens, leadingWhitespaces, trailingWhitespaces } = splitByWhitespaces(template2, templates.raw[index]);
   const newTokens = concatTokens(tokens, nextTokens, leadingWhitespaces);
   if (index === expressions.length) {
     return newTokens;
@@ -248493,18 +248953,18 @@ var parseTemplate = ({ templates, expressions, tokens, index, template }) => {
   const expressionTokens = Array.isArray(expression) ? expression.map((expression2) => parseExpression(expression2)) : [parseExpression(expression)];
   return concatTokens(newTokens, expressionTokens, trailingWhitespaces);
 };
-var splitByWhitespaces = (template, rawTemplate) => {
+var splitByWhitespaces = (template2, rawTemplate) => {
   if (rawTemplate.length === 0) {
     return { nextTokens: [], leadingWhitespaces: false, trailingWhitespaces: false };
   }
   const nextTokens = [];
   let templateStart = 0;
   const leadingWhitespaces = DELIMITERS.has(rawTemplate[0]);
-  for (let templateIndex = 0, rawIndex = 0;templateIndex < template.length; templateIndex += 1, rawIndex += 1) {
+  for (let templateIndex = 0, rawIndex = 0;templateIndex < template2.length; templateIndex += 1, rawIndex += 1) {
     const rawCharacter = rawTemplate[rawIndex];
     if (DELIMITERS.has(rawCharacter)) {
       if (templateStart !== templateIndex) {
-        nextTokens.push(template.slice(templateStart, templateIndex));
+        nextTokens.push(template2.slice(templateStart, templateIndex));
       }
       templateStart = templateIndex + 1;
     } else if (rawCharacter === "\\") {
@@ -248520,9 +248980,9 @@ var splitByWhitespaces = (template, rawTemplate) => {
       }
     }
   }
-  const trailingWhitespaces = templateStart === template.length;
+  const trailingWhitespaces = templateStart === template2.length;
   if (!trailingWhitespaces) {
-    nextTokens.push(template.slice(templateStart));
+    nextTokens.push(template2.slice(templateStart));
   }
   return { nextTokens, leadingWhitespaces, trailingWhitespaces };
 };
@@ -249916,8 +250376,8 @@ var disconnect = (anyProcess) => {
 // ../../node_modules/execa/lib/utils/deferred.js
 var createDeferred = () => {
   const methods = {};
-  const promise2 = new Promise((resolve3, reject) => {
-    Object.assign(methods, { resolve: resolve3, reject });
+  const promise2 = new Promise((resolve4, reject) => {
+    Object.assign(methods, { resolve: resolve4, reject });
   });
   return Object.assign(promise2, methods);
 };
@@ -254281,11 +254741,11 @@ var addConcurrentStream = (concurrentStreams, stream, waitName) => {
   const promises = weakMap.get(stream);
   const promise2 = createDeferred();
   promises.push(promise2);
-  const resolve3 = promise2.resolve.bind(promise2);
-  return { resolve: resolve3, promises };
+  const resolve4 = promise2.resolve.bind(promise2);
+  return { resolve: resolve4, promises };
 };
-var waitForConcurrentStreams = async ({ resolve: resolve3, promises }, subprocess) => {
-  resolve3();
+var waitForConcurrentStreams = async ({ resolve: resolve4, promises }, subprocess) => {
+  resolve4();
   const [isSubprocessExit] = await Promise.race([
     Promise.allSettled([true, subprocess]),
     Promise.all([false, ...promises])
@@ -254864,522 +255324,6 @@ var {
   getCancelSignal: getCancelSignal2
 } = getIpcExport();
 
-// src/core/utils/git.ts
-var GIT_HASH_PATTERN = /^[a-fA-F0-9]{7,64}$/;
-function isGitCommitHash(value) {
-  return GIT_HASH_PATTERN.test(value);
-}
-async function getGitHead(cwd) {
-  try {
-    const { stdout } = await execa("git", ["rev-parse", "HEAD"], { cwd });
-    return stdout.trim();
-  } catch {
-    return null;
-  }
-}
-
-// src/core/site/manifest.ts
-import { createHash } from "node:crypto";
-import { readFile as readFile2, stat } from "node:fs/promises";
-import { basename as basename4, join as join15 } from "node:path";
-var MAX_ASSET_SIZE_BYTES = 25 * 1024 * 1024;
-var MAX_ASSET_COUNT = 1e5;
-var ASSETS_IGNORE_FILE = ".assetsignore";
-var ALWAYS_IGNORED = new Set([
-  ASSETS_IGNORE_FILE,
-  "wrangler.json",
-  ".dev.vars"
-]);
-function hashAsset(appId, content) {
-  return createHash("sha256").update(Buffer.from(appId, "utf8")).update(content).digest("hex").slice(0, 32);
-}
-async function buildAssetManifest(assetsDir, appId) {
-  const manifest = {};
-  const filesByHash = new Map;
-  const found = await globby("**/*", {
-    cwd: assetsDir,
-    dot: true,
-    onlyFiles: true,
-    followSymbolicLinks: false,
-    ignoreFiles: [ASSETS_IGNORE_FILE]
-  });
-  const relativeFilePaths = found.filter((path16) => !ALWAYS_IGNORED.has(basename4(path16)));
-  if (relativeFilePaths.length > MAX_ASSET_COUNT) {
-    throw new InvalidInputError(`Too many static assets: found ${relativeFilePaths.length}, the limit is ${MAX_ASSET_COUNT} files.`);
-  }
-  for (const relativePath of relativeFilePaths.sort()) {
-    const absolutePath = join15(assetsDir, ...relativePath.split("/"));
-    const { size } = await stat(absolutePath);
-    if (size > MAX_ASSET_SIZE_BYTES) {
-      throw new InvalidInputError(`Static asset "${relativePath}" is ${size} bytes, which exceeds the 25 MiB per-file limit.`);
-    }
-    const content = await readFile2(absolutePath);
-    const hash2 = hashAsset(appId, content);
-    manifest[`/${relativePath}`] = { hash: hash2, size };
-    if (!filesByHash.has(hash2)) {
-      filesByHash.set(hash2, { absolutePath, hash: hash2, size });
-    }
-  }
-  return { manifest, filesByHash };
-}
-
-// src/core/site/upload.ts
-import { readFile as readFile3 } from "node:fs/promises";
-var UPLOAD_CONCURRENCY = 3;
-var MAX_ATTEMPTS_PER_UPLOAD = 3;
-var RETRY_BASE_DELAY_MS = 500;
-async function uploadPresignedAssets(uploads, assets, onProgress) {
-  let uploadedFiles = 0;
-  let nextUpload = 0;
-  const worker = async () => {
-    while (nextUpload < uploads.length) {
-      const upload = uploads[nextUpload++];
-      await uploadPresignedAssetWithRetry(upload, assets);
-      uploadedFiles++;
-      onProgress?.({ uploadedFiles, totalFiles: uploads.length });
-    }
-  };
-  await Promise.all(Array.from({ length: Math.min(UPLOAD_CONCURRENCY, uploads.length) }, worker));
-}
-async function uploadPresignedAssetWithRetry(upload, assets) {
-  const entry = assets.manifest[upload.path];
-  const file2 = entry && assets.filesByHash.get(entry.hash);
-  if (!file2) {
-    throw new InternalError(`Server requested upload of unknown asset path: ${upload.path}`);
-  }
-  const content = await readFile3(file2.absolutePath);
-  let lastError;
-  for (let attempt = 0;attempt < MAX_ATTEMPTS_PER_UPLOAD; attempt++) {
-    if (attempt > 0) {
-      await sleep3(RETRY_BASE_DELAY_MS * 2 ** (attempt - 1));
-    }
-    try {
-      await distribution_default.put(upload.url, {
-        body: new Uint8Array(content),
-        headers: { "Content-Type": upload.contentType },
-        timeout: 120000,
-        retry: 0
-      });
-      return;
-    } catch (error48) {
-      lastError = error48;
-    }
-  }
-  throw await ApiError.fromHttpError(lastError, "uploading static assets");
-}
-function sleep3(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
-}
-
-// src/core/site/static-site.ts
-async function deployStaticSite(options) {
-  const { outputDir, projectRoot, progress } = options;
-  const gitHash = await resolveGitHash(projectRoot, options.gitHash);
-  const assets = await buildAssetManifest(outputDir, getAppContext().id);
-  if (!assets.manifest["/index.html"]) {
-    throw new InvalidInputError(`No index.html found in "${outputDir}" — a static site needs one at the output directory root.`);
-  }
-  const created = await createDeployment({
-    git_hash: gitHash,
-    asset_manifest: assets.manifest
-  });
-  progress?.onAssets?.({
-    totalAssets: Object.keys(assets.manifest).length,
-    newAssets: created.assetUploads?.uploads.length ?? 0
-  });
-  if (created.assetUploads) {
-    await uploadPresignedAssets(created.assetUploads.uploads, assets, progress?.onAssetUpload);
-  }
-  const indexHtml = await readFile4(join16(outputDir, "index.html"));
-  const finalized = await finalizeStaticDeployment(created.deploymentId, new Uint8Array(indexHtml));
-  return { deploymentId: finalized.deploymentId, gitHash };
-}
-async function resolveGitHash(projectRoot, explicit) {
-  const hash2 = explicit ?? await getGitHead(projectRoot);
-  if (!hash2 || !isGitCommitHash(hash2)) {
-    throw new InvalidInputError(explicit ? `'${explicit}' is not a git commit hash.` : "Deployments are addressed by the commit that produced the build, and no git commit was found.", {
-      hints: [
-        {
-          message: "Run the deploy from a git checkout, or pass the commit explicitly: base44 site deploy --git-hash <commit>."
-        }
-      ]
-    });
-  }
-  return hash2;
-}
-
-// src/core/site/deploy-app.ts
-function planAppDeploy(target, staticDeployments) {
-  const outputDirectory = target.site?.outputDirectory;
-  if (!outputDirectory) {
-    return { kind: "none" };
-  }
-  const outputDir = resolve3(target.root, outputDirectory);
-  return staticDeployments ? { kind: "static-deployment", outputDir } : { kind: "static", outputDir };
-}
-function detectAppDeployKind(target, options = {}) {
-  return planAppDeploy(target, options.staticDeployments ?? false).kind;
-}
-async function deployAppSite(target, options = {}) {
-  const plan = planAppDeploy(target, options.staticDeployments ?? false);
-  switch (plan.kind) {
-    case "static-deployment": {
-      const { deploymentId, gitHash } = await deployStaticSite({
-        outputDir: plan.outputDir,
-        projectRoot: target.root,
-        gitHash: options.gitHash,
-        progress: options.progress
-      });
-      return { kind: "static-deployment", deploymentId, gitHash };
-    }
-    case "static": {
-      const { appUrl } = await deploySite(plan.outputDir);
-      return { kind: "static", appUrl };
-    }
-    case "none":
-      return { kind: "none" };
-  }
-}
-// src/core/site/gate.ts
-var STATIC_DEPLOYMENTS_ENV = "BASE44_STATIC_DEPLOYMENTS";
-function staticDeploymentsEnabled(env2 = process.env) {
-  const value = env2[STATIC_DEPLOYMENTS_ENV];
-  return value === "1" || value === "true";
-}
-// src/core/project/deploy.ts
-function hasResourcesToDeploy(projectData) {
-  const {
-    project,
-    entities,
-    functions,
-    agents,
-    agentSkills,
-    connectors,
-    authConfig
-  } = projectData;
-  const hasSite = Boolean(project.site?.outputDirectory);
-  const hasEntities = entities.length > 0;
-  const hasFunctions = functions.length > 0;
-  const hasAgents = agents.length > 0;
-  const hasAgentSkills = agentSkills.length > 0;
-  const hasConnectors = connectors.length > 0;
-  const hasAuthConfig = authConfig.length > 0;
-  const hasVisibility = Boolean(project.visibility);
-  return hasEntities || hasFunctions || hasAgents || hasAgentSkills || hasConnectors || hasAuthConfig || hasVisibility || hasSite;
-}
-async function deployAll(projectData, options) {
-  const {
-    project,
-    entities,
-    functions,
-    agents,
-    agentSkills,
-    connectors,
-    authConfig
-  } = projectData;
-  await setAppVisibility(project.visibility);
-  if (project.visibility) {
-    options?.onVisibilitySet?.(project.visibility);
-  }
-  await entityResource.push(entities);
-  await deployFunctionsSequentially(functions, {
-    onStart: options?.onFunctionStart,
-    onResult: options?.onFunctionResult
-  });
-  await agentSkillResource.push(agentSkills);
-  await agentResource.push(agents);
-  await authConfigResource.push(authConfig);
-  const skipConnectorSync = connectors.length === 0 && hasWorkspaceApiKeyAuth();
-  const connectorResults = skipConnectorSync ? [] : (await pushConnectors(connectors)).results;
-  if (project.site?.outputDirectory) {
-    const outputDir = resolve4(project.root, project.site.outputDirectory);
-    const { appUrl } = await deploySite(outputDir);
-    return { appUrl, connectorResults };
-  }
-  return { connectorResults };
-}
-// src/core/clients/base44-client.ts
-var retriedRequests = new WeakSet;
-async function captureRequestBody(request, options) {
-  if (request.body == null) {
-    return;
-  }
-  try {
-    const cloned = request.clone();
-    const text = await cloned.text();
-    options.context.__requestBody = text;
-  } catch {}
-}
-async function handleUnauthorized(request, _options, response) {
-  if (response.status !== 401) {
-    return;
-  }
-  if (hasWorkspaceApiKeyAuth()) {
-    return;
-  }
-  if (retriedRequests.has(request)) {
-    return;
-  }
-  const newAccessToken = await refreshAndSaveTokens();
-  if (!newAccessToken) {
-    return;
-  }
-  retriedRequests.add(request);
-  const requestId = request.headers.get("X-Request-ID");
-  return distribution_default(request.clone(), {
-    headers: {
-      ...requestId && { "X-Request-ID": requestId },
-      Authorization: `Bearer ${newAccessToken}`
-    }
-  });
-}
-var base44Client = distribution_default.create({
-  prefixUrl: getBase44ApiUrl(),
-  headers: {
-    "User-Agent": "Base44 CLI"
-  },
-  hooks: {
-    beforeRequest: [
-      (request) => {
-        request.headers.set("X-Request-ID", randomUUID2());
-      },
-      captureRequestBody,
-      async (request) => {
-        const workspaceApiKey = getWorkspaceApiKeyFromEnv();
-        if (workspaceApiKey && isWorkspaceApiKey(workspaceApiKey)) {
-          request.headers.set("api_key", workspaceApiKey);
-          return;
-        }
-        try {
-          const auth = await readAuth();
-          if (isTokenExpired(auth)) {
-            const newAccessToken = await refreshAndSaveTokens();
-            if (newAccessToken) {
-              request.headers.set("Authorization", `Bearer ${newAccessToken}`);
-              return;
-            }
-          }
-          request.headers.set("Authorization", `Bearer ${auth.accessToken}`);
-        } catch {}
-      }
-    ],
-    afterResponse: [handleUnauthorized]
-  }
-});
-function getAppClient() {
-  const { id } = getAppContext();
-  return base44Client.extend({
-    prefixUrl: new URL(`/api/apps/${id}/`, getBase44ApiUrl()).href
-  });
-}
-function getSandboxClient(appId) {
-  return base44Client.extend({
-    prefixUrl: new URL(`/api/apps/${appId}/sandbox-bridge/`, getBase44ApiUrl()).href
-  });
-}
-// src/core/clients/oauth-client.ts
-import { randomUUID as randomUUID3 } from "node:crypto";
-var oauthClient = distribution_default.create({
-  prefixUrl: getBase44ApiUrl(),
-  headers: {
-    "User-Agent": "Base44 CLI"
-  },
-  hooks: {
-    beforeRequest: [
-      (request) => {
-        request.headers.set("X-Request-ID", randomUUID3());
-      }
-    ]
-  }
-});
-// src/core/auth/api.ts
-async function generateDeviceCode() {
-  const response = await oauthClient.post("oauth/device/code", {
-    json: {
-      client_id: AUTH_CLIENT_ID,
-      scope: "apps:read apps:write sandbox:write"
-    },
-    throwHttpErrors: false
-  });
-  if (!response.ok) {
-    throw new ApiError(`Failed to generate device code: ${response.status} ${response.statusText}`, { statusCode: response.status });
-  }
-  const result = DeviceCodeResponseSchema.safeParse(await response.json());
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid device code response from server", result.error);
-  }
-  return result.data;
-}
-async function getTokenFromDeviceCode(deviceCode) {
-  const searchParams = new URLSearchParams;
-  searchParams.set("grant_type", "urn:ietf:params:oauth:grant-type:device_code");
-  searchParams.set("device_code", deviceCode);
-  searchParams.set("client_id", AUTH_CLIENT_ID);
-  const response = await oauthClient.post("oauth/token", {
-    body: searchParams.toString(),
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded"
-    },
-    throwHttpErrors: false
-  });
-  const json2 = await response.json();
-  if (!response.ok) {
-    const errorResult = OAuthErrorSchema.safeParse(json2);
-    if (!errorResult.success) {
-      throw new SchemaValidationError("Token request failed", errorResult.error);
-    }
-    const { error: error48, error_description } = errorResult.data;
-    if (error48 === "authorization_pending" || error48 === "slow_down") {
-      return null;
-    }
-    throw new ApiError(error_description ?? `OAuth error: ${error48}`, {
-      statusCode: response.status
-    });
-  }
-  const result = TokenResponseSchema.safeParse(json2);
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid token response from server", result.error);
-  }
-  return result.data;
-}
-async function renewAccessToken(refreshToken) {
-  const searchParams = new URLSearchParams;
-  searchParams.set("grant_type", "refresh_token");
-  searchParams.set("refresh_token", refreshToken);
-  searchParams.set("client_id", AUTH_CLIENT_ID);
-  const response = await oauthClient.post("oauth/token", {
-    body: searchParams.toString(),
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded"
-    },
-    throwHttpErrors: false
-  });
-  const json2 = await response.json();
-  if (!response.ok) {
-    const errorResult = OAuthErrorSchema.safeParse(json2);
-    if (!errorResult.success) {
-      throw new ApiError(`Token refresh failed: ${response.statusText}`, {
-        statusCode: response.status
-      });
-    }
-    const { error: error48, error_description } = errorResult.data;
-    throw new ApiError(error_description ?? `OAuth error: ${error48}`, {
-      statusCode: response.status
-    });
-  }
-  const result = TokenResponseSchema.safeParse(json2);
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid token response from server", result.error);
-  }
-  return result.data;
-}
-async function getUserInfo(accessToken) {
-  const response = await oauthClient.get("oauth/userinfo", {
-    headers: { Authorization: `Bearer ${accessToken}` }
-  });
-  if (!response.ok) {
-    throw new ApiError(`Failed to fetch user info: ${response.status}`, {
-      statusCode: response.status
-    });
-  }
-  const result = UserInfoSchema.safeParse(await response.json());
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid UserInfo response from server", result.error);
-  }
-  return result.data;
-}
-// src/cli/commands/auth/login-flow.ts
-async function generateAndDisplayDeviceCode(log, runTask) {
-  const deviceCodeResponse = await runTask("Generating device code...", async () => {
-    return await generateDeviceCode();
-  }, {
-    successMessage: "Device code generated",
-    errorMessage: "Failed to generate device code"
-  });
-  log.info(`Verification code: ${theme.styles.bold(deviceCodeResponse.userCode)}` + `
-Please confirm this code at: ${deviceCodeResponse.verificationUri}`);
-  return deviceCodeResponse;
-}
-async function waitForAuthentication(deviceCode, expiresIn, interval, runTask) {
-  let tokenResponse;
-  try {
-    await runTask("Waiting for authentication...", async () => {
-      await pWaitFor(async () => {
-        const result = await getTokenFromDeviceCode(deviceCode);
-        if (result !== null) {
-          tokenResponse = result;
-          return true;
-        }
-        return false;
-      }, {
-        interval: interval * 1000,
-        timeout: expiresIn * 1000
-      });
-    }, {
-      successMessage: "Authentication completed!",
-      errorMessage: "Authentication failed"
-    });
-  } catch (error48) {
-    if (error48 instanceof Error && error48.message.includes("timed out")) {
-      throw new AuthExpiredError("Authentication timed out. Please try again.");
-    }
-    throw error48;
-  }
-  if (tokenResponse === undefined) {
-    throw new InternalError("Failed to retrieve authentication token.");
-  }
-  return tokenResponse;
-}
-async function saveAuthData(response, userInfo) {
-  const expiresAt = Date.now() + response.expiresIn * 1000;
-  await writeAuth({
-    accessToken: response.accessToken,
-    refreshToken: response.refreshToken,
-    expiresAt,
-    email: userInfo.email,
-    name: userInfo.name
-  });
-}
-async function login({
-  log,
-  runTask
-}) {
-  const deviceCodeResponse = await generateAndDisplayDeviceCode(log, runTask);
-  const token = await waitForAuthentication(deviceCodeResponse.deviceCode, deviceCodeResponse.expiresIn, deviceCodeResponse.interval, runTask);
-  const userInfo = await getUserInfo(token.accessToken);
-  await saveAuthData(token, userInfo);
-  return {
-    outroMessage: `Successfully logged in as ${theme.styles.bold(userInfo.email)}`
-  };
-}
-
-// src/cli/utils/command/middleware.ts
-async function ensureAuth(ctx) {
-  if (hasWorkspaceApiKeyAuth()) {
-    ctx.errorReporter.setContext({
-      user: { email: "workspace-api-key", name: "Workspace API key" }
-    });
-    return;
-  }
-  await seedAuthFromEnv();
-  const loggedIn = await isLoggedIn();
-  if (!loggedIn) {
-    ctx.log.info("You need to login first to continue.");
-    await login(ctx);
-  }
-  try {
-    const userInfo = await readAuth();
-    ctx.errorReporter.setContext({
-      user: { email: userInfo.email, name: userInfo.name }
-    });
-  } catch {}
-}
-async function ensureAppContext(ctx, options = {}) {
-  const appContext = await initAppContext(options);
-  ctx.app = appContext;
-  ctx.errorReporter.setContext({ appId: appContext.id });
-}
-
 // src/cli/utils/version-check.ts
 async function checkForUpgrade() {
   const testLatestVersion = getTestOverrides()?.latestVersion;
@@ -256075,7 +256019,7 @@ function getAuthPushCommand() {
 }
 
 // src/cli/commands/auth/social-login.ts
-import { dirname as dirname14, join as join21, resolve as resolve5 } from "node:path";
+import { dirname as dirname14, join as join21, resolve as resolve4 } from "node:path";
 var PROVIDER_LABELS = {
   google: "Google",
   microsoft: "Microsoft",
@@ -256115,7 +256059,7 @@ async function socialLoginAction({ log, isNonInteractive, runTask: runTask2 }, p
   let clientSecret;
   if (useCustomOAuth && oauth && oauthCli && hasSecretOptions(options)) {
     if (options.envFile) {
-      const secrets = await parseEnvFile(resolve5(options.envFile));
+      const secrets = await parseEnvFile(resolve4(options.envFile));
       const value = secrets[oauthCli.envVar];
       if (!value) {
         throw new InvalidInputError(`Key "${oauthCli.envVar}" not found in ${options.envFile}.`);
@@ -256171,7 +256115,7 @@ function getSocialLoginCommand() {
 }
 
 // src/cli/commands/auth/sso.ts
-import { dirname as dirname15, join as join22, resolve as resolve6 } from "node:path";
+import { dirname as dirname15, join as join22, resolve as resolve5 } from "node:path";
 var SSOConfigFileSchema = exports_external.object({
   provider: exports_external.enum(Object.values(KNOWN_SSO_PROVIDERS)),
   clientId: exports_external.string(),
@@ -256187,7 +256131,7 @@ var SSOConfigFileSchema = exports_external.object({
   ssoName: exports_external.string().optional()
 });
 async function loadSSOConfigFile(filePath) {
-  const resolved = resolve6(filePath);
+  const resolved = resolve5(filePath);
   const raw2 = await readJsonFile(resolved);
   const result = SSOConfigFileSchema.safeParse(raw2);
   if (!result.success) {
@@ -256275,7 +256219,7 @@ async function ssoEnableAction({ isNonInteractive, runTask: runTask2 }, options)
   }
   let clientSecret;
   if (merged.envFile && !merged.clientSecret) {
-    const secrets2 = await parseEnvFile(resolve6(merged.envFile));
+    const secrets2 = await parseEnvFile(resolve5(merged.envFile));
     const value = secrets2.sso_client_secret;
     if (!value) {
       throw new InvalidInputError(`Key "sso_client_secret" not found in ${merged.envFile}.`);
@@ -256913,19 +256857,19 @@ var baseOpen = async (options) => {
   }
   const subprocess = childProcess3.spawn(command2, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve6, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode !== 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve7(subprocess);
+        resolve6(subprocess);
       });
     });
   }
   if (isFallbackAttempt) {
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve6, reject) => {
       subprocess.once("error", reject);
       subprocess.once("spawn", () => {
         subprocess.once("close", (exitCode) => {
@@ -256935,17 +256879,17 @@ var baseOpen = async (options) => {
             return;
           }
           subprocess.unref();
-          resolve7(subprocess);
+          resolve6(subprocess);
         });
       });
     });
   }
   subprocess.unref();
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve6, reject) => {
     subprocess.once("error", reject);
     subprocess.once("spawn", () => {
       subprocess.off("error", reject);
-      resolve7(subprocess);
+      resolve6(subprocess);
     });
   });
 };
@@ -257208,10 +257152,10 @@ function getConnectorsListAvailableCommand() {
 }
 
 // src/cli/commands/connectors/pull.ts
-import { dirname as dirname16, join as join23, resolve as resolve7 } from "node:path";
+import { dirname as dirname16, join as join23, resolve as resolve6 } from "node:path";
 async function resolveConnectorsDir(options) {
   if (!getAppContext().projectRoot) {
-    return resolve7(options.dir ?? "connectors");
+    return resolve6(options.dir ?? "connectors");
   }
   const { project: project2 } = await readProjectConfig();
   return join23(dirname16(project2.configPath), project2.connectorsDir);
@@ -257255,10 +257199,10 @@ function getConnectorsPullCommand() {
 }
 
 // src/cli/commands/connectors/push.ts
-import { resolve as resolve8 } from "node:path";
+import { resolve as resolve7 } from "node:path";
 async function readConnectorsToPush(options) {
   if (!getAppContext().projectRoot) {
-    return readAllConnectors(resolve8(options.dir ?? "connectors"));
+    return readAllConnectors(resolve7(options.dir ?? "connectors"));
   }
   const { connectors } = await readProjectConfig();
   return connectors;
@@ -257759,7 +257703,7 @@ function getBuildCommand() {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename5, resolve as resolve9 } from "node:path";
+import { basename as basename5, resolve as resolve8 } from "node:path";
 var import_kebabCase = __toESM(require_kebabCase(), 1);
 
 // src/cli/commands/project/scaffold-shared.ts
@@ -257951,7 +257895,7 @@ async function createInteractive(options, ctx) {
   }, ctx);
 }
 async function createNonInteractive(options, ctx) {
-  ctx.log.info(`Creating a new project at ${resolve9(options.path)}`);
+  ctx.log.info(`Creating a new project at ${resolve8(options.path)}`);
   const template2 = await getTemplateById(options.template ?? DEFAULT_TEMPLATE_ID);
   return await executeCreate({
     template: template2,
@@ -257975,7 +257919,7 @@ async function executeCreate({
 }, ctx) {
   const { log, runTask: runTask2 } = ctx;
   const name2 = rawName.trim();
-  const resolvedPath = resolve9(projectPath);
+  const resolvedPath = resolve8(projectPath);
   const organizationId = await resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive);
   const { projectId } = await runTask2("Setting up your project...", async () => {
     return await createProjectFiles({
@@ -258382,7 +258326,7 @@ async function followLogs(functionNames, options, availableFunctionNames, jsonMo
     for (const entry of fresh)
       writeFollowLine(entry, jsonMode);
     first = false;
-    await new Promise((resolve10) => setTimeout(resolve10, 2000));
+    await new Promise((resolve9) => setTimeout(resolve9, 2000));
   }
 }
 function formatLogs(entries, env3) {
@@ -258496,7 +258440,7 @@ function getLogsCommand() {
 }
 
 // src/cli/commands/project/scaffold.ts
-import { basename as basename6, resolve as resolve10 } from "node:path";
+import { basename as basename6, resolve as resolve9 } from "node:path";
 function resolveAppId(options) {
   const appId = options.appId;
   if (!appId) {
@@ -258512,7 +258456,7 @@ function resolveAppId(options) {
 async function scaffoldAction(ctx, name2, options, command2) {
   const { log, runTask: runTask2 } = ctx;
   const appId = resolveAppId(command2.optsWithGlobals());
-  const resolvedPath = resolve10("./");
+  const resolvedPath = resolve9("./");
   const projectName = (name2 ?? basename6(resolvedPath)).trim();
   const template2 = await getTemplateById("backend-only");
   log.info(`Scaffolding project at ${resolvedPath}`);
@@ -258909,7 +258853,7 @@ function getSecretsListCommand() {
 }
 
 // src/cli/commands/secrets/set.ts
-import { resolve as resolve11 } from "node:path";
+import { resolve as resolve10 } from "node:path";
 function parseEntries(entries) {
   const secrets = {};
   for (const entry of entries) {
@@ -258940,7 +258884,7 @@ async function setSecretsAction({ log, runTask: runTask2 }, entries, options) {
   validateInput(entries, options);
   let secrets;
   if (options.envFile) {
-    secrets = await parseEnvFile(resolve11(options.envFile));
+    secrets = await parseEnvFile(resolve10(options.envFile));
     if (Object.keys(secrets).length === 0) {
       throw new InvalidInputError("The env file contains no valid KEY=VALUE entries.");
     }
@@ -258968,49 +258912,8 @@ function getSecretsCommand() {
   return new Command("secrets").description("Manage project secrets (environment variables)").addCommand(getSecretsListCommand()).addCommand(getSecretsSetCommand()).addCommand(getSecretsDeleteCommand());
 }
 
-// src/cli/commands/site/run-app-deploy.ts
-var TASK_LABELS = {
-  "static-deployment": {
-    start: "Deploying site...",
-    success: "Site deployed",
-    error: "Site deploy failed"
-  },
-  static: {
-    start: "Creating archive and deploying site...",
-    success: "Site deployed successfully",
-    error: "Deployment failed"
-  }
-};
-async function runAppSiteDeploy({ runTask: runTask2, log, staticDeployments }, target, options = {}) {
-  const kind = detectAppDeployKind(target, { staticDeployments });
-  if (kind === "none")
-    return { kind: "none" };
-  const labels = TASK_LABELS[kind];
-  const progressLines = [];
-  const result = await runTask2(labels.start, async (updateMessage) => await deployAppSite(target, {
-    staticDeployments,
-    gitHash: options.gitHash,
-    progress: {
-      onAssets: ({ totalAssets, newAssets }) => {
-        const line = `Found ${totalAssets} static assets (${newAssets} new)`;
-        progressLines.push(line);
-        updateMessage(line);
-      },
-      onAssetUpload: ({ uploadedFiles, totalFiles }) => {
-        updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} assets`);
-      }
-    }
-  }), {
-    successMessage: labels.success,
-    errorMessage: labels.error
-  });
-  for (const line of progressLines) {
-    log.message(theme.styles.dim(line));
-  }
-  return result;
-}
-
 // src/cli/commands/site/deploy.ts
+import { resolve as resolve11 } from "node:path";
 async function deployAction2(ctx, options) {
   const { isNonInteractive } = ctx;
   if (isNonInteractive && !options.yes) {
@@ -259036,25 +258939,45 @@ async function deployAction2(ctx, options) {
     }
   }
   await maybeBuildBeforeDeploy(ctx, project2, options.build);
-  const result = await runAppSiteDeploy(ctx, project2, {
-    gitHash: options.gitHash
-  });
-  if (result.kind === "static-deployment") {
-    return {
-      outroMessage: `Deployment ${result.deploymentId} (commit ${result.gitHash.slice(0, 12)})`,
-      stdout: ctx.jsonMode ? `${JSON.stringify({ deploymentId: result.deploymentId, gitHash: result.gitHash }, null, 2)}
-` : undefined
-    };
-  }
-  if (result.kind === "static") {
-    return { outroMessage: `Visit your site at: ${result.appUrl}` };
+  const outputDir = resolve11(project2.root, outputDirectory);
+  return options.gitHash ? await deployToDeploymentsApi(ctx, outputDir, options.gitHash) : await deployTarball(ctx, outputDir);
+}
+async function deployToDeploymentsApi({ runTask: runTask2, log, jsonMode }, outputDir, gitHash) {
+  const progressLines = [];
+  const { deploymentId } = await runTask2("Deploying site...", async (updateMessage) => await deployStaticSite({
+    outputDir,
+    gitHash,
+    progress: {
+      onAssets: ({ totalAssets, newAssets }) => {
+        const line = `Found ${totalAssets} static assets (${newAssets} new)`;
+        progressLines.push(line);
+        updateMessage(line);
+      },
+      onAssetUpload: ({ uploadedFiles, totalFiles }) => {
+        updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} assets`);
+      }
+    }
+  }), { successMessage: "Site deployed", errorMessage: "Site deploy failed" });
+  for (const line of progressLines) {
+    log.message(theme.styles.dim(line));
   }
-  return { outroMessage: "Nothing to deploy" };
+  return {
+    outroMessage: `Deployment ${deploymentId} (commit ${gitHash.slice(0, 12)})`,
+    stdout: jsonMode ? `${JSON.stringify({ deploymentId, gitHash }, null, 2)}
+` : undefined
+  };
+}
+async function deployTarball({ runTask: runTask2 }, outputDir) {
+  const { appUrl } = await runTask2("Creating archive and deploying site...", async () => await deploySite(outputDir), {
+    successMessage: "Site deployed successfully",
+    errorMessage: "Deployment failed"
+  });
+  return { outroMessage: `Visit your site at: ${appUrl}` };
 }
 function getSiteDeployCommand() {
   const command2 = new Base44Command("deploy").description("Deploy built site files to Base44 hosting").option("-y, --yes", "Skip confirmation prompt").option("--build", "Build the site before deploying (skips the prompt)").option("--no-build", "Deploy without building (skips the prompt)");
   if (staticDeploymentsEnabled()) {
-    command2.addOption(new Option("--git-hash <hash>", "Commit the build came from (defaults to the checkout's HEAD)"));
+    command2.addOption(new Option("--git-hash <hash>", "Commit the build came from — deploys through the deployments API"));
   }
   return command2.action(deployAction2);
 }
@@ -267850,4 +267773,4 @@ export {
   CLIExitError
 };
 
-//# debugId=2A92EE13E93D45AB64756E2164756E21
+//# debugId=7E09388401C6A22064756E2164756E21