@devicecloud.dev/dcd 5.0.0-beta.0 → 5.0.0-beta.1

package/dist/commands/login.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loginCommand = void 0;
 /**
  * `dcd login` — delegates auth to the web frontend and persists the resulting
  * Supabase session locally.
@@ -28,20 +25,21 @@ exports.loginCommand = void 0;
  * rendezvous endpoint makes both cases trivial. A leaked URL is inert: it
  * carries the challenge, not the verifier.
  */
-const p = require("@clack/prompts");
-const citty_1 = require("citty");
-const node_child_process_1 = require("node:child_process");
-const node_crypto_1 = require("node:crypto");
-const environments_1 = require("../config/environments");
-const cli_1 = require("../utils/cli");
-const config_store_1 = require("../utils/config-store");
-const orgs_1 = require("../utils/orgs");
-const styling_1 = require("../utils/styling");
+import * as p from '@clack/prompts';
+import { defineCommand } from 'citty';
+import { spawn } from 'node:child_process';
+import { createHash, randomBytes } from 'node:crypto';
+import { ENVIRONMENTS, inferEnvFromApiUrl, resolveFrontendUrl } from '../config/environments.js';
+import { CliError, logger } from '../utils/cli.js';
+import { readConfig, writeConfig } from '../utils/config-store.js';
+import { fetchOrgs, pickOrg } from '../utils/orgs.js';
+import { colors } from '../utils/styling.js';
+import { ui } from '../utils/ui.js';
 const LOGIN_TIMEOUT_MS = 10 * 60 * 1000;
 // 1s feels snappy after the user clicks "Authorize" in the browser. The api
 // rate-limits /cli-login/claim at 60/min which is exactly this cadence.
 const POLL_INTERVAL_MS = 1000;
-exports.loginCommand = (0, citty_1.defineCommand)({
+export const loginCommand = defineCommand({
     meta: {
         name: 'login',
         description: 'Authenticate with devicecloud.dev via your browser',
@@ -71,7 +69,7 @@ exports.loginCommand = (0, citty_1.defineCommand)({
         // If there's an existing stored session, make the user confirm before we
         // overwrite it. Silent clobber is fine for power users but surprising if
         // someone runs `dcd login` by mistake while already authenticated.
-        const existing = (0, config_store_1.readConfig)();
+        const existing = readConfig();
         if (existing?.session) {
             const currentOrg = existing.current_org_name ?? existing.current_org_id;
             const ok = await p.confirm({
@@ -81,35 +79,37 @@ exports.loginCommand = (0, citty_1.defineCommand)({
                 initialValue: false,
             });
             if (p.isCancel(ok) || !ok) {
-                cli_1.logger.log(`${styling_1.symbols.info} Keeping existing session.`);
+                logger.log(ui.info('Keeping existing session.'));
                 return;
             }
         }
-        const env = (0, environments_1.inferEnvFromApiUrl)(apiUrl);
-        const SUPABASE_URL = environments_1.ENVIRONMENTS[env].supabase.url;
-        const frontendUrl = (frontendOverride ?? (0, environments_1.resolveFrontendUrl)(apiUrl)).replace(/\/$/, '');
-        const state = (0, node_crypto_1.randomBytes)(32).toString('hex');
-        const codeVerifier = base64url((0, node_crypto_1.randomBytes)(32));
-        const codeChallenge = base64url((0, node_crypto_1.createHash)('sha256').update(codeVerifier, 'ascii').digest());
+        const env = inferEnvFromApiUrl(apiUrl);
+        const SUPABASE_URL = ENVIRONMENTS[env].supabase.url;
+        const frontendUrl = (frontendOverride ?? resolveFrontendUrl(apiUrl)).replace(/\/$/, '');
+        const state = randomBytes(32).toString('hex');
+        const codeVerifier = base64url(randomBytes(32));
+        const codeChallenge = base64url(createHash('sha256').update(codeVerifier, 'ascii').digest());
         const loginUrl = `${frontendUrl}/cli-login?state=${state}&code_challenge=${codeChallenge}`;
-        cli_1.logger.log((0, styling_1.sectionHeader)('Signing in to devicecloud.dev'));
+        logger.log(ui.section('Signing in to devicecloud.dev'));
+        const rows = [];
         if (noBrowser) {
-            cli_1.logger.log(`   ${styling_1.colors.dim('Open this URL in a browser to finish login:')}`);
-            cli_1.logger.log(`   ${styling_1.colors.highlight(loginUrl)}`);
+            rows.push(ui.note('Open this URL in a browser to finish login:'), colors.highlight(loginUrl));
         }
         else {
-            cli_1.logger.log(`   ${styling_1.colors.dim('Opening your browser...')}`);
             const opened = openBrowser(loginUrl);
+            rows.push(ui.note(opened
+                ? 'Opening your browser…'
+                : 'Could not launch a browser. Open this URL manually:'));
             if (!opened) {
-                cli_1.logger.log(`   ${styling_1.colors.dim('Could not launch a browser. Open this URL manually:')}`);
-                cli_1.logger.log(`   ${styling_1.colors.highlight(loginUrl)}`);
+                rows.push(colors.highlight(loginUrl));
             }
         }
-        cli_1.logger.log(`   ${styling_1.colors.dim('Waiting for login to complete...')}\n`);
+        rows.push(ui.note('Waiting for login to complete…'));
+        logger.log(ui.branch(rows));
         try {
             const payload = await pollForClaim(apiUrl, state, codeVerifier);
             if (!payload.access_token || typeof payload.access_token !== 'string') {
-                throw new cli_1.CliError('Claim response did not include an access_token.');
+                throw new CliError('Claim response did not include an access_token.');
             }
             // Fetch orgs with the just-minted Bearer token. We don't write the
             // config until the user has picked an org — half-completed state isn't
@@ -119,7 +119,7 @@ exports.loginCommand = (0, citty_1.defineCommand)({
             };
             let orgs;
             try {
-                orgs = await (0, orgs_1.fetchOrgs)(apiUrl, bearerHeaders);
+                orgs = await fetchOrgs(apiUrl, bearerHeaders);
             }
             catch (err) {
                 // The api rejected the JWT. Before blaming the api, hit Supabase's
@@ -127,15 +127,15 @@ exports.loginCommand = (0, citty_1.defineCommand)({
                 // rejects it, the token itself is bad; if Supabase accepts, the
                 // api's JwtService is misconfigured.
                 const iss = decodeJwtIssuer(payload.access_token);
-                const supabaseUser = await probeSupabaseUser(iss, environments_1.ENVIRONMENTS[env].supabase.anonKey, payload.access_token);
+                const supabaseUser = await probeSupabaseUser(iss, ENVIRONMENTS[env].supabase.anonKey, payload.access_token);
                 const parts = [
                     iss ? `token iss: ${iss}` : null,
                     `supabase /auth/v1/user: ${supabaseUser}`,
                 ].filter(Boolean);
-                throw new cli_1.CliError(`${err.message} [${parts.join(' | ')}]`);
+                throw new CliError(`${err.message} [${parts.join(' | ')}]`);
             }
-            const chosen = await (0, orgs_1.pickOrg)(orgs);
-            (0, config_store_1.writeConfig)({
+            const chosen = await pickOrg(orgs);
+            writeConfig({
                 version: 1,
                 env,
                 api_url: apiUrl,
@@ -150,14 +150,16 @@ exports.loginCommand = (0, citty_1.defineCommand)({
                 current_org_id: chosen.id,
                 current_org_name: chosen.name,
             });
-            cli_1.logger.log(`${styling_1.symbols.success} ${styling_1.colors.bold('Logged in')} as ${styling_1.colors.highlight(payload.user_email)}`);
-            cli_1.logger.log(`   ${styling_1.colors.dim('Organization:')} ${styling_1.colors.highlight(chosen.name)}`);
-            if (orgs.length > 1) {
-                cli_1.logger.log(`   ${styling_1.colors.dim('Switch orgs later with')} ${styling_1.colors.highlight('dcd switch-org')}`);
-            }
+            logger.log(ui.success(`Logged in as ${colors.highlight(payload.user_email)}`));
+            logger.log(ui.branch([
+                ...ui.fields([['organization', colors.highlight(chosen.name)]]),
+                ...(orgs.length > 1
+                    ? [ui.note(`Switch orgs later with ${colors.highlight('dcd switch-org')}`)]
+                    : []),
+            ]));
         }
         catch (error) {
-            cli_1.logger.error(error, { exit: 1 });
+            logger.error(error, { exit: 1 });
         }
     },
 });
@@ -168,7 +170,7 @@ function openBrowser(url) {
             ? { bin: 'cmd', args: ['/c', 'start', '""', url] }
             : { bin: 'xdg-open', args: [url] };
     try {
-        const child = (0, node_child_process_1.spawn)(cmd.bin, cmd.args, { detached: true, stdio: 'ignore' });
+        const child = spawn(cmd.bin, cmd.args, { detached: true, stdio: 'ignore' });
         child.unref();
         return true;
     }
@@ -207,9 +209,9 @@ async function pollForClaim(apiUrl, state, codeVerifier) {
             continue;
         }
         const body = await res.text().catch(() => '');
-        throw new cli_1.CliError(`Login failed: ${res.status} ${res.statusText}${body ? ` — ${body}` : ''}`);
+        throw new CliError(`Login failed: ${res.status} ${res.statusText}${body ? ` — ${body}` : ''}`);
     }
-    throw new cli_1.CliError('Login timed out. Please run `dcd login` again.');
+    throw new CliError('Login timed out. Please run `dcd login` again.');
 }
 function base64url(buf) {
     return buf.toString('base64').replaceAll('+', '-').replaceAll('/', '_').replace(/=+$/, '');
@@ -247,4 +249,4 @@ function decodeJwtIssuer(token) {
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-exports.default = exports.loginCommand;
+export default loginCommand;

package/dist/commands/logout.js

@@ -1,32 +1,30 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logoutCommand = void 0;
 /**
  * `dcd logout` — clears the stored Supabase session and best-effort revokes
  * it on Supabase. Leaves DEVICE_CLOUD_API_KEY (env/flag) untouched.
  */
-const citty_1 = require("citty");
-const environments_1 = require("../config/environments");
-const cli_auth_gateway_1 = require("../gateways/cli-auth-gateway");
-const cli_1 = require("../utils/cli");
-const config_store_1 = require("../utils/config-store");
-const styling_1 = require("../utils/styling");
-exports.logoutCommand = (0, citty_1.defineCommand)({
+import { defineCommand } from 'citty';
+import { ENVIRONMENTS } from '../config/environments.js';
+import { CliAuthGateway } from '../gateways/cli-auth-gateway.js';
+import { logger } from '../utils/cli.js';
+import { clearConfig, getConfigPath, readConfig } from '../utils/config-store.js';
+import { colors } from '../utils/styling.js';
+import { ui } from '../utils/ui.js';
+export const logoutCommand = defineCommand({
     meta: {
         name: 'logout',
         description: 'Clear the stored devicecloud.dev session',
     },
     async run() {
-        const config = (0, config_store_1.readConfig)();
+        const config = readConfig();
         if (!config?.session) {
-            cli_1.logger.log(`${styling_1.symbols.info} No active session found (${styling_1.colors.dim((0, config_store_1.getConfigPath)())}).`);
-            (0, config_store_1.clearConfig)();
+            logger.log(ui.info(`No active session found (${colors.dim(getConfigPath())}).`));
+            clearConfig();
             return;
         }
-        const { anonKey } = environments_1.ENVIRONMENTS[config.env].supabase;
-        await cli_auth_gateway_1.CliAuthGateway.signOut(config.supabase_url, anonKey, config.session);
-        (0, config_store_1.clearConfig)();
-        cli_1.logger.log(`${styling_1.symbols.success} Logged out ${styling_1.colors.dim(`(${config.session.user_email})`)}.`);
+        const { anonKey } = ENVIRONMENTS[config.env].supabase;
+        await CliAuthGateway.signOut(config.supabase_url, anonKey, config.session);
+        clearConfig();
+        logger.log(ui.success(`Logged out ${colors.dim(`(${config.session.user_email})`)}`));
     },
 });
-exports.default = exports.logoutCommand;
+export default logoutCommand;

package/dist/commands/status.d.ts

@@ -1,22 +1,22 @@
 export declare const statusCommand: import("citty").CommandDef<{
-    json: {
-        type: "boolean";
-        description: string;
+    readonly json: {
+        readonly type: "boolean";
+        readonly description: "output in json format";
     };
-    name: {
-        type: "string";
-        description: string;
+    readonly name: {
+        readonly type: "string";
+        readonly description: "Name of the upload to check status for";
     };
-    'upload-id': {
-        type: "string";
-        description: string;
+    readonly 'upload-id': {
+        readonly type: "string";
+        readonly description: "UUID of the upload to check status for";
     };
-    'api-key': {
+    readonly 'api-key': {
         readonly type: "string";
         readonly alias: ["apiKey"];
         readonly description: "API key for devicecloud.dev (find this in the console UI). You can also set the DEVICE_CLOUD_API_KEY environment variable.";
     };
-    'api-url': {
+    readonly 'api-url': {
         readonly type: "string";
         readonly alias: ["apiURL", "apiUrl"];
         readonly description: "API base URL (defaults to the URL stored by `dcd login`, else prod)";

package/dist/commands/status.js

@@ -1,15 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.statusCommand = void 0;
-const citty_1 = require("citty");
-const api_flags_1 = require("../config/flags/api.flags");
-const api_gateway_1 = require("../gateways/api-gateway");
-const methods_1 = require("../methods");
-const auth_1 = require("../utils/auth");
-const cli_1 = require("../utils/cli");
-const config_store_1 = require("../utils/config-store");
-const connectivity_1 = require("../utils/connectivity");
-const styling_1 = require("../utils/styling");
+import { defineCommand } from 'citty';
+import { apiFlags } from '../config/flags/api.flags.js';
+import { ApiGateway } from '../gateways/api-gateway.js';
+import { formatDurationSeconds } from '../methods.js';
+import { resolveAuth } from '../utils/auth.js';
+import { CliError, logger } from '../utils/cli.js';
+import { resolveApiUrl } from '../utils/config-store.js';
+import { checkInternetConnectivity, } from '../utils/connectivity.js';
+import { colors, formatId, formatUrl } from '../utils/styling.js';
+import { ui } from '../utils/ui.js';
 /** Errors the API gateway surfaces for 4xx-class failures — retrying is pointless. */
 function isClientApiError(error) {
     if (!error)
@@ -30,13 +28,13 @@ function formatDateTime(isoString) {
         return isoString;
     }
 }
-exports.statusCommand = (0, citty_1.defineCommand)({
+export const statusCommand = defineCommand({
     meta: {
         name: 'status',
         description: 'Get the status of an upload by name or upload ID',
     },
     args: {
-        ...api_flags_1.apiFlags,
+        ...apiFlags,
         json: {
             type: 'boolean',
             description: 'output in json format',
@@ -53,7 +51,7 @@ exports.statusCommand = (0, citty_1.defineCommand)({
     // eslint-disable-next-line complexity
     async run({ args }) {
         const apiKeyFlag = args['api-key'];
-        const apiUrl = (0, config_store_1.resolveApiUrl)(args['api-url']);
+        const apiUrl = resolveApiUrl(args['api-url']);
         const json = Boolean(args.json);
         const name = args.name;
         const uploadId = args['upload-id'];
@@ -61,17 +59,17 @@ exports.statusCommand = (0, citty_1.defineCommand)({
             await statusMain({ apiKeyFlag, apiUrl, json, name, uploadId });
         }
         catch (error) {
-            cli_1.logger.error(error, { exit: 1, json });
+            logger.error(error, { exit: 1, json });
         }
     },
 });
 async function statusMain({ apiKeyFlag, apiUrl, json, name, uploadId, }) {
-    const auth = await (0, auth_1.resolveAuth)({ apiKeyFlag });
+    const auth = await resolveAuth({ apiKeyFlag });
     if (name && uploadId) {
-        throw new cli_1.CliError('Cannot provide both --name and --upload-id. These options are mutually exclusive.');
+        throw new CliError('Cannot provide both --name and --upload-id. These options are mutually exclusive.');
     }
     if (!name && !uploadId) {
-        throw new cli_1.CliError('Either --name or --upload-id must be provided');
+        throw new CliError('Either --name or --upload-id must be provided');
     }
     let lastError = null;
     let status = null;
@@ -79,7 +77,7 @@ async function statusMain({ apiKeyFlag, apiUrl, json, name, uploadId, }) {
     for (let attempt = 1; attempt <= 5; attempt++) {
         try {
             attemptsMade = attempt;
-            status = (await api_gateway_1.ApiGateway.getUploadStatus(apiUrl, auth, {
+            status = (await ApiGateway.getUploadStatus(apiUrl, auth, {
                 name,
                 uploadId,
             }));
@@ -93,7 +91,7 @@ async function statusMain({ apiKeyFlag, apiUrl, json, name, uploadId, }) {
                 break;
             }
             if (attempt < 5) {
-                cli_1.logger.log(isNetworkError
+                logger.log(isNetworkError
                     ? `Network error on attempt ${attempt}/5. Retrying...`
                     : `Request failed on attempt ${attempt}/5. Retrying...`);
                 await new Promise((resolve) => {
@@ -115,9 +113,9 @@ async function statusMain({ apiKeyFlag, apiUrl, json, name, uploadId, }) {
                 }, null, 2));
                 return;
             }
-            throw new cli_1.CliError(errorMessage);
+            throw new CliError(errorMessage);
         }
-        const connectivityCheck = await (0, connectivity_1.checkInternetConnectivity)();
+        const connectivityCheck = await checkInternetConnectivity();
         let errorMessage;
         if (connectivityCheck.connected) {
             errorMessage = `Failed to get status after ${attemptsMade} attempt${attemptsMade > 1 ? 's' : ''}. Internet appears functional but unable to reach API. Last error: ${lastError?.message || 'Unknown error'}`;
@@ -143,7 +141,7 @@ async function statusMain({ apiKeyFlag, apiUrl, json, name, uploadId, }) {
             }, null, 2));
             return;
         }
-        throw new cli_1.CliError(errorMessage);
+        throw new CliError(errorMessage);
     }
     try {
         if (json) {
@@ -152,42 +150,46 @@ async function statusMain({ apiKeyFlag, apiUrl, json, name, uploadId, }) {
             console.log(JSON.stringify({ ...rest, tests }, null, 2));
             return;
         }
-        cli_1.logger.log((0, styling_1.sectionHeader)('Upload Status'));
-        cli_1.logger.log(`   ${(0, styling_1.formatStatus)(status.status)}`);
+        const fields = [];
         if (status.name) {
-            cli_1.logger.log(`   ${styling_1.colors.dim('Name:')} ${styling_1.colors.bold(status.name)}`);
+            fields.push(['name', colors.bold(status.name)]);
         }
         if (status.uploadId) {
-            cli_1.logger.log(`   ${styling_1.colors.dim('Upload ID:')} ${(0, styling_1.formatId)(status.uploadId)}`);
+            fields.push(['upload id', formatId(status.uploadId)]);
         }
         if (status.appBinaryId) {
-            cli_1.logger.log(`   ${styling_1.colors.dim('Binary ID:')} ${(0, styling_1.formatId)(status.appBinaryId)}`);
+            fields.push(['binary id', formatId(status.appBinaryId)]);
         }
         if (status.createdAt) {
-            cli_1.logger.log(`   ${styling_1.colors.dim('Created:')} ${formatDateTime(status.createdAt)}`);
+            fields.push(['created', formatDateTime(status.createdAt)]);
         }
         if (status.consoleUrl) {
-            cli_1.logger.log(`   ${styling_1.colors.dim('Console:')} ${(0, styling_1.formatUrl)(status.consoleUrl)}`);
+            fields.push(['console', formatUrl(status.consoleUrl)]);
         }
+        logger.log(ui.section('Upload Status'));
+        logger.log(ui.branch([ui.status(status.status), ...ui.fields(fields)]));
         if (status.tests.length > 0) {
-            cli_1.logger.log((0, styling_1.sectionHeader)('Test Results'));
-            for (const item of status.tests) {
-                cli_1.logger.log(`   ${(0, styling_1.formatStatus)(item.status)} ${styling_1.colors.bold(item.name)}`);
-                if (item.status === 'FAILED' && item.failReason) {
-                    cli_1.logger.log(`      ${styling_1.colors.error('Fail reason:')} ${item.failReason}`);
-                }
+            logger.log(ui.section('Test Results'));
+            logger.log(ui.branch(status.tests.map((item) => {
+                const head = `${ui.statusSymbol(item.status)} ${item.name}`;
+                const meta = [];
                 if (item.durationSeconds) {
-                    cli_1.logger.log(`      ${styling_1.colors.dim('Duration:')} ${(0, methods_1.formatDurationSeconds)(item.durationSeconds)}`);
+                    meta.push(formatDurationSeconds(item.durationSeconds));
                 }
                 if (item.createdAt) {
-                    cli_1.logger.log(`      ${styling_1.colors.dim('Created:')} ${formatDateTime(item.createdAt)}`);
+                    meta.push(colors.dim(formatDateTime(item.createdAt)));
                 }
-                cli_1.logger.log('');
-            }
+                if (item.status === 'FAILED' && item.failReason) {
+                    meta.push(colors.error(item.failReason));
+                }
+                return meta.length > 0
+                    ? `${head}   ${colors.dim('·')} ${meta.join(colors.dim(' · '))}`
+                    : head;
+            })));
         }
     }
     catch (error) {
-        throw new cli_1.CliError(`Failed to get status: ${error.message}`);
+        throw new CliError(`Failed to get status: ${error.message}`);
     }
 }
-exports.default = exports.statusCommand;
+export default statusCommand;

package/dist/commands/switch-org.d.ts

@@ -1,12 +1,12 @@
 export declare const switchOrgCommand: import("citty").CommandDef<{
-    'api-url': {
-        type: "string";
-        description: string;
+    readonly 'api-url': {
+        readonly type: "string";
+        readonly description: "API base URL (defaults to the URL stored by `dcd login`)";
     };
-    org: {
-        type: "positional";
-        required: false;
-        description: string;
+    readonly org: {
+        readonly type: "positional";
+        readonly required: false;
+        readonly description: "Org name to switch to (omit for an interactive picker)";
     };
 }>;
 export default switchOrgCommand;

package/dist/commands/switch-org.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.switchOrgCommand = void 0;
 /**
  * `dcd switch-org` — changes the active org on the stored session.
  *
@@ -8,13 +5,14 @@ exports.switchOrgCommand = void 0;
  * confirming the user is a member via GET /me/orgs.
  * Without an argument: fetch orgs and prompt the user to pick one.
  */
-const citty_1 = require("citty");
-const auth_1 = require("../utils/auth");
-const cli_1 = require("../utils/cli");
-const config_store_1 = require("../utils/config-store");
-const orgs_1 = require("../utils/orgs");
-const styling_1 = require("../utils/styling");
-exports.switchOrgCommand = (0, citty_1.defineCommand)({
+import { defineCommand } from 'citty';
+import { resolveAuth } from '../utils/auth.js';
+import { CliError, logger } from '../utils/cli.js';
+import { readConfig, resolveApiUrl, writeConfig } from '../utils/config-store.js';
+import { fetchOrgs, pickOrg } from '../utils/orgs.js';
+import { colors } from '../utils/styling.js';
+import { ui } from '../utils/ui.js';
+export const switchOrgCommand = defineCommand({
     meta: {
         name: 'switch-org',
         description: 'Switch the active organization for the logged-in session',
@@ -31,31 +29,31 @@ exports.switchOrgCommand = (0, citty_1.defineCommand)({
         },
     },
     async run({ args }) {
-        const config = (0, config_store_1.readConfig)();
+        const config = readConfig();
         if (!config?.session) {
-            throw new cli_1.CliError('Not logged in. Run `dcd login` first.');
+            throw new CliError('Not logged in. Run `dcd login` first.');
         }
         // Honor the env the user logged into — defaulting to prod here would send
         // a dev Bearer token to the prod API.
-        const apiUrl = (0, config_store_1.resolveApiUrl)(args['api-url']);
+        const apiUrl = resolveApiUrl(args['api-url']);
         const target = args.org;
         // sessionOnly: an exported DEVICE_CLOUD_API_KEY must not shadow the
         // browser session this command requires.
-        const auth = await (0, auth_1.resolveAuth)({ apiKeyFlag: undefined, sessionOnly: true });
-        const orgs = await (0, orgs_1.fetchOrgs)(apiUrl, auth.headers);
+        const auth = await resolveAuth({ apiKeyFlag: undefined, sessionOnly: true });
+        const orgs = await fetchOrgs(apiUrl, auth.headers);
         let chosen;
         if (target) {
             chosen = matchOrg(orgs, target);
         }
         else {
-            chosen = await (0, orgs_1.pickOrg)(orgs);
+            chosen = await pickOrg(orgs);
         }
-        (0, config_store_1.writeConfig)({
+        writeConfig({
             ...config,
             current_org_id: chosen.id,
             current_org_name: chosen.name,
         });
-        cli_1.logger.log(`${styling_1.symbols.success} ${styling_1.colors.bold('Switched')} to ${styling_1.colors.highlight(chosen.name)}`);
+        logger.log(ui.success(`Switched to ${colors.highlight(chosen.name)}`));
     },
 });
 /**
@@ -67,12 +65,12 @@ function matchOrg(orgs, target) {
     const needle = target.toLowerCase();
     const nameMatches = orgs.filter((o) => o.name.toLowerCase() === needle);
     if (nameMatches.length > 1) {
-        throw new cli_1.CliError(`Multiple orgs named "${target}". Run \`dcd switch-org\` without arguments to pick interactively.`);
+        throw new CliError(`Multiple orgs named "${target}". Run \`dcd switch-org\` without arguments to pick interactively.`);
     }
     const chosen = nameMatches[0] ?? orgs.find((o) => o.slug === target || o.id === target);
     if (!chosen) {
-        throw new cli_1.CliError(`No org named "${target}". Available: ${orgs.map((o) => o.name).join(', ')}`);
+        throw new CliError(`No org named "${target}". Available: ${orgs.map((o) => o.name).join(', ')}`);
     }
     return chosen;
 }
-exports.default = exports.switchOrgCommand;
+export default switchOrgCommand;