windmill-cli 1.518.2 → 1.519.0

package/esm/{sync.js → src/commands/sync/sync.js}

@@ -1,80 +1,29 @@
-import * as dntShim from "./_dnt.shims.js";
-import { requireLogin } from "./auth.js";
-import { fetchVersion, resolveWorkspace } from "./context.js";
-import { colors, Command, Confirm, Select, ensureDir, minimatch, path, log, yamlStringify, yamlParseContent, SEP, } from "./deps.js";
-import * as wmill from "./gen/services.gen.js";
-import { getTypeStrFromPath, parseFromPath, pushObj, showConflict, showDiff, } from "./types.js";
+import * as dntShim from "../../../_dnt.shims.js";
+import { requireLogin } from "../../core/auth.js";
+import { fetchVersion, resolveWorkspace } from "../../core/context.js";
+import { colors, Command, Confirm, ensureDir, minimatch, path, log, yamlStringify, yamlParseContent, SEP, } from "../../../deps.js";
+import * as wmill from "../../../gen/services.gen.js";
+import { getTypeStrFromPath, parseFromPath, pushObj, showConflict, showDiff, } from "../../types.js";
 import { downloadZip } from "./pull.js";
-import { exts, findContentFile, findGlobalDeps, findResourceFile, handleScriptMetadata, removeExtensionToPath, } from "./script.js";
-import { handleFile } from "./script.js";
-import { deepEqual, isFileResource } from "./utils.js";
-import { readConfigFile, getEffectiveSettings } from "./conf.js";
-import { removePathPrefix } from "./types.js";
-import { listSyncCodebases } from "./codebase.js";
-import { generateFlowLockInternal, generateScriptMetadataInternal, readLockfile, } from "./metadata.js";
-import { pushResource } from "./resource.js";
-import { extractInlineScripts as extractInlineScriptsForFlows } from "./windmill-utils-internal/src/inline-scripts/extractor.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 { removePathPrefix } from "../../types.js";
+import { listSyncCodebases } from "../../utils/codebase.js";
+import { generateFlowLockInternal, generateScriptMetadataInternal, readLockfile, } from "../../utils/metadata.js";
+import { pushResource } from "../resource/resource.js";
+import { newPathAssigner } from "../../../windmill-utils-internal/src/path-utils/path-assigner.js";
+import { extractInlineScripts as extractInlineScriptsForFlows } from "../../../windmill-utils-internal/src/inline-scripts/extractor.js";
 // Merge CLI options with effective settings, preserving CLI flags as overrides
 function mergeCliWithEffectiveOptions(cliOpts, effectiveOpts) {
     // overlay CLI options on top (undefined cliOpts won't override effectiveOpts)
     return Object.assign({}, effectiveOpts, cliOpts);
 }
-// Resolve effective sync options with smart repository detection
-async function resolveEffectiveSyncOptions(workspace, repositoryPath) {
+// Resolve effective sync options using branch-based configuration
+async function resolveEffectiveSyncOptions(workspace, promotion) {
     const localConfig = await readConfigFile();
-    // If repository path is already specified, use it directly
-    if (repositoryPath) {
-        return getEffectiveSettings(localConfig, workspace.remote, workspace.workspaceId, repositoryPath);
-    }
-    // Auto-detect repository from overrides if not specified
-    if (localConfig.overrides) {
-        const prefix = `${workspace.remote}:${workspace.workspaceId}:`;
-        const applicableRepos = [];
-        // Find all repository-specific overrides for this workspace
-        for (const key of Object.keys(localConfig.overrides)) {
-            if (key.startsWith(prefix) && !key.endsWith(":*")) {
-                const repo = key.substring(prefix.length);
-                if (repo) {
-                    applicableRepos.push(repo);
-                }
-            }
-        }
-        if (applicableRepos.length === 1) {
-            // Single repository found - auto-select it
-            log.info(`Auto-selected repository: ${applicableRepos[0]}`);
-            return getEffectiveSettings(localConfig, workspace.remote, workspace.workspaceId, applicableRepos[0]);
-        }
-        else if (applicableRepos.length > 1) {
-            // Multiple repositories found - prompt for selection
-            const isInteractive = dntShim.Deno.stdin.isTerminal() && dntShim.Deno.stdout.isTerminal();
-            if (isInteractive) {
-                const choices = [
-                    {
-                        name: "Use top-level settings (no repository-specific override)",
-                        value: "",
-                    },
-                    ...applicableRepos.map((repo) => ({ name: repo, value: repo })),
-                ];
-                const selectedRepo = await Select.prompt({
-                    message: "Multiple repository overrides found. Select which to use:",
-                    options: choices,
-                });
-                if (selectedRepo) {
-                    log.info(`Selected repository: ${selectedRepo}`);
-                }
-                return getEffectiveSettings(localConfig, workspace.remote, workspace.workspaceId, selectedRepo);
-            }
-            else {
-                // Non-interactive mode - list options and use top-level
-                log.warn(`Multiple repository overrides found: ${applicableRepos.join(", ")}`);
-                log.warn(`Running in non-interactive mode. Use --repository flag to specify which one to use.`);
-                log.info(`Falling back to top-level settings (no repository-specific overrides applied)`);
-            }
-        }
-    }
-    // No repository overrides found or selected - use top-level settings
-    log.info(`No repository overrides found, using top-level settings`);
-    return getEffectiveSettings(localConfig, workspace.remote, workspace.workspaceId, "");
+    return await getEffectiveSettings(localConfig, promotion);
 }
 export function findCodebase(path, codebases) {
     if (!path.endsWith(".ts")) {
@@ -283,7 +232,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ig
                 async *getChildren() {
                     if (kind == "flow") {
                         const flow = JSON.parse(await f.async("text"));
-                        const inlineScripts = extractInlineScriptsForFlows(flow.value.modules, {}, SEP, defaultTs, newPathAssigner(defaultTs));
+                        const inlineScripts = extractInlineScriptsForFlows(flow.value.modules, {}, SEP, defaultTs);
                         for (const s of inlineScripts) {
                             yield {
                                 isDirectory: false,
@@ -917,13 +866,24 @@ async function buildTracker(changes) {
     return tracker;
 }
 export async function pull(opts) {
+    // Validate branch configuration early
+    try {
+        await validateBranchConfiguration(false, opts.yes);
+    }
+    catch (error) {
+        if (error instanceof Error && error.message.includes("overrides")) {
+            log.error(error.message);
+            dntShim.Deno.exit(1);
+        }
+        throw error;
+    }
     if (opts.stateful) {
         await ensureDir(path.join(dntShim.Deno.cwd(), ".wmill"));
     }
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
-    // Resolve effective sync options with repository awareness
-    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts.repository);
+    // Resolve effective sync options with branch awareness
+    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts.promotion);
     // Merge CLI flags with resolved settings (CLI flags take precedence only for explicit overrides)
     opts = mergeCliWithEffectiveOptions(opts, effectiveOpts);
     const codebases = await listSyncCodebases(opts);
@@ -1143,10 +1103,21 @@ function removeSuffix(str, suffix) {
     return str.slice(0, str.length - suffix.length);
 }
 export async function push(opts) {
+    // Validate branch configuration early
+    try {
+        await validateBranchConfiguration(false, opts.yes);
+    }
+    catch (error) {
+        if (error instanceof Error && error.message.includes("overrides")) {
+            log.error(error.message);
+            dntShim.Deno.exit(1);
+        }
+        throw error;
+    }
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);
-    // Resolve effective sync options with repository awareness
-    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts.repository);
+    // Resolve effective sync options with branch awareness
+    const effectiveOpts = await resolveEffectiveSyncOptions(workspace, opts.promotion);
     // Merge CLI flags with resolved settings (CLI flags take precedence only for explicit overrides)
     opts = mergeCliWithEffectiveOptions(opts, effectiveOpts);
     const codebases = await listSyncCodebases(opts);
@@ -1556,6 +1527,7 @@ const command = new Command()
     .option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which file to NOT take into account. Overrides wmill.yaml excludes")
     .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")
     // deno-lint-ignore no-explicit-any
     .action(pull)
     .command("push")
@@ -1588,75 +1560,4 @@ const command = new Command()
     .option("--repository <repo:string>", "Specify repository path (e.g., u/user/repo) when multiple repositories exist")
     // deno-lint-ignore no-explicit-any
     .action(push);
-const INLINE_SCRIPT = "inline_script";
-export function newPathAssigner(defaultTs) {
-    let counter = 0;
-    const seen_names = new Set();
-    function assignPath(summary, language) {
-        let name;
-        name = summary?.toLowerCase()?.replaceAll(" ", "_") ?? "";
-        let original_name = name;
-        if (name == "") {
-            original_name = INLINE_SCRIPT;
-            name = `${INLINE_SCRIPT}_0`;
-        }
-        while (seen_names.has(name)) {
-            counter++;
-            name = `${original_name}_${counter}`;
-        }
-        seen_names.add(name);
-        let ext;
-        if (language == "python3")
-            ext = "py";
-        else if (language == defaultTs || language == "bunnative")
-            ext = "ts";
-        else if (language == "bun")
-            ext = "bun.ts";
-        else if (language == "deno")
-            ext = "deno.ts";
-        else if (language == "go")
-            ext = "go";
-        else if (language == "bash")
-            ext = "sh";
-        else if (language == "powershell")
-            ext = "ps1";
-        else if (language == "postgresql")
-            ext = "pg.sql";
-        else if (language == "mysql")
-            ext = "my.sql";
-        else if (language == "bigquery")
-            ext = "bq.sql";
-        else if (language == "oracledb")
-            ext = "odb.sql";
-        else if (language == "snowflake")
-            ext = "sf.sql";
-        else if (language == "mssql")
-            ext = "ms.sql";
-        else if (language == "graphql")
-            ext = "gql";
-        else if (language == "nativets")
-            ext = "native.ts";
-        else if (language == "frontend")
-            ext = "frontend.js";
-        else if (language == "php")
-            ext = "php";
-        else if (language == "rust")
-            ext = "rs";
-        else if (language == "csharp")
-            ext = "cs";
-        else if (language == "nu")
-            ext = "nu";
-        else if (language == "ansible")
-            ext = "playbook.yml";
-        else if (language == "java")
-            ext = "java";
-        else if (language == "duckdb")
-            ext = "duckdb.sql";
-        // for related places search: ADD_NEW_LANG
-        else
-            ext = "no_ext";
-        return [`${name}.inline_script.`, ext];
-    }
-    return { assignPath };
-}
 export default command;

package/esm/{trigger.js → src/commands/trigger/trigger.js}

@@ -1,9 +1,9 @@
-import * as dntShim from "./_dnt.shims.js";
-import * as wmill from "./gen/services.gen.js";
-import { colors, Command, log, SEP, Table } from "./deps.js";
-import { isSuperset, parseFromFile, removeType, } from "./types.js";
-import { requireLogin } from "./auth.js";
-import { validatePath, resolveWorkspace } from "./context.js";
+import * as dntShim from "../../../_dnt.shims.js";
+import * as wmill from "../../../gen/services.gen.js";
+import { colors, Command, log, SEP, Table } from "../../../deps.js";
+import { isSuperset, parseFromFile, removeType, } from "../../types.js";
+import { requireLogin } from "../../core/auth.js";
+import { validatePath, resolveWorkspace } from "../../core/context.js";
 async function getTrigger(triggerType, workspace, path) {
     const triggerFunctions = {
         http: wmill.getHttpTrigger,

package/esm/{user.js → src/commands/user/user.js}

@@ -1,10 +1,10 @@
 // deno-lint-ignore-file no-explicit-any
-import * as dntShim from "./_dnt.shims.js";
-import { requireLogin } from "./auth.js";
-import { isSuperset, removeType, removePathPrefix, } from "./types.js";
-import { compareInstanceObjects } from "./instance.js";
-import { colors, Command, log, Table, yamlStringify, yamlParseFile, } from "./deps.js";
-import * as wmill from "./gen/services.gen.js";
+import * as dntShim from "../../../_dnt.shims.js";
+import { requireLogin } from "../../core/auth.js";
+import { isSuperset, removeType, removePathPrefix, } from "../../types.js";
+import { compareInstanceObjects } from "../instance/instance.js";
+import { colors, Command, log, Table, yamlStringify, yamlParseFile, } from "../../../deps.js";
+import * as wmill from "../../../gen/services.gen.js";
 const INSTANCE_USERS_PATH = "instance_users.yaml";
 let instanceUsersPath = INSTANCE_USERS_PATH;
 function checkInstanceUsersPath(opts) {

package/esm/{variable.js → src/commands/variable/variable.js}

@@ -1,10 +1,10 @@
 // deno-lint-ignore-file no-explicit-any
-import * as dntShim from "./_dnt.shims.js";
-import { requireLogin } from "./auth.js";
-import { resolveWorkspace, validatePath } from "./context.js";
-import { isSuperset, parseFromFile, removeType, } from "./types.js";
-import { colors, Command, Confirm, log, SEP, Table } from "./deps.js";
-import * as wmill from "./gen/services.gen.js";
+import * as dntShim from "../../../_dnt.shims.js";
+import { requireLogin } from "../../core/auth.js";
+import { resolveWorkspace, validatePath } from "../../core/context.js";
+import { isSuperset, parseFromFile, removeType, } from "../../types.js";
+import { colors, Command, Confirm, log, SEP, Table } from "../../../deps.js";
+import * as wmill from "../../../gen/services.gen.js";
 async function list(opts) {
     const workspace = await resolveWorkspace(opts);
     await requireLogin(opts);

package/esm/{worker_groups.js → src/commands/worker-groups/worker_groups.js}

@@ -1,8 +1,8 @@
-import { Command, Confirm, setClient, Table } from "./deps.js";
-import { log } from "./deps.js";
-import { allInstances, getActiveInstance, pickInstance } from "./instance.js";
-import * as wmill from "./gen/services.gen.js";
-import { pullInstanceConfigs, pushInstanceConfigs } from "./settings.js";
+import { Command, Confirm, setClient, Table } from "../../../deps.js";
+import { log } from "../../../deps.js";
+import { allInstances, getActiveInstance, pickInstance } from "../instance/instance.js";
+import * as wmill from "../../../gen/services.gen.js";
+import { pullInstanceConfigs, pushInstanceConfigs } from "../../core/settings.js";
 export async function getInstance(opts) {
     const instances = await allInstances();
     const instanceName = await getActiveInstance(opts);

package/esm/{workers.js → src/commands/workers/workers.js}

@@ -1,7 +1,7 @@
-import { Command, Table } from "./deps.js";
-import { log } from "./deps.js";
-import * as wmill from "./gen/services.gen.js";
-import { pickInstance } from "./instance.js";
+import { Command, Table } from "../../../deps.js";
+import { log } from "../../../deps.js";
+import * as wmill from "../../../gen/services.gen.js";
+import { pickInstance } from "../instance/instance.js";
 function toPercent(value) {
     return value != undefined ? `${(value * 100).toFixed(1)}%` : '?%';
 }

package/esm/{workspace.js → src/commands/workspace/workspace.js}

@@ -1,13 +1,13 @@
 // deno-lint-ignore-file no-explicit-any
-import * as dntShim from "./_dnt.shims.js";
-import { getRootStore } from "./store.js";
-import { loginInteractive, tryGetLoginInfo } from "./login.js";
-import { colors, Command, Confirm, Input, log, setClient, Table } from "./deps.js";
-import { requireLogin } from "./auth.js";
-import * as wmill from "./gen/services.gen.js";
+import * as dntShim from "../../../_dnt.shims.js";
+import { getActiveWorkspaceConfigFilePath, getWorkspaceConfigFilePath } from "../../../windmill-utils-internal/src/config/config.js";
+import { loginInteractive, tryGetLoginInfo } from "../../core/login.js";
+import { colors, Command, Confirm, Input, log, setClient, Table } from "../../../deps.js";
+import { requireLogin } from "../../core/auth.js";
+import * as wmill from "../../../gen/services.gen.js";
 export async function allWorkspaces(configDirOverride) {
     try {
-        const file = (await getRootStore(configDirOverride)) + "remotes.ndjson";
+        const file = await getWorkspaceConfigFilePath(configDirOverride);
         const txt = await dntShim.Deno.readTextFile(file);
         return txt
             .split("\n")
@@ -29,13 +29,14 @@ async function getActiveWorkspaceName(opts) {
         return opts?.workspace;
     }
     try {
-        return await dntShim.Deno.readTextFile((await getRootStore(opts?.configDir)) + "/activeWorkspace");
+        const file = await getActiveWorkspaceConfigFilePath(opts?.configDir);
+        return await dntShim.Deno.readTextFile(file);
     }
     catch {
         return undefined;
     }
 }
-export async function getActiveWorkspace(opts) {
+export async function getActiveWorkspace(opts = undefined) {
     const name = await getActiveWorkspaceName(opts);
     if (!name) {
         return undefined;
@@ -88,7 +89,8 @@ async function switchC(opts, workspaceName) {
     return;
 }
 export async function setActiveWorkspace(workspaceName, configDirOverride) {
-    await dntShim.Deno.writeTextFile((await getRootStore(configDirOverride)) + "/activeWorkspace", workspaceName);
+    const file = await getActiveWorkspaceConfigFilePath(configDirOverride);
+    await dntShim.Deno.writeTextFile(file, workspaceName);
 }
 export async function add(opts, workspaceName, workspaceId, remote) {
     if (opts.workspace) {
@@ -214,41 +216,11 @@ export async function addWorkspace(workspace, opts) {
             }
         }
     }
-    // Check 2: Same (remote, workspaceId) tuple already exists under different name
-    const tupleConflict = existingWorkspaces.find(w => w.remote === workspace.remote &&
-        w.workspaceId === workspace.workspaceId &&
-        w.name !== workspace.name);
-    if (tupleConflict) {
-        log.info(colors.red.bold(`❌ Workspace ${workspace.workspaceId} on ${workspace.remote} already exists!`));
-        log.info(`   Existing name: "${tupleConflict.name}"`);
-        log.info(`   New name:      "${workspace.name}"`);
-        log.info(colors.yellow(`\nNote: Backend constraint prevents duplicate (remote, workspaceId) combinations.`));
-        if (!isInteractive) {
-            // In non-interactive mode (tests, scripts), auto-overwrite with force flag
-            if (opts.force) {
-                log.info(colors.yellow(`Force flag enabled, overwriting existing workspace "${tupleConflict.name}".`));
-            }
-            else {
-                throw new Error(`Backend constraint violation: (${workspace.remote}, ${workspace.workspaceId}) already exists as "${tupleConflict.name}". Use --force to overwrite.`);
-            }
-        }
-        else {
-            const overwrite = await Confirm.prompt({
-                message: `Do you want to overwrite the existing workspace "${tupleConflict.name}"?`,
-                default: false,
-            });
-            if (!overwrite) {
-                log.info(colors.yellow("Operation cancelled."));
-                return;
-            }
-        }
-        // Remove the conflicting workspace
-        await removeWorkspace(tupleConflict.name, true, opts);
-    }
     // Remove existing workspace with same name (if updating)
     await removeWorkspace(workspace.name, true, opts);
     // Add the new workspace
-    const file = await dntShim.Deno.open((await getRootStore(opts.configDir)) + "remotes.ndjson", {
+    const filePath = await getWorkspaceConfigFilePath(opts.configDir);
+    const file = await dntShim.Deno.open(filePath, {
         append: true,
         write: true,
         read: true,
@@ -270,7 +242,8 @@ export async function removeWorkspace(name, silent, opts) {
     if (!silent) {
         log.info(colors.yellow(`Removing existing workspace ${name}`));
     }
-    await dntShim.Deno.writeTextFile((await getRootStore(opts.configDir)) + "remotes.ndjson", orgWorkspaces
+    const filePath = await getWorkspaceConfigFilePath(opts.configDir);
+    await dntShim.Deno.writeTextFile(filePath, orgWorkspaces
         .filter((x) => x.name !== name)
         .map((x) => JSON.stringify(x))
         .join("\n") + "\n");
@@ -287,7 +260,60 @@ async function whoami(_opts) {
     const activeName = await getActiveWorkspaceName(_opts);
     log.info("Active: " + colors.green.bold(activeName || "none"));
 }
+async function bind(opts, bindWorkspace) {
+    const { isGitRepository, getCurrentGitBranch } = await import("../../utils/git.js");
+    if (!isGitRepository()) {
+        log.error(colors.red("Not in a Git repository"));
+        return;
+    }
+    const branch = opts.branch || getCurrentGitBranch();
+    if (!branch) {
+        log.error(colors.red("Could not determine current Git branch"));
+        return;
+    }
+    const { readConfigFile } = await import("../../core/conf.js");
+    const config = await readConfigFile();
+    const activeWorkspace = await getActiveWorkspace(opts);
+    if (!activeWorkspace && bindWorkspace) {
+        log.error(colors.red("No active workspace. Use 'wmill workspace add' or 'wmill workspace switch' first"));
+        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`));
+        return;
+    }
+    // Update the branch configuration with workspace binding
+    if (!config.git_branches) {
+        config.git_branches = {};
+    }
+    if (!config.git_branches[branch]) {
+        config.git_branches[branch] = { overrides: {} };
+    }
+    if (bindWorkspace && activeWorkspace) {
+        config.git_branches[branch].baseUrl = activeWorkspace.remote;
+        config.git_branches[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;
+        log.info(colors.green(`✓ Removed workspace binding from branch '${branch}'`));
+    }
+    // Write back the updated config
+    const { yamlStringify } = await import("../../../deps.js");
+    try {
+        await dntShim.Deno.writeTextFile("wmill.yaml", yamlStringify(config));
+    }
+    catch (error) {
+        log.error(colors.red(`Failed to save configuration: ${error.message}`));
+        return;
+    }
+}
 const command = new Command()
+    .alias("profile")
     .description("workspace related commands")
     .action(list)
     .command("switch")
@@ -310,5 +336,13 @@ const command = new Command()
     .action(remove)
     .command("whoami")
     .description("Show the currently active user")
-    .action(whoami);
+    .action(whoami)
+    .command("bind")
+    .description("Bind the current Git branch to the active workspace")
+    .option("--branch <branch:string>", "Specify branch (defaults to current)")
+    .action((opts) => bind(opts, true))
+    .command("unbind")
+    .description("Remove workspace binding from the current Git branch")
+    .option("--branch <branch:string>", "Specify branch (defaults to current)")
+    .action((opts) => bind(opts, false));
 export default command;

package/esm/{auth.js → src/core/auth.js}

@@ -1,6 +1,6 @@
 // deno-lint-ignore-file no-explicit-any
-import { log, setClient } from "./deps.js";
-import * as wmill from "./gen/services.gen.js";
+import { log, setClient } from "../../deps.js";
+import * as wmill from "../../gen/services.gen.js";
 import { loginInteractive, tryGetLoginInfo } from "./login.js";
 /**
  * Main authentication function - moved from context.ts to break circular dependencies
@@ -30,7 +30,7 @@ export async function requireLogin(opts) {
             throw new Error("Unauthorized: Could not authenticate with the provided credentials");
         }
         // Update workspace token
-        const { removeWorkspace, addWorkspace } = await import("./workspace.js");
+        const { removeWorkspace, addWorkspace } = await import("../commands/workspace/workspace.js");
         removeWorkspace(workspace.name, false, opts);
         workspace.token = newToken;
         addWorkspace(workspace, opts);

package/esm/src/core/branch-profiles.js

@@ -0,0 +1,46 @@
+import * as dntShim from "../../_dnt.shims.js";
+import { log } from "../../deps.js";
+import { getStore } from "./store.js";
+const BRANCH_PROFILES_FILE = "branch-profiles.json";
+export async function getBranchProfilesPath(configDirOverride) {
+    return (await getStore("", configDirOverride)) + BRANCH_PROFILES_FILE;
+}
+export async function loadBranchProfiles(configDirOverride) {
+    try {
+        const path = await getBranchProfilesPath(configDirOverride);
+        const content = await dntShim.Deno.readTextFile(path);
+        return JSON.parse(content);
+    }
+    catch {
+        // File doesn't exist or invalid JSON - return empty mapping
+        return { lastUsed: {} };
+    }
+}
+export async function saveBranchProfiles(mapping, configDirOverride) {
+    const path = await getBranchProfilesPath(configDirOverride);
+    await dntShim.Deno.writeTextFile(path, JSON.stringify(mapping, null, 2));
+}
+export function getBranchProfileKey(branch, baseUrl, workspaceId) {
+    // Normalize baseUrl to ensure consistency
+    let normalizedUrl;
+    try {
+        normalizedUrl = new URL(baseUrl).toString();
+    }
+    catch {
+        // Fallback to non-normalized URL if parsing fails
+        normalizedUrl = baseUrl;
+    }
+    return `${branch}|${normalizedUrl}|${workspaceId}`;
+}
+export async function getLastUsedProfile(branch, baseUrl, workspaceId, configDirOverride) {
+    const mapping = await loadBranchProfiles(configDirOverride);
+    const key = getBranchProfileKey(branch, baseUrl, workspaceId);
+    return mapping.lastUsed[key];
+}
+export async function setLastUsedProfile(branch, baseUrl, workspaceId, profileName, configDirOverride) {
+    const mapping = await loadBranchProfiles(configDirOverride);
+    const key = getBranchProfileKey(branch, baseUrl, workspaceId);
+    mapping.lastUsed[key] = profileName;
+    await saveBranchProfiles(mapping, configDirOverride);
+    log.debug(`Saved last used profile for ${key}: ${profileName}`);
+}