windmill-cli 1.532.0 → 1.533.0

package/esm/gen/core/OpenAPI.js

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

package/esm/src/commands/gitsync-settings/pull.js

@@ -3,7 +3,7 @@ import { colors, log, yamlStringify } from "../../../deps.js";
 import { requireLogin } from "../../core/auth.js";
 import { resolveWorkspace } from "../../core/context.js";
 import * as wmill from "../../../gen/services.gen.js";
-import { readConfigFile, getEffectiveSettings, DEFAULT_SYNC_OPTIONS } from "../../core/conf.js";
+import { readConfigFile, getEffectiveSettings, DEFAULT_SYNC_OPTIONS, getWmillYamlPath } from "../../core/conf.js";
 import { deepEqual } from "../../utils/utils.js";
 import { getCurrentGitBranch, isGitRepository } from "../../utils/git.js";
 import { GitSyncSettingsConverter } from "./converter.js";
@@ -83,12 +83,9 @@ export async function pullGitSyncSettings(opts) {
         // Convert backend settings to SyncOptions format
         const backendSyncOptions = GitSyncSettingsConverter.fromBackendFormat(selectedRepo.settings);
         // Check if wmill.yaml exists - create a default one if it doesn't exist
-        let wmillYamlExists = true;
-        try {
-            await dntShim.Deno.stat("wmill.yaml");
-        }
-        catch (error) {
-            wmillYamlExists = false;
+        const wmillYamlPath = getWmillYamlPath();
+        const wmillYamlExists = wmillYamlPath !== null;
+        if (!wmillYamlExists) {
             if (!opts.jsonOutput) {
                 log.info(colors.yellow("No wmill.yaml file found. Will create one with backend git-sync settings."));
             }
@@ -110,11 +107,11 @@ export async function pullGitSyncSettings(opts) {
             if (isGitRepository()) {
                 const currentBranch = getCurrentGitBranch();
                 if (currentBranch) {
-                    if (!updatedConfig.git_branches) {
-                        updatedConfig.git_branches = {};
+                    if (!updatedConfig.gitBranches) {
+                        updatedConfig.gitBranches = {};
                     }
-                    if (!updatedConfig.git_branches[currentBranch]) {
-                        updatedConfig.git_branches[currentBranch] = { overrides: {} };
+                    if (!updatedConfig.gitBranches[currentBranch]) {
+                        updatedConfig.gitBranches[currentBranch] = { overrides: {} };
                     }
                 }
             }
@@ -268,15 +265,15 @@ export async function pullGitSyncSettings(opts) {
             let needsBranchStructure = false;
             if (isGitRepository()) {
                 const currentBranch = getCurrentGitBranch();
-                if (currentBranch && (!localConfig.git_branches || !localConfig.git_branches[currentBranch])) {
+                if (currentBranch && (!localConfig.gitBranches || !localConfig.gitBranches[currentBranch])) {
                     needsBranchStructure = true;
                     // Create empty branch structure
                     const updatedConfig = { ...localConfig };
-                    if (!updatedConfig.git_branches) {
-                        updatedConfig.git_branches = {};
+                    if (!updatedConfig.gitBranches) {
+                        updatedConfig.gitBranches = {};
                     }
-                    if (!updatedConfig.git_branches[currentBranch]) {
-                        updatedConfig.git_branches[currentBranch] = { overrides: {} };
+                    if (!updatedConfig.gitBranches[currentBranch]) {
+                        updatedConfig.gitBranches[currentBranch] = { overrides: {} };
                     }
                     // Write updated configuration
                     await dntShim.Deno.writeTextFile("wmill.yaml", yamlStringify(updatedConfig));
@@ -322,11 +319,11 @@ export async function pullGitSyncSettings(opts) {
             const currentBranch = getCurrentGitBranch();
             if (currentBranch) {
                 log.info(`Detected Git repository, adding empty branch structure for: ${currentBranch}`);
-                if (!updatedConfig.git_branches) {
-                    updatedConfig.git_branches = {};
+                if (!updatedConfig.gitBranches) {
+                    updatedConfig.gitBranches = {};
                 }
-                if (!updatedConfig.git_branches[currentBranch]) {
-                    updatedConfig.git_branches[currentBranch] = { overrides: {} };
+                if (!updatedConfig.gitBranches[currentBranch]) {
+                    updatedConfig.gitBranches[currentBranch] = { overrides: {} };
                 }
             }
         }

package/esm/src/commands/gitsync-settings/push.js

@@ -3,7 +3,7 @@ import { colors, log, Confirm } from "../../../deps.js";
 import { requireLogin } from "../../core/auth.js";
 import { resolveWorkspace } from "../../core/context.js";
 import * as wmill from "../../../gen/services.gen.js";
-import { readConfigFile, validateBranchConfiguration, getEffectiveSettings } from "../../core/conf.js";
+import { readConfigFile, validateBranchConfiguration, getEffectiveSettings, getWmillYamlPath } from "../../core/conf.js";
 import { deepEqual } from "../../utils/utils.js";
 import { GitSyncSettingsConverter } from "./converter.js";
 import { handleLegacyRepositoryMigration } from "./legacySettings.js";
@@ -24,10 +24,8 @@ export async function pushGitSyncSettings(opts) {
     await requireLogin(opts);
     try {
         // Check if wmill.yaml exists - require it for git-sync settings commands
-        try {
-            await dntShim.Deno.stat("wmill.yaml");
-        }
-        catch (error) {
+        const wmillYamlPath = getWmillYamlPath();
+        if (!wmillYamlPath) {
             log.error(colors.red("No wmill.yaml file found. Please run 'wmill init' first to create the configuration file."));
             dntShim.Deno.exit(1);
         }

package/esm/src/commands/gitsync-settings/utils.js

@@ -21,11 +21,11 @@ export function normalizeRepoPath(path) {
 }
 // Helper to get or create branch configuration
 export function getOrCreateBranchConfig(config, branchName) {
-    if (!config.git_branches) {
-        config.git_branches = {};
+    if (!config.gitBranches) {
+        config.gitBranches = {};
     }
-    if (!config.git_branches[branchName]) {
-        config.git_branches[branchName] = {};
+    if (!config.gitBranches[branchName]) {
+        config.gitBranches[branchName] = {};
     }
     return {
         config,
@@ -36,20 +36,20 @@ export function getOrCreateBranchConfig(config, branchName) {
 export function applyBackendSettingsToBranch(config, branchName, backendSettings) {
     const { config: updatedConfig } = getOrCreateBranchConfig(config, branchName);
     // Get the base settings (top-level + defaults) to compare against
-    const { git_branches, ...topLevelSettings } = config;
+    const { gitBranches, ...topLevelSettings } = config;
     const baseSettings = { ...DEFAULT_SYNC_OPTIONS, ...topLevelSettings };
     // Only store fields that differ from the base settings
     Object.keys(backendSettings).forEach(key => {
-        if (key !== 'git_branches' && backendSettings[key] !== undefined) {
+        if (key !== 'gitBranches' && backendSettings[key] !== undefined) {
             const backendValue = backendSettings[key];
             const baseValue = baseSettings[key];
             // Only store if different from base
             const isDifferent = GitSyncSettingsConverter.isDifferent(backendValue, baseValue);
             if (isDifferent) {
-                if (!updatedConfig.git_branches[branchName].overrides) {
-                    updatedConfig.git_branches[branchName].overrides = {};
+                if (!updatedConfig.gitBranches[branchName].overrides) {
+                    updatedConfig.gitBranches[branchName].overrides = {};
                 }
-                updatedConfig.git_branches[branchName].overrides[key] = backendValue;
+                updatedConfig.gitBranches[branchName].overrides[key] = backendValue;
             }
         }
     });

package/esm/src/commands/init/init.js

@@ -20,16 +20,16 @@ async function initAction(opts) {
         if (isGitRepository()) {
             const currentBranch = getCurrentGitBranch();
             if (currentBranch) {
-                initialConfig.git_branches = {
+                initialConfig.gitBranches = {
                     [currentBranch]: { overrides: {} },
                 };
             }
             else {
-                initialConfig.git_branches = {};
+                initialConfig.gitBranches = {};
             }
         }
         else {
-            initialConfig.git_branches = {};
+            initialConfig.gitBranches = {};
         }
         await dntShim.Deno.writeTextFile("wmill.yaml", yamlStringify(initialConfig));
         log.info(colors.green("wmill.yaml created with default settings"));
@@ -66,15 +66,15 @@ async function initAction(opts) {
                         })))) {
                     // Update the config with workspace binding
                     const currentConfig = await import("../../core/conf.js").then((m) => m.readConfigFile());
-                    if (!currentConfig.git_branches) {
-                        currentConfig.git_branches = {};
+                    if (!currentConfig.gitBranches) {
+                        currentConfig.gitBranches = {};
                     }
-                    if (!currentConfig.git_branches[currentBranch]) {
-                        currentConfig.git_branches[currentBranch] = { overrides: {} };
+                    if (!currentConfig.gitBranches[currentBranch]) {
+                        currentConfig.gitBranches[currentBranch] = { overrides: {} };
                     }
-                    currentConfig.git_branches[currentBranch].baseUrl =
+                    currentConfig.gitBranches[currentBranch].baseUrl =
                         activeWorkspace.remote;
-                    currentConfig.git_branches[currentBranch].workspaceId =
+                    currentConfig.gitBranches[currentBranch].workspaceId =
                         activeWorkspace.workspaceId;
                     await dntShim.Deno.writeTextFile("wmill.yaml", yamlStringify(currentConfig));
                     log.info(colors.green(`✓ Bound branch '${currentBranch}' to workspace '${activeWorkspace.name}'`));

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

@@ -8,7 +8,9 @@ import { downloadZip } from "./pull.js";
 import { exts, findContentFile, findGlobalDeps, findResourceFile, handleScriptMetadata, removeExtensionToPath, } from "../script/script.js";
 import { handleFile } from "../script/script.js";
 import { deepEqual, isFileResource } from "../../utils/utils.js";
-import { readConfigFile, getEffectiveSettings, validateBranchConfiguration, } from "../../core/conf.js";
+import { getEffectiveSettings, validateBranchConfiguration, mergeConfigWithConfigFile, } from "../../core/conf.js";
+import { getSpecificItemsForCurrentBranch, isSpecificItem, getBranchSpecificPath, fromBranchSpecificPath, isCurrentBranchFile, isBranchSpecificFile, } from "../../core/specific_items.js";
+import { getCurrentGitBranch } from "../../utils/git.js";
 import { removePathPrefix } from "../../types.js";
 import { listSyncCodebases } from "../../utils/codebase.js";
 import { generateFlowLockInternal, generateScriptMetadataInternal, readLockfile, } from "../../utils/metadata.js";
@@ -21,8 +23,7 @@ function mergeCliWithEffectiveOptions(cliOpts, effectiveOpts) {
     return Object.assign({}, effectiveOpts, cliOpts);
 }
 // Resolve effective sync options using branch-based configuration
-async function resolveEffectiveSyncOptions(workspace, promotion) {
-    const localConfig = await readConfigFile();
+async function resolveEffectiveSyncOptions(workspace, localConfig, promotion) {
     return await getEffectiveSettings(localConfig, promotion);
 }
 export function findCodebase(path, codebases) {
@@ -505,8 +506,30 @@ export async function* readDirRecursiveWithIgnore(ignore, root) {
         }
     }
 }
-export async function elementsToMap(els, ignore, json, skips) {
+export async function elementsToMap(els, ignore, json, skips, specificItems) {
     const map = {};
+    const processedBasePaths = new Set();
+    // First pass: collect all file paths to identify branch-specific files
+    const allPaths = [];
+    for await (const entry of readDirRecursiveWithIgnore(ignore, els)) {
+        if (!entry.isDirectory && !entry.ignored) {
+            allPaths.push(entry.path);
+        }
+    }
+    const branchSpecificExists = new Set();
+    if (specificItems) {
+        const currentBranch = getCurrentGitBranch();
+        if (currentBranch) {
+            for (const path of allPaths) {
+                if (isCurrentBranchFile(path)) {
+                    const basePath = fromBranchSpecificPath(path, currentBranch);
+                    if (isSpecificItem(basePath, specificItems)) {
+                        branchSpecificExists.add(basePath);
+                    }
+                }
+            }
+        }
+    }
     for await (const entry of readDirRecursiveWithIgnore(ignore, els)) {
         if (entry.isDirectory || entry.ignored)
             continue;
@@ -578,10 +601,18 @@ export async function elementsToMap(els, ignore, json, skips) {
             "nu",
             "java",
             "rb",
-            // for related places search: ADD_NEW_LANG 
+            // for related places search: ADD_NEW_LANG
         ].includes(path.split(".").pop() ?? "") &&
             !isFileResource(path))
             continue;
+        // Handle branch-specific files - skip files for other branches
+        if (specificItems && isBranchSpecificFile(path)) {
+            const currentBranch = getCurrentGitBranch();
+            if (!currentBranch || !isCurrentBranchFile(path)) {
+                // Skip branch-specific files for other branches
+                continue;
+            }
+        }
         const content = await entry.getContentText();
         if (skips.skipSecrets && path.endsWith(".variable" + ext)) {
             try {
@@ -612,17 +643,45 @@ export async function elementsToMap(els, ignore, json, skips) {
                 log.warn(`Error reading variable ${path} to check for secrets`);
             }
         }
-        map[entry.path] = content;
+        // Handle branch-specific path mapping after all filtering
+        if (specificItems) {
+            const currentBranch = getCurrentGitBranch();
+            if (currentBranch && isCurrentBranchFile(path)) {
+                // This is a branch-specific file for current branch
+                const basePath = fromBranchSpecificPath(path, currentBranch);
+                if (isSpecificItem(basePath, specificItems)) {
+                    // Map to base path for push operations
+                    map[basePath] = content;
+                    processedBasePaths.add(basePath);
+                }
+                else {
+                    // Branch-specific file doesn't match pattern, skip it
+                    continue;
+                }
+            }
+            else if (!isBranchSpecificFile(path)) {
+                // This is a regular base file, check if we should skip it
+                if (processedBasePaths.has(path)) {
+                    // Skip base file, we already processed branch-specific version
+                    continue;
+                }
+                map[path] = content;
+            }
+        }
+        else {
+            // No specific items configuration, use regular path
+            map[entry.path] = content;
+        }
     }
     return map;
 }
-async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetadataDeletion, codebases, ignoreCodebaseChanges) {
+async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetadataDeletion, codebases, ignoreCodebaseChanges, specificItems) {
     const [m1, m2] = els2
         ? await Promise.all([
-            elementsToMap(els1, ignore, json, skips),
-            elementsToMap(els2, ignore, json, skips),
+            elementsToMap(els1, ignore, json, skips, specificItems),
+            elementsToMap(els2, ignore, json, skips, specificItems),
         ])
-        : [await elementsToMap(els1, ignore, json, skips), {}];
+        : [await elementsToMap(els1, ignore, json, skips, specificItems), {}];
     const changes = [];
     function parseYaml(k, v) {
         if (k.endsWith(".script.yaml")) {
@@ -985,6 +1044,8 @@ async function buildTracker(changes) {
     return tracker;
 }
 export async function pull(opts) {
+    const originalCliOpts = { ...opts };
+    opts = await mergeConfigWithConfigFile(opts);
     // Validate branch configuration early
     try {
         await validateBranchConfiguration(false, opts.yes);
@@ -1002,9 +1063,11 @@ export async function pull(opts) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
     // Resolve effective sync options with branch awareness
-    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts.promotion);
+    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts, opts.promotion);
+    // Extract specific items configuration before merging overwrites gitBranches
+    const specificItems = getSpecificItemsForCurrentBranch(opts);
     // Merge CLI flags with resolved settings (CLI flags take precedence only for explicit overrides)
-    opts = mergeCliWithEffectiveOptions(opts, effectiveOpts);
+    opts = mergeCliWithEffectiveOptions(originalCliOpts, effectiveOpts);
     const codebases = await listSyncCodebases(opts);
     log.info(colors.gray("Computing the files to update locally to match remote (taking wmill.yaml into account)"));
     let resourceTypeToFormatExtension = {};
@@ -1020,7 +1083,7 @@ export async function pull(opts) {
     const local = !opts.stateful
         ? await FSFSElement(dntShim.Deno.cwd(), codebases, true)
         : await FSFSElement(path.join(dntShim.Deno.cwd(), ".wmill"), [], true);
-    const changes = await compareDynFSElement(remote, local, await ignoreF(opts), opts.json ?? false, opts, false, codebases, true);
+    const changes = await compareDynFSElement(remote, local, await ignoreF(opts), opts.json ?? false, opts, false, codebases, true, specificItems);
     log.info(`remote (${workspace.name}) -> local: ${changes.length} changes to apply`);
     // Handle JSON output for dry-run
     if (opts.dryRun && opts.jsonOutput) {
@@ -1032,6 +1095,12 @@ export async function pull(opts) {
                 ...(change.name === "edited" && change.codebase
                     ? { codebase_changed: true }
                     : {}),
+                ...(specificItems && isSpecificItem(change.path, specificItems)
+                    ? {
+                        branch_specific: true,
+                        branch_specific_path: getBranchSpecificPath(change.path, specificItems)
+                    }
+                    : {}),
             })),
             total: changes.length,
         };
@@ -1040,7 +1109,7 @@ export async function pull(opts) {
     }
     if (changes.length > 0) {
         if (!opts.jsonOutput) {
-            prettyChanges(changes);
+            prettyChanges(changes, specificItems);
         }
         if (opts.dryRun) {
             log.info(colors.gray(`Dry run complete.`));
@@ -1056,8 +1125,16 @@ export async function pull(opts) {
         const conflicts = [];
         log.info(colors.gray(`Applying changes to files ...`));
         for await (const change of changes) {
-            const target = path.join(dntShim.Deno.cwd(), change.path);
-            const stateTarget = path.join(dntShim.Deno.cwd(), ".wmill", change.path);
+            // Determine if this file should be written to a branch-specific path
+            let targetPath = change.path;
+            if (specificItems && isSpecificItem(change.path, specificItems)) {
+                const branchSpecificPath = getBranchSpecificPath(change.path, specificItems);
+                if (branchSpecificPath) {
+                    targetPath = branchSpecificPath;
+                }
+            }
+            const target = path.join(dntShim.Deno.cwd(), targetPath);
+            const stateTarget = path.join(dntShim.Deno.cwd(), ".wmill", targetPath);
             if (change.name === "edited") {
                 if (opts.stateful) {
                     try {
@@ -1089,11 +1166,11 @@ export async function pull(opts) {
                     }
                 }
                 if (exts.some((e) => change.path.endsWith(e))) {
-                    log.info(`Editing script content of ${change.path}`);
+                    log.info(`Editing script content of ${targetPath}${targetPath !== change.path ? colors.gray(` (branch-specific override for ${change.path})`) : ""}`);
                 }
                 else if (change.path.endsWith(".yaml") ||
                     change.path.endsWith(".json")) {
-                    log.info(`Editing ${getTypeStrFromPath(change.path)} ${change.path}`);
+                    log.info(`Editing ${getTypeStrFromPath(change.path)} ${targetPath}${targetPath !== change.path ? colors.gray(` (branch-specific override for ${change.path})`) : ""}`);
                 }
                 await dntShim.Deno.writeTextFile(target, change.after);
                 if (opts.stateful) {
@@ -1105,10 +1182,10 @@ export async function pull(opts) {
                 await ensureDir(path.dirname(target));
                 if (opts.stateful) {
                     await ensureDir(path.dirname(stateTarget));
-                    log.info(`Adding ${getTypeStrFromPath(change.path)} ${change.path}`);
+                    log.info(`Adding ${getTypeStrFromPath(change.path)} ${targetPath}${targetPath !== change.path ? colors.gray(` (branch-specific override for ${change.path})`) : ""}`);
                 }
                 await dntShim.Deno.writeTextFile(target, change.content);
-                log.info(`Writing ${getTypeStrFromPath(change.path)} ${change.path}`);
+                log.info(`Writing ${getTypeStrFromPath(change.path)} ${targetPath}${targetPath !== change.path ? colors.gray(` (branch-specific override for ${change.path})`) : ""}`);
                 if (opts.stateful) {
                     await dntShim.Deno.copyFile(target, stateTarget);
                 }
@@ -1166,6 +1243,12 @@ export async function pull(opts) {
                     ...(change.name === "edited" && change.codebase
                         ? { codebase_changed: true }
                         : {}),
+                    ...(specificItems && isSpecificItem(change.path, specificItems)
+                        ? {
+                            branch_specific: true,
+                            branch_specific_path: getBranchSpecificPath(change.path, specificItems)
+                        }
+                        : {}),
                 })),
                 total: changes.length,
             };
@@ -1179,17 +1262,27 @@ export async function pull(opts) {
         console.log(JSON.stringify({ success: true, message: "No changes to apply", total: 0 }, null, 2));
     }
 }
-function prettyChanges(changes) {
+function prettyChanges(changes, specificItems) {
     for (const change of changes) {
+        let displayPath = change.path;
+        let branchNote = "";
+        // Check if this will be written as a branch-specific file
+        if (specificItems && isSpecificItem(change.path, specificItems)) {
+            const branchSpecificPath = getBranchSpecificPath(change.path, specificItems);
+            if (branchSpecificPath) {
+                displayPath = branchSpecificPath;
+                branchNote = " (branch-specific)";
+            }
+        }
         if (change.name === "added") {
-            log.info(colors.green(`+ ${getTypeStrFromPath(change.path)} ` + change.path));
+            log.info(colors.green(`+ ${getTypeStrFromPath(change.path)} ` + displayPath + colors.gray(branchNote)));
         }
         else if (change.name === "deleted") {
-            log.info(colors.red(`- ${getTypeStrFromPath(change.path)} ` + change.path));
+            log.info(colors.red(`- ${getTypeStrFromPath(change.path)} ` + displayPath + colors.gray(branchNote)));
         }
         else if (change.name === "edited") {
             log.info(colors.yellow(`~ ${getTypeStrFromPath(change.path)} ` +
-                change.path +
+                displayPath + colors.gray(branchNote) +
                 (change.codebase ? ` (codebase changed)` : "")));
             if (change.before != change.after) {
                 showDiff(change.before, change.after);
@@ -1222,6 +1315,10 @@ function removeSuffix(str, suffix) {
     return str.slice(0, str.length - suffix.length);
 }
 export async function push(opts) {
+    // Save original CLI options before merging with config file
+    const originalCliOpts = { ...opts };
+    // Load configuration from wmill.yaml and merge with CLI options
+    opts = await mergeConfigWithConfigFile(opts);
     // Validate branch configuration early
     try {
         await validateBranchConfiguration(false, opts.yes);
@@ -1236,9 +1333,11 @@ export async function push(opts) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
     // Resolve effective sync options with branch awareness
-    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts.promotion);
+    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts, opts.promotion);
+    // Extract specific items configuration BEFORE merging overwrites gitBranches
+    const specificItems = getSpecificItemsForCurrentBranch(opts);
     // Merge CLI flags with resolved settings (CLI flags take precedence only for explicit overrides)
-    opts = mergeCliWithEffectiveOptions(opts, effectiveOpts);
+    opts = mergeCliWithEffectiveOptions(originalCliOpts, effectiveOpts);
     const codebases = await listSyncCodebases(opts);
     if (opts.raw) {
         log.info("--raw is now the default, you can remove it as a flag");
@@ -1263,7 +1362,7 @@ export async function push(opts) {
     }
     const remote = ZipFSElement((await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipResourceTypes, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.defaultTs)), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension, false);
     const local = await FSFSElement(path.join(dntShim.Deno.cwd(), ""), codebases, false);
-    const changes = await compareDynFSElement(local, remote, await ignoreF(opts), opts.json ?? false, opts, true, codebases, false);
+    const changes = await compareDynFSElement(local, remote, await ignoreF(opts), opts.json ?? false, opts, true, codebases, false, specificItems);
     const globalDeps = await findGlobalDeps();
     const tracker = await buildTracker(changes);
     const staleScripts = [];
@@ -1308,6 +1407,12 @@ export async function push(opts) {
                 ...(change.name === "edited" && change.codebase
                     ? { codebase_changed: true }
                     : {}),
+                ...(specificItems && isSpecificItem(change.path, specificItems)
+                    ? {
+                        branch_specific: true,
+                        branch_specific_path: getBranchSpecificPath(change.path, specificItems)
+                    }
+                    : {}),
             })),
             total: changes.length,
         };
@@ -1316,7 +1421,7 @@ export async function push(opts) {
     }
     if (changes.length > 0) {
         if (!opts.jsonOutput) {
-            prettyChanges(changes);
+            prettyChanges(changes, specificItems);
         }
         if (opts.dryRun) {
             log.info(colors.gray(`Dry run complete.`));
@@ -1603,6 +1708,12 @@ export async function push(opts) {
                     ...(change.name === "edited" && change.codebase
                         ? { codebase_changed: true }
                         : {}),
+                    ...(specificItems && isSpecificItem(change.path, specificItems)
+                        ? {
+                            branch_specific: true,
+                            branch_specific_path: getBranchSpecificPath(change.path, specificItems)
+                        }
+                        : {}),
                 })),
                 total: changes.length,
                 duration_ms: Math.round(performance.now() - start),

package/esm/src/commands/workspace/workspace.js

@@ -279,27 +279,27 @@ async function bind(opts, bindWorkspace) {
         return;
     }
     // For unbind, check if branch exists
-    if (!bindWorkspace && (!config.git_branches || !config.git_branches[branch])) {
-        log.error(colors.red(`Branch '${branch}' not found in wmill.yaml git_branches`));
+    if (!bindWorkspace && (!config.gitBranches || !config.gitBranches[branch])) {
+        log.error(colors.red(`Branch '${branch}' not found in wmill.yaml gitBranches`));
         return;
     }
     // Update the branch configuration with workspace binding
-    if (!config.git_branches) {
-        config.git_branches = {};
+    if (!config.gitBranches) {
+        config.gitBranches = {};
     }
-    if (!config.git_branches[branch]) {
-        config.git_branches[branch] = { overrides: {} };
+    if (!config.gitBranches[branch]) {
+        config.gitBranches[branch] = { overrides: {} };
     }
     if (bindWorkspace && activeWorkspace) {
-        config.git_branches[branch].baseUrl = activeWorkspace.remote;
-        config.git_branches[branch].workspaceId = activeWorkspace.workspaceId;
+        config.gitBranches[branch].baseUrl = activeWorkspace.remote;
+        config.gitBranches[branch].workspaceId = activeWorkspace.workspaceId;
         log.info(colors.green(`✓ Bound branch '${branch}' to workspace '${activeWorkspace.name}'\n` +
             `  ${activeWorkspace.workspaceId} on ${activeWorkspace.remote}`));
     }
     else {
         // Unbind
-        delete config.git_branches[branch].baseUrl;
-        delete config.git_branches[branch].workspaceId;
+        delete config.gitBranches[branch].baseUrl;
+        delete config.gitBranches[branch].workspaceId;
         log.info(colors.green(`✓ Removed workspace binding from branch '${branch}'`));
     }
     // Write back the updated config

package/esm/src/core/conf.js

@@ -1,13 +1,80 @@
 import * as dntShim from "../../_dnt.shims.js";
 import { log, yamlParseFile, Confirm, yamlStringify } from "../../deps.js";
 import { getCurrentGitBranch, isGitRepository } from "../utils/git.js";
+import { join, dirname, resolve, relative } from "node:path";
+import { existsSync } from "node:fs";
+import { execSync } from "node:child_process";
 export let showDiffs = false;
 export function setShowDiffs(value) {
     showDiffs = value;
 }
+function getGitRepoRoot() {
+    try {
+        const result = execSync("git rev-parse --show-toplevel", {
+            encoding: "utf8",
+            stdio: "pipe"
+        });
+        return result.trim();
+    }
+    catch (error) {
+        return null;
+    }
+}
+function findWmillYaml() {
+    const startDir = resolve(dntShim.Deno.cwd());
+    const isInGitRepo = isGitRepository();
+    // If not in git repo, only check current directory
+    if (!isInGitRepo) {
+        const wmillYamlPath = join(startDir, "wmill.yaml");
+        return existsSync(wmillYamlPath) ? wmillYamlPath : null;
+    }
+    // If in git repo, search up to git repository root
+    const gitRoot = getGitRepoRoot();
+    let currentDir = startDir;
+    let foundPath = null;
+    while (true) {
+        const wmillYamlPath = join(currentDir, "wmill.yaml");
+        if (existsSync(wmillYamlPath)) {
+            foundPath = wmillYamlPath;
+            break;
+        }
+        // Check if we've reached the git repository root
+        if (gitRoot && resolve(currentDir) === resolve(gitRoot)) {
+            break;
+        }
+        // Check if we've reached the filesystem root
+        const parentDir = dirname(currentDir);
+        if (parentDir === currentDir) {
+            break;
+        }
+        currentDir = parentDir;
+    }
+    // If wmill.yaml was found in a parent directory, warn the user and change working directory
+    if (foundPath && resolve(dirname(foundPath)) !== resolve(startDir)) {
+        const configDir = dirname(foundPath);
+        const relativePath = relative(startDir, foundPath);
+        log.warn(`⚠️  wmill.yaml found in parent directory: ${relativePath}`);
+        // Change working directory to where wmill.yaml was found
+        dntShim.Deno.chdir(configDir);
+        log.info(`📁 Changed working directory to: ${configDir}`);
+    }
+    return foundPath;
+}
+export function getWmillYamlPath() {
+    return findWmillYaml();
+}
 export async function readConfigFile() {
     try {
-        const conf = (await yamlParseFile("wmill.yaml"));
+        // First, try to find wmill.yaml recursively
+        const wmillYamlPath = findWmillYaml();
+        if (!wmillYamlPath) {
+            log.warn("No wmill.yaml found. Use 'wmill init' to bootstrap it. Using 'bun' as default typescript runtime.");
+            return {};
+        }
+        const conf = (await yamlParseFile(wmillYamlPath));
+        // Handle legacy format migrations (combine overrides and git_branches)
+        let needsConfigWrite = false;
+        const migrationMessages = [];
         // Handle obsolete overrides format
         if (conf && 'overrides' in conf) {
             const overrides = conf.overrides;
@@ -18,17 +85,55 @@ export async function readConfigFile() {
                     "   Please delete your wmill.yaml and run 'wmill init' to recreate it with the new format.");
             }
             else {
-                // Remove empty overrides with a note
-                log.info("ℹ️  Removing empty 'overrides: {}' from wmill.yaml (migrated to git_branches format)");
+                // Remove empty overrides
                 delete conf.overrides;
-                // Write the updated config back to file
-                try {
-                    await dntShim.Deno.writeTextFile("wmill.yaml", yamlStringify(conf));
+                needsConfigWrite = true;
+                migrationMessages.push("ℹ️  Removing empty 'overrides: {}' from wmill.yaml (migrated to gitBranches format)");
+            }
+        }
+        // Handle git_branches to gitBranches migration
+        if (conf && 'git_branches' in conf) {
+            if (!conf.gitBranches) {
+                // Deep copy git_branches to gitBranches (even if empty)
+                conf.gitBranches = JSON.parse(JSON.stringify(conf.git_branches));
+                needsConfigWrite = true;
+                migrationMessages.push("⚠️  Migrating 'git_branches' to 'gitBranches' (camelCase). The snake_case format is deprecated.");
+                migrationMessages.push("✅ Successfully migrated 'git_branches' to 'gitBranches' in wmill.yaml");
+            }
+            else {
+                migrationMessages.push("⚠️  Both 'git_branches' and 'gitBranches' found in wmill.yaml. Using 'gitBranches' and ignoring 'git_branches'.");
+            }
+            // Always remove the old field from config object (both file and memory)
+            delete conf.git_branches;
+        }
+        // Perform single atomic write if any migrations are needed
+        if (needsConfigWrite) {
+            try {
+                await dntShim.Deno.writeTextFile(wmillYamlPath, yamlStringify(conf));
+                // Log all migration messages after successful write
+                migrationMessages.forEach(msg => {
+                    if (msg.startsWith('⚠️')) {
+                        log.warn(msg);
+                    }
+                    else {
+                        log.info(msg);
+                    }
+                });
+            }
+            catch (error) {
+                log.warn(`Could not update wmill.yaml to apply migrations: ${error instanceof Error ? error.message : error}`);
+            }
+        }
+        else if (migrationMessages.length > 0) {
+            // Log messages for non-write cases (like "both found")
+            migrationMessages.forEach(msg => {
+                if (msg.startsWith('⚠️')) {
+                    log.warn(msg);
                 }
-                catch (error) {
-                    log.warn(`Could not update wmill.yaml to remove empty overrides: ${error instanceof Error ? error.message : error}`);
+                else {
+                    log.info(msg);
                 }
-            }
+            });
         }
         if (conf?.defaultTs == undefined) {
             log.warn("No defaultTs defined in your wmill.yaml. Using 'bun' as default.");
@@ -39,8 +144,19 @@ export async function readConfigFile() {
         if (e instanceof Error && (e.message.includes("overrides") || e.message.includes("Obsolete configuration format"))) {
             throw e; // Re-throw the specific obsolete format error
         }
-        log.warn("No wmill.yaml found. Use 'wmill init' to bootstrap it. Using 'bun' as default typescript runtime.");
-        return {};
+        // Since we already found the file path, this is likely a parsing or access error
+        if (e instanceof Error && e.message.includes("Error parsing yaml")) {
+            const yamlError = e.cause instanceof Error ? e.cause.message : String(e.cause);
+            throw new Error("❌ YAML syntax error in wmill.yaml:\n" +
+                "   " + yamlError + "\n" +
+                "   Please fix the YAML syntax in wmill.yaml or delete the file to start fresh.");
+        }
+        else {
+            // File exists but has other issues (permissions, etc.)
+            throw new Error("❌ Failed to read wmill.yaml:\n" +
+                "   " + (e instanceof Error ? e.message : String(e)) + "\n" +
+                "   Please check file permissions or fix the syntax.");
+        }
     }
 }
 // Default sync options - shared across the codebase to prevent duplication
@@ -74,33 +190,40 @@ export async function validateBranchConfiguration(skipValidation, autoAccept) {
         return;
     }
     const config = await readConfigFile();
-    const { git_branches } = config;
+    const { gitBranches } = config;
     const currentBranch = getCurrentGitBranch();
-    // In a git repository, git_branches section is recommended
-    if (!git_branches || Object.keys(git_branches).length === 0) {
-        log.warn("⚠️  WARNING: In a Git repository, the 'git_branches' section is recommended in wmill.yaml.\n" +
-            "   Consider adding a git_branches section with configuration for your Git branches.\n" +
+    // In a git repository, gitBranches section is recommended
+    if (!gitBranches || Object.keys(gitBranches).length === 0) {
+        log.warn("⚠️  WARNING: In a Git repository, the 'gitBranches' section is recommended in wmill.yaml.\n" +
+            "   Consider adding a gitBranches section with configuration for your Git branches.\n" +
             "   Run 'wmill init' to recreate the configuration file with proper branch setup.");
         return;
     }
-    // Current branch must be defined in git_branches config
-    if (currentBranch && !git_branches[currentBranch]) {
+    // Current branch must be defined in gitBranches config
+    if (currentBranch && !gitBranches[currentBranch]) {
         // In interactive mode, offer to create the branch
         if (dntShim.Deno.stdin.isTerminal()) {
-            const availableBranches = Object.keys(git_branches).join(', ');
-            log.info(`Current Git branch '${currentBranch}' is not defined in the git_branches configuration.\n` +
+            const availableBranches = Object.keys(gitBranches).join(', ');
+            log.info(`Current Git branch '${currentBranch}' is not defined in the gitBranches configuration.\n` +
                 `Available branches: ${availableBranches}`);
             const shouldCreate = autoAccept || await Confirm.prompt({
                 message: `Create empty branch configuration for '${currentBranch}'?`,
                 default: true,
             });
             if (shouldCreate) {
+                // Warn if branch name contains filesystem-unsafe characters
+                if (/[\/\\:*?"<>|.]/.test(currentBranch)) {
+                    const sanitizedBranchName = currentBranch.replace(/[\/\\:*?"<>|.]/g, '_');
+                    log.warn(`⚠️  WARNING: Branch name "${currentBranch}" contains filesystem-unsafe characters (/ \\ : * ? " < > | .).`);
+                    log.warn(`   Branch-specific files will be saved with sanitized name: "${sanitizedBranchName}"`);
+                    log.warn(`   Example: "file.variable.yaml" → "file.${sanitizedBranchName}.variable.yaml"`);
+                }
                 // Read current config, add branch, and write it back
                 const currentConfig = await readConfigFile();
-                if (!currentConfig.git_branches) {
-                    currentConfig.git_branches = {};
+                if (!currentConfig.gitBranches) {
+                    currentConfig.gitBranches = {};
                 }
-                currentConfig.git_branches[currentBranch] = { overrides: {} };
+                currentConfig.gitBranches[currentBranch] = { overrides: {} };
                 await dntShim.Deno.writeTextFile("wmill.yaml", yamlStringify(currentConfig));
                 log.info(`✅ Created empty branch configuration for '${currentBranch}'`);
             }
@@ -110,9 +233,15 @@ export async function validateBranchConfiguration(skipValidation, autoAccept) {
             }
         }
         else {
-            log.warn(`⚠️  WARNING: Current Git branch '${currentBranch}' is not defined in the git_branches configuration.\n` +
-                `   Consider adding configuration for branch '${currentBranch}' in the git_branches section of wmill.yaml.\n` +
-                `   Available branches: ${Object.keys(git_branches).join(', ')}`);
+            // Warn about filesystem-unsafe characters in branch name
+            if (/[\/\\:*?"<>|.]/.test(currentBranch)) {
+                const sanitizedBranchName = currentBranch.replace(/[\/\\:*?"<>|.]/g, '_');
+                log.warn(`⚠️  WARNING: Branch name "${currentBranch}" contains filesystem-unsafe characters (/ \\ : * ? " < > | .).`);
+                log.warn(`   Branch-specific files will use sanitized name: "${sanitizedBranchName}"`);
+            }
+            log.warn(`⚠️  WARNING: Current Git branch '${currentBranch}' is not defined in the gitBranches configuration.\n` +
+                `   Consider adding configuration for branch '${currentBranch}' in the gitBranches section of wmill.yaml.\n` +
+                `   Available branches: ${Object.keys(gitBranches).join(', ')}`);
             return;
         }
     }
@@ -120,13 +249,13 @@ export async function validateBranchConfiguration(skipValidation, autoAccept) {
 // Get effective settings by merging top-level settings with branch-specific overrides
 export async function getEffectiveSettings(config, promotion, skipBranchValidation, suppressLogs) {
     // Start with top-level settings from config
-    const { git_branches, ...topLevelSettings } = config;
+    const { gitBranches, ...topLevelSettings } = config;
     let effective = { ...topLevelSettings };
     if (isGitRepository()) {
         const currentBranch = getCurrentGitBranch();
         // If promotion is specified, use that branch's promotionOverrides or overrides
-        if (promotion && git_branches && git_branches[promotion]) {
-            const targetBranch = git_branches[promotion];
+        if (promotion && gitBranches && gitBranches[promotion]) {
+            const targetBranch = gitBranches[promotion];
             // First try promotionOverrides, then fall back to overrides
             if (targetBranch.promotionOverrides) {
                 Object.assign(effective, targetBranch.promotionOverrides);
@@ -145,8 +274,8 @@ export async function getEffectiveSettings(config, promotion, skipBranchValidati
             }
         }
         // Otherwise use current branch overrides (existing behavior)
-        else if (currentBranch && git_branches && git_branches[currentBranch] && git_branches[currentBranch].overrides) {
-            Object.assign(effective, git_branches[currentBranch].overrides);
+        else if (currentBranch && gitBranches && gitBranches[currentBranch] && gitBranches[currentBranch].overrides) {
+            Object.assign(effective, gitBranches[currentBranch].overrides);
             if (!suppressLogs) {
                 log.info(`Applied settings for Git branch: ${currentBranch}`);
             }

package/esm/src/core/context.js

@@ -79,7 +79,7 @@ async function tryResolveBranchWorkspace(opts) {
     }
     // Read wmill.yaml to check for branch workspace configuration
     const config = await readConfigFile();
-    const branchConfig = config.git_branches?.[currentBranch];
+    const branchConfig = config.gitBranches?.[currentBranch];
     // Check if branch has workspace configuration
     if (!branchConfig?.baseUrl || !branchConfig?.workspaceId) {
         return undefined;

package/esm/src/core/specific_items.js

@@ -0,0 +1,141 @@
+import { minimatch } from "../../deps.js";
+import { getCurrentGitBranch, isGitRepository } from "../utils/git.js";
+/**
+ * Get the specific items configuration for the current git branch
+ * Merges commonSpecificItems with branch-specific specificItems
+ */
+export function getSpecificItemsForCurrentBranch(config) {
+    if (!isGitRepository() || !config.gitBranches) {
+        return undefined;
+    }
+    const currentBranch = getCurrentGitBranch();
+    if (!currentBranch) {
+        return undefined;
+    }
+    const commonItems = config.gitBranches.commonSpecificItems;
+    const branchItems = config.gitBranches[currentBranch]?.specificItems;
+    // If neither common nor branch-specific items exist, return undefined
+    if (!commonItems && !branchItems) {
+        return undefined;
+    }
+    // Merge common and branch-specific items
+    const merged = {};
+    // Add common items
+    if (commonItems?.variables) {
+        merged.variables = [...commonItems.variables];
+    }
+    if (commonItems?.resources) {
+        merged.resources = [...commonItems.resources];
+    }
+    // Add branch-specific items (extending common items)
+    if (branchItems?.variables) {
+        merged.variables = [...(merged.variables || []), ...branchItems.variables];
+    }
+    if (branchItems?.resources) {
+        merged.resources = [...(merged.resources || []), ...branchItems.resources];
+    }
+    return merged;
+}
+/**
+ * Check if a path matches any of the patterns in the given list
+ */
+function matchesPatterns(path, patterns) {
+    return patterns.some(pattern => minimatch(path, pattern));
+}
+/**
+ * Check if a file path should be treated as branch-specific
+ */
+export function isSpecificItem(path, specificItems) {
+    if (!specificItems) {
+        return false;
+    }
+    // Determine the item type from the file path
+    if (path.endsWith('.variable.yaml')) {
+        return specificItems.variables ? matchesPatterns(path, specificItems.variables) : false;
+    }
+    if (path.endsWith('.resource.yaml')) {
+        return specificItems.resources ? matchesPatterns(path, specificItems.resources) : false;
+    }
+    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
+    }
+    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
+    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}`;
+}
+/**
+ * Convert a branch-specific path back to a base path
+ */
+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) {
+        return branchSpecificPath; // Return unchanged if not a branch-specific path
+    }
+    const extension = match[1];
+    const pathWithoutBranchAndExtension = branchSpecificPath.substring(0, branchSpecificPath.length - `.${sanitizedBranchName}${extension}`.length);
+    return `${pathWithoutBranchAndExtension}${extension}`;
+}
+/**
+ * Get the branch-specific path for the current branch if the item should be branch-specific
+ */
+export function getBranchSpecificPath(basePath, specificItems) {
+    if (!isGitRepository() || !specificItems) {
+        return undefined;
+    }
+    const currentBranch = getCurrentGitBranch();
+    if (!currentBranch) {
+        return undefined;
+    }
+    if (isSpecificItem(basePath, specificItems)) {
+        return toBranchSpecificPath(basePath, currentBranch);
+    }
+    return undefined;
+}
+// Cache for compiled regex patterns to avoid recompilation
+const branchPatternCache = new Map();
+/**
+ * Check if a path is a branch-specific file for the current branch
+ */
+export function isCurrentBranchFile(path) {
+    if (!isGitRepository()) {
+        return false;
+    }
+    const currentBranch = getCurrentGitBranch();
+    if (!currentBranch) {
+        return false;
+    }
+    // Use cached pattern or create and cache new one
+    let pattern = branchPatternCache.get(currentBranch);
+    if (!pattern) {
+        pattern = new RegExp(`\\.${currentBranch}\\.(variable|resource)\\.yaml$`);
+        branchPatternCache.set(currentBranch, pattern);
+    }
+    return pattern.test(path);
+}
+/**
+ * Check if a path is a branch-specific file for ANY branch (not necessarily current)
+ * 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);
+}

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.532.0";
+export const VERSION = "1.533.0";
 const command = new Command()
     .name("wmill")
     .action(() => log.info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`))

package/package.json

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

package/types/_dnt.polyfills.d.ts

@@ -22,6 +22,12 @@ declare global {
     }
 }
 export {};
+declare global {
+    interface Error {
+        cause?: unknown;
+    }
+}
+export {};
 declare global {
     interface Object {
         /**

package/types/_dnt.polyfills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_dnt.polyfills.d.ts","sourceRoot":"","sources":["../src/_dnt.polyfills.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU;QAClB;;;;;;;;WAQG;QACH,IAAI,EAAE,OAAO,CAAC;QAEd;;;;;;;WAOG;QAEH,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;KACpC;CACF;AAED,OAAO,EAAE,CAAA;AAgBT,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd;;;;WAIG;QACH,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;KAC5C;CACF;AAED,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,gBAAgB;QACxB,SAAS,CAAC,CAAC,EACP,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,GAC7F,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QAEhB,SAAS,CAAC,CAAC,EAAE,CAAC,EACV,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,EAClE,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAC/B,OAAO,CAAC,EAAE,GAAG,GACd,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;KAC1B;CACF;AAoID,OAAO,EAAE,CAAC"}
+{"version":3,"file":"_dnt.polyfills.d.ts","sourceRoot":"","sources":["../src/_dnt.polyfills.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU;QAClB;;;;;;;;WAQG;QACH,IAAI,EAAE,OAAO,CAAC;QAEd;;;;;;;WAOG;QAEH,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;KACpC;CACF;AAED,OAAO,EAAE,CAAA;AACT,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK;QACb,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CACF;AAED,OAAO,EAAE,CAAC;AAgBV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd;;;;WAIG;QACH,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;KAC5C;CACF;AAED,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,gBAAgB;QACxB,SAAS,CAAC,CAAC,EACP,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,GAC7F,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QAEhB,SAAS,CAAC,CAAC,EAAE,CAAC,EACV,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,EAClE,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAC/B,OAAO,CAAC,EAAE,GAAG,GACd,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;KAC1B;CACF;AAoID,OAAO,EAAE,CAAC"}

package/types/src/commands/gitsync-settings/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/gitsync-settings/pull.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAqB/C,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,aAAa,GAAG;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,iBAycF"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/gitsync-settings/pull.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAqB/C,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,aAAa,GAAG;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,iBAucF"}

package/types/src/commands/gitsync-settings/push.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/gitsync-settings/push.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAmB/C,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,aAAa,GAAG;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,iBA4UF"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/gitsync-settings/push.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAmB/C,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,aAAa,GAAG;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,iBA2UF"}

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

@@ -1,6 +1,7 @@
 import { Command } from "../../../deps.js";
 import { GlobalOptions } from "../../types.js";
 import { SyncOptions } from "../../core/conf.js";
+import { SpecificItemsConfig } from "../../core/specific_items.js";
 import { SyncCodebase } from "../../utils/codebase.js";
 import { PathAssigner } from "../../../windmill-utils-internal/src/path-utils/path-assigner.js";
 type DynFSElement = {
@@ -28,7 +29,7 @@ export declare function readDirRecursiveWithIgnore(ignore: (path: string, isDire
     isDirectory: boolean;
     getContentText(): Promise<string>;
 }>;
-export declare function elementsToMap(els: DynFSElement, ignore: (path: string, isDirectory: boolean) => boolean, json: boolean, skips: Skips): Promise<{
+export declare function elementsToMap(els: DynFSElement, ignore: (path: string, isDirectory: boolean) => boolean, json: boolean, skips: Skips, specificItems?: SpecificItemsConfig): Promise<{
     [key: string]: string;
 }>;
 export interface Skips {

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/core/conf.d.ts

@@ -31,12 +31,38 @@ export interface SyncOptions {
     codebases?: Codebase[];
     parallel?: number;
     jsonOutput?: boolean;
+    gitBranches?: {
+        commonSpecificItems?: {
+            variables?: string[];
+            resources?: string[];
+        };
+    } & {
+        [branchName: string]: SyncOptions & {
+            overrides?: Partial<SyncOptions>;
+            promotionOverrides?: Partial<SyncOptions>;
+            baseUrl?: string;
+            workspaceId?: string;
+            specificItems?: {
+                variables?: string[];
+                resources?: string[];
+            };
+        };
+    };
     git_branches?: {
+        commonSpecificItems?: {
+            variables?: string[];
+            resources?: string[];
+        };
+    } & {
         [branchName: string]: SyncOptions & {
             overrides?: Partial<SyncOptions>;
             promotionOverrides?: Partial<SyncOptions>;
             baseUrl?: string;
             workspaceId?: string;
+            specificItems?: {
+                variables?: string[];
+                resources?: string[];
+            };
         };
     };
     promotion?: string;
@@ -56,6 +82,7 @@ export interface Codebase {
     };
     inject?: string[];
 }
+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' | 'skipScripts' | 'skipFlows' | 'skipApps' | 'skipFolders' | 'includeUsers' | 'includeGroups' | 'includeSettings' | 'includeKey'>>>;
 export declare function mergeConfigWithConfigFile<T>(opts: T): Promise<T & SyncOptions>;

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/specific_items.d.ts

@@ -0,0 +1,36 @@
+import { SyncOptions } from "./conf.js";
+export interface SpecificItemsConfig {
+    variables?: string[];
+    resources?: string[];
+}
+/**
+ * Get the specific items configuration for the current git branch
+ * Merges commonSpecificItems with branch-specific specificItems
+ */
+export declare function getSpecificItemsForCurrentBranch(config: SyncOptions): SpecificItemsConfig | undefined;
+/**
+ * Check if a file path should be treated as branch-specific
+ */
+export declare function isSpecificItem(path: string, specificItems: SpecificItemsConfig | undefined): boolean;
+/**
+ * Convert a base path to a branch-specific path
+ */
+export declare function toBranchSpecificPath(basePath: string, branchName: string): string;
+/**
+ * Convert a branch-specific path back to a base path
+ */
+export declare function fromBranchSpecificPath(branchSpecificPath: string, branchName: string): string;
+/**
+ * Get the branch-specific path for the current branch if the item should be branch-specific
+ */
+export declare function getBranchSpecificPath(basePath: string, specificItems: SpecificItemsConfig | undefined): string | undefined;
+/**
+ * Check if a path is a branch-specific file for the current branch
+ */
+export declare function isCurrentBranchFile(path: string): boolean;
+/**
+ * Check if a path is a branch-specific file for ANY branch (not necessarily current)
+ * Used to identify and skip files from other branches during sync operations
+ */
+export declare function isBranchSpecificFile(path: string): boolean;
+//# sourceMappingURL=specific_items.d.ts.map

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

@@ -0,0 +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"}

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