windmill-cli 1.784.0 → 1.785.0

package/esm/main.js

@@ -16784,7 +16784,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.784.0",
+    VERSION: "1.785.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -17515,6 +17515,8 @@ __export(exports_services_gen, {
   getOfflineLicenseStatus: () => getOfflineLicenseStatus,
   getObjectStorageUsage: () => getObjectStorageUsage,
   getOauthConnect: () => getOauthConnect,
+  getNpmProxyConfig: () => getNpmProxyConfig,
+  getNpmPackageTarball: () => getNpmPackageTarball,
   getNpmPackageMetadata: () => getNpmPackageMetadata,
   getNpmPackageFiletree: () => getNpmPackageFiletree,
   getNpmPackageFile: () => getNpmPackageFile,
@@ -20549,6 +20551,14 @@ var backendVersion = () => {
       workspace: data3.workspace
     }
   });
+}, getNpmProxyConfig = (data3) => {
+  return request(OpenAPI, {
+    method: "GET",
+    url: "/w/{workspace}/npm_proxy/config",
+    path: {
+      workspace: data3.workspace
+    }
+  });
 }, getNpmPackageMetadata = (data3) => {
   return request(OpenAPI, {
     method: "GET",
@@ -20591,6 +20601,16 @@ var backendVersion = () => {
       filepath: data3.filepath
     }
   });
+}, getNpmPackageTarball = (data3) => {
+  return request(OpenAPI, {
+    method: "GET",
+    url: "/w/{workspace}/npm_proxy/tarball/{package}/{version}",
+    path: {
+      workspace: data3.workspace,
+      package: data3._package,
+      version: data3.version
+    }
+  });
 }, queryResourceTypes = (data3) => {
   return request(OpenAPI, {
     method: "GET",
@@ -26943,6 +26963,8 @@ __export(exports_gen, {
   getOfflineLicenseStatus: () => getOfflineLicenseStatus,
   getObjectStorageUsage: () => getObjectStorageUsage,
   getOauthConnect: () => getOauthConnect,
+  getNpmProxyConfig: () => getNpmProxyConfig,
+  getNpmPackageTarball: () => getNpmPackageTarball,
   getNpmPackageMetadata: () => getNpmPackageMetadata,
   getNpmPackageFiletree: () => getNpmPackageFiletree,
   getNpmPackageFile: () => getNpmPackageFile,
@@ -27427,7 +27449,7 @@ var init_auth = __esm(async () => {
 });
 
 // src/core/constants.ts
-var WM_FORK_PREFIX = "wm-fork", VERSION = "1.784.0";
+var WM_FORK_PREFIX = "wm-fork", VERSION = "1.785.0";
 
 // src/utils/git.ts
 var exports_git = {};
@@ -31744,6 +31766,12 @@ function isFileResource(path5) {
   const splitPath = path5.split(".");
   return splitPath.length >= 4 && splitPath[splitPath.length - 3] == "resource" && splitPath[splitPath.length - 2] == "file";
 }
+function removeResourceSuffix(path5) {
+  if (isFileResource(path5)) {
+    return path5.split(".").slice(0, -3).join(".");
+  }
+  return path5.replace(/\.resource\.(yaml|json)$/, "");
+}
 function isFilesetResource(path5) {
   return path5.includes(".fileset/") || path5.includes(".fileset\\");
 }
@@ -61708,7 +61736,7 @@ var init_openflow = __esm(() => {
   openflow_default = {
     openapi: "3.0.3",
     info: {
-      version: "1.784.0",
+      version: "1.785.0",
       title: "OpenFlow Spec",
       contact: {
         name: "Ruben Fiszel",
@@ -64178,17 +64206,73 @@ Frontend appends a \`*\` to the displayed name.
       },
       filters: {
         type: "array",
+        description: "Filters to match incoming messages (only matching messages trigger the script). Each entry is either a leaf `{key, value}` (top-level field) or `{path, value}` (dotted path into nested objects), or a group `{any_of: [...]}` / `{all_of: [...]}` / `{none_of: [...]}` nesting more entries. Entries at the top level are combined with `filter_logic`.",
         items: {
-          type: "object",
-          properties: {
-            key: {
-              type: "string"
+          description: "Either a leaf filter, matching a field of the message (parsed as JSON) against a value by equality (or superset, when the value is an object or array) — addressed by `key` for a top-level field or `path` for a dotted path into nested objects — or a group nesting sub-filters under a boolean operator (`none_of` matches when none of its sub-filters do).\n",
+          oneOf: [
+            {
+              type: "object",
+              properties: {
+                key: {
+                  type: "string"
+                },
+                value: {}
+              },
+              required: [
+                "key",
+                "value"
+              ]
             },
-            value: {}
-          },
-          required: [
-            "key",
-            "value"
+            {
+              type: "object",
+              properties: {
+                path: {
+                  type: "string",
+                  description: "Dotted path into nested objects, e.g. `a.b.c`. Does not traverse arrays."
+                },
+                value: {}
+              },
+              required: [
+                "path",
+                "value"
+              ]
+            },
+            {
+              type: "object",
+              properties: {
+                any_of: {
+                  type: "array",
+                  items: {}
+                }
+              },
+              required: [
+                "any_of"
+              ]
+            },
+            {
+              type: "object",
+              properties: {
+                all_of: {
+                  type: "array",
+                  items: {}
+                }
+              },
+              required: [
+                "all_of"
+              ]
+            },
+            {
+              type: "object",
+              properties: {
+                none_of: {
+                  type: "array",
+                  items: {}
+                }
+              },
+              required: [
+                "none_of"
+              ]
+            }
           ]
         }
       },
@@ -64199,7 +64283,7 @@ Frontend appends a \`*\` to the displayed name.
           "or"
         ],
         default: "and",
-        description: "Logic to apply when evaluating filters. 'and' requires all filters to match, 'or' requires any filter to match."
+        description: "Logic to apply when evaluating the top-level filters. 'and' requires all of them to match, 'or' requires any of them to match. Nested `any_of`/`all_of`/`none_of` groups carry their own logic."
       },
       auto_offset_reset: {
         type: "string",
@@ -64921,18 +65005,73 @@ Frontend appends a \`*\` to the displayed name.
       },
       filters: {
         type: "array",
-        description: "Array of key-value filters to match incoming messages (only matching messages trigger the script)",
+        description: "Filters to match incoming messages (only matching messages trigger the script). Each entry is either a leaf `{key, value}` (top-level field) or `{path, value}` (dotted path into nested objects), or a group `{any_of: [...]}` / `{all_of: [...]}` / `{none_of: [...]}` nesting more entries. Entries at the top level are combined with `filter_logic`.",
         items: {
-          type: "object",
-          properties: {
-            key: {
-              type: "string"
+          description: "Either a leaf filter, matching a field of the message (parsed as JSON) against a value by equality (or superset, when the value is an object or array) — addressed by `key` for a top-level field or `path` for a dotted path into nested objects — or a group nesting sub-filters under a boolean operator (`none_of` matches when none of its sub-filters do).\n",
+          oneOf: [
+            {
+              type: "object",
+              properties: {
+                key: {
+                  type: "string"
+                },
+                value: {}
+              },
+              required: [
+                "key",
+                "value"
+              ]
             },
-            value: {}
-          },
-          required: [
-            "key",
-            "value"
+            {
+              type: "object",
+              properties: {
+                path: {
+                  type: "string",
+                  description: "Dotted path into nested objects, e.g. `a.b.c`. Does not traverse arrays."
+                },
+                value: {}
+              },
+              required: [
+                "path",
+                "value"
+              ]
+            },
+            {
+              type: "object",
+              properties: {
+                any_of: {
+                  type: "array",
+                  items: {}
+                }
+              },
+              required: [
+                "any_of"
+              ]
+            },
+            {
+              type: "object",
+              properties: {
+                all_of: {
+                  type: "array",
+                  items: {}
+                }
+              },
+              required: [
+                "all_of"
+              ]
+            },
+            {
+              type: "object",
+              properties: {
+                none_of: {
+                  type: "array",
+                  items: {}
+                }
+              },
+              required: [
+                "none_of"
+              ]
+            }
           ]
         }
       },
@@ -64943,7 +65082,7 @@ Frontend appends a \`*\` to the displayed name.
           "or"
         ],
         default: "and",
-        description: "Logic to apply when evaluating filters. 'and' requires all filters to match, 'or' requires any filter to match."
+        description: "Logic to apply when evaluating the top-level filters. 'and' requires all of them to match, 'or' requires any of them to match. Nested `any_of`/`all_of`/`none_of` groups carry their own logic."
       },
       initial_messages: {
         type: "array",
@@ -65696,6 +65835,9 @@ function getWorkspaceSpecificPath(basePath, specificItems, workspaceNameOverride
   return;
 }
 function isCurrentWorkspaceFile(path8, workspaceNameOverride) {
+  if (isFilesetResource(path8)) {
+    return false;
+  }
   let currentWorkspace = null;
   if (workspaceNameOverride) {
     currentWorkspace = workspaceNameOverride;
@@ -65715,6 +65857,9 @@ function isCurrentWorkspaceFile(path8, workspaceNameOverride) {
   return pattern.test(path8);
 }
 function isWorkspaceSpecificFile(path8) {
+  if (isFilesetResource(path8)) {
+    return false;
+  }
   const typePattern = buildItemTypePattern();
   return new RegExp(`\\.[^.]+\\.${typePattern}\\.(yaml|json)$|` + `\\.[^.]+\\.resource\\.file\\..+$|` + `/folder\\.[^.]+\\.meta\\.(yaml|json)$|` + `^settings\\.[^.]+\\.(yaml|json)$`).test(path8);
 }
@@ -66769,7 +66914,7 @@ __export(exports_generate_metadata, {
 });
 import { sep as SEP5 } from "node:path";
 async function walkLocalScripts(codebases, ignore) {
-  const elems = await elementsToMap(await FSFSElement(process.cwd(), codebases, false), (p, isD) => !isD && !hasScriptExt(p) || ignore(p, isD) || isFolderResourcePathAnyFormat(p) || isDatatableMigrationPath(p) || isScriptModulePath(p) && !isModuleEntryPoint(p), false, {});
+  const elems = await elementsToMap(await FSFSElement(process.cwd(), codebases, false), (p, isD) => !isD && !hasScriptExt(p) || ignore(p, isD) || isFolderResourcePathAnyFormat(p) || isDatatableMigrationPath(p) || isFileResource(p) || isFilesetResource(p) || isScriptModulePath(p) && !isModuleEntryPoint(p), false, {});
   return Object.keys(elems);
 }
 async function walkLocalFlowFolders(ignore) {
@@ -66828,7 +66973,7 @@ function categorizeLocalFiles(paths) {
       flowFolderSet.add(p.substring(0, p.lastIndexOf(SEP5)));
     } else if (p.endsWith(SEP5 + "raw_app.yaml") || p.endsWith(SEP5 + "app.yaml")) {
       appPaths.push(p);
-    } else if (hasScriptExt(p) && !isFolderResourcePathAnyFormat(p) && !isDatatableMigrationPath(p) && !(isScriptModulePath(p) && !isModuleEntryPoint(p))) {
+    } else if (hasScriptExt(p) && !isFolderResourcePathAnyFormat(p) && !isDatatableMigrationPath(p) && !isFileResource(p) && !isFilesetResource(p) && !(isScriptModulePath(p) && !isModuleEntryPoint(p))) {
       scripts.push(p);
     }
   }
@@ -67220,6 +67365,7 @@ var init_generate_metadata = __esm(async () => {
   await __promiseAll([
     init_confirm(),
     init_types(),
+    init_utils(),
     init_conf(),
     init_context(),
     init_auth(),
@@ -67278,6 +67424,9 @@ async function push2(opts, filePath) {
   if (filePath.endsWith(".script.json") || filePath.endsWith(".script.yaml")) {
     throw Error("Cannot push a script metadata file, point to the script content file instead (.py, .ts, .go|.sh)");
   }
+  if (isFileResource(filePath) || isFilesetResource(filePath)) {
+    throw Error("Cannot push a file/fileset resource content file as a script, push its .resource.yaml with 'wmill resource push' instead");
+  }
   await requireLogin(opts);
   try {
     const content = await readScriptContent(filePath);
@@ -67337,6 +67486,9 @@ async function handleScriptMetadata(path10, workspace, alreadySynced, message, r
   }
 }
 async function handleFile(path10, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases, permissionedAsContext) {
+  if (isFileResource(path10) || isFilesetResource(path10)) {
+    return false;
+  }
   const moduleEntryPoint = isModuleEntryPoint(path10);
   if (!isAppInlineScriptPath2(path10) && !isFlowInlineScriptPath2(path10) && !isRawAppPath(path10) && (!isScriptModulePath(path10) || moduleEntryPoint) && hasScriptExt(path10)) {
     if (alreadySynced.includes(path10)) {
@@ -69268,7 +69420,15 @@ async function readFilesetDirectory(dirPath) {
   await walk(dirPath, "");
   return result;
 }
-async function pushResource(workspace, remotePath, resource, localResource, originalLocalPath, wsSpecific) {
+function validateFilesetPointer(dirPath, remotePath) {
+  const normalize6 = (p) => p.replaceAll("\\", "/").replace(/\/+$/, "");
+  const pointer = normalize6(dirPath);
+  const expected = normalize6(remotePath.replaceAll(SEP8, "/")) + ".fileset";
+  if (pointer !== expected) {
+    throw new Error(`Resource ${remotePath.replaceAll(SEP8, "/")} uses '!inline_fileset ${dirPath}', ` + `but a fileset directory must live next to its resource file, at '${expected}'. ` + `Move the directory there (e.g. 'git mv ${pointer} ${expected}') and update the ` + `'!inline_fileset' value to match.`);
+  }
+}
+async function pushResource(workspace, remotePath, resource, localResource, originalLocalPath, wsSpecific, enforceCanonicalFileset) {
   remotePath = removeType(remotePath, "resource");
   try {
     resource = await getResource({
@@ -69279,6 +69439,9 @@ async function pushResource(workspace, remotePath, resource, localResource, orig
   const resolveInlineContent = async () => {
     if (typeof localResource.value === "string" && localResource.value.startsWith("!inline_fileset ")) {
       const dirPath = localResource.value.split(" ")[1];
+      if (enforceCanonicalFileset) {
+        validateFilesetPointer(dirPath, remotePath);
+      }
       localResource.value = await readFilesetDirectory(dirPath.replaceAll("/", SEP8));
     } else if (localResource.value["content"]?.startsWith("!inline ")) {
       const basePath = localResource.value["content"].split(" ")[1];
@@ -69444,6 +69607,7 @@ __export(exports_sync, {
   gitDeploy: () => gitDeploy,
   generateDatatablesDocumentation: () => generateDatatablesDocumentation,
   generateAgentsDocumentation: () => generateAgentsDocumentation,
+  findFilesetResourceFile: () => findFilesetResourceFile,
   findCodebase: () => findCodebase,
   findCaseInsensitiveCollisions: () => findCaseInsensitiveCollisions,
   extractInlineScriptsForApps: () => extractInlineScriptsForApps,
@@ -69920,13 +70084,16 @@ function parseFileResourceTypeMap(raw) {
   }
   return { formatExtMap, filesetMap };
 }
-async function findFilesetResourceFile(changePath) {
+async function findFilesetResourceFile(changePath, wsName) {
   const filesetIdx = changePath.indexOf(".fileset" + SEP9);
   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"];
+  if (wsName) {
+    candidates.unshift(toWorkspaceSpecificPath(basePath + ".resource.json", wsName), toWorkspaceSpecificPath(basePath + ".resource.yaml", wsName));
+  }
   for (const candidate of candidates) {
     try {
       const s = await stat7(candidate);
@@ -69939,7 +70106,7 @@ async function findFilesetResourceFile(changePath) {
 async function pushFilesetParentResource(childPath, workspaceId, alreadySynced, cachedWsName, specificItems) {
   let resourceFilePath;
   try {
-    resourceFilePath = await findFilesetResourceFile(childPath);
+    resourceFilePath = await findFilesetResourceFile(childPath, cachedWsName);
   } catch {
     return { status: "parent-missing" };
   }
@@ -69956,7 +70123,7 @@ async function pushFilesetParentResource(childPath, workspaceId, alreadySynced,
   } else if (specificItems && isSpecificItem(childPath, specificItems)) {
     wsSpecific = true;
   }
-  await pushResource(workspaceId, serverPath, undefined, newObj, resourceFilePath, wsSpecific ? true : undefined);
+  await pushResource(workspaceId, serverPath, undefined, newObj, resourceFilePath, wsSpecific ? true : undefined, true);
   return { status: "pushed", resourceFilePath };
 }
 function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, resourceTypeToIsFileset, ignoreCodebaseChanges, stripOnBehalfOf) {
@@ -72034,6 +72201,41 @@ Run 'wmill folder add-missing' to create them locally, then push again.`;
       warn(msg);
     }
   }
+  {
+    const wsNameForPointerCheck = wsNameForFiles || (isGitRepository() ? getCurrentGitBranch() : null);
+    const pointerErrors = [];
+    for (const change of changes) {
+      if (change.name !== "added" && change.name !== "edited") {
+        continue;
+      }
+      const normalizedPath = change.path.replaceAll(SEP9, "/");
+      if (!normalizedPath.endsWith(".resource.yaml") && !normalizedPath.endsWith(".resource.json")) {
+        continue;
+      }
+      if (isFilesetResource(change.path)) {
+        continue;
+      }
+      const content = change.name === "added" ? change.content : change.after;
+      let parsed;
+      try {
+        parsed = parseFromPath(change.path, content);
+      } catch {
+        continue;
+      }
+      if (typeof parsed?.value === "string" && parsed.value.startsWith("!inline_fileset ")) {
+        const serverPath = wsNameForPointerCheck && isWorkspaceSpecificFile(change.path) ? fromWorkspaceSpecificPath(change.path, wsNameForPointerCheck) : change.path;
+        try {
+          validateFilesetPointer(parsed.value.split(" ")[1], removeType(serverPath, "resource"));
+        } catch (e) {
+          pointerErrors.push(e instanceof Error ? e.message : String(e));
+        }
+      }
+    }
+    if (pointerErrors.length > 0) {
+      throw new Error(pointerErrors.join(`
+`));
+    }
+  }
   if (opts.dryRun && opts.jsonOutput) {
     const result = {
       success: true,
@@ -72218,27 +72420,22 @@ Run 'wmill folder add-missing' to create them locally, then push again.`;
               }
             }
             if (change.name === "edited") {
-              if (await handleScriptMetadata(change.path, workspace, alreadySynced, opts.message, rawWorkspaceDependencies, codebases, opts, permissionedAsContext)) {
+              if (isFileResource(change.path) || isFilesetResource(change.path)) {
                 if (stateTarget) {
-                  await writeFile7(stateTarget, change.after, "utf-8");
+                  await mkdir5(path12.dirname(stateTarget), { recursive: true });
+                  info(`Editing ${getTypeStrFromPath(change.path)} ${change.path}`);
                 }
-                continue;
-              } else if (await handleFile(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases, permissionedAsContext)) {
-                if (stateTarget) {
-                  await writeFile7(stateTarget, change.after, "utf-8");
+              }
+              if (isFilesetResource(change.path)) {
+                const result = await pushFilesetParentResource(change.path, workspace.workspaceId, alreadySynced, cachedWsNameForPush, specificItems);
+                if (result.status === "parent-missing") {
+                  throw new Error(`No resource metadata file found for fileset resource: ${change.path}`);
                 }
-                continue;
-              } else if (isScriptModulePath(change.path)) {
-                await pushParentScriptForModule(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases);
                 if (stateTarget) {
                   await writeFile7(stateTarget, change.after, "utf-8");
                 }
                 continue;
               }
-              if (stateTarget) {
-                await mkdir5(path12.dirname(stateTarget), { recursive: true });
-                info(`Editing ${getTypeStrFromPath(change.path)} ${change.path}`);
-              }
               if (isFileResource(change.path)) {
                 const resourceFilePath = await findResourceFile(change.path);
                 if (!alreadySynced.includes(resourceFilePath)) {
@@ -72253,24 +72450,33 @@ Run 'wmill folder add-missing' to create them locally, then push again.`;
                   } else if (specificItems && isSpecificItem(change.path, specificItems)) {
                     isFileResWsSpecific = true;
                   }
-                  await pushResource(workspace.workspaceId, serverPath, undefined, newObj2, resourceFilePath, isFileResWsSpecific ? true : undefined);
-                  if (stateTarget) {
-                    await writeFile7(stateTarget, change.after, "utf-8");
-                  }
-                  continue;
+                  await pushResource(workspace.workspaceId, serverPath, undefined, newObj2, resourceFilePath, isFileResWsSpecific ? true : undefined, true);
+                }
+                if (stateTarget) {
+                  await writeFile7(stateTarget, change.after, "utf-8");
                 }
+                continue;
               }
-              if (isFilesetResource(change.path)) {
-                const result = await pushFilesetParentResource(change.path, workspace.workspaceId, alreadySynced, cachedWsNameForPush, specificItems);
-                if (result.status === "parent-missing") {
-                  throw new Error(`No resource metadata file found for fileset resource: ${change.path}`);
+              if (await handleScriptMetadata(change.path, workspace, alreadySynced, opts.message, rawWorkspaceDependencies, codebases, opts, permissionedAsContext)) {
+                if (stateTarget) {
+                  await writeFile7(stateTarget, change.after, "utf-8");
                 }
-                if (result.status === "pushed") {
-                  if (stateTarget) {
-                    await writeFile7(stateTarget, change.after, "utf-8");
-                  }
-                  continue;
+                continue;
+              } else if (await handleFile(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases, permissionedAsContext)) {
+                if (stateTarget) {
+                  await writeFile7(stateTarget, change.after, "utf-8");
                 }
+                continue;
+              } else if (isScriptModulePath(change.path)) {
+                await pushParentScriptForModule(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases);
+                if (stateTarget) {
+                  await writeFile7(stateTarget, change.after, "utf-8");
+                }
+                continue;
+              }
+              if (stateTarget) {
+                await mkdir5(path12.dirname(stateTarget), { recursive: true });
+                info(`Editing ${getTypeStrFromPath(change.path)} ${change.path}`);
               }
               const oldObj = parseFromPath(change.path, change.before);
               const newObj = parseFromPath(change.path, change.after);
@@ -72387,7 +72593,7 @@ Run 'wmill folder add-missing' to create them locally, then push again.`;
                   });
                   break;
                 case "resource": {
-                  const resourcePath = removeSuffix(target, ".resource.json");
+                  const resourcePath = removeResourceSuffix(target);
                   try {
                     await deleteResource({
                       workspace: workspaceId,
@@ -80580,7 +80786,7 @@ async function pushObj(workspace, p, befObj, newObj, plainSecrets, alreadySynced
   } else if (typeEnding === "resource") {
     if (!alreadySynced3.includes(p)) {
       alreadySynced3.push(p);
-      await pushResource(workspace, p, befObj, newObj, originalLocalPath || p, wsSpecific);
+      await pushResource(workspace, p, befObj, newObj, originalLocalPath || p, wsSpecific, true);
     }
   } else if (typeEnding === "resource-type") {
     await pushResourceType(workspace, p, befObj, newObj);
@@ -83505,6 +83711,14 @@ async getResult(jobId: string): Promise<any>
  */
 async getResultMaybe(jobId: string): Promise<any>
 
+/**
+ * Cancel a queued or running job by ID.
+ * @param jobId - UUID of the job to cancel
+ * @param reason - Optional reason for cancellation
+ * @returns Response message from the cancel endpoint
+ */
+async cancelJob(jobId: string, reason: string | undefined = undefined): Promise<string>
+
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
@@ -84269,6 +84483,14 @@ async getResult(jobId: string): Promise<any>
  */
 async getResultMaybe(jobId: string): Promise<any>
 
+/**
+ * Cancel a queued or running job by ID.
+ * @param jobId - UUID of the job to cancel
+ * @param reason - Optional reason for cancellation
+ * @returns Response message from the cancel endpoint
+ */
+async cancelJob(jobId: string, reason: string | undefined = undefined): Promise<string>
+
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
@@ -85127,6 +85349,14 @@ async getResult(jobId: string): Promise<any>
  */
 async getResultMaybe(jobId: string): Promise<any>
 
+/**
+ * Cancel a queued or running job by ID.
+ * @param jobId - UUID of the job to cancel
+ * @param reason - Optional reason for cancellation
+ * @returns Response message from the cancel endpoint
+ */
+async cancelJob(jobId: string, reason: string | undefined = undefined): Promise<string>
+
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
@@ -91120,18 +91350,62 @@ properties:
   filters:
     type: array
     items:
-      type: object
-      properties:
-        key:
-          type: string
-        value: {}
+      oneOf:
+      - type: object
+        properties:
+          key:
+            type: string
+          value: {}
+        required:
+        - key
+        - value
+      - type: object
+        properties:
+          path:
+            type: string
+            description: Dotted path into nested objects, e.g. \`a.b.c\`. Does not traverse
+              arrays.
+          value: {}
+        required:
+        - path
+        - value
+      - type: object
+        properties:
+          any_of:
+            type: array
+            items:
+              type: object
+        required:
+        - any_of
+      - type: object
+        properties:
+          all_of:
+            type: array
+            items:
+              type: object
+        required:
+        - all_of
+      - type: object
+        properties:
+          none_of:
+            type: array
+            items:
+              type: object
+        required:
+        - none_of
+    description: 'Filters to match incoming messages (only matching messages trigger
+      the script). Each entry is either a leaf \`{key, value}\` (top-level field) or
+      \`{path, value}\` (dotted path into nested objects), or a group \`{any_of: [...]}\`
+      / \`{all_of: [...]}\` / \`{none_of: [...]}\` nesting more entries. Entries at the
+      top level are combined with \`filter_logic\`.'
   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.
+    description: Logic to apply when evaluating the top-level filters. 'and' requires
+      all of them to match, 'or' requires any of them to match. Nested \`any_of\`/\`all_of\`/\`none_of\`
+      groups carry their own logic.
   auto_offset_reset:
     type: string
     enum:
@@ -91232,6 +91506,18 @@ properties:
     type: array
     items:
       type: object
+      properties:
+        qos:
+          type: string
+          enum:
+          - qos0
+          - qos1
+          - qos2
+        topic:
+          type: string
+      required:
+      - qos
+      - topic
     description: Array of MQTT topics to subscribe to, each with topic name and QoS
       level
   v3_config:
@@ -91776,24 +92062,91 @@ properties:
   filters:
     type: array
     items:
-      type: object
-      properties:
-        key:
-          type: string
-        value: {}
-    description: Array of key-value filters to match incoming messages (only matching
-      messages trigger the script)
+      oneOf:
+      - type: object
+        properties:
+          key:
+            type: string
+          value: {}
+        required:
+        - key
+        - value
+      - type: object
+        properties:
+          path:
+            type: string
+            description: Dotted path into nested objects, e.g. \`a.b.c\`. Does not traverse
+              arrays.
+          value: {}
+        required:
+        - path
+        - value
+      - type: object
+        properties:
+          any_of:
+            type: array
+            items:
+              type: object
+        required:
+        - any_of
+      - type: object
+        properties:
+          all_of:
+            type: array
+            items:
+              type: object
+        required:
+        - all_of
+      - type: object
+        properties:
+          none_of:
+            type: array
+            items:
+              type: object
+        required:
+        - none_of
+    description: 'Filters to match incoming messages (only matching messages trigger
+      the script). Each entry is either a leaf \`{key, value}\` (top-level field) or
+      \`{path, value}\` (dotted path into nested objects), or a group \`{any_of: [...]}\`
+      / \`{all_of: [...]}\` / \`{none_of: [...]}\` nesting more entries. Entries at the
+      top level are combined with \`filter_logic\`.'
   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.
+    description: Logic to apply when evaluating the top-level filters. 'and' requires
+      all of them to match, 'or' requires any of them to match. Nested \`any_of\`/\`all_of\`/\`none_of\`
+      groups carry their own logic.
   initial_messages:
     type: array
     items:
-      type: object
+      oneOf:
+      - type: object
+        properties:
+          raw_message:
+            type: string
+        required:
+        - raw_message
+      - type: object
+        properties:
+          runnable_result:
+            type: object
+            properties:
+              path:
+                type: string
+              args:
+                type: object
+                description: The arguments to pass to the script or flow
+                additionalProperties: true
+              is_flow:
+                type: boolean
+            required:
+            - path
+            - args
+            - is_flow
+        required:
+        - runnable_result
     description: Messages to send immediately after connecting (can be raw strings
       or computed by runnables)
   url_runnable_args:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.784.0",
+  "version": "1.785.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",
@@ -23,7 +23,7 @@
     "windmill-parser-wasm-java": "1.510.1",
     "windmill-parser-wasm-nu": "1.510.1",
     "windmill-parser-wasm-php": "1.647.1",
-    "windmill-parser-wasm-py": "1.693.1",
+    "windmill-parser-wasm-py": "1.782.0",
     "windmill-parser-wasm-py-imports": "1.693.1",
     "windmill-parser-wasm-r": "1.668.1",
     "windmill-parser-wasm-regex": "1.764.0",