@valbuild/server 0.73.2 → 0.75.0

package/dist/valbuild-server.esm.js

@@ -1,7 +1,7 @@
 import { newQuickJSWASMModule } from 'quickjs-emscripten';
 import ts from 'typescript';
 import { result, pipe } from '@valbuild/core/fp';
-import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, VAL_EXTENSION, derefPatch, Internal, Schema, ImageSchema, RichTextSchema, FileSchema } from '@valbuild/core';
+import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, VAL_EXTENSION, derefPatch, Internal, Schema, ImageSchema, RichTextSchema, FileSchema, DEFAULT_CONTENT_HOST } from '@valbuild/core';
 import { deepEqual, isNotRoot, PatchError, parseAndValidateArrayIndex, applyPatch, JSONOps, deepClone, sourceToPatchPath } from '@valbuild/core/patch';
 import * as fsPath from 'path';
 import fsPath__default from 'path';
@@ -1454,7 +1454,11 @@ const tsOps = new TSOps(document => {
 class ValOps {
   /** Sources from val modules, immutable (without patches or anything)  */
 
-  /** The sha256 / hash of sources + schema + config */
+  /** The sha256 / hash of all sources + all schemas + config */
+
+  /** The sha256 / hash of all sources */
+
+  /** The sha256 / hash of config */
 
   /** Schema from val modules, immutable  */
 
@@ -1467,6 +1471,8 @@ class ValOps {
     this.baseSha = null;
     this.schemas = null;
     this.schemaSha = null;
+    this.sourcesSha = null;
+    this.configSha = null;
     this.modulesErrors = null;
   }
   hash(input) {
@@ -1524,7 +1530,7 @@ class ValOps {
 
   // #region initTree
   async initSources() {
-    if (this.baseSha === null || this.schemaSha === null || this.sources === null || this.schemas === null || this.modulesErrors === null) {
+    if (this.baseSha === null || this.sourcesSha === null || this.configSha === null || this.schemaSha === null || this.sources === null || this.schemas === null || this.modulesErrors === null) {
       const currentModulesErrors = [];
       const addModuleError = (message, index, path) => {
         currentModulesErrors[index] = {
@@ -1534,8 +1540,10 @@ class ValOps {
       };
       const currentSources = {};
       const currentSchemas = {};
-      let baseSha = this.hash(JSON.stringify(this.valModules.config));
-      let schemaSha = baseSha;
+      const configSha = this.hash(JSON.stringify(this.valModules.config));
+      let sourcesSha = "";
+      let baseSha = configSha;
+      let schemaSha = configSha;
       for (let moduleIdx = 0; moduleIdx < this.valModules.modules.length; moduleIdx++) {
         const module = this.valModules.modules[moduleIdx];
         if (!module.def) {
@@ -1590,6 +1598,10 @@ class ValOps {
           currentSources[pathM] = source;
           currentSchemas[pathM] = schema;
           // make sure the checks above is enough that this does not fail - even if val modules are not set up correctly
+          sourcesSha = this.hash(sourcesSha + JSON.stringify({
+            path,
+            source
+          }));
           baseSha = this.hash(baseSha + JSON.stringify({
             path,
             schema: serializedSchema,
@@ -1603,11 +1615,15 @@ class ValOps {
       this.schemas = currentSchemas;
       this.baseSha = baseSha;
       this.schemaSha = schemaSha;
+      this.sourcesSha = sourcesSha;
+      this.configSha = configSha;
       this.modulesErrors = currentModulesErrors;
     }
     return {
       baseSha: this.baseSha,
       schemaSha: this.schemaSha,
+      sourcesSha: this.sourcesSha,
+      configSha: this.configSha,
       sources: this.sources,
       schemas: this.schemas,
       moduleErrors: this.modulesErrors
@@ -1632,6 +1648,12 @@ class ValOps {
   async getBaseSha() {
     return this.initSources().then(result => result.baseSha);
   }
+  async getConfigSha() {
+    return this.initSources().then(result => result.configSha);
+  }
+  async getSourcesSha() {
+    return this.initSources().then(result => result.sourcesSha);
+  }
   async getSchemaSha() {
     return this.initSources().then(result => result.schemaSha);
   }
@@ -2191,7 +2213,7 @@ class ValOps {
   }
 
   // #region createPatch
-  async createPatch(path, patch, parentRef, authorId) {
+  async createPatch(path, patch, patchId, parentRef, authorId) {
     const initTree = await this.initSources();
     const schemas = initTree.schemas;
     const moduleErrors = initTree.moduleErrors;
@@ -2280,7 +2302,7 @@ class ValOps {
         }
       }
     }
-    const saveRes = await this.saveSourceFilePatch(path, patch, parentRef, authorId);
+    const saveRes = await this.saveSourceFilePatch(path, patch, patchId, parentRef, authorId);
     if (result.isErr(saveRes)) {
       console.error(`Could not save source patch at path: '${path}'. Error: ${saveRes.error.errorType === "other" ? saveRes.error.message : saveRes.error.errorType}`);
       if (saveRes.error.errorType === "patch-head-conflict") {
@@ -2293,7 +2315,6 @@ class ValOps {
         error: saveRes.error
       });
     }
-    const patchId = saveRes.value.patchId;
     const saveFileRes = await Promise.all(Object.entries(files).map(async ([filePath, data]) => {
       if (data.error) {
         return {
@@ -2603,6 +2624,7 @@ class ValOpsFS extends ValOps {
       var _this$options, _this$options2;
       const currentBaseSha = await this.getBaseSha();
       const currentSchemaSha = await this.getSchemaSha();
+      const currentSourcesSha = await this.getSourcesSha();
       const moduleFilePaths = Object.keys(await this.getSchemas());
       const patchData = await this.readPatches();
       const patches = [];
@@ -2613,12 +2635,15 @@ class ValOpsFS extends ValOps {
         patches.push(patchId);
       }
       // something changed: return immediately
-      const didChange = !params || currentBaseSha !== params.baseSha || currentSchemaSha !== params.schemaSha || patches.length !== params.patches.length || patches.some((p, i) => p !== params.patches[i]);
+      const didChange = !params || currentBaseSha !== params.baseSha ||
+      // base sha covers both sources sha and schema sha, so we could remove checks for schema sha and sources sha
+      currentSourcesSha !== params.sourcesSha || currentSchemaSha !== params.schemaSha || patches.length !== params.patches.length || patches.some((p, i) => p !== params.patches[i]);
       if (didChange) {
         return {
           type: "did-change",
           baseSha: currentBaseSha,
           schemaSha: currentSchemaSha,
+          sourcesSha: currentSourcesSha,
           patches
         };
       }
@@ -2732,6 +2757,7 @@ class ValOpsFS extends ValOps {
         type,
         baseSha: currentBaseSha,
         schemaSha: currentSchemaSha,
+        sourcesSha: currentSourcesSha,
         patches
       };
     } catch (err) {
@@ -2806,6 +2832,11 @@ class ValOpsFS extends ValOps {
         };
       }
       return patchData;
+    }).filter(patchData => {
+      if (filters.patchIds && filters.patchIds.length > 0) {
+        return filters.patchIds.includes(patchData.patchId);
+      }
+      return true;
     });
     return {
       patches: sortedPatches,
@@ -2942,11 +2973,10 @@ class ValOpsFS extends ValOps {
       };
     }
   }
-  async saveSourceFilePatch(path, patch, parentRef, authorId) {
+  async saveSourceFilePatch(path, patch, patchId, parentRef, authorId) {
     const patchDir = this.getParentPatchIdFromParentRef(parentRef);
     try {
       const baseSha = await this.getBaseSha();
-      const patchId = crypto.randomUUID();
       const data = {
         patch,
         patchId,
@@ -2957,6 +2987,13 @@ class ValOpsFS extends ValOps {
         coreVersion: Internal.VERSION.core,
         createdAt: new Date().toISOString()
       };
+      const headParentPatchId = "head";
+      if (patchDir !== headParentPatchId && !this.host.fileExists(this.getPatchFilePath(headParentPatchId))) {
+        console.error("Val: out-of-band patch detected.", this.getPatchFilePath(headParentPatchId));
+        return result.err({
+          errorType: "patch-head-conflict"
+        });
+      }
       const writeRes = this.host.tryWriteUf8File(this.getPatchFilePath(patchDir), JSON.stringify(data));
       if (writeRes.type === "error") {
         return writeRes.errorType === "dir-already-exists" ? result.err({
@@ -3128,6 +3165,28 @@ class ValOpsFS extends ValOps {
       deleted
     };
   }
+  async deleteAllPatches() {
+    const patchesCacheDir = this.getPatchesDir();
+    const tmpDir = fsPath__default.join(this.rootDir, ValOpsFS.VAL_DIR, "patches-deleted-" + crypto.randomUUID());
+    try {
+      this.host.moveDir(patchesCacheDir, tmpDir);
+      this.host.deleteDir(tmpDir);
+      return {};
+    } catch (err) {
+      if (err instanceof Error) {
+        return {
+          error: {
+            message: `Got an error while deleting patches: ${err.message}`
+          }
+        };
+      }
+      return {
+        error: {
+          message: "Got an unexpected error while deleting patches"
+        }
+      };
+    }
+  }
   updateOrderedPatches(updates, patchDirMap, deletePatchIds) {
     for (const patchId of deletePatchIds) {
       const patchDir = patchDirMap[patchId];
@@ -3170,7 +3229,7 @@ class ValOpsFS extends ValOps {
       }
     }
   }
-  async saveOrUploadFiles(preparedCommit, auth, testMode) {
+  async saveOrUploadFiles(preparedCommit, mode, auth) {
     const updatedFiles = [];
     const uploadedRemoteRefs = [];
     const errors = {};
@@ -3188,42 +3247,50 @@ class ValOpsFS extends ValOps {
     }]) => [ref, {
       patchId
     }]);
-    for (const [ref, {
-      patchId
-    }] of remoteFileDescriptors) {
-      var _this$options4;
-      const splitRemoteRefRes = Internal.remote.splitRemoteRef(ref);
-      if (splitRemoteRefRes.status === "error") {
-        errors[ref] = {
-          message: "Failed to split remote ref: " + ref
+    if (mode === "upload-remote") {
+      if (!auth) {
+        errors["auth"] = {
+          message: "No auth provided"
         };
-        continue;
-      }
-      const fileBuffer = await this.getBase64EncodedBinaryFileFromPatch(splitRemoteRefRes.filePath, patchId);
-      if (!fileBuffer) {
-        errors[ref] = {
-          message: "Failed to get binary file from patch. Ref: " + ref + ". PatchId: " + patchId
-        };
-        continue;
-      }
-      if (testMode === "test-skip-remote") {
-        console.log("Skip remote flag enabled. Skipping file upload", ref);
-        continue;
-      }
-      if (!((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.config.project)) {
-        errors[ref] = {
-          message: "No project found in config"
+        return {
+          updatedFiles,
+          uploadedRemoteRefs,
+          errors
         };
-        continue;
       }
-      console.log("Uploading remote file", ref);
-      const res = await uploadRemoteFile(this.contentUrl, this.options.config.project, splitRemoteRefRes.bucket, splitRemoteRefRes.fileHash, getFileExt(splitRemoteRefRes.filePath), fileBuffer, auth);
-      if (!res.success) {
-        console.error("Failed to upload remote file", ref, res.error);
-        throw new Error(`Failed to upload remote file: ${ref}. ${res.error}`);
+      for (const [ref, {
+        patchId
+      }] of remoteFileDescriptors) {
+        var _this$options4;
+        const splitRemoteRefRes = Internal.remote.splitRemoteRef(ref);
+        if (splitRemoteRefRes.status === "error") {
+          errors[ref] = {
+            message: "Failed to split remote ref: " + ref
+          };
+          continue;
+        }
+        const fileBuffer = await this.getBase64EncodedBinaryFileFromPatch(splitRemoteRefRes.filePath, patchId);
+        if (!fileBuffer) {
+          errors[ref] = {
+            message: "Failed to get binary file from patch. Ref: " + ref + ". PatchId: " + patchId
+          };
+          continue;
+        }
+        if (!((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.config.project)) {
+          errors[ref] = {
+            message: "No project found in config"
+          };
+          continue;
+        }
+        console.log("Uploading remote file", ref);
+        const res = await uploadRemoteFile(this.contentUrl, this.options.config.project, splitRemoteRefRes.bucket, splitRemoteRefRes.fileHash, getFileExt(splitRemoteRefRes.filePath), fileBuffer, auth);
+        if (!res.success) {
+          console.error("Failed to upload remote file", ref, res.error);
+          throw new Error(`Failed to upload remote file: ${ref}. ${res.error}`);
+        }
+        console.log("Completed remote file", ref);
+        uploadedRemoteRefs.push(ref);
       }
-      console.log("Completed remote file", ref);
-      uploadedRemoteRefs.push(ref);
     }
     const patchIdToPatchDirMapRes = await this.getParentPatchIdFromPatchIdMap();
     if (result.isErr(patchIdToPatchDirMapRes)) {
@@ -3522,9 +3589,17 @@ const GetApplicablePatches = z.object({
     commitSha: z.string(),
     clientCommitSha: z.string(),
     parentCommitSha: z.string(),
+    commitMessage: z.string().nullable(),
     branch: z.string(),
     creator: z.string(),
     createdAt: z.string()
+  })).optional(),
+  deployments: z.array(z.object({
+    deploymentId: z.string(),
+    commitSha: z.string(),
+    deploymentState: z.string(),
+    createdAt: z.string(),
+    updatedAt: z.string()
   })).optional()
 });
 const FilesResponse = z.object({
@@ -3576,6 +3651,8 @@ const ProfilesResponse = z.object({
   profiles: z.array(z.object({
     profileId: z.string(),
     fullName: z.string(),
+    email: z.string().optional(),
+    // TODO: make this required once this can be guaranteed
     avatar: z.object({
       url: z.string()
     }).nullable()
@@ -3673,6 +3750,7 @@ class ValOpsHttp extends ValOps {
     }
     const currentBaseSha = await this.getBaseSha();
     const currentSchemaSha = await this.getSchemaSha();
+    const currentSourcesSha = await this.getSourcesSha();
     const allPatchData = await this.fetchPatches({
       excludePatchOps: true,
       patchIds: undefined
@@ -3732,6 +3810,9 @@ class ValOpsHttp extends ValOps {
       nonce,
       baseSha: currentBaseSha,
       schemaSha: currentSchemaSha,
+      sourcesSha: currentSourcesSha,
+      commits: allPatchData.commits || [],
+      deployments: allPatchData.deployments || [],
       patches,
       commitSha: this.commitSha
     };
@@ -3741,7 +3822,8 @@ class ValOpsHttp extends ValOps {
       method: "POST",
       body: JSON.stringify({
         branch: this.branch,
-        profileId
+        profileId,
+        commitSha: this.commitSha
       }),
       headers: {
         ...this.authHeaders,
@@ -3881,12 +3963,26 @@ class ValOpsHttp extends ValOps {
                 parentCommitSha: commit.parentCommitSha,
                 branch: commit.branch,
                 creator: commit.creator,
-                createdAt: commit.createdAt
+                createdAt: commit.createdAt,
+                commitMessage: commit.commitMessage
+              });
+            }
+          }
+          const deployments = [];
+          if (data.deployments) {
+            for (const deployment of data.deployments) {
+              deployments.push({
+                commitSha: deployment.commitSha,
+                deploymentId: deployment.deploymentId,
+                deploymentState: deployment.deploymentState,
+                createdAt: deployment.createdAt,
+                updatedAt: deployment.updatedAt
               });
             }
           }
           return {
             commits,
+            deployments,
             patches,
             errors
           };
@@ -3925,7 +4021,7 @@ class ValOpsHttp extends ValOps {
       };
     }
   }
-  async saveSourceFilePatch(path, patch, parentRef, authorId) {
+  async saveSourceFilePatch(path, patch, patchId, parentRef, authorId) {
     const baseSha = await this.getBaseSha();
     return fetch(`${this.contentUrl}/v1/${this.project}/patches`, {
       method: "POST",
@@ -3937,6 +4033,7 @@ class ValOpsHttp extends ValOps {
         path,
         patch,
         authorId,
+        patchId,
         parentPatchId: parentRef.type === "patch" ? parentRef.patchId : null,
         baseSha,
         commit: this.commitSha,
@@ -4382,7 +4479,7 @@ class ValOpsHttp extends ValOps {
   }
 }
 
-const host = process.env.VAL_CONTENT_URL || "https://content.val.build";
+const host = process.env.VAL_CONTENT_URL || DEFAULT_CONTENT_HOST;
 const SettingsSchema = z.object({
   publicProjectId: z.string(),
   remoteFileBuckets: z.array(z.object({
@@ -4485,6 +4582,51 @@ function parsePersonalAccessTokenFile(content) {
   }
 }
 
+/**
+ * Iterates through all schemas and find if there is 1 or more remote files in them
+ */
+function hasRemoteFileSchema(schema) {
+  if (schema.type === "file" || schema.type === "image") {
+    return !!schema.remote;
+  } else if (schema.type === "richtext") {
+    var _schema$options;
+    if (typeof ((_schema$options = schema.options) === null || _schema$options === void 0 || (_schema$options = _schema$options.inline) === null || _schema$options === void 0 ? void 0 : _schema$options.img) === "object") {
+      return hasRemoteFileSchema(schema.options.inline.img);
+    }
+    return false;
+  } else if (schema.type === "array" || schema.type === "record") {
+    return hasRemoteFileSchema(schema.item);
+  } else if (schema.type === "object") {
+    for (const key in schema.items) {
+      const hasRemoteFile = hasRemoteFileSchema(schema.items[key]);
+      if (hasRemoteFile) {
+        return true;
+      }
+    }
+    return false;
+  } else if (schema.type === "union") {
+    const unionStringSchema = typeof schema.key === "object" && schema.key.type === "literal" ? schema : undefined;
+    const unionObjectSchema = typeof schema.key === "string" ? schema : undefined;
+    if (unionStringSchema) {
+      return false;
+    }
+    if (unionObjectSchema) {
+      for (const key in unionObjectSchema.items) {
+        const hasRemoteFile = hasRemoteFileSchema(unionObjectSchema.items[key]);
+        if (hasRemoteFile) {
+          return true;
+        }
+      }
+    }
+    return false;
+  } else if (schema.type === "boolean" || schema.type === "number" || schema.type === "string" || schema.type === "literal" || schema.type === "date" || schema.type === "keyOf") {
+    return false;
+  } else {
+    const exhaustiveCheck = schema;
+    throw new Error(`Unexpected schema: ${JSON.stringify(exhaustiveCheck)}`);
+  }
+}
+
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const ValServer = (valModules, options, callbacks) => {
   let serverOps;
@@ -4655,7 +4797,7 @@ const ValServer = (valModules, options, callbacks) => {
         apiKey: options.apiKey
       };
     } else if (serverOps instanceof ValOpsFS) {
-      const projectRootDir = options.config.root;
+      const projectRootDir = options.config.root || ".";
       if (!projectRootDir) {
         return {
           status: 400,
@@ -5009,15 +5151,59 @@ const ValServer = (valModules, options, callbacks) => {
       }
     },
     "/logout": {
-      GET: async () => {
+      GET: async req => {
+        const query = req.query;
+        const redirectTo = query.redirect_to;
+        if (redirectTo) {
+          return {
+            status: 302,
+            redirectTo: redirectTo,
+            cookies: {
+              [VAL_SESSION_COOKIE]: {
+                value: "empty",
+                options: {
+                  httpOnly: true,
+                  sameSite: "strict",
+                  path: "/",
+                  secure: true,
+                  expires: new Date(0)
+                }
+              },
+              [VAL_STATE_COOKIE]: {
+                value: "empty",
+                options: {
+                  httpOnly: true,
+                  sameSite: "strict",
+                  path: "/",
+                  secure: true,
+                  expires: new Date(0)
+                }
+              }
+            }
+          };
+        }
         return {
           status: 200,
           cookies: {
             [VAL_SESSION_COOKIE]: {
-              value: null
+              value: "empty",
+              options: {
+                httpOnly: true,
+                sameSite: "strict",
+                path: "/",
+                secure: true,
+                expires: new Date(0)
+              }
             },
             [VAL_STATE_COOKIE]: {
-              value: null
+              value: "empty",
+              options: {
+                httpOnly: true,
+                sameSite: "strict",
+                path: "/",
+                secure: true,
+                expires: new Date(0)
+              }
             }
           }
         };
@@ -5101,9 +5287,10 @@ const ValServer = (valModules, options, callbacks) => {
             }
           };
         }
+        const profileId = "id" in auth ? auth.id : undefined;
         const currentStat = await serverOps.getStat({
           ...req.body,
-          profileId: "id" in auth ? auth.id : undefined
+          profileId
         });
         if (currentStat.type === "error" && currentStat.networkError) {
           return {
@@ -5127,11 +5314,21 @@ const ValServer = (valModules, options, callbacks) => {
             json: currentStat.error
           };
         }
+        const mode = serverOps instanceof ValOpsFS ? "fs" : serverOps instanceof ValOpsHttp ? "http" : "unknown";
+        if (mode === "unknown") {
+          return {
+            status: 500,
+            json: {
+              message: "Server mode is neither fs nor http - this is an internal Val bug"
+            }
+          };
+        }
         return {
           status: 200,
           json: {
             ...currentStat,
-            mode: serverOps instanceof ValOpsFS ? "fs" : serverOps instanceof ValOpsHttp ? "http" : "unknown",
+            profileId: profileId ?? null,
+            mode,
             config: options.config
           }
         };
@@ -5163,7 +5360,7 @@ const ValServer = (valModules, options, callbacks) => {
         const authorId = "id" in auth ? auth.id : null;
         const newPatchIds = [];
         for (const patch of patches) {
-          const createPatchRes = await serverOps.createPatch(patch.path, patch.patch, parentRef, authorId);
+          const createPatchRes = await serverOps.createPatch(patch.path, patch.patch, patch.patchId, parentRef, authorId);
           if (result.isErr(createPatchRes)) {
             if (createPatchRes.error.errorType === "patch-head-conflict") {
               return {
@@ -5397,6 +5594,7 @@ const ValServer = (valModules, options, callbacks) => {
             }
           };
         }
+        const sourcesSha = await serverOps.getSourcesSha();
         const moduleErrors = await serverOps.getModuleErrors();
         if ((moduleErrors === null || moduleErrors === void 0 ? void 0 : moduleErrors.length) > 0) {
           console.error("Val: Module errors", moduleErrors);
@@ -5457,7 +5655,9 @@ const ValServer = (valModules, options, callbacks) => {
         const modules = {};
         for (const [moduleFilePathS, module] of Object.entries(sourcesRes.sources)) {
           const moduleFilePath = moduleFilePathS;
-          if (moduleFilePath.startsWith(moduleFilePath)) {
+          // TODO: currently sourcesRes contains ALL MODULES.
+          // We should only evaluate exactly what we need
+          if (!req.path || moduleFilePath.startsWith(req.path)) {
             var _patchAnalysis$patche, _sourcesValidation$er;
             const skippedPatches = [];
             const patchErrors = {};
@@ -5494,6 +5694,7 @@ const ValServer = (valModules, options, callbacks) => {
           status: 200,
           json: {
             schemaSha,
+            sourcesSha,
             modules
           }
         };
@@ -5622,33 +5823,33 @@ const ValServer = (valModules, options, callbacks) => {
           };
         }
         if (serverOps instanceof ValOpsFS) {
-          const remoteFileAuthRes = await getRemoteFileAuth();
-          if (remoteFileAuthRes.status !== 200) {
+          var _remoteFileAuthRes;
+          const isRemoteRequired = getIsRemoteRequired(await serverOps.getSchemas());
+          let mode;
+          let remoteFileAuthRes;
+          if (isRemoteRequired) {
+            mode = "upload-remote";
+            remoteFileAuthRes = await getRemoteFileAuth();
+          } else {
+            mode = "skip-remote";
+          }
+          if (remoteFileAuthRes && remoteFileAuthRes.status !== 200) {
             return remoteFileAuthRes;
           }
-          const remoteFileAuth = remoteFileAuthRes.json.remoteFileAuth;
-          await serverOps.saveOrUploadFiles(preparedCommit, remoteFileAuth);
-          await serverOps.deletePatches(patchIds);
+          const remoteFileAuth = (_remoteFileAuthRes = remoteFileAuthRes) === null || _remoteFileAuthRes === void 0 || (_remoteFileAuthRes = _remoteFileAuthRes.json) === null || _remoteFileAuthRes === void 0 ? void 0 : _remoteFileAuthRes.remoteFileAuth;
+          const deleteRes = await serverOps.deleteAllPatches();
+          await serverOps.saveOrUploadFiles(preparedCommit, mode, remoteFileAuth);
+          if (deleteRes.error) {
+            console.error(`Val got an error while cleaning up patches after publish: ${deleteRes.error.message}`);
+          }
           return {
             status: 200,
             json: {} // TODO:
           };
         } else if (serverOps instanceof ValOpsHttp) {
           if (auth.error === undefined && auth.id) {
-            var _options$config$ai, _options$config$files;
-            let message = body.message || "Update content: " + Object.keys(analysis.patchesByModule) + " modules changed";
-            if (!((_options$config$ai = options.config.ai) !== null && _options$config$ai !== void 0 && (_options$config$ai = _options$config$ai.commitMessages) !== null && _options$config$ai !== void 0 && _options$config$ai.disabled)) {
-              const res = await serverOps.getCommitMessage(preparedCommit);
-              if (res.error) {
-                // ignore
-                console.error("Failed to get commit message", res.error.message);
-              } else {
-                message = res.commitSummary;
-              }
-            }
-            console.log({
-              message
-            });
+            var _options$config$files;
+            const message = body.message || "Val CMS update (" + Object.keys(analysis.patchesByModule).length + " files changed)";
             const commitRes = await serverOps.commit(preparedCommit, message, auth.id, ((_options$config$files = options.config.files) === null || _options$config$files === void 0 ? void 0 : _options$config$files.directory) || "/public/val");
             if (commitRes.error) {
               console.error("Failed to commit", commitRes.error);
@@ -6041,6 +6242,17 @@ function guessMimeTypeFromPath(filePath) {
   }
   return null;
 }
+function getIsRemoteRequired(schemas) {
+  for (const moduleFilePathS in schemas) {
+    const moduleFilePath = moduleFilePathS;
+    const schema = schemas[moduleFilePath].serialize();
+    const isRemoteRequired = hasRemoteFileSchema(schema);
+    if (isRemoteRequired) {
+      return true;
+    }
+  }
+  return false;
+}
 
 async function createValServer(valModules, route, opts, config, callbacks, formatter) {
   const valServerConfig = await initHandlerOptions(route, opts, config);
@@ -6057,7 +6269,7 @@ async function initHandlerOptions(route, opts, config) {
   const valDisableRedirectUrl = opts.valDisableRedirectUrl || process.env.VAL_DISABLE_REDIRECT_URL;
   const maybeValProject = opts.project || process.env.VAL_PROJECT;
   const valBuildUrl = opts.valBuildUrl || process.env.VAL_BUILD_URL || "https://app.val.build";
-  const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || "https://content.val.build";
+  const valContentUrl = opts.valContentUrl || process.env.VAL_CONTENT_URL || DEFAULT_CONTENT_HOST;
   if (isProxyMode) {
     var _opts$versions, _opts$versions2;
     if (!maybeApiKey || !maybeValSecret) {