cc-pets 1.0.9 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -10,6 +10,12 @@
10
10
  - Token 聚合改为增量跟读并按额度窗口节流,事件驱动的高频刷新不再重复扫描近 7 天会话;
11
11
  过期日期目录按目录名剪枝,无 Token 数据的会话文件缓存失败结果不再反复重读。
12
12
  - 新开 Codex 会话时不再因为尚无 `rate_limits` 而清空面板上已知的额度。
13
+ - 修正跨窗口 Codex 会话的 Token 高估:Codex 会把同一份 `token_count` 重复写进会话
14
+ (实测近 7 天 68 个会话里 14 个存在重复,累加值整体偏高约 1%,最差的单个会话偏高
15
+ 7.7%),窗口内那一段改为按 `total_token_usage` 求差,累计值对重复事件是幂等的。
16
+ - 桌宠端不再跟随继承来的 `CODEX_HOME`,与 `CLAUDE_CONFIG_DIR` 的处理对齐:常驻进程会一直
17
+ 带着启动时的环境,用它选目录等于永久绑定到第一个拉起桌宠的那份 Codex 配置。需要时用
18
+ `CC_PETS_CODEX_HOME` 覆盖;跑在会话里的记录端仍认 `CODEX_HOME`。
13
19
  - 修复存在多个 Claude 配置目录时统计错账号:桌宠是被客户端启动的常驻进程,会一直带着
14
20
  启动时的 `CLAUDE_CONFIG_DIR`,等于永久绑定到"第一个拉起它的账号"。现固定只统计
15
21
  `~/.claude`(可用 `CC_PETS_CLAUDE_CONFIG_DIR` 覆盖),包装脚本启动桌宠时也不再透传该
@@ -33,8 +39,8 @@
33
39
  provider 是否还有存活客户端判定,并用事件活跃度覆盖不经包装脚本启动的会话。包装脚本
34
40
  启动的会话退出后 3 秒内转为"离线",不再被为直接启动会话准备的 60 秒静默宽限拖住。
35
41
  - 额度面板调整信息层级:官方剩余百分比升为主值、本机 Token 降为次级;汇总条改为
36
- 「今日」与「最近 7 天」双端 Token 合计——两家的 `resets_at` 并不一致,按各自订阅窗口
37
- 算出的数不在同一区间上,改用与订阅无关的自然日窗口才可相加;"数据刷新"改由面板自身定时器走字;无 Agent 在线时
42
+ 分别展示 Codex、Claude 的「今日」与「最近 7 天」Token;统计改用与订阅无关的自然日窗口,
43
+ 并保留 Provider 归属;"数据刷新"改由面板自身定时器走字;无 Agent 在线时
38
44
  状态配色转灰;额度窗口缺失的列标注"当前无活跃窗口"。
39
45
  - 新增 `cc-pets clean` 和带确认的 `cc-pets uninstall --purge`,并自动清理测试临时目录与过期运行状态。
40
46
  - 更新日志每次更新前截断,并限制为最近 1 MB,避免长期残留增长。
package/README.md CHANGED
@@ -129,6 +129,31 @@ Hooks、shell alias 和 `~/Applications/CC Pets.app` 的安装;`--prefer-onlin
129
129
  cc-pets install
130
130
  ```
131
131
 
132
+ #### 关于安装脚本白名单
133
+
134
+ 新版 npm(12 起默认)引入了安装脚本白名单:不在白名单里的包,`postinstall` 一律不执行。
135
+ 它只打印一行 `warn install-scripts`,进程仍然以成功退出,所以**安装看起来是成功的**,
136
+ 但原生应用、Hooks 和 shell alias 都不会被安装 —— 表现为敲 `codex` / `claude` 时桌宠不出现。
137
+
138
+ 不想每次都带 `--allow-scripts` 参数的话,可以配置一次持久白名单:
139
+
140
+ ```bash
141
+ npm config set allow-scripts=cc-pets --location=user
142
+ ```
143
+
144
+ 这个机制作用于所有带 `postinstall` 的包,不限于 CC Pets。常见的一个例子是 Claude Code 自身:
145
+ 它的原生二进制正是由 `postinstall` 铺开的,被拦下时执行 `claude` 会提示
146
+ `claude native binary not installed`,而重装并不能修好 —— 因为每次重装都会被同样拦下。
147
+ 这类情况可以按需把多个包一起加进白名单:
148
+
149
+ ```bash
150
+ npm config set allow-scripts=cc-pets,@anthropic-ai/claude-code --location=user
151
+ ```
152
+
153
+ 怀疑某个 CLI 装完后行为异常时,可以在 `~/.npm/_logs/` 最近的日志里搜 `install-scripts`,
154
+ 确认是不是同一个原因。注意白名单只对之后的安装生效,不会回头补跑已经被拦下的脚本,
155
+ 所以配置完还需要重装一次对应的包。
156
+
132
157
  ### 本地源码安装
133
158
 
134
159
  ```bash
@@ -273,13 +298,17 @@ Claude Code 支持用 `CLAUDE_CONFIG_DIR` 把配置目录指到别处,同一
273
298
  额度文件按配置目录分开存放,因此多个配置目录的 status line 不会互相覆盖——否则面板会
274
299
  把一个账号的剩余百分比配上另一个账号的用量。
275
300
 
301
+ Codex 侧同理:桌宠固定只统计 `~/.codex`,不读继承来的 `CODEX_HOME`,需要时用
302
+ `CC_PETS_CODEX_HOME` 覆盖。跑在 Codex 会话里的记录端(Agent Hooks、安装脚本)照常认
303
+ `CODEX_HOME`,那是会话级的、不存在被常驻进程带跑的问题。
304
+
276
305
  本地 Token 是 CLI 会话事件的原始计数,不等同于订阅额度。官方额度可能受模型、缓存和
277
306
  请求复杂度等因素影响,应始终以服务端返回的百分比为准。
278
307
 
279
308
  额度详情面板使用青色区分 Codex、紫色区分 Claude。标题行显示在线 Agent 数,下方汇总条
280
- 展示「今日」与「最近 7 天」的双端 Token 合计和最近刷新时间。汇总用的是与订阅无关的
309
+ 分别展示 Codex、Claude 的「今日」与「最近 7 天」Token,并显示最近刷新时间。统计用的是与订阅无关的
281
310
  自然日窗口(今日 = 本机零点至今,最近 7 天 = 含今天在内的 7 个自然日),因为两家的
282
- `resets_at` 并不一致,按各自订阅窗口算出的数不在同一区间上,相加没有意义;每个 Agent 卡片按 5 小时和 7 天两列
311
+ `resets_at` 并不一致,按各自订阅窗口算出的数不在同一区间上,相加没有意义。每个 Agent 卡片按 5 小时和 7 天两列
283
312
  展示官方剩余百分比(主值)、本机 Token 用量和重置时间,右侧是近 7 天额度趋势。某个窗口
284
313
  当前没有额度数据时该列标注"当前无活跃窗口"。卡片上的在线徽章表示该 Provider 是否还有
285
314
  运行中的客户端(包装脚本写出的 pid 文件,或该 Provider 最近 60 秒内仍在发事件),与是否
@@ -326,7 +355,7 @@ npx petdex install <slug>
326
355
 
327
356
  ## 隐私
328
357
 
329
- - Codex 额度只从本机 `${CODEX_HOME:-~/.codex}/sessions` 读取。
358
+ - Codex 额度与 Token 只从本机 `~/.codex/sessions` 读取(可用 `CC_PETS_CODEX_HOME` 覆盖)。
330
359
  - Claude 额度只从 Claude Code 传给本机 status line 的 `rate_limits` 字段读取。
331
360
  - Agent Hooks 只向当前用户的临时目录写入桌宠事件和额度缓存。
332
361
  - 额度历史默认关闭;启用后只在本机保留最近 7 天的剩余比例快照。
@@ -11,9 +11,6 @@
11
11
  @property NSTextField *statusTitleLabel;
12
12
  @property NSTextField *statusDetailLabel;
13
13
  @property NSButton *statusIconButton;
14
- @property NSPanel *statusTogglePanel;
15
- @property NSVisualEffectView *statusToggleGlass;
16
- @property NSButton *statusToggleButton;
17
14
  @property BOOL statusBubbleExpanded;
18
15
  @property BOOL statusBubbleAbove;
19
16
  @property BOOL hasAgentStatus;
@@ -51,7 +48,7 @@
51
48
  - (void)positionAgentStatus;
52
49
  - (void)showAgentStatusForRecord:(NSDictionary *)record;
53
50
  - (void)prunePendingApprovalRecords;
54
- - (void)toggleAgentStatusBubble:(id)sender;
51
+ - (void)toggleStatusBubbleFromMenu:(NSButton *)sender;
55
52
  - (void)refreshUsage:(id)sender;
56
53
  - (void)applyCodexUsage:(NSDictionary *)codexUsage claudeUsage:(NSDictionary *)claudeUsage;
57
54
  - (void)switchPetToID:(NSString *)petID;
@@ -386,29 +386,6 @@ static void TrimUpdateLog(NSString *path) {
386
386
  if ([state isEqualToString:@"idle"]) return @"zzz";
387
387
  return @"ellipsis";
388
388
  }
389
- - (void)updateStatusToggleAppearance {
390
- if (!self.hasAgentStatus) return;
391
- NSColor *stateColor = [self statusColorForState:self.lastStatusState];
392
- if (self.statusBubbleExpanded) {
393
- self.statusToggleButton.title = @"";
394
- self.statusToggleButton.imagePosition = NSImageOnly;
395
- NSString *symbol = self.statusBubbleAbove ? @"chevron.down" : @"chevron.up";
396
- NSImage *image = [NSImage imageWithSystemSymbolName:symbol accessibilityDescription:@"折叠状态"];
397
- self.statusToggleButton.image = [image imageWithSymbolConfiguration:
398
- [NSImageSymbolConfiguration configurationWithPointSize:11 weight:NSFontWeightSemibold]];
399
- self.statusToggleButton.contentTintColor = NSColor.whiteColor;
400
- self.statusToggleGlass.layer.backgroundColor =
401
- [NSColor colorWithWhite:0.16 alpha:0.54].CGColor;
402
- } else {
403
- self.statusToggleButton.image = nil;
404
- self.statusToggleButton.imagePosition = NSNoImage;
405
- self.statusToggleButton.title = [NSString stringWithFormat:@"%ld",
406
- (long)MAX(1, self.liveClientCount)];
407
- self.statusToggleButton.font = [NSFont systemFontOfSize:11 weight:NSFontWeightSemibold];
408
- self.statusToggleButton.contentTintColor = NSColor.whiteColor;
409
- self.statusToggleGlass.layer.backgroundColor = [stateColor colorWithAlphaComponent:0.72].CGColor;
410
- }
411
- }
412
389
  // Codex / Claude 退出时不会补发结束事件:包装脚本最后一行是 exec,自身已经被
413
390
  // 替换掉,装不上 EXIT trap。唯一可靠的退出信号是客户端 pid 文件被回收。
414
391
  // 没有这一步的话,“正在启动”只能等 60 秒无活动才消失,而另一个 provider 的事件
@@ -426,22 +403,21 @@ static void TrimUpdateLog(NSString *path) {
426
403
  [NSObject cancelPreviousPerformRequestsWithTarget:self
427
404
  selector:@selector(enterIdleStatus) object:nil];
428
405
  [self.statusPanel orderOut:nil];
429
- [self.statusTogglePanel orderOut:nil];
430
406
  self.hasAgentStatus = NO;
431
407
  }
432
- - (void)toggleAgentStatusBubble:(id)sender {
433
- if (!self.hasAgentStatus) return;
408
+ // 勾选 = 显示气泡。没有 agent 状态时也允许改,这样用户可以提前设好偏好,
409
+ // 而不必等下一次会话开始。
410
+ - (void)toggleStatusBubbleFromMenu:(NSButton *)sender {
434
411
  self.statusBubbleExpanded = !self.statusBubbleExpanded;
435
412
  [NSUserDefaults.standardUserDefaults setBool:self.statusBubbleExpanded
436
413
  forKey:StatusBubbleExpandedKey];
437
- if (self.statusBubbleExpanded) {
414
+ sender.state = self.statusBubbleExpanded ? NSControlStateValueOn : NSControlStateValueOff;
415
+ if (self.statusBubbleExpanded && self.hasAgentStatus) {
416
+ [self positionAgentStatus];
438
417
  [self.statusPanel orderFrontRegardless];
439
418
  } else {
440
419
  [self.statusPanel orderOut:nil];
441
420
  }
442
- [self positionAgentStatus];
443
- [self updateStatusToggleAppearance];
444
- [self.statusTogglePanel orderFrontRegardless];
445
421
  }
446
422
  // Stop 之后还会飘来 SubagentStop / PostToolUse / TaskCompleted 这类"仍在工作"的尾巴事件
447
423
  // (实测 Stop 后 4 秒),它们和 UserPromptSubmit 一样都归一成 thinking,只看 state 分不出来,
@@ -471,8 +447,6 @@ static void TrimUpdateLog(NSString *path) {
471
447
  [self positionAgentStatus];
472
448
  if (self.statusBubbleExpanded) [self.statusPanel orderFrontRegardless];
473
449
  else [self.statusPanel orderOut:nil];
474
- [self updateStatusToggleAppearance];
475
- [self.statusTogglePanel orderFrontRegardless];
476
450
  }
477
451
  // "正在启动"只在会话拉起的一瞬间成立。之后如果没有任何后续事件,真实情况是会话已就绪、
478
452
  // 正在等用户输入——继续显示"正在准备当前会话…"会让启动和待机看起来一模一样。
@@ -744,6 +718,8 @@ static void TrimUpdateLog(NSString *path) {
744
718
  self.panel.hasShadow = NO;
745
719
  self.panel.level = NSFloatingWindowLevel;
746
720
  self.panel.collectionBehavior = NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorFullScreenAuxiliary;
721
+ // 与 1.0 一致:透明背景交给 AppKit 原生拖动;PetView 通过
722
+ // mouseDownCanMoveWindow=NO 保留自己的点击和奔跑动画拖动,两条路径按命中区隔离。
747
723
  self.panel.movableByWindowBackground = YES;
748
724
  self.panel.hidesOnDeactivate = NO;
749
725
 
@@ -765,16 +741,16 @@ static void TrimUpdateLog(NSString *path) {
765
741
  self.petView.switchPetRequested = ^(NSString *petID) {
766
742
  [weakSelf switchPetToID:petID];
767
743
  };
768
- self.petView.positionChanged = ^{
769
- if (weakSelf.quotaPanel.isVisible) [weakSelf positionQuotaDashboard];
770
- if (weakSelf.statusPanel.isVisible || weakSelf.statusTogglePanel.isVisible) {
771
- [weakSelf positionAgentStatus];
772
- }
773
- };
774
744
  self.petView.dragStateChanged = ^(BOOL dragging) {
775
745
  weakSelf.petDragging = dragging;
776
746
  if (!dragging) [weakSelf scheduleQuotaDashboardHide];
777
747
  };
748
+ // 附属面板的跟随必须挂在窗口自身的移动通知上,不能只挂 PetView 的拖动回调:
749
+ // panel 开了 movableByWindowBackground,按在 PetView 之外的透明边上时由 AppKit
750
+ // 直接搬窗口,PetView 的 mouseDragged 根本不触发,气泡就会留在原地。
751
+ [NSNotificationCenter.defaultCenter addObserver:self
752
+ selector:@selector(petWindowDidMove:)
753
+ name:NSWindowDidMoveNotification object:self.panel];
778
754
  [root addSubview:self.petView];
779
755
 
780
756
  NSSize statusGlassSize = NSMakeSize(340, 58);
@@ -848,38 +824,6 @@ static void TrimUpdateLog(NSString *path) {
848
824
  [statusRoot addSubview:self.statusGlass];
849
825
  self.statusPanel.contentView = statusRoot;
850
826
 
851
- NSSize toggleSize = NSMakeSize(28, 28);
852
- self.statusTogglePanel = [[NSPanel alloc] initWithContentRect:NSMakeRect(0, 0,
853
- toggleSize.width, toggleSize.height)
854
- styleMask:NSWindowStyleMaskBorderless | NSWindowStyleMaskNonactivatingPanel
855
- backing:NSBackingStoreBuffered defer:NO];
856
- self.statusTogglePanel.opaque = NO;
857
- self.statusTogglePanel.backgroundColor = NSColor.clearColor;
858
- self.statusTogglePanel.hasShadow = YES;
859
- self.statusTogglePanel.ignoresMouseEvents = NO;
860
- self.statusTogglePanel.level = NSFloatingWindowLevel;
861
- self.statusTogglePanel.collectionBehavior =
862
- NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorFullScreenAuxiliary;
863
- self.statusTogglePanel.hidesOnDeactivate = NO;
864
- self.statusToggleGlass = [[NSVisualEffectView alloc] initWithFrame:NSMakeRect(
865
- 0, 0, toggleSize.width, toggleSize.height)];
866
- self.statusToggleGlass.material = NSVisualEffectMaterialHUDWindow;
867
- self.statusToggleGlass.blendingMode = NSVisualEffectBlendingModeBehindWindow;
868
- self.statusToggleGlass.state = NSVisualEffectStateActive;
869
- self.statusToggleGlass.appearance = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
870
- self.statusToggleGlass.wantsLayer = YES;
871
- self.statusToggleGlass.layer.cornerRadius = 14;
872
- self.statusToggleGlass.layer.masksToBounds = YES;
873
- self.statusToggleGlass.layer.borderWidth = 1;
874
- self.statusToggleGlass.layer.borderColor = [NSColor colorWithWhite:1 alpha:0.24].CGColor;
875
- self.statusToggleButton = [[NSButton alloc] initWithFrame:self.statusToggleGlass.bounds];
876
- self.statusToggleButton.bordered = NO;
877
- self.statusToggleButton.imagePosition = NSImageOnly;
878
- self.statusToggleButton.target = self;
879
- self.statusToggleButton.action = @selector(toggleAgentStatusBubble:);
880
- [self.statusToggleGlass addSubview:self.statusToggleButton];
881
- self.statusTogglePanel.contentView = self.statusToggleGlass;
882
-
883
827
  NSSize quotaSize = NSMakeSize(QuotaLogicalWidth * QuotaScale, QuotaLogicalHeight * QuotaScale);
884
828
  self.quotaPanel = [[NSPanel alloc] initWithContentRect:NSMakeRect(0, 0, quotaSize.width, quotaSize.height)
885
829
  styleMask:NSWindowStyleMaskBorderless | NSWindowStyleMaskNonactivatingPanel
@@ -996,12 +940,37 @@ static void TrimUpdateLog(NSString *path) {
996
940
  NSRect petFrame = self.panel.frame;
997
941
  NSRect visible = (self.panel.screen ?: NSScreen.mainScreen).visibleFrame;
998
942
  NSSize size = self.quotaPanel.frame.size;
999
- CGFloat x = NSMinX(petFrame) - size.width + 55;
1000
- CGFloat y = NSMinY(petFrame) + 112;
1001
- x = fmax(NSMinX(visible) + 12, fmin(x, NSMaxX(visible) - size.width - 12));
1002
- y = fmax(NSMinY(visible) + 12, fmin(y, NSMaxY(visible) - size.height - 12));
943
+ const CGFloat margin = 12;
944
+ const CGFloat gap = 8;
945
+ CGFloat minX = NSMinX(visible) + margin;
946
+ CGFloat maxX = NSMaxX(visible) - size.width - margin;
947
+ CGFloat minY = NSMinY(visible) + margin;
948
+ CGFloat maxY = NSMaxY(visible) - size.height - margin;
949
+ CGFloat leftX = NSMinX(petFrame) - size.width - gap;
950
+ CGFloat rightX = NSMaxX(petFrame) + gap;
951
+ CGFloat x;
952
+ CGFloat y = fmax(minY, fmin(NSMinY(petFrame) + 112, maxY));
953
+
954
+ // 优先放在宠物左侧,其次右侧;两个可点击窗口之间始终留出间隔。
955
+ if (leftX >= minX) {
956
+ x = leftX;
957
+ } else if (rightX <= maxX) {
958
+ x = rightX;
959
+ } else {
960
+ // 横向空间不足时改放上/下方,避免屏幕边缘钳位后重新盖住宠物。
961
+ x = fmax(minX, fmin(NSMidX(petFrame) - size.width / 2.0, maxX));
962
+ CGFloat aboveY = NSMaxY(petFrame) + gap;
963
+ CGFloat belowY = NSMinY(petFrame) - size.height - gap;
964
+ if (aboveY <= maxY) y = aboveY;
965
+ else if (belowY >= minY) y = belowY;
966
+ else y = fmax(minY, fmin(aboveY, maxY));
967
+ }
1003
968
  [self.quotaPanel setFrameOrigin:NSMakePoint(x, y)];
1004
969
  }
970
+ - (void)petWindowDidMove:(NSNotification *)notification {
971
+ if (self.quotaPanel.isVisible) [self positionQuotaDashboard];
972
+ if (self.statusPanel.isVisible) [self positionAgentStatus];
973
+ }
1005
974
  - (void)positionAgentStatus {
1006
975
  NSRect petFrame = self.panel.frame;
1007
976
  NSRect visible = (self.panel.screen ?: NSScreen.mainScreen).visibleFrame;
@@ -1016,19 +985,6 @@ static void TrimUpdateLog(NSString *path) {
1016
985
  x = fmax(NSMinX(visible) + 10, fmin(x, NSMaxX(visible) - size.width - 10));
1017
986
  y = fmax(NSMinY(visible) + 10, fmin(y, NSMaxY(visible) - size.height - 10));
1018
987
  [self.statusPanel setFrameOrigin:NSMakePoint(x, y)];
1019
-
1020
- NSSize toggleSize = self.statusTogglePanel.frame.size;
1021
- NSRect petViewFrame = self.petView.frame;
1022
- CGFloat toggleX = NSMinX(petFrame) + NSMinX(petViewFrame) +
1023
- NSWidth(petViewFrame) * 0.82;
1024
- CGFloat toggleY = NSMinY(petFrame) + NSMinY(petViewFrame) +
1025
- NSHeight(petViewFrame) * 0.70;
1026
- toggleX = fmax(NSMinX(visible) + 8,
1027
- fmin(toggleX, NSMaxX(visible) - toggleSize.width - 8));
1028
- toggleY = fmax(NSMinY(visible) + 8,
1029
- fmin(toggleY, NSMaxY(visible) - toggleSize.height - 8));
1030
- [self.statusTogglePanel setFrameOrigin:NSMakePoint(toggleX, toggleY)];
1031
- [self updateStatusToggleAppearance];
1032
988
  }
1033
989
  - (void)scheduleQuotaDashboardHide {
1034
990
  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(hideQuotaDashboardIfNeeded) object:nil];
@@ -1248,9 +1204,6 @@ static void TrimUpdateLog(NSString *path) {
1248
1204
  }
1249
1205
  [self updateQuotaLiveState];
1250
1206
  [self hideAgentStatusIfClientGone];
1251
- if (self.statusTogglePanel.isVisible && !self.statusBubbleExpanded) {
1252
- [self updateStatusToggleAppearance];
1253
- }
1254
1207
  // 启动模式在应用生命周期内保持不变。手动启动的桌宠即使后来检测到
1255
1208
  // Codex/Claude 客户端,也不应被转成 CLI 托管模式并随客户端退出。
1256
1209
  if (liveClients == 0 && self.managedByCLI) [NSApp terminate:nil];
@@ -90,6 +90,16 @@ NSString *NormalizedStateForEvent(NSString *event, BOOL failed) {
90
90
  static const off_t AgentEventLogSizeLimit = 4 * 1024 * 1024;
91
91
 
92
92
  BOOL AppendAgentEventRecord(NSDictionary *record) {
93
+ // 测试会跑包装脚本和 hook,漏设 CC_PETS_STATE_DIR 的用例会把事件写进用户真实的
94
+ // 事件流里,把正在运行的桌宠打回"正在启动"。测试统一导出这个变量,写入端打上标记,
95
+ // 收尾就能只对"测试自己写的行"判污染——按文件大小判会被同机的真实会话误伤。
96
+ // 正常使用下没有任何东西会设它。
97
+ NSString *mark = NSProcessInfo.processInfo.environment[@"CC_PETS_TEST_MARK"];
98
+ if (mark.length > 0) {
99
+ NSMutableDictionary *marked = [record mutableCopy];
100
+ marked[@"testMark"] = SanitizedShortString(mark, 64);
101
+ record = marked;
102
+ }
93
103
  NSData *json = [NSJSONSerialization dataWithJSONObject:record options:0 error:nil];
94
104
  if (!json) return NO;
95
105
  // JSON 和换行必须一次 write 写完:O_APPEND 只保证单次 write 的原子性,
@@ -8,6 +8,8 @@ NSString *ClaudeUsagePath(void);
8
8
  // 桌宠端用:只看主账号,不受继承来的 CLAUDE_CONFIG_DIR 影响。
9
9
  NSString *DefaultClaudeConfigDirectory(void);
10
10
  NSString *CurrentClaudeConfigDirectory(void);
11
+ // 桌宠端用:只看主账号的 Codex 目录,不受继承来的 CODEX_HOME 影响。
12
+ NSString *DefaultCodexHomeDirectory(void);
11
13
  NSString *ClaudeUsagePathForConfigDirectory(NSString *configDirectory);
12
14
  NSString *ApplicationSupportDirectory(void);
13
15
  NSString *QuotaHistoryPath(void);
@@ -29,6 +29,15 @@ NSString *CurrentClaudeConfigDirectory(void) {
29
29
  return DefaultClaudeConfigDirectory();
30
30
  }
31
31
 
32
+ // 与 DefaultClaudeConfigDirectory 同一个理由:桌宠是被某个客户端 open 起来的常驻进程,
33
+ // 会把当时的 CODEX_HOME 一直带着,等于永久绑定到"第一个拉起它的那份 Codex 配置"。
34
+ // 记录端(--provider-event 之类跑在 Codex 会话里的入口)照常用 CODEX_HOME,那是会话级的。
35
+ NSString *DefaultCodexHomeDirectory(void) {
36
+ NSString *override = NSProcessInfo.processInfo.environment[@"CC_PETS_CODEX_HOME"];
37
+ if (override.length > 0) return override.stringByStandardizingPath;
38
+ return [NSHomeDirectory() stringByAppendingPathComponent:@".codex"];
39
+ }
40
+
32
41
  // 额度是按账号的。一台机器上可以有多个配置目录(例如 ~/.claude 和 ~/.claude-nw),
33
42
  // 各自是不同账号、不同额度周期。共用一个文件的话两边的 statusline 会互相覆盖,
34
43
  // 面板就会把 A 账号的剩余百分比配上 B 账号的用量。因此按配置目录分文件。
@@ -23,6 +23,12 @@ NSDictionary *QuotaHistoryDocument(void) {
23
23
  static NSDictionary *HistoryProviderSample(NSDictionary *usage, NSString *usedKey) {
24
24
  NSNumber *fiveHour = RemainingValue(usage, @"fiveHour", usedKey);
25
25
  NSNumber *week = RemainingValue(usage, @"week", usedKey);
26
+ // 额度被拒之后官方不再报窗口,留在手里的百分比是过期值,照抄进历史会画出一条
27
+ // "一直有余额"的假曲线。
28
+ if ([usage[@"exhaustedAt"] isKindOfClass:NSNumber.class]) {
29
+ if (fiveHour) fiveHour = @0;
30
+ if (week) week = @0;
31
+ }
26
32
  NSMutableDictionary *sample = [NSMutableDictionary dictionary];
27
33
  if (fiveHour) sample[@"fiveHourRemaining"] = fiveHour;
28
34
  if (week) sample[@"weekRemaining"] = week;
@@ -185,8 +185,34 @@ static NSURL *NewestCodexSessionURL(NSURL *sessionsURL) {
185
185
  return newest ?: NewestSessionFileInDirectory(sessionsURL, NULL);
186
186
  }
187
187
 
188
+ // 额度被拒时 Codex 会写一条带 error.codex_error_info = usage_limit_exceeded 的事件。
189
+ // 这是唯一能说明"官方额度现在不给用了"的结构化信号:同一时刻 rate_limits 里
190
+ // primary/secondary 全是 null,光看额度字段只能看到"这行没有数据",于是上一份百分比
191
+ // 会一直挂在面板上——账号被别人用完时,那个数字既过期又正好指向相反的结论。
192
+ static NSNumber *ExhaustionTimestampFromLine(NSData *lineData) {
193
+ if (lineData.length == 0) return nil;
194
+ static NSData *marker;
195
+ static dispatch_once_t once;
196
+ dispatch_once(&once, ^{
197
+ marker = [@"usage_limit_exceeded" dataUsingEncoding:NSUTF8StringEncoding];
198
+ });
199
+ if ([lineData rangeOfData:marker options:0 range:NSMakeRange(0, lineData.length)].location ==
200
+ NSNotFound) return nil;
201
+ id rootValue = [NSJSONSerialization JSONObjectWithData:lineData options:0 error:nil];
202
+ if (![rootValue isKindOfClass:NSDictionary.class]) return nil;
203
+ NSDictionary *root = rootValue;
204
+ NSDictionary *payload = [root[@"payload"] isKindOfClass:NSDictionary.class] ? root[@"payload"] : nil;
205
+ NSDictionary *error = [payload[@"error"] isKindOfClass:NSDictionary.class] ? payload[@"error"] : nil;
206
+ NSString *info = [error[@"codex_error_info"] isKindOfClass:NSString.class]
207
+ ? error[@"codex_error_info"] : nil;
208
+ if (![info containsString:@"usage_limit"]) return nil;
209
+ NSDate *date = ISO8601Timestamp(root[@"timestamp"]);
210
+ return date ? @(date.timeIntervalSince1970) : nil;
211
+ }
212
+
188
213
  static NSDictionary *UsageFromCodexLine(NSData *lineData) {
189
- NSDictionary *payload = TokenPayloadFromLine(lineData, NULL);
214
+ NSDictionary *root = nil;
215
+ NSDictionary *payload = TokenPayloadFromLine(lineData, &root);
190
216
  if (!payload) return nil;
191
217
  id limitsValue = payload[@"rate_limits"];
192
218
  if (![limitsValue isKindOfClass:NSDictionary.class]) return nil;
@@ -202,29 +228,49 @@ static NSDictionary *UsageFromCodexLine(NSData *lineData) {
202
228
  if (minutes == 300) fiveHour = quota;
203
229
  if (minutes == 10080) week = quota;
204
230
  }
231
+ // primary/secondary 全是 null 的 rate_limits(实测切到 premium/credits 计费后每条都这样)
232
+ // 并不表示额度消失,只是这条响应没带窗口信息。当成"这行没有额度"往前找,
233
+ // 否则上一份仍然有效的窗口会被它整块盖掉,面板退回 `--` + 等待数据。
234
+ if (!fiveHour && !week) return nil;
235
+ // 采样时刻用来和耗尽事件比先后:耗尽之后又拿到新的额度快照,说明额度已经恢复。
236
+ NSDate *sampledAt = ISO8601Timestamp(root[@"timestamp"]);
205
237
  return @{
206
238
  @"fiveHour": fiveHour ?: NSNull.null,
207
- @"week": week ?: NSNull.null
239
+ @"week": week ?: NSNull.null,
240
+ @"sampledAt": @(sampledAt ? sampledAt.timeIntervalSince1970 : 0)
208
241
  };
209
242
  }
210
243
 
244
+ // 耗尽事件不早于当前额度快照时,把标记贴到 usage 上,供面板把剩余额度显示成 0。
245
+ static NSDictionary *UsageByMarkingExhaustion(NSDictionary *usage, NSTimeInterval exhaustedAt) {
246
+ if (![usage isKindOfClass:NSDictionary.class] || exhaustedAt <= 0) return usage;
247
+ if (exhaustedAt < [usage[@"sampledAt"] doubleValue]) return usage;
248
+ NSMutableDictionary *result = [usage mutableCopy];
249
+ result[@"exhaustedAt"] = @(exhaustedAt);
250
+ return result;
251
+ }
252
+
211
253
  // token_count 行几乎总在文件末尾,因此从尾部反向按 \n 切片逐行试,命中即停。
212
254
  // 原实现会把整段(最多 2MB)解码成 NSString、再切成全部行、再把每行编码回 NSData、
213
255
  // 又解码回 NSString 查子串,等于来回往返两遍。
214
- static NSDictionary *LatestUsageInData(NSData *data) {
256
+ static NSDictionary *LatestUsageInData(NSData *data, NSNumber **outExhaustedAt) {
215
257
  const uint8_t *bytes = data.bytes;
216
258
  NSUInteger end = data.length;
259
+ NSDictionary *usage = nil;
260
+ NSNumber *exhaustedAt = nil;
217
261
  while (end > 0) {
218
262
  NSUInteger start = end;
219
263
  while (start > 0 && bytes[start - 1] != '\n') start -= 1;
220
264
  if (end > start) {
221
- NSDictionary *usage = UsageFromCodexLine(
222
- [data subdataWithRange:NSMakeRange(start, end - start)]);
223
- if (usage) return usage;
265
+ NSData *line = [data subdataWithRange:NSMakeRange(start, end - start)];
266
+ if (!exhaustedAt) exhaustedAt = ExhaustionTimestampFromLine(line);
267
+ if (!usage) usage = UsageFromCodexLine(line);
268
+ if (usage && exhaustedAt) break;
224
269
  }
225
270
  end = start > 0 ? start - 1 : 0;
226
271
  }
227
- return nil;
272
+ if (outExhaustedAt) *outExhaustedAt = exhaustedAt;
273
+ return usage;
228
274
  }
229
275
 
230
276
  // resets_at 恒在未来,因此 7 天窗口的起点不可能早于 now - 7d;再留一天覆盖时区和跨日边界。
@@ -272,6 +318,47 @@ static NSArray<NSURL *> *RecentCodexSessionURLs(NSURL *sessionsURL) {
272
318
  return urls;
273
319
  }
274
320
 
321
+ static NSData *SessionTailData(NSURL *url) {
322
+ NSFileHandle *handle = [NSFileHandle fileHandleForReadingFromURL:url error:nil];
323
+ if (!handle) return nil;
324
+ unsigned long long size = [handle seekToEndOfFile];
325
+ [handle seekToFileOffset:size > 2 * 1024 * 1024 ? size - 2 * 1024 * 1024 : 0];
326
+ NSData *tail = [handle readDataToEndOfFile];
327
+ [handle closeFile];
328
+ return tail;
329
+ }
330
+
331
+ static BOOL UsageHasLiveWindow(NSDictionary *usage) {
332
+ NSTimeInterval now = NSDate.date.timeIntervalSince1970;
333
+ for (NSString *key in @[@"fiveHour", @"week"]) {
334
+ NSDictionary *quota = [usage[key] isKindOfClass:NSDictionary.class] ? usage[key] : nil;
335
+ NSNumber *reset = [quota[@"resets_at"] isKindOfClass:NSNumber.class] ? quota[@"resets_at"] : nil;
336
+ if (reset && reset.doubleValue > now) return YES;
337
+ }
338
+ return NO;
339
+ }
340
+
341
+ // 最新会话整篇都没有额度时往前找。rate_limits 是账号级的,写在哪个会话里都一样;
342
+ // 而新会话在第一次拿到限流响应之前一条都不写,冷启动正好撞上就会整块空白。
343
+ // 只接受 resets_at 还没到的窗口,免得把过期的百分比当成当前值。
344
+ static NSDictionary *LatestQuotaInRecentSessions(NSURL *sessionsURL, NSURL *skipURL) {
345
+ NSArray<NSURL *> *urls = [RecentCodexSessionURLs(sessionsURL) sortedArrayUsingComparator:
346
+ ^NSComparisonResult(NSURL *left, NSURL *right) {
347
+ NSDate *leftDate = nil, *rightDate = nil;
348
+ [left getResourceValue:&leftDate forKey:NSURLContentModificationDateKey error:nil];
349
+ [right getResourceValue:&rightDate forKey:NSURLContentModificationDateKey error:nil];
350
+ return [(rightDate ?: NSDate.distantPast) compare:(leftDate ?: NSDate.distantPast)];
351
+ }];
352
+ NSUInteger examined = 0;
353
+ for (NSURL *url in urls) {
354
+ if (skipURL && [url.path isEqualToString:skipURL.path]) continue;
355
+ if (++examined > 8) break;
356
+ NSDictionary *usage = LatestUsageInData(SessionTailData(url), NULL);
357
+ if (usage && UsageHasLiveWindow(usage)) return usage;
358
+ }
359
+ return nil;
360
+ }
361
+
275
362
  static NSDictionary *FirstTimestampRecordInData(NSData *data) {
276
363
  const uint8_t *bytes = data.bytes;
277
364
  NSUInteger start = 0;
@@ -348,10 +435,34 @@ static void AddTokenCounts(NSMutableDictionary *target, NSDictionary *counts) {
348
435
  }
349
436
  }
350
437
 
438
+ // 累计值相减,而不是累加窗口内的 last_token_usage:Codex 会把同一份 token_count
439
+ // 重复写进会话(本机近期 68 个会话里 14 个如此,sum(last) 整体比末行 total 高 1.1%,
440
+ // 最差的单个会话高 7.7%),累加就把重复的那次算了两遍。累计值对重复事件是幂等的。
441
+ // total_token_usage 罕见地回退(会话内重置)时,窗口前的基线已经失效,直接取窗口内的值。
442
+ static NSDictionary *TokenCountsBySubtracting(NSDictionary *totals, NSDictionary *baseline) {
443
+ NSMutableDictionary *result = [NSMutableDictionary dictionary];
444
+ for (NSString *key in TokenKeys()) {
445
+ if (!totals[key]) continue;
446
+ unsigned long long current = [totals[key] unsignedLongLongValue];
447
+ unsigned long long previous = [baseline[key] unsignedLongLongValue];
448
+ result[key] = @(current >= previous ? current - previous : current);
449
+ }
450
+ return result;
451
+ }
452
+
351
453
  static NSDictionary *PartialTokenTotals(NSURL *url, NSTimeInterval start, NSTimeInterval end) {
352
454
  NSFileHandle *handle = [NSFileHandle fileHandleForReadingFromURL:url error:nil];
353
455
  if (!handle) return nil;
354
- NSMutableDictionary *totals = [NSMutableDictionary dictionary];
456
+ __block NSDictionary *baseline = nil;
457
+ __block NSDictionary *inside = nil;
458
+ void (^consume)(NSData *) = ^(NSData *line) {
459
+ NSDictionary *record = TokenRecordFromLine(line);
460
+ NSDictionary *total = record[@"total"];
461
+ if (!total) return;
462
+ NSTimeInterval timestamp = [record[@"timestamp"] doubleValue];
463
+ if (timestamp < start) baseline = total;
464
+ else if (timestamp < end) inside = total;
465
+ };
355
466
  NSMutableData *pending = [NSMutableData data];
356
467
  while (YES) {
357
468
  NSData *chunk = [handle readDataOfLength:256 * 1024];
@@ -361,12 +472,7 @@ static NSDictionary *PartialTokenTotals(NSURL *url, NSTimeInterval start, NSTime
361
472
  NSUInteger lineStart = 0;
362
473
  for (NSUInteger index = 0; index < pending.length; index++) {
363
474
  if (bytes[index] != '\n') continue;
364
- NSDictionary *record = TokenRecordFromLine(
365
- [pending subdataWithRange:NSMakeRange(lineStart, index - lineStart)]);
366
- NSTimeInterval timestamp = [record[@"timestamp"] doubleValue];
367
- if (record[@"last"] && timestamp >= start && timestamp < end) {
368
- AddTokenCounts(totals, record[@"last"]);
369
- }
475
+ consume([pending subdataWithRange:NSMakeRange(lineStart, index - lineStart)]);
370
476
  lineStart = index + 1;
371
477
  }
372
478
  if (lineStart > 0) {
@@ -374,15 +480,10 @@ static NSDictionary *PartialTokenTotals(NSURL *url, NSTimeInterval start, NSTime
374
480
  lineStart, pending.length - lineStart)] mutableCopy];
375
481
  }
376
482
  }
377
- if (pending.length > 0) {
378
- NSDictionary *record = TokenRecordFromLine(pending);
379
- NSTimeInterval timestamp = [record[@"timestamp"] doubleValue];
380
- if (record[@"last"] && timestamp >= start && timestamp < end) {
381
- AddTokenCounts(totals, record[@"last"]);
382
- }
383
- }
483
+ if (pending.length > 0) consume(pending);
384
484
  [handle closeFile];
385
- return totals;
485
+ // 窗口内一条 token_count 都没有:这段时间没有产生用量。
486
+ return inside ? TokenCountsBySubtracting(inside, baseline) : @{};
386
487
  }
387
488
 
388
489
  // 聚合区间对齐官方重置时间:[resets_at - 窗长, resets_at)。
@@ -406,9 +507,26 @@ static BOOL TokenWindowForQuota(NSDictionary *quota, double fallbackMinutes,
406
507
  static const double FiveHourWindowMinutes = 300;
407
508
  static const double SevenDayWindowMinutes = 10080;
408
509
 
409
- // 面板汇总条要把两家相加,而两家的 resets_at 并不一致(实测能差 2 天以上),
410
- // 按各自订阅窗口算出来的两个数不在同一个区间上,相加没有对应的物理量。
411
- // 所以汇总另用一组与订阅完全脱钩的自然日窗口,两家共享。
510
+ // 官方窗口拿不到时(账号根本没有这个窗口、缺 resets_at、或窗口已过期),Token 依然是
511
+ // 本机自己数出来的,没有理由跟着变成 `--`。退化成按本机时钟往回推的滚动窗口。
512
+ // 终点向上对齐到 10 分钟:起点每秒都在动的话,分片缓存的键每轮都变,跨界会话会被整篇重扫。
513
+ static const NSTimeInterval TokenFallbackGranularity = 600;
514
+ static void RollingWindowForMinutes(double minutes, NSTimeInterval *outStart, NSTimeInterval *outEnd) {
515
+ NSTimeInterval now = NSDate.date.timeIntervalSince1970;
516
+ NSTimeInterval end = (floor(now / TokenFallbackGranularity) + 1) * TokenFallbackGranularity;
517
+ if (outStart) *outStart = end - minutes * 60.0;
518
+ if (outEnd) *outEnd = end;
519
+ }
520
+ static BOOL TokenWindowOrFallback(NSDictionary *quota, double fallbackMinutes,
521
+ NSTimeInterval *outStart, NSTimeInterval *outEnd) {
522
+ if (TokenWindowForQuota(quota, fallbackMinutes, outStart, outEnd)) return YES;
523
+ if (fallbackMinutes <= 0) return NO;
524
+ RollingWindowForMinutes(fallbackMinutes, outStart, outEnd);
525
+ return YES;
526
+ }
527
+
528
+ // 面板要并列展示两家数据,而两家的 resets_at 并不一致(实测能差 2 天以上),
529
+ // 所以汇总另用一组与订阅完全脱钩的自然日窗口,保证两家的时间口径一致。
412
530
  //
413
531
  // 取自然日边界而不是"从现在往回推 N 秒",是因为分片缓存的键里含窗口起点:起点每秒
414
532
  // 都在动的话,跨界会话每一轮都要整篇重扫;对齐到零点后起点一天之内不变,缓存才能命中。
@@ -463,11 +581,11 @@ static NSDictionary *TokenTotalsInWindow(NSTimeInterval start, NSTimeInterval en
463
581
  return totals;
464
582
  }
465
583
 
466
- static NSDictionary *TokenTotalsForQuota(NSDictionary *quota, NSArray<NSURL *> *urls,
467
- NSMutableDictionary *cache) {
584
+ static NSDictionary *TokenTotalsForQuota(NSDictionary *quota, double fallbackMinutes,
585
+ NSArray<NSURL *> *urls, NSMutableDictionary *cache) {
468
586
  NSTimeInterval start = 0;
469
587
  NSTimeInterval end = 0;
470
- if (!TokenWindowForQuota(quota, 0, &start, &end)) return nil;
588
+ if (!TokenWindowOrFallback(quota, fallbackMinutes, &start, &end)) return nil;
471
589
  return TokenTotalsInWindow(start, end, urls, cache);
472
590
  }
473
591
 
@@ -493,25 +611,29 @@ static void PruneTokenCache(NSMutableDictionary *cache, NSArray<NSURL *> *urls,
493
611
  }
494
612
  }
495
613
 
614
+ // 一份额度都没拿到时也照样统计 Token:Token 是本机数出来的,不该因为官方额度缺失就空着。
496
615
  static NSDictionary *UsageByAddingTokenTotals(NSDictionary *usage, NSURL *sessionsURL,
497
616
  NSMutableDictionary *cache) {
498
- if (![usage isKindOfClass:NSDictionary.class]) return usage;
617
+ if (![usage isKindOfClass:NSDictionary.class]) usage = @{};
499
618
  NSArray<NSURL *> *urls = RecentCodexSessionURLs(sessionsURL);
500
619
  NSDictionary *five = [usage[@"fiveHour"] isKindOfClass:NSDictionary.class]
501
620
  ? usage[@"fiveHour"] : nil;
502
621
  NSDictionary *week = [usage[@"week"] isKindOfClass:NSDictionary.class] ? usage[@"week"] : nil;
503
- NSDictionary *fiveTokens = five ? TokenTotalsForQuota(five, urls, cache) : nil;
504
- NSDictionary *weekTokens = week ? TokenTotalsForQuota(week, urls, cache) : nil;
622
+ NSDictionary *fiveTokens = TokenTotalsForQuota(five, FiveHourWindowMinutes, urls, cache);
623
+ NSDictionary *weekTokens = TokenTotalsForQuota(week, SevenDayWindowMinutes, urls, cache);
505
624
  NSTimeInterval todayStart = 0, rollingWeekStart = 0, rollingEnd = 0;
506
625
  RollingTokenWindows(&todayStart, &rollingWeekStart, &rollingEnd);
507
626
  NSDictionary *todayTokens = TokenTotalsInWindow(todayStart, rollingEnd, urls, cache);
508
627
  NSDictionary *recentTokens = TokenTotalsInWindow(rollingWeekStart, rollingEnd, urls, cache);
509
628
  NSMutableSet<NSString *> *liveWindowKeys = [NSMutableSet setWithArray:@[
510
629
  PartialTokenKey(todayStart, rollingEnd), PartialTokenKey(rollingWeekStart, rollingEnd)]];
511
- for (NSDictionary *quota in @[five ?: @{}, week ?: @{}]) {
630
+ NSArray<NSDictionary *> *windows = @[
631
+ @{@"quota": five ?: @{}, @"minutes": @(FiveHourWindowMinutes)},
632
+ @{@"quota": week ?: @{}, @"minutes": @(SevenDayWindowMinutes)}];
633
+ for (NSDictionary *window in windows) {
512
634
  NSTimeInterval start = 0;
513
635
  NSTimeInterval end = 0;
514
- if (TokenWindowForQuota(quota, 0, &start, &end)) {
636
+ if (TokenWindowOrFallback(window[@"quota"], [window[@"minutes"] doubleValue], &start, &end)) {
515
637
  [liveWindowKeys addObject:PartialTokenKey(start, end)];
516
638
  }
517
639
  }
@@ -527,21 +649,23 @@ static NSDictionary *UsageByAddingTokenTotals(NSDictionary *usage, NSURL *sessio
527
649
  return result;
528
650
  }
529
651
 
652
+ static NSURL *CodexSessionsURL(void) {
653
+ return [NSURL fileURLWithPath:
654
+ [DefaultCodexHomeDirectory() stringByAppendingPathComponent:@"sessions"]];
655
+ }
656
+
530
657
  NSDictionary *LatestUsage(void) {
531
- NSString *home = NSProcessInfo.processInfo.environment[@"CODEX_HOME"];
532
- if (home.length == 0) home = [NSHomeDirectory() stringByAppendingPathComponent:@".codex"];
533
- NSURL *sessions = [NSURL fileURLWithPath:[home stringByAppendingPathComponent:@"sessions"]];
658
+ NSURL *sessions = CodexSessionsURL();
534
659
  NSURL *newest = NewestCodexSessionURL(sessions);
535
660
  if (!newest) return nil;
536
661
 
537
- NSFileHandle *handle = [NSFileHandle fileHandleForReadingFromURL:newest error:nil];
538
- if (!handle) return nil;
539
- unsigned long long size = [handle seekToEndOfFile];
540
- [handle seekToFileOffset:size > 2 * 1024 * 1024 ? size - 2 * 1024 * 1024 : 0];
541
- NSData *tail = [handle readDataToEndOfFile];
542
- [handle closeFile];
543
- NSDictionary *usage = LatestUsageInData(tail);
544
- return UsageByAddingTokenTotals(usage, sessions, [NSMutableDictionary dictionary]);
662
+ NSData *tail = SessionTailData(newest);
663
+ if (!tail) return nil;
664
+ NSNumber *exhaustedAt = nil;
665
+ NSDictionary *usage = LatestUsageInData(tail, &exhaustedAt)
666
+ ?: LatestQuotaInRecentSessions(sessions, newest);
667
+ usage = UsageByAddingTokenTotals(usage, sessions, [NSMutableDictionary dictionary]);
668
+ return UsageByMarkingExhaustion(usage, exhaustedAt.doubleValue);
545
669
  }
546
670
 
547
671
  // Token 聚合要遍历近 7 天的会话文件,而 refresh 由 FSEvents 驱动、会话写盘时约 0.5 秒
@@ -562,22 +686,21 @@ static NSString *TokenWindowIdentity(NSDictionary *usage) {
562
686
  @property NSDictionary *tokenUsage;
563
687
  @property NSString *tokenWindowIdentity;
564
688
  @property NSTimeInterval tokenComputedAt;
689
+ @property NSTimeInterval exhaustedAt;
565
690
  @property BOOL forcesTokenAggregation;
566
691
  @end
567
692
 
568
693
  @implementation CodexUsageReader
569
694
  - (instancetype)init {
570
695
  if ((self = [super init])) {
571
- NSString *home = NSProcessInfo.processInfo.environment[@"CODEX_HOME"];
572
- if (home.length == 0) home = [NSHomeDirectory() stringByAppendingPathComponent:@".codex"];
573
- _sessionsURL = [NSURL fileURLWithPath:[home stringByAppendingPathComponent:@"sessions"]];
696
+ _sessionsURL = CodexSessionsURL();
574
697
  _partialLine = [NSMutableData data];
575
698
  _tokenSummaryCache = [NSMutableDictionary dictionary];
576
699
  }
577
700
  return self;
578
701
  }
579
702
  - (NSDictionary *)usageWithTokenTotals:(NSDictionary *)usage {
580
- if (![usage isKindOfClass:NSDictionary.class]) return usage;
703
+ if (![usage isKindOfClass:NSDictionary.class]) usage = @{};
581
704
  NSString *identity = TokenWindowIdentity(usage);
582
705
  NSTimeInterval now = NSDate.date.timeIntervalSince1970;
583
706
  BOOL reusable = !self.forcesTokenAggregation && self.tokenUsage &&
@@ -586,7 +709,7 @@ static NSString *TokenWindowIdentity(NSDictionary *usage) {
586
709
  if (reusable) {
587
710
  NSMutableDictionary *result = [usage mutableCopy];
588
711
  result[@"tokenUsage"] = self.tokenUsage;
589
- return result;
712
+ return UsageByMarkingExhaustion(result, self.exhaustedAt);
590
713
  }
591
714
  NSDictionary *result = UsageByAddingTokenTotals(usage, self.sessionsURL, self.tokenSummaryCache);
592
715
  id tokens = result[@"tokenUsage"];
@@ -594,7 +717,11 @@ static NSString *TokenWindowIdentity(NSDictionary *usage) {
594
717
  self.tokenWindowIdentity = identity;
595
718
  self.tokenComputedAt = now;
596
719
  self.forcesTokenAggregation = NO;
597
- return result;
720
+ return UsageByMarkingExhaustion(result, self.exhaustedAt);
721
+ }
722
+ // 耗尽事件只往前走:额度恢复由"更新的额度快照"表达(见 UsageByMarkingExhaustion)。
723
+ - (void)noteExhaustion:(NSNumber *)timestamp {
724
+ if (timestamp.doubleValue > self.exhaustedAt) self.exhaustedAt = timestamp.doubleValue;
598
725
  }
599
726
  - (void)selectSessionURL:(NSURL *)url {
600
727
  self.sessionURL = url;
@@ -616,7 +743,11 @@ static NSString *TokenWindowIdentity(NSDictionary *usage) {
616
743
  self.forcesTokenAggregation = YES;
617
744
  // 额度是账号级的,不随会话切换失效。新会话在首个 token_count 落盘前没有 rate_limits,
618
745
  // 这时沿用上一份,否则每次开新会话面板都会整块闪空。窗口过期的判定另有 resets_at 兜底。
619
- self.usage = [self usageWithTokenTotals:LatestUsageInData(tail) ?: self.usage];
746
+ NSNumber *exhaustedAt = nil;
747
+ NSDictionary *latest = LatestUsageInData(tail, &exhaustedAt);
748
+ [self noteExhaustion:exhaustedAt];
749
+ self.usage = [self usageWithTokenTotals:latest ?: self.usage
750
+ ?: LatestQuotaInRecentSessions(self.sessionsURL, url)];
620
751
 
621
752
  const uint8_t *bytes = tail.bytes;
622
753
  NSUInteger lastNewline = NSNotFound;
@@ -639,6 +770,7 @@ static NSString *TokenWindowIdentity(NSDictionary *usage) {
639
770
  for (NSUInteger index = 0; index < self.partialLine.length; index++) {
640
771
  if (bytes[index] != '\n') continue;
641
772
  NSData *line = [self.partialLine subdataWithRange:NSMakeRange(lineStart, index - lineStart)];
773
+ [self noteExhaustion:ExhaustionTimestampFromLine(line)];
642
774
  NSDictionary *newUsage = UsageFromCodexLine(line);
643
775
  if (newUsage) self.usage = newUsage;
644
776
  lineStart = index + 1;
@@ -904,8 +1036,9 @@ static NSDictionary *ClaudeTokenTotals(NSArray<NSData *> *recordSets, NSTimeInte
904
1036
  NSDictionary *week = [limits[@"week"] isKindOfClass:NSDictionary.class] ? limits[@"week"] : nil;
905
1037
  NSTimeInterval fiveStart = 0, fiveEnd = 0, weekStart = 0, weekEnd = 0;
906
1038
  // Claude 的 rate_limits 没有 window_minutes,窗长按官方订阅固定为 5 小时 / 7 天。
907
- BOOL hasFive = five && TokenWindowForQuota(five, FiveHourWindowMinutes, &fiveStart, &fiveEnd);
908
- BOOL hasWeek = week && TokenWindowForQuota(week, SevenDayWindowMinutes, &weekStart, &weekEnd);
1039
+ // 窗口不可用时退化成滚动窗口,Token 是本机数据,不跟着官方额度一起变成 `--`。
1040
+ TokenWindowOrFallback(five, FiveHourWindowMinutes, &fiveStart, &fiveEnd);
1041
+ TokenWindowOrFallback(week, SevenDayWindowMinutes, &weekStart, &weekEnd);
909
1042
  // 自然日窗口和额度无关,即使两个额度窗口都不可用也照样统计。
910
1043
  NSArray<NSURL *> *urls = RecentClaudeTranscriptURLs(self.projectsURL);
911
1044
  NSMutableArray<NSData *> *recordSets = [NSMutableArray arrayWithCapacity:urls.count];
@@ -921,8 +1054,8 @@ static NSDictionary *ClaudeTokenTotals(NSArray<NSData *> *recordSets, NSTimeInte
921
1054
  NSTimeInterval todayStart = 0, rollingWeekStart = 0, rollingEnd = 0;
922
1055
  RollingTokenWindows(&todayStart, &rollingWeekStart, &rollingEnd);
923
1056
  return @{
924
- @"fiveHour": hasFive ? ClaudeTokenTotals(recordSets, fiveStart, fiveEnd) : (id)NSNull.null,
925
- @"week": hasWeek ? ClaudeTokenTotals(recordSets, weekStart, weekEnd) : (id)NSNull.null,
1057
+ @"fiveHour": ClaudeTokenTotals(recordSets, fiveStart, fiveEnd),
1058
+ @"week": ClaudeTokenTotals(recordSets, weekStart, weekEnd),
926
1059
  @"today": ClaudeTokenTotals(recordSets, todayStart, rollingEnd),
927
1060
  @"recentWeek": ClaudeTokenTotals(recordSets, rollingWeekStart, rollingEnd),
928
1061
  @"source": @"local"
@@ -12,12 +12,10 @@
12
12
  @property BOOL draggingPet;
13
13
  @property BOOL agentActive;
14
14
  @property NSPoint dragStartMouse;
15
- @property NSPoint dragStartWindowOrigin;
16
15
  @property NSString *currentPetID;
17
16
  @property id globalMouseMonitor;
18
17
  @property id localMouseMonitor;
19
18
  @property(copy) void (^pocketHoverChanged)(BOOL hovering);
20
- @property(copy) void (^positionChanged)(void);
21
19
  @property(copy) void (^dragStateChanged)(BOOL dragging);
22
20
  @property(copy) NSArray<NSDictionary *> *(^petOptionsRequested)(void);
23
21
  @property(copy) void (^switchPetRequested)(NSString *petID);
@@ -3,6 +3,9 @@
3
3
  #import "CCPetsPaths.h"
4
4
  #import "CCPetsImageLoader.h"
5
5
 
6
+ // 按下后位移超过这个距离才判定为拖动,之内视为点击。
7
+ static const CGFloat PetDragThreshold = 3.0;
8
+
6
9
  @implementation PetView
7
10
  - (instancetype)initWithFrame:(NSRect)frame sheet:(NSImage *)sheet rowCount:(NSInteger)rowCount {
8
11
  if ((self = [super initWithFrame:frame])) {
@@ -67,9 +70,13 @@
67
70
  NSTimeInterval interval = PetFrameInterval;
68
71
  if (self.lowPowerMode) interval *= 1.5;
69
72
  if (self.reduceMotion) interval *= 2.0;
70
- self.frameTimer = [NSTimer scheduledTimerWithTimeInterval:interval repeats:YES
73
+ // 必须注册到 common modes:performWindowDragWithEvent: 期间主 runloop 处于
74
+ // NSEventTrackingRunLoopMode,只挂在默认 mode 上的定时器不会触发,宠物会
75
+ // 定格在拖动起手的那一帧上,直到松手才继续动。
76
+ self.frameTimer = [NSTimer timerWithTimeInterval:interval repeats:YES
71
77
  block:^(NSTimer *timer) { [weakSelf nextFrame:timer]; }];
72
78
  self.frameTimer.tolerance = interval * 0.25;
79
+ [NSRunLoop.mainRunLoop addTimer:self.frameTimer forMode:NSRunLoopCommonModes];
73
80
  }
74
81
  - (void)setLookDirection:(NSInteger)value {
75
82
  if (_lookDirection == value) return;
@@ -258,40 +265,46 @@
258
265
  [self playRow:3 throughFrame:3 oneShot:YES];
259
266
  }
260
267
  }
268
+ // 桌宠是 LSUIElement + NSNonactivatingPanel,几乎永远不是活跃应用。不接受 first mouse
269
+ // 的话,AppKit 会把点击非活跃应用窗口的第一次 mouseDown 当成"激活点击"消耗掉,视图
270
+ // 根本收不到——表现为要点两下才拖得动。以前靠 movableByWindowBackground 拖动时不受
271
+ // 影响(窗口背景拖动在窗口服务器层处理,不走视图的 first mouse 判定),关掉它之后
272
+ // 这个缺陷才暴露出来。
273
+ - (BOOL)acceptsFirstMouse:(NSEvent *)event { return YES; }
274
+ // 精灵区的拖动由 runWindowDragWithEvent: 自己发起,不让 AppKit 的窗口背景拖动同时
275
+ // 介入同一次按下;窗口透明区没有这个覆写,继续走 movableByWindowBackground。
276
+ // 两条路径底层都是窗口服务器拖动,手感一致。
277
+ - (BOOL)mouseDownCanMoveWindow { return NO; }
261
278
  - (void)mouseDown:(NSEvent *)event {
262
279
  self.agentActive = NO;
263
280
  self.dragStartMouse = NSEvent.mouseLocation;
264
- self.dragStartWindowOrigin = self.window.frame.origin;
265
- self.draggingPet = NO;
266
281
  }
267
282
  - (void)mouseDragged:(NSEvent *)event {
268
283
  NSPoint current = NSEvent.mouseLocation;
269
284
  CGFloat horizontal = current.x - self.dragStartMouse.x;
270
285
  CGFloat vertical = current.y - self.dragStartMouse.y;
271
- if (!self.draggingPet && hypot(horizontal, vertical) >= 3) {
272
- self.draggingPet = YES;
273
- if (self.dragStateChanged) self.dragStateChanged(YES);
274
- }
275
- if (self.draggingPet) {
276
- if (self.pocketHoverChanged) self.pocketHoverChanged(NO);
277
- [self playRow:horizontal >= 0 ? 1 : 2 throughFrame:7 oneShot:NO];
278
- }
279
- NSPoint origin = NSMakePoint(
280
- self.dragStartWindowOrigin.x + horizontal,
281
- self.dragStartWindowOrigin.y + vertical
282
- );
283
- [self.window setFrameOrigin:origin];
284
- if (self.positionChanged) self.positionChanged();
286
+ if (hypot(horizontal, vertical) < PetDragThreshold) return;
287
+ [self runWindowDragWithEvent:event movingRight:horizontal >= 0];
288
+ }
289
+ // 拖动整段交给窗口服务器:它不依赖应用事件流,所以掠过其他窗口、拖出屏幕、
290
+ // 应用非活跃都不会中断,也不可能丢 mouseUp。函数阻塞到用户松手才返回,
291
+ // 前后两段状态因此天然配对,不存在"开始了但没结束"。
292
+ - (void)runWindowDragWithEvent:(NSEvent *)event movingRight:(BOOL)movingRight {
293
+ self.draggingPet = YES;
294
+ if (self.pocketHoverChanged) self.pocketHoverChanged(NO);
295
+ if (self.dragStateChanged) self.dragStateChanged(YES);
296
+ [self playRow:movingRight ? 1 : 2 throughFrame:7 oneShot:NO];
297
+
298
+ [self.window performWindowDragWithEvent:event];
299
+
300
+ self.draggingPet = NO;
301
+ if (self.dragStateChanged) self.dragStateChanged(NO);
302
+ [self playRow:0 throughFrame:5 oneShot:NO];
285
303
  }
304
+ // 拖动会话(含 mouseUp)已被 performWindowDragWithEvent: 消费,所以能走到这里
305
+ // 就说明本次按下没有拖动过,不需要额外的标志来区分。
286
306
  - (void)mouseUp:(NSEvent *)event {
287
- if (self.draggingPet) {
288
- self.draggingPet = NO;
289
- if (self.dragStateChanged) self.dragStateChanged(NO);
290
- [self playRow:0 throughFrame:5 oneShot:NO];
291
- } else {
292
- // 第 8 行未标注的动作作为点击反馈,完整利用剩余素材。
293
- [self playRow:7 throughFrame:5 oneShot:YES];
294
- }
307
+ [self playRow:7 throughFrame:5 oneShot:YES];
295
308
  }
296
309
  - (void)drawRect:(NSRect)dirtyRect {
297
310
  CGFloat cellWidth = self.sheet.size.width / 8.0;
@@ -480,6 +493,11 @@
480
493
  [menu addItem:NSMenuItem.separatorItem];
481
494
  NSMenuItem *refreshItem = [menu addItemWithTitle:@"刷新用量" action:@selector(refreshUsage:) keyEquivalent:@"r"];
482
495
  refreshItem.target = NSApp.delegate;
496
+ [self addPersistentSwitchToMenu:menu
497
+ title:@"显示消息气泡"
498
+ checked:[NSUserDefaults.standardUserDefaults boolForKey:StatusBubbleExpandedKey]
499
+ action:@selector(toggleStatusBubbleFromMenu:)
500
+ tag:0];
483
501
  [self addPersistentSwitchToMenu:menu
484
502
  title:@"记录本地额度历史"
485
503
  checked:[NSUserDefaults.standardUserDefaults boolForKey:HistoryEnabledKey]
@@ -54,6 +54,17 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
54
54
  return NSMakeRect(logical.origin.x * QuotaScale, logical.origin.y * QuotaScale,
55
55
  logical.size.width * QuotaScale, logical.size.height * QuotaScale);
56
56
  }
57
+ - (NSRect)logicalSummaryRect {
58
+ return NSMakeRect(20, 372, QuotaLogicalWidth - 40, 86);
59
+ }
60
+ // 刷新时间挪去了右上角,这一版块整宽留给两个统计格,各占一半。
61
+ - (NSRect)logicalSummaryCellRectAtIndex:(NSUInteger)index {
62
+ NSRect summary = [self logicalSummaryRect];
63
+ CGFloat width = NSWidth(summary) / 2;
64
+ return index < 2
65
+ ? NSMakeRect(NSMinX(summary) + index * width, NSMinY(summary), width, NSHeight(summary))
66
+ : NSZeroRect;
67
+ }
57
68
  - (void)mouseMoved:(NSEvent *)event {
58
69
  NSPoint point = [self convertPoint:event.locationInWindow fromView:nil];
59
70
  BOOL hovering = NSPointInRect(point, [self refreshRect]);
@@ -97,25 +108,42 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
97
108
  ? usage[@"tokenUsage"] : nil;
98
109
  return [tokenUsage[key] isKindOfClass:NSDictionary.class] ? tokenUsage[key] : nil;
99
110
  }
100
- - (NSString *)formattedTokenCount:(NSDictionary *)totals {
101
- NSNumber *number = [totals[@"total_tokens"] isKindOfClass:NSNumber.class]
102
- ? totals[@"total_tokens"] : nil;
103
- if (!number) return @"--";
104
- double value = number.doubleValue;
111
+ - (NSString *)formattedTokenValue:(double)value {
105
112
  if (value >= 1000000000) return [NSString stringWithFormat:@"%.2fB", value / 1000000000.0];
106
113
  if (value >= 1000000) return [NSString stringWithFormat:@"%.2fM", value / 1000000.0];
107
114
  if (value >= 1000) return [NSString stringWithFormat:@"%.1fK", value / 1000.0];
108
115
  return [NSString stringWithFormat:@"%.0f", value];
109
116
  }
117
+ - (NSString *)formattedTokenCount:(NSDictionary *)totals {
118
+ NSNumber *number = [totals[@"total_tokens"] isKindOfClass:NSNumber.class]
119
+ ? totals[@"total_tokens"] : nil;
120
+ return number ? [self formattedTokenValue:number.doubleValue] : @"--";
121
+ }
122
+ // 输入取 total - output,而不是把几个 input_* 字段加起来:两家的包含关系是相反的。
123
+ // Codex 的 cached_input_tokens 是 input_tokens 的子集(实测 input+output == total),
124
+ // 相加会把缓存部分算两遍;Claude 的 input_tokens 不含缓存读写,两者是并列项,不加又会漏。
125
+ // total - output 对两家都成立,也保证"输入 + 输出"正好等于卡片上那个已用 Token。
126
+ - (NSString *)formattedTokenSplit:(NSDictionary *)totals wantsOutput:(BOOL)wantsOutput {
127
+ NSNumber *total = [totals[@"total_tokens"] isKindOfClass:NSNumber.class]
128
+ ? totals[@"total_tokens"] : nil;
129
+ if (!total) return @"--";
130
+ NSNumber *output = [totals[@"output_tokens"] isKindOfClass:NSNumber.class]
131
+ ? totals[@"output_tokens"] : nil;
132
+ double outputValue = output ? output.doubleValue : 0;
133
+ return [self formattedTokenValue:
134
+ wantsOutput ? outputValue : fmax(0, total.doubleValue - outputValue)];
135
+ }
110
136
  // 两个窗口共用。resets_at 是整分对齐的,带秒只会多占宽度。
111
- - (NSString *)resetText:(NSDictionary *)quota {
112
- NSNumber *reset = [quota[@"resets_at"] isKindOfClass:NSNumber.class] ? quota[@"resets_at"] : nil;
113
- if (!reset) return @"--";
137
+ - (NSString *)clockText:(NSTimeInterval)value {
114
138
  NSDateFormatter *formatter = [NSDateFormatter new];
115
139
  formatter.locale = [NSLocale localeWithLocaleIdentifier:@"zh_CN"];
116
140
  formatter.timeZone = NSTimeZone.localTimeZone;
117
141
  formatter.dateFormat = @"M/d HH:mm";
118
- return [formatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:reset.doubleValue]];
142
+ return [formatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:value]];
143
+ }
144
+ - (NSString *)resetText:(NSDictionary *)quota {
145
+ NSNumber *reset = [quota[@"resets_at"] isKindOfClass:NSNumber.class] ? quota[@"resets_at"] : nil;
146
+ return reset ? [self clockText:reset.doubleValue] : @"--";
119
147
  }
120
148
  // 在线 = 这一家还有活着的客户端,和有没有额度数据无关:额度会一直缓存着,
121
149
  // 拿它当在线信号会恒亮。身份不明的老客户端无法归属到某一家,保守地都算在线。
@@ -129,19 +157,13 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
129
157
  - (NSColor *)agentStatusColor {
130
158
  return self.activeAgentCount > 0 ? NSColor.systemGreenColor : self.secondaryColor;
131
159
  }
132
- // 汇总条展示两个 Provider 的合计,任一侧缺数据时按 0 计入,两侧都没有才显示 `--`。
133
- // 只能传自然日口径的 key(today / recentWeek):两家的订阅窗口起止并不一致,
134
- // 按各自 resets_at 算出来的数不在同一区间上,相加得不到任何有意义的量。
135
- - (NSDictionary *)combinedTokens:(NSString *)key {
136
- NSDictionary *codex = [self tokenTotals:self.codexUsage key:key];
137
- NSDictionary *claude = [self tokenTotals:self.claudeUsage key:key];
138
- NSNumber *codexTotal = [codex[@"total_tokens"] isKindOfClass:NSNumber.class]
139
- ? codex[@"total_tokens"] : nil;
140
- NSNumber *claudeTotal = [claude[@"total_tokens"] isKindOfClass:NSNumber.class]
141
- ? claude[@"total_tokens"] : nil;
142
- if (!codexTotal && !claudeTotal) return @{};
143
- return @{@"total_tokens": @(codexTotal.unsignedLongLongValue +
144
- claudeTotal.unsignedLongLongValue)};
160
+ - (NSString *)formattedTokenCountForUsage:(NSDictionary *)usage key:(NSString *)key {
161
+ return [self formattedTokenCount:[self tokenTotals:usage key:key] ?: @{}];
162
+ }
163
+ - (NSString *)formattedTokenSplitForUsage:(NSDictionary *)usage key:(NSString *)key
164
+ wantsOutput:(BOOL)wantsOutput {
165
+ return [self formattedTokenSplit:[self tokenTotals:usage key:key] ?: @{}
166
+ wantsOutput:wantsOutput];
145
167
  }
146
168
  - (NSNumber *)usedForQuota:(NSDictionary *)quota usedKey:(NSString *)usedKey {
147
169
  NSNumber *used = [quota[usedKey] isKindOfClass:NSNumber.class] ? quota[usedKey] : nil;
@@ -159,6 +181,14 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
159
181
  return @{NSFontAttributeName: [NSFont systemFontOfSize:size weight:weight],
160
182
  NSForegroundColorAttributeName: color};
161
183
  }
184
+ - (NSDictionary *)rightAlignedTextAttributesWithSize:(CGFloat)size color:(NSColor *)color
185
+ weight:(NSFontWeight)weight {
186
+ NSMutableParagraphStyle *style = [NSMutableParagraphStyle new];
187
+ style.alignment = NSTextAlignmentRight;
188
+ return @{NSFontAttributeName: [NSFont systemFontOfSize:size weight:weight],
189
+ NSForegroundColorAttributeName: color,
190
+ NSParagraphStyleAttributeName: style};
191
+ }
162
192
  - (NSDictionary *)centeredTextAttributesWithSize:(CGFloat)size color:(NSColor *)color weight:(NSFontWeight)weight {
163
193
  NSMutableParagraphStyle *style = [NSMutableParagraphStyle new];
164
194
  style.alignment = NSTextAlignmentCenter;
@@ -196,7 +226,10 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
196
226
  NSDictionary *weekTokens = [self tokenTotals:usage key:@"week"];
197
227
  NSNumber *fiveUsed = [self usedForQuota:five usedKey:usedKey];
198
228
  NSNumber *weekUsed = [self usedForQuota:week usedKey:usedKey];
199
- BOOL hasData = fiveUsed || weekUsed || fiveTokens || weekTokens;
229
+ // 额度被拒之后官方不再报告任何窗口,留在手里的百分比既过期、指向的结论又正好相反
230
+ // (账号是共享的,别人用完时本机的数字纹丝不动)。这时按 0 显示,并把状态说清楚。
231
+ BOOL exhausted = [usage[@"exhaustedAt"] isKindOfClass:NSNumber.class];
232
+ BOOL hasData = fiveUsed || weekUsed || fiveTokens || weekTokens || exhausted;
200
233
  BOOL online = [self isProviderOnline:name];
201
234
 
202
235
  NSBezierPath *cardPath = [NSBezierPath bezierPathWithRoundedRect:card xRadius:18 yRadius:18];
@@ -231,9 +264,12 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
231
264
  }
232
265
  [name drawInRect:NSMakeRect(NSMinX(card) + 94, NSMinY(card) + 84, 88, 30)
233
266
  withAttributes:[self textAttributesWithSize:22 color:primary weight:NSFontWeightBold]];
234
- // 三态:没有任何额度数据 → 等待数据;有数据但客户端已退出 → 离线;两者都有 → 在线。
235
- NSString *statusText = !hasData ? @"等待数据" : (online ? @"● 在线" : @"离线");
236
- NSColor *statusColor = online && hasData ? NSColor.systemGreenColor : secondary;
267
+ // 四态:额度被拒 → 额度已用尽(压过在线,这是此刻唯一要紧的信息);没有任何额度
268
+ // 数据 → 等待数据;有数据但客户端已退出 → 离线;两者都有 → 在线。
269
+ NSString *statusText = exhausted ? @"额度已用尽"
270
+ : (!hasData ? @"等待数据" : (online ? @"● 在线" : @"离线"));
271
+ NSColor *statusColor = exhausted ? NSColor.systemOrangeColor
272
+ : (online && hasData ? NSColor.systemGreenColor : secondary);
237
273
  NSDictionary *statusAttributes = [self textAttributesWithSize:11 color:statusColor
238
274
  weight:NSFontWeightMedium];
239
275
  CGFloat statusWidth = ceil([statusText sizeWithAttributes:statusAttributes].width) + 18;
@@ -244,37 +280,46 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
244
280
  // 层级:官方剩余额度是订阅限额的权威值,占主位;本机 Token 是参考量,降一级并用
245
281
  // 强调色区分;重置时间最小。反过来会让最抢眼的数字恰好是最不该照着做决定的那个。
246
282
  NSArray<NSDictionary *> *windows = @[
247
- @{@"x": @(NSMinX(card) + 214), @"title": @"5 小时", @"quota": five ?: @{},
248
- @"tokens": fiveTokens ?: @{}, @"used": fiveUsed ?: NSNull.null},
249
- @{@"x": @(NSMinX(card) + 394), @"title": @"7 天", @"quota": week ?: @{},
250
- @"tokens": weekTokens ?: @{}, @"used": weekUsed ?: NSNull.null}
283
+ @{@"x": @(NSMinX(card) + 214), @"title": @"5 小时窗口", @"quota": five ?: @{},
284
+ @"tokens": fiveTokens ?: @{}, @"used": fiveUsed ?: NSNull.null,
285
+ @"rolling": @"无官方窗口 · 近 5 小时"},
286
+ @{@"x": @(NSMinX(card) + 394), @"title": @"7 天窗口", @"quota": week ?: @{},
287
+ @"tokens": weekTokens ?: @{}, @"used": weekUsed ?: NSNull.null,
288
+ @"rolling": @"无官方窗口 · 近 7 天"}
251
289
  ];
252
290
  for (NSDictionary *window in windows) {
253
291
  CGFloat x = [window[@"x"] doubleValue];
254
292
  [window[@"title"] drawInRect:NSMakeRect(x, NSMinY(card) + 114, 130, 20)
255
293
  withAttributes:[self textAttributesWithSize:13 color:secondary weight:NSFontWeightRegular]];
256
294
  NSNumber *used = [window[@"used"] isKindOfClass:NSNumber.class] ? window[@"used"] : nil;
257
- NSString *official = used ? [NSString stringWithFormat:@"%.0f%%",
258
- 100.0 - used.doubleValue] : @"--";
259
- [official drawInRect:NSMakeRect(x, NSMinY(card) + 78, 145, 34)
260
- withAttributes:[self textAttributesWithSize:25 color:primary weight:NSFontWeightBold]];
261
- [@"剩余额度" drawInRect:NSMakeRect(x, NSMinY(card) + 60, 145, 18)
262
- withAttributes:[self textAttributesWithSize:11 color:secondary weight:NSFontWeightRegular]];
263
- NSString *tokenText = [NSString stringWithFormat:@"Token %@",
295
+ double remaining = exhausted ? 0 : (used ? 100.0 - used.doubleValue : 0);
296
+ NSString *official = (used || exhausted)
297
+ ? [NSString stringWithFormat:@"%.0f%%", remaining] : @"--";
298
+ // 百分比是"剩余"、Token 是"已用",方向相反。后缀直接贴在数字右侧、
299
+ // 前缀写进 Token 行,否则两个数字并排看会被当成同一口径。
300
+ NSDictionary *valueAttributes = [self textAttributesWithSize:25
301
+ color:exhausted ? NSColor.systemOrangeColor : primary
302
+ weight:NSFontWeightBold];
303
+ CGFloat valueWidth = ceil([official sizeWithAttributes:valueAttributes].width);
304
+ [official drawInRect:NSMakeRect(x, NSMinY(card) + 74, valueWidth + 4, 34)
305
+ withAttributes:valueAttributes];
306
+ [@"剩余" drawInRect:NSMakeRect(x + valueWidth + 7, NSMinY(card) + 78, 60, 20)
307
+ withAttributes:[self textAttributesWithSize:12 color:secondary weight:NSFontWeightRegular]];
308
+ NSString *tokenText = [NSString stringWithFormat:@"已用 Token %@",
264
309
  [self formattedTokenCount:window[@"tokens"]]];
265
- [tokenText drawInRect:NSMakeRect(x, NSMinY(card) + 36, 145, 22)
266
- withAttributes:[self textAttributesWithSize:15 color:color weight:NSFontWeightSemibold]];
267
- // 整列都是 `--` 时说明这个窗口当前根本没有额度数据,直接说清楚,
268
- // 比堆三个 `--` 让人以为是渲染坏了要好。
310
+ [tokenText drawInRect:NSMakeRect(x, NSMinY(card) + 46, 150, 22)
311
+ withAttributes:[self textAttributesWithSize:14 color:color weight:NSFontWeightSemibold]];
312
+ // 官方窗口拿不到时(账号没有这个窗口、或响应里没带),Token 走的是本机滚动窗口。
313
+ // 说清楚这一行的口径,比留一个 `--` 让人以为是渲染坏了要好。
269
314
  NSString *resetValue = [self resetText:window[@"quota"]];
270
315
  NSString *reset = [resetValue isEqualToString:@"--"]
271
- ? @"当前无活跃窗口" : [NSString stringWithFormat:@"重置于 %@", resetValue];
272
- [reset drawInRect:NSMakeRect(x, NSMinY(card) + 16, 145, 18)
316
+ ? window[@"rolling"] : [NSString stringWithFormat:@"额度重置 %@", resetValue];
317
+ [reset drawInRect:NSMakeRect(x, NSMinY(card) + 22, 150, 18)
273
318
  withAttributes:[self textAttributesWithSize:11 color:secondary weight:NSFontWeightRegular]];
274
319
  }
275
320
 
276
321
  CGFloat trendX = NSMinX(card) + 564;
277
- [@"过去 7 天额度趋势" drawInRect:NSMakeRect(trendX, NSMinY(card) + 114, 145, 20)
322
+ [@"过去 7 天已用趋势" drawInRect:NSMakeRect(trendX, NSMinY(card) + 114, 145, 20)
278
323
  withAttributes:[self textAttributesWithSize:13 color:secondary weight:NSFontWeightRegular]];
279
324
  NSArray<NSNumber *> *history = [name isEqualToString:@"Codex"] ? self.codexHistory : self.claudeHistory;
280
325
  [self drawUsageBars:history inRect:NSMakeRect(trendX, NSMinY(card) + 42, 135, 64) color:color];
@@ -282,7 +327,7 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
282
327
  if (self.historyEnabled && history.count > 0) {
283
328
  double peak = 0;
284
329
  for (NSNumber *remaining in history) peak = fmax(peak, 100.0 - remaining.doubleValue);
285
- trendDetail = [NSString stringWithFormat:@"峰值额度已用 %.0f%%", peak];
330
+ trendDetail = [NSString stringWithFormat:@"峰值已用 %.0f%%", peak];
286
331
  }
287
332
  [trendDetail drawInRect:NSMakeRect(trendX, NSMinY(card) + 18, 145, 18)
288
333
  withAttributes:[self textAttributesWithSize:11 color:secondary weight:NSFontWeightRegular]];
@@ -345,42 +390,68 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
345
390
  [self fillRoundedRect:refreshRect radius:10 color:[NSColor colorWithWhite:1 alpha:buttonAlpha]];
346
391
  [recentlyRefreshed ? @"✓" : @"↻" drawInRect:NSInsetRect(refreshRect, 8, 4)
347
392
  withAttributes:[self textAttributesWithSize:19 color:[NSColor colorWithWhite:0.9 alpha:1] weight:NSFontWeightRegular]];
393
+ // 贴着刷新按钮左侧右对齐:它说明的正是这个按钮上次生效的时间,挨着放才不用再标一遍
394
+ // "数据刷新"是什么意思。放回汇总条里会挤掉一整格 Provider 数据。
395
+ [[NSString stringWithFormat:@"数据刷新 %@", [self refreshAgeText]]
396
+ drawInRect:NSMakeRect(NSMinX(logicalRefreshRect) - 206, NSMinY(logicalRefreshRect) + 7, 200, 18)
397
+ withAttributes:[self rightAlignedTextAttributesWithSize:11 color:secondary
398
+ weight:NSFontWeightRegular]];
348
399
 
349
- NSRect summary = NSMakeRect(20, 372, QuotaLogicalWidth - 40, 86);
400
+ NSRect summary = [self logicalSummaryRect];
350
401
  NSBezierPath *summaryPath = [NSBezierPath bezierPathWithRoundedRect:summary xRadius:18 yRadius:18];
351
402
  [[NSColor colorWithWhite:1 alpha:0.065] setFill];
352
403
  [summaryPath fill];
353
404
  [[NSColor colorWithWhite:1 alpha:0.16] setStroke];
354
405
  [summaryPath stroke];
355
406
 
356
- // 在线 Agent 数已经在标题旁展示过,这里换成 5 小时合计,和第二格的 7 天形成对照。
357
- // 三格等宽由 summary 推导,改宽度时分隔线和内容不会各走各的。
407
+ // 今日与最近 7 天都按 Provider 分开展示。底层本来就是两套独立的自然日统计,
408
+ // 不在展示层相加,避免用户无法判断 Token 来自 Codex 还是 Claude。
409
+ // 每格内是一张 2×2 表:行是 Provider,列是输入/输出,列头与格标题共用一行 —— 86pt
410
+ // 高度只够三行,再单开一行列头就得把格子拔高,挤掉下面两张 Provider 卡片。
358
411
  NSArray<NSDictionary *> *cells = @[
359
- @{@"icon": @"◔", @"tint": cyan, @"value": [self formattedTokenCount:
360
- [self combinedTokens:@"today"]], @"label": @"今日 Token"},
361
- @{@"icon": @"◉", @"tint": cyan, @"value": [self formattedTokenCount:
362
- [self combinedTokens:@"recentWeek"]], @"label": @"最近 7 天"},
363
- @{@"icon": @"◷", @"tint": NSColor.systemPurpleColor, @"value": [self refreshAgeText],
364
- @"label": @"数据刷新"}
412
+ @{@"icon": @"◔", @"key": @"today", @"label": @"今日已用 Token"},
413
+ @{@"icon": @"◉", @"key": @"recentWeek", @"label": @"近 7 天已用 Token"}
414
+ ];
415
+ NSColor *claudeColor = [NSColor colorWithRed:0.66 green:0.43 blue:0.94 alpha:1];
416
+ NSArray<NSDictionary *> *rows = @[
417
+ @{@"name": @"Codex", @"usage": self.codexUsage ?: @{}, @"color": cyan, @"y": @35},
418
+ @{@"name": @"Claude", @"usage": self.claudeUsage ?: @{}, @"color": claudeColor, @"y": @12}
365
419
  ];
366
- CGFloat cellWidth = NSWidth(summary) / cells.count;
367
420
  [[NSColor colorWithWhite:1 alpha:0.10] setStroke];
368
421
  for (NSUInteger index = 1; index < cells.count; index++) {
369
- CGFloat x = NSMinX(summary) + cellWidth * index;
422
+ CGFloat x = NSMinX([self logicalSummaryCellRectAtIndex:index]);
370
423
  [NSBezierPath strokeLineFromPoint:NSMakePoint(x, NSMinY(summary) + 16)
371
424
  toPoint:NSMakePoint(x, NSMaxY(summary) - 16)];
372
425
  }
373
426
  for (NSUInteger index = 0; index < cells.count; index++) {
374
427
  NSDictionary *cell = cells[index];
375
- CGFloat x = NSMinX(summary) + cellWidth * index;
376
- [cell[@"icon"] drawInRect:NSMakeRect(x + 26, NSMinY(summary) + 23, 42, 42)
377
- withAttributes:[self textAttributesWithSize:30 color:cell[@"tint"]
378
- weight:NSFontWeightRegular]];
379
- [cell[@"value"] drawInRect:NSMakeRect(x + 74, NSMinY(summary) + 40, 150, 28)
380
- withAttributes:[self textAttributesWithSize:22 color:primary weight:NSFontWeightBold]];
381
- [cell[@"label"] drawInRect:NSMakeRect(x + 74, NSMinY(summary) + 17, 150, 20)
382
- withAttributes:[self textAttributesWithSize:12 color:secondary
383
- weight:NSFontWeightRegular]];
428
+ NSString *key = cell[@"key"];
429
+ CGFloat x = NSMinX([self logicalSummaryCellRectAtIndex:index]);
430
+ const CGFloat inputX = x + 176;
431
+ const CGFloat outputX = x + 266;
432
+ [cell[@"icon"] drawInRect:NSMakeRect(x + 24, NSMinY(summary) + 23, 42, 42)
433
+ withAttributes:[self textAttributesWithSize:30 color:cyan weight:NSFontWeightRegular]];
434
+ NSDictionary *headerAttributes = [self textAttributesWithSize:11 color:secondary
435
+ weight:NSFontWeightRegular];
436
+ [cell[@"label"] drawInRect:NSMakeRect(x + 72, NSMinY(summary) + 59, 100, 18)
437
+ withAttributes:headerAttributes];
438
+ [@"输入" drawInRect:NSMakeRect(inputX, NSMinY(summary) + 59, 86, 18)
439
+ withAttributes:headerAttributes];
440
+ [@"输出" drawInRect:NSMakeRect(outputX, NSMinY(summary) + 59, 86, 18)
441
+ withAttributes:headerAttributes];
442
+ for (NSDictionary *row in rows) {
443
+ CGFloat y = NSMinY(summary) + [row[@"y"] doubleValue];
444
+ NSDictionary *usage = row[@"usage"];
445
+ [row[@"name"] drawInRect:NSMakeRect(x + 72, y, 60, 20)
446
+ withAttributes:[self textAttributesWithSize:12 color:row[@"color"]
447
+ weight:NSFontWeightMedium]];
448
+ NSDictionary *valueAttributes = [self textAttributesWithSize:16 color:primary
449
+ weight:NSFontWeightBold];
450
+ [[self formattedTokenSplitForUsage:usage key:key wantsOutput:NO]
451
+ drawInRect:NSMakeRect(inputX, y - 2, 86, 23) withAttributes:valueAttributes];
452
+ [[self formattedTokenSplitForUsage:usage key:key wantsOutput:YES]
453
+ drawInRect:NSMakeRect(outputX, y - 2, 86, 23) withAttributes:valueAttributes];
454
+ }
384
455
  }
385
456
 
386
457
  [self drawProvider:@"Codex" usage:self.codexUsage usedKey:@"used_percent"
@@ -388,7 +459,7 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName) {
388
459
  [self drawProvider:@"Claude" usage:self.claudeUsage usedKey:@"used_percentage"
389
460
  color:[NSColor colorWithRed:0.66 green:0.43 blue:0.94 alpha:1]
390
461
  cardRect:NSMakeRect(20, 44, QuotaLogicalWidth - 40, 152)];
391
- NSString *footer = @"ⓘ Token 为本机统计;官方订阅额度以服务端百分比为准,数据可能存在短暂延迟";
462
+ NSString *footer = @"ⓘ 百分比 = 官方订阅额度的剩余比例;Token = 本机统计的已用量(输入含缓存读写),两者口径不同";
392
463
  // 卡片底边在 y=44,原来 footer 顶到 44 完全没有间隙。下移到与卡片留约 8pt,
393
464
  // 同时底部留白 16pt,和顶部标题的留白大致对称。
394
465
  [footer drawInRect:NSMakeRect(28, 16, 650, 20)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cc-pets",
3
- "version": "1.0.9",
3
+ "version": "1.1.1",
4
4
  "description": "A native macOS desktop pet for Codex CLI and Claude Code",
5
5
  "author": "wangxinyusqn",
6
6
  "license": "MIT",