feat: add list row numbers and switch indentation

Author: Loongphy

docs/implement.md

@@ -287,6 +287,7 @@ Latest rollout `.jsonl` rate limit record shape (from an `event_msg` + `token_co
 ## Output Notes
 
 - Default list table columns: `ACCOUNT`, `PLAN`, `5H USAGE`, `WEEKLY`, `LAST ACTIVITY`.
+- `list` adds a zero-padded leading row number for selectable accounts, such as `01`, `02`.
 - Human-readable `list`, `switch`, and `remove` group records by email when the same email owns multiple account snapshots.
 - In grouped output:
   - the top-level email line is a header only
@@ -295,7 +296,7 @@ Latest rollout `.jsonl` rate limit record shape (from an `event_msg` + `token_co
   - otherwise the child label is the plan name (`team`, `plus`, etc.)
   - repeated plans under the same email are rendered as stable numbered labels like `team #1`, `team #2`
 - Single-account emails still render as one flat row; when an alias is set, that row shows `(alias)email`.
-- The switch/remove UI shows `ACCOUNT`, `PLAN`, `5H`, `WEEKLY`, `LAST`.
+- The switch/remove UI shows `ACCOUNT`, `PLAN`, `5H`, `WEEKLY`, `LAST`, and preserves grouped child indentation.
 - Usage limit cells show remaining percent plus reset time: `NN% (HH:MM)` for same-day resets, or `NN% (HH:MM on D Mon)` when the reset is on a different day.
 - `LAST ACTIVITY` is derived from `last_usage_at` and rendered as a relative time like `Now` or `2m ago`.
 - `PLAN` comes from the auth claim when available, and falls back to the last usage snapshot's `plan_type` (e.g. `free`, `plus`, `team`).

src/cli.zig

@@ -1622,7 +1622,10 @@ fn renderSwitchList(
         try out.writeAll(if (is_selected) "> " else "  ");
         try writeIndexPadded(out, selectable_counter + 1, idx_width);
         try out.writeAll(" ");
-        try writeTruncatedPadded(out, row.account, widths.email);
+        const indent: usize = @as(usize, row.depth) * 2;
+        const indent_to_print: usize = @min(indent, widths.email);
+        try writeRepeat(out, ' ', indent_to_print);
+        try writeTruncatedPadded(out, row.account, widths.email - indent_to_print);
         try out.writeAll("  ");
         try writeTruncatedPadded(out, row.plan, widths.plan);
         try out.writeAll("  ");
@@ -1700,7 +1703,10 @@ fn renderRemoveList(
         try out.writeAll(" ");
         try writeIndexPadded(out, selectable_counter + 1, idx_width);
         try out.writeAll(" ");
-        try writeTruncatedPadded(out, row.account, widths.email);
+        const indent: usize = @as(usize, row.depth) * 2;
+        const indent_to_print: usize = @min(indent, widths.email);
+        try writeRepeat(out, ' ', indent_to_print);
+        try writeTruncatedPadded(out, row.account, widths.email - indent_to_print);
         try out.writeAll("  ");
         try writeTruncatedPadded(out, row.plan, widths.plan);
         try out.writeAll("  ");
@@ -1754,6 +1760,13 @@ fn writeTruncatedPadded(out: *std.Io.Writer, value: []const u8, width: usize) !v
     try out.writeAll(".");
 }
 
+fn writeRepeat(out: *std.Io.Writer, ch: u8, count: usize) !void {
+    var i: usize = 0;
+    while (i < count) : (i += 1) {
+        try out.writeByte(ch);
+    }
+}
+
 const SwitchWidths = struct {
     email: usize,
     plan: usize,
@@ -1769,6 +1782,7 @@ const SwitchRow = struct {
     rate_5h: []u8,
     rate_week: []u8,
     last: []u8,
+    depth: u8,
     is_active: bool,
     is_header: bool,
 
@@ -1820,10 +1834,11 @@ fn buildSwitchRows(allocator: std.mem.Allocator, reg: *registry.Registry) !Switc
                 .rate_5h = rate_5h_str,
                 .rate_week = rate_week_str,
                 .last = last,
+                .depth = display_row.depth,
                 .is_active = display_row.is_active,
                 .is_header = false,
             };
-            widths.email = @max(widths.email, display_row.account_cell.len);
+            widths.email = @max(widths.email, display_row.account_cell.len + (@as(usize, display_row.depth) * 2));
             widths.plan = @max(widths.plan, plan.len);
             widths.rate_5h = @max(widths.rate_5h, rate_5h_str.len);
             widths.rate_week = @max(widths.rate_week, rate_week_str.len);
@@ -1836,10 +1851,11 @@ fn buildSwitchRows(allocator: std.mem.Allocator, reg: *registry.Registry) !Switc
                 .rate_5h = try allocator.dupe(u8, ""),
                 .rate_week = try allocator.dupe(u8, ""),
                 .last = try allocator.dupe(u8, ""),
+                .depth = display_row.depth,
                 .is_active = false,
                 .is_header = true,
             };
-            widths.email = @max(widths.email, display_row.account_cell.len);
+            widths.email = @max(widths.email, display_row.account_cell.len + (@as(usize, display_row.depth) * 2));
         }
     }
     if (widths.email > 32) widths.email = 32;
@@ -1882,10 +1898,11 @@ fn buildSwitchRowsFromIndices(
                 .rate_5h = rate_5h_str,
                 .rate_week = rate_week_str,
                 .last = last,
+                .depth = display_row.depth,
                 .is_active = display_row.is_active,
                 .is_header = false,
             };
-            widths.email = @max(widths.email, display_row.account_cell.len);
+            widths.email = @max(widths.email, display_row.account_cell.len + (@as(usize, display_row.depth) * 2));
             widths.plan = @max(widths.plan, plan.len);
             widths.rate_5h = @max(widths.rate_5h, rate_5h_str.len);
             widths.rate_week = @max(widths.rate_week, rate_week_str.len);
@@ -1898,10 +1915,11 @@ fn buildSwitchRowsFromIndices(
                 .rate_5h = try allocator.dupe(u8, ""),
                 .rate_week = try allocator.dupe(u8, ""),
                 .last = try allocator.dupe(u8, ""),
+                .depth = display_row.depth,
                 .is_active = false,
                 .is_header = true,
             };
-            widths.email = @max(widths.email, display_row.account_cell.len);
+            widths.email = @max(widths.email, display_row.account_cell.len + (@as(usize, display_row.depth) * 2));
         }
     }
     if (widths.email > 32) widths.email = 32;
@@ -2046,3 +2064,64 @@ test "Scenario: Given q quit input when checking switch picker helpers then both
     try std.testing.expect(isQuitKey('Q'));
     try std.testing.expect(!isQuitKey('j'));
 }
+
+fn makeTestRegistry() registry.Registry {
+    return .{
+        .schema_version = registry.current_schema_version,
+        .active_account_key = null,
+        .active_account_activated_at_ms = null,
+        .auto_switch = registry.defaultAutoSwitchConfig(),
+        .api = registry.defaultApiConfig(),
+        .accounts = std.ArrayList(registry.AccountRecord).empty,
+    };
+}
+
+fn appendTestAccount(
+    allocator: std.mem.Allocator,
+    reg: *registry.Registry,
+    record_key: []const u8,
+    email: []const u8,
+    alias: []const u8,
+    plan: registry.PlanType,
+) !void {
+    const sep = std.mem.lastIndexOf(u8, record_key, "::") orelse return error.InvalidRecordKey;
+    const chatgpt_user_id = record_key[0..sep];
+    const chatgpt_account_id = record_key[sep + 2 ..];
+    try reg.accounts.append(allocator, .{
+        .account_key = try allocator.dupe(u8, record_key),
+        .chatgpt_account_id = try allocator.dupe(u8, chatgpt_account_id),
+        .chatgpt_user_id = try allocator.dupe(u8, chatgpt_user_id),
+        .email = try allocator.dupe(u8, email),
+        .alias = try allocator.dupe(u8, alias),
+        .account_name = null,
+        .plan = plan,
+        .auth_mode = .chatgpt,
+        .created_at = 1,
+        .last_used_at = null,
+        .last_usage = null,
+        .last_usage_at = null,
+        .last_local_rollout = null,
+    });
+}
+
+test "Scenario: Given grouped accounts when rendering switch list then child rows keep indentation" {
+    const gpa = std.testing.allocator;
+    var reg = makeTestRegistry();
+    defer reg.deinit(gpa);
+
+    try appendTestAccount(gpa, &reg, "user-1::acc-1", "user@example.com", "", .team);
+    reg.accounts.items[0].account_name = try gpa.dupe(u8, "Als's Workspace");
+    try appendTestAccount(gpa, &reg, "user-1::acc-2", "user@example.com", "", .free);
+
+    var rows = try buildSwitchRows(gpa, &reg);
+    defer rows.deinit(gpa);
+
+    var buffer: [2048]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buffer);
+    const idx_width = @max(@as(usize, 2), indexWidth(rows.selectable_row_indices.len));
+    try renderSwitchList(&writer, &reg, rows.items, idx_width, rows.widths, null, false);
+
+    const output = writer.buffered();
+    try std.testing.expect(std.mem.indexOf(u8, output, "01   Als's Workspace") != null);
+    try std.testing.expect(std.mem.indexOf(u8, output, "02   free") != null);
+}

src/format.zig

@@ -31,6 +31,11 @@ fn printAccountsTable(reg: *registry.Registry) !void {
     var stdout: io_util.Stdout = undefined;
     stdout.init();
     const out = stdout.out();
+    try writeAccountsTable(out, reg, colorEnabled());
+    try out.flush();
+}
+
+fn writeAccountsTable(out: *std.Io.Writer, reg: *registry.Registry, use_color: bool) !void {
     const headers = [_][]const u8{ "ACCOUNT", "PLAN", "5H USAGE", "WEEKLY USAGE", "LAST ACTIVITY" };
     var widths = [_]usize{
         headers[0].len,
@@ -40,11 +45,11 @@ fn printAccountsTable(reg: *registry.Registry) !void {
         headers[4].len,
     };
     const now = std.time.timestamp();
-    const prefix_len: usize = 2;
-    const sep_len: usize = 2;
-
     var display = try display_rows.buildDisplayRows(std.heap.page_allocator, reg, null);
     defer display.deinit(std.heap.page_allocator);
+    const idx_width = @max(@as(usize, 2), indexWidth(display.selectable_row_indices.len));
+    const prefix_len: usize = 2 + idx_width + 1;
+    const sep_len: usize = 2;
 
     for (display.rows) |row| {
         const indent: usize = @as(usize, row.depth) * 2;
@@ -70,7 +75,6 @@ fn printAccountsTable(reg: *registry.Registry) !void {
 
     adjustListWidths(&widths, prefix_len, sep_len);
 
-    const use_color = colorEnabled();
     const h0 = try truncateAlloc(headers[0], widths[0]);
     defer std.heap.page_allocator.free(h0);
     const h1 = try truncateAlloc(headers[1], widths[1]);
@@ -86,7 +90,7 @@ fn printAccountsTable(reg: *registry.Registry) !void {
     defer std.heap.page_allocator.free(h4);
 
     if (use_color) try out.writeAll(ansi.dim);
-    try out.writeAll("  ");
+    try writeRepeat(out, ' ', prefix_len);
     try writePadded(out, h0, widths[0]);
     try out.writeAll("  ");
     try writePadded(out, h1, widths[1]);
@@ -102,6 +106,7 @@ fn printAccountsTable(reg: *registry.Registry) !void {
     try out.writeAll("\n");
     if (use_color) try out.writeAll(ansi.reset);
 
+    var selectable_counter: usize = 0;
     for (display.rows) |row| {
         if (row.account_index) |account_idx| {
             const rec = reg.accounts.items[account_idx];
@@ -134,6 +139,8 @@ fn printAccountsTable(reg: *registry.Registry) !void {
                 }
             }
             try out.writeAll(if (row.is_active) "* " else "  ");
+            try writeIndexPadded(out, selectable_counter + 1, idx_width);
+            try out.writeAll(" ");
             try writeRepeat(out, ' ', indent_to_print);
             try writePadded(out, account_cell, widths[0] - indent_to_print);
             try out.writeAll("  ");
@@ -146,18 +153,17 @@ fn printAccountsTable(reg: *registry.Registry) !void {
             try writePadded(out, last_cell, widths[4]);
             try out.writeAll("\n");
             if (use_color) try out.writeAll(ansi.reset);
+            selectable_counter += 1;
         } else {
             const account_cell = try truncateAlloc(row.account_cell, widths[0]);
             defer std.heap.page_allocator.free(account_cell);
             if (use_color) try out.writeAll(ansi.dim);
-            try out.writeAll("  ");
+            try writeRepeat(out, ' ', prefix_len);
             try writePadded(out, account_cell, widths[0]);
             try out.writeAll("\n");
             if (use_color) try out.writeAll(ansi.reset);
         }
     }
-
-    try out.flush();
 }
 
 fn resolveRateWindow(usage: ?registry.RateLimitSnapshot, minutes: i64, fallback_primary: bool) ?registry.RateLimitWindow {
@@ -570,6 +576,66 @@ fn truncateAlloc(value: []const u8, max_len: usize) ![]u8 {
     return std.fmt.allocPrint(std.heap.page_allocator, "{s}.", .{value[0 .. max_len - 1]});
 }
 
+fn writeIndexPadded(out: *std.Io.Writer, idx: usize, width: usize) !void {
+    var buf: [16]u8 = undefined;
+    const idx_str = std.fmt.bufPrint(&buf, "{d}", .{idx}) catch "0";
+    if (idx_str.len < width) {
+        var pad: usize = width - idx_str.len;
+        while (pad > 0) : (pad -= 1) {
+            try out.writeAll("0");
+        }
+    }
+    try out.writeAll(idx_str);
+}
+
+fn indexWidth(count: usize) usize {
+    var n = count;
+    var width: usize = 1;
+    while (n >= 10) : (n /= 10) {
+        width += 1;
+    }
+    return width;
+}
+
+fn makeTestRegistry() registry.Registry {
+    return .{
+        .schema_version = registry.current_schema_version,
+        .active_account_key = null,
+        .active_account_activated_at_ms = null,
+        .auto_switch = registry.defaultAutoSwitchConfig(),
+        .api = registry.defaultApiConfig(),
+        .accounts = std.ArrayList(registry.AccountRecord).empty,
+    };
+}
+
+fn appendTestAccount(
+    allocator: std.mem.Allocator,
+    reg: *registry.Registry,
+    record_key: []const u8,
+    email: []const u8,
+    alias: []const u8,
+    plan: registry.PlanType,
+) !void {
+    const sep = std.mem.lastIndexOf(u8, record_key, "::") orelse return error.InvalidRecordKey;
+    const chatgpt_user_id = record_key[0..sep];
+    const chatgpt_account_id = record_key[sep + 2 ..];
+    try reg.accounts.append(allocator, .{
+        .account_key = try allocator.dupe(u8, record_key),
+        .chatgpt_account_id = try allocator.dupe(u8, chatgpt_account_id),
+        .chatgpt_user_id = try allocator.dupe(u8, chatgpt_user_id),
+        .email = try allocator.dupe(u8, email),
+        .alias = try allocator.dupe(u8, alias),
+        .account_name = null,
+        .plan = plan,
+        .auth_mode = .chatgpt,
+        .created_at = 1,
+        .last_used_at = null,
+        .last_usage = null,
+        .last_usage_at = null,
+        .last_local_rollout = null,
+    });
+}
+
 test "printTableRow handles long cells without underflow" {
     var buffer: [256]u8 = undefined;
     var writer: std.Io.Writer = .fixed(&buffer);
@@ -601,3 +667,21 @@ test "formatRateLimitFullAlloc shows 100% after reset instead of dash-prefixed v
 
     try std.testing.expectEqualStrings("100%", formatted);
 }
+
+test "writeAccountsTable shows zero-padded row numbers for selectable accounts" {
+    const gpa = std.testing.allocator;
+    var reg = makeTestRegistry();
+    defer reg.deinit(gpa);
+
+    try appendTestAccount(gpa, &reg, "user-1::acc-1", "user@example.com", "", .team);
+    reg.accounts.items[0].account_name = try gpa.dupe(u8, "Als's Workspace");
+    try appendTestAccount(gpa, &reg, "user-1::acc-2", "user@example.com", "", .free);
+
+    var buffer: [2048]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buffer);
+    try writeAccountsTable(&writer, &reg, false);
+
+    const output = writer.buffered();
+    try std.testing.expect(std.mem.indexOf(u8, output, "01   Als's Workspace") != null);
+    try std.testing.expect(std.mem.indexOf(u8, output, "02   free") != null);
+}