@wix/ditto-codegen-public 1.0.60 → 1.0.62

package/dist/out.js

@@ -123219,22 +123219,26 @@ var require_PlannerAgent = __commonJS({
       buildSystemPrompt(hasEmbeddedScriptExtensions, hasBackendApiExtensions) {
         return (0, planner_1.plannerPrompt)(hasEmbeddedScriptExtensions, hasBackendApiExtensions);
       }
-      async generate(blueprint) {
-        const model = (0, anthropic_1.createAnthropic)({ apiKey: this.apiKey })("claude-3-5-haiku-latest");
-        const hasEmbeddedScriptExtensions = blueprint?.extensions?.some((ext) => ext.type === types_1.ExtensionType.EMBEDDED_SCRIPT) ?? false;
-        const hasBackendApiExtensions = blueprint?.extensions?.some((ext) => ext.type === types_1.ExtensionType.BACKEND_API) ?? false;
+      async generatePlan(systemPrompt, blueprint, model, error) {
+        const userContent = `
+    ${JSON.stringify(blueprint, null, 2)}
+    ${error ? `
+
+The previous attempt failed with the following error:
+${error}` : ""}
+    `;
         const result = await (0, ai_1.generateObject)({
           model,
           schema: exports2.PlannerOutputSchema,
           messages: [
             {
               role: "system",
-              content: this.buildSystemPrompt(hasEmbeddedScriptExtensions, hasBackendApiExtensions),
+              content: systemPrompt,
               providerOptions: (0, utils_1.withCaching)("1h")
             },
             {
               role: "user",
-              content: JSON.stringify(blueprint ?? {}, null, 2)
+              content: userContent
             }
           ],
           maxRetries: 3,
@@ -123246,6 +123250,24 @@ var require_PlannerAgent = __commonJS({
         });
         return result.object;
       }
+      async generate(blueprint) {
+        const model = (0, anthropic_1.createAnthropic)({ apiKey: this.apiKey })("claude-3-5-haiku-latest");
+        const hasEmbeddedScriptExtensions = blueprint?.extensions?.some((ext) => ext.type === types_1.ExtensionType.EMBEDDED_SCRIPT) ?? false;
+        const hasBackendApiExtensions = blueprint?.extensions?.some((ext) => ext.type === types_1.ExtensionType.BACKEND_API) ?? false;
+        const systemPrompt = this.buildSystemPrompt(hasEmbeddedScriptExtensions, hasBackendApiExtensions);
+        let lastError;
+        for (let i = 0; i < 3; i++) {
+          try {
+            const result = await this.generatePlan(systemPrompt, blueprint, model, lastError);
+            return result;
+          } catch (error) {
+            lastError = (0, utils_1.getErrorMessage)(error);
+            console.error(`Error generating plan (attempt ${i + 1}): ${error}`);
+            continue;
+          }
+        }
+        throw new Error("Failed to generate plan after 3 attempts");
+      }
     };
     exports2.PlannerAgent = PlannerAgent;
     exports2.default = PlannerAgent;
@@ -137941,6 +137963,49 @@ var require_file_collector = __commonJS({
   }
 });
 
+// dist/orchestrator-error-helpers.js
+var require_orchestrator_error_helpers = __commonJS({
+  "dist/orchestrator-error-helpers.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.createExtensionErrorHandler = createExtensionErrorHandler;
+    exports2.throwIfFailures = throwIfFailures;
+    function createExtensionErrorHandler(orchestrator, extension) {
+      return (error) => {
+        const errorObj = error instanceof Error ? error : new Error(String(error));
+        orchestrator.emitEvent("agent:error", {
+          extension,
+          error: errorObj
+        });
+        console.error(`\u274C Failed to process extension ${extension.name}:`, error);
+        throw error;
+      };
+    }
+    function throwIfFailures(results, errorMessagePrefix) {
+      const failures = results.map((result, index) => {
+        if (result.status === "rejected") {
+          return {
+            index,
+            error: result.reason
+          };
+        }
+        return null;
+      }).filter((f) => f !== null);
+      if (failures.length > 0) {
+        const errorMessages = failures.map((f) => `Task ${f.index} failed: ${f.error instanceof Error ? f.error.message : String(f.error)}`);
+        const message = errorMessagePrefix ? `${errorMessagePrefix}
+${errorMessages.join("\n")}` : `Failed to process ${failures.length} of ${results.length} parallel tasks:
+${errorMessages.join("\n")}`;
+        const aggregatedError = new Error(message);
+        if (failures[0]?.error instanceof Error) {
+          aggregatedError.stack = failures[0].error.stack;
+        }
+        throw aggregatedError;
+      }
+    }
+  }
+});
+
 // dist/orchestrator.js
 var require_orchestrator = __commonJS({
   "dist/orchestrator.js"(exports2) {
@@ -137961,6 +138026,7 @@ var require_orchestrator = __commonJS({
     var extensionGenerators_1 = require_extensionGenerators();
     var extensionIndexer_1 = require_extensionIndexer();
     var file_collector_1 = require_file_collector();
+    var orchestrator_error_helpers_1 = require_orchestrator_error_helpers();
     var MAX_ERRORS_PER_BATCH = 20;
     var DittoOrchestrator = class extends events_1.EventEmitter {
       constructor(agentsFactory, apiKey) {
@@ -138322,7 +138388,8 @@ var require_orchestrator = __commonJS({
             outputPath
           });
         });
-        await Promise.all(parallelTasks);
+        const results = await Promise.allSettled(parallelTasks);
+        (0, orchestrator_error_helpers_1.throwIfFailures)(results);
       }
       async processIterationExtension({ extension, paths, relevantUserRequest, outputPath, newExtension }) {
         if (newExtension) {
@@ -138415,12 +138482,13 @@ var require_orchestrator = __commonJS({
           blueprint,
           outputPath,
           planAndResources
-        }));
+        }).catch((0, orchestrator_error_helpers_1.createExtensionErrorHandler)(this, extension)));
         const collections = planAndResources.createdCollections ?? [];
         if (collections.length > 0 && siteId && siteId !== "N/A" && accessToken) {
           parallelTasks.push(this.generateCMSData(request, collections));
         }
-        await Promise.all(parallelTasks.filter(Boolean));
+        const results = await Promise.allSettled(parallelTasks.filter(Boolean));
+        (0, orchestrator_error_helpers_1.throwIfFailures)(results);
         await (0, extensionIndexer_1.generateMainExtensionsFile)(outputPath);
         const durationMsCodeGeneration = Date.now() - start;
         this.emitEvent("finish:code-generation", {
@@ -138451,7 +138519,7 @@ var require_orchestrator = __commonJS({
             relevantUserRequest: iterationPlan.summary,
             outputPath,
             newExtension: true
-          });
+          }).catch((0, orchestrator_error_helpers_1.createExtensionErrorHandler)(this, extension.extension));
         }) || [];
         if (iterationPlan?.currentExtensions && iterationPlan.currentExtensions.length > 0) {
           parallelTasks.push(...iterationPlan.currentExtensions.map((extension) => {
@@ -138461,10 +138529,11 @@ var require_orchestrator = __commonJS({
               relevantUserRequest: iterationPlan.summary,
               outputPath,
               newExtension: false
-            });
+            }).catch((0, orchestrator_error_helpers_1.createExtensionErrorHandler)(this, extension.extension));
           }));
         }
-        await Promise.all(parallelTasks.filter(Boolean));
+        const results = await Promise.allSettled(parallelTasks.filter(Boolean));
+        (0, orchestrator_error_helpers_1.throwIfFailures)(results);
         await (0, extensionIndexer_1.generateMainExtensionsFile)(outputPath);
         const durationMsCodeGeneration = Date.now() - start;
         this.emitEvent("finish:code-generation", {
@@ -138568,52 +138637,88 @@ ${unfixedValidationErrors}`;
   }
 });
 
-// dist/flows/init-codegen.js
-var require_init_codegen = __commonJS({
-  "dist/flows/init-codegen.js"(exports2) {
+// 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(mod2) {
       return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.runInitCodegenFlow = void 0;
+    exports2.setupAgentTaskTracking = setupAgentTaskTracking;
+    exports2.updateParentTaskStatus = updateParentTaskStatus;
+    exports2.getOutputPath = getOutputPath;
     var path_1 = __importDefault2(require("path"));
     var __1 = require_index();
-    var AgentsFactory_1 = require_AgentsFactory();
-    var cli_listeners_1 = require_cli_listeners();
-    var context_1 = require_context();
-    var job_context_storage_1 = require_job_context_storage();
     var orchestrator_1 = require_orchestrator();
     var CodeGenService_1 = require_CodeGenService();
     var utils_1 = require_utils18();
     var slugify = (str = "") => {
       return str.toLowerCase().replace(/ /g, "-");
     };
+    function setupAgentTaskTracking(orchestrator, jobContext) {
+      const getTaskId = (extension) => {
+        return `${jobContext.taskId}-${slugify(extension.name)}`;
+      };
+      orchestrator.onEvent("agent:start", ({ extension }) => {
+        console.log(`[Agent] start: ${extension.name}`);
+        const taskId = getTaskId(extension);
+        __1.codeGenerationService.addTask(jobContext.jobId, {
+          id: taskId,
+          kind: "run_agent",
+          status: CodeGenService_1.TaskStatus.RUNNING,
+          name: "run_agent",
+          description: `Run agent for ${extension.name}`,
+          payload: { extension }
+        });
+      });
+      orchestrator.onEvent("agent:done", ({ extension, files }) => {
+        console.log(`[Agent] done: ${extension.name}`);
+        const taskId = getTaskId(extension);
+        __1.codeGenerationService.updateTask(jobContext.jobId, taskId, CodeGenService_1.TaskStatus.COMPLETED, { taskOutput: { files } });
+      });
+      orchestrator.onEvent("agent:error", async ({ extension, error }) => {
+        console.error(`[Agent] error: ${extension.name}`, error);
+        const taskId = getTaskId(extension);
+        await __1.codeGenerationService.updateTask(jobContext.jobId, taskId, CodeGenService_1.TaskStatus.FAILED, {
+          error: (0, utils_1.serializeError)(error)
+        });
+      });
+    }
+    async function updateParentTaskStatus(jobContext, status, error) {
+      await __1.codeGenerationService.updateTask(jobContext.jobId, jobContext.taskId, status, error ? { error: (0, utils_1.serializeError)(error) } : {});
+    }
+    function getOutputPath() {
+      const outputDir = process.env.OUTPUT_PATH || orchestrator_1.DittoOrchestrator.DEFAULT_OUTPUT_PATH;
+      return outputDir.startsWith("/") ? outputDir : path_1.default.join(process.cwd(), outputDir);
+    }
+  }
+});
+
+// dist/flows/init-codegen.js
+var require_init_codegen = __commonJS({
+  "dist/flows/init-codegen.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.runInitCodegenFlow = void 0;
+    var __1 = require_index();
+    var AgentsFactory_1 = require_AgentsFactory();
+    var cli_listeners_1 = require_cli_listeners();
+    var context_1 = require_context();
+    var job_context_storage_1 = require_job_context_storage();
+    var orchestrator_1 = require_orchestrator();
+    var CodeGenService_1 = require_CodeGenService();
+    var codegen_flow_helpers_1 = require_codegen_flow_helpers();
     var runInitCodegenFlow = async (blueprint) => {
       const localJobContext = job_context_storage_1.jobContextStorage.getStore();
       console.log(`[Init] Starting init codegen task: jobId=${localJobContext?.jobId}, taskId=${localJobContext?.taskId}`);
       await __1.codeGenerationService.updateTask(localJobContext.jobId, localJobContext.taskId, CodeGenService_1.TaskStatus.RUNNING, {});
       console.log(`[Init] Marked task RUNNING: jobId=${localJobContext.jobId}, taskId=${localJobContext.taskId}`);
       try {
-        const outputDir = process.env.OUTPUT_PATH || orchestrator_1.DittoOrchestrator.DEFAULT_OUTPUT_PATH;
-        const outputPath = outputDir.startsWith("/") ? outputDir : path_1.default.join(process.cwd(), outputDir);
+        const outputPath = (0, codegen_flow_helpers_1.getOutputPath)();
         const agentsFactory = new AgentsFactory_1.AgentsFactory(context_1.ctx?.apiKey);
         const orchestrator = new orchestrator_1.DittoOrchestrator(agentsFactory, context_1.ctx?.apiKey);
-        orchestrator.onEvent("agent:start", ({ extension }) => {
-          console.log(`[Agent] start: ${extension.name}`);
-          __1.codeGenerationService.addTask(localJobContext.jobId, {
-            id: `${localJobContext.taskId}-${slugify(extension.name)}`,
-            kind: "run_agent",
-            status: CodeGenService_1.TaskStatus.RUNNING,
-            name: "run_agent",
-            description: `Run agent for ${extension.name}`,
-            payload: { extension }
-          });
-        });
-        orchestrator.onEvent("agent:done", ({ extension, files }) => {
-          console.log(`[Agent] done: ${extension.name}`);
-          __1.codeGenerationService.updateTask(localJobContext.jobId, `${localJobContext.taskId}-${slugify(extension.name)}`, CodeGenService_1.TaskStatus.COMPLETED, { taskOutput: { files } });
-        });
+        (0, codegen_flow_helpers_1.setupAgentTaskTracking)(orchestrator, localJobContext);
         (0, cli_listeners_1.attachOrchestratorListeners)(orchestrator);
         await orchestrator.generateCode({
           blueprint,
@@ -138621,12 +138726,10 @@ var require_init_codegen = __commonJS({
           siteId: context_1.ctx.siteId,
           accessToken: context_1.ctx.accessToken
         });
-        await __1.codeGenerationService.updateTask(localJobContext.jobId, localJobContext.taskId, CodeGenService_1.TaskStatus.COMPLETED, {});
+        await (0, codegen_flow_helpers_1.updateParentTaskStatus)(localJobContext, CodeGenService_1.TaskStatus.COMPLETED);
         console.log(`[Init] Completed init codegen task: jobId=${localJobContext.jobId}, taskId=${localJobContext.taskId}`);
       } catch (error) {
-        await __1.codeGenerationService.updateTask(localJobContext.jobId, localJobContext.taskId, CodeGenService_1.TaskStatus.FAILED, {
-          error: (0, utils_1.serializeError)(error)
-        });
+        await (0, codegen_flow_helpers_1.updateParentTaskStatus)(localJobContext, CodeGenService_1.TaskStatus.FAILED, error);
         console.error(`\u274C [Init] Failed init codegen task: jobId=${localJobContext.jobId}, taskId=${localJobContext.taskId}`, error);
       }
     };
@@ -138638,12 +138741,8 @@ var require_init_codegen = __commonJS({
 var require_iterate_codegen = __commonJS({
   "dist/flows/iterate-codegen.js"(exports2) {
     "use strict";
-    var __importDefault2 = exports2 && exports2.__importDefault || function(mod2) {
-      return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
-    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.runIterateCodegenFlow = void 0;
-    var path_1 = __importDefault2(require("path"));
     var __1 = require_index();
     var AgentsFactory_1 = require_AgentsFactory();
     var cli_listeners_1 = require_cli_listeners();
@@ -138651,35 +138750,17 @@ var require_iterate_codegen = __commonJS({
     var job_context_storage_1 = require_job_context_storage();
     var orchestrator_1 = require_orchestrator();
     var CodeGenService_1 = require_CodeGenService();
-    var utils_1 = require_utils18();
-    var slugify = (str = "") => {
-      return str.toLowerCase().replace(/ /g, "-");
-    };
+    var codegen_flow_helpers_1 = require_codegen_flow_helpers();
     var runIterateCodegenFlow = async (chatHistory) => {
       const localJobContext = job_context_storage_1.jobContextStorage.getStore();
       console.log(`[Iterate] Starting iterate codegen task: jobId=${localJobContext?.jobId}, taskId=${localJobContext?.taskId}`);
       await __1.codeGenerationService.updateTask(localJobContext.jobId, localJobContext.taskId, CodeGenService_1.TaskStatus.RUNNING, {});
       console.log(`[Init] Marked task RUNNING: jobId=${localJobContext.jobId}, taskId=${localJobContext.taskId}`);
       try {
-        const outputDir = process.env.OUTPUT_PATH || orchestrator_1.DittoOrchestrator.DEFAULT_OUTPUT_PATH;
-        const outputPath = outputDir.startsWith("/") ? outputDir : path_1.default.join(process.cwd(), outputDir);
+        const outputPath = (0, codegen_flow_helpers_1.getOutputPath)();
         const agentsFactory = new AgentsFactory_1.AgentsFactory(context_1.ctx?.apiKey);
         const orchestrator = new orchestrator_1.DittoOrchestrator(agentsFactory, context_1.ctx?.apiKey);
-        orchestrator.onEvent("agent:start", ({ extension }) => {
-          console.log(`[Agent] start: ${extension.name}`);
-          __1.codeGenerationService.addTask(localJobContext.jobId, {
-            id: `${localJobContext.taskId}-${slugify(extension.name)}`,
-            kind: "run_agent",
-            status: CodeGenService_1.TaskStatus.RUNNING,
-            name: "run_agent",
-            description: `Run agent for ${extension.name}`,
-            payload: { extension }
-          });
-        });
-        orchestrator.onEvent("agent:done", ({ extension, files }) => {
-          console.log(`[Agent] done: ${extension.name}`);
-          __1.codeGenerationService.updateTask(localJobContext.jobId, `${localJobContext.taskId}-${slugify(extension.name)}`, CodeGenService_1.TaskStatus.COMPLETED, { taskOutput: { files } });
-        });
+        (0, codegen_flow_helpers_1.setupAgentTaskTracking)(orchestrator, localJobContext);
         (0, cli_listeners_1.attachOrchestratorListeners)(orchestrator);
         await orchestrator.generateIterationCode({
           chatHistory,
@@ -138687,13 +138768,11 @@ var require_iterate_codegen = __commonJS({
           siteId: context_1.ctx.siteId,
           accessToken: context_1.ctx.accessToken
         });
-        await __1.codeGenerationService.updateTask(localJobContext.jobId, localJobContext.taskId, CodeGenService_1.TaskStatus.COMPLETED, {});
+        await (0, codegen_flow_helpers_1.updateParentTaskStatus)(localJobContext, CodeGenService_1.TaskStatus.COMPLETED);
         console.log(`[Init] Completed iterate codegen task: jobId=${localJobContext.jobId}, taskId=${localJobContext.taskId}`);
       } catch (error) {
-        await __1.codeGenerationService.updateTask(localJobContext.jobId, localJobContext.taskId, CodeGenService_1.TaskStatus.FAILED, {
-          error: (0, utils_1.serializeError)(error)
-        });
-        console.error(`\u274C [Init] Failed iterate codegen task: jobId=${localJobContext.jobId}, taskId=${localJobContext.taskId}`, error);
+        await (0, codegen_flow_helpers_1.updateParentTaskStatus)(localJobContext, CodeGenService_1.TaskStatus.FAILED, error);
+        console.error(`\u274C [Iterate] Failed iterate codegen task: jobId=${localJobContext.jobId}, taskId=${localJobContext.taskId}`, error);
       }
     };
     exports2.runIterateCodegenFlow = runIterateCodegenFlow;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "description": "AI-powered Wix CLI app generator - standalone executable",
   "scripts": {
     "build": "node build.mjs",
@@ -24,5 +24,5 @@
     "@wix/ditto-codegen": "1.0.0",
     "esbuild": "^0.25.9"
   },
-  "falconPackageHash": "cc96755abf87f7cf075c6b660ab4e49dfe7c383ebacc11e06da2992a"
+  "falconPackageHash": "73032240b41bf383a302f704545d08c7acbfdf0936a82b5aaa9c0c3b"
 }