@wix/ditto-codegen-public 1.0.435 → 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 };
@@ -17449,36 +17458,6 @@ var require_OpenCodeOrchestrator = __commonJS({
   }
 });
 
-// dist/flows/codegen-flow-helpers.js
-var require_codegen_flow_helpers = __commonJS({
-  "dist/flows/codegen-flow-helpers.js"(exports2) {
-    "use strict";
-    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.updateJobPayload = updateJobPayload;
-    exports2.updateParentTaskStatus = updateParentTaskStatus;
-    exports2.getOutputPath = getOutputPath;
-    var path_1 = __importDefault2(require("path"));
-    var codeGenerationService_12 = require_codeGenerationService();
-    var utils_1 = require_utils9();
-    var DEFAULT_OUTPUT_PATH = "generated-app";
-    async function updateJobPayload(jobContext, payload) {
-      await codeGenerationService_12.codeGenerationService.updateJob(jobContext.jobId, payload);
-    }
-    async function updateParentTaskStatus(jobContext, status, error) {
-      await codeGenerationService_12.codeGenerationService.updateTask(jobContext.jobId, jobContext.taskId, status, {
-        ...error ? { error: (0, utils_1.serializeError)(error) } : {}
-      });
-    }
-    function getOutputPath() {
-      const outputDir = process.env.OUTPUT_PATH || DEFAULT_OUTPUT_PATH;
-      return outputDir.startsWith("/") ? outputDir : path_1.default.join(process.cwd(), outputDir);
-    }
-  }
-});
-
 // dist/flows/agent-io.js
 var require_agent_io = __commonJS({
   "dist/flows/agent-io.js"(exports2) {
@@ -17539,6 +17518,51 @@ var require_agent_io = __commonJS({
   }
 });
 
+// dist/flows/codegen-flow-helpers.js
+var require_codegen_flow_helpers = __commonJS({
+  "dist/flows/codegen-flow-helpers.js"(exports2) {
+    "use strict";
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.updateJobPayload = updateJobPayload;
+    exports2.buildFailedRunPayload = buildFailedRunPayload;
+    exports2.updateParentTaskStatus = updateParentTaskStatus;
+    exports2.getOutputPath = getOutputPath;
+    var path_1 = __importDefault2(require("path"));
+    var codeGenerationService_12 = require_codeGenerationService();
+    var git_file_changes_1 = require_git_file_changes();
+    var collect_extensions_created_1 = require_collect_extensions_created();
+    var agent_io_1 = require_agent_io();
+    var utils_1 = require_utils9();
+    var DEFAULT_OUTPUT_PATH = "generated-app";
+    async function updateJobPayload(jobContext, payload) {
+      await codeGenerationService_12.codeGenerationService.updateJob(jobContext.jobId, payload);
+    }
+    async function buildFailedRunPayload(error, outputPath, gitBaseline) {
+      const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
+      const extensions = await (0, collect_extensions_created_1.buildExtensionsJobPayload)(outputPath, files);
+      return {
+        requiredPermissions: [],
+        error,
+        files,
+        ...(0, agent_io_1.readAgentOutput)(outputPath),
+        extensions
+      };
+    }
+    async function updateParentTaskStatus(jobContext, status, error) {
+      await codeGenerationService_12.codeGenerationService.updateTask(jobContext.jobId, jobContext.taskId, status, {
+        ...error ? { error: (0, utils_1.serializeError)(error) } : {}
+      });
+    }
+    function getOutputPath() {
+      const outputDir = process.env.OUTPUT_PATH || DEFAULT_OUTPUT_PATH;
+      return outputDir.startsWith("/") ? outputDir : path_1.default.join(process.cwd(), outputDir);
+    }
+  }
+});
+
 // dist/opencode-integration/inject-created-by.js
 var require_inject_created_by = __commonJS({
   "dist/opencode-integration/inject-created-by.js"(exports2) {
@@ -22692,6 +22716,7 @@ var require_opencode_init = __commonJS({
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
       const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
+      store.gitBaseline = gitBaseline;
       const orchestrator = new OpenCodeOrchestrator_1.OpenCodeOrchestrator();
       let caughtError;
       try {
@@ -22752,16 +22777,8 @@ var require_opencode_init = __commonJS({
       } catch (error) {
         caughtError = error;
         const codegenError = (0, ditto_codegen_types_2.toCodegenError)(error);
-        const agentOutput = (0, agent_io_1.readAgentOutput)(outputPath);
-        const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
-        const extensions = await (0, collect_extensions_created_1.buildExtensionsJobPayload)(outputPath, files);
-        await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
-          requiredPermissions: [],
-          error: codegenError,
-          files,
-          ...agentOutput,
-          extensions
-        });
+        const failedRunPayload = await (0, codegen_flow_helpers_12.buildFailedRunPayload)(codegenError, outputPath, gitBaseline);
+        await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, failedRunPayload);
         await (0, codegen_flow_helpers_12.updateParentTaskStatus)(localJobContext, ditto_codegen_types_12.Status.FAILED, codegenError);
         const taskCost = orchestrator.lastUsage ? Math.round(orchestrator.lastUsage.cost * 1e6) : void 0;
         await (0, biEvents_1.reportSessionEnd)({
@@ -22770,7 +22787,7 @@ var require_opencode_init = __commonJS({
           taskType: kind,
           taskCost,
           taskStatus: ditto_codegen_types_12.Status.FAILED,
-          agentOutput: JSON.stringify({ files }),
+          agentOutput: JSON.stringify({ files: failedRunPayload.files }),
           jobDuration: String(Date.now() - flowStartTime)
         });
         await (0, biEvents_1.reportSessionError)({
@@ -22906,6 +22923,7 @@ var require_opencode_iterate = __commonJS({
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
       const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
+      store.gitBaseline = gitBaseline;
       const iterationOrchestrator = new OpenCodeIterationOrchestrator_1.OpenCodeIterationOrchestrator();
       let caughtError;
       try {
@@ -22956,16 +22974,8 @@ var require_opencode_iterate = __commonJS({
       } catch (error) {
         caughtError = error;
         const codegenError = (0, ditto_codegen_types_2.toCodegenError)(error);
-        const agentOutput = (0, agent_io_1.readAgentOutput)(outputPath);
-        const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
-        const extensions = await (0, collect_extensions_created_1.buildExtensionsJobPayload)(outputPath, files);
-        await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
-          requiredPermissions: [],
-          error: codegenError,
-          files,
-          ...agentOutput,
-          extensions
-        });
+        const failedRunPayload = await (0, codegen_flow_helpers_12.buildFailedRunPayload)(codegenError, outputPath, gitBaseline);
+        await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, failedRunPayload);
         await (0, codegen_flow_helpers_12.updateParentTaskStatus)(localJobContext, ditto_codegen_types_12.Status.FAILED, codegenError);
         const taskCost = iterationOrchestrator.lastUsage ? Math.round(iterationOrchestrator.lastUsage.cost * 1e6) : void 0;
         await (0, biEvents_1.reportSessionEnd)({
@@ -22974,7 +22984,7 @@ var require_opencode_iterate = __commonJS({
           taskType: kind,
           taskCost,
           taskStatus: ditto_codegen_types_12.Status.FAILED,
-          agentOutput: JSON.stringify({ files }),
+          agentOutput: JSON.stringify({ files: failedRunPayload.files }),
           jobDuration: String(Date.now() - flowStartTime)
         });
         await (0, biEvents_1.reportSessionError)({
@@ -23104,6 +23114,7 @@ var require_opencode_ask = __commonJS({
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
       const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
+      store.gitBaseline = gitBaseline;
       const askOrchestrator = new OpenCodeAskOrchestrator_1.OpenCodeAskOrchestrator();
       try {
         (0, cli_listeners_1.attachOrchestratorListeners)(askOrchestrator);
@@ -23284,6 +23295,7 @@ var require_opencode_fix_git_conflicts = __commonJS({
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
       const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
+      store.gitBaseline = gitBaseline;
       const orchestrator = new OpenCodeGitConflictsOrchestrator_1.OpenCodeGitConflictsOrchestrator();
       let caughtError;
       try {
@@ -23459,6 +23471,7 @@ var require_job_timeout_monitor = __commonJS({
     var logger_12 = require_logger();
     var context_12 = require_context();
     var job_context_storage_12 = require_job_context_storage();
+    var codegen_flow_helpers_12 = require_codegen_flow_helpers();
     var types_1 = require_types_impl();
     var biEvents_1 = require_biEvents();
     exports2.JOB_TIMEOUT_MS = 1e3 * 60 * 20;
@@ -23486,31 +23499,30 @@ var require_job_timeout_monitor = __commonJS({
         });
         try {
           logger_12.logger.info("[Job] Timeout detected, exiting", logContext);
-          const codegenError = await this.resolveTimeoutError(jobId);
+          const job = await this.codeGenerationService.getJob(jobId);
+          const codegenError = this.resolveTimeoutError(jobId, job);
           await (0, utils_1.updateAllRunningTasks)(jobId, ditto_codegen_types_12.Status.FAILED, codegenError);
-          await this.codeGenerationService.markJobAsCompleted(jobId);
-          logger_12.logger.info("[Job] Marked job as completed, failed all running tasks", logContext);
+          await this.codeGenerationService.updateJobStatus(jobId, ditto_codegen_types_12.Status.FAILED);
+          const failedRunPayload = await (0, codegen_flow_helpers_12.buildFailedRunPayload)(codegenError, (0, codegen_flow_helpers_12.getOutputPath)(), job_context_storage_12.jobContextStorage.getStore()?.gitBaseline ?? "");
+          await this.codeGenerationService.updateJob(jobId, {
+            ...job?.payload,
+            ...failedRunPayload
+          });
+          logger_12.logger.info("[Job] Marked job as failed, failed all running tasks", logContext);
           await this.reportTimeoutBi(jobId, codegenError);
           process.exit();
         } catch (error) {
-          logger_12.logger.error("[Job] Failed to mark timed-out job as completed", {
+          logger_12.logger.error("[Job] Failed to mark timed-out job as failed", {
             ...logContext,
             error: error instanceof Error ? error.message : String(error)
           });
+          throw error;
         }
       }
-      async resolveTimeoutError(jobId) {
-        try {
-          const job = await this.codeGenerationService.getJob(jobId);
-          const pendingDecision = job?.pendingUserDecisions?.find((decision) => !decision.response?.selectedOptionId);
-          if (pendingDecision?.id) {
-            return new ditto_codegen_types_12.UserDecisionTimeoutError(jobId, pendingDecision.id);
-          }
-        } catch (error) {
-          logger_12.logger.warn("[Job] Could not determine timeout error type", {
-            jobId,
-            error: error instanceof Error ? error.message : String(error)
-          });
+      resolveTimeoutError(jobId, job) {
+        const pendingDecision = job?.pendingUserDecisions?.find((decision) => !decision.response?.selectedOptionId);
+        if (pendingDecision?.id) {
+          return new ditto_codegen_types_12.UserDecisionTimeoutError(jobId, pendingDecision.id);
         }
         return new ditto_codegen_types_12.TimeoutError(`Job exceeded timeout of ${exports2.JOB_TIMEOUT_MS}ms`);
       }

package/package.json

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