windmill-cli 1.668.2 → 1.668.4

package/esm/main.js

@@ -11812,7 +11812,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv2("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.668.2",
+    VERSION: "1.668.4",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -24671,6 +24671,7 @@ function getHeaders2() {
 async function digestDir(path3, conf) {
   const hashes = [];
   const entries = await readdir(path3, { withFileTypes: true });
+  entries.sort((a, b) => a.name.localeCompare(b.name));
   for (const e of entries) {
     const npath = path3 + "/" + e.name;
     if (e.isFile()) {
@@ -26166,7 +26167,7 @@ Available workspaces:`);
     opts.__secret_workspace = ws;
     return ws;
   }
-  info(colors.red.bold("No workspace given and no default set."));
+  info(colors.red.bold("No workspace given and no default set. Run 'wmill workspace add' to configure one."));
   return process.exit(-1);
 }
 async function fetchVersion(baseUrl2) {
@@ -59228,7 +59229,10 @@ async function push(opts, filePath) {
     const remotePath = removeExtensionToPath(filePath).replaceAll(SEP4, "/");
     const contentHash = await generateHash(content + remotePath);
     const conf = await readLockfile();
-    if (!await checkifMetadataUptodate(remotePath, contentHash, conf)) {
+    const hasLockEntry = conf.locks && (conf.locks[remotePath] !== undefined || conf.locks[`${remotePath}.ts`] !== undefined);
+    if (!hasLockEntry) {
+      warn(colors.yellow(`No metadata generated yet for ${filePath}. Run 'wmill generate-metadata' to generate schema and lock.`));
+    } else if (!await checkifMetadataUptodate(remotePath, contentHash, conf)) {
       warn(colors.yellow(`Metadata for ${filePath} appears stale (content changed since last 'wmill generate-metadata').
 ` + `The schema and lock may not match the current code. Consider running 'wmill generate-metadata' first.`));
     }
@@ -60167,7 +60171,7 @@ var init_script = __esm(async () => {
   languageAliases = {
     python: "python3"
   };
-  command3 = new Command().description("script related commands").option("--show-archived", "Enable archived scripts in output").option("--json", "Output as JSON (for piping to jq)").action(list3).command("list", "list all scripts").option("--show-archived", "Enable archived scripts in output").option("--json", "Output as JSON (for piping to jq)").action(list3).command("push", "push a local script spec. This overrides any remote versions. Use the script file (.ts, .js, .py, .sh)").arguments("<path:file>").option("--message <message:string>", "Deployment message").action(push).command("get", "get a script's details").arguments("<path:file>").option("--json", "Output as JSON (for piping to jq)").action(get).command("show", "show a script's content (alias for get)").arguments("<path:file>").action(show).command("run", "run a script by path").arguments("<path:file>").option("-d --data <data:file>", "Inputs specified as a JSON string or a file using @<filename> or stdin using @-.").option("-s --silent", "Do not output anything other then the final output. Useful for scripting.").action(run2).command("preview", "preview a local script without deploying it. Supports both regular and codebase scripts.").arguments("<path:file>").option("-d --data <data:file>", "Inputs specified as a JSON string or a file using @<filename> or stdin using @-.").option("-s --silent", "Do not output anything other than the final output. Useful for scripting.").action(preview).command("new", "create a new script").arguments("<path:file> <language:string>").option("--summary <summary:string>", "script summary").option("--description <description:string>", "script description").action(bootstrap).command("bootstrap", "create a new script (alias for new)").arguments("<path:file> <language:string>").option("--summary <summary:string>", "script summary").option("--description <description:string>", "script description").action(bootstrap).command("generate-metadata", "re-generate the metadata file updating the lock and the script schema (for flows, use `wmill flow generate-locks`)").arguments("[script:file]").option("--yes", "Skip confirmation prompt").option("--dry-run", "Perform a dry run without making changes").option("--lock-only", "re-generate only the lock").option("--schema-only", "re-generate only script schema").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string)").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which file to NOT take into account.").action(generateMetadata).command("history", "show version history for a script").arguments("<path:string>").option("--json", "Output as JSON (for piping to jq)").action(history);
+  command3 = new Command().description("script related commands").option("--show-archived", "Show archived scripts instead of active ones").option("--json", "Output as JSON (for piping to jq)").action(list3).command("list", "list all scripts").option("--show-archived", "Show archived scripts instead of active ones").option("--json", "Output as JSON (for piping to jq)").action(list3).command("push", "push a local script spec. This overrides any remote versions. Use the script file (.ts, .js, .py, .sh)").arguments("<path:file>").option("--message <message:string>", "Deployment message").action(push).command("get", "get a script's details").arguments("<path:file>").option("--json", "Output as JSON (for piping to jq)").action(get).command("show", "show a script's content (alias for get)").arguments("<path:file>").action(show).command("run", "run a script by path").arguments("<path:file>").option("-d --data <data:file>", "Inputs specified as a JSON string or a file using @<filename> or stdin using @-.").option("-s --silent", "Do not output anything other then the final output. Useful for scripting.").action(run2).command("preview", "preview a local script without deploying it. Supports both regular and codebase scripts.").arguments("<path:file>").option("-d --data <data:file>", "Inputs specified as a JSON string or a file using @<filename> or stdin using @-.").option("-s --silent", "Do not output anything other than the final output. Useful for scripting.").action(preview).command("new", "create a new script").arguments("<path:file> <language:string>").option("--summary <summary:string>", "script summary").option("--description <description:string>", "script description").action(bootstrap).command("bootstrap", "create a new script (alias for new)").arguments("<path:file> <language:string>").option("--summary <summary:string>", "script summary").option("--description <description:string>", "script description").action(bootstrap).command("generate-metadata", "re-generate the metadata file updating the lock and the script schema (for flows, use `wmill flow generate-locks`)").arguments("[script:file]").option("--yes", "Skip confirmation prompt").option("--dry-run", "Perform a dry run without making changes").option("--lock-only", "re-generate only the lock").option("--schema-only", "re-generate only script schema").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string)").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which file to NOT take into account.").action(generateMetadata).command("history", "show version history for a script").arguments("<path:string>").option("--json", "Output as JSON (for piping to jq)").action(history);
   script_default = command3;
 });
 
@@ -60556,7 +60560,8 @@ async function runLint(opts, directory) {
   if (!stats.isDirectory()) {
     throw new Error(`Path is not a directory: ${targetDirectory}`);
   }
-  const ignore = await ignoreF(mergedOpts);
+  const isSubdirectory = explicitTargetDirectory && !await stat4(path6.join(targetDirectory, "wmill.yaml")).catch(() => null);
+  const ignore = isSubdirectory ? (_p, _isDir) => false : await ignoreF(mergedOpts);
   const root = await FSFSElement(targetDirectory, [], false);
   const validator = new import_windmill_yaml_validator.WindmillYamlValidator;
   const warnings = [];
@@ -60569,8 +60574,8 @@ async function runLint(opts, directory) {
     if (entry.isDirectory || entry.ignored) {
       continue;
     }
-    scannedFiles += 1;
     const normalizedPath = normalizePath(entry.path);
+    scannedFiles += 1;
     if (!YAML_FILE_REGEX.test(normalizedPath)) {
       continue;
     }
@@ -60654,6 +60659,10 @@ function printReport(report, jsonOutput) {
   }
 }
 async function lint(opts, directory) {
+  if (opts.watch) {
+    await lintWatch(opts, directory);
+    return;
+  }
   try {
     const report = await runLint(opts, directory);
     printReport(report, !!opts.json);
@@ -60674,6 +60683,32 @@ async function lint(opts, directory) {
     process12.exit(1);
   }
 }
+async function lintWatch(opts, directory) {
+  const { watch } = await import("node:fs");
+  const targetDir = directory ? path6.resolve(process12.cwd(), directory) : process12.cwd();
+  info(colors.blue(`Watching ${targetDir} for changes... (Ctrl+C to stop)`));
+  async function runAndReport() {
+    try {
+      const report = await runLint(opts, directory);
+      process12.stdout.write("\x1Bc");
+      info(colors.gray(`[${new Date().toLocaleTimeString()}] Lint results:
+`));
+      printReport(report, false);
+    } catch (error2) {
+      error(error2 instanceof Error ? error2.message : String(error2));
+    }
+  }
+  await runAndReport();
+  let debounce = null;
+  watch(targetDir, { recursive: true }, (_event, filename) => {
+    if (!filename || !filename.toString().endsWith(".yaml") && !filename.toString().endsWith(".yml"))
+      return;
+    if (debounce)
+      clearTimeout(debounce);
+    debounce = setTimeout(runAndReport, 300);
+  });
+  await new Promise(() => {});
+}
 var import_windmill_yaml_validator, YAML_FILE_REGEX, NATIVE_TRIGGER_REGEX, command4, lint_default;
 var init_lint = __esm(async () => {
   init_colors2();
@@ -60690,7 +60725,7 @@ var init_lint = __esm(async () => {
   import_windmill_yaml_validator = __toESM(require_dist3(), 1);
   YAML_FILE_REGEX = /\.ya?ml$/i;
   NATIVE_TRIGGER_REGEX = /\.[^.]+_native_trigger\.ya?ml$/i;
-  command4 = new Command().description("Validate Windmill flow, schedule, and trigger YAML files in a directory").arguments("[directory:string]").option("--json", "Output results in JSON format").option("--fail-on-warn", "Exit with code 1 when warnings are emitted").option("--locks-required", "Fail if scripts or flow inline scripts that need locks have no locks").action(lint);
+  command4 = new Command().description("Validate Windmill flow, schedule, and trigger YAML files in a directory").arguments("[directory:string]").option("--json", "Output results in JSON format").option("--fail-on-warn", "Exit with code 1 when warnings are emitted").option("--locks-required", "Fail if scripts or flow inline scripts that need locks have no locks").option("-w, --watch", "Watch for file changes and re-lint automatically").action(lint);
   lint_default = command4;
 });
 
@@ -61084,7 +61119,7 @@ var init_extractor = __esm(() => {
 });
 
 // windmill-utils-internal/src/inline-scripts/replacer.ts
-async function replaceRawscriptInline(id, rawscript, fileReader, logger, separator, removeLocks) {
+async function replaceRawscriptInline(id, rawscript, fileReader, logger, separator, removeLocks, missingFiles) {
   if (!rawscript.content || !rawscript.content.startsWith("!inline")) {
     return;
   }
@@ -61099,6 +61134,8 @@ async function replaceRawscriptInline(id, rawscript, fileReader, logger, separat
       rawscript.content = await fileReader(newPath);
     } catch {
       logger.error(`Script file ${newPath} not found`);
+      if (missingFiles)
+        missingFiles.push(path7);
     }
   }
   const lock = rawscript.lock;
@@ -61117,34 +61154,36 @@ async function replaceRawscriptInline(id, rawscript, fileReader, logger, separat
 async function replaceInlineScripts(modules, fileReader, logger = {
   info: () => {},
   error: () => {}
-}, localPath, separator = "/", removeLocks) {
+}, localPath, separator = "/", removeLocks, missingFiles) {
+  const missing = missingFiles ?? [];
   await Promise.all(modules.map(async (module) => {
     if (!module.value) {
       throw new Error(`Module value is undefined for module ${module.id}`);
     }
     if (module.value.type === "rawscript") {
-      await replaceRawscriptInline(module.id, module.value, fileReader, logger, separator, removeLocks);
+      await replaceRawscriptInline(module.id, module.value, fileReader, logger, separator, removeLocks, missing);
     } else if (module.value.type === "forloopflow" || module.value.type === "whileloopflow") {
-      await replaceInlineScripts(module.value.modules, fileReader, logger, localPath, separator, removeLocks);
+      await replaceInlineScripts(module.value.modules, fileReader, logger, localPath, separator, removeLocks, missing);
     } else if (module.value.type === "branchall") {
       await Promise.all(module.value.branches.map(async (branch) => {
-        await replaceInlineScripts(branch.modules, fileReader, logger, localPath, separator, removeLocks);
+        await replaceInlineScripts(branch.modules, fileReader, logger, localPath, separator, removeLocks, missing);
       }));
     } else if (module.value.type === "branchone") {
       await Promise.all(module.value.branches.map(async (branch) => {
-        await replaceInlineScripts(branch.modules, fileReader, logger, localPath, separator, removeLocks);
+        await replaceInlineScripts(branch.modules, fileReader, logger, localPath, separator, removeLocks, missing);
       }));
-      await replaceInlineScripts(module.value.default, fileReader, logger, localPath, separator, removeLocks);
+      await replaceInlineScripts(module.value.default, fileReader, logger, localPath, separator, removeLocks, missing);
     } else if (module.value.type === "aiagent") {
       await Promise.all((module.value.tools ?? []).map(async (tool) => {
         const toolValue = tool.value;
         if (!toolValue || toolValue.tool_type !== "flowmodule" || toolValue.type !== "rawscript") {
           return;
         }
-        await replaceRawscriptInline(tool.id, toolValue, fileReader, logger, separator, removeLocks);
+        await replaceRawscriptInline(tool.id, toolValue, fileReader, logger, separator, removeLocks, missing);
       }));
     }
   }));
+  return missing;
 }
 async function replacePathScriptsWithLocal(modules, scriptReader, logger = {
   info: () => {},
@@ -61930,12 +61969,13 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             let inlineScripts;
             try {
               const assigner = newPathAssigner(defaultTs, { skipInlineScriptSuffix: getNonDottedPaths() });
-              inlineScripts = extractInlineScripts(flow.value.modules, {}, SEP8, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths() });
+              const inlineMapping = extractCurrentMapping(flow.value.modules, {}, flow.value.failure_module, flow.value.preprocessor_module);
+              inlineScripts = extractInlineScripts(flow.value.modules, inlineMapping, SEP8, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths() });
               if (flow.value.failure_module) {
-                inlineScripts.push(...extractInlineScripts([flow.value.failure_module], {}, SEP8, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths() }));
+                inlineScripts.push(...extractInlineScripts([flow.value.failure_module], inlineMapping, SEP8, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths() }));
               }
               if (flow.value.preprocessor_module) {
-                inlineScripts.push(...extractInlineScripts([flow.value.preprocessor_module], {}, SEP8, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths() }));
+                inlineScripts.push(...extractInlineScripts([flow.value.preprocessor_module], inlineMapping, SEP8, defaultTs, assigner, { skipInlineScriptSuffix: getNonDottedPaths() }));
               }
             } catch (error2) {
               error(`Failed to extract inline scripts for flow at path: ${p}`);
@@ -62537,6 +62577,10 @@ async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetada
         continue;
       }
       if (k.startsWith("dependencies/")) {
+        if (!workspaceDependenciesPathToLanguageAndFilename(k)) {
+          warn(`Skipping unrecognized workspace dependencies file: ${k}`);
+          continue;
+        }
         info(`Adding workspace dependencies file: ${k}`);
       }
       changes.push({ name: "added", path: k, content: v });
@@ -70044,44 +70088,39 @@ async function push9(opts, filePath) {
   await pushWorkspaceDependencies(workspace.workspaceId, filePath, null, content);
 }
 async function pushWorkspaceDependencies(workspace, path18, _befObj, newDependenciesContent) {
+  const res = workspaceDependenciesPathToLanguageAndFilename(path18);
+  if (!res) {
+    throw new Error(`Unknown workspace dependencies file format: ${path18}. ` + `Valid files: package.json, requirements.in, composer.json, go.mod, modules.json`);
+  }
+  const { language, name } = res;
+  const displayName = name ? `named dependencies "${name}"` : `workspace default dependencies`;
   try {
-    const res = workspaceDependenciesPathToLanguageAndFilename(path18);
-    if (!res) {
-      throw new Error(`Unknown workspace dependencies file format: ${path18}`);
-    }
-    const { language, name } = res;
-    const displayName = name ? `named dependencies "${name}"` : `workspace default dependencies`;
-    try {
-      const remoteDeps = await getLatestWorkspaceDependencies({
-        workspace,
-        language,
-        name
-      });
-      if (remoteDeps && remoteDeps.content === newDependenciesContent) {
-        info(colors.green(`${displayName} for ${language} are up-to-date, skipping push`));
-        return;
-      }
-    } catch (e) {
-      if (e.status !== 404 && !e.message?.includes("not found")) {
-        throw e;
-      }
-    }
-    info(colors.yellow(`Pushing ${name ? "named" : "workspace default"} dependencies for ${language}...`));
-    await createWorkspaceDependencies({
+    const remoteDeps = await getLatestWorkspaceDependencies({
       workspace,
-      requestBody: {
-        name,
-        content: newDependenciesContent,
-        language,
-        workspace_id: workspace,
-        description: undefined
-      }
+      language,
+      name
     });
-    info(colors.green(`Successfully pushed ${displayName} for ${language}`));
-  } catch (error2) {
-    error(colors.red(`Failed to push workspace dependencies: ${error2.message}`));
-    throw error2;
+    if (remoteDeps && remoteDeps.content === newDependenciesContent) {
+      info(colors.green(`${displayName} for ${language} are up-to-date, skipping push`));
+      return;
+    }
+  } catch (e) {
+    if (e.status !== 404 && !e.message?.includes("not found")) {
+      throw e;
+    }
   }
+  info(colors.yellow(`Pushing ${name ? "named" : "workspace default"} dependencies for ${language}...`));
+  await createWorkspaceDependencies({
+    workspace,
+    requestBody: {
+      name,
+      content: newDependenciesContent,
+      language,
+      workspace_id: workspace,
+      description: undefined
+    }
+  });
+  info(colors.green(`Successfully pushed ${displayName} for ${language}`));
 }
 var command19, dependencies_default;
 var init_dependencies = __esm(async () => {
@@ -70289,6 +70328,26 @@ async function newTrigger(opts, path18) {
   });
   info(colors.green(`Created ${filePath}`));
 }
+function printTriggerDetails(trigger, kind) {
+  console.log(colors.bold("Path:") + " " + trigger.path);
+  console.log(colors.bold("Kind:") + " " + kind);
+  console.log(colors.bold("Enabled:") + " " + (trigger.enabled ?? trigger.mode ?? "-"));
+  console.log(colors.bold("Script Path:") + " " + (trigger.script_path ?? ""));
+  console.log(colors.bold("Is Flow:") + " " + (trigger.is_flow ? "true" : "false"));
+  for (const [key, value] of Object.entries(trigger)) {
+    if (["path", "enabled", "mode", "script_path", "is_flow"].includes(key))
+      continue;
+    if (TRIGGER_SKIP_FIELDS.has(key))
+      continue;
+    if (value === undefined || value === null || value === "")
+      continue;
+    const display = Array.isArray(value) ? value.length > 0 ? JSON.stringify(value) : "[]" : typeof value === "object" ? JSON.stringify(value) : String(value);
+    if (display === "[]" || display === "{}")
+      continue;
+    const label = key.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
+    console.log(colors.bold(label + ":") + " " + display);
+  }
+}
 async function get8(opts, path18) {
   if (opts.json)
     setSilent(true);
@@ -70302,11 +70361,7 @@ async function get8(opts, path18) {
     if (opts.json) {
       console.log(JSON.stringify(trigger));
     } else {
-      console.log(colors.bold("Path:") + " " + trigger.path);
-      console.log(colors.bold("Kind:") + " " + opts.kind);
-      console.log(colors.bold("Enabled:") + " " + (trigger.enabled ?? "-"));
-      console.log(colors.bold("Script Path:") + " " + (trigger.script_path ?? ""));
-      console.log(colors.bold("Is Flow:") + " " + (trigger.is_flow ? "true" : "false"));
+      printTriggerDetails(trigger, opts.kind);
     }
     return;
   }
@@ -70325,11 +70380,7 @@ async function get8(opts, path18) {
     if (opts.json) {
       console.log(JSON.stringify(trigger));
     } else {
-      console.log(colors.bold("Path:") + " " + trigger.path);
-      console.log(colors.bold("Kind:") + " " + kind);
-      console.log(colors.bold("Enabled:") + " " + (trigger.enabled ?? trigger.mode ?? "-"));
-      console.log(colors.bold("Script Path:") + " " + (trigger.script_path ?? ""));
-      console.log(colors.bold("Is Flow:") + " " + (trigger.is_flow ? "true" : "false"));
+      printTriggerDetails(trigger, kind);
     }
     return;
   }
@@ -70426,7 +70477,7 @@ async function push10(opts, filePath, remotePath) {
   await pushTrigger(triggerKind, workspace.workspaceId, remotePath, undefined, parseFromFile(filePath));
   console.log(colors.bold.underline.green("Trigger pushed"));
 }
-var import_yaml33, triggerTemplates, command20, trigger_default;
+var import_yaml33, triggerTemplates, TRIGGER_SKIP_FIELDS, command20, trigger_default;
 var init_trigger = __esm(async () => {
   init_services_gen();
   init_mod3();
@@ -70518,9 +70569,11 @@ var init_trigger = __esm(async () => {
     email: {
       script_path: "",
       is_flow: false,
+      local_part: "",
       enabled: false
     }
   };
+  TRIGGER_SKIP_FIELDS = new Set(["workspace_id", "extra_perms", "edited_by", "edited_at"]);
   command20 = new Command().description("trigger related commands").option("--json", "Output as JSON (for piping to jq)").action(list11).command("list", "list all triggers").option("--json", "Output as JSON (for piping to jq)").action(list11).command("get", "get a trigger's details").arguments("<path:string>").option("--json", "Output as JSON (for piping to jq)").option("--kind <kind:string>", "Trigger kind (http, websocket, kafka, nats, postgres, mqtt, sqs, gcp, email). Recommended for faster lookup").action(get8).command("new", "create a new trigger locally").arguments("<path:string>").option("--kind <kind:string>", "Trigger kind (required: http, websocket, kafka, nats, postgres, mqtt, sqs, gcp, email)").action(newTrigger).command("push", "push a local trigger spec. This overrides any remote versions.").arguments("<file_path:string> <remote_path:string>").action(push10);
   trigger_default = command20;
 });
@@ -70970,12 +71023,16 @@ async function pushFlow(workspace, remotePath, localPath, message) {
   }
   const localFlow = await yamlParseFile(localPath + "flow.yaml");
   const fileReader = async (path19) => await readFile15(localPath + path19, "utf-8");
-  await replaceInlineScripts(localFlow.value.modules, fileReader, exports_log, localPath, SEP19);
+  const missingFiles = [];
+  await replaceInlineScripts(localFlow.value.modules, fileReader, exports_log, localPath, SEP19, undefined, missingFiles);
   if (localFlow.value.failure_module) {
-    await replaceInlineScripts([localFlow.value.failure_module], fileReader, exports_log, localPath, SEP19);
+    await replaceInlineScripts([localFlow.value.failure_module], fileReader, exports_log, localPath, SEP19, undefined, missingFiles);
   }
   if (localFlow.value.preprocessor_module) {
-    await replaceInlineScripts([localFlow.value.preprocessor_module], fileReader, exports_log, localPath, SEP19);
+    await replaceInlineScripts([localFlow.value.preprocessor_module], fileReader, exports_log, localPath, SEP19, undefined, missingFiles);
+  }
+  if (missingFiles.length > 0) {
+    warn(colors.yellow(`Warning: missing inline script file(s): ${missingFiles.join(", ")}. ` + `The flow will be pushed with unresolved !inline references.`));
   }
   if (flow) {
     if (isSuperset(localFlow, flow)) {
@@ -71064,12 +71121,29 @@ async function get9(opts, path19) {
     console.log(colors.bold("Edited at:") + " " + (f.edited_at ?? ""));
     const modules = f.value?.modules;
     if (modules && Array.isArray(modules) && modules.length > 0) {
+      let printModules = function(mods, indent = "  ") {
+        for (const mod of mods) {
+          const type = mod.value?.type ?? "unknown";
+          const detail = mod.value?.language ?? mod.value?.path ?? "";
+          console.log(`${indent}${mod.id}: ${type}${detail ? " (" + detail + ")" : ""}`);
+          if (type === "branchall" || type === "branchone") {
+            for (const branch of mod.value?.branches ?? []) {
+              console.log(`${indent}  Branch: ${branch.summary || "(default)"}`);
+              if (branch.modules)
+                printModules(branch.modules, indent + "    ");
+            }
+            if (type === "branchone" && mod.value?.default) {
+              console.log(`${indent}  Default:`);
+              printModules(mod.value.default, indent + "    ");
+            }
+          } else if (type === "forloopflow" || type === "whileloopflow") {
+            if (mod.value?.modules)
+              printModules(mod.value.modules, indent + "  ");
+          }
+        }
+      };
       console.log(colors.bold("Steps:"));
-      for (const mod of modules) {
-        const type = mod.value?.type ?? "unknown";
-        const detail = mod.value?.language ?? mod.value?.path ?? "";
-        console.log(`  ${mod.id}: ${type}${detail ? " (" + detail + ")" : ""}`);
-      }
+      printModules(modules);
     }
   }
 }
@@ -71230,7 +71304,6 @@ async function preview2(opts, flowPath) {
         process.exitCode = 1;
         return;
       }
-      error(`Flow preview failed: ${JSON.stringify(e.body)}`);
     }
     throw e;
   }
@@ -79540,6 +79613,7 @@ Validate Windmill flow, schedule, and trigger YAML files in a directory
 - \`--json\` - Output results in JSON format
 - \`--fail-on-warn\` - Exit with code 1 when warnings are emitted
 - \`--locks-required\` - Fail if scripts or flow inline scripts that need locks have no locks
+- \`-w, --watch\` - Watch for file changes and re-lint automatically
 
 ### queues
 
@@ -79608,13 +79682,13 @@ schedule related commands
 script related commands
 
 **Options:**
-- \`--show-archived\` - Enable archived scripts in output
+- \`--show-archived\` - Show archived scripts instead of active ones
 - \`--json\` - Output as JSON (for piping to jq)
 
 **Subcommands:**
 
 - \`script list\` - list all scripts
-  - \`--show-archived\` - Enable archived scripts in output
+  - \`--show-archived\` - Show archived scripts instead of active ones
   - \`--json\` - Output as JSON (for piping to jq)
 - \`script push <path:file>\` - push a local script spec. This overrides any remote versions. Use the script file (.ts, .js, .py, .sh
   - \`--message <message:string>\` - Deployment message
@@ -81581,17 +81655,19 @@ async function list13(opts) {
   let successFilter = opts.success;
   if (opts.failed)
     successFilter = false;
-  const jobs = await listJobs({
+  const limit = Math.min(opts.limit ?? 30, 100);
+  const allJobs = await listJobs({
     workspace: workspace.workspaceId,
     scriptPathExact: opts.scriptPath,
     createdBy: opts.createdBy,
     running: opts.running,
     success: successFilter,
-    perPage: Math.min(opts.limit ?? 30, 100),
+    perPage: limit,
     jobKinds: opts.jobKinds ?? "script,flow,singlestepflow",
     label: opts.label,
     hasNullParent: opts.all ? undefined : true
   });
+  const jobs = allJobs.slice(0, limit);
   if (opts.json) {
     console.log(JSON.stringify(jobs));
   } else {
@@ -82266,7 +82342,7 @@ var config_default = command35;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.668.2";
+var VERSION = "1.668.4";
 var command36 = new Command().name("wmill").action(() => info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`)).description("Windmill CLI").globalOption("--workspace <workspace:string>", "Specify the target workspace. This overrides the default workspace.").globalOption("--debug --verbose", "Show debug/verbose logs").globalOption("--show-diffs", "Show diff informations when syncing (may show sensitive informations)").globalOption("--token <token:string>", "Specify an API token. This will override any stored token.").globalOption("--base-url <baseUrl:string>", "Specify the base URL of the API. If used, --token and --workspace are required and no local remote/workspace already set will be used.").globalOption("--config-dir <configDir:string>", "Specify a custom config directory. Overrides WMILL_CONFIG_DIR environment variable and default ~/.config location.").env("HEADERS <headers:string>", `Specify headers to use for all requests. e.g: "HEADERS='h1: v1, h2: v2'"`).version(VERSION).versionOption(false).command("init", init_default).command("app", app_default).command("flow", flow_default).command("script", script_default).command("workspace", workspace_default).command("resource", resource_default).command("resource-type", resource_type_default).command("user", user_default).command("variable", variable_default).command("hub", hub_default).command("folder", folder_default).command("schedule", schedule_default).command("trigger", trigger_default).command("dev", dev_default2).command("sync", sync_default).command("lint", lint_default).command("gitsync-settings", gitsync_settings_default).command("instance", instance_default).command("worker-groups", worker_groups_default).command("workers", workers_default).command("queues", queues_default).command("dependencies", dependencies_default).command("jobs", jobs_default).command("job", job_default).command("group", group_default).command("audit", audit_default).command("token", token_default).command("generate-metadata", generate_metadata_default).command("docs", docs_default).command("config", config_default).command("version --version", "Show version information").action(async (opts) => {
   console.log("CLI version: " + VERSION);
   try {
@@ -82324,7 +82400,8 @@ async function main2() {
   } catch (e) {
     if (e && typeof e === "object" && "name" in e && e.name === "ApiError") {
       const body = e.body;
-      const bodyStr = typeof body === "object" && body !== null ? JSON.stringify(body) : body;
+      let bodyStr = typeof body === "object" && body !== null ? JSON.stringify(body) : String(body ?? "");
+      bodyStr = bodyStr.replace(/\s*[@(]\w+\.rs:\d+[:\d]*\)?/g, "");
       error("Server failed. " + e.statusText + ": " + bodyStr);
     } else if (e instanceof Error) {
       error(e.message);

package/package.json

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