@wix/ditto-codegen-public 1.0.315 → 1.0.317

package/dist/out.js

@@ -10291,6 +10291,50 @@ var require_logger = __commonJS({
   }
 });
 
+// dist/services/wixTokenRefresh.js
+var require_wixTokenRefresh = __commonJS({
+  "dist/services/wixTokenRefresh.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.refreshWixAccessToken = refreshWixAccessToken;
+    var child_process_1 = require("child_process");
+    var util_1 = require("util");
+    var logger_12 = require_logger();
+    var execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
+    var inFlight = null;
+    async function runWixToken() {
+      const { stdout } = await execFileAsync("wix", ["token", "--json"], {
+        timeout: 3e4
+      });
+      const parsed = JSON.parse(stdout);
+      if (!parsed.accessToken) {
+        throw new Error("wix token returned empty accessToken");
+      }
+      return parsed.accessToken;
+    }
+    async function refreshWixAccessToken() {
+      if (inFlight)
+        return inFlight;
+      inFlight = (async () => {
+        logger_12.logger.info("[Auth] Refreshing access token via `wix token`");
+        try {
+          const token = await runWixToken();
+          logger_12.logger.info("[Auth] Access token refreshed");
+          return token;
+        } catch (err) {
+          logger_12.logger.error("[Auth] Failed to refresh access token", {
+            error: err instanceof Error ? err.message : String(err)
+          });
+          throw err;
+        } finally {
+          inFlight = null;
+        }
+      })();
+      return inFlight;
+    }
+  }
+});
+
 // dist/services/CodeGenService.js
 var require_CodeGenService = __commonJS({
   "dist/services/CodeGenService.js"(exports2) {
@@ -10300,6 +10344,7 @@ var require_CodeGenService = __commonJS({
     exports2.createCodeGenErrorHandler = createCodeGenErrorHandler;
     var http_client_1 = require_index_node();
     var http_1 = require_http_impl();
+    var wixTokenRefresh_1 = require_wixTokenRefresh();
     var types_1 = require_types_impl();
     Object.defineProperty(exports2, "Status", { enumerable: true, get: function() {
       return types_1.Status;
@@ -10332,8 +10377,24 @@ var require_CodeGenService = __commonJS({
         this.projectId = projectId;
         this.accessToken = process.env.WIX_ACCESS_TOKEN;
         this.sandboxId = process.env.SANDBOX_ID;
+        this.refreshAccessToken = async () => {
+          const token = await (0, wixTokenRefresh_1.refreshWixAccessToken)();
+          this.setAccessToken(token);
+          return token;
+        };
+        this.request = async (req) => {
+          try {
+            return await this.httpClient.request(this.withAuth(req));
+          } catch (err) {
+            if (!this.isUnauthorized(err))
+              throw err;
+            logger_12.logger.warn("[CodeGenService] 401 received, refreshing token and retrying once");
+            await this.refreshAccessToken();
+            return await this.httpClient.request(this.withAuth(req));
+          }
+        };
         this.fetchPendingJobs = async () => {
-          const resp = await this.httpClient.request((0, http_1.listProjectJobs)({
+          const resp = await this.request((0, http_1.listProjectJobs)({
             projectId: this.projectId
           }));
           const jobs = resp.data?.jobs ?? [];
@@ -10347,7 +10408,7 @@ var require_CodeGenService = __commonJS({
           return true;
         };
         this.markJobAsCompleted = async (jobId) => {
-          await this.httpClient.request((0, http_1.updateJob)({
+          await this.request((0, http_1.updateJob)({
             projectId: this.projectId,
             job: {
               id: jobId,
@@ -10357,7 +10418,7 @@ var require_CodeGenService = __commonJS({
           }));
         };
         this.markJobAsRuninng = async (jobId) => {
-          await this.httpClient.request((0, http_1.updateJob)({
+          await this.request((0, http_1.updateJob)({
             projectId: this.projectId,
             job: {
               id: jobId,
@@ -10367,7 +10428,7 @@ var require_CodeGenService = __commonJS({
           }));
         };
         this.markJobAsCancelled = async (jobId) => {
-          await this.httpClient.request((0, http_1.updateJob)({
+          await this.request((0, http_1.updateJob)({
             projectId: this.projectId,
             job: {
               id: jobId,
@@ -10377,7 +10438,7 @@ var require_CodeGenService = __commonJS({
           }));
         };
         this.updateJob = async (jobId, payload) => {
-          await this.httpClient.request((0, http_1.updateJob)({
+          await this.request((0, http_1.updateJob)({
             projectId: this.projectId,
             job: {
               id: jobId,
@@ -10391,7 +10452,7 @@ var require_CodeGenService = __commonJS({
             jobId,
             status
           });
-          await this.httpClient.request((0, http_1.updateJob)({
+          await this.request((0, http_1.updateJob)({
             projectId: this.projectId,
             job: {
               id: jobId,
@@ -10406,7 +10467,7 @@ var require_CodeGenService = __commonJS({
             decisionId: userDecision.id,
             userDecision: JSON.stringify(userDecision, null, 2)
           });
-          await this.httpClient.request((0, http_1.updateJob)({
+          await this.request((0, http_1.updateJob)({
             projectId: this.projectId,
             job: {
               id: jobId,
@@ -10418,7 +10479,7 @@ var require_CodeGenService = __commonJS({
         };
         this.resumeJobFromDecision = async (jobId) => {
           logger_12.logger.info("Resuming job from user decision");
-          await this.httpClient.request((0, http_1.updateJob)({
+          await this.request((0, http_1.updateJob)({
             projectId: this.projectId,
             job: {
               id: jobId,
@@ -10429,7 +10490,7 @@ var require_CodeGenService = __commonJS({
           }));
         };
         this.updateTask = async (jobId, taskId, status, payload) => {
-          await this.httpClient.request((0, http_1.updateTask)({
+          await this.request((0, http_1.updateTask)({
             projectId: this.projectId,
             jobId,
             task: {
@@ -10440,7 +10501,7 @@ var require_CodeGenService = __commonJS({
           }));
         };
         this.addTask = async (jobId, task) => {
-          await this.httpClient.request((0, http_1.createTask)({
+          await this.request((0, http_1.createTask)({
             projectId: this.projectId,
             jobId,
             task: {
@@ -10455,7 +10516,7 @@ var require_CodeGenService = __commonJS({
           }));
         };
         this.getJob = async (jobId) => {
-          const resp = await this.httpClient.request((0, http_1.getJob)({
+          const resp = await this.request((0, http_1.getJob)({
             projectId: this.projectId,
             jobId
           }));
@@ -10468,12 +10529,32 @@ var require_CodeGenService = __commonJS({
         const serverUrl = process.env.CODEGEN_SERVER_BASE_URL || "https://manage.wix.com";
         this.httpClient = (0, http_client_1.createHttpClient)({
           baseURL: serverUrl,
-          headers: {
-            authorization: `Bearer ${this.accessToken}`
-          },
           errorHandler: createCodeGenErrorHandler(() => this.httpClient)
         });
       }
+      getAccessToken() {
+        return this.accessToken;
+      }
+      setAccessToken(token) {
+        this.accessToken = token;
+      }
+      isUnauthorized(error) {
+        if (!http_client_1.HttpClient.isHttpError(error))
+          return false;
+        if (this.httpClient.isCancel(error))
+          return false;
+        return error.response?.status === 401;
+      }
+      withAuth(req) {
+        const authHeader = { authorization: `Bearer ${this.accessToken}` };
+        if (typeof req === "function") {
+          return (ctx) => {
+            const r = req(ctx);
+            return { ...r, headers: { ...r.headers ?? {}, ...authHeader } };
+          };
+        }
+        return { ...req, headers: { ...req.headers ?? {}, ...authHeader } };
+      }
     };
     exports2.CodeGenService = CodeGenService;
   }
@@ -12221,6 +12302,7 @@ var require_config = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.DEFAULT_MODEL = exports2.DEFAULT_TIMEOUT_MS = void 0;
     exports2.getAnthropicBaseUrl = getAnthropicBaseUrl;
+    exports2.setCurrentAccessToken = setCurrentAccessToken;
     exports2.getOpenCodeEnv = getOpenCodeEnv;
     var os_1 = require("os");
     var constants_1 = require_constants5();
@@ -12236,9 +12318,13 @@ var require_config = __commonJS({
       }
       return `${AI_PROXY_BASE_URL}/projects/${projectId}/anthropic`;
     }
+    var currentAccessToken = process.env.WIX_ACCESS_TOKEN;
+    function setCurrentAccessToken(token) {
+      currentAccessToken = token;
+      process.env.WIX_ACCESS_TOKEN = token;
+    }
     function getProviderConfig() {
-      const accessToken = process.env.WIX_ACCESS_TOKEN;
-      const headers = accessToken ? { Authorization: `Bearer ${accessToken}` } : {};
+      const headers = currentAccessToken ? { Authorization: `Bearer ${currentAccessToken}` } : {};
       return {
         anthropic: {
           options: {
@@ -12640,6 +12726,7 @@ var require_extension_handler = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ExtensionTaskHandler = void 0;
     exports2.buildExtensionTaskPayload = buildExtensionTaskPayload;
+    var crypto_12 = require("crypto");
     var promises_1 = require("fs/promises");
     var path_1 = require("path");
     var ditto_codegen_types_12 = require_dist4();
@@ -12727,8 +12814,7 @@ var require_extension_handler = __commonJS({
         const extensionName = (0, constants_1.extractExtensionName)(originalPath);
         const description = `Creating ${extensionName} ${extensionType}`;
         const extensionKey = `ext-${normalizedPath}`;
-        ctx.taskCounter++;
-        const taskId = `${jobContext.taskId}-ext-${ctx.taskCounter}`;
+        const taskId = (0, crypto_12.randomUUID)();
         const extensionFolder = normalizedPath.substring(0, normalizedPath.lastIndexOf("/") + 1);
         const tracked = {
           taskId,
@@ -12778,6 +12864,7 @@ var require_category_handler = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.CategoryTaskHandler = void 0;
+    var crypto_12 = require("crypto");
     var ditto_codegen_types_12 = require_dist4();
     var codeGenerationService_12 = require_codeGenerationService();
     var logger_12 = require_logger();
@@ -12842,7 +12929,7 @@ var require_category_handler = __commonJS({
           return;
         await (0, init_task_1.completeInitTask)(ctx);
         const description = CATEGORY_DESCRIPTIONS[key];
-        const taskId = `${jobContext.taskId}-${key}`;
+        const taskId = (0, crypto_12.randomUUID)();
         ctx.trackedTasks.set(key, {
           taskId,
           description,
@@ -12880,7 +12967,8 @@ var require_category_handler = __commonJS({
           });
         } catch (error) {
           logger_12.logger.error("[OpenCode] Failed to mark category task as completed", {
-            error: error instanceof Error ? error.message : String(error)
+            error: error instanceof Error ? error.message : String(error),
+            taskId: tracked.taskId
           });
         }
       }
@@ -12907,7 +12995,6 @@ var require_task_tracker = __commonJS({
     var OpenCodeTaskTracker = class {
       constructor(workingDirectory) {
         this.trackedTasks = /* @__PURE__ */ new Map();
-        this.taskCounter = 0;
         this.collectedFiles = [];
         this.skillsUsed = /* @__PURE__ */ new Set();
         this.extensionHandler = new extension_handler_1.ExtensionTaskHandler();
@@ -12933,7 +13020,6 @@ var require_task_tracker = __commonJS({
           store: this.store,
           trackedTasks: this.trackedTasks,
           collectedFiles: this.collectedFiles,
-          taskCounter: this.taskCounter,
           workingDirectory: this.workingDirectory
         };
       }
@@ -12959,7 +13045,6 @@ 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) {
@@ -12972,7 +13057,6 @@ var require_task_tracker = __commonJS({
           }
           const ctx = this.handlerContext;
           await this.extensionHandler.handle(effectiveTool, fileState, ctx);
-          this.taskCounter = ctx.taskCounter;
         }
       }
       expandBatchWrite(state) {
@@ -13190,18 +13274,18 @@ var require_process_handlers = __commonJS({
     exports2.setupCloseHandler = setupCloseHandler;
     exports2.setupErrorHandler = setupErrorHandler;
     var parser_1 = require_parser();
-    var config_1 = require_config();
+    var config_12 = require_config();
     var process_manager_1 = require_process_manager();
     var result_builder_1 = require_result_builder();
     var logger_12 = require_logger();
     function setupTotalTimeout(ctx) {
       return setTimeout(() => {
         if (ctx.child && !ctx.state.resolved) {
-          logger_12.logger.warn(`[OpenCode] Process timed out after ${config_1.DEFAULT_TIMEOUT_MS}ms (total timeout)`);
+          logger_12.logger.warn(`[OpenCode] Process timed out after ${config_12.DEFAULT_TIMEOUT_MS}ms (total timeout)`);
           (0, process_manager_1.killProcess)(ctx.child, ctx.state.resolved);
-          ctx.finalize((0, result_builder_1.createTimeoutResult)(`Process timed out after ${config_1.DEFAULT_TIMEOUT_MS}ms`, ctx.state.stdout, ctx.state.stderr, ctx.startTime));
+          ctx.finalize((0, result_builder_1.createTimeoutResult)(`Process timed out after ${config_12.DEFAULT_TIMEOUT_MS}ms`, ctx.state.stdout, ctx.state.stderr, ctx.startTime));
         }
-      }, config_1.DEFAULT_TIMEOUT_MS);
+      }, config_12.DEFAULT_TIMEOUT_MS);
     }
     function setupIdleWatchdog(ctx) {
       return setInterval(() => {
@@ -13276,7 +13360,7 @@ var require_executor = __commonJS({
     exports2.executeOpenCode = executeOpenCode;
     var child_process_1 = require("child_process");
     var ditto_codegen_types_12 = require_dist4();
-    var config_1 = require_config();
+    var config_12 = require_config();
     var job_context_storage_12 = require_job_context_storage();
     var parser_1 = require_parser();
     var prompts_1 = require_prompts();
@@ -13343,7 +13427,7 @@ var require_executor = __commonJS({
     }
     async function logOpenCodeStats(options) {
       const isAsk = job_context_storage_12.jobContextStorage.getStore()?.kind === ditto_codegen_types_12.TaskKind.ASK_CODEGEN;
-      const env = (0, config_1.getOpenCodeEnv)(options.projectId, isAsk);
+      const env = (0, config_12.getOpenCodeEnv)(options.projectId, isAsk);
       const stats = await (0, cost_tracker_1.fetchOpenCodeStats)(options.outputPath, env);
       if (stats) {
         console.log("[OpenCode] Stats\n", stats);
@@ -13399,7 +13483,7 @@ var require_executor = __commonJS({
             workingDirectory: outputPath
           });
           const isAsk = job_context_storage_12.jobContextStorage.getStore()?.kind === ditto_codegen_types_12.TaskKind.ASK_CODEGEN;
-          const env = (0, config_1.getOpenCodeEnv)(projectId, isAsk);
+          const env = (0, config_12.getOpenCodeEnv)(projectId, isAsk);
           ctx.child = (0, child_process_1.spawn)("opencode", args, {
             cwd: outputPath,
             env,
@@ -18007,7 +18091,7 @@ var require_opencode_init = __commonJS({
     var ditto_codegen_types_2 = require_dist4();
     var context_12 = require_context();
     var logger_12 = require_logger();
-    var config_1 = require_config();
+    var config_12 = require_config();
     var biEvents_1 = require_biEvents();
     var pre_run_decision_1 = require_pre_run_decision();
     var experiments_1 = require_experiments();
@@ -18033,7 +18117,7 @@ var require_opencode_init = __commonJS({
       logger_12.logger.info("[OpenCode Init] Marked task RUNNING", { taskId });
       (0, biEvents_1.reportSessionStart)({
         ...biBaseParams,
-        Task_model: config_1.DEFAULT_MODEL,
+        Task_model: config_12.DEFAULT_MODEL,
         Task_type: kind
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
@@ -18071,7 +18155,7 @@ var require_opencode_init = __commonJS({
         }
         (0, biEvents_1.reportSessionEnd)({
           ...biBaseParams,
-          Task_model: config_1.DEFAULT_MODEL,
+          Task_model: config_12.DEFAULT_MODEL,
           Task_type: kind,
           Task_cost: Math.round(result.usage.cost * 1e6),
           Task_status: ditto_codegen_types_12.Status.COMPLETED,
@@ -18098,13 +18182,13 @@ var require_opencode_init = __commonJS({
         await (0, codegen_flow_helpers_12.updateParentTaskStatus)(localJobContext, ditto_codegen_types_12.Status.FAILED, codegenError);
         (0, biEvents_1.reportSessionEnd)({
           ...biBaseParams,
-          Task_model: config_1.DEFAULT_MODEL,
+          Task_model: config_12.DEFAULT_MODEL,
           Task_type: kind,
           Task_status: ditto_codegen_types_12.Status.FAILED
         });
         (0, biEvents_1.reportSessionError)({
           ...biBaseParams,
-          task_model: config_1.DEFAULT_MODEL,
+          task_model: config_12.DEFAULT_MODEL,
           task_type: kind,
           Agent_output: JSON.stringify(codegenError),
           Error_desc: codegenError.errorType,
@@ -18196,7 +18280,7 @@ var require_opencode_iterate = __commonJS({
     var ditto_codegen_types_2 = require_dist4();
     var context_12 = require_context();
     var logger_12 = require_logger();
-    var config_1 = require_config();
+    var config_12 = require_config();
     var biEvents_1 = require_biEvents();
     var hooks_1 = require_hooks();
     var runOpencodeIterateFlow = async (chatHistory, agentData) => {
@@ -18219,7 +18303,7 @@ var require_opencode_iterate = __commonJS({
       logger_12.logger.info("[OpenCode Iterate] Marked task RUNNING", { taskId });
       (0, biEvents_1.reportSessionStart)({
         ...biBaseParams,
-        Task_model: config_1.DEFAULT_MODEL,
+        Task_model: config_12.DEFAULT_MODEL,
         Task_type: kind
       });
       const outputPath = (0, codegen_flow_helpers_12.getOutputPath)();
@@ -18249,7 +18333,7 @@ var require_opencode_iterate = __commonJS({
         });
         (0, biEvents_1.reportSessionEnd)({
           ...biBaseParams,
-          Task_model: config_1.DEFAULT_MODEL,
+          Task_model: config_12.DEFAULT_MODEL,
           Task_type: kind,
           Task_cost: Math.round(result.usage.cost * 1e6),
           Task_status: ditto_codegen_types_12.Status.COMPLETED,
@@ -18270,13 +18354,13 @@ var require_opencode_iterate = __commonJS({
         await (0, codegen_flow_helpers_12.updateParentTaskStatus)(localJobContext, ditto_codegen_types_12.Status.FAILED, codegenError);
         (0, biEvents_1.reportSessionEnd)({
           ...biBaseParams,
-          Task_model: config_1.DEFAULT_MODEL,
+          Task_model: config_12.DEFAULT_MODEL,
           Task_type: kind,
           Task_status: ditto_codegen_types_12.Status.FAILED
         });
         (0, biEvents_1.reportSessionError)({
           ...biBaseParams,
-          task_model: config_1.DEFAULT_MODEL,
+          task_model: config_12.DEFAULT_MODEL,
           task_type: kind,
           Agent_output: JSON.stringify(codegenError),
           Error_desc: codegenError.errorType,
@@ -18366,7 +18450,7 @@ var require_opencode_ask = __commonJS({
     var ditto_codegen_types_2 = require_dist4();
     var context_12 = require_context();
     var logger_12 = require_logger();
-    var config_1 = require_config();
+    var config_12 = require_config();
     var biEvents_1 = require_biEvents();
     var runOpencodeAskFlow = async (chatHistory) => {
       const store = job_context_storage_12.jobContextStorage.getStore();
@@ -18388,7 +18472,7 @@ var require_opencode_ask = __commonJS({
       logger_12.logger.info("[OpenCode Ask] Marked task RUNNING", { taskId });
       (0, biEvents_1.reportSessionStart)({
         ...biBaseParams,
-        Task_model: config_1.DEFAULT_MODEL,
+        Task_model: config_12.DEFAULT_MODEL,
         Task_type: kind
       });
       try {
@@ -18407,7 +18491,7 @@ var require_opencode_ask = __commonJS({
         });
         (0, biEvents_1.reportSessionEnd)({
           ...biBaseParams,
-          Task_model: config_1.DEFAULT_MODEL,
+          Task_model: config_12.DEFAULT_MODEL,
           Task_type: kind,
           Task_cost: Math.round(result.usage.cost * 1e6),
           Task_status: ditto_codegen_types_12.Status.COMPLETED,
@@ -18419,13 +18503,13 @@ var require_opencode_ask = __commonJS({
         await (0, codegen_flow_helpers_12.updateParentTaskStatus)(localJobContext, ditto_codegen_types_12.Status.FAILED, codegenError);
         (0, biEvents_1.reportSessionEnd)({
           ...biBaseParams,
-          Task_model: config_1.DEFAULT_MODEL,
+          Task_model: config_12.DEFAULT_MODEL,
           Task_type: kind,
           Task_status: ditto_codegen_types_12.Status.FAILED
         });
         (0, biEvents_1.reportSessionError)({
           ...biBaseParams,
-          task_model: config_1.DEFAULT_MODEL,
+          task_model: config_12.DEFAULT_MODEL,
           task_type: kind,
           Agent_output: JSON.stringify(codegenError),
           Error_desc: codegenError.errorType,
@@ -18713,6 +18797,7 @@ var logger_1 = require_logger();
 var skills_installer_1 = require_skills_installer();
 var rules_writer_1 = require_rules_writer();
 var tools_writer_1 = require_tools_writer();
+var config_1 = require_config();
 var environments_1 = require_environments();
 var sessionId = process.env.CODEGEN_SESSION_ID || (0, crypto_1.randomUUID)();
 process.env.CODEGEN_SESSION_ID = sessionId;
@@ -18745,6 +18830,8 @@ var alwaysOnLoop = async () => {
       }
       const jobId = job.id;
       logger_1.logger.info("[Loop] Selected job", { jobId });
+      const freshToken = await codeGenerationService_1.codeGenerationService.refreshAccessToken();
+      (0, config_1.setCurrentAccessToken)(freshToken);
       await codeGenerationService_1.codeGenerationService.markJobAsRuninng(jobId);
       await processJob(job);
       await codeGenerationService_1.codeGenerationService.markJobAsCompleted(jobId);

package/package.json

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