@wix/ditto-codegen-public 1.0.431 → 1.0.433

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
@@ -16517,13 +16529,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 +16583,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 +16610,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 +16653,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 +16685,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 +16736,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 +16784,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 +16802,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 +16834,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 +16868,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 +16899,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 +16954,8 @@ var require_executor = __commonJS({
           stderr: "",
           lineBuffer: "",
           lastOutputTime: Date.now(),
-          resolved: false
+          resolved: false,
+          startsWithoutFinish: 0
         };
         const timers = {
           timeoutId: null,
@@ -22133,11 +22222,19 @@ var require_biEvents = __commonJS({
     var types_1 = require_types_impl();
     var biLogger_1 = require_biLogger();
     var logger_12 = require_logger();
+    var MAX_JOB_INPUT_LENGTH = 3e4;
+    var TRUNCATION_SUFFIX = "\u2026";
     var JOB_STATUS_MAP = {
       COMPLETED: "successful",
       FAILED: "error",
       CANCELLED: "stopped"
     };
+    function truncateJobInput(jobInput) {
+      if (!jobInput || jobInput.length <= MAX_JOB_INPUT_LENGTH) {
+        return jobInput;
+      }
+      return jobInput.slice(0, MAX_JOB_INPUT_LENGTH - TRUNCATION_SUFFIX.length) + TRUNCATION_SUFFIX;
+    }
     function skillsArrayToMap(skills) {
       const map = {};
       for (const skill of skills) {
@@ -22168,6 +22265,7 @@ var require_biEvents = __commonJS({
       }
       const codegenAgentParams = {
         job_id: report.jobId,
+        job_input: truncateJobInput(report.jobInput),
         extra_data: report.extraData,
         Job_cost: report.jobCost,
         dev_machine_session_id: report.devMachineSessionId,
@@ -22377,7 +22475,7 @@ var require_opencode_init = __commonJS({
       if (!store?.jobId || !store?.taskId) {
         throw new Error("Job context not available - jobId and taskId are required");
       }
-      const { jobId, taskId, kind } = store;
+      const { jobId, taskId, kind, userInput } = store;
       const localJobContext = { jobId, taskId };
       const environment = process.env.CODEGEN_ENVIRONMENT ?? types_1.Environment.UNKNOWN_ENVIRONMENT;
       const flowStartTime = Date.now();
@@ -22397,7 +22495,8 @@ var require_opencode_init = __commonJS({
       await (0, biEvents_1.reportSessionStart)({
         ...biBase,
         taskModel: config_12.DEFAULT_MODEL,
-        taskType: kind
+        taskType: kind,
+        jobInput: userInput
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
       const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
@@ -22590,7 +22689,7 @@ var require_opencode_iterate = __commonJS({
       if (!store?.jobId || !store?.taskId) {
         throw new Error("Job context not available - jobId and taskId are required");
       }
-      const { jobId, taskId, kind } = store;
+      const { jobId, taskId, kind, userInput } = store;
       const localJobContext = { jobId, taskId };
       const environment = process.env.CODEGEN_ENVIRONMENT ?? types_1.Environment.UNKNOWN_ENVIRONMENT;
       const flowStartTime = Date.now();
@@ -22610,7 +22709,8 @@ var require_opencode_iterate = __commonJS({
       await (0, biEvents_1.reportSessionStart)({
         ...biBase,
         taskModel: config_12.DEFAULT_MODEL,
-        taskType: kind
+        taskType: kind,
+        jobInput: userInput
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
       const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
@@ -22787,7 +22887,7 @@ var require_opencode_ask = __commonJS({
       if (!store?.jobId || !store?.taskId) {
         throw new Error("Job context not available - jobId and taskId are required");
       }
-      const { jobId, taskId, kind } = store;
+      const { jobId, taskId, kind, userInput } = store;
       const localJobContext = { jobId, taskId };
       const environment = process.env.CODEGEN_ENVIRONMENT ?? types_1.Environment.UNKNOWN_ENVIRONMENT;
       const flowStartTime = Date.now();
@@ -22807,7 +22907,8 @@ var require_opencode_ask = __commonJS({
       await (0, biEvents_1.reportSessionStart)({
         ...biBase,
         taskModel: config_12.DEFAULT_MODEL,
-        taskType: kind
+        taskType: kind,
+        jobInput: userInput
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
       const gitBaseline = await (0, git_file_changes_1.captureGitBaseline)(outputPath);
@@ -23637,11 +23738,10 @@ async function main(ctx) {
 var getFirstTask = (job) => {
   return job.tasks?.[0];
 };
-function buildPluginsForTask(jobId, taskId, kind, payload) {
+function buildPluginsForTask(jobId, taskId, kind, userInput) {
   if (kind !== CodeGenService_1.TaskKind.INIT_CODEGEN && kind !== CodeGenService_1.TaskKind.ITERATE_CODEGEN && kind !== CodeGenService_1.TaskKind.FIX_GIT_CONFLICTS) {
     return void 0;
   }
-  const userInput = extractUserInput(kind, payload);
   const host = (0, plugin_host_1.buildPluginHost)();
   return (0, environments_1.getCodegenEnvironmentConfig)().plugins.map((factory) => factory({
     host,
@@ -23659,7 +23759,7 @@ function extractUserInput(kind, payload) {
   if (kind === CodeGenService_1.TaskKind.INIT_CODEGEN) {
     return payload.blueprint?.summary?.trim() || void 0;
   }
-  if (kind === CodeGenService_1.TaskKind.ITERATE_CODEGEN || kind === CodeGenService_1.TaskKind.FIX_GIT_CONFLICTS) {
+  if (kind === CodeGenService_1.TaskKind.ITERATE_CODEGEN || kind === CodeGenService_1.TaskKind.FIX_GIT_CONFLICTS || kind === CodeGenService_1.TaskKind.ASK_CODEGEN) {
     const history = payload.history ?? [];
     for (let i = history.length - 1; i >= 0; i--) {
       if (history[i].role === "USER") {
@@ -23680,12 +23780,14 @@ async function processJob(job) {
     return;
   }
   const payload = task.input ?? task.payload ?? {};
-  const plugins = buildPluginsForTask(jobId, task.id, task.kind, payload);
+  const userInput = extractUserInput(task.kind, payload);
+  const plugins = buildPluginsForTask(jobId, task.id, task.kind, userInput);
   await job_context_storage_1.jobContextStorage.run({
     jobId,
     taskId: task.id,
     kind: task.kind,
     plugins,
+    userInput,
     metasiteId: context_1.ctx.metasiteId
   }, async () => {
     logger_1.logger.info("[Job] Start processing", { taskKind: task.kind });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.431",
+  "version": "1.0.433",
   "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": "85a0210cddb251eaf19067e588dd30dc2a73f6bb94352b5b386068d3"
+  "falconPackageHash": "1601a0c2e0fc0a29a1d23a9101dd1760a021d72adbd91767267f436d"
 }