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

package/dist/utils/config-store.js

@@ -0,0 +1,125 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CONFIG_SCHEMA_VERSION = void 0;
+exports.getConfigDir = getConfigDir;
+exports.getConfigPath = getConfigPath;
+exports.readConfig = readConfig;
+exports.resolveApiUrl = resolveApiUrl;
+exports.writeConfig = writeConfig;
+exports.clearConfig = clearConfig;
+exports.configFileMode = configFileMode;
+/**
+ * Persistent CLI config: Supabase session tokens + chosen org.
+ *
+ * Storage: $XDG_CONFIG_HOME/dcd/config.json (fallback ~/.dcd/config.json).
+ * File mode 0600, directory mode 0700 — owner-only.
+ * Writes are atomic (tmp file + rename) so a crash mid-refresh can't
+ * leave a corrupt config behind that logs the user out.
+ */
+const node_crypto_1 = require("node:crypto");
+const node_fs_1 = require("node:fs");
+const node_os_1 = require("node:os");
+const path = require("node:path");
+const environments_1 = require("../config/environments");
+exports.CONFIG_SCHEMA_VERSION = 1;
+function getConfigDir() {
+    if (process.env.DCD_CONFIG_DIR)
+        return process.env.DCD_CONFIG_DIR;
+    const xdg = process.env.XDG_CONFIG_HOME;
+    if (xdg && xdg.trim().length > 0)
+        return path.join(xdg, 'dcd');
+    return path.join((0, node_os_1.homedir)(), '.dcd');
+}
+function getConfigPath() {
+    return path.join(getConfigDir(), 'config.json');
+}
+function readConfig() {
+    const p = getConfigPath();
+    if (!(0, node_fs_1.existsSync)(p))
+        return null;
+    try {
+        const raw = (0, node_fs_1.readFileSync)(p, 'utf8');
+        const parsed = JSON.parse(raw);
+        if (parsed.version !== exports.CONFIG_SCHEMA_VERSION) {
+            // eslint-disable-next-line no-console
+            console.warn(`Warning: config at ${p} was written by an incompatible CLI version (config version ${parsed.version}); ignoring it. Run \`dcd login\` to recreate it.`);
+            return null;
+        }
+        return parsed;
+    }
+    catch {
+        // Surface the corruption instead of silently behaving as logged-out, so
+        // downstream "Not authenticated" errors aren't mystifying.
+        // eslint-disable-next-line no-console
+        console.warn(`Warning: could not parse config at ${p}; treating as logged out. Run \`dcd login\` to recreate it.`);
+        return null;
+    }
+}
+/**
+ * Resolve the API URL a command should talk to. Precedence:
+ *   1. explicit --api-url flag
+ *   2. api_url stored by `dcd login` (honors the env the user logged into)
+ *   3. prod default
+ *
+ * Without this, session commands default to prod and a dev/staging Bearer
+ * token is rejected with a misleading "Invalid or expired JWT". `switch-org`
+ * has always done this; this helper extends it to every command.
+ */
+function resolveApiUrl(flag) {
+    const explicit = flag?.trim();
+    if (explicit)
+        return explicit;
+    return readConfig()?.api_url ?? environments_1.ENVIRONMENTS.prod.apiUrl;
+}
+function writeConfig(config) {
+    const dir = getConfigDir();
+    if (!(0, node_fs_1.existsSync)(dir)) {
+        (0, node_fs_1.mkdirSync)(dir, { recursive: true, mode: 0o700 });
+    }
+    else {
+        try {
+            (0, node_fs_1.chmodSync)(dir, 0o700);
+        }
+        catch { /* best effort */ }
+    }
+    const finalPath = getConfigPath();
+    // Best-effort cleanup of orphaned tmp files left behind by crashed writes.
+    // Only remove old ones — a concurrent process may be between its own
+    // writeFileSync and renameSync right now.
+    try {
+        const base = path.basename(finalPath);
+        for (const entry of (0, node_fs_1.readdirSync)(dir)) {
+            if (!entry.startsWith(`${base}.`) || !entry.endsWith('.tmp'))
+                continue;
+            const tmp = path.join(dir, entry);
+            try {
+                if (Date.now() - (0, node_fs_1.statSync)(tmp).mtimeMs > 60_000)
+                    (0, node_fs_1.unlinkSync)(tmp);
+            }
+            catch { /* best effort */ }
+        }
+    }
+    catch { /* best effort */ }
+    const tmpPath = `${finalPath}.${(0, node_crypto_1.randomBytes)(6).toString('hex')}.tmp`;
+    (0, node_fs_1.writeFileSync)(tmpPath, JSON.stringify(config, null, 2), { mode: 0o600 });
+    try {
+        (0, node_fs_1.chmodSync)(tmpPath, 0o600);
+    }
+    catch { /* best effort on platforms w/o chmod */ }
+    (0, node_fs_1.renameSync)(tmpPath, finalPath);
+    try {
+        (0, node_fs_1.chmodSync)(finalPath, 0o600);
+    }
+    catch { /* best effort */ }
+}
+function clearConfig() {
+    const p = getConfigPath();
+    if ((0, node_fs_1.existsSync)(p))
+        (0, node_fs_1.unlinkSync)(p);
+}
+function configFileMode() {
+    const p = getConfigPath();
+    if (!(0, node_fs_1.existsSync)(p))
+        return null;
+    return (0, node_fs_1.statSync)(p).mode & 0o777;
+}

package/dist/utils/connectivity.js

@@ -22,16 +22,15 @@ async function checkInternetConnectivity() {
     // Try each endpoint with a short timeout
     for (const { url, description } of testEndpoints) {
         const startTime = Date.now();
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), 3000); // 3 second timeout
         try {
-            const controller = new AbortController();
-            const timeoutId = setTimeout(() => controller.abort(), 3000); // 3 second timeout
             const response = await fetch(url, {
                 method: 'HEAD', // Use HEAD to minimize data transfer
                 signal: controller.signal,
                 // Disable redirects to get faster response
                 redirect: 'manual',
             });
-            clearTimeout(timeoutId);
             const latencyMs = Date.now() - startTime;
             // Any response (including 3xx redirects) indicates connectivity
             if (response) {
@@ -81,6 +80,11 @@ async function checkInternetConnectivity() {
             // Continue to next endpoint if this one fails
             continue;
         }
+        finally {
+            // Always clear — a dangling abort timer keeps the event loop alive
+            // for up to 3s per failed endpoint.
+            clearTimeout(timeoutId);
+        }
     }
     // Generate developer-friendly message
     let message;

package/dist/utils/expo.js

@@ -40,10 +40,20 @@ async function downloadExpoUrl(url, debug) {
         try {
             const response = await fetch(url);
             if (!response.ok) {
+                // 4xx responses (expired signed URL, 404, ...) won't get better on
+                // retry — flag them so the catch below rethrows immediately.
+                const permanent = response.status >= 400 && response.status < 500;
+                let error;
                 if (response.status === 403 || response.status === 401) {
-                    throw new Error(`Failed to download Expo build from URL (HTTP ${response.status}). Expo signed URLs expire after ~1 hour — please generate a fresh URL with 'eas build' and try again.`);
+                    error = new Error(`Failed to download Expo build from URL (HTTP ${response.status}). Expo signed URLs expire after ~1 hour — please generate a fresh URL with 'eas build' and try again.`);
                 }
-                throw new Error(`Failed to download Expo build from URL (HTTP ${response.status}).`);
+                else {
+                    error = new Error(`Failed to download Expo build from URL (HTTP ${response.status}).`);
+                }
+                if (permanent) {
+                    error.permanent = true;
+                }
+                throw error;
             }
             if (!response.body) {
                 throw new Error('No response body received from Expo URL.');
@@ -60,8 +70,9 @@ async function downloadExpoUrl(url, debug) {
         catch (error) {
             // Clean up any partial file before retrying
             await fsp.rm(destPath, { force: true }).catch(() => { });
+            const isPermanent = Boolean(error?.permanent);
             const isLastAttempt = attempt === DOWNLOAD_RETRY_ATTEMPTS;
-            if (isLastAttempt) {
+            if (isPermanent || isLastAttempt) {
                 throw error;
             }
             if (debug) {

package/dist/utils/orgs.d.ts

@@ -0,0 +1,11 @@
+export interface OrgListItem {
+    id: string;
+    name: string;
+    slug?: string;
+}
+export declare function fetchOrgs(apiUrl: string, headers: Record<string, string>): Promise<OrgListItem[]>;
+/**
+ * Interactive org picker. Auto-selects when there's only one org (returns it
+ * without prompting). Throws on zero orgs or user cancellation.
+ */
+export declare function pickOrg(orgs: OrgListItem[], message?: string): Promise<OrgListItem>;

package/dist/utils/orgs.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchOrgs = fetchOrgs;
+exports.pickOrg = pickOrg;
+/**
+ * Shared helpers for fetching and picking from /me/orgs. Used by both
+ * `dcd login` (after the PKCE claim returns a session) and `dcd switch-org`.
+ */
+const p = require("@clack/prompts");
+const cli_1 = require("./cli");
+async function fetchOrgs(apiUrl, headers) {
+    const res = await fetch(`${apiUrl.replace(/\/$/, '')}/me/orgs`, { headers });
+    if (!res.ok) {
+        const body = await res.text().catch(() => '');
+        throw new cli_1.CliError(`Failed to list organizations: HTTP ${res.status}${body ? ` — ${body}` : ''}`);
+    }
+    const body = (await res.json());
+    return body.orgs ?? [];
+}
+/**
+ * Interactive org picker. Auto-selects when there's only one org (returns it
+ * without prompting). Throws on zero orgs or user cancellation.
+ */
+async function pickOrg(orgs, message = 'Pick an organization') {
+    if (orgs.length === 0) {
+        throw new cli_1.CliError('No organizations found for this user.');
+    }
+    if (orgs.length === 1)
+        return orgs[0];
+    const picked = await p.select({
+        message,
+        options: orgs.map((o) => ({ value: o.id, label: o.name })),
+    });
+    if (p.isCancel(picked))
+        throw new cli_1.CliError('Cancelled.');
+    const chosen = orgs.find((o) => o.id === picked);
+    if (!chosen)
+        throw new cli_1.CliError('No organization selected.');
+    return chosen;
+}

package/dist/utils/paths.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Convert an absolute path into the portable './'-prefixed, forward-slash
+ * relative form used as flow keys across submission, metadata maps, and
+ * polling. `commonRoot` must be a whole-segment prefix of `absolutePath`
+ * without a trailing separator (or '' when no common root exists, in which
+ * case the path is kept whole apart from separator normalization).
+ *
+ * Replaces the old `replaceAll(commonRoot, '.')` pattern, which corrupted
+ * paths when the root substring recurred mid-path or collapsed to ''.
+ */
+export declare function toPortableRelativePath(absolutePath: string, commonRoot: string): string;

package/dist/utils/paths.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toPortableRelativePath = toPortableRelativePath;
+const path = require("node:path");
+/**
+ * Convert an absolute path into the portable './'-prefixed, forward-slash
+ * relative form used as flow keys across submission, metadata maps, and
+ * polling. `commonRoot` must be a whole-segment prefix of `absolutePath`
+ * without a trailing separator (or '' when no common root exists, in which
+ * case the path is kept whole apart from separator normalization).
+ *
+ * Replaces the old `replaceAll(commonRoot, '.')` pattern, which corrupted
+ * paths when the root substring recurred mid-path or collapsed to ''.
+ */
+function toPortableRelativePath(absolutePath, commonRoot) {
+    let relative = absolutePath;
+    if (commonRoot && absolutePath.startsWith(commonRoot)) {
+        relative = absolutePath.slice(commonRoot.length);
+    }
+    if (!relative.startsWith(path.sep)) {
+        relative = path.sep + relative;
+    }
+    return ('.' + relative).split(path.sep).join('/');
+}

package/dist/utils/progress.d.ts

@@ -0,0 +1,13 @@
+declare class Action {
+    private current;
+    private _status;
+    start(title: string, initialStatus?: string, _opts?: unknown): void;
+    stop(message?: string): void;
+    set status(value: string);
+    get status(): string;
+}
+export declare const ux: {
+    action: Action;
+    info(message: string): void;
+};
+export {};

package/dist/utils/progress.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ux = void 0;
+/**
+ * Progress adapter that wraps @clack/prompts spinner with a
+ * drop-in API for existing services that used oclif's `ux.action` / `ux.info`.
+ *
+ * Keeps call sites unchanged while migrating away from @oclif/core.
+ */
+const p = require("@clack/prompts");
+class Action {
+    current = null;
+    _status = '';
+    start(title, initialStatus, _opts) {
+        if (this.current) {
+            this.current.stop();
+        }
+        this.current = p.spinner();
+        this._status = initialStatus ?? '';
+        this.current.start(initialStatus ? `${title} — ${initialStatus}` : title);
+    }
+    stop(message) {
+        if (!this.current) {
+            if (message) {
+                // eslint-disable-next-line no-console
+                console.log(message);
+            }
+            return;
+        }
+        this.current.stop(message ?? '');
+        this.current = null;
+        this._status = '';
+    }
+    set status(value) {
+        this._status = value;
+        if (this.current && value) {
+            this.current.message(value);
+        }
+    }
+    get status() {
+        return this._status;
+    }
+}
+exports.ux = {
+    action: new Action(),
+    info(message) {
+        // eslint-disable-next-line no-console
+        console.log(message);
+    },
+};

package/dist/utils/styling.d.ts

@@ -1,8 +1,4 @@
 import chalk = require('chalk');
-/**
- * Centralized styling utilities for CLI output
- * Provides consistent, developer-friendly visual formatting
- */
 /**
  * Status symbols with associated colors
  */
@@ -97,9 +93,21 @@ export declare function formatTestSummary(summary: {
  * @returns Formatted box with borders
  */
 export declare function box(content: string): string;
+/**
+ * Minimal column table renderer.
+ * Columns are defined with a `get(row) => string` accessor and optional header label.
+ * Matches the subset of oclif's ux.table used by this CLI.
+ */
+export declare function table<T>(rows: T[], columns: Record<string, {
+    get: (row: T) => string;
+    header?: string;
+}>, options?: {
+    printLine?: (line: string) => void;
+}): void;
 /**
  * Generate console URL based on API URL
- * If a non-default API URL is used, prepends "dev." to the console subdomain
+ * Derives the console host from the known environment matching the API URL;
+ * unknown API URLs fall back to the dev console (historical behavior).
  * @param apiUrl - The API URL being used
  * @param uploadId - The upload ID
  * @param resultId - The result ID

package/dist/utils/styling.js

@@ -9,12 +9,17 @@ exports.formatUrl = formatUrl;
 exports.formatId = formatId;
 exports.formatTestSummary = formatTestSummary;
 exports.box = box;
+exports.table = table;
 exports.getConsoleUrl = getConsoleUrl;
 const chalk = require("chalk");
+const environments_1 = require("../config/environments");
 /**
  * Centralized styling utilities for CLI output
  * Provides consistent, developer-friendly visual formatting
  */
+/** Strip ANSI color escape sequences for visible-width calculations. */
+// eslint-disable-next-line no-control-regex -- matches ANSI escape sequences
+const stripAnsi = (s) => s.replace(/\u001B\[[0-9;]*m/g, '');
 /**
  * Status symbols with associated colors
  */
@@ -147,25 +152,50 @@ function formatTestSummary(summary) {
  */
 function box(content) {
     const lines = content.split('\n');
-    const maxLength = Math.max(...lines.map((l) => l.length));
+    const visibleLen = (s) => stripAnsi(s).length;
+    const maxLength = Math.max(...lines.map((l) => visibleLen(l)));
     const top = chalk.gray('┌' + '─'.repeat(maxLength + 2) + '┐');
     const bottom = chalk.gray('└' + '─'.repeat(maxLength + 2) + '┘');
     const middle = lines
-        .map((line) => chalk.gray('│ ') + line.padEnd(maxLength) + chalk.gray(' │'))
+        .map((line) => chalk.gray('│ ') + line + ' '.repeat(Math.max(0, maxLength - visibleLen(line))) + chalk.gray(' │'))
         .join('\n');
     return `${top}\n${middle}\n${bottom}`;
 }
+/**
+ * Minimal column table renderer.
+ * Columns are defined with a `get(row) => string` accessor and optional header label.
+ * Matches the subset of oclif's ux.table used by this CLI.
+ */
+function table(rows, columns, options = {}) {
+    const printLine = options.printLine ?? ((line) => {
+        // eslint-disable-next-line no-console
+        console.log(line);
+    });
+    const keys = Object.keys(columns);
+    const headers = keys.map((k) => columns[k].header ?? k);
+    const cells = rows.map((row) => keys.map((k) => String(columns[k].get(row) ?? '')));
+    const widths = keys.map((_, i) => Math.max(stripAnsi(headers[i]).length, ...cells.map((r) => stripAnsi(r[i]).length)));
+    const pad = (s, width) => {
+        const visibleLen = stripAnsi(s).length;
+        return s + ' '.repeat(Math.max(0, width - visibleLen));
+    };
+    printLine(headers.map((h, i) => pad(chalk.bold(h), widths[i])).join('  '));
+    printLine(widths.map((w) => chalk.gray('─'.repeat(w))).join('  '));
+    for (const row of cells) {
+        printLine(row.map((c, i) => pad(c, widths[i])).join('  '));
+    }
+}
 /**
  * Generate console URL based on API URL
- * If a non-default API URL is used, prepends "dev." to the console subdomain
+ * Derives the console host from the known environment matching the API URL;
+ * unknown API URLs fall back to the dev console (historical behavior).
  * @param apiUrl - The API URL being used
  * @param uploadId - The upload ID
  * @param resultId - The result ID
  * @returns The appropriate console URL
  */
 function getConsoleUrl(apiUrl, uploadId, resultId) {
-    const DEFAULT_API_URL = 'https://api.devicecloud.dev';
-    const isDefaultApi = apiUrl === DEFAULT_API_URL;
-    const consoleSubdomain = isDefaultApi ? 'console' : 'dev.console';
-    return `https://${consoleSubdomain}.devicecloud.dev/results?upload=${uploadId}&result=${resultId}`;
+    const env = (0, environments_1.findEnvByApiUrl)(apiUrl);
+    const base = env?.frontendUrl ?? 'https://dev.console.devicecloud.dev';
+    return `${base}/results?upload=${uploadId}&result=${resultId}`;
 }

package/package.json

@@ -1,66 +1,54 @@
 {
   "author": "devicecloud.dev",
   "bin": {
-    "dcd": "bin/run.js"
+    "dcd": "dist/index.js"
   },
   "dependencies": {
-    "@oclif/core": "^3.27.0",
-    "@oclif/plugin-help": "^6.2.37",
+    "@clack/prompts": "^1.2.0",
     "@supabase/supabase-js": "^2.99.1",
-    "app-info-parser": "^1.1.6",
-    "archiver": "^7.0.1",
     "bplist-parser": "^0.3.2",
     "chalk": "4.1.2",
-    "glob": "^13.0.6",
+    "citty": "^0.1.6",
     "js-yaml": "^4.1.1",
+    "node-apk": "^1.2.1",
     "node-stream-zip": "^1.15.0",
     "plist": "^3.1.0",
     "tar": "^7.5.11",
-    "tus-js-client": "^4.3.1"
+    "tus-js-client": "^4.3.1",
+    "yazl": "^3.3.1"
   },
   "description": "Better cloud maestro testing",
   "devDependencies": {
-    "@oclif/prettier-config": "^0.2.1",
-    "@oclif/test": "^4.1.16",
-    "@types/archiver": "^7.0.0",
-    "@types/chai": "^5.2.3",
-    "@types/glob-to-regexp": "^0.4.4",
+    "@eslint/js": "^9.39.4",
+    "@types/chai": "^4.3.20",
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.10",
     "@types/node": "^25.4.0",
     "@types/plist": "^3.0.5",
-    "@types/tar": "^7.0.87",
-    "chai": "^6.2.2",
-    "eslint": "^8.57.1",
-    "eslint-config-oclif": "^5.2.2",
-    "eslint-config-oclif-typescript": "^3.1.14",
+    "@types/yazl": "^3.3.1",
+    "chai": "^4.5.0",
+    "eslint": "^9.16.0",
     "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-unicorn": "^64.0.0",
+    "husky": "^9.1.7",
     "mocha": "^11.7.5",
-    "oclif": "^4.22.96",
+    "prettier": "^3.3.3",
     "shx": "^0.4.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.9.3"
+    "tsx": "^4.19.2",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.59.0"
   },
   "engines": {
     "node": ">=22.0.0"
   },
   "files": [
-    "/bin",
-    "/dist",
-    "/oclif.manifest.json"
+    "/dist"
   ],
   "homepage": "https://devicecloud.dev",
   "license": "MIT",
   "main": "dist/index.js",
   "name": "@devicecloud.dev/dcd",
-  "oclif": {
-    "bin": "dcd",
-    "dirname": "dcd",
-    "commands": "./dist/commands",
-    "plugins": [
-      "@oclif/plugin-help"
-    ]
-  },
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -69,7 +57,7 @@
     "type": "git",
     "url": "https://devicecloud.dev"
   },
-  "version": "4.4.9",
+  "version": "5.0.0-beta.0",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },
@@ -83,11 +71,11 @@
   ],
   "types": "dist/index.d.ts",
   "scripts": {
-    "dcd": "./bin/dev.js",
-    "prod": "./bin/run.js",
-    "build": "shx rm -rf dist && tsc -b",
-    "lint": "eslint . --ext .ts",
-    "version": "oclif readme && git add README.md",
-    "test": "node scripts/test-runner.mjs"
+    "dcd": "tsx src/index.ts",
+    "build": "shx rm -rf dist && tsc -b && shx chmod +x dist/index.js",
+    "build:binaries": "node scripts/build-binaries.mjs",
+    "lint": "eslint src test --ext .ts",
+    "test": "node scripts/test-runner.mjs",
+    "typecheck": "tsc --noEmit -p tsconfig.test.json"
   }
 }

package/bin/dev.cmd

@@ -1,3 +0,0 @@
-@echo off
-
-node "%~dp0\dev" %*

package/bin/dev.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node_modules/.bin/ts-node
-// eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
-;(async () => {
-  const oclif = await import('@oclif/core')
-  await oclif.execute({development: true, dir: __dirname})
-})()

package/bin/run.cmd

@@ -1,3 +0,0 @@
-@echo off
-
-node "%~dp0\run" %*

package/bin/run.js

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-// eslint-disable-next-line unicorn/prefer-top-level-await
-(async () => {
-  const oclif = await import('@oclif/core');
-  await oclif.execute({ development: false, dir: __dirname });
-})();