@get-dx/cli 0.7.0 → 0.9.0

package/dist/doctor/skill.js

@@ -0,0 +1,16 @@
+import os from "node:os";
+import path from "node:path";
+import { isSkillInstalled } from "../skill.js";
+import { tildify } from "./format.js";
+import { check } from "./types.js";
+export async function checkSkill() {
+    const installed = await isSkillInstalled();
+    const skillPath = tildify(path.join(os.homedir(), ".agents", "skills", "dx-cli"));
+    return {
+        id: "skill",
+        title: "Agent skill",
+        checks: [
+            check("skill", "dx-cli skill", "ok", installed ? `installed (${skillPath})` : "not installed", { data: { installed, path: installed ? skillPath : null } }),
+        ],
+    };
+}

package/dist/doctor/types.js

@@ -0,0 +1,11 @@
+export function check(id, label, status, message, options = {}) {
+    return {
+        id,
+        label,
+        status,
+        message,
+        hint: status === "warn" || status === "fail" ? (options.hint ?? null) : null,
+        source: options.source ?? null,
+        data: options.data ?? null,
+    };
+}

package/dist/http.js

@@ -2,6 +2,7 @@ import { CliError, HttpError } from "./errors.js";
 export async function request(runtime, route, options = {}) {
     const method = options.method || "GET";
     const headers = new Headers({
+        ...options.headers,
         Accept: "application/json",
         "X-Client-Type": "dx-cli",
         "X-Client-Version": runtime.version,
@@ -40,6 +41,7 @@ export async function request(runtime, route, options = {}) {
             method,
             headers,
             body: requestBody,
+            signal: options.signal,
         });
     }
     catch (error) {

package/dist/secrets.js

@@ -8,6 +8,35 @@ export async function getToken(baseUrl) {
     }
     return await getSecretStore().get(baseUrl);
 }
+/**
+ * Like `getToken`, but reports where the token came from, and surfaces errors
+ * reading the OS secret store instead of treating them as a missing token.
+ */
+export async function getTokenWithSource(baseUrl) {
+    if (process.env.DX_API_TOKEN) {
+        return { source: "env", token: process.env.DX_API_TOKEN };
+    }
+    let store;
+    try {
+        store = getSecretStore();
+    }
+    catch (error) {
+        return {
+            source: "error",
+            storeName: null,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+    const result = await store.probe(baseUrl);
+    switch (result.status) {
+        case "found":
+            return { source: "keychain", token: result.token, storeName: store.name };
+        case "missing":
+            return { source: "none", storeName: store.name };
+        case "error":
+            return { source: "error", storeName: store.name, error: result.error };
+    }
+}
 export async function setToken(baseUrl, token) {
     await getSecretStore().set(baseUrl, token);
 }
@@ -26,9 +55,16 @@ function getSecretStore(platform = process.platform) {
     }
     throw new CliError(`Unsupported platform for secure token storage: ${platform}`);
 }
+// `security` exits with this code when no matching keychain item exists.
+const MACOS_ITEM_NOT_FOUND_EXIT_CODE = 44;
 function macosSecretStore() {
     return {
+        name: "macOS Keychain",
         async get(baseUrl) {
+            const result = await this.probe(baseUrl);
+            return result.status === "found" ? result.token : null;
+        },
+        async probe(baseUrl) {
             try {
                 const result = await execa("security", [
                     "find-generic-password",
@@ -38,10 +74,15 @@ function macosSecretStore() {
                     baseUrl,
                     "-w",
                 ]);
-                return result.stdout?.trim() ?? null;
+                const token = result.stdout?.trim();
+                return token ? { status: "found", token } : { status: "missing" };
             }
-            catch {
-                return null;
+            catch (error) {
+                if (isRecord(error) &&
+                    error.exitCode === MACOS_ITEM_NOT_FOUND_EXIT_CODE) {
+                    return { status: "missing" };
+                }
+                return { status: "error", error: describeStoreError(error) };
             }
         },
         async set(baseUrl, token) {
@@ -86,7 +127,12 @@ function macosSecretStore() {
 }
 function linuxSecretStore() {
     return {
+        name: "Linux Secret Service (secret-tool)",
         async get(baseUrl) {
+            const result = await this.probe(baseUrl);
+            return result.status === "found" ? result.token : null;
+        },
+        async probe(baseUrl) {
             try {
                 const result = await execa("secret-tool", [
                     "lookup",
@@ -95,10 +141,21 @@ function linuxSecretStore() {
                     "account",
                     baseUrl,
                 ]);
-                return result.stdout?.trim() ?? null;
+                const token = result.stdout?.trim();
+                return token ? { status: "found", token } : { status: "missing" };
             }
-            catch {
-                return null;
+            catch (error) {
+                if (hasErrorCode(error, "ENOENT")) {
+                    return { status: "error", error: "`secret-tool` is not installed" };
+                }
+                // `secret-tool lookup` exits 1 without output when nothing matches.
+                if (isRecord(error) &&
+                    error.exitCode === 1 &&
+                    !errorStderr(error) &&
+                    !isLinuxSecretServiceUnavailable(error)) {
+                    return { status: "missing" };
+                }
+                return { status: "error", error: describeStoreError(error) };
             }
         },
         async set(baseUrl, token) {
@@ -116,12 +173,18 @@ function linuxSecretStore() {
 }
 function windowsSecretStore() {
     return {
+        name: "Windows Credential Manager",
         async get(baseUrl) {
+            const result = await this.probe(baseUrl);
+            return result.status === "found" ? result.token : null;
+        },
+        async probe(baseUrl) {
             try {
-                return await crossKeychain.getPassword(SERVICE, encodeAccountName(baseUrl));
+                const token = await crossKeychain.getPassword(SERVICE, encodeAccountName(baseUrl));
+                return token ? { status: "found", token } : { status: "missing" };
             }
-            catch {
-                return null;
+            catch (error) {
+                return { status: "error", error: describeStoreError(error) };
             }
         },
         async set(baseUrl, token) {
@@ -191,6 +254,21 @@ function isLinuxSecretServiceUnavailable(error) {
         "No such secret service",
     ].some((message) => text.includes(message));
 }
+function errorStderr(error) {
+    return typeof error.stderr === "string" ? error.stderr.trim() : "";
+}
+function describeStoreError(error) {
+    if (isRecord(error)) {
+        const stderr = errorStderr(error);
+        if (stderr) {
+            return stderr;
+        }
+        if (typeof error.shortMessage === "string") {
+            return error.shortMessage;
+        }
+    }
+    return error instanceof Error ? error.message : String(error);
+}
 function formatErrorDetails(error) {
     if (!isRecord(error) || typeof error.stderr !== "string") {
         return null;

package/dist/ui/blocks.js

@@ -104,3 +104,49 @@ export class JsonBlock extends AbstractBlock {
         return pc.cyan(JSON.stringify(this.value, null, 2)) + "\n";
     }
 }
+function statusMarker(status) {
+    switch (status) {
+        case "ok":
+            return pc.green("[ OK ]");
+        case "warn":
+            return pc.yellow("[WARN]");
+        case "fail":
+            return pc.red("[FAIL]");
+        case "skip":
+            return pc.dim("[SKIP]");
+    }
+}
+/**
+ * A titled list of `[ OK ]` / `[WARN]` / `[FAIL]` / `[SKIP]` rows, e.g.:
+ *
+ * ```
+ * Network
+ *   [ OK ] DNS              resolved to 104.18.20.33
+ *   [FAIL] TLS handshake    connection reset by peer
+ *          → A firewall or proxy is likely interrupting HTTPS traffic.
+ * ```
+ */
+export class StatusListBlock extends AbstractBlock {
+    title;
+    rows;
+    options;
+    constructor(title, rows, options) {
+        super();
+        this.title = title;
+        this.rows = rows;
+        this.options = options;
+    }
+    render() {
+        const lines = [pc.bold(this.title)];
+        for (const row of this.rows) {
+            const label = padEnd(row.label, this.options.labelWidth);
+            lines.push(`  ${statusMarker(row.status)} ${label}${row.detail}`);
+            if (row.hint) {
+                const [first, ...rest] = row.hint.split("\n");
+                lines.push(`         → ${first}`);
+                lines.push(...rest.map((line) => `           ${line}`));
+            }
+        }
+        return lines.join("\n") + "\n";
+    }
+}

package/dist/ui.js

@@ -2,7 +2,7 @@ import dayjs from "dayjs";
 import relativeTimePlugin from "dayjs/plugin/relativeTime.js";
 import pc from "picocolors";
 export { GLYPHS } from "./ui/glyphs.js";
-import { DescriptionListBlock, DescriptionListItemContainer, HeadingBlock, JsonBlock, ListItemContainer, ParagraphBlock, UnorderedListBlock, CodeBlock, } from "./ui/blocks.js";
+import { DescriptionListBlock, DescriptionListItemContainer, HeadingBlock, JsonBlock, ListItemContainer, ParagraphBlock, UnorderedListBlock, CodeBlock, StatusListBlock, } from "./ui/blocks.js";
 dayjs.extend(relativeTimePlugin);
 // Block-level elements
 export function h1(text) {
@@ -49,6 +49,13 @@ export function dli(term, detailItems) {
         return new DescriptionListItemContainer(term, detailItems);
     }
 }
+/**
+ * Create a titled list of `[ OK ]` / `[WARN]` / `[FAIL]` / `[SKIP]` rows, as
+ * used by `dx doctor`.
+ */
+export function statusList(title, rows, options) {
+    return new StatusListBlock(title, rows, options);
+}
 export function codeBlock(text) {
     return new CodeBlock(text);
 }

package/dist/versionCheck.js

@@ -10,7 +10,7 @@ import * as ui from "./ui.js";
 import cliPackage from "../package.json" with { type: "json" };
 const VERSION_CHECK_INTERVAL_HOURS = 24;
 const SNOOZE_DAYS = 7;
-const SKIP_COMMANDS = new Set(["auth", "init"]);
+const SKIP_COMMANDS = new Set(["auth", "doctor", "init"]);
 const SKIP_OPTIONS = new Set(["-h", "--help", "-v", "--version"]);
 /**
  * Compares two semver strings (e.g. "1.2.3").
@@ -52,10 +52,32 @@ export function shouldShowVersionPrompt(latestVersion, versionPromptSelection) {
     }
     return true;
 }
-async function fetchLatestVersion(runtime) {
-    const response = await request(runtime, "/cli.currentVersion", { method: "GET" });
+export async function fetchLatestVersion(runtime, options) {
+    const response = await request(runtime, "/cli.currentVersion", { ...options, method: "GET" });
     return response.body.versions.cli;
 }
+const NPM_LATEST_URL = `https://registry.npmjs.org/${cliPackage.name}/latest`;
+/**
+ * Fetch the latest published version from the npm registry. Unlike
+ * `fetchLatestVersion`, this does not need a DX API token.
+ */
+export async function fetchLatestVersionFromNpm(options) {
+    const response = await fetch(NPM_LATEST_URL, {
+        headers: {
+            Accept: "application/json",
+            "User-Agent": `dx-cli/${cliPackage.version}`,
+        },
+        signal: options?.signal,
+    });
+    if (!response.ok) {
+        throw new Error(`npm registry returned HTTP ${response.status}`);
+    }
+    const body = (await response.json());
+    if (typeof body.version !== "string") {
+        throw new Error("npm registry response did not include a version");
+    }
+    return body.version;
+}
 /**
  * Checks whether a newer CLI version is available.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@get-dx/cli",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "DX CLI",
   "author": "DX <developers@getdx.com>",
   "bugs": {