@wix/ditto-codegen-public 1.0.438 → 1.0.440

package/dist/out.js

@@ -1821,7 +1821,7 @@ var require_headers = __commonJS({
     exports2.isWixDomain = exports2.composeHeaders = exports2.requestIdOrEmptyString = void 0;
     var tslib_1 = (init_tslib_es6(), __toCommonJS(tslib_es6_exports));
     var headers_1 = require_cjs();
-    var utils_1 = require_utils2();
+    var utils_12 = require_utils2();
     var whitelist_json_1 = tslib_1.__importDefault(require_whitelist());
     function requestIdOrEmptyString(response) {
       var _a;
@@ -1834,11 +1834,11 @@ var require_headers = __commonJS({
     };
     exports2.composeHeaders = composeHeaders;
     function isWixDomain(url) {
-      const isRelative = !(0, utils_1.isAbsoluteUrl)(url);
+      const isRelative = !(0, utils_12.isAbsoluteUrl)(url);
       if (isRelative) {
         return true;
       }
-      const host = `.${(0, utils_1.extractHost)(url)}`;
+      const host = `.${(0, utils_12.extractHost)(url)}`;
       const isWhitelisted = whitelist_json_1.default.find((wixHost) => host.endsWith(`.${wixHost}`));
       return !!isWhitelisted;
     }
@@ -5359,7 +5359,7 @@ var require_options = __commonJS({
     exports2.getUrlHeaders = exports2.buildAllHeaders = exports2.buildOptions = void 0;
     var constants_1 = require_constants();
     var headers_1 = require_headers();
-    var utils_1 = require_utils2();
+    var utils_12 = require_utils2();
     var buildOptions = ({ requestOptions, urlObject, headers, globalConfig = {
       httpMockServer: {
         enabled: false
@@ -5408,8 +5408,8 @@ var require_options = __commonJS({
       const { host, protocol } = urlObject;
       const originalUrlHeader = globalConfig.httpMockServer.enabled ? {
         [constants_1.ORIGINAL_URL_HEADER]: buildUrlFromRequest(url, params),
-        [constants_1.ORIGINAL_HOST_HEADER]: (0, utils_1.isAbsoluteUrl)(url) ? (0, utils_1.extractHost)(url) : host,
-        [constants_1.ORIGINAL_PROTOCOL_HEADER]: (0, utils_1.isAbsoluteUrl)(url) ? (0, utils_1.extractProtocol)(url) : protocol
+        [constants_1.ORIGINAL_HOST_HEADER]: (0, utils_12.isAbsoluteUrl)(url) ? (0, utils_12.extractHost)(url) : host,
+        [constants_1.ORIGINAL_PROTOCOL_HEADER]: (0, utils_12.isAbsoluteUrl)(url) ? (0, utils_12.extractProtocol)(url) : protocol
       } : {};
       return originalUrlHeader;
     };
@@ -5418,7 +5418,7 @@ var require_options = __commonJS({
       if (globalConfig.httpMockServer.enabled) {
         const mockUrl = new URL(globalConfig.httpMockServer.mockServerUrl);
         return {
-          url: (0, utils_1.changeHost)(url, mockUrl.host)
+          url: (0, utils_12.changeHost)(url, mockUrl.host)
         };
       }
       return {};
@@ -5427,7 +5427,7 @@ var require_options = __commonJS({
       const { pathname, searchParams } = new URL(url, "http://unused.com");
       requestParams = requestParams || searchParams;
       if (requestParams) {
-        const params = (0, utils_1.toSearchQueryParams)(requestParams) || requestParams.toString();
+        const params = (0, utils_12.toSearchQueryParams)(requestParams) || requestParams.toString();
         const paramsAsString = params ? `?${params}` : "";
         return `${pathname}${paramsAsString}`;
       }
@@ -5469,7 +5469,7 @@ var require_http_client = __commonJS({
     var error_1 = require_error();
     var headers_1 = require_headers();
     var options_1 = require_options();
-    var utils_1 = require_utils2();
+    var utils_12 = require_utils2();
     var HttpClient = class {
       constructor(opts = {}) {
         this.opts = opts;
@@ -5487,8 +5487,8 @@ var require_http_client = __commonJS({
       }
       async request(requestOptionsOrFactory, overrides) {
         var _a, _b;
-        const host = (0, utils_1.resolveHost)(this.opts);
-        const protocol = (0, utils_1.resolveProtocol)(this.opts);
+        const host = (0, utils_12.resolveHost)(this.opts);
+        const protocol = (0, utils_12.resolveProtocol)(this.opts);
         const urlObject = { protocol, host };
         const requestOptions = typeof requestOptionsOrFactory === "function" ? requestOptionsOrFactory({ isSSR: this.opts.isSSR, host }) : requestOptionsOrFactory;
         const signedInstance = (overrides === null || overrides === void 0 ? void 0 : overrides.signedInstance) || await ((_b = (_a = this.opts).getAppToken) === null || _b === void 0 ? void 0 : _b.call(_a)) || "";
@@ -5497,7 +5497,7 @@ var require_http_client = __commonJS({
           requestOptions,
           urlObject,
           headers,
-          globalConfig: (0, utils_1.getGlobalConfig)()
+          globalConfig: (0, utils_12.getGlobalConfig)()
         });
         if (this.opts.isSSR) {
           options.baseURL = this.opts.baseURL ? this.opts.baseURL : `${constants_1.SSR_PROTOCOL}://${constants_1.SSR_HOST}`;
@@ -5567,22 +5567,22 @@ var require_http_client = __commonJS({
           multilingualOptions: this.opts.multilingualOptions,
           currency: (_b = (_a = this.opts).getCurrency) === null || _b === void 0 ? void 0 : _b.call(_a)
         };
-        return (0, options_1.buildAllHeaders)(requestOptions, wixHeadersOpts, (0, utils_1.getGlobalConfig)(), urlObject);
+        return (0, options_1.buildAllHeaders)(requestOptions, wixHeadersOpts, (0, utils_12.getGlobalConfig)(), urlObject);
       }
       getCustomHeaders(requestOptions, signedInstance, urlObject) {
         const { url, headers } = requestOptions;
         const authHeader = signedInstance && (0, headers_1.isWixDomain)(url) ? { authorization: signedInstance } : {};
         const customHeaders = this.opts.createHeaders();
-        const originalUrlHeader = (0, options_1.getUrlHeaders)((0, utils_1.getGlobalConfig)(), requestOptions, urlObject);
+        const originalUrlHeader = (0, options_1.getUrlHeaders)((0, utils_12.getGlobalConfig)(), requestOptions, urlObject);
         return Object.assign(Object.assign(Object.assign(Object.assign({}, originalUrlHeader), customHeaders), authHeader), headers);
       }
       handleRequestError(error, requestOptions) {
         const requestError = (0, error_1.createHttpError)(error);
-        (0, utils_1.silent)(() => {
+        (0, utils_12.silent)(() => {
           var _a;
           return (_a = requestOptions.onError) === null || _a === void 0 ? void 0 : _a.call(requestOptions, requestError);
         });
-        (0, utils_1.silent)(() => {
+        (0, utils_12.silent)(() => {
           var _a;
           return (_a = this.opts.errorHandler) === null || _a === void 0 ? void 0 : _a.handleError(requestError, {
             requestOptions
@@ -5592,7 +5592,7 @@ var require_http_client = __commonJS({
       }
       maybeFallbackRequest(err, requestOptions, urlObject, signedInstance) {
         var _a, _b, _c;
-        const shouldFallbackRequest = (0, utils_1.isHttpMockServerEnabled)() && (0, utils_1.shouldAllowUnmocked)() && ((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) === 404 && ((_c = (_b = err.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.msg) === constants_1.NO_SCENARIO_FOUND;
+        const shouldFallbackRequest = (0, utils_12.isHttpMockServerEnabled)() && (0, utils_12.shouldAllowUnmocked)() && ((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) === 404 && ((_c = (_b = err.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.msg) === constants_1.NO_SCENARIO_FOUND;
         if (shouldFallbackRequest) {
           const headers = this.getHeaders(requestOptions, signedInstance, urlObject);
           const prodOptions = (0, options_1.buildOptions)({
@@ -5635,10 +5635,10 @@ var require_http_client = __commonJS({
     function transformData(res, requestOptions, flags) {
       let resData = sanitizeResponse(res, flags);
       if (requestOptions._pickResponseBody) {
-        resData = (0, utils_1.extractProp)(res.data, requestOptions._pickResponseBody);
+        resData = (0, utils_12.extractProp)(res.data, requestOptions._pickResponseBody);
       }
       if (requestOptions._logs) {
-        const logs = (0, utils_1.extractProp)(res.data, requestOptions._logs);
+        const logs = (0, utils_12.extractProp)(res.data, requestOptions._logs);
         if (logs === null || logs === void 0 ? void 0 : logs.length) {
           logs.map((log) => console.log(...log));
         }
@@ -11156,6 +11156,19 @@ var require_CodeGenService = __commonJS({
             return job.sandboxId === this.sandboxId;
           return true;
         };
+        this.markJobAsFailed = async (jobId, error) => {
+          logger_12.logger.info("Marking job as failed", { jobId });
+          await this.request((0, http_1.updateJob)({
+            projectId: this.projectId,
+            job: {
+              id: jobId,
+              projectId: this.projectId,
+              status: types_1.Status.FAILED,
+              payload: { error },
+              output: toJobOutput({ error })
+            }
+          }));
+        };
         this.markJobAsCompleted = async (jobId) => {
           await this.request((0, http_1.updateJob)({
             projectId: this.projectId,
@@ -16618,7 +16631,7 @@ var require_plugins_runtime = __commonJS({
     var http_client_1 = require_index_node();
     var job_context_storage_12 = require_job_context_storage();
     var codeGenerationService_12 = require_codeGenerationService();
-    var utils_1 = require_utils9();
+    var utils_12 = require_utils9();
     function getActivePlugins() {
       return job_context_storage_12.jobContextStorage.getStore()?.plugins ?? [];
     }
@@ -16662,7 +16675,7 @@ var require_plugins_runtime = __commonJS({
         const requestId = http_client_1.HttpClient.isHttpError(pluginError) && pluginError.requestId || void 0;
         await codeGenerationService_12.codeGenerationService.handlePluginFailure({
           pluginName,
-          error: (0, utils_1.errorStack)(pluginError),
+          error: (0, utils_12.errorStack)(pluginError),
           requestId,
           jobId: store?.jobId,
           metasiteId: store?.metasiteId,
@@ -17670,7 +17683,7 @@ var require_codegen_flow_helpers = __commonJS({
     var git_file_changes_1 = require_git_file_changes();
     var collect_extensions_created_1 = require_collect_extensions_created();
     var agent_io_1 = require_agent_io();
-    var utils_1 = require_utils9();
+    var utils_12 = require_utils9();
     var DEFAULT_OUTPUT_PATH = "generated-app";
     async function updateJobPayload(jobContext, payload) {
       await codeGenerationService_12.codeGenerationService.updateJob(jobContext.jobId, payload);
@@ -17688,7 +17701,7 @@ var require_codegen_flow_helpers = __commonJS({
     }
     async function updateParentTaskStatus(jobContext, status, error) {
       await codeGenerationService_12.codeGenerationService.updateTask(jobContext.jobId, jobContext.taskId, status, {
-        ...error ? { error: (0, utils_1.serializeError)(error) } : {}
+        ...error ? { error: (0, utils_12.serializeError)(error) } : {}
       });
     }
     function getOutputPath() {
@@ -20455,7 +20468,7 @@ var require_headers2 = __commonJS({
     exports2.isWixDomain = exports2.composeHeaders = exports2.requestIdOrEmptyString = void 0;
     var tslib_1 = (init_tslib_es6(), __toCommonJS(tslib_es6_exports));
     var headers_1 = require_cjs4();
-    var utils_1 = require_utils11();
+    var utils_12 = require_utils11();
     var whitelist_json_1 = tslib_1.__importDefault(require_whitelist2());
     function requestIdOrEmptyString(response) {
       var _a;
@@ -20468,11 +20481,11 @@ var require_headers2 = __commonJS({
     };
     exports2.composeHeaders = composeHeaders;
     function isWixDomain(url) {
-      const isRelative = !(0, utils_1.isAbsoluteUrl)(url);
+      const isRelative = !(0, utils_12.isAbsoluteUrl)(url);
       if (isRelative) {
         return true;
       }
-      const host = `.${(0, utils_1.extractHost)(url)}`;
+      const host = `.${(0, utils_12.extractHost)(url)}`;
       const isWhitelisted = whitelist_json_1.default.find((wixHost) => host.endsWith(`.${wixHost}`));
       return !!isWhitelisted;
     }
@@ -22114,7 +22127,7 @@ var require_options2 = __commonJS({
     exports2.getUrlHeaders = exports2.buildAllHeaders = exports2.buildOptions = void 0;
     var constants_1 = require_constants6();
     var headers_1 = require_headers2();
-    var utils_1 = require_utils11();
+    var utils_12 = require_utils11();
     var buildOptions = ({ requestOptions, urlObject, headers, globalConfig = {
       httpMockServer: {
         enabled: false
@@ -22151,8 +22164,8 @@ var require_options2 = __commonJS({
       const { host, protocol } = urlObject;
       const originalUrlHeader = globalConfig.httpMockServer.enabled ? {
         [constants_1.ORIGINAL_URL_HEADER]: buildUrlFromRequest(url, params),
-        [constants_1.ORIGINAL_HOST_HEADER]: (0, utils_1.isAbsoluteUrl)(url) ? (0, utils_1.extractHost)(url) : host,
-        [constants_1.ORIGINAL_PROTOCOL_HEADER]: (0, utils_1.isAbsoluteUrl)(url) ? (0, utils_1.extractProtocol)(url) : protocol
+        [constants_1.ORIGINAL_HOST_HEADER]: (0, utils_12.isAbsoluteUrl)(url) ? (0, utils_12.extractHost)(url) : host,
+        [constants_1.ORIGINAL_PROTOCOL_HEADER]: (0, utils_12.isAbsoluteUrl)(url) ? (0, utils_12.extractProtocol)(url) : protocol
       } : {};
       return originalUrlHeader;
     };
@@ -22161,7 +22174,7 @@ var require_options2 = __commonJS({
       if (globalConfig.httpMockServer.enabled) {
         const mockUrl = new URL(globalConfig.httpMockServer.mockServerUrl);
         return {
-          url: (0, utils_1.changeHost)(url, mockUrl.host)
+          url: (0, utils_12.changeHost)(url, mockUrl.host)
         };
       }
       return {};
@@ -22170,7 +22183,7 @@ var require_options2 = __commonJS({
       const { pathname, searchParams } = new URL(url, "http://unused.com");
       requestParams = requestParams || searchParams;
       if (requestParams) {
-        const params = (0, utils_1.toSearchQueryParams)(requestParams) || requestParams.toString();
+        const params = (0, utils_12.toSearchQueryParams)(requestParams) || requestParams.toString();
         const paramsAsString = params ? `?${params}` : "";
         return `${pathname}${paramsAsString}`;
       }
@@ -22198,7 +22211,7 @@ var require_http_client2 = __commonJS({
     var error_1 = require_error2();
     var headers_1 = require_headers2();
     var options_1 = require_options2();
-    var utils_1 = require_utils11();
+    var utils_12 = require_utils11();
     var HttpClient = class {
       constructor(opts = {}) {
         this.opts = opts;
@@ -22213,8 +22226,8 @@ var require_http_client2 = __commonJS({
       }
       async request(requestOptionsOrFactory, overrides) {
         var _a, _b;
-        const host = (0, utils_1.resolveHost)(this.opts);
-        const protocol = (0, utils_1.resolveProtocol)(this.opts);
+        const host = (0, utils_12.resolveHost)(this.opts);
+        const protocol = (0, utils_12.resolveProtocol)(this.opts);
         const urlObject = { protocol, host };
         const requestOptions = typeof requestOptionsOrFactory === "function" ? requestOptionsOrFactory({ isSSR: this.opts.isSSR, host }) : requestOptionsOrFactory;
         const signedInstance = (overrides === null || overrides === void 0 ? void 0 : overrides.signedInstance) || await ((_b = (_a = this.opts).getAppToken) === null || _b === void 0 ? void 0 : _b.call(_a)) || "";
@@ -22223,7 +22236,7 @@ var require_http_client2 = __commonJS({
           requestOptions,
           urlObject,
           headers,
-          globalConfig: (0, utils_1.getGlobalConfig)()
+          globalConfig: (0, utils_12.getGlobalConfig)()
         });
         if (this.opts.isSSR) {
           options.baseURL = this.opts.baseURL ? this.opts.baseURL : `${constants_1.SSR_PROTOCOL}://${constants_1.SSR_HOST}`;
@@ -22291,18 +22304,18 @@ var require_http_client2 = __commonJS({
           csrf: false,
           multilingualOptions: this.opts.multilingualOptions
         };
-        return (0, options_1.buildAllHeaders)(requestOptions, wixHeadersOpts, (0, utils_1.getGlobalConfig)(), urlObject);
+        return (0, options_1.buildAllHeaders)(requestOptions, wixHeadersOpts, (0, utils_12.getGlobalConfig)(), urlObject);
       }
       getCustomHeaders(requestOptions, signedInstance, urlObject) {
         const { url } = requestOptions;
         const authHeader = signedInstance && (0, headers_1.isWixDomain)(url) ? { authorization: signedInstance } : {};
         const customHeaders = this.opts.createHeaders();
-        const originalUrlHeader = (0, options_1.getUrlHeaders)((0, utils_1.getGlobalConfig)(), requestOptions, urlObject);
+        const originalUrlHeader = (0, options_1.getUrlHeaders)((0, utils_12.getGlobalConfig)(), requestOptions, urlObject);
         return Object.assign(Object.assign(Object.assign({}, originalUrlHeader), customHeaders), authHeader);
       }
       handleRequestError(error, requestOptions) {
         const requestError = (0, error_1.createHttpError)(error);
-        (0, utils_1.silent)(() => {
+        (0, utils_12.silent)(() => {
           var _a;
           return (_a = requestOptions.onError) === null || _a === void 0 ? void 0 : _a.call(requestOptions, requestError);
         });
@@ -22310,7 +22323,7 @@ var require_http_client2 = __commonJS({
       }
       maybeFallbackRequest(err, requestOptions, urlObject, signedInstance) {
         var _a, _b, _c;
-        const shouldFallbackRequest = (0, utils_1.isHttpMockServerEnabled)() && (0, utils_1.shouldAllowUnmocked)() && ((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) === 404 && ((_c = (_b = err.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.msg) === constants_1.NO_SCENARIO_FOUND;
+        const shouldFallbackRequest = (0, utils_12.isHttpMockServerEnabled)() && (0, utils_12.shouldAllowUnmocked)() && ((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) === 404 && ((_c = (_b = err.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.msg) === constants_1.NO_SCENARIO_FOUND;
         if (shouldFallbackRequest) {
           const headers = this.getHeaders(requestOptions, signedInstance, urlObject);
           const prodOptions = (0, options_1.buildOptions)({
@@ -22353,10 +22366,10 @@ var require_http_client2 = __commonJS({
     function transformData(res, requestOptions, flags) {
       let resData = sanitizeResponse(res, flags);
       if (requestOptions._pickResponseBody) {
-        resData = (0, utils_1.extractProp)(res.data, requestOptions._pickResponseBody);
+        resData = (0, utils_12.extractProp)(res.data, requestOptions._pickResponseBody);
       }
       if (requestOptions._logs) {
-        const logs = (0, utils_1.extractProp)(res.data, requestOptions._logs);
+        const logs = (0, utils_12.extractProp)(res.data, requestOptions._logs);
         if (logs === null || logs === void 0 ? void 0 : logs.length) {
           logs.map((log) => console.log(...log));
         }
@@ -23526,7 +23539,7 @@ var require_job_cancellation_monitor = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.JobCancellationMonitor = void 0;
     var ditto_codegen_types_12 = require_dist4();
-    var utils_1 = require_utils9();
+    var utils_12 = require_utils9();
     var logger_12 = require_logger();
     var job_context_storage_12 = require_job_context_storage();
     var types_1 = require_types_impl();
@@ -23561,7 +23574,7 @@ var require_job_cancellation_monitor = __commonJS({
             logger_12.logger.info("[Job] Detected cancellation request, exiting");
             await this.reportCancellationBi(jobId);
             await this.codeGenerationService.markJobAsCancelled(jobId);
-            await (0, utils_1.updateAllRunningTasks)(jobId, ditto_codegen_types_12.Status.CANCELLED);
+            await (0, utils_12.updateAllRunningTasks)(jobId, ditto_codegen_types_12.Status.CANCELLED);
             logger_12.logger.info("[Job] Marked job as CANCELLED");
             process.exit();
           }
@@ -23602,7 +23615,7 @@ var require_job_timeout_monitor = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.JobTimeoutMonitor = exports2.JOB_TIMEOUT_MS = void 0;
     var ditto_codegen_types_12 = require_dist4();
-    var utils_1 = require_utils9();
+    var utils_12 = require_utils9();
     var logger_12 = require_logger();
     var context_12 = require_context();
     var job_context_storage_12 = require_job_context_storage();
@@ -23636,7 +23649,7 @@ var require_job_timeout_monitor = __commonJS({
           logger_12.logger.info("[Job] Timeout detected, exiting", logContext);
           const job = await this.codeGenerationService.getJob(jobId);
           const codegenError = this.resolveTimeoutError(jobId, job);
-          await (0, utils_1.updateAllRunningTasks)(jobId, ditto_codegen_types_12.Status.FAILED, codegenError);
+          await (0, utils_12.updateAllRunningTasks)(jobId, ditto_codegen_types_12.Status.FAILED, codegenError);
           await this.codeGenerationService.updateJobStatus(jobId, ditto_codegen_types_12.Status.FAILED);
           const failedRunPayload = await (0, codegen_flow_helpers_12.buildFailedRunPayload)(codegenError, (0, codegen_flow_helpers_12.getOutputPath)(), job_context_storage_12.jobContextStorage.getStore()?.gitBaseline ?? "");
           await this.codeGenerationService.updateJob(jobId, {
@@ -23768,8 +23781,39 @@ var require_skills_installer = __commonJS({
     var path_12 = require("path");
     var ditto_codegen_types_12 = require_dist4();
     var skills_override_12 = require_skills_override();
-    function hasSkills(dir) {
-      return (0, fs_1.existsSync)(dir) && (0, fs_1.readdirSync)(dir).length > 0;
+    var STARTUP_SKILLS_PACKAGE = "@wix/agent-skills";
+    var SKILLS_READY_TIMEOUT_MS = 3 * 6e4;
+    var UNRESOLVED_GRACE_MS = 3e4;
+    function discoverSkills(dir) {
+      try {
+        return (0, fs_1.readdirSync)(dir).filter((name) => (0, fs_1.existsSync)((0, path_12.join)(dir, name, "SKILL.md")));
+      } catch (error) {
+        if (error.code === void 0) {
+          throw error;
+        }
+        return [];
+      }
+    }
+    function tryResolveStartupPackage(outputPath) {
+      try {
+        return (0, path_12.dirname)(require.resolve(`${STARTUP_SKILLS_PACKAGE}/package.json`, {
+          paths: [outputPath]
+        }));
+      } catch (error) {
+        const code = error.code;
+        if (code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED") {
+          return null;
+        }
+        throw error;
+      }
+    }
+    function startupSkills(outputPath) {
+      const packageRoot = tryResolveStartupPackage(outputPath);
+      if (!packageRoot) {
+        return [];
+      }
+      const nested = discoverSkills((0, path_12.join)(packageRoot, "skills"));
+      return nested.length > 0 ? nested : discoverSkills(packageRoot);
     }
     var delay2 = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
     async function applySkillsOverride(outputPath, log) {
@@ -23789,32 +23833,50 @@ var require_skills_installer = __commonJS({
         });
       }
     }
-    async function ensureSkillsReady(outputPath, log, { timeoutMs = 6e4, intervalMs = 1e3 } = {}) {
+    async function ensureSkillsReady(outputPath, log, { timeoutMs = SKILLS_READY_TIMEOUT_MS, intervalMs = 1e3, graceMs = UNRESOLVED_GRACE_MS, skillsDir = skills_override_12.SKILLS_DIR } = {}) {
       const projectSkillsDir = (0, path_12.join)(outputPath, ".agents", "skills");
-      const skillsPresent = () => hasSkills(skills_override_12.SKILLS_DIR) || hasSkills(projectSkillsDir);
-      if (skillsPresent()) {
+      const start = Date.now();
+      const inspect = (candidates) => {
+        const present = [
+          .../* @__PURE__ */ new Set([
+            ...discoverSkills(skillsDir),
+            ...discoverSkills(projectSkillsDir)
+          ])
+        ];
+        const found = startupSkills(outputPath);
+        const required = found.length > 0 ? found : candidates;
+        const ready = present.length > 0 && (required.length > 0 ? required.some((name) => present.includes(name)) : Date.now() - start >= graceMs);
+        return { present, candidates: required, ready };
+      };
+      let state = inspect([]);
+      if (state.ready) {
         return;
       }
-      log.info("[Skills] Not present yet \u2014 waiting for the startup install", {
-        globalSkillsDir: skills_override_12.SKILLS_DIR,
+      log.info(`[Skills] Not ready yet \u2014 waiting for any ${STARTUP_SKILLS_PACKAGE} skill`, {
+        candidates: state.candidates,
+        present: state.present,
+        globalSkillsDir: skillsDir,
         projectSkillsDir,
         timeoutMs
       });
       const deadline = Date.now() + timeoutMs;
       while (Date.now() < deadline) {
         await delay2(intervalMs);
-        if (skillsPresent()) {
-          log.info("[Skills] Skills became available");
+        state = inspect(state.candidates);
+        if (state.ready) {
+          log.info("[Skills] Skills became available", { present: state.present });
           return;
         }
       }
-      log.error("[Skills] No skills available after waiting", {
-        globalSkillsDir: skills_override_12.SKILLS_DIR,
+      log.error("[Skills] Skills still not ready after waiting", {
+        candidates: state.candidates,
+        present: state.present,
+        globalSkillsDir: skillsDir,
         projectSkillsDir,
         environment: process.env.CODEGEN_ENVIRONMENT,
         timeoutMs
       });
-      throw new ditto_codegen_types_12.ProcessExecutionError("Skills not available \u2014 verify the install-skills step (codegen-install --phase startup) ran and populated /root/.agents/skills.", { processType: ditto_codegen_types_12.ProcessType.INITIALIZATION });
+      throw new ditto_codegen_types_12.ProcessExecutionError(`Skills not ready after ${timeoutMs}ms \u2014 no ${STARTUP_SKILLS_PACKAGE} skill reached ${skillsDir}. It provides [${state.candidates.join(", ")}]; the store has [${state.present.join(", ")}]. Verify the install-skills step (codegen-install --phase startup) ran.`, { processType: ditto_codegen_types_12.ProcessType.INITIALIZATION });
     }
   }
 });
@@ -24236,6 +24298,7 @@ var plugin_artifacts_1 = require_plugin_artifacts();
 var config_1 = require_config();
 var environments_1 = require_environments();
 var plugin_host_1 = require_plugin_host();
+var utils_1 = require_utils9();
 var sessionId = process.env.CODEGEN_SESSION_ID || (0, crypto_1.randomUUID)();
 process.env.CODEGEN_SESSION_ID = sessionId;
 (0, logger_1.initLogger)(sessionId);
@@ -24363,6 +24426,22 @@ function extractUserInput(kind, payload) {
   }
   return void 0;
 }
+async function reportPreDispatchFailure(jobId, error) {
+  const codegenError = (0, ditto_codegen_types_1.toCodegenError)(error);
+  logger_1.logger.error("[Job] Failed before flow dispatch", {
+    jobId,
+    error: codegenError.message
+  });
+  try {
+    await codeGenerationService_1.codeGenerationService.markJobAsFailed(jobId, codegenError);
+    await (0, utils_1.updateAllRunningTasks)(jobId, CodeGenService_1.Status.FAILED, codegenError);
+  } catch (reportError) {
+    logger_1.logger.error("[Job] Could not mark the job failed", {
+      jobId,
+      error: reportError instanceof Error ? reportError.message : reportError
+    });
+  }
+}
 async function processJob(job) {
   if (!job.id) {
     throw new ditto_codegen_types_1.MissingJobIdError();
@@ -24404,7 +24483,12 @@ async function processJob(job) {
           keys: Object.keys(agentData)
         });
       }
-      await (0, skills_installer_1.ensureSkillsReady)((0, codegen_flow_helpers_1.getOutputPath)(), logger_1.logger);
+      try {
+        await (0, skills_installer_1.ensureSkillsReady)((0, codegen_flow_helpers_1.getOutputPath)(), logger_1.logger);
+      } catch (error) {
+        await reportPreDispatchFailure(jobId, error);
+        throw error;
+      }
       if (task.kind === CodeGenService_1.TaskKind.ASK_CODEGEN) {
         await (0, opencode_ask_1.runOpencodeAskFlow)(history);
       } else if (task.kind === CodeGenService_1.TaskKind.ITERATE_CODEGEN) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.438",
+  "version": "1.0.440",
   "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": "505e7fd77b8402842416d269ee4d6800b6ad3e313ae5d985dfd48792"
+  "falconPackageHash": "a92a9bf3737fefaa49b3fc7499eaa2e04ba4b0f61ad30ef63bd85bb8"
 }