npm - windmill-cli - Versions diffs - 1.607.0 → 1.610.1 - Mend

windmill-cli 1.607.0 → 1.610.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

package/esm/deps/jsr.io/@windmill-labs/shared-utils/{1.0.11 → 1.0.12}/lib.es.js +202 -35
package/esm/deps.js +5 -6
package/esm/gen/core/OpenAPI.js +1 -1
package/esm/gen/services.gen.js +101 -0
package/esm/src/commands/app/dev.js +182 -4
package/esm/src/commands/app/wmillTsDev.js +40 -1
package/esm/src/commands/script/script.js +2 -1
package/esm/src/commands/sync/sync.js +34 -32
package/esm/src/core/conf.js +47 -45
package/esm/src/core/context.js +34 -22
package/esm/src/core/specific_items.js +28 -10
package/esm/src/main.js +1 -1
package/esm/src/utils/resource_folders.js +3 -1
package/package.json +1 -1
package/types/deps/jsr.io/@windmill-labs/shared-utils/{1.0.11 → 1.0.12}/lib.es.d.ts.map +1 -1
package/types/deps.d.ts +2 -2
package/types/deps.d.ts.map +1 -1
package/types/gen/services.gen.d.ts +50 -1
package/types/gen/services.gen.d.ts.map +1 -1
package/types/gen/types.gen.d.ts +73 -0
package/types/gen/types.gen.d.ts.map +1 -1
package/types/src/commands/app/dev.d.ts.map +1 -1
package/types/src/commands/app/metadata.d.ts +1 -1
package/types/src/commands/app/metadata.d.ts.map +1 -1
package/types/src/commands/app/wmillTsDev.d.ts.map +1 -1
package/types/src/commands/script/script.d.ts.map +1 -1
package/types/src/commands/sync/sync.d.ts +5 -1
package/types/src/commands/sync/sync.d.ts.map +1 -1
package/types/src/core/conf.d.ts +1 -1
package/types/src/core/conf.d.ts.map +1 -1
package/types/src/core/context.d.ts +2 -2
package/types/src/core/context.d.ts.map +1 -1
package/types/src/core/specific_items.d.ts +3 -3
package/types/src/core/specific_items.d.ts.map +1 -1
package/types/src/main.d.ts +1 -1
package/types/src/utils/resource_folders.d.ts.map +1 -1
package/types/windmill-utils-internal/src/gen/types.gen.d.ts +73 -0
package/types/windmill-utils-internal/src/gen/types.gen.d.ts.map +1 -1
/package/types/deps/jsr.io/@windmill-labs/shared-utils/{1.0.11 → 1.0.12}/lib.es.d.ts +0 -0

package/esm/src/commands/app/dev.js CHANGED Viewed

@@ -17,9 +17,41 @@ import { replaceInlineScripts } from "./app.js";
 import { APP_BACKEND_FOLDER, inferRunnableSchemaFromFile, } from "./app_metadata.js";
 import { loadRunnablesFromBackend } from "./raw_apps.js";
 import { regenerateAgentDocs } from "./generate_agents.js";
-import { hasFolderSuffix, getFolderSuffix } from "../../utils/resource_folders.js";
+import { getFolderSuffix, hasFolderSuffix, setNonDottedPaths, } from "../../utils/resource_folders.js";
 const DEFAULT_PORT = 4000;
 const DEFAULT_HOST = "localhost";
+/**
+ * Search for wmill.yaml by traversing upward from the current directory.
+ * Unlike the standard findWmillYaml() in conf.ts, this does not stop at
+ * the git root - it continues searching until the filesystem root.
+ * This is needed for `app dev` which runs from inside a raw_app folder
+ * that may be deeply nested within a larger git repository.
+ */
+async function findAndLoadNonDottedPathsSetting() {
+    let currentDir = process.cwd();
+    while (true) {
+        const wmillYamlPath = path.join(currentDir, "wmill.yaml");
+        if (fs.existsSync(wmillYamlPath)) {
+            try {
+                const config = await yamlParseFile(wmillYamlPath);
+                setNonDottedPaths(config?.nonDottedPaths ?? false);
+                log.debug(`Found wmill.yaml at ${wmillYamlPath}, nonDottedPaths=${config?.nonDottedPaths ?? false}`);
+            }
+            catch (e) {
+                log.debug(`Failed to parse wmill.yaml at ${wmillYamlPath}: ${e}`);
+            }
+            return;
+        }
+        // Check if we've reached the filesystem root
+        const parentDir = path.dirname(currentDir);
+        if (parentDir === currentDir) {
+            // Reached filesystem root without finding wmill.yaml
+            log.debug("No wmill.yaml found, using default dotted paths");
+            return;
+        }
+        currentDir = parentDir;
+    }
+}
 // HTML template with live reload and SQL migration modal
 const createHTML = (jsPath, cssPath) => `
 <!DOCTYPE html>
@@ -275,6 +307,9 @@ const createHTML = (jsPath, cssPath) => `
 `;
 async function dev(opts) {
     GLOBAL_CONFIG_OPT.noCdToRoot = true;
+    // Search for wmill.yaml by traversing upward (without git root constraint)
+    // to initialize nonDottedPaths setting before using folder suffix functions
+    await findAndLoadNonDottedPathsSetting();
     // Validate that we're in a .raw_app folder
     const cwd = process.cwd();
     const currentDirName = path.basename(cwd);
@@ -356,9 +391,12 @@ async function dev(opts) {
             });
             // Provide the virtual module content
             build.onLoad({ filter: /.*/, namespace: "wmill-virtual" }, (args) => {
+                const contents = wmillTs(port);
                 log.info(colors.yellow(`[wmill-virtual] Loading virtual module: ${args.path}`));
+                log.info(colors.gray(`[wmill-virtual] Exports: ${contents.match(/export (const|function) \w+/g)?.join(", ") ??
+                    "none"}`));
                 return {
-                    contents: wmillTs(port),
+                    contents,
                     loader: "ts",
                 };
             });
@@ -745,6 +783,23 @@ async function dev(opts) {
                         }
                         break;
                     }
+                    case "streamJob": {
+                        // Stream job results using SSE
+                        log.info(colors.blue(`[streamJob] Streaming job: ${jobId}`));
+                        try {
+                            await streamJobWithSSE(workspaceId, jobId, reqId, ws, workspace.remote, workspace.token);
+                        }
+                        catch (error) {
+                            log.error(colors.red(`[streamJob] Error: ${error.message}`));
+                            ws.send(JSON.stringify({
+                                type: "streamJobRes",
+                                reqId,
+                                error: true,
+                                result: { message: error.message, stack: error.stack },
+                            }));
+                        }
+                        break;
+                    }
                     case "applySqlMigration": {
                         // Execute SQL migration against a datatable
                         const { sql, datatable, fileName } = message;
@@ -992,6 +1047,25 @@ async function genRunnablesTs(schemaOverrides = {}) {
         log.error(colors.red(`Failed to generate wmill.d.ts: ${error.message}`));
     }
 }
+/**
+ * Convert runnables from file format to API format.
+ * File format uses type: "script"|"hubscript"|"flow" for path-based runnables.
+ * API format uses type: "path" with runType: "script"|"hubscript"|"flow".
+ */
+function convertRunnablesToApiFormat(runnables) {
+    for (const [runnableId, runnable] of Object.entries(runnables)) {
+        if (runnable?.type === "script" ||
+            runnable?.type === "hubscript" ||
+            runnable?.type === "flow") {
+            // Convert from file format to API format
+            // { type: "script" } -> { type: "path", runType: "script" }
+            const originalType = runnable.type;
+            runnable.runType = originalType;
+            runnable.type = "path";
+            log.debug(`Converted runnable '${runnableId}' from type='${originalType}' to type='path', runType='${originalType}'`);
+        }
+    }
+}
 async function loadRunnables() {
     try {
         const localPath = process.cwd();
@@ -1003,6 +1077,9 @@ async function loadRunnables() {
             const rawApp = (await yamlParseFile(path.join(localPath, "raw_app.yaml")));
             runnables = rawApp?.runnables ?? {};
         }
+        // Always convert path-based runnables from file format to API format
+        // This handles both backend folder runnables and raw_app.yaml runnables
+        convertRunnablesToApiFormat(runnables);
         replaceInlineScripts(runnables, backendPath + SEP, true);
         return runnables;
     }
@@ -1044,13 +1121,24 @@ async function executeRunnable(runnable, workspace, appPath, runnableId, args) {
             cache_ttl: inlineScript.cache_ttl,
         };
     }
-    else if (runnable.type === "path" && runnable.runType && runnable.path) {
-        // Path-based runnables have type: "path" and runType: "script"|"hubscript"|"flow"
+    else if ((runnable.type === "path" || runnable.type === "runnableByPath") &&
+        runnable.runType &&
+        runnable.path) {
+        // Path-based runnables have type: "path" (or legacy "runnableByPath") and runType: "script"|"hubscript"|"flow"
         const prefix = runnable.runType;
         requestBody.path = prefix !== "hubscript"
             ? `${prefix}/${runnable.path}`
             : `script/${runnable.path}`;
     }
+    else {
+        // Neither inline script nor valid path-based runnable
+        const debugInfo = `type=${runnable.type}, runType=${runnable.runType}, ` +
+            `path=${runnable.path}, hasInlineScript=${!!runnable
+                .inlineScript}`;
+        log.error(colors.red(`[executeRunnable] Invalid runnable configuration for '${runnableId}': ${debugInfo}`));
+        throw new Error(`Invalid runnable '${runnableId}': ${debugInfo}. ` +
+            `Must have either inlineScript (for inline type) or type="path" with runType and path fields`);
+    }
     const uuid = await wmill.executeComponent({
         workspace,
         path: appPath,
@@ -1108,3 +1196,93 @@ async function getJobStatus(workspace, jobId) {
         id: jobId,
     });
 }
+async function streamJobWithSSE(workspace, jobId, reqId, ws, baseUrl, token) {
+    const sseUrl = `${baseUrl}api/w/${workspace}/jobs_u/getupdate_sse/${jobId}?fast=true`;
+    const response = await fetch(sseUrl, {
+        headers: {
+            Accept: "text/event-stream",
+            Authorization: `Bearer ${token}`,
+        },
+    });
+    if (!response.ok) {
+        throw new Error(`SSE request failed: ${response.status} ${response.statusText}`);
+    }
+    const reader = response.body?.getReader();
+    if (!reader) {
+        throw new Error("No response body for SSE stream");
+    }
+    const decoder = new TextDecoder();
+    let buffer = "";
+    try {
+        while (true) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            buffer += decoder.decode(value, { stream: true });
+            const lines = buffer.split("\n");
+            buffer = lines.pop() || "";
+            for (const line of lines) {
+                if (line.startsWith("data: ")) {
+                    const data = line.slice(6);
+                    try {
+                        const update = JSON.parse(data);
+                        const type = update.type;
+                        if (type === "ping" || type === "timeout") {
+                            if (type === "timeout") {
+                                reader.cancel();
+                                return;
+                            }
+                            continue;
+                        }
+                        if (type === "error") {
+                            ws.send(JSON.stringify({
+                                type: "streamJobRes",
+                                reqId,
+                                error: true,
+                                result: { message: update.error || "SSE error" },
+                            }));
+                            reader.cancel();
+                            return;
+                        }
+                        if (type === "not_found") {
+                            ws.send(JSON.stringify({
+                                type: "streamJobRes",
+                                reqId,
+                                error: true,
+                                result: { message: "Job not found" },
+                            }));
+                            reader.cancel();
+                            return;
+                        }
+                        // Send stream update if there's new stream data
+                        if (update.new_result_stream !== undefined) {
+                            ws.send(JSON.stringify({
+                                type: "streamJobUpdate",
+                                reqId,
+                                new_result_stream: update.new_result_stream,
+                                stream_offset: update.stream_offset,
+                            }));
+                        }
+                        // Check if job is completed
+                        if (update.completed) {
+                            ws.send(JSON.stringify({
+                                type: "streamJobRes",
+                                reqId,
+                                error: false,
+                                result: update.only_result,
+                            }));
+                            reader.cancel();
+                            return;
+                        }
+                    }
+                    catch (parseErr) {
+                        log.warn(`Failed to parse SSE data: ${parseErr}`);
+                    }
+                }
+            }
+        }
+    }
+    finally {
+        reader.releaseLock();
+    }
+}

package/esm/src/commands/app/wmillTsDev.js CHANGED Viewed

@@ -20,7 +20,27 @@ function initWebSocket() {
     ws.onmessage = (event) => {
         const data = JSON.parse(event.data)
-        if (data.type === 'backendRes' || data.type === 'backendAsyncRes') {
+        if (data.type === 'streamJobUpdate') {
+            // Handle streaming update
+            const job = reqs[data.reqId]
+            if (job && job.onUpdate) {
+                job.onUpdate({
+                    new_result_stream: data.new_result_stream,
+                    stream_offset: data.stream_offset
+                })
+            }
+        } else if (data.type === 'streamJobRes') {
+            // Handle stream completion
+            const job = reqs[data.reqId]
+            if (job) {
+                if (data.error) {
+                    job.reject(new Error(data.result?.stack ?? data.result?.message ?? 'Stream error'))
+                } else {
+                    job.resolve(data.result)
+                }
+                delete reqs[data.reqId]
+            }
+        } else if (data.type === 'backendRes' || data.type === 'backendAsyncRes') {
             console.log('Message from WebSocket backend', data)
             const job = reqs[data.reqId]
             if (job) {
@@ -85,5 +105,24 @@ export function waitJob(jobId: string) {
 export function getJob(jobId: string) {
     return doRequest('getJob', { jobId })
 }
+/**
+ * Stream job results using SSE. Calls onUpdate for each stream update,
+ * and resolves with the final result when the job completes.
+ * @param jobId - The job ID to stream
+ * @param onUpdate - Callback for stream updates with new_result_stream data
+ * @returns Promise that resolves with the final job result
+ */
+export function streamJob(
+    jobId: string,
+    onUpdate?: (data: { new_result_stream?: string; stream_offset?: number }) => void
+): Promise<any> {
+    return new Promise(async (resolve, reject) => {
+        await wsReady
+        const reqId = Math.random().toString(36)
+        reqs[reqId] = { resolve, reject, onUpdate }
+        ws?.send(JSON.stringify({ jobId, type: 'streamJob', reqId }))
+    })
+}
 `;
 }

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

@@ -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 CHANGED Viewed

@@ -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;