@wix/ditto-codegen-public 1.0.280 → 1.0.282

package/dist/out.js

@@ -12072,6 +12072,7 @@ var require_parser = __commonJS({
     exports2.createEmptyUsageStats = createEmptyUsageStats;
     exports2.parseUsageStats = parseUsageStats;
     exports2.mergeUsageStats = mergeUsageStats;
+    exports2.hasSessionError = hasSessionError;
     exports2.formatUsageStats = formatUsageStats;
     var ditto_codegen_types_12 = require_dist4();
     var types_1 = require_types4();
@@ -12199,6 +12200,32 @@ var require_parser = __commonJS({
         stepCount: a.stepCount + b.stepCount
       };
     }
+    function hasSessionError(output) {
+      const lines = output.split("\n");
+      let foundError = false;
+      let lastStepFinishReason;
+      for (const line of lines) {
+        if (!line.trim())
+          continue;
+        const event = (0, types_1.tryParseJson)(line);
+        if (!event)
+          continue;
+        if (event.type === "error") {
+          foundError = true;
+        } else if (event.type === "tool_use") {
+          const toolEvent = event;
+          if (toolEvent.part?.state?.status === "error") {
+            foundError = true;
+          }
+        } else if (event.type === "step_finish") {
+          const stepEvent = event;
+          lastStepFinishReason = stepEvent.part?.reason;
+        }
+      }
+      if (lastStepFinishReason === "stop")
+        return false;
+      return foundError;
+    }
     function formatUsageStats(stats) {
       const lines = [
         `\u{1F4CA} Usage Summary:`,
@@ -12816,8 +12843,10 @@ var require_executor = __commonJS({
         accumulatedSkills.push(...result.skillsUsed);
         accumulatedExtensions.push(...result.extensionsCreated);
         const errorMsg = result.error?.message.toLowerCase() ?? "";
-        const isRetryableFailure = !result.success && errorMsg.includes("idle timeout");
-        if (result.success || !isRetryableFailure) {
+        const isIdleTimeout = !result.success && errorMsg.includes("idle timeout");
+        const isSessionError = (0, parser_1.hasSessionError)(result.stdout);
+        const isRetryableFailure = isIdleTimeout || isSessionError;
+        if (!isRetryableFailure) {
           const finalResult2 = {
             ...result,
             filesChanged: (0, parser_1.parseFilesChanged)(accumulatedStdout),
@@ -12830,7 +12859,8 @@ var require_executor = __commonJS({
           return finalResult2;
         }
         lastResult = result;
-        logger_12.logger.warn("[OpenCode] Attempt failed due to idle timeout, will retry", {
+        const reason = isSessionError ? "session error" : "idle timeout";
+        logger_12.logger.warn(`[OpenCode] Attempt failed due to ${reason}, will retry`, {
           attempt,
           maxRetries: MAX_RETRIES
         });
@@ -18130,14 +18160,33 @@ var require_skills_installer = __commonJS({
     var util_1 = require("util");
     var ditto_codegen_types_12 = require_dist4();
     var execAsync = (0, util_1.promisify)(child_process_1.exec);
+    var SKILLS_DIR = "/root/.agents/skills";
     var SKILLS_INSTALL_COMMAND = "npx --yes skills add wix/skills -g -a opencode -y";
     function buildOverrideCommand(branch) {
-      return `curl -sL https://github.com/wix/skills/archive/${branch}.tar.gz | tar xz --strip-components=2 -C /root/.agents/skills --wildcards "*/skills/*"`;
+      return `rm -rf ${SKILLS_DIR} && mkdir -p ${SKILLS_DIR} && curl -sL https://github.com/wix/skills/archive/${branch}.tar.gz | tar xz --strip-components=2 -C ${SKILLS_DIR} --wildcards "*/skills/*"`;
     }
     async function installSkills(outputPath, log) {
       log.info("[Skills] Installing Wix skills globally", {
         installInternalSkills: process.env.INSTALL_INTERNAL_SKILLS
       });
+      const overrideBranch = process.env.SKILLS_OVERRIDE_BRANCH;
+      if (overrideBranch) {
+        try {
+          log.info("[Skills] Installing skills from branch", {
+            branch: overrideBranch
+          });
+          await execAsync(buildOverrideCommand(overrideBranch), {
+            cwd: outputPath
+          });
+          log.info("[Skills] Skills installed from branch successfully");
+          return;
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          log.warn("[Skills] Branch install failed, falling back to default", {
+            error: errorMessage
+          });
+        }
+      }
       try {
         const { stdout, stderr } = await execAsync(SKILLS_INSTALL_COMMAND, {
           cwd: outputPath
@@ -18154,21 +18203,6 @@ var require_skills_installer = __commonJS({
           cause: error
         });
       }
-      const overrideBranch = process.env.SKILLS_OVERRIDE_BRANCH;
-      if (!overrideBranch)
-        return;
-      try {
-        log.info("[Skills] Overriding skills from branch", {
-          branch: overrideBranch
-        });
-        await execAsync(buildOverrideCommand(overrideBranch), { cwd: outputPath });
-        log.info("[Skills] Skills override complete");
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        log.warn("[Skills] Skills override failed, using default", {
-          error: errorMessage
-        });
-      }
     }
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.280",
+  "version": "1.0.282",
   "description": "AI-powered Wix CLI app generator - standalone executable",
   "scripts": {
     "build": "node build.mjs",
@@ -27,5 +27,5 @@
     "@wix/ditto-codegen": "1.0.0",
     "esbuild": "^0.27.2"
   },
-  "falconPackageHash": "70edf61cffcb5b7f839c64fa0f2aad237cbee615f556014d88d77f80"
+  "falconPackageHash": "dfa51d2033ad05b1debde0dbd9a4970eab5e3a9a5507fc31abbf2a36"
 }