cc-pets 2.0.3 → 2.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.
Files changed (50) hide show
  1. package/CC_BRIDGE.md +239 -0
  2. package/CC_BRIDGE.zh-CN.md +210 -0
  3. package/CHANGELOG.md +49 -0
  4. package/CHANGELOG.zh-CN.md +49 -0
  5. package/PROVIDER_PROTOCOL.md +6 -0
  6. package/PROVIDER_PROTOCOL.zh-CN.md +5 -0
  7. package/README.md +17 -1
  8. package/README.zh-CN.md +18 -2
  9. package/Sources/CCPets/CCPetsAppDelegate.h +17 -2
  10. package/Sources/CCPets/CCPetsAppDelegate.m +478 -56
  11. package/Sources/CCPets/CCPetsBridge.h +43 -0
  12. package/Sources/CCPets/CCPetsBridge.m +198 -0
  13. package/Sources/CCPets/CCPetsCleanup.m +3 -1
  14. package/Sources/CCPets/CCPetsCodexRateLimits.h +1 -0
  15. package/Sources/CCPets/CCPetsCodexRateLimits.m +7 -0
  16. package/Sources/CCPets/CCPetsEvents.m +1 -1
  17. package/Sources/CCPets/CCPetsGlassMenu.h +10 -0
  18. package/Sources/CCPets/CCPetsGlassMenu.m +196 -0
  19. package/Sources/CCPets/CCPetsGlassView.h +31 -0
  20. package/Sources/CCPets/CCPetsGlassView.m +246 -0
  21. package/Sources/CCPets/CCPetsPaths.h +7 -0
  22. package/Sources/CCPets/CCPetsPaths.m +14 -0
  23. package/Sources/CCPets/CCPetsTerminalFocus.h +15 -0
  24. package/Sources/CCPets/CCPetsTerminalFocus.m +306 -15
  25. package/Sources/CCPets/CCPetsUsage.h +2 -0
  26. package/Sources/CCPets/CCPetsUsage.m +69 -18
  27. package/Sources/CCPets/CCPetsUsageMonitor.m +43 -8
  28. package/Sources/CCPets/MenuChoiceRow.h +19 -0
  29. package/Sources/CCPets/MenuChoiceRow.m +96 -0
  30. package/Sources/CCPets/MenuHintView.h +15 -0
  31. package/Sources/CCPets/MenuHintView.m +128 -0
  32. package/Sources/CCPets/PetView.m +143 -3
  33. package/Sources/CCPets/QuotaDashboardView.h +3 -4
  34. package/Sources/CCPets/QuotaDashboardView.m +222 -143
  35. package/Sources/CCPets/main.m +16 -0
  36. package/bin/cc-pets +38 -1
  37. package/bin/codex-with-pet +2 -0
  38. package/package.json +3 -1
  39. package/scripts/bridge/cli.mjs +229 -0
  40. package/scripts/bridge/core.mjs +227 -0
  41. package/scripts/bridge/hook.mjs +149 -0
  42. package/scripts/bridge/install.mjs +288 -0
  43. package/scripts/bridge/mcp-server.mjs +300 -0
  44. package/scripts/bridge/options.mjs +86 -0
  45. package/scripts/bridge/process.mjs +129 -0
  46. package/scripts/bridge/reservations.mjs +247 -0
  47. package/scripts/bridge/store.mjs +432 -0
  48. package/scripts/bridge/watch.mjs +69 -0
  49. package/scripts/install-shell-integration.sh +3 -0
  50. package/scripts/uninstall-integrations.mjs +10 -0
@@ -1,8 +1,12 @@
1
1
  #import "PetView.h"
2
2
  #import <QuartzCore/QuartzCore.h>
3
3
  #import "MenuToggleSwitch.h"
4
+ #import "MenuHintView.h"
4
5
  #import "CCPetsPaths.h"
5
6
  #import "CCPetsImageLoader.h"
7
+ #import "CCPetsBridge.h"
8
+ #import "CCPetsGlassView.h"
9
+ #import "MenuChoiceRow.h"
6
10
 
7
11
  // 碎碎念频率档位的 defaults 键。定义在 CCPetsAppDelegate.m,这里只读不写;
8
12
  // 单独 extern 而不 import 那个头文件,是因为它反过来 import 了 PetView.h。
@@ -1405,8 +1409,17 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1405
1409
  ? item.representedObject : nil;
1406
1410
  if (pet) [self showMenuPreviewForPet:pet item:item menu:menu];
1407
1411
  else [self.petMenuPreviewPanel orderOut:nil];
1412
+ // 自绘行的说明由 MenuHintRowView 自己的进出事件管,这里不能去取消它。
1413
+ if (item.view) return;
1414
+ NSString *hint = [item.representedObject isKindOfClass:NSString.class] ? item.representedObject : nil;
1415
+ NSRect itemFrame = item.accessibilityFrame;
1416
+ if (hint && !NSIsEmptyRect(itemFrame)) [MenuHint scheduleText:hint belowScreenRect:itemFrame];
1417
+ else [MenuHint cancel];
1408
1418
  }
1409
1419
  - (void)menuDidClose:(NSMenu *)menu {
1420
+ [MenuHint cancel];
1421
+ // CC Bridge 子菜单也以 self 为代理(为了悬停说明),删除确认和预览只属于"管理桌宠"。
1422
+ if (menu != self.activePetSwitchMenu) return;
1410
1423
  [self resetPendingDeleteButton];
1411
1424
  [self.petMenuPreviewPanel orderOut:nil];
1412
1425
  }
@@ -1423,7 +1436,7 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1423
1436
  const CGFloat leadingInset = 12;
1424
1437
  CGFloat toggleX = width - trailingInset - toggleWidth;
1425
1438
  NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
1426
- NSView *row = [[NSView alloc] initWithFrame:NSMakeRect(0, 0, width, 28)];
1439
+ NSView *row = [[MenuHintRowView alloc] initWithFrame:NSMakeRect(0, 0, width, 28)];
1427
1440
  NSTextField *label = [NSTextField labelWithString:title];
1428
1441
  label.frame = NSMakeRect(leadingInset, 5, toggleX - leadingInset - trailingInset, 18);
1429
1442
  label.font = [NSFont menuFontOfSize:13];
@@ -1466,6 +1479,97 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1466
1479
  [menu addItem:item];
1467
1480
  return item;
1468
1481
  }
1482
+ // CC Bridge 开关组。状态每次打开菜单时现读(开关文件 / 选项),不在视图里缓存。
1483
+ // 除"消息角标 / 新消息通知"这两项只影响桌宠外,其余开关都通过 cc-pets bridge enable / configure
1484
+ // 落到 Claude Code / Codex 的配置里。
1485
+ - (void)addBridgeSwitchToMenu:(NSMenu *)menu title:(NSString *)title checked:(BOOL)checked
1486
+ action:(SEL)action tag:(NSInteger)tag toolTip:(NSString *)toolTip {
1487
+ // 与其他子菜单同宽。菜单宽度取最宽的一行:标题都控制在 5 个字以内,说明性文字放进悬停提示,
1488
+ // 否则长文字行会把菜单撑宽,而自绘开关行是固定宽度,开关就不再贴右边。
1489
+ // 说明不用系统 toolTip:它只在 App 激活时显示,见 MenuHintView.h。
1490
+ NSMenuItem *item = [self addPersistentSwitchToMenu:menu title:title checked:checked
1491
+ action:action width:PetSubmenuRowWidth tag:tag];
1492
+ ((MenuHintRowView *)item.view).hint = toolTip;
1493
+ }
1494
+ // 一级子菜单只放启用和最常动的两个开关(开关在上、二级菜单在下);免审批(设一次就不动)和只影响桌宠的提醒各收进二级菜单。
1495
+ // 未开启时只留"启用"一行:其余开关此时都不生效,列出来只是占地方。开启是异步的,
1496
+ // 菜单停留期间不会自己长出其余项,下次打开时按实际状态重建。
1497
+ - (void)addBridgeMenuToMenu:(NSMenu *)menu {
1498
+ NSMenuItem *bridgeItem = [menu addItemWithTitle:@"CC Bridge" action:nil keyEquivalent:@""];
1499
+ NSMenu *bridgeMenu = [NSMenu new];
1500
+ // 免审批 / 桌宠提醒 是普通菜单项,悬停说明走 menu:willHighlightItem:。
1501
+ bridgeMenu.delegate = self;
1502
+ bridgeItem.submenu = bridgeMenu;
1503
+ BOOL enabled = CCBridgeEnabled();
1504
+ [self addBridgeSwitchToMenu:bridgeMenu title:@"启用" checked:enabled
1505
+ action:@selector(toggleBridgeEnabled:) tag:0
1506
+ toolTip:@"让本机 Claude Code / Codex 会话互相发消息、唤醒对方、预留文件"];
1507
+ if (!enabled) return;
1508
+
1509
+ // 状态放在"启用"行的第二行,省掉底部单独的状态行和分隔线。开关上移与标题对齐,
1510
+ // 状态文字才能占满整行宽度,不被开关截断。
1511
+ NSDictionary *sessions = CCBridgeSessions();
1512
+ NSUInteger reservations = CCBridgeActiveReservationCount([NSSet setWithArray:sessions.allKeys]);
1513
+ MenuHintRowView *enableRow = (MenuHintRowView *)bridgeMenu.itemArray.lastObject.view;
1514
+ enableRow.hint = [enableRow.hint stringByAppendingString:@"\n下方为在线会话数 · 有效的文件预留数"];
1515
+ const CGFloat statusHeight = 14;
1516
+ [enableRow setFrameSize:NSMakeSize(NSWidth(enableRow.frame), NSHeight(enableRow.frame) + statusHeight)];
1517
+ for (NSView *subview in enableRow.subviews) {
1518
+ [subview setFrameOrigin:NSMakePoint(NSMinX(subview.frame), NSMinY(subview.frame) + statusHeight - 2)];
1519
+ }
1520
+ NSTextField *status = [NSTextField labelWithString:[NSString stringWithFormat:@"%lu 会话 · %lu 预留",
1521
+ (unsigned long)sessions.count, (unsigned long)reservations]];
1522
+ status.frame = NSMakeRect(12, 4, NSWidth(enableRow.frame) - 12 - PetMenuControlGap, statusHeight);
1523
+ status.font = [NSFont menuFontOfSize:11];
1524
+ status.textColor = NSColor.secondaryLabelColor;
1525
+ status.lineBreakMode = NSLineBreakByTruncatingTail;
1526
+ [enableRow addSubview:status];
1527
+
1528
+ [bridgeMenu addItem:NSMenuItem.separatorItem];
1529
+ NSDictionary *options = CCBridgeOptions();
1530
+ [self addBridgeSwitchToMenu:bridgeMenu title:@"自动唤醒" checked:[options[@"wake"] boolValue]
1531
+ action:@selector(toggleBridgeWake:) tag:0
1532
+ toolTip:@"自动唤醒空闲会话。关闭后消息只进信箱,等对方下次收到你的输入时带入,可省 token;Codex 需重启会话生效"];
1533
+ [self addBridgeSwitchToMenu:bridgeMenu title:@"编辑拦截" checked:[options[@"editGuard"] boolValue]
1534
+ action:@selector(toggleBridgeEditGuard:) tag:0
1535
+ toolTip:@"编辑他人预留的文件时先暂停一次并说明原因,重试即放行;Codex 需重启会话生效"];
1536
+
1537
+ NSMenuItem *approvalItem = [bridgeMenu addItemWithTitle:@"免审批" action:nil keyEquivalent:@""];
1538
+ approvalItem.representedObject = @"每组同时作用于 Codex 免审批与 Claude 免确认;Codex 需重启会话生效";
1539
+ NSMenu *approvalMenu = [NSMenu new];
1540
+ NSArray<NSDictionary *> *groups = @[
1541
+ @{@"title": @"查看类", @"group": @"view", @"tag": @1,
1542
+ @"tip": @"列出会话、查看预留、读取信箱免审批;只读,放开没有风险"},
1543
+ @{@"title": @"发消息", @"group": @"send", @"tag": @2,
1544
+ @"tip": @"开启后,Agent 可以不经确认给其他会话发消息"},
1545
+ @{@"title": @"文件预留", @"group": @"reserve", @"tag": @3,
1546
+ @"tip": @"预留 / 释放文件免审批"},
1547
+ @{@"title": @"改会话名", @"group": @"name", @"tag": @4,
1548
+ @"tip": @"修改当前会话在 CC Bridge 中的名字免审批"}
1549
+ ];
1550
+ NSSet *codex = [NSSet setWithArray:options[@"codexApprove"]];
1551
+ NSSet *claude = [NSSet setWithArray:options[@"claudeAllow"]];
1552
+ for (NSDictionary *group in groups) {
1553
+ NSSet *tools = [NSSet setWithArray:CCBridgeToolGroup(group[@"group"])];
1554
+ BOOL checked = tools.count > 0 && [tools isSubsetOfSet:codex] && [tools isSubsetOfSet:claude];
1555
+ [self addBridgeSwitchToMenu:approvalMenu title:group[@"title"] checked:checked
1556
+ action:@selector(toggleBridgeApproval:) tag:[group[@"tag"] integerValue] toolTip:group[@"tip"]];
1557
+ }
1558
+ approvalItem.submenu = approvalMenu;
1559
+
1560
+ NSMenuItem *alertItem = [bridgeMenu addItemWithTitle:@"桌宠提醒" action:nil keyEquivalent:@""];
1561
+ alertItem.representedObject = @"只影响桌宠,不改 Claude Code / Codex 的配置";
1562
+ NSMenu *alertMenu = [NSMenu new];
1563
+ [self addBridgeSwitchToMenu:alertMenu title:@"消息角标"
1564
+ checked:[NSUserDefaults.standardUserDefaults boolForKey:BridgeBadgeEnabledKey]
1565
+ action:@selector(toggleBridgeBadge:) tag:0
1566
+ toolTip:@"状态图标右下角:蓝色为新送达,橙色为信箱积压"];
1567
+ [self addBridgeSwitchToMenu:alertMenu title:@"新消息通知"
1568
+ checked:[NSUserDefaults.standardUserDefaults boolForKey:BridgeNotificationKey]
1569
+ action:@selector(toggleBridgeNotification:) tag:0
1570
+ toolTip:@"会话之间有消息送达时发一条系统通知(只含谁发给谁,不含正文)"];
1571
+ alertItem.submenu = alertMenu;
1572
+ }
1469
1573
  - (void)rightMouseDown:(NSEvent *)event {
1470
1574
  NSArray<NSDictionary *> *availablePets = self.petOptionsRequested ? self.petOptionsRequested() : @[];
1471
1575
  NSMenu *menu = [NSMenu new];
@@ -1479,8 +1583,6 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1479
1583
  self.activePetSwitchMenu = switchMenu;
1480
1584
  switchItem.submenu = switchMenu;
1481
1585
  [menu addItem:NSMenuItem.separatorItem];
1482
- NSMenuItem *refreshItem = [menu addItemWithTitle:@"刷新用量" action:@selector(refreshUsage:) keyEquivalent:@"r"];
1483
- refreshItem.target = NSApp.delegate;
1484
1586
  [self addPersistentSwitchToMenu:menu
1485
1587
  title:@"显示消息气泡"
1486
1588
  checked:[NSUserDefaults.standardUserDefaults boolForKey:StatusBubbleExpandedKey]
@@ -1500,6 +1602,40 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1500
1602
  [self addUsageModeControlToMenu:usageModeMenu provider:@"Claude"
1501
1603
  preferenceKey:ClaudeUsageDisplayModeKey tag:2];
1502
1604
  usageModeItem.submenu = usageModeMenu;
1605
+ NSMenuItem *themeItem = [menu addItemWithTitle:@"面板主题" action:nil keyEquivalent:@""];
1606
+ NSMenu *themeMenu = [[NSMenu alloc] initWithTitle:@"面板主题"];
1607
+ // 两组都用自绘单选行:点了立即生效且菜单不收起,方便连着对比主题和压暗档位。
1608
+ NSString *selectedTheme = CCPetsPanelTheme();
1609
+ for (NSArray<NSString *> *option in @[
1610
+ @[@"经典", @"classic"], @[@"Liquid Glass", @"liquid"]]) {
1611
+ NSMenuItem *item = [MenuChoiceRowView addToMenu:themeMenu title:option[0] group:@"theme"
1612
+ representedObject:option[1] checked:[selectedTheme isEqualToString:option[1]]
1613
+ target:NSApp.delegate action:@selector(setPanelTheme:) width:PetSubmenuRowWidth];
1614
+ if ([option[1] isEqualToString:@"liquid"] && !CCPetsLiquidGlassAvailable()) {
1615
+ ((MenuChoiceRowView *)item.view).enabled = NO;
1616
+ [item.view setAccessibilityHelp:@"需要 macOS 26 及以上"];
1617
+ }
1618
+ }
1619
+ // 压暗作用于额度面板、状态卡和说话气泡的原生玻璃;经典主题下没有这层,置灰。切主题时当场联动。
1620
+ [themeMenu addItem:NSMenuItem.separatorItem];
1621
+ NSMenuItem *dimHeader = [themeMenu addItemWithTitle:@"玻璃压暗" action:nil keyEquivalent:@""];
1622
+ dimHeader.enabled = NO;
1623
+ BOOL (^dimApplies)(void) = ^BOOL {
1624
+ return [CCPetsPanelTheme() isEqualToString:@"liquid"] && CCPetsLiquidGlassAvailable();
1625
+ };
1626
+ NSDictionary<NSNumber *, NSString *> *dimTitles = @{
1627
+ @0: @"通透(0%)", @15: @"轻度(15%)", @25: @"标准(25%)", @45: @"清晰(45%)"};
1628
+ NSInteger selectedDim = CCPetsGlassDimLevel();
1629
+ for (NSNumber *level in CCPetsGlassDimLevels()) {
1630
+ NSMenuItem *item = [MenuChoiceRowView addToMenu:themeMenu title:dimTitles[level] group:@"dim"
1631
+ representedObject:level checked:level.integerValue == selectedDim
1632
+ target:NSApp.delegate action:@selector(setGlassDimLevel:) width:PetSubmenuRowWidth];
1633
+ MenuChoiceRowView *row = (MenuChoiceRowView *)item.view;
1634
+ row.indentation = 10;
1635
+ row.enabledHandler = dimApplies;
1636
+ row.enabled = dimApplies();
1637
+ }
1638
+ themeItem.submenu = themeMenu;
1503
1639
  NSMenuItem *notificationItem = [menu addItemWithTitle:@"系统通知" action:nil keyEquivalent:@""];
1504
1640
  NSMenu *notificationMenu = [NSMenu new];
1505
1641
  NSArray<NSDictionary *> *notificationOptions = @[
@@ -1517,6 +1653,7 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1517
1653
  tag:[option[@"tag"] integerValue]];
1518
1654
  }
1519
1655
  notificationItem.submenu = notificationMenu;
1656
+ [self addBridgeMenuToMenu:menu];
1520
1657
  NSMenuItem *interactionItem = [menu addItemWithTitle:@"连击互动" action:nil keyEquivalent:@""];
1521
1658
  NSMenu *interactionMenu = [NSMenu new];
1522
1659
  [self addPersistentSwitchToMenu:interactionMenu
@@ -1613,12 +1750,15 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
1613
1750
  action:@selector(editPhrasesFile:) keyEquivalent:@""];
1614
1751
  editPhrases.target = NSApp.delegate;
1615
1752
  speechItem.submenu = speechMenu;
1753
+ NSMenuItem *aboutItem = [menu addItemWithTitle:@"关于 CC Pets" action:@selector(showAboutPanel:) keyEquivalent:@""];
1754
+ aboutItem.target = NSApp.delegate;
1616
1755
  NSMenuItem *updateItem = [menu addItemWithTitle:@"检查更新…" action:@selector(checkForUpdates:) keyEquivalent:@""];
1617
1756
  updateItem.target = NSApp.delegate;
1618
1757
  [menu addItem:NSMenuItem.separatorItem];
1619
1758
  NSMenuItem *quitItem = [menu addItemWithTitle:@"退出桌宠" action:@selector(terminate:) keyEquivalent:@"q"];
1620
1759
  quitItem.target = NSApp;
1621
1760
  [NSMenu popUpContextMenu:menu withEvent:event forView:self];
1761
+ [MenuHint cancel];
1622
1762
  self.activePetSwitchMenu = nil;
1623
1763
  [self.petMenuPreviewPanel orderOut:nil];
1624
1764
  }
@@ -10,6 +10,9 @@ CGFloat QuotaLogicalHeightForProviderCount(NSUInteger count);
10
10
  NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName);
11
11
 
12
12
  @interface QuotaDashboardView : NSView
13
+ @property BOOL usesLiquidGlass;
14
+ // 原生玻璃下卡片和汇总区衬底的不透明度,由 App 按压暗档位设置。
15
+ @property CGFloat cardScrimAlpha;
13
16
  @property NSDictionary *codexUsage;
14
17
  @property NSDictionary *claudeUsage;
15
18
  @property NSArray<NSDictionary *> *codexHistory;
@@ -38,9 +41,5 @@ NSImage *OfficialAppIcon(NSString *bundleIdentifier, NSString *resourceName);
38
41
  - (BOOL)isProviderOnline:(NSString *)name;
39
42
  @property NSImage *codexLogo;
40
43
  @property NSImage *claudeLogo;
41
- @property BOOL refreshHovered;
42
- @property BOOL refreshPressed;
43
- @property NSTimeInterval refreshedUntil;
44
44
  @property(copy) void (^hoverChanged)(BOOL hovering);
45
- @property(copy) void (^refreshRequested)(void);
46
45
  @end