cc-pets 2.0.3 → 2.1.0

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.
@@ -8,6 +8,7 @@
8
8
  #import "CCPetsPhrasesEditor.h"
9
9
  #import "CCPetsUsage.h"
10
10
  #import "CCPetsTerminalFocus.h"
11
+ #import "CCPetsBridge.h"
11
12
  #import "MenuToggleSwitch.h"
12
13
  #import <UserNotifications/UserNotifications.h>
13
14
  #import <signal.h>
@@ -23,6 +24,10 @@ static const NSUInteger PendingApprovalLimit = 100;
23
24
  static const NSUInteger AgentSessionRecordLimit = 20;
24
25
  static const NSUInteger AgentSessionMenuLimit = 8;
25
26
  static const CGFloat PetApprovalBadgeSize = 17.0;
27
+ // CC Bridge:轮询间隔、"最近消息"的时间窗、菜单里最多列几条。
28
+ static const NSTimeInterval BridgeRefreshInterval = 3.0;
29
+ static const NSTimeInterval BridgeRecentWindow = 30 * 60;
30
+ static const NSUInteger BridgeMenuDeliveryLimit = 5;
26
31
  static const unsigned long long UpdateLogSizeLimit = 1024 * 1024;
27
32
  static NSString *const PetInteractionPhrasesV1MigratedKey =
28
33
  @"CCPetsInteractionPhrasesV1Migrated";
@@ -43,6 +48,8 @@ static NSString *const PetInteractionPhrasesV1MigratedKey =
43
48
  // 不见的地方。角标把这个数字单独拎出来常驻。
44
49
  @interface CCPetsApprovalBadgeView : NSView
45
50
  @property(nonatomic) NSUInteger count;
51
+ // 默认审批红;CC Bridge 消息角标复用同一个视图,换成蓝色 / 橙色。
52
+ @property(nonatomic) NSColor *fillColor;
46
53
  @end
47
54
 
48
55
  @implementation CCPetsApprovalBadgeView
@@ -52,6 +59,11 @@ static NSString *const PetInteractionPhrasesV1MigratedKey =
52
59
  self.hidden = count == 0;
53
60
  self.needsDisplay = YES;
54
61
  }
62
+ - (void)setFillColor:(NSColor *)fillColor {
63
+ if ([_fillColor isEqual:fillColor]) return;
64
+ _fillColor = fillColor;
65
+ self.needsDisplay = YES;
66
+ }
55
67
  // 角标压在圆形状态图标的右上角,但不能把那颗按钮的点击吃掉。
56
68
  - (NSView *)hitTest:(NSPoint)point { return nil; }
57
69
  - (void)drawRect:(NSRect)dirtyRect {
@@ -59,7 +71,7 @@ static NSString *const PetInteractionPhrasesV1MigratedKey =
59
71
  // 描边是给玻璃卡片准备的:审批色和卡片背景都偏亮,没有这圈白边角标会糊在一起。
60
72
  NSRect circle = NSInsetRect(self.bounds, 1.0, 1.0);
61
73
  NSBezierPath *fill = [NSBezierPath bezierPathWithOvalInRect:circle];
62
- [[NSColor colorWithRed:0.86 green:0.24 blue:0.24 alpha:1] setFill];
74
+ [(self.fillColor ?: [NSColor colorWithRed:0.86 green:0.24 blue:0.24 alpha:1]) setFill];
63
75
  [fill fill];
64
76
  fill.lineWidth = 1.5;
65
77
  [[NSColor colorWithWhite:1 alpha:0.92] setStroke];
@@ -959,6 +971,10 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
959
971
  6 + NSMaxX(icon) - PetApprovalBadgeSize + 4,
960
972
  6 + NSMaxY(icon) - PetApprovalBadgeSize + 4,
961
973
  PetApprovalBadgeSize, PetApprovalBadgeSize);
974
+ self.bridgeBadgeView.frame = NSMakeRect(
975
+ 6 + NSMaxX(icon) - PetApprovalBadgeSize + 4,
976
+ 6 + NSMinY(icon) - 4,
977
+ PetApprovalBadgeSize, PetApprovalBadgeSize);
962
978
  }
963
979
  - (void)refreshApprovalBadge {
964
980
  CCPetsApprovalBadgeView *badge = (CCPetsApprovalBadgeView *)self.approvalBadgeView;
@@ -1003,8 +1019,23 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
1003
1019
  }
1004
1020
  - (void)showAgentSessionsMenu:(NSButton *)sender {
1005
1021
  NSArray<NSDictionary *> *records = [self recentAgentSessionRecords];
1006
- if (records.count == 0) return;
1022
+ [self refreshBridgeState:nil];
1023
+ NSArray<NSDictionary *> *deliveries = self.bridgeRecentDeliveries ?: @[];
1024
+ NSDictionary<NSString *, NSNumber *> *pending = self.bridgePendingCounts ?: @{};
1025
+ if (records.count == 0 && deliveries.count == 0 && pending.count == 0) return;
1007
1026
  NSMenu *menu = [[NSMenu alloc] initWithTitle:@"最近 Agent 会话"];
1027
+ if (deliveries.count > 0 || pending.count > 0) {
1028
+ [self addBridgeItemsToMenu:menu deliveries:deliveries pending:pending];
1029
+ [menu addItem:NSMenuItem.separatorItem];
1030
+ }
1031
+ // 菜单打开即视为看过:角标清零,下一条新消息再亮。
1032
+ self.bridgeSeenAt = NSDate.date.timeIntervalSince1970;
1033
+ [self refreshBridgeBadge];
1034
+ if (records.count == 0) {
1035
+ [menu popUpMenuPositioningItem:nil
1036
+ atLocation:NSMakePoint(0, NSHeight(sender.bounds) + 4) inView:sender];
1037
+ return;
1038
+ }
1008
1039
  NSMenuItem *heading = [menu addItemWithTitle:@"最近 Agent 会话" action:nil keyEquivalent:@""];
1009
1040
  heading.enabled = NO;
1010
1041
  [menu addItem:NSMenuItem.separatorItem];
@@ -1023,10 +1054,16 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
1023
1054
  NSDate *date = [NSDate dateWithTimeIntervalSince1970:[record[@"timestamp"] doubleValue]];
1024
1055
  NSString *time = [NSDateFormatter localizedStringFromDate:date
1025
1056
  dateStyle:NSDateFormatterNoStyle timeStyle:NSDateFormatterShortStyle];
1026
- NSString *title = [NSString stringWithFormat:@"%@%@ · %@ · %@ · %@",
1057
+ // 开启 CC Bridge 时带上会话名:用户和 Agent 之间就是用这个名字互相指代的。
1058
+ NSDictionary *bridge = [self bridgeSessionEntryForRecord:record];
1059
+ NSString *bridgeName = bridge.count > 0
1060
+ ? [NSString stringWithFormat:@"(%@)", bridge[@"name"]] : @"";
1061
+ NSUInteger waiting = [pending[[self bridgeSessionIdForRecord:record] ?: @""] unsignedIntegerValue];
1062
+ NSString *title = [NSString stringWithFormat:@"%@%@%@ · %@ · %@ · %@%@",
1027
1063
  approval ? @"⚠️ " : @"",
1028
- provider.length > 0 ? provider : @"Agent",
1029
- [self statusTextForState:state tool:tool], [self terminalNameForTarget:target], time];
1064
+ provider.length > 0 ? provider : @"Agent", bridgeName,
1065
+ [self statusTextForState:state tool:tool], [self terminalNameForTarget:target], time,
1066
+ waiting > 0 ? [NSString stringWithFormat:@" · 📬 %lu", (unsigned long)waiting] : @""];
1030
1067
  NSMenuItem *item = [menu addItemWithTitle:title
1031
1068
  action:@selector(focusAgentSessionRecord:) keyEquivalent:@""];
1032
1069
  item.target = self;
@@ -1036,6 +1073,302 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
1036
1073
  [menu popUpMenuPositioningItem:nil
1037
1074
  atLocation:NSMakePoint(0, NSHeight(sender.bounds) + 4) inView:sender];
1038
1075
  }
1076
+ #pragma mark - CC Bridge
1077
+
1078
+ // 菜单开关 → cc-pets bridge enable / disable / configure。逻辑全在 CLI 里,桌宠只负责调用,
1079
+ // 命令行与菜单两条路的行为才一致。enable 要跑 claude / codex mcp add,要几秒,所以异步执行;
1080
+ // 执行期间忽略新的切换,结束后按实际状态刷新(菜单下次打开时现读)。
1081
+ - (void)runBridgeCommand:(NSArray<NSString *> *)arguments sender:(NSButton *)sender
1082
+ successMessage:(NSString *)successMessage {
1083
+ NSDictionary<NSString *, NSString *> *locator = CCBridgeCLILocator();
1084
+ if (!locator) {
1085
+ [self showUpdateAlertWithTitle:@"无法修改 CC Bridge 设置"
1086
+ message:@"没有找到 cc-pets 的命令行程序。请在终端执行一次 cc-pets install 后重试。"];
1087
+ [self syncBridgeSwitch:sender];
1088
+ return;
1089
+ }
1090
+ if (self.bridgeCommandRunning) {
1091
+ [self syncBridgeSwitch:sender];
1092
+ return;
1093
+ }
1094
+ self.bridgeCommandRunning = YES;
1095
+ NSTask *task = [NSTask new];
1096
+ task.executableURL = [NSURL fileURLWithPath:locator[@"node"]];
1097
+ task.arguments = [@[locator[@"cli"]] arrayByAddingObjectsFromArray:arguments];
1098
+ NSMutableDictionary<NSString *, NSString *> *environment =
1099
+ [NSProcessInfo.processInfo.environment mutableCopy];
1100
+ NSString *existingPath = environment[@"PATH"].length > 0 ? environment[@"PATH"] : @"/usr/bin:/bin:/usr/sbin:/sbin";
1101
+ // claude / codex 常装在 node 同目录(nvm),桌宠的 PATH 里未必有。
1102
+ environment[@"PATH"] = [NSString stringWithFormat:@"%@:%@",
1103
+ [locator[@"node"] stringByDeletingLastPathComponent], existingPath];
1104
+ task.environment = environment;
1105
+ NSPipe *output = [NSPipe pipe];
1106
+ task.standardOutput = output;
1107
+ task.standardError = output;
1108
+ __weak typeof(self) weakSelf = self;
1109
+ task.terminationHandler = ^(NSTask *finished) {
1110
+ NSData *data = [output.fileHandleForReading readDataToEndOfFile];
1111
+ NSString *text = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] ?: @"";
1112
+ dispatch_async(dispatch_get_main_queue(), ^{
1113
+ typeof(self) strongSelf = weakSelf;
1114
+ if (!strongSelf) return;
1115
+ strongSelf.bridgeCommandRunning = NO;
1116
+ [strongSelf refreshBridgeState:nil];
1117
+ if (finished.terminationStatus == EXIT_SUCCESS) {
1118
+ if (successMessage.length > 0) {
1119
+ [strongSelf sendNotificationWithTitle:@"CC Bridge" body:successMessage];
1120
+ }
1121
+ return;
1122
+ }
1123
+ [strongSelf syncBridgeSwitch:sender];
1124
+ NSString *detail = [text stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
1125
+ [strongSelf showUpdateAlertWithTitle:@"CC Bridge 设置失败"
1126
+ message:detail.length > 0 ? detail : @"命令执行失败。"];
1127
+ });
1128
+ };
1129
+ NSError *error = nil;
1130
+ if (![task launchAndReturnError:&error]) {
1131
+ self.bridgeCommandRunning = NO;
1132
+ [self syncBridgeSwitch:sender];
1133
+ [self showUpdateAlertWithTitle:@"CC Bridge 设置失败" message:error.localizedDescription];
1134
+ }
1135
+ }
1136
+ // 与其他菜单开关一致:目标状态按"实际存储的状态取反"算,不信任开关视图自己翻转后的 state——
1137
+ // 菜单停留期间状态可能已被命令行改过。命令没执行成功时再把开关翻回实际状态。
1138
+ - (BOOL)currentBridgeStateForSwitch:(NSButton *)sender {
1139
+ NSDictionary *options = CCBridgeOptions();
1140
+ if (sender.action == @selector(toggleBridgeEnabled:)) return CCBridgeEnabled();
1141
+ if (sender.action == @selector(toggleBridgeWake:)) return [options[@"wake"] boolValue];
1142
+ if (sender.action == @selector(toggleBridgeEditGuard:)) return [options[@"editGuard"] boolValue];
1143
+ if (sender.action == @selector(toggleBridgeApproval:)) {
1144
+ NSSet *tools = [NSSet setWithArray:CCBridgeToolGroup([self bridgeApprovalGroupForTag:sender.tag])];
1145
+ return tools.count > 0 && [tools isSubsetOfSet:[NSSet setWithArray:options[@"codexApprove"]]] &&
1146
+ [tools isSubsetOfSet:[NSSet setWithArray:options[@"claudeAllow"]]];
1147
+ }
1148
+ return NO;
1149
+ }
1150
+ - (void)syncBridgeSwitch:(NSButton *)sender {
1151
+ if (!sender) return;
1152
+ sender.state = [self currentBridgeStateForSwitch:sender] ? NSControlStateValueOn : NSControlStateValueOff;
1153
+ }
1154
+ // 返回目标状态,并先把开关视图摆到目标状态上(命令失败时 syncBridgeSwitch 再翻回来)。
1155
+ - (BOOL)targetBridgeStateForSwitch:(NSButton *)sender {
1156
+ BOOL target = ![self currentBridgeStateForSwitch:sender];
1157
+ sender.state = target ? NSControlStateValueOn : NSControlStateValueOff;
1158
+ return target;
1159
+ }
1160
+ - (NSString *)bridgeApprovalGroupForTag:(NSInteger)tag {
1161
+ NSArray<NSString *> *groups = CCBridgeToolGroupNames();
1162
+ return tag >= 1 && tag <= (NSInteger)groups.count ? groups[tag - 1] : @"";
1163
+ }
1164
+ - (void)toggleBridgeEnabled:(NSButton *)sender {
1165
+ BOOL enable = [self targetBridgeStateForSwitch:sender];
1166
+ [self runBridgeCommand:@[enable ? @"enable" : @"disable"] sender:sender
1167
+ successMessage:enable
1168
+ ? @"已开启。已在运行的 Codex 会话需重启并在 /hooks 中信任;Claude 会话重启后才有 cc-bridge 工具。"
1169
+ : @"已关闭,相关 hooks 与 MCP 注册已移除。"];
1170
+ }
1171
+ // 一个分组同时作用于 Codex 免审批与 Claude 免确认:菜单上只有一组开关,两边保持一致。
1172
+ - (void)toggleBridgeApproval:(NSButton *)sender {
1173
+ NSArray<NSString *> *tools = CCBridgeToolGroup([self bridgeApprovalGroupForTag:sender.tag]);
1174
+ if (tools.count == 0) return;
1175
+ BOOL allow = [self targetBridgeStateForSwitch:sender];
1176
+ NSDictionary *options = CCBridgeOptions();
1177
+ NSString *(^apply)(NSArray<NSString *> *) = ^NSString *(NSArray<NSString *> *current) {
1178
+ NSMutableOrderedSet<NSString *> *next = [NSMutableOrderedSet orderedSetWithArray:current];
1179
+ if (allow) [next addObjectsFromArray:tools]; else [next removeObjectsInArray:tools];
1180
+ return [next.array componentsJoinedByString:@","];
1181
+ };
1182
+ [self runBridgeCommand:@[@"configure",
1183
+ [@"--codex-approve=" stringByAppendingString:apply(options[@"codexApprove"])],
1184
+ [@"--claude-allow=" stringByAppendingString:apply(options[@"claudeAllow"])]]
1185
+ sender:sender successMessage:nil];
1186
+ }
1187
+ - (void)toggleBridgeWake:(NSButton *)sender {
1188
+ [self runBridgeCommand:@[@"configure",
1189
+ [self targetBridgeStateForSwitch:sender] ? @"--wake=on" : @"--wake=off"] sender:sender successMessage:nil];
1190
+ }
1191
+ - (void)toggleBridgeEditGuard:(NSButton *)sender {
1192
+ [self runBridgeCommand:@[@"configure",
1193
+ [self targetBridgeStateForSwitch:sender] ? @"--edit-guard=on" : @"--edit-guard=off"]
1194
+ sender:sender successMessage:nil];
1195
+ }
1196
+ - (void)toggleBridgeBadge:(NSButton *)sender {
1197
+ BOOL enabled = ![NSUserDefaults.standardUserDefaults boolForKey:BridgeBadgeEnabledKey];
1198
+ [NSUserDefaults.standardUserDefaults setBool:enabled forKey:BridgeBadgeEnabledKey];
1199
+ sender.state = enabled ? NSControlStateValueOn : NSControlStateValueOff;
1200
+ [self refreshBridgeBadge];
1201
+ }
1202
+ // 与"系统通知"那组开关同一套授权流程:第一次打开时向系统申请通知权限。
1203
+ - (void)toggleBridgeNotification:(NSButton *)sender {
1204
+ NSUserDefaults *defaults = NSUserDefaults.standardUserDefaults;
1205
+ if ([defaults boolForKey:BridgeNotificationKey]) {
1206
+ [defaults setBool:NO forKey:BridgeNotificationKey];
1207
+ sender.state = NSControlStateValueOff;
1208
+ return;
1209
+ }
1210
+ [UNUserNotificationCenter.currentNotificationCenter
1211
+ requestAuthorizationWithOptions:UNAuthorizationOptionAlert | UNAuthorizationOptionSound
1212
+ completionHandler:^(BOOL granted, NSError *error) {
1213
+ dispatch_async(dispatch_get_main_queue(), ^{
1214
+ [defaults setBool:granted forKey:BridgeNotificationKey];
1215
+ sender.state = granted ? NSControlStateValueOn : NSControlStateValueOff;
1216
+ if (!granted) {
1217
+ [self showUpdateAlertWithTitle:@"无法启用系统通知" message:error.localizedDescription ?:
1218
+ @"请在“系统设置 → 通知 → CC Pets”中允许通知后重试。"];
1219
+ }
1220
+ });
1221
+ }];
1222
+ }
1223
+
1224
+ // 读 bridge 状态(会话名、最近送达、信箱积压),刷新角标。bridge 未开启时清空并隐藏。
1225
+ // 回执目录没变就不重读文件,只按时间窗重新过滤缓存——回执状态一变,写入端的
1226
+ // "临时文件 + rename" 必然改动目录的修改时间。
1227
+ - (void)refreshBridgeState:(NSTimer *)timer {
1228
+ if (!CCBridgeEnabled()) {
1229
+ self.bridgeSessions = nil;
1230
+ self.bridgeRecentDeliveries = nil;
1231
+ self.bridgePendingCounts = nil;
1232
+ self.bridgeSentStamp = nil;
1233
+ [self refreshBridgeBadge];
1234
+ return;
1235
+ }
1236
+ NSTimeInterval now = NSDate.date.timeIntervalSince1970;
1237
+ NSString *directory = CCBridgeStateDirectory();
1238
+ self.bridgeSessions = CCBridgeSessions();
1239
+ NSDate *stamp = [NSFileManager.defaultManager attributesOfItemAtPath:
1240
+ [directory stringByAppendingPathComponent:@"sent"] error:nil].fileModificationDate;
1241
+ if (!stamp || ![stamp isEqualToDate:self.bridgeSentStamp] || !self.bridgeDeliveryCache) {
1242
+ self.bridgeDeliveryCache = CCBridgeRecentDeliveries(now - BridgeRecentWindow, 50);
1243
+ self.bridgeSentStamp = stamp;
1244
+ }
1245
+ NSMutableArray<NSDictionary *> *recent = [NSMutableArray array];
1246
+ for (NSDictionary *delivery in self.bridgeDeliveryCache) {
1247
+ if ([delivery[@"at"] doubleValue] >= now - BridgeRecentWindow) [recent addObject:delivery];
1248
+ }
1249
+ self.bridgeRecentDeliveries = recent;
1250
+ // 只算仍在线的会话:已退出会话的积压已经投不出去,提醒也无从处理。
1251
+ NSMutableDictionary<NSString *, NSNumber *> *pending = [NSMutableDictionary dictionary];
1252
+ [CCBridgePendingCounts() enumerateKeysAndObjectsUsingBlock:^(NSString *session, NSNumber *count, BOOL *stop) {
1253
+ if (self.bridgeSessions[session]) pending[session] = count;
1254
+ }];
1255
+ self.bridgePendingCounts = pending;
1256
+ [self notifyNewBridgeDeliveries];
1257
+ [self refreshBridgeBadge];
1258
+ }
1259
+ // 新送达的跨会话消息发系统通知:只含谁发给谁,不含正文。一次刷新里来了多条时合并成一条。
1260
+ - (void)notifyNewBridgeDeliveries {
1261
+ NSMutableArray<NSDictionary *> *fresh = [NSMutableArray array];
1262
+ for (NSDictionary *delivery in self.bridgeRecentDeliveries) {
1263
+ if ([delivery[@"at"] doubleValue] > self.bridgeNotifiedAt) [fresh addObject:delivery];
1264
+ }
1265
+ if (fresh.count == 0) return;
1266
+ for (NSDictionary *delivery in fresh) {
1267
+ self.bridgeNotifiedAt = MAX(self.bridgeNotifiedAt, [delivery[@"at"] doubleValue]);
1268
+ }
1269
+ if (![NSUserDefaults.standardUserDefaults boolForKey:BridgeNotificationKey]) return;
1270
+ NSDictionary *latest = fresh.firstObject;
1271
+ NSString *body = fresh.count == 1
1272
+ ? [NSString stringWithFormat:@"%@ → %@", latest[@"from"], latest[@"to"]]
1273
+ : [NSString stringWithFormat:@"%@ → %@ 等 %lu 条", latest[@"from"], latest[@"to"],
1274
+ (unsigned long)fresh.count];
1275
+ [self sendNotificationWithTitle:@"CC Bridge 新消息" body:body];
1276
+ }
1277
+ // 蓝色 = 有新的跨会话消息送达;橙色 = 有消息卡在某个会话的信箱里(那个 Claude 会话长时间空闲、
1278
+ // 唤醒 watcher 已退出,要等用户在那个终端开口才会送进去),需要用户过去看一眼。
1279
+ - (void)refreshBridgeBadge {
1280
+ CCPetsApprovalBadgeView *badge = (CCPetsApprovalBadgeView *)self.bridgeBadgeView;
1281
+ if (!badge) return;
1282
+ if (![NSUserDefaults.standardUserDefaults boolForKey:BridgeBadgeEnabledKey]) {
1283
+ badge.count = 0;
1284
+ return;
1285
+ }
1286
+ NSUInteger unseen = 0;
1287
+ for (NSDictionary *delivery in self.bridgeRecentDeliveries) {
1288
+ if ([delivery[@"at"] doubleValue] > self.bridgeSeenAt) unseen++;
1289
+ }
1290
+ NSUInteger waiting = 0;
1291
+ for (NSNumber *count in self.bridgePendingCounts.allValues) waiting += count.unsignedIntegerValue;
1292
+ badge.fillColor = waiting > 0
1293
+ ? [NSColor colorWithRed:0.92 green:0.58 blue:0.12 alpha:1]
1294
+ : [NSColor colorWithRed:0.20 green:0.47 blue:0.90 alpha:1];
1295
+ badge.count = unseen + waiting;
1296
+ [self layoutApprovalBadge];
1297
+ }
1298
+ - (NSString *)bridgeSessionIdForRecord:(NSDictionary *)record {
1299
+ NSString *session = SanitizedShortString(record[@"session"], 128);
1300
+ if (session.length > 0 && self.bridgeSessions[session]) return session;
1301
+ // 事件里没有 session id 的记录,退回按 provider + tty 对上 bridge 注册表。
1302
+ NSDictionary *terminal = [record[@"terminal"] isKindOfClass:NSDictionary.class] ? record[@"terminal"] : nil;
1303
+ NSString *tty = SanitizedShortString([terminal[@"tty"] lastPathComponent], 64);
1304
+ NSString *provider = SanitizedShortString(record[@"provider"], 32);
1305
+ if (tty.length == 0) return nil;
1306
+ __block NSString *match = nil;
1307
+ [self.bridgeSessions enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSDictionary *entry, BOOL *stop) {
1308
+ if ([entry[@"tty"] isEqualToString:tty] && [entry[@"provider"] isEqualToString:provider]) {
1309
+ match = key;
1310
+ *stop = YES;
1311
+ }
1312
+ }];
1313
+ return match;
1314
+ }
1315
+ - (NSDictionary *)bridgeSessionEntryForRecord:(NSDictionary *)record {
1316
+ NSString *session = [self bridgeSessionIdForRecord:record];
1317
+ return session ? self.bridgeSessions[session] : nil;
1318
+ }
1319
+ // 收件会话的终端:优先用桌宠自己记录的该会话终端信息(带宿主应用),其次按 tty 对上任一
1320
+ // 已知终端,最后借用最近一次的宿主应用配上 bridge 记录的 tty。
1321
+ - (NSDictionary *)terminalTargetForBridgeSession:(NSString *)sessionId {
1322
+ NSString *tty = self.bridgeSessions[sessionId][@"tty"];
1323
+ NSDictionary *byTty = nil;
1324
+ for (NSDictionary *record in self.agentSessionRecords.allValues) {
1325
+ NSDictionary *terminal = [record[@"terminal"] isKindOfClass:NSDictionary.class] ? record[@"terminal"] : nil;
1326
+ if (terminal.count == 0) continue;
1327
+ if ([SanitizedShortString(record[@"session"], 128) isEqualToString:sessionId]) return terminal;
1328
+ if (tty.length > 0 && [[terminal[@"tty"] lastPathComponent] isEqualToString:tty]) byTty = terminal;
1329
+ }
1330
+ if (byTty) return byTty;
1331
+ if (tty.length > 0 && self.lastTerminalFocusTarget.count > 0) {
1332
+ NSMutableDictionary *target = [self.lastTerminalFocusTarget mutableCopy];
1333
+ target[@"tty"] = tty;
1334
+ [target removeObjectForKey:@"session"];
1335
+ return target;
1336
+ }
1337
+ return nil;
1338
+ }
1339
+ - (void)focusBridgeSession:(NSMenuItem *)sender {
1340
+ NSString *sessionId = [sender.representedObject isKindOfClass:NSString.class] ? sender.representedObject : nil;
1341
+ NSDictionary *target = sessionId ? [self terminalTargetForBridgeSession:sessionId] : nil;
1342
+ if (target.count > 0) ActivateTerminalFocusTarget(target);
1343
+ }
1344
+ - (void)addBridgeItemsToMenu:(NSMenu *)menu deliveries:(NSArray<NSDictionary *> *)deliveries
1345
+ pending:(NSDictionary<NSString *, NSNumber *> *)pending {
1346
+ NSMenuItem *heading = [menu addItemWithTitle:@"CC Bridge 消息" action:nil keyEquivalent:@""];
1347
+ heading.enabled = NO;
1348
+ [pending enumerateKeysAndObjectsUsingBlock:^(NSString *session, NSNumber *count, BOOL *stop) {
1349
+ NSString *name = self.bridgeSessions[session][@"name"] ?: session;
1350
+ NSString *title = [NSString stringWithFormat:@"📬 %@ 有 %lu 条消息待投递(去那个终端说句话即可送达)",
1351
+ name, count.unsignedLongValue];
1352
+ NSMenuItem *item = [menu addItemWithTitle:title action:@selector(focusBridgeSession:) keyEquivalent:@""];
1353
+ item.target = self;
1354
+ item.representedObject = session;
1355
+ }];
1356
+ NSUInteger shown = 0;
1357
+ for (NSDictionary *delivery in deliveries) {
1358
+ if (shown++ >= BridgeMenuDeliveryLimit) break;
1359
+ NSDate *date = [NSDate dateWithTimeIntervalSince1970:[delivery[@"at"] doubleValue]];
1360
+ NSString *time = [NSDateFormatter localizedStringFromDate:date
1361
+ dateStyle:NSDateFormatterNoStyle timeStyle:NSDateFormatterShortStyle];
1362
+ BOOL unseen = [delivery[@"at"] doubleValue] > self.bridgeSeenAt;
1363
+ NSString *title = [NSString stringWithFormat:@"%@%@ → %@ · %@",
1364
+ unseen ? @"✉️ " : @"", delivery[@"from"], delivery[@"to"], time];
1365
+ NSMenuItem *item = [menu addItemWithTitle:title action:@selector(focusBridgeSession:) keyEquivalent:@""];
1366
+ item.target = self;
1367
+ item.representedObject = delivery[@"toSession"];
1368
+ item.toolTip = [NSString stringWithFormat:@"跳到 %@ 所在的终端", delivery[@"to"]];
1369
+ }
1370
+ }
1371
+
1039
1372
  - (BOOL)focusLatestAgentTerminal {
1040
1373
  // 只有 Hook 状态气泡上的透明按钮会调用这里;桌宠本体继续负责原有互动。
1041
1374
  if (!self.hasAgentStatus || self.lastTerminalFocusTarget.count == 0) return NO;
@@ -1261,7 +1594,9 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
1261
1594
  PetInteractionEnabledKey: @YES,
1262
1595
  PetInteractionHeartThresholdKey: @3,
1263
1596
  PetInteractionAnnoyedThresholdKey: @10,
1264
- PetInteractionIntervalKey: @1.2
1597
+ PetInteractionIntervalKey: @1.2,
1598
+ BridgeBadgeEnabledKey: @YES,
1599
+ BridgeNotificationKey: @NO
1265
1600
  }];
1266
1601
  if (![defaults boolForKey:StatusBubblePreferenceV2Key]) {
1267
1602
  [defaults setBool:YES forKey:StatusBubbleExpandedKey];
@@ -1405,7 +1740,7 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
1405
1740
  self.statusIconButton.wantsLayer = YES;
1406
1741
  self.statusIconButton.layer.cornerRadius = 17;
1407
1742
  self.statusIconButton.layer.masksToBounds = YES;
1408
- self.statusIconButton.toolTip = @"查看最近 Agent 会话";
1743
+ self.statusIconButton.toolTip = @"查看最近 Agent 会话与 CC Bridge 消息";
1409
1744
  self.statusIconButton.target = self;
1410
1745
  self.statusIconButton.action = @selector(showAgentSessionsMenu:);
1411
1746
  [self.statusGlass addSubview:self.statusIconButton];
@@ -1428,6 +1763,14 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
1428
1763
  badge.hidden = YES;
1429
1764
  self.approvalBadgeView = badge;
1430
1765
  [statusRoot addSubview:badge];
1766
+ // CC Bridge 消息角标压在图标右下角,与右上角的审批角标错开。点击同样穿透到图标,
1767
+ // 打开的会话菜单里列出最近的跨会话消息。
1768
+ CCPetsApprovalBadgeView *bridgeBadge = [[CCPetsApprovalBadgeView alloc]
1769
+ initWithFrame:NSMakeRect(0, 0, PetApprovalBadgeSize, PetApprovalBadgeSize)];
1770
+ bridgeBadge.hidden = YES;
1771
+ bridgeBadge.fillColor = [NSColor colorWithRed:0.20 green:0.47 blue:0.90 alpha:1];
1772
+ self.bridgeBadgeView = bridgeBadge;
1773
+ [statusRoot addSubview:bridgeBadge];
1431
1774
  [self layoutApprovalBadge];
1432
1775
  self.statusPanel.contentView = statusRoot;
1433
1776
 
@@ -1498,6 +1841,13 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
1498
1841
  NSTimer *readerTimer = [NSTimer scheduledTimerWithTimeInterval:AgentEventReaderCheckInterval
1499
1842
  target:self selector:@selector(ensureAgentEventReader:) userInfo:nil repeats:YES];
1500
1843
  readerTimer.tolerance = AgentEventReaderCheckInterval * 0.3;
1844
+ // 启动前的消息不算"未读":角标只提示桌宠运行期间新发生的跨会话往来。通知同理。
1845
+ self.bridgeSeenAt = NSDate.date.timeIntervalSince1970;
1846
+ self.bridgeNotifiedAt = self.bridgeSeenAt;
1847
+ [self refreshBridgeState:nil];
1848
+ NSTimer *bridgeTimer = [NSTimer scheduledTimerWithTimeInterval:BridgeRefreshInterval
1849
+ target:self selector:@selector(refreshBridgeState:) userInfo:nil repeats:YES];
1850
+ bridgeTimer.tolerance = BridgeRefreshInterval * 0.3;
1501
1851
  // 这里刻意不使用 occlusionState / NSWindowDidChangeOcclusionStateNotification:
1502
1852
  // 桌宠是置顶的(NSFloatingWindowLevel + FullScreenAuxiliary),全屏应用也压不住它,
1503
1853
  // 所以“被遮挡”几乎不会真实发生,收益接近零;而实测中 occlusionState 会在
@@ -0,0 +1,43 @@
1
+ #import <Foundation/Foundation.h>
2
+
3
+ // CC Bridge(scripts/bridge/)状态的只读视图,供桌宠显示角标、在会话列表里标出
4
+ // 会话名、以及点击跳回收件会话的终端。
5
+ //
6
+ // 只读元数据:会话名 / tty、谁发给谁、何时送达、信箱积压条数。回执文件里虽然带着
7
+ // 消息正文,这里解析后立即丢弃,不返回、不缓存——桌宠界面不显示正文。
8
+
9
+ // 桌宠侧的偏好:消息角标(默认开)、新消息系统通知(默认关)。
10
+ extern NSString *const BridgeBadgeEnabledKey;
11
+ extern NSString *const BridgeNotificationKey;
12
+
13
+ // <PetStateDirectory>/cc-bridge-<uid>,与 scripts/bridge/store.mjs 的 bridgeDirectory 一致。
14
+ NSString *CCBridgeStateDirectory(void);
15
+
16
+ // ~/.cc-pets/bridge-enabled(可用 CC_PETS_HOME 覆盖)存在即视为开启。
17
+ BOOL CCBridgeEnabled(void);
18
+
19
+ // 开关文件里保存的选项(与 scripts/bridge/options.mjs 一致),未开启或缺项时取默认值:
20
+ // @{ @"codexApprove": NSArray, @"claudeAllow": NSArray, @"wake": @YES, @"editGuard": @YES }
21
+ NSDictionary *CCBridgeOptions(void);
22
+
23
+ // 免审批分组:view / send / reserve / name → 工具名。必须与 options.mjs 的 TOOL_GROUPS 一致。
24
+ NSArray<NSString *> *CCBridgeToolGroupNames(void);
25
+ NSArray<NSString *> *CCBridgeToolGroup(NSString *group);
26
+
27
+ // CLI 定位(~/.cc-pets/bridge-cli.json,由 cc-pets bridge refresh / enable / configure 写入):
28
+ // @{ @"node", @"cli" },两者都必须是存在的绝对路径,否则返回 nil。
29
+ NSDictionary<NSString *, NSString *> *CCBridgeCLILocator(void);
30
+
31
+ // 仍有效(未过期、持有者在给定会话集合内)的文件预留条数。
32
+ NSUInteger CCBridgeActiveReservationCount(NSSet<NSString *> *sessionIds);
33
+
34
+ // 在线会话:session id → @{ @"name", @"ref", @"provider", @"tty" }(tty 可能缺省)。
35
+ // 记录了 pid 而进程已不在的会话不返回。
36
+ NSDictionary<NSString *, NSDictionary *> *CCBridgeSessions(void);
37
+
38
+ // 最近送达的跨会话消息,不含 cc-bridge 自己发的系统通知(空闲通知等),按送达时间倒序。
39
+ // 每项:@{ @"id", @"from", @"to", @"toSession", @"at" },at 为秒级时间戳。
40
+ NSArray<NSDictionary *> *CCBridgeRecentDeliveries(NSTimeInterval since, NSUInteger limit);
41
+
42
+ // session id → 信箱里仍未投递的条数(只含 > 0 的会话)。
43
+ NSDictionary<NSString *, NSNumber *> *CCBridgePendingCounts(void);