diff --git a/hermes_cli/claw.py b/hermes_cli/claw.py
index 5f9d728252..5455b4355d 100644
--- a/hermes_cli/claw.py
+++ b/hermes_cli/claw.py
@@ -685,10 +685,17 @@ def _cmd_cleanup(args):
     # Summary
     print()
     if dry_run:
-        print_info(f"Dry run complete. {len(dirs_to_check)} directory(ies) would be archived.")
+        _n_dirs = len(dirs_to_check)
+        print_info(
+            f"Dry run complete. {_n_dirs} "
+            f"{'directory' if _n_dirs == 1 else 'directories'} would be archived."
+        )
         print_info("Run without --dry-run to archive them.")
     elif total_archived:
-        print_success(f"Cleaned up {total_archived} OpenClaw directory(ies).")
+        print_success(
+            f"Cleaned up {total_archived} OpenClaw "
+            f"{'directory' if total_archived == 1 else 'directories'}."
+        )
         print_info("Directories were renamed, not deleted. You can undo by renaming them back.")
     else:
         print_info("No directories were archived.")
diff --git a/hermes_cli/doctor.py b/hermes_cli/doctor.py
index ca0102d871..09a0976ac5 100644
--- a/hermes_cli/doctor.py
+++ b/hermes_cli/doctor.py
@@ -1087,9 +1087,16 @@ def run_doctor(args):
                         f"{label} deps",
                         f"({critical} critical, {high} high, {moderate} moderate — run: cd {npm_dir} && npm audit fix)"
                     )
-                    issues.append(f"{label} has {total} npm vulnerability(ies)")
+                    issues.append(
+                        f"{label} has {total} npm "
+                        f"{'vulnerability' if total == 1 else 'vulnerabilities'}"
+                    )
                 else:
-                    check_ok(f"{label} deps", f"({moderate} moderate vulnerability(ies))")
+                    check_ok(
+                        f"{label} deps",
+                        f"({moderate} moderate "
+                        f"{'vulnerability' if moderate == 1 else 'vulnerabilities'})",
+                    )
             except Exception:
                 pass