i18nsmith 0.2.0 → 0.3.0

package/dist/rename-suspicious.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=rename-suspicious.test.d.ts.map

package/dist/rename-suspicious.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rename-suspicious.test.d.ts","sourceRoot":"","sources":["../src/rename-suspicious.test.ts"],"names":[],"mappings":""}

package/dist/utils/diff-utils.d.ts

@@ -1,3 +1,8 @@
+/**
+ * CLI presentation layer for diff utilities.
+ * This module handles printing and writing locale diffs for CLI commands.
+ * Core diff building logic is in packages/core/src/diff-utils.ts.
+ */
 import type { SyncSummary } from '@i18nsmith/core';
 export declare function printLocaleDiffs(diffs: SyncSummary['diffs']): void;
 export declare function writeLocaleDiffPatches(diffs: SyncSummary['diffs'], directory: string): Promise<void>;

package/dist/utils/diff-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diff-utils.d.ts","sourceRoot":"","sources":["../../src/utils/diff-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,QAW3D;AAED,wBAAsB,sBAAsB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,iBAuB1F"}
+{"version":3,"file":"diff-utils.d.ts","sourceRoot":"","sources":["../../src/utils/diff-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,QAW3D;AAED,wBAAsB,sBAAsB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,iBAuB1F"}

package/dist/utils/errors.d.ts

@@ -0,0 +1,8 @@
+export declare class CliError extends Error {
+    exitCode: number;
+    constructor(message: string, exitCode?: number);
+}
+type MaybePromise<T> = T | Promise<T>;
+export declare function withErrorHandling<A extends unknown[], R>(action: (...args: A) => MaybePromise<R>): (...args: A) => Promise<R | undefined>;
+export {};
+//# sourceMappingURL=errors.d.ts.map

package/dist/utils/errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"AAEA,qBAAa,QAAS,SAAQ,KAAK;IACG,QAAQ;gBAAhC,OAAO,EAAE,MAAM,EAAS,QAAQ,SAAI;CAIjD;AAED,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEtC,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EACtD,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC,GACtC,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAoBxC"}

package/dist/utils/locale-audit.d.ts

@@ -0,0 +1,39 @@
+import { type I18nConfig } from '@i18nsmith/core';
+export interface AuditIssue {
+    key: string;
+    value: string;
+    reason: string;
+    description: string;
+    suggestion?: string;
+}
+export interface QualityIssue {
+    type: 'duplicate-value' | 'inconsistent-key' | 'orphaned-namespace';
+    description: string;
+    keys?: string[];
+    suggestion?: string;
+}
+export interface LocaleAuditResult {
+    locale: string;
+    totalKeys: number;
+    issues: AuditIssue[];
+    qualityIssues: QualityIssue[];
+}
+export interface LocaleAuditSummary {
+    results: LocaleAuditResult[];
+    totalIssues: number;
+    totalQualityIssues: number;
+}
+export interface LocaleAuditContext {
+    config: I18nConfig;
+    projectRoot: string;
+}
+export interface LocaleAuditOptions {
+    locales?: string[];
+    checkDuplicates?: boolean;
+    checkInconsistent?: boolean;
+    checkOrphaned?: boolean;
+}
+export declare function runLocaleAudit(context: LocaleAuditContext, options?: LocaleAuditOptions): Promise<LocaleAuditSummary>;
+export declare function printLocaleAuditResults(summary: LocaleAuditSummary): void;
+export declare function hasAuditFindings(summary: LocaleAuditSummary): boolean;
+//# sourceMappingURL=locale-audit.d.ts.map

package/dist/utils/locale-audit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"locale-audit.d.ts","sourceRoot":"","sources":["../../src/utils/locale-audit.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,oBAAoB,CAAC;IACpE,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAkH7B;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,QA6ClE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAErE"}

package/dist/utils/preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/utils/preview.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,cAAc,CAAC,QAAQ;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,QAAQ,CAAC;CACnB;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,YAAY,GAAG,WAAW,CAAC;AAE5E,wBAAsB,gBAAgB,CAAC,QAAQ,EAC7C,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAcjB;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAC5C,YAAY,EAAE,WAAW,EACzB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAWnC;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,WAAW,EACzB,WAAW,EAAE,MAAM,EACnB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,IAAI,CAAC,CAuBf"}
+{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/utils/preview.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,cAAc,CAAC,QAAQ;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,QAAQ,CAAC;CACnB;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,YAAY,GAAG,WAAW,CAAC;AAE5E,wBAAsB,gBAAgB,CAAC,QAAQ,EAC7C,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAcjB;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAC5C,YAAY,EAAE,WAAW,EACzB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAWnC;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,WAAW,EACzB,WAAW,EAAE,MAAM,EACnB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,IAAI,CAAC,CAiBf"}

package/dist/utils/preview.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=preview.test.d.ts.map

package/dist/utils/preview.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preview.test.d.ts","sourceRoot":"","sources":["../../src/utils/preview.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18nsmith",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "CLI for i18nsmith",
   "type": "module",
   "main": "dist/index.js",
@@ -21,6 +21,10 @@
     "test": "vitest run"
   },
   "dependencies": {
+    "@i18nsmith/core": "workspace:*",
+    "@i18nsmith/transformer": "workspace:*",
+    "@i18nsmith/translation": "workspace:*",
+    "@i18nsmith/translator-mock": "workspace:*",
     "chalk": "^5.0.0",
     "commander": "^11.0.0",
     "diff": "^8.0.2",
@@ -31,10 +35,6 @@
     "ts-morph": "^21.0.0"
   },
   "devDependencies": {
-    "@i18nsmith/core": "workspace:*",
-    "@i18nsmith/transformer": "workspace:*",
-    "@i18nsmith/translation": "workspace:*",
-    "@i18nsmith/translator-mock": "workspace:*",
     "esbuild": "^0.25.0"
   }
 }

package/src/commands/audit.ts

@@ -1,14 +1,7 @@
-import fs from 'fs/promises';
-import path from 'path';
 import chalk from 'chalk';
 import type { Command } from 'commander';
-import {
-  loadConfig,
-  LocaleStore,
-  KeyValidator,
-  LocaleValidator,
-  SUSPICIOUS_KEY_REASON_DESCRIPTIONS,
-} from '@i18nsmith/core';
+import { runCheck } from './check.js';
+import { withErrorHandling } from '../utils/errors.js';
 
 interface AuditCommandOptions {
   config?: string;
@@ -21,28 +14,6 @@ interface AuditCommandOptions {
   orphaned?: boolean;
 }
 
-interface AuditIssue {
-  key: string;
-  value: string;
-  reason: string;
-  description: string;
-  suggestion?: string;
-}
-
-interface QualityIssue {
-  type: 'duplicate-value' | 'inconsistent-key' | 'orphaned-namespace';
-  description: string;
-  keys?: string[];
-  suggestion?: string;
-}
-
-interface LocaleAuditResult {
-  locale: string;
-  totalKeys: number;
-  issues: AuditIssue[];
-  qualityIssues: QualityIssue[];
-}
-
 export function registerAudit(program: Command) {
   program
     .command('audit')
@@ -53,182 +24,20 @@ export function registerAudit(program: Command) {
     .option('--report <path>', 'Write JSON report to a file')
     .option('--strict', 'Exit with error code if any issues found', false)
     .option('--duplicates', 'Check for duplicate values (consolidation opportunities)', false)
-    .option('--inconsistent', 'Check for inconsistent key naming patterns', false)
-    .option('--orphaned', 'Check for orphaned namespaces with few keys', false)
-    .action(async (options: AuditCommandOptions) => {
-      console.log(chalk.blue('Auditing locale files...'));
-      try {
-        const config = await loadConfig(options.config);
-        const localesDir = path.resolve(process.cwd(), config.localesDir ?? 'locales');
-        const localeStore = new LocaleStore(localesDir, {
-          sortKeys: config.locales?.sortKeys ?? 'alphabetical',
-        });
-        const keyValidator = new KeyValidator(config.sync?.suspiciousKeyPolicy ?? 'skip');
-        const localeValidator = new LocaleValidator({
-          delimiter: config.locales?.delimiter ?? '.',
-        });
-
-        // Determine which locales to audit
-        let localesToAudit = options.locale ?? [];
-        if (localesToAudit.length === 0) {
-          localesToAudit = [config.sourceLanguage ?? 'en', ...(config.targetLanguages ?? [])];
-        }
-
-        // Enable all quality checks if none specified
-        const runQualityChecks = options.duplicates || options.inconsistent || options.orphaned;
-        const checkDuplicates = options.duplicates || !runQualityChecks;
-        const checkInconsistent = options.inconsistent;
-        const checkOrphaned = options.orphaned;
-
-        const results: LocaleAuditResult[] = [];
-        const allKeys = new Set<string>();
-
-        // First pass: collect all keys
-        for (const locale of localesToAudit) {
-          const data = await localeStore.get(locale);
-          for (const key of Object.keys(data)) {
-            allKeys.add(key);
-          }
-        }
-
-        // Second pass: run audits
-        for (const locale of localesToAudit) {
-          const data = await localeStore.get(locale);
-          const keys = Object.keys(data);
-          const issues: AuditIssue[] = [];
-          const qualityIssues: QualityIssue[] = [];
-
-          // Suspicious key detection
-          for (const key of keys) {
-            const value = data[key];
-            const analysis = keyValidator.analyzeWithValue(key, value);
-
-            if (analysis.suspicious && analysis.reason) {
-              issues.push({
-                key,
-                value: value.length > 50 ? `${value.slice(0, 47)}...` : value,
-                reason: analysis.reason,
-                description: SUSPICIOUS_KEY_REASON_DESCRIPTIONS[analysis.reason] ?? 'Unknown issue',
-                suggestion: keyValidator.suggestFix(key, analysis.reason),
-              });
-            }
-          }
-
-          // Quality checks
-          if (checkDuplicates) {
-            const duplicates = localeValidator.detectDuplicateValues(locale, data);
-            for (const dup of duplicates) {
-              qualityIssues.push({
-                type: 'duplicate-value',
-                description: `Value "${dup.value.slice(0, 40)}${dup.value.length > 40 ? '...' : ''}" used by ${dup.keys.length} keys`,
-                keys: dup.keys,
-                suggestion: 'Consider consolidating to a single key',
-              });
-            }
-          }
-
-          if (checkInconsistent && locale === localesToAudit[0]) {
-            // Only check inconsistent keys once (using all keys)
-            const inconsistent = localeValidator.detectInconsistentKeys(Array.from(allKeys));
-            for (const inc of inconsistent) {
-              qualityIssues.push({
-                type: 'inconsistent-key',
-                description: inc.pattern,
-                keys: inc.variants,
-                suggestion: inc.suggestion,
-              });
-            }
-          }
-
-          if (checkOrphaned && locale === localesToAudit[0]) {
-            // Only check orphaned namespaces once (using all keys)
-            const orphaned = localeValidator.detectOrphanedNamespaces(Array.from(allKeys));
-            for (const orph of orphaned) {
-              qualityIssues.push({
-                type: 'orphaned-namespace',
-                description: `Namespace "${orph.namespace}" has only ${orph.keyCount} key(s)`,
-                keys: orph.keys,
-                suggestion: 'Consider merging into a related namespace',
-              });
-            }
-          }
-
-          results.push({
-            locale,
-            totalKeys: keys.length,
-            issues,
-            qualityIssues,
-          });
-        }
-
-        const totalIssues = results.reduce((sum, r) => sum + r.issues.length, 0);
-        const totalQualityIssues = results.reduce((sum, r) => sum + r.qualityIssues.length, 0);
-
-        if (options.report) {
-          const outputPath = path.resolve(process.cwd(), options.report);
-          await fs.mkdir(path.dirname(outputPath), { recursive: true });
-          await fs.writeFile(outputPath, JSON.stringify({ results, totalIssues, totalQualityIssues }, null, 2));
-          console.log(chalk.green(`Audit report written to ${outputPath}`));
-        }
-
-        if (options.json) {
-          console.log(JSON.stringify({ results, totalIssues, totalQualityIssues }, null, 2));
-        } else {
-          // Pretty print results
-          for (const result of results) {
-            const hasIssues = result.issues.length > 0 || result.qualityIssues.length > 0;
-            if (!hasIssues) {
-              console.log(chalk.green(`✓ ${result.locale}.json: ${result.totalKeys} keys, no issues`));
-            } else {
-              console.log(chalk.yellow(`⚠ ${result.locale}.json: ${result.totalKeys} keys`));
-
-              // Suspicious keys
-              if (result.issues.length > 0) {
-                console.log(chalk.yellow(`  Suspicious keys: ${result.issues.length}`));
-                for (const issue of result.issues) {
-                  console.log(chalk.dim(`    - "${issue.key}"`));
-                  console.log(chalk.dim(`      ${issue.description}`));
-                  if (issue.suggestion) {
-                    console.log(chalk.dim(`      Suggestion: ${issue.suggestion}`));
-                  }
-                }
-              }
-
-              // Quality issues
-              if (result.qualityIssues.length > 0) {
-                console.log(chalk.cyan(`  Quality checks: ${result.qualityIssues.length}`));
-                for (const issue of result.qualityIssues) {
-                  const typeLabel = issue.type === 'duplicate-value' ? '📋' :
-                                    issue.type === 'inconsistent-key' ? '🔀' : '📦';
-                  console.log(chalk.dim(`    ${typeLabel} ${issue.description}`));
-                  if (issue.suggestion) {
-                    console.log(chalk.dim(`       ${issue.suggestion}`));
-                  }
-                }
-              }
-            }
-          }
-
-          console.log();
-          if (totalIssues === 0 && totalQualityIssues === 0) {
-            console.log(chalk.green('✓ No issues found in locale files'));
-          } else {
-            if (totalIssues > 0) {
-              console.log(chalk.yellow(`Found ${totalIssues} suspicious key(s)`));
-            }
-            if (totalQualityIssues > 0) {
-              console.log(chalk.cyan(`Found ${totalQualityIssues} quality issue(s)`));
-            }
-          }
-        }
-
-        if (options.strict && totalIssues > 0) {
-          console.error(chalk.red(`\nAudit failed with ${totalIssues} issue(s). Use --strict=false to allow.`));
-          process.exitCode = 1;
-        }
-      } catch (error) {
-        console.error(chalk.red('Audit failed:'), (error as Error).message);
-        process.exitCode = 1;
-      }
-    });
+    .option('--inconsistent', 'Detect inconsistent key naming patterns', false)
+    .option('--orphaned', 'Detect orphaned namespaces that only contain a few keys', false)
+    .action(withErrorHandling(async (options: AuditCommandOptions) => {
+      console.log(chalk.yellow('⚠️  "i18nsmith audit" is deprecated. Proxying to "i18nsmith check --audit"...'));
+      await runCheck({
+        config: options.config,
+        json: options.json,
+        report: options.report,
+        audit: true,
+        auditStrict: options.strict,
+        auditLocales: options.locale,
+        auditDuplicates: options.duplicates,
+        auditInconsistent: options.inconsistent,
+        auditOrphaned: options.orphaned,
+      });
+    }));
 }

package/src/commands/backup.ts

@@ -2,6 +2,7 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import { listBackups, restoreBackup } from '@i18nsmith/core';
+import { CliError, withErrorHandling } from '../utils/errors.js';
 
 /**
  * Registers backup-related commands (backup-list, backup-restore)
@@ -11,86 +12,89 @@ export function registerBackup(program: Command): void {
     .command('backup-list')
     .description('List available locale file backups')
     .option('--backup-dir <path>', 'Custom backup directory (default: .i18nsmith-backup)')
-    .action(async (options: { backupDir?: string }) => {
-      try {
-        const workspaceRoot = process.cwd();
-        const backups = await listBackups(workspaceRoot, { backupDir: options.backupDir });
+    .action(
+      withErrorHandling(async (options: { backupDir?: string }) => {
+        try {
+          const workspaceRoot = process.cwd();
+          const backups = await listBackups(workspaceRoot, { backupDir: options.backupDir });
 
-        if (backups.length === 0) {
-          console.log(chalk.yellow('No backups found.'));
-          console.log(chalk.gray('Backups are created automatically when using --write --prune'));
-          return;
-        }
+          if (backups.length === 0) {
+            console.log(chalk.yellow('No backups found.'));
+            console.log(chalk.gray('Backups are created automatically when using --write --prune'));
+            return;
+          }
 
-        console.log(chalk.blue(`Found ${backups.length} backup(s):\n`));
+          console.log(chalk.blue(`Found ${backups.length} backup(s):\n`));
 
-        for (const backup of backups) {
-          const date = new Date(backup.createdAt);
-          const formattedDate = date.toLocaleString();
-          console.log(`  ${chalk.cyan(backup.timestamp)}  ${formattedDate}  (${backup.fileCount} files)`);
-        }
+          for (const backup of backups) {
+            const date = new Date(backup.createdAt);
+            const formattedDate = date.toLocaleString();
+            console.log(`  ${chalk.cyan(backup.timestamp)}  ${formattedDate}  (${backup.fileCount} files)`);
+          }
 
-        console.log(chalk.gray(`\nRestore a backup with: i18nsmith backup-restore <timestamp>`));
-      } catch (err) {
-        console.error(chalk.red('Error listing backups:'), err instanceof Error ? err.message : err);
-        process.exitCode = 1;
-      }
-    });
+          console.log(chalk.gray(`\nRestore a backup with: i18nsmith backup-restore <timestamp>`));
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          throw new CliError(`Error listing backups: ${message}`);
+        }
+      })
+    );
 
   program
     .command('backup-restore')
     .description('Restore locale files from a previous backup')
     .argument('<timestamp>', 'Backup timestamp (from backup-list) or "latest" for most recent')
     .option('--backup-dir <path>', 'Custom backup directory (default: .i18nsmith-backup)')
-    .action(async (timestamp: string, options: { backupDir?: string }) => {
-      try {
-        const workspaceRoot = process.cwd();
-        const backups = await listBackups(workspaceRoot, { backupDir: options.backupDir });
+    .action(
+      withErrorHandling(async (timestamp: string, options: { backupDir?: string }) => {
+        try {
+          const workspaceRoot = process.cwd();
+          const backups = await listBackups(workspaceRoot, { backupDir: options.backupDir });
 
-        if (backups.length === 0) {
-          console.error(chalk.red('No backups found.'));
-          process.exitCode = 1;
-          return;
-        }
+          if (backups.length === 0) {
+            throw new CliError('No backups found.');
+          }
 
-        let targetBackup = timestamp === 'latest'
-          ? backups[0]
-          : backups.find((b) => b.timestamp === timestamp);
+          const targetBackup = timestamp === 'latest'
+            ? backups[0]
+            : backups.find((b) => b.timestamp === timestamp);
 
-        if (!targetBackup) {
-          console.error(chalk.red(`Backup not found: ${timestamp}`));
-          console.log(chalk.gray('Available backups:'));
-          for (const b of backups.slice(0, 5)) {
-            console.log(`  ${b.timestamp}`);
+          if (!targetBackup) {
+            const suggestion = backups
+              .slice(0, 5)
+              .map((b) => b.timestamp)
+              .join(', ');
+            throw new CliError(
+              suggestion
+                ? `Backup not found: ${timestamp}. Available backups: ${suggestion}`
+                : `Backup not found: ${timestamp}`
+            );
           }
-          process.exitCode = 1;
-          return;
-        }
 
-        // Confirm restore
-        const { confirmed } = await inquirer.prompt<{ confirmed: boolean }>([
-          {
-            type: 'confirm',
-            name: 'confirmed',
-            message: `Restore ${targetBackup.fileCount} locale files from backup ${targetBackup.timestamp}? This will overwrite current locale files.`,
-            default: false,
-          },
-        ]);
+          const { confirmed } = await inquirer.prompt<{ confirmed: boolean }>([
+            {
+              type: 'confirm',
+              name: 'confirmed',
+              message: `Restore ${targetBackup.fileCount} locale files from backup ${targetBackup.timestamp}? This will overwrite current locale files.`,
+              default: false,
+            },
+          ]);
 
-        if (!confirmed) {
-          console.log(chalk.yellow('Restore cancelled.'));
-          return;
-        }
+          if (!confirmed) {
+            console.log(chalk.yellow('Restore cancelled.'));
+            return;
+          }
 
-        const result = await restoreBackup(targetBackup.path, workspaceRoot);
+          const result = await restoreBackup(targetBackup.path, workspaceRoot);
 
-        console.log(chalk.green(`\n✅ ${result.summary}`));
-        for (const file of result.restored) {
-          console.log(chalk.gray(`   Restored: ${file}`));
+          console.log(chalk.green(`\n✅ ${result.summary}`));
+          for (const file of result.restored) {
+            console.log(chalk.gray(`   Restored: ${file}`));
+          }
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          throw new CliError(`Error restoring backup: ${message}`);
         }
-      } catch (err) {
-        console.error(chalk.red('Error restoring backup:'), err instanceof Error ? err.message : err);
-        process.exitCode = 1;
-      }
-    });
+      })
+    );
 }