@wix/ditto-codegen-public 1.0.314 → 1.0.315

package/dist/out.js

@@ -12605,26 +12605,69 @@ var require_cost_tracker = __commonJS({
   }
 });
 
+// dist/opencode-integration/task-tracker/init-task.js
+var require_init_task = __commonJS({
+  "dist/opencode-integration/task-tracker/init-task.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.completeInitTask = completeInitTask;
+    var ditto_codegen_types_12 = require_dist4();
+    var codeGenerationService_12 = require_codeGenerationService();
+    var logger_12 = require_logger();
+    async function completeInitTask(ctx) {
+      const { store } = ctx;
+      if (store?.isCompleted || store?.kind !== ditto_codegen_types_12.TaskKind.INIT_CODEGEN)
+        return;
+      if (!store.jobId || !store.taskId)
+        return;
+      store.isCompleted = true;
+      try {
+        await codeGenerationService_12.codeGenerationService.updateTask(store.jobId, store.taskId, ditto_codegen_types_12.Status.COMPLETED, {});
+        logger_12.logger.info("[OpenCode] Completed init task before sub-tasks");
+      } catch (error) {
+        logger_12.logger.error("[OpenCode] Failed to complete init task", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+    }
+  }
+});
+
 // dist/opencode-integration/task-tracker/extension-handler.js
 var require_extension_handler = __commonJS({
   "dist/opencode-integration/task-tracker/extension-handler.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ExtensionTaskHandler = void 0;
+    exports2.buildExtensionTaskPayload = buildExtensionTaskPayload;
     var promises_1 = require("fs/promises");
     var path_1 = require("path");
     var ditto_codegen_types_12 = require_dist4();
     var codeGenerationService_12 = require_codeGenerationService();
     var logger_12 = require_logger();
     var constants_1 = require_constants5();
+    var init_task_1 = require_init_task();
+    function buildExtensionTaskPayload(tracked, collectedFiles) {
+      if (!tracked.extensionFolder)
+        return {};
+      const extensionFiles = collectedFiles.filter((f) => f.path.startsWith(tracked.extensionFolder));
+      return {
+        taskOutput: {
+          files: extensionFiles.map((f) => ({
+            path: f.path,
+            operation: f.operation
+          }))
+        }
+      };
+    }
     var ExtensionTaskHandler = class {
       constructor() {
-        this.extensionTasksCreated = /* @__PURE__ */ new Map();
+        this.extensionTypesByPath = /* @__PURE__ */ new Map();
       }
       getExtensionTypesCreated() {
-        return Array.from(this.extensionTasksCreated.values());
+        return Array.from(this.extensionTypesByPath.values());
       }
-      /** Inspects a write/edit event; if it targets an extension file, creates a tracked sub-task. */
+      /** Inspects a write/edit event; creates a RUNNING sub-task on first sight, completes on the completed event. */
       async handle(tool, state, ctx) {
         const filePath = state.input?.filePath || state.title || "";
         if (!(0, constants_1.isExtensionsFile)(filePath))
@@ -12635,13 +12678,25 @@ var require_extension_handler = __commonJS({
         const extension = (0, constants_1.detectExtension)(content);
         if (!extension)
           return;
-        await this.ensureCreatedBy(filePath, ctx.workingDirectory);
         const normalizedPath = (0, constants_1.normalizeFilePath)(filePath);
-        if (this.extensionTasksCreated.has(normalizedPath))
+        const isCompleted = state.status === "completed";
+        if (isCompleted) {
+          await this.ensureCreatedBy(filePath, ctx.workingDirectory);
+        }
+        if (!this.extensionTypesByPath.has(normalizedPath)) {
+          this.extensionTypesByPath.set(normalizedPath, extension.extensionType);
+          await (0, init_task_1.completeInitTask)(ctx);
+          await this.createExtensionTask(normalizedPath, extension.label, filePath, ctx);
+        }
+        if (!isCompleted)
+          return;
+        const tracked = ctx.trackedTasks.get(`ext-${normalizedPath}`);
+        if (!tracked || tracked.status !== ditto_codegen_types_12.Status.RUNNING)
+          return;
+        const jobContext = ctx.getJobContext();
+        if (!jobContext)
           return;
-        this.extensionTasksCreated.set(normalizedPath, extension.extensionType);
-        await this.completeInitTask(ctx);
-        await this.createExtensionTask(normalizedPath, extension.label, filePath, ctx);
+        await this.completeExtensionTask(tracked, jobContext.jobId, ctx);
       }
       /** Reads an extension file from disk and injects createdBy if missing. */
       async ensureCreatedBy(filePath, workingDirectory) {
@@ -12664,24 +12719,7 @@ var require_extension_handler = __commonJS({
           });
         }
       }
-      /** Completes the INIT_CODEGEN task once the extension tasks are created. */
-      async completeInitTask(ctx) {
-        const { store } = ctx;
-        if (store?.isCompleted || store?.kind !== ditto_codegen_types_12.TaskKind.INIT_CODEGEN)
-          return;
-        if (!store.jobId || !store.taskId)
-          return;
-        store.isCompleted = true;
-        try {
-          await codeGenerationService_12.codeGenerationService.updateTask(store.jobId, store.taskId, ditto_codegen_types_12.Status.COMPLETED, {});
-          logger_12.logger.info("[OpenCode] Completed init task before extension tasks");
-        } catch (error) {
-          logger_12.logger.error("[OpenCode] Failed to complete init task", {
-            error: error instanceof Error ? error.message : String(error)
-          });
-        }
-      }
-      /** Registers a new RUNNING sub-task in the job service for a detected extension. */
+      /** Registers a RUNNING sub-task in the job service for a detected extension. */
       async createExtensionTask(normalizedPath, extensionType, originalPath, ctx) {
         const jobContext = ctx.getJobContext();
         if (!jobContext)
@@ -12692,12 +12730,13 @@ var require_extension_handler = __commonJS({
         ctx.taskCounter++;
         const taskId = `${jobContext.taskId}-ext-${ctx.taskCounter}`;
         const extensionFolder = normalizedPath.substring(0, normalizedPath.lastIndexOf("/") + 1);
-        ctx.trackedTasks.set(extensionKey, {
+        const tracked = {
           taskId,
           description,
           status: ditto_codegen_types_12.Status.RUNNING,
           extensionFolder
-        });
+        };
+        ctx.trackedTasks.set(extensionKey, tracked);
         try {
           await codeGenerationService_12.codeGenerationService.addTask(jobContext.jobId, {
             id: taskId,
@@ -12714,6 +12753,20 @@ var require_extension_handler = __commonJS({
           });
         }
       }
+      /** Marks the extension task COMPLETED with the file list collected so far for its folder. */
+      async completeExtensionTask(tracked, jobId, ctx) {
+        tracked.status = ditto_codegen_types_12.Status.COMPLETED;
+        try {
+          await codeGenerationService_12.codeGenerationService.updateTask(jobId, tracked.taskId, ditto_codegen_types_12.Status.COMPLETED, buildExtensionTaskPayload(tracked, ctx.collectedFiles));
+          logger_12.logger.info("[OpenCode] Completed extension task", {
+            description: tracked.description
+          });
+        } catch (error) {
+          logger_12.logger.error("[OpenCode] Failed to complete extension task", {
+            error: error instanceof Error ? error.message : String(error)
+          });
+        }
+      }
     };
     exports2.ExtensionTaskHandler = ExtensionTaskHandler;
   }
@@ -12729,6 +12782,7 @@ var require_category_handler = __commonJS({
     var codeGenerationService_12 = require_codeGenerationService();
     var logger_12 = require_logger();
     var constants_1 = require_constants5();
+    var init_task_1 = require_init_task();
     var CategoryKey;
     (function(CategoryKey2) {
       CategoryKey2["CodeSearch"] = "code-search";
@@ -12764,10 +12818,10 @@ var require_category_handler = __commonJS({
           await this.track(CategoryKey.RunCommands, ctx, state);
         }
         if (tool === "validate") {
-          await this.track(CategoryKey.Validate, ctx, state);
+          await this.track(CategoryKey.Validate, ctx);
         }
         if (constants_1.WRITE_TOOLS.has(tool)) {
-          await this.track(CategoryKey.WriteCode, ctx);
+          await this.track(CategoryKey.WriteCode, ctx, state);
         }
       }
       async trackLoadSkill(ctx, state) {
@@ -12786,6 +12840,7 @@ var require_category_handler = __commonJS({
         const jobContext = ctx.getJobContext();
         if (!jobContext)
           return;
+        await (0, init_task_1.completeInitTask)(ctx);
         const description = CATEGORY_DESCRIPTIONS[key];
         const taskId = `${jobContext.taskId}-${key}`;
         ctx.trackedTasks.set(key, {
@@ -12908,12 +12963,13 @@ var require_task_tracker = __commonJS({
         await (0, hooks_1.runOnToolUse)((0, hooks_1.getActiveHooks)(), { tool, state });
       }
       async handleWriteEvent(tool, state) {
-        if (state.status !== "completed")
-          return;
+        const isCompleted = state.status === "completed";
         const fileStates = tool === "batch-write" ? this.expandBatchWrite(state) : [state];
         const effectiveTool = tool === "batch-write" ? "write" : tool;
         for (const fileState of fileStates) {
-          this.trackFileChange(effectiveTool, fileState);
+          if (isCompleted) {
+            this.trackFileChange(effectiveTool, fileState);
+          }
           const ctx = this.handlerContext;
           await this.extensionHandler.handle(effectiveTool, fileState, ctx);
           this.taskCounter = ctx.taskCounter;
@@ -12921,7 +12977,7 @@ var require_task_tracker = __commonJS({
       }
       expandBatchWrite(state) {
         return (state.input?.files ?? []).map((f) => ({
-          status: "completed",
+          status: state.status,
           input: { filePath: f.path, content: f.content },
           metadata: { exists: false }
         }));
@@ -12942,21 +12998,6 @@ var require_task_tracker = __commonJS({
         logger_12.logger.info("[OpenCode] Loaded skill", { skillName });
         await this.categoryHandler.trackLoadSkill(this.handlerContext, state);
       }
-      /** Builds the task completion payload — includes file list for extension tasks. */
-      buildTaskPayload(tracked) {
-        if (tracked.extensionFolder) {
-          const extensionFiles = this.collectedFiles.filter((f) => f.path.startsWith(tracked.extensionFolder));
-          return {
-            taskOutput: {
-              files: extensionFiles.map((f) => ({
-                path: f.path,
-                operation: f.operation
-              }))
-            }
-          };
-        }
-        return {};
-      }
       /** Marks all still-running tracked tasks as COMPLETED (called on successful process exit). */
       async completeRemainingTasks() {
         const jobContext = this.getJobContext();
@@ -12964,7 +13005,7 @@ var require_task_tracker = __commonJS({
           return;
         for (const [, tracked] of this.trackedTasks) {
           if (tracked.status === ditto_codegen_types_12.Status.RUNNING) {
-            const payload = this.buildTaskPayload(tracked);
+            const payload = (0, extension_handler_1.buildExtensionTaskPayload)(tracked, this.collectedFiles);
             try {
               await codeGenerationService_12.codeGenerationService.updateTask(jobContext.jobId, tracked.taskId, ditto_codegen_types_12.Status.COMPLETED, payload);
               logger_12.logger.info("[OpenCode] Completed task", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.314",
+  "version": "1.0.315",
   "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": "d9b12ec21f21078ba1ac9393765773db4870fefd00a8a85fc542cd50"
+  "falconPackageHash": "a729cdb06df2c35379619880dc60336a5505a5a382a7b737b17b1c05"
 }