windmill-cli 1.642.0 → 1.643.0

package/esm/main.js

@@ -11767,7 +11767,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv2("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.642.0",
+    VERSION: "1.643.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -14083,6 +14083,9 @@ var backendVersion = () => {
     },
     query: {
       path_start: data2.pathStart,
+      path: data2.path,
+      description: data2.description,
+      value: data2.value,
       page: data2.page,
       per_page: data2.perPage
     }
@@ -14439,7 +14442,10 @@ var backendVersion = () => {
       per_page: data2.perPage,
       resource_type: data2.resourceType,
       resource_type_exclude: data2.resourceTypeExclude,
-      path_start: data2.pathStart
+      path_start: data2.pathStart,
+      path: data2.path,
+      description: data2.description,
+      value: data2.value
     }
   });
 }, listSearchResource = (data2) => {
@@ -16847,7 +16853,10 @@ var backendVersion = () => {
       args: data2.args,
       path: data2.path,
       is_flow: data2.isFlow,
-      path_start: data2.pathStart
+      path_start: data2.pathStart,
+      schedule_path: data2.schedulePath,
+      description: data2.description,
+      summary: data2.summary
     }
   });
 }, listSchedulesWithJobs = (data2) => {
@@ -19106,7 +19115,9 @@ var backendVersion = () => {
       cursor_id: data2.cursorId,
       asset_path: data2.assetPath,
       usage_path: data2.usagePath,
-      asset_kinds: data2.assetKinds
+      asset_kinds: data2.assetKinds,
+      path: data2.path,
+      columns: data2.columns
     }
   });
 }, listAssetsByUsage = (data2) => {
@@ -23401,6 +23412,9 @@ function isFileResource(path3) {
   const splitPath = path3.split(".");
   return splitPath.length >= 4 && splitPath[splitPath.length - 3] == "resource" && splitPath[splitPath.length - 2] == "file";
 }
+function isFilesetResource(path3) {
+  return path3.includes(".fileset/") || path3.includes(".fileset\\");
+}
 function isRawAppFile(path3) {
   return isRawAppPath(path3);
 }
@@ -55905,7 +55919,7 @@ function isItemTypeConfigured(path5, specificItems) {
   if (path5 === "settings.yaml") {
     return specificItems.settings !== undefined;
   }
-  if (isFileResource(path5)) {
+  if (isFileResource(path5) || isFilesetResource(path5)) {
     return specificItems.resources !== undefined;
   }
   return false;
@@ -55940,6 +55954,13 @@ function isSpecificItem(path5, specificItems) {
       return matchesPatterns(basePath, specificItems.resources);
     }
   }
+  if (isFilesetResource(path5)) {
+    const basePathMatch = path5.match(/^(.+?)\.fileset[/\\]/);
+    if (basePathMatch && specificItems.resources) {
+      const basePath = basePathMatch[1] + ".resource.yaml";
+      return matchesPatterns(basePath, specificItems.resources);
+    }
+  }
   return false;
 }
 function toBranchSpecificPath(basePath, branchName) {
@@ -59946,8 +59967,26 @@ var init_lint = __esm(async () => {
 });
 
 // src/commands/resource/resource.ts
-import { stat as stat5, writeFile as writeFile5 } from "node:fs/promises";
+import { stat as stat5, writeFile as writeFile5, readdir as readdir3, readFile as readFile6 } from "node:fs/promises";
+import nodePath from "node:path";
 import { sep as SEP6 } from "node:path";
+async function readFilesetDirectory(dirPath) {
+  const result = {};
+  async function walk(currentPath, prefix) {
+    const entries = await readdir3(currentPath, { withFileTypes: true });
+    for (const entry of entries) {
+      const entryPath = nodePath.join(currentPath, entry.name);
+      const relPath = prefix ? prefix + "/" + entry.name : entry.name;
+      if (entry.isDirectory()) {
+        await walk(entryPath, relPath);
+      } else if (entry.isFile()) {
+        result[relPath] = await readFile6(entryPath, "utf-8");
+      }
+    }
+  }
+  await walk(dirPath, "");
+  return result;
+}
 async function pushResource(workspace, remotePath, resource, localResource, originalLocalPath) {
   remotePath = removeType(remotePath, "resource");
   try {
@@ -59957,7 +59996,10 @@ async function pushResource(workspace, remotePath, resource, localResource, orig
     });
   } catch {}
   const resolveInlineContent = async () => {
-    if (localResource.value["content"]?.startsWith("!inline ")) {
+    if (typeof localResource.value === "string" && localResource.value.startsWith("!inline_fileset ")) {
+      const dirPath = localResource.value.split(" ")[1];
+      localResource.value = await readFilesetDirectory(dirPath.replaceAll("/", SEP6));
+    } else if (localResource.value["content"]?.startsWith("!inline ")) {
       const basePath = localResource.value["content"].split(" ")[1];
       let pathToRead = basePath;
       if (originalLocalPath && isBranchSpecificFile(originalLocalPath)) {
@@ -60330,7 +60372,7 @@ async function replaceInlineScripts(modules, fileReader, logger = {
 // src/commands/flow/flow_metadata.ts
 import * as path6 from "node:path";
 import { sep as SEP7 } from "node:path";
-import { readFile as readFile6 } from "node:fs/promises";
+import { readFile as readFile7 } from "node:fs/promises";
 async function generateFlowHash(rawWorkspaceDependencies, folder, defaultTs) {
   const elems = await FSFSElement(path6.join(process.cwd(), folder), [], true);
   const hashes = {};
@@ -60377,7 +60419,7 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
       }
     }
     info(`Recomputing locks of ${changedScripts.join(", ")} in ${folder}`);
-    await replaceInlineScripts(flowValue.value.modules, async (path7) => await readFile6(folder + SEP7 + path7, "utf-8"), exports_log, folder + SEP7, SEP7, changedScripts);
+    await replaceInlineScripts(flowValue.value.modules, async (path7) => await readFile7(folder + SEP7 + path7, "utf-8"), exports_log, folder + SEP7, SEP7, changedScripts);
     flowValue.value = await updateFlow2(workspace, flowValue.value, remote_path, filteredDeps);
     const inlineScripts = extractInlineScripts(flowValue.value.modules, {}, SEP7, opts.defaultTs);
     inlineScripts.forEach((s) => {
@@ -60486,7 +60528,7 @@ __export(exports_sync, {
   default: () => sync_default,
   FSFSElement: () => FSFSElement
 });
-import { readFile as readFile7, writeFile as writeFile6, readdir as readdir3, stat as stat6, rm, copyFile, mkdir as mkdir3 } from "node:fs/promises";
+import { readFile as readFile8, writeFile as writeFile6, readdir as readdir4, stat as stat6, rm, copyFile, mkdir as mkdir3 } from "node:fs/promises";
 import * as path7 from "node:path";
 import { sep as SEP8 } from "node:path";
 function mergeCliWithEffectiveOptions(cliOpts, effectiveOpts) {
@@ -60578,7 +60620,7 @@ async function FSFSElement(p, codebases, ignoreCodebaseChanges) {
         if (!isDir)
           return [];
         try {
-          const entries = await readdir3(localP, { withFileTypes: true });
+          const entries = await readdir4(localP, { withFileTypes: true });
           for (const e of entries) {
             yield _internal_element(path7.join(localP, e.name), e.isDirectory(), codebases2);
           }
@@ -60587,7 +60629,7 @@ async function FSFSElement(p, codebases, ignoreCodebaseChanges) {
         }
       },
       async getContentText() {
-        const content = await readFile7(localP, "utf-8");
+        const content = await readFile8(localP, "utf-8");
         const itemPath = localP.substring(p.length + 1);
         const r = await addCodebaseDigestIfRelevant(itemPath, content, codebases2, ignoreCodebaseChanges);
         return r;
@@ -60785,7 +60827,39 @@ function extractInlineScriptsForApps(key, rec, pathAssigner, toId, removeSchema)
   }
   return [];
 }
-function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ignoreCodebaseChanges) {
+function parseFileResourceTypeMap(raw) {
+  const formatExtMap = {};
+  const filesetMap = {};
+  for (const [k, v] of Object.entries(raw)) {
+    if (typeof v === "string") {
+      formatExtMap[k] = v;
+      filesetMap[k] = false;
+    } else {
+      if (v.format_extension) {
+        formatExtMap[k] = v.format_extension;
+      }
+      filesetMap[k] = v.is_fileset ?? false;
+    }
+  }
+  return { formatExtMap, filesetMap };
+}
+async function findFilesetResourceFile(changePath) {
+  const filesetIdx = changePath.indexOf(".fileset" + SEP8);
+  if (filesetIdx === -1) {
+    throw new Error(`Not a fileset resource path: ${changePath}`);
+  }
+  const basePath = changePath.substring(0, filesetIdx);
+  const candidates = [basePath + ".resource.json", basePath + ".resource.yaml"];
+  for (const candidate of candidates) {
+    try {
+      const s = await stat6(candidate);
+      if (s.isFile())
+        return candidate;
+    } catch {}
+  }
+  throw new Error(`No resource metadata file found for fileset resource: ${changePath}`);
+}
+function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, resourceTypeToIsFileset, ignoreCodebaseChanges) {
   async function _internal_file(p, f) {
     const kind = isFlowMetadataFile(p) ? "flow" : isAppMetadataFile(p) ? "app" : isRawAppMetadataFile(p) ? "raw_app" : p.endsWith(".script.json") ? "script" : p.endsWith(".resource.json") ? "resource" : p.startsWith("dependencies/") ? "dependencies" : "other";
     const isJson = p.endsWith(".json");
@@ -61041,8 +61115,12 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ig
               error(`Failed to parse resource.yaml at path: ${p}`);
               throw error2;
             }
-            const formatExtension = resourceTypeToFormatExtension[parsed["resource_type"]];
-            if (formatExtension) {
+            const resourceType = parsed["resource_type"];
+            const formatExtension = resourceTypeToFormatExtension[resourceType];
+            const isFileset = resourceTypeToIsFileset[resourceType] ?? false;
+            if (isFileset) {
+              parsed["value"] = "!inline_fileset " + removeSuffix(p.replaceAll(SEP8, "/"), ".resource.json") + ".fileset";
+            } else if (formatExtension) {
               parsed["value"]["content"] = "!inline " + removeSuffix(p.replaceAll(SEP8, "/"), ".resource.json") + ".resource.file." + formatExtension;
             }
             return useYaml ? import_yaml10.stringify(parsed, yamlOptions) : JSON.stringify(parsed, null, 2);
@@ -61088,8 +61166,33 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ig
         error(`Failed to parse resource file content at path: ${p}`);
         throw error2;
       }
-      const formatExtension = resourceTypeToFormatExtension[parsed["resource_type"]];
-      if (formatExtension) {
+      const resourceType = parsed["resource_type"];
+      const formatExtension = resourceTypeToFormatExtension[resourceType];
+      const isFileset = resourceTypeToIsFileset[resourceType] ?? false;
+      if (isFileset && typeof parsed["value"] === "object" && parsed["value"] !== null) {
+        const filesetBasePath = removeSuffix(finalPath, ".resource.json") + ".fileset";
+        r.push({
+          isDirectory: true,
+          path: filesetBasePath,
+          async* getChildren() {
+            for (const [relPath, fileContent] of Object.entries(parsed["value"])) {
+              if (typeof fileContent === "string") {
+                yield {
+                  isDirectory: false,
+                  path: path7.join(filesetBasePath, relPath),
+                  async* getChildren() {},
+                  async getContentText() {
+                    return fileContent;
+                  }
+                };
+              }
+            }
+          },
+          async getContentText() {
+            throw new Error("Cannot get content of directory");
+          }
+        });
+      } else if (formatExtension) {
         const fileContent = parsed["value"]["content"];
         if (typeof fileContent === "string") {
           r.push({
@@ -61172,7 +61275,7 @@ async function elementsToMap(els, ignore, json, skips, specificItems, branchOver
       continue;
     }
     const path8 = entry.path;
-    if (!isFileResource(path8) && !isRawAppFile(path8) && !isWorkspaceDependencies(path8)) {
+    if (!isFileResource(path8) && !isFilesetResource(path8) && !isRawAppFile(path8) && !isWorkspaceDependencies(path8)) {
       if (json && path8.endsWith(".yaml"))
         continue;
       if (!json && path8.endsWith(".json"))
@@ -61206,7 +61309,7 @@ async function elementsToMap(els, ignore, json, skips, specificItems, branchOver
         continue;
       }
     }
-    if (skips.skipResources && isFileResource(path8))
+    if (skips.skipResources && (isFileResource(path8) || isFilesetResource(path8)))
       continue;
     const ext2 = json ? ".json" : ".yaml";
     if (!skips.includeSchedules && path8.endsWith(".schedule" + ext2))
@@ -61589,13 +61692,17 @@ async function pull(opts) {
   const codebases = await listSyncCodebases(opts);
   info(colors.gray("Computing the files to update locally to match remote (taking wmill.yaml into account)"));
   let resourceTypeToFormatExtension = {};
+  let resourceTypeToIsFileset = {};
   try {
-    resourceTypeToFormatExtension = await fileResourceTypeToFileExtMap({
+    const raw = await fileResourceTypeToFileExtMap({
       workspace: workspace.workspaceId
     });
+    const parsed = parseFileResourceTypeMap(raw);
+    resourceTypeToFormatExtension = parsed.formatExtMap;
+    resourceTypeToIsFileset = parsed.filesetMap;
   } catch {}
   const zipFile = await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipResourceTypes, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.skipWorkspaceDependencies, opts.defaultTs);
-  const remote = ZipFSElement(zipFile, !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension, true);
+  const remote = ZipFSElement(zipFile, !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension, resourceTypeToIsFileset, true);
   const local = !opts.stateful ? await FSFSElement(process.cwd(), codebases, true) : await FSFSElement(path7.join(process.cwd(), ".wmill"), [], true);
   const changes = await compareDynFSElement(remote, local, await ignoreF(opts), opts.json ?? false, opts, false, codebases, true, specificItems, opts.branch, true);
   info(`remote (${workspace.name}) -> local: ${changes.length} changes to apply`);
@@ -61645,7 +61752,7 @@ async function pull(opts) {
       if (change.name === "edited") {
         if (opts.stateful) {
           try {
-            const currentLocal = await readFile7(target, "utf-8");
+            const currentLocal = await readFile8(target, "utf-8");
             if (currentLocal !== change.before && currentLocal !== change.after) {
               info(colors.red(`Conflict detected on ${change.path}
 Both local and remote have been modified.`));
@@ -61852,12 +61959,16 @@ Push aborted: ${lockIssues.length} script(s) missing locks.`));
   }
   info(colors.gray("Computing the files to update on the remote to match local (taking wmill.yaml includes/excludes into account)"));
   let resourceTypeToFormatExtension = {};
+  let resourceTypeToIsFileset = {};
   try {
-    resourceTypeToFormatExtension = await fileResourceTypeToFileExtMap({
+    const raw = await fileResourceTypeToFileExtMap({
       workspace: workspace.workspaceId
     });
+    const parsed = parseFileResourceTypeMap(raw);
+    resourceTypeToFormatExtension = parsed.formatExtMap;
+    resourceTypeToIsFileset = parsed.filesetMap;
   } catch {}
-  const remote = ZipFSElement(await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipResourceTypes, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.skipWorkspaceDependencies, opts.defaultTs), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension, false);
+  const remote = ZipFSElement(await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipResourceTypes, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.skipWorkspaceDependencies, opts.defaultTs), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension, resourceTypeToIsFileset, false);
   const local = await FSFSElement(path7.join(process.cwd(), ""), codebases, false);
   const changes = await compareDynFSElement(local, remote, await ignoreF(opts), opts.json ?? false, opts, true, codebases, false, specificItems, opts.branch, false);
   const rawWorkspaceDependencies = await getRawWorkspaceDependencies();
@@ -62018,7 +62129,24 @@ Push aborted: ${lockIssues.length} script(s) missing locks.`));
                 const resourceFilePath = await findResourceFile(change.path);
                 if (!alreadySynced.includes(resourceFilePath)) {
                   alreadySynced.push(resourceFilePath);
-                  const newObj2 = parseFromPath(resourceFilePath, await readFile7(resourceFilePath, "utf-8"));
+                  const newObj2 = parseFromPath(resourceFilePath, await readFile8(resourceFilePath, "utf-8"));
+                  let serverPath = resourceFilePath;
+                  const currentBranch = cachedBranchForPush;
+                  if (currentBranch && isBranchSpecificFile(resourceFilePath)) {
+                    serverPath = fromBranchSpecificPath(resourceFilePath, currentBranch);
+                  }
+                  await pushResource(workspace.workspaceId, serverPath, undefined, newObj2, resourceFilePath);
+                  if (stateTarget) {
+                    await writeFile6(stateTarget, change.after, "utf-8");
+                  }
+                  continue;
+                }
+              }
+              if (isFilesetResource(change.path)) {
+                const resourceFilePath = await findFilesetResourceFile(change.path);
+                if (!alreadySynced.includes(resourceFilePath)) {
+                  alreadySynced.push(resourceFilePath);
+                  const newObj2 = parseFromPath(resourceFilePath, await readFile8(resourceFilePath, "utf-8"));
                   let serverPath = resourceFilePath;
                   const currentBranch = cachedBranchForPush;
                   if (currentBranch && isBranchSpecificFile(resourceFilePath)) {
@@ -62042,7 +62170,7 @@ Push aborted: ${lockIssues.length} script(s) missing locks.`));
                 await writeFile6(stateTarget, change.after, "utf-8");
               }
             } else if (change.name === "added") {
-              if (change.path.endsWith(".script.json") || change.path.endsWith(".script.yaml") || change.path.endsWith(".lock") || isFileResource(change.path)) {
+              if (change.path.endsWith(".script.json") || change.path.endsWith(".script.yaml") || change.path.endsWith(".lock") || isFileResource(change.path) || isFilesetResource(change.path)) {
                 continue;
               } else if (await handleFile(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases)) {
                 continue;
@@ -62586,7 +62714,7 @@ __export(exports_metadata, {
   LockfileGenerationError: () => LockfileGenerationError
 });
 import { sep as SEP9 } from "node:path";
-import { readFile as readFile8, writeFile as writeFile7, stat as stat7, rm as rm2, readdir as readdir4 } from "node:fs/promises";
+import { readFile as readFile9, writeFile as writeFile7, stat as stat7, rm as rm2, readdir as readdir5 } from "node:fs/promises";
 import { readFileSync as readFileSync3 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 function loadParser(pkgName) {
@@ -62606,12 +62734,12 @@ async function generateAllMetadata() {}
 async function getRawWorkspaceDependencies() {
   const rawWorkspaceDeps = {};
   try {
-    const entries = await readdir4("dependencies", { withFileTypes: true });
+    const entries = await readdir5("dependencies", { withFileTypes: true });
     for (const entry of entries) {
       if (entry.isDirectory())
         continue;
       const filePath = `dependencies/${entry.name}`;
-      const content = await readFile8(filePath, "utf-8");
+      const content = await readFile9(filePath, "utf-8");
       for (const lang of workspaceDependenciesLanguages) {
         if (entry.name.endsWith(lang.filename)) {
           const contentHash = await generateHash(content + filePath);
@@ -62657,7 +62785,7 @@ async function filterWorkspaceDependenciesForScripts(scripts, rawWorkspaceDepend
     if (content.startsWith("!inline ")) {
       const filePath = folder + sep3 + content.replace("!inline ", "");
       try {
-        content = await readFile8(filePath, "utf-8");
+        content = await readFile9(filePath, "utf-8");
       } catch {
         continue;
       }
@@ -62677,8 +62805,8 @@ async function generateScriptMetadataInternal(scriptPath, workspace, opts, dryRu
   const remotePath = scriptPath.substring(0, scriptPath.indexOf(".")).replaceAll(SEP9, "/");
   const language = inferContentTypeFromFilePath(scriptPath, opts.defaultTs);
   const metadataWithType = await parseMetadataFile(remotePath, undefined);
-  const scriptContent = await readFile8(scriptPath, "utf-8");
-  const metadataContent = await readFile8(metadataWithType.path, "utf-8");
+  const scriptContent = await readFile9(scriptPath, "utf-8");
+  const metadataContent = await readFile9(metadataWithType.path, "utf-8");
   const filteredRawWorkspaceDependencies = filterWorkspaceDependencies(rawWorkspaceDependencies, scriptContent, language);
   let hash2 = await generateScriptHash(filteredRawWorkspaceDependencies, scriptContent, metadataContent);
   if (await checkifMetadataUptodate(remotePath, hash2, undefined)) {
@@ -63022,7 +63150,7 @@ async function parseMetadataFile(scriptPath, generateMetadataIfMissing) {
     await stat7(metadataFilePath);
     return {
       path: metadataFilePath,
-      payload: JSON.parse(await readFile8(metadataFilePath, "utf-8")),
+      payload: JSON.parse(await readFile9(metadataFilePath, "utf-8")),
       isJson: true
     };
   } catch {
@@ -63189,7 +63317,7 @@ var init_metadata = __esm(async () => {
 // src/commands/app/raw_apps.ts
 import { sep as SEP10 } from "node:path";
 import path8 from "node:path";
-import { readFile as readFile9, readdir as readdir5 } from "node:fs/promises";
+import { readFile as readFile10, readdir as readdir6 } from "node:fs/promises";
 async function findRunnableContentFile(backendPath, runnableId, allFiles) {
   for (const fileName of allFiles) {
     if (fileName.endsWith(".yaml") || fileName.endsWith(".lock")) {
@@ -63201,7 +63329,7 @@ async function findRunnableContentFile(backendPath, runnableId, allFiles) {
     const ext2 = fileName.substring(runnableId.length + 1);
     if (EXTENSION_TO_LANGUAGE[ext2]) {
       try {
-        const content = await readFile9(path8.join(backendPath, fileName), "utf-8");
+        const content = await readFile10(path8.join(backendPath, fileName), "utf-8");
         return { ext: ext2, content };
       } catch {
         continue;
@@ -63225,7 +63353,7 @@ async function loadRunnablesFromBackend(backendPath, defaultTs = "bun") {
   const runnables = {};
   try {
     const allFiles = [];
-    const _entries = await readdir5(backendPath, { withFileTypes: true });
+    const _entries = await readdir6(backendPath, { withFileTypes: true });
     for (const entry of _entries) {
       if (entry.isFile()) {
         allFiles.push(entry.name);
@@ -63246,7 +63374,7 @@ async function loadRunnablesFromBackend(backendPath, defaultTs = "bun") {
           const language = getLanguageFromExtension(contentFile.ext, defaultTs);
           let lock;
           try {
-            lock = await readFile9(path8.join(backendPath, `${runnableId}.lock`), "utf-8");
+            lock = await readFile10(path8.join(backendPath, `${runnableId}.lock`), "utf-8");
           } catch {}
           runnable.inlineScript = {
             content: contentFile.content,
@@ -63277,7 +63405,7 @@ async function loadRunnablesFromBackend(backendPath, defaultTs = "bun") {
         const language = getLanguageFromExtension(contentFile.ext, defaultTs);
         let lock;
         try {
-          lock = await readFile9(path8.join(backendPath, `${runnableId}.lock`), "utf-8");
+          lock = await readFile10(path8.join(backendPath, `${runnableId}.lock`), "utf-8");
         } catch {}
         runnables[runnableId] = {
           type: "inline",
@@ -63311,7 +63439,7 @@ function writeRunnableToBackend(backendPath, runnableId, runnable) {
 async function collectAppFiles(localPath) {
   const files = {};
   async function readDirRecursive(dir, basePath = "/") {
-    const dirEntries = await readdir5(dir, { withFileTypes: true });
+    const dirEntries = await readdir6(dir, { withFileTypes: true });
     for (const entry of dirEntries) {
       const fullPath = dir + entry.name;
       const relativePath = basePath + entry.name;
@@ -63324,7 +63452,7 @@ async function collectAppFiles(localPath) {
         if (entry.name === "raw_app.yaml" || entry.name === "package-lock.json" || entry.name === "DATATABLES.md" || entry.name === "AGENTS.md" || entry.name === "wmill.d.ts") {
           continue;
         }
-        const content = await readFile9(fullPath, "utf-8");
+        const content = await readFile10(fullPath, "utf-8");
         files[relativePath] = content;
       }
     }
@@ -63475,7 +63603,7 @@ __export(exports_app_metadata, {
   APP_BACKEND_FOLDER: () => APP_BACKEND_FOLDER
 });
 import path9 from "node:path";
-import { readFile as readFile10, mkdir as mkdir4 } from "node:fs/promises";
+import { readFile as readFile11, mkdir as mkdir4 } from "node:fs/promises";
 import { sep as SEP11 } from "node:path";
 async function generateAppHash(rawReqs, folder, rawApp, defaultTs) {
   const runnablesFolder = rawApp ? path9.join(folder, APP_BACKEND_FOLDER) : folder;
@@ -63790,7 +63918,7 @@ async function inferRunnableSchemaFromFile(appFolder, runnableFilePath) {
   const fullFilePath = path9.join(appFolder, APP_BACKEND_FOLDER, runnableFilePath);
   let content;
   try {
-    content = await readFile10(fullFilePath, "utf-8");
+    content = await readFile11(fullFilePath, "utf-8");
   } catch {
     warn(colors.yellow(`Could not read file: ${fullFilePath}`));
     return;
@@ -64092,7 +64220,7 @@ import * as fs10 from "node:fs";
 import * as path11 from "node:path";
 import process14 from "node:process";
 import { writeFileSync as writeFileSync2 } from "node:fs";
-import { readFile as readFile11 } from "node:fs/promises";
+import { readFile as readFile12 } from "node:fs/promises";
 async function dev(opts, appFolder) {
   GLOBAL_CONFIG_OPT.noCdToRoot = true;
   await loadNonDottedPathsSetting();
@@ -64366,7 +64494,7 @@ data: reload
     currentSqlFile = filePath;
     const fileName = path11.basename(filePath);
     try {
-      const sqlContent = await readFile11(filePath, "utf-8");
+      const sqlContent = await readFile12(filePath, "utf-8");
       if (!sqlContent.trim()) {
         info(colors.gray(`Skipping empty file: ${fileName}`));
         currentSqlFile = null;
@@ -64398,7 +64526,7 @@ data: reload
     info(colors.cyan("[WebSocket] Client connected"));
     if (currentSqlFile && fs10.existsSync(currentSqlFile)) {
       try {
-        const sqlContent = await readFile11(currentSqlFile, "utf-8");
+        const sqlContent = await readFile12(currentSqlFile, "utf-8");
         const datatable = await getDatatableConfig();
         const fileName = path11.basename(currentSqlFile);
         ws.send(JSON.stringify({
@@ -67232,13 +67360,13 @@ var init_settings = __esm(async () => {
 });
 
 // src/commands/instance/instance.ts
-import { readFile as readFile12, writeFile as writeFile15, readdir as readdir6, mkdir as mkdir7, rm as rm3, stat as stat13 } from "node:fs/promises";
+import { readFile as readFile13, writeFile as writeFile15, readdir as readdir7, mkdir as mkdir7, rm as rm3, stat as stat13 } from "node:fs/promises";
 import { appendFile } from "node:fs/promises";
 import * as path15 from "node:path";
 async function allInstances() {
   try {
     const file = await getInstancesConfigFilePath();
-    const txt = await readFile12(file, "utf-8");
+    const txt = await readFile13(file, "utf-8");
     return txt.split(`
 `).map((line) => {
       if (line.length <= 2) {
@@ -67632,7 +67760,7 @@ async function getLocalWorkspaces(rootDir, localPrefix, folderPerInstance) {
     await mkdir7(localPrefix);
   }
   if (folderPerInstance) {
-    const prefixEntries = await readdir6(rootDir + "/" + localPrefix, { withFileTypes: true });
+    const prefixEntries = await readdir7(rootDir + "/" + localPrefix, { withFileTypes: true });
     for (const dir of prefixEntries) {
       if (dir.isDirectory()) {
         const dirName = dir.name;
@@ -67643,7 +67771,7 @@ async function getLocalWorkspaces(rootDir, localPrefix, folderPerInstance) {
       }
     }
   } else {
-    const rootEntries = await readdir6(rootDir, { withFileTypes: true });
+    const rootEntries = await readdir7(rootDir, { withFileTypes: true });
     for (const dir of rootEntries) {
       const dirName = dir.name;
       if (dirName.startsWith(localPrefix + "_")) {
@@ -67675,7 +67803,7 @@ async function getActiveInstance(opts) {
     return opts.instance;
   }
   try {
-    return await readFile12(await getActiveInstanceFilePath(), "utf-8");
+    return await readFile13(await getActiveInstanceFilePath(), "utf-8");
   } catch {
     return;
   }
@@ -68756,7 +68884,7 @@ 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)) {
+    if (isFileResource(p) || isFilesetResource(p)) {
       return "resource";
     }
     throw new Error("Could not infer type of path " + JSON.stringify(parsed));
@@ -68854,7 +68982,7 @@ function defaultFlowDefinition() {
 
 // src/commands/flow/flow.ts
 import { sep as SEP19 } from "node:path";
-import { readFile as readFile13 } from "node:fs/promises";
+import { readFile as readFile14 } from "node:fs/promises";
 import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync4 } from "node:fs";
 async function pushFlow(workspace, remotePath, localPath, message) {
   if (alreadySynced3.includes(localPath)) {
@@ -68873,7 +69001,7 @@ async function pushFlow(workspace, remotePath, localPath, message) {
     localPath += SEP19;
   }
   const localFlow = await yamlParseFile(localPath + "flow.yaml");
-  await replaceInlineScripts(localFlow.value.modules, async (path17) => await readFile13(localPath + path17, "utf-8"), exports_log, localPath, SEP19);
+  await replaceInlineScripts(localFlow.value.modules, async (path17) => await readFile14(localPath + path17, "utf-8"), exports_log, localPath, SEP19);
   if (flow) {
     if (isSuperset(localFlow, flow)) {
       info(colors.green(`Flow ${remotePath} is up to date`));
@@ -69015,7 +69143,7 @@ async function preview2(opts, flowPath) {
     flowPath += SEP19;
   }
   const localFlow = await yamlParseFile(flowPath + "flow.yaml");
-  await replaceInlineScripts(localFlow.value.modules, async (path17) => await readFile13(flowPath + path17, "utf-8"), exports_log, flowPath, SEP19);
+  await replaceInlineScripts(localFlow.value.modules, async (path17) => await readFile14(flowPath + path17, "utf-8"), exports_log, flowPath, SEP19);
   const input = opts.data ? await resolve6(opts.data) : {};
   if (!opts.silent) {
     info(colors.yellow(`Running flow preview for ${flowPath}...`));
@@ -70778,6 +70906,19 @@ To enable shell completions for this program add the following line to your ${di
     }).noGlobals().action(() => this.showHelp()).command("bash", new BashCompletionsCommand(this.#cmd)).command("fish", new FishCompletionsCommand(this.#cmd)).command("zsh", new ZshCompletionsCommand(this.#cmd)).command("complete", new CompleteCommand(this.#cmd)).hidden().reset();
   }
 }
+// node_modules/@cliffy/command/completions/generate.js
+function generateShellCompletions(cmd, shell, { name = cmd.getName() } = {}) {
+  switch (shell) {
+    case "bash":
+      return BashCompletionsGenerator.generate(name, cmd);
+    case "fish":
+      return FishCompletionsGenerator.generate(name, cmd);
+    case "zsh":
+      return ZshCompletionsGenerator.generate(name, cmd);
+    default:
+      throw new Error(`Unsupported shell: ${shell}`);
+  }
+}
 // node_modules/@jsr/std__semver/_shared.js
 function compareNumber(a, b) {
   if (isNaN(a) || isNaN(b)) {
@@ -71314,7 +71455,7 @@ async function pull2(opts) {
       info("failed to parse schema for " + x.name);
       continue;
     }
-    if (resourceTypes.find((y) => y.name === x.name && typeof y.schema !== "string" && deepEqual(y.schema, x.schema) && y.description === x.description)) {
+    if (resourceTypes.find((y) => y.name === x.name && typeof y.schema !== "string" && deepEqual(y.schema, x.schema) && y.description === x.description && (y.is_fileset ?? false) === (x.is_fileset ?? false))) {
       info("skipping " + x.name + " (same as current)");
       continue;
     }
@@ -71357,7 +71498,7 @@ await __promiseAll([
 ]);
 import { sep as SEP20 } from "node:path";
 import * as http3 from "node:http";
-import { readFile as readFile14, realpath } from "node:fs/promises";
+import { readFile as readFile15, realpath } from "node:fs/promises";
 import { watch as watch2 } from "node:fs";
 var PORT = 3001;
 async function dev2(opts) {
@@ -71406,7 +71547,7 @@ async function dev2(opts) {
       if (typ == "flow") {
         const localPath = extractFolderPath(cpath, "flow");
         const localFlow = await yamlParseFile(localPath + "flow.yaml");
-        await replaceInlineScripts(localFlow.value.modules, async (path17) => await readFile14(localPath + path17, "utf-8"), exports_log, localPath, SEP20, undefined);
+        await replaceInlineScripts(localFlow.value.modules, async (path17) => await readFile15(localPath + path17, "utf-8"), exports_log, localPath, SEP20, undefined);
         currentLastEdit = {
           type: "flow",
           flow: localFlow,
@@ -71415,7 +71556,7 @@ async function dev2(opts) {
         info("Updated " + localPath);
         broadcastChanges(currentLastEdit);
       } else if (typ == "script") {
-        const content = await readFile14(cpath, "utf-8");
+        const content = await readFile15(cpath, "utf-8");
         const splitted = cpath.split(".");
         const wmPath = splitted[0];
         const lang = inferContentTypeFromFilePath(cpath, conf.defaultTs);
@@ -77964,7 +78105,7 @@ var jobs_default = command28;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.642.0";
+var VERSION = "1.643.0";
 var command29 = 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("version --version", "Show version information").action(async (opts) => {
   console.log("CLI version: " + VERSION);
   try {
@@ -77994,7 +78135,16 @@ var command29 = new Command().name("wmill").action(() => info(`Welcome to Windmi
 }).error((e) => {
   error(e);
   info("Try running with sudo and otherwise check the result of the command: npm uninstall windmill-cli && npm install -g windmill-cli");
-})).command("completions", new CompletionsCommand);
+})).command("completions", new Command().description("Generate shell completions.").command("bash", new Command().description("Generate bash completions.").action(() => {
+  process.stdout.write(generateShellCompletions(command29, "bash") + `
+`);
+})).command("zsh", new Command().description("Generate zsh completions.").action(() => {
+  process.stdout.write(generateShellCompletions(command29, "zsh") + `
+`);
+})).command("fish", new Command().description("Generate fish completions.").action(() => {
+  process.stdout.write(generateShellCompletions(command29, "fish") + `
+`);
+})));
 async function main2() {
   try {
     const args = process.argv.slice(2);

package/package.json

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