@wix/ditto-codegen-public 1.0.455 → 1.0.457

package/dist/out.js

@@ -10460,9 +10460,9 @@ var require_cjs3 = __commonJS({
   }
 });
 
-// dist/job-context-storage.js
+// dist/jobs/job-context-storage.js
 var require_job_context_storage = __commonJS({
-  "dist/job-context-storage.js"(exports2) {
+  "dist/jobs/job-context-storage.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.jobContextStorage = void 0;
@@ -10471,9 +10471,9 @@ var require_job_context_storage = __commonJS({
   }
 });
 
-// dist/logger.js
+// dist/telemetry/logger.js
 var require_logger = __commonJS({
-  "dist/logger.js"(exports2) {
+  "dist/telemetry/logger.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.logger = void 0;
@@ -10581,46 +10581,6 @@ var require_wixTokenRefresh = __commonJS({
   }
 });
 
-// dist/experiments.js
-var require_experiments = __commonJS({
-  "dist/experiments.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.FILTERED_JOB_POLLING = void 0;
-    exports2.getExperimentVariant = getExperimentVariant;
-    exports2.isExperimentEnabled = isExperimentEnabled;
-    var logger_12 = require_logger();
-    exports2.FILTERED_JOB_POLLING = "codegenFilteredJobPolling";
-    var parsedExperiments = null;
-    function getExperiments() {
-      if (parsedExperiments !== null) {
-        return parsedExperiments;
-      }
-      const raw = process.env.CODEGEN_EXPERIMENTS;
-      if (!raw) {
-        parsedExperiments = {};
-        return parsedExperiments;
-      }
-      try {
-        parsedExperiments = JSON.parse(raw);
-      } catch (error) {
-        logger_12.logger.error("[Experiments] Failed to parse CODEGEN_EXPERIMENTS", {
-          error: error instanceof Error ? error.message : String(error)
-        });
-        parsedExperiments = {};
-      }
-      return parsedExperiments;
-    }
-    function getExperimentVariant(specName) {
-      return getExperiments()[specName] ?? "A";
-    }
-    function isExperimentEnabled(specName) {
-      const variant = getExperimentVariant(specName);
-      return variant === "true" || variant !== "A" && variant !== "false";
-    }
-  }
-});
-
 // ../codegen-types/dist/errors/ErrorTypes.js
 var require_ErrorTypes = __commonJS({
   "../codegen-types/dist/errors/ErrorTypes.js"(exports2) {
@@ -11065,7 +11025,6 @@ var require_CodeGenService = __commonJS({
       return types_1.JobsSortOrder;
     } });
     var logger_12 = require_logger();
-    var experiments_1 = require_experiments();
     var ditto_codegen_types_12 = require_dist4();
     var FILE_OPERATION = {
       [ditto_codegen_types_12.ExtensionGenerationOperation.INSERT]: types_1.FileOperation.INSERT,
@@ -11177,7 +11136,7 @@ var require_CodeGenService = __commonJS({
         };
         this.fetchPendingJobs = async () => {
           const { sandboxId } = this;
-          const filtered = sandboxId && (0, experiments_1.isExperimentEnabled)(experiments_1.FILTERED_JOB_POLLING) ? {
+          const filtered = sandboxId ? {
             projectId: this.projectId,
             filter: { status: types_1.Status.PENDING, sandboxId },
             paging: { limit: 1 },
@@ -11607,7 +11566,6 @@ var require_codegen_prompt = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.buildInitPrompt = buildInitPrompt;
-    exports2.buildIterationBasePrompt = buildIterationBasePrompt;
     exports2.buildIterationPrompt = buildIterationPrompt;
     exports2.buildRecoveryPrompt = buildRecoveryPrompt;
     var prompt_utils_1 = require_prompt_utils();
@@ -11746,131 +11704,19 @@ var require_prompts = __commonJS({
   }
 });
 
-// dist/opencode-integration/task-tracker/constants.js
+// dist/opencode-integration/configuration/constants.js
 var require_constants5 = __commonJS({
-  "dist/opencode-integration/task-tracker/constants.js"(exports2) {
+  "dist/opencode-integration/configuration/constants.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.BUILDER_EXTENSION_TYPES = exports2.WIX_MCP_SERVER_NAME = exports2.CONTAINER_ROOT_PREFIX = void 0;
-    exports2.resolveFileOperation = resolveFileOperation;
-    exports2.isSpiExtension = isSpiExtension;
-    exports2.normalizeFilePath = normalizeFilePath;
-    exports2.isExtensionsFile = isExtensionsFile;
-    exports2.detectExtension = detectExtension;
-    exports2.toTitleCase = toTitleCase;
-    exports2.extractExtensionName = extractExtensionName;
-    exports2.matchQuotedExtensionConfigProperty = matchQuotedExtensionConfigProperty;
-    exports2.extractExtensionDisplayTitle = extractExtensionDisplayTitle;
-    exports2.injectCreatedBy = injectCreatedBy;
-    var ditto_codegen_types_12 = require_dist4();
-    exports2.CONTAINER_ROOT_PREFIX = /^\/user-code\//;
+    exports2.WIX_MCP_SERVER_NAME = void 0;
     exports2.WIX_MCP_SERVER_NAME = "wix-mcp";
-    var EXTENSION_FILE_PATTERN = /\/extensions\.ts$|\.extension\.ts$/;
-    function resolveFileOperation(tool, metadata) {
-      if (tool === "write") {
-        return metadata?.exists ? ditto_codegen_types_12.ExtensionGenerationOperation.EDIT : ditto_codegen_types_12.ExtensionGenerationOperation.INSERT;
-      }
-      if (tool === "edit") {
-        return ditto_codegen_types_12.ExtensionGenerationOperation.EDIT;
-      }
-      return null;
-    }
-    var SPI_EXTENSION_TYPES = [
-      "ecomShippingRates",
-      "ecomAdditionalFees",
-      "ecomValidations",
-      "ecomDiscountTriggers",
-      "ecomGiftCards",
-      "ecomPaymentSettings",
-      "bookingsStaffSortingProvider"
-    ];
-    exports2.BUILDER_EXTENSION_TYPES = [
-      "dashboardPage",
-      "dashboardModal",
-      "dashboardPlugin",
-      "dashboardMenuPlugin",
-      "embeddedScript",
-      "event",
-      "customElement",
-      "siteComponent",
-      "editorReactComponent",
-      "sitePlugin",
-      ...SPI_EXTENSION_TYPES,
-      "contextProvider",
-      "functionLibrary",
-      "dataCollections"
-    ];
-    var SPI_EXTENSION_TYPE_SET = new Set(SPI_EXTENSION_TYPES);
-    function isSpiExtension(extensionType) {
-      return SPI_EXTENSION_TYPE_SET.has(extensionType);
-    }
-    function normalizeFilePath(filePath) {
-      return filePath.replace(exports2.CONTAINER_ROOT_PREFIX, "");
-    }
-    function isExtensionsFile(filePath) {
-      return EXTENSION_FILE_PATTERN.test(filePath);
-    }
-    function detectExtension(content) {
-      for (const extensionType of exports2.BUILDER_EXTENSION_TYPES) {
-        if (content.includes(`extensions.${extensionType}(`) || content.includes(`experimentalExtensions.${extensionType}(`)) {
-          return extensionType;
-        }
-      }
-      return null;
-    }
-    function toTitleCase(str) {
-      return str.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
-    }
-    function extractExtensionName(filePath) {
-      const parts = normalizeFilePath(filePath).split("/");
-      const folderName = parts[parts.length - 2] || "";
-      return toTitleCase(folderName);
-    }
-    function matchQuotedExtensionConfigProperty(content, propName) {
-      const objectPropertyQuotedStringValuePattern = `\\b${propName}\\s*:\\s*(?:"([^"\\\\]*)"|'([^'\\\\]*)')`;
-      const objectPropertyQuotedStringValueRegex = new RegExp(
-        objectPropertyQuotedStringValuePattern,
-        // `m` = multiline: `^` / `$` match line starts/ends, not only the whole string.
-        "m"
-      );
-      const quotedStringValueMatch = content.match(objectPropertyQuotedStringValueRegex);
-      if (!quotedStringValueMatch)
-        return null;
-      return quotedStringValueMatch[1] ?? quotedStringValueMatch[2] ?? null;
-    }
-    function extractExtensionDisplayTitle(content, filePath) {
-      const title = matchQuotedExtensionConfigProperty(content, "title");
-      if (title)
-        return title;
-      const name = matchQuotedExtensionConfigProperty(content, "name");
-      if (name)
-        return name;
-      const displayName = matchQuotedExtensionConfigProperty(content, "displayName");
-      if (displayName)
-        return displayName;
-      const idSuffix = matchQuotedExtensionConfigProperty(content, "idSuffix");
-      if (idSuffix)
-        return idSuffix;
-      return extractExtensionName(filePath);
-    }
-    function injectCreatedBy(content) {
-      if (content.includes("createdBy"))
-        return content;
-      const isGeneric = content.includes("genericExtension(");
-      const createdByValue = isGeneric ? '  createdBy: "CODE_GEN",' : '  createdBy: {\n    author: "CODE_GEN",\n  },';
-      return content.replace(/(\S)(\n)(}\))(;?\s*)$/, (_match, preChar, newline, closeBrace, tail) => {
-        const needsComma = preChar !== "," && preChar !== "{";
-        const separator = needsComma ? `${preChar},` : preChar;
-        return `${separator}${newline}${createdByValue}
-${closeBrace}${tail}`;
-      });
-    }
   }
 });
 
-// dist/opencode-integration/model-knobs.js
+// dist/opencode-integration/configuration/model-knobs.js
 var require_model_knobs = __commonJS({
-  "dist/opencode-integration/model-knobs.js"(exports2) {
+  "dist/opencode-integration/configuration/model-knobs.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.DEFAULT_SMALL_MODEL = exports2.DEFAULT_MODEL = void 0;
@@ -11972,9 +11818,9 @@ var require_types4 = __commonJS({
   }
 });
 
-// dist/opencode-integration/agents.js
-var require_agents = __commonJS({
-  "dist/opencode-integration/agents.js"(exports2) {
+// dist/opencode-integration/configuration/subagents.js
+var require_subagents = __commonJS({
+  "dist/opencode-integration/configuration/subagents.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.SUBAGENT_AGENT_NAMES = exports2.WDS_DOCS_SUBAGENT_NAME = exports2.WIX_DOCS_SUBAGENT_NAME = exports2.VALIDATOR_SUBAGENT_NAME = exports2.PRIMARY_AGENT_NAME = void 0;
@@ -12266,9 +12112,9 @@ skills already cover. Read-only.`;
   }
 });
 
-// dist/opencode-integration/rules-writer.js
+// dist/opencode-integration/configuration/rules-writer.js
 var require_rules_writer = __commonJS({
-  "dist/opencode-integration/rules-writer.js"(exports2) {
+  "dist/opencode-integration/configuration/rules-writer.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRulePath = getRulePath;
@@ -15338,14 +15184,13 @@ WORKFLOW:
   }
 });
 
-// dist/job-decision-manager.js
+// dist/jobs/job-decision-manager.js
 var require_job_decision_manager = __commonJS({
-  "dist/job-decision-manager.js"(exports2) {
+  "dist/jobs/job-decision-manager.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.pauseForUserDecision = pauseForUserDecision;
     exports2.askJobChoice = askJobChoice;
-    exports2.askJobConfirmation = askJobConfirmation;
     var types_1 = require_types_impl();
     var codeGenerationService_12 = require_codeGenerationService();
     var types_2 = require_types_impl();
@@ -15410,18 +15255,6 @@ var require_job_decision_manager = __commonJS({
       }
       return response.selectedOptionId;
     }
-    async function askJobConfirmation(jobId, question, context) {
-      const response = await pauseForUserDecision(jobId, {
-        question,
-        questionType: types_1.UserDecisionQuestionType.UI_COMPONENT_TYPE,
-        options: [
-          { id: "yes", label: "Yes" },
-          { id: "no", label: "No" }
-        ],
-        context
-      });
-      return response.selectedOptionId === "yes";
-    }
   }
 });
 
@@ -15496,9 +15329,9 @@ var require_environments = __commonJS({
   }
 });
 
-// dist/opencode-integration/config.js
+// dist/opencode-integration/configuration/config.js
 var require_config = __commonJS({
-  "dist/opencode-integration/config.js"(exports2) {
+  "dist/opencode-integration/configuration/config.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.DEFAULT_TIMEOUT_MS = void 0;
@@ -15512,7 +15345,7 @@ var require_config = __commonJS({
     var ditto_codegen_types_12 = require_dist4();
     var constants_1 = require_constants5();
     var model_knobs_1 = require_model_knobs();
-    var agents_1 = require_agents();
+    var subagents_1 = require_subagents();
     var rules_writer_12 = require_rules_writer();
     var environments_12 = require_environments();
     var CodeGenService_12 = require_CodeGenService();
@@ -15698,8 +15531,8 @@ var require_config = __commonJS({
       external_directory: READABLE_EXTERNAL_DIRS
     };
     function buildConfig(projectId, instructionPaths, permission, { isCodeWritingFlow = false, withAgents = false } = {}) {
-      const main2 = (0, agents_1.getMainAgentModel)();
-      const subagent = (0, agents_1.getSubagentModel)();
+      const main2 = (0, subagents_1.getMainAgentModel)();
+      const subagent = (0, subagents_1.getSubagentModel)();
       return {
         model: (0, model_knobs_1.getModel)(),
         small_model: (0, model_knobs_1.getSmallModel)(),
@@ -15716,8 +15549,8 @@ var require_config = __commonJS({
         // not: its primary agent re-opens `task`, which would let the write-capable
         // validator subagent run in a flow meant to stay read-only.
         ...withAgents ? {
-          agent: (0, agents_1.getAgentConfig)(main2, subagent),
-          default_agent: agents_1.PRIMARY_AGENT_NAME
+          agent: (0, subagents_1.getAgentConfig)(main2, subagent),
+          default_agent: subagents_1.PRIMARY_AGENT_NAME
         } : {}
       };
     }
@@ -15772,44 +15605,43 @@ var require_config = __commonJS({
   }
 });
 
-// dist/opencode-integration/generated-plugins.js
-var require_generated_plugins = __commonJS({
-  "dist/opencode-integration/generated-plugins.js"(exports2) {
+// dist/opencode-integration/plugins/write-plugin.js
+var require_write_plugin = __commonJS({
+  "dist/opencode-integration/plugins/write-plugin.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.OPENCODE_PLUGIN_DIR = void 0;
     exports2.writeGeneratedPlugin = writeGeneratedPlugin;
     var promises_1 = require("fs/promises");
     var os_1 = require("os");
     var path_12 = require("path");
     var logger_12 = require_logger();
-    exports2.OPENCODE_PLUGIN_DIR = (0, path_12.join)((0, os_1.homedir)(), ".config", "opencode", "plugin");
+    var OPENCODE_PLUGIN_DIR = (0, path_12.join)((0, os_1.homedir)(), ".config", "opencode", "plugin");
     async function writeGeneratedPlugin(filename, source) {
-      await (0, promises_1.mkdir)(exports2.OPENCODE_PLUGIN_DIR, { recursive: true });
-      await (0, promises_1.writeFile)((0, path_12.join)(exports2.OPENCODE_PLUGIN_DIR, filename), source, "utf-8");
+      await (0, promises_1.mkdir)(OPENCODE_PLUGIN_DIR, { recursive: true });
+      await (0, promises_1.writeFile)((0, path_12.join)(OPENCODE_PLUGIN_DIR, filename), source, "utf-8");
       logger_12.logger.info("[OpenCode] Wrote generated plugin", { plugin: filename });
     }
   }
 });
 
-// dist/opencode-integration/subagent-tool-logger.js
+// dist/opencode-integration/plugins/subagent-tool-logger.js
 var require_subagent_tool_logger = __commonJS({
-  "dist/opencode-integration/subagent-tool-logger.js"(exports2) {
+  "dist/opencode-integration/plugins/subagent-tool-logger.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.SUBAGENT_STARTED_EVENT_TYPE = exports2.SUBAGENT_TOOL_EVENT_TYPE = void 0;
+    exports2.SUBAGENT_TOOL_LOGGER_FILENAME = exports2.SUBAGENT_STARTED_EVENT_TYPE = exports2.SUBAGENT_TOOL_EVENT_TYPE = void 0;
     exports2.buildSubagentToolLoggerPluginSource = buildSubagentToolLoggerPluginSource;
     exports2.writeSubagentToolLoggerPlugin = writeSubagentToolLoggerPlugin;
-    var generated_plugins_1 = require_generated_plugins();
-    var agents_1 = require_agents();
+    var write_plugin_1 = require_write_plugin();
+    var subagents_1 = require_subagents();
     exports2.SUBAGENT_TOOL_EVENT_TYPE = "subagent_tool_use";
     exports2.SUBAGENT_STARTED_EVENT_TYPE = "subagent_started";
-    var PLUGIN_FILENAME = "subagent-tool-logger.ts";
+    exports2.SUBAGENT_TOOL_LOGGER_FILENAME = "subagent-tool-logger.ts";
     function buildSubagentToolLoggerPluginSource() {
       return `// Generated by @wix/ditto-codegen (subagent-tool-logger) \u2014 do not edit.
 const EVENT_TYPE = ${JSON.stringify(exports2.SUBAGENT_TOOL_EVENT_TYPE)};
 const STARTED_EVENT_TYPE = ${JSON.stringify(exports2.SUBAGENT_STARTED_EVENT_TYPE)};
-const SUBAGENT_AGENTS = new Set(${JSON.stringify(agents_1.SUBAGENT_AGENT_NAMES)});
+const SUBAGENT_AGENTS = new Set(${JSON.stringify(subagents_1.SUBAGENT_AGENT_NAMES)});
 
 export const SubagentToolLogger = async () => {
   // sessionID -> agent name, learned from session.* / message.updated (both
@@ -15918,14 +15750,14 @@ export const SubagentToolLogger = async () => {
 `;
     }
     async function writeSubagentToolLoggerPlugin() {
-      await (0, generated_plugins_1.writeGeneratedPlugin)(PLUGIN_FILENAME, buildSubagentToolLoggerPluginSource());
+      await (0, write_plugin_1.writeGeneratedPlugin)(exports2.SUBAGENT_TOOL_LOGGER_FILENAME, buildSubagentToolLoggerPluginSource());
     }
   }
 });
 
-// dist/opencode-integration/parser.js
+// dist/opencode-integration/execution/parser.js
 var require_parser = __commonJS({
-  "dist/opencode-integration/parser.js"(exports2) {
+  "dist/opencode-integration/execution/parser.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseRequiredPermissions = parseRequiredPermissions;
@@ -15939,8 +15771,8 @@ var require_parser = __commonJS({
     exports2.parseValidatorTaskOutputs = parseValidatorTaskOutputs;
     exports2.summarizeOpenCodeLine = summarizeOpenCodeLine;
     var types_1 = require_types4();
-    var agents_1 = require_agents();
-    var subagent_tool_logger_12 = require_subagent_tool_logger();
+    var subagents_1 = require_subagents();
+    var subagent_tool_logger_1 = require_subagent_tool_logger();
     function parseRequiredPermissions(output) {
       let permissions = [];
       const lines = output.split("\n");
@@ -16083,7 +15915,7 @@ var require_parser = __commonJS({
           continue;
         }
         const { title, output, input } = event.part.state;
-        const isValidator = input?.subagent_type === agents_1.VALIDATOR_SUBAGENT_NAME || title?.includes(agents_1.VALIDATOR_SUBAGENT_NAME);
+        const isValidator = input?.subagent_type === subagents_1.VALIDATOR_SUBAGENT_NAME || title?.includes(subagents_1.VALIDATOR_SUBAGENT_NAME);
         if (isValidator && output) {
           outputs.push(output.trim());
         }
@@ -16091,7 +15923,7 @@ var require_parser = __commonJS({
       return outputs;
     }
     function summarizeOpenCodeLine(line) {
-      if (line.type !== "tool_use" && line.type !== subagent_tool_logger_12.SUBAGENT_TOOL_EVENT_TYPE) {
+      if (line.type !== "tool_use" && line.type !== subagent_tool_logger_1.SUBAGENT_TOOL_EVENT_TYPE) {
         return line;
       }
       const { part } = line;
@@ -16113,9 +15945,9 @@ var require_parser = __commonJS({
   }
 });
 
-// dist/opencode-integration/internal-paths.js
+// dist/git/internal-paths.js
 var require_internal_paths = __commonJS({
-  "dist/opencode-integration/internal-paths.js"(exports2) {
+  "dist/git/internal-paths.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.isInternalPath = isInternalPath;
@@ -16126,9 +15958,9 @@ var require_internal_paths = __commonJS({
   }
 });
 
-// dist/opencode-integration/git-file-changes.js
-var require_git_file_changes = __commonJS({
-  "dist/opencode-integration/git-file-changes.js"(exports2) {
+// dist/git/file-changes.js
+var require_file_changes = __commonJS({
+  "dist/git/file-changes.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.captureGitBaseline = captureGitBaseline;
@@ -16207,9 +16039,9 @@ var require_git_file_changes = __commonJS({
   }
 });
 
-// dist/opencode-integration/cost-tracker.js
+// dist/opencode-integration/execution/cost-tracker.js
 var require_cost_tracker = __commonJS({
-  "dist/opencode-integration/cost-tracker.js"(exports2) {
+  "dist/opencode-integration/execution/cost-tracker.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.fetchOpenCodeStats = fetchOpenCodeStats;
@@ -16328,6 +16160,113 @@ var require_progress_handler = __commonJS({
   }
 });
 
+// dist/extension-reporting/detect.js
+var require_detect = __commonJS({
+  "dist/extension-reporting/detect.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.BUILDER_EXTENSION_TYPES = void 0;
+    exports2.isSpiExtension = isSpiExtension;
+    exports2.isExtensionsFile = isExtensionsFile;
+    exports2.detectExtension = detectExtension;
+    exports2.matchQuotedExtensionConfigProperty = matchQuotedExtensionConfigProperty;
+    exports2.extractExtensionDisplayTitle = extractExtensionDisplayTitle;
+    exports2.injectCreatedBy = injectCreatedBy;
+    var CONTAINER_ROOT_PREFIX = /^\/user-code\//;
+    var EXTENSION_FILE_PATTERN = /\/extensions\.ts$|\.extension\.ts$/;
+    var SPI_EXTENSION_TYPES = [
+      "ecomShippingRates",
+      "ecomAdditionalFees",
+      "ecomValidations",
+      "ecomDiscountTriggers",
+      "ecomGiftCards",
+      "ecomPaymentSettings",
+      "bookingsStaffSortingProvider"
+    ];
+    exports2.BUILDER_EXTENSION_TYPES = [
+      "dashboardPage",
+      "dashboardModal",
+      "dashboardPlugin",
+      "dashboardMenuPlugin",
+      "embeddedScript",
+      "event",
+      "customElement",
+      "siteComponent",
+      "editorReactComponent",
+      "sitePlugin",
+      ...SPI_EXTENSION_TYPES,
+      "contextProvider",
+      "functionLibrary",
+      "dataCollections"
+    ];
+    var SPI_EXTENSION_TYPE_SET = new Set(SPI_EXTENSION_TYPES);
+    function isSpiExtension(extensionType) {
+      return SPI_EXTENSION_TYPE_SET.has(extensionType);
+    }
+    function normalizeFilePath(filePath) {
+      return filePath.replace(CONTAINER_ROOT_PREFIX, "");
+    }
+    function isExtensionsFile(filePath) {
+      return EXTENSION_FILE_PATTERN.test(filePath);
+    }
+    function detectExtension(content) {
+      for (const extensionType of exports2.BUILDER_EXTENSION_TYPES) {
+        if (content.includes(`extensions.${extensionType}(`) || content.includes(`experimentalExtensions.${extensionType}(`)) {
+          return extensionType;
+        }
+      }
+      return null;
+    }
+    function toTitleCase(str) {
+      return str.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+    }
+    function extractExtensionName(filePath) {
+      const parts = normalizeFilePath(filePath).split("/");
+      const folderName = parts[parts.length - 2] || "";
+      return toTitleCase(folderName);
+    }
+    function matchQuotedExtensionConfigProperty(content, propName) {
+      const objectPropertyQuotedStringValuePattern = `\\b${propName}\\s*:\\s*(?:"([^"\\\\]*)"|'([^'\\\\]*)')`;
+      const objectPropertyQuotedStringValueRegex = new RegExp(
+        objectPropertyQuotedStringValuePattern,
+        // `m` = multiline: `^` / `$` match line starts/ends, not only the whole string.
+        "m"
+      );
+      const quotedStringValueMatch = content.match(objectPropertyQuotedStringValueRegex);
+      if (!quotedStringValueMatch)
+        return null;
+      return quotedStringValueMatch[1] ?? quotedStringValueMatch[2] ?? null;
+    }
+    function extractExtensionDisplayTitle(content, filePath) {
+      const title = matchQuotedExtensionConfigProperty(content, "title");
+      if (title)
+        return title;
+      const name = matchQuotedExtensionConfigProperty(content, "name");
+      if (name)
+        return name;
+      const displayName = matchQuotedExtensionConfigProperty(content, "displayName");
+      if (displayName)
+        return displayName;
+      const idSuffix = matchQuotedExtensionConfigProperty(content, "idSuffix");
+      if (idSuffix)
+        return idSuffix;
+      return extractExtensionName(filePath);
+    }
+    function injectCreatedBy(content) {
+      if (content.includes("createdBy"))
+        return content;
+      const isGeneric = content.includes("genericExtension(");
+      const createdByValue = isGeneric ? '  createdBy: "CODE_GEN",' : '  createdBy: {\n    author: "CODE_GEN",\n  },';
+      return content.replace(/(\S)(\n)(}\))(;?\s*)$/, (_match, preChar, newline, closeBrace, tail) => {
+        const needsComma = preChar !== "," && preChar !== "{";
+        const separator = needsComma ? `${preChar},` : preChar;
+        return `${separator}${newline}${createdByValue}
+${closeBrace}${tail}`;
+      });
+    }
+  }
+});
+
 // dist/opencode-integration/task-tracker/derived-progress.js
 var require_derived_progress = __commonJS({
   "dist/opencode-integration/task-tracker/derived-progress.js"(exports2) {
@@ -16336,12 +16275,12 @@ var require_derived_progress = __commonJS({
     exports2.DerivedProgressReporter = void 0;
     exports2.deriveProgressSteps = deriveProgressSteps;
     var ditto_codegen_types_12 = require_dist4();
-    var constants_1 = require_constants5();
-    var agents_1 = require_agents();
+    var detect_1 = require_detect();
+    var subagents_1 = require_subagents();
     var SUBAGENT_STEPS = {
-      [agents_1.VALIDATOR_SUBAGENT_NAME]: "Building project",
-      [agents_1.WIX_DOCS_SUBAGENT_NAME]: "Reading documentation",
-      [agents_1.WDS_DOCS_SUBAGENT_NAME]: "Reading documentation"
+      [subagents_1.VALIDATOR_SUBAGENT_NAME]: "Building project",
+      [subagents_1.WIX_DOCS_SUBAGENT_NAME]: "Reading documentation",
+      [subagents_1.WDS_DOCS_SUBAGENT_NAME]: "Reading documentation"
     };
     var REGISTRY_FILE_PATTERN = /(^|\/)extensions\.ts$/;
     var EXTENSION_DEFINITION_PATTERN = /\.extension\.ts$/;
@@ -16349,7 +16288,7 @@ var require_derived_progress = __commonJS({
       return token.replace(/[_-]+/g, " ").replace(/([a-z\d])([A-Z])/g, "$1 $2").split(/\s+/).filter(Boolean).map((word) => word[0].toUpperCase() + word.slice(1).toLowerCase()).join(" ");
     }
     function humanizeExtensionType(type) {
-      return (0, constants_1.isSpiExtension)(type) ? "Service Plugin" : toTitleCaseWords(type);
+      return (0, detect_1.isSpiExtension)(type) ? "Service Plugin" : toTitleCaseWords(type);
     }
     function extensionStep(verb, type) {
       return `${verb} ${humanizeExtensionType(type)}`;
@@ -16398,7 +16337,7 @@ var require_derived_progress = __commonJS({
             if (REGISTRY_FILE_PATTERN.test(file.path)) {
               steps.push("Registering extensions");
             } else if (EXTENSION_DEFINITION_PATTERN.test(file.path) && file.content) {
-              const type = (0, constants_1.detectExtension)(file.content);
+              const type = (0, detect_1.detectExtension)(file.content);
               if (type)
                 steps.push(extensionStep("Editing", type));
             }
@@ -16505,9 +16444,9 @@ var require_utils9 = __commonJS({
   }
 });
 
-// dist/plugins-runtime.js
+// dist/plugin-system/plugins-runtime.js
 var require_plugins_runtime = __commonJS({
-  "dist/plugins-runtime.js"(exports2) {
+  "dist/plugin-system/plugins-runtime.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getActivePlugins = getActivePlugins;
@@ -16657,15 +16596,15 @@ var require_task_tracker2 = __commonJS({
   }
 });
 
-// dist/opencode-integration/tool-usage.js
+// dist/opencode-integration/execution/tool-usage.js
 var require_tool_usage = __commonJS({
-  "dist/opencode-integration/tool-usage.js"(exports2) {
+  "dist/opencode-integration/execution/tool-usage.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ToolUsageCollector = void 0;
     exports2.commandSignature = commandSignature;
     exports2.emptyToolUsage = emptyToolUsage;
-    var subagent_tool_logger_12 = require_subagent_tool_logger();
+    var subagent_tool_logger_1 = require_subagent_tool_logger();
     var MAX_REPORTED_TOOLS = 50;
     var MAX_DETAIL_CHARS = 200;
     var MAX_DETAIL_LABELS = 2;
@@ -16702,7 +16641,7 @@ var require_tool_usage = __commonJS({
       return duration > 0 ? duration : 0;
     }
     function isCompletedToolCall(event) {
-      if (event.type !== "tool_use" && event.type !== subagent_tool_logger_12.SUBAGENT_TOOL_EVENT_TYPE) {
+      if (event.type !== "tool_use" && event.type !== subagent_tool_logger_1.SUBAGENT_TOOL_EVENT_TYPE) {
         return false;
       }
       if (!event.part?.tool)
@@ -16758,18 +16697,18 @@ var require_tool_usage = __commonJS({
   }
 });
 
-// dist/opencode-integration/process-manager.js
+// dist/opencode-integration/execution/process-manager.js
 var require_process_manager = __commonJS({
-  "dist/opencode-integration/process-manager.js"(exports2) {
+  "dist/opencode-integration/execution/process-manager.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.MAX_STARTS_WITHOUT_FINISH = exports2.KILL_GRACE_PERIOD_MS = exports2.IDLE_CHECK_INTERVAL_MS = exports2.IDLE_TIMEOUT_MS = void 0;
+    exports2.MAX_STARTS_WITHOUT_FINISH = exports2.IDLE_CHECK_INTERVAL_MS = exports2.IDLE_TIMEOUT_MS = void 0;
     exports2.clearTimers = clearTimers;
     exports2.killProcess = killProcess;
     var logger_12 = require_logger();
     exports2.IDLE_TIMEOUT_MS = 6e5;
     exports2.IDLE_CHECK_INTERVAL_MS = 15e3;
-    exports2.KILL_GRACE_PERIOD_MS = 5e3;
+    var KILL_GRACE_PERIOD_MS = 5e3;
     exports2.MAX_STARTS_WITHOUT_FINISH = 3;
     function clearTimers(timers) {
       if (timers.timeoutId) {
@@ -16805,14 +16744,14 @@ var require_process_manager = __commonJS({
         if (child && !resolved) {
           killSignal("SIGKILL");
         }
-      }, exports2.KILL_GRACE_PERIOD_MS);
+      }, KILL_GRACE_PERIOD_MS);
     }
   }
 });
 
-// dist/opencode-integration/result-builder.js
+// dist/opencode-integration/execution/result-builder.js
 var require_result_builder = __commonJS({
-  "dist/opencode-integration/result-builder.js"(exports2) {
+  "dist/opencode-integration/execution/result-builder.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.createTimeoutResult = createTimeoutResult;
@@ -16880,9 +16819,9 @@ var require_result_builder = __commonJS({
   }
 });
 
-// dist/opencode-integration/process-handlers.js
+// dist/opencode-integration/execution/process-handlers.js
 var require_process_handlers = __commonJS({
-  "dist/opencode-integration/process-handlers.js"(exports2) {
+  "dist/opencode-integration/execution/process-handlers.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.setupTotalTimeout = setupTotalTimeout;
@@ -17012,12 +16951,11 @@ var require_process_handlers = __commonJS({
   }
 });
 
-// dist/opencode-integration/executor.js
+// dist/opencode-integration/execution/executor.js
 var require_executor = __commonJS({
-  "dist/opencode-integration/executor.js"(exports2) {
+  "dist/opencode-integration/execution/executor.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.notifyValidatorOutputsToSlack = notifyValidatorOutputsToSlack;
     exports2.classifyAttempt = classifyAttempt;
     exports2.executeOpenCode = executeOpenCode;
     exports2.resolveFinalRunCost = resolveFinalRunCost;
@@ -17027,9 +16965,8 @@ var require_executor = __commonJS({
     var model_knobs_1 = require_model_knobs();
     var job_context_storage_12 = require_job_context_storage();
     var parser_1 = require_parser();
-    var codeGenerationService_12 = require_codeGenerationService();
     var prompts_1 = require_prompts();
-    var git_file_changes_1 = require_git_file_changes();
+    var file_changes_1 = require_file_changes();
     var cost_tracker_1 = require_cost_tracker();
     var task_tracker_1 = require_task_tracker2();
     var tool_usage_1 = require_tool_usage();
@@ -17038,37 +16975,6 @@ var require_executor = __commonJS({
     var logger_12 = require_logger();
     var MAX_RETRIES = 5;
     var MAX_STALL_ATTEMPTS = 2;
-    async function notifyValidatorOutputsToSlack(stdout, costUsd) {
-      try {
-        const store = job_context_storage_12.jobContextStorage.getStore();
-        const outputs = (0, parser_1.parseValidatorTaskOutputs)(stdout);
-        if (outputs.length === 0)
-          return;
-        const durationMs = store?.flowStartTime ? Date.now() - store.flowStartTime : void 0;
-        const context = {
-          jobId: store?.jobId,
-          metasiteId: store?.metasiteId,
-          costUsd: costUsd > 0 ? costUsd : void 0,
-          durationMs
-        };
-        for (const output of outputs) {
-          if (!(0, parser_1.shouldReportValidatorOutput)(output)) {
-            continue;
-          }
-          try {
-            await codeGenerationService_12.codeGenerationService.handleValidationErrors(output, context);
-          } catch (err) {
-            logger_12.logger.warn("[OpenCode] Failed to report validator output to Slack", {
-              error: err instanceof Error ? err.message : String(err)
-            });
-          }
-        }
-      } catch (err) {
-        logger_12.logger.warn("[OpenCode] Unexpected error in notifyValidatorOutputsToSlack", {
-          error: err instanceof Error ? err.message : String(err)
-        });
-      }
-    }
     function failureReason(result) {
       if (result.stalled)
         return "stall";
@@ -17105,7 +17011,7 @@ var require_executor = __commonJS({
         if (attempt > 1) {
           const failureDetail = lastResult?.error?.message || lastResult?.stderr || "Process timed out";
           logger_12.logger.info(`[OpenCode] Retry attempt ${attempt}/${MAX_RETRIES} after ${lastFailureReason} - starting fresh session with recovery context`, { reason: lastFailureReason, detail: failureDetail.slice(0, 500) });
-          const filesChanged = await (0, git_file_changes_1.collectGitFileChanges)(options.outputPath, options.gitBaseline);
+          const filesChanged = await (0, file_changes_1.collectGitFileChanges)(options.outputPath, options.gitBaseline);
           currentPrompt = (0, prompts_1.buildRecoveryPrompt)(options.prompt, filesChanged, failureDetail, lastFailureReason);
           continueSession = false;
         }
@@ -17259,9 +17165,9 @@ var require_executor = __commonJS({
   }
 });
 
-// dist/opencode-integration/opencode-runner.js
+// dist/opencode-integration/execution/opencode-runner.js
 var require_opencode_runner = __commonJS({
-  "dist/opencode-integration/opencode-runner.js"(exports2) {
+  "dist/opencode-integration/execution/opencode-runner.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.runOpenCodeInit = runOpenCodeInit;
@@ -17330,20 +17236,106 @@ var require_opencode_runner = __commonJS({
   }
 });
 
-// dist/opencode-integration/extension-metadata.js
-var require_extension_metadata = __commonJS({
-  "dist/opencode-integration/extension-metadata.js"(exports2) {
+// dist/opencode-integration/index.js
+var require_opencode_integration = __commonJS({
+  "dist/opencode-integration/index.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.OpenCodeTaskTracker = exports2.runOpenCodeGitConflicts = exports2.runOpenCodeAsk = exports2.runOpenCodeIteration = exports2.runOpenCodeInit = void 0;
+    var opencode_runner_1 = require_opencode_runner();
+    Object.defineProperty(exports2, "runOpenCodeInit", { enumerable: true, get: function() {
+      return opencode_runner_1.runOpenCodeInit;
+    } });
+    Object.defineProperty(exports2, "runOpenCodeIteration", { enumerable: true, get: function() {
+      return opencode_runner_1.runOpenCodeIteration;
+    } });
+    Object.defineProperty(exports2, "runOpenCodeAsk", { enumerable: true, get: function() {
+      return opencode_runner_1.runOpenCodeAsk;
+    } });
+    Object.defineProperty(exports2, "runOpenCodeGitConflicts", { enumerable: true, get: function() {
+      return opencode_runner_1.runOpenCodeGitConflicts;
+    } });
+    var task_tracker_1 = require_task_tracker2();
+    Object.defineProperty(exports2, "OpenCodeTaskTracker", { enumerable: true, get: function() {
+      return task_tracker_1.OpenCodeTaskTracker;
+    } });
+  }
+});
+
+// dist/orchestrators/opencode-orchestrator.js
+var require_opencode_orchestrator = __commonJS({
+  "dist/orchestrators/opencode-orchestrator.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.OpenCodeOrchestrator = void 0;
+    var ditto_codegen_types_12 = require_dist4();
+    var DittoEventEmitter_1 = require_DittoEventEmitter();
+    var opencode_integration_1 = require_opencode_integration();
+    var logger_12 = require_logger();
+    var OpenCodeOrchestrator = class extends DittoEventEmitter_1.DittoEventEmitter {
+      constructor() {
+        super();
+      }
+      async generateCode(request) {
+        const { blueprint, outputPath, projectId, chatHistory, gitBaseline } = request;
+        this.emitEvent("start:init", {
+          appName: blueprint.appName ?? "",
+          summary: blueprint.summary ?? "",
+          outputPath,
+          extensionsCount: blueprint.extensions?.length || 0
+        });
+        const start = Date.now();
+        this.emitEvent("opencode:start", { outputPath });
+        const result = await (0, opencode_integration_1.runOpenCodeInit)({
+          blueprint,
+          outputPath,
+          projectId,
+          chatHistory,
+          gitBaseline,
+          onStdout: (data) => {
+            this.emitEvent("opencode:output", { data });
+          },
+          onStderr: (data) => {
+            logger_12.logger.error("[OpenCode] stderr", { output: data });
+          }
+        });
+        this.lastUsage = result.usage;
+        this.lastStdout = result.stdout;
+        const durationMs = Date.now() - start;
+        if (!result.success) {
+          this.emitEvent("opencode:error", {
+            error: result.error?.message,
+            exitCode: result.exitCode,
+            durationMs
+          });
+          throw result.error ?? new ditto_codegen_types_12.ProcessExecutionError(`Code generation failed (exit code ${result.exitCode})`, {
+            processType: ditto_codegen_types_12.ProcessType.EXECUTION,
+            exitCode: result.exitCode ?? void 0
+          });
+        }
+        this.emitEvent("opencode:done", { durationMs });
+        this.emitEvent("finish:init", { outputPath, durationMs });
+        return result;
+      }
+    };
+    exports2.OpenCodeOrchestrator = OpenCodeOrchestrator;
+    OpenCodeOrchestrator.DEFAULT_OUTPUT_PATH = "generated-app";
+  }
+});
+
+// dist/extension-reporting/metadata.js
+var require_metadata = __commonJS({
+  "dist/extension-reporting/metadata.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.buildJobExtension = exports2.resolveFilePath = exports2.isFileInExtensionFolder = exports2.getExtensionDirectory = void 0;
+    exports2.buildJobExtension = exports2.resolveFilePath = exports2.isFileInExtensionFolder = void 0;
     exports2.collectDataCollectionEntries = collectDataCollectionEntries;
     var path_12 = require("path");
     var promises_1 = require("fs/promises");
-    var constants_1 = require_constants5();
+    var detect_1 = require_detect();
     var DATA_COLLECTION_MARKER = /import\s+(?:type\s+)?\{[^}]*\bDataCollection\b[^}]*\}\s+from\s+['"](?:@wix\/astro\/builders|@wix\/custom-extensions)['"]/;
     var getExtensionDirectory = (extensionDefinitionPath) => `${path_12.posix.dirname(extensionDefinitionPath)}/`;
-    exports2.getExtensionDirectory = getExtensionDirectory;
-    var isFileInExtensionFolder = (filePath, extensionDefinitionPath) => filePath === extensionDefinitionPath || filePath.startsWith((0, exports2.getExtensionDirectory)(extensionDefinitionPath));
+    var isFileInExtensionFolder = (filePath, extensionDefinitionPath) => filePath === extensionDefinitionPath || filePath.startsWith(getExtensionDirectory(extensionDefinitionPath));
     exports2.isFileInExtensionFolder = isFileInExtensionFolder;
     var resolveFilePath = (outputPath, filePath) => (0, path_12.isAbsolute)(filePath) ? filePath : (0, path_12.join)(outputPath, filePath);
     exports2.resolveFilePath = resolveFilePath;
@@ -17365,51 +17357,51 @@ var require_extension_metadata = __commonJS({
       return entries;
     }
     var buildJobExtension = (definitionPath, extensionType, contentForTitle, titlePath, files) => {
-      const routePath = (0, constants_1.matchQuotedExtensionConfigProperty)(contentForTitle, "routePath");
-      const id = (0, constants_1.matchQuotedExtensionConfigProperty)(contentForTitle, "id");
+      const routePath = (0, detect_1.matchQuotedExtensionConfigProperty)(contentForTitle, "routePath");
+      const id = (0, detect_1.matchQuotedExtensionConfigProperty)(contentForTitle, "id");
       return {
         path: definitionPath,
         extensionType,
-        title: (0, constants_1.extractExtensionDisplayTitle)(contentForTitle, titlePath),
+        title: (0, detect_1.extractExtensionDisplayTitle)(contentForTitle, titlePath),
         ...routePath !== null && { routePath },
         ...id !== null && { id },
         files: [...files],
-        isSpi: (0, constants_1.isSpiExtension)(extensionType)
+        isSpi: (0, detect_1.isSpiExtension)(extensionType)
       };
     };
     exports2.buildJobExtension = buildJobExtension;
   }
 });
 
-// dist/opencode-integration/collect-extensions-created.js
-var require_collect_extensions_created = __commonJS({
-  "dist/opencode-integration/collect-extensions-created.js"(exports2) {
+// dist/extension-reporting/collect-created.js
+var require_collect_created = __commonJS({
+  "dist/extension-reporting/collect-created.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.collectInsertedExtensionsMetadata = collectInsertedExtensionsMetadata;
     var promises_1 = require("fs/promises");
     var ditto_codegen_types_12 = require_dist4();
-    var constants_1 = require_constants5();
-    var extension_metadata_1 = require_extension_metadata();
+    var detect_1 = require_detect();
+    var metadata_1 = require_metadata();
     async function collectInsertedExtensionsMetadata(outputPath, files) {
       const results = [];
       for (const fileChange of files) {
         if (fileChange.operation !== ditto_codegen_types_12.ExtensionGenerationOperation.INSERT)
           continue;
-        if (!(0, constants_1.isExtensionsFile)(fileChange.path))
+        if (!(0, detect_1.isExtensionsFile)(fileChange.path))
           continue;
         try {
-          const content = await (0, promises_1.readFile)((0, extension_metadata_1.resolveFilePath)(outputPath, fileChange.path), "utf-8");
-          const extensionType = (0, constants_1.detectExtension)(content);
+          const content = await (0, promises_1.readFile)((0, metadata_1.resolveFilePath)(outputPath, fileChange.path), "utf-8");
+          const extensionType = (0, detect_1.detectExtension)(content);
           if (!extensionType)
             continue;
-          const folderFiles = files.filter((file) => (0, extension_metadata_1.isFileInExtensionFolder)(file.path, fileChange.path));
+          const folderFiles = files.filter((file) => (0, metadata_1.isFileInExtensionFolder)(file.path, fileChange.path));
           if (extensionType === "dataCollections") {
-            const dataCollectionEntries = await (0, extension_metadata_1.collectDataCollectionEntries)(outputPath, fileChange.path, folderFiles);
+            const dataCollectionEntries = await (0, metadata_1.collectDataCollectionEntries)(outputPath, fileChange.path, folderFiles);
             results.push(...dataCollectionEntries);
             continue;
           }
-          results.push((0, extension_metadata_1.buildJobExtension)(fileChange.path, extensionType, content, fileChange.path, folderFiles));
+          results.push((0, metadata_1.buildJobExtension)(fileChange.path, extensionType, content, fileChange.path, folderFiles));
         } catch {
           continue;
         }
@@ -17419,9 +17411,9 @@ var require_collect_extensions_created = __commonJS({
   }
 });
 
-// dist/opencode-integration/collect-extensions-updated.js
-var require_collect_extensions_updated = __commonJS({
-  "dist/opencode-integration/collect-extensions-updated.js"(exports2) {
+// dist/extension-reporting/collect-updated.js
+var require_collect_updated = __commonJS({
+  "dist/extension-reporting/collect-updated.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.collectUpdatedExtensionsMetadata = collectUpdatedExtensionsMetadata;
@@ -17429,12 +17421,12 @@ var require_collect_extensions_updated = __commonJS({
     var path_12 = require("path");
     var util_1 = require("util");
     var promises_1 = require("fs/promises");
-    var constants_1 = require_constants5();
+    var detect_1 = require_detect();
     var logger_12 = require_logger();
-    var extension_metadata_1 = require_extension_metadata();
+    var metadata_1 = require_metadata();
     var execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
     var ownsItsFolder = (candidate) => {
-      if (!(0, constants_1.isExtensionsFile)(candidate))
+      if (!(0, detect_1.isExtensionsFile)(candidate))
         return false;
       const directory = path_12.posix.dirname(candidate);
       return directory !== "." && path_12.posix.dirname(directory) !== ".";
@@ -17454,7 +17446,7 @@ var require_collect_extensions_updated = __commonJS({
       }
     }
     var resolveOwningDefinitionPath = (filePath, candidates) => {
-      if ((0, constants_1.isExtensionsFile)(filePath))
+      if ((0, detect_1.isExtensionsFile)(filePath))
         return filePath;
       let longest;
       let longestFolderLength = -1;
@@ -17470,146 +17462,51 @@ var require_collect_extensions_updated = __commonJS({
     async function collectUpdatedExtensionsMetadata(outputPath, files, insertedDefinitionPaths) {
       const candidates = await listCandidateDefinitionPaths(outputPath);
       const definitionPaths = /* @__PURE__ */ new Set();
-      for (const fileChange of files) {
-        const definitionPath = resolveOwningDefinitionPath(fileChange.path, candidates);
-        if (definitionPath && !insertedDefinitionPaths.has(definitionPath)) {
-          definitionPaths.add(definitionPath);
-        }
-      }
-      const results = [];
-      for (const definitionPath of definitionPaths) {
-        try {
-          const content = await (0, promises_1.readFile)((0, extension_metadata_1.resolveFilePath)(outputPath, definitionPath), "utf-8");
-          const extensionType = (0, constants_1.detectExtension)(content);
-          if (!extensionType)
-            continue;
-          const folderFiles = files.filter((file) => (0, extension_metadata_1.isFileInExtensionFolder)(file.path, definitionPath));
-          if (extensionType === "dataCollections") {
-            const dataCollectionEntries = await (0, extension_metadata_1.collectDataCollectionEntries)(outputPath, definitionPath, folderFiles);
-            results.push(...dataCollectionEntries);
-            continue;
-          }
-          results.push((0, extension_metadata_1.buildJobExtension)(definitionPath, extensionType, content, definitionPath, folderFiles));
-        } catch {
-          continue;
-        }
-      }
-      return results;
-    }
-  }
-});
-
-// dist/opencode-integration/extensions-job-payload.js
-var require_extensions_job_payload = __commonJS({
-  "dist/opencode-integration/extensions-job-payload.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.buildExtensionsJobPayload = buildExtensionsJobPayload;
-    var ditto_codegen_types_12 = require_dist4();
-    var constants_1 = require_constants5();
-    var collect_extensions_created_1 = require_collect_extensions_created();
-    var collect_extensions_updated_1 = require_collect_extensions_updated();
-    async function buildExtensionsJobPayload(outputPath, files) {
-      const created = await (0, collect_extensions_created_1.collectInsertedExtensionsMetadata)(outputPath, files);
-      const insertedDefinitionPaths = new Set(files.filter((file) => file.operation === ditto_codegen_types_12.ExtensionGenerationOperation.INSERT && (0, constants_1.isExtensionsFile)(file.path)).map((file) => file.path));
-      const updated = await (0, collect_extensions_updated_1.collectUpdatedExtensionsMetadata)(outputPath, files, insertedDefinitionPaths);
-      return { created, updated };
-    }
-  }
-});
-
-// dist/opencode-integration/index.js
-var require_opencode_integration = __commonJS({
-  "dist/opencode-integration/index.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.buildExtensionsJobPayload = exports2.collectInsertedExtensionsMetadata = exports2.OpenCodeTaskTracker = exports2.runOpenCodeGitConflicts = exports2.runOpenCodeAsk = exports2.runOpenCodeIteration = exports2.runOpenCodeInit = void 0;
-    var opencode_runner_1 = require_opencode_runner();
-    Object.defineProperty(exports2, "runOpenCodeInit", { enumerable: true, get: function() {
-      return opencode_runner_1.runOpenCodeInit;
-    } });
-    Object.defineProperty(exports2, "runOpenCodeIteration", { enumerable: true, get: function() {
-      return opencode_runner_1.runOpenCodeIteration;
-    } });
-    Object.defineProperty(exports2, "runOpenCodeAsk", { enumerable: true, get: function() {
-      return opencode_runner_1.runOpenCodeAsk;
-    } });
-    Object.defineProperty(exports2, "runOpenCodeGitConflicts", { enumerable: true, get: function() {
-      return opencode_runner_1.runOpenCodeGitConflicts;
-    } });
-    var task_tracker_1 = require_task_tracker2();
-    Object.defineProperty(exports2, "OpenCodeTaskTracker", { enumerable: true, get: function() {
-      return task_tracker_1.OpenCodeTaskTracker;
-    } });
-    var collect_extensions_created_1 = require_collect_extensions_created();
-    Object.defineProperty(exports2, "collectInsertedExtensionsMetadata", { enumerable: true, get: function() {
-      return collect_extensions_created_1.collectInsertedExtensionsMetadata;
-    } });
-    var extensions_job_payload_1 = require_extensions_job_payload();
-    Object.defineProperty(exports2, "buildExtensionsJobPayload", { enumerable: true, get: function() {
-      return extensions_job_payload_1.buildExtensionsJobPayload;
-    } });
+      for (const fileChange of files) {
+        const definitionPath = resolveOwningDefinitionPath(fileChange.path, candidates);
+        if (definitionPath && !insertedDefinitionPaths.has(definitionPath)) {
+          definitionPaths.add(definitionPath);
+        }
+      }
+      const results = [];
+      for (const definitionPath of definitionPaths) {
+        try {
+          const content = await (0, promises_1.readFile)((0, metadata_1.resolveFilePath)(outputPath, definitionPath), "utf-8");
+          const extensionType = (0, detect_1.detectExtension)(content);
+          if (!extensionType)
+            continue;
+          const folderFiles = files.filter((file) => (0, metadata_1.isFileInExtensionFolder)(file.path, definitionPath));
+          if (extensionType === "dataCollections") {
+            const dataCollectionEntries = await (0, metadata_1.collectDataCollectionEntries)(outputPath, definitionPath, folderFiles);
+            results.push(...dataCollectionEntries);
+            continue;
+          }
+          results.push((0, metadata_1.buildJobExtension)(definitionPath, extensionType, content, definitionPath, folderFiles));
+        } catch {
+          continue;
+        }
+      }
+      return results;
+    }
   }
 });
 
-// dist/OpenCodeOrchestrator.js
-var require_OpenCodeOrchestrator = __commonJS({
-  "dist/OpenCodeOrchestrator.js"(exports2) {
+// dist/extension-reporting/job-payload.js
+var require_job_payload2 = __commonJS({
+  "dist/extension-reporting/job-payload.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.OpenCodeOrchestrator = void 0;
+    exports2.buildExtensionsJobPayload = buildExtensionsJobPayload;
     var ditto_codegen_types_12 = require_dist4();
-    var DittoEventEmitter_1 = require_DittoEventEmitter();
-    var opencode_integration_1 = require_opencode_integration();
-    var logger_12 = require_logger();
-    var OpenCodeOrchestrator = class extends DittoEventEmitter_1.DittoEventEmitter {
-      constructor() {
-        super();
-      }
-      async generateCode(request) {
-        const { blueprint, outputPath, projectId, chatHistory, gitBaseline } = request;
-        this.emitEvent("start:init", {
-          appName: blueprint.appName ?? "",
-          summary: blueprint.summary ?? "",
-          outputPath,
-          extensionsCount: blueprint.extensions?.length || 0
-        });
-        const start = Date.now();
-        this.emitEvent("opencode:start", { outputPath });
-        const result = await (0, opencode_integration_1.runOpenCodeInit)({
-          blueprint,
-          outputPath,
-          projectId,
-          chatHistory,
-          gitBaseline,
-          onStdout: (data) => {
-            this.emitEvent("opencode:output", { data });
-          },
-          onStderr: (data) => {
-            logger_12.logger.error("[OpenCode] stderr", { output: data });
-          }
-        });
-        this.lastUsage = result.usage;
-        this.lastStdout = result.stdout;
-        const durationMs = Date.now() - start;
-        if (!result.success) {
-          this.emitEvent("opencode:error", {
-            error: result.error?.message,
-            exitCode: result.exitCode,
-            durationMs
-          });
-          throw result.error ?? new ditto_codegen_types_12.ProcessExecutionError(`Code generation failed (exit code ${result.exitCode})`, {
-            processType: ditto_codegen_types_12.ProcessType.EXECUTION,
-            exitCode: result.exitCode ?? void 0
-          });
-        }
-        this.emitEvent("opencode:done", { durationMs });
-        this.emitEvent("finish:init", { outputPath, durationMs });
-        return result;
-      }
-    };
-    exports2.OpenCodeOrchestrator = OpenCodeOrchestrator;
-    OpenCodeOrchestrator.DEFAULT_OUTPUT_PATH = "generated-app";
+    var detect_1 = require_detect();
+    var collect_created_1 = require_collect_created();
+    var collect_updated_1 = require_collect_updated();
+    async function buildExtensionsJobPayload(outputPath, files) {
+      const created = await (0, collect_created_1.collectInsertedExtensionsMetadata)(outputPath, files);
+      const insertedDefinitionPaths = new Set(files.filter((file) => file.operation === ditto_codegen_types_12.ExtensionGenerationOperation.INSERT && (0, detect_1.isExtensionsFile)(file.path)).map((file) => file.path));
+      const updated = await (0, collect_updated_1.collectUpdatedExtensionsMetadata)(outputPath, files, insertedDefinitionPaths);
+      return { created, updated };
+    }
   }
 });
 
@@ -17687,8 +17584,8 @@ var require_codegen_flow_helpers = __commonJS({
     exports2.getOutputPath = getOutputPath;
     var path_12 = __importDefault2(require("path"));
     var codeGenerationService_12 = require_codeGenerationService();
-    var git_file_changes_1 = require_git_file_changes();
-    var extensions_job_payload_1 = require_extensions_job_payload();
+    var file_changes_1 = require_file_changes();
+    var job_payload_1 = require_job_payload2();
     var agent_io_1 = require_agent_io();
     var utils_12 = require_utils9();
     var DEFAULT_OUTPUT_PATH = "generated-app";
@@ -17696,8 +17593,8 @@ var require_codegen_flow_helpers = __commonJS({
       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, extensions_job_payload_1.buildExtensionsJobPayload)(outputPath, files);
+      const files = await (0, file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
+      const extensions = await (0, job_payload_1.buildExtensionsJobPayload)(outputPath, files);
       return {
         requiredPermissions: [],
         error,
@@ -17718,22 +17615,22 @@ var require_codegen_flow_helpers = __commonJS({
   }
 });
 
-// dist/opencode-integration/inject-created-by.js
+// dist/extension-reporting/inject-created-by.js
 var require_inject_created_by = __commonJS({
-  "dist/opencode-integration/inject-created-by.js"(exports2) {
+  "dist/extension-reporting/inject-created-by.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.injectCreatedByIntoExtensionFiles = injectCreatedByIntoExtensionFiles;
     var promises_1 = require("fs/promises");
     var path_12 = require("path");
     var logger_12 = require_logger();
-    var constants_1 = require_constants5();
+    var detect_1 = require_detect();
     async function injectCreatedByIntoExtensionFiles(cwd, createdExtensions) {
       for (const { path: filePath } of createdExtensions) {
         const absolutePath = (0, path_12.join)(cwd, filePath);
         try {
           const original = await (0, promises_1.readFile)(absolutePath, "utf-8");
-          const injected = (0, constants_1.injectCreatedBy)(original);
+          const injected = (0, detect_1.injectCreatedBy)(original);
           if (injected !== original) {
             await (0, promises_1.writeFile)(absolutePath, injected, "utf-8");
             logger_12.logger.info("[OpenCode] Injected createdBy into extension file", {
@@ -22559,9 +22456,9 @@ var require_src2 = __commonJS({
   }
 });
 
-// dist/biLogger.js
-var require_biLogger = __commonJS({
-  "dist/biLogger.js"(exports2) {
+// dist/telemetry/bi-logger.js
+var require_bi_logger2 = __commonJS({
+  "dist/telemetry/bi-logger.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -22580,9 +22477,9 @@ var require_biLogger = __commonJS({
   }
 });
 
-// dist/biEvents.js
-var require_biEvents = __commonJS({
-  "dist/biEvents.js"(exports2) {
+// dist/telemetry/bi-events.js
+var require_bi_events = __commonJS({
+  "dist/telemetry/bi-events.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.reportSessionStart = reportSessionStart;
@@ -22591,7 +22488,7 @@ var require_biEvents = __commonJS({
     var v2_1 = require_v2();
     var v2_2 = require_v22();
     var types_1 = require_types_impl();
-    var biLogger_1 = require_biLogger();
+    var bi_logger_1 = require_bi_logger2();
     var logger_12 = require_logger();
     var MAX_JOB_INPUT_LENGTH = 3e4;
     var TRUNCATION_SUFFIX = "\u2026";
@@ -22629,7 +22526,7 @@ var require_biEvents = __commonJS({
       if (report.environment === types_1.Environment.APP_BUILDER) {
         logger_12.logger.info("Reporting BI event 200 (session start)", devibeParams);
         try {
-          await biLogger_1.biLogger.report((0, v2_1.devibeCodegenAgentSessionStartSrc196Evid200)(devibeParams));
+          await bi_logger_1.biLogger.report((0, v2_1.devibeCodegenAgentSessionStartSrc196Evid200)(devibeParams));
         } catch (err) {
           logger_12.logger.warn("BI event 200 report failed", { error: err });
         }
@@ -22647,7 +22544,7 @@ var require_biEvents = __commonJS({
       };
       logger_12.logger.info("Reporting BI event 299 (generic session start)", codegenAgentParams);
       try {
-        await biLogger_1.biLogger.report((0, v2_2.codegenAgentSessionStartSrc11Evid299)(codegenAgentParams));
+        await bi_logger_1.biLogger.report((0, v2_2.codegenAgentSessionStartSrc11Evid299)(codegenAgentParams));
       } catch (err) {
         logger_12.logger.warn("BI event 299 report failed", { error: err });
       }
@@ -22674,7 +22571,7 @@ var require_biEvents = __commonJS({
       if (report.environment === types_1.Environment.APP_BUILDER) {
         logger_12.logger.info("Reporting BI event 201 (session end)", devibeParams);
         try {
-          await biLogger_1.biLogger.report((0, v2_1.devibeCodegenAgentSessionEndSrc196Evid201)(devibeParams));
+          await bi_logger_1.biLogger.report((0, v2_1.devibeCodegenAgentSessionEndSrc196Evid201)(devibeParams));
         } catch (err) {
           logger_12.logger.warn("BI event 201 report failed", { error: err });
         }
@@ -22696,7 +22593,7 @@ var require_biEvents = __commonJS({
       };
       logger_12.logger.info("Reporting BI event 304 (generic session end)", codegenAgentParams);
       try {
-        await biLogger_1.biLogger.report((0, v2_2.codegenAgentSessionEndSrc11Evid304)(codegenAgentParams));
+        await bi_logger_1.biLogger.report((0, v2_2.codegenAgentSessionEndSrc11Evid304)(codegenAgentParams));
       } catch (err) {
         logger_12.logger.warn("BI event 304 report failed", { error: err });
       }
@@ -22723,7 +22620,7 @@ var require_biEvents = __commonJS({
       if (report.environment === types_1.Environment.APP_BUILDER) {
         logger_12.logger.info("Reporting BI event 202 (session error)", devibeParams);
         try {
-          await biLogger_1.biLogger.report((0, v2_1.devibeCodegenAgentSessionErrorSrc196Evid202)(devibeParams));
+          await bi_logger_1.biLogger.report((0, v2_1.devibeCodegenAgentSessionErrorSrc196Evid202)(devibeParams));
         } catch (err) {
           logger_12.logger.warn("BI event 202 report failed", { error: err });
         }
@@ -22746,7 +22643,7 @@ var require_biEvents = __commonJS({
       };
       logger_12.logger.info("Reporting BI event 305 (generic session error)", codegenAgentParams);
       try {
-        await biLogger_1.biLogger.report((0, v2_2.codegenAgentSessionErrorSrc11Evid305)(codegenAgentParams));
+        await bi_logger_1.biLogger.report((0, v2_2.codegenAgentSessionErrorSrc11Evid305)(codegenAgentParams));
       } catch (err) {
         logger_12.logger.warn("BI event 305 report failed", { error: err });
       }
@@ -22754,9 +22651,53 @@ var require_biEvents = __commonJS({
   }
 });
 
-// dist/opencode-integration/report-expensive-run.js
-var require_report_expensive_run = __commonJS({
-  "dist/opencode-integration/report-expensive-run.js"(exports2) {
+// dist/opencode-integration/slack-reports/validator-outputs.js
+var require_validator_outputs = __commonJS({
+  "dist/opencode-integration/slack-reports/validator-outputs.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.notifyValidatorOutputsToSlack = notifyValidatorOutputsToSlack;
+    var logger_12 = require_logger();
+    var job_context_storage_12 = require_job_context_storage();
+    var codeGenerationService_12 = require_codeGenerationService();
+    var parser_1 = require_parser();
+    async function notifyValidatorOutputsToSlack(stdout, costUsd) {
+      try {
+        const store = job_context_storage_12.jobContextStorage.getStore();
+        const outputs = (0, parser_1.parseValidatorTaskOutputs)(stdout);
+        if (outputs.length === 0)
+          return;
+        const durationMs = store?.flowStartTime ? Date.now() - store.flowStartTime : void 0;
+        const context = {
+          jobId: store?.jobId,
+          metasiteId: store?.metasiteId,
+          costUsd: costUsd > 0 ? costUsd : void 0,
+          durationMs
+        };
+        for (const output of outputs) {
+          if (!(0, parser_1.shouldReportValidatorOutput)(output)) {
+            continue;
+          }
+          try {
+            await codeGenerationService_12.codeGenerationService.handleValidationErrors(output, context);
+          } catch (err) {
+            logger_12.logger.warn("[OpenCode] Failed to report validator output to Slack", {
+              error: err instanceof Error ? err.message : String(err)
+            });
+          }
+        }
+      } catch (err) {
+        logger_12.logger.warn("[OpenCode] Unexpected error in notifyValidatorOutputsToSlack", {
+          error: err instanceof Error ? err.message : String(err)
+        });
+      }
+    }
+  }
+});
+
+// dist/opencode-integration/slack-reports/expensive-run.js
+var require_expensive_run = __commonJS({
+  "dist/opencode-integration/slack-reports/expensive-run.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.notifyExpensiveRunToSlack = notifyExpensiveRunToSlack;
@@ -22823,7 +22764,7 @@ var require_opencode_init = __commonJS({
     var codeGenerationService_12 = require_codeGenerationService();
     var cli_listeners_1 = require_cli_listeners();
     var job_context_storage_12 = require_job_context_storage();
-    var OpenCodeOrchestrator_1 = require_OpenCodeOrchestrator();
+    var opencode_orchestrator_1 = require_opencode_orchestrator();
     var ditto_codegen_types_12 = require_dist4();
     var codegen_flow_helpers_12 = require_codegen_flow_helpers();
     var agent_io_1 = require_agent_io();
@@ -22832,12 +22773,12 @@ var require_opencode_init = __commonJS({
     var context_12 = require_context();
     var logger_12 = require_logger();
     var model_knobs_1 = require_model_knobs();
-    var git_file_changes_1 = require_git_file_changes();
+    var file_changes_1 = require_file_changes();
     var inject_created_by_1 = require_inject_created_by();
-    var extensions_job_payload_1 = require_extensions_job_payload();
-    var biEvents_1 = require_biEvents();
-    var executor_1 = require_executor();
-    var report_expensive_run_1 = require_report_expensive_run();
+    var job_payload_1 = require_job_payload2();
+    var bi_events_1 = require_bi_events();
+    var validator_outputs_1 = require_validator_outputs();
+    var expensive_run_1 = require_expensive_run();
     var pre_run_decision_1 = require_pre_run_decision();
     var environments_12 = require_environments();
     var plugins_runtime_1 = require_plugins_runtime();
@@ -22864,16 +22805,16 @@ var require_opencode_init = __commonJS({
       logger_12.logger.info("[OpenCode Init] Starting task", { taskId });
       await codeGenerationService_12.codeGenerationService.updateTask(jobId, taskId, ditto_codegen_types_12.Status.RUNNING, {});
       logger_12.logger.info("[OpenCode Init] Marked task RUNNING", { taskId });
-      await (0, biEvents_1.reportSessionStart)({
+      await (0, bi_events_1.reportSessionStart)({
         ...biBase,
         taskModel,
         taskType: kind,
         jobInput: userInput
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
-      const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
+      const gitBaseline = await (0, file_changes_1.captureGitBaseline)(outputPath);
       store.gitBaseline = gitBaseline;
-      const orchestrator = new OpenCodeOrchestrator_1.OpenCodeOrchestrator();
+      const orchestrator = new opencode_orchestrator_1.OpenCodeOrchestrator();
       let caughtError;
       try {
         (0, agent_io_1.writeAgentInput)(outputPath, agentData);
@@ -22895,9 +22836,9 @@ var require_opencode_init = __commonJS({
           gitBaseline
         });
         store.lastAgentMessage = result.agentMessage;
-        const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
+        const files = await (0, file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
         const agentOutput = (0, agent_io_1.readAgentOutput)(outputPath);
-        const extensions = await (0, extensions_job_payload_1.buildExtensionsJobPayload)(outputPath, files);
+        const extensions = await (0, job_payload_1.buildExtensionsJobPayload)(outputPath, files);
         await (0, inject_created_by_1.injectCreatedByIntoExtensionFiles)(outputPath, extensions.created);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
           requiredPermissions: result.requiredPermissions,
@@ -22913,8 +22854,8 @@ var require_opencode_init = __commonJS({
           requiredPermissions: result.requiredPermissions
         });
         if (orchestrator.lastStdout && !(0, model_knobs_1.hasModelOverride)() && !(0, model_knobs_1.hasSmallModelOverride)()) {
-          void (0, executor_1.notifyValidatorOutputsToSlack)(orchestrator.lastStdout, result.usage.cost);
-          void (0, report_expensive_run_1.notifyExpensiveRunToSlack)({
+          void (0, validator_outputs_1.notifyValidatorOutputsToSlack)(orchestrator.lastStdout, result.usage.cost);
+          void (0, expensive_run_1.notifyExpensiveRunToSlack)({
             usage: result.usage,
             durationMs: Date.now() - flowStartTime,
             agentMessage: result.agentMessage,
@@ -22924,7 +22865,7 @@ var require_opencode_init = __commonJS({
         if (!store.isCompleted) {
           await codeGenerationService_12.codeGenerationService.updateTask(jobId, taskId, ditto_codegen_types_12.Status.COMPLETED, {});
         }
-        await (0, biEvents_1.reportSessionEnd)({
+        await (0, bi_events_1.reportSessionEnd)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -22943,7 +22884,7 @@ var require_opencode_init = __commonJS({
         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)({
+        await (0, bi_events_1.reportSessionEnd)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -22952,7 +22893,7 @@ var require_opencode_init = __commonJS({
           agentOutput: JSON.stringify({ files: failedRunPayload.files }),
           jobDuration: String(Date.now() - flowStartTime)
         });
-        await (0, biEvents_1.reportSessionError)({
+        await (0, bi_events_1.reportSessionError)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -22976,9 +22917,9 @@ var require_opencode_init = __commonJS({
   }
 });
 
-// dist/OpenCodeIterationOrchestrator.js
-var require_OpenCodeIterationOrchestrator = __commonJS({
-  "dist/OpenCodeIterationOrchestrator.js"(exports2) {
+// dist/orchestrators/opencode-iteration-orchestrator.js
+var require_opencode_iteration_orchestrator = __commonJS({
+  "dist/orchestrators/opencode-iteration-orchestrator.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.OpenCodeIterationOrchestrator = void 0;
@@ -23040,7 +22981,7 @@ var require_opencode_iterate = __commonJS({
     var cli_listeners_1 = require_cli_listeners();
     var job_context_storage_12 = require_job_context_storage();
     var ditto_codegen_types_12 = require_dist4();
-    var OpenCodeIterationOrchestrator_1 = require_OpenCodeIterationOrchestrator();
+    var opencode_iteration_orchestrator_1 = require_opencode_iteration_orchestrator();
     var types_1 = require_types_impl();
     var codegen_flow_helpers_12 = require_codegen_flow_helpers();
     var agent_io_1 = require_agent_io();
@@ -23048,12 +22989,12 @@ var require_opencode_iterate = __commonJS({
     var context_12 = require_context();
     var logger_12 = require_logger();
     var model_knobs_1 = require_model_knobs();
-    var git_file_changes_1 = require_git_file_changes();
+    var file_changes_1 = require_file_changes();
     var inject_created_by_1 = require_inject_created_by();
-    var extensions_job_payload_1 = require_extensions_job_payload();
-    var executor_1 = require_executor();
-    var report_expensive_run_1 = require_report_expensive_run();
-    var biEvents_1 = require_biEvents();
+    var job_payload_1 = require_job_payload2();
+    var validator_outputs_1 = require_validator_outputs();
+    var expensive_run_1 = require_expensive_run();
+    var bi_events_1 = require_bi_events();
     var plugins_runtime_1 = require_plugins_runtime();
     var runOpencodeIterateFlow = async (chatHistory, agentData) => {
       const store = job_context_storage_12.jobContextStorage.getStore();
@@ -23078,16 +23019,16 @@ var require_opencode_iterate = __commonJS({
       logger_12.logger.info("[OpenCode Iterate] Starting task", { taskId });
       await codeGenerationService_12.codeGenerationService.updateTask(jobId, taskId, ditto_codegen_types_12.Status.RUNNING, {});
       logger_12.logger.info("[OpenCode Iterate] Marked task RUNNING", { taskId });
-      await (0, biEvents_1.reportSessionStart)({
+      await (0, bi_events_1.reportSessionStart)({
         ...biBase,
         taskModel,
         taskType: kind,
         jobInput: userInput
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
-      const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
+      const gitBaseline = await (0, file_changes_1.captureGitBaseline)(outputPath);
       store.gitBaseline = gitBaseline;
-      const iterationOrchestrator = new OpenCodeIterationOrchestrator_1.OpenCodeIterationOrchestrator();
+      const iterationOrchestrator = new opencode_iteration_orchestrator_1.OpenCodeIterationOrchestrator();
       let caughtError;
       try {
         (0, agent_io_1.writeAgentInput)(outputPath, agentData);
@@ -23099,9 +23040,9 @@ var require_opencode_iterate = __commonJS({
           gitBaseline
         });
         store.lastAgentMessage = result.agentMessage;
-        const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
+        const files = await (0, file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
         const agentOutput = (0, agent_io_1.readAgentOutput)(outputPath);
-        const extensions = await (0, extensions_job_payload_1.buildExtensionsJobPayload)(outputPath, files);
+        const extensions = await (0, job_payload_1.buildExtensionsJobPayload)(outputPath, files);
         await (0, inject_created_by_1.injectCreatedByIntoExtensionFiles)(outputPath, extensions.created);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
           requiredPermissions: result.requiredPermissions,
@@ -23117,8 +23058,8 @@ var require_opencode_iterate = __commonJS({
           requiredPermissions: result.requiredPermissions
         });
         if (iterationOrchestrator.lastStdout && !(0, model_knobs_1.hasModelOverride)() && !(0, model_knobs_1.hasSmallModelOverride)()) {
-          void (0, executor_1.notifyValidatorOutputsToSlack)(iterationOrchestrator.lastStdout, result.usage.cost);
-          void (0, report_expensive_run_1.notifyExpensiveRunToSlack)({
+          void (0, validator_outputs_1.notifyValidatorOutputsToSlack)(iterationOrchestrator.lastStdout, result.usage.cost);
+          void (0, expensive_run_1.notifyExpensiveRunToSlack)({
             usage: result.usage,
             durationMs: Date.now() - flowStartTime,
             agentMessage: result.agentMessage,
@@ -23128,7 +23069,7 @@ var require_opencode_iterate = __commonJS({
         await codeGenerationService_12.codeGenerationService.updateTask(jobId, taskId, ditto_codegen_types_12.Status.COMPLETED, {
           taskOutput: { files }
         });
-        await (0, biEvents_1.reportSessionEnd)({
+        await (0, bi_events_1.reportSessionEnd)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -23147,7 +23088,7 @@ var require_opencode_iterate = __commonJS({
         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)({
+        await (0, bi_events_1.reportSessionEnd)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -23156,7 +23097,7 @@ var require_opencode_iterate = __commonJS({
           agentOutput: JSON.stringify({ files: failedRunPayload.files }),
           jobDuration: String(Date.now() - flowStartTime)
         });
-        await (0, biEvents_1.reportSessionError)({
+        await (0, bi_events_1.reportSessionError)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -23180,9 +23121,9 @@ var require_opencode_iterate = __commonJS({
   }
 });
 
-// dist/OpenCodeAskOrchestrator.js
-var require_OpenCodeAskOrchestrator = __commonJS({
-  "dist/OpenCodeAskOrchestrator.js"(exports2) {
+// dist/orchestrators/opencode-ask-orchestrator.js
+var require_opencode_ask_orchestrator = __commonJS({
+  "dist/orchestrators/opencode-ask-orchestrator.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.OpenCodeAskOrchestrator = void 0;
@@ -23242,17 +23183,17 @@ var require_opencode_ask = __commonJS({
     var cli_listeners_1 = require_cli_listeners();
     var job_context_storage_12 = require_job_context_storage();
     var ditto_codegen_types_12 = require_dist4();
-    var OpenCodeAskOrchestrator_1 = require_OpenCodeAskOrchestrator();
+    var opencode_ask_orchestrator_1 = require_opencode_ask_orchestrator();
     var types_1 = require_types_impl();
     var codegen_flow_helpers_12 = require_codegen_flow_helpers();
     var ditto_codegen_types_2 = require_dist4();
     var context_12 = require_context();
     var logger_12 = require_logger();
     var model_knobs_1 = require_model_knobs();
-    var git_file_changes_1 = require_git_file_changes();
+    var file_changes_1 = require_file_changes();
     var inject_created_by_1 = require_inject_created_by();
-    var extensions_job_payload_1 = require_extensions_job_payload();
-    var biEvents_1 = require_biEvents();
+    var job_payload_1 = require_job_payload2();
+    var bi_events_1 = require_bi_events();
     var runOpencodeAskFlow = async (chatHistory) => {
       const store = job_context_storage_12.jobContextStorage.getStore();
       if (!store?.jobId || !store?.taskId) {
@@ -23276,16 +23217,16 @@ var require_opencode_ask = __commonJS({
       logger_12.logger.info("[OpenCode Ask] Starting task", { taskId });
       await codeGenerationService_12.codeGenerationService.updateTask(jobId, taskId, ditto_codegen_types_12.Status.RUNNING, {});
       logger_12.logger.info("[OpenCode Ask] Marked task RUNNING", { taskId });
-      await (0, biEvents_1.reportSessionStart)({
+      await (0, bi_events_1.reportSessionStart)({
         ...biBase,
         taskModel,
         taskType: kind,
         jobInput: userInput
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
-      const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
+      const gitBaseline = await (0, file_changes_1.captureGitBaseline)(outputPath);
       store.gitBaseline = gitBaseline;
-      const askOrchestrator = new OpenCodeAskOrchestrator_1.OpenCodeAskOrchestrator();
+      const askOrchestrator = new opencode_ask_orchestrator_1.OpenCodeAskOrchestrator();
       try {
         (0, cli_listeners_1.attachOrchestratorListeners)(askOrchestrator);
         const result = await askOrchestrator.ask({
@@ -23294,8 +23235,8 @@ var require_opencode_ask = __commonJS({
           chatHistory,
           gitBaseline
         });
-        const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
-        const extensions = await (0, extensions_job_payload_1.buildExtensionsJobPayload)(outputPath, files);
+        const files = await (0, file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
+        const extensions = await (0, job_payload_1.buildExtensionsJobPayload)(outputPath, files);
         await (0, inject_created_by_1.injectCreatedByIntoExtensionFiles)(outputPath, extensions.created);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
           files,
@@ -23307,7 +23248,7 @@ var require_opencode_ask = __commonJS({
             answer: result.answer
           }
         });
-        await (0, biEvents_1.reportSessionEnd)({
+        await (0, bi_events_1.reportSessionEnd)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -23320,8 +23261,8 @@ var require_opencode_ask = __commonJS({
         logger_12.logger.info("[OpenCode Ask] Completed task", { taskId });
       } catch (error) {
         const codegenError = (0, ditto_codegen_types_2.toCodegenError)(error);
-        const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
-        const extensions = await (0, extensions_job_payload_1.buildExtensionsJobPayload)(outputPath, files);
+        const files = await (0, file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
+        const extensions = await (0, job_payload_1.buildExtensionsJobPayload)(outputPath, files);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
           files,
           extensions,
@@ -23329,7 +23270,7 @@ var require_opencode_ask = __commonJS({
         });
         await (0, codegen_flow_helpers_12.updateParentTaskStatus)(localJobContext, ditto_codegen_types_12.Status.FAILED, codegenError);
         const taskCost = askOrchestrator.lastUsage ? Math.round(askOrchestrator.lastUsage.cost * 1e6) : void 0;
-        await (0, biEvents_1.reportSessionEnd)({
+        await (0, bi_events_1.reportSessionEnd)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -23338,7 +23279,7 @@ var require_opencode_ask = __commonJS({
           agentOutput: JSON.stringify({ files }),
           jobDuration: String(Date.now() - flowStartTime)
         });
-        await (0, biEvents_1.reportSessionError)({
+        await (0, bi_events_1.reportSessionError)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -23360,9 +23301,9 @@ var require_opencode_ask = __commonJS({
   }
 });
 
-// dist/OpenCodeGitConflictsOrchestrator.js
-var require_OpenCodeGitConflictsOrchestrator = __commonJS({
-  "dist/OpenCodeGitConflictsOrchestrator.js"(exports2) {
+// dist/orchestrators/opencode-git-conflicts-orchestrator.js
+var require_opencode_git_conflicts_orchestrator = __commonJS({
+  "dist/orchestrators/opencode-git-conflicts-orchestrator.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.OpenCodeGitConflictsOrchestrator = void 0;
@@ -23424,17 +23365,17 @@ var require_opencode_fix_git_conflicts = __commonJS({
     var cli_listeners_1 = require_cli_listeners();
     var job_context_storage_12 = require_job_context_storage();
     var ditto_codegen_types_12 = require_dist4();
-    var OpenCodeGitConflictsOrchestrator_1 = require_OpenCodeGitConflictsOrchestrator();
+    var opencode_git_conflicts_orchestrator_1 = require_opencode_git_conflicts_orchestrator();
     var types_1 = require_types_impl();
     var codegen_flow_helpers_12 = require_codegen_flow_helpers();
     var context_12 = require_context();
     var logger_12 = require_logger();
     var model_knobs_1 = require_model_knobs();
-    var git_file_changes_1 = require_git_file_changes();
-    var extensions_job_payload_1 = require_extensions_job_payload();
-    var executor_1 = require_executor();
-    var report_expensive_run_1 = require_report_expensive_run();
-    var biEvents_1 = require_biEvents();
+    var file_changes_1 = require_file_changes();
+    var job_payload_1 = require_job_payload2();
+    var validator_outputs_1 = require_validator_outputs();
+    var expensive_run_1 = require_expensive_run();
+    var bi_events_1 = require_bi_events();
     var plugins_runtime_1 = require_plugins_runtime();
     var runOpencodeGitConflictsFlow = async (chatHistory) => {
       const store = job_context_storage_12.jobContextStorage.getStore();
@@ -23459,15 +23400,15 @@ var require_opencode_fix_git_conflicts = __commonJS({
       logger_12.logger.info("[OpenCode Git Conflicts] Starting task", { taskId });
       await codeGenerationService_12.codeGenerationService.updateTask(jobId, taskId, ditto_codegen_types_12.Status.RUNNING, {});
       logger_12.logger.info("[OpenCode Git Conflicts] Marked task RUNNING", { taskId });
-      await (0, biEvents_1.reportSessionStart)({
+      await (0, bi_events_1.reportSessionStart)({
         ...biBase,
         taskModel,
         taskType: kind
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
-      const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
+      const gitBaseline = await (0, file_changes_1.captureGitBaseline)(outputPath);
       store.gitBaseline = gitBaseline;
-      const orchestrator = new OpenCodeGitConflictsOrchestrator_1.OpenCodeGitConflictsOrchestrator();
+      const orchestrator = new opencode_git_conflicts_orchestrator_1.OpenCodeGitConflictsOrchestrator();
       let caughtError;
       try {
         (0, cli_listeners_1.attachOrchestratorListeners)(orchestrator);
@@ -23478,8 +23419,8 @@ var require_opencode_fix_git_conflicts = __commonJS({
           gitBaseline
         });
         store.lastAgentMessage = result.agentMessage;
-        const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
-        const extensions = await (0, extensions_job_payload_1.buildExtensionsJobPayload)(outputPath, files);
+        const files = await (0, file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
+        const extensions = await (0, job_payload_1.buildExtensionsJobPayload)(outputPath, files);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
           requiredPermissions: result.requiredPermissions,
           agentMessage: result.agentMessage,
@@ -23493,8 +23434,8 @@ var require_opencode_fix_git_conflicts = __commonJS({
           requiredPermissions: result.requiredPermissions
         });
         if (orchestrator.lastStdout && !(0, model_knobs_1.hasModelOverride)() && !(0, model_knobs_1.hasSmallModelOverride)()) {
-          void (0, executor_1.notifyValidatorOutputsToSlack)(orchestrator.lastStdout, result.usage.cost);
-          void (0, report_expensive_run_1.notifyExpensiveRunToSlack)({
+          void (0, validator_outputs_1.notifyValidatorOutputsToSlack)(orchestrator.lastStdout, result.usage.cost);
+          void (0, expensive_run_1.notifyExpensiveRunToSlack)({
             usage: result.usage,
             durationMs: Date.now() - flowStartTime,
             agentMessage: result.agentMessage,
@@ -23504,7 +23445,7 @@ var require_opencode_fix_git_conflicts = __commonJS({
         await codeGenerationService_12.codeGenerationService.updateTask(jobId, taskId, ditto_codegen_types_12.Status.COMPLETED, {
           taskOutput: { files }
         });
-        await (0, biEvents_1.reportSessionEnd)({
+        await (0, bi_events_1.reportSessionEnd)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -23518,8 +23459,8 @@ var require_opencode_fix_git_conflicts = __commonJS({
       } catch (error) {
         caughtError = error;
         const codegenError = (0, ditto_codegen_types_12.toCodegenError)(error);
-        const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
-        const extensions = await (0, extensions_job_payload_1.buildExtensionsJobPayload)(outputPath, files);
+        const files = await (0, file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
+        const extensions = await (0, job_payload_1.buildExtensionsJobPayload)(outputPath, files);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
           requiredPermissions: [],
           error: codegenError,
@@ -23528,7 +23469,7 @@ var require_opencode_fix_git_conflicts = __commonJS({
         });
         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)({
+        await (0, bi_events_1.reportSessionEnd)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -23537,7 +23478,7 @@ var require_opencode_fix_git_conflicts = __commonJS({
           agentOutput: JSON.stringify({ files }),
           jobDuration: String(Date.now() - flowStartTime)
         });
-        await (0, biEvents_1.reportSessionError)({
+        await (0, bi_events_1.reportSessionError)({
           ...biBase,
           taskModel,
           taskType: kind,
@@ -23561,9 +23502,9 @@ var require_opencode_fix_git_conflicts = __commonJS({
   }
 });
 
-// dist/job-cancellation-monitor.js
+// dist/jobs/job-cancellation-monitor.js
 var require_job_cancellation_monitor = __commonJS({
-  "dist/job-cancellation-monitor.js"(exports2) {
+  "dist/jobs/job-cancellation-monitor.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.JobCancellationMonitor = void 0;
@@ -23572,7 +23513,7 @@ var require_job_cancellation_monitor = __commonJS({
     var logger_12 = require_logger();
     var job_context_storage_12 = require_job_context_storage();
     var types_1 = require_types_impl();
-    var biEvents_1 = require_biEvents();
+    var bi_events_1 = require_bi_events();
     var STATUS_CHECK_INTERVAL_MS = 2e3;
     var JobCancellationMonitor = class {
       constructor(codeGenerationService) {
@@ -23620,7 +23561,7 @@ var require_job_cancellation_monitor = __commonJS({
         if (!store)
           return;
         const jobDuration = store.flowStartTime ? String(Date.now() - store.flowStartTime) : void 0;
-        await (0, biEvents_1.reportSessionEnd)({
+        await (0, bi_events_1.reportSessionEnd)({
           jobId,
           taskId: store.taskId,
           appId: this.projectId,
@@ -23637,9 +23578,9 @@ var require_job_cancellation_monitor = __commonJS({
   }
 });
 
-// dist/job-timeout-monitor.js
+// dist/jobs/job-timeout-monitor.js
 var require_job_timeout_monitor = __commonJS({
-  "dist/job-timeout-monitor.js"(exports2) {
+  "dist/jobs/job-timeout-monitor.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.JobTimeoutMonitor = exports2.JOB_TIMEOUT_MS = void 0;
@@ -23650,7 +23591,7 @@ var require_job_timeout_monitor = __commonJS({
     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();
+    var bi_events_1 = require_bi_events();
     exports2.JOB_TIMEOUT_MS = 1e3 * 60 * 20;
     var JobTimeoutMonitor = class {
       constructor(codeGenerationService) {
@@ -23718,12 +23659,12 @@ var require_job_timeout_monitor = __commonJS({
           runKind: store.kind,
           environment
         };
-        await (0, biEvents_1.reportSessionEnd)({
+        await (0, bi_events_1.reportSessionEnd)({
           ...biBase,
           taskStatus: ditto_codegen_types_12.Status.FAILED,
           jobDuration
         });
-        await (0, biEvents_1.reportSessionError)({
+        await (0, bi_events_1.reportSessionError)({
           ...biBase,
           errorDesc: codegenError.errorType,
           errorMessage: codegenError.message,
@@ -23737,9 +23678,9 @@ var require_job_timeout_monitor = __commonJS({
   }
 });
 
-// dist/opencode-integration/skills-override.js
+// dist/opencode-integration/skills/skills-override.js
 var require_skills_override = __commonJS({
-  "dist/opencode-integration/skills-override.js"(exports2) {
+  "dist/opencode-integration/skills/skills-override.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.SKILLS_DIR = void 0;
@@ -23799,9 +23740,9 @@ var require_skills_override = __commonJS({
   }
 });
 
-// dist/opencode-integration/skills-installer.js
+// dist/opencode-integration/skills/skills-installer.js
 var require_skills_installer = __commonJS({
-  "dist/opencode-integration/skills-installer.js"(exports2) {
+  "dist/opencode-integration/skills/skills-installer.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.applySkillsOverride = applySkillsOverride;
@@ -23939,31 +23880,79 @@ var require_tools_writer = __commonJS({
   }
 });
 
-// dist/opencode-integration/tool-policies.js
+// dist/opencode-integration/plugins/generated-files-guard.js
+var require_generated_files_guard = __commonJS({
+  "dist/opencode-integration/plugins/generated-files-guard.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.GUARD_PLUGIN_FILENAME = exports2.GUARD_MESSAGE = void 0;
+    exports2.isEditorComponentManifest = isEditorComponentManifest;
+    exports2.extractWritePaths = extractWritePaths;
+    exports2.buildGeneratedFilesGuardSource = buildGeneratedFilesGuardSource;
+    exports2.writeGeneratedFilesGuardPlugin = writeGeneratedFilesGuardPlugin;
+    var write_plugin_1 = require_write_plugin();
+    var ERC_MANIFEST_RE = /(^|\/)src\/extensions\/site\/components\/.+\.generated\.tsx?$/;
+    exports2.GUARD_MESSAGE = "BLOCKED: this editor-react-component manifest is auto-generated. Do not create or edit it by hand \u2014 edit the *.tsx / *.module.css / *.props.ts source and regenerate with `npx wix build && npx wix generate manifest`, or override values in the component's *.extension.ts. Do not re-attempt the blocked path; the whole call was rejected, so resubmit any other paths it carried \u2014 they were not written. Only *.generated.ts under src/extensions/site/components/ is blocked.";
+    function isEditorComponentManifest(path) {
+      return ERC_MANIFEST_RE.test(path);
+    }
+    function extractWritePaths(tool, args) {
+      if (tool === "write" || tool === "edit") {
+        return typeof args.filePath === "string" ? [args.filePath] : [];
+      }
+      const list = tool === "batch-write" ? args.files : tool === "multi-edit" ? args.edits : void 0;
+      if (!list)
+        return [];
+      return list.map((item) => item.path).filter((p) => typeof p === "string");
+    }
+    exports2.GUARD_PLUGIN_FILENAME = "generated-files-guard.ts";
+    function buildGeneratedFilesGuardSource() {
+      return `// Generated by @wix/ditto-codegen (generated-files-guard). Do not edit.
+const ERC_MANIFEST_RE = /${ERC_MANIFEST_RE.source}/;
+const GUARD_MESSAGE = ${JSON.stringify(exports2.GUARD_MESSAGE)};
+
+function extractWritePaths(tool, args) {
+  if (tool === "${"write"}" || tool === "${"edit"}") {
+    return typeof args.filePath === "string" ? [args.filePath] : [];
+  }
+  const list =
+    tool === "${"batch-write"}" ? args.files : tool === "${"multi-edit"}" ? args.edits : undefined;
+  if (!list) return [];
+  return list
+    .map((item) => item.path)
+    .filter((p) => typeof p === "string");
+}
+
+export const GeneratedFilesGuard = async () => ({
+  "tool.execute.before": async (input, output) => {
+    const blocked = extractWritePaths(input.tool, output.args).filter((p) =>
+      ERC_MANIFEST_RE.test(p),
+    );
+    if (blocked.length > 0) {
+      throw new Error(GUARD_MESSAGE + " (blocked: " + blocked.join(", ") + ")");
+    }
+  },
+});
+`;
+    }
+    async function writeGeneratedFilesGuardPlugin() {
+      await (0, write_plugin_1.writeGeneratedPlugin)(exports2.GUARD_PLUGIN_FILENAME, buildGeneratedFilesGuardSource());
+    }
+  }
+});
+
+// dist/opencode-integration/plugins/tool-policies.js
 var require_tool_policies3 = __commonJS({
-  "dist/opencode-integration/tool-policies.js"(exports2) {
+  "dist/opencode-integration/plugins/tool-policies.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.TOOL_POLICIES_PLUGIN_FILENAME = exports2.GENERATE_CMD_RE = void 0;
-    exports2.policyMatchesPath = policyMatchesPath;
-    exports2.skillRootOf = skillRootOf;
+    exports2.TOOL_POLICIES_FILENAME = exports2.GENERATE_CMD_RE = void 0;
     exports2.buildToolPoliciesPluginSource = buildToolPoliciesPluginSource;
     exports2.writeToolPoliciesPlugin = writeToolPoliciesPlugin;
-    exports2.validateToolPolicies = validateToolPolicies;
-    var promises_1 = require("fs/promises");
-    var path_12 = require("path");
     var ditto_codegen_types_12 = require_dist4();
-    var logger_12 = require_logger();
-    var generated_plugins_1 = require_generated_plugins();
-    var skills_override_12 = require_skills_override();
+    var write_plugin_1 = require_write_plugin();
     exports2.GENERATE_CMD_RE = /\bwix\s+(schema\s+)?generate\b/;
-    function policyMatchesPath(policy, path) {
-      return policy.pathFragments.some((fragment) => path.includes(fragment));
-    }
-    function skillRootOf(fragment) {
-      return fragment.split("/")[0];
-    }
-    exports2.TOOL_POLICIES_PLUGIN_FILENAME = "tool-policies.ts";
+    exports2.TOOL_POLICIES_FILENAME = "tool-policies.ts";
     function buildToolPoliciesPluginSource(policies) {
       const emitKind = (type, toRuntime, extraFilter = () => true) => JSON.stringify(policies.filter((policy) => policy.type === type).filter(extraFilter).map(toRuntime));
       const emitReads = (mode) => emitKind("read", ({ pathFragments, message }) => ({ pathFragments, message }), (policy) => policy.mode === mode);
@@ -24086,7 +24075,26 @@ export const ToolPolicies = async () => ({
 `;
     }
     async function writeToolPoliciesPlugin(policies) {
-      await (0, generated_plugins_1.writeGeneratedPlugin)(exports2.TOOL_POLICIES_PLUGIN_FILENAME, buildToolPoliciesPluginSource(policies));
+      await (0, write_plugin_1.writeGeneratedPlugin)(exports2.TOOL_POLICIES_FILENAME, buildToolPoliciesPluginSource(policies));
+    }
+  }
+});
+
+// dist/opencode-integration/plugins/tool-policies-drift.js
+var require_tool_policies_drift = __commonJS({
+  "dist/opencode-integration/plugins/tool-policies-drift.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.validateToolPolicies = validateToolPolicies;
+    var promises_1 = require("fs/promises");
+    var path_12 = require("path");
+    var logger_12 = require_logger();
+    var skills_override_12 = require_skills_override();
+    function policyMatchesPath(policy, path) {
+      return policy.pathFragments.some((fragment) => path.includes(fragment));
+    }
+    function skillRootOf(fragment) {
+      return fragment.split("/")[0];
     }
     async function walkFiles(dir, depth = 6) {
       if (depth === 0)
@@ -24188,70 +24196,33 @@ export const ToolPolicies = async () => ({
   }
 });
 
-// dist/opencode-integration/generated-files-guard.js
-var require_generated_files_guard = __commonJS({
-  "dist/opencode-integration/generated-files-guard.js"(exports2) {
+// dist/opencode-integration/plugins/index.js
+var require_plugins3 = __commonJS({
+  "dist/opencode-integration/plugins/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.GUARD_MESSAGE = void 0;
-    exports2.isEditorComponentManifest = isEditorComponentManifest;
-    exports2.extractWritePaths = extractWritePaths;
-    exports2.buildGeneratedFilesGuardSource = buildGeneratedFilesGuardSource;
-    exports2.writeGeneratedFilesGuardPlugin = writeGeneratedFilesGuardPlugin;
-    var generated_plugins_1 = require_generated_plugins();
-    var ERC_MANIFEST_RE = /(^|\/)src\/extensions\/site\/components\/.+\.generated\.tsx?$/;
-    exports2.GUARD_MESSAGE = "BLOCKED: this editor-react-component manifest is auto-generated. Do not create or edit it by hand \u2014 edit the *.tsx / *.module.css / *.props.ts source and regenerate with `npx wix build && npx wix generate manifest`, or override values in the component's *.extension.ts. Do not re-attempt the blocked path; the whole call was rejected, so resubmit any other paths it carried \u2014 they were not written. Only *.generated.ts under src/extensions/site/components/ is blocked.";
-    function isEditorComponentManifest(path) {
-      return ERC_MANIFEST_RE.test(path);
-    }
-    function extractWritePaths(tool, args) {
-      if (tool === "write" || tool === "edit") {
-        return typeof args.filePath === "string" ? [args.filePath] : [];
-      }
-      const list = tool === "batch-write" ? args.files : tool === "multi-edit" ? args.edits : void 0;
-      if (!list)
-        return [];
-      return list.map((item) => item.path).filter((p) => typeof p === "string");
-    }
-    var GUARD_PLUGIN_FILENAME = "generated-files-guard.ts";
-    function buildGeneratedFilesGuardSource() {
-      return `// Generated by @wix/ditto-codegen (generated-files-guard). Do not edit.
-const ERC_MANIFEST_RE = /${ERC_MANIFEST_RE.source}/;
-const GUARD_MESSAGE = ${JSON.stringify(exports2.GUARD_MESSAGE)};
-
-function extractWritePaths(tool, args) {
-  if (tool === "${"write"}" || tool === "${"edit"}") {
-    return typeof args.filePath === "string" ? [args.filePath] : [];
-  }
-  const list =
-    tool === "${"batch-write"}" ? args.files : tool === "${"multi-edit"}" ? args.edits : undefined;
-  if (!list) return [];
-  return list
-    .map((item) => item.path)
-    .filter((p) => typeof p === "string");
-}
-
-export const GeneratedFilesGuard = async () => ({
-  "tool.execute.before": async (input, output) => {
-    const blocked = extractWritePaths(input.tool, output.args).filter((p) =>
-      ERC_MANIFEST_RE.test(p),
-    );
-    if (blocked.length > 0) {
-      throw new Error(GUARD_MESSAGE + " (blocked: " + blocked.join(", ") + ")");
-    }
-  },
-});
-`;
-    }
-    async function writeGeneratedFilesGuardPlugin() {
-      await (0, generated_plugins_1.writeGeneratedPlugin)(GUARD_PLUGIN_FILENAME, buildGeneratedFilesGuardSource());
+    exports2.validateToolPolicies = void 0;
+    exports2.writeGeneratedPlugins = writeGeneratedPlugins;
+    var generated_files_guard_1 = require_generated_files_guard();
+    var subagent_tool_logger_1 = require_subagent_tool_logger();
+    var tool_policies_1 = require_tool_policies3();
+    var tool_policies_drift_1 = require_tool_policies_drift();
+    Object.defineProperty(exports2, "validateToolPolicies", { enumerable: true, get: function() {
+      return tool_policies_drift_1.validateToolPolicies;
+    } });
+    async function writeGeneratedPlugins(toolPolicies) {
+      await Promise.all([
+        (0, generated_files_guard_1.writeGeneratedFilesGuardPlugin)(),
+        (0, subagent_tool_logger_1.writeSubagentToolLoggerPlugin)(),
+        (0, tool_policies_1.writeToolPoliciesPlugin)(toolPolicies)
+      ]);
     }
   }
 });
 
-// dist/plugin-host.js
+// dist/plugin-system/plugin-host.js
 var require_plugin_host = __commonJS({
-  "dist/plugin-host.js"(exports2) {
+  "dist/plugin-system/plugin-host.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.buildPluginHost = void 0;
@@ -24271,9 +24242,9 @@ var require_plugin_host = __commonJS({
   }
 });
 
-// dist/plugin-artifacts.js
+// dist/plugin-system/plugin-artifacts.js
 var require_plugin_artifacts = __commonJS({
-  "dist/plugin-artifacts.js"(exports2) {
+  "dist/plugin-system/plugin-artifacts.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.collectPluginArtifacts = collectPluginArtifacts;
@@ -24297,9 +24268,9 @@ var require_plugin_artifacts = __commonJS({
   }
 });
 
-// dist/fetch-scheduler.js
+// dist/jobs/fetch-scheduler.js
 var require_fetch_scheduler = __commonJS({
-  "dist/fetch-scheduler.js"(exports2) {
+  "dist/jobs/fetch-scheduler.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.FetchScheduler = exports2.MAX_AWAITED_JOB_IDS = exports2.MAX_MISSING_JOB_RECHECKS = exports2.ERROR_BACKOFF_MS = exports2.POST_JOB_INTERVAL_MS = exports2.MIN_FETCH_INTERVAL_MS = void 0;
@@ -24449,21 +24420,21 @@ var require_fetch_scheduler = __commonJS({
   }
 });
 
-// dist/nudge-listener-server.js
+// dist/jobs/nudge-listener-server.js
 var require_nudge_listener_server = __commonJS({
-  "dist/nudge-listener-server.js"(exports2) {
+  "dist/jobs/nudge-listener-server.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.NudgeListenerServer = exports2.BIND_RETRY_DELAY_MS = exports2.BIND_RETRIES = exports2.MAX_LOGGED_PATH_LENGTH = exports2.JOB_ID_PATTERN = exports2.JOB_FETCH_PATH = exports2.JOB_FETCH_PORT = void 0;
+    exports2.NudgeListenerServer = exports2.BIND_RETRY_DELAY_MS = exports2.MAX_LOGGED_PATH_LENGTH = exports2.JOB_FETCH_PATH = exports2.JOB_FETCH_PORT = void 0;
     var node_http_1 = require("node:http");
     var logger_12 = require_logger();
     var utils_12 = require_utils9();
     var fetch_scheduler_1 = require_fetch_scheduler();
     exports2.JOB_FETCH_PORT = 52402;
     exports2.JOB_FETCH_PATH = "/_wix/codegen/fetch-jobs";
-    exports2.JOB_ID_PATTERN = /^[A-Za-z0-9_-]{1,64}$/;
+    var JOB_ID_PATTERN = /^[A-Za-z0-9_-]{1,64}$/;
     exports2.MAX_LOGGED_PATH_LENGTH = 128;
-    exports2.BIND_RETRIES = 5;
+    var BIND_RETRIES = 5;
     exports2.BIND_RETRY_DELAY_MS = 300;
     var NudgeListenerServer = class {
       constructor(deps, port = exports2.JOB_FETCH_PORT) {
@@ -24515,7 +24486,7 @@ var require_nudge_listener_server = __commonJS({
           try {
             return await this.listenOnce();
           } catch (error) {
-            const inUse = error?.code === "EADDRINUSE" && attempt < exports2.BIND_RETRIES;
+            const inUse = error?.code === "EADDRINUSE" && attempt < BIND_RETRIES;
             if (!inUse)
               throw error;
             await (0, utils_12.delay)(exports2.BIND_RETRY_DELAY_MS);
@@ -24563,7 +24534,7 @@ var require_nudge_listener_server = __commonJS({
           return;
         }
         const nudgedId = url.searchParams.get("jobId");
-        const usable = nudgedId === null || exports2.JOB_ID_PATTERN.test(nudgedId);
+        const usable = nudgedId === null || JOB_ID_PATTERN.test(nudgedId);
         if (!usable) {
           logger_12.logger.warn("[JobFetch] Nudge carried an unusable jobId", {
             length: nudgedId.length
@@ -24587,9 +24558,9 @@ var require_nudge_listener_server = __commonJS({
   }
 });
 
-// dist/job-fetching.js
+// dist/jobs/job-fetching.js
 var require_job_fetching = __commonJS({
-  "dist/job-fetching.js"(exports2) {
+  "dist/jobs/job-fetching.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.JobDeliveryMode = void 0;
@@ -24679,10 +24650,8 @@ var logger_1 = require_logger();
 var skills_installer_1 = require_skills_installer();
 var rules_writer_1 = require_rules_writer();
 var tools_writer_1 = require_tools_writer();
-var tool_policies_1 = require_tool_policies3();
+var plugins_1 = require_plugins3();
 var skills_override_1 = require_skills_override();
-var generated_files_guard_1 = require_generated_files_guard();
-var subagent_tool_logger_1 = require_subagent_tool_logger();
 var plugin_artifacts_1 = require_plugin_artifacts();
 var config_1 = require_config();
 var environments_1 = require_environments();
@@ -24766,11 +24735,9 @@ async function initOpenCode() {
     ]),
     (0, skills_installer_1.applySkillsOverride)((0, codegen_flow_helpers_1.getOutputPath)(), logger_1.logger),
     (0, tools_writer_1.writeToolFiles)(pluginArtifacts.tools),
-    (0, generated_files_guard_1.writeGeneratedFilesGuardPlugin)(),
-    (0, subagent_tool_logger_1.writeSubagentToolLoggerPlugin)(),
-    (0, tool_policies_1.writeToolPoliciesPlugin)(toolPolicies)
+    (0, plugins_1.writeGeneratedPlugins)(toolPolicies)
   ]);
-  void (0, tool_policies_1.validateToolPolicies)(toolPolicies, [
+  void (0, plugins_1.validateToolPolicies)(toolPolicies, [
     skills_override_1.SKILLS_DIR,
     (0, path_1.join)((0, codegen_flow_helpers_1.getOutputPath)(), ".agents", "skills")
   ]);