@wix/ditto-codegen-public 1.0.313 → 1.0.315

package/dist/out.js

@@ -12095,7 +12095,8 @@ var require_app_builder = __commonJS({
         { filename: "codegen-instructions.md", content: codegen_rules_1.CODEGEN_RULES }
       ],
       askRules: [{ filename: "ask-instructions.md", content: ask_rules_1.ASK_RULES }],
-      decisionCheckers: [pre_run_decision_1.checkSiteUIDecision]
+      decisionCheckers: [pre_run_decision_1.checkSiteUIDecision],
+      hooks: []
     };
   }
 });
@@ -12113,20 +12114,93 @@ var require_studio_2 = __commonJS({
         { filename: "codegen-instructions.md", content: codegen_rules_1.CODEGEN_RULES }
       ],
       askRules: [{ filename: "ask-instructions.md", content: ask_rules_1.ASK_RULES }],
-      decisionCheckers: []
+      decisionCheckers: [],
+      hooks: []
     };
   }
 });
 
+// dist/environments/hooks/run-hooks.js
+var require_run_hooks = __commonJS({
+  "dist/environments/hooks/run-hooks.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.getActiveHooks = getActiveHooks;
+    exports2.runOnToolUse = runOnToolUse;
+    exports2.runOnFlowEnd = runOnFlowEnd;
+    var logger_12 = require_logger();
+    var job_context_storage_12 = require_job_context_storage();
+    function getActiveHooks() {
+      return job_context_storage_12.jobContextStorage.getStore()?.hooks ?? [];
+    }
+    async function runOnToolUse(hooks, event) {
+      for (const hook of hooks) {
+        if (!hook.onToolUse)
+          continue;
+        try {
+          await hook.onToolUse(event);
+        } catch (error) {
+          logger_12.logger.error("[Hook] onToolUse failed", {
+            hook: hook.name,
+            error: error instanceof Error ? error.message : String(error)
+          });
+        }
+      }
+    }
+    async function runOnFlowEnd(hooks, ctx) {
+      for (const hook of hooks) {
+        if (!hook.onFlowEnd)
+          continue;
+        try {
+          await hook.onFlowEnd(ctx);
+        } catch (hookError) {
+          if (ctx.failed) {
+            logger_12.logger.error("[Hook] onFlowEnd failed after flow failure", {
+              hook: hook.name,
+              error: hookError instanceof Error ? hookError.message : String(hookError)
+            });
+            continue;
+          }
+          throw hookError;
+        }
+      }
+    }
+  }
+});
+
+// dist/environments/hooks/index.js
+var require_hooks = __commonJS({
+  "dist/environments/hooks/index.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.runOnFlowEnd = exports2.runOnToolUse = exports2.getActiveHooks = void 0;
+    var run_hooks_1 = require_run_hooks();
+    Object.defineProperty(exports2, "getActiveHooks", { enumerable: true, get: function() {
+      return run_hooks_1.getActiveHooks;
+    } });
+    Object.defineProperty(exports2, "runOnToolUse", { enumerable: true, get: function() {
+      return run_hooks_1.runOnToolUse;
+    } });
+    Object.defineProperty(exports2, "runOnFlowEnd", { enumerable: true, get: function() {
+      return run_hooks_1.runOnFlowEnd;
+    } });
+  }
+});
+
 // dist/environments/index.js
 var require_environments = __commonJS({
   "dist/environments/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.getActiveHooks = void 0;
     exports2.getCodegenEnvironmentConfig = getCodegenEnvironmentConfig;
     var types_1 = require_types_impl();
     var app_builder_1 = require_app_builder();
     var studio_2_1 = require_studio_2();
+    var hooks_1 = require_hooks();
+    Object.defineProperty(exports2, "getActiveHooks", { enumerable: true, get: function() {
+      return hooks_1.getActiveHooks;
+    } });
     function getCodegenEnvironmentConfig(environment) {
       switch (environment) {
         case types_1.Environment.STUDIO_2:
@@ -12531,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))
@@ -12561,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) {
@@ -12590,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)
@@ -12618,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,
@@ -12640,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;
   }
@@ -12655,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";
@@ -12690,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) {
@@ -12712,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, {
@@ -12774,6 +12903,7 @@ var require_task_tracker = __commonJS({
     var constants_1 = require_constants5();
     var extension_handler_1 = require_extension_handler();
     var category_handler_1 = require_category_handler();
+    var hooks_1 = require_hooks();
     var OpenCodeTaskTracker = class {
       constructor(workingDirectory) {
         this.trackedTasks = /* @__PURE__ */ new Map();
@@ -12830,14 +12960,16 @@ var require_task_tracker = __commonJS({
         const ctx = this.handlerContext;
         await this.categoryHandler.handle(tool, ctx, state);
         this.taskCounter = ctx.taskCounter;
+        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;
@@ -12845,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 }
         }));
@@ -12866,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();
@@ -12888,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", {
@@ -17895,6 +18012,7 @@ var require_opencode_init = __commonJS({
     var pre_run_decision_1 = require_pre_run_decision();
     var experiments_1 = require_experiments();
     var environments_12 = require_environments();
+    var hooks_1 = require_hooks();
     var runOpencodeInitFlow = async (blueprint, history, agentData) => {
       const store = job_context_storage_12.jobContextStorage.getStore();
       if (!store?.jobId || !store?.taskId) {
@@ -17919,6 +18037,7 @@ var require_opencode_init = __commonJS({
         Task_type: kind
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
+      let caughtError;
       try {
         (0, agent_io_1.writeAgentInput)(outputPath, agentData);
         let finalBlueprint = blueprint;
@@ -17967,6 +18086,7 @@ var require_opencode_init = __commonJS({
         });
         logger_12.logger.info("[OpenCode Init] Completed task", { taskId });
       } catch (error) {
+        caughtError = error;
         const codegenError = (0, ditto_codegen_types_2.toCodegenError)(error);
         const agentOutput = (0, agent_io_1.readAgentOutput)(outputPath);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
@@ -17998,6 +18118,11 @@ var require_opencode_init = __commonJS({
           taskId,
           error: error instanceof Error ? error.message : String(error)
         });
+      } finally {
+        await (0, hooks_1.runOnFlowEnd)((0, hooks_1.getActiveHooks)(), {
+          failed: caughtError !== void 0,
+          error: caughtError
+        });
       }
     };
     exports2.runOpencodeInitFlow = runOpencodeInitFlow;
@@ -18073,6 +18198,7 @@ var require_opencode_iterate = __commonJS({
     var logger_12 = require_logger();
     var config_1 = require_config();
     var biEvents_1 = require_biEvents();
+    var hooks_1 = require_hooks();
     var runOpencodeIterateFlow = async (chatHistory, agentData) => {
       const store = job_context_storage_12.jobContextStorage.getStore();
       if (!store?.jobId || !store?.taskId) {
@@ -18097,6 +18223,7 @@ var require_opencode_iterate = __commonJS({
         Task_type: kind
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
+      let caughtError;
       try {
         (0, agent_io_1.writeAgentInput)(outputPath, agentData);
         const iterationOrchestrator = new OpenCodeIterationOrchestrator_1.OpenCodeIterationOrchestrator();
@@ -18132,6 +18259,7 @@ var require_opencode_iterate = __commonJS({
         });
         logger_12.logger.info("[OpenCode Iterate] Completed task", { taskId });
       } catch (error) {
+        caughtError = error;
         const codegenError = (0, ditto_codegen_types_2.toCodegenError)(error);
         const agentOutput = (0, agent_io_1.readAgentOutput)(outputPath);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
@@ -18162,6 +18290,11 @@ var require_opencode_iterate = __commonJS({
           taskId,
           error: error instanceof Error ? error.message : String(error)
         });
+      } finally {
+        await (0, hooks_1.runOnFlowEnd)((0, hooks_1.getActiveHooks)(), {
+          failed: caughtError !== void 0,
+          error: caughtError
+        });
       }
     };
     exports2.runOpencodeIterateFlow = runOpencodeIterateFlow;
@@ -18648,6 +18781,27 @@ async function main(ctx) {
 var getFirstTask = (job) => {
   return job.tasks?.[0];
 };
+function buildHooksForTask(jobId, taskId, kind, payload) {
+  if (kind !== CodeGenService_1.TaskKind.INIT_CODEGEN && kind !== CodeGenService_1.TaskKind.ITERATE_CODEGEN) {
+    return void 0;
+  }
+  const userInput = extractUserInput(kind, payload);
+  return (0, environments_1.getCodegenEnvironmentConfig)().hooks.map((factory) => factory({ projectId: context_1.ctx.projectId, jobId, taskId, kind, userInput }));
+}
+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) {
+    const history = payload.history ?? [];
+    for (let i = history.length - 1; i >= 0; i--) {
+      if (history[i].role === "USER") {
+        return history[i].text.trim() || void 0;
+      }
+    }
+  }
+  return void 0;
+}
 async function processJob(job) {
   if (!job.id) {
     throw new ditto_codegen_types_1.MissingJobIdError();
@@ -18658,14 +18812,15 @@ async function processJob(job) {
     logger_1.logger.warn("[Job] No initial task found, skipping", { jobId });
     return;
   }
-  await job_context_storage_1.jobContextStorage.run({ jobId, taskId: task.id, kind: task.kind }, async () => {
+  const payload = task.payload ?? {};
+  const hooks = buildHooksForTask(jobId, task.id, task.kind, payload);
+  await job_context_storage_1.jobContextStorage.run({ jobId, taskId: task.id, kind: task.kind, hooks }, async () => {
     logger_1.logger.info("[Job] Start processing", { taskKind: task.kind });
     context_1.ctx.setJobStatus(jobId, CodeGenService_1.Status.RUNNING);
     logger_1.logger.info("[Job] Marked job RUNNING", { initTaskId: task.id });
     jobCancellationMonitor.start(jobId);
     jobTimeoutMonitor.start(jobId);
     try {
-      const payload = task.payload ?? {};
       const history = payload.history ?? [];
       const blueprint = payload.blueprint;
       const agentData = payload.agentData;

package/package.json

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