@eslint-config-snapshot/cli 0.6.0 → 0.9.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @eslint-config-snapshot/cli
 
+## 0.9.0
+
+### Minor Changes
+
+- Release minor version with robust CLI version resolution and improved runtime log UX.
+
+### Patch Changes
+
+- Updated dependencies
+  - @eslint-config-snapshot/api@0.9.0
+
+## 0.8.0
+
+### Minor Changes
+
+- Release minor version with improved human-readable CLI runtime logs and consistent output spacing.
+
+### Patch Changes
+
+- Updated dependencies
+  - @eslint-config-snapshot/api@0.8.0
+
+## 0.7.0
+
+### Minor Changes
+
+- Release minor version after improving runtime command header messaging and UX consistency.
+
+### Patch Changes
+
+- Updated dependencies
+  - @eslint-config-snapshot/api@0.7.0
+
 ## 0.6.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -41,6 +41,7 @@ var import_commander = require("commander");
 var import_fast_glob = __toESM(require("fast-glob"), 1);
 var import_node_fs = require("fs");
 var import_promises = require("fs/promises");
+var import_node_module = require("module");
 var import_node_path = __toESM(require("path"), 1);
 var import_node_readline = require("readline");
 var SNAPSHOT_DIR = ".eslint-config-snapshot";
@@ -218,13 +219,13 @@ async function executeCheck(cwd, format, defaultInvocation = false) {
   if (storedSnapshots.size === 0) {
     const summary = summarizeSnapshots(currentSnapshots);
     process.stdout.write(
-      `Current rule state: ${summary.groups} groups, ${summary.rules} rules (severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off).
+      `Rules found in this analysis: ${summary.groups} groups, ${summary.rules} rules (severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off).
 `
     );
     const canPromptBaseline = defaultInvocation || format === "summary";
     if (canPromptBaseline && process.stdin.isTTY && process.stdout.isTTY) {
       const shouldCreateBaseline = await askYesNo(
-        "No baseline yet. Use current rule state as your baseline now? [Y/n] ",
+        "No baseline yet. Do you want to save this analyzed rule state as your baseline now? [Y/n] ",
         true
       );
       if (shouldCreateBaseline) {
@@ -329,7 +330,7 @@ async function executeConfig(cwd, format) {
   const storedSnapshots = await loadStoredSnapshots(cwd);
   writeRunContextHeader(cwd, `config:${format}`, foundConfig?.path, storedSnapshots);
   if (shouldShowRunLogs()) {
-    writeSubtleInfo("\u{1F50E} Resolving effective runtime configuration...\n");
+    writeSubtleInfo("\u2699\uFE0F Resolving effective runtime configuration...\n");
   }
   const config = await (0, import_api.loadConfig)(cwd);
   const resolved = await resolveWorkspaceAssignments(cwd, config);
@@ -780,7 +781,6 @@ function printWhatChanged(changes, currentSnapshots, eslintVersionsByGroup) {
 - workspace membership changes: ${changeSummary.workspace}
 - current baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules
 - current severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off
-
 `
   );
   writeEslintVersionSummary(eslintVersionsByGroup);
@@ -890,13 +890,12 @@ function endRunTimer(exitCode) {
     activeRunTimer.pauseStartedAtMs = void 0;
   }
   const elapsedMs = Math.max(0, Date.now() - activeRunTimer.startedAtMs - activeRunTimer.pausedMs);
-  const color = createColorizer();
   const seconds = (elapsedMs / 1e3).toFixed(2);
   if (exitCode === 0) {
-    writeSubtleInfo(`${color.green("\u2705")} Finished in ${seconds}s
+    writeSubtleInfo(`Finished in ${seconds}s
 `);
   } else {
-    writeSubtleInfo(`${color.red("\u274C")} Finished in ${seconds}s
+    writeSubtleInfo(`Finished with errors in ${seconds}s
 `);
   }
   activeRunTimer = void 0;
@@ -926,22 +925,45 @@ function readCliVersion() {
   if (cachedCliVersion !== void 0) {
     return cachedCliVersion;
   }
+  const envPackageName = process.env.npm_package_name;
+  const envPackageVersion = process.env.npm_package_version;
+  if (isCliPackageName(envPackageName) && typeof envPackageVersion === "string" && envPackageVersion.length > 0) {
+    cachedCliVersion = envPackageVersion;
+    return cachedCliVersion;
+  }
   const scriptPath = process.argv[1];
   if (!scriptPath) {
     cachedCliVersion = "unknown";
     return cachedCliVersion;
   }
+  try {
+    const req = (0, import_node_module.createRequire)(import_node_path.default.resolve(scriptPath));
+    const resolvedCliEntry = req.resolve("@eslint-config-snapshot/cli");
+    const resolvedVersion = readVersionFromResolvedEntry(resolvedCliEntry);
+    if (resolvedVersion !== void 0) {
+      cachedCliVersion = resolvedVersion;
+      return cachedCliVersion;
+    }
+  } catch {
+  }
   let current = import_node_path.default.resolve(import_node_path.default.dirname(scriptPath));
+  let fallbackVersion;
   while (true) {
     const packageJsonPath = import_node_path.default.join(current, "package.json");
     if ((0, import_node_fs.existsSync)(packageJsonPath)) {
       try {
         const raw = (0, import_node_fs.readFileSync)(packageJsonPath, "utf8");
         const parsed = JSON.parse(raw);
-        cachedCliVersion = parsed.version ?? "unknown";
-        return cachedCliVersion;
+        if (typeof parsed.version === "string" && parsed.version.length > 0) {
+          if (isCliPackageName(parsed.name)) {
+            cachedCliVersion = parsed.version;
+            return cachedCliVersion;
+          }
+          if (fallbackVersion === void 0) {
+            fallbackVersion = parsed.version;
+          }
+        }
       } catch {
-        break;
       }
     }
     const parent = import_node_path.default.dirname(current);
@@ -950,25 +972,86 @@ function readCliVersion() {
     }
     current = parent;
   }
-  cachedCliVersion = "unknown";
+  cachedCliVersion = fallbackVersion ?? "unknown";
   return cachedCliVersion;
 }
+function isCliPackageName(value) {
+  return value === "@eslint-config-snapshot/cli" || value === "eslint-config-snapshot";
+}
+function readVersionFromResolvedEntry(entryAbs) {
+  let current = import_node_path.default.resolve(import_node_path.default.dirname(entryAbs));
+  while (true) {
+    const packageJsonPath = import_node_path.default.join(current, "package.json");
+    if ((0, import_node_fs.existsSync)(packageJsonPath)) {
+      try {
+        const raw = (0, import_node_fs.readFileSync)(packageJsonPath, "utf8");
+        const parsed = JSON.parse(raw);
+        if (isCliPackageName(parsed.name) && typeof parsed.version === "string" && parsed.version.length > 0) {
+          return parsed.version;
+        }
+      } catch {
+      }
+    }
+    const parent = import_node_path.default.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return void 0;
+}
 function writeRunContextHeader(cwd, commandLabel, configPath, storedSnapshots) {
   if (!shouldShowRunLogs()) {
     return;
   }
   const color = createColorizer();
-  process.stdout.write(color.bold(`\u2728 eslint-config-snapshot v${readCliVersion()}
+  process.stdout.write(color.bold(`eslint-config-snapshot v${readCliVersion()} \u2022 ${formatCommandDisplayLabel(commandLabel)}
 `));
-  process.stdout.write(`\u{1F9ED} Command: ${commandLabel}
-`);
   process.stdout.write(`\u{1F4C1} Repository: ${cwd}
 `);
-  process.stdout.write(`\u2699\uFE0F Config source: ${formatConfigSource(cwd, configPath)}
+  process.stdout.write(`\u{1F4C1} Baseline: ${formatStoredSnapshotSummary(storedSnapshots)}
 `);
-  process.stdout.write(`\u{1F5C2}\uFE0F Baseline: ${formatStoredSnapshotSummary(storedSnapshots)}
-
+  process.stdout.write(`\u2699\uFE0F Config source: ${formatConfigSource(cwd, configPath)}
 `);
+  process.stdout.write("\n");
+}
+function formatCommandDisplayLabel(commandLabel) {
+  switch (commandLabel) {
+    case "check":
+    case "check:summary": {
+      return "Check drift against baseline (summary)";
+    }
+    case "check:diff": {
+      return "Check drift against baseline (detailed diff)";
+    }
+    case "check:status": {
+      return "Check drift against baseline (status only)";
+    }
+    case "update": {
+      return "Update baseline snapshot";
+    }
+    case "print:json": {
+      return "Print aggregated rules (JSON)";
+    }
+    case "print:short": {
+      return "Print aggregated rules (short view)";
+    }
+    case "config:json": {
+      return "Show effective runtime config (JSON)";
+    }
+    case "config:short": {
+      return "Show effective runtime config (short view)";
+    }
+    case "init": {
+      return "Initialize local configuration";
+    }
+    case "help": {
+      return "Show CLI help";
+    }
+    default: {
+      return commandLabel;
+    }
+  }
 }
 function formatConfigSource(cwd, configPath) {
   if (!configPath) {

package/dist/index.js

@@ -22,6 +22,7 @@ import { Command, CommanderError, InvalidArgumentError } from "commander";
 import fg from "fast-glob";
 import { existsSync, readFileSync } from "fs";
 import { access, mkdir, readFile, writeFile } from "fs/promises";
+import { createRequire } from "module";
 import path from "path";
 import { createInterface } from "readline";
 var SNAPSHOT_DIR = ".eslint-config-snapshot";
@@ -199,13 +200,13 @@ async function executeCheck(cwd, format, defaultInvocation = false) {
   if (storedSnapshots.size === 0) {
     const summary = summarizeSnapshots(currentSnapshots);
     process.stdout.write(
-      `Current rule state: ${summary.groups} groups, ${summary.rules} rules (severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off).
+      `Rules found in this analysis: ${summary.groups} groups, ${summary.rules} rules (severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off).
 `
     );
     const canPromptBaseline = defaultInvocation || format === "summary";
     if (canPromptBaseline && process.stdin.isTTY && process.stdout.isTTY) {
       const shouldCreateBaseline = await askYesNo(
-        "No baseline yet. Use current rule state as your baseline now? [Y/n] ",
+        "No baseline yet. Do you want to save this analyzed rule state as your baseline now? [Y/n] ",
         true
       );
       if (shouldCreateBaseline) {
@@ -310,7 +311,7 @@ async function executeConfig(cwd, format) {
   const storedSnapshots = await loadStoredSnapshots(cwd);
   writeRunContextHeader(cwd, `config:${format}`, foundConfig?.path, storedSnapshots);
   if (shouldShowRunLogs()) {
-    writeSubtleInfo("\u{1F50E} Resolving effective runtime configuration...\n");
+    writeSubtleInfo("\u2699\uFE0F Resolving effective runtime configuration...\n");
   }
   const config = await loadConfig(cwd);
   const resolved = await resolveWorkspaceAssignments(cwd, config);
@@ -761,7 +762,6 @@ function printWhatChanged(changes, currentSnapshots, eslintVersionsByGroup) {
 - workspace membership changes: ${changeSummary.workspace}
 - current baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules
 - current severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off
-
 `
   );
   writeEslintVersionSummary(eslintVersionsByGroup);
@@ -871,13 +871,12 @@ function endRunTimer(exitCode) {
     activeRunTimer.pauseStartedAtMs = void 0;
   }
   const elapsedMs = Math.max(0, Date.now() - activeRunTimer.startedAtMs - activeRunTimer.pausedMs);
-  const color = createColorizer();
   const seconds = (elapsedMs / 1e3).toFixed(2);
   if (exitCode === 0) {
-    writeSubtleInfo(`${color.green("\u2705")} Finished in ${seconds}s
+    writeSubtleInfo(`Finished in ${seconds}s
 `);
   } else {
-    writeSubtleInfo(`${color.red("\u274C")} Finished in ${seconds}s
+    writeSubtleInfo(`Finished with errors in ${seconds}s
 `);
   }
   activeRunTimer = void 0;
@@ -907,22 +906,45 @@ function readCliVersion() {
   if (cachedCliVersion !== void 0) {
     return cachedCliVersion;
   }
+  const envPackageName = process.env.npm_package_name;
+  const envPackageVersion = process.env.npm_package_version;
+  if (isCliPackageName(envPackageName) && typeof envPackageVersion === "string" && envPackageVersion.length > 0) {
+    cachedCliVersion = envPackageVersion;
+    return cachedCliVersion;
+  }
   const scriptPath = process.argv[1];
   if (!scriptPath) {
     cachedCliVersion = "unknown";
     return cachedCliVersion;
   }
+  try {
+    const req = createRequire(path.resolve(scriptPath));
+    const resolvedCliEntry = req.resolve("@eslint-config-snapshot/cli");
+    const resolvedVersion = readVersionFromResolvedEntry(resolvedCliEntry);
+    if (resolvedVersion !== void 0) {
+      cachedCliVersion = resolvedVersion;
+      return cachedCliVersion;
+    }
+  } catch {
+  }
   let current = path.resolve(path.dirname(scriptPath));
+  let fallbackVersion;
   while (true) {
     const packageJsonPath = path.join(current, "package.json");
     if (existsSync(packageJsonPath)) {
       try {
         const raw = readFileSync(packageJsonPath, "utf8");
         const parsed = JSON.parse(raw);
-        cachedCliVersion = parsed.version ?? "unknown";
-        return cachedCliVersion;
+        if (typeof parsed.version === "string" && parsed.version.length > 0) {
+          if (isCliPackageName(parsed.name)) {
+            cachedCliVersion = parsed.version;
+            return cachedCliVersion;
+          }
+          if (fallbackVersion === void 0) {
+            fallbackVersion = parsed.version;
+          }
+        }
       } catch {
-        break;
       }
     }
     const parent = path.dirname(current);
@@ -931,25 +953,86 @@ function readCliVersion() {
     }
     current = parent;
   }
-  cachedCliVersion = "unknown";
+  cachedCliVersion = fallbackVersion ?? "unknown";
   return cachedCliVersion;
 }
+function isCliPackageName(value) {
+  return value === "@eslint-config-snapshot/cli" || value === "eslint-config-snapshot";
+}
+function readVersionFromResolvedEntry(entryAbs) {
+  let current = path.resolve(path.dirname(entryAbs));
+  while (true) {
+    const packageJsonPath = path.join(current, "package.json");
+    if (existsSync(packageJsonPath)) {
+      try {
+        const raw = readFileSync(packageJsonPath, "utf8");
+        const parsed = JSON.parse(raw);
+        if (isCliPackageName(parsed.name) && typeof parsed.version === "string" && parsed.version.length > 0) {
+          return parsed.version;
+        }
+      } catch {
+      }
+    }
+    const parent = path.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return void 0;
+}
 function writeRunContextHeader(cwd, commandLabel, configPath, storedSnapshots) {
   if (!shouldShowRunLogs()) {
     return;
   }
   const color = createColorizer();
-  process.stdout.write(color.bold(`\u2728 eslint-config-snapshot v${readCliVersion()}
+  process.stdout.write(color.bold(`eslint-config-snapshot v${readCliVersion()} \u2022 ${formatCommandDisplayLabel(commandLabel)}
 `));
-  process.stdout.write(`\u{1F9ED} Command: ${commandLabel}
-`);
   process.stdout.write(`\u{1F4C1} Repository: ${cwd}
 `);
-  process.stdout.write(`\u2699\uFE0F Config source: ${formatConfigSource(cwd, configPath)}
+  process.stdout.write(`\u{1F4C1} Baseline: ${formatStoredSnapshotSummary(storedSnapshots)}
 `);
-  process.stdout.write(`\u{1F5C2}\uFE0F Baseline: ${formatStoredSnapshotSummary(storedSnapshots)}
-
+  process.stdout.write(`\u2699\uFE0F Config source: ${formatConfigSource(cwd, configPath)}
 `);
+  process.stdout.write("\n");
+}
+function formatCommandDisplayLabel(commandLabel) {
+  switch (commandLabel) {
+    case "check":
+    case "check:summary": {
+      return "Check drift against baseline (summary)";
+    }
+    case "check:diff": {
+      return "Check drift against baseline (detailed diff)";
+    }
+    case "check:status": {
+      return "Check drift against baseline (status only)";
+    }
+    case "update": {
+      return "Update baseline snapshot";
+    }
+    case "print:json": {
+      return "Print aggregated rules (JSON)";
+    }
+    case "print:short": {
+      return "Print aggregated rules (short view)";
+    }
+    case "config:json": {
+      return "Show effective runtime config (JSON)";
+    }
+    case "config:short": {
+      return "Show effective runtime config (short view)";
+    }
+    case "init": {
+      return "Initialize local configuration";
+    }
+    case "help": {
+      return "Show CLI help";
+    }
+    default: {
+      return commandLabel;
+    }
+  }
 }
 function formatConfigSource(cwd, configPath) {
   if (!configPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-config-snapshot/cli",
-  "version": "0.6.0",
+  "version": "0.9.0",
   "type": "module",
   "repository": {
     "type": "git",
@@ -30,6 +30,6 @@
     "@inquirer/prompts": "^8.2.0",
     "commander": "^14.0.3",
     "fast-glob": "^3.3.3",
-    "@eslint-config-snapshot/api": "0.6.0"
+    "@eslint-config-snapshot/api": "0.9.0"
   }
 }

package/src/index.ts

@@ -20,6 +20,7 @@ import { Command, CommanderError, InvalidArgumentError } from 'commander'
 import fg from 'fast-glob'
 import { existsSync, readFileSync } from 'node:fs'
 import { access, mkdir, readFile, writeFile } from 'node:fs/promises'
+import { createRequire } from 'node:module'
 import path from 'node:path'
 import { createInterface } from 'node:readline'
 
@@ -293,18 +294,18 @@ async function executeCheck(cwd: string, format: CheckFormat, defaultInvocation
 
     throw error
   }
-  if (storedSnapshots.size === 0) {
-    const summary = summarizeSnapshots(currentSnapshots)
-    process.stdout.write(
-      `Current rule state: ${summary.groups} groups, ${summary.rules} rules (severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off).\n`
-    )
-
-    const canPromptBaseline = defaultInvocation || format === 'summary'
-    if (canPromptBaseline && process.stdin.isTTY && process.stdout.isTTY) {
-      const shouldCreateBaseline = await askYesNo(
-        'No baseline yet. Use current rule state as your baseline now? [Y/n] ',
-        true
+    if (storedSnapshots.size === 0) {
+      const summary = summarizeSnapshots(currentSnapshots)
+      process.stdout.write(
+        `Rules found in this analysis: ${summary.groups} groups, ${summary.rules} rules (severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off).\n`
       )
+
+      const canPromptBaseline = defaultInvocation || format === 'summary'
+      if (canPromptBaseline && process.stdin.isTTY && process.stdout.isTTY) {
+        const shouldCreateBaseline = await askYesNo(
+          'No baseline yet. Do you want to save this analyzed rule state as your baseline now? [Y/n] ',
+          true
+        )
       if (shouldCreateBaseline) {
         await writeSnapshots(cwd, currentSnapshots)
         const summary = summarizeSnapshots(currentSnapshots)
@@ -420,7 +421,7 @@ async function executeConfig(cwd: string, format: PrintFormat): Promise<void> {
   const storedSnapshots = await loadStoredSnapshots(cwd)
   writeRunContextHeader(cwd, `config:${format}`, foundConfig?.path, storedSnapshots)
   if (shouldShowRunLogs()) {
-    writeSubtleInfo('🔎 Resolving effective runtime configuration...\n')
+    writeSubtleInfo('⚙️ Resolving effective runtime configuration...\n')
   }
   const config = await loadConfig(cwd)
   const resolved = await resolveWorkspaceAssignments(cwd, config)
@@ -969,7 +970,7 @@ function printWhatChanged(
   process.stdout.write(color.red('Heads up: snapshot drift detected.\n'))
   writeSectionTitle('Summary', color)
   process.stdout.write(
-    `- changed groups: ${changes.length}\n- introduced rules: ${changeSummary.introduced}\n- removed rules: ${changeSummary.removed}\n- severity changes: ${changeSummary.severity}\n- options changes: ${changeSummary.options}\n- workspace membership changes: ${changeSummary.workspace}\n- current baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules\n- current severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off\n\n`
+    `- changed groups: ${changes.length}\n- introduced rules: ${changeSummary.introduced}\n- removed rules: ${changeSummary.removed}\n- severity changes: ${changeSummary.severity}\n- options changes: ${changeSummary.options}\n- workspace membership changes: ${changeSummary.workspace}\n- current baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules\n- current severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off\n`
   )
   writeEslintVersionSummary(eslintVersionsByGroup)
   process.stdout.write('\n')
@@ -1090,12 +1091,11 @@ function endRunTimer(exitCode: number): void {
   }
 
   const elapsedMs = Math.max(0, Date.now() - activeRunTimer.startedAtMs - activeRunTimer.pausedMs)
-  const color = createColorizer()
   const seconds = (elapsedMs / 1000).toFixed(2)
   if (exitCode === 0) {
-    writeSubtleInfo(`${color.green('✅')} Finished in ${seconds}s\n`)
+    writeSubtleInfo(`Finished in ${seconds}s\n`)
   } else {
-    writeSubtleInfo(`${color.red('❌')} Finished in ${seconds}s\n`)
+    writeSubtleInfo(`Finished with errors in ${seconds}s\n`)
   }
   activeRunTimer = undefined
 }
@@ -1130,23 +1130,51 @@ function readCliVersion(): string {
     return cachedCliVersion
   }
 
+  const envPackageName = process.env.npm_package_name
+  const envPackageVersion = process.env.npm_package_version
+  if (isCliPackageName(envPackageName) && typeof envPackageVersion === 'string' && envPackageVersion.length > 0) {
+    cachedCliVersion = envPackageVersion
+    return cachedCliVersion
+  }
+
   const scriptPath = process.argv[1]
   if (!scriptPath) {
     cachedCliVersion = 'unknown'
     return cachedCliVersion
   }
 
+  try {
+    const req = createRequire(path.resolve(scriptPath))
+    const resolvedCliEntry = req.resolve('@eslint-config-snapshot/cli')
+    const resolvedVersion = readVersionFromResolvedEntry(resolvedCliEntry)
+    if (resolvedVersion !== undefined) {
+      cachedCliVersion = resolvedVersion
+      return cachedCliVersion
+    }
+  } catch {
+    // continue to path-walk fallback
+  }
+
   let current = path.resolve(path.dirname(scriptPath))
+  let fallbackVersion: string | undefined
   while (true) {
     const packageJsonPath = path.join(current, 'package.json')
     if (existsSync(packageJsonPath)) {
       try {
         const raw = readFileSync(packageJsonPath, 'utf8')
-        const parsed = JSON.parse(raw) as { version?: string }
-        cachedCliVersion = parsed.version ?? 'unknown'
-        return cachedCliVersion
+        const parsed = JSON.parse(raw) as { name?: string; version?: string }
+        if (typeof parsed.version === 'string' && parsed.version.length > 0) {
+          if (isCliPackageName(parsed.name)) {
+            cachedCliVersion = parsed.version
+            return cachedCliVersion
+          }
+
+          if (fallbackVersion === undefined) {
+            fallbackVersion = parsed.version
+          }
+        }
       } catch {
-        break
+        // continue walking up
       }
     }
 
@@ -1157,10 +1185,41 @@ function readCliVersion(): string {
     current = parent
   }
 
-  cachedCliVersion = 'unknown'
+  cachedCliVersion = fallbackVersion ?? 'unknown'
   return cachedCliVersion
 }
 
+function isCliPackageName(value: string | undefined): boolean {
+  return value === '@eslint-config-snapshot/cli' || value === 'eslint-config-snapshot'
+}
+
+function readVersionFromResolvedEntry(entryAbs: string): string | undefined {
+  let current = path.resolve(path.dirname(entryAbs))
+
+  while (true) {
+    const packageJsonPath = path.join(current, 'package.json')
+    if (existsSync(packageJsonPath)) {
+      try {
+        const raw = readFileSync(packageJsonPath, 'utf8')
+        const parsed = JSON.parse(raw) as { name?: string; version?: string }
+        if (isCliPackageName(parsed.name) && typeof parsed.version === 'string' && parsed.version.length > 0) {
+          return parsed.version
+        }
+      } catch {
+        // continue walking up
+      }
+    }
+
+    const parent = path.dirname(current)
+    if (parent === current) {
+      break
+    }
+    current = parent
+  }
+
+  return undefined
+}
+
 function writeRunContextHeader(
   cwd: string,
   commandLabel: string,
@@ -1172,11 +1231,50 @@ function writeRunContextHeader(
   }
 
   const color = createColorizer()
-  process.stdout.write(color.bold(`✨ eslint-config-snapshot v${readCliVersion()}\n`))
-  process.stdout.write(`🧭 Command: ${commandLabel}\n`)
+  process.stdout.write(color.bold(`eslint-config-snapshot v${readCliVersion()} • ${formatCommandDisplayLabel(commandLabel)}\n`))
   process.stdout.write(`📁 Repository: ${cwd}\n`)
+  process.stdout.write(`📁 Baseline: ${formatStoredSnapshotSummary(storedSnapshots)}\n`)
   process.stdout.write(`⚙️ Config source: ${formatConfigSource(cwd, configPath)}\n`)
-  process.stdout.write(`🗂️ Baseline: ${formatStoredSnapshotSummary(storedSnapshots)}\n\n`)
+  process.stdout.write('\n')
+}
+
+function formatCommandDisplayLabel(commandLabel: string): string {
+  switch (commandLabel) {
+    case 'check':
+    case 'check:summary': {
+      return 'Check drift against baseline (summary)'
+    }
+    case 'check:diff': {
+      return 'Check drift against baseline (detailed diff)'
+    }
+    case 'check:status': {
+      return 'Check drift against baseline (status only)'
+    }
+    case 'update': {
+      return 'Update baseline snapshot'
+    }
+    case 'print:json': {
+      return 'Print aggregated rules (JSON)'
+    }
+    case 'print:short': {
+      return 'Print aggregated rules (short view)'
+    }
+    case 'config:json': {
+      return 'Show effective runtime config (JSON)'
+    }
+    case 'config:short': {
+      return 'Show effective runtime config (short view)'
+    }
+    case 'init': {
+      return 'Initialize local configuration'
+    }
+    case 'help': {
+      return 'Show CLI help'
+    }
+    default: {
+      return commandLabel
+    }
+  }
 }
 
 function formatConfigSource(cwd: string, configPath: string | undefined): string {

package/test/cli.terminal.integration.test.ts

@@ -101,7 +101,7 @@ describe('cli terminal invocation', () => {
     const result = run([])
     expect(result.status).toBe(1)
     expect(result.stdout).toBe(
-      'Current rule state: 1 groups, 3 rules (severity mix: 2 errors, 0 warnings, 1 off).\nYou are almost set: no baseline snapshot found yet.\nRun `eslint-config-snapshot --update` to create your first baseline.\n'
+      'Rules found in this analysis: 1 groups, 3 rules (severity mix: 2 errors, 0 warnings, 1 off).\nYou are almost set: no baseline snapshot found yet.\nRun `eslint-config-snapshot --update` to create your first baseline.\n'
     )
   })