@factorialco/fcode-cli 3.1.0 → 3.2.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @factorialco/fcode-cli
 $ fcode COMMAND
 running command...
 $ fcode (--version)
-@factorialco/fcode-cli/3.1.0 linux-x64 node-v22.22.3
+@factorialco/fcode-cli/3.2.0 linux-x64 node-v22.22.3
 $ fcode --help [COMMAND]
 USAGE
   $ fcode COMMAND
@@ -31,6 +31,7 @@ USAGE
 ## Commands
 <!-- commands -->
 * [`fcode add`](#fcode-add)
+* [`fcode app:push`](#fcode-apppush)
 * [`fcode clone [TEAM]`](#fcode-clone-team)
 * [`fcode config:get [KEY]`](#fcode-configget-key)
 * [`fcode config:remove KEY`](#fcode-configremove-key)
@@ -116,6 +117,26 @@ EXAMPLES
   $ fcode add
 ```
 
+## `fcode app:push`
+
+Upload the App folder's README.md and MARKETPLACE.md to the dashboard
+
+```
+USAGE
+  $ fcode app:push [-f]
+
+FLAGS
+  -f, --force  Force command
+
+DESCRIPTION
+  Upload the App folder's README.md and MARKETPLACE.md to the dashboard
+
+EXAMPLES
+  $ fcode app:push
+
+  $ fcode app:push --force
+```
+
 ## `fcode clone [TEAM]`
 
 Clone team workspace from cloud
@@ -566,7 +587,8 @@ FLAGS
   -t, --accessToken=<value>   Access Token (to be used instead of email and password)
   -u, --url=<value>           [default: https://code.factorialhr.com/platform] Factorial Code Cloud endpoint (host or
                               full /platform URL, ie: code.factorialhr.com)
-  -x, --prompt                Prompt for email and password (instead of opening browser)
+  -x, --prompt                Prompt for email and password (instead of opening browser). Make it the default with
+                              'fcode config:set disableBrowserLogin true' or FCODE_DISABLE_BROWSER_LOGIN=true
 
 DESCRIPTION
   Login with your Factorial Code credentials (browser OAuth or email/password)

package/dist/commands/app/push.d.ts

@@ -0,0 +1,13 @@
+import { Command } from '@oclif/core';
+export default class AppPushCommand extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    init(): Promise<void>;
+    run(): Promise<void>;
+    private pushFile;
+    private decide;
+    private reportFailure;
+}

package/dist/commands/app/push.js

@@ -0,0 +1,147 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const fs = require("fs-extra");
+const path = require("node:path");
+const color_1 = require("@oclif/color");
+const dashboard_client_1 = require("../../services/dashboard-client");
+const dev_team_1 = require("../../config/dev-team");
+const global_1 = require("../../config/global");
+const app_metadata_files_1 = require("../../services/app-metadata-files");
+const errors_1 = require("../../core/errors");
+const types_1 = require("../../core/types");
+const cli_1 = require("../../utils/cli");
+/** Wire field names as the dashboard reports them, translated to what the file calls them. */
+const FIELD_NAMES = {
+    '/full_description': 'description body',
+    '/dato_category_id': 'category_id',
+    '/readme': 'content',
+};
+const README = {
+    file: app_metadata_files_1.APP_README_FILENAME,
+    hashKey: 'readmeHash',
+    cloud: async ({ client, app }) => (0, app_metadata_files_1.readmeRendering)(app, await client.getAppReadme(app.id)),
+    upload: async ({ client, app }, local) => (0, app_metadata_files_1.readmeRendering)(app, await client.putAppReadme(app.id, (0, app_metadata_files_1.readmeForPush)(local))),
+};
+const MARKETPLACE = {
+    file: app_metadata_files_1.APP_MARKETPLACE_FILENAME,
+    hashKey: 'marketplaceHash',
+    cloud: async ({ client, app }) => (0, app_metadata_files_1.marketplaceRendering)(app, await client.getAppMarketplace(app.id)),
+    upload: async ({ client, app }, local) => {
+        const input = (0, app_metadata_files_1.marketplaceForPush)((0, app_metadata_files_1.parseMarketplaceFile)(local));
+        if (input === 'empty') {
+            return 'empty';
+        }
+        return (0, app_metadata_files_1.marketplaceRendering)(app, { metadata: await client.putAppMarketplace(app.id, input) });
+    },
+};
+class AppPushCommand extends core_1.Command {
+    async init() {
+        const { url } = (0, global_1.parseTeamOrigin)('');
+        const { authUrl } = await new global_1.default().getAuthInfo(url);
+        await this.config.runHook('auth', { argv: [url, authUrl], id: 'login' });
+    }
+    async run() {
+        const { flags: { force }, } = await this.parse(AppPushCommand);
+        const appDir = (0, dev_team_1.findAppFolder)();
+        if (!appDir) {
+            throw new dev_team_1.NotAppFolder();
+        }
+        const rootDir = (0, dev_team_1.findDevTeamRoot)(appDir);
+        if (!rootDir) {
+            throw new dev_team_1.NotDevTeamFolder();
+        }
+        const config = new dev_team_1.default(rootDir);
+        const metadata = config.read();
+        const { id } = (0, dev_team_1.readAppSettings)(appDir);
+        const recorded = metadata.apps[id];
+        if (!recorded) {
+            this.error(`App ${id} is not recorded in .fcode/team.json — run fcode team:pull from ${path.basename(rootDir)}`, {
+                code: 'ERR_APP_NOT_RECORDED',
+                exit: 1,
+            });
+        }
+        const client = new dashboard_client_1.default(metadata.cloudUrl);
+        const app = await client.getApp(id);
+        cli_1.default.log(color_1.default.cyan(`\n📤 pushing metadata of '${app.name}'...`));
+        const context = { client, app, appDir, recorded, force };
+        const outcomes = [];
+        try {
+            for (const target of [README, MARKETPLACE]) {
+                outcomes.push(await this.pushFile(context, target));
+            }
+        }
+        finally {
+            // A hash recorded by a file that did push is kept even when the next one fails.
+            config.write(metadata);
+        }
+        if (outcomes.includes(false)) {
+            process.exitCode = 1;
+        }
+    }
+    async pushFile(context, target) {
+        const { file } = target;
+        const filePath = path.join(context.appDir, file);
+        if (!fs.pathExistsSync(filePath)) {
+            cli_1.default.log(`- ${file} not present — nothing to push`);
+            return true;
+        }
+        const local = fs.readFileSync(filePath, 'utf8');
+        try {
+            const decision = this.decide(local, context.recorded[target.hashKey], await target.cloud(context), context.force);
+            if (decision !== 'push') {
+                return decision === 'skip';
+            }
+            const saved = await target.upload(context, local);
+            if (saved === 'empty') {
+                cli_1.default.log(`ℹ️  ${file} has no description yet — nothing to push`);
+                return true;
+            }
+            context.recorded[target.hashKey] = (0, app_metadata_files_1.writeEditable)(context.appDir, saved);
+            cli_1.default.log(color_1.default.green(`✅ ${file} pushed`));
+            return true;
+        }
+        catch (error) {
+            return this.reportFailure(file, error);
+        }
+    }
+    decide(local, storedHash, cloud, force) {
+        if (force) {
+            return 'push';
+        }
+        const { file } = cloud;
+        switch ((0, app_metadata_files_1.metadataSyncState)(local, storedHash, cloud)) {
+            case 'up-to-date':
+                cli_1.default.log(`- ${file} up to date`);
+                return 'skip';
+            case 'out-of-date':
+                cli_1.default.log(color_1.default.yellow(`🔻 ${file} is behind the cloud — run fcode team:pull`));
+                return 'skip';
+            case 'conflict':
+                cli_1.default.log(color_1.default.red(`🔥 ${file} changed both locally and in the cloud — fcode app:push --force to overwrite the cloud, or delete the file and fcode team:pull to take the cloud version`));
+                return 'refuse';
+            default:
+                return 'push';
+        }
+    }
+    reportFailure(file, error) {
+        if (error instanceof dashboard_client_1.DashboardApiError && error.code === 'VALIDATION_ERROR') {
+            const detail = error.detail.replace(/(^|; )(\/[a-z_]+)/g, (_, sep, field) => `${sep}${FIELD_NAMES[field] ?? field.slice(1)}`);
+            cli_1.default.log(color_1.default.red(`❌ ${file} rejected: ${detail}`));
+        }
+        else if (error instanceof dashboard_client_1.DashboardApiError && error.status === 403) {
+            cli_1.default.log(color_1.default.red(`❌ ${file} not pushed: you are not a member of this App`));
+        }
+        else if (error instanceof errors_1.CLIError) {
+            cli_1.default.log(color_1.default.red(`❌ ${error.message}`));
+        }
+        else {
+            cli_1.default.log(color_1.default.red(`❌ ${file} not pushed: ${error.message}`));
+        }
+        return false;
+    }
+}
+AppPushCommand.description = "Upload the App folder's README.md and MARKETPLACE.md to the dashboard";
+AppPushCommand.examples = ['$ fcode app:push', '$ fcode app:push --force'];
+AppPushCommand.flags = types_1.ForceFlag;
+exports.default = AppPushCommand;

package/dist/commands/login.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const global_1 = require("../config/global");
+const settings_1 = require("../config/settings");
 const url_utils_1 = require("../utils/url-utils");
 const cli_1 = require("../utils/cli");
 class Login extends core_1.Command {
@@ -57,7 +58,7 @@ Login.flags = {
     }),
     prompt: core_1.Flags.boolean({
         char: 'x',
-        description: 'Prompt for email and password (instead of opening browser)',
+        description: `Prompt for email and password (instead of opening browser). Make it the default with 'fcode config:set ${settings_1.SettingKeys.DISABLE_BROWSER_LOGIN} true' or FCODE_DISABLE_BROWSER_LOGIN=true`,
         default: false,
     }),
 };

package/dist/commands/team/clone.js

@@ -55,7 +55,7 @@ class TeamCloneCommand extends core_1.Command {
         if (!(await this.skipSkills(flags.skipSkillsSetup))) {
             await (0, skills_installer_1.installSkillsAt)(rootDir);
         }
-        const result = await (0, dev_team_service_1.syncTeam)(rootDir, metadata, remote);
+        const result = await (0, dev_team_service_1.syncTeam)(rootDir, metadata, remote, client);
         config.write(metadata);
         if ((0, dev_team_service_1.reportOutcomes)(result)) {
             process.exitCode = 1;

package/dist/commands/team/pull.js

@@ -20,8 +20,9 @@ class TeamPullCommand extends core_1.Command {
         const metadata = config.read();
         const { developmentTeam } = metadata;
         cli_1.default.log(color_1.default.cyan(`\n🏢 pulling '${developmentTeam.name}'...`));
-        const remote = await (0, dev_team_service_1.fetchTeamRemote)(new dashboard_client_1.default(metadata.cloudUrl), developmentTeam.id);
-        const result = await (0, dev_team_service_1.syncTeam)(rootDir, metadata, remote);
+        const client = new dashboard_client_1.default(metadata.cloudUrl);
+        const remote = await (0, dev_team_service_1.fetchTeamRemote)(client, developmentTeam.id);
+        const result = await (0, dev_team_service_1.syncTeam)(rootDir, metadata, remote, client);
         // Written even when a workspace failed, so the ones that did land are recorded and a rerun
         // only retries what is still missing.
         config.write(metadata);

package/dist/commands/team/status.d.ts

@@ -4,4 +4,6 @@ export default class TeamStatusCommand extends Command {
     static examples: string[];
     init(): Promise<void>;
     run(): Promise<void>;
+    private remoteApps;
+    private reportMetadata;
 }

package/dist/commands/team/status.js

@@ -4,11 +4,21 @@ const core_1 = require("@oclif/core");
 const fs = require("fs-extra");
 const path = require("node:path");
 const color_1 = require("@oclif/color");
+const dashboard_client_1 = require("../../services/dashboard-client");
 const dev_team_1 = require("../../config/dev-team");
 const global_1 = require("../../config/global");
 const status_1 = require("../status");
+const app_metadata_files_1 = require("../../services/app-metadata-files");
 const workspace_cloner_1 = require("../../services/workspace-cloner");
 const cli_1 = require("../../utils/cli");
+const STATUS_LINES = {
+    'up-to-date': (file) => color_1.default.green(`✅ ${file} up to date`),
+    modified: (file) => color_1.default.yellow(`🔺 ${file} modified locally (run fcode app:push)`),
+    unsynced: (file) => color_1.default.yellow(`🔺 ${file} never synced (run fcode app:push, or delete it and fcode team:pull)`),
+    'out-of-date': (file) => color_1.default.yellow(`🔻 ${file} out of date (run fcode team:pull)`),
+    conflict: (file) => color_1.default.red(`🔥 ${file} conflict (changed both locally and in the cloud)`),
+    missing: (file) => color_1.default.yellow(`🔻 ${file} missing (run fcode team:pull)`),
+};
 class TeamStatusCommand extends core_1.Command {
     async init() {
         const { url } = (0, global_1.parseTeamOrigin)('');
@@ -19,12 +29,18 @@ class TeamStatusCommand extends core_1.Command {
         await this.parse(TeamStatusCommand);
         const rootDir = process.cwd();
         const metadata = new dev_team_1.default(rootDir).read();
+        const client = new dashboard_client_1.default(metadata.cloudUrl);
+        const remoteApps = await this.remoteApps(client, metadata.developmentTeam.id);
         const checkouts = [
             ...Object.values(metadata.globalWorkspaces).map(({ name, slug }) => ({ name, folder: (0, dev_team_1.globalWorkspaceFolder)(slug) })),
-            ...Object.values(metadata.apps).map(({ name, folder }) => ({ name, folder: path.join(folder, dev_team_1.APP_WORKSPACE_DIR) })),
+            ...Object.entries(metadata.apps).map(([id, recorded]) => ({
+                name: recorded.name,
+                folder: path.join(recorded.folder, dev_team_1.APP_WORKSPACE_DIR),
+                app: { dir: path.join(rootDir, recorded.folder), id, recorded },
+            })),
         ];
         const failed = [];
-        for (const { name, folder } of checkouts) {
+        for (const { name, folder, app } of checkouts) {
             cli_1.default.log(color_1.default.cyan(`\n━━ ${name} (${folder}) ━━`));
             const workspaceDir = path.join(rootDir, folder);
             if (!fs.pathExistsSync(workspaceDir)) {
@@ -32,6 +48,9 @@ class TeamStatusCommand extends core_1.Command {
                 failed.push(folder);
                 continue;
             }
+            if (app) {
+                await this.reportMetadata(client, app, remoteApps.get(app.id));
+            }
             try {
                 await (0, workspace_cloner_1.runInWorkspace)(workspaceDir, () => status_1.default.run([]));
             }
@@ -45,6 +64,29 @@ class TeamStatusCommand extends core_1.Command {
             cli_1.default.log(color_1.default.red(`\n${failed.length} workspace(s) could not be checked: ${failed.join(', ')}`));
         }
     }
+    async remoteApps(client, teamId) {
+        try {
+            return new Map((await client.listTeamApps(teamId)).map((app) => [app.id, app]));
+        }
+        catch (error) {
+            cli_1.default.log(color_1.default.yellow(`⚠️  App metadata files not checked: ${error.message}`));
+            return new Map();
+        }
+    }
+    async reportMetadata(client, { dir, id, recorded }, app) {
+        if (!app) {
+            return;
+        }
+        try {
+            const [readme, marketplace] = await Promise.all([client.getAppReadme(id), client.getAppMarketplace(id)]);
+            for (const { file, state } of (0, app_metadata_files_1.metadataStatus)(dir, app, recorded, { readme, marketplace })) {
+                cli_1.default.log(STATUS_LINES[state](file));
+            }
+        }
+        catch (error) {
+            cli_1.default.log(color_1.default.yellow(`⚠️  README.md / MARKETPLACE.md not checked: ${error.message}`));
+        }
+    }
 }
 TeamStatusCommand.description = 'Show what differs from the cloud in every workspace of the development team folder';
 TeamStatusCommand.examples = ['$ fcode team:status'];

package/dist/config/dev-team.d.ts

@@ -18,6 +18,10 @@ export interface DevTeamApp {
     folder: string;
     /** Workspace the checkout was cloned from. The directory itself is always `APP_WORKSPACE_DIR`. */
     devWorkspaceSlug: string;
+    /** md5 of README.md as last written by a pull or confirmed by app:push. Absent = never synced. */
+    readmeHash?: string;
+    /** Same for MARKETPLACE.md. */
+    marketplaceHash?: string;
 }
 export interface DevTeamGlobalWorkspace {
     name: string;
@@ -41,6 +45,9 @@ export declare function globalWorkspaceFolder(slug: string): string;
 export declare class NotDevTeamFolder extends CLIError {
     constructor();
 }
+export declare class NotAppFolder extends CLIError {
+    constructor();
+}
 export default class DevTeamConfig {
     private readonly rootDir;
     constructor(rootDir?: string);
@@ -62,3 +69,11 @@ export interface AppSettings {
  */
 export declare const APP_SETTINGS_FILENAME = "settings.json";
 export declare function writeAppSettings(appDir: string, app: AppSettings): void;
+export declare function readAppSettings(appDir: string): AppSettings | undefined;
+/**
+ * The App folder at or above `startDir`: the one holding an App `settings.json` (with an `id`) next
+ * to an `app/` checkout — the pair a workspace's own `settings.json` never has. Resolves from inside
+ * the checkout too.
+ */
+export declare function findAppFolder(startDir?: string): string | undefined;
+export declare function findDevTeamRoot(startDir?: string): string | undefined;

package/dist/config/dev-team.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APP_SETTINGS_FILENAME = exports.NotDevTeamFolder = exports.GLOBAL_WORKSPACES_DIR = exports.APP_WORKSPACE_DIR = void 0;
+exports.APP_SETTINGS_FILENAME = exports.NotAppFolder = exports.NotDevTeamFolder = exports.GLOBAL_WORKSPACES_DIR = exports.APP_WORKSPACE_DIR = void 0;
 exports.globalWorkspaceFolder = globalWorkspaceFolder;
 exports.writeAppSettings = writeAppSettings;
+exports.readAppSettings = readAppSettings;
+exports.findAppFolder = findAppFolder;
+exports.findDevTeamRoot = findDevTeamRoot;
 const fs = require("fs-extra");
 const path = require("node:path");
 const errors_1 = require("../core/errors");
@@ -41,6 +44,16 @@ class NotDevTeamFolder extends errors_1.CLIError {
     }
 }
 exports.NotDevTeamFolder = NotDevTeamFolder;
+class NotAppFolder extends errors_1.CLIError {
+    constructor() {
+        super('⚠️  Current directory is not a Factorial Code App folder (settings.json + app/).', {
+            code: 'ERR_NOT_APP_FOLDER',
+            exit: 1,
+            suggestions: ['cd <app-folder>', 'fcode team:clone'],
+        });
+    }
+}
+exports.NotAppFolder = NotAppFolder;
 class DevTeamConfig {
     constructor(rootDir = process.cwd()) {
         this.rootDir = rootDir;
@@ -74,3 +87,43 @@ exports.APP_SETTINGS_FILENAME = 'settings.json';
 function writeAppSettings(appDir, app) {
     fs.outputJsonSync(path.join(appDir, exports.APP_SETTINGS_FILENAME), app, { spaces: 2 });
 }
+function readAppSettings(appDir) {
+    const settingsPath = path.join(appDir, exports.APP_SETTINGS_FILENAME);
+    if (!fs.pathExistsSync(settingsPath)) {
+        return undefined;
+    }
+    try {
+        const settings = fs.readJsonSync(settingsPath);
+        return typeof settings.id === 'string' ? settings : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function isAppFolder(dir) {
+    return readAppSettings(dir) !== undefined && fs.pathExistsSync(path.join(dir, exports.APP_WORKSPACE_DIR));
+}
+function findUpwards(startDir, matches) {
+    let dir = path.resolve(startDir);
+    for (;;) {
+        if (matches(dir)) {
+            return dir;
+        }
+        const parent = path.dirname(dir);
+        if (parent === dir) {
+            return undefined;
+        }
+        dir = parent;
+    }
+}
+/**
+ * The App folder at or above `startDir`: the one holding an App `settings.json` (with an `id`) next
+ * to an `app/` checkout — the pair a workspace's own `settings.json` never has. Resolves from inside
+ * the checkout too.
+ */
+function findAppFolder(startDir = process.cwd()) {
+    return findUpwards(startDir, isAppFolder);
+}
+function findDevTeamRoot(startDir = process.cwd()) {
+    return findUpwards(startDir, (dir) => new DevTeamConfig(dir).exists());
+}

package/dist/config/settings.d.ts

@@ -4,6 +4,7 @@ export interface SettingDefinition {
     description?: string;
 }
 export declare enum SettingKeys {
+    DISABLE_BROWSER_LOGIN = "disableBrowserLogin",
     DISABLE_UPDATE_NOTIFIER = "disableUpdateNotifier",
     IGNORE_PROCESS_VERSIONS = "ignoreProcessVersions",
     IGNORE_WORKSPACE_NOT_EMPTY = "ignoreWorkspaceNotEmpty",

package/dist/config/settings.js

@@ -4,6 +4,7 @@ exports.SETTINGS_DEFINITIONS = exports.SettingKeys = void 0;
 exports.getSettingDefault = getSettingDefault;
 var SettingKeys;
 (function (SettingKeys) {
+    SettingKeys["DISABLE_BROWSER_LOGIN"] = "disableBrowserLogin";
     SettingKeys["DISABLE_UPDATE_NOTIFIER"] = "disableUpdateNotifier";
     SettingKeys["IGNORE_PROCESS_VERSIONS"] = "ignoreProcessVersions";
     SettingKeys["IGNORE_WORKSPACE_NOT_EMPTY"] = "ignoreWorkspaceNotEmpty";
@@ -24,6 +25,11 @@ exports.SETTINGS_DEFINITIONS = [
         default: 'false',
         description: 'Disable update notifier',
     },
+    {
+        key: SettingKeys.DISABLE_BROWSER_LOGIN,
+        default: 'false',
+        description: 'Disable the interactive browser OAuth login; fcode login prompts for email and password instead',
+    },
     {
         key: SettingKeys.SKIP_SKILLS_SETUP,
         default: 'false',

package/dist/hooks/init/auth.d.ts

@@ -1,3 +1,22 @@
 import { Hook } from '@oclif/core';
+import GlobalConfig from '../../config/global';
+export type LoginMethod = 'accessToken' | 'credentials' | 'browser';
+export interface LoginOptions {
+    email?: string;
+    password?: string;
+    clientId?: string;
+    clientSecret?: string;
+    accessToken?: string;
+    prompt?: boolean;
+    browserLoginDisabled?: boolean;
+}
+/**
+ * Picks how to log in from what the user passed. The browser OAuth flow is the default, but it is
+ * skipped when the user asked to be prompted (`--prompt`), when it is disabled through the
+ * `disableBrowserLogin` setting or the `FCODE_DISABLE_BROWSER_LOGIN` env var (headless machines,
+ * CI, remote shells), or when credentials that identify another method were given.
+ */
+export declare function resolveLoginMethod(options: LoginOptions): LoginMethod;
+export declare function isBrowserLoginDisabled(globalConfig?: GlobalConfig): Promise<boolean>;
 declare const auth: Hook<'init'>;
 export default auth;

package/dist/hooks/init/auth.js

@@ -1,27 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveLoginMethod = resolveLoginMethod;
+exports.isBrowserLoginDisabled = isBrowserLoginDisabled;
 const dotenv_1 = require("dotenv");
 const auth_service_1 = require("../../services/auth-service");
 const credential_prompter_1 = require("../../services/credential-prompter");
 const oauth_browser_service_1 = require("../../services/oauth-browser-service");
 const global_1 = require("../../config/global");
+const settings_1 = require("../../config/settings");
 const url_utils_1 = require("../../utils/url-utils");
+/**
+ * Picks how to log in from what the user passed. The browser OAuth flow is the default, but it is
+ * skipped when the user asked to be prompted (`--prompt`), when it is disabled through the
+ * `disableBrowserLogin` setting or the `FCODE_DISABLE_BROWSER_LOGIN` env var (headless machines,
+ * CI, remote shells), or when credentials that identify another method were given.
+ */
+function resolveLoginMethod(options) {
+    if (options.accessToken) {
+        return 'accessToken';
+    }
+    if (options.prompt ||
+        options.browserLoginDisabled ||
+        options.email ||
+        options.password ||
+        (options.clientId && options.clientSecret)) {
+        return 'credentials';
+    }
+    return 'browser';
+}
+async function isBrowserLoginDisabled(globalConfig = new global_1.default()) {
+    return (process.env.FCODE_DISABLE_BROWSER_LOGIN === 'true' ||
+        (await globalConfig.getSetting(settings_1.SettingKeys.DISABLE_BROWSER_LOGIN)) === 'true');
+}
 const auth = async function ({ argv }) {
     const url = argv[0] || global_1.FCODE_CLOUD_URL;
     const authUrl = argv[1] || (0, url_utils_1.buildAuthUrl)(url);
     const isAuthenticated = await auth_service_1.default.isAuthenticated(url);
     if (!isAuthenticated) {
         (0, dotenv_1.config)();
-        const accessToken = argv[6];
-        const prompt = argv[7];
-        if (accessToken) {
+        const [, , email, password, clientId, clientSecret, accessToken, prompt] = argv;
+        const method = resolveLoginMethod({
+            email,
+            password,
+            clientId,
+            clientSecret,
+            accessToken,
+            prompt: Boolean(prompt),
+            browserLoginDisabled: await isBrowserLoginDisabled(),
+        });
+        if (method === 'accessToken') {
             await auth_service_1.default.login({ url, authUrl, accessToken });
         }
-        else if (prompt || argv[2] || argv[3] || (argv[4] && argv[5])) {
-            await credential_prompter_1.default.prompt({ url, authUrl, email: argv[2], password: argv[3], clientId: argv[4], clientSecret: argv[5] });
+        else if (method === 'credentials') {
+            await credential_prompter_1.default.prompt({ url, authUrl, email, password, clientId, clientSecret });
         }
         else {
-            await (0, oauth_browser_service_1.loginViaBrowser)(url, authUrl, argv[4]);
+            await (0, oauth_browser_service_1.loginViaBrowser)(url, authUrl, clientId);
         }
     }
 };