@wix/ditto-codegen-public 1.0.433 → 1.0.435

package/dist/out.js

@@ -39,7 +39,7 @@ var require_types_impl = __commonJS({
   "../../node_modules/@wix/ambassador-ctp-codegen-job-service-v1-job/cjs/build/types.impl.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.WebhookIdentityType = exports2.UserDecisionQuestionType = exports2.TaskKind = exports2.Status = exports2.ProcessType = exports2.FileOperation = exports2.ErrorType = exports2.Environment = exports2.ChatMessageRole = exports2.ExtensionType = void 0;
+    exports2.WebhookIdentityType = exports2.UserDecisionQuestionType = exports2.TaskKind = exports2.Status = exports2.ProcessType = exports2.JobsSortOrder = exports2.FileOperation = exports2.ErrorType = exports2.Environment = exports2.ChatMessageRole = exports2.ExtensionType = void 0;
     var ExtensionType;
     (function(ExtensionType2) {
       ExtensionType2["UNDEFINED_EXTENSION_TYPE"] = "UNDEFINED_EXTENSION_TYPE";
@@ -89,6 +89,12 @@ var require_types_impl = __commonJS({
       FileOperation2["DELETE"] = "DELETE";
       FileOperation2["EDIT"] = "EDIT";
     })(FileOperation || (exports2.FileOperation = FileOperation = {}));
+    var JobsSortOrder;
+    (function(JobsSortOrder2) {
+      JobsSortOrder2["UNKNOWN_SORT_ORDER"] = "UNKNOWN_SORT_ORDER";
+      JobsSortOrder2["CREATED_AT_ASC"] = "CREATED_AT_ASC";
+      JobsSortOrder2["CREATED_AT_DESC"] = "CREATED_AT_DESC";
+    })(JobsSortOrder || (exports2.JobsSortOrder = JobsSortOrder = {}));
     var ProcessType;
     (function(ProcessType2) {
       ProcessType2["UNKNOWN_PROCESS_TYPE"] = "UNKNOWN_PROCESS_TYPE";
@@ -5836,7 +5842,7 @@ var require_utils4 = __commonJS({
   "../../node_modules/@wix/metro-runtime/cjs/build/serialization/utils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.parseLeanSchemaRef = void 0;
+    exports2.parseLeanSchemaRef = parseLeanSchemaRef;
     function parseLeanSchemaRef(renderedSchemaName = "") {
       const [typeOrName, schemaName] = getSchemaNameAndType(renderedSchemaName);
       if (schemaName) {
@@ -5849,7 +5855,6 @@ var require_utils4 = __commonJS({
         schemaName: typeOrName
       };
     }
-    exports2.parseLeanSchemaRef = parseLeanSchemaRef;
     var getSchemaNameAndType = (leanSchema) => leanSchema.split("#");
   }
 });
@@ -5884,7 +5889,7 @@ var require_utils5 = __commonJS({
   "../../node_modules/@wix/metro-runtime/cjs/build/utils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.findByPath = void 0;
+    exports2.findByPath = findByPath;
     function findByPath(obj, path, defaultValue, suffix) {
       let result = obj;
       for (const field of path.split(".")) {
@@ -5895,7 +5900,6 @@ var require_utils5 = __commonJS({
       }
       return `${result}${suffix}`;
     }
-    exports2.findByPath = findByPath;
   }
 });
 
@@ -5904,12 +5908,24 @@ var require_url_resolver = __commonJS({
   "../../node_modules/@wix/metro-runtime/cjs/build/url-resolver.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.resolveUrl = void 0;
+    exports2.resolveUrl = resolveUrl;
     var utils_js_1 = require_utils5();
     var USER_DOMAIN = "_";
+    var WWW_BASE_DOMAIN = "www._base_domain_";
+    var WILDCARD_PREFIX = "*.";
     var DOMAINS = ["wix.com", "editorx.com"];
-    var WIX_API_DOMAINS = ["42.wixprod.net", "uw2-edt-1.wixprod.net"];
+    var WIX_API_DOMAINS = [
+      "42.wixprod.net",
+      "uw2-edt-1.wixprod.net",
+      "virginia-edt.wixprod.net"
+    ];
     var DEV_WIX_CODE_DOMAIN = "dev.wix-code.com";
+    var HOST_ALIASES = {
+      // payments.base44.com runs customised Business Manager, which needs to work exactly the same as normal BM on manage.wix.com
+      "payments.base44.com": "manage.wix.com",
+      // https://system-kb.wixanswers.com/kb/en/article/editorx-domains-matching-to-wixcom
+      "create.editorx.com": "editor.editorx.com"
+    };
     var REGEX_CAPTURE_PROTO_FIELD = /{(.*)}/;
     var REGEX_CAPTURE_DOMAINS = new RegExp(`\\.(${DOMAINS.join("|")})$`);
     var REGEX_CAPTURE_API_DOMAINS = new RegExp(`\\.(${WIX_API_DOMAINS.join("|")})$`);
@@ -5920,7 +5936,6 @@ var require_url_resolver = __commonJS({
       const path = injectDataIntoProtoPath(opts.protoPath, opts.data || {});
       return resolvePath(path, mappings);
     }
-    exports2.resolveUrl = resolveUrl;
     function injectDataIntoProtoPath(protoPath, data) {
       return protoPath.split("/").map((path) => maybeProtoPathToData(path, data)).join("/");
     }
@@ -5938,24 +5953,27 @@ var require_url_resolver = __commonJS({
       return resolvedHost.replace(REGEX_CAPTURE_DOMAINS, "._base_domain_").replace(REGEX_CAPTURE_API_DOMAINS, "._api_base_domain_").replace(REGEX_CAPTURE_DEV_WIX_CODE_DOMAIN, "*.dev.wix-code.com");
     }
     function fixHostExceptions(host) {
-      return host.replace("create.editorx.com", "editor.editorx.com");
+      return HOST_ALIASES[host] ?? host;
     }
     function resolveMappingsByDomain(domain, domainToMappings) {
       const mappings = domainToMappings[domain];
       if (mappings) {
         return mappings;
       }
-      const rootDomainMappings = resolveRootDomain(domain, domainToMappings);
-      if (!rootDomainMappings) {
+      const matchedMappings = resolveRootDomain(domain, domainToMappings) ?? resolveWildcardDomain(domain, domainToMappings);
+      if (!matchedMappings) {
+        if (isBaseDomain(domain)) {
+          const wwwMappings = domainToMappings[WWW_BASE_DOMAIN];
+          if (wwwMappings) {
+            return wwwMappings;
+          }
+        }
         const userMappings = domainToMappings[USER_DOMAIN];
         if (userMappings) {
           return userMappings;
         }
-        if (isBaseDomain(domain)) {
-          return domainToMappings[wwwBaseDomain];
-        }
       }
-      return rootDomainMappings ?? [];
+      return matchedMappings ?? [];
     }
     function resolveRootDomain(domain, domainToMappings) {
       return Object.entries(domainToMappings).find(([entryDomain]) => {
@@ -5963,6 +5981,22 @@ var require_url_resolver = __commonJS({
         return rooDomainSegments.join(".") === entryDomain;
       })?.[1];
     }
+    function resolveWildcardDomain(domain, domainToMappings) {
+      const matchingEntries = Object.entries(domainToMappings).filter(([entryDomain]) => matchesWildcardDomain(domain, entryDomain));
+      const [mostSpecificEntry] = matchingEntries.sort(([entryDomainA], [entryDomainB]) => entryDomainB.length - entryDomainA.length);
+      if (!mostSpecificEntry) {
+        return void 0;
+      }
+      const [, mappings] = mostSpecificEntry;
+      return mappings;
+    }
+    function matchesWildcardDomain(domain, entryDomain) {
+      if (!entryDomain.startsWith(WILDCARD_PREFIX)) {
+        return false;
+      }
+      const suffix = entryDomain.slice(WILDCARD_PREFIX.length - 1);
+      return domain.length > suffix.length && domain.endsWith(suffix);
+    }
     function resolvePath(protoPath, mappings) {
       const mapping = mappings?.find((m) => protoPath.startsWith(m.destPath));
       if (!mapping) {
@@ -5973,7 +6007,6 @@ var require_url_resolver = __commonJS({
     function isBaseDomain(domain) {
       return !!domain.match(/\._base_domain_$/);
     }
-    var wwwBaseDomain = "www._base_domain_";
   }
 });
 
@@ -6238,7 +6271,7 @@ var require_flatten_params = __commonJS({
   "../../node_modules/@wix/metro-runtime/cjs/build/flatten-params.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.toURLSearchParams = void 0;
+    exports2.toURLSearchParams = toURLSearchParams;
     var js_base64_1 = require_base642();
     function flattenParams(data, path = "") {
       const params = {};
@@ -6276,7 +6309,6 @@ var require_flatten_params = __commonJS({
         }, new URLSearchParams());
       }
     }
-    exports2.toURLSearchParams = toURLSearchParams;
   }
 });
 
@@ -6317,7 +6349,7 @@ var require_domain2 = __commonJS({
     (function(ConverterType2) {
       ConverterType2[ConverterType2["TO_JSON"] = 0] = "TO_JSON";
       ConverterType2[ConverterType2["FROM_JSON"] = 1] = "FROM_JSON";
-    })(ConverterType = exports2.ConverterType || (exports2.ConverterType = {}));
+    })(ConverterType || (exports2.ConverterType = ConverterType = {}));
   }
 });
 
@@ -6326,7 +6358,7 @@ var require_serializer = __commonJS({
   "../../node_modules/@wix/metro-runtime/cjs/build/serializer/serializer.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.schemaSerializer = void 0;
+    exports2.schemaSerializer = schemaSerializer;
     var index_js_1 = require_build();
     function schemaSerializer(rootSchema, depSchemas = {}, converterSets) {
       return function serialize(json = {}, converterType) {
@@ -6377,7 +6409,6 @@ var require_serializer = __commonJS({
         }
       };
     }
-    exports2.schemaSerializer = schemaSerializer;
   }
 });
 
@@ -6572,7 +6603,7 @@ var require_utils6 = __commonJS({
   "../../node_modules/@wix/metro-runtime/cjs/build/serializer/utils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.typeToConverterSet = void 0;
+    exports2.typeToConverterSet = typeToConverterSet;
     function typeToConverterSet(converterSets) {
       return converterSets.reduce((result, converterSet) => {
         const types = converterSet.types.reduce((typeResult, type) => {
@@ -6587,7 +6618,6 @@ var require_utils6 = __commonJS({
         };
       }, {});
     }
-    exports2.typeToConverterSet = typeToConverterSet;
   }
 });
 
@@ -6596,7 +6626,7 @@ var require_ambassador_index = __commonJS({
   "../../node_modules/@wix/metro-runtime/cjs/build/ambassador-index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.serializer = void 0;
+    exports2.serializer = serializer;
     var domain_js_1 = require_domain2();
     var serializer_js_1 = require_serializer();
     var converters_js_1 = require_converters();
@@ -6614,7 +6644,6 @@ var require_ambassador_index = __commonJS({
         }
       };
     }
-    exports2.serializer = serializer;
     function safeJsonParse(someString) {
       try {
         return JSON.parse(someString);
@@ -10540,6 +10569,41 @@ var require_wixTokenRefresh = __commonJS({
   }
 });
 
+// dist/experiments.js
+var require_experiments = __commonJS({
+  "dist/experiments.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.FILTERED_JOB_POLLING = void 0;
+    exports2.isExperimentEnabled = isExperimentEnabled;
+    var logger_12 = require_logger();
+    exports2.FILTERED_JOB_POLLING = "codegenFilteredJobPolling";
+    var parsedExperiments = null;
+    function getExperiments() {
+      if (parsedExperiments !== null) {
+        return parsedExperiments;
+      }
+      const raw = process.env.CODEGEN_EXPERIMENTS;
+      if (!raw) {
+        parsedExperiments = {};
+        return parsedExperiments;
+      }
+      try {
+        parsedExperiments = JSON.parse(raw);
+      } catch (error) {
+        logger_12.logger.error("[Experiments] Failed to parse CODEGEN_EXPERIMENTS", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+        parsedExperiments = {};
+      }
+      return parsedExperiments;
+    }
+    function isExperimentEnabled(specName) {
+      return getExperiments()[specName] === "true";
+    }
+  }
+});
+
 // ../codegen-types/dist/errors/ErrorTypes.js
 var require_ErrorTypes = __commonJS({
   "../codegen-types/dist/errors/ErrorTypes.js"(exports2) {
@@ -10957,7 +11021,7 @@ var require_CodeGenService = __commonJS({
   "dist/services/CodeGenService.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.CodeGenService = exports2.TaskKind = exports2.Status = void 0;
+    exports2.CodeGenService = exports2.JobsSortOrder = exports2.TaskKind = exports2.Status = void 0;
     exports2.createCodeGenErrorHandler = createCodeGenErrorHandler;
     var http_client_1 = require_index_node();
     var http_1 = require_http_impl();
@@ -10969,7 +11033,11 @@ var require_CodeGenService = __commonJS({
     Object.defineProperty(exports2, "TaskKind", { enumerable: true, get: function() {
       return types_1.TaskKind;
     } });
+    Object.defineProperty(exports2, "JobsSortOrder", { enumerable: true, get: function() {
+      return types_1.JobsSortOrder;
+    } });
     var logger_12 = require_logger();
+    var experiments_1 = require_experiments();
     var ditto_codegen_types_12 = require_dist4();
     var FILE_OPERATION = {
       [ditto_codegen_types_12.ExtensionGenerationOperation.INSERT]: types_1.FileOperation.INSERT,
@@ -11059,11 +11127,16 @@ var require_CodeGenService = __commonJS({
           }
         };
         this.fetchPendingJobs = async () => {
-          const resp = await this.request((0, http_1.listProjectJobs)({
-            projectId: this.projectId
-          }));
+          const { sandboxId } = this;
+          const filtered = sandboxId && (0, experiments_1.isExperimentEnabled)(experiments_1.FILTERED_JOB_POLLING) ? {
+            projectId: this.projectId,
+            filter: { status: types_1.Status.PENDING, sandboxId },
+            paging: { limit: 1 },
+            sortOrder: types_1.JobsSortOrder.CREATED_AT_ASC
+          } : void 0;
+          const resp = await this.request((0, http_1.listProjectJobs)(filtered ?? { projectId: this.projectId }));
           const jobs = resp.data?.jobs ?? [];
-          return jobs.filter(this.shouldProcessJob);
+          return filtered ? jobs : jobs.filter(this.shouldProcessJob);
         };
         this.shouldProcessJob = (job) => {
           if (job.status !== types_1.Status.PENDING)
@@ -11523,7 +11596,7 @@ var require_git_conflicts_prompt = __commonJS({
     var prompt_utils_1 = require_prompt_utils();
     function buildGitConflictsPrompt(history) {
       const { currentUserRequest } = (0, prompt_utils_1.extractUserRequestAndFilteredHistory)(history);
-      const base = "Fix all Git merge conflicts in the current project. Resolve every conflict marker (<<<<<<<, =======, >>>>>>>) so the code compiles correctly.";
+      const base = "Fix all Git merge conflicts in the current project. Resolve every git conflict marker so the code compiles correctly.";
       const sections = [
         base,
         currentUserRequest ? `Additional context from user: "${currentUserRequest}"` : "",
@@ -13124,6 +13197,59 @@ var require_http_impl3 = __commonJS({
   }
 });
 
+// ../../node_modules/@wix/ambassador-code-project-orchestrator-v1-code-project/cjs/build/types.impl.js
+var require_types_impl3 = __commonJS({
+  "../../node_modules/@wix/ambassador-code-project-orchestrator-v1-code-project/cjs/build/types.impl.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.TaskStatus = exports2.SyncStatus = exports2.DeploymentStatus = exports2.ConflictResolutionStrategy = exports2.CodeDeploymentStatus = exports2.CheckpointErrorType = void 0;
+    var CheckpointErrorType;
+    (function(CheckpointErrorType2) {
+      CheckpointErrorType2["CHECKPOINT_ERROR_TYPE_UNKNOWN"] = "CHECKPOINT_ERROR_TYPE_UNKNOWN";
+      CheckpointErrorType2["CHECKPOINT_ERROR_TYPE_USER"] = "CHECKPOINT_ERROR_TYPE_USER";
+      CheckpointErrorType2["CHECKPOINT_ERROR_TYPE_SYSTEM"] = "CHECKPOINT_ERROR_TYPE_SYSTEM";
+    })(CheckpointErrorType || (exports2.CheckpointErrorType = CheckpointErrorType = {}));
+    var CodeDeploymentStatus;
+    (function(CodeDeploymentStatus2) {
+      CodeDeploymentStatus2["CODE_DEPLOYMENT_STATUS_UNKNOWN"] = "CODE_DEPLOYMENT_STATUS_UNKNOWN";
+      CodeDeploymentStatus2["CODE_DEPLOYMENT_STATUS_IN_PROGRESS"] = "CODE_DEPLOYMENT_STATUS_IN_PROGRESS";
+      CodeDeploymentStatus2["CODE_DEPLOYMENT_STATUS_COMPLETED"] = "CODE_DEPLOYMENT_STATUS_COMPLETED";
+      CodeDeploymentStatus2["CODE_DEPLOYMENT_STATUS_FAILED"] = "CODE_DEPLOYMENT_STATUS_FAILED";
+    })(CodeDeploymentStatus || (exports2.CodeDeploymentStatus = CodeDeploymentStatus = {}));
+    var ConflictResolutionStrategy;
+    (function(ConflictResolutionStrategy2) {
+      ConflictResolutionStrategy2["CONFLICT_RESOLUTION_STRATEGY_UNKNOWN"] = "CONFLICT_RESOLUTION_STRATEGY_UNKNOWN";
+      ConflictResolutionStrategy2["OURS"] = "OURS";
+      ConflictResolutionStrategy2["THEIRS"] = "THEIRS";
+      ConflictResolutionStrategy2["AI"] = "AI";
+    })(ConflictResolutionStrategy || (exports2.ConflictResolutionStrategy = ConflictResolutionStrategy = {}));
+    var DeploymentStatus;
+    (function(DeploymentStatus2) {
+      DeploymentStatus2["UNKNOWN"] = "UNKNOWN";
+      DeploymentStatus2["BUILD_IN_PROGRESS"] = "BUILD_IN_PROGRESS";
+      DeploymentStatus2["BUILD_COMPLETED"] = "BUILD_COMPLETED";
+      DeploymentStatus2["BUILD_FAILED"] = "BUILD_FAILED";
+      DeploymentStatus2["ARCHIVED"] = "ARCHIVED";
+    })(DeploymentStatus || (exports2.DeploymentStatus = DeploymentStatus = {}));
+    var SyncStatus;
+    (function(SyncStatus2) {
+      SyncStatus2["SYNC_STATUS_UNKNOWN"] = "SYNC_STATUS_UNKNOWN";
+      SyncStatus2["SYNC_STATUS_IN_SYNC"] = "SYNC_STATUS_IN_SYNC";
+      SyncStatus2["SYNC_STATUS_OUT_OF_SYNC"] = "SYNC_STATUS_OUT_OF_SYNC";
+    })(SyncStatus || (exports2.SyncStatus = SyncStatus = {}));
+    var TaskStatus;
+    (function(TaskStatus2) {
+      TaskStatus2["UNKNOWN_TASK_STATUS"] = "UNKNOWN_TASK_STATUS";
+      TaskStatus2["NOT_STARTED"] = "NOT_STARTED";
+      TaskStatus2["RUNNING"] = "RUNNING";
+      TaskStatus2["COMPLETED"] = "COMPLETED";
+      TaskStatus2["FAILED"] = "FAILED";
+      TaskStatus2["CANCELLED"] = "CANCELLED";
+      TaskStatus2["NOT_EXECUTED"] = "NOT_EXECUTED";
+    })(TaskStatus || (exports2.TaskStatus = TaskStatus = {}));
+  }
+});
+
 // ../codegen-checkpoint-plugin/dist/checkpoint.js
 var require_checkpoint = __commonJS({
   "../codegen-checkpoint-plugin/dist/checkpoint.js"(exports2) {
@@ -13134,6 +13260,7 @@ var require_checkpoint = __commonJS({
     var path_1 = require("path");
     var http_1 = require_http_impl2();
     var http_2 = require_http_impl3();
+    var types_1 = require_types_impl3();
     var http_client_1 = require_index_node();
     var FALLBACK_COMMIT_MESSAGE = "Auto-save";
     var EML_MARKER = "generate-eml.ts";
@@ -13166,7 +13293,24 @@ var require_checkpoint = __commonJS({
         return message;
       return message.slice(0, MAX_COMMIT_MESSAGE_LENGTH - TRUNCATION_SUFFIX.length) + TRUNCATION_SUFFIX;
     };
+    var CHECKPOINT_CONFLICT_CODE = "CHECKPOINT_CONFLICT";
     var useCodeProjectOrchestrator = () => process.env.USE_CODE_PROJECT_ORCHESTRATOR === "true";
+    var collaboratorLiveSyncEnabled = () => process.env.STUDIO2_COLLABORATOR_LIVE_SYNC === "true";
+    var readApplicationErrorCode = (error) => {
+      if (!http_client_1.HttpClient.isHttpError(error))
+        return void 0;
+      const data = error.response?.data;
+      const code = data?.details?.applicationError?.code;
+      return typeof code === "string" ? code : void 0;
+    };
+    var isCheckpointConflict = (error) => readApplicationErrorCode(error) === CHECKPOINT_CONFLICT_CODE;
+    var readConflictedFiles = (error) => {
+      if (!http_client_1.HttpClient.isHttpError(error))
+        return [];
+      const data = error.response?.data;
+      const files = data?.details?.applicationError?.data?.files;
+      return Array.isArray(files) ? files.filter((file) => typeof file === "string") : [];
+    };
     var wasAuthorizationHeaderSent = (requestHeaders) => {
       if (typeof requestHeaders !== "object" || requestHeaders === null)
         return false;
@@ -13213,6 +13357,13 @@ var require_checkpoint = __commonJS({
         commitHash: resp.data?.checkpointId
       };
     };
+    var callResolveCheckpointConflict = async (client, siteBranchId) => {
+      const resp = await client.request((0, http_2.resolveCheckpointConflict)({
+        siteBranchId,
+        strategy: types_1.ConflictResolutionStrategy.AI
+      }));
+      return resp.data?.jobId ?? void 0;
+    };
     var readToolCommitMessage = (input) => {
       if (typeof input !== "object" || input === null)
         return void 0;
@@ -13257,6 +13408,45 @@ var require_checkpoint = __commonJS({
             commitMessage
           });
         } catch (error) {
+          if (useCodeProjectOrchestrator() && collaboratorLiveSyncEnabled() && job.siteBranchId && isCheckpointConflict(error)) {
+            const files = readConflictedFiles(error);
+            try {
+              const conflictResolutionJobId = await callResolveCheckpointConflict(orchestratorHttpClient, job.siteBranchId);
+              if (!conflictResolutionJobId) {
+                throw new Error("resolveCheckpointConflict returned no conflict resolution job id");
+              }
+              outcome = {
+                status: "resolvingGitConflicts",
+                conflictResolutionJobId,
+                conflictedFiles: files
+              };
+              await host.jobs.updatePayload({ jobId: job.jobId, taskId: job.taskId }, {
+                checkpointStatus: "resolvingGitConflicts",
+                conflictResolutionJobId,
+                conflictedFiles: files
+              }).catch((payloadError) => {
+                host.logger.warn("[Checkpoint] failed to publish the resolving-conflicts state", {
+                  projectId: job.projectId,
+                  conflictResolutionJobId,
+                  error: payloadError instanceof Error ? payloadError.message : String(payloadError)
+                });
+              });
+              host.logger.info("[Checkpoint] git conflicts handed to AI resolution", {
+                projectId: job.projectId,
+                siteBranchId: job.siteBranchId,
+                conflictResolutionJobId,
+                files
+              });
+              return;
+            } catch (resolveError) {
+              host.logger.error("[Checkpoint] git conflict resolution dispatch failed", {
+                projectId: job.projectId,
+                siteBranchId: job.siteBranchId,
+                files,
+                error: resolveError instanceof Error ? resolveError.message : String(resolveError)
+              });
+            }
+          }
           outcome = { status: "failed", error };
           host.logger.error("[Checkpoint] create failed", {
             projectId: job.projectId,
@@ -13302,6 +13492,8 @@ var require_checkpoint = __commonJS({
             throw outcome.error;
           if (outcome?.status === "created")
             return;
+          if (outcome?.status === "resolvingGitConflicts")
+            return;
           if (codegenFailed)
             return;
           const commitMessage = capturedCommitMessage ?? FALLBACK_COMMIT_MESSAGE;
@@ -15148,9 +15340,9 @@ UNDERSTAND INTENT FIRST:
 - When the change is non-trivial, inspect recent history to learn what the incoming branch refactored: \`git log -p -n 3 -- <file>\` and \`git diff\` are READ-ONLY and safe. NEVER run \`git merge\`, \`git rebase\`, \`git checkout\`, \`git reset\`, \`git add\`, or \`git commit\` \u2014 only the agent's edit tools change files; git state is managed by the host.
 
 CONFLICT RESOLUTION STRATEGY:
-- Identify all files containing conflict markers: <<<<<<<, =======, >>>>>>>
-- The HEAD (OURS) section (between <<<<<<< and =======) represents the current branch's changes \u2014 preserve this code.
-- The incoming (THEIRS) section (between ======= and >>>>>>>) represents the changes being merged in.
+- Identify all files containing git conflict markers.
+- The HEAD (OURS) section \u2014 the first side of the conflict \u2014 represents the current branch's changes; preserve this code.
+- The incoming (THEIRS) section \u2014 the second side \u2014 represents the changes being merged in.
 - Resolve each conflict by merging both sides logically \u2014 judge by SEMANTIC meaning, not line-by-line text:
   - If both sides add independent, non-overlapping code \u2014 include both.
   - If they modify the same logic \u2014 prefer HEAD (OURS) and incorporate non-conflicting parts from THEIRS.
@@ -15173,7 +15365,7 @@ ${(0, shared_rules_1.buildFileOperationsRules)("resolving conflicts")}
 - NEVER run preview, dev, release, or promote commands.
 
 WORKFLOW:
-1. **Find**: Use \`grep\` to locate all files containing "<<<<<<<".
+1. **Find**: Use \`grep\` to locate every file containing git conflict markers, searching the whole project \u2014 any files named in the request are only a hint.
 2. **Resolve**: Read (\`batch-read\`) and fix all conflicts using \`multi-edit\`. Do NOT add new logic \u2014 only remove markers and merge the two sides.
 3. **Verify markers**: Run \`grep\` again to confirm zero conflict markers remain.
 4. **Validate**: Run \`validate\` (typecheck only). Fix any errors and re-validate until tsc passes, then run \`validate({ runBuild: true })\` ONCE to confirm the resolution did not break the build. Pass \`installDeps: true\` ONLY when \`package.json\` changed without already running \`npm install <package-name>\` in this iteration; otherwise omit it (node_modules is pre-installed).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.433",
+  "version": "1.0.435",
   "description": "AI-powered Wix CLI app generator - standalone executable",
   "scripts": {
     "build": "node build.mjs",
@@ -29,5 +29,5 @@
     "esbuild": "^0.27.2",
     "vitest": "^4.0.16"
   },
-  "falconPackageHash": "1601a0c2e0fc0a29a1d23a9101dd1760a021d72adbd91767267f436d"
+  "falconPackageHash": "c800cf38305a8152baff949db90fba6913ed33954d9af629d14ee2a5"
 }