@wix/ditto-codegen-public 1.0.345 → 1.0.347

package/dist/out.js

@@ -11235,7 +11235,6 @@ var require_constants5 = __commonJS({
       dashboardMenuPlugin: "dashboard menu plugin",
       embeddedScript: "embedded script",
       event: "backend event",
-      genericExtension: "extension",
       customElement: "custom element",
       siteComponent: "editor react component",
       editorReactComponent: "editor react component",
@@ -11248,7 +11247,8 @@ var require_constants5 = __commonJS({
       ecomPaymentSettings: "service plugin",
       bookingsStaffSortingProvider: "service plugin",
       contextProvider: "context provider",
-      functionLibrary: "function library"
+      functionLibrary: "function library",
+      dataCollections: "data collection"
     };
     function normalizeFilePath(filePath) {
       return filePath.replace(exports2.CONTAINER_ROOT_PREFIX, "");
@@ -11257,9 +11257,6 @@ var require_constants5 = __commonJS({
       return EXTENSION_FILE_PATTERN.test(filePath);
     }
     function detectExtension(content) {
-      if (content.includes("genericExtension(") && content.includes("DATA_COMPONENT")) {
-        return { extensionType: "dataCollection", label: "collection" };
-      }
       for (const [extensionType, label] of Object.entries(exports2.BUILDER_TO_EXTENSION_LABEL)) {
         if (content.includes(`extensions.${extensionType}(`) || content.includes(`experimentalExtensions.${extensionType}(`)) {
           return { extensionType, label };
@@ -12662,6 +12659,19 @@ var require_types4 = __commonJS({
   }
 });
 
+// dist/opencode-integration/internal-paths.js
+var require_internal_paths = __commonJS({
+  "dist/opencode-integration/internal-paths.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.isInternalPath = isInternalPath;
+    var INTERNAL_PATH_PREFIXES = [".agents/"];
+    function isInternalPath(path) {
+      return INTERNAL_PATH_PREFIXES.some((prefix) => path.startsWith(prefix));
+    }
+  }
+});
+
 // dist/opencode-integration/parser.js
 var require_parser = __commonJS({
   "dist/opencode-integration/parser.js"(exports2) {
@@ -12678,6 +12688,7 @@ var require_parser = __commonJS({
     var ditto_codegen_types_12 = require_dist4();
     var types_1 = require_types4();
     var constants_1 = require_constants5();
+    var internal_paths_1 = require_internal_paths();
     function parseEvents(output, type) {
       return output.split("\n").filter((line) => line.trim()).map((line) => (0, types_1.tryParseJson)(line)).filter((event) => event !== null && event.type === type);
     }
@@ -12708,7 +12719,7 @@ var require_parser = __commonJS({
       const seenPaths = /* @__PURE__ */ new Set();
       const addFileChange = (filePath, operation) => {
         const normalizedPath = (0, constants_1.normalizeFilePath)(filePath);
-        if (normalizedPath && !seenPaths.has(normalizedPath)) {
+        if (normalizedPath && !(0, internal_paths_1.isInternalPath)(normalizedPath) && !seenPaths.has(normalizedPath)) {
           seenPaths.add(normalizedPath);
           filesChanged.push({ path: normalizedPath, operation });
         }
@@ -13480,27 +13491,51 @@ var require_collect_extensions_created = __commonJS({
     var promises_1 = require("fs/promises");
     var ditto_codegen_types_12 = require_dist4();
     var constants_1 = require_constants5();
+    var DATA_COLLECTION_MARKER = /import\s+(?:type\s+)?\{[^}]*\bDataCollection\b[^}]*\}\s+from\s+['"]@wix\/astro\/builders['"]/;
     var getExtensionDirectory = (extensionDefinitionPath) => `${path_1.posix.dirname(extensionDefinitionPath)}/`;
     var isFileInExtensionFolder = (filePath, extensionDefinitionPath) => filePath === extensionDefinitionPath || filePath.startsWith(getExtensionDirectory(extensionDefinitionPath));
+    var resolveFilePath = (outputPath, filePath) => (0, path_1.isAbsolute)(filePath) ? filePath : (0, path_1.join)(outputPath, filePath);
+    var buildJobExtension = (definitionPath, extensionType, contentForTitle, titlePath, files) => ({
+      path: definitionPath,
+      extensionType,
+      title: (0, constants_1.extractExtensionDisplayTitle)(contentForTitle, titlePath),
+      files: [...files]
+    });
+    async function collectDataCollectionEntries(outputPath, parentExtensionFile, folderFiles) {
+      const entries = [];
+      for (const file of folderFiles) {
+        if (file.path === parentExtensionFile.path)
+          continue;
+        try {
+          const content = await (0, promises_1.readFile)(resolveFilePath(outputPath, file.path), "utf-8");
+          if (!DATA_COLLECTION_MARKER.test(content))
+            continue;
+          entries.push(buildJobExtension(parentExtensionFile.path, "dataCollection", content, file.path, [parentExtensionFile, file]));
+        } catch {
+          continue;
+        }
+      }
+      return entries;
+    }
     async function collectInsertedExtensionsMetadata(outputPath, files) {
       const results = [];
-      for (const f of files) {
-        if (f.operation !== ditto_codegen_types_12.ExtensionGenerationOperation.INSERT)
+      for (const fileChange of files) {
+        if (fileChange.operation !== ditto_codegen_types_12.ExtensionGenerationOperation.INSERT)
           continue;
-        if (!(0, constants_1.isExtensionsFile)(f.path))
+        if (!(0, constants_1.isExtensionsFile)(fileChange.path))
           continue;
-        const fullPath = (0, path_1.isAbsolute)(f.path) ? f.path : (0, path_1.join)(outputPath, f.path);
         try {
-          const content = await (0, promises_1.readFile)(fullPath, "utf-8");
+          const content = await (0, promises_1.readFile)(resolveFilePath(outputPath, fileChange.path), "utf-8");
           const detected = (0, constants_1.detectExtension)(content);
           if (!detected)
             continue;
-          results.push({
-            path: f.path,
-            extensionType: detected.extensionType,
-            title: (0, constants_1.extractExtensionDisplayTitle)(content, f.path),
-            files: files.filter((file) => isFileInExtensionFolder(file.path, f.path))
-          });
+          const folderFiles = files.filter((file) => isFileInExtensionFolder(file.path, fileChange.path));
+          if (detected.extensionType === "dataCollections") {
+            const dataCollectionEntries = await collectDataCollectionEntries(outputPath, fileChange, folderFiles);
+            results.push(...dataCollectionEntries);
+            continue;
+          }
+          results.push(buildJobExtension(fileChange.path, detected.extensionType, content, fileChange.path, folderFiles));
         } catch {
           continue;
         }
@@ -13672,6 +13707,7 @@ var require_git_file_changes = __commonJS({
     var child_process_1 = require("child_process");
     var util_1 = require("util");
     var ditto_codegen_types_12 = require_dist4();
+    var internal_paths_1 = require_internal_paths();
     var logger_12 = require_logger();
     var execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
     async function captureGitBaseline(cwd) {
@@ -13694,8 +13730,9 @@ var require_git_file_changes = __commonJS({
         ]);
         const files = parseDiffNameStatus(diffResult.stdout);
         appendUntrackedFiles(untrackedResult.stdout, files);
-        files.sort((a, b) => a.path.localeCompare(b.path));
-        return files;
+        const userFiles = files.filter((f) => !(0, internal_paths_1.isInternalPath)(f.path));
+        userFiles.sort((a, b) => a.path.localeCompare(b.path));
+        return userFiles;
       } catch (error) {
         logger_12.logger.error("[OpenCode] Failed to collect git file changes", {
           error: error instanceof Error ? error.message : String(error)
@@ -19423,16 +19460,17 @@ var require_skills_installer = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.installSkills = installSkills;
-    var child_process_1 = require("child_process");
     var fs_1 = require("fs");
-    var util_1 = require("util");
+    var path_1 = require("path");
     var ditto_codegen_types_12 = require_dist4();
     var skills_override_1 = require_skills_override();
-    var execAsync = (0, util_1.promisify)(child_process_1.exec);
-    var SKILLS_INSTALL_COMMAND = "npx --yes skills add wix/skills -s wix-app wix-design-system -g -a opencode -y";
+    function hasSkills(dir) {
+      return (0, fs_1.existsSync)(dir) && (0, fs_1.readdirSync)(dir).length > 0;
+    }
     async function installSkills(outputPath, log) {
       const skillsOverride = process.env.SKILLS_OVERRIDE_BRANCH;
-      const isPreInstalled = (0, fs_1.existsSync)(skills_override_1.SKILLS_DIR) && (0, fs_1.readdirSync)(skills_override_1.SKILLS_DIR).length > 0;
+      const projectSkillsDir = (0, path_1.join)(outputPath, ".agents", "skills");
+      const isPreInstalled = hasSkills(skills_override_1.SKILLS_DIR) || hasSkills(projectSkillsDir);
       if (isPreInstalled && !skillsOverride) {
         log.info("[Skills] Skipping runtime skills installation (pre-installed via Docker image)", { environment: process.env.CODEGEN_ENVIRONMENT });
         return;
@@ -19443,35 +19481,17 @@ var require_skills_installer = __commonJS({
           await (0, skills_override_1.overrideSkills)(overrides, outputPath, log);
           return;
         } catch (error) {
-          if (isPreInstalled) {
-            throw new ditto_codegen_types_12.ProcessExecutionError("Failed to override pre-installed skills", { processType: ditto_codegen_types_12.ProcessType.INITIALIZATION, cause: error });
-          }
           const errorMessage = error instanceof Error ? error.message : String(error);
-          log.warn("[Skills] Branch override failed, falling back to default", {
-            error: errorMessage
-          });
+          log.error("[Skills] Branch override failed", { error: errorMessage });
+          throw new ditto_codegen_types_12.ProcessExecutionError(isPreInstalled ? "Failed to override pre-installed skills" : "Skills override failed and no pre-installed skills available", { processType: ditto_codegen_types_12.ProcessType.INITIALIZATION, cause: error });
         }
       }
-      log.info("[Skills] Installing Wix skills globally", {
-        installInternalSkills: process.env.INSTALL_INTERNAL_SKILLS
+      log.error("[Skills] No skills available \u2014 pre-install missing and no override", {
+        globalSkillsDir: skills_override_1.SKILLS_DIR,
+        projectSkillsDir,
+        environment: process.env.CODEGEN_ENVIRONMENT
       });
-      try {
-        const { stdout, stderr } = await execAsync(SKILLS_INSTALL_COMMAND, {
-          cwd: outputPath
-        });
-        if (stderr && !stderr.includes("npm warn")) {
-          log.warn("[Skills] Installation stderr", { stderr });
-        }
-        console.log("[Skills] Skills installed successfully\n", stdout);
-        log.debug("[Skills] Skills installed successfully", { stdout });
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        log.error("[Skills] Failed to install skills", { error: errorMessage });
-        throw new ditto_codegen_types_12.ProcessExecutionError("Failed to install Wix skills", {
-          processType: ditto_codegen_types_12.ProcessType.INITIALIZATION,
-          cause: error
-        });
-      }
+      throw new ditto_codegen_types_12.ProcessExecutionError("Skills not pre-installed and no SKILLS_OVERRIDE_BRANCH set \u2014 verify the Docker image bake-time install ran successfully.", { processType: ditto_codegen_types_12.ProcessType.INITIALIZATION });
     }
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.345",
+  "version": "1.0.347",
   "description": "AI-powered Wix CLI app generator - standalone executable",
   "scripts": {
     "build": "node build.mjs",
@@ -28,5 +28,5 @@
     "esbuild": "^0.27.2",
     "vitest": "^4.0.16"
   },
-  "falconPackageHash": "fa273ae4cec1a778feb1e32b156c7b89b0638ac919a56d66298ecdd5"
+  "falconPackageHash": "08231ee565611b4b7a817e282b1afc9a2c80d4e437af9683d13fa37c"
 }