@wix/ditto-codegen-public 1.0.164 → 1.0.166

package/dist/out.js

@@ -65677,6 +65677,7 @@ var require_ErrorTypes = __commonJS({
       ErrorType2["EXTENSION_GENERATION_ERROR"] = "EXTENSION_GENERATION_ERROR";
       ErrorType2["VALIDATION_CONFIGURATION_ERROR"] = "VALIDATION_CONFIGURATION_ERROR";
       ErrorType2["GENERATE_OBJECT_ERROR"] = "GENERATE_OBJECT_ERROR";
+      ErrorType2["AUTO_FIX_ERROR"] = "AUTO_FIX_ERROR";
       ErrorType2["UNEXPECTED_ERROR"] = "UNEXPECTED_ERROR";
     })(ErrorType || (exports2.ErrorType = ErrorType = {}));
   }
@@ -65691,8 +65692,7 @@ var require_enums2 = __commonJS({
     var ValidationType;
     (function(ValidationType2) {
       ValidationType2["TYPESCRIPT"] = "typescript";
-      ValidationType2["JAVASCRIPT"] = "javascript";
-      ValidationType2["JSON"] = "json";
+      ValidationType2["BUILD"] = "build";
     })(ValidationType || (exports2.ValidationType = ValidationType = {}));
     var ProcessType;
     (function(ProcessType2) {
@@ -65779,27 +65779,12 @@ var require_CodeValidationError = __commonJS({
         this.expected = true;
         this.retryable = false;
         this.validationType = options.validationType;
-        this.file = options.file;
-        this.line = options.line;
-        this.column = options.column;
-        this.errorCode = options.errorCode;
-        this.errorMessage = options.errorMessage;
-        this.errors = options.errors;
+        this.errors = options.errors || [];
       }
       getAdditionalProperties() {
         const props = {
           validationType: this.validationType
         };
-        if (this.file)
-          props.file = this.file;
-        if (this.line !== void 0)
-          props.line = this.line;
-        if (this.column !== void 0)
-          props.column = this.column;
-        if (this.errorCode)
-          props.errorCode = this.errorCode;
-        if (this.errorMessage)
-          props.errorMessage = this.errorMessage;
         if (this.errors && this.errors.length > 0)
           props.errors = this.errors;
         return props;
@@ -66175,6 +66160,35 @@ var require_ValidationConfigurationError = __commonJS({
   }
 });
 
+// ../codegen-types/dist/errors/AutoFixError.js
+var require_AutoFixError = __commonJS({
+  "../codegen-types/dist/errors/AutoFixError.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.AutoFixError = void 0;
+    var BaseCodegenError_1 = require_BaseCodegenError();
+    var ErrorTypes_1 = require_ErrorTypes();
+    var AutoFixError = class extends BaseCodegenError_1.BaseCodegenError {
+      constructor(message, options) {
+        super(message);
+        this.name = "AutoFixError";
+        this.errorType = ErrorTypes_1.ErrorType.AUTO_FIX_ERROR;
+        this.expected = false;
+        this.retryable = true;
+        this.validationType = options?.validationType;
+        this.cause = options?.cause;
+      }
+      getAdditionalProperties() {
+        return {
+          validationType: this.validationType,
+          cause: this.cause
+        };
+      }
+    };
+    exports2.AutoFixError = AutoFixError;
+  }
+});
+
 // ../codegen-types/dist/errors/UnexpectedError.js
 var require_UnexpectedError = __commonJS({
   "../codegen-types/dist/errors/UnexpectedError.js"(exports2) {
@@ -66352,6 +66366,7 @@ var require_errors = __commonJS({
     __exportStar2(require_PlanningError(), exports2);
     __exportStar2(require_ExtensionGenerationError(), exports2);
     __exportStar2(require_ValidationConfigurationError(), exports2);
+    __exportStar2(require_AutoFixError(), exports2);
     __exportStar2(require_UnexpectedError(), exports2);
     __exportStar2(require_TimeoutError(), exports2);
     __exportStar2(require_GenerateCodegenObjectError(), exports2);
@@ -139625,9 +139640,7 @@ var require_wdsPackage = __commonJS({
     })();
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.buildWdsSystemPrompt = buildWdsSystemPrompt;
-    var fs4 = __importStar2(require("fs"));
-    var path2 = __importStar2(require("path"));
-    require_wds_storybook();
+    var wdsJson = __importStar2(require_wds_storybook());
     function formatComponentAsPromptBlock(component) {
       const componentDescription = component?.content?.description;
       const features = component?.content?.featureExamples?.map((feature) => `  - ${feature.title}: ${feature.description}`).join("\n");
@@ -139643,9 +139656,7 @@ ${componentDescription}
 </component>`;
     }
     async function buildWdsSystemPrompt(allowedComponents) {
-      const storybookJsonPath = path2.join(__dirname, "wds-storybook.json");
-      const storybookData = fs4.readFileSync(storybookJsonPath, "utf-8");
-      const parsedData = JSON.parse(storybookData);
+      const parsedData = wdsJson;
       const relevantComponents = (parsedData.items || []).filter((component) => allowedComponents.has(component.storyName));
       if (!relevantComponents.length) {
         return "";
@@ -153267,9 +153278,10 @@ var require_TypescriptValidator = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     var child_process_1 = require("child_process");
+    var ditto_codegen_types_12 = require_dist();
     var TypescriptValidator = class {
       constructor() {
-        this.type = "typescript";
+        this.type = ditto_codegen_types_12.ValidationType.TYPESCRIPT;
       }
       async validate(projectDir) {
         const result = this.runTypecheck(projectDir);
@@ -153305,7 +153317,7 @@ var require_TypescriptValidator = __commonJS({
       }
       async parseTypecheckError(stdout) {
         const lines = stdout.split(/\r?\n/);
-        const tsRegex = /^(?<path>.+?)\((?<line>\d+),(?<col>\d+)\):\s*error\s+TS\d+:\s*(?<msg>.+)$/;
+        const tsRegex = /^(?<path>.+?)\((?<line>\d+),(?<col>\d+)\):\s*error\s+(?<code>TS\d+):\s*(?<msg>.+)$/;
         const results = [];
         for (const line of lines) {
           const m = line.match(tsRegex);
@@ -153314,6 +153326,7 @@ var require_TypescriptValidator = __commonJS({
               filePath: m.groups["path"],
               line: Number(m.groups["line"]),
               column: Number(m.groups["col"]),
+              errorCode: m.groups["code"],
               errorMessage: m.groups["msg"].trim()
             });
           }
@@ -153338,12 +153351,12 @@ var require_ValidatorFactory = __commonJS({
     var ValidatorFactory = class {
       constructor() {
       }
-      getValidator(type = "typescript") {
-        if (type === "typescript") {
+      getValidator(type = ditto_codegen_types_12.ValidationType.TYPESCRIPT) {
+        if (type === ditto_codegen_types_12.ValidationType.TYPESCRIPT) {
           return new TypescriptValidator_1.default();
         }
-        throw new ditto_codegen_types_12.ValidationConfigurationError(`Invalid validator type: ${type}`, {
-          validatorType: type
+        throw new ditto_codegen_types_12.AutoFixError(`Invalid validator type: ${type}`, {
+          validationType: type
         });
       }
     };
@@ -153373,6 +153386,17 @@ var require_NaiveFixerAgent = __commonJS({
       constructor() {
         this.name = "BatchFixAgent";
       }
+      formatErrors(errors) {
+        return errors.map((error, index) => `${index + 1}. Line ${error.line}, Column ${error.column}${error.errorCode ? ` (${error.errorCode})` : ""}: ${error.message}`).join("\n");
+      }
+      formatPreviousErrors(previousErrors) {
+        if (!previousErrors || previousErrors.length === 0) {
+          return "";
+        }
+        return `The following errors persisted after your last fix attempt.
+Please try a DIFFERENT approach to solve them:
+${previousErrors.map((err) => `- ${err}`).join("\n")}`;
+      }
       async fixFileWithMultipleErrors(input) {
         const systemPrompt = (0, dedent_1.default)`You are an expert TypeScript/JavaScript developer. Your task is to fix ALL compilation errors in a file by providing the complete corrected file content.
 
@@ -153391,7 +153415,8 @@ Focus on common TypeScript errors:
 - Syntax errors
 - Missing semicolons or brackets
 - Incorrect component props`;
-        const errorsList = input.errors.map((error, index) => `${index + 1}. Line ${error.line}, Column ${error.column}: ${error.message}`).join("\n");
+        const errorsList = this.formatErrors(input.errors);
+        const previousErrorsSection = this.formatPreviousErrors(input.previousErrors);
         const userMessage = `File: ${input.filePath}
 Language: ${input.language}
 
@@ -153401,6 +153426,8 @@ ${errorsList}
 CURRENT FILE CONTENT:
 ${input.content}
 
+${previousErrorsSection}
+
 Please provide the complete fixed file content that resolves ALL the errors listed above.`;
         try {
           const result = await codeGenerationService_12.codegenAIProxyService.generateCodegenObject({
@@ -153447,7 +153474,7 @@ var require_NaiveErrorFixer = __commonJS({
     var NaiveErrorFixer = class {
       constructor() {
       }
-      async fixMultipleErrors(projectDir, filePath, errors) {
+      async fixMultipleErrors(projectDir, filePath, errors, previousErrors) {
         if (errors.length === 0) {
           return;
         }
@@ -153465,9 +153492,11 @@ var require_NaiveErrorFixer = __commonJS({
             errors: errors.map((error) => ({
               line: error.line || 1,
               column: error.column || 1,
+              errorCode: error.errorCode,
               message: error.errorMessage || "Unknown error"
             })),
-            language: "typescript"
+            language: "typescript",
+            previousErrors: previousErrors?.map(formatErrorToString)
           });
           if (batchResult.fixedContent) {
             fs_1.default.writeFileSync(absolutePath, batchResult.fixedContent, "utf8");
@@ -153485,6 +153514,9 @@ var require_NaiveErrorFixer = __commonJS({
       }
     };
     exports2.default = NaiveErrorFixer;
+    var formatErrorToString = (err) => {
+      return `Line ${err.line}${err.errorCode ? ` (${err.errorCode})` : ""}: ${err.errorMessage}`;
+    };
   }
 });
 
@@ -153527,66 +153559,106 @@ var require_fixFlow = __commonJS({
     var ValidatorFactory_1 = __importDefault2(require_ValidatorFactory());
     var FixerFactory_1 = __importDefault2(require_FixerFactory());
     var ditto_codegen_types_12 = require_dist();
+    var job_context_storage_12 = require_job_context_storage();
+    var codeGenerationService_12 = require_codeGenerationService();
     var MAX_ERRORS_PER_BATCH = 20;
-    async function startFixFlow(request, eventEmitter) {
+    async function startFixFlow(request) {
       const { projectDir } = request;
-      eventEmitter.emitEvent("validation:start", { outputPath: projectDir });
       const fixerFactory = new FixerFactory_1.default();
       const validatorFactory = new ValidatorFactory_1.default();
       const validator = validatorFactory.getValidator();
-      console.log("\u{1F50D} Running validation and batch fix...");
-      const initialValidation = await validator.validate(projectDir);
-      if (initialValidation.status === 0) {
-        console.log(`\u2705 ${validator.type} validation passed - no fixes needed`);
-        eventEmitter.emitEvent("validation:done", { outputPath: projectDir });
-        return;
-      }
-      if (!initialValidation.parsedValidationErrors || initialValidation.parsedValidationErrors.length === 0) {
-        const errorMessage2 = `Validation failed but no parsed errors available. Raw errors: ${initialValidation.validationErrors}`;
-        console.warn(`\u26A0\uFE0F ${errorMessage2}`);
-        const error2 = new ditto_codegen_types_12.ValidationConfigurationError(errorMessage2);
-        throw error2;
-      }
-      const totalErrors = initialValidation.parsedValidationErrors.length;
-      console.log(`\u{1F4DD} Found ${totalErrors} errors to fix`);
-      const errorsByFile = (0, utils_1.mapGroupBy)(initialValidation.parsedValidationErrors, (error2) => error2.filePath);
-      console.log(`\u{1F4C1} Errors span ${errorsByFile.size} files`);
-      let totalFixesApplied = 0;
       const fixer = fixerFactory.getFixer();
-      for (const [filePath, fileErrors] of errorsByFile) {
-        const errorsToFix = fileErrors.slice(0, MAX_ERRORS_PER_BATCH);
-        if (errorsToFix.length < fileErrors.length) {
-          console.log(`\u{1F4CB} Processing ${errorsToFix.length}/${fileErrors.length} errors for ${filePath} (batching to prevent AI overload)`);
-        } else {
-          console.log(`\u{1F4CB} Processing ${errorsToFix.length} errors for ${filePath}`);
+      const MAX_FIX_ATTEMPTS = 3;
+      const parentContext = job_context_storage_12.jobContextStorage.getStore();
+      const fixTaskId = `fix-flow`;
+      const updateFixTask = async (status, payload = {}) => {
+        await codeGenerationService_12.codeGenerationService.updateTask(parentContext.jobId, fixTaskId, status, payload);
+      };
+      await codeGenerationService_12.codeGenerationService.addTask(parentContext.jobId, {
+        id: fixTaskId,
+        kind: "fix_code",
+        name: "Auto-Fixer",
+        status: ditto_codegen_types_12.Status.RUNNING,
+        description: "Running automatic code fixes"
+      });
+      console.log("\u{1F50D} Running validation and batch fix...");
+      const processFiles = async (fileEntries, lastRunErrors) => {
+        for (const [filePath, fileErrors] of fileEntries) {
+          const errorsToFix = fileErrors.slice(0, MAX_ERRORS_PER_BATCH);
+          if (errorsToFix.length < fileErrors.length) {
+            console.log(`\u{1F4CB} Processing ${errorsToFix.length}/${fileErrors.length} errors for ${filePath} (batching to prevent AI overload)`);
+          } else {
+            console.log(`\u{1F4CB} Processing ${errorsToFix.length} errors for ${filePath}`);
+          }
+          const previousErrors = lastRunErrors.get(filePath);
+          try {
+            await fixer.fixMultipleErrors(projectDir, filePath, errorsToFix, previousErrors);
+            console.log(`\u2705 Applied batch fixes for ${filePath}`);
+          } catch (fixError) {
+            console.error(`\u274C Failed to fix errors in ${filePath}: ${fixError instanceof Error ? fixError.message : String(fixError)}`);
+          }
         }
-        try {
-          await fixer.fixMultipleErrors(projectDir, filePath, errorsToFix);
-          totalFixesApplied += errorsToFix.length;
-          console.log(`\u2705 Applied batch fixes for ${filePath}`);
-        } catch (fixError) {
-          console.error(`\u274C Failed to fix errors in ${filePath}: ${fixError instanceof Error ? fixError.message : String(fixError)}`);
-          continue;
+      };
+      const fixState = {
+        accumulatedFixes: 0,
+        lastRunErrors: /* @__PURE__ */ new Map()
+      };
+      const handleValidationFailure = async (validation, reason) => {
+        const remainingErrors = validation.parsedValidationErrors?.length || 0;
+        const unfixedValidationErrors = validation.validationErrors || "Unknown validation errors";
+        console.log(`\u{1F4CB} ${remainingErrors} errors remaining after fixes`);
+        const errorMessage = `Validation failed: ${reason}. Fixed ${fixState.accumulatedFixes} errors, but ${remainingErrors} remain:
+${unfixedValidationErrors}`;
+        const validationErrors = validation.parsedValidationErrors || [];
+        const error = new ditto_codegen_types_12.CodeValidationError(errorMessage, {
+          validationType: ditto_codegen_types_12.ValidationType.TYPESCRIPT,
+          errors: validationErrors
+        });
+        await updateFixTask(ditto_codegen_types_12.Status.FAILED, { error: errorMessage });
+        throw error;
+      };
+      const ensureParsedErrorsExist = async (validation) => {
+        const hasParsedErrorsToFix = validation.parsedValidationErrors.length > 0;
+        if (!hasParsedErrorsToFix) {
+          const errorMessage = `Validation failed but no parsed errors available. Raw errors: ${validation.validationErrors}`;
+          console.warn(`\u26A0\uFE0F ${errorMessage}`);
+          await updateFixTask(ditto_codegen_types_12.Status.FAILED, { error: errorMessage });
+          throw new Error(errorMessage);
         }
+      };
+      try {
+        for (let attempt = 0; attempt < MAX_FIX_ATTEMPTS; attempt++) {
+          console.log(`\u{1F504} Fix Attempt ${attempt}/${MAX_FIX_ATTEMPTS}`);
+          const currentValidation = await validator.validate(projectDir);
+          if (currentValidation.status === 0) {
+            console.log(`\u2705 ${validator.type} validation passed - no fixes needed`);
+            await updateFixTask(ditto_codegen_types_12.Status.COMPLETED, {
+              description: `Fixed ${fixState.accumulatedFixes} errors.`
+            });
+            return;
+          }
+          if (attempt === MAX_FIX_ATTEMPTS - 1) {
+            await handleValidationFailure(currentValidation, `after ${MAX_FIX_ATTEMPTS} fix attempts`);
+          }
+          await ensureParsedErrorsExist(currentValidation);
+          const totalErrors = currentValidation.parsedValidationErrors.length;
+          console.log(`\u{1F4DD} Found ${totalErrors} errors to fix`);
+          const errorsByFile = (0, utils_1.mapGroupBy)(currentValidation.parsedValidationErrors, (error) => error.filePath);
+          console.log(`\u{1F4C1} Errors span ${errorsByFile.size} files`);
+          await processFiles(Array.from(errorsByFile), fixState.lastRunErrors);
+          fixState.lastRunErrors = errorsByFile;
+        }
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const finalError = new ditto_codegen_types_12.AutoFixError(errorMessage, {
+          validationType: validator.type,
+          cause: error
+        });
+        await updateFixTask(ditto_codegen_types_12.Status.FAILED, {
+          error: finalError.message
+        });
+        throw finalError;
       }
-      console.log(`\u{1F4CA} Batch fix completed: ${totalFixesApplied} fixes applied across ${errorsByFile.size} files`);
-      const finalValidation = await validator.validate(projectDir);
-      if (finalValidation.status === 0) {
-        console.log(`\u2705 ${validator.type} validation passed after batch fixes`);
-        eventEmitter.emitEvent("validation:done", { outputPath: projectDir });
-        return;
-      }
-      const remainingErrors = finalValidation.parsedValidationErrors?.length || 0;
-      const unfixedValidationErrors = finalValidation.validationErrors || "Unknown validation errors";
-      console.log(`\u{1F4CB} ${remainingErrors} errors remaining after fixes`);
-      const errorMessage = `Validation failed after batch fix attempt. Fixed ${totalFixesApplied} errors, but ${remainingErrors} remain:
-${unfixedValidationErrors}`;
-      const validationErrors = finalValidation.parsedValidationErrors || [];
-      const error = new ditto_codegen_types_12.CodeValidationError(errorMessage, {
-        validationType: ditto_codegen_types_12.ValidationType.TYPESCRIPT,
-        errors: validationErrors
-      });
-      throw error;
     }
   }
 });
@@ -154718,7 +154790,7 @@ var require_orchestrator = __commonJS({
         });
         await (0, fixFlow_1.startFixFlow)({
           projectDir: outputPath
-        }, this);
+        });
         const durationMs = Date.now() - start;
         this.emitEvent("finish", { outputPath, durationMs });
       }
@@ -374036,7 +374108,7 @@ var require_IterationOrchestrator = __commonJS({
         });
         await (0, fixFlow_1.startFixFlow)({
           projectDir: outputPath
-        }, this);
+        });
         const durationMs = Date.now() - start;
         this.emitEvent("finish:iteration", { outputPath, durationMs });
         return iterationPlan;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.164",
+  "version": "1.0.166",
   "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": "73292fd1b72e5f37603b50c29a72115965d1026e4136e3f84df23c14"
+  "falconPackageHash": "f4fa79a226dd76d71e7123b20e0cc77f46c96764501c9af43a76a455"
 }