easy-codex 0.1.3 → 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,16 +48,16 @@ npm test
 macOS 14+ 安装后运行：
 
 ```sh
-easy-codex overlay
+easy-codex show
 ```
 
 独立 AppKit 浮窗在 Codex 位于前台时显示，切到其他应用、最小化或关闭 Codex 窗口后隐藏。默认位于 Codex 窗口左下角头像上方；拖动可校准位置，偏移量保存在本机。它按窗口边界跟随，不自动识别头像；侧栏布局变化后可再次拖动。首版跟随最前面的一个 Codex 普通窗口。
 
 - 圆环长度表示剩余百分比：大于 50% 绿色，20%–50% 橙色，低于 20% 红色。
-- 浮窗为头像大小（32×32），背景透明，无底板和阴影。圆环只显示百分比，无数据时显示 `—`，不显示窗口时长或状态文字；时长与状态见悬停提示和菜单。
+- 浮窗为头像大小（32×32），背景透明，无底板和阴影。圆环只显示剩余数字，不带 %，无数据时显示 `—`，不显示窗口时长或状态文字；时长与状态见悬停提示和菜单。
 - 未知或过期数据为灰色；失败后的过期说明见悬停提示。已到重置时间时也先标为过期，等待重新查询，不擅自恢复满额。
 - 浮窗可见时每 60 秒刷新，查询不会重叠；回到前台且距离上次查询超过 60 秒会刷新。
-- 默认优先 codex 额度桶，显示其中剩余比例最低的窗口；右键可切换其他窗口，不把各窗口相加。
+- 按服务端真实时长识别窗口并优先 codex 桶，不跨桶拼接：只有周额度时显示单周环和周剩余数字，不显示不存在的5小时项；两项都有时周外粗环、5小时内细环，均为实线剩余弧。菜单切换中心数字，显示本地时区重置时间。
 - 悬停查看额度详情与更新时间；双击刷新；右键或菜单栏 **EC** 可立即刷新、恢复默认位置、退出。
 - 这是 **CLI 登录账号** 的额度，不自动确认桌面端正在使用同一账号。切换账号后请核对并手动刷新。
 
@@ -77,3 +77,13 @@ node bin/easy-codex.js overlay
 GitHub Actions 在 `v*` 标签上测试、构建通用 macOS 浮窗，并发布 npm 包。标签必须与 package.json 版本一致；预发布版本使用 `next`，正式版本使用 `latest`。发布任务使用 GitHub `npm` Environment，部署记录链接到 npm 包。
 
 首次发布需配置仓库 Secret `NPM_TOKEN`（具有该包发布权限、允许自动化发布的 npm Token）。不要把凭据写入源码。修改版本后创建对应标签触发发布；失败可在 Actions 中重新运行任务。
+
+## 电子时钟
+
+透明时钟位于圆环上方，竖排居中，默认间距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

@@ -7,7 +7,15 @@ struct UsageWindow: Decodable {
     let name: String
     let remaining: Double?
     let resetsAt: Double?
+    let windowDurationMins: Double?
 }
+// 主次窗口随套餐变化，只按服务端时长识别，且不跨额度桶拼接。
+func codexWindow(_ windows: [UsageWindow], minutes: Double) -> UsageWindow? {
+    let bucket = windows.contains { $0.id.hasPrefix("codex:") } ? "codex" : windows.first?.id.components(separatedBy: ":").first
+    guard let bucket else { return nil }
+    return windows.first { $0.id.hasPrefix(bucket + ":") && $0.windowDurationMins == minutes }
+}
+
 struct Snapshot: Decodable {
     var windows: [UsageWindow] = []
     var detail: String = ""
@@ -68,8 +76,14 @@ func targetWindow() -> CGRect? {
 }
 
 @MainActor
-final class RingView: NSView {
+class RingView: NSView {
     var remaining: Double?
+    var weeklyRemaining: Double?
+    var weeklyStale = true
+    var showWeeklyPercentage = false
+    var showWeeklyRing = true
+    var showFiveHourRing = true
+    var displaysWeeklyPercentage: Bool { showWeeklyRing && (showWeeklyPercentage || !showFiveHourRing) }
     var stale = true
     var caption = "等待额度"
     var makeMenu: (() -> NSMenu)?
@@ -80,23 +94,31 @@ final class RingView: NSView {
     private var originStart = CGPoint.zero
 
     override func draw(_ dirtyRect: NSRect) {
+        if showWeeklyRing { drawRing(radius: 14, remaining: weeklyRemaining, stale: weeklyStale, dashed: true) }
+        if showFiveHourRing { drawRing(radius: showWeeklyRing ? 10 : 14, remaining: remaining, stale: stale) }
+        let useWeekly = displaysWeeklyPercentage
+        let percentage = useWeekly ? weeklyRemaining : remaining
+        let percentageStale = useWeekly ? weeklyStale : stale
+        let state = RingState.resolve(percentage, stale: percentageStale)
+        let text = percentage.map { "\(Int($0.rounded()))" } ?? "—"
+        drawText(text, y: 10, font: .monospacedDigitSystemFont(ofSize: 9, weight: .semibold), color: state.color)
+    }
+    private func drawRing(radius: CGFloat, remaining: Double?, stale: Bool, dashed: Bool = false) {
         let center = CGPoint(x: bounds.midX, y: bounds.midY)
-        let track = NSBezierPath(ovalIn: CGRect(x: center.x - 14, y: center.y - 14, width: 28, height: 28))
-        track.lineWidth = 2
+        let track = NSBezierPath(ovalIn: CGRect(x: center.x - radius, y: center.y - radius,
+                                               width: radius * 2, height: radius * 2))
+        track.lineWidth = dashed ? 3 : 2
+        if dashed { track.setLineDash([2, 2], count: 2, phase: 0) }
         NSColor.labelColor.withAlphaComponent(0.12).setStroke()
         track.stroke()
-        let state = RingState.resolve(remaining, stale: stale)
-        if let remaining, remaining > 0, !stale {
-            let arc = NSBezierPath()
-            arc.lineWidth = 2
-            arc.lineCapStyle = .round
-            arc.appendArc(withCenter: center, radius: 14, startAngle: 90,
-                          endAngle: 90 - CGFloat(min(100, max(0, remaining))) * 3.6, clockwise: true)
-            state.color.setStroke()
-            arc.stroke()
-        }
-        let text = remaining.map { "\(Int($0.rounded()))%" } ?? "—"
-        drawText(text, y: 10, font: .monospacedDigitSystemFont(ofSize: 9, weight: .semibold), color: state.color)
+        guard let remaining, remaining > 0, !stale else { return }
+        let arc = NSBezierPath()
+        arc.lineWidth = dashed ? 3 : 2
+        arc.lineCapStyle = .round
+        arc.appendArc(withCenter: center, radius: radius, startAngle: 90,
+                      endAngle: 90 - CGFloat(min(100, max(0, remaining))) * 3.6, clockwise: true)
+        RingState.resolve(remaining, stale: stale).color.setStroke()
+        arc.stroke()
     }
     private func drawText(_ text: String, y: CGFloat, font: NSFont, color: NSColor) {
         let style = NSMutableParagraphStyle()
@@ -125,17 +147,94 @@ final class RingView: NSView {
     }
 }
 
+struct ClockCity {
+    let name: String
+    let identifier: String
+    static let presets: [ClockCity] = [
+        ClockCity(name: "硅谷", identifier: "America/Los_Angeles"),
+        ClockCity(name: "洛杉矶", identifier: "America/Los_Angeles"),
+        ClockCity(name: "西雅图", identifier: "America/Los_Angeles"),
+        ClockCity(name: "华盛顿", identifier: "America/New_York"),
+        ClockCity(name: "哥伦布", identifier: "America/New_York"),
+        ClockCity(name: "新加坡", identifier: "Asia/Singapore"),
+        ClockCity(name: "上海", identifier: "Asia/Shanghai")
+    ]
+}
+
+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")
+    formatter.timeZone = zone
+    formatter.dateFormat = "HH:mm"
+    return formatter.string(from: date)
+}
+
+func clockState(at date: Date, zone: TimeZone) -> RingState {
+    var calendar = Calendar(identifier: .gregorian)
+    calendar.timeZone = zone
+    let hour = calendar.component(.hour, from: date)
+    if hour >= 9 && hour < 15 { return .green }
+    if hour >= 15 { return .orange }
+    return .red
+}
+
+@MainActor
+final class ClockView: RingView {
+    var zone = TimeZone(identifier: "America/Los_Angeles")!
+    var cityName = "硅谷"
+    override func draw(_ dirtyRect: NSRect) {
+        let style = NSMutableParagraphStyle()
+        style.alignment = .center
+        let now = Date()
+        let time = clockText(at: now, zone: zone)
+        (time as NSString).draw(in: CGRect(x: 0, y: 17, width: bounds.width, height: 25),
+            withAttributes: [.font: NSFont.monospacedDigitSystemFont(ofSize: 13, weight: .medium),
+                             .foregroundColor: clockState(at: now, zone: zone).color, .paragraphStyle: style])
+        let city = cityName
+        (city as NSString).draw(in: CGRect(x: 0, y: 1, width: bounds.width, height: 15),
+            withAttributes: [.font: NSFont.systemFont(ofSize: 9),
+                             .foregroundColor: NSColor.secondaryLabelColor, .paragraphStyle: style])
+    }
+}
+
 @MainActor
 final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
     let panel = NSPanel(contentRect: CGRect(x: 0, y: 0, width: 32, height: 32),
                         styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: false)
     let ring = RingView(frame: CGRect(x: 0, y: 0, width: 32, height: 32))
+    let clockPanel = NSPanel(contentRect: CGRect(x: 0, y: 0, width: 48, height: 46),
+                             styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: false)
+    let clock = ClockView(frame: CGRect(x: 0, y: 0, width: 48, height: 46))
+    var clockInset = CGPoint(x: 2, y: 116)
+    var clockEnabled = true
     var status: NSStatusItem?
     var timer: Timer?
     var query: Process?
     var snapshot: Snapshot?
     var error: String?
-    var selectedID: String?
     var lastAttempt = Date.distantPast
     var lastRect: CGRect?
     var inset = CGPoint(x: 10, y: 74)
@@ -153,7 +252,32 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
         if prefs.object(forKey: "leftInset") != nil {
             inset = CGPoint(x: prefs.double(forKey: "leftInset"), y: prefs.double(forKey: "bottomInset"))
         }
-        selectedID = prefs.string(forKey: "selectedWindow")
+        if let identifier = prefs.string(forKey: "clockTimeZone"), let zone = TimeZone(identifier: identifier) {
+            clock.zone = zone
+            let savedCity = prefs.string(forKey: "clockCity")
+            let preset = ClockCity.presets.first { $0.name == savedCity && $0.identifier == identifier }
+                ?? ClockCity.presets.first { $0.identifier == identifier }
+            clock.cityName = preset?.name ?? identifier
+        }
+        ring.showWeeklyPercentage = prefs.bool(forKey: "showWeeklyPercentage")
+        clockEnabled = prefs.object(forKey: "clockEnabled") == nil || prefs.bool(forKey: "clockEnabled")
+        if prefs.object(forKey: "clockLeftInset") != nil {
+            clockInset = CGPoint(x: prefs.double(forKey: "clockLeftInset"), y: prefs.double(forKey: "clockBottomInset"))
+        }
+        clockPanel.isOpaque = false
+        clockPanel.backgroundColor = .clear
+        clockPanel.hasShadow = false
+        clockPanel.level = .floating
+        clockPanel.hidesOnDeactivate = false
+        clockPanel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
+        clockPanel.contentView = clock
+        clock.makeMenu = { [weak self] in self?.makeMenu() ?? NSMenu() }
+        clock.moved = { [weak self] point in
+            guard let self, let rect = self.lastRect else { return }
+            self.clockInset = CGPoint(x: point.x - rect.minX, y: point.y - rect.minY)
+            prefs.set(self.clockInset.x, forKey: "clockLeftInset")
+            prefs.set(self.clockInset.y, forKey: "clockBottomInset")
+        }
         panel.isOpaque = false
         panel.backgroundColor = .clear
         panel.hasShadow = false
@@ -179,32 +303,49 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
         NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(hide), name: NSWorkspace.didDeactivateApplicationNotification, object: nil)
         tick()
     }
-    @objc func hide() { panel.orderOut(nil) }
+    @objc func hide() { panel.orderOut(nil); clockPanel.orderOut(nil) }
     @objc func tick() {
-        guard let rect = targetWindow() else { panel.orderOut(nil); lastRect = nil; return }
+        guard let rect = targetWindow() else { hide(); lastRect = nil; return }
         lastRect = rect
+        if clockEnabled {
+            if !clock.dragging {
+                let x: CGFloat = max(rect.minX, min(rect.maxX - 48, rect.minX + clockInset.x))
+                let y: CGFloat = max(rect.minY, min(rect.maxY - 46, rect.minY + clockInset.y))
+                clockPanel.setFrameOrigin(CGPoint(x: x, y: y))
+            }
+            clock.needsDisplay = true
+            clock.toolTip = "\(clock.cityName) · \(clock.zone.identifier)"
+            clock.setAccessibilityLabel("\(clock.cityName) \(clock.zone.identifier) \(clockText(at: Date(), zone: clock.zone))")
+            if !clockPanel.isVisible { clockPanel.orderFrontRegardless() }
+        } else { clockPanel.orderOut(nil) }
         if !ring.dragging { panel.setFrameOrigin(ringOrigin(in: rect, inset: inset)) }
         if !panel.isVisible { panel.orderFrontRegardless() }
         if Date().timeIntervalSince(lastAttempt) >= 60 { refresh() }
         updateRing()
     }
-    var chosen: UsageWindow? {
-        guard let windows = snapshot?.windows else { return nil }
-        if let selectedID { return windows.first { $0.id == selectedID } }
-        // 默认优先 codex 桶，取其中最紧张的窗口，不把不同窗口相加。
-        let codex = windows.filter { $0.id.hasPrefix("codex:") }
-        return (codex.isEmpty ? windows : codex).filter { $0.remaining != nil }.min { $0.remaining! < $1.remaining! }
-            ?? windows.first
-    }
     func updateRing() {
-        let stale = error != nil || snapshot == nil || Date().timeIntervalSince1970 - (snapshot?.fetchedAt ?? 0) > 120
-            || (chosen?.resetsAt.map { $0 <= Date().timeIntervalSince1970 } ?? false)
-        ring.remaining = chosen?.remaining
-        ring.stale = stale
-        ring.caption = stale ? (snapshot == nil ? "等待额度" : "数据过期") : chosen?.label ?? "额度未知"
+        let windows = snapshot?.windows ?? []
+        let weekly = codexWindow(windows, minutes: 10080)
+        let fiveHour = codexWindow(windows, minutes: 300)
+        let now = Date().timeIntervalSince1970
+        let snapshotStale = error != nil || snapshot == nil || now - (snapshot?.fetchedAt ?? 0) > 120
+        func stale(_ window: UsageWindow?) -> Bool {
+            snapshotStale || window?.remaining == nil || (window?.resetsAt.map { $0 <= now } ?? false)
+        }
+        ring.showWeeklyRing = weekly != nil || fiveHour == nil
+        ring.showFiveHourRing = fiveHour != nil
+        ring.remaining = fiveHour?.remaining
+        ring.stale = stale(fiveHour)
+        ring.weeklyRemaining = weekly?.remaining
+        ring.weeklyStale = stale(weekly)
+        func label(_ value: Double?) -> String { value.map { "\(Int($0.rounded()))%" } ?? "未知" }
+        let summary = [
+            weekly == nil ? nil : "外侧粗环 · 周额度：\(label(weekly?.remaining))\(ring.weeklyStale ? "（未知或已过期）" : "")",
+            fiveHour == nil ? nil : "\(weekly == nil ? "单环" : "内侧细环") · 5 小时：\(label(fiveHour?.remaining))\(ring.stale ? "（未知或已过期）" : "")"
+        ].compactMap { $0 }.joined(separator: "\n")
         let fetched = snapshot.map { Date(timeIntervalSince1970: $0.fetchedAt).formatted(date: .omitted, time: .standard) } ?? "尚未更新"
-        ring.toolTip = "本机 Codex CLI 账号额度\n\(chosen?.name ?? "未选择窗口")\n\(error ?? snapshot?.detail ?? "正在读取")\n状态：\(stale ? "数据未知或已过期" : "已更新")\n更新时间：\(fetched)\n拖动校准位置；双击刷新；右键打开菜单"
-        ring.setAccessibilityLabel("Codex \(chosen?.name ?? "") 剩余 \(chosen?.remaining.map { "\(Int($0.rounded()))%" } ?? "未知")，\(ring.caption)")
+        ring.toolTip = "本机 Codex CLI 账号额度\n\(summary)\n\(error ?? snapshot?.detail ?? "正在读取")\n更新时间：\(fetched)\n中心数字为\(ring.displaysWeeklyPercentage ? "周" : "5小时")剩余；拖动校准位置；双击刷新；右键打开菜单"
+        ring.setAccessibilityLabel("Codex \(summary)")
         ring.needsDisplay = true
     }
     @objc func refresh() {
@@ -236,7 +377,7 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
         }
         query = process
         do { try process.run() }
-        catch { query = nil; self.error = "无法启动额度查询，请重新运行 easy-codex overlay"; updateRing() }
+        catch { query = nil; self.error = "无法启动额度查询，请重新运行 easy-claude overlay"; updateRing() }
     }
     func item(_ title: String, _ action: Selector?) -> NSMenuItem {
         let item = NSMenuItem(title: title, action: action, keyEquivalent: "")
@@ -250,16 +391,34 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
         if let error { menu.addItem(item(error, nil)) }
         if snapshot?.restricted == true { menu.addItem(item("服务端提示：当前使用受限", nil)) }
         menu.addItem(.separator())
-        for window in snapshot?.windows ?? [] {
+        for (minutes, label) in [(300.0, "5小时"), (10080.0, "周")] {
+            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 option = item("\(window.name) · \(remaining)", #selector(selectWindow(_:)))
-            option.representedObject = window.id
-            option.state = chosen?.id == window.id ? .on : .off
+            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)
         }
         menu.addItem(item(query == nil ? "立即刷新" : "正在刷新…", query == nil ? #selector(refresh) : nil))
         menu.addItem(item("恢复默认位置", #selector(resetPosition)))
         menu.addItem(.separator())
+        let toggle = item("显示时间", #selector(toggleClock))
+        toggle.state = clockEnabled ? .on : .off
+        menu.addItem(toggle)
+        let zones = NSMenu()
+        for city in ClockCity.presets {
+            let option = item(city.name, #selector(selectTimeZone(_:)))
+            option.representedObject = city.name
+            option.state = clock.cityName == city.name && clock.zone.identifier == city.identifier ? .on : .off
+            zones.addItem(option)
+        }
+        zones.addItem(item("自定义时区…", #selector(customTimeZone)))
+        let zoneItem = item("\(clock.cityName)·\(clockText(at: Date(), zone: clock.zone))", nil)
+        zoneItem.submenu = zones
+        menu.addItem(zoneItem)
+        menu.addItem(.separator())
         menu.addItem(item("退出浮窗", #selector(quit)))
         return menu
     }
@@ -268,12 +427,51 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
         let fresh = makeMenu()
         for item in fresh.items { fresh.removeItem(item); menu.addItem(item) }
     }
-    @objc func selectWindow(_ sender: NSMenuItem) {
-        selectedID = sender.representedObject as? String
-        UserDefaults.standard.set(selectedID, forKey: "selectedWindow")
+    @objc func selectPercentage(_ sender: NSMenuItem) {
+        guard let id = sender.representedObject as? String else { return }
+        ring.showWeeklyPercentage = id == "weekly"
+        UserDefaults.standard.set(ring.showWeeklyPercentage, forKey: "showWeeklyPercentage")
         updateRing()
     }
+    @objc func toggleClock() {
+        clockEnabled.toggle()
+        UserDefaults.standard.set(clockEnabled, forKey: "clockEnabled")
+        tick()
+    }
+    func setTimeZone(_ identifier: String, cityName: String? = nil) -> Bool {
+        guard let zone = TimeZone(identifier: identifier) else { return false }
+        clock.zone = zone
+        clock.cityName = cityName ?? ClockCity.presets.first { $0.identifier == zone.identifier }?.name ?? zone.identifier
+        UserDefaults.standard.set(clock.cityName, forKey: "clockCity")
+        UserDefaults.standard.set(zone.identifier, forKey: "clockTimeZone")
+        clock.needsDisplay = true
+        return true
+    }
+    @objc func selectTimeZone(_ sender: NSMenuItem) {
+        if let name = sender.representedObject as? String,
+           let city = ClockCity.presets.first(where: { $0.name == name }) {
+            _ = setTimeZone(city.identifier, cityName: city.name)
+        }
+    }
+    @objc func customTimeZone() {
+        let alert = NSAlert()
+        alert.messageText = "设置电子时钟时区"
+        alert.informativeText = "输入 IANA 时区，例如 America/Los_Angeles；自动适应夏令时。"
+        let field = NSTextField(string: clock.zone.identifier)
+        field.frame = CGRect(x: 0, y: 0, width: 300, height: 24)
+        alert.accessoryView = field
+        alert.addButton(withTitle: "保存")
+        alert.addButton(withTitle: "取消")
+        NSApp.activate(ignoringOtherApps: true)
+        while alert.runModal() == .alertFirstButtonReturn {
+            if setTimeZone(field.stringValue.trimmingCharacters(in: .whitespacesAndNewlines)) { break }
+            alert.informativeText = "无效时区，请输入有效的 IANA 名称，例如 America/Los_Angeles。"
+        }
+    }
     @objc func resetPosition() {
+        clockInset = CGPoint(x: 2, y: 116)
+        UserDefaults.standard.removeObject(forKey: "clockLeftInset")
+        UserDefaults.standard.removeObject(forKey: "clockBottomInset")
         inset = CGPoint(x: 10, y: 74)
         UserDefaults.standard.removeObject(forKey: "leftInset")
         UserDefaults.standard.removeObject(forKey: "bottomInset")
@@ -291,6 +489,47 @@ final class Overlay: NSObject, NSApplicationDelegate, NSMenuDelegate {
 struct Main {
     @MainActor static func main() {
         if CommandLine.arguments.contains("--self-test") {
+            precondition(ClockCity.presets.map(\.name) == ["硅谷", "洛杉矶", "西雅图", "华盛顿", "哥伦布", "新加坡", "上海"])
+            precondition(ClockCity.presets.allSatisfy { TimeZone(identifier: $0.identifier) != nil })
+            let weekOnly = UsageWindow(id: "codex:primary", label: "7天", name: "codex", remaining: 80, resetsAt: nil, windowDurationMins: 10080)
+            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)
+            testRing.showWeeklyPercentage = true
+            testRing.showWeeklyRing = false
+            testRing.showFiveHourRing = true
+            precondition(!testRing.displaysWeeklyPercentage)
+            let la = TimeZone(identifier: "America/Los_Angeles")!
+            let singapore = TimeZone(identifier: "Asia/Singapore")!
+            let winter = ISO8601DateFormatter().date(from: "2026-01-15T12:00:00Z")!
+            let summer = ISO8601DateFormatter().date(from: "2026-07-15T12:00:00Z")!
+            precondition(clockText(at: winter, zone: la) == "04:00")
+            precondition(clockText(at: summer, zone: la) == "05:00")
+            precondition(clockText(at: winter, zone: singapore) == "20:00")
+            precondition(TimeZone(identifier: "Invalid/Zone") == nil)
+            let utc = TimeZone(secondsFromGMT: 0)!
+            for (hour, state) in [(0, RingState.red), (6, .red), (8, .red), (9, .green), (14, .green), (15, .orange), (23, .orange)] {
+                let date = Date(timeIntervalSince1970: Double(hour * 3600))
+                precondition(clockState(at: date, zone: utc) == state)
+            }
+            precondition(clockState(at: winter, zone: la) == .red)
+            precondition(clockState(at: winter, zone: singapore) == .orange)
             assert(RingState.resolve(51, stale: false) == .green)
             assert(RingState.resolve(50, stale: false) == .orange)
             assert(RingState.resolve(20, stale: false) == .orange)
@@ -321,6 +560,9 @@ struct Main {
                 (transform as NSAffineTransform).concat()
                 let view = RingView(frame: CGRect(x: 0, y: 0, width: 32, height: 32))
                 view.remaining = value < 0 ? nil : value; view.stale = value < 0
+                view.weeklyRemaining = value < 0 ? nil : 100 - value; view.weeklyStale = value < 0
+                if index == 0 { view.showFiveHourRing = false }
+                if index == 1 { view.showWeeklyRing = false }
                 view.caption = value < 0 ? "额度未知" : "7天"
                 view.draw(view.bounds)
                 NSGraphicsContext.restoreGraphicsState()

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.1.3</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,7 +1,7 @@
 {
   "name": "easy-codex",
-  "version": "0.1.3",
-  "description": "Display remaining Codex account usage limits",
+  "version": "0.2.1",
+  "description": "Codex usage limits and transparent world clock overlay",
   "type": "module",
   "bin": {
     "easy-codex": "bin/easy-codex.js"

package/src/overlay-data.js

@@ -16,6 +16,7 @@ export function overlayData(result, now = Date.now()) {
         ? mins % 1440 === 0 ? `${mins / 1440}天` : mins % 60 === 0 ? `${mins / 60}小时` : `${mins}分钟`
         : key === 'primary' ? '主窗口' : '次窗口';
       windows.push({ id: `${id}:${key}`, label,
+        windowDurationMins: Number.isFinite(mins) && mins > 0 ? mins : null,
         name: `${String(bucket.limitName || id).replace(/[\x00-\x1f\x7f-\x9f]/g, '')} · ${label}`,
         remaining: Number.isFinite(w.usedPercent) ? Math.max(0, Math.min(100, 100 - w.usedPercent)) : null,
         resetsAt: Number.isFinite(w.resetsAt) && Math.abs(w.resetsAt) < 8.64e12 ? w.resetsAt : null });

package/src/overlay.js

@@ -11,5 +11,5 @@ export async function launchOverlay() {
   catch { throw new Error('尚未构建浮窗，请在项目目录执行 npm run build:overlay。'); }
   await promisify(execFile)('/usr/bin/open', ['-g', '-a', app, '--args',
     process.execPath, fileURLToPath(new URL('./overlay-query.js', import.meta.url)), process.env.PATH ?? '', process.env.CODEX_HOME ?? '']);
-  console.log('额度浮窗已启动；Codex 在前台时显示。拖动调整位置，右键或菜单栏 EC 可刷新、切换额度和退出。');
+  console.log('额度与电子时钟浮窗已启动；Codex 在前台时显示。拖动调整位置，右键或菜单栏 EC 可刷新、切换中心额度、设置时区和退出。');
 }