git-push-time 1.1.3 → 1.1.4

package/lib/ui.js

@@ -3,16 +3,15 @@ import boxen from "boxen";
 import stringWidth from "string-width";
 
 /**
- * Chiều rộng khung thống nhất cho toàn bộ UI.
- * - Luôn bằng nhau giữa dashboard / banner / prompt / box chi tiết
- *   nên các khung xếp chồng không bị lệch (vỡ giao diện).
- * - Terminal hẹp thì co theo `cols - 2`, terminal rộng thì cap 76.
+ * Shared frame width for the entire UI.
+ * - Keep dashboards, banners, prompts, and detail boxes aligned.
+ * - Shrink to `cols - 2` in narrow terminals and cap at 76 columns.
  */
 export function getW() {
   const cols = process.stdout.columns;
   if (!cols || cols < 10) return 72;
   const avail = cols - 2;
-  // Terminal quá hẹp (<34): dùng đúng phần hiển thị được, tránh tràn dòng.
+  // On very narrow terminals (<34 columns), use the available width to prevent wrapping.
   if (avail < 34) return Math.max(24, avail);
   return Math.min(76, avail);
 }
@@ -81,10 +80,10 @@ export function truncateVisual(str, maxLen) {
   return fitStyled(str, maxLen);
 }
 
-/** Khung tiêu đề nhất quán cho từng bước tương tác trong terminal. */
+/** Consistent title frame for each interactive terminal step. */
 export function framePrompt(message) {
-  // Dùng cùng getW() với mọi box khác để các khung luôn thẳng hàng,
-  // không còn tình trạng prompt hẹp (56) còn dashboard rộng (76) gây vỡ.
+  // Use the same width as other boxes to keep frames aligned and prevent narrow prompts
+  // from breaking against a wider dashboard.
   return boxen(String(message ?? ""), {
     borderStyle: "round",
     borderColor: "#818CF8",
@@ -95,15 +94,15 @@ export function framePrompt(message) {
 }
 
 /* ==========================================================================
-   BOX ENGINE CHUẨN (Bo góc mềm & Căn lề pixel-perfect)
+   SHARED BOX ENGINE (rounded corners and precise alignment)
    ========================================================================== */
 
 export function boxTop(title = "", borderColor = chalk.hex("#334155")) {
   const W = getW();
   if (!title) return borderColor("╭" + "─".repeat(Math.max(2, W - 2)) + "╮");
 
-  // Căn giữa tiêu đề để 2 bên đều nhau: ╭──── Title ────╮
-  // Chừa 1 space mỗi bên title + tối thiểu 2 gạch mỗi bên.
+  // Center the title with even spacing on both sides: ╭──── Title ────╮
+  // Leave one space beside the title and at least two dashes on each side.
   const maxTitle = Math.max(4, W - 8);
   const fittedTitle = fitStyled(title, maxTitle);
   const titleWidth = stringWidth(fittedTitle);
@@ -117,7 +116,7 @@ export function boxTop(title = "", borderColor = chalk.hex("#334155")) {
   );
 }
 
-/** Khung tiêu đề căn trái theo lề nội dung của boxRow. */
+/** Left-aligned title frame matching the content margin of boxRow. */
 export function boxTopLeft(title = "", borderColor = chalk.hex("#334155")) {
   const W = getW();
   if (!title) return borderColor("╭" + "─".repeat(Math.max(2, W - 2)) + "╮");
@@ -144,14 +143,12 @@ export function boxDivider(borderColor = chalk.hex("#334155")) {
 }
 
 /**
- * Hàng Key-Value có đường nối bằng dấu chấm · · ·
- * Dùng "·" (U+00B7) thay vì "․" (U+2024) để không bị vỡ font trên
- * Windows PowerShell / Consolas. Label không còn bị cắt oan khi
- * terminal hẹp nhờ công thức fitted mới.
+ * Key-value row connected with dot leaders.
+ * Use "·" (U+00B7) instead of "․" (U+2024) for compatibility with
+ * Windows PowerShell and Consolas. The label width adapts to narrow terminals.
  */
 /**
- * Hàng Key-Value có đường nối bằng dấu chấm · · ·
- * Căn lề chuẩn xác, khoảng cách đều và không bị vỡ font trên mọi terminal.
+ * Key-value row with dot leaders, precise alignment, and consistent spacing.
  */
 export function boxKvDot(
   label,
@@ -260,7 +257,7 @@ export function printBanner(version = "1.1.1") {
     "#F472B6",
   ]);
   const subtitle = chalk.hex("#94A3B8")(
-    "GitHub · Push / Pull · Lịch sử commit · Secret scan",
+    "GitHub · Push / Pull · Commit history · Secret scan",
   );
   const mascot = mascotLines();
   const body = [...mascot, "", title, subtitle, "", ...rows].join("\n");
@@ -275,7 +272,7 @@ export function printBanner(version = "1.1.1") {
 }
 
 /**
- * Hiển thị Dashboard trạng thái ngắn gọn & trực quan ở đầu menu
+ * Display a concise status dashboard at the top of the menu.
  */
 export function printDashboardStatus({
   targetDir = process.cwd(),
@@ -288,34 +285,34 @@ export function printDashboardStatus({
 }) {
   const border = chalk.hex("#6366F1");
   const W = getW();
-  const remote = remoteUrl ? formatRemoteLabel(remoteUrl) : chalk.hex("#94A3B8")("Chưa liên kết");
+  const remote = remoteUrl ? formatRemoteLabel(remoteUrl) : chalk.hex("#94A3B8")("Not linked");
 
   const ghStatus = githubUser
-    ? `${chalk.hex("#38BDF8").bold(`@${githubUser.login}`)}  ${chalk.bgHex("#064E3B").hex("#34D399").bold(" [✓ ĐÃ KẾT NỐI] ")}`
-    : chalk.bgHex("#1E1B4B").hex("#A5B4FC").bold(" [○ CHƯA ĐĂNG NHẬP] ");
+    ? `${chalk.hex("#38BDF8").bold(`@${githubUser.login}`)}  ${chalk.bgHex("#064E3B").hex("#34D399").bold(" [✓ CONNECTED] ")}`
+    : chalk.bgHex("#1E1B4B").hex("#A5B4FC").bold(" [○ SIGNED OUT] ");
 
   const branchPill = changes === 0
-    ? chalk.bgHex("#064E3B").hex("#34D399").bold(" [✓ SẠCH] ")
-    : chalk.bgHex("#78350F").hex("#FDE047").bold(` [● ${changes} THAY ĐỔI] `);
+    ? chalk.bgHex("#064E3B").hex("#34D399").bold(" [✓ CLEAN] ")
+    : chalk.bgHex("#78350F").hex("#FDE047").bold(` [● ${changes} CHANGES] `);
 
   const branchDisplay = `${chalk.hex("#38BDF8").bold(currentBranch)}  ${branchPill}`;
 
   console.log("");
   console.log(
     boxTop(
-      `${chalk.bold.hex("#F8FAFC")(" BẢNG ĐIỀU KHIỂN GIT ")} ${chalk.hex("#94A3B8")(`v${version}`)}`,
+      `${chalk.bold.hex("#F8FAFC")(" GIT DASHBOARD ")} ${chalk.hex("#94A3B8")(`v${version}`)}`,
       border,
     ),
   );
   console.log(boxRow("", border));
-  console.log(boxKvDot("Thư mục", chalk.hex("#F1F5F9").bold(targetDir), 14, border));
-  console.log(boxKvDot("Nhánh Git", branchDisplay, 14, border));
+  console.log(boxKvDot("Folder", chalk.hex("#F1F5F9").bold(targetDir), 14, border));
+  console.log(boxKvDot("Branch", branchDisplay, 14, border));
   console.log(boxKvDot("GitHub", ghStatus, 14, border));
   console.log(boxKvDot("Remote", remote, 14, border));
 
   if (lastCommit && lastCommit.hash) {
     const commitText = `${chalk.hex("#A78BFA").bold(lastCommit.hash)} ${chalk.hex("#CBD5E1")(truncateVisual(lastCommit.message || "", 26))} ${chalk.hex("#64748B")(`(${lastCommit.relativeTime || ""})`)}`;
-    console.log(boxKvDot("Commit gần", commitText, 14, border));
+    console.log(boxKvDot("Latest commit", commitText, 14, border));
   }
 
   console.log(boxRow("", border));
@@ -338,7 +335,7 @@ export function printPushProgress({ current, total = 6, title, completed = [] })
   });
   const rail = nodes.join(chalk.hex("#334155")("──"));
   const lead = `${chalk.hex("#38BDF8").bold("PUSH PROGRESS")}  ${rail}`;
-  const detail = chalk.hex("#94A3B8")(`[Bước ${current}/${total} · ${title}]`);
+  const detail = chalk.hex("#94A3B8")(`[Step ${current}/${total} · ${title}]`);
   console.log("");
   if (stringWidth(`${lead}  ${detail}`) <= getW() - 2) console.log(`${lead}  ${detail}`);
   else {
@@ -356,7 +353,7 @@ export function printPushProgress({ current, total = 6, title, completed = [] })
 }
 
 /**
- * Tiêu đề phân đoạn với điểm nhấn màu sắc
+ * Section heading with a color accent.
  */
 export function printSection(title) {
   const W = getW();
@@ -377,7 +374,7 @@ export function printSection(title) {
 }
 
 /**
- * Pill Step Badge (Ví dụ: 1/6)
+ * Step badge (for example, 1/6).
  */
 export function stepLabel(current, total, text) {
   const pill = chalk.bgHex("#2563EB").hex("#FFFFFF").bold(` ${current}/${total} `);
@@ -385,23 +382,23 @@ export function stepLabel(current, total, text) {
 }
 
 /**
- * Bảng tóm tắt thông tin trước khi Push
+ * Summary panel displayed before pushing.
  */
 export function printSummary({ repoUrl, commitMsg, dateDisplay, branch, force, sourceDir }) {
   const border = chalk.hex("#38BDF8");
-  const title = chalk.bold.hex("#F8FAFC")(" XÁC NHẬN THÔNG TIN PUSH ");
+  const title = chalk.bold.hex("#F8FAFC")(" REVIEW PUSH DETAILS ");
   console.log("");
   console.log(boxTop(title, border));
   console.log(boxRow("", border));
-  if (sourceDir) console.log(boxKvDot("Thư mục nguồn", chalk.hex("#F1F5F9")(sourceDir), 16, border));
-  console.log(boxKvDot("Kho lưu trữ", formatRemoteLabel(repoUrl), 16, border));
-  console.log(boxKvDot("Nhánh đích", chalk.hex("#38BDF8").bold(branch), 16, border));
-  console.log(boxKvDot("Thông điệp", chalk.hex("#FDE047")(`"${commitMsg}"`), 16, border));
-  console.log(boxKvDot("Thời điểm", chalk.hex("#A78BFA")(dateDisplay), 16, border));
-  console.log(boxKvDot("Quét Secret", chalk.hex("#34D399")("✓ Tự động kiểm tra trước khi đẩy"), 16, border));
+  if (sourceDir) console.log(boxKvDot("Source folder", chalk.hex("#F1F5F9")(sourceDir), 16, border));
+  console.log(boxKvDot("Repository", formatRemoteLabel(repoUrl), 16, border));
+  console.log(boxKvDot("Target branch", chalk.hex("#38BDF8").bold(branch), 16, border));
+  console.log(boxKvDot("Message", chalk.hex("#FDE047")(`"${commitMsg}"`), 16, border));
+  console.log(boxKvDot("Commit time", chalk.hex("#A78BFA")(dateDisplay), 16, border));
+  console.log(boxKvDot("Secret scan", chalk.hex("#34D399")("✓ Automatically checked before push"), 16, border));
   if (force) {
     console.log(boxRow("", border));
-    console.log(boxRow(chalk.hex("#F43F5E").bold("  [!] CẢNH BÁO: Chế độ ghi đè (--force) đang kích hoạt!"), border));
+    console.log(boxRow(chalk.hex("#F43F5E").bold("  [!] WARNING: Force push (--force) is enabled!"), border));
   }
   console.log(boxRow("", border));
   console.log(boxBottom(border));
@@ -411,18 +408,18 @@ export function printTargetDir(dir = "") {
   const W = getW();
   console.log(
     chalk.hex("#64748B")(
-      `  Thư mục: ${truncateVisual(String(dir || ""), W - 13)}`,
+      `  Folder: ${truncateVisual(String(dir || ""), W - 13)}`,
     ),
   );
 }
 
 /**
- * Hiển thị thẻ Profile thông tin tài khoản GitHub
+ * Display the GitHub account profile card.
  */
 export function printGitHubProfile(user, source = '') {
   const border = chalk.hex("#4F46E5");
   const title = chalk.bold.bgHex("#4F46E5").hex("#FFFFFF")(
-    " TÀI KHOẢN GITHUB KẾT NỐI ",
+    " CONNECTED GITHUB ACCOUNT ",
   );
 
   console.log("");
@@ -432,31 +429,31 @@ export function printGitHubProfile(user, source = '') {
     boxKvDot("Username", chalk.hex("#38BDF8").bold(`@${user.login}`), 16, border)
   );
   if (user.name) {
-    console.log(boxKvDot("Tên hiển thị", chalk.hex("#F8FAFC")(user.name), 16, border));
+    console.log(boxKvDot("Display name", chalk.hex("#F8FAFC")(user.name), 16, border));
   }
   if (user.email) {
     console.log(boxKvDot("Email", chalk.hex("#94A3B8")(user.email), 16, border));
   }
   if (user.bio) {
-    console.log(boxKvDot("Tiểu sử", chalk.hex("#CBD5E1")(truncateVisual(user.bio, 40)), 16, border));
+    console.log(boxKvDot("Bio", chalk.hex("#CBD5E1")(truncateVisual(user.bio, 40)), 16, border));
   }
 
   const repoStats = `${user.public_repos || 0} public  •  ${user.total_private_repos || 0} private`;
   console.log(boxKvDot("Repositories", chalk.hex("#34D399").bold(repoStats), 16, border));
 
   if (source) {
-    const srcDesc = source === 'gh-cli' ? 'GitHub CLI (gh)' : source === 'env' ? 'Biến môi trường' : 'Lưu trữ cá nhân';
-    console.log(boxKvDot("Nguồn xác thực", chalk.hex("#A78BFA")(srcDesc), 16, border));
+    const srcDesc = source === 'gh-cli' ? 'GitHub CLI (gh)' : source === 'env' ? 'Environment variable' : 'Local config';
+    console.log(boxKvDot("Auth source", chalk.hex("#A78BFA")(srcDesc), 16, border));
   }
 
   console.log(boxDivider(border));
-  console.log(boxRow(chalk.hex("#64748B")(`» Trang cá nhân: ${user.html_url}`), border));
+  console.log(boxRow(chalk.hex("#64748B")(`» Profile: ${user.html_url}`), border));
   console.log(boxBottom(border));
   console.log("");
 }
 
 /**
- * Hiển thị mã xác thực GitHub Device Flow cho người dùng
+ * Display the GitHub Device Flow verification code.
  */
 export function printDeviceCodePrompt({ userCode, verificationUri }) {
   const border = chalk.hex("#6366F1");
@@ -467,27 +464,27 @@ export function printDeviceCodePrompt({ userCode, verificationUri }) {
   console.log("");
   console.log(boxTop(title, border));
   console.log(boxRow("", border));
-  console.log(boxRow(chalk.hex("#F8FAFC").bold("Bước 1: Mở trình duyệt và truy cập liên kết:"), border));
+  console.log(boxRow(chalk.hex("#F8FAFC").bold("Step 1: Open this link in your browser:"), border));
   console.log(boxRow(chalk.hex("#38BDF8").bold.underline(`  ${verificationUri}`), border));
   console.log(boxRow("", border));
-  console.log(boxRow(chalk.hex("#F8FAFC").bold("Bước 2: Nhập mã xác nhận (User Code):"), border));
+  console.log(boxRow(chalk.hex("#F8FAFC").bold("Step 2: Enter this user code:"), border));
 
   const codeBox = chalk.bgHex("#1E1B4B").hex("#A5B4FC").bold(`    >>>  ${userCode}  <<<    `);
   console.log(boxRow(`  ${codeBox}`, border));
   console.log(boxRow("", border));
-  console.log(boxRow(chalk.hex("#94A3B8")("» Hệ thống đang tự động mở trình duyệt cho bạn..."), border));
-  console.log(boxRow(chalk.hex("#64748B")("» Nhấn Authorize trên trình duyệt để hoàn tất."), border));
+  console.log(boxRow(chalk.hex("#94A3B8")("» Your browser is opening automatically..."), border));
+  console.log(boxRow(chalk.hex("#64748B")("» Select Authorize in your browser to finish."), border));
   console.log(boxBottom(border));
   console.log("");
 }
 
 /**
- * Hiển thị thông báo sau khi tạo repository GitHub mới thành công
+ * Display a success message after creating a GitHub repository.
  */
 export function printRepoCreatedBox(repo) {
   const border = chalk.hex("#059669");
   const title = chalk.bold.bgHex("#10B981").hex("#064E3B")(
-    " TẠO REPOSITORY GITHUB THÀNH CÔNG! ",
+    " GITHUB REPOSITORY CREATED ",
   );
 
   console.log("");
@@ -498,28 +495,28 @@ export function printRepoCreatedBox(repo) {
     ? chalk.bgHex("#7F1D1D").hex("#FCA5A5").bold(" PRIVATE ")
     : chalk.bgHex("#065F46").hex("#6EE7B7").bold(" PUBLIC ");
 
-  console.log(boxKvDot("Tên Repo", chalk.hex("#F8FAFC").bold(repo.fullName || repo.name), 14, border));
-  console.log(boxKvDot("Quyền riêng tư", visibilityPill, 14, border));
+  console.log(boxKvDot("Repository", chalk.hex("#F8FAFC").bold(repo.fullName || repo.name), 14, border));
+  console.log(boxKvDot("Visibility", visibilityPill, 14, border));
   if (repo.description) {
-    console.log(boxKvDot("Mô tả", chalk.hex("#CBD5E1")(truncateVisual(repo.description, 42)), 14, border));
+    console.log(boxKvDot("Description", chalk.hex("#CBD5E1")(truncateVisual(repo.description, 42)), 14, border));
   }
   console.log(boxKvDot("HTTPS Clone", chalk.hex("#38BDF8").underline(repo.cloneUrl), 14, border));
   console.log(boxKvDot("SSH Clone", chalk.hex("#A78BFA")(repo.sshUrl), 14, border));
 
   console.log(boxRow("", border));
   console.log(boxDivider(border));
-  console.log(boxRow(chalk.hex("#6EE7B7")(`» Xem trên GitHub: ${repo.htmlUrl}`), border));
+  console.log(boxRow(chalk.hex("#6EE7B7")(`» View on GitHub: ${repo.htmlUrl}`), border));
   console.log(boxBottom(border));
   console.log("");
 }
 
 /**
- * Cảnh báo Folder lồng trong Repo cha
+ * Warn when a folder is nested inside a parent repository.
  */
 export function printNestedRepoWarning({ targetDir = "", topLevel = "" } = {}) {
   const border = chalk.hex("#D97706");
   const title = chalk.bold.bgHex("#D97706").hex("#FFFFFF")(
-    " FOLDER NẰM TRONG REPO CHA ",
+    " FOLDER INSIDE A PARENT REPOSITORY ",
   );
 
   console.log("");
@@ -527,7 +524,7 @@ export function printNestedRepoWarning({ targetDir = "", topLevel = "" } = {}) {
   console.log(
     boxRow(
       chalk.hex("#FDE047")(
-        "Folder nguồn đang nằm trong Git repo của folder cha:",
+        "The source folder is inside the parent Git repository:",
       ),
       border,
     ),
@@ -540,7 +537,7 @@ export function printNestedRepoWarning({ targetDir = "", topLevel = "" } = {}) {
   console.log(
     boxRow(
       chalk.hex("#94A3B8")(
-        "Nếu push tiếp, lịch sử/file của folder cha có thể đi kèm.",
+        "Pushing may include the parent folder's history and files.",
       ),
       border,
     ),
@@ -548,7 +545,7 @@ export function printNestedRepoWarning({ targetDir = "", topLevel = "" } = {}) {
   console.log(
     boxRow(
       chalk.hex("#34D399")(
-        "Gợi ý: Tạo repo RIÊNG để chỉ push folder này.",
+        "Tip: Create a SEPARATE repository to push only this folder.",
       ),
       border,
     ),
@@ -557,12 +554,12 @@ export function printNestedRepoWarning({ targetDir = "", topLevel = "" } = {}) {
 }
 
 /**
- * Cảnh báo Secret nhạy cảm
+ * Warn about sensitive secrets.
  */
 export function printPrePushSecretWarning({ riskyFiles = [], findings = [] }) {
   const border = chalk.hex("#D97706");
   const title = chalk.bold.bgHex("#D97706").hex("#FFFFFF")(
-    " PHÁT HIỆN DỮ LIỆU NHẠY CẢM ",
+    " SENSITIVE DATA DETECTED ",
   );
 
   console.log("");
@@ -570,7 +567,7 @@ export function printPrePushSecretWarning({ riskyFiles = [], findings = [] }) {
   console.log(
     boxRow(
       chalk.hex("#FDE047")(
-        "GitHub có thể chặn push nếu phát hiện key bí mật (GH013)",
+        "GitHub may block the push if it detects a secret (GH013)",
       ),
       border,
     ),
@@ -584,7 +581,7 @@ export function printPrePushSecretWarning({ riskyFiles = [], findings = [] }) {
 
   if (riskyFiles.length > 0) {
     console.log(
-      boxRow(chalk.bold.hex("#F8FAFC")("File cấu hình nguy cơ:"), border),
+      boxRow(chalk.bold.hex("#F8FAFC")("Sensitive files:"), border),
     );
     const showFiles = riskyFiles.slice(0, 4);
     showFiles.forEach((f) => {
@@ -596,7 +593,7 @@ export function printPrePushSecretWarning({ riskyFiles = [], findings = [] }) {
     if (riskyFiles.length > 4) {
       console.log(
         boxRow(
-          chalk.hex("#64748B")(`  +- ...và ${riskyFiles.length - 4} file khác`),
+          chalk.hex("#64748B")(`  +- ...and ${riskyFiles.length - 4} more file(s)`),
           border,
         ),
       );
@@ -607,7 +604,7 @@ export function printPrePushSecretWarning({ riskyFiles = [], findings = [] }) {
     if (riskyFiles.length > 0) console.log(boxRow("", border));
     console.log(
       boxRow(
-        chalk.bold.hex("#F8FAFC")("Vị trí nghi vấn Secret trong code:"),
+        chalk.bold.hex("#F8FAFC")("Possible secrets in source files:"),
         border,
       ),
     );
@@ -637,7 +634,7 @@ export function printPrePushSecretWarning({ riskyFiles = [], findings = [] }) {
     if (findings.length > 4) {
       console.log(
         boxRow(
-          chalk.hex("#64748B")(`  +- ...và ${findings.length - 4} vị trí khác`),
+          chalk.hex("#64748B")(`  +- ...and ${findings.length - 4} more location(s)`),
           border,
         ),
       );
@@ -648,7 +645,7 @@ export function printPrePushSecretWarning({ riskyFiles = [], findings = [] }) {
   console.log(
     boxRow(
       chalk.hex("#34D399")(
-        'Gợi ý: Chọn "Tự động fix" để gỡ file + .gitignore an toàn',
+        'Tip: Choose "Auto-fix" to safely unstage files and update .gitignore',
       ),
       border,
     ),
@@ -657,14 +654,14 @@ export function printPrePushSecretWarning({ riskyFiles = [], findings = [] }) {
 }
 
 /**
- * Cảnh báo Push bị chặn bởi GitHub Push Protection (GH013)
+ * Warn when GitHub Push Protection blocks a push (GH013).
  */
 export function printSecretBlockedBox(rawMessage, details = {}) {
   const border = chalk.hex("#E11D48");
   const files = details.files || [];
   const types = details.secretTypes || [];
   const title = chalk.bold.bgHex("#E11D48").hex("#FFFFFF")(
-    " PUSH BỊ CHẶN — PHÁT HIỆN SECRET (GH013) ",
+    " PUSH BLOCKED — SECRET DETECTED (GH013) ",
   );
 
   console.log("");
@@ -672,7 +669,7 @@ export function printSecretBlockedBox(rawMessage, details = {}) {
   console.log(
     boxRow(
       chalk.hex("#FDA4AF")(
-        "GitHub Push Protection đã chặn push vì phát hiện secret!",
+        "GitHub Push Protection blocked the push because it detected a secret.",
       ),
       border,
     ),
@@ -682,7 +679,7 @@ export function printSecretBlockedBox(rawMessage, details = {}) {
   if (types.length > 0) {
     console.log(
       boxKvDot(
-        "Loại secret",
+        "Secret type",
         chalk.hex("#F8FAFC").bold(types.slice(0, 2).join(", ")),
         14,
         border,
@@ -692,25 +689,25 @@ export function printSecretBlockedBox(rawMessage, details = {}) {
   if (files.length > 0) {
     files.slice(0, 2).forEach((f) => {
       console.log(
-        boxKvDot("File nguồn", chalk.hex("#FCD34D")(f), 14, border),
+        boxKvDot("Source file", chalk.hex("#FCD34D")(f), 14, border),
       );
     });
   }
 
   console.log(boxRow("", border));
   console.log(
-    boxRow(chalk.bold.hex("#F8FAFC")("» Các giải pháp khắc phục:"), border),
+    boxRow(chalk.bold.hex("#F8FAFC")("» How to resolve this:"), border),
   );
   console.log(
     boxRow(
-      chalk.hex("#E2E8F0")("  [1] Thu hồi (revoke) key ngay nếu là token thật"),
+      chalk.hex("#E2E8F0")("  [1] Revoke the key immediately if it is real"),
       border,
     ),
   );
   console.log(
     boxRow(
       chalk.hex("#38BDF8")(
-        "  [2] Dùng tool tự động gỡ file & squash làm sạch commit",
+        "  [2] Use this tool to unstage files and squash the commits",
       ),
       border,
     ),
@@ -718,7 +715,7 @@ export function printSecretBlockedBox(rawMessage, details = {}) {
   console.log(
     boxRow(
       chalk.hex("#94A3B8")(
-        "  [3] Xóa secret trong code / dùng biến môi trường (process.env)",
+        "  [3] Remove the secret from source code and use an environment variable (process.env)",
       ),
       border,
     ),
@@ -729,40 +726,40 @@ export function printSecretBlockedBox(rawMessage, details = {}) {
   if (details.unblockUrl) {
     console.log(
       chalk.hex("#F59E0B")(
-        `\n  » URL mở khóa tạm thời (nếu là key mẫu thử nghiệm):\n  ${chalk.underline(details.unblockUrl)}`,
+        `\n  » Temporary unblock URL (for test credentials only):\n  ${chalk.underline(details.unblockUrl)}`,
       ),
     );
   }
   console.log(
     chalk.hex("#64748B")(
-      `\n  » Tài liệu GitHub: ${details.resolveUrl || "https://docs.github.com/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection"}\n`,
+      `\n  » GitHub documentation: ${details.resolveUrl || "https://docs.github.com/code-security/secret-scanning/pushing-a-branch-blocked-by-push-protection"}\n`,
     ),
   );
 }
 
 /**
- * Card Thông báo Thành công sau khi Push
+ * Success card displayed after a push.
  */
 /**
- * Card Thông báo Thành công sau khi Push
+ * Success card displayed after a push.
  */
 export function printSuccessBox({
   branch,
   repoUrl,
   durationSeconds = null,
-  secretStatus = "Đã quét (0 rủi ro)",
+  secretStatus = "Scanned (no risks)",
 }) {
   const border = chalk.hex("#10B981");
-  const title = chalk.bold.hex("#F8FAFC")(" PUSH THÀNH CÔNG ");
+  const title = chalk.bold.hex("#F8FAFC")(" PUSH SUCCEEDED ");
   console.log("");
   console.log(boxTop(title, border));
   console.log(boxRow("", border));
-  console.log(boxKvDot("Nhánh đích", chalk.hex("#34D399").bold(branch), 18, border));
-  console.log(boxKvDot("Trạng thái Secret", chalk.hex("#38BDF8")(secretStatus), 18, border));
+  console.log(boxKvDot("Target branch", chalk.hex("#34D399").bold(branch), 18, border));
+  console.log(boxKvDot("Secret scan", chalk.hex("#38BDF8")(secretStatus), 18, border));
   if (durationSeconds !== null) {
     console.log(
       boxKvDot(
-        "Thời gian xử lý",
+        "Duration",
         chalk.hex("#FBBF24").bold(`${durationSeconds.toFixed(1)}s`),
         18,
         border,
@@ -775,7 +772,7 @@ export function printSuccessBox({
     console.log(boxDivider(border));
     console.log(
       boxRow(
-        `${chalk.hex("#34D399")("» Xem trên GitHub:")} ${chalk.hex("#38BDF8").underline(webUrl)}`,
+        `${chalk.hex("#34D399")("» View on GitHub:")} ${chalk.hex("#38BDF8").underline(webUrl)}`,
         border,
       ),
     );
@@ -795,7 +792,7 @@ function toGitHubWebUrl(url) {
 export function printCancelled() {
   const border = chalk.hex("#64748B");
   const title = chalk.bold.hex("#F8FAFC")(
-    " ĐÃ HỦY THAO TÁC ",
+    " OPERATION CANCELLED ",
   );
   console.log("");
   console.log(boxTop(title, border));
@@ -803,7 +800,7 @@ export function printCancelled() {
   console.log(
     boxRow(
       chalk.hex("#94A3B8")(
-        "Thao tác đã dừng lại an toàn. Không có thay đổi nào được thực hiện.",
+        "The operation was safely stopped. No changes were made.",
       ),
       border,
     ),
@@ -813,11 +810,11 @@ export function printCancelled() {
   console.log("");
 }
 
-export function printErrorBox(title = "XẢY RA LỖI", lines = [], hint = "") {
+export function printErrorBox(title = "AN ERROR OCCURRED", lines = [], hint = "") {
   const W = getW();
   const border = chalk.hex("#E11D48");
   const cleanTitle = String(title || "").toUpperCase();
-  const titleStyled = chalk.bold.bgHex("#E11D48").hex("#FFFFFF")(` [LỖI] ${cleanTitle} `);
+  const titleStyled = chalk.bold.bgHex("#E11D48").hex("#FFFFFF")(` [ERROR] ${cleanTitle} `);
   const rows = Array.isArray(lines) ? lines : [String(lines || "")];
 
   console.log("");
@@ -843,19 +840,19 @@ export function printErrorBox(title = "XẢY RA LỖI", lines = [], hint = "") {
 
 export function printGitMissing() {
   printErrorBox(
-    "CHƯA CÀI ĐẶT GIT",
+    "GIT IS NOT INSTALLED",
     [
-      "Không tìm thấy Git trên hệ thống máy tính của bạn.",
-      "Vui lòng tải và cài đặt Git để tiếp tục!",
+      "Git was not found on this system.",
+      "Download and install Git to continue.",
     ],
-    "Tải ngay tại: https://git-scm.com/downloads",
+    "Download it at: https://git-scm.com/downloads",
   );
 }
 
 export function printAuthFailedBox(message = "") {
   const border = chalk.hex("#E11D48");
   const title = chalk.bold.bgHex("#E11D48").hex("#FFFFFF")(
-    " LỖI XÁC THỰC GIT ",
+    " GIT AUTHENTICATION FAILED ",
   );
   const firstLine = String(message || "")
     .split("\n")[0]
@@ -866,7 +863,7 @@ export function printAuthFailedBox(message = "") {
   console.log(
     boxRow(
       chalk.hex("#FDA4AF")(
-        "Không thể xác thực với remote. Kiểm tra lại quyền truy cập.",
+        "Could not authenticate with the remote. Check your access permissions.",
       ),
       border,
     ),
@@ -880,23 +877,23 @@ export function printAuthFailedBox(message = "") {
     );
   console.log(boxRow("", border));
   console.log(
-    boxRow(chalk.bold.hex("#F8FAFC")("» Cách khắc phục nhanh:"), border),
+    boxRow(chalk.bold.hex("#F8FAFC")("» Quick fixes:"), border),
   );
   console.log(
     boxRow(
-      chalk.hex("#E2E8F0")("  [1] Chạy tính năng GITHUB trong tool để kết nối tài khoản"),
+      chalk.hex("#E2E8F0")("  [1] Use the GITHUB menu to connect your account"),
       border,
     ),
   );
   console.log(
     boxRow(
-      chalk.hex("#E2E8F0")("  [2] Dùng lệnh gh: gh auth login"),
+      chalk.hex("#E2E8F0")("  [2] Use GitHub CLI: gh auth login"),
       border,
     ),
   );
   console.log(
     boxRow(
-      chalk.hex("#94A3B8")("  [3] Sử dụng SSH URL: git@github.com:user/repo.git"),
+      chalk.hex("#94A3B8")("  [3] Use an SSH URL: git@github.com:user/repo.git"),
       border,
     ),
   );
@@ -907,7 +904,7 @@ export function printAuthFailedBox(message = "") {
 export function printNonFastForwardBox(message = "", branch = "main") {
   const border = chalk.hex("#D97706");
   const title = chalk.bold.bgHex("#D97706").hex("#FFFFFF")(
-    " REMOTE ĐÃ CÓ COMMIT MỚI HƠN ",
+    " REMOTE HAS NEWER COMMITS ",
   );
   const firstLine = String(message || "")
     .split("\n")[0]
@@ -918,7 +915,7 @@ export function printNonFastForwardBox(message = "", branch = "main") {
   console.log(
     boxRow(
       chalk.hex("#FDE68A")(
-        "Kho lưu trữ trên Remote đang chứa commit mới hơn Local.",
+        "The remote repository has commits that are newer than your local branch.",
       ),
       border,
     ),
@@ -934,7 +931,7 @@ export function printNonFastForwardBox(message = "", branch = "main") {
   console.log(
     boxRow(
       chalk.hex("#38BDF8")(
-        `  » Bạn có thể chọn Pull (rebase) rồi push lại ngay trong tool`,
+        `  » Choose Pull (rebase), then push again from this tool.`,
       ),
       border,
     ),
@@ -942,7 +939,7 @@ export function printNonFastForwardBox(message = "", branch = "main") {
   console.log(
     boxRow(
       chalk.hex("#94A3B8")(
-        "     Chỉ dùng --force khi bạn chắc chắn muốn ghi đè Remote.",
+        "     Use --force only when you are certain you want to overwrite the remote.",
       ),
       border,
     ),
@@ -959,7 +956,7 @@ export function printFixResult({
 } = {}) {
   const W = getW();
   const border = chalk.hex("#10B981");
-  const title = chalk.bold.hex("#F8FAFC")(" KẾT QUẢ BẢO VỆ SECRET ");
+  const title = chalk.bold.hex("#F8FAFC")(" SECRET PROTECTION RESULTS ");
 
   console.log("");
   console.log(boxTop(title, border));
@@ -968,7 +965,7 @@ export function printFixResult({
   if (fixed.length > 0) {
     console.log(
       boxRow(
-        `${chalk.hex("#34D399").bold("[OK] Đã gỡ khỏi commit:")} ${chalk.hex("#F1F5F9")(truncateVisual(fixed.join(", "), W - 28))}`,
+        `${chalk.hex("#34D399").bold("[OK] Removed from commit:")} ${chalk.hex("#F1F5F9")(truncateVisual(fixed.join(", "), W - 28))}`,
         border,
       ),
     );
@@ -976,7 +973,7 @@ export function printFixResult({
   if (gitignoreAdded.length > 0) {
     console.log(
       boxRow(
-        `${chalk.hex("#38BDF8").bold("[+]  Thêm vào .gitignore:")} ${chalk.hex("#CBD5E1")(truncateVisual(gitignoreAdded.join(", "), W - 30))}`,
+        `${chalk.hex("#38BDF8").bold("[+]  Added to .gitignore:")} ${chalk.hex("#CBD5E1")(truncateVisual(gitignoreAdded.join(", "), W - 30))}`,
         border,
       ),
     );
@@ -985,7 +982,7 @@ export function printFixResult({
     console.log(boxRow("", border));
     console.log(
       boxRow(
-        chalk.hex("#FBBF24").bold("[!]  File code chứa secret (đã gỡ stage, KHÔNG ignore):"),
+        chalk.hex("#FBBF24").bold("[!]  Source files containing secrets (unstaged, not ignored):"),
         border,
       ),
     );
@@ -993,7 +990,7 @@ export function printFixResult({
       console.log(boxRow(`     - ${chalk.hex("#CBD5E1")(truncateVisual(f, W - 10))}`, border)),
     );
     console.log(
-      boxRow(chalk.hex("#94A3B8")("     » Hãy xóa key trong file và thay bằng process.env."), border),
+      boxRow(chalk.hex("#94A3B8")("     » Remove the key from the file and use process.env instead."), border),
     );
   }
   if (failed.length > 0) {
@@ -1010,7 +1007,7 @@ export function printFixResult({
 
 export function printFooter() {
   const W = getW();
-  // Dải phân cách căn đều 2 bên, full width như mọi khung.
+  // Full-width divider, aligned like the other frames.
   const core = "»";
   const remaining = Math.max(4, W - 3); // 1 core + 2 space
   const leftLen = Math.ceil(remaining / 2);
@@ -1021,10 +1018,10 @@ export function printFooter() {
     chalk.hex("#334155")(" " + "─".repeat(rightLen))
   );
   const tip1 =
-    chalk.hex("#64748B")("» Mẹo: Chạy ") +
+    chalk.hex("#64748B")("» Tip: Run ") +
     chalk.hex("#38BDF8").bold("git-push-time --help") +
-    chalk.hex("#64748B")(" để xem toàn bộ lệnh.");
-  const tip2 = chalk.hex("#475569")("» GitHub CLI & Push Time — Chúc hiệu quả!");
+    chalk.hex("#64748B")(" to see all commands.");
+  const tip2 = chalk.hex("#475569")("» Git & GitHub workspace — Happy coding!");
   for (const tip of [tip1, tip2]) {
     const w = stringWidth(tip);
     if (w >= W) {
@@ -1049,12 +1046,12 @@ export function styleCliHelp(program) {
   program.addHelpText(
     "after",
     `
-${chalk.hex("#334155")("─── » Ví dụ phổ biến ───")}
-  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time')}                           # Mở menu điều khiển tương tác trực quan
-  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time github create')}            # Tạo nhanh repo mới trên GitHub
-  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time -r <repo-url> -d "-2d" -y')} # Push tự động lùi 2 ngày
-  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time fix')}                      # Quét & gỡ sạch secret
-  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time pull')}                     # Cập nhật code mới từ remote
+${chalk.hex("#334155")("─── » Common examples ───")}
+  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time')}                           # Open the interactive dashboard
+  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time github create')}            # Create a GitHub repository
+  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time -r <repo-url> -d "-2d" -y')} # Push with a commit date two days ago
+  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time fix')}                      # Scan for and remove staged secrets
+  ${chalk.hex("#34D399")("$")} ${chalk.white('git-push-time pull')}                     # Pull the latest changes
 `,
   );
 }