windmill-cli 1.697.0 → 1.698.0

package/esm/main.js

@@ -16752,7 +16752,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.697.0",
+    VERSION: "1.698.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -62509,6 +62509,7 @@ async function readModulesFromDisk(moduleFolderPath, defaultTs, folderLayout = f
 async function createScript2(bundleContent, workspaceId, body, workspace) {
   const start = performance.now();
   const skipIfNoop = "skip_if_noop=true";
+  const extraHeaders = getHeaders2();
   if (!bundleContent) {
     try {
       const url = workspace.remote + "api/w/" + workspaceId + "/scripts/create?" + skipIfNoop;
@@ -62516,10 +62517,12 @@ async function createScript2(bundleContent, workspaceId, body, workspace) {
         method: "POST",
         headers: {
           Authorization: `Bearer ${workspace.token}`,
-          "Content-Type": "application/json"
+          "Content-Type": "application/json",
+          ...extraHeaders
         },
         body: JSON.stringify(body)
       });
+      await detectAuthGatewayChallenge(req, url);
       if (req.status != 201) {
         throw Error(`${req.status} - ${req.statusText} - ${await req.text()}`);
       }
@@ -62533,9 +62536,13 @@ async function createScript2(bundleContent, workspaceId, body, workspace) {
     const url = workspace.remote + "api/w/" + workspace.workspaceId + "/scripts/create_snapshot?" + skipIfNoop;
     const req = await fetch(url, {
       method: "POST",
-      headers: { Authorization: `Bearer ${workspace.token} ` },
+      headers: {
+        Authorization: `Bearer ${workspace.token} `,
+        ...extraHeaders
+      },
       body: form
     });
+    await detectAuthGatewayChallenge(req, url);
     if (req.status != 201) {
       throw Error(`Script snapshot creation was not successful: ${req.status} - ${req.statusText} - ${await req.text()} `);
     }
@@ -63080,11 +63087,16 @@ async function preview(opts, filePath) {
     form.append("preview", JSON.stringify(previewPayload));
     form.append("file", typeof bundledContent === "string" ? new Blob([bundledContent], { type: "application/javascript" }) : bundledContent);
     const url = workspace.remote + "api/w/" + workspace.workspaceId + "/jobs/run/preview_bundle";
+    const extraHeaders = getHeaders2();
     const response = await fetch(url, {
       method: "POST",
-      headers: { Authorization: `Bearer ${workspace.token}` },
+      headers: {
+        Authorization: `Bearer ${workspace.token}`,
+        ...extraHeaders
+      },
       body: form
     });
+    await detectAuthGatewayChallenge(response, url);
     if (!response.ok) {
       throw new Error(`Preview failed: ${response.status} - ${response.statusText} - ${await response.text()}`);
     }
@@ -63192,6 +63204,7 @@ var init_script = __esm(async () => {
   init_mod3();
   init_mod6();
   init_log();
+  init_http_guards();
   init_services_gen();
   init_git();
   init_script_bootstrap();
@@ -64981,6 +64994,7 @@ async function rehashOnly(opts, folder, rehashFilter) {
   }
   const stubWorkspace = {};
   const rehashOpts = { ...opts, rehashOnly: true };
+  const queue = [];
   if (!rehashFilter?.skipScripts) {
     for (const e of scriptPaths) {
       const remotePath = scriptPathToRemotePath(e);
@@ -64990,12 +65004,7 @@ async function rehashOnly(opts, folder, rehashFilter) {
         if (skipIfExisting(remotePath) || skipIfExisting(remotePath, "__script_hash"))
           continue;
       }
-      try {
-        await generateScriptMetadataInternal(e, stubWorkspace, rehashOpts, false, true, {}, codebases, false);
-        counts.scripts++;
-      } catch (err) {
-        warn(`Skipping ${e}: ${err instanceof Error ? err.message : err}`);
-      }
+      queue.push({ kind: "script", scriptPath: e });
     }
   }
   if (!rehashFilter?.skipFlows) {
@@ -65007,12 +65016,7 @@ async function rehashOnly(opts, folder, rehashFilter) {
         if (skipIfExisting(folderNormalized, "__flow_hash"))
           continue;
       }
-      try {
-        await generateFlowLockInternal(f, false, stubWorkspace, rehashOpts, false, true);
-        counts.flows++;
-      } catch (err) {
-        warn(`Skipping ${f}: ${err instanceof Error ? err.message : err}`);
-      }
+      queue.push({ kind: "flow", folder: f });
     }
   }
   if (!rehashFilter?.skipApps) {
@@ -65024,13 +65028,47 @@ async function rehashOnly(opts, folder, rehashFilter) {
         if (skipIfExisting(folderNormalized, "__app_hash"))
           continue;
       }
-      try {
-        await generateAppLocksInternal(appFolder, rawApp, false, stubWorkspace, rehashOpts, false, true);
-        counts.apps++;
-      } catch (err) {
-        warn(`Skipping ${appFolder}: ${err instanceof Error ? err.message : err}`);
+      queue.push({ kind: "app", folder: appFolder, rawApp });
+    }
+  }
+  let parallelism = Number(opts.parallel ?? 1);
+  if (!Number.isFinite(parallelism) || parallelism <= 0)
+    parallelism = 1;
+  if (parallelism > 1) {
+    info(`Parallelizing ${parallelism} items at a time`);
+  }
+  await beginLockfileBatch();
+  try {
+    const pool = new Set;
+    while (queue.length > 0 || pool.size > 0) {
+      while (pool.size < parallelism && queue.length > 0) {
+        const task = queue.shift();
+        const p = (async () => {
+          try {
+            if (task.kind === "script") {
+              await generateScriptMetadataInternal(task.scriptPath, stubWorkspace, rehashOpts, false, true, {}, codebases, false);
+              counts.scripts++;
+            } else if (task.kind === "flow") {
+              await generateFlowLockInternal(task.folder, false, stubWorkspace, rehashOpts, false, true);
+              counts.flows++;
+            } else {
+              await generateAppLocksInternal(task.folder, task.rawApp, false, stubWorkspace, rehashOpts, false, true);
+              counts.apps++;
+            }
+          } catch (err) {
+            const label = task.kind === "script" ? task.scriptPath : task.folder;
+            warn(`Skipping ${label}: ${err instanceof Error ? err.message : err}`);
+          }
+        })();
+        pool.add(p);
+        p.then(() => pool.delete(p));
+      }
+      if (pool.size > 0) {
+        await Promise.race(pool);
       }
     }
+  } finally {
+    await flushLockfileBatch();
   }
   if (counts.scripts + counts.flows + counts.apps > 0 || !rehashFilter?.missingOnly) {
     info(`Rehashed ${colors.bold(String(counts.scripts))} script(s), ` + `${colors.bold(String(counts.flows))} flow(s), ` + `${colors.bold(String(counts.apps))} app(s) from disk.`);
@@ -65193,47 +65231,75 @@ async function generateMetadata2(opts, folder) {
     return colors.dim(colors.white(`[${n}/${total}]`.padEnd(maxWidth, " ")));
   };
   const errors = [];
-  for (const item of scripts) {
-    current++;
-    info(`${formatProgress(current)} script ${item.path}`);
-    try {
-      await generateScriptMetadataInternal(item.path, workspace, opts, false, true, mismatchedWorkspaceDeps, codebases, false, tree);
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      errors.push({ path: item.path, error: msg });
-      error(`  Failed: ${msg}`);
-    }
-  }
-  for (const item of flows) {
-    current++;
-    try {
-      const result = await generateFlowLockInternal(item.folder.replaceAll("/", SEP8), false, workspace, opts, false, true, tree);
-      const flowResult = result;
-      const scriptsInfo = flowResult?.updatedScripts?.length ? colors.dim(colors.white(`: ${flowResult.updatedScripts.join(", ")}`)) : "";
-      info(`${formatProgress(current)} flow   ${item.path}${scriptsInfo}`);
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      errors.push({ path: item.path, error: msg });
-      info(`${formatProgress(current)} flow   ${item.path}`);
-      error(`  Failed: ${msg}`);
-    }
-  }
-  for (const item of apps2) {
-    current++;
-    try {
-      const result = await generateAppLocksInternal(item.folder.replaceAll("/", SEP8), item.isRawApp, false, workspace, opts, false, true, tree);
-      const appResult = result;
-      const scriptsInfo = appResult?.updatedScripts?.length ? colors.dim(colors.white(`: ${appResult.updatedScripts.join(", ")}`)) : "";
-      info(`${formatProgress(current)} app    ${item.path}${scriptsInfo}`);
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      errors.push({ path: item.path, error: msg });
-      info(`${formatProgress(current)} app    ${item.path}`);
-      error(`  Failed: ${msg}`);
+  let parallelism = Number(opts.parallel ?? 1);
+  if (!Number.isFinite(parallelism) || parallelism <= 0)
+    parallelism = 1;
+  if (parallelism > 1) {
+    info(`Parallelizing ${parallelism} items at a time`);
+  }
+  const queue = [
+    ...scripts.map((item) => ({ kind: "script", item })),
+    ...flows.map((item) => ({ kind: "flow", item })),
+    ...apps2.map((item) => ({ kind: "app", item }))
+  ];
+  await beginLockfileBatch();
+  try {
+    const pool = new Set;
+    while (queue.length > 0 || pool.size > 0) {
+      while (pool.size < parallelism && queue.length > 0) {
+        const task = queue.shift();
+        const taskNumber = ++current;
+        const p = (async () => {
+          if (task.kind === "script") {
+            const item = task.item;
+            info(`${formatProgress(taskNumber)} script ${item.path}`);
+            try {
+              await generateScriptMetadataInternal(item.path, workspace, opts, false, true, mismatchedWorkspaceDeps, codebases, false, tree);
+            } catch (e) {
+              const msg = e instanceof Error ? e.message : String(e);
+              errors.push({ path: item.path, error: msg });
+              error(`  Failed: ${msg}`);
+            }
+          } else if (task.kind === "flow") {
+            const item = task.item;
+            try {
+              const result = await generateFlowLockInternal(item.folder.replaceAll("/", SEP8), false, workspace, opts, false, true, tree);
+              const flowResult = result;
+              const scriptsInfo = flowResult?.updatedScripts?.length ? colors.dim(colors.white(`: ${flowResult.updatedScripts.join(", ")}`)) : "";
+              info(`${formatProgress(taskNumber)} flow   ${item.path}${scriptsInfo}`);
+            } catch (e) {
+              const msg = e instanceof Error ? e.message : String(e);
+              errors.push({ path: item.path, error: msg });
+              info(`${formatProgress(taskNumber)} flow   ${item.path}`);
+              error(`  Failed: ${msg}`);
+            }
+          } else {
+            const item = task.item;
+            try {
+              const result = await generateAppLocksInternal(item.folder.replaceAll("/", SEP8), item.isRawApp, false, workspace, opts, false, true, tree);
+              const appResult = result;
+              const scriptsInfo = appResult?.updatedScripts?.length ? colors.dim(colors.white(`: ${appResult.updatedScripts.join(", ")}`)) : "";
+              info(`${formatProgress(taskNumber)} app    ${item.path}${scriptsInfo}`);
+            } catch (e) {
+              const msg = e instanceof Error ? e.message : String(e);
+              errors.push({ path: item.path, error: msg });
+              info(`${formatProgress(taskNumber)} app    ${item.path}`);
+              error(`  Failed: ${msg}`);
+            }
+          }
+        })();
+        pool.add(p);
+        p.then(() => pool.delete(p));
+      }
+      if (pool.size > 0) {
+        await Promise.race(pool);
+      }
     }
+    const allStaleDeps = staleItems.filter((i) => i.type === "dependencies");
+    await tree.persistDepsHashes(allStaleDeps.map((d) => d.path));
+  } finally {
+    await flushLockfileBatch();
   }
-  const allStaleDeps = staleItems.filter((i) => i.type === "dependencies");
-  await tree.persistDepsHashes(allStaleDeps.map((d) => d.path));
   const succeeded = total - errors.length;
   info("");
   if (errors.length > 0) {
@@ -65275,7 +65341,7 @@ var init_generate_metadata = __esm(async () => {
     init_codebase(),
     init_dependency_tree()
   ]);
-  command7 = new Command().description("Generate metadata (locks, schemas) for all scripts, flows, and apps").arguments("[folder:string]").option("--yes", "Skip confirmation prompt").option("--dry-run", "Show what would be updated without making changes").option("--lock-only", "Re-generate only the lock files").option("--schema-only", "Re-generate only script schemas (skips flows and apps)").option("--skip-scripts", "Skip processing scripts").option("--skip-flows", "Skip processing flows").option("--skip-apps", "Skip processing apps").option("--strict-folder-boundaries", "Only update items inside the specified folder (requires folder argument)").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which files to include").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which files to exclude").action(generateMetadata2).command("rehash", new Command().description("Trust on-disk content; rewrite wmill-lock.yaml hashes without backend " + "trips or yaml/lock rewrites. Useful for bootstrapping missing lockfile " + "entries or recovering from older-CLI hash drift.").arguments("[folder:string]").option("--skip-scripts", "Skip processing scripts").option("--skip-flows", "Skip processing flows").option("--skip-apps", "Skip processing apps").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which files to include").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which files to exclude").action(rehashCommand));
+  command7 = new Command().description("Generate metadata (locks, schemas) for all scripts, flows, and apps").arguments("[folder:string]").option("--yes", "Skip confirmation prompt").option("--dry-run", "Show what would be updated without making changes").option("--lock-only", "Re-generate only the lock files").option("--schema-only", "Re-generate only script schemas (skips flows and apps)").option("--skip-scripts", "Skip processing scripts").option("--skip-flows", "Skip processing flows").option("--skip-apps", "Skip processing apps").option("--strict-folder-boundaries", "Only update items inside the specified folder (requires folder argument)").option("--parallel <n:number>", "Number of items to process in parallel").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which files to include").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which files to exclude").action(generateMetadata2).command("rehash", new Command().description("Trust on-disk content; rewrite wmill-lock.yaml hashes without backend " + "trips or yaml/lock rewrites. Useful for bootstrapping missing lockfile " + "entries or recovering from older-CLI hash drift.").arguments("[folder:string]").option("--skip-scripts", "Skip processing scripts").option("--skip-flows", "Skip processing flows").option("--skip-apps", "Skip processing apps").option("--parallel <n:number>", "Number of items to process in parallel").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which files to include").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which files to exclude").action(rehashCommand));
   generate_metadata_default = command7;
 });
 
@@ -68951,7 +69017,20 @@ function normalizeLockPath(p) {
     n = n.slice(2);
   return n;
 }
+async function beginLockfileBatch() {
+  if (inMemoryLock)
+    return;
+  inMemoryLock = await readLockfile();
+}
+async function flushLockfileBatch() {
+  if (!inMemoryLock)
+    return;
+  await writeFile8(WMILL_LOCKFILE, import_yaml13.stringify(inMemoryLock, yamlOptions), "utf-8");
+  inMemoryLock = null;
+}
 async function readLockfile() {
+  if (inMemoryLock)
+    return inMemoryLock;
   let parsed;
   try {
     parsed = await yamlParseFile(WMILL_LOCKFILE);
@@ -69044,7 +69123,9 @@ async function clearGlobalLock(path13) {
         }
       });
     }
-    await writeFile8(WMILL_LOCKFILE, import_yaml13.stringify(conf, yamlOptions), "utf-8");
+    if (!inMemoryLock) {
+      await writeFile8(WMILL_LOCKFILE, import_yaml13.stringify(conf, yamlOptions), "utf-8");
+    }
   }
 }
 async function updateMetadataGlobalLock(path13, hash2, subpath) {
@@ -69067,9 +69148,11 @@ async function updateMetadataGlobalLock(path13, hash2, subpath) {
       conf.locks[path13] = hash2;
     }
   }
-  await writeFile8(WMILL_LOCKFILE, import_yaml13.stringify(conf, yamlOptions), "utf-8");
+  if (!inMemoryLock) {
+    await writeFile8(WMILL_LOCKFILE, import_yaml13.stringify(conf, yamlOptions), "utf-8");
+  }
 }
-var import_yaml13, _require, _parserCache, LockfileGenerationError, UnknownLockVersionError, MalformedLockfileError, LANG_ANNOTATION_CONFIG, lockCache, WMILL_LOCKFILE = "wmill-lock.yaml", CURRENT_LOCK_VERSION = "v2", KNOWN_LOCK_VERSIONS, SCRIPT_TOP_HASH = "__script_hash";
+var import_yaml13, _require, _parserCache, LockfileGenerationError, UnknownLockVersionError, MalformedLockfileError, LANG_ANNOTATION_CONFIG, lockCache, WMILL_LOCKFILE = "wmill-lock.yaml", CURRENT_LOCK_VERSION = "v2", KNOWN_LOCK_VERSIONS, SCRIPT_TOP_HASH = "__script_hash", inMemoryLock = null;
 var init_metadata = __esm(async () => {
   init_colors2();
   init_log();
@@ -70967,12 +71050,15 @@ async function getJobStatus(workspace, jobId) {
 }
 async function streamJobWithSSE(workspace, jobId, reqId, ws, baseUrl2, token) {
   const sseUrl = `${baseUrl2}api/w/${workspace}/jobs_u/getupdate_sse/${jobId}?fast=true`;
+  const extraHeaders = getHeaders2();
   const response = await fetch(sseUrl, {
     headers: {
       Accept: "text/event-stream",
-      Authorization: `Bearer ${token}`
+      Authorization: `Bearer ${token}`,
+      ...extraHeaders
     }
   });
+  await detectAuthGatewayChallenge(response, sseUrl);
   if (!response.ok) {
     throw new Error(`SSE request failed: ${response.status} ${response.statusText}`);
   }
@@ -71331,6 +71417,7 @@ var init_dev = __esm(async () => {
   init_get_port();
   init_port_probe();
   init_open();
+  init_http_guards();
   init_wrapper();
   init_services_gen();
   init_job_polling();
@@ -86103,6 +86190,7 @@ Generate metadata (locks, schemas) for all scripts, flows, and apps
 - \`--skip-flows\` - Skip processing flows
 - \`--skip-apps\` - Skip processing apps
 - \`--strict-folder-boundaries\` - Only update items inside the specified folder (requires folder argument)
+- \`--parallel <n:number>\` - Number of items to process in parallel
 - \`-i --includes <patterns:file[]>\` - Comma separated patterns to specify which files to include
 - \`-e --excludes <patterns:file[]>\` - Comma separated patterns to specify which files to exclude
 
@@ -86112,6 +86200,7 @@ Generate metadata (locks, schemas) for all scripts, flows, and apps
   - \`--skip-scripts\` - Skip processing scripts
   - \`--skip-flows\` - Skip processing flows
   - \`--skip-apps\` - Skip processing apps
+  - \`--parallel <n:number>\` - Number of items to process in parallel
   - \`-i --includes <patterns:file[]>\` - Comma separated patterns to specify which files to include
   - \`-e --excludes <patterns:file[]>\` - Comma separated patterns to specify which files to exclude
 
@@ -89329,9 +89418,11 @@ await init_generate_metadata();
 init_mod3();
 init_colors2();
 init_log();
+init_http_guards();
 await __promiseAll([
   init_auth(),
-  init_context()
+  init_context(),
+  init_utils()
 ]);
 async function docs(opts, query) {
   await requireLogin(opts);
@@ -89340,19 +89431,22 @@ async function docs(opts, query) {
   console.log(colors.bold(`
 Searching Windmill docs...
 `));
+  const extraHeaders = getHeaders2();
   let res;
   try {
     res = await fetch(url, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        Authorization: `Bearer ${workspace.token}`
+        Authorization: `Bearer ${workspace.token}`,
+        ...extraHeaders
       },
       body: JSON.stringify({ query })
     });
   } catch (e) {
     throw new Error(`Network error connecting to ${workspace.remote}: ${e}`);
   }
+  await detectAuthGatewayChallenge(res, url);
   if (res.status === 403) {
     info("Windmill documentation search is an Enterprise Edition feature. Please upgrade to use this command.");
     return;
@@ -89471,7 +89565,7 @@ var config_default = command35;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.697.0";
+var VERSION = "1.698.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.697.0",
+  "version": "1.698.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",