@wix/ditto-codegen-public 1.0.355 → 1.0.357

package/dist/opencode-tools/batch-write.ts

@@ -2,6 +2,20 @@ import { tool } from "@opencode-ai/plugin";
 import { writeFile, mkdir } from "fs/promises";
 import { join, dirname, isAbsolute } from "path";
 
+function unescapeString(str: string): string {
+  return str.replace(/\\(n|t|r|"|\\)/g, (_, c: string) => {
+    if (c === "n") return "\n";
+    if (c === "t") return "\t";
+    if (c === "r") return "\r";
+    if (c === '"') return '"';
+    return "\\";
+  });
+}
+
+function normalizeToolString(text: string): string {
+  return unescapeString(text).replace(/\r\n/g, "\n");
+}
+
 export default tool({
   description:
     "Write multiple files at once. Creates directories as needed. " +
@@ -28,7 +42,7 @@ export default tool({
         await mkdir(dirname(fullPath), { recursive: true });
         const content =
           typeof f.content === "string"
-            ? f.content
+            ? normalizeToolString(f.content)
             : JSON.stringify(f.content, null, 2);
         await writeFile(fullPath, content, "utf-8");
         results.push(`OK: ${f.path}`);

package/dist/opencode-tools/multi-edit.ts

@@ -2,6 +2,20 @@ import { tool } from "@opencode-ai/plugin";
 import { readFile, writeFile } from "fs/promises";
 import { join, isAbsolute } from "path";
 
+function unescapeString(str: string): string {
+  return str.replace(/\\(n|t|r|"|\\)/g, (_, c: string) => {
+    if (c === "n") return "\n";
+    if (c === "t") return "\t";
+    if (c === "r") return "\r";
+    if (c === '"') return '"';
+    return "\\";
+  });
+}
+
+function normalizeToolString(text: string): string {
+  return unescapeString(text).replace(/\r\n/g, "\n");
+}
+
 export default tool({
   description:
     "Apply multiple find-and-replace edits across one or more files in a single call. " +
@@ -36,7 +50,9 @@ export default tool({
         : join(context.directory, e.path);
       try {
         const content = await readFile(fullPath, "utf-8");
-        const occurrences = content.split(e.oldString).length - 1;
+        const oldString = normalizeToolString(e.oldString);
+        const newString = normalizeToolString(e.newString);
+        const occurrences = content.split(oldString).length - 1;
         if (occurrences === 0) {
           results.push(`FAILED: ${e.path} - oldString not found`);
           continue;
@@ -48,8 +64,8 @@ export default tool({
           continue;
         }
         const updated = e.replaceAll
-          ? content.split(e.oldString).join(e.newString)
-          : content.replace(e.oldString, e.newString);
+          ? content.split(oldString).join(newString)
+          : content.replace(oldString, newString);
         await writeFile(fullPath, updated, "utf-8");
         results.push(`OK: ${e.path}`);
       } catch (err) {

package/dist/out.js

@@ -12175,7 +12175,7 @@ TOOL USAGE:
   - \`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.
-  - In \`write\`/\`batch-write\` (\`content\`) and \`edit\`/\`multi-edit\` (\`newString\`) payloads, use real newlines/tabs/quotes \u2014 NEVER the two-character escape sequences \`\\n\`, \`\\t\`, or \`\\"\`. Those are written literally to disk and break \`tsc\`.
+  - 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.
 - Before calling MCP tools, check if loaded skills already cover the API. Only use MCP for gaps.
 - When using MCP to look up a Wix SDK method, ALWAYS call \`ReadFullDocsMethodSchema\` (not just \`ReadFullDocsArticle\`). The schema is the source of truth for parameter shapes. Code examples in docs may use incorrect call signatures.
@@ -19497,7 +19497,8 @@ var require_skills_installer = __commonJS({
   "dist/opencode-integration/skills-installer.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.installSkills = installSkills;
+    exports2.applySkillsOverride = applySkillsOverride;
+    exports2.ensureSkillsReady = ensureSkillsReady;
     var fs_1 = require("fs");
     var path_1 = require("path");
     var ditto_codegen_types_12 = require_dist4();
@@ -19505,31 +19506,50 @@ var require_skills_installer = __commonJS({
     function hasSkills(dir) {
       return (0, fs_1.existsSync)(dir) && (0, fs_1.readdirSync)(dir).length > 0;
     }
-    async function installSkills(outputPath, log) {
+    var delay2 = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+    async function applySkillsOverride(outputPath, log) {
       const skillsOverride = process.env.SKILLS_OVERRIDE_BRANCH;
+      if (!skillsOverride) {
+        return;
+      }
+      try {
+        const overrides = (0, skills_override_1.parseSkillsOverrides)(skillsOverride);
+        await (0, skills_override_1.overrideSkills)(overrides, outputPath, log);
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        log.error("[Skills] Branch override failed", { error: errorMessage });
+        throw new ditto_codegen_types_12.ProcessExecutionError("Failed to apply SKILLS_OVERRIDE_BRANCH", {
+          processType: ditto_codegen_types_12.ProcessType.INITIALIZATION,
+          cause: error
+        });
+      }
+    }
+    async function ensureSkillsReady(outputPath, log, { timeoutMs = 6e4, intervalMs = 1e3 } = {}) {
       const projectSkillsDir = (0, path_1.join)(outputPath, ".agents", "skills");
-      const isPreInstalled = hasSkills(skills_override_1.SKILLS_DIR) || hasSkills(projectSkillsDir);
-      if (isPreInstalled && !skillsOverride) {
-        log.info("[Skills] Skipping runtime skills installation (pre-installed via Docker image)", { environment: process.env.CODEGEN_ENVIRONMENT });
+      const skillsPresent = () => hasSkills(skills_override_1.SKILLS_DIR) || hasSkills(projectSkillsDir);
+      if (skillsPresent()) {
         return;
       }
-      if (skillsOverride) {
-        try {
-          const overrides = (0, skills_override_1.parseSkillsOverrides)(skillsOverride);
-          await (0, skills_override_1.overrideSkills)(overrides, outputPath, log);
+      log.info("[Skills] Not present yet \u2014 waiting for the startup install", {
+        globalSkillsDir: skills_override_1.SKILLS_DIR,
+        projectSkillsDir,
+        timeoutMs
+      });
+      const deadline = Date.now() + timeoutMs;
+      while (Date.now() < deadline) {
+        await delay2(intervalMs);
+        if (skillsPresent()) {
+          log.info("[Skills] Skills became available");
           return;
-        } catch (error) {
-          const errorMessage = error instanceof Error ? error.message : String(error);
-          log.error("[Skills] Branch override failed", { error: errorMessage });
-          throw new ditto_codegen_types_12.ProcessExecutionError(isPreInstalled ? "Failed to override pre-installed skills" : "Skills override failed and no pre-installed skills available", { processType: ditto_codegen_types_12.ProcessType.INITIALIZATION, cause: error });
         }
       }
-      log.error("[Skills] No skills available \u2014 pre-install missing and no override", {
+      log.error("[Skills] No skills available after waiting", {
         globalSkillsDir: skills_override_1.SKILLS_DIR,
         projectSkillsDir,
-        environment: process.env.CODEGEN_ENVIRONMENT
+        environment: process.env.CODEGEN_ENVIRONMENT,
+        timeoutMs
       });
-      throw new ditto_codegen_types_12.ProcessExecutionError("Skills not pre-installed and no SKILLS_OVERRIDE_BRANCH set \u2014 verify the Docker image bake-time install ran successfully.", { processType: ditto_codegen_types_12.ProcessType.INITIALIZATION });
+      throw new ditto_codegen_types_12.ProcessExecutionError("Skills not available \u2014 verify the install-skills step (codegen-install --phase startup) ran and populated /root/.agents/skills.", { processType: ditto_codegen_types_12.ProcessType.INITIALIZATION });
     }
   }
 });
@@ -19684,7 +19704,7 @@ async function initOpenCode() {
   await Promise.all([
     (0, rules_writer_1.writeRuleFiles)([...envConfig.codegenRules, ...pluginArtifacts.rules]),
     (0, rules_writer_1.writeRuleFiles)(envConfig.askRules),
-    (0, skills_installer_1.installSkills)((0, codegen_flow_helpers_1.getOutputPath)(), logger_1.logger),
+    (0, skills_installer_1.applySkillsOverride)((0, codegen_flow_helpers_1.getOutputPath)(), logger_1.logger),
     (0, tools_writer_1.writeToolFiles)(pluginArtifacts.tools)
   ]);
 }
@@ -19765,6 +19785,7 @@ async function processJob(job) {
           keys: Object.keys(agentData)
         });
       }
+      await (0, skills_installer_1.ensureSkillsReady)((0, codegen_flow_helpers_1.getOutputPath)(), logger_1.logger);
       if (task.kind === CodeGenService_1.TaskKind.ASK_CODEGEN) {
         await (0, opencode_ask_1.runOpencodeAskFlow)(history);
       } else if (task.kind === CodeGenService_1.TaskKind.ITERATE_CODEGEN) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.355",
+  "version": "1.0.357",
   "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": "dd6728e78e15bfd74a1b9833c183856688581fdb5c38a7c055f003e6"
+  "falconPackageHash": "236fead8ed789d2e79367a542151458b9890fc135b057e67784bb6f9"
 }