@base44-preview/cli 0.1.15-pr.626.6cd5550 → 0.1.15-pr.626.6dabe64

package/dist/cli/index.js

@@ -239590,94 +239590,8 @@ async function createArchive(pathToArchive, targetArchivePath) {
 import { readFile as readFile3 } from "node:fs/promises";
 import { join as join18 } from "node:path";
 
-// src/core/site/manifest.ts
-import { createHash } from "node:crypto";
-import { createReadStream } from "node:fs";
-import { stat } from "node:fs/promises";
-import { basename as basename5, extname, join as join16 } from "node:path";
-var MAX_ASSET_COUNT = 1e5;
-var ASSETS_IGNORE_FILE = ".assetsignore";
-var ALWAYS_IGNORED = new Set([
-  ASSETS_IGNORE_FILE,
-  "wrangler.json",
-  ".dev.vars"
-]);
-var MIME_TYPES = {
-  ".html": "text/html",
-  ".htm": "text/html",
-  ".css": "text/css",
-  ".js": "text/javascript",
-  ".mjs": "text/javascript",
-  ".json": "application/json",
-  ".map": "application/json",
-  ".txt": "text/plain",
-  ".xml": "application/xml",
-  ".svg": "image/svg+xml",
-  ".png": "image/png",
-  ".jpg": "image/jpeg",
-  ".jpeg": "image/jpeg",
-  ".gif": "image/gif",
-  ".webp": "image/webp",
-  ".avif": "image/avif",
-  ".ico": "image/x-icon",
-  ".woff": "font/woff",
-  ".woff2": "font/woff2",
-  ".ttf": "font/ttf",
-  ".otf": "font/otf",
-  ".eot": "application/vnd.ms-fontobject",
-  ".mp3": "audio/mpeg",
-  ".mp4": "video/mp4",
-  ".webm": "video/webm",
-  ".pdf": "application/pdf",
-  ".wasm": "application/wasm",
-  ".webmanifest": "application/manifest+json"
-};
-function getAssetContentType(filePath) {
-  return MIME_TYPES[extname(filePath).toLowerCase()] ?? "application/octet-stream";
-}
-async function walkBuildOutput(outputDir) {
-  const found = await globby("**/*", {
-    cwd: outputDir,
-    dot: true,
-    onlyFiles: true,
-    followSymbolicLinks: false,
-    ignoreFiles: [ASSETS_IGNORE_FILE]
-  });
-  return found.filter((path) => !ALWAYS_IGNORED.has(basename5(path))).sort();
-}
-async function hashAssetFile(appId, absolutePath) {
-  const hash = createHash("sha256").update(Buffer.from(appId, "utf8"));
-  for await (const chunk of createReadStream(absolutePath)) {
-    hash.update(chunk);
-  }
-  return hash.digest("hex").slice(0, 32);
-}
-async function buildAssetManifest(assetsDir, appId) {
-  const manifest = {};
-  const filesByHash = new Map;
-  const relativeFilePaths = await walkBuildOutput(assetsDir);
-  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) {
-    const absolutePath = join16(assetsDir, ...relativePath.split("/"));
-    const { size } = await stat(absolutePath);
-    const hash = await hashAssetFile(appId, absolutePath);
-    manifest[`/${relativePath}`] = { hash, size };
-    if (!filesByHash.has(hash)) {
-      filesByHash.set(hash, {
-        absolutePath,
-        hash,
-        size,
-        contentType: getAssetContentType(absolutePath)
-      });
-    }
-  }
-  return { manifest, filesByHash };
-}
-
 // src/core/site/modules.ts
-import { stat as stat2 } from "node:fs/promises";
+import { stat } from "node:fs/promises";
 import { relative as relative5, resolve as resolve3, sep } from "node:path";
 var MAX_TOTAL_MODULE_BYTES = 40 * 1024 * 1024;
 var MODULE_IGNORE = ["wrangler.json", ".dev.vars"];
@@ -239752,7 +239666,7 @@ async function collectModules(config) {
   const modules = [...modulesByName.values()];
   let totalBytes = 0;
   for (const module of modules) {
-    module.size = (await stat2(module.absolutePath)).size;
+    module.size = (await stat(module.absolutePath)).size;
     totalBytes += module.size;
   }
   if (totalBytes > MAX_TOTAL_MODULE_BYTES) {
@@ -239771,8 +239685,104 @@ function addSourcemap(modulesByName, configDir, name) {
   });
 }
 
-// src/core/site/upload.ts
-import { readFile as readFile2 } from "node:fs/promises";
+// src/core/site/wrangler-config.ts
+import { dirname as dirname12, join as join16, resolve as resolve4 } from "node:path";
+var WRANGLER_REDIRECT_PATH = join16(".wrangler", "deploy", "config.json");
+var RedirectConfigSchema = looseObject({
+  configPath: string2().min(1)
+});
+var WranglerConfigSchema = looseObject({
+  main: string2().min(1, "wrangler config is missing a 'main' entry module"),
+  no_bundle: boolean2().optional(),
+  rules: array(looseObject({ type: string2(), globs: array(string2()) })).optional(),
+  assets: looseObject({
+    directory: string2().optional(),
+    html_handling: string2().optional(),
+    not_found_handling: string2().optional(),
+    run_worker_first: union([boolean2(), array(string2())]).optional(),
+    headers: string2().optional(),
+    redirects: string2().optional()
+  }).optional(),
+  compatibility_date: string2().optional(),
+  compatibility_flags: array(string2()).optional(),
+  vars: record(string2(), unknown()).optional(),
+  upload_source_maps: boolean2().optional()
+});
+async function detectFullStackArtifact(projectRoot) {
+  const redirectPath = join16(projectRoot, WRANGLER_REDIRECT_PATH);
+  return await pathExists(redirectPath) ? redirectPath : null;
+}
+async function resolveWranglerConfig(redirectPath) {
+  const configPath = await resolveRedirectedConfigPath(redirectPath);
+  const parsed = await readJsonFile(configPath);
+  const result = WranglerConfigSchema.safeParse(parsed);
+  if (!result.success) {
+    throw new ConfigInvalidError(`Invalid wrangler config: ${prettifyError(result.error)}`, configPath);
+  }
+  const config = result.data;
+  if (config.no_bundle !== true) {
+    throw new InvalidInputError("This framework's output requires bundling; not yet supported. Base44 only deploys pre-bundled Workers output (no_bundle: true).");
+  }
+  const configDir = dirname12(configPath);
+  const assetsDirectory = config.assets?.directory ? resolve4(configDir, config.assets.directory) : null;
+  return {
+    configPath,
+    configDir,
+    main: config.main,
+    assetsDirectory,
+    assetsConfig: config.assets ? toResolvedAssetsConfig(config.assets) : null,
+    compatibilityDate: config.compatibility_date ?? null,
+    compatibilityFlags: config.compatibility_flags ?? [],
+    rules: (config.rules ?? []).map((rule) => ({
+      type: rule.type,
+      globs: rule.globs
+    })),
+    uploadSourceMaps: config.upload_source_maps ?? false
+  };
+}
+async function resolveRedirectedConfigPath(redirectPath) {
+  const parsed = await readJsonFile(redirectPath);
+  const result = RedirectConfigSchema.safeParse(parsed);
+  if (!result.success) {
+    throw new ConfigInvalidError(`Invalid deploy redirect file: ${prettifyError(result.error)}`, redirectPath);
+  }
+  const configPath = resolve4(dirname12(redirectPath), result.data.configPath);
+  if (!await pathExists(configPath)) {
+    throw new ConfigInvalidError(`Wrangler config referenced by ${redirectPath} does not exist: ${configPath}`, redirectPath, {
+      hints: [{ message: "Rebuild the project to regenerate the artifact" }]
+    });
+  }
+  return configPath;
+}
+function toResolvedAssetsConfig(assets) {
+  return {
+    htmlHandling: assets.html_handling,
+    notFoundHandling: assets.not_found_handling,
+    runWorkerFirst: assets.run_worker_first,
+    headers: assets.headers,
+    redirects: assets.redirects
+  };
+}
+
+// src/core/site/full-stack.ts
+async function resolveFullStackBuild(projectRoot) {
+  const redirectPath = await detectFullStackArtifact(projectRoot);
+  if (!redirectPath) {
+    return null;
+  }
+  const config = await resolveWranglerConfig(redirectPath);
+  return {
+    config,
+    modules: await collectModules(config),
+    assetsDir: config.assetsDirectory && await pathExists(config.assetsDirectory) ? config.assetsDirectory : null
+  };
+}
+
+// src/core/site/manifest.ts
+import { createHash } from "node:crypto";
+import { createReadStream } from "node:fs";
+import { stat as stat2 } from "node:fs/promises";
+import { basename as basename5, extname, join as join17 } from "node:path";
 
 // ../../node_modules/p-map/index.js
 async function pMap(iterable, mapper, {
@@ -239898,7 +239908,99 @@ async function pMap(iterable, mapper, {
 }
 var pMapSkip = Symbol("skip");
 
+// src/core/site/manifest.ts
+var MAX_ASSET_COUNT = 1e5;
+var ASSETS_IGNORE_FILE = ".assetsignore";
+var ALWAYS_IGNORED = new Set([
+  ASSETS_IGNORE_FILE,
+  "wrangler.json",
+  ".dev.vars"
+]);
+var MIME_TYPES = {
+  ".html": "text/html",
+  ".htm": "text/html",
+  ".css": "text/css",
+  ".js": "text/javascript",
+  ".mjs": "text/javascript",
+  ".json": "application/json",
+  ".map": "application/json",
+  ".txt": "text/plain",
+  ".xml": "application/xml",
+  ".svg": "image/svg+xml",
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".avif": "image/avif",
+  ".ico": "image/x-icon",
+  ".woff": "font/woff",
+  ".woff2": "font/woff2",
+  ".ttf": "font/ttf",
+  ".otf": "font/otf",
+  ".eot": "application/vnd.ms-fontobject",
+  ".mp3": "audio/mpeg",
+  ".mp4": "video/mp4",
+  ".webm": "video/webm",
+  ".pdf": "application/pdf",
+  ".wasm": "application/wasm",
+  ".webmanifest": "application/manifest+json"
+};
+function getAssetContentType(filePath) {
+  return MIME_TYPES[extname(filePath).toLowerCase()] ?? "application/octet-stream";
+}
+async function walkBuildOutput(outputDir) {
+  const found = await globby("**/*", {
+    cwd: outputDir,
+    dot: true,
+    onlyFiles: true,
+    followSymbolicLinks: false,
+    ignoreFiles: [ASSETS_IGNORE_FILE]
+  });
+  return found.filter((path) => !ALWAYS_IGNORED.has(basename5(path))).sort();
+}
+var STAT_CONCURRENCY = 32;
+async function describeBuildOutput(outputDir) {
+  const relativePaths = await walkBuildOutput(outputDir);
+  return await pMap(relativePaths, async (path) => {
+    const absolutePath = join17(outputDir, ...path.split("/"));
+    return { path, absolutePath, size: (await stat2(absolutePath)).size };
+  }, { concurrency: STAT_CONCURRENCY });
+}
+async function hashFileInto(hash, absolutePath) {
+  for await (const chunk of createReadStream(absolutePath)) {
+    hash.update(chunk);
+  }
+  return hash;
+}
+async function hashAssetFile(appId, absolutePath) {
+  const hash = await hashFileInto(createHash("sha256").update(Buffer.from(appId, "utf8")), absolutePath);
+  return hash.digest("hex").slice(0, 32);
+}
+async function buildAssetManifest(assetsDir, appId) {
+  const manifest = {};
+  const filesByHash = new Map;
+  const files = await describeBuildOutput(assetsDir);
+  if (files.length > MAX_ASSET_COUNT) {
+    throw new InvalidInputError(`Too many static assets: found ${files.length}, the limit is ${MAX_ASSET_COUNT} files.`);
+  }
+  for (const { path: relativePath, absolutePath, size } of files) {
+    const hash = await hashAssetFile(appId, absolutePath);
+    manifest[`/${relativePath}`] = { hash, size };
+    if (!filesByHash.has(hash)) {
+      filesByHash.set(hash, {
+        absolutePath,
+        hash,
+        size,
+        contentType: getAssetContentType(absolutePath)
+      });
+    }
+  }
+  return { manifest, filesByHash };
+}
+
 // src/core/site/upload.ts
+import { readFile as readFile2 } from "node:fs/promises";
 var DEFAULT_UPLOAD_CONCURRENCY = 3;
 var MAX_UPLOAD_CONCURRENCY = 50;
 var MAX_UPLOAD_ATTEMPTS = 3;
@@ -240016,85 +240118,6 @@ async function putPresigned(upload, absolutePath) {
   }
 }
 
-// src/core/site/wrangler-config.ts
-import { dirname as dirname12, join as join17, resolve as resolve4 } from "node:path";
-var WRANGLER_REDIRECT_PATH = join17(".wrangler", "deploy", "config.json");
-var RedirectConfigSchema = looseObject({
-  configPath: string2().min(1)
-});
-var WranglerConfigSchema = looseObject({
-  main: string2().min(1, "wrangler config is missing a 'main' entry module"),
-  no_bundle: boolean2().optional(),
-  rules: array(looseObject({ type: string2(), globs: array(string2()) })).optional(),
-  assets: looseObject({
-    directory: string2().optional(),
-    html_handling: string2().optional(),
-    not_found_handling: string2().optional(),
-    run_worker_first: union([boolean2(), array(string2())]).optional(),
-    headers: string2().optional(),
-    redirects: string2().optional()
-  }).optional(),
-  compatibility_date: string2().optional(),
-  compatibility_flags: array(string2()).optional(),
-  vars: record(string2(), unknown()).optional(),
-  upload_source_maps: boolean2().optional()
-});
-async function detectFullStackArtifact(projectRoot) {
-  const redirectPath = join17(projectRoot, WRANGLER_REDIRECT_PATH);
-  return await pathExists(redirectPath) ? redirectPath : null;
-}
-async function resolveWranglerConfig(redirectPath) {
-  const configPath = await resolveRedirectedConfigPath(redirectPath);
-  const parsed = await readJsonFile(configPath);
-  const result = WranglerConfigSchema.safeParse(parsed);
-  if (!result.success) {
-    throw new ConfigInvalidError(`Invalid wrangler config: ${prettifyError(result.error)}`, configPath);
-  }
-  const config = result.data;
-  if (config.no_bundle !== true) {
-    throw new InvalidInputError("This framework's output requires bundling; not yet supported. Base44 only deploys pre-bundled Workers output (no_bundle: true).");
-  }
-  const configDir = dirname12(configPath);
-  const assetsDirectory = config.assets?.directory ? resolve4(configDir, config.assets.directory) : null;
-  return {
-    configPath,
-    configDir,
-    main: config.main,
-    assetsDirectory,
-    assetsConfig: config.assets ? toResolvedAssetsConfig(config.assets) : null,
-    compatibilityDate: config.compatibility_date ?? null,
-    compatibilityFlags: config.compatibility_flags ?? [],
-    rules: (config.rules ?? []).map((rule) => ({
-      type: rule.type,
-      globs: rule.globs
-    })),
-    uploadSourceMaps: config.upload_source_maps ?? false
-  };
-}
-async function resolveRedirectedConfigPath(redirectPath) {
-  const parsed = await readJsonFile(redirectPath);
-  const result = RedirectConfigSchema.safeParse(parsed);
-  if (!result.success) {
-    throw new ConfigInvalidError(`Invalid deploy redirect file: ${prettifyError(result.error)}`, redirectPath);
-  }
-  const configPath = resolve4(dirname12(redirectPath), result.data.configPath);
-  if (!await pathExists(configPath)) {
-    throw new ConfigInvalidError(`Wrangler config referenced by ${redirectPath} does not exist: ${configPath}`, redirectPath, {
-      hints: [{ message: "Rebuild the project to regenerate the artifact" }]
-    });
-  }
-  return configPath;
-}
-function toResolvedAssetsConfig(assets) {
-  return {
-    htmlHandling: assets.html_handling,
-    notFoundHandling: assets.not_found_handling,
-    runWorkerFirst: assets.run_worker_first,
-    headers: assets.headers,
-    redirects: assets.redirects
-  };
-}
-
 // src/core/site/deployment.ts
 var NO_ASSETS = { manifest: {}, filesByHash: new Map };
 var DEPLOYMENTS_API_ENV = "BASE44_DEPLOYMENTS_API";
@@ -240121,12 +240144,11 @@ async function deployToDeployments(options) {
   return { deploymentId: finalized.deploymentId, gitHash };
 }
 async function resolveWorkerBuild(projectRoot, progress) {
-  const redirectPath = await detectFullStackArtifact(projectRoot);
-  if (!redirectPath) {
+  const built = await resolveFullStackBuild(projectRoot);
+  if (!built) {
     return null;
   }
-  const config = await resolveWranglerConfig(redirectPath);
-  const assetsDir = config.assetsDirectory && await pathExists(config.assetsDirectory) ? config.assetsDirectory : null;
+  const { config, modules, assetsDir } = built;
   return {
     config: {
       main: config.main,
@@ -240134,7 +240156,7 @@ async function resolveWorkerBuild(projectRoot, progress) {
       compatibility_flags: config.compatibilityFlags,
       assets: buildAssetsConfig(config.assetsConfig, progress)
     },
-    modules: await collectModules(config),
+    modules,
     assetsDir
   };
 }
@@ -247054,6 +247076,12 @@ async function ensureAppContext(ctx, options = {}) {
   ctx.app = appContext;
   ctx.errorReporter.setContext({ appId: appContext.id });
 }
+function requireApp(ctx) {
+  if (!ctx.app) {
+    throw new InternalError("This command read an app context it never resolved — it is declared with requireAppContext: false.");
+  }
+  return ctx.app;
+}
 
 // src/cli/utils/version-check.ts
 async function checkForUpgrade() {
@@ -247296,6 +247324,7 @@ async function createVersion(artifacts, options = {}) {
       site_worker: {
         main: artifacts.siteWorker.main,
         modules: artifacts.siteWorker.modules.map(declaredFile),
+        assets: artifacts.siteWorker.assets.map(declaredFile),
         compatibility_date: artifacts.siteWorker.compatibilityDate,
         compatibility_flags: artifacts.siteWorker.compatibilityFlags
       }
@@ -247306,15 +247335,17 @@ async function createVersion(artifacts, options = {}) {
   }, "declaring a version")).json(), "declare");
   const declaredFiles = [
     ...artifacts.files,
-    ...artifacts.siteWorker?.modules ?? []
+    ...artifacts.siteWorker?.modules ?? [],
+    ...artifacts.siteWorker?.assets ?? []
   ];
-  options.progress?.onDeclared?.({
-    fileCount: declaredFiles.length,
-    owedFiles: declared.uploads.length
-  });
+  options.progress?.onDeclared?.({ fileCount: declaredFiles.length });
   if (declared.uploads.length !== declaredFiles.length) {
     throw new InternalError(`Declared ${declaredFiles.length} files but the server signed ${declared.uploads.length} upload URLs.`);
   }
+  const drifted = declared.uploads.findIndex((upload, index) => upload.path !== declaredFiles[index].path);
+  if (drifted !== -1) {
+    throw new InternalError(`Upload ${drifted} is signed for ${declared.uploads[drifted].path}, but that slot declared ${declaredFiles[drifted].path}.`);
+  }
   let uploadedFiles = 0;
   await pMap(declared.uploads, async (upload, index) => {
     await putPresigned(upload, declaredFiles[index].absolutePath);
@@ -247340,7 +247371,7 @@ async function tagStep(step, run) {
   try {
     return await run();
   } catch (error) {
-    if (error !== null && typeof error === "object" && !(STEP in error)) {
+    if (error !== null && typeof error === "object" && !(STEP in error) && Object.isExtensible(error)) {
       Object.defineProperty(error, STEP, { value: step, enumerable: false });
     }
     throw error;
@@ -249731,53 +249762,84 @@ async function maybeAskToBuild(isNonInteractive, buildCommand) {
 }
 // src/core/version/artifacts.ts
 import { createHash as createHash2 } from "node:crypto";
-import { createReadStream as createReadStream3 } from "node:fs";
-import { stat as stat3 } from "node:fs/promises";
-import { join as join27, resolve as resolve10 } from "node:path";
+import { join as join28, resolve as resolve11 } from "node:path";
+
+// src/core/version/project.ts
+import { dirname as dirname21, join as join27, resolve as resolve10 } from "node:path";
+var DEFAULT_BUILD_COMMAND = "npm run build";
+var DEFAULT_OUTPUT_DIRECTORY = "dist";
+async function resolvePublishTarget(projectRoot, overrides = {}) {
+  const project = await readSettingsIfPresent(projectRoot);
+  const root = project?.root ?? projectRoot ?? process.cwd();
+  return {
+    root,
+    configDir: project ? dirname21(project.configPath) : join27(root, PROJECT_SUBDIR),
+    buildCommand: project ? project.site?.buildCommand : DEFAULT_BUILD_COMMAND,
+    outputDir: outputDirectory(project, root, overrides.outputDir),
+    entitiesDir: project?.entitiesDir ?? "entities",
+    agentsDir: project?.agentsDir ?? "agents"
+  };
+}
+function outputDirectory(project, root, override) {
+  const configured = override ?? (project ? project.site?.outputDirectory : DEFAULT_OUTPUT_DIRECTORY);
+  return configured ? resolve10(root, configured) : null;
+}
+function requireOutputDir(target) {
+  if (target.outputDir === null) {
+    throw new ConfigNotFoundError("No site configuration found.", {
+      hints: [
+        {
+          message: `Add 'site.outputDirectory' to your config.jsonc (e.g., "site": { "outputDirectory": "dist" })`
+        },
+        { message: `Or pass --output-dir <dir>, relative to ${target.root}` }
+      ]
+    });
+  }
+  return target.outputDir;
+}
+async function readSettingsIfPresent(projectRoot) {
+  try {
+    return await readProjectSettings(projectRoot);
+  } catch (error) {
+    if (error instanceof ConfigNotFoundError) {
+      return null;
+    }
+    throw error;
+  }
+}
+
+// src/core/version/artifacts.ts
 var MAX_FILE_COUNT = 50000;
 var HASH_CONCURRENCY = 32;
 var ENTRY2 = "index.html";
 async function digestFile(absolutePath) {
-  const hash = createHash2("sha256");
-  for await (const chunk of createReadStream3(absolutePath)) {
-    hash.update(chunk);
-  }
+  const hash = await hashFileInto(createHash2("sha256"), absolutePath);
   return `sha256:${hash.digest("hex")}`;
 }
 async function collectBuildOutput(outputDir, options = {}) {
-  const relativePaths = await walkBuildOutput(outputDir);
-  if (relativePaths.length === 0) {
+  const found = await describeBuildOutput(outputDir);
+  if (found.length === 0) {
     throw new InvalidInputError(`No files found in ${outputDir}. Build the site before creating a version.`, {
       hints: [
         { message: "Run 'base44 build' first", command: "base44 build" }
       ]
     });
   }
-  if (relativePaths.length > MAX_FILE_COUNT) {
-    throw new InvalidInputError(`Too many files: found ${relativePaths.length}, the limit is ${MAX_FILE_COUNT}.`);
+  if (found.length > MAX_FILE_COUNT) {
+    throw new InvalidInputError(`Too many files: found ${found.length}, the limit is ${MAX_FILE_COUNT}.`);
   }
-  if (options.requireEntry !== false && !relativePaths.includes(ENTRY2)) {
+  if (options.requireEntry !== false && !found.some((f) => f.path === ENTRY2)) {
     throw new InvalidInputError(`${outputDir} has no ${ENTRY2}, so nothing could enter the site.`);
   }
-  return await pMap(relativePaths, async (path) => {
-    const absolutePath = join27(outputDir, ...path.split("/"));
-    const { size } = await stat3(absolutePath);
-    return {
-      path,
-      absolutePath,
-      size,
-      digest: await digestFile(absolutePath)
-    };
-  }, { concurrency: HASH_CONCURRENCY });
+  return await pMap(found, async (file) => ({ ...file, digest: await digestFile(file.absolutePath) }), { concurrency: HASH_CONCURRENCY });
 }
 async function collectSiteWorker(projectRoot) {
-  const redirectPath = await detectFullStackArtifact(projectRoot);
-  if (!redirectPath) {
+  const built = await resolveFullStackBuild(projectRoot);
+  if (!built) {
     return null;
   }
-  const config = await resolveWranglerConfig(redirectPath);
-  const modules = await collectModules(config);
-  const entry = resolve10(config.configDir, config.main);
+  const { config, modules, assetsDir } = built;
+  const entry = resolve11(config.configDir, config.main);
   const main = modules.find((m) => m.absolutePath === entry)?.name;
   if (!main) {
     throw new InvalidInputError(`The Worker's entry module ${config.main} is not among the ${modules.length} modules collected from ${config.configDir}.`);
@@ -249790,9 +249852,9 @@ async function collectSiteWorker(projectRoot) {
       size,
       digest: await digestFile(absolutePath)
     }), { concurrency: HASH_CONCURRENCY }),
+    assets: assetsDir ? await collectBuildOutput(assetsDir, { requireEntry: false }) : [],
     compatibilityDate: config.compatibilityDate,
-    compatibilityFlags: config.compatibilityFlags,
-    assetsDir: config.assetsDirectory && await pathExists(config.assetsDirectory) ? config.assetsDirectory : null
+    compatibilityFlags: config.compatibilityFlags
   };
 }
 async function readRawResources(dir) {
@@ -249807,77 +249869,42 @@ async function readRawResources(dir) {
   const payloads = {};
   for (const relativePath of files.sort()) {
     const name = relativePath.replace(/\.jsonc?$/, "");
-    payloads[name] = await readJsonFile(join27(dir, ...relativePath.split("/")));
+    payloads[name] = await readJsonFile(join28(dir, ...relativePath.split("/")));
   }
   return payloads;
 }
 async function collectResources(configDir, dirs) {
   const [entities, agents] = await Promise.all([
-    readRawResources(join27(configDir, dirs.entitiesDir)),
-    readRawResources(join27(configDir, dirs.agentsDir))
+    readRawResources(join28(configDir, dirs.entitiesDir)),
+    readRawResources(join28(configDir, dirs.agentsDir))
   ]);
   return { entities, agents };
 }
+async function collectArtifacts(target) {
+  const siteWorker = await collectSiteWorker(target.root);
+  return {
+    files: siteWorker ? [] : await collectBuildOutput(requireOutputDir(target)),
+    ...siteWorker ? { siteWorker } : {},
+    ...await collectResources(target.configDir, target)
+  };
+}
 // src/core/version/gate.ts
 var VERSIONS_API_ENV = "BASE44_VERSIONS_API";
 function versionsApiEnabled(env = process.env) {
   const value = env[VERSIONS_API_ENV];
   return value === "1" || value === "true";
 }
-// src/core/version/project.ts
-import { dirname as dirname21, join as join28, resolve as resolve11 } from "node:path";
-var DEFAULT_BUILD_COMMAND = "npm run build";
-var DEFAULT_OUTPUT_DIRECTORY = "dist";
-async function resolvePublishTarget(projectRoot, overrides = {}) {
-  const project = await readSettingsIfPresent(projectRoot);
-  const root = project?.root ?? projectRoot ?? process.cwd();
-  return {
-    root,
-    configDir: project ? dirname21(project.configPath) : join28(root, PROJECT_SUBDIR),
-    buildCommand: project ? project.site?.buildCommand : DEFAULT_BUILD_COMMAND,
-    outputDir: outputDirectory(project, root, overrides.outputDir),
-    entitiesDir: project?.entitiesDir ?? "entities",
-    agentsDir: project?.agentsDir ?? "agents"
-  };
-}
-function outputDirectory(project, root, override) {
-  const configured = override ?? (project ? project.site?.outputDirectory : DEFAULT_OUTPUT_DIRECTORY);
-  return configured ? resolve11(root, configured) : null;
-}
-function requireOutputDir(target) {
-  if (target.outputDir === null) {
-    throw new ConfigNotFoundError("No site configuration found.", {
-      hints: [
-        {
-          message: `Add 'site.outputDirectory' to your config.jsonc (e.g., "site": { "outputDirectory": "dist" })`
-        },
-        { message: `Or pass --output-dir <dir>, relative to ${target.root}` }
-      ]
-    });
-  }
-  return target.outputDir;
-}
-async function readSettingsIfPresent(projectRoot) {
-  try {
-    return await readProjectSettings(projectRoot);
-  } catch (error) {
-    if (error instanceof ConfigNotFoundError) {
-      return null;
-    }
-    throw error;
-  }
-}
 // src/cli/commands/project/build.ts
 async function buildAction(ctx) {
-  const { app } = ctx;
-  const target = await resolvePublishTarget(app?.projectRoot);
+  const app = requireApp(ctx);
+  const target = await resolvePublishTarget(app.projectRoot);
   await runSiteBuild(ctx, {
     root: target.root,
     buildCommand: target.buildCommand,
-    appId: app?.id ?? ""
+    appId: app.id
   });
   return {
-    outroMessage: `Site built with app id ${theme.styles.bold(app?.id ?? "")}`
+    outroMessage: `Site built with app id ${theme.styles.bold(app.id)}`
   };
 }
 function getBuildCommand() {
@@ -250837,36 +250864,25 @@ function concurrencyOption() {
 
 // src/cli/commands/publish.ts
 async function publishAction(ctx, options) {
-  const { runTask, log, jsonMode, app } = ctx;
-  const target = await resolvePublishTarget(app?.projectRoot, {
-    outputDir: options.outputDir
-  });
+  const { runTask, log, jsonMode } = ctx;
+  const app = requireApp(ctx);
+  const target = await tagStep("create_version", () => resolvePublishTarget(app.projectRoot, { outputDir: options.outputDir }));
   if (options.build !== false) {
     await tagStep("build", () => runSiteBuild(ctx, {
       root: target.root,
       buildCommand: target.buildCommand,
-      appId: app?.id ?? ""
+      appId: app.id
     }));
   }
   const gitHash = await resolveProvenanceCommit(target.root, options.gitHash);
   const result = await runTask("Publishing...", async (updateMessage) => {
-    const artifacts = await tagStep("create_version", async () => {
-      const siteWorker = await collectSiteWorker(target.root);
-      const assetsDir = siteWorker ? siteWorker.assetsDir : requireOutputDir(target);
-      return {
-        files: assetsDir ? await collectBuildOutput(assetsDir, {
-          requireEntry: siteWorker === null
-        }) : [],
-        ...siteWorker ? { siteWorker } : {},
-        ...await collectResources(target.configDir, target)
-      };
-    });
+    const artifacts = await tagStep("create_version", () => collectArtifacts(target));
     return await publishVersion(artifacts, {
       sourceCommit: gitHash,
       target: options.target,
       concurrency: options.concurrency,
       progress: {
-        onDeclared: ({ fileCount, owedFiles }) => updateMessage(`Uploading ${owedFiles} of ${fileCount} files`),
+        onDeclared: ({ fileCount }) => updateMessage(`Uploading ${fileCount} files`),
         onUpload: ({ uploadedFiles, totalFiles }) => updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} files`)
       }
     });
@@ -251576,19 +251592,17 @@ function getTypesCommand() {
 }
 
 // src/cli/commands/versions/create.ts
-async function createAction2({ runTask, jsonMode, app }, options) {
-  const target = await resolvePublishTarget(app?.projectRoot, {
+async function createAction2(ctx, options) {
+  const { runTask, jsonMode } = ctx;
+  const target = await resolvePublishTarget(requireApp(ctx).projectRoot, {
     outputDir: options.outputDir
   });
   const gitHash = await resolveProvenanceCommit(target.root, options.gitHash);
-  const version = await runTask("Creating version...", async (updateMessage) => await createVersion({
-    files: await collectBuildOutput(requireOutputDir(target)),
-    ...await collectResources(target.configDir, target)
-  }, {
+  const version = await runTask("Creating version...", async (updateMessage) => await createVersion(await collectArtifacts(target), {
     sourceCommit: gitHash,
     concurrency: options.concurrency,
     progress: {
-      onDeclared: ({ fileCount, owedFiles }) => updateMessage(`Uploading ${owedFiles} of ${fileCount} files`),
+      onDeclared: ({ fileCount }) => updateMessage(`Uploading ${fileCount} files`),
       onUpload: ({ uploadedFiles, totalFiles }) => updateMessage(`Uploaded ${uploadedFiles} of ${totalFiles} files`)
     }
   }), {
@@ -251622,7 +251636,7 @@ async function deployAction3({ runTask, jsonMode }, versionId, options) {
   };
 }
 function getVersionDeployCommand() {
-  return new Base44Command("deploy").description("Point an environment at an already-recorded version (also the rollback)").argument("<version-id>", "The version to serve").option("--target <name>", "Environment to point at it").action(deployAction3);
+  return new Base44Command("deploy").description("Point an environment at an already-recorded version (also the rollback)").argument("<version-id>", "The version to serve").addOption(targetOption()).action(deployAction3);
 }
 
 // src/cli/commands/versions/index.ts
@@ -253953,11 +253967,11 @@ import { relative as relative9 } from "node:path";
 // ../../node_modules/chokidar/index.js
 import { EventEmitter as EventEmitter3 } from "node:events";
 import { stat as statcb, Stats } from "node:fs";
-import { readdir as readdir3, stat as stat7 } from "node:fs/promises";
+import { readdir as readdir3, stat as stat6 } from "node:fs/promises";
 import * as sp3 from "node:path";
 
 // ../../node_modules/readdirp/index.js
-import { lstat as lstat2, readdir as readdir2, realpath, stat as stat5 } from "node:fs/promises";
+import { lstat as lstat2, readdir as readdir2, realpath, stat as stat4 } from "node:fs/promises";
 import { join as pjoin, relative as prelative, resolve as presolve, sep as psep } from "node:path";
 import { Readable as Readable6 } from "node:stream";
 var EntryTypes = {
@@ -254039,7 +254053,7 @@ class ReaddirpStream extends Readable6 {
     const { root, type } = opts;
     this._fileFilter = normalizeFilter(opts.fileFilter);
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
-    const statMethod = opts.lstat ? lstat2 : stat5;
+    const statMethod = opts.lstat ? lstat2 : stat4;
     if (wantBigintFsStats) {
       this._stat = (path) => statMethod(path, { bigint: true });
     } else {
@@ -254192,7 +254206,7 @@ function readdirp(root, options = {}) {
 
 // ../../node_modules/chokidar/handler.js
 import { watch as fs_watch, unwatchFile, watchFile } from "node:fs";
-import { realpath as fsrealpath, lstat as lstat3, open as open2, stat as stat6 } from "node:fs/promises";
+import { realpath as fsrealpath, lstat as lstat3, open as open2, stat as stat5 } from "node:fs/promises";
 import { type as osType } from "node:os";
 import * as sp2 from "node:path";
 var STR_DATA = "data";
@@ -254218,7 +254232,7 @@ var EVENTS = {
 };
 var EV = EVENTS;
 var THROTTLE_MODE_WATCH = "watch";
-var statMethods = { lstat: lstat3, stat: stat6 };
+var statMethods = { lstat: lstat3, stat: stat5 };
 var KEY_LISTENERS = "listeners";
 var KEY_ERR = "errHandlers";
 var KEY_RAW = "rawEmitters";
@@ -254689,7 +254703,7 @@ class NodeFsHandler {
         return;
       if (!newStats || newStats.mtimeMs === 0) {
         try {
-          const newStats = await stat6(file);
+          const newStats = await stat5(file);
           if (this.fsw.closed)
             return;
           const at = newStats.atimeMs;
@@ -255361,7 +255375,7 @@ class FSWatcher extends EventEmitter3 {
       const fullPath = opts.cwd ? sp3.join(opts.cwd, path) : path;
       let stats;
       try {
-        stats = await stat7(fullPath);
+        stats = await stat6(fullPath);
       } catch (err) {}
       if (!stats || this.closed)
         return;
@@ -258351,7 +258365,7 @@ class ReduceableCache {
   }
 }
 // ../../node_modules/posthog-node/dist/extensions/error-tracking/modifiers/context-lines.node.mjs
-import { createReadStream as createReadStream4 } from "node:fs";
+import { createReadStream as createReadStream3 } from "node:fs";
 import { createInterface as createInterface2 } from "node:readline";
 var LRU_FILE_CONTENTS_CACHE = new ReduceableCache(25);
 var LRU_FILE_CONTENTS_FS_READ_FAILED = new ReduceableCache(20);
@@ -258395,7 +258409,7 @@ async function addSourceContext(frames) {
 }
 function getContextLinesFromFile(path, ranges, output) {
   return new Promise((resolve) => {
-    const stream = createReadStream4(path);
+    const stream = createReadStream3(path);
     const lineReaded = createInterface2({
       input: stream
     });
@@ -260346,4 +260360,4 @@ export {
   runCLI
 };
 
-//# debugId=6F5FA046DBD3D8D164756E2164756E21
+//# debugId=7059640A5E6CFF9564756E2164756E21