easy-codex 0.2.0 → 0.2.1

package/README.md

@@ -19,7 +19,7 @@ easy-codex
 显示透明圆环（macOS）：
 
 ```sh
-easy-codex overlay
+easy-codex show
 ```
 
 需要 Node.js 22+ 和已登录的官方 Codex CLI。安装包自带浮窗，使用者无需下载源码、安装依赖或编译。
@@ -48,7 +48,7 @@ npm test
 macOS 14+ 安装后运行：
 
 ```sh
-easy-codex overlay
+easy-codex show
 ```
 
 独立 AppKit 浮窗在 Codex 位于前台时显示，切到其他应用、最小化或关闭 Codex 窗口后隐藏。默认位于 Codex 窗口左下角头像上方；拖动可校准位置，偏移量保存在本机。它按窗口边界跟随，不自动识别头像；侧栏布局变化后可再次拖动。首版跟随最前面的一个 Codex 普通窗口。
@@ -81,3 +81,9 @@ GitHub Actions 在 `v*` 标签上测试、构建通用 macOS 浮窗，并发布
 ## 电子时钟
 
 透明时钟位于圆环上方，竖排居中，默认间距10px，可独立拖动。默认硅谷，城市顺序为硅谷、洛杉矶、西雅图、华盛顿特区、哥伦布（俄亥俄州）、新加坡、上海，也可自定义 IANA 时区；设置自动保存。仅显示时分，按目标当地时间00–09红色、09–15绿色、15–24橙色，自动处理夏令时，不修改电脑系统时区。菜单“恢复默认位置”应用竖排默认布局；已有拖动位置继续保留。
+
+
+
+浮窗使用 `easy-codex show` 启动；原 `overlay` 命令保留兼容。
+
+周倒计时只显示最大单位，例如“6天后 25日 06:17 重置”，不足一天按小时、不足一小时按分钟。5小时窗口保留时分组合，例如“3小时2分后 07:59 重置”，没有小时则“22分后 07:59 重置”，省略为零的单位。绝对重置时刻使用电脑本地时区；周含日，5小时不含日期。

package/bin/easy-codex.js

@@ -5,16 +5,16 @@ import { readUsage, formatUsage } from '../src/usage.js';
 
 const args = process.argv.slice(2);
 if (args.length === 1 && ['--help', '-h'].includes(args[0])) {
-  console.log('用法：easy-codex [usage|overlay]\n显示已登录 Codex 账号的剩余百分比和重置时间。需要官方 Codex CLI。');
+  console.log('用法：easy-codex [usage|show|overlay]\n显示已登录 Codex 账号的剩余百分比和重置时间。需要官方 Codex CLI。');
 } else if (args.length === 1 && ['--version', '-v'].includes(args[0])) {
   console.log(version);
-} else if (args.length === 1 && args[0] === 'overlay') {
+} else if (args.length === 1 && ['show', 'overlay'].includes(args[0])) {
   try { const { launchOverlay } = await import('../src/overlay.js'); await launchOverlay(); }
   catch (error) { console.error(`easy-codex: ${error.message}`); process.exitCode = 1; }
 } else if (args.length === 0 || (args.length === 1 && args[0] === 'usage')) {
   try { console.log(formatUsage(await readUsage())); }
   catch (error) { console.error(`easy-codex: ${error.message}`); process.exitCode = 1; }
 } else {
-  console.error('未知参数。用法：easy-codex [usage|overlay]，或 easy-codex --help');
+  console.error('未知参数。用法：easy-codex [usage|show|overlay]，或 easy-codex --help');
   process.exitCode = 1;
 }

package/native/Overlay.swift

@@ -161,6 +161,29 @@ struct ClockCity {
     ]
 }
 
+func resetDescription(_ resetsAt: Double?, weekly: Bool, now: Date = Date(), zone: TimeZone = .current) -> String {
+    guard let resetsAt, resetsAt.isFinite, abs(resetsAt) < 8.64e12 else { return "重置时间未知" }
+    let remaining = resetsAt - now.timeIntervalSince1970
+    guard remaining > 0 else { return "已到重置时间，等待更新" }
+    let formatter = DateFormatter()
+    formatter.locale = Locale(identifier: "zh_CN")
+    formatter.timeZone = zone
+    formatter.dateFormat = weekly ? "d'日' HH:mm" : "HH:mm"
+    let time = formatter.string(from: Date(timeIntervalSince1970: resetsAt))
+    let duration: String
+    if weekly {
+        if remaining >= 86400 { duration = "\(Int(remaining / 86400))天" }
+        else if remaining >= 3600 { duration = "\(Int(remaining / 3600))小时" }
+        else { duration = "\(Int(ceil(remaining / 60)))分钟" }
+    } else {
+        let totalMinutes = Int(ceil(remaining / 60))
+        let hours = totalMinutes / 60
+        let minutes = totalMinutes % 60
+        duration = (hours > 0 ? "\(hours)小时" : "") + (minutes > 0 ? "\(minutes)分" : "")
+    }
+    return "\(duration)后 \(time) 重置"
+}
+
 func clockText(at date: Date, zone: TimeZone) -> String {
     let formatter = DateFormatter()
     formatter.locale = Locale(identifier: "en_US_POSIX")
@@ -372,15 +395,8 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
             let id = minutes == 10080 ? "weekly" : "fiveHour"
             guard let window = codexWindow(snapshot?.windows ?? [], minutes: minutes) else { continue }
             let remaining = window.remaining.map { "\(Int($0.rounded()))%" } ?? "未知"
-            let reset: String
-            if let seconds = window.resetsAt {
-                let formatter = DateFormatter()
-                formatter.locale = Locale(identifier: "zh_CN")
-                formatter.timeZone = .current
-                formatter.dateFormat = "MM-dd HH:mm"
-                reset = formatter.string(from: Date(timeIntervalSince1970: seconds))
-            } else { reset = "未知" }
-            let option = item("\(label) · \(remaining) · 重置 \(reset)", #selector(selectPercentage(_:)))
+            let reset = resetDescription(window.resetsAt, weekly: minutes == 10080)
+            let option = item("\(label) · \(remaining) · \(reset)", #selector(selectPercentage(_:)))
             option.representedObject = id
             option.state = (ring.displaysWeeklyPercentage == (id == "weekly")) ? .on : .off
             menu.addItem(option)
@@ -388,7 +404,7 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
         menu.addItem(item(query == nil ? "立即刷新" : "正在刷新…", query == nil ? #selector(refresh) : nil))
         menu.addItem(item("恢复默认位置", #selector(resetPosition)))
         menu.addItem(.separator())
-        let toggle = item("显示电子时钟", #selector(toggleClock))
+        let toggle = item("显示时间", #selector(toggleClock))
         toggle.state = clockEnabled ? .on : .off
         menu.addItem(toggle)
         let zones = NSMenu()
@@ -399,7 +415,7 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
             zones.addItem(option)
         }
         zones.addItem(item("自定义时区…", #selector(customTimeZone)))
-        let zoneItem = item("时区 · \(clock.cityName)", nil)
+        let zoneItem = item("\(clock.cityName)·\(clockText(at: Date(), zone: clock.zone))", nil)
         zoneItem.submenu = zones
         menu.addItem(zoneItem)
         menu.addItem(.separator())
@@ -479,6 +495,19 @@ struct Main {
             let otherHours = UsageWindow(id: "other:primary", label: "5小时", name: "other", remaining: 10, resetsAt: nil, windowDurationMins: 300)
             precondition(codexWindow([otherHours, weekOnly], minutes: 10080)?.remaining == 80)
             precondition(codexWindow([otherHours, weekOnly], minutes: 300) == nil)
+            let countdownStart = ISO8601DateFormatter().date(from: "2026-10-15T04:57:00Z")!
+            let countdownUTC = TimeZone(secondsFromGMT: 0)!
+            precondition(resetDescription(countdownStart.timeIntervalSince1970 + 10920, weekly: false, now: countdownStart, zone: countdownUTC) == "3小时2分后 07:59 重置")
+            let weekStart = ISO8601DateFormatter().date(from: "2026-10-14T08:03:00Z")!
+            precondition(resetDescription(weekStart.timeIntervalSince1970 + 345360, weekly: true, now: weekStart, zone: countdownUTC) == "3天后 18日 07:59 重置")
+            precondition(resetDescription(nil, weekly: true) == "重置时间未知")
+            precondition(resetDescription(countdownStart.timeIntervalSince1970, weekly: false, now: countdownStart) == "已到重置时间，等待更新")
+            precondition(resetDescription(countdownStart.timeIntervalSince1970 + 1, weekly: false, now: countdownStart, zone: countdownUTC) == "1分后 04:57 重置")
+            precondition(resetDescription(countdownStart.timeIntervalSince1970 + 86160, weekly: true, now: countdownStart, zone: countdownUTC) == "23小时后 16日 04:53 重置")
+            precondition(resetDescription(countdownStart.timeIntervalSince1970 + 120, weekly: true, now: countdownStart, zone: countdownUTC) == "2分钟后 15日 04:59 重置")
+            precondition(resetDescription(countdownStart.timeIntervalSince1970 + 86400, weekly: true, now: countdownStart, zone: countdownUTC) == "1天后 16日 04:57 重置")
+            precondition(resetDescription(countdownStart.timeIntervalSince1970 + 86399, weekly: true, now: countdownStart, zone: countdownUTC) == "23小时后 16日 04:56 重置")
+            precondition(resetDescription(countdownStart.timeIntervalSince1970 + 3599, weekly: false, now: countdownStart, zone: countdownUTC) == "1小时后 05:56 重置")
             let testRing = RingView()
             testRing.showFiveHourRing = false
             precondition(testRing.displaysWeeklyPercentage)

package/native/build/EasyCodexOverlay.app/Contents/Info.plist

@@ -5,7 +5,7 @@
 <key>CFBundleIdentifier</key><string>com.unionschool.easy-codex.overlay</string>
 <key>CFBundleName</key><string>Easy Codex Overlay</string>
 <key>CFBundlePackageType</key><string>APPL</string>
-<key>CFBundleShortVersionString</key><string>0.2.0</string>
+<key>CFBundleShortVersionString</key><string>0.2.1</string>
 <key>LSMinimumSystemVersion</key><string>14.0</string>
 <key>LSUIElement</key><true/>
 <key>NSHighResolutionCapable</key><true/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-codex",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Codex usage limits and transparent world clock overlay",
   "type": "module",
   "bin": {