@wix/ditto-codegen-public 1.0.476 → 1.0.478

package/dist/out.js

@@ -12830,7 +12830,6 @@ var require_checkpoint = __commonJS({
     var types_1 = require_types_impl3();
     var http_client_1 = require_index_node();
     var FALLBACK_COMMIT_MESSAGE = "Auto-save";
-    var EML_MARKER = "generate-eml.ts";
     var SET_COMMIT_MESSAGE_TOOL = "set-commit-message";
     var MAX_CHECKPOINT_ERROR_LENGTH = 1e3;
     var TRUNCATION_SUFFIX = "\u2026";
@@ -12945,12 +12944,6 @@ var require_checkpoint = __commonJS({
       const trimmed = value.trim();
       return trimmed.length > 0 ? trimmed : void 0;
     };
-    var readBashCommand = (input) => {
-      if (typeof input !== "object" || input === null)
-        return void 0;
-      const value = input.command;
-      return typeof value === "string" ? value : void 0;
-    };
     var checkpointPluginFactory = (ctx) => {
       const { host, job } = ctx;
       const accessToken = host.auth.getAccessToken();
@@ -13055,40 +13048,21 @@ var require_checkpoint = __commonJS({
         rules: buildCheckpointRules(),
         tools: buildCheckpointTools(),
         // The agent calls `set-commit-message` (registered as a host tool from
-        // the plugin's `tools` field) as the first thing it does. We capture
-        // the value here. Then later, when the EML script runs (mid-flow), we
-        // use the captured value for the early checkpoint.
+        // the plugin's `tools` field) as the first thing it does. We capture the
+        // value here and use it for the checkpoint at flow end.
         async onToolUse({ tool, state }) {
           if (state.status === "error")
             return;
-          if (tool === SET_COMMIT_MESSAGE_TOOL) {
-            const message = readToolCommitMessage(state.input);
-            if (message)
-              capturedCommitMessage = message;
-            return;
-          }
-          if (outcome)
-            return;
-          if (tool !== "bash")
-            return;
-          const command = readBashCommand(state.input);
-          if (!command || !command.includes(EML_MARKER))
+          if (tool !== SET_COMMIT_MESSAGE_TOOL)
             return;
-          const commitMessage = capturedCommitMessage ?? FALLBACK_COMMIT_MESSAGE;
-          try {
-            await commitCheckpoint(commitMessage);
-          } catch {
-          }
+          const message = readToolCommitMessage(state.input);
+          if (message)
+            capturedCommitMessage = message;
         },
-        // Flow-end fallback: only fires if onToolUse didn't already create the
-        // checkpoint. Re-throws an earlier failure so the task is marked failed.
+        // Creates the checkpoint once the flow is over. Throws on failure, which
+        // the runner reports as a plugin failure. A conflict handed off to AI
+        // resolution is not a failure.
         async onFlowEnd({ codegenFailed, filesChanged }) {
-          if (outcome?.status === "failed")
-            throw outcome.error;
-          if (outcome?.status === "created")
-            return;
-          if (outcome?.status === "resolvingGitConflicts")
-            return;
           if (codegenFailed)
             return;
           if (!filesChanged)
@@ -15147,7 +15121,7 @@ var require_git_conflicts_rules = __commonJS({
     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.
+- Do NOT introduce new mocks, placeholders, debug logging, or TODOs while resolving conflicts. Keep any that either side already contains \u2014 they may be there because the user asked for them.
 
 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.476",
+  "version": "1.0.478",
   "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": "b00e5087ab99a56911dcace77fb99fa76a2acc00bdae9f7d3d1ccd63"
+  "falconPackageHash": "08e7a6012a59f25529773b267a6c5d6d7e88cf5f6455ee0b9c89426e"
 }