devvami 1.4.1 → 1.5.0

package/src/commands/dotfiles/add.js

@@ -1,8 +1,8 @@
-import { Command, Flags, Args } from '@oclif/core'
+import {Command, Flags, Args} from '@oclif/core'
 import ora from 'ora'
 import chalk from 'chalk'
-import { checkbox, confirm, input } from '@inquirer/prompts'
-import { detectPlatform } from '../../services/platform.js'
+import {checkbox, confirm, input} from '@inquirer/prompts'
+import {detectPlatform} from '../../services/platform.js'
 import {
   isChezmoiInstalled,
   getManagedFiles,
@@ -11,13 +11,13 @@ import {
   isPathSensitive,
   isWSLWindowsPath,
 } from '../../services/dotfiles.js'
-import { loadConfig } from '../../services/config.js'
-import { execOrThrow } from '../../services/shell.js'
-import { formatDotfilesAdd } from '../../formatters/dotfiles.js'
-import { DvmiError } from '../../utils/errors.js'
-import { homedir } from 'node:os'
-import { join } from 'node:path'
-import { existsSync } from 'node:fs'
+import {loadConfig} from '../../services/config.js'
+import {execOrThrow} from '../../services/shell.js'
+import {formatDotfilesAdd} from '../../formatters/dotfiles.js'
+import {DvmiError} from '../../utils/errors.js'
+import {homedir} from 'node:os'
+import {join} from 'node:path'
+import {existsSync} from 'node:fs'
 
 /** @import { DotfilesAddResult } from '../../types.js' */
 
@@ -47,13 +47,13 @@ export default class DotfilesAdd extends Command {
   static enableJsonFlag = true
 
   static flags = {
-    help: Flags.help({ char: 'h' }),
-    encrypt: Flags.boolean({ char: 'e', description: 'Force encryption for all files being added', default: false }),
-    'no-encrypt': Flags.boolean({ description: 'Disable auto-encryption (add all as plaintext)', default: false }),
+    help: Flags.help({char: 'h'}),
+    encrypt: Flags.boolean({char: 'e', description: 'Force encryption for all files being added', default: false}),
+    'no-encrypt': Flags.boolean({description: 'Disable auto-encryption (add all as plaintext)', default: false}),
   }
 
   static args = {
-    files: Args.string({ description: 'File paths to add', required: false }),
+    files: Args.string({description: 'File paths to add', required: false}),
   }
 
   // oclif does not support variadic args natively via Args.string for multiple values;
@@ -61,7 +61,7 @@ export default class DotfilesAdd extends Command {
   static strict = false
 
   async run() {
-    const { flags } = await this.parse(DotfilesAdd)
+    const {flags} = await this.parse(DotfilesAdd)
     const isJson = flags.json
     const forceEncrypt = flags.encrypt
     const forceNoEncrypt = flags['no-encrypt']
@@ -73,23 +73,21 @@ export default class DotfilesAdd extends Command {
     // Pre-checks
     const config = await loadConfig()
     if (!config.dotfiles?.enabled) {
-      throw new DvmiError(
-        'Chezmoi dotfiles management is not configured',
-        'Run `dvmi dotfiles setup` first',
-      )
+      throw new DvmiError('Chezmoi dotfiles management is not configured', 'Run `dvmi dotfiles setup` first')
     }
 
     const chezmoiInstalled = await isChezmoiInstalled()
     if (!chezmoiInstalled) {
       const platformInfo = await detectPlatform()
-      const hint = platformInfo.platform === 'macos'
-        ? 'Run `brew install chezmoi` or visit https://chezmoi.io/install'
-        : 'Run `sh -c "$(curl -fsLS get.chezmoi.io)"` or visit https://chezmoi.io/install'
+      const hint =
+        platformInfo.platform === 'macos'
+          ? 'Run `brew install chezmoi` or visit https://chezmoi.io/install'
+          : 'Run `sh -c "$(curl -fsLS get.chezmoi.io)"` or visit https://chezmoi.io/install'
       throw new DvmiError('chezmoi is not installed', hint)
     }
 
     const platformInfo = await detectPlatform()
-    const { platform } = platformInfo
+    const {platform} = platformInfo
     const sensitivePatterns = getSensitivePatterns(config)
 
     // Get already-managed files for V-007 check
@@ -97,7 +95,7 @@ export default class DotfilesAdd extends Command {
     const managedPaths = new Set(managedFiles.map((f) => f.path))
 
     /** @type {DotfilesAddResult} */
-    const result = { added: [], skipped: [], rejected: [] }
+    const result = {added: [], skipped: [], rejected: []}
 
     if (fileArgs.length > 0) {
       // Direct mode — files provided as arguments
@@ -107,19 +105,22 @@ export default class DotfilesAdd extends Command {
 
         // V-002: WSL2 Windows path rejection
         if (platform === 'wsl2' && isWSLWindowsPath(absPath)) {
-          result.rejected.push({ path: displayPath, reason: 'Windows filesystem paths not supported on WSL2. Use Linux-native paths (~/) instead.' })
+          result.rejected.push({
+            path: displayPath,
+            reason: 'Windows filesystem paths not supported on WSL2. Use Linux-native paths (~/) instead.',
+          })
           continue
         }
 
         // V-001: file must exist
         if (!existsSync(absPath)) {
-          result.skipped.push({ path: displayPath, reason: 'File not found' })
+          result.skipped.push({path: displayPath, reason: 'File not found'})
           continue
         }
 
         // V-007: not already managed
         if (managedPaths.has(absPath)) {
-          result.skipped.push({ path: displayPath, reason: 'Already managed by chezmoi' })
+          result.skipped.push({path: displayPath, reason: 'Already managed by chezmoi'})
           continue
         }
 
@@ -138,9 +139,12 @@ export default class DotfilesAdd extends Command {
           if (encrypt) args.push('--encrypt')
           args.push(absPath)
           await execOrThrow('chezmoi', args)
-          result.added.push({ path: displayPath, encrypted: encrypt })
+          result.added.push({path: displayPath, encrypted: encrypt})
         } catch {
-          result.skipped.push({ path: displayPath, reason: `Failed to add to chezmoi. Run \`chezmoi doctor\` to verify your setup.` })
+          result.skipped.push({
+            path: displayPath,
+            reason: `Failed to add to chezmoi. Run \`chezmoi doctor\` to verify your setup.`,
+          })
         }
       }
 
@@ -161,11 +165,15 @@ export default class DotfilesAdd extends Command {
     if (isCI || isNonInteractive) {
       this.error(
         'This command requires an interactive terminal (TTY) when no files are specified. Provide file paths as arguments or run with --json.',
-        { exit: 1 },
+        {exit: 1},
       )
     }
 
-    const spinner = ora({ spinner: 'arc', color: false, text: chalk.hex('#FF6B2B')('Loading recommended files...') }).start()
+    const spinner = ora({
+      spinner: 'arc',
+      color: false,
+      text: chalk.hex('#FF6B2B')('Loading recommended files...'),
+    }).start()
     const recommended = getDefaultFileList(platform)
     spinner.stop()
 
@@ -191,9 +199,9 @@ export default class DotfilesAdd extends Command {
     })
 
     // Offer custom file
-    const addCustom = await confirm({ message: 'Add a custom file path?', default: false })
+    const addCustom = await confirm({message: 'Add a custom file path?', default: false})
     if (addCustom) {
-      const customPath = await input({ message: 'Enter file path:' })
+      const customPath = await input({message: 'Enter file path:'})
       if (customPath.trim()) selected.push(customPath.trim())
     }
 
@@ -202,24 +210,28 @@ export default class DotfilesAdd extends Command {
       return result
     }
 
-    const addSpinner = ora({ spinner: 'arc', color: false, text: chalk.hex('#FF6B2B')('Adding files to chezmoi...') }).start()
+    const addSpinner = ora({
+      spinner: 'arc',
+      color: false,
+      text: chalk.hex('#FF6B2B')('Adding files to chezmoi...'),
+    }).start()
     addSpinner.stop()
 
     for (const rawPath of selected) {
       const absPath = expandTilde(rawPath)
 
       if (platform === 'wsl2' && isWSLWindowsPath(absPath)) {
-        result.rejected.push({ path: rawPath, reason: 'Windows filesystem paths not supported on WSL2' })
+        result.rejected.push({path: rawPath, reason: 'Windows filesystem paths not supported on WSL2'})
         continue
       }
 
       if (!existsSync(absPath)) {
-        result.skipped.push({ path: rawPath, reason: 'File not found' })
+        result.skipped.push({path: rawPath, reason: 'File not found'})
         continue
       }
 
       if (managedPaths.has(absPath)) {
-        result.skipped.push({ path: rawPath, reason: 'Already managed by chezmoi' })
+        result.skipped.push({path: rawPath, reason: 'Already managed by chezmoi'})
         continue
       }
 
@@ -237,9 +249,9 @@ export default class DotfilesAdd extends Command {
         if (encrypt) args.push('--encrypt')
         args.push(absPath)
         await execOrThrow('chezmoi', args)
-        result.added.push({ path: rawPath, encrypted: encrypt })
+        result.added.push({path: rawPath, encrypted: encrypt})
       } catch {
-        result.skipped.push({ path: rawPath, reason: `Failed to add. Run \`chezmoi doctor\` to verify your setup.` })
+        result.skipped.push({path: rawPath, reason: `Failed to add. Run \`chezmoi doctor\` to verify your setup.`})
       }
     }
 

package/src/commands/dotfiles/setup.js

@@ -1,30 +1,27 @@
-import { Command, Flags } from '@oclif/core'
+import {Command, Flags} from '@oclif/core'
 import ora from 'ora'
 import chalk from 'chalk'
-import { confirm } from '@inquirer/prompts'
-import { detectPlatform } from '../../services/platform.js'
-import { isChezmoiInstalled, getChezmoiConfig, buildSetupSteps } from '../../services/dotfiles.js'
-import { formatDotfilesSetup } from '../../formatters/dotfiles.js'
-import { DvmiError } from '../../utils/errors.js'
+import {confirm} from '@inquirer/prompts'
+import {detectPlatform} from '../../services/platform.js'
+import {isChezmoiInstalled, getChezmoiConfig, buildSetupSteps} from '../../services/dotfiles.js'
+import {formatDotfilesSetup} from '../../formatters/dotfiles.js'
+import {DvmiError} from '../../utils/errors.js'
 
 /** @import { DotfilesSetupResult, SetupStep, StepResult } from '../../types.js' */
 
 export default class DotfilesSetup extends Command {
   static description = 'Interactive wizard to configure chezmoi with age encryption for dotfile management'
 
-  static examples = [
-    '<%= config.bin %> dotfiles setup',
-    '<%= config.bin %> dotfiles setup --json',
-  ]
+  static examples = ['<%= config.bin %> dotfiles setup', '<%= config.bin %> dotfiles setup --json']
 
   static enableJsonFlag = true
 
   static flags = {
-    help: Flags.help({ char: 'h' }),
+    help: Flags.help({char: 'h'}),
   }
 
   async run() {
-    const { flags } = await this.parse(DotfilesSetup)
+    const {flags} = await this.parse(DotfilesSetup)
     const isJson = flags.json
 
     // Non-interactive guard
@@ -33,12 +30,12 @@ export default class DotfilesSetup extends Command {
     if ((isCI || isNonInteractive) && !isJson) {
       this.error(
         'This command requires an interactive terminal (TTY). Run with --json for a non-interactive status check.',
-        { exit: 1 },
+        {exit: 1},
       )
     }
 
     const platformInfo = await detectPlatform()
-    const { platform } = platformInfo
+    const {platform} = platformInfo
 
     // --json branch: non-interactive setup attempt
     if (isJson) {
@@ -52,9 +49,10 @@ export default class DotfilesSetup extends Command {
           sourceDir: null,
           publicKey: null,
           status: 'failed',
-          message: platform === 'macos'
-            ? 'chezmoi is not installed. Run `brew install chezmoi` or visit https://chezmoi.io/install'
-            : 'chezmoi is not installed. Run `sh -c "$(curl -fsLS get.chezmoi.io)"` or visit https://chezmoi.io/install',
+          message:
+            platform === 'macos'
+              ? 'chezmoi is not installed. Run `brew install chezmoi` or visit https://chezmoi.io/install'
+              : 'chezmoi is not installed. Run `sh -c "$(curl -fsLS get.chezmoi.io)"` or visit https://chezmoi.io/install',
         }
       }
 
@@ -76,15 +74,20 @@ export default class DotfilesSetup extends Command {
     // ---------------------------------------------------------------------------
     // Interactive mode
     // ---------------------------------------------------------------------------
-    const preSpinner = ora({ spinner: 'arc', color: false, text: chalk.hex('#FF6B2B')('Checking chezmoi status...') }).start()
+    const preSpinner = ora({
+      spinner: 'arc',
+      color: false,
+      text: chalk.hex('#FF6B2B')('Checking chezmoi status...'),
+    }).start()
     const chezmoiInstalled = await isChezmoiInstalled()
     const existingConfig = await getChezmoiConfig()
     preSpinner.stop()
 
     if (!chezmoiInstalled) {
-      const hint = platform === 'macos'
-        ? 'Run `brew install chezmoi` or visit https://chezmoi.io/install'
-        : 'Run `sh -c "$(curl -fsLS get.chezmoi.io)"` or visit https://chezmoi.io/install'
+      const hint =
+        platform === 'macos'
+          ? 'Run `brew install chezmoi` or visit https://chezmoi.io/install'
+          : 'Run `sh -c "$(curl -fsLS get.chezmoi.io)"` or visit https://chezmoi.io/install'
       throw new DvmiError('chezmoi is not installed', hint)
     }
 
@@ -92,18 +95,26 @@ export default class DotfilesSetup extends Command {
     const hasEncryption = existingConfig?.encryption?.tool === 'age' || !!existingConfig?.age?.identity
     if (existingConfig && hasEncryption) {
       this.log(chalk.green('  ✔ chezmoi is already configured with age encryption'))
-      const reconfigure = await confirm({ message: 'Reconfigure encryption (regenerate age key)?', default: false })
+      const reconfigure = await confirm({message: 'Reconfigure encryption (regenerate age key)?', default: false})
       if (!reconfigure) {
         const sourceDir = existingConfig?.sourceDir ?? existingConfig?.sourcePath ?? null
         this.log(chalk.dim('  Skipped. Existing encryption configuration kept.'))
-        return { platform, chezmoiInstalled: true, encryptionConfigured: true, sourceDir, publicKey: null, status: 'skipped', message: 'Existing encryption configuration kept' }
+        return {
+          platform,
+          chezmoiInstalled: true,
+          encryptionConfigured: true,
+          sourceDir,
+          publicKey: null,
+          status: 'skipped',
+          message: 'Existing encryption configuration kept',
+        }
       }
     } else if (existingConfig) {
       this.log(chalk.yellow('  chezmoi is initialised but encryption is not configured — adding age encryption'))
     }
 
     // Build and run steps
-    const steps = buildSetupSteps(platform, { existingConfig })
+    const steps = buildSetupSteps(platform, {existingConfig})
 
     this.log('')
 
@@ -111,24 +122,24 @@ export default class DotfilesSetup extends Command {
     let sourceDir = null
 
     for (const step of steps) {
-      const typeColor = { check: chalk.blue, install: chalk.yellow, configure: chalk.cyan, verify: chalk.green }
+      const typeColor = {check: chalk.blue, install: chalk.yellow, configure: chalk.cyan, verify: chalk.green}
       const colorFn = typeColor[step.type] ?? chalk.white
       this.log(`  ${colorFn(`[${step.type}]`)}  ${step.label}`)
 
       if (step.requiresConfirmation) {
-        const proceed = await confirm({ message: `Proceed with: ${step.label}?`, default: true })
+        const proceed = await confirm({message: `Proceed with: ${step.label}?`, default: true})
         if (!proceed) {
           this.log(chalk.dim('  Skipped.'))
           continue
         }
       }
 
-      const stepSpinner = ora({ spinner: 'arc', color: false, text: chalk.dim(step.label) }).start()
+      const stepSpinner = ora({spinner: 'arc', color: false, text: chalk.dim(step.label)}).start()
       let result
       try {
         result = await step.run()
       } catch (err) {
-        result = { status: /** @type {'failed'} */ ('failed'), hint: err instanceof Error ? err.message : String(err) }
+        result = {status: /** @type {'failed'} */ ('failed'), hint: err instanceof Error ? err.message : String(err)}
       }
 
       if (result.status === 'success') {
@@ -147,8 +158,26 @@ export default class DotfilesSetup extends Command {
       } else {
         stepSpinner.fail(chalk.red(`${step.label} — failed`))
         if (result.hint) this.log(chalk.dim(`  → ${result.hint}`))
-        this.log(formatDotfilesSetup({ platform, chezmoiInstalled: true, encryptionConfigured: false, sourceDir: null, publicKey: null, status: 'failed', message: result.hint }))
-        return { platform, chezmoiInstalled: true, encryptionConfigured: false, sourceDir: null, publicKey: null, status: 'failed', message: result.hint }
+        this.log(
+          formatDotfilesSetup({
+            platform,
+            chezmoiInstalled: true,
+            encryptionConfigured: false,
+            sourceDir: null,
+            publicKey: null,
+            status: 'failed',
+            message: result.hint,
+          }),
+        )
+        return {
+          platform,
+          chezmoiInstalled: true,
+          encryptionConfigured: false,
+          sourceDir: null,
+          publicKey: null,
+          status: 'failed',
+          message: result.hint,
+        }
       }
     }
 
@@ -161,9 +190,9 @@ export default class DotfilesSetup extends Command {
     // Try to get public key from key file
     if (!publicKey) {
       try {
-        const { homedir } = await import('node:os')
-        const { join } = await import('node:path')
-        const { readFile } = await import('node:fs/promises')
+        const {homedir} = await import('node:os')
+        const {join} = await import('node:path')
+        const {readFile} = await import('node:fs/promises')
         const keyPath = join(homedir(), '.config', 'chezmoi', 'key.txt')
         const keyContent = await readFile(keyPath, 'utf8').catch(() => '')
         const match = keyContent.match(/# public key: (age1[a-z0-9]+)/i)

package/src/commands/dotfiles/status.js

@@ -1,34 +1,31 @@
-import { Command, Flags } from '@oclif/core'
+import {Command, Flags} from '@oclif/core'
 import ora from 'ora'
 import chalk from 'chalk'
-import { detectPlatform } from '../../services/platform.js'
-import { isChezmoiInstalled, getChezmoiConfig, getManagedFiles, getChezmoiRemote } from '../../services/dotfiles.js'
-import { loadConfig } from '../../services/config.js'
-import { formatDotfilesStatus } from '../../formatters/dotfiles.js'
-import { DvmiError } from '../../utils/errors.js'
+import {detectPlatform} from '../../services/platform.js'
+import {isChezmoiInstalled, getChezmoiConfig, getManagedFiles, getChezmoiRemote} from '../../services/dotfiles.js'
+import {loadConfig} from '../../services/config.js'
+import {formatDotfilesStatus} from '../../formatters/dotfiles.js'
+import {DvmiError} from '../../utils/errors.js'
 
 /** @import { DotfilesStatusResult } from '../../types.js' */
 
 export default class DotfilesStatus extends Command {
   static description = 'Show chezmoi dotfiles status: managed files, encryption state, and sync health'
 
-  static examples = [
-    '<%= config.bin %> dotfiles status',
-    '<%= config.bin %> dotfiles status --json',
-  ]
+  static examples = ['<%= config.bin %> dotfiles status', '<%= config.bin %> dotfiles status --json']
 
   static enableJsonFlag = true
 
   static flags = {
-    help: Flags.help({ char: 'h' }),
+    help: Flags.help({char: 'h'}),
   }
 
   async run() {
-    const { flags } = await this.parse(DotfilesStatus)
+    const {flags} = await this.parse(DotfilesStatus)
     const isJson = flags.json
 
     const platformInfo = await detectPlatform()
-    const { platform } = platformInfo
+    const {platform} = platformInfo
 
     const config = await loadConfig()
     const enabled = config.dotfiles?.enabled === true
@@ -47,7 +44,7 @@ export default class DotfilesStatus extends Command {
         repo: null,
         sourceDir: null,
         files: [],
-        summary: { total: 0, encrypted: 0, plaintext: 0 },
+        summary: {total: 0, encrypted: 0, plaintext: 0},
       }
 
       if (isJson) return notConfiguredResult
@@ -56,14 +53,17 @@ export default class DotfilesStatus extends Command {
     }
 
     if (!chezmoiInstalled) {
-      const hint = platform === 'macos'
-        ? 'Run `brew install chezmoi` or visit https://chezmoi.io/install'
-        : 'Run `sh -c "$(curl -fsLS get.chezmoi.io)"` or visit https://chezmoi.io/install'
+      const hint =
+        platform === 'macos'
+          ? 'Run `brew install chezmoi` or visit https://chezmoi.io/install'
+          : 'Run `sh -c "$(curl -fsLS get.chezmoi.io)"` or visit https://chezmoi.io/install'
       throw new DvmiError('chezmoi is not installed', hint)
     }
 
     // Gather data
-    const spinner = isJson ? null : ora({ spinner: 'arc', color: false, text: chalk.hex('#FF6B2B')('Gathering dotfiles status...') }).start()
+    const spinner = isJson
+      ? null
+      : ora({spinner: 'arc', color: false, text: chalk.hex('#FF6B2B')('Gathering dotfiles status...')}).start()
 
     const [chezmoiConfig, files, remote] = await Promise.all([
       getChezmoiConfig(),