@wix/ditto-codegen-public 1.0.432 → 1.0.434

package/dist/out.js

@@ -11458,7 +11458,19 @@ INSTRUCTIONS:
     function buildIterationPrompt(chatHistory) {
       return buildPrompt(buildIterationBasePrompt(chatHistory));
     }
-    function buildRecoveryPrompt(originalPrompt, filesChanged, error) {
+    var INCREMENTAL_WRITE_STRATEGY = `WHY THE PREVIOUS SESSION FAILED:
+A single tool call tried to produce more content than one turn can stream, so it was cut off
+and nothing was saved. The same approach will fail again.
+
+RECOVERY STRATEGY:
+1. One file per tool call, ~200 lines or 1,500 words at most.
+2. For anything larger, write the first section, then append the rest with follow-up edits,
+   or split it across several files and import them.
+3. Prefer many small steps over one big step.`;
+    function buildRecoveryPrompt(originalPrompt, filesChanged, error, failureReason) {
+      const strategy = failureReason === "stall" ? `
+${INCREMENTAL_WRITE_STRATEGY}
+` : "";
       return buildPrompt(`You are continuing a code generation task that was interrupted due to a session error.
 
 ORIGINAL TASK:
@@ -11469,7 +11481,7 @@ ${(0, prompt_utils_1.formatFilesList)(filesChanged)}
 
 PREVIOUS SESSION ERROR:
 ${error}
-
+${strategy}
 INSTRUCTIONS:
 1. Review the files listed above that were already created/modified in the previous session
 2. Continue with any remaining work needed to fulfill the original task
@@ -11511,7 +11523,7 @@ var require_git_conflicts_prompt = __commonJS({
     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 base = "Fix all Git merge conflicts in the current project. Resolve every git conflict marker so the code compiles correctly.";
       const sections = [
         base,
         currentUserRequest ? `Additional context from user: "${currentUserRequest}"` : "",
@@ -13112,6 +13124,59 @@ var require_http_impl3 = __commonJS({
   }
 });
 
+// ../../node_modules/@wix/ambassador-code-project-orchestrator-v1-code-project/cjs/build/types.impl.js
+var require_types_impl3 = __commonJS({
+  "../../node_modules/@wix/ambassador-code-project-orchestrator-v1-code-project/cjs/build/types.impl.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.TaskStatus = exports2.SyncStatus = exports2.DeploymentStatus = exports2.ConflictResolutionStrategy = exports2.CodeDeploymentStatus = exports2.CheckpointErrorType = void 0;
+    var CheckpointErrorType;
+    (function(CheckpointErrorType2) {
+      CheckpointErrorType2["CHECKPOINT_ERROR_TYPE_UNKNOWN"] = "CHECKPOINT_ERROR_TYPE_UNKNOWN";
+      CheckpointErrorType2["CHECKPOINT_ERROR_TYPE_USER"] = "CHECKPOINT_ERROR_TYPE_USER";
+      CheckpointErrorType2["CHECKPOINT_ERROR_TYPE_SYSTEM"] = "CHECKPOINT_ERROR_TYPE_SYSTEM";
+    })(CheckpointErrorType || (exports2.CheckpointErrorType = CheckpointErrorType = {}));
+    var CodeDeploymentStatus;
+    (function(CodeDeploymentStatus2) {
+      CodeDeploymentStatus2["CODE_DEPLOYMENT_STATUS_UNKNOWN"] = "CODE_DEPLOYMENT_STATUS_UNKNOWN";
+      CodeDeploymentStatus2["CODE_DEPLOYMENT_STATUS_IN_PROGRESS"] = "CODE_DEPLOYMENT_STATUS_IN_PROGRESS";
+      CodeDeploymentStatus2["CODE_DEPLOYMENT_STATUS_COMPLETED"] = "CODE_DEPLOYMENT_STATUS_COMPLETED";
+      CodeDeploymentStatus2["CODE_DEPLOYMENT_STATUS_FAILED"] = "CODE_DEPLOYMENT_STATUS_FAILED";
+    })(CodeDeploymentStatus || (exports2.CodeDeploymentStatus = CodeDeploymentStatus = {}));
+    var ConflictResolutionStrategy;
+    (function(ConflictResolutionStrategy2) {
+      ConflictResolutionStrategy2["CONFLICT_RESOLUTION_STRATEGY_UNKNOWN"] = "CONFLICT_RESOLUTION_STRATEGY_UNKNOWN";
+      ConflictResolutionStrategy2["OURS"] = "OURS";
+      ConflictResolutionStrategy2["THEIRS"] = "THEIRS";
+      ConflictResolutionStrategy2["AI"] = "AI";
+    })(ConflictResolutionStrategy || (exports2.ConflictResolutionStrategy = ConflictResolutionStrategy = {}));
+    var DeploymentStatus;
+    (function(DeploymentStatus2) {
+      DeploymentStatus2["UNKNOWN"] = "UNKNOWN";
+      DeploymentStatus2["BUILD_IN_PROGRESS"] = "BUILD_IN_PROGRESS";
+      DeploymentStatus2["BUILD_COMPLETED"] = "BUILD_COMPLETED";
+      DeploymentStatus2["BUILD_FAILED"] = "BUILD_FAILED";
+      DeploymentStatus2["ARCHIVED"] = "ARCHIVED";
+    })(DeploymentStatus || (exports2.DeploymentStatus = DeploymentStatus = {}));
+    var SyncStatus;
+    (function(SyncStatus2) {
+      SyncStatus2["SYNC_STATUS_UNKNOWN"] = "SYNC_STATUS_UNKNOWN";
+      SyncStatus2["SYNC_STATUS_IN_SYNC"] = "SYNC_STATUS_IN_SYNC";
+      SyncStatus2["SYNC_STATUS_OUT_OF_SYNC"] = "SYNC_STATUS_OUT_OF_SYNC";
+    })(SyncStatus || (exports2.SyncStatus = SyncStatus = {}));
+    var TaskStatus;
+    (function(TaskStatus2) {
+      TaskStatus2["UNKNOWN_TASK_STATUS"] = "UNKNOWN_TASK_STATUS";
+      TaskStatus2["NOT_STARTED"] = "NOT_STARTED";
+      TaskStatus2["RUNNING"] = "RUNNING";
+      TaskStatus2["COMPLETED"] = "COMPLETED";
+      TaskStatus2["FAILED"] = "FAILED";
+      TaskStatus2["CANCELLED"] = "CANCELLED";
+      TaskStatus2["NOT_EXECUTED"] = "NOT_EXECUTED";
+    })(TaskStatus || (exports2.TaskStatus = TaskStatus = {}));
+  }
+});
+
 // ../codegen-checkpoint-plugin/dist/checkpoint.js
 var require_checkpoint = __commonJS({
   "../codegen-checkpoint-plugin/dist/checkpoint.js"(exports2) {
@@ -13122,6 +13187,7 @@ var require_checkpoint = __commonJS({
     var path_1 = require("path");
     var http_1 = require_http_impl2();
     var http_2 = require_http_impl3();
+    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";
@@ -13154,7 +13220,24 @@ var require_checkpoint = __commonJS({
         return message;
       return message.slice(0, MAX_COMMIT_MESSAGE_LENGTH - TRUNCATION_SUFFIX.length) + TRUNCATION_SUFFIX;
     };
+    var CHECKPOINT_CONFLICT_CODE = "CHECKPOINT_CONFLICT";
     var useCodeProjectOrchestrator = () => process.env.USE_CODE_PROJECT_ORCHESTRATOR === "true";
+    var collaboratorLiveSyncEnabled = () => process.env.STUDIO2_COLLABORATOR_LIVE_SYNC === "true";
+    var readApplicationErrorCode = (error) => {
+      if (!http_client_1.HttpClient.isHttpError(error))
+        return void 0;
+      const data = error.response?.data;
+      const code = data?.details?.applicationError?.code;
+      return typeof code === "string" ? code : void 0;
+    };
+    var isCheckpointConflict = (error) => readApplicationErrorCode(error) === CHECKPOINT_CONFLICT_CODE;
+    var readConflictedFiles = (error) => {
+      if (!http_client_1.HttpClient.isHttpError(error))
+        return [];
+      const data = error.response?.data;
+      const files = data?.details?.applicationError?.data?.files;
+      return Array.isArray(files) ? files.filter((file) => typeof file === "string") : [];
+    };
     var wasAuthorizationHeaderSent = (requestHeaders) => {
       if (typeof requestHeaders !== "object" || requestHeaders === null)
         return false;
@@ -13201,6 +13284,13 @@ var require_checkpoint = __commonJS({
         commitHash: resp.data?.checkpointId
       };
     };
+    var callResolveCheckpointConflict = async (client, siteBranchId) => {
+      const resp = await client.request((0, http_2.resolveCheckpointConflict)({
+        siteBranchId,
+        strategy: types_1.ConflictResolutionStrategy.AI
+      }));
+      return resp.data?.jobId ?? void 0;
+    };
     var readToolCommitMessage = (input) => {
       if (typeof input !== "object" || input === null)
         return void 0;
@@ -13245,6 +13335,45 @@ var require_checkpoint = __commonJS({
             commitMessage
           });
         } catch (error) {
+          if (useCodeProjectOrchestrator() && collaboratorLiveSyncEnabled() && job.siteBranchId && isCheckpointConflict(error)) {
+            const files = readConflictedFiles(error);
+            try {
+              const conflictResolutionJobId = await callResolveCheckpointConflict(orchestratorHttpClient, job.siteBranchId);
+              if (!conflictResolutionJobId) {
+                throw new Error("resolveCheckpointConflict returned no conflict resolution job id");
+              }
+              outcome = {
+                status: "resolvingGitConflicts",
+                conflictResolutionJobId,
+                conflictedFiles: files
+              };
+              await host.jobs.updatePayload({ jobId: job.jobId, taskId: job.taskId }, {
+                checkpointStatus: "resolvingGitConflicts",
+                conflictResolutionJobId,
+                conflictedFiles: files
+              }).catch((payloadError) => {
+                host.logger.warn("[Checkpoint] failed to publish the resolving-conflicts state", {
+                  projectId: job.projectId,
+                  conflictResolutionJobId,
+                  error: payloadError instanceof Error ? payloadError.message : String(payloadError)
+                });
+              });
+              host.logger.info("[Checkpoint] git conflicts handed to AI resolution", {
+                projectId: job.projectId,
+                siteBranchId: job.siteBranchId,
+                conflictResolutionJobId,
+                files
+              });
+              return;
+            } catch (resolveError) {
+              host.logger.error("[Checkpoint] git conflict resolution dispatch failed", {
+                projectId: job.projectId,
+                siteBranchId: job.siteBranchId,
+                files,
+                error: resolveError instanceof Error ? resolveError.message : String(resolveError)
+              });
+            }
+          }
           outcome = { status: "failed", error };
           host.logger.error("[Checkpoint] create failed", {
             projectId: job.projectId,
@@ -13290,6 +13419,8 @@ var require_checkpoint = __commonJS({
             throw outcome.error;
           if (outcome?.status === "created")
             return;
+          if (outcome?.status === "resolvingGitConflicts")
+            return;
           if (codegenFailed)
             return;
           const commitMessage = capturedCommitMessage ?? FALLBACK_COMMIT_MESSAGE;
@@ -15136,9 +15267,9 @@ UNDERSTAND INTENT FIRST:
 - 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.
+- Identify all files containing git conflict markers.
+- The HEAD (OURS) section \u2014 the first side of the conflict \u2014 represents the current branch's changes; preserve this code.
+- The incoming (THEIRS) section \u2014 the second side \u2014 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.
@@ -15161,7 +15292,7 @@ ${(0, shared_rules_1.buildFileOperationsRules)("resolving conflicts")}
 - NEVER run preview, dev, release, or promote commands.
 
 WORKFLOW:
-1. **Find**: Use \`grep\` to locate all files containing "<<<<<<<".
+1. **Find**: Use \`grep\` to locate every file containing git conflict markers, searching the whole project \u2014 any files named in the request are only a hint.
 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).
@@ -16517,13 +16648,14 @@ var require_process_manager = __commonJS({
   "dist/opencode-integration/process-manager.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.KILL_GRACE_PERIOD_MS = exports2.IDLE_CHECK_INTERVAL_MS = exports2.IDLE_TIMEOUT_MS = void 0;
+    exports2.MAX_STARTS_WITHOUT_FINISH = exports2.KILL_GRACE_PERIOD_MS = exports2.IDLE_CHECK_INTERVAL_MS = exports2.IDLE_TIMEOUT_MS = void 0;
     exports2.clearTimers = clearTimers;
     exports2.killProcess = killProcess;
     var logger_12 = require_logger();
     exports2.IDLE_TIMEOUT_MS = 6e5;
     exports2.IDLE_CHECK_INTERVAL_MS = 15e3;
     exports2.KILL_GRACE_PERIOD_MS = 5e3;
+    exports2.MAX_STARTS_WITHOUT_FINISH = 3;
     function clearTimers(timers) {
       if (timers.timeoutId) {
         clearTimeout(timers.timeoutId);
@@ -16570,24 +16702,13 @@ var require_result_builder = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.createTimeoutResult = createTimeoutResult;
     exports2.createSuccessResult = createSuccessResult;
+    exports2.createFailedResult = createFailedResult;
     exports2.createSpawnErrorResult = createSpawnErrorResult;
     var ditto_codegen_types_12 = require_dist4();
     var tool_usage_1 = require_tool_usage();
     var parser_1 = require_parser();
     function createTimeoutResult(message, stdout, stderr, startTime) {
-      return {
-        success: false,
-        exitCode: null,
-        stdout,
-        stderr,
-        agentMessage: (0, parser_1.parseAnswerText)(stdout),
-        error: new ditto_codegen_types_12.TimeoutError(message),
-        durationMs: Date.now() - startTime,
-        requiredPermissions: [],
-        usage: (0, parser_1.parseUsageStats)(stdout),
-        skillsUsed: [],
-        toolUsage: (0, tool_usage_1.emptyToolUsage)()
-      };
+      return createFailedResult(new ditto_codegen_types_12.TimeoutError(message), stdout, stderr, startTime);
     }
     function createSuccessResult(code, stdout, stderr, startTime) {
       return {
@@ -16608,6 +16729,21 @@ var require_result_builder = __commonJS({
         toolUsage: (0, tool_usage_1.emptyToolUsage)()
       };
     }
+    function createFailedResult(error, stdout, stderr, startTime) {
+      return {
+        success: false,
+        exitCode: null,
+        stdout,
+        stderr,
+        agentMessage: (0, parser_1.parseAnswerText)(stdout),
+        error,
+        durationMs: Date.now() - startTime,
+        requiredPermissions: [],
+        usage: (0, parser_1.parseUsageStats)(stdout),
+        skillsUsed: [],
+        toolUsage: (0, tool_usage_1.emptyToolUsage)()
+      };
+    }
     function createSpawnErrorResult(errorMessage, stdout, stderr, startTime) {
       return {
         success: false,
@@ -16636,12 +16772,14 @@ var require_process_handlers = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.setupTotalTimeout = setupTotalTimeout;
     exports2.setupIdleWatchdog = setupIdleWatchdog;
+    exports2.trackTurnProgress = trackTurnProgress;
     exports2.setupStdoutHandler = setupStdoutHandler;
     exports2.setupStderrHandler = setupStderrHandler;
     exports2.setupCloseHandler = setupCloseHandler;
     exports2.setupErrorHandler = setupErrorHandler;
     var parser_1 = require_parser();
     var config_12 = require_config();
+    var ditto_codegen_types_12 = require_dist4();
     var process_manager_1 = require_process_manager();
     var result_builder_1 = require_result_builder();
     var logger_12 = require_logger();
@@ -16666,6 +16804,49 @@ var require_process_handlers = __commonJS({
         }
       }, process_manager_1.IDLE_CHECK_INTERVAL_MS);
     }
+    function trackTurnProgress(state, event) {
+      if (event.type === "step_finish") {
+        state.startsWithoutFinish = 0;
+        return;
+      }
+      if (event.type !== "step_start")
+        return;
+      state.startsWithoutFinish += 1;
+      if (state.startsWithoutFinish < process_manager_1.MAX_STARTS_WITHOUT_FINISH)
+        return;
+      throw new ditto_codegen_types_12.TimeoutError(`Process stalled - ${process_manager_1.MAX_STARTS_WITHOUT_FINISH} turns started without completing`);
+    }
+    function handleStdoutLine(ctx, line, trackProgress) {
+      ctx.taskTracker.processLine(line);
+      if (!line.trim())
+        return null;
+      let event = null;
+      try {
+        event = JSON.parse(line);
+        logger_12.logger.debug("[OpenCode] stdout", (0, parser_1.summarizeOpenCodeLine)(event));
+      } catch {
+        logger_12.logger.debug("[OpenCode] stdout", { line: line.slice(0, 200) });
+      }
+      if (!event || !trackProgress)
+        return null;
+      try {
+        trackTurnProgress(ctx.state, event);
+        return null;
+      } catch (error) {
+        return error instanceof ditto_codegen_types_12.TimeoutError ? error : new ditto_codegen_types_12.TimeoutError(String(error));
+      }
+    }
+    function failStalledRun(ctx, stall) {
+      logger_12.logger.warn("[OpenCode] Killing stalled process", {
+        error: stall.message,
+        startsWithoutFinish: ctx.state.startsWithoutFinish
+      });
+      (0, process_manager_1.killProcess)(ctx.child, ctx.state.resolved);
+      ctx.finalize({
+        ...(0, result_builder_1.createFailedResult)(stall, ctx.state.stdout, ctx.state.stderr, ctx.startTime),
+        stalled: true
+      });
+    }
     function setupStdoutHandler(ctx, onStdout) {
       ctx.child?.stdout?.on("data", (data) => {
         const text = data.toString();
@@ -16674,21 +16855,18 @@ var require_process_handlers = __commonJS({
         ctx.state.lineBuffer += text;
         const lines = ctx.state.lineBuffer.split("\n");
         ctx.state.lineBuffer = lines.pop() || "";
+        let stall = null;
         for (const line of lines) {
-          ctx.taskTracker.processLine(line);
-          if (line.trim()) {
-            try {
-              logger_12.logger.debug("[OpenCode] stdout", (0, parser_1.summarizeOpenCodeLine)(JSON.parse(line)));
-            } catch {
-              logger_12.logger.debug("[OpenCode] stdout", { line: line.slice(0, 200) });
-            }
-          }
+          const found = handleStdoutLine(ctx, line, !stall && !ctx.state.resolved);
+          stall ??= found;
         }
         if (onStdout) {
           onStdout(text);
         } else {
           process.stdout.write(text);
         }
+        if (stall && !ctx.state.resolved)
+          failStalledRun(ctx, stall);
       });
     }
     function setupStderrHandler(ctx, onStderr) {
@@ -16725,6 +16903,7 @@ var require_executor = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.notifyValidatorOutputsToSlack = notifyValidatorOutputsToSlack;
+    exports2.classifyAttempt = classifyAttempt;
     exports2.executeOpenCode = executeOpenCode;
     exports2.resolveFinalRunCost = resolveFinalRunCost;
     var child_process_1 = require("child_process");
@@ -16742,6 +16921,7 @@ var require_executor = __commonJS({
     var process_handlers_1 = require_process_handlers();
     var logger_12 = require_logger();
     var MAX_RETRIES = 5;
+    var MAX_STALL_ATTEMPTS = 2;
     async function notifyValidatorOutputsToSlack(stdout, costUsd) {
       try {
         const store = job_context_storage_12.jobContextStorage.getStore();
@@ -16773,12 +16953,33 @@ var require_executor = __commonJS({
         });
       }
     }
+    function failureReason(result) {
+      if (result.stalled)
+        return "stall";
+      if ((0, parser_1.hasSessionError)(result.stdout))
+        return "session error";
+      if (result.error instanceof ditto_codegen_types_12.ProcessExecutionError) {
+        return "process execution error";
+      }
+      if (!result.success && result.error instanceof ditto_codegen_types_12.TimeoutError) {
+        return "timeout";
+      }
+      return null;
+    }
+    function classifyAttempt(result, stalls) {
+      const reason = failureReason(result);
+      if (!reason)
+        return { retryable: false, reason: null };
+      return { retryable: stalls < MAX_STALL_ATTEMPTS, reason };
+    }
     async function executeOpenCode(options) {
       let lastResult = null;
       let accumulatedUsage = (0, parser_1.createEmptyUsageStats)();
       const accumulatedSkills = [];
       const toolUsage = new tool_usage_1.ToolUsageCollector();
       let currentPrompt = options.prompt;
+      let lastFailureReason = null;
+      let stalls = 0;
       let continueSession = 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);
@@ -16786,20 +16987,25 @@ var require_executor = __commonJS({
       logger_12.logger.debug("[OpenCode] Stats baseline before run", { baselineCost });
       for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
         if (attempt > 1) {
-          logger_12.logger.info(`[OpenCode] Retry attempt ${attempt}/${MAX_RETRIES} - starting fresh session with recovery context`);
+          const failureDetail = lastResult?.error?.message || lastResult?.stderr || "Process timed out";
+          logger_12.logger.info(`[OpenCode] Retry attempt ${attempt}/${MAX_RETRIES} after ${lastFailureReason} - starting fresh session with recovery context`, { reason: lastFailureReason, detail: failureDetail.slice(0, 500) });
           const filesChanged = await (0, git_file_changes_1.collectGitFileChanges)(options.outputPath, options.gitBaseline);
-          currentPrompt = (0, prompts_1.buildRecoveryPrompt)(options.prompt, filesChanged, lastResult?.error?.message || lastResult?.stderr || "Process timed out");
+          currentPrompt = (0, prompts_1.buildRecoveryPrompt)(options.prompt, filesChanged, failureDetail, lastFailureReason);
           continueSession = false;
         }
         const result = await executeOpenCodeOnce({ ...options, prompt: currentPrompt, continueSession }, attempt, toolUsage);
         accumulatedUsage = (0, parser_1.mergeUsageStats)(accumulatedUsage, result.usage);
         accumulatedSkills.push(...result.skillsUsed);
-        const errorMsg = result.error?.message.toLowerCase() ?? "";
-        const isIdleTimeout = !result.success && errorMsg.includes("idle timeout");
-        const isSessionError = (0, parser_1.hasSessionError)(result.stdout);
-        const isProcessError = result.error instanceof ditto_codegen_types_12.ProcessExecutionError;
-        const isRetryableFailure = isIdleTimeout || isSessionError || isProcessError;
-        if (!isRetryableFailure) {
+        if (result.stalled)
+          stalls += 1;
+        const { retryable, reason } = classifyAttempt(result, stalls);
+        if (!retryable) {
+          if (reason) {
+            logger_12.logger.warn(`[OpenCode] Not retrying after ${reason}`, {
+              attempt,
+              stalls
+            });
+          }
           accumulatedUsage = await resolveFinalRunCost(accumulatedUsage, options, baselineCost);
           const finalResult2 = {
             ...result,
@@ -16812,10 +17018,11 @@ var require_executor = __commonJS({
           return finalResult2;
         }
         lastResult = result;
-        const reason = isSessionError ? "session error" : isProcessError ? "process execution error" : "idle timeout";
+        lastFailureReason = reason;
         logger_12.logger.warn(`[OpenCode] Attempt failed due to ${reason}, will retry`, {
           attempt,
-          maxRetries: MAX_RETRIES
+          maxRetries: MAX_RETRIES,
+          detail: (result.error?.message || result.stderr || "").slice(0, 500)
         });
       }
       logger_12.logger.warn("[OpenCode] All retry attempts exhausted", {
@@ -16866,7 +17073,8 @@ var require_executor = __commonJS({
           stderr: "",
           lineBuffer: "",
           lastOutputTime: Date.now(),
-          resolved: false
+          resolved: false,
+          startsWithoutFinish: 0
         };
         const timers = {
           timeoutId: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.432",
+  "version": "1.0.434",
   "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": "138387ddb94767f45627512cde3a8a5d6dd67ce1200ce29873f584f9"
+  "falconPackageHash": "b849b4780b251c081a437506b4ded2164211e1e078b19bd3e61e64b7"
 }