@wix/ditto-codegen-public 1.0.457 → 1.0.458

package/dist/out.js

@@ -15334,7 +15334,7 @@ var require_config = __commonJS({
   "dist/opencode-integration/configuration/config.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.DEFAULT_TIMEOUT_MS = void 0;
+    exports2.PROVIDER_CHUNK_TIMEOUT_MS = exports2.DEFAULT_TIMEOUT_MS = void 0;
     exports2.getAnthropicBaseUrl = getAnthropicBaseUrl;
     exports2.getOpenAiBaseUrl = getOpenAiBaseUrl;
     exports2.getGoogleBaseUrl = getGoogleBaseUrl;
@@ -15380,6 +15380,7 @@ var require_config = __commonJS({
       ".git/**",
       ".astro/**"
     ];
+    exports2.PROVIDER_CHUNK_TIMEOUT_MS = 9e4;
     function getProviderConfig(projectId) {
       const environment = (0, environments_12.getValidatedCodegenEnvironment)();
       const chargingMode = (0, environments_12.getCodegenEnvironmentConfig)().chargingMode ?? "app";
@@ -15398,7 +15399,8 @@ var require_config = __commonJS({
           options: {
             apiKey: "proxy-handled",
             cacheControl: true,
-            headers
+            headers,
+            chunkTimeout: exports2.PROVIDER_CHUNK_TIMEOUT_MS
           }
         }
       };
@@ -15410,7 +15412,8 @@ var require_config = __commonJS({
             // don't "clean up" apiKey — removing it 403s every openai request.
             apiKey: "proxy-handled",
             baseURL: getOpenAiBaseUrl(projectId),
-            headers
+            headers,
+            chunkTimeout: exports2.PROVIDER_CHUNK_TIMEOUT_MS
           }
         };
       }
@@ -15419,7 +15422,8 @@ var require_config = __commonJS({
           options: {
             apiKey: "proxy-handled",
             baseURL: getGoogleBaseUrl(projectId),
-            headers
+            headers,
+            chunkTimeout: exports2.PROVIDER_CHUNK_TIMEOUT_MS
           },
           // Wix AI proxy aliases not in models.dev — opencode would reject them
           // with ModelNotFoundError without these stubs. Empty records are enough;
@@ -15629,18 +15633,20 @@ var require_subagent_tool_logger = __commonJS({
   "dist/opencode-integration/plugins/subagent-tool-logger.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.SUBAGENT_TOOL_LOGGER_FILENAME = exports2.SUBAGENT_STARTED_EVENT_TYPE = exports2.SUBAGENT_TOOL_EVENT_TYPE = void 0;
+    exports2.SUBAGENT_TOOL_LOGGER_FILENAME = exports2.TOOL_STARTED_EVENT_TYPE = exports2.SUBAGENT_STARTED_EVENT_TYPE = exports2.SUBAGENT_TOOL_EVENT_TYPE = void 0;
     exports2.buildSubagentToolLoggerPluginSource = buildSubagentToolLoggerPluginSource;
     exports2.writeSubagentToolLoggerPlugin = writeSubagentToolLoggerPlugin;
     var write_plugin_1 = require_write_plugin();
     var subagents_1 = require_subagents();
     exports2.SUBAGENT_TOOL_EVENT_TYPE = "subagent_tool_use";
     exports2.SUBAGENT_STARTED_EVENT_TYPE = "subagent_started";
+    exports2.TOOL_STARTED_EVENT_TYPE = "tool_started";
     exports2.SUBAGENT_TOOL_LOGGER_FILENAME = "subagent-tool-logger.ts";
     function buildSubagentToolLoggerPluginSource() {
       return `// Generated by @wix/ditto-codegen (subagent-tool-logger) \u2014 do not edit.
 const EVENT_TYPE = ${JSON.stringify(exports2.SUBAGENT_TOOL_EVENT_TYPE)};
 const STARTED_EVENT_TYPE = ${JSON.stringify(exports2.SUBAGENT_STARTED_EVENT_TYPE)};
+const TOOL_STARTED_EVENT_TYPE = ${JSON.stringify(exports2.TOOL_STARTED_EVENT_TYPE)};
 const SUBAGENT_AGENTS = new Set(${JSON.stringify(subagents_1.SUBAGENT_AGENT_NAMES)});
 
 export const SubagentToolLogger = async () => {
@@ -15652,6 +15658,8 @@ export const SubagentToolLogger = async () => {
   const emitted = new Set();
   // sessions we've already emitted a start marker for (events repeat).
   const started = new Set();
+  // callIDs we've announced as started \u2014 a running part updates repeatedly.
+  const toolStarted = new Set();
 
   // Emit the start marker once per subagent session, stamped with opencode's
   // own creation time \u2014 NOT the plugin's observation time (Date.now), which
@@ -15708,6 +15716,25 @@ export const SubagentToolLogger = async () => {
         if (part?.type !== "tool") return;
 
         const status = part.state?.status;
+
+        // Before the subagent filter: root parts are never in agentBySession.
+        if (status === "running") {
+          if (!part.callID || toolStarted.has(part.callID)) return;
+          toolStarted.add(part.callID);
+          const startedAt = part.state?.time?.start;
+          process.stdout.write(
+            JSON.stringify({
+              type: TOOL_STARTED_EVENT_TYPE,
+              timestamp: startedAt || Date.now(),
+              exactTime: startedAt != null,
+              sessionID: part.sessionID,
+              callID: part.callID,
+              tool: part.tool,
+            }) + "\\n",
+          );
+          return;
+        }
+
         if (status !== "completed" && status !== "error") return;
 
         const agent = agentBySession.get(part.sessionID);
@@ -16702,11 +16729,12 @@ var require_process_manager = __commonJS({
   "dist/opencode-integration/execution/process-manager.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.MAX_STARTS_WITHOUT_FINISH = exports2.IDLE_CHECK_INTERVAL_MS = exports2.IDLE_TIMEOUT_MS = void 0;
+    exports2.MAX_STARTS_WITHOUT_FINISH = exports2.IDLE_CHECK_INTERVAL_MS = exports2.GENERATING_IDLE_TIMEOUT_MS = exports2.IDLE_TIMEOUT_MS = void 0;
     exports2.clearTimers = clearTimers;
     exports2.killProcess = killProcess;
     var logger_12 = require_logger();
     exports2.IDLE_TIMEOUT_MS = 6e5;
+    exports2.GENERATING_IDLE_TIMEOUT_MS = 18e4;
     exports2.IDLE_CHECK_INTERVAL_MS = 15e3;
     var KILL_GRACE_PERIOD_MS = 5e3;
     exports2.MAX_STARTS_WITHOUT_FINISH = 3;
@@ -16825,6 +16853,8 @@ var require_process_handlers = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.setupTotalTimeout = setupTotalTimeout;
+    exports2.trackToolActivity = trackToolActivity;
+    exports2.idleBudgetMs = idleBudgetMs;
     exports2.setupIdleWatchdog = setupIdleWatchdog;
     exports2.trackTurnProgress = trackTurnProgress;
     exports2.setupStdoutHandler = setupStdoutHandler;
@@ -16834,6 +16864,7 @@ var require_process_handlers = __commonJS({
     var parser_1 = require_parser();
     var config_12 = require_config();
     var ditto_codegen_types_12 = require_dist4();
+    var subagent_tool_logger_1 = require_subagent_tool_logger();
     var process_manager_1 = require_process_manager();
     var result_builder_1 = require_result_builder();
     var logger_12 = require_logger();
@@ -16846,15 +16877,43 @@ var require_process_handlers = __commonJS({
         }
       }, config_12.DEFAULT_TIMEOUT_MS);
     }
+    function trackToolActivity(state, event) {
+      if (event.type === subagent_tool_logger_1.TOOL_STARTED_EVENT_TYPE) {
+        state.toolActivitySeen = true;
+        const { callID } = event;
+        if (callID)
+          state.inFlightToolCalls.add(callID);
+        return;
+      }
+      if (event.type === "tool_use" || event.type === subagent_tool_logger_1.SUBAGENT_TOOL_EVENT_TYPE) {
+        const callID = event.part?.callID;
+        if (callID)
+          state.inFlightToolCalls.delete(callID);
+        return;
+      }
+      if (event.type === "step_finish")
+        state.inFlightToolCalls.clear();
+    }
+    function idleBudgetMs(state) {
+      if (!state.toolActivitySeen)
+        return process_manager_1.IDLE_TIMEOUT_MS;
+      return state.inFlightToolCalls.size > 0 ? process_manager_1.IDLE_TIMEOUT_MS : process_manager_1.GENERATING_IDLE_TIMEOUT_MS;
+    }
     function setupIdleWatchdog(ctx) {
       return setInterval(() => {
         if (ctx.state.resolved)
           return;
         const idleTime = Date.now() - ctx.state.lastOutputTime;
-        if (idleTime >= process_manager_1.IDLE_TIMEOUT_MS) {
-          logger_12.logger.warn(`[OpenCode] Process appears stuck - no output for ${Math.round(idleTime / 1e3)}s. Killing process.`);
+        const budget = idleBudgetMs(ctx.state);
+        if (idleTime >= budget) {
+          const seconds = Math.round(idleTime / 1e3);
+          logger_12.logger.warn(`[OpenCode] Process appears stuck - no output for ${seconds}s. Killing process.`, {
+            budgetMs: budget,
+            inFlightToolCalls: ctx.state.inFlightToolCalls.size,
+            toolActivitySeen: ctx.state.toolActivitySeen
+          });
           (0, process_manager_1.killProcess)(ctx.child, ctx.state.resolved);
-          ctx.finalize((0, result_builder_1.createTimeoutResult)(`Process stuck - no output for ${Math.round(idleTime / 1e3)} seconds (idle timeout)`, ctx.state.stdout, ctx.state.stderr, ctx.startTime));
+          ctx.finalize((0, result_builder_1.createTimeoutResult)(`Process stuck - no output for ${seconds} seconds (idle timeout)`, ctx.state.stdout, ctx.state.stderr, ctx.startTime));
         }
       }, process_manager_1.IDLE_CHECK_INTERVAL_MS);
     }
@@ -16881,7 +16940,10 @@ var require_process_handlers = __commonJS({
       } catch {
         logger_12.logger.debug("[OpenCode] stdout", { line: line.slice(0, 200) });
       }
-      if (!event || !trackProgress)
+      if (!event)
+        return null;
+      trackToolActivity(ctx.state, event);
+      if (!trackProgress)
         return null;
       try {
         trackTurnProgress(ctx.state, event);
@@ -17096,7 +17158,9 @@ var require_executor = __commonJS({
           lineBuffer: "",
           lastOutputTime: Date.now(),
           resolved: false,
-          startsWithoutFinish: 0
+          startsWithoutFinish: 0,
+          inFlightToolCalls: /* @__PURE__ */ new Set(),
+          toolActivitySeen: false
         };
         const timers = {
           timeoutId: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.457",
+  "version": "1.0.458",
   "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": "ca4eb489e9a1029b7b98a4af11bfdc27fed6489f43aa896bd4252489"
+  "falconPackageHash": "3e1ee6ac3b0a2480ec489dfc8d1a425a79116fbe0f25a1c75c07a414"
 }