opencode-swap 0.4.2__tar.gz → 0.4.3__tar.gz

{opencode_swap-0.4.2 → opencode_swap-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: opencode-swap
-Version: 0.4.2
+Version: 0.4.3
 Summary: Multi-account switcher for OpenCode
 Project-URL: Homepage, https://github.com/leinardi/opencode-swap
 Project-URL: Repository, https://github.com/leinardi/opencode-swap

{opencode_swap-0.4.2 → opencode_swap-0.4.3}/integrations/opencode-tui-plugin/src/tui.tsx

@@ -204,12 +204,14 @@ function usageWindowDetail(window: UsageWindow): UsageDetail | undefined {
   }
   const date = new Date(resetAt);
   if (Number.isNaN(date.getTime())) return { label, percent, band };
-  // Reset under 24h *in the future* renders as bare "HH:MM", matching
-  // cli.py's _format_reset; a past or non-finite delta always gets the full
-  // date so a stale/expired reset never reads as "today".
+  // A reset on today's local date renders as bare "HH:MM", matching cli.py's
+  // _format_reset; anything on another date keeps the full date, so tomorrow
+  // morning (under 24h away, but not today) never reads as "today".
   const hhmm = `${String(date.getHours()).padStart(2, "0")}:${String(date.getMinutes()).padStart(2, "0")}`;
-  const deltaMs = resetAt - Date.now();
-  if (deltaMs >= 0 && deltaMs < 86_400_000) return { label, percent, band, reset: hhmm };
+  const now = new Date();
+  if (date.getFullYear() === now.getFullYear() && date.getMonth() === now.getMonth() && date.getDate() === now.getDate()) {
+    return { label, percent, band, reset: hhmm };
+  }
   const month = date.toLocaleString(undefined, { month: "short" });
   return { label, percent, band, reset: `${month} ${date.getDate()}, ${hhmm}` };
 }

{opencode_swap-0.4.2 → opencode_swap-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opencode-swap"
-version = "0.4.2"
+version = "0.4.3"
 description = "Multi-account switcher for OpenCode"
 readme = "README.md"
 requires-python = ">=3.12"

{opencode_swap-0.4.2 → opencode_swap-0.4.3}/src/opencode_swap/__init__.py

@@ -1,3 +1,3 @@
 """opencode-swap: multi-account switcher for OpenCode."""
 
-__version__ = "0.4.2"
+__version__ = "0.4.3"

{opencode_swap-0.4.2 → opencode_swap-0.4.3}/src/opencode_swap/cli.py

@@ -241,9 +241,13 @@ def _format_reset(reset_at: object) -> str | None:
         # reset time is shown in the user's local clock, same as time.time()
         # below it, so the timestamp must convert to local, not stay UTC.
         reset_time = datetime.fromtimestamp(reset_at / 1000, tz=UTC).astimezone()
+        now = datetime.fromtimestamp(time.time(), tz=UTC).astimezone()
     except (OverflowError, OSError, ValueError):
         return None
-    if 0 <= reset_at - time.time() * 1000 < 86_400_000:
+    # Bare "HH:MM" only for a reset on today's local date: an "under 24h away"
+    # test would print a bare time for tomorrow morning too, which reads as
+    # today and understates the wait.
+    if reset_time.date() == now.date():
         return f"{reset_time:%H:%M}"
     return f"{reset_time:%b} {reset_time.day}, {reset_time:%H:%M}"
 

{opencode_swap-0.4.2 → opencode_swap-0.4.3}/tests/test_cli.py

@@ -30,6 +30,17 @@ def auth_path(tmp_path):
     return tmp_path / "opencode" / "auth.json"
 
 
+@pytest.fixture
+def utc_clock():
+    """Pin the process' local timezone to UTC for one test, so assertions on
+    locally-rendered reset times do not depend on the machine's timezone."""
+    with pytest.MonkeyPatch.context() as mp:
+        mp.setenv("TZ", "UTC")
+        time.tzset()
+        yield
+    time.tzset()
+
+
 def write_live_account(tmp_path, account_id="acct-1", refresh="r1", extra=None):
     entry = {
         "type": "oauth",
@@ -340,7 +351,9 @@ def test_format_usage_shows_both_windows(monkeypatch):
     assert ", " in output.split(" | ")[1]
 
 
-def test_format_usage_reset_under_a_day_shows_time_only(monkeypatch):
+def test_format_usage_reset_later_today_shows_time_only(monkeypatch, utc_clock):
+    # 1_751_310_000 is 2025-06-30 19:00 UTC; utc_clock pins TZ so the local
+    # date the formatter compares against is not the test machine's.
     monkeypatch.setattr(cli.time, "time", lambda: 1_751_310_000)
     output = cli._format_usage(
         UsageSnapshot(
@@ -349,8 +362,22 @@ def test_format_usage_reset_under_a_day_shows_time_only(monkeypatch):
         )
     )
 
-    # Reset under 24h away renders as bare "HH:MM", not a full date.
-    assert "," not in output
+    # Reset on today's local date renders as bare "HH:MM", not a full date.
+    assert output == "  usage: 5h 49% @20:00"
+
+
+def test_format_usage_reset_tomorrow_shows_date(monkeypatch, utc_clock):
+    monkeypatch.setattr(cli.time, "time", lambda: 1_751_310_000)
+    output = cli._format_usage(
+        UsageSnapshot(
+            available=True,
+            # 6h ahead: under 24h away, but on the next local date, so the
+            # date has to be shown or "@01:00" reads as earlier today.
+            windows=(UsageWindow(used_percent=41, reset_at=(1_751_310_000 + 6 * 3600) * 1000, window_seconds=7 * 86_400),),
+        )
+    )
+
+    assert output == "  usage: 7d 41% @Jul 1, 01:00"
 
 
 @pytest.mark.parametrize(