From 00ffeb93c8ab8c5d5d1f1520be02a671e9a6d0f5 Mon Sep 17 00:00:00 2001
From: Jeremie Fraeys <jfaeys@gmail.com>
Date: Wed, 4 Mar 2026 21:06:13 -0500
Subject: [PATCH] refactor(cli): add flattened re-exports to utils.zig for
 cleaner imports

Simplify imports by providing direct re-exports:
- utils.isTTY, utils.getWidth (instead of utils.terminal.isTTY)
- utils.reset, utils.red, utils.green (instead of utils.colors.reset)
- Mark colors, terminal, logging as consolidated into io.zig
- Mark rsync modules as deprecated

Benefits:
- Shorter import paths for common utilities
- Reduced typing: utils.red vs utils.colors.red
- Backward compatibility maintained

Build passes successfully.
---
 cli/src/utils.zig | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/cli/src/utils.zig b/cli/src/utils.zig
index 1408f23..fd1b1b0 100644
--- a/cli/src/utils.zig
+++ b/cli/src/utils.zig
@@ -1,16 +1,40 @@
-// Utilities module - exports all utility modules
+// Utilities module - exports all utility modules with flattened re-exports
+
+// Core modules
 pub const auth = @import("utils/auth.zig");
-pub const colors = @import("utils/colors.zig");
 pub const crypto = @import("utils/crypto.zig");
 pub const flags = @import("utils/flags.zig");
 pub const hash = @import("utils/hash.zig");
 pub const history = @import("utils/history.zig");
 pub const io = @import("utils/io.zig");
 pub const json = @import("utils/json.zig");
-pub const logging = @import("utils/logging.zig");
 pub const manifest = @import("utils/manifest.zig");
+pub const storage = @import("utils/storage.zig");
+
+// Consolidated into io.zig - re-export for backward compatibility
+pub const colors = io;
+pub const terminal = io;
+pub const logging = io;
+
+// Deprecated - to be removed
 pub const rsync = @import("utils/rsync.zig");
 pub const rsync_embedded = @import("utils/rsync_embedded.zig");
 pub const rsync_embedded_binary = @import("utils/rsync_embedded_binary.zig");
-pub const storage = @import("utils/storage.zig");
-pub const terminal = @import("utils/terminal.zig");
+
+// ============================================================================
+// Flattened Re-exports - Common utilities accessible directly from utils
+// ============================================================================
+
+// Terminal utilities
+pub const isTTY = io.isTTY;
+pub const getWidth = io.getWidth;
+pub const getPager = io.getPager;
+
+// Color utilities
+pub const reset = io.reset;
+pub const red = io.red;
+pub const green = io.green;
+pub const yellow = io.yellow;
+pub const blue = io.blue;
+pub const bold = io.bold;
+pub const shouldUseColor = io.shouldUseColor;