windmill-cli 1.684.0 → 1.685.0

package/esm/main.js

@@ -11812,7 +11812,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv2("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.684.0",
+    VERSION: "1.685.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -63310,7 +63310,11 @@ async function generateFlowHash(rawWorkspaceDependencies, folder, defaultTs) {
       hashes[normalizedPath] = await generateHash(await f.getContentText() + JSON.stringify(rawWorkspaceDependencies));
     }
   }
-  return { ...hashes, [TOP_HASH]: await generateHash(JSON.stringify(hashes)) };
+  const sortedHashes = {};
+  for (const k of Object.keys(hashes).sort()) {
+    sortedHashes[k] = hashes[k];
+  }
+  return { ...sortedHashes, [TOP_HASH]: await generateHash(JSON.stringify(sortedHashes)) };
 }
 async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpdateMetadataLock, noStaleMessage, tree) {
   if (folder.endsWith(SEP7)) {
@@ -64851,7 +64855,7 @@ async function ignoreF(wmillconf) {
   };
 }
 async function addToChangedIfNotExists(p, tracker) {
-  const isScript = exts.some((e) => p.endsWith(e));
+  const isScript = exts.some((e) => p.endsWith(e)) && !isFileResource(p) && !isFilesetResource(p);
   if (isScript) {
     if (isFlowPath(p)) {
       const folder = extractFolderPath(p, "flow");
@@ -66453,7 +66457,7 @@ async function generateScriptMetadataInternal(scriptPath, workspace, opts, dryRu
       newMetadataContent = import_yaml13.stringify(metadataParsedContent, yamlOptions);
     }
   }
-  const metadataContentUsedForHash = newMetadataContent;
+  const metadataContentUsedForHash = justUpdateMetadataLock ? metadataContent : newMetadataContent;
   hash2 = await generateScriptHash(depsForHash, scriptContent, metadataContentUsedForHash);
   if (hasModuleHashes) {
     const sortedEntries = Object.entries(moduleHashes).sort(([a], [b]) => a.localeCompare(b));
@@ -67394,7 +67398,11 @@ async function generateAppHash(rawReqs, folder, rawApp, defaultTs) {
       throw error2;
     }
   }
-  return { ...hashes, [TOP_HASH2]: await generateHash(JSON.stringify(hashes)) };
+  const sortedHashes = {};
+  for (const k of Object.keys(hashes).sort()) {
+    sortedHashes[k] = hashes[k];
+  }
+  return { ...sortedHashes, [TOP_HASH2]: await generateHash(JSON.stringify(sortedHashes)) };
 }
 async function generateAppLocksInternal(appFolder, rawApp, dryRun, workspace, opts, justUpdateMetadataLock, noStaleMessage, tree) {
   if (appFolder.endsWith(SEP11)) {
@@ -72797,6 +72805,9 @@ function getTypeStrFromPath(p) {
   if (p.startsWith("dependencies" + SEP18)) {
     return "workspace_dependencies";
   }
+  if (isFileResource(p) || isFilesetResource(p)) {
+    return "resource";
+  }
   const parsed = path18.parse(p);
   if (parsed.ext == ".go" || parsed.ext == ".ts" || parsed.ext == ".sh" || parsed.ext == ".py" || parsed.ext == ".sql" || parsed.ext == ".gql" || parsed.ext == ".ps1" || parsed.ext == ".js" || parsed.ext == ".php" || parsed.ext == ".rs" || parsed.ext == ".cs" || parsed.ext == ".nu" || parsed.ext == ".java" || parsed.ext == ".rb" || parsed.ext == ".r" || parsed.ext == ".yml" && parsed.name.split(".").pop() == "playbook") {
     return "script";
@@ -72817,9 +72828,6 @@ function getTypeStrFromPath(p) {
   if (typeEnding === "script" || typeEnding === "variable" || typeEnding === "resource" || typeEnding === "resource-type" || typeEnding === "app" || typeEnding === "schedule" || typeEnding === "http_trigger" || typeEnding === "websocket_trigger" || typeEnding === "kafka_trigger" || typeEnding === "nats_trigger" || typeEnding === "postgres_trigger" || typeEnding === "mqtt_trigger" || typeEnding === "sqs_trigger" || typeEnding === "gcp_trigger" || typeEnding === "email_trigger" || typeEnding === "user" || typeEnding === "group" || typeEnding === "settings" || typeEnding === "encryption_key") {
     return typeEnding;
   } else {
-    if (isFileResource(p) || isFilesetResource(p)) {
-      return "resource";
-    }
     throw new Error("Could not infer type of path " + JSON.stringify(parsed));
   }
 }
@@ -81026,6 +81034,53 @@ The OpenFlow schema (openflow.openapi.yaml) is the source of truth for flow stru
 - \`preprocessor\` - Reserved for preprocessor module
 - \`Input\` - Reserved for flow input reference
 
+## Hard Structural Rules
+
+These are strict Windmill schema rules. Follow them exactly.
+
+- \`value.modules\` is only for normal sequential steps
+- \`value.preprocessor_module\` and \`value.failure_module\` are special top-level fields inside \`value\`, not entries in \`value.modules\`
+- If a flow needs a preprocessor, create \`value.preprocessor_module\` with \`id: preprocessor\`
+- If a flow needs a failure handler, create \`value.failure_module\` with \`id: failure\`
+- Do NOT create regular modules inside \`value.modules\` named \`preprocessor\` or \`failure\`
+- \`preprocessor_module\` and \`failure_module\` only support \`script\` or \`rawscript\`
+- \`preprocessor_module\` runs before normal modules and cannot reference \`results.*\`
+- \`failure_module\` can use the \`error\` object with \`error.message\`, \`error.step_id\`, \`error.name\`, and \`error.stack\`
+
+Correct shape:
+
+\`\`\`yaml
+value:
+  preprocessor_module:
+    id: preprocessor
+    value:
+      type: rawscript
+      ...
+  failure_module:
+    id: failure
+    value:
+      type: rawscript
+      ...
+  modules:
+    - id: process_event
+      value:
+        type: rawscript
+        ...
+\`\`\`
+
+Incorrect shape:
+
+\`\`\`yaml
+value:
+  modules:
+    - id: preprocessor
+      ...
+    - id: process_event
+      ...
+    - id: failure
+      ...
+\`\`\`
+
 ## Module ID Rules
 
 - Must be unique across the entire flow
@@ -81041,10 +81096,148 @@ The OpenFlow schema (openflow.openapi.yaml) is the source of truth for flow stru
 ## Data Flow Between Steps
 
 - \`flow_input.property\` - Access flow input parameters
-- \`results.step_id\` - Access output from a previous step
-- \`results.step_id.property\` - Access specific property from previous step output
-- \`flow_input.iter.value\` - Current item when inside a for-loop
-- \`flow_input.iter.index\` - Current index when inside a for-loop
+- \`results.step_id\` - Access output from a previous step only when that step result is in scope
+- \`results.step_id.property\` - Access specific property from a previous step output only when that step result is in scope
+- \`flow_input.iter.value\` - Current iteration value when inside a loop (\`forloopflow\` or \`whileloopflow\`)
+- \`flow_input.iter.index\` - Current loop index when inside a loop (\`forloopflow\` or \`whileloopflow\`)
+
+## Loop Structure Rules
+
+- For \`whileloopflow\`, use module-level \`stop_after_if\` on the loop module itself when the loop should stop after an iteration result
+- Do NOT put \`stop_after_if\` inside \`value\` of a \`whileloopflow\`
+- \`stop_after_all_iters_if\` is for checks after the whole loop finishes, not the normal per-iteration break condition
+- When a \`whileloopflow\` carries state forward between iterations, use \`flow_input.iter.value\` as the current loop value and provide an explicit first-iteration fallback when needed
+- Use \`flow_input.iter.index\` only when the loop logic is truly based on the iteration index, not as a replacement for the current loop value
+- If the user asks for a final scalar/object after a loop, add a normal step after the loop that extracts the final value from the loop result instead of returning the whole loop result array
+
+Correct \`whileloopflow\` shape:
+
+\`\`\`yaml
+- id: loop_until_done
+  stop_after_if:
+    expr: result.done === true
+    skip_if_stopped: false
+  value:
+    type: whileloopflow
+    skip_failures: false
+    modules:
+      - id: advance_state
+        value:
+          type: rawscript
+          input_transforms:
+            state:
+              type: javascript
+              expr: flow_input.iter && flow_input.iter.value !== undefined ? flow_input.iter.value : flow_input.initial_state
+- id: return_final_state
+  value:
+    type: rawscript
+    input_transforms:
+      final_state:
+        type: javascript
+        expr: results.loop_until_done[results.loop_until_done.length - 1]
+\`\`\`
+
+Incorrect \`whileloopflow\` patterns:
+
+\`\`\`yaml
+- id: loop_until_done
+  value:
+    type: whileloopflow
+    stop_after_if:
+      expr: result.done === true
+\`\`\`
+
+\`\`\`yaml
+input_transforms:
+  state:
+    type: javascript
+    expr: flow_input.iter.index
+\`\`\`
+
+\`\`\`yaml
+input_transforms:
+  final_state:
+    type: javascript
+    expr: results.loop_until_done
+\`\`\`
+
+## Approval / Suspend Structure
+
+- \`suspend\` belongs on the flow module object itself, as a sibling of \`id\` and \`value\`
+- Never put \`suspend\` inside \`value\`
+
+Correct shape:
+
+\`\`\`yaml
+- id: request_approval
+  suspend:
+    required_events: 1
+    resume_form:
+      schema:
+        type: object
+        properties:
+          comment:
+            type: string
+        required: [comment]
+  value:
+    type: identity
+\`\`\`
+
+Incorrect shape:
+
+\`\`\`yaml
+- id: request_approval
+  value:
+    type: rawscript
+    suspend:
+      required_events: 1
+\`\`\`
+
+## Branch Result Scope Rules
+
+- Inside a branch, you may reference earlier outer steps and earlier steps in the same branch
+- Outside a \`branchone\`, do NOT reference ids of steps that only exist inside its branches or default branch. Use \`results.<branchone_module_id>\` instead
+- Outside a \`branchall\`, do NOT reference ids of steps inside its branches. Use \`results.<branchall_module_id>\` instead
+- If downstream steps need a stable shape after a branch, make each branch return the same fields
+- When needed, add a normalization step immediately after the branch and consume \`results.<branch_module_id>\` there
+
+Correct after \`branchone\`:
+
+\`\`\`yaml
+- id: route_order
+  value:
+    type: branchone
+    ...
+- id: send_confirmation
+  value:
+    input_transforms:
+      routed:
+        type: javascript
+        expr: results.route_order
+\`\`\`
+
+Incorrect after \`branchone\`:
+
+\`\`\`yaml
+expr: results.create_shipment
+expr: results.create_backorder
+\`\`\`
+
+Correct after \`branchall\`:
+
+\`\`\`yaml
+- id: enrich_parallel
+  value:
+    type: branchall
+    parallel: true
+    ...
+- id: combine_data
+  value:
+    input_transforms:
+      enrichments:
+        type: javascript
+        expr: results.enrich_parallel
+\`\`\`
 
 ## Input Transforms
 
@@ -81061,14 +81254,14 @@ JavaScript transform (dynamic expression):
 - For flow inputs: Use type \`"object"\` with format \`"resource-{type}"\` (e.g., \`"resource-postgresql"\`)
 - For step inputs: Use static value \`"$res:path/to/resource"\`
 
-## Failure Handler
+## Final Structural Self-Check
 
-Executes when any step fails. Has access to error details:
+Before finalizing a flow, verify:
 
-- \`error.message\` - Error message
-- \`error.step_id\` - ID of failed step
-- \`error.name\` - Error name
-- \`error.stack\` - Stack trace
+- any preprocessor is in \`value.preprocessor_module\`
+- any failure handler is in \`value.failure_module\`
+- any approval step has module-level \`suspend\`
+- no downstream step references inner branch step ids from outside the branch
 
 ## S3 Object Operations
 
@@ -85186,7 +85379,7 @@ var config_default = command35;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.684.0";
+var VERSION = "1.685.0";
 async function checkVersionSafe(cmd) {
   const mainCommand = cmd.getMainCommand();
   const upgradeCommand = mainCommand.getCommand("upgrade");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.684.0",
+  "version": "1.685.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",