windmill-cli 1.535.0 → 1.536.0

package/esm/gen/core/OpenAPI.js

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

package/esm/src/commands/resource/resource.js

@@ -6,7 +6,9 @@ import { resolveWorkspace, validatePath } from "../../core/context.js";
 import { colors, Command, log, SEP, Table } from "../../../deps.js";
 import * as wmill from "../../../gen/services.gen.js";
 import { readInlinePathSync } from "../../utils/utils.js";
-export async function pushResource(workspace, remotePath, resource, localResource) {
+import { isBranchSpecificFile } from "../../core/specific_items.js";
+import { getCurrentGitBranch } from "../../utils/git.js";
+export async function pushResource(workspace, remotePath, resource, localResource, originalLocalPath) {
     remotePath = removeType(remotePath, "resource");
     try {
         resource = await wmill.getResource({
@@ -17,14 +19,33 @@ export async function pushResource(workspace, remotePath, resource, localResourc
     catch {
         // flow doesn't exist
     }
-    if (localResource.value["content"]?.startsWith("!inline ")) {
-        const basePath = localResource.value["content"].split(" ")[1];
-        localResource.value["content"] = readInlinePathSync(basePath);
-    }
+    // Helper function to resolve inline content
+    const resolveInlineContent = async () => {
+        if (localResource.value["content"]?.startsWith("!inline ")) {
+            const basePath = localResource.value["content"].split(" ")[1];
+            // If we're processing a branch-specific metadata file, read from branch-specific resource file
+            let pathToRead = basePath;
+            if (originalLocalPath && isBranchSpecificFile(originalLocalPath)) {
+                const currentBranch = getCurrentGitBranch();
+                if (currentBranch) {
+                    // Directly construct branch-specific resource file path
+                    const resourcePathSegments = basePath.split(".");
+                    if (resourcePathSegments.length >= 4 && resourcePathSegments[resourcePathSegments.length - 3] === "resource" && resourcePathSegments[resourcePathSegments.length - 2] === "file") {
+                        const fileBaseParts = resourcePathSegments.slice(0, -3);
+                        const fileExt = resourcePathSegments.slice(-3);
+                        pathToRead = [...fileBaseParts, currentBranch, ...fileExt].join(".");
+                    }
+                }
+            }
+            localResource.value["content"] = readInlinePathSync(pathToRead);
+        }
+    };
     if (resource) {
         if (isSuperset(localResource, resource)) {
             return;
         }
+        // Only resolve inline content if we're actually updating
+        await resolveInlineContent();
         await wmill.updateResource({
             workspace: workspace,
             path: remotePath.replaceAll(SEP, "/"),
@@ -32,6 +53,8 @@ export async function pushResource(workspace, remotePath, resource, localResourc
         });
     }
     else {
+        // New resource - resolve inline content
+        await resolveInlineContent();
         if (localResource.is_oauth) {
             log.info(colors.yellow("! is_oauth has been removed in newer versions. Ignoring."));
         }
@@ -56,7 +79,8 @@ async function push(opts, filePath, remotePath) {
         throw new Error("file path must refer to a file.");
     }
     log.info(colors.bold.yellow("Pushing resource..."));
-    await pushResource(workspace.workspaceId, remotePath, undefined, parseFromFile(filePath));
+    await pushResource(workspace.workspaceId, remotePath, undefined, parseFromFile(filePath), filePath // Pass the local file path for branch-specific inline content resolution
+    );
     log.info(colors.bold.underline.green(`Resource ${remotePath} pushed`));
 }
 async function list(opts) {

package/esm/src/commands/script/script.js

@@ -5,6 +5,8 @@ import { resolveWorkspace, validatePath } from "../../core/context.js";
 import { colors, Command, Confirm, log, readAll, SEP, Table, writeAllSync, yamlStringify, } from "../../../deps.js";
 import { deepEqual } from "../../utils/utils.js";
 import * as wmill from "../../../gen/services.gen.js";
+import * as specificItems from "../../core/specific_items.js";
+import { getCurrentGitBranch } from "../../utils/git.js";
 import { defaultScriptMetadata, scriptBootstrapCode, } from "../../../bootstrap/script_bootstrap.js";
 import { generateScriptMetadataInternal, parseMetadataFile, } from "../../utils/metadata.js";
 import { inferContentTypeFromFilePath, languagesWithRawReqsSupport, } from "../../utils/script_common.js";
@@ -36,9 +38,18 @@ async function push(opts, filePath) {
 }
 export async function findResourceFile(path) {
     const splitPath = path.split(".");
-    const contentBasePathJSON = splitPath[0] + "." + splitPath[1] + ".json";
-    const contentBasePathYAML = splitPath[0] + "." + splitPath[1] + ".yaml";
-    const validCandidates = (await Promise.all([contentBasePathJSON, contentBasePathYAML].map((x) => {
+    let contentBasePathJSON = splitPath[0] + "." + splitPath[1] + ".json";
+    let contentBasePathYAML = splitPath[0] + "." + splitPath[1] + ".yaml";
+    // Check for branch-specific metadata files first
+    const currentBranch = getCurrentGitBranch();
+    const candidates = [contentBasePathJSON, contentBasePathYAML];
+    if (currentBranch) {
+        // Add branch-specific candidates at the beginning (higher priority)
+        const branchSpecificJSON = specificItems.toBranchSpecificPath(contentBasePathJSON, currentBranch);
+        const branchSpecificYAML = specificItems.toBranchSpecificPath(contentBasePathYAML, currentBranch);
+        candidates.unshift(branchSpecificJSON, branchSpecificYAML);
+    }
+    const validCandidates = (await Promise.all(candidates.map((x) => {
         return dntShim.Deno.stat(x)
             .catch(() => undefined)
             .then((x) => x?.isFile)
@@ -410,7 +421,7 @@ export function filePathExtensionFromContentType(language, defaultTs) {
     }
     else if (language === "ruby") {
         return ".rb";
-        // for related places search: ADD_NEW_LANG 
+        // for related places search: ADD_NEW_LANG
     }
     else {
         throw new Error("Invalid language: " + language);
@@ -441,7 +452,7 @@ export const exts = [
     ".playbook.yml",
     ".java",
     ".rb"
-    // for related places search: ADD_NEW_LANG 
+    // for related places search: ADD_NEW_LANG
 ];
 export function removeExtensionToPath(path) {
     for (const ext of exts) {

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

@@ -1505,7 +1505,14 @@ export async function push(opts) {
                                 if (!alreadySynced.includes(resourceFilePath)) {
                                     alreadySynced.push(resourceFilePath);
                                     const newObj = parseFromPath(resourceFilePath, await dntShim.Deno.readTextFile(resourceFilePath));
-                                    await pushResource(workspace.workspaceId, resourceFilePath, undefined, newObj);
+                                    // For branch-specific resources, push to the base path on the workspace server
+                                    // This ensures branch-specific files are stored with their base names in the workspace
+                                    let serverPath = resourceFilePath;
+                                    const currentBranch = getCurrentGitBranch();
+                                    if (currentBranch && isBranchSpecificFile(resourceFilePath)) {
+                                        serverPath = fromBranchSpecificPath(resourceFilePath, currentBranch);
+                                    }
+                                    await pushResource(workspace.workspaceId, serverPath, undefined, newObj, resourceFilePath);
                                     if (stateTarget) {
                                         await dntShim.Deno.writeTextFile(stateTarget, change.after);
                                     }
@@ -1514,7 +1521,12 @@ export async function push(opts) {
                             }
                             const oldObj = parseFromPath(change.path, change.before);
                             const newObj = parseFromPath(change.path, change.after);
-                            await pushObj(workspace.workspaceId, change.path, oldObj, newObj, opts.plainSecrets ?? false, alreadySynced, opts.message);
+                            // Check if this is a branch-specific item and get the original branch-specific path
+                            let originalBranchSpecificPath;
+                            if (specificItems && isSpecificItem(change.path, specificItems)) {
+                                originalBranchSpecificPath = getBranchSpecificPath(change.path, specificItems);
+                            }
+                            await pushObj(workspace.workspaceId, change.path, oldObj, newObj, opts.plainSecrets ?? false, alreadySynced, opts.message, originalBranchSpecificPath);
                             if (stateTarget) {
                                 await dntShim.Deno.writeTextFile(stateTarget, change.after);
                             }
@@ -1534,7 +1546,17 @@ export async function push(opts) {
                                 log.info(`Adding ${getTypeStrFromPath(change.path)} ${change.path}`);
                             }
                             const obj = parseFromPath(change.path, change.content);
-                            await pushObj(workspace.workspaceId, change.path, undefined, obj, opts.plainSecrets ?? false, [], opts.message);
+                            // Determine the actual local file path for this change
+                            // For branch-specific items, we read from branch-specific files but push to base server paths
+                            let localFilePath = change.path;
+                            if (specificItems && isSpecificItem(change.path, specificItems)) {
+                                const branchSpecificPath = getBranchSpecificPath(change.path, specificItems);
+                                if (branchSpecificPath) {
+                                    localFilePath = branchSpecificPath;
+                                }
+                            }
+                            await pushObj(workspace.workspaceId, change.path, undefined, obj, opts.plainSecrets ?? false, [], opts.message, localFilePath // Pass the actual local file path
+                            );
                             if (stateTarget) {
                                 await dntShim.Deno.writeTextFile(stateTarget, change.content);
                             }

package/esm/src/commands/trigger/trigger.js

@@ -1,7 +1,9 @@
 import * as dntShim from "../../../_dnt.shims.js";
 import * as wmill from "../../../gen/services.gen.js";
 import { colors, Command, log, SEP, Table } from "../../../deps.js";
-import { isSuperset, parseFromFile, removeType, } from "../../types.js";
+import { isSuperset, parseFromFile, removeType, TRIGGER_TYPES, } from "../../types.js";
+import { fromBranchSpecificPath, isBranchSpecificFile } from "../../core/specific_items.js";
+import { getCurrentGitBranch } from "../../utils/git.js";
 import { requireLogin } from "../../core/auth.js";
 import { validatePath, resolveWorkspace } from "../../core/context.js";
 async function getTrigger(triggerType, workspace, path) {
@@ -138,23 +140,26 @@ async function list(opts) {
         .render();
 }
 function checkIfValidTrigger(kind) {
-    if (kind &&
-        [
-            "http",
-            "websocket",
-            "kafka",
-            "nats",
-            "postgres",
-            "mqtt",
-            "sqs",
-            "gcp",
-        ].includes(kind)) {
+    if (kind && TRIGGER_TYPES.includes(kind)) {
         return true;
     }
     else {
         return false;
     }
 }
+function extractTriggerKindFromPath(filePath) {
+    let pathToAnalyze = filePath;
+    // If this is a branch-specific file, convert it to the base path first
+    if (isBranchSpecificFile(filePath)) {
+        const currentBranch = getCurrentGitBranch();
+        if (currentBranch) {
+            pathToAnalyze = fromBranchSpecificPath(filePath, currentBranch);
+        }
+    }
+    // Now extract trigger type from the base path: "something.kafka_trigger.yaml" -> "kafka"
+    const triggerMatch = pathToAnalyze.match(/\.(\w+)_trigger\.yaml$/);
+    return triggerMatch ? triggerMatch[1] : undefined;
+}
 async function push(opts, filePath, remotePath) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
@@ -166,7 +171,7 @@ async function push(opts, filePath, remotePath) {
         throw new Error("file path must refer to a file.");
     }
     console.log(colors.bold.yellow("Pushing trigger..."));
-    const triggerKind = filePath.split(".")[1].split("_")[0];
+    const triggerKind = extractTriggerKindFromPath(filePath);
     if (!checkIfValidTrigger(triggerKind)) {
         throw new Error("Invalid trigger kind: " + triggerKind);
     }

package/esm/src/core/context.js

@@ -59,14 +59,11 @@ async function tryResolveWorkspace(opts) {
         opts.__secret_workspace = e;
         return { isError: false, value: e };
     }
-    const defaultWorkspace = await getActiveWorkspace(opts);
-    if (!defaultWorkspace) {
-        return {
-            isError: true,
-            error: colors.red.underline("No workspace given and no default set."),
-        };
-    }
-    return { isError: false, value: defaultWorkspace };
+    // Only check for explicit workspace, don't fallback to active workspace here
+    return {
+        isError: true,
+        error: colors.red.underline("No explicit workspace given."),
+    };
 }
 async function tryResolveBranchWorkspace(opts) {
     // Only try branch-based resolution if in a Git repository
@@ -160,6 +157,9 @@ async function tryResolveBranchWorkspace(opts) {
     return selectedProfile;
 }
 export async function resolveWorkspace(opts) {
+    const cache = opts.__secret_workspace;
+    if (cache)
+        return cache;
     if (opts.baseUrl) {
         if (opts.workspace && opts.token) {
             let normalizedBaseUrl;
@@ -209,18 +209,25 @@ export async function resolveWorkspace(opts) {
             return dntShim.Deno.exit(-1);
         }
     }
-    // Try explicit workspace flag first (should override branch-based resolution)
+    // Try explicit workspace flag first (highest priority)
     const res = await tryResolveWorkspace(opts);
     if (!res.isError) {
         return res.value;
     }
-    // Fall back to branch-based resolution if no explicit workspace
+    // Try branch-based resolution (medium priority)
     const branchWorkspace = await tryResolveBranchWorkspace(opts);
     if (branchWorkspace) {
+        opts.__secret_workspace = branchWorkspace;
         return branchWorkspace;
     }
-    // If both failed, show the original error from explicit workspace resolution
-    log.info(colors.red.bold(res.error));
+    // Fall back to active workspace (lowest priority)
+    const activeWorkspace = await getActiveWorkspace(opts);
+    if (activeWorkspace) {
+        opts.__secret_workspace = activeWorkspace;
+        return activeWorkspace;
+    }
+    // If everything failed, show error
+    log.info(colors.red.bold("No workspace given and no default set."));
     return dntShim.Deno.exit(-1);
 }
 export async function fetchVersion(baseUrl) {

package/esm/src/core/specific_items.js

@@ -1,5 +1,45 @@
 import { minimatch } from "../../deps.js";
 import { getCurrentGitBranch, isGitRepository } from "../utils/git.js";
+import { isFileResource } from "../utils/utils.js";
+import { TRIGGER_TYPES } from "../types.js";
+// Define all branch-specific file types (computed lazily)
+function getBranchSpecificTypes() {
+    return {
+        variable: '.variable.yaml',
+        resource: '.resource.yaml',
+        // Generate trigger patterns from the list
+        ...Object.fromEntries(TRIGGER_TYPES.map(t => [`${t}_trigger`, `.${t}_trigger.yaml`]))
+    };
+}
+/**
+ * Check if a path ends with any trigger type
+ */
+function isTriggerFile(path) {
+    return TRIGGER_TYPES.some(type => path.endsWith(`.${type}_trigger.yaml`));
+}
+/**
+ * Extract the file type suffix from a path
+ */
+function getFileTypeSuffix(path) {
+    for (const [_, suffix] of Object.entries(getBranchSpecificTypes())) {
+        if (path.endsWith(suffix)) {
+            return suffix;
+        }
+    }
+    const resourceFileMatch = path.match(/(\\.resource\\.file\\..+)$/);
+    if (resourceFileMatch) {
+        return resourceFileMatch[1];
+    }
+    return null;
+}
+/**
+ * Build regex pattern for all supported yaml file types
+ */
+function buildYamlTypePattern() {
+    const basicTypes = ['variable', 'resource'];
+    const triggerTypes = TRIGGER_TYPES.map(t => `${t}_trigger`);
+    return `((${basicTypes.join('|')})|(${triggerTypes.join('|')}))`;
+}
 /**
  * Get the specific items configuration for the current git branch
  * Merges commonSpecificItems with branch-specific specificItems
@@ -27,6 +67,9 @@ export function getSpecificItemsForCurrentBranch(config) {
     if (commonItems?.resources) {
         merged.resources = [...commonItems.resources];
     }
+    if (commonItems?.triggers) {
+        merged.triggers = [...commonItems.triggers];
+    }
     // Add branch-specific items (extending common items)
     if (branchItems?.variables) {
         merged.variables = [...(merged.variables || []), ...branchItems.variables];
@@ -34,6 +77,9 @@ export function getSpecificItemsForCurrentBranch(config) {
     if (branchItems?.resources) {
         merged.resources = [...(merged.resources || []), ...branchItems.resources];
     }
+    if (branchItems?.triggers) {
+        merged.triggers = [...(merged.triggers || []), ...branchItems.triggers];
+    }
     return merged;
 }
 /**
@@ -56,19 +102,42 @@ export function isSpecificItem(path, specificItems) {
     if (path.endsWith('.resource.yaml')) {
         return specificItems.resources ? matchesPatterns(path, specificItems.resources) : false;
     }
+    // Check for any trigger type
+    if (isTriggerFile(path)) {
+        return specificItems.triggers ? matchesPatterns(path, specificItems.triggers) : false;
+    }
+    // Check for resource files using the standard detection function
+    if (isFileResource(path)) {
+        // Extract the base path without the file extension to match against patterns
+        const basePathMatch = path.match(/^(.+?)\.resource\.file\./);
+        if (basePathMatch && specificItems.resources) {
+            const basePath = basePathMatch[1] + '.resource.yaml';
+            return matchesPatterns(basePath, specificItems.resources);
+        }
+    }
     return false;
 }
 /**
  * Convert a base path to a branch-specific path
  */
 export function toBranchSpecificPath(basePath, branchName) {
-    // Extract the extension (e.g., ".variable.yaml" or ".resource.yaml")
-    const extensionMatch = basePath.match(/(\.(variable|resource)\.yaml)$/);
-    if (!extensionMatch) {
-        return basePath; // Return unchanged if no recognized extension
+    // Check for resource file pattern (e.g., .resource.file.ini)
+    const resourceFileMatch = basePath.match(/^(.+?)(\.resource\.file\..+)$/);
+    let extension;
+    let pathWithoutExtension;
+    if (resourceFileMatch) {
+        // Handle resource files
+        extension = resourceFileMatch[2];
+        pathWithoutExtension = resourceFileMatch[1];
+    }
+    else {
+        const suffix = getFileTypeSuffix(basePath);
+        if (!suffix) {
+            return basePath;
+        }
+        extension = suffix;
+        pathWithoutExtension = basePath.substring(0, basePath.length - extension.length);
     }
-    const extension = extensionMatch[1];
-    const 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
@@ -83,14 +152,21 @@ export function toBranchSpecificPath(basePath, branchName) {
 export function fromBranchSpecificPath(branchSpecificPath, branchName) {
     // Sanitize branch name the same way as in toBranchSpecificPath
     const sanitizedBranchName = branchName.replace(/[\/\\:*?"<>|.]/g, '_');
-    // Pattern: path.sanitizedBranchName.extension
     const escapedBranchName = sanitizedBranchName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const pattern = new RegExp(`\\.${escapedBranchName}(\\.(variable|resource)\\.yaml)$`);
-    const match = branchSpecificPath.match(pattern);
-    if (!match) {
+    // Check for resource file pattern first
+    const resourceFilePattern = new RegExp(`\\.${escapedBranchName}(\\.resource\\.file\\..+)$`);
+    const resourceFileMatch = branchSpecificPath.match(resourceFilePattern);
+    if (resourceFileMatch) {
+        const extension = resourceFileMatch[1];
+        const pathWithoutBranchAndExtension = branchSpecificPath.substring(0, branchSpecificPath.length - `.${sanitizedBranchName}${extension}`.length);
+        return `${pathWithoutBranchAndExtension}${extension}`;
+    }
+    const yamlPattern = new RegExp(`\\.${escapedBranchName}(\\.${buildYamlTypePattern()}\\.yaml)$`);
+    const yamlMatch = branchSpecificPath.match(yamlPattern);
+    if (!yamlMatch) {
         return branchSpecificPath; // Return unchanged if not a branch-specific path
     }
-    const extension = match[1];
+    const extension = yamlMatch[1];
     const pathWithoutBranchAndExtension = branchSpecificPath.substring(0, branchSpecificPath.length - `.${sanitizedBranchName}${extension}`.length);
     return `${pathWithoutBranchAndExtension}${extension}`;
 }
@@ -123,10 +199,13 @@ export function isCurrentBranchFile(path) {
     if (!currentBranch) {
         return false;
     }
+    // Sanitize branch name to match what would be used in file naming
+    const sanitizedBranchName = currentBranch.replace(/[\/\\:*?"<>|.]/g, '_');
+    const escapedBranchName = sanitizedBranchName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     // Use cached pattern or create and cache new one
     let pattern = branchPatternCache.get(currentBranch);
     if (!pattern) {
-        pattern = new RegExp(`\\.${currentBranch}\\.(variable|resource)\\.yaml$`);
+        pattern = new RegExp(`\\.${escapedBranchName}\\.${buildYamlTypePattern()}\\.yaml$|\\.${escapedBranchName}\\.resource\\.file\\..+$`);
         branchPatternCache.set(currentBranch, pattern);
     }
     return pattern.test(path);
@@ -136,6 +215,6 @@ export function isCurrentBranchFile(path) {
  * Used to identify and skip files from other branches during sync operations
  */
 export function isBranchSpecificFile(path) {
-    // Pattern: *.branchName.variable.yaml or *.branchName.resource.yaml
-    return /\.[^.]+\.(variable|resource)\.yaml$/.test(path);
+    const yamlTypePattern = buildYamlTypePattern();
+    return new RegExp(`\\.[^.]+\\.${yamlTypePattern}\\.yaml$|\\.[^.]+\\.resource\\.file\\..+$`).test(path);
 }

package/esm/src/main.js

@@ -38,7 +38,7 @@ export { flow, app, script, workspace, resource, resourceType, user, variable, h
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.535.0";
+export const VERSION = "1.536.0";
 const command = new Command()
     .name("wmill")
     .action(() => log.info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`))

package/esm/src/types.js

@@ -15,6 +15,16 @@ import { pushWorkspaceUser } from "./commands/user/user.js";
 import { pushGroup } from "./commands/user/user.js";
 import { pushWorkspaceSettings, pushWorkspaceKey } from "./core/settings.js";
 import { pushTrigger } from "./commands/trigger/trigger.js";
+export const TRIGGER_TYPES = [
+    'http',
+    'websocket',
+    'kafka',
+    'nats',
+    'postgres',
+    'mqtt',
+    'sqs',
+    'gcp'
+];
 export function isSuperset(subset, superset) {
     return Object.keys(subset).every((key) => {
         const eq = deepEqual(subset[key], superset[key]);
@@ -66,7 +76,18 @@ export function showConflict(path, local, remote) {
     log.info("\x1b[31mlocal\x1b[31m - \x1b[32mremote\x1b[32m");
     log.info("\n");
 }
-export async function pushObj(workspace, p, befObj, newObj, plainSecrets, alreadySynced, message) {
+/**
+ * Pushes an object to the workspace server based on its type
+ * @param workspace - The workspace ID to push to
+ * @param p - The server path (base path for branch-specific items)
+ * @param befObj - The previous object state (for updates)
+ * @param newObj - The new object state to push
+ * @param plainSecrets - Whether to store secrets in plain text
+ * @param alreadySynced - Array to track already synced items
+ * @param message - Optional commit/update message
+ * @param originalLocalPath - The original local file path (used for branch-specific resource file resolution)
+ */
+export async function pushObj(workspace, p, befObj, newObj, plainSecrets, alreadySynced, message, originalLocalPath) {
     const typeEnding = getTypeStrFromPath(p);
     if (typeEnding === "app") {
         const appName = p.split(".app" + SEP)[0];
@@ -85,7 +106,7 @@ export async function pushObj(workspace, p, befObj, newObj, plainSecrets, alread
     else if (typeEnding === "resource") {
         if (!alreadySynced.includes(p)) {
             alreadySynced.push(p);
-            await pushResource(workspace, p, befObj, newObj);
+            await pushResource(workspace, p, befObj, newObj, originalLocalPath || p);
         }
     }
     else if (typeEnding === "resource-type") {

package/esm/src/utils/utils.js

@@ -124,9 +124,10 @@ export function sleep(ms) {
 }
 export function isFileResource(path) {
     const splitPath = path.split(".");
+    // Check for pattern: *.resource.file.* (handles both base and branch-specific)
     return (splitPath.length >= 4 &&
-        splitPath[1] == "resource" &&
-        splitPath[2] == "file");
+        splitPath[splitPath.length - 3] == "resource" &&
+        splitPath[splitPath.length - 2] == "file");
 }
 export function printSync(input, to = dntShim.Deno.stdout) {
     let bytesWritten = 0;

package/package.json

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

package/types/src/commands/resource/resource.d.ts

@@ -6,7 +6,7 @@ export interface ResourceFile {
     resource_type: string;
     is_oauth?: boolean;
 }
-export declare function pushResource(workspace: string, remotePath: string, resource: ResourceFile | Resource | undefined, localResource: ResourceFile): Promise<void>;
+export declare function pushResource(workspace: string, remotePath: string, resource: ResourceFile | Resource | undefined, localResource: ResourceFile, originalLocalPath?: string): Promise<void>;
 declare const command: Command<void, void, void, [import("../../../deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType, import("../../../deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType], void, void, void, Command<void, void, void, [], void, {
     number: number;
     integer: number;

package/types/src/commands/resource/resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/resource/resource.ts"],"names":[],"mappings":"AAWA,OAAO,EAAU,OAAO,EAAmB,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,GAAG,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,YAAY,GAAG,QAAQ,GAAG,SAAS,EAC7C,aAAa,EAAE,YAAY,GAC1B,OAAO,CAAC,IAAI,CAAC,CA2Cf;AAsDD,QAAA,MAAM,OAAO;;;;;;oBAQS,CAAC;AAEvB,eAAe,OAAO,CAAC"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/resource/resource.ts"],"names":[],"mappings":"AAWA,OAAO,EAAU,OAAO,EAAmB,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAKrD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,GAAG,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,YAAY,GAAG,QAAQ,GAAG,SAAS,EAC7C,aAAa,EAAE,YAAY,EAC3B,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,IAAI,CAAC,CAuEf;AAuDD,QAAA,MAAM,OAAO;;;;;;oBAQS,CAAC;AAEvB,eAAe,OAAO,CAAC"}

package/types/src/commands/script/script.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/script/script.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,EAEL,OAAO,EAQR,MAAM,kBAAkB,CAAC;AAS1B,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAKtD,OAAO,EACH,0BAA0B,EAC5B,cAAc,EAGf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAIL,KAAK,EAEN,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,YAAY,EAAqB,MAAM,yBAAyB,CAAC;AAO1E,MAAM,WAAW,UAAU;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,IAAI,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;CAClE;AAsCD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,mBA8BlD;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,YAAY,EAAE,EACzB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,OAAO,CAAC,CAmBlB;AAED,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,IAAI,EAAE,CAAC,aAAa,GAAG;IAAE,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,GAAG,KAAK,CAAC,GAAG,SAAS,EAC1E,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,YAAY,EAAE,GACxB,OAAO,CAAC,OAAO,CAAC,CAoPlB;AA6ED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,mBAiCrD;AAED,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,GACpC,MAAM,CAyDR;AAED,eAAO,MAAM,IAAI,UA0BhB,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO1D;AAuCD,wBAAsB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAiBzE;AA8CD,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,iBA6E5D;AAuED,MAAM,MAAM,UAAU,GAAG,GAAG,CAAC,0BAA0B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEjF,wBAAsB,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC,CA2B1D;AAuGD,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;oBA8CqB,CAAC;AAEnC,eAAe,OAAO,CAAC"}
+{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/script/script.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,EAEL,OAAO,EAQR,MAAM,kBAAkB,CAAC;AAW1B,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAKtD,OAAO,EACH,0BAA0B,EAC5B,cAAc,EAGf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAIL,KAAK,EAEN,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,YAAY,EAAqB,MAAM,yBAAyB,CAAC;AAO1E,MAAM,WAAW,UAAU;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,IAAI,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;CAClE;AAsCD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,mBA0ClD;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,YAAY,EAAE,EACzB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,OAAO,CAAC,CAmBlB;AAED,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,IAAI,EAAE,CAAC,aAAa,GAAG;IAAE,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,GAAG,KAAK,CAAC,GAAG,SAAS,EAC1E,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,YAAY,EAAE,GACxB,OAAO,CAAC,OAAO,CAAC,CAoPlB;AA6ED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,mBAiCrD;AAED,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,GACpC,MAAM,CAyDR;AAED,eAAO,MAAM,IAAI,UA0BhB,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO1D;AAuCD,wBAAsB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAiBzE;AA8CD,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,iBA6E5D;AAuED,MAAM,MAAM,UAAU,GAAG,GAAG,CAAC,0BAA0B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEjF,wBAAsB,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC,CA2B1D;AAuGD,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;oBA8CqB,CAAC;AAEnC,eAAe,OAAO,CAAC"}

package/types/src/commands/sync/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/sync/sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/sync/sync.ts"],"names":[],"mappings":"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"}

package/types/src/commands/trigger/trigger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigger.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/trigger/trigger.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EACX,WAAW,EACX,eAAe,EACf,UAAU,EACV,gBAAgB,EACjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAU,OAAO,EAAmB,MAAM,kBAAkB,CAAC;AAUpE,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,eAAe,CAAC;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,EAAE,UAAU,CAAC;IAChB,GAAG,EAAE,UAAU,CAAC;CACjB,CAAC;AAEF,KAAK,WAAW,CAAC,CAAC,SAAS,WAAW,IAAI,IAAI,CAC5C,OAAO,CAAC,CAAC,CAAC,EACR,MAAM,GACN,WAAW,GACX,WAAW,GACX,WAAW,GACX,OAAO,GACP,kBAAkB,GAClB,WAAW,CACd,CAAC;AAEF,KAAK,WAAW,GAAG,MAAM,OAAO,CAAC;AAoFjC,wBAAsB,WAAW,CAAC,CAAC,SAAS,WAAW,EACrD,WAAW,EAAE,CAAC,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,EAChD,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CAyCf;AAkGD,QAAA,MAAM,OAAO;;;;;;oBAQS,CAAC;AAEvB,eAAe,OAAO,CAAC"}
+{"version":3,"file":"trigger.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/trigger/trigger.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EACX,WAAW,EACX,eAAe,EACf,UAAU,EACV,gBAAgB,EACjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAU,OAAO,EAAmB,MAAM,kBAAkB,CAAC;AAapE,KAAK,OAAO,GAAG;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,eAAe,CAAC;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,EAAE,UAAU,CAAC;IAChB,GAAG,EAAE,UAAU,CAAC;CACjB,CAAC;AAEF,KAAK,WAAW,CAAC,CAAC,SAAS,WAAW,IAAI,IAAI,CAC5C,OAAO,CAAC,CAAC,CAAC,EACR,MAAM,GACN,WAAW,GACX,WAAW,GACX,WAAW,GACX,OAAO,GACP,kBAAkB,GAClB,WAAW,CACd,CAAC;AAEF,KAAK,WAAW,GAAG,MAAM,OAAO,CAAC;AAoFjC,wBAAsB,WAAW,CAAC,CAAC,SAAS,WAAW,EACrD,WAAW,EAAE,CAAC,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,EAChD,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CAyCf;AAsGD,QAAA,MAAM,OAAO;;;;;;oBAQS,CAAC;AAEvB,eAAe,OAAO,CAAC"}

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

@@ -35,6 +35,7 @@ export interface SyncOptions {
         commonSpecificItems?: {
             variables?: string[];
             resources?: string[];
+            triggers?: string[];
         };
     } & {
         [branchName: string]: SyncOptions & {
@@ -45,6 +46,7 @@ export interface SyncOptions {
             specificItems?: {
                 variables?: string[];
                 resources?: string[];
+                triggers?: string[];
             };
         };
     };
@@ -52,6 +54,7 @@ export interface SyncOptions {
         commonSpecificItems?: {
             variables?: string[];
             resources?: string[];
+            triggers?: string[];
         };
     } & {
         [branchName: string]: SyncOptions & {
@@ -62,6 +65,7 @@ export interface SyncOptions {
             specificItems?: {
                 variables?: string[];
                 resources?: string[];
+                triggers?: string[];
             };
         };
     };

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":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/src/core/context.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,EAGL,SAAS,EAGV,MAAM,oCAAoC,CAAC;AAuE5C,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAyKF,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,SAAS,CAAC,CAqFpB;AAGD,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBnE;AACD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB7B;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAWlD"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/src/core/context.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,EAGL,SAAS,EAGV,MAAM,oCAAoC,CAAC;AAuE5C,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAqKF,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,SAAS,CAAC,CAgGpB;AAGD,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBnE;AACD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB7B;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAWlD"}

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

@@ -2,6 +2,7 @@ import { SyncOptions } from "./conf.js";
 export interface SpecificItemsConfig {
     variables?: string[];
     resources?: string[];
+    triggers?: string[];
 }
 /**
  * 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":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,WAAW,GAAG,mBAAmB,GAAG,SAAS,CAsCrG;AASD;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CAepG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAmBjF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAoB7F;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,mBAAmB,GAAG,SAAS,GAC7C,MAAM,GAAG,SAAS,CAepB;AAKD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAkBzD;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;CACrB;AAgDD;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,WAAW,GAAG,mBAAmB,GAAG,SAAS,CA4CrG;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,GAC7C,MAAM,GAAG,SAAS,CAepB;AAKD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAsBzD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1D"}

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.535.0";
+export declare const VERSION = "1.536.0";
 declare const command: Command<{
     workspace?: (import("../deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType & string) | undefined;
 } & {

package/types/src/types.d.ts

@@ -15,6 +15,7 @@ export interface DifferenceChange {
     oldValue: any;
 }
 export type Difference = DifferenceCreate | DifferenceRemove | DifferenceChange;
+export declare const TRIGGER_TYPES: readonly ["http", "websocket", "kafka", "nats", "postgres", "mqtt", "sqs", "gcp"];
 export type GlobalOptions = {
     baseUrl: string | undefined;
     workspace: string | undefined;
@@ -24,7 +25,18 @@ export type GlobalOptions = {
 export declare function isSuperset(subset: Record<string, any>, superset: Record<string, any>): boolean;
 export declare function showDiff(local: string, remote: string): void;
 export declare function showConflict(path: string, local: string, remote: string): void;
-export declare function pushObj(workspace: string, p: string, befObj: any, newObj: any, plainSecrets: boolean, alreadySynced: string[], message?: string): Promise<void>;
+/**
+ * Pushes an object to the workspace server based on its type
+ * @param workspace - The workspace ID to push to
+ * @param p - The server path (base path for branch-specific items)
+ * @param befObj - The previous object state (for updates)
+ * @param newObj - The new object state to push
+ * @param plainSecrets - Whether to store secrets in plain text
+ * @param alreadySynced - Array to track already synced items
+ * @param message - Optional commit/update message
+ * @param originalLocalPath - The original local file path (used for branch-specific resource file resolution)
+ */
+export declare function pushObj(workspace: string, p: string, befObj: any, newObj: any, plainSecrets: boolean, alreadySynced: string[], message?: string, originalLocalPath?: string): Promise<void>;
 export declare function parseFromPath(p: string, content: string): any;
 export declare function parseFromFile(p: string): any;
 export declare function getTypeStrFromPath(p: string): "script" | "variable" | "flow" | "resource" | "resource-type" | "folder" | "app" | "schedule" | "http_trigger" | "websocket_trigger" | "kafka_trigger" | "nats_trigger" | "postgres_trigger" | "mqtt_trigger" | "sqs_trigger" | "gcp_trigger" | "user" | "group" | "settings" | "encryption_key";

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/src/types.ts"],"names":[],"mappings":"AA4BA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC1B,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAEhF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC5B,OAAO,CAkBT;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QA2BrD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAKvE;AAED,wBAAsB,OAAO,CAC3B,SAAS,EAAE,MAAM,EACjB,CAAC,EAAE,MAAM,EACT,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,MAAM,iBAoDjB;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG,CAM7D;AACD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAQ5C;AACD,wBAAgB,kBAAkB,CAChC,CAAC,EAAE,MAAM,GAEP,QAAQ,GACR,UAAU,GACV,MAAM,GACN,UAAU,GACV,eAAe,GACf,QAAQ,GACR,KAAK,GACL,UAAU,GACV,cAAc,GACd,mBAAmB,GACnB,eAAe,GACf,cAAc,GACd,kBAAkB,GAClB,cAAc,GACd,aAAa,GACb,aAAa,GACb,MAAM,GACN,OAAO,GACP,UAAU,GACV,gBAAgB,CA4DnB;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAQnD;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAK3D"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/src/types.ts"],"names":[],"mappings":"AA4BA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC1B,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAEhF,eAAO,MAAM,aAAa,mFAShB,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,CAAC;AAEF,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC5B,OAAO,CAkBT;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QA2BrD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAKvE;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,OAAO,CAC3B,SAAS,EAAE,MAAM,EACjB,CAAC,EAAE,MAAM,EACT,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,MAAM,iBAoD3B;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG,CAM7D;AACD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAQ5C;AACD,wBAAgB,kBAAkB,CAChC,CAAC,EAAE,MAAM,GAEP,QAAQ,GACR,UAAU,GACV,MAAM,GACN,UAAU,GACV,eAAe,GACf,QAAQ,GACR,KAAK,GACL,UAAU,GACV,cAAc,GACd,mBAAmB,GACnB,eAAe,GACf,cAAc,GACd,kBAAkB,GAClB,cAAc,GACd,aAAa,GACb,aAAa,GACb,MAAM,GACN,OAAO,GACP,UAAU,GACV,gBAAgB,CA4DnB;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAQnD;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAK3D"}

package/types/src/utils/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/src/utils/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAO/C,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CA2EhD;AAED,wBAAgB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAa/D;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,mBAWzD;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGnE;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAMD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,oBAE/B;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOpD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,EAAE;;;;CAAsB,QAM7E;AAGD,MAAM,WAAW,UAAU;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAGD,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EACzD,YAAY,EAAE,CAAC,EAAE,EACjB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,CAAC,CAoCZ;AAGD,wBAAsB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAMjD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/src/utils/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAO/C,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CA2EhD;AAED,wBAAgB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAa/D;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,mBAWzD;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGnE;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,MAAM,CAAC,CAGjB;AAMD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,oBAE/B;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CASpD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,EAAE;;;;CAAsB,QAM7E;AAGD,MAAM,WAAW,UAAU;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAGD,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,UAAU,EACzD,YAAY,EAAE,CAAC,EAAE,EACjB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,CAAC,CAoCZ;AAGD,wBAAsB,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAMjD"}