@wix/ditto-codegen-public 1.0.433 → 1.0.434

package/dist/out.js

@@ -11523,7 +11523,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 +13124,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 +13187,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 +13220,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 +13284,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 +13335,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 +13419,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 +15267,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 +15292,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.434",
   "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": "b849b4780b251c081a437506b4ded2164211e1e078b19bd3e61e64b7"
 }