cc-pets 1.0.5 → 1.0.6
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,14 @@
|
|
|
10
10
|
- Token 聚合改为增量跟读并按额度窗口节流,事件驱动的高频刷新不再重复扫描近 7 天会话;
|
|
11
11
|
过期日期目录按目录名剪枝,无 Token 数据的会话文件缓存失败结果不再反复重读。
|
|
12
12
|
- 新开 Codex 会话时不再因为尚无 `rate_limits` 而清空面板上已知的额度。
|
|
13
|
+
- 修复状态气泡在任务完成后被打回"正在思考":`Stop` 之后仍会飘来 `SubagentStop` /
|
|
14
|
+
`PostToolUse` 等尾巴事件,它们与 `UserPromptSubmit` 归一成同一个状态,现按事件名拦截,
|
|
15
|
+
终态只能被新一轮真实动作解除。
|
|
16
|
+
- 状态气泡新增"待机中":`正在启动` 超过 8 秒没有后续事件即落到待机,不再让启动态和
|
|
17
|
+
空闲态显示成同一句"正在准备当前会话…"。
|
|
18
|
+
- 修复测试污染用户真实事件流:跑包装脚本的用例只隔离了 `TMPDIR`,而事件文件走
|
|
19
|
+
`NSTemporaryDirectory()` 不认它,每次跑测试都会写入 3 条 `SessionStart`,把正在运行的
|
|
20
|
+
桌宠打回"正在启动"。相关用例补上 `CC_PETS_STATE_DIR`,并加了基线校验防止再犯。
|
|
13
21
|
- 修复额度卡片的在线徽章恒亮:此前按"有没有额度数据"判定,而额度会一直缓存,导致
|
|
14
22
|
客户端早已退出、甚至单独打开 App 从未运行过 Agent 时两张卡片也显示在线。现改为按该
|
|
15
23
|
provider 是否还有存活客户端判定,并用事件活跃度覆盖不经包装脚本启动的会话。包装脚本
|
package/PROVIDER_PROTOCOL.md
CHANGED
|
@@ -36,6 +36,17 @@ printf '%s' '{
|
|
|
36
36
|
建议工具类别使用 `shell`、`edit`、`write`、`read`、`search`、`web`、`mcp` 或
|
|
37
37
|
`agent`。CC Pets 不会执行 `tool` 字段,也不会将其作为通知正文。
|
|
38
38
|
|
|
39
|
+
## 状态显示规则
|
|
40
|
+
|
|
41
|
+
事件到达顺序不一定等于语义顺序,气泡显示因此有两条额外规则:
|
|
42
|
+
|
|
43
|
+
- **终态具有黏性。** 进入 `completed` 或 `failed` 后,紧随其后的 `tool_completed`
|
|
44
|
+
(以及内部的 `SubagentStop`、`TaskCompleted`)不会改写气泡——这类尾巴事件常常在任务
|
|
45
|
+
真正结束之后才到达。要解除终态,请发送 `thinking`、`tool`、`approval` 或
|
|
46
|
+
`notification` 等表示新一轮动作的状态。
|
|
47
|
+
- **`starting` 是短时态。** 超过 8 秒没有后续事件,气泡会自动落到"待机中",表示会话
|
|
48
|
+
已就绪、正在等待输入。长时间的准备工作请显式发送 `thinking`,不要停留在 `starting`。
|
|
49
|
+
|
|
39
50
|
## 生命周期
|
|
40
51
|
|
|
41
52
|
事件写入当前用户的临时状态目录,已经运行的 CC Pets 会立即读取。Provider 集成需要自行
|
|
@@ -296,6 +296,7 @@ static void TrimUpdateLog(NSString *path) {
|
|
|
296
296
|
}
|
|
297
297
|
- (NSString *)statusTextForState:(NSString *)state tool:(NSString *)tool {
|
|
298
298
|
if ([state isEqualToString:@"starting"]) return @"正在启动";
|
|
299
|
+
if ([state isEqualToString:@"idle"]) return @"待机中";
|
|
299
300
|
if ([state isEqualToString:@"thinking"]) return @"正在思考";
|
|
300
301
|
if ([state isEqualToString:@"auto_review"]) return @"自动审批中";
|
|
301
302
|
if ([state isEqualToString:@"approval"]) return @"等待审批";
|
|
@@ -322,6 +323,7 @@ static void TrimUpdateLog(NSString *path) {
|
|
|
322
323
|
}
|
|
323
324
|
- (NSString *)statusDetailForState:(NSString *)state {
|
|
324
325
|
if ([state isEqualToString:@"starting"]) return @"正在准备当前会话…";
|
|
326
|
+
if ([state isEqualToString:@"idle"]) return @"会话已就绪,等待你的下一条指令。";
|
|
325
327
|
if ([state isEqualToString:@"thinking"]) return @"正在分析请求…";
|
|
326
328
|
if ([state isEqualToString:@"auto_review"]) return @"正在由 Auto-review 审核,无需手动操作。";
|
|
327
329
|
if ([state isEqualToString:@"approval"]) return @"请回到终端确认操作。";
|
|
@@ -344,12 +346,15 @@ static void TrimUpdateLog(NSString *path) {
|
|
|
344
346
|
if ([state isEqualToString:@"approval"] || [state isEqualToString:@"notification"]) {
|
|
345
347
|
return [NSColor colorWithRed:0.92 green:0.58 blue:0.12 alpha:1];
|
|
346
348
|
}
|
|
349
|
+
// 待机是"没在干活",用中性灰和工作中的蓝拉开距离。
|
|
350
|
+
if ([state isEqualToString:@"idle"]) return [NSColor colorWithWhite:0.55 alpha:1];
|
|
347
351
|
return [NSColor colorWithRed:0.33 green:0.53 blue:0.78 alpha:1];
|
|
348
352
|
}
|
|
349
353
|
- (NSString *)statusSymbolForState:(NSString *)state {
|
|
350
354
|
if ([state isEqualToString:@"completed"] || [state isEqualToString:@"tool_completed"]) return @"checkmark";
|
|
351
355
|
if ([state isEqualToString:@"failed"] || [state isEqualToString:@"tool_failed"]) return @"xmark";
|
|
352
356
|
if ([state isEqualToString:@"approval"] || [state isEqualToString:@"notification"]) return @"exclamationmark";
|
|
357
|
+
if ([state isEqualToString:@"idle"]) return @"zzz";
|
|
353
358
|
return @"ellipsis";
|
|
354
359
|
}
|
|
355
360
|
- (void)updateStatusToggleAppearance {
|
|
@@ -389,6 +394,8 @@ static void TrimUpdateLog(NSString *path) {
|
|
|
389
394
|
[self hideAgentStatus];
|
|
390
395
|
}
|
|
391
396
|
- (void)hideAgentStatus {
|
|
397
|
+
[NSObject cancelPreviousPerformRequestsWithTarget:self
|
|
398
|
+
selector:@selector(enterIdleStatus) object:nil];
|
|
392
399
|
[self.statusPanel orderOut:nil];
|
|
393
400
|
[self.statusTogglePanel orderOut:nil];
|
|
394
401
|
self.hasAgentStatus = NO;
|
|
@@ -407,21 +414,20 @@ static void TrimUpdateLog(NSString *path) {
|
|
|
407
414
|
[self updateStatusToggleAppearance];
|
|
408
415
|
[self.statusTogglePanel orderFrontRegardless];
|
|
409
416
|
}
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
417
|
+
// Stop 之后还会飘来 SubagentStop / PostToolUse / TaskCompleted 这类"仍在工作"的尾巴事件
|
|
418
|
+
// (实测 Stop 后 4 秒),它们和 UserPromptSubmit 一样都归一成 thinking,只看 state 分不出来,
|
|
419
|
+
// 所以必须按事件名判断。终态只能被新一轮真实动作解除(用户提问、工具调用、需要关注),
|
|
420
|
+
// 否则"任务已完成"会被打回"正在思考",看起来像任务又活了。
|
|
421
|
+
- (BOOL)isTrailingRecord:(NSDictionary *)record afterState:(NSString *)state {
|
|
422
|
+
if (![state isEqualToString:@"completed"] && ![state isEqualToString:@"failed"]) return NO;
|
|
423
|
+
NSString *event = [record[@"event"] isKindOfClass:NSString.class] ? record[@"event"] : @"";
|
|
424
|
+
return [event isEqualToString:@"SubagentStop"] || [event isEqualToString:@"PostToolUse"] ||
|
|
425
|
+
[event isEqualToString:@"TaskCompleted"];
|
|
426
|
+
}
|
|
427
|
+
- (void)applyStatusPresentationForState:(NSString *)state provider:(NSString *)provider
|
|
428
|
+
tool:(NSString *)tool {
|
|
419
429
|
self.lastStatusState = state;
|
|
420
430
|
self.lastStatusProvider = provider;
|
|
421
|
-
self.lastStatusTimestamp = [NSDate.date timeIntervalSince1970];
|
|
422
|
-
if (!self.providerActivityAt) self.providerActivityAt = [NSMutableDictionary dictionary];
|
|
423
|
-
self.providerActivityAt[provider] = @(self.lastStatusTimestamp);
|
|
424
|
-
[self updateQuotaLiveState];
|
|
425
431
|
self.statusTitleLabel.stringValue = [NSString stringWithFormat:@"%@ · %@",
|
|
426
432
|
provider, [self statusTextForState:state tool:tool]];
|
|
427
433
|
self.statusDetailLabel.stringValue = [self statusDetailForState:state];
|
|
@@ -438,9 +444,41 @@ static void TrimUpdateLog(NSString *path) {
|
|
|
438
444
|
else [self.statusPanel orderOut:nil];
|
|
439
445
|
[self updateStatusToggleAppearance];
|
|
440
446
|
[self.statusTogglePanel orderFrontRegardless];
|
|
447
|
+
}
|
|
448
|
+
// "正在启动"只在会话拉起的一瞬间成立。之后如果没有任何后续事件,真实情况是会话已就绪、
|
|
449
|
+
// 正在等用户输入——继续显示"正在准备当前会话…"会让启动和待机看起来一模一样。
|
|
450
|
+
- (void)enterIdleStatus {
|
|
451
|
+
if (!self.hasAgentStatus) return;
|
|
452
|
+
[self applyStatusPresentationForState:@"idle"
|
|
453
|
+
provider:self.lastStatusProvider ?: @"Agent" tool:@""];
|
|
454
|
+
}
|
|
455
|
+
- (void)showAgentStatusForRecord:(NSDictionary *)record notify:(BOOL)shouldNotify {
|
|
456
|
+
NSString *provider = SanitizedShortString(record[@"provider"], 32);
|
|
457
|
+
if (provider.length == 0) provider = @"Agent";
|
|
458
|
+
NSString *state = [record[@"state"] isKindOfClass:NSString.class]
|
|
459
|
+
? record[@"state"] : NormalizedStateForEvent(record[@"event"], [record[@"failed"] boolValue]);
|
|
460
|
+
NSString *tool = [record[@"tool"] isKindOfClass:NSString.class] ? record[@"tool"] : @"";
|
|
461
|
+
// 尾巴事件仍然算"客户端还活着",只是不该改写气泡上的终态。
|
|
462
|
+
self.lastStatusTimestamp = [NSDate.date timeIntervalSince1970];
|
|
463
|
+
if (!self.providerActivityAt) self.providerActivityAt = [NSMutableDictionary dictionary];
|
|
464
|
+
self.providerActivityAt[provider] = @(self.lastStatusTimestamp);
|
|
465
|
+
[self updateQuotaLiveState];
|
|
466
|
+
if (self.hasAgentStatus && [provider isEqualToString:self.lastStatusProvider] &&
|
|
467
|
+
[self isTrailingRecord:record afterState:self.lastStatusState]) return;
|
|
468
|
+
|
|
469
|
+
[NSObject cancelPreviousPerformRequestsWithTarget:self
|
|
470
|
+
selector:@selector(hideAgentStatus) object:nil];
|
|
471
|
+
[NSObject cancelPreviousPerformRequestsWithTarget:self
|
|
472
|
+
selector:@selector(enterIdleStatus) object:nil];
|
|
473
|
+
self.hasAgentStatus = YES;
|
|
474
|
+
[self applyStatusPresentationForState:state provider:provider tool:tool];
|
|
441
475
|
[self.panel orderFrontRegardless];
|
|
442
476
|
[self performSelector:@selector(hideAgentStatus)
|
|
443
477
|
withObject:nil afterDelay:AgentStatusInactivityInterval];
|
|
478
|
+
if ([state isEqualToString:@"starting"]) {
|
|
479
|
+
[self performSelector:@selector(enterIdleStatus) withObject:nil
|
|
480
|
+
afterDelay:AgentStartingGraceInterval];
|
|
481
|
+
}
|
|
444
482
|
if (shouldNotify) [self notifyForRecord:record];
|
|
445
483
|
}
|
|
446
484
|
- (void)showAgentStatusForRecord:(NSDictionary *)record {
|
|
@@ -16,6 +16,7 @@ extern NSString *const StatusBubblePreferenceV2Key;
|
|
|
16
16
|
|
|
17
17
|
extern const NSTimeInterval AgentStatusInactivityInterval;
|
|
18
18
|
extern const NSTimeInterval AgentStatusOrphanInterval;
|
|
19
|
+
extern const NSTimeInterval AgentStartingGraceInterval;
|
|
19
20
|
extern const NSTimeInterval UsageRefreshIntervalVisible;
|
|
20
21
|
extern const NSTimeInterval UsageRefreshIntervalHidden;
|
|
21
22
|
extern const NSTimeInterval ClientLifecycleInterval;
|
|
@@ -38,6 +38,9 @@ const NSTimeInterval AgentStatusInactivityInterval = 60.0;
|
|
|
38
38
|
// 留这段宽限是因为不经包装脚本启动的客户端(直接跑 claude / codex)没有 pid
|
|
39
39
|
// 文件,只能靠"最近还在发事件"证明自己活着,不能一看不到 pid 文件就清掉。
|
|
40
40
|
const NSTimeInterval AgentStatusOrphanInterval = 10.0;
|
|
41
|
+
// "正在启动"只在会话拉起的一瞬间成立。超过这段还没有任何后续事件,说明会话已经就绪、
|
|
42
|
+
// 正在等用户输入,气泡应当落到"待机中",否则启动态和空闲态看起来完全一样。
|
|
43
|
+
const NSTimeInterval AgentStartingGraceInterval = 8.0;
|
|
41
44
|
// 额度变化由 FSEvents/VNODE 主动推送;定时器只保留为监听不可用时的 120 秒兜底。
|
|
42
45
|
// 打开面板和手动刷新仍会立即读取一次。
|
|
43
46
|
const NSTimeInterval UsageRefreshIntervalVisible = 120.0;
|