@wix/ditto-codegen-public 1.0.468 → 1.0.470

package/dist/out.js

@@ -546,7 +546,16 @@ var require_context = __commonJS({
     var path_12 = __importDefault2(require("path"));
     var provisioned = {
       CODEGEN_JOB_DELIVERY: process.env.CODEGEN_JOB_DELIVERY,
-      CODEGEN_JOB_FETCH_PORT: process.env.CODEGEN_JOB_FETCH_PORT
+      CODEGEN_JOB_FETCH_PORT: process.env.CODEGEN_JOB_FETCH_PORT,
+      // The model-comparison harness pins each CLI via its spawn env, not the shared .env.
+      CODEGEN_MODEL_OVERRIDE: process.env.CODEGEN_MODEL_OVERRIDE,
+      CODEGEN_SMALL_MODEL_OVERRIDE: process.env.CODEGEN_SMALL_MODEL_OVERRIDE,
+      CODEGEN_ENVIRONMENT: process.env.CODEGEN_ENVIRONMENT,
+      OUTPUT_PATH: process.env.OUTPUT_PATH,
+      SANDBOX_ID: process.env.SANDBOX_ID,
+      CODEGEN_FRESH_SESSION: process.env.CODEGEN_FRESH_SESSION,
+      CODE_IDENTIFIER: process.env.CODE_IDENTIFIER,
+      PROJECT_ID: process.env.PROJECT_ID
     };
     dotenv_1.default.config({ path: path_12.default.join(__dirname, "../.env"), override: true });
     for (const [key, value] of Object.entries(provisioned)) {
@@ -14916,7 +14925,8 @@ ${environmentIdentity}`;
   - \`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.
   - \`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 ${multiEditContextClause} across N files, use ONE \`multi-edit\` with all N edits.
-  - Tool arguments are strict JSON, and \`write\`/\`edit\`/\`batch-write\`/\`multi-edit\` write \`content\`/\`oldString\`/\`newString\` to disk EXACTLY as decoded from that JSON \u2014 there is no second unescaping pass, so encode for the ONE decode that happens. Use \`\\n\`/\`\\t\`/\`\\"\` in the JSON when you want the file to contain a REAL newline/tab/quote character (a raw unescaped newline inside a JSON string value breaks parsing). If the file itself must contain the two LITERAL characters backslash-then-n (e.g. inside a string literal like \`.join('\\n')\`, a regex, or an already-escaped JSON value), escape the backslash itself in your JSON so it survives the one decode intact \u2014 do NOT emit a bare \`\\n\` expecting a tool to turn it back into two literal characters for you; none of them do.
+  - \`apply_patch\` (when available): inside each \`*** Update File\` section, list hunks in FILE ORDER, top to bottom. The applier only searches forward from where the previous hunk matched, so a hunk whose lines sit ABOVE the previous one fails with "Failed to find expected lines" even though the lines exist \u2014 the whole patch is then rejected. Unsure of the order? Re-read the file first, or split into one patch per hunk.
+  - Tool arguments are strict JSON, and \`write\`/\`edit\`/\`batch-write\`/\`multi-edit\`/\`apply_patch\` write \`content\`/\`oldString\`/\`newString\`/\`patchText\` to disk EXACTLY as decoded from that JSON \u2014 there is no second unescaping pass, so encode for the ONE decode that happens. Use \`\\n\`/\`\\t\`/\`\\"\` in the JSON when you want the file to contain a REAL newline/tab/quote character (a raw unescaped newline inside a JSON string value breaks parsing). If the file itself must contain the two LITERAL characters backslash-then-n (e.g. inside a string literal like \`.join('\\n')\`, a regex, or an already-escaped JSON value), escape the backslash itself in your JSON so it survives the one decode intact \u2014 do NOT emit a bare \`\\n\` expecting a tool to turn it back into two literal characters for you; none of them do.
 - 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.`;
     }
   }
@@ -14982,7 +14992,7 @@ FILE CREATION:
 
 GENERATED FILES:
 - \`src/extensions/site/components/**/*.generated.ts\` is an auto-generated editor-react-component manifest \u2014 NEVER hand-edit. Change a manifest VALUE in the component's \`*.extension.ts\`; change anything else in the \`*.tsx\` / \`*.module.css\` / \`*.props.ts\` source, then regenerate (workflow step 5). No other \`.generated.ts\` path is affected.
-- A write guard rejects \`write\`/\`edit\`/\`batch-write\`/\`multi-edit\` there, dropping the ENTIRE call \u2014 never batch that path with real edits, or those are lost too and must be resubmitted.
+- A write guard rejects \`write\`/\`edit\`/\`batch-write\`/\`multi-edit\`/\`apply_patch\` there, dropping the ENTIRE call \u2014 never batch that path with real edits (or put it in a patch alongside other hunks), or those are lost too and must be resubmitted.
 
 TYPESCRIPT:
 - The project enables \`verbatimModuleSyntax\`. Type-only imports MUST use \`import type\`.
@@ -15727,6 +15737,20 @@ export const SubagentToolLogger = async () => {
   }
 });
 
+// dist/opencode-integration/apply-patch.js
+var require_apply_patch = __commonJS({
+  "dist/opencode-integration/apply-patch.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.PATCH_FILE_HEADER_RE = void 0;
+    exports2.extractPatchPaths = extractPatchPaths;
+    exports2.PATCH_FILE_HEADER_RE = /^\*\*\* (?:Add File|Update File|Delete File|Move to):(.*)$/;
+    function extractPatchPaths(patchText) {
+      return patchText.split(/\r?\n/).map((line) => exports2.PATCH_FILE_HEADER_RE.exec(line)?.[1].trim() ?? "").filter((p) => p !== "");
+    }
+  }
+});
+
 // dist/opencode-integration/execution/parser.js
 var require_parser = __commonJS({
   "dist/opencode-integration/execution/parser.js"(exports2) {
@@ -15741,6 +15765,7 @@ var require_parser = __commonJS({
     exports2.summarizeOpenCodeLine = summarizeOpenCodeLine;
     var types_1 = require_types4();
     var subagent_tool_logger_1 = require_subagent_tool_logger();
+    var apply_patch_1 = require_apply_patch();
     function parseRequiredPermissions(output) {
       let permissions = [];
       const lines = output.split("\n");
@@ -15851,7 +15876,14 @@ var require_parser = __commonJS({
     function summarizeOutput(tool, output) {
       return FULL_OUTPUT_TOOLS.has(tool) ? truncate(output, FULL_OUTPUT_CAP) : truncate(output);
     }
+    var PATCH_TEXT_CAP = 4e3;
     function summarizeInput(input) {
+      if (typeof input.patchText === "string") {
+        return {
+          patchFiles: (0, apply_patch_1.extractPatchPaths)(input.patchText),
+          patchText: truncate(input.patchText, PATCH_TEXT_CAP)
+        };
+      }
       if (input.files) {
         return { files: input.files.map(({ path }) => ({ path })) };
       }
@@ -15866,6 +15898,18 @@ var require_parser = __commonJS({
         ...input.description && { description: truncate(input.description) }
       };
     }
+    function summarizeMetadata(metadata) {
+      const trimmed = { ...metadata };
+      delete trimmed.diff;
+      if (trimmed.files) {
+        trimmed.files = trimmed.files.map((file) => {
+          const copy = { ...file };
+          delete copy.patch;
+          return copy;
+        });
+      }
+      return trimmed;
+    }
     function summarizeOpenCodeLine(line) {
       if (line.type !== "tool_use" && line.type !== subagent_tool_logger_1.SUBAGENT_TOOL_EVENT_TYPE) {
         return line;
@@ -15881,6 +15925,9 @@ var require_parser = __commonJS({
             ...state?.input && { input: summarizeInput(state.input) },
             ...state?.output && {
               output: summarizeOutput(part.tool, state.output)
+            },
+            ...state?.metadata && part.tool === "apply_patch" && {
+              metadata: summarizeMetadata(state.metadata)
             }
           }
         }
@@ -16001,7 +16048,7 @@ var require_cost_tracker = __commonJS({
     async function fetchOpenCodeStats(cwd, env) {
       for (let attempt = 0; attempt < STATS_MAX_ATTEMPTS; attempt++) {
         try {
-          const { stdout } = await execAsync("opencode stats --models", {
+          const { stdout } = await execAsync('opencode stats --models --project ""', {
             cwd,
             env,
             timeout: CLI_TIMEOUT_MS
@@ -16979,7 +17026,8 @@ var require_executor = __commonJS({
       let currentPrompt = options.prompt;
       let lastFailureReason = null;
       let stalls = 0;
-      let continueSession = options.continueSession ?? false;
+      const forceFresh = process.env.CODEGEN_FRESH_SESSION === "true";
+      let continueSession = forceFresh ? false : options.continueSession ?? false;
       const env = (0, config_12.getOpenCodeEnv)(options.projectId, job_context_storage_12.jobContextStorage.getStore()?.kind);
       const statsBaseline = await (0, cost_tracker_1.fetchOpenCodeStats)(options.outputPath, env);
       const baselineCost = statsBaseline ? (0, cost_tracker_1.parseStatsTotalCost)(statsBaseline) : null;
@@ -23929,8 +23977,9 @@ var require_generated_files_guard = __commonJS({
     exports2.buildGeneratedFilesGuardSource = buildGeneratedFilesGuardSource;
     exports2.writeGeneratedFilesGuardPlugin = writeGeneratedFilesGuardPlugin;
     var write_plugin_1 = require_write_plugin();
+    var apply_patch_1 = require_apply_patch();
     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.";
+    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 \u2014 including every other file or apply_patch hunk it carried \u2014 so resubmit those; they were not written. Only *.generated.ts under src/extensions/site/components/ is blocked.";
     function isEditorComponentManifest(path) {
       return ERC_MANIFEST_RE.test(path);
     }
@@ -23938,6 +23987,9 @@ var require_generated_files_guard = __commonJS({
       if (tool === "write" || tool === "edit") {
         return typeof args.filePath === "string" ? [args.filePath] : [];
       }
+      if (tool === "apply_patch") {
+        return typeof args.patchText === "string" ? (0, apply_patch_1.extractPatchPaths)(args.patchText) : [];
+      }
       const list = tool === "batch-write" ? args.files : tool === "multi-edit" ? args.edits : void 0;
       if (!list)
         return [];
@@ -23948,11 +24000,19 @@ var require_generated_files_guard = __commonJS({
       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)};
+const PATCH_FILE_HEADER_RE = /${apply_patch_1.PATCH_FILE_HEADER_RE.source}/;
 
 function extractWritePaths(tool, args) {
   if (tool === "${"write"}" || tool === "${"edit"}") {
     return typeof args.filePath === "string" ? [args.filePath] : [];
   }
+  if (tool === "${"apply_patch"}") {
+    if (typeof args.patchText !== "string") return [];
+    return args.patchText
+      .split(/\\r?\\n/)
+      .map((line) => PATCH_FILE_HEADER_RE.exec(line)?.[1].trim() ?? "")
+      .filter((p) => p !== "");
+  }
   const list =
     tool === "${"batch-write"}" ? args.files : tool === "${"multi-edit"}" ? args.edits : undefined;
   if (!list) return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.468",
+  "version": "1.0.470",
   "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": "a6a62e94e0a4a64426b44c65e0586dcf2965cb540f379be948120c0e"
+  "falconPackageHash": "51949572d62d11b72e4bc67ed5130033eb60717dc57e17abbdad93a0"
 }