windmill-cli 1.608.0 → 1.610.1

package/esm/gen/core/OpenAPI.js

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

package/esm/gen/services.gen.js

@@ -1973,6 +1973,25 @@ export const editErrorHandler = (data) => {
         mediaType: 'application/json'
     });
 };
+/**
+ * edit success handler
+ * @param data The data for the request.
+ * @param data.workspace
+ * @param data.requestBody WorkspaceSuccessHandler
+ * @returns string status
+ * @throws ApiError
+ */
+export const editSuccessHandler = (data) => {
+    return __request(OpenAPI, {
+        method: 'POST',
+        url: '/w/{workspace}/workspaces/edit_success_handler',
+        path: {
+            workspace: data.workspace
+        },
+        body: data.requestBody,
+        mediaType: 'application/json'
+    });
+};
 /**
  * edit large file storage settings
  * @param data The data for the request.
@@ -3456,6 +3475,88 @@ export const listResourceTypeNames = (data) => {
         }
     });
 };
+/**
+ * get npm package metadata from private registry
+ * @param data The data for the request.
+ * @param data.workspace
+ * @param data._package npm package name
+ * @returns unknown package metadata
+ * @throws ApiError
+ */
+export const getNpmPackageMetadata = (data) => {
+    return __request(OpenAPI, {
+        method: 'GET',
+        url: '/w/{workspace}/npm_proxy/metadata/{package}',
+        path: {
+            workspace: data.workspace,
+            package: data._package
+        }
+    });
+};
+/**
+ * resolve npm package version from private registry
+ * @param data The data for the request.
+ * @param data.workspace
+ * @param data._package npm package name
+ * @param data.tag version tag or reference
+ * @returns unknown resolved version
+ * @throws ApiError
+ */
+export const resolveNpmPackageVersion = (data) => {
+    return __request(OpenAPI, {
+        method: 'GET',
+        url: '/w/{workspace}/npm_proxy/resolve/{package}',
+        path: {
+            workspace: data.workspace,
+            package: data._package
+        },
+        query: {
+            tag: data.tag
+        }
+    });
+};
+/**
+ * get npm package file tree from private registry
+ * @param data The data for the request.
+ * @param data.workspace
+ * @param data._package npm package name
+ * @param data.version package version
+ * @returns unknown package file tree
+ * @throws ApiError
+ */
+export const getNpmPackageFiletree = (data) => {
+    return __request(OpenAPI, {
+        method: 'GET',
+        url: '/w/{workspace}/npm_proxy/filetree/{package}/{version}',
+        path: {
+            workspace: data.workspace,
+            package: data._package,
+            version: data.version
+        }
+    });
+};
+/**
+ * get specific file from npm package in private registry
+ * @param data The data for the request.
+ * @param data.workspace
+ * @param data._package npm package name
+ * @param data.version package version
+ * @param data.filepath file path within package
+ * @returns string file content
+ * @throws ApiError
+ */
+export const getNpmPackageFile = (data) => {
+    return __request(OpenAPI, {
+        method: 'GET',
+        url: '/w/{workspace}/npm_proxy/file/{package}/{version}/{filepath}',
+        path: {
+            workspace: data.workspace,
+            package: data._package,
+            version: data.version,
+            filepath: data.filepath
+        }
+    });
+};
 /**
  * query resource types by similarity
  * @param data The data for the request.

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

@@ -172,6 +172,7 @@ export async function handleFile(path, workspace, alreadySynced, message, opts,
                         continue;
                     }
                     log.info(`Adding file: ${file.path.substring(1)}`);
+                    // deno-lint-ignore no-explicit-any
                     const fil = new File([file.contents], file.path.substring(1));
                     tarball.append(fil);
                 }
@@ -350,7 +351,7 @@ async function streamToBlob(stream) {
         // Push the chunk to the array
         chunks.push(value);
     }
-    // Create a Blob from the chunks
+    // deno-lint-ignore no-explicit-any
     const blob = new Blob(chunks);
     return blob;
 }

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

@@ -10,7 +10,7 @@ import { handleFile } from "../script/script.js";
 import { deepEqual, fetchRemoteVersion, isFileResource, isRawAppFile, isWorkspaceDependencies, } from "../../utils/utils.js";
 import { getEffectiveSettings, mergeConfigWithConfigFile, validateBranchConfiguration, } from "../../core/conf.js";
 import { fromBranchSpecificPath, getBranchSpecificPath, getSpecificItemsForCurrentBranch, isBranchSpecificFile, isCurrentBranchFile, isSpecificItem, } from "../../core/specific_items.js";
-import { getCurrentGitBranch } from "../../utils/git.js";
+import { getCurrentGitBranch, isGitRepository } from "../../utils/git.js";
 import { removePathPrefix } from "../../types.js";
 import { listSyncCodebases } from "../../utils/codebase.js";
 import { generateScriptMetadataInternal, getRawWorkspaceDependencies, readLockfile, workspaceDependenciesPathToLanguageAndFilename, } from "../../utils/metadata.js";
@@ -27,8 +27,8 @@ function mergeCliWithEffectiveOptions(cliOpts, effectiveOpts) {
     return Object.assign({}, effectiveOpts, cliOpts);
 }
 // Resolve effective sync options using branch-based configuration
-async function resolveEffectiveSyncOptions(workspace, localConfig, promotion) {
-    return await getEffectiveSettings(localConfig, promotion);
+async function resolveEffectiveSyncOptions(workspace, localConfig, promotion, branchOverride) {
+    return await getEffectiveSettings(localConfig, promotion, false, false, branchOverride);
 }
 export function findCodebase(path, codebases) {
     if (!path.endsWith(".ts")) {
@@ -1014,7 +1014,7 @@ export async function* readDirRecursiveWithIgnore(ignore, root) {
         }
     }
 }
-export async function elementsToMap(els, ignore, json, skips, specificItems) {
+export async function elementsToMap(els, ignore, json, skips, specificItems, branchOverride) {
     const map = {};
     const processedBasePaths = new Set();
     for await (const entry of readDirRecursiveWithIgnore(ignore, els)) {
@@ -1115,8 +1115,7 @@ export async function elementsToMap(els, ignore, json, skips, specificItems) {
         }
         // Handle branch-specific files - skip files for other branches
         if (specificItems && isBranchSpecificFile(path)) {
-            const currentBranch = getCurrentGitBranch();
-            if (!currentBranch || !isCurrentBranchFile(path)) {
+            if (!isCurrentBranchFile(path, branchOverride)) {
                 // Skip branch-specific files for other branches
                 continue;
             }
@@ -1153,9 +1152,10 @@ export async function elementsToMap(els, ignore, json, skips, specificItems) {
         }
         // Handle branch-specific path mapping after all filtering
         if (specificItems) {
-            const currentBranch = getCurrentGitBranch();
-            if (currentBranch && isCurrentBranchFile(path)) {
+            if (isCurrentBranchFile(path, branchOverride)) {
                 // This is a branch-specific file for current branch
+                // Safe to compute branch here since isCurrentBranchFile already validated it exists
+                const currentBranch = branchOverride || getCurrentGitBranch();
                 const basePath = fromBranchSpecificPath(path, currentBranch);
                 if (isSpecificItem(basePath, specificItems)) {
                     // Map to base path for push operations
@@ -1183,13 +1183,13 @@ export async function elementsToMap(els, ignore, json, skips, specificItems) {
     }
     return map;
 }
-async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetadataDeletion, codebases, ignoreCodebaseChanges, specificItems) {
+async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetadataDeletion, codebases, ignoreCodebaseChanges, specificItems, branchOverride) {
     const [m1, m2] = els2
         ? await Promise.all([
-            elementsToMap(els1, ignore, json, skips, specificItems),
-            elementsToMap(els2, ignore, json, skips, specificItems),
+            elementsToMap(els1, ignore, json, skips, specificItems, branchOverride),
+            elementsToMap(els2, ignore, json, skips, specificItems, branchOverride),
         ])
-        : [await elementsToMap(els1, ignore, json, skips, specificItems), {}];
+        : [await elementsToMap(els1, ignore, json, skips, specificItems, branchOverride), {}];
     const changes = [];
     function parseYaml(k, v) {
         if (k.endsWith(".script.yaml")) {
@@ -1573,12 +1573,12 @@ export async function pull(opts) {
     if (opts.stateful) {
         await ensureDir(path.join(dntShim.Deno.cwd(), ".wmill"));
     }
-    const workspace = await resolveWorkspace(opts);
+    const workspace = await resolveWorkspace(opts, opts.branch);
     await requireLogin(opts);
     // Resolve effective sync options with branch awareness
-    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts, opts.promotion);
+    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts, opts.promotion, opts.branch);
     // Extract specific items configuration before merging overwrites gitBranches
-    const specificItems = getSpecificItemsForCurrentBranch(opts);
+    const specificItems = getSpecificItemsForCurrentBranch(opts, opts.branch);
     // Merge CLI flags with resolved settings (CLI flags take precedence only for explicit overrides)
     opts = mergeCliWithEffectiveOptions(originalCliOpts, effectiveOpts);
     const codebases = await listSyncCodebases(opts);
@@ -1597,7 +1597,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, specificItems);
+    const changes = await compareDynFSElement(remote, local, await ignoreF(opts), opts.json ?? false, opts, false, codebases, true, specificItems, opts.branch);
     log.info(`remote (${workspace.name}) -> local: ${changes.length} changes to apply`);
     // Handle JSON output for dry-run
     if (opts.dryRun && opts.jsonOutput) {
@@ -1612,7 +1612,7 @@ export async function pull(opts) {
                 ...(specificItems && isSpecificItem(change.path, specificItems)
                     ? {
                         branch_specific: true,
-                        branch_specific_path: getBranchSpecificPath(change.path, specificItems),
+                        branch_specific_path: getBranchSpecificPath(change.path, specificItems, opts.branch),
                     }
                     : {}),
             })),
@@ -1623,7 +1623,7 @@ export async function pull(opts) {
     }
     if (changes.length > 0) {
         if (!opts.jsonOutput) {
-            prettyChanges(changes, specificItems);
+            prettyChanges(changes, specificItems, opts.branch);
         }
         if (opts.dryRun) {
             log.info(colors.gray(`Dry run complete.`));
@@ -1642,7 +1642,7 @@ export async function pull(opts) {
             // 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);
+                const branchSpecificPath = getBranchSpecificPath(change.path, specificItems, opts.branch);
                 if (branchSpecificPath) {
                     targetPath = branchSpecificPath;
                 }
@@ -1776,7 +1776,7 @@ export async function pull(opts) {
                     ...(specificItems && isSpecificItem(change.path, specificItems)
                         ? {
                             branch_specific: true,
-                            branch_specific_path: getBranchSpecificPath(change.path, specificItems),
+                            branch_specific_path: getBranchSpecificPath(change.path, specificItems, opts.branch),
                         }
                         : {}),
                 })),
@@ -1792,13 +1792,13 @@ export async function pull(opts) {
         console.log(JSON.stringify({ success: true, message: "No changes to apply", total: 0 }, null, 2));
     }
 }
-function prettyChanges(changes, specificItems) {
+function prettyChanges(changes, specificItems, branchOverride) {
     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);
+            const branchSpecificPath = getBranchSpecificPath(change.path, specificItems, branchOverride);
             if (branchSpecificPath) {
                 displayPath = branchSpecificPath;
                 branchNote = " (branch-specific)";
@@ -1875,12 +1875,12 @@ export async function push(opts) {
         }
         throw error;
     }
-    const workspace = await resolveWorkspace(opts);
+    const workspace = await resolveWorkspace(opts, opts.branch);
     await requireLogin(opts);
     // Resolve effective sync options with branch awareness
-    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts, opts.promotion);
+    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts, opts.promotion, opts.branch);
     // Extract specific items configuration BEFORE merging overwrites gitBranches
-    const specificItems = getSpecificItemsForCurrentBranch(opts);
+    const specificItems = getSpecificItemsForCurrentBranch(opts, opts.branch);
     // Merge CLI flags with resolved settings (CLI flags take precedence only for explicit overrides)
     opts = mergeCliWithEffectiveOptions(originalCliOpts, effectiveOpts);
     const codebases = await listSyncCodebases(opts);
@@ -1907,7 +1907,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.skipWorkspaceDependencies, 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, specificItems);
+    const changes = await compareDynFSElement(local, remote, await ignoreF(opts), opts.json ?? false, opts, true, codebases, false, specificItems, opts.branch);
     const rawWorkspaceDependencies = await getRawWorkspaceDependencies();
     const tracker = await buildTracker(changes);
     const staleScripts = [];
@@ -1974,7 +1974,7 @@ export async function push(opts) {
                 ...(specificItems && isSpecificItem(change.path, specificItems)
                     ? {
                         branch_specific: true,
-                        branch_specific_path: getBranchSpecificPath(change.path, specificItems),
+                        branch_specific_path: getBranchSpecificPath(change.path, specificItems, opts.branch),
                     }
                     : {}),
             })),
@@ -1985,7 +1985,7 @@ export async function push(opts) {
     }
     if (changes.length > 0) {
         if (!opts.jsonOutput) {
-            prettyChanges(changes, specificItems);
+            prettyChanges(changes, specificItems, opts.branch);
         }
         if (opts.dryRun) {
             log.info(colors.gray(`Dry run complete.`));
@@ -2083,7 +2083,7 @@ export async function push(opts) {
                                     // 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();
+                                    const currentBranch = opts.branch || (isGitRepository() ? getCurrentGitBranch() : null);
                                     if (currentBranch && isBranchSpecificFile(resourceFilePath)) {
                                         serverPath = fromBranchSpecificPath(resourceFilePath, currentBranch);
                                     }
@@ -2099,7 +2099,7 @@ export async function push(opts) {
                             // 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);
+                                originalBranchSpecificPath = getBranchSpecificPath(change.path, specificItems, opts.branch);
                             }
                             await pushObj(workspace.workspaceId, change.path, oldObj, newObj, opts.plainSecrets ?? false, alreadySynced, opts.message, originalBranchSpecificPath);
                             if (stateTarget) {
@@ -2125,7 +2125,7 @@ export async function push(opts) {
                             // 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);
+                                const branchSpecificPath = getBranchSpecificPath(change.path, specificItems, opts.branch);
                                 if (branchSpecificPath) {
                                     localFilePath = branchSpecificPath;
                                 }
@@ -2330,7 +2330,7 @@ export async function push(opts) {
                     ...(specificItems && isSpecificItem(change.path, specificItems)
                         ? {
                             branch_specific: true,
-                            branch_specific_path: getBranchSpecificPath(change.path, specificItems),
+                            branch_specific_path: getBranchSpecificPath(change.path, specificItems, opts.branch),
                         }
                         : {}),
                 })),
@@ -2379,6 +2379,7 @@ const command = new Command()
     .option("--extra-includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Useful to still take wmill.yaml into account and act as a second pattern to satisfy")
     .option("--repository <repo:string>", "Specify repository path (e.g., u/user/repo) when multiple repositories exist")
     .option("--promotion <branch:string>", "Use promotionOverrides from the specified branch instead of regular overrides")
+    .option("--branch <branch:string>", "Override the current git branch (works even outside a git repository)")
     // deno-lint-ignore no-explicit-any
     .action(pull)
     .command("push")
@@ -2411,6 +2412,7 @@ const command = new Command()
     .option("--message <message:string>", "Include a message that will be added to all scripts/flows/apps updated during this push")
     .option("--parallel <number>", "Number of changes to process in parallel")
     .option("--repository <repo:string>", "Specify repository path (e.g., u/user/repo) when multiple repositories exist")
+    .option("--branch <branch:string>", "Override the current git branch (works even outside a git repository)")
     // deno-lint-ignore no-explicit-any
     .action(push);
 export default command;

package/esm/src/core/conf.js

@@ -268,60 +268,67 @@ export async function validateBranchConfiguration(opts) {
     }
 }
 // Get effective settings by merging top-level settings with branch-specific overrides
-export async function getEffectiveSettings(config, promotion, skipBranchValidation, suppressLogs) {
+export async function getEffectiveSettings(config, promotion, skipBranchValidation, suppressLogs, branchOverride) {
     // Start with top-level settings from config
     const { gitBranches, ...topLevelSettings } = config;
     const effective = { ...topLevelSettings };
-    if (isGitRepository()) {
-        const branch = getCurrentGitBranch();
-        const originalBranchIfForked = getOriginalBranchForWorkspaceForks(branch);
-        let currentBranch;
+    // Determine the branch to use: branchOverride takes precedence, then git detection
+    let currentBranch = null;
+    let originalBranchIfForked = null;
+    let rawGitBranch = null;
+    if (branchOverride) {
+        currentBranch = branchOverride;
+        // Note: "Using branch override" is logged in context.ts when resolving workspace
+    }
+    else if (isGitRepository()) {
+        rawGitBranch = getCurrentGitBranch();
+        originalBranchIfForked = getOriginalBranchForWorkspaceForks(rawGitBranch);
         if (originalBranchIfForked) {
             log.info(`Using overrides from original branch \`${originalBranchIfForked}\``);
             currentBranch = originalBranchIfForked;
         }
         else {
-            currentBranch = branch;
+            currentBranch = rawGitBranch;
         }
-        // If promotion is specified, use that branch's promotionOverrides or overrides
-        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);
-                if (!suppressLogs) {
-                    log.info(`Applied promotion settings from branch: ${promotion}`);
-                }
-            }
-            else if (targetBranch.overrides) {
-                Object.assign(effective, targetBranch.overrides);
-                if (!suppressLogs) {
-                    log.info(`Applied settings from branch: ${promotion} (no promotionOverrides found)`);
-                }
-            }
-            else {
-                log.debug(`No promotion or regular overrides found for branch '${promotion}', using top-level settings`);
+    }
+    else {
+        log.debug("Not in a Git repository and no branch override provided, using top-level settings");
+    }
+    // If promotion is specified, use that branch's promotionOverrides or overrides
+    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);
+            if (!suppressLogs) {
+                log.info(`Applied promotion settings from branch: ${promotion}`);
             }
         }
-        // Otherwise use current branch overrides (existing behavior)
-        else if (currentBranch &&
-            gitBranches &&
-            gitBranches[currentBranch] &&
-            gitBranches[currentBranch].overrides) {
-            Object.assign(effective, gitBranches[currentBranch].overrides);
+        else if (targetBranch.overrides) {
+            Object.assign(effective, targetBranch.overrides);
             if (!suppressLogs) {
-                const extraLog = originalBranchIfForked
-                    ? ` (because it is the origin of the workspace fork branch \`${branch}\`)`
-                    : "";
-                log.info(`Applied settings for Git branch: ${currentBranch}${extraLog}`);
+                log.info(`Applied settings from branch: ${promotion} (no promotionOverrides found)`);
             }
         }
-        else if (currentBranch) {
-            log.debug(`No branch-specific overrides found for '${currentBranch}', using top-level settings`);
+        else {
+            log.debug(`No promotion or regular overrides found for branch '${promotion}', using top-level settings`);
         }
     }
-    else {
-        log.debug("Not in a Git repository, using top-level settings");
+    // Otherwise use current branch overrides (existing behavior)
+    else if (currentBranch &&
+        gitBranches &&
+        gitBranches[currentBranch] &&
+        gitBranches[currentBranch].overrides) {
+        Object.assign(effective, gitBranches[currentBranch].overrides);
+        if (!suppressLogs) {
+            const extraLog = originalBranchIfForked
+                ? ` (because it is the origin of the workspace fork branch \`${rawGitBranch}\`)`
+                : "";
+            log.info(`Applied settings for Git branch: ${currentBranch}${extraLog}`);
+        }
+    }
+    else if (currentBranch) {
+        log.debug(`No branch-specific overrides found for '${currentBranch}', using top-level settings`);
     }
     return effective;
 }

package/esm/src/core/context.js

@@ -114,24 +114,35 @@ async function tryResolveWorkspace(opts) {
         error: colors.red.underline("No explicit workspace given."),
     };
 }
-export async function tryResolveBranchWorkspace(opts) {
-    // Only try branch-based resolution if in a Git repository
-    if (!isGitRepository()) {
-        return undefined;
-    }
-    const rawBranch = getCurrentGitBranch();
-    if (!rawBranch) {
-        return undefined;
-    }
+export async function tryResolveBranchWorkspace(opts, branchOverride) {
+    let rawBranch = null;
     let currentBranch;
-    const originalBranchIfForked = getOriginalBranchForWorkspaceForks(rawBranch);
-    const workspaceIdIfForked = getWorkspaceIdForWorkspaceForkFromBranchName(rawBranch);
-    if (originalBranchIfForked) {
-        log.info(`Using original branch \`${originalBranchIfForked}\` for finding workspace profile from gitBranches section in wmill.yaml`);
-        currentBranch = originalBranchIfForked;
+    let originalBranchIfForked = null;
+    let workspaceIdIfForked = null;
+    if (branchOverride) {
+        // Use branch override directly
+        currentBranch = branchOverride;
+        log.info(`Using branch override: ${branchOverride}`);
     }
     else {
-        currentBranch = rawBranch;
+        // Only try branch-based resolution if in a Git repository
+        if (!isGitRepository()) {
+            return undefined;
+        }
+        rawBranch = getCurrentGitBranch();
+        if (!rawBranch) {
+            return undefined;
+        }
+        originalBranchIfForked = getOriginalBranchForWorkspaceForks(rawBranch);
+        workspaceIdIfForked =
+            getWorkspaceIdForWorkspaceForkFromBranchName(rawBranch);
+        if (originalBranchIfForked) {
+            log.info(`Using original branch \`${originalBranchIfForked}\` for finding workspace profile from gitBranches section in wmill.yaml`);
+            currentBranch = originalBranchIfForked;
+        }
+        else {
+            currentBranch = rawBranch;
+        }
     }
     // Read wmill.yaml to check for branch workspace configuration
     const config = await readConfigFile();
@@ -155,7 +166,7 @@ export async function tryResolveBranchWorkspace(opts) {
     const matchingProfiles = allProfiles.filter((w) => w.remote === normalizedBaseUrl && w.workspaceId === workspaceId);
     if (matchingProfiles.length === 0) {
         // No matching profile exists - prompt to create one
-        return await createWorkspaceProfileInteractively(normalizedBaseUrl, workspaceId, currentBranch, opts, { rawBranch, isForked: !!originalBranchIfForked });
+        return await createWorkspaceProfileInteractively(normalizedBaseUrl, workspaceId, currentBranch, opts, { rawBranch: rawBranch ?? currentBranch, isForked: !!originalBranchIfForked });
     }
     // Handle multiple profiles - use special branch-aware logic
     let selectedProfile;
@@ -186,7 +197,7 @@ export async function tryResolveBranchWorkspace(opts) {
     }
     return selectedProfile;
 }
-export async function resolveWorkspace(opts) {
+export async function resolveWorkspace(opts, branchOverride) {
     const cache = opts.__secret_workspace;
     if (cache)
         return cache;
@@ -239,12 +250,12 @@ export async function resolveWorkspace(opts) {
             return dntShim.Deno.exit(-1);
         }
     }
-    const branch = getCurrentGitBranch();
+    const branch = branchOverride ?? getCurrentGitBranch();
     // Try explicit workspace flag first (should override branch-based resolution). Unless it's a
-    // forked workspace, that we detect through the branch name
+    // forked workspace, that we detect through the branch name (only when not using branchOverride)
     const res = await tryResolveWorkspace(opts);
     if (!res.isError) {
-        if (!branch || !branch.startsWith(WM_FORK_PREFIX)) {
+        if (branchOverride || !branch || !branch.startsWith(WM_FORK_PREFIX)) {
             return res.value;
         }
         else {
@@ -252,12 +263,13 @@ export async function resolveWorkspace(opts) {
         }
     }
     // Try branch-based resolution (medium priority)
-    const branchWorkspace = await tryResolveBranchWorkspace(opts);
+    const branchWorkspace = await tryResolveBranchWorkspace(opts, branchOverride);
     if (branchWorkspace) {
         opts.__secret_workspace = branchWorkspace;
         return branchWorkspace;
     }
-    else {
+    else if (!branchOverride) {
+        // Only check for fork errors when not using branchOverride
         const originalBranch = getOriginalBranchForWorkspaceForks(branch);
         if (originalBranch) {
             log.error(colors.red.bold(`Failed to resolve workspace profile for workspace fork. This most likely means that the original branch \`${originalBranch}\` where \`${branch}\` is originally forked from, is not setup in the wmill.yaml. You need to update the \`gitBranches\` section for \`${originalBranch}\` to include workspaceId and baseUrl.`));

package/esm/src/core/specific_items.js

@@ -44,11 +44,18 @@ function buildYamlTypePattern() {
  * Get the specific items configuration for the current git branch
  * Merges commonSpecificItems with branch-specific specificItems
  */
-export function getSpecificItemsForCurrentBranch(config) {
-    if (!isGitRepository() || !config.gitBranches) {
+export function getSpecificItemsForCurrentBranch(config, branchOverride) {
+    if (!config.gitBranches) {
         return undefined;
     }
-    const currentBranch = getCurrentGitBranch();
+    // Use branch override if provided, otherwise detect from git
+    let currentBranch = null;
+    if (branchOverride) {
+        currentBranch = branchOverride;
+    }
+    else if (isGitRepository()) {
+        currentBranch = getCurrentGitBranch();
+    }
     if (!currentBranch) {
         return undefined;
     }
@@ -173,11 +180,18 @@ export function fromBranchSpecificPath(branchSpecificPath, branchName) {
 /**
  * Get the branch-specific path for the current branch if the item should be branch-specific
  */
-export function getBranchSpecificPath(basePath, specificItems) {
-    if (!isGitRepository() || !specificItems) {
+export function getBranchSpecificPath(basePath, specificItems, branchOverride) {
+    if (!specificItems) {
         return undefined;
     }
-    const currentBranch = getCurrentGitBranch();
+    // Use branch override if provided, otherwise detect from git
+    let currentBranch = null;
+    if (branchOverride) {
+        currentBranch = branchOverride;
+    }
+    else if (isGitRepository()) {
+        currentBranch = getCurrentGitBranch();
+    }
     if (!currentBranch) {
         return undefined;
     }
@@ -191,11 +205,15 @@ 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;
+export function isCurrentBranchFile(path, branchOverride) {
+    // Use branch override if provided, otherwise detect from git
+    let currentBranch = null;
+    if (branchOverride) {
+        currentBranch = branchOverride;
+    }
+    else if (isGitRepository()) {
+        currentBranch = getCurrentGitBranch();
     }
-    const currentBranch = getCurrentGitBranch();
     if (!currentBranch) {
         return false;
     }

package/esm/src/main.js

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