@wix/ditto-codegen-public 1.0.389 → 1.0.391

package/dist/out.js

@@ -80,6 +80,7 @@ var require_types_impl = __commonJS({
       ErrorType2["PROCESS_EXECUTION_ERROR"] = "PROCESS_EXECUTION_ERROR";
       ErrorType2["UNEXPECTED_ERROR"] = "UNEXPECTED_ERROR";
       ErrorType2["MISSING_JOB_ID_ERROR"] = "MISSING_JOB_ID_ERROR";
+      ErrorType2["USER_DECISION_TIMEOUT_ERROR"] = "USER_DECISION_TIMEOUT_ERROR";
     })(ErrorType || (exports2.ErrorType = ErrorType = {}));
     var FileOperation;
     (function(FileOperation2) {
@@ -10845,22 +10846,13 @@ var require_CodeGenService = __commonJS({
       [ditto_codegen_types_12.ProcessType.EXECUTION]: types_1.ProcessType.EXECUTION,
       [ditto_codegen_types_12.ProcessType.INITIALIZATION]: types_1.ProcessType.INITIALIZATION
     };
-    var ERROR_TYPE = {
-      [ditto_codegen_types_12.ErrorType.TIMEOUT_ERROR]: types_1.ErrorType.TIMEOUT_ERROR,
-      [ditto_codegen_types_12.ErrorType.PROCESS_EXECUTION_ERROR]: types_1.ErrorType.PROCESS_EXECUTION_ERROR,
-      [ditto_codegen_types_12.ErrorType.UNEXPECTED_ERROR]: types_1.ErrorType.UNEXPECTED_ERROR,
-      [ditto_codegen_types_12.ErrorType.MISSING_JOB_ID_ERROR]: types_1.ErrorType.MISSING_JOB_ID_ERROR,
-      // TODO: map to ApiErrorType.USER_DECISION_TIMEOUT_ERROR once the proto change (PR #938)
-      // is GA'd and the generated API enum includes it. For now report it as TIMEOUT_ERROR.
-      [ditto_codegen_types_12.ErrorType.USER_DECISION_TIMEOUT_ERROR]: types_1.ErrorType.TIMEOUT_ERROR
-    };
     function toApiError(error) {
       if (!error)
         return void 0;
       return {
         name: error.name,
         message: error.message,
-        errorType: ERROR_TYPE[error.errorType],
+        errorType: error.errorType,
         retryable: error.retryable,
         expected: error.expected,
         ..."processType" in error && error.processType && { processType: PROCESS_TYPE[error.processType] },
@@ -10869,7 +10861,7 @@ var require_CodeGenService = __commonJS({
       };
     }
     function toJobOutput(payload) {
-      const { requiredPermissions, files, extensions, error, agentMessage, userActions, ...rest } = payload;
+      const { requiredPermissions, files, extensions, error, agentMessage, ...rest } = payload;
       return {
         requiredPermissions,
         files: files?.map((file) => ({
@@ -10888,7 +10880,6 @@ var require_CodeGenService = __commonJS({
         })),
         error: toApiError(error),
         agentMessage,
-        userActions,
         agentOutput: Object.keys(rest).length > 0 ? rest : void 0
       };
     }
@@ -14363,7 +14354,6 @@ TOOL USAGE:
 - \`uuid\` to generate UUIDs (supports count param for multiple). Do NOT use bash.
 - \`wix-generate\` to scaffold extensions non-interactively \u2014 prefer over hand-writing boilerplate; pass an array to scaffold several at once. It RETURNS every created file's contents, so trust that and do NOT \`read\`/\`batch-read\` them afterward. On a \`FAILED\` block, fix the params per the error and retry.
 - \`required-permissions\` \u2014 declare the Wix app permissions the generated code needs (when/whether to call: workflow step 6 + PERMISSIONS).
-- \`user-actions\` \u2014 declare manual setup steps the user must perform (when/whether to call: workflow step 7 + USER ACTIONS).
 - Package dependencies \u2014 \`npm install <pkg>\` any package not already in \`package.json\` BEFORE the first \`validate\` (do NOT wait for \`TS2307\`); install all needed packages in ONE command. Do NOT hand-edit \`package.json\` for deps unless npm cannot be used.
 - File operations \u2014 pick the BATCH tool whenever you have 2+ files; the single-file variants are 5\u201310\xD7 slower:
   - \`batch-write\` to create N new files in one call. NEVER call \`write\` more than once per turn \u2014 use batch-write instead. \`write\` is reserved for single-file creation.
@@ -14385,7 +14375,7 @@ IMPLEMENTATION WORKFLOW:
 4. **Register**: Register all extensions in \`src/extensions.ts\`. Include a \`progress\` call (e.g. "Registering extensions").
 5. **Validate**: Run \`validate\` (typecheck only). Fix any errors and re-validate until tsc passes. Include a \`progress\` call (e.g. "Running type checks"). Then run \`validate({ runBuild: true })\` ONCE to verify the build. Pass \`installDeps: true\` ONLY when \`package.json\` changed without already running \`npm install <package-name>\` in this iteration; otherwise omit it (node_modules is pre-installed). Include a \`progress\` call (e.g. "Building project").
 6. **Declare permissions**: If the generated code requires Wix app permissions, call \`required-permissions\` ONCE with their SCOPE IDs (see PERMISSIONS below). Skip this step entirely if no permissions are needed.
-7. **Declare user actions**: If the user must perform manual steps for the app to work, call \`user-actions\` ONCE with them (see USER ACTIONS below). Skip this step entirely if there are none.
+7. **Final message**: Your last message is returned to the user as the codegen output \u2014 keep it short and plain (a sentence or two on what the app now does).
 8. **Stop**: STOP immediately. Do NOT refactor, clean up, or verify.
 
 FILE CREATION:
@@ -14402,25 +14392,7 @@ When you call \`required-permissions\` (see workflow step 6 for when), use SCOPE
 - Embedded scripts \u2192 "SCOPE.DC-APPS.MANAGE-EMBEDDED-SCRIPTS"
 
 CRITICAL: Only include permissions you have explicitly seen in the Wix SDK documentation (via MCP or loaded skills) \u2014 NEVER guess or infer a scope ID. If you cannot point to where you saw it, do NOT include it. When in doubt, skip the call entirely. A fabricated scope ID will show an error to the user and confuse them; a missing permission is just a warning the user can fix.
-
-USER ACTIONS:
-A user action is manual setup the app needs to ACTUALLY WORK \u2014 either OUTSIDE Wix (third-party API keys, connecting an external account, registering a webhook elsewhere) or INSIDE Wix that you could not do in code (e.g. creating a Wix Triggered Email template, configuring a Wix Automation, adding a value in Secrets Manager). (When/whether to call: workflow step 7.)
-\`output\` is a single markdown string rendered directly to the user: a short intro line + a bulleted/numbered list. FORMAT TIGHTLY \u2014 a SINGLE \`\\n\` between every line (intro\u2192first item AND between items); NEVER blank lines (\`\\n\\n\`), which make the client render each item with extra spacing. Example:
-"After installing the app, complete these steps:\\n1. **Add your Stripe secret key** \u2014 open the app's settings and paste your Stripe secret key.\\n2. **Create the stock-alert email template** \u2014 in your Wix dashboard, create a Triggered Email template so subscribers receive the alert email."
-
-AUDIENCE \u2014 say WHO performs each step. Most third-party credentials and dashboard setup (their API key, creating a Triggered Email template, configuring an automation) are done by the SITE OWNER who installs the app, NOT the developer \u2014 phrase those as "After installing the app, \u2026" or "The site owner must \u2026". Use developer-facing phrasing only for steps the developer genuinely performs (in Dev Center / the app's own settings).
-
-CRITICAL \u2014 a user action is something the USER does in a dashboard, UI, or external system. It is NEVER a coding task. Do NOT ask the user to write, add, or modify code, call an API from the codebase, wire up logic, or "finish" an implementation \u2014 that is YOUR job. If a step can be done in code, you MUST do it now, not declare it. (E.g. if a feature needs to send an email, write the sending code yourself; only the dashboard email-template setup is a user action.)
-
-CRITICAL \u2014 declare ONLY steps the app REQUIRES to function as built. Do NOT include optional customizations, "for future" tweaks, nice-to-haves, or steps for an alternative path you did not implement. Every action must be mandatory for the app to work.
-
-If a feature only works once the user does required manual setup (e.g. you logged a notification intent because the actual email needs a Triggered Email template), you MUST declare that step here \u2014 do NOT bury it in prose or leave it unsaid.
-
-Do NOT include the steps Wix already handles through its own flows:
-- ANYTHING about permissions or scopes \u2014 adding, granting, enabling, or configuring a permission/scope, whether in Dev Center or the dashboard. These are declared EXCLUSIVELY via the \`required-permissions\` tool.
-- Releasing a new app version.
-- Publishing the site.
-Also do NOT include things you already did in code (created files, registered extensions) or things the app does automatically on install. In particular, a site plugin configured with \`installation: { autoAdd: true }\` is placed on its slot automatically \u2014 NEVER tell the user to add it in the Editor. Only declare manual placement for slots that don't support auto-add (e.g. the checkout page).`;
+`;
   }
 });
 
@@ -14775,10 +14747,6 @@ var require_config = __commonJS({
       [
         "required-permissions"
         /* OpenCodeTool.RequiredPermissions */
-      ]: "deny",
-      [
-        "user-actions"
-        /* OpenCodeTool.UserActions */
       ]: "deny"
     };
     var ASK_PERMISSIONS = {
@@ -14882,38 +14850,12 @@ var require_types4 = __commonJS({
   }
 });
 
-// dist/opencode-integration/normalize-tool-string.js
-var require_normalize_tool_string = __commonJS({
-  "dist/opencode-integration/normalize-tool-string.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.normalizeToolString = normalizeToolString;
-    function unescapeString(str) {
-      return str.replace(/\\(n|t|r|"|\\)/g, (_, c) => {
-        if (c === "n")
-          return "\n";
-        if (c === "t")
-          return "	";
-        if (c === "r")
-          return "\r";
-        if (c === '"')
-          return '"';
-        return "\\";
-      });
-    }
-    function normalizeToolString(text) {
-      return unescapeString(text).replace(/\r\n/g, "\n");
-    }
-  }
-});
-
 // dist/opencode-integration/parser.js
 var require_parser = __commonJS({
   "dist/opencode-integration/parser.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseRequiredPermissions = parseRequiredPermissions;
-    exports2.parseUserActions = parseUserActions;
     exports2.parseAnswerText = parseAnswerText;
     exports2.createEmptyUsageStats = createEmptyUsageStats;
     exports2.parseUsageStats = parseUsageStats;
@@ -14921,10 +14863,6 @@ var require_parser = __commonJS({
     exports2.hasSessionError = hasSessionError;
     exports2.summarizeOpenCodeLine = summarizeOpenCodeLine;
     var types_1 = require_types4();
-    var normalize_tool_string_1 = require_normalize_tool_string();
-    function parseEvents(output, type) {
-      return output.split("\n").filter((line) => line.trim()).map((line) => (0, types_1.tryParseJson)(line)).filter((event) => event !== null && event.type === type);
-    }
     function parseRequiredPermissions(output) {
       let permissions = [];
       const lines = output.split("\n");
@@ -14942,25 +14880,9 @@ var require_parser = __commonJS({
       }
       return permissions;
     }
-    function parseUserActions(output) {
-      let markdown = "";
-      const lines = output.split("\n");
-      for (const line of lines) {
-        if (!line.trim())
-          continue;
-        const event = (0, types_1.tryParseJson)(line);
-        if (!event || event.type !== "tool_use" || event.part?.tool !== "user-actions" || event.part.state?.status !== "completed") {
-          continue;
-        }
-        const declared = event.part.state.input?.output;
-        if (typeof declared !== "string")
-          continue;
-        markdown = (0, normalize_tool_string_1.normalizeToolString)(declared);
-      }
-      return markdown;
-    }
     function parseAnswerText(output) {
-      return parseEvents(output, "text").map((event) => event.part?.text).filter(Boolean).join("").trim();
+      const messages = output.split("\n").map((line) => (0, types_1.tryParseJson)(line)).filter((event) => event?.type === "text").map((event) => event.part?.text ?? "");
+      return (messages[messages.length - 1] ?? "").trim();
     }
     function createEmptyUsageStats() {
       return {
@@ -15469,7 +15391,7 @@ var require_result_builder = __commonJS({
         exitCode: null,
         stdout,
         stderr,
-        userActions: (0, parser_1.parseUserActions)(stdout),
+        agentMessage: (0, parser_1.parseAnswerText)(stdout),
         error: new ditto_codegen_types_12.TimeoutError(message),
         durationMs: Date.now() - startTime,
         requiredPermissions: [],
@@ -15483,7 +15405,7 @@ var require_result_builder = __commonJS({
         exitCode: code,
         stdout,
         stderr,
-        userActions: (0, parser_1.parseUserActions)(stdout),
+        agentMessage: (0, parser_1.parseAnswerText)(stdout),
         error: code !== 0 ? new ditto_codegen_types_12.ProcessExecutionError(`Code generation process exited unexpectedly (exit code ${code})`, {
           processType: ditto_codegen_types_12.ProcessType.EXECUTION,
           exitCode: code ?? void 0,
@@ -15501,7 +15423,7 @@ var require_result_builder = __commonJS({
         exitCode: null,
         stdout,
         stderr,
-        userActions: (0, parser_1.parseUserActions)(stdout),
+        agentMessage: (0, parser_1.parseAnswerText)(stdout),
         error: new ditto_codegen_types_12.ProcessExecutionError(`Failed to start code generation process: ${errorMessage}`, {
           processType: ditto_codegen_types_12.ProcessType.SPAWN,
           stderr
@@ -15626,7 +15548,6 @@ var require_executor = __commonJS({
     var MAX_RETRIES = 5;
     async function executeOpenCode(options) {
       let lastResult = null;
-      let accumulatedStdout = "";
       let accumulatedUsage = (0, parser_1.createEmptyUsageStats)();
       const accumulatedSkills = [];
       let currentPrompt = options.prompt;
@@ -15639,7 +15560,6 @@ var require_executor = __commonJS({
           continueSession = false;
         }
         const result = await executeOpenCodeOnce({ ...options, prompt: currentPrompt, continueSession }, attempt);
-        accumulatedStdout += result.stdout;
         accumulatedUsage = (0, parser_1.mergeUsageStats)(accumulatedUsage, result.usage);
         accumulatedSkills.push(...result.skillsUsed);
         const errorMsg = result.error?.message.toLowerCase() ?? "";
@@ -15649,7 +15569,7 @@ var require_executor = __commonJS({
         if (!isRetryableFailure) {
           const finalResult2 = {
             ...result,
-            userActions: (0, parser_1.parseUserActions)(accumulatedStdout),
+            agentMessage: (0, parser_1.parseAnswerText)(result.stdout),
             usage: accumulatedUsage,
             skillsUsed: accumulatedSkills
           };
@@ -15669,7 +15589,7 @@ var require_executor = __commonJS({
       });
       const finalResult = {
         ...lastResult,
-        userActions: (0, parser_1.parseUserActions)(accumulatedStdout),
+        agentMessage: (0, parser_1.parseAnswerText)(lastResult.stdout),
         usage: accumulatedUsage,
         skillsUsed: Array.from(accumulatedSkills)
       };
@@ -15749,7 +15669,7 @@ var require_executor = __commonJS({
             exitCode: null,
             stdout: state.stdout,
             stderr: state.stderr,
-            userActions: (0, parser_1.parseUserActions)(state.stdout),
+            agentMessage: (0, parser_1.parseAnswerText)(state.stdout),
             error: new ditto_codegen_types_12.ProcessExecutionError(`Code generation process failed to run: ${error instanceof Error ? error.message : String(error)}`, {
               processType: ditto_codegen_types_12.ProcessType.EXECUTION,
               cause: error
@@ -21266,7 +21186,7 @@ var require_opencode_init = __commonJS({
         await (0, inject_created_by_1.injectCreatedByIntoExtensionFiles)(outputPath, extensions.created);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
           requiredPermissions: result.requiredPermissions,
-          userActions: result.userActions,
+          agentMessage: result.agentMessage,
           files,
           ...agentOutput,
           extensions
@@ -21456,7 +21376,7 @@ var require_opencode_iterate = __commonJS({
         await (0, inject_created_by_1.injectCreatedByIntoExtensionFiles)(outputPath, extensions.created);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
           requiredPermissions: result.requiredPermissions,
-          userActions: result.userActions,
+          agentMessage: result.agentMessage,
           files,
           ...agentOutput,
           extensions
@@ -21817,6 +21737,7 @@ var require_opencode_fix_git_conflicts = __commonJS({
         const extensions = await (0, collect_extensions_created_1.buildExtensionsJobPayload)(outputPath, files);
         await (0, codegen_flow_helpers_12.updateJobPayload)(localJobContext, {
           requiredPermissions: result.requiredPermissions,
+          agentMessage: result.agentMessage,
           files,
           extensions
         });
@@ -21993,10 +21914,11 @@ var require_job_timeout_monitor = __commonJS({
         });
         try {
           logger_12.logger.info("[Job] Timeout detected, exiting", logContext);
-          await (0, utils_1.updateAllRunningTasks)(jobId, ditto_codegen_types_12.Status.FAILED, new ditto_codegen_types_12.TimeoutError(`Job exceeded timeout of ${exports2.JOB_TIMEOUT_MS}ms`));
+          const codegenError = await this.resolveTimeoutError(jobId);
+          await (0, utils_1.updateAllRunningTasks)(jobId, ditto_codegen_types_12.Status.FAILED, codegenError);
           await this.codeGenerationService.markJobAsCompleted(jobId);
           logger_12.logger.info("[Job] Marked job as completed, failed all running tasks", logContext);
-          await this.reportTimeoutBi(jobId);
+          await this.reportTimeoutBi(jobId, codegenError);
           process.exit();
         } catch (error) {
           logger_12.logger.error("[Job] Failed to mark timed-out job as completed", {
@@ -22005,7 +21927,22 @@ var require_job_timeout_monitor = __commonJS({
           });
         }
       }
-      async reportTimeoutBi(jobId) {
+      async resolveTimeoutError(jobId) {
+        try {
+          const job = await this.codeGenerationService.getJob(jobId);
+          const pendingDecision = job?.pendingUserDecisions?.find((decision) => !decision.response?.selectedOptionId);
+          if (pendingDecision?.id) {
+            return new ditto_codegen_types_12.UserDecisionTimeoutError(jobId, pendingDecision.id);
+          }
+        } catch (error) {
+          logger_12.logger.warn("[Job] Could not determine timeout error type", {
+            jobId,
+            error: error instanceof Error ? error.message : String(error)
+          });
+        }
+        return new ditto_codegen_types_12.TimeoutError(`Job exceeded timeout of ${exports2.JOB_TIMEOUT_MS}ms`);
+      }
+      async reportTimeoutBi(jobId, codegenError) {
         const store = job_context_storage_12.jobContextStorage.getStore();
         if (!store)
           return;
@@ -22019,7 +21956,6 @@ var require_job_timeout_monitor = __commonJS({
           runKind: store.kind,
           environment
         };
-        const codegenError = (0, ditto_codegen_types_12.toCodegenError)(new ditto_codegen_types_12.TimeoutError(`Job exceeded timeout of ${exports2.JOB_TIMEOUT_MS}ms`));
         await (0, biEvents_1.reportSessionEnd)({
           ...biBase,
           taskStatus: ditto_codegen_types_12.Status.FAILED,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/ditto-codegen-public",
-  "version": "1.0.389",
+  "version": "1.0.391",
   "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": "1f2c19ad8ba834649254819e388cb4feb7516e76da78903eee56d3d2"
+  "falconPackageHash": "ffaf520e25dae6b0db9450f128f6eedcf0cd611df74594a0e682a01c"
 }

package/dist/opencode-tools/user-actions.ts

@@ -1,19 +0,0 @@
-import { tool } from "@opencode-ai/plugin";
-
-export default tool({
-  description:
-    "Declare the manual setup steps the user must perform for the generated app to " +
-    "work, as a single markdown string. Call once at the end, only if such setup is " +
-    "required.",
-  args: {
-    output: tool.schema
-      .string()
-      .describe(
-        "The setup steps, as markdown (a short intro line followed by a bulleted or " +
-          "numbered list). Rendered directly to the user.",
-      ),
-  },
-  async execute(args) {
-    return `✓ recorded user actions (${args.output.length} chars)`;
-  },
-});