@wix/ditto-codegen-public 1.0.436 → 1.0.437

package/dist/out.js

@@ -13294,6 +13294,7 @@ var require_checkpoint = __commonJS({
       return message.slice(0, MAX_COMMIT_MESSAGE_LENGTH - TRUNCATION_SUFFIX.length) + TRUNCATION_SUFFIX;
     };
     var CHECKPOINT_CONFLICT_CODE = "CHECKPOINT_CONFLICT";
+    var FIX_GIT_CONFLICTS_TASK_KIND = "FIX_GIT_CONFLICTS";
     var useCodeProjectOrchestrator = () => process.env.USE_CODE_PROJECT_ORCHESTRATOR === "true";
     var collaboratorLiveSyncEnabled = () => process.env.STUDIO2_COLLABORATOR_LIVE_SYNC === "true";
     var readApplicationErrorCode = (error) => {
@@ -13410,41 +13411,49 @@ var require_checkpoint = __commonJS({
         } 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", {
+            if (job.kind === FIX_GIT_CONFLICTS_TASK_KIND) {
+              host.logger.warn("[Checkpoint] conflict during a conflict-resolution run, skipping resolve", {
                 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)
-              });
+            } else {
+              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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.436",
+  "version": "1.0.437",
   "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": "41733ebfdb6e0790cdf0ddfb2bf8ab3c16812a1d07a04394b28d2553"
+  "falconPackageHash": "fa7b527ce78aed885889951926ab8c492e1b9f58e57ba82962990fbf"
 }