windmill-cli 1.669.1 → 1.671.0

package/esm/main.js

@@ -11812,7 +11812,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv2("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.669.1",
+    VERSION: "1.671.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -61430,7 +61430,13 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
       await replaceInlineScripts([flowValue.value.preprocessor_module], fileReader, exports_log, folder + SEP7, SEP7, locksToRemove);
     }
     const tempScriptRefs = tree?.getTempScriptRefs(folderNormalized);
+    const savedNotes = flowValue.value.notes;
+    const savedGroups = flowValue.value.groups;
     flowValue.value = await updateFlow2(workspace, flowValue.value, remote_path, filteredDeps, tempScriptRefs);
+    if (savedNotes !== undefined)
+      flowValue.value.notes = savedNotes;
+    if (savedGroups !== undefined)
+      flowValue.value.groups = savedGroups;
     const lockAssigner = newPathAssigner(opts.defaultTs ?? "bun", {
       skipInlineScriptSuffix: getNonDottedPaths()
     });
@@ -61444,7 +61450,7 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
     inlineScripts.forEach((s) => {
       writeIfChanged(process.cwd() + SEP7 + folder + SEP7 + s.path, s.content);
     });
-    writeIfChanged(process.cwd() + SEP7 + folder + SEP7 + "flow.yaml", import_yaml8.stringify(flowValue));
+    writeIfChanged(process.cwd() + SEP7 + folder + SEP7 + "flow.yaml", import_yaml8.stringify(flowValue, yamlOptions));
   }
   const depsForHash = tree && !legacyBehaviour ? {} : filteredDeps;
   const finalHashes = await generateFlowHash(depsForHash, folder, opts.defaultTs);
@@ -71172,28 +71178,89 @@ async function run3(opts, path19) {
     path: path19,
     requestBody: input
   });
+  const stepLabels = new Map;
+  try {
+    const initialJob = await getJob({
+      workspace: workspace.workspaceId,
+      id
+    });
+    const rawFlow = initialJob.raw_flow;
+    if (rawFlow?.modules) {
+      for (const mod of rawFlow.modules) {
+        if (mod.id) {
+          const label = mod.summary ? `${mod.id}: ${mod.summary}` : mod.id;
+          stepLabels.set(mod.id, label);
+        }
+      }
+    }
+  } catch {}
   let i = 0;
+  let lastStatus = "";
   while (true) {
     const jobInfo = await getJob({
       workspace: workspace.workspaceId,
       id
     });
-    if (jobInfo.flow_status.modules.length <= i) {
+    const isCompleted = jobInfo.type === "CompletedJob";
+    const flowStatus = jobInfo.flow_status;
+    if (flowStatus.modules.length <= i) {
       break;
     }
-    const module = jobInfo.flow_status.modules[i];
-    if (module.job) {
-      if (!opts.silent) {
-        info("====== Job " + (i + 1) + " ======");
+    const module = flowStatus.modules[i];
+    if (module.type === "Failure") {
+      if (module.job && !opts.silent) {
+        const label = stepLabels.get(module.id) ?? `Step ${i + 1}`;
+        info("====== " + label + " ======");
         await track_job(workspace.workspaceId, module.job);
       }
+      break;
+    }
+    if (module.job) {
+      const label = stepLabels.get(module.id) ?? `Step ${i + 1}`;
+      const isForLoop = module.flow_jobs !== undefined;
+      if (isForLoop) {
+        let trackedIterations = 0;
+        let forLoopFailed = false;
+        while (true) {
+          const refreshed = await getJob({
+            workspace: workspace.workspaceId,
+            id
+          });
+          const refreshedModule = refreshed.flow_status.modules[i];
+          const flowJobs = refreshedModule.flow_jobs ?? [];
+          while (trackedIterations < flowJobs.length) {
+            if (!opts.silent) {
+              info(`====== ${label} (iteration ${trackedIterations}) ======`);
+              await track_job(workspace.workspaceId, flowJobs[trackedIterations]);
+            }
+            trackedIterations++;
+          }
+          if (refreshedModule.type === "Success" || refreshedModule.type === "Failure") {
+            forLoopFailed = refreshedModule.type === "Failure";
+            break;
+          }
+          await new Promise((resolve8) => setTimeout(resolve8, 200));
+        }
+        if (forLoopFailed)
+          break;
+      } else {
+        if (!opts.silent) {
+          info("====== " + label + " ======");
+          await track_job(workspace.workspaceId, module.job);
+        }
+      }
     } else {
-      if (!opts.silent) {
-        info(module.type);
+      const status = String(module.type);
+      if (!opts.silent && status !== lastStatus) {
+        info(colors.dim(status));
+        lastStatus = status;
       }
       await new Promise((resolve8, _) => setTimeout(() => resolve8(undefined), 100));
+      if (isCompleted)
+        break;
       continue;
     }
+    lastStatus = "";
     i++;
   }
   const MAX_RETRIES = 600;
@@ -71205,7 +71272,11 @@ async function run3(opts, path19) {
         id
       });
       if (!opts.silent) {
-        info(colors.green.underline.bold("Flow ran to completion"));
+        if (jobInfo.success === false) {
+          info(colors.red.underline.bold("Flow failed"));
+        } else {
+          info(colors.green.underline.bold("Flow ran to completion"));
+        }
         info(`
 `);
       }
@@ -79427,7 +79498,7 @@ flow related commands
 - \`flow new <flow_path:string>\` - create a new empty flow
   - \`--summary <summary:string>\` - flow summary
   - \`--description <description:string>\` - flow description
-- \`flow bootstrap <flow_path:string>\` - create a new empty flow (alias for new
+- \`flow bootstrap <flow_path:string>\` - create a new empty flow (alias for new)
   - \`--summary <summary:string>\` - flow summary
   - \`--description <description:string>\` - flow description
 - \`flow history <path:string>\` - Show version history for a flow
@@ -79580,10 +79651,10 @@ Manage jobs (list, inspect, cancel)
 **Subcommands:**
 
 - \`job list\` - List recent jobs
-- \`job get <id:string>\` - Get job details and result
+- \`job get <id:string>\` - Get job details. For flows: shows step tree with sub-job IDs
   - \`--json\` - Output as JSON (for piping to jq)
-- \`job result <id:string>\` - Get the result of a completed job (machine-friendly
-- \`job logs <id:string>\` - Get job logs
+- \`job result <id:string>\` - Get the result of a completed job (machine-friendly)
+- \`job logs <id:string>\` - Get job logs. For flows: aggregates all step logs
 - \`job cancel <id:string>\` - Cancel a running or queued job
   - \`--reason <reason:string>\` - Reason for cancellation
 
@@ -79690,11 +79761,11 @@ script related commands
 - \`script list\` - list all scripts
   - \`--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
+- \`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
 - \`script get <path:file>\` - get a script's details
   - \`--json\` - Output as JSON (for piping to jq)
-- \`script show <path:file>\` - show a script's content (alias for get
+- \`script show <path:file>\` - show a script's content (alias for get)
 - \`script run <path:file>\` - run a script by path
   - \`-d --data <data:file>\` - Inputs specified as a JSON string or a file using @<filename> or stdin using @-.
   - \`-s --silent\` - Do not output anything other then the final output. Useful for scripting.
@@ -79704,10 +79775,10 @@ script related commands
 - \`script new <path:file> <language:string>\` - create a new script
   - \`--summary <summary:string>\` - script summary
   - \`--description <description:string>\` - script description
-- \`script bootstrap <path:file> <language:string>\` - create a new script (alias for new
+- \`script bootstrap <path:file> <language:string>\` - create a new script (alias for new)
   - \`--summary <summary:string>\` - script summary
   - \`--description <description:string>\` - script description
-- \`script generate-metadata [script:file]\` - re-generate the metadata file updating the lock and the script schema (for flows, use \`wmill flow generate-locks\`
+- \`script generate-metadata [script:file]\` - re-generate the metadata file updating the lock and the script schema (for flows, use \`wmill flow generate-locks\`)
   - \`--yes\` - Skip confirmation prompt
   - \`--dry-run\` - Perform a dry run without making changes
   - \`--lock-only\` - re-generate only the lock
@@ -80171,6 +80242,13 @@ properties:
         key:
           type: string
         value: {}
+  filter_logic:
+    type: string
+    enum:
+    - and
+    - or
+    description: Logic to apply when evaluating filters. 'and' requires all filters
+      to match, 'or' requires any filter to match.
   auto_offset_reset:
     type: string
     enum:
@@ -80698,6 +80776,13 @@ properties:
         value: {}
     description: Array of key-value filters to match incoming messages (only matching
       messages trigger the script)
+  filter_logic:
+    type: string
+    enum:
+    - and
+    - or
+    description: Logic to apply when evaluating filters. 'and' requires all filters
+      to match, 'or' requires any filter to match.
   initial_messages:
     type: array
     items:
@@ -81655,6 +81740,8 @@ async function list13(opts) {
   let successFilter = opts.success;
   if (opts.failed)
     successFilter = false;
+  const showSubJobs = opts.all || opts.parent;
+  const defaultJobKinds = showSubJobs ? "script,flow,singlestepflow,flowscript,flowdependencies" : "script,flow,singlestepflow";
   const limit = Math.min(opts.limit ?? 30, 100);
   const allJobs = await listJobs({
     workspace: workspace.workspaceId,
@@ -81663,9 +81750,11 @@ async function list13(opts) {
     running: opts.running,
     success: successFilter,
     perPage: limit,
-    jobKinds: opts.jobKinds ?? "script,flow,singlestepflow",
+    jobKinds: opts.jobKinds ?? defaultJobKinds,
     label: opts.label,
-    hasNullParent: opts.all ? undefined : true
+    hasNullParent: showSubJobs ? undefined : true,
+    parentJob: opts.parent,
+    isFlowStep: opts.isFlowStep
   });
   const jobs = allJobs.slice(0, limit);
   if (opts.json) {
@@ -81687,6 +81776,64 @@ async function list13(opts) {
 Showing ${jobs.length} job(s). Use --limit to show more.`);
   }
 }
+function getModuleStatusIcon(type, success) {
+  switch (type) {
+    case "Success":
+      return colors.green("✓");
+    case "Failure":
+      return colors.red("✗");
+    case "InProgress":
+      return colors.blue("▶");
+    case "WaitingForPriorSteps":
+      return colors.dim("○");
+    case "WaitingForEvents":
+      return colors.yellow("⏳");
+    default:
+      return colors.dim("·");
+  }
+}
+function formatFlowSteps(flowStatus, rawFlow) {
+  const modules = flowStatus?.modules ?? [];
+  const rawModules = rawFlow?.modules ?? [];
+  const summaryMap = new Map;
+  for (const mod of rawModules) {
+    if (mod.id && mod.summary) {
+      summaryMap.set(mod.id, mod.summary);
+    }
+  }
+  console.log(colors.bold(`
+Steps:`));
+  for (const mod of modules) {
+    const icon = getModuleStatusIcon(mod.type);
+    const summary = summaryMap.get(mod.id) ?? "";
+    const label = summary ? `${mod.id}: ${summary}` : mod.id;
+    const jobId = mod.job ? colors.dim(mod.job) : "";
+    const flowJobsDuration = mod.flow_jobs_duration;
+    const flowJobs = mod.flow_jobs;
+    if (flowJobs && flowJobs.length > 0) {
+      const totalMs = flowJobsDuration?.duration_ms ? flowJobsDuration.duration_ms.reduce((a, b) => a + b, 0) : undefined;
+      const durationStr = totalMs != null ? colors.dim(formatDuration(totalMs)) : "";
+      console.log(`  ${icon} ${label}  ${durationStr}`);
+      const flowJobsSuccess = mod.flow_jobs_success ?? [];
+      const durationMs = flowJobsDuration?.duration_ms ?? [];
+      for (let iter = 0;iter < flowJobs.length; iter++) {
+        const iterSuccess = flowJobsSuccess[iter];
+        const iterIcon = iterSuccess === true ? colors.green("✓") : iterSuccess === false ? colors.red("✗") : colors.dim("·");
+        const iterDur = durationMs[iter] != null ? colors.dim(formatDuration(durationMs[iter])) : "";
+        const iterJobId = colors.dim(flowJobs[iter]);
+        console.log(`    ${iterIcon} iteration ${iter}  ${iterJobId}  ${iterDur}`);
+      }
+    } else {
+      const durationStr = mod.duration_ms != null ? colors.dim(formatDuration(mod.duration_ms)) : "";
+      console.log(`  ${icon} ${label}  ${jobId}  ${durationStr}`);
+    }
+  }
+  const hasJobs = modules.some((m) => m.job);
+  if (hasJobs) {
+    console.log(colors.dim(`
+Use 'wmill job logs <job-id>' for step logs`));
+  }
+}
 async function get10(opts, id) {
   if (opts.json)
     setSilent(true);
@@ -81716,8 +81863,13 @@ async function get10(opts, id) {
     if (j.schedule_path) {
       console.log(colors.bold("Schedule:") + " " + j.schedule_path);
     }
+    const isFlow = j.job_kind === "flow" || j.job_kind === "flowpreview";
+    if (isFlow && j.flow_status) {
+      formatFlowSteps(j.flow_status, j.raw_flow);
+    }
     if (j.result !== undefined) {
-      console.log(colors.bold("Result:"));
+      console.log(colors.bold(`
+Result:`));
       console.log(JSON.stringify(j.result, null, 2));
     }
   }
@@ -81742,10 +81894,55 @@ async function logs(opts, id) {
       workspace: workspace.workspaceId,
       id
     });
-    const jobKind = job.job_kind;
-    if (jobKind === "flow" || jobKind === "flowpreview") {
-      info(colors.yellow(`Flow jobs don't have direct logs. Each step runs as a separate job.
-` + "Use 'wmill job list --all' to see sub-jobs, then 'wmill job logs <sub-job-id>' for individual step logs."));
+    const j = job;
+    const jobKind = j.job_kind;
+    if ((jobKind === "flow" || jobKind === "flowpreview") && j.flow_status?.modules) {
+      const modules = j.flow_status.modules;
+      const rawModules = j.raw_flow?.modules ?? [];
+      const summaryMap = new Map;
+      for (const mod of rawModules) {
+        if (mod.id && mod.summary)
+          summaryMap.set(mod.id, mod.summary);
+      }
+      const stripHint = (text) => text.replace(/^to remove ansi colors.*\n?/gm, "");
+      let hasLogs = false;
+      for (const mod of modules) {
+        const summary = summaryMap.get(mod.id) ?? "";
+        const label = summary ? `${mod.id}: ${summary}` : mod.id;
+        const flowJobs = mod.flow_jobs;
+        if (flowJobs && flowJobs.length > 0) {
+          for (let iter = 0;iter < flowJobs.length; iter++) {
+            try {
+              const stepLogs = await getJobLogs({
+                workspace: workspace.workspaceId,
+                id: flowJobs[iter]
+              });
+              if (stepLogs) {
+                console.log(colors.bold.cyan(`
+====== ${label} (iteration ${iter}) ======`));
+                console.log(stripHint(stepLogs));
+                hasLogs = true;
+              }
+            } catch {}
+          }
+        } else if (mod.job) {
+          try {
+            const stepLogs = await getJobLogs({
+              workspace: workspace.workspaceId,
+              id: mod.job
+            });
+            if (stepLogs) {
+              console.log(colors.bold.cyan(`
+====== ${label} ======`));
+              console.log(stripHint(stepLogs));
+              hasLogs = true;
+            }
+          } catch {}
+        }
+      }
+      if (!hasLogs) {
+        info("No logs available for this flow's steps.");
+      }
       return;
     }
   } catch {}
@@ -81756,8 +81953,9 @@ async function logs(opts, id) {
   if (jobLogs == null || jobLogs === "") {
     info("No logs available for this job.");
   } else {
+    const stripped = jobLogs.replace(/^to remove ansi colors.*\n?/gm, "");
     console.error("to remove ansi colors, use: | sed 's/\\x1B\\[[0-9;]\\{1,\\}[A-Za-z]//g'");
-    console.log(jobLogs);
+    console.log(stripped);
   }
 }
 async function cancel(opts, id) {
@@ -81773,8 +81971,8 @@ async function cancel(opts, id) {
   });
   info(colors.green(`Job ${id} canceled.`));
 }
-var listOptions = (cmd) => cmd.option("--json", "Output as JSON (for piping to jq)").option("--script-path <scriptPath:string>", "Filter by exact script/flow path").option("--created-by <createdBy:string>", "Filter by creator username").option("--running", "Show only running jobs").option("--failed", "Show only failed jobs").option("--success <success:boolean>", "Filter by success status (true/false)").option("--limit <limit:number>", "Number of jobs to return (default 30, max 100)").option("--job-kinds <jobKinds:string>", "Filter by job kinds (default: script,flow,singlestepflow)").option("--label <label:string>", "Filter by job label").option("--all", "Include sub-jobs (flow steps). By default only top-level jobs are shown");
-var command29 = listOptions(new Command().description("Manage jobs (list, inspect, cancel)")).action(list13).command("list", listOptions(new Command().description("List recent jobs"))).action(list13).command("get", "Get job details and result").arguments("<id:string>").option("--json", "Output as JSON (for piping to jq)").action(get10).command("result", "Get the result of a completed job (machine-friendly)").arguments("<id:string>").action(result).command("logs", "Get job logs").arguments("<id:string>").action(logs).command("cancel", "Cancel a running or queued job").arguments("<id:string>").option("--reason <reason:string>", "Reason for cancellation").action(cancel);
+var listOptions = (cmd) => cmd.option("--json", "Output as JSON (for piping to jq)").option("--script-path <scriptPath:string>", "Filter by exact script/flow path").option("--created-by <createdBy:string>", "Filter by creator username").option("--running", "Show only running jobs").option("--failed", "Show only failed jobs").option("--success <success:boolean>", "Filter by success status (true/false)").option("--limit <limit:number>", "Number of jobs to return (default 30, max 100)").option("--job-kinds <jobKinds:string>", "Filter by job kinds (default: script,flow,singlestepflow)").option("--label <label:string>", "Filter by job label").option("--all", "Include sub-jobs (flow steps). By default only top-level jobs are shown").option("--parent <parent:string>", "Filter by parent job ID (show sub-jobs of a specific flow)").option("--is-flow-step", "Show only flow step jobs");
+var command29 = listOptions(new Command().description("Manage jobs (list, inspect, cancel)")).action(list13).command("list", listOptions(new Command().description("List recent jobs"))).action(list13).command("get", "Get job details. For flows: shows step tree with sub-job IDs").arguments("<id:string>").option("--json", "Output as JSON (for piping to jq)").action(get10).command("result", "Get the result of a completed job (machine-friendly)").arguments("<id:string>").action(result).command("logs", "Get job logs. For flows: aggregates all step logs").arguments("<id:string>").action(logs).command("cancel", "Cancel a running or queued job").arguments("<id:string>").option("--reason <reason:string>", "Reason for cancellation").action(cancel);
 var job_default = command29;
 
 // src/commands/group/group.ts
@@ -82342,7 +82540,7 @@ var config_default = command35;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.669.1";
+var VERSION = "1.671.0";
 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 {

package/package.json

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