windmill-cli 1.611.0 → 1.612.0

package/esm/gen/core/OpenAPI.js

@@ -32,7 +32,7 @@ export const OpenAPI = {
     PASSWORD: undefined,
     TOKEN: getEnv("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: '1.611.0',
+    VERSION: '1.612.0',
     WITH_CREDENTIALS: true,
     interceptors: {
         request: new Interceptors(),

package/esm/src/commands/sync/sync.js

@@ -1559,9 +1559,9 @@ async function buildTracker(changes) {
 export async function pull(opts) {
     const originalCliOpts = { ...opts };
     opts = await mergeConfigWithConfigFile(opts);
-    // Validate branch configuration early
+    // Validate branch configuration early (skipped when --branch is used)
     try {
-        await validateBranchConfiguration(opts);
+        await validateBranchConfiguration(opts, opts.branch);
     }
     catch (error) {
         if (error instanceof Error && error.message.includes("overrides")) {
@@ -1864,9 +1864,9 @@ export async function push(opts) {
     const originalCliOpts = { ...opts };
     // Load configuration from wmill.yaml and merge with CLI options
     opts = await mergeConfigWithConfigFile(opts);
-    // Validate branch configuration early
+    // Validate branch configuration early (skipped when --branch is used)
     try {
-        await validateBranchConfiguration(opts);
+        await validateBranchConfiguration(opts, opts.branch);
     }
     catch (error) {
         if (error instanceof Error && error.message.includes("overrides")) {

package/esm/src/core/conf.js

@@ -196,8 +196,9 @@ export async function mergeConfigWithConfigFile(opts) {
     return Object.assign(configFile ?? {}, opts);
 }
 // Validate branch configuration early in the process
-export async function validateBranchConfiguration(opts) {
-    if (opts.skipBranchValidation || !isGitRepository()) {
+export async function validateBranchConfiguration(opts, branchOverride) {
+    // When branch override is provided, skip validation - user is explicitly specifying the branch
+    if (opts.skipBranchValidation || branchOverride || !isGitRepository()) {
         return;
     }
     const config = await readConfigFile();

package/esm/src/core/specific_items.js

@@ -77,6 +77,12 @@ export function getSpecificItemsForCurrentBranch(config, branchOverride) {
     if (commonItems?.triggers) {
         merged.triggers = [...commonItems.triggers];
     }
+    if (commonItems?.folders) {
+        merged.folders = [...commonItems.folders];
+    }
+    if (commonItems?.settings !== undefined) {
+        merged.settings = commonItems.settings;
+    }
     // Add branch-specific items (extending common items)
     if (branchItems?.variables) {
         merged.variables = [...(merged.variables || []), ...branchItems.variables];
@@ -87,6 +93,13 @@ export function getSpecificItemsForCurrentBranch(config, branchOverride) {
     if (branchItems?.triggers) {
         merged.triggers = [...(merged.triggers || []), ...branchItems.triggers];
     }
+    if (branchItems?.folders) {
+        merged.folders = [...(merged.folders || []), ...branchItems.folders];
+    }
+    // For settings (boolean), branch-specific overrides common
+    if (branchItems?.settings !== undefined) {
+        merged.settings = branchItems.settings;
+    }
     return merged;
 }
 /**
@@ -113,6 +126,19 @@ export function isSpecificItem(path, specificItems) {
     if (isTriggerFile(path)) {
         return specificItems.triggers ? matchesPatterns(path, specificItems.triggers) : false;
     }
+    // Check for folder meta files
+    if (path.endsWith('/folder.meta.yaml')) {
+        if (specificItems.folders) {
+            // Match against the folder path (without /folder.meta.yaml)
+            const folderPath = path.slice(0, -'/folder.meta.yaml'.length);
+            return matchesPatterns(folderPath, specificItems.folders);
+        }
+        return false;
+    }
+    // Check for settings.yaml (root-level file)
+    if (path === 'settings.yaml') {
+        return specificItems.settings === true;
+    }
     // Check for resource files using the standard detection function
     if (isFileResource(path)) {
         // Extract the base path without the file extension to match against patterns
@@ -128,6 +154,21 @@ export function isSpecificItem(path, specificItems) {
  * Convert a base path to a branch-specific path
  */
 export function toBranchSpecificPath(basePath, branchName) {
+    // Sanitize branch name to be filesystem-safe
+    const sanitizedBranchName = branchName.replace(/[\/\\:*?"<>|.]/g, '_');
+    // Warn about potential collisions if sanitization occurred
+    if (sanitizedBranchName !== branchName) {
+        console.warn(`Warning: Branch name "${branchName}" contains filesystem-unsafe characters (/ \\ : * ? " < > | .) and was sanitized to "${sanitizedBranchName}". This may cause collisions with other similarly named branches.`);
+    }
+    // Check for folder meta file pattern: folder.meta.yaml -> folder.branchName.meta.yaml
+    if (basePath.endsWith('/folder.meta.yaml')) {
+        const pathWithoutMeta = basePath.substring(0, basePath.length - '/folder.meta.yaml'.length);
+        return `${pathWithoutMeta}/folder.${sanitizedBranchName}.meta.yaml`;
+    }
+    // Check for settings.yaml: settings.yaml -> settings.branchName.yaml
+    if (basePath === 'settings.yaml') {
+        return `settings.${sanitizedBranchName}.yaml`;
+    }
     // Check for resource file pattern (e.g., .resource.file.ini)
     const resourceFileMatch = basePath.match(/^(.+?)(\.resource\.file\..+)$/);
     let extension;
@@ -145,12 +186,6 @@ export function toBranchSpecificPath(basePath, branchName) {
         extension = suffix;
         pathWithoutExtension = basePath.substring(0, basePath.length - extension.length);
     }
-    // Sanitize branch name to be filesystem-safe
-    const sanitizedBranchName = branchName.replace(/[\/\\:*?"<>|.]/g, '_');
-    // Warn about potential collisions if sanitization occurred
-    if (sanitizedBranchName !== branchName) {
-        console.warn(`Warning: Branch name "${branchName}" contains filesystem-unsafe characters (/ \\ : * ? " < > | .) and was sanitized to "${sanitizedBranchName}". This may cause collisions with other similarly named branches.`);
-    }
     return `${pathWithoutExtension}.${sanitizedBranchName}${extension}`;
 }
 /**
@@ -160,7 +195,17 @@ export function fromBranchSpecificPath(branchSpecificPath, branchName) {
     // Sanitize branch name the same way as in toBranchSpecificPath
     const sanitizedBranchName = branchName.replace(/[\/\\:*?"<>|.]/g, '_');
     const escapedBranchName = sanitizedBranchName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    // Check for resource file pattern first
+    // Check for folder meta file pattern: /folder.branchName.meta.yaml -> /folder.meta.yaml
+    const folderPattern = new RegExp(`/folder\\.${escapedBranchName}\\.meta\\.yaml$`);
+    if (folderPattern.test(branchSpecificPath)) {
+        return branchSpecificPath.replace(folderPattern, '/folder.meta.yaml');
+    }
+    // Check for settings file pattern: settings.branchName.yaml -> settings.yaml
+    const settingsPattern = new RegExp(`^settings\\.${escapedBranchName}\\.yaml$`);
+    if (settingsPattern.test(branchSpecificPath)) {
+        return 'settings.yaml';
+    }
+    // Check for resource file pattern
     const resourceFilePattern = new RegExp(`\\.${escapedBranchName}(\\.resource\\.file\\..+)$`);
     const resourceFileMatch = branchSpecificPath.match(resourceFilePattern);
     if (resourceFileMatch) {
@@ -223,7 +268,10 @@ export function isCurrentBranchFile(path, branchOverride) {
     // Use cached pattern or create and cache new one
     let pattern = branchPatternCache.get(currentBranch);
     if (!pattern) {
-        pattern = new RegExp(`\\.${escapedBranchName}\\.${buildYamlTypePattern()}\\.yaml$|\\.${escapedBranchName}\\.resource\\.file\\..+$`);
+        pattern = new RegExp(`\\.${escapedBranchName}\\.${buildYamlTypePattern()}\\.yaml$|` +
+            `\\.${escapedBranchName}\\.resource\\.file\\..+$|` +
+            `/folder\\.${escapedBranchName}\\.meta\\.yaml$|` +
+            `^settings\\.${escapedBranchName}\\.yaml$`);
         branchPatternCache.set(currentBranch, pattern);
     }
     return pattern.test(path);
@@ -234,5 +282,8 @@ export function isCurrentBranchFile(path, branchOverride) {
  */
 export function isBranchSpecificFile(path) {
     const yamlTypePattern = buildYamlTypePattern();
-    return new RegExp(`\\.[^.]+\\.${yamlTypePattern}\\.yaml$|\\.[^.]+\\.resource\\.file\\..+$`).test(path);
+    return new RegExp(`\\.[^.]+\\.${yamlTypePattern}\\.yaml$|` +
+        `\\.[^.]+\\.resource\\.file\\..+$|` +
+        `/folder\\.[^.]+\\.meta\\.yaml$|` +
+        `^settings\\.[^.]+\\.yaml$`).test(path);
 }

package/esm/src/main.js

@@ -40,7 +40,7 @@ export { flow, app, script, workspace, resource, resourceType, user, variable, h
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.611.0";
+export const VERSION = "1.612.0";
 // Re-exported from constants.ts to maintain backwards compatibility
 export { WM_FORK_PREFIX } from "./core/constants.js";
 const command = new Command()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.611.0",
+  "version": "1.612.0",
   "description": "CLI for Windmill",
   "repository": {
     "type": "git",

package/types/src/core/conf.d.ts

@@ -39,6 +39,8 @@ export interface SyncOptions {
             variables?: string[];
             resources?: string[];
             triggers?: string[];
+            folders?: string[];
+            settings?: boolean;
         };
     } & {
         [branchName: string]: SyncOptions & {
@@ -50,6 +52,8 @@ export interface SyncOptions {
                 variables?: string[];
                 resources?: string[];
                 triggers?: string[];
+                folders?: string[];
+                settings?: boolean;
             };
         };
     };
@@ -58,6 +62,8 @@ export interface SyncOptions {
             variables?: string[];
             resources?: string[];
             triggers?: string[];
+            folders?: string[];
+            settings?: boolean;
         };
     } & {
         [branchName: string]: SyncOptions & {
@@ -69,6 +75,8 @@ export interface SyncOptions {
                 variables?: string[];
                 resources?: string[];
                 triggers?: string[];
+                folders?: string[];
+                settings?: boolean;
             };
         };
     };
@@ -101,6 +109,6 @@ export declare function getWmillYamlPath(): string | null;
 export declare function readConfigFile(): Promise<SyncOptions>;
 export declare const DEFAULT_SYNC_OPTIONS: Readonly<Required<Pick<SyncOptions, "defaultTs" | "includes" | "excludes" | "codebases" | "skipVariables" | "skipResources" | "skipResourceTypes" | "skipSecrets" | "includeSchedules" | "includeTriggers" | "skipWorkspaceDependencies" | "skipScripts" | "skipFlows" | "skipApps" | "skipFolders" | "includeUsers" | "includeGroups" | "includeSettings" | "includeKey" | "nonDottedPaths">>>;
 export declare function mergeConfigWithConfigFile<T>(opts: T): Promise<T & SyncOptions>;
-export declare function validateBranchConfiguration(opts: Pick<SyncOptions, "skipBranchValidation" | "yes">): Promise<void>;
+export declare function validateBranchConfiguration(opts: Pick<SyncOptions, "skipBranchValidation" | "yes">, branchOverride?: string): Promise<void>;
 export declare function getEffectiveSettings(config: SyncOptions, promotion?: string, skipBranchValidation?: boolean, suppressLogs?: boolean, branchOverride?: string): Promise<SyncOptions>;
 //# sourceMappingURL=conf.d.ts.map

package/types/src/core/conf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conf.d.ts","sourceRoot":"","sources":["../../../src/src/core/conf.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conf.d.ts","sourceRoot":"","sources":["../../../src/src/core/conf.ts"],"names":[],"mappings":"AAYA,eAAO,IAAI,SAAS,SAAQ,CAAC;AAC7B,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,QAE1C;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE;QACZ,mBAAmB,CAAC,EAAE;YACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;YACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;YACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;YACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;YACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;SACpB,CAAC;KACH,GAAG;QACF,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG;YAClC,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YACjC,kBAAkB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,aAAa,CAAC,EAAE;gBACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;gBACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;gBACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;gBACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;gBACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;aACpB,CAAC;SACH,CAAC;KACH,CAAC;IAEF,YAAY,CAAC,EAAE;QACb,mBAAmB,CAAC,EAAE;YACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;YACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;YACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;YACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;YACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;SACpB,CAAC;KACH,GAAG;QACF,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG;YAClC,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YACjC,kBAAkB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,aAAa,CAAC,EAAE;gBACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;gBACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;gBACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;gBACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;gBACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;aACpB,CAAC;SACH,CAAC;KACH,CAAC;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,QAAQ;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACZ,EAAE,CAAC;IACJ,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,MAAM,CAAC,EAAE;QACP,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;KAC1B,CAAC;CACD;AAcD,eAAO,MAAM,iBAAiB;;CAAwB,CAAC;AAkDvD,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAEhD;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAsI3D;AAGD,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CACzC,QAAQ,CACN,IAAI,CACF,WAAW,EACT,WAAW,GACX,UAAU,GACV,UAAU,GACV,WAAW,GACX,eAAe,GACf,eAAe,GACf,mBAAmB,GACnB,aAAa,GACb,kBAAkB,GAClB,iBAAiB,GACjB,2BAA2B,GAC3B,aAAa,GACb,WAAW,GACX,UAAU,GACV,aAAa,GACb,cAAc,GACd,eAAe,GACf,iBAAiB,GACjB,YAAY,GACZ,gBAAgB,CACnB,CACF,CAsBO,CAAC;AAEX,wBAAsB,yBAAyB,CAAC,CAAC,EAC/C,IAAI,EAAE,CAAC,GACN,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,CAG1B;AAGD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,sBAAsB,GAAG,KAAK,CAAC,EACvD,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CA8Gf;AAGD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,WAAW,EACnB,SAAS,CAAC,EAAE,MAAM,EAClB,oBAAoB,CAAC,EAAE,OAAO,EAC9B,YAAY,CAAC,EAAE,OAAO,EACtB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,WAAW,CAAC,CA2EtB"}

package/types/src/core/specific_items.d.ts

@@ -3,6 +3,8 @@ export interface SpecificItemsConfig {
     variables?: string[];
     resources?: string[];
     triggers?: string[];
+    folders?: string[];
+    settings?: boolean;
 }
 /**
  * Get the specific items configuration for the current git branch

package/types/src/core/specific_items.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specific_items.d.ts","sourceRoot":"","sources":["../../../src/src/core/specific_items.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAgDD;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAmD9H;AASD;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CA8BpG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA6BjF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAgC7F;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,mBAAmB,GAAG,SAAS,EAC9C,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAsBpB;AAKD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAyBlF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1D"}
+{"version":3,"file":"specific_items.d.ts","sourceRoot":"","sources":["../../../src/src/core/specific_items.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAgDD;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAgE9H;AASD;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CA6CpG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAwCjF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA4C7F;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,mBAAmB,GAAG,SAAS,EAC9C,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAsBpB;AAKD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CA8BlF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQ1D"}

package/types/src/main.d.ts

@@ -22,7 +22,7 @@ import { pull as hubPull } from "./commands/hub/hub.js";
 import { pull, push } from "./commands/sync/sync.js";
 import { add as workspaceAdd } from "./commands/workspace/workspace.js";
 export { flow, app, script, workspace, resource, resourceType, user, variable, hub, folder, schedule, trigger, sync, gitsyncSettings, instance, dev, hubPull, pull, push, workspaceAdd, };
-export declare const VERSION = "1.611.0";
+export declare const VERSION = "1.612.0";
 export { WM_FORK_PREFIX } from "./core/constants.js";
 declare const command: Command<{
     workspace?: (import("../deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType & string) | undefined;