@wix/ditto-codegen-public 1.0.383 → 1.0.384

package/dist/out.js

@@ -11299,12 +11299,33 @@ var require_ask_prompt = __commonJS({
   }
 });
 
+// dist/opencode-integration/prompts/git-conflicts-prompt.js
+var require_git_conflicts_prompt = __commonJS({
+  "dist/opencode-integration/prompts/git-conflicts-prompt.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.buildGitConflictsPrompt = buildGitConflictsPrompt;
+    var prompt_utils_1 = require_prompt_utils();
+    function buildGitConflictsPrompt(history) {
+      const { currentUserRequest } = (0, prompt_utils_1.extractUserRequestAndFilteredHistory)(history);
+      const base = "Fix all Git merge conflicts in the current project. Resolve every conflict marker (<<<<<<<, =======, >>>>>>>) so the code compiles correctly.";
+      const sections = [
+        base,
+        currentUserRequest ? `Additional context from user: "${currentUserRequest}"` : "",
+        (0, prompt_utils_1.formatChatHistory)(history.slice(-5), "CONVERSATION CONTEXT"),
+        (0, prompt_utils_1.buildAppContext)()
+      ];
+      return sections.filter(Boolean).join("\n\n");
+    }
+  }
+});
+
 // dist/opencode-integration/prompts/index.js
 var require_prompts = __commonJS({
   "dist/opencode-integration/prompts/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.buildAskPrompt = exports2.buildIterationPrompt = exports2.buildRecoveryPrompt = exports2.buildInitPrompt = void 0;
+    exports2.buildGitConflictsPrompt = exports2.buildAskPrompt = exports2.buildIterationPrompt = exports2.buildRecoveryPrompt = exports2.buildInitPrompt = void 0;
     var codegen_prompt_1 = require_codegen_prompt();
     Object.defineProperty(exports2, "buildInitPrompt", { enumerable: true, get: function() {
       return codegen_prompt_1.buildInitPrompt;
@@ -11320,6 +11341,10 @@ var require_prompts = __commonJS({
     Object.defineProperty(exports2, "buildAskPrompt", { enumerable: true, get: function() {
       return ask_prompt_1.buildAskPrompt;
     } });
+    var git_conflicts_prompt_1 = require_git_conflicts_prompt();
+    Object.defineProperty(exports2, "buildGitConflictsPrompt", { enumerable: true, get: function() {
+      return git_conflicts_prompt_1.buildGitConflictsPrompt;
+    } });
   }
 });
 
@@ -11489,6 +11514,9 @@ var require_rules_writer = __commonJS({
       return (0, path_1.join)(GLOBAL_RULES_DIR, filename);
     }
     async function writeRuleFiles(rules) {
+      if (rules.length === 0) {
+        return [];
+      }
       await (0, promises_1.mkdir)(GLOBAL_RULES_DIR, { recursive: true });
       const paths = rules.map((rule) => getRulePath(rule.filename));
       await Promise.all(rules.map((rule) => (0, promises_1.writeFile)(getRulePath(rule.filename), rule.content, "utf-8")));
@@ -11674,6 +11702,7 @@ var require_dist5 = __commonJS({
     exports2.appBuilderCodegenConfig = {
       codegenRules: [],
       askRules: [],
+      gitConflictsRules: [],
       decisionCheckers: [],
       plugins: []
     };
@@ -13904,6 +13933,7 @@ var require_dist8 = __commonJS({
         { filename: "site-data-layer-rules.md", content: codegen_common_logic_1.SITE_DATA_LAYER_RULES }
       ],
       askRules: [],
+      gitConflictsRules: [],
       decisionCheckers: [],
       plugins: [codegen_checkpoint_plugin_1.checkpointPluginFactory]
     };
@@ -14254,6 +14284,7 @@ var require_dist10 = __commonJS({
         { filename: "site-data-layer-rules.md", content: codegen_common_logic_1.SITE_DATA_LAYER_RULES }
       ],
       askRules: [],
+      gitConflictsRules: [],
       decisionCheckers: [],
       plugins: [codegen_feature_vibe_plugin_1.featureVibePluginFactory]
     };
@@ -14379,6 +14410,61 @@ DEBUGGING GUIDANCE:
   }
 });
 
+// dist/opencode-integration/rules/git-conflicts-rules.js
+var require_git_conflicts_rules = __commonJS({
+  "dist/opencode-integration/rules/git-conflicts-rules.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.GIT_CONFLICTS_RULES = void 0;
+    exports2.GIT_CONFLICTS_RULES = `CORE PRINCIPLES:
+- You are a Git merge conflict resolver. Your ONLY job is to fix merge conflict markers in files.
+- Do NOT generate new features, refactor code, or make changes beyond resolving conflicts.
+- NEVER use mocks, placeholders, or TODOs.
+
+UNDERSTAND INTENT FIRST:
+- Before resolving a conflict, understand WHAT each side was trying to accomplish and WHY \u2014 not just which lines differ. Read enough of the surrounding file (and the imports/usages the conflict touches) to know the intent of both sides.
+- When the change is non-trivial, inspect recent history to learn what the incoming branch refactored: \`git log -p -n 3 -- <file>\` and \`git diff\` are READ-ONLY and safe. NEVER run \`git merge\`, \`git rebase\`, \`git checkout\`, \`git reset\`, \`git add\`, or \`git commit\` \u2014 only the agent's edit tools change files; git state is managed by the host.
+
+CONFLICT RESOLUTION STRATEGY:
+- Identify all files containing conflict markers: <<<<<<<, =======, >>>>>>>
+- The HEAD (OURS) section (between <<<<<<< and =======) represents the current branch's changes \u2014 preserve this code.
+- The incoming (THEIRS) section (between ======= and >>>>>>>) represents the changes being merged in.
+- Resolve each conflict by merging both sides logically \u2014 judge by SEMANTIC meaning, not line-by-line text:
+  - If both sides add independent, non-overlapping code \u2014 include both.
+  - If they modify the same logic \u2014 prefer HEAD (OURS) and incorporate non-conflicting parts from THEIRS.
+  - If THEIRS deletes something that HEAD modifies \u2014 keep HEAD's version.
+- De-duplicate when merging both sides: combine and dedupe additive changes such as imports, exports, list/array entries, object keys, and config \u2014 NEVER leave two copies of the same import or declaration.
+- After resolving, remove ALL conflict markers. The final file must contain zero conflict markers.
+- Do NOT revert or undo any working code that existed before the conflict.
+
+SEMANTIC CORRECTNESS \u2014 beyond removing markers:
+- A clean merge has NO markers AND is logically coherent. Watch for semantic conflicts: code that compiles after the markers are gone but is contradictory or broken (duplicate/clashing declarations, a variable renamed on one side but still referenced by the other, a function signature changed on one side but called the old way on the other, half-merged statements).
+- After merging, re-read the resolved region in context to confirm both sides' intent is preserved and the result type-checks. This is what the \`validate\` step exists to catch \u2014 fix anything it surfaces.
+
+MINIMIZE TEXT OUTPUT \u2014 CRITICAL:
+- Do NOT narrate your actions or explain your decisions.
+- Every text token costs money. Use tools, not words.
+
+TOOL USAGE:
+- \`validate\` for all validation (tsc + build). Run it after resolving the conflicts to make sure nothing breaks.
+- Package dependencies \u2014 \`npm install <pkg>\` any package not already in \`package.json\` BEFORE the first \`validate\` (do NOT wait for \`TS2307\`); install all needed packages in ONE command. Do NOT hand-edit \`package.json\` for deps unless npm cannot be used.
+- File operations \u2014 pick the BATCH tool whenever you have 2+ files; the single-file variants are 5\u201310\xD7 slower:
+  - \`batch-read\` to read N files in one call. NEVER call \`read\` more than once per turn \u2014 use batch-read instead.
+  - \`multi-edit\` to apply N find-and-replace edits across one or more files in one call. NEVER call \`edit\` more than once per turn \u2014 use multi-edit instead. \`edit\` is reserved for a single edit to one file. When resolving conflicts across N files, use ONE \`multi-edit\` with all N edits.
+  - \`batch-write\` to create N new files in one call. NEVER call \`write\` more than once per turn \u2014 use batch-write instead. \`write\` is reserved for single-file creation.
+  - Tool arguments are strict JSON. For multiline strings in \`write\`, \`edit\`, \`batch-write\`, and \`multi-edit\`, use JSON escape sequences (\`\\n\`, \`\\t\`, \`\\"\`) \u2014 do NOT put raw (unescaped) newlines inside JSON string values (that breaks parsing). \`batch-write\` and \`multi-edit\` also normalize literal two-character escape sequences before writing; prefer proper JSON escapes.
+- For tools where no batch variant exists (e.g. \`grep\`, \`glob\`), still emit MULTIPLE \`tool_use\` blocks in a SINGLE response when the calls are independent. Sequential turns waste a model round-trip per call.
+- NEVER run preview, dev, release, or promote commands.
+
+WORKFLOW:
+1. **Find**: Use \`grep\` to locate all files containing "<<<<<<<".
+2. **Resolve**: Read (\`batch-read\`) and fix all conflicts using \`multi-edit\`. Do NOT add new logic \u2014 only remove markers and merge the two sides.
+3. **Verify markers**: Run \`grep\` again to confirm zero conflict markers remain.
+4. **Validate**: Run \`validate\` (typecheck only). Fix any errors and re-validate until tsc passes, then run \`validate({ runBuild: true })\` ONCE to confirm the resolution did not break the build. Pass \`installDeps: true\` ONLY when \`package.json\` changed without already running \`npm install <package-name>\` in this iteration; otherwise omit it (node_modules is pre-installed).
+5. **Stop**: STOP immediately after validation passes. Do NOT refactor or make changes beyond resolving conflicts.`;
+  }
+});
+
 // dist/job-decision-manager.js
 var require_job_decision_manager = __commonJS({
   "dist/job-decision-manager.js"(exports2) {
@@ -14487,6 +14573,7 @@ var require_environments = __commonJS({
     var codegen_harmony_config_1 = require_dist10();
     var codegen_rules_1 = require_codegen_rules();
     var ask_rules_1 = require_ask_rules();
+    var git_conflicts_rules_1 = require_git_conflicts_rules();
     var job_decision_manager_1 = require_job_decision_manager();
     var logger_12 = require_logger();
     var SHARED_CODEGEN_RULE = {
@@ -14497,10 +14584,15 @@ var require_environments = __commonJS({
       filename: "ask-instructions.md",
       content: ask_rules_1.ASK_RULES
     };
+    var SHARED_GIT_CONFLICTS_RULE = {
+      filename: "git-conflicts-instructions.md",
+      content: git_conflicts_rules_1.GIT_CONFLICTS_RULES
+    };
     var withSharedRules = (env) => ({
       ...env,
       codegenRules: [SHARED_CODEGEN_RULE, ...env.codegenRules],
-      askRules: [SHARED_ASK_RULE, ...env.askRules]
+      askRules: [SHARED_ASK_RULE, ...env.askRules],
+      gitConflictsRules: [SHARED_GIT_CONFLICTS_RULE, ...env.gitConflictsRules]
     });
     function getCodegenEnvironmentConfig() {
       switch (process.env.CODEGEN_ENVIRONMENT) {
@@ -14541,6 +14633,7 @@ var require_config = __commonJS({
     var rules_writer_12 = require_rules_writer();
     var node_modules_guard_12 = require_node_modules_guard();
     var environments_12 = require_environments();
+    var CodeGenService_12 = require_CodeGenService();
     exports2.DEFAULT_TIMEOUT_MS = 20 * 60 * 1e3;
     exports2.DEFAULT_MODEL = "anthropic/claude-sonnet-4-6";
     exports2.DEFAULT_SMALL_MODEL = "anthropic/claude-haiku-4-5-20251001";
@@ -14599,93 +14692,96 @@ var require_config = __commonJS({
         enabled: true
       }
     };
-    function getOpenCodeConfig(instructionPaths) {
+    var READABLE_EXTERNAL_DIRS = {
+      "/root/.agents/**": "allow",
+      "/root/.claude/**": "allow",
+      "/root/.opencode/**": "allow",
+      "/tmp/**": "allow"
+    };
+    var PLANNING_TOOLS_DENIED = {
+      task: "deny",
+      [
+        "todowrite"
+        /* OpenCodeTool.TodoWrite */
+      ]: "deny",
+      [
+        "todoread"
+        /* OpenCodeTool.TodoRead */
+      ]: "deny"
+    };
+    var CODEGEN_PERMISSIONS = {
+      ...PLANNING_TOOLS_DENIED,
+      [
+        "skill"
+        /* OpenCodeTool.Skill */
+      ]: { "*": "allow" },
+      doom_loop: "allow",
+      external_directory: READABLE_EXTERNAL_DIRS
+    };
+    var GIT_CONFLICTS_PERMISSIONS = {
+      ...CODEGEN_PERMISSIONS,
+      [
+        "progress"
+        /* OpenCodeTool.Progress */
+      ]: "deny",
+      [
+        "uuid"
+        /* OpenCodeTool.Uuid */
+      ]: "deny",
+      [
+        "wix-generate"
+        /* OpenCodeTool.WixGenerate */
+      ]: "deny",
+      [
+        "required-permissions"
+        /* OpenCodeTool.RequiredPermissions */
+      ]: "deny",
+      [
+        "user-actions"
+        /* OpenCodeTool.UserActions */
+      ]: "deny"
+    };
+    var ASK_PERMISSIONS = {
+      ...PLANNING_TOOLS_DENIED,
+      [
+        "edit"
+        /* OpenCodeTool.Edit */
+      ]: "deny",
+      [
+        "bash"
+        /* OpenCodeTool.Bash */
+      ]: "deny",
+      [
+        "batch-write"
+        /* OpenCodeTool.BatchWrite */
+      ]: "deny",
+      [
+        "multi-edit"
+        /* OpenCodeTool.MultiEdit */
+      ]: "deny",
+      [
+        "validate"
+        /* OpenCodeTool.Validate */
+      ]: "deny",
+      [
+        "uuid"
+        /* OpenCodeTool.Uuid */
+      ]: "deny",
+      external_directory: READABLE_EXTERNAL_DIRS
+    };
+    function buildConfig(instructionPaths, permission, { guardNodeModules = false } = {}) {
       return {
         model: exports2.DEFAULT_MODEL,
         small_model: exports2.DEFAULT_SMALL_MODEL,
         provider: getProviderConfig(),
         compaction: { prune: true },
         // drop old tool outputs so --continue replays stay bounded
-        permission: {
-          [
-            "skill"
-            /* OpenCodeTool.Skill */
-          ]: {
-            "*": "allow"
-          },
-          task: "deny",
-          doom_loop: "allow",
-          [
-            "todowrite"
-            /* OpenCodeTool.TodoWrite */
-          ]: "deny",
-          [
-            "todoread"
-            /* OpenCodeTool.TodoRead */
-          ]: "deny",
-          external_directory: {
-            "/root/.agents/**": "allow",
-            "/root/.claude/**": "allow",
-            "/root/.opencode/**": "allow",
-            "/tmp/**": "allow"
-          }
-        },
+        permission,
         instructions: instructionPaths,
-        // Blocks node_modules SDK-spelunking bash turns after a small exploratory
-        // budget and steers back to the loaded references (see node-modules-guard.ts).
-        plugin: [node_modules_guard_12.GUARD_PLUGIN_PATH],
-        autoupdate: false,
-        share: "disabled",
         lsp: false,
         mcp: WIX_MCP_CONFIG,
-        watcher: { ignore: WATCHER_IGNORE_PATTERNS }
-      };
-    }
-    function getOpenCodeAskConfig(instructionPaths) {
-      return {
-        model: exports2.DEFAULT_MODEL,
-        small_model: exports2.DEFAULT_SMALL_MODEL,
-        provider: getProviderConfig(),
-        compaction: { prune: true },
-        permission: {
-          [
-            "edit"
-            /* OpenCodeTool.Edit */
-          ]: "deny",
-          [
-            "bash"
-            /* OpenCodeTool.Bash */
-          ]: "deny",
-          task: "deny",
-          [
-            "todowrite"
-            /* OpenCodeTool.TodoWrite */
-          ]: "deny",
-          [
-            "todoread"
-            /* OpenCodeTool.TodoRead */
-          ]: "deny",
-          [
-            "batch-write"
-            /* OpenCodeTool.BatchWrite */
-          ]: "deny",
-          [
-            "multi-edit"
-            /* OpenCodeTool.MultiEdit */
-          ]: "deny",
-          [
-            "validate"
-            /* OpenCodeTool.Validate */
-          ]: "deny",
-          [
-            "uuid"
-            /* OpenCodeTool.Uuid */
-          ]: "deny"
-        },
-        instructions: instructionPaths,
-        lsp: false,
-        mcp: WIX_MCP_CONFIG,
-        watcher: { ignore: WATCHER_IGNORE_PATTERNS }
+        watcher: { ignore: WATCHER_IGNORE_PATTERNS },
+        ...guardNodeModules ? { plugin: [node_modules_guard_12.GUARD_PLUGIN_PATH], autoupdate: false, share: "disabled" } : {}
       };
     }
     function ensureOpenCodeInPath() {
@@ -14708,12 +14804,24 @@ var require_config = __commonJS({
         OPENCODE_DISABLE_FILETIME_CHECK: "true"
       };
     }
-    function getOpenCodeEnv(projectId, isAsk = false) {
-      const envConfig = (0, environments_12.getCodegenEnvironmentConfig)();
-      const rules = isAsk ? envConfig.askRules : envConfig.codegenRules;
-      const paths = rules.map((r) => (0, rules_writer_12.getRulePath)(r.filename));
-      const config = isAsk ? getOpenCodeAskConfig(paths) : getOpenCodeConfig(paths);
-      return buildOpenCodeEnv(projectId, config);
+    function getOpenCodeEnv(projectId, kind) {
+      return buildOpenCodeEnv(projectId, buildConfigForKind(kind));
+    }
+    function buildConfigForKind(kind) {
+      const env = (0, environments_12.getCodegenEnvironmentConfig)();
+      const paths = (rules) => rules.map((r) => (0, rules_writer_12.getRulePath)(r.filename));
+      switch (kind) {
+        case CodeGenService_12.TaskKind.ASK_CODEGEN:
+          return buildConfig(paths(env.askRules), ASK_PERMISSIONS);
+        case CodeGenService_12.TaskKind.FIX_GIT_CONFLICTS:
+          return buildConfig(paths(env.gitConflictsRules), GIT_CONFLICTS_PERMISSIONS, {
+            guardNodeModules: true
+          });
+        default:
+          return buildConfig(paths(env.codegenRules), CODEGEN_PERMISSIONS, {
+            guardNodeModules: true
+          });
+      }
     }
   }
 });
@@ -15528,8 +15636,7 @@ var require_executor = __commonJS({
       return finalResult;
     }
     async function logOpenCodeStats(options) {
-      const isAsk = job_context_storage_12.jobContextStorage.getStore()?.kind === ditto_codegen_types_12.TaskKind.ASK_CODEGEN;
-      const env = (0, config_12.getOpenCodeEnv)(options.projectId, isAsk);
+      const env = (0, config_12.getOpenCodeEnv)(options.projectId, job_context_storage_12.jobContextStorage.getStore()?.kind);
       const stats = await (0, cost_tracker_1.fetchOpenCodeStats)(options.outputPath, env);
       if (stats) {
         console.log("[OpenCode] Stats\n", stats);
@@ -15581,8 +15688,7 @@ var require_executor = __commonJS({
             continueSession
           });
           logger_12.logger.debug("[OpenCode] Full prompt", { prompt });
-          const isAsk = job_context_storage_12.jobContextStorage.getStore()?.kind === ditto_codegen_types_12.TaskKind.ASK_CODEGEN;
-          const env = (0, config_12.getOpenCodeEnv)(projectId, isAsk);
+          const env = (0, config_12.getOpenCodeEnv)(projectId, job_context_storage_12.jobContextStorage.getStore()?.kind);
           ctx.child = (0, child_process_1.spawn)("opencode", args, {
             cwd: outputPath,
             env,
@@ -15625,6 +15731,7 @@ var require_opencode_runner = __commonJS({
     exports2.runOpenCodeInit = runOpenCodeInit;
     exports2.runOpenCodeIteration = runOpenCodeIteration;
     exports2.runOpenCodeAsk = runOpenCodeAsk;
+    exports2.runOpenCodeGitConflicts = runOpenCodeGitConflicts;
     var prompts_1 = require_prompts();
     var executor_1 = require_executor();
     var parser_1 = require_parser();
@@ -15672,6 +15779,18 @@ var require_opencode_runner = __commonJS({
         error: result.error
       };
     }
+    async function runOpenCodeGitConflicts(options) {
+      const { outputPath, projectId, chatHistory, gitBaseline, onStdout, onStderr } = options;
+      const prompt = (0, prompts_1.buildGitConflictsPrompt)(chatHistory);
+      return (0, executor_1.executeOpenCode)({
+        prompt,
+        outputPath,
+        projectId,
+        gitBaseline,
+        onStdout,
+        onStderr
+      });
+    }
   }
 });
 
@@ -15749,7 +15868,7 @@ var require_opencode_integration = __commonJS({
   "dist/opencode-integration/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.collectInsertedExtensionsMetadata = exports2.buildExtensionsJobPayload = exports2.OpenCodeTaskTracker = exports2.runOpenCodeAsk = exports2.runOpenCodeIteration = exports2.runOpenCodeInit = void 0;
+    exports2.collectInsertedExtensionsMetadata = exports2.buildExtensionsJobPayload = 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;
@@ -15760,6 +15879,9 @@ var require_opencode_integration = __commonJS({
     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;
@@ -21528,6 +21650,185 @@ var require_opencode_ask = __commonJS({
   }
 });
 
+// dist/OpenCodeGitConflictsOrchestrator.js
+var require_OpenCodeGitConflictsOrchestrator = __commonJS({
+  "dist/OpenCodeGitConflictsOrchestrator.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.OpenCodeGitConflictsOrchestrator = 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 OpenCodeGitConflictsOrchestrator = class extends DittoEventEmitter_1.DittoEventEmitter {
+      constructor() {
+        super();
+      }
+      async fixConflicts(request) {
+        const { outputPath, projectId, chatHistory, gitBaseline } = request;
+        this.emitEvent("start:git-conflicts", { outputPath });
+        this.emitEvent("opencode:start", { outputPath });
+        const start = Date.now();
+        const result = await (0, opencode_integration_1.runOpenCodeGitConflicts)({
+          outputPath,
+          projectId,
+          chatHistory,
+          gitBaseline,
+          onStdout: (data) => {
+            this.emitEvent("opencode:output", { data });
+          },
+          onStderr: (data) => {
+            logger_12.logger.error("[OpenCode Git Conflicts] stderr", { output: data });
+          }
+        });
+        this.lastUsage = result.usage;
+        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("Git conflicts flow failed", {
+            processType: ditto_codegen_types_12.ProcessType.EXECUTION,
+            exitCode: result.exitCode ?? void 0
+          });
+        }
+        this.emitEvent("opencode:done", { durationMs });
+        this.emitEvent("finish:git-conflicts", { outputPath, durationMs });
+        return result;
+      }
+    };
+    exports2.OpenCodeGitConflictsOrchestrator = OpenCodeGitConflictsOrchestrator;
+  }
+});
+
+// dist/flows/opencode-fix-git-conflicts.js
+var require_opencode_fix_git_conflicts = __commonJS({
+  "dist/flows/opencode-fix-git-conflicts.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.runOpencodeGitConflictsFlow = void 0;
+    var codeGenerationService_12 = require_codeGenerationService();
+    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 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 config_12 = require_config();
+    var git_file_changes_1 = require_git_file_changes();
+    var collect_extensions_created_1 = require_collect_extensions_created();
+    var biEvents_1 = require_biEvents();
+    var plugins_runtime_1 = require_plugins_runtime();
+    var runOpencodeGitConflictsFlow = async (chatHistory) => {
+      const store = job_context_storage_12.jobContextStorage.getStore();
+      if (!store?.jobId || !store?.taskId) {
+        throw new Error("Job context not available - jobId and taskId are required");
+      }
+      const { jobId, taskId, kind } = store;
+      const localJobContext = { jobId, taskId };
+      const environment = process.env.CODEGEN_ENVIRONMENT ?? types_1.Environment.UNKNOWN_ENVIRONMENT;
+      const flowStartTime = Date.now();
+      store.flowStartTime = flowStartTime;
+      const biBase = {
+        jobId,
+        taskId,
+        appId: context_12.ctx.projectId,
+        devMachineSessionId: process.env.CODEGEN_SESSION_ID,
+        runKind: kind,
+        jobInput: JSON.stringify(chatHistory),
+        environment
+      };
+      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)({
+        ...biBase,
+        taskModel: config_12.DEFAULT_MODEL,
+        taskType: kind
+      });
+      const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
+      const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
+      const orchestrator = new OpenCodeGitConflictsOrchestrator_1.OpenCodeGitConflictsOrchestrator();
+      let caughtError;
+      try {
+        (0, cli_listeners_1.attachOrchestratorListeners)(orchestrator);
+        const result = await orchestrator.fixConflicts({
+          outputPath,
+          projectId: context_12.ctx.projectId,
+          chatHistory,
+          gitBaseline
+        });
+        const files = await (0, git_file_changes_1.collectGitFileChanges)(outputPath, gitBaseline);
+        const extensions = await (0, collect_extensions_created_1.buildExtensionsJobPayload)(outputPath, files);
+        await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
+          requiredPermissions: result.requiredPermissions,
+          files,
+          extensions
+        });
+        await codeGenerationService_12.codeGenerationService.updateTask(jobId, taskId, ditto_codegen_types_12.Status.COMPLETED, {
+          taskOutput: { files }
+        });
+        await (0, biEvents_1.reportSessionEnd)({
+          ...biBase,
+          taskModel: config_12.DEFAULT_MODEL,
+          taskType: kind,
+          taskCost: Math.round(result.usage.cost * 1e6),
+          taskStatus: ditto_codegen_types_12.Status.COMPLETED,
+          agentOutput: JSON.stringify({ files }),
+          jobDuration: String(Date.now() - flowStartTime),
+          skillsUsed: result.skillsUsed
+        });
+        logger_12.logger.info("[OpenCode Git Conflicts] Completed task", { taskId });
+      } 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, collect_extensions_created_1.buildExtensionsJobPayload)(outputPath, files);
+        await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
+          requiredPermissions: [],
+          error: codegenError,
+          files,
+          extensions
+        });
+        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)({
+          ...biBase,
+          taskModel: config_12.DEFAULT_MODEL,
+          taskType: kind,
+          taskCost,
+          taskStatus: ditto_codegen_types_12.Status.FAILED,
+          agentOutput: JSON.stringify({ files }),
+          jobDuration: String(Date.now() - flowStartTime)
+        });
+        await (0, biEvents_1.reportSessionError)({
+          ...biBase,
+          taskModel: config_12.DEFAULT_MODEL,
+          taskType: kind,
+          agentOutput: JSON.stringify(codegenError),
+          errorDesc: codegenError.errorType,
+          errorMessage: codegenError.message,
+          errorJson: JSON.stringify(codegenError),
+          isRetryable: codegenError.retryable,
+          isExpected: codegenError.expected,
+          validationType: codegenError.validationType
+        });
+        logger_12.logger.error("[OpenCode Git Conflicts] Failed task", {
+          taskId,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      } finally {
+        await (0, plugins_runtime_1.runOnFlowEnd)((0, plugins_runtime_1.getActivePlugins)(), { codegenFailed: caughtError !== void 0, codegenError: caughtError }, logger_12.logger);
+      }
+    };
+    exports2.runOpencodeGitConflictsFlow = runOpencodeGitConflictsFlow;
+  }
+});
+
 // dist/job-cancellation-monitor.js
 var require_job_cancellation_monitor = __commonJS({
   "dist/job-cancellation-monitor.js"(exports2) {
@@ -21861,6 +22162,7 @@ var job_context_storage_1 = require_job_context_storage();
 var opencode_init_1 = require_opencode_init();
 var opencode_iterate_1 = require_opencode_iterate();
 var opencode_ask_1 = require_opencode_ask();
+var opencode_fix_git_conflicts_1 = require_opencode_fix_git_conflicts();
 var codegen_flow_helpers_1 = require_codegen_flow_helpers();
 var job_cancellation_monitor_1 = require_job_cancellation_monitor();
 var job_timeout_monitor_1 = require_job_timeout_monitor();
@@ -21927,8 +22229,12 @@ async function initOpenCode() {
   const envConfig = (0, environments_1.getCodegenEnvironmentConfig)();
   const pluginArtifacts = (0, plugin_artifacts_1.collectPluginArtifacts)(envConfig);
   await Promise.all([
-    (0, rules_writer_1.writeRuleFiles)([...envConfig.codegenRules, ...pluginArtifacts.rules]),
-    (0, rules_writer_1.writeRuleFiles)(envConfig.askRules),
+    (0, rules_writer_1.writeRuleFiles)([
+      ...envConfig.codegenRules,
+      ...pluginArtifacts.rules,
+      ...envConfig.askRules,
+      ...envConfig.gitConflictsRules
+    ]),
     (0, skills_installer_1.applySkillsOverride)((0, codegen_flow_helpers_1.getOutputPath)(), logger_1.logger),
     (0, tools_writer_1.writeToolFiles)(pluginArtifacts.tools),
     (0, node_modules_guard_1.writeGuardPlugin)()
@@ -21948,7 +22254,7 @@ var getFirstTask = (job) => {
   return job.tasks?.[0];
 };
 function buildPluginsForTask(jobId, taskId, kind, payload) {
-  if (kind !== CodeGenService_1.TaskKind.INIT_CODEGEN && kind !== CodeGenService_1.TaskKind.ITERATE_CODEGEN) {
+  if (kind !== CodeGenService_1.TaskKind.INIT_CODEGEN && kind !== CodeGenService_1.TaskKind.ITERATE_CODEGEN && kind !== CodeGenService_1.TaskKind.FIX_GIT_CONFLICTS) {
     return void 0;
   }
   const userInput = extractUserInput(kind, payload);
@@ -21969,7 +22275,7 @@ function extractUserInput(kind, payload) {
   if (kind === CodeGenService_1.TaskKind.INIT_CODEGEN) {
     return payload.blueprint?.summary?.trim() || void 0;
   }
-  if (kind === CodeGenService_1.TaskKind.ITERATE_CODEGEN) {
+  if (kind === CodeGenService_1.TaskKind.ITERATE_CODEGEN || kind === CodeGenService_1.TaskKind.FIX_GIT_CONFLICTS) {
     const history = payload.history ?? [];
     for (let i = history.length - 1; i >= 0; i--) {
       if (history[i].role === "USER") {
@@ -22019,6 +22325,8 @@ async function processJob(job) {
         await (0, opencode_iterate_1.runOpencodeIterateFlow)(history, agentData);
       } else if (task.kind === CodeGenService_1.TaskKind.INIT_CODEGEN && blueprint) {
         await (0, opencode_init_1.runOpencodeInitFlow)(blueprint, history, agentData);
+      } else if (task.kind === CodeGenService_1.TaskKind.FIX_GIT_CONFLICTS) {
+        await (0, opencode_fix_git_conflicts_1.runOpencodeGitConflictsFlow)(history);
       }
     } finally {
       jobCancellationMonitor.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.383",
+  "version": "1.0.384",
   "description": "AI-powered Wix CLI app generator - standalone executable",
   "scripts": {
     "build": "node build.mjs",
@@ -29,5 +29,5 @@
     "esbuild": "^0.27.2",
     "vitest": "^4.0.16"
   },
-  "falconPackageHash": "9eeb81c88135bb782b2dba1cee39f9a4a74efce788a4e05022ca7519"
+  "falconPackageHash": "9b169b82fd27ad66070b5b9211071a3775eed2985a3006f2f89789fb"
 }