windmill-cli 1.586.2 → 1.586.4

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

@@ -1,8 +1,9 @@
 import * as dntShim from "../../../_dnt.shims.js";
-import { colors, Command, log, yamlStringify, Confirm, } from "../../../deps.js";
+import { colors, Command, log, yamlStringify, Confirm } from "../../../deps.js";
 import { readLockfile } from "../../utils/metadata.js";
 import { SCRIPT_GUIDANCE } from "../../guidance/script_guidance.js";
 import { FLOW_GUIDANCE } from "../../guidance/flow_guidance.js";
+import { getActiveWorkspaceOrFallback } from "../workspace/workspace.js";
 /**
  * Bootstrap a windmill project with a wmill.yaml file
  */
@@ -37,8 +38,7 @@ async function initAction(opts) {
         await readLockfile();
         // Offer to bind workspace profile to current branch
         if (isGitRepository()) {
-            const { getActiveWorkspace } = await import("../workspace/workspace.js");
-            const activeWorkspace = await getActiveWorkspace(opts);
+            const activeWorkspace = await getActiveWorkspaceOrFallback(opts);
             const currentBranch = getCurrentGitBranch();
             if (activeWorkspace && currentBranch) {
                 // Determine binding behavior based on flags

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

@@ -264,6 +264,18 @@ async function whoami(_opts) {
     const activeName = await getActiveWorkspaceName(_opts);
     log.info("Active: " + colors.green.bold(activeName || "none"));
 }
+export async function getActiveWorkspaceOrFallback(opts) {
+    let activeWorkspace = await getActiveWorkspace(opts);
+    if (!activeWorkspace && opts.baseUrl && opts.workspace) {
+        activeWorkspace = {
+            name: opts.workspace,
+            remote: opts.baseUrl,
+            workspaceId: opts.workspace,
+            token: "",
+        };
+    }
+    return activeWorkspace;
+}
 async function bind(opts, bindWorkspace) {
     const { isGitRepository, getCurrentGitBranch } = await import("../../utils/git.js");
     if (!isGitRepository()) {
@@ -277,7 +289,7 @@ async function bind(opts, bindWorkspace) {
     }
     const { readConfigFile } = await import("../../core/conf.js");
     const config = await readConfigFile();
-    const activeWorkspace = await getActiveWorkspace(opts);
+    const activeWorkspace = await getActiveWorkspaceOrFallback(opts);
     if (!activeWorkspace && bindWorkspace) {
         log.error(colors.red("No active workspace. Use 'wmill workspace add' or 'wmill workspace switch' first"));
         return;

package/esm/src/core/context.js

@@ -6,7 +6,7 @@ import { getHeaders } from "../utils/utils.js";
 import { getActiveWorkspace, getWorkspaceByName, allWorkspaces, addWorkspace, } from "../commands/workspace/workspace.js";
 import { getLastUsedProfile, setLastUsedProfile } from "./branch-profiles.js";
 import { readConfigFile } from "./conf.js";
-import { getCurrentGitBranch, getOriginalBranchForWorkspaceForks, getWorkspaceIdForWorkspaceForkFromBranchName, isGitRepository } from "../utils/git.js";
+import { getCurrentGitBranch, getOriginalBranchForWorkspaceForks, getWorkspaceIdForWorkspaceForkFromBranchName, isGitRepository, } from "../utils/git.js";
 import { WM_FORK_PREFIX } from "../main.js";
 // Helper function to select from multiple matching profiles
 async function selectFromMultipleProfiles(profiles, baseUrl, workspaceId, context, configDir) {
@@ -16,7 +16,7 @@ async function selectFromMultipleProfiles(profiles, baseUrl, workspaceId, contex
     // Check for last used profile
     const lastUsedProfileName = await getLastUsedProfile("", baseUrl, workspaceId, configDir);
     if (lastUsedProfileName) {
-        const lastUsedProfile = profiles.find(p => p.name === lastUsedProfileName);
+        const lastUsedProfile = profiles.find((p) => p.name === lastUsedProfileName);
         if (lastUsedProfile) {
             log.info(colors.green(`Using last used profile '${lastUsedProfile.name}' for ${context}`));
             return lastUsedProfile;
@@ -34,12 +34,12 @@ async function selectFromMultipleProfiles(profiles, baseUrl, workspaceId, contex
     log.info(colors.yellow(`\nMultiple workspace profiles found for ${context}:`));
     const selectedName = await Select.prompt({
         message: "Select profile",
-        options: profiles.map(p => ({
+        options: profiles.map((p) => ({
             name: `${p.name} (${p.workspaceId} on ${p.remote})`,
             value: p.name,
         })),
     });
-    const selectedProfile = profiles.find(p => p.name === selectedName);
+    const selectedProfile = profiles.find((p) => p.name === selectedName);
     // Save selection for next time
     await setLastUsedProfile("", // No branch context for general workspace selection
     baseUrl, workspaceId, selectedProfile.name, configDir);
@@ -141,7 +141,7 @@ export async function tryResolveBranchWorkspace(opts) {
         return undefined;
     }
     log.info(`Using branch configuration for branch \`${currentBranch}\` set in gitBranches`);
-    let { baseUrl, workspaceId } = branchConfig;
+    const { baseUrl, workspaceId } = branchConfig;
     let normalizedBaseUrl;
     try {
         normalizedBaseUrl = new URL(baseUrl).toString();
@@ -152,7 +152,7 @@ export async function tryResolveBranchWorkspace(opts) {
     }
     // Find all profiles matching this baseUrl and workspaceId
     const allProfiles = await allWorkspaces(opts.configDir);
-    const matchingProfiles = allProfiles.filter(w => w.remote === normalizedBaseUrl && w.workspaceId === workspaceId);
+    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 });
@@ -167,7 +167,7 @@ export async function tryResolveBranchWorkspace(opts) {
         // For multiple profiles, check branch-specific last used first
         const lastUsedName = await getLastUsedProfile(currentBranch, normalizedBaseUrl, workspaceId, opts.configDir);
         if (lastUsedName) {
-            const lastUsedProfile = matchingProfiles.find(p => p.name === lastUsedName);
+            const lastUsedProfile = matchingProfiles.find((p) => p.name === lastUsedName);
             if (lastUsedProfile) {
                 log.info(colors.green(`Using workspace profile '${lastUsedProfile.name}' for branch '${currentBranch}' (last used)`));
                 return lastUsedProfile;
@@ -208,7 +208,7 @@ export async function resolveWorkspace(opts) {
                 if (!existingWorkspace) {
                     const { allWorkspaces } = await import("../commands/workspace/workspace.js");
                     const workspaces = await allWorkspaces(opts.configDir);
-                    const matchingWorkspaces = workspaces.filter(w => w.workspaceId === opts.workspace && w.remote === normalizedBaseUrl);
+                    const matchingWorkspaces = workspaces.filter((w) => w.workspaceId === opts.workspace && w.remote === normalizedBaseUrl);
                     if (matchingWorkspaces.length >= 1) {
                         existingWorkspace = await selectFromMultipleProfiles(matchingWorkspaces, normalizedBaseUrl, opts.workspace, `workspace "${opts.workspace}" on ${normalizedBaseUrl}`, opts.configDir);
                     }

package/package.json

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

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,OAAO,EAIR,MAAM,kBAAkB,CAAC;AAM1B,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAuRD,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;mBAae,CAAC;AAE7B,eAAe,OAAO,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,OAAO,EAA+B,MAAM,kBAAkB,CAAC;AAOhF,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AA0QD,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;mBAae,CAAC;AAE7B,eAAe,OAAO,CAAC"}

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

@@ -18,6 +18,7 @@ export declare function add(opts: GlobalOptions & {
 }, workspaceName: string | undefined, workspaceId: string | undefined, remote: string | undefined): Promise<void>;
 export declare function addWorkspace(workspace: Workspace, opts: any): Promise<void>;
 export declare function removeWorkspace(name: string, silent: boolean, opts: any): Promise<void>;
+export declare function getActiveWorkspaceOrFallback(opts: GlobalOptions): Promise<Workspace | undefined>;
 declare const command: Command<void, void, {
     yes?: true | undefined;
 }, [import("../../../deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType], void, void, void, Command<void, void, void, [], void, {

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

@@ -1 +1 @@
-{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/workspace/workspace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAM/C,OAAO,EAEL,OAAO,EAMR,MAAM,kBAAkB,CAAC;AAM1B,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,aAAa,CACjC,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,EAAE,CAAC,CAiBtB;AAgBD,wBAAsB,kBAAkB,CACtC,IAAI,GAAE,aAAa,GAAG,SAAqB,GAC1C,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAMhC;AAED,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAQhC;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,aAAa,iBAqB7C;AAoCD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,MAAM,iBAI3B;AAED,wBAAsB,GAAG,CACvB,IAAI,EAAE,aAAa,GAAG;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,EACD,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,iBAuH3B;AAED,wBAAsB,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,iBAwEjE;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,GAAG,iBA6BV;AA2FD,QAAA,MAAM,OAAO;;;;;;;;oBAoDwB,CAAC;AAEtC,eAAe,OAAO,CAAC"}
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/workspace/workspace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAM/C,OAAO,EAEL,OAAO,EAMR,MAAM,kBAAkB,CAAC;AAM1B,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,aAAa,CACjC,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,EAAE,CAAC,CAiBtB;AAgBD,wBAAsB,kBAAkB,CACtC,IAAI,GAAE,aAAa,GAAG,SAAqB,GAC1C,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAMhC;AAED,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAQhC;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,aAAa,iBAqB7C;AAoCD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,MAAM,iBAI3B;AAED,wBAAsB,GAAG,CACvB,IAAI,EAAE,aAAa,GAAG;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,EACD,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,iBAuH3B;AAED,wBAAsB,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,iBAwEjE;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,GAAG,iBA6BV;AAaD,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,aAAa,kCAWrE;AA+ED,QAAA,MAAM,OAAO;;;;;;;;oBAoDwB,CAAC;AAEtC,eAAe,OAAO,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/src/core/context.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,EAGL,SAAS,EAGV,MAAM,oCAAoC,CAAC;AA4I5C,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA6BF,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAkHhC;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,SAAS,CAAC,CA6GpB;AAGD,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBnE;AACD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB7B;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAWlD"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/src/core/context.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,EAGL,SAAS,EAGV,MAAM,oCAAoC,CAAC;AA+K5C,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA6BF,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAqIhC;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,SAAS,CAAC,CAyHpB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAwBnE;AACD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB7B;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAWlD"}