cc-pets 2.3.0 → 2.5.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.
Files changed (101) hide show
  1. package/CC_BRIDGE.md +63 -7
  2. package/CC_BRIDGE.zh-CN.md +43 -5
  3. package/CHANGELOG.md +106 -0
  4. package/CHANGELOG.zh-CN.md +106 -0
  5. package/CONTRIBUTING.md +23 -1
  6. package/CONTRIBUTING.zh-CN.md +18 -1
  7. package/PROVIDER_PROTOCOL.md +5 -1
  8. package/PROVIDER_PROTOCOL.zh-CN.md +4 -1
  9. package/README.md +177 -33
  10. package/README.zh-CN.md +137 -32
  11. package/Resources/AgentIcons/claude.png +0 -0
  12. package/Resources/AgentIcons/codex.icns +0 -0
  13. package/Resources/IDEPlugins/cc-pets-terminal.vsix +0 -0
  14. package/Resources/IDEPlugins/cc-pets-terminal.zip +0 -0
  15. package/Resources/zh-Hans.lproj/Localizable.strings +187 -35
  16. package/Sources/CCPets/App/CCPetsAppDelegate+AgentEvents.m +47 -4
  17. package/Sources/CCPets/App/CCPetsAppDelegate+AgentStatus.m +121 -20
  18. package/Sources/CCPets/App/CCPetsAppDelegate+Bridge.m +8 -6
  19. package/Sources/CCPets/App/CCPetsAppDelegate+MenuBar.m +86 -0
  20. package/Sources/CCPets/App/CCPetsAppDelegate+Private.h +14 -1
  21. package/Sources/CCPets/App/CCPetsAppDelegate+Quota.m +6 -1
  22. package/Sources/CCPets/App/CCPetsAppDelegate+Settings.m +3 -6
  23. package/Sources/CCPets/App/CCPetsAppDelegate+Speech.m +118 -50
  24. package/Sources/CCPets/App/CCPetsAppDelegate+Update.m +4 -1
  25. package/Sources/CCPets/App/CCPetsAppDelegate+Workbench.m +4 -0
  26. package/Sources/CCPets/App/CCPetsAppDelegate.h +12 -2
  27. package/Sources/CCPets/App/CCPetsAppDelegate.m +4 -2
  28. package/Sources/CCPets/App/main.m +6 -0
  29. package/Sources/CCPets/Bridge/CCPetsBridge.m +45 -18
  30. package/Sources/CCPets/Bridge/CCPetsBridgeCLI.m +175 -68
  31. package/Sources/CCPets/Bridge/CCPetsBridgeCore.h +14 -6
  32. package/Sources/CCPets/Bridge/CCPetsBridgeCore.m +356 -110
  33. package/Sources/CCPets/Bridge/CCPetsBridgeSetup.h +0 -2
  34. package/Sources/CCPets/Bridge/CCPetsBridgeSetup.m +247 -126
  35. package/Sources/CCPets/Bridge/CCPetsBridgeStore.h +37 -9
  36. package/Sources/CCPets/Bridge/CCPetsBridgeStore.m +385 -80
  37. package/Sources/CCPets/Integrations/CCPetsEvents.h +5 -0
  38. package/Sources/CCPets/Integrations/CCPetsEvents.m +68 -12
  39. package/Sources/CCPets/Integrations/CCPetsIDEIntegration.h +21 -0
  40. package/Sources/CCPets/Integrations/CCPetsIDEIntegration.m +503 -0
  41. package/Sources/CCPets/Integrations/CCPetsIntegrations.m +1 -1
  42. package/Sources/CCPets/Integrations/CCPetsLaunchPreflight.h +5 -0
  43. package/Sources/CCPets/Integrations/CCPetsLaunchPreflight.m +367 -0
  44. package/Sources/CCPets/Integrations/CCPetsTerminalFocus.h +8 -1
  45. package/Sources/CCPets/Integrations/CCPetsTerminalFocus.m +156 -25
  46. package/Sources/CCPets/Integrations/CCPetsTerminalIntegration.h +17 -0
  47. package/Sources/CCPets/Integrations/CCPetsTerminalIntegration.m +64 -0
  48. package/Sources/CCPets/Integrations/CCPetsVSCodeIntegration.h +23 -0
  49. package/Sources/CCPets/Integrations/CCPetsVSCodeIntegration.m +475 -0
  50. package/Sources/CCPets/Pet/CCPetsPhrasesEditor.m +7 -0
  51. package/Sources/CCPets/Pet/PetView+Menu.m +11 -3
  52. package/Sources/CCPets/Pet/PetView.h +7 -0
  53. package/Sources/CCPets/Pet/PetView.m +12 -1
  54. package/Sources/CCPets/Support/CCPetsDoctor.m +26 -12
  55. package/Sources/CCPets/Support/CCPetsPreferences.h +12 -0
  56. package/Sources/CCPets/Support/CCPetsPreferences.m +52 -2
  57. package/Sources/CCPets/UI/CCPetsFormBuilder.h +2 -0
  58. package/Sources/CCPets/UI/CCPetsFormBuilder.m +18 -7
  59. package/Sources/CCPets/UI/CCPetsGlassView.h +26 -4
  60. package/Sources/CCPets/UI/CCPetsGlassView.m +40 -9
  61. package/Sources/CCPets/UI/CCPetsMenuBarIcon.h +16 -0
  62. package/Sources/CCPets/UI/CCPetsMenuBarIcon.m +70 -0
  63. package/Sources/CCPets/UI/CCPetsMenuBarPanel.h +18 -0
  64. package/Sources/CCPets/UI/CCPetsMenuBarPanel.m +528 -0
  65. package/Sources/CCPets/UI/CCPetsMenuBarSummary.h +51 -0
  66. package/Sources/CCPets/UI/CCPetsMenuBarSummary.m +95 -0
  67. package/Sources/CCPets/UI/CCPetsSettingsPage.h +6 -1
  68. package/Sources/CCPets/UI/CCPetsSettingsPage.m +577 -66
  69. package/Sources/CCPets/UI/CCPetsStatusItem.h +28 -0
  70. package/Sources/CCPets/UI/CCPetsStatusItem.m +147 -0
  71. package/Sources/CCPets/UI/CCPetsUIStyle.h +5 -2
  72. package/Sources/CCPets/UI/CCPetsUIStyle.m +57 -8
  73. package/Sources/CCPets/UI/CCPetsUsageChartView.m +4 -0
  74. package/Sources/CCPets/UI/CCPetsUsagePage.m +23 -28
  75. package/Sources/CCPets/UI/CCPetsUsageStore.m +2 -2
  76. package/Sources/CCPets/UI/CCPetsWorkbenchPages.m +5 -3
  77. package/Sources/CCPets/Usage/CCPetsUsage+CodexBackground.m +193 -0
  78. package/Sources/CCPets/Usage/CCPetsUsage+Internal.h +1 -0
  79. package/Sources/CCPets/Usage/CCPetsUsage+Models.m +49 -11
  80. package/Sources/CCPets/Usage/CCPetsUsage.h +3 -2
  81. package/Sources/CCPets/Usage/CCPetsUsageMonitor.m +15 -17
  82. package/Sources/CCPets/Usage/QuotaDashboardView+Rendering.m +11 -29
  83. package/Sources/CCPets/Usage/QuotaDashboardView.m +128 -2
  84. package/THIRD_PARTY_NOTICES.md +7 -3
  85. package/THIRD_PARTY_NOTICES.zh-CN.md +5 -1
  86. package/bin/claude-with-pet +2 -0
  87. package/bin/codex-with-pet +2 -0
  88. package/package.json +5 -1
  89. package/plugins/jetbrains/README.md +62 -0
  90. package/plugins/jetbrains/src/main/java/com/ccpets/terminal/TerminalBridge.java +379 -0
  91. package/plugins/jetbrains/src/main/java/com/ccpets/terminal/TerminalIdentity.java +24 -0
  92. package/plugins/jetbrains/src/main/java/com/ccpets/terminal/TerminalStartup.java +12 -0
  93. package/plugins/jetbrains/src/main/resources/META-INF/plugin.xml +23 -0
  94. package/plugins/jetbrains/src/main/resources/META-INF/pluginIcon.svg +380 -0
  95. package/plugins/vscode/README.md +63 -0
  96. package/plugins/vscode/extension.js +210 -0
  97. package/plugins/vscode/package.json +18 -0
  98. package/scripts/build-idea-plugin.sh +101 -0
  99. package/scripts/build-vscode-extension.sh +112 -0
  100. package/scripts/build.sh +24 -2
  101. package/scripts/compile-cached.zsh +133 -0
@@ -18,11 +18,11 @@
18
18
 
19
19
  #define LF(localized, values) CCPetsInterpolate(localized, values)
20
20
 
21
- // 安装脚本在 App 数据目录里记下 npm 包目录:装到 ~/Applications 的 App 是拷贝,
21
+ // 安装脚本在 App 数据目录里记下本地包目录:装到 ~/Applications 的 App 是拷贝,
22
22
  // 从自己的位置推不出包在哪。
23
23
  static NSString *const PackageDirectoryMarker = @"package-dir";
24
24
 
25
- // npm 包目录。三种来源,按可靠程度:
25
+ // 本地包目录。三种来源,按可靠程度:
26
26
  // 1. 可执行文件在 <包目录>/.build/release/ 之下(命令行二进制,或构建出来的 App);
27
27
  // 2. 安装脚本留下的记号文件(~/Applications 里的 App);
28
28
  // 3. 退回按命令行二进制的相对位置推算(<包目录>/.build/release/cc-pets)。
@@ -39,11 +39,24 @@ static NSString *PackageDirectory(void) {
39
39
  .stringByDeletingLastPathComponent;
40
40
  }
41
41
 
42
+ // 先解析 npm link 等软链;Git worktree 的 .git 是文件,普通 checkout 则是目录。
43
+ // 无法确定来源时只称“本地包”,不把源码归档或任意目录猜作 npm 安装。
44
+ static NSString *PackageKind(void) {
45
+ NSString *directory = PackageDirectory().stringByResolvingSymlinksInPath;
46
+ if ([NSFileManager.defaultManager fileExistsAtPath:[directory stringByAppendingPathComponent:@".git"]]) {
47
+ return L(@"local source package");
48
+ }
49
+ if ([directory.stringByDeletingLastPathComponent.lastPathComponent isEqualToString:@"node_modules"]) {
50
+ return L(@"local npm package");
51
+ }
52
+ return L(@"local package");
53
+ }
54
+
42
55
  static NSString *PetBinary(void) {
43
56
  return [PackageDirectory() stringByAppendingPathComponent:@".build/release/cc-pets"];
44
57
  }
45
58
 
46
- // 版本以 package.json 为准(npm 安装的就是它);读不到时退回编进二进制的版本。
59
+ // 只读本地 package.json,不表示 npm Registry 已发布该版本;读不到时退回编译版本。
47
60
  static NSString *PackageVersion(void) {
48
61
  NSData *data = [NSData dataWithContentsOfFile:[PackageDirectory() stringByAppendingPathComponent:@"package.json"]];
49
62
  NSDictionary *package = data ? [NSJSONSerialization JSONObjectWithData:data options:0 error:nil] : nil;
@@ -114,7 +127,7 @@ static NSDictionary *ReadJSONFile(NSString *file) {
114
127
 
115
128
  static NSArray<NSDictionary *> *PathGroups(NSDictionary *native) {
116
129
  NSMutableArray *integrationItems = [NSMutableArray arrayWithArray:@[
117
- @[L(@"npm package"), PackageDirectory()],
130
+ @[PackageKind(), PackageDirectory()],
118
131
  @[L(@"Installed app"), InstalledApp()],
119
132
  @[L(@"Agent profile registry"), CCPetsProfilesPath()],
120
133
  @[L(@"Claude Code settings"), [[CCPetsHomeDirectory() stringByAppendingPathComponent:@".claude"]
@@ -391,12 +404,13 @@ static NSArray<NSDictionary *> *DoctorSections(BOOL inApp) {
391
404
  NSString *packageVersion = PackageVersion();
392
405
 
393
406
  NSMutableArray<NSDictionary *> *program = [NSMutableArray arrayWithObject:
394
- Result(@"info", LF(L(@"npm package {packageVersion}: {projectDir}"),
395
- (@{@"packageVersion": packageVersion, @"projectDir": CCPetsTildePath(PackageDirectory())})), nil)];
407
+ Result(@"info", LF(L(@"{packageKind} {packageVersion}: {projectDir}"),
408
+ (@{@"packageKind": PackageKind(), @"packageVersion": packageVersion, @"projectDir": CCPetsTildePath(PackageDirectory())})), nil)];
409
+ [program addObject:Result(@"info", L(@"These checks compare local versions. Published npm updates are checked separately."), nil)];
396
410
  NSString *binaryVersion = @CC_PETS_VERSION;
397
411
  if (![binaryVersion isEqualToString:packageVersion]) {
398
- [program addObject:Result(@"warn", LF(L(@"Native binary {binaryVersion} doesn't match npm package {packageVersion}"),
399
- (@{@"binaryVersion": binaryVersion, @"packageVersion": packageVersion})), @"cc-pets install")];
412
+ [program addObject:Result(@"warn", LF(L(@"Native binary {binaryVersion} doesn't match {packageKind} {packageVersion}"),
413
+ (@{@"binaryVersion": binaryVersion, @"packageKind": PackageKind(), @"packageVersion": packageVersion})), @"cc-pets install")];
400
414
  } else {
401
415
  [program addObject:Result(@"ok", LF(L(@"Native binary {binaryVersion}"), @{@"binaryVersion": binaryVersion}), nil)];
402
416
  }
@@ -404,8 +418,8 @@ static NSArray<NSDictionary *> *DoctorSections(BOOL inApp) {
404
418
  if (!appVersion) {
405
419
  [program addObject:Result(@"warn", LF(L(@"Installed app not found: {installedApp}"), @{@"installedApp": CCPetsTildePath(InstalledApp())}), @"cc-pets install")];
406
420
  } else if (![appVersion isEqualToString:packageVersion]) {
407
- [program addObject:Result(@"warn", LF(L(@"Installed app {appVersion} doesn't match npm package {packageVersion}"),
408
- (@{@"appVersion": appVersion, @"packageVersion": packageVersion})), @"cc-pets install")];
421
+ [program addObject:Result(@"warn", LF(L(@"Installed app {appVersion} doesn't match {packageKind} {packageVersion}"),
422
+ (@{@"appVersion": appVersion, @"packageKind": PackageKind(), @"packageVersion": packageVersion})), @"cc-pets install")];
409
423
  } else {
410
424
  [program addObject:Result(@"ok", LF(L(@"Installed app {appVersion}"), @{@"appVersion": appVersion}), nil)];
411
425
  }
@@ -508,8 +522,8 @@ NSString *CCPetsDoctorReport(NSArray<NSDictionary *> *sections) {
508
522
  struct utsname system;
509
523
  uname(&system);
510
524
  NSMutableArray<NSString *> *lines = [NSMutableArray arrayWithObject:
511
- LF(L(@"CC Pets diagnostics (npm package {packageVersion}, {platform} {release})"),
512
- (@{@"packageVersion": PackageVersion(), @"platform": @"darwin", @"release": @(system.release)}))];
525
+ LF(L(@"CC Pets diagnostics ({packageKind} {packageVersion}, {platform} {release})"),
526
+ (@{@"packageKind": PackageKind(), @"packageVersion": PackageVersion(), @"platform": @"darwin", @"release": @(system.release)}))];
513
527
  NSDictionary<NSString *, NSString *> *icons = @{@"ok": @"✅", @"warn": @"⚠️ ", @"fail": @"❌", @"info": @"ℹ️ "};
514
528
  for (NSDictionary *section in sections) {
515
529
  [lines addObject:[@"\n" stringByAppendingString:section[@"title"]]];
@@ -15,6 +15,18 @@ extern NSString *const PetInteractionEnabledKey;
15
15
  extern NSString *const PetInteractionHeartThresholdKey;
16
16
  extern NSString *const PetInteractionAnnoyedThresholdKey;
17
17
  extern NSString *const PetInteractionIntervalKey;
18
+ // 启动保护按代理软件分别保存;增加软件时定义独立的布尔键。
19
+ extern NSString *const CCPetsShadowrocketLaunchCheckKey;
20
+
21
+ // 显示位置:仅桌宠(默认)/ 桌宠 + 菜单栏 / 仅菜单栏。字符串而不是整数,以后加模式不错位。
22
+ extern NSString *const CCPetsDisplayModeKey;
23
+ extern NSString *const CCPetsDisplayModePet;
24
+ extern NSString *const CCPetsDisplayModeBoth;
25
+ extern NSString *const CCPetsDisplayModeMenuBar;
26
+ // 菜单栏图标旁常驻显示最低的 5 小时剩余额度。默认关;低于 20% 时不论开关都会显示。
27
+ extern NSString *const CCPetsMenuBarShowsPercentKey;
28
+ // 规整后的显示位置:没写过或写了未知值都按仅桌宠处理。
29
+ NSString *CCPetsDisplayMode(void);
18
30
 
19
31
  // 布尔设置。碎碎念这类"没写过就算开"的键在这里统一兜底,调用方不必各自判 nil。
20
32
  BOOL CCPetsPrefBool(NSString *key);
@@ -10,6 +10,40 @@ NSString *const PetInteractionEnabledKey = @"CCPetsInteractionEnabled";
10
10
  NSString *const PetInteractionHeartThresholdKey = @"CCPetsInteractionHeartThreshold";
11
11
  NSString *const PetInteractionAnnoyedThresholdKey = @"CCPetsInteractionAnnoyedThreshold";
12
12
  NSString *const PetInteractionIntervalKey = @"CCPetsInteractionInterval";
13
+ NSString *const CCPetsShadowrocketLaunchCheckKey = @"CCPetsLaunchProtection.Shadowrocket";
14
+ NSString *const CCPetsDisplayModeKey = @"CCPetsDisplayMode";
15
+ NSString *const CCPetsDisplayModePet = @"pet";
16
+ NSString *const CCPetsDisplayModeBoth = @"both";
17
+ NSString *const CCPetsDisplayModeMenuBar = @"menubar";
18
+ NSString *const CCPetsMenuBarShowsPercentKey = @"CCPetsMenuBarShowsPercent";
19
+
20
+ static NSArray<NSString *> *DisplayModes(void) {
21
+ return @[CCPetsDisplayModePet, CCPetsDisplayModeBoth, CCPetsDisplayModeMenuBar];
22
+ }
23
+
24
+ NSString *CCPetsDisplayMode(void) {
25
+ id value = [NSUserDefaults.standardUserDefaults objectForKey:CCPetsDisplayModeKey];
26
+ return [value isKindOfClass:NSString.class] && [DisplayModes() containsObject:value]
27
+ ? value : CCPetsDisplayModePet;
28
+ }
29
+
30
+ // 包装器运行的是裸二进制,默认 preferences domain 与 App bundle 不同。
31
+ // 启动保护的读取和写入统一走 CFPreferences 的同一个域、用户和主机。
32
+ // 不混用临时 suite 的写入与 standardUserDefaults 的快照回读,避免控件刷新后弹回关闭。
33
+ static NSString *LaunchPreferencesDomain(void) {
34
+ NSString *domain = NSProcessInfo.processInfo.environment[@"CC_PETS_PREFERENCES_DOMAIN"];
35
+ return domain.length ? domain : @"com.universewang.cc-pets";
36
+ }
37
+
38
+ static BOOL IsLaunchProtectionKey(NSString *key) {
39
+ return [key hasPrefix:@"CCPetsLaunchProtection."];
40
+ }
41
+
42
+ static id LaunchProtectionValue(NSString *key) {
43
+ return CFBridgingRelease(CFPreferencesCopyValue((__bridge CFStringRef)key,
44
+ (__bridge CFStringRef)LaunchPreferencesDomain(),
45
+ kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
46
+ }
13
47
 
14
48
  // 没有注册默认值、缺省又是开启的键。碎碎念从第一版起就是"读不到就算开",
15
49
  // 改成 registerDefaults 的话 CLI 子命令(没走 applicationDidFinishLaunching)会读成关。
@@ -18,7 +52,13 @@ static BOOL DefaultsToEnabled(NSString *key) {
18
52
  }
19
53
 
20
54
  BOOL CCPetsPrefBool(NSString *key) {
21
- id value = [NSUserDefaults.standardUserDefaults objectForKey:key];
55
+ id value = IsLaunchProtectionKey(key)
56
+ ? LaunchProtectionValue(key)
57
+ : [NSUserDefaults.standardUserDefaults objectForKey:key];
58
+ // 兼容第一版总开关;一旦保存了 Shadowrocket 的独立开关(包括关闭),就以新值为准。
59
+ if (value == nil && [key isEqualToString:CCPetsShadowrocketLaunchCheckKey]) {
60
+ value = LaunchProtectionValue(@"CCPetsLaunchProxyCheck");
61
+ }
22
62
  if (value == nil) return DefaultsToEnabled(key);
23
63
  return [value respondsToSelector:@selector(boolValue)] ? [value boolValue] : NO;
24
64
  }
@@ -33,7 +73,14 @@ void CCPetsPrefPostChange(NSString *key) {
33
73
  void CCPetsPrefSetBool(NSString *key, BOOL value) {
34
74
  if (key.length == 0) return;
35
75
  BOOL changed = CCPetsPrefBool(key) != value;
36
- [NSUserDefaults.standardUserDefaults setBool:value forKey:key];
76
+ if (IsLaunchProtectionKey(key)) {
77
+ CFStringRef domain = (__bridge CFStringRef)LaunchPreferencesDomain();
78
+ CFPreferencesSetValue((__bridge CFStringRef)key, value ? kCFBooleanTrue : kCFBooleanFalse,
79
+ domain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
80
+ CFPreferencesSynchronize(domain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
81
+ } else {
82
+ [NSUserDefaults.standardUserDefaults setBool:value forKey:key];
83
+ }
37
84
  if (changed) CCPetsPrefPostChange(key);
38
85
  }
39
86
 
@@ -64,6 +111,9 @@ id CCPetsPrefNormalizedValue(NSString *key, id value) {
64
111
  return count ? @(count.integerValue) : nil;
65
112
  }
66
113
  if ([key isEqualToString:PetInteractionIntervalKey]) return ClampedNumber(value, 0.4, 3.0);
114
+ if ([key isEqualToString:CCPetsDisplayModeKey]) {
115
+ return [value isKindOfClass:NSString.class] && [DisplayModes() containsObject:value] ? value : nil;
116
+ }
67
117
  if ([value isKindOfClass:NSString.class] || [value isKindOfClass:NSNumber.class]) return value;
68
118
  return nil;
69
119
  }
@@ -32,6 +32,8 @@
32
32
  // 一张卡片,rows 之间自动加分隔线。title 非 nil 时先加分组标题;footer 是卡片下方的小字。
33
33
  // 返回卡片。
34
34
  - (NSView *)addGroupWithTitle:(NSString *)title rows:(NSArray<NSView *> *)rows footer:(NSString *)footer;
35
+ // 替换 addGroupWithTitle 返回的卡片里的行(分隔线同样自动加),用于行数随数据变化的卡片。
36
+ + (void)replaceRowsInCard:(NSView *)card withRows:(NSArray<NSView *> *)rows;
35
37
  // 拉满宽度加到内容里。
36
38
  - (void)addView:(NSView *)view;
37
39
  // 卡片下方那种灰色小字。
@@ -206,13 +206,8 @@ static const CGFloat FormSideInset = 28;
206
206
  [self.stack setCustomSpacing:8 afterView:header];
207
207
  }
208
208
 
209
- - (NSView *)addGroupWithTitle:(NSString *)title rows:(NSArray<NSView *> *)rows footer:(NSString *)footer {
210
- if (title.length > 0) [self addGroupTitle:title note:nil];
211
-
212
- NSStackView *content = [NSStackView stackViewWithViews:@[]];
213
- content.orientation = NSUserInterfaceLayoutOrientationVertical;
214
- content.spacing = 0;
215
- content.translatesAutoresizingMaskIntoConstraints = NO;
209
+ static void FillCardContent(NSStackView *content, NSArray<NSView *> *rows) {
210
+ for (NSView *view in content.arrangedSubviews.copy) [view removeFromSuperview];
216
211
  for (NSView *row in rows) {
217
212
  if (content.arrangedSubviews.count > 0) {
218
213
  NSView *separator = [CCPetsFormBuilder separator];
@@ -224,6 +219,22 @@ static const CGFloat FormSideInset = 28;
224
219
  [row.leadingAnchor constraintEqualToAnchor:content.leadingAnchor].active = YES;
225
220
  [row.trailingAnchor constraintEqualToAnchor:content.trailingAnchor].active = YES;
226
221
  }
222
+ }
223
+
224
+ + (void)replaceRowsInCard:(NSView *)card withRows:(NSArray<NSView *> *)rows {
225
+ for (NSView *content in card.subviews) {
226
+ if ([content isKindOfClass:NSStackView.class]) { FillCardContent((NSStackView *)content, rows); return; }
227
+ }
228
+ }
229
+
230
+ - (NSView *)addGroupWithTitle:(NSString *)title rows:(NSArray<NSView *> *)rows footer:(NSString *)footer {
231
+ if (title.length > 0) [self addGroupTitle:title note:nil];
232
+
233
+ NSStackView *content = [NSStackView stackViewWithViews:@[]];
234
+ content.orientation = NSUserInterfaceLayoutOrientationVertical;
235
+ content.spacing = 0;
236
+ content.translatesAutoresizingMaskIntoConstraints = NO;
237
+ FillCardContent(content, rows);
227
238
 
228
239
  CCPetsCardView *card = [CCPetsCardView new];
229
240
  card.translatesAutoresizingMaskIntoConstraints = NO;
@@ -2,17 +2,35 @@
2
2
 
3
3
  extern NSString *const CCPetsPanelThemeKey;
4
4
  NSString *CCPetsPanelTheme(void);
5
- // 桌面小组件式玻璃背后压暗层的不透明度(百分比),0–45 之间连续可调,默认 25。
5
+ // 桌面小组件式玻璃背后压暗层的实际不透明度(百分比),0–45 之间连续可调,默认 25。
6
+ // 界面上统一换算成 0–100 的“强度”展示:100 对应实际 45。
6
7
  // 主窗口用滑块连续调;右键菜单只列 CCPetsGlassDimLevels() 四档,勾选最接近当前值的那档。
7
8
  extern NSString *const CCPetsGlassDimKey;
8
9
  extern const NSInteger CCPetsGlassDimMaximum;
9
- NSInteger CCPetsGlassDimLevel(void);
10
+ // 实际不透明度百分比(0–45,可带小数)。
11
+ double CCPetsGlassDimLevel(void);
12
+ // 展示用强度(0–100)。
13
+ NSInteger CCPetsGlassDimPercent(void);
14
+ // 强度(0–100)换算成实际不透明度百分比(0–45)。
15
+ double CCPetsGlassDimLevelForPercent(double percent);
16
+ // 菜单四档,单位是展示强度(0–100)。
10
17
  NSArray<NSNumber *> *CCPetsGlassDimLevels(void);
11
- // 四档里离 level 最近的一档;两档等距时取较小的。
12
- NSInteger CCPetsNearestGlassDimLevel(NSInteger level);
18
+ // 四档里离 percent 最近的一档;两档等距时取较小的。
19
+ NSInteger CCPetsNearestGlassDimLevel(NSInteger percent);
13
20
  // 额度卡片衬底的不透明度,跟随压暗档位:卡片区域同时受背后压暗和衬底两层影响,
14
21
  // 衬底固定的话选「通透」时卡片仍然很深。
15
22
  CGFloat CCPetsGlassCardScrimAlpha(void);
23
+ // 同上,但按传入的实际压暗值(0–45)计算;设置页预览拖动滑块时用。
24
+ CGFloat CCPetsGlassCardScrimAlphaForLevel(double level);
25
+
26
+ // 宠物说话气泡的样式:真实气泡和设置页的 Liquid Glass 预览共用,改一处两边同步。
27
+ static const CGFloat CCPetsSpeechBubbleHeight = 38.0;
28
+ static const CGFloat CCPetsSpeechBubblePadding = 16.0;
29
+ static const CGFloat CCPetsSpeechBubbleFontSize = 13.0;
30
+ static const CGFloat CCPetsSpeechBubbleEdgeShadeHeight = 9.0;
31
+ static const CGFloat CCPetsSpeechBubbleEdgeShadeAlpha = 0.6;
32
+ // 玻璃上白字的贴字形投影(状态卡、气泡、额度面板一致)。
33
+ NSShadow *CCPetsGlassTextShadow(void);
16
34
  // 运行系统和构建 SDK 都支持 NSGlassEffectView 时才为 YES。
17
35
  BOOL CCPetsLiquidGlassAvailable(void);
18
36
 
@@ -27,9 +45,13 @@ BOOL CCPetsLiquidGlassAvailable(void);
27
45
  // 胶囊形的状态卡、气泡比较矮,要在设置 usesWidgetGlass 之前调小。
28
46
  @property(nonatomic) CGFloat edgeShadeHeight;
29
47
  @property(nonatomic) CGFloat edgeShadeAlpha;
48
+ // 不看当前主题,始终用原生玻璃(设置页的 Liquid Glass 预览用);系统不支持时仍退回磨砂。
49
+ @property(nonatomic) BOOL forcesLiquidGlass;
30
50
  - (instancetype)initWithFrame:(NSRect)frame material:(NSVisualEffectMaterial)material
31
51
  appearance:(NSAppearanceName)appearance cornerRadius:(CGFloat)cornerRadius;
32
52
  - (void)applyTheme;
33
53
  // 只按当前档位更新压暗层透明度,不重建玻璃。
34
54
  - (void)applyDimLevel;
55
+ // 按指定的实际压暗值(0–45)更新压暗层,不读偏好;预览拖动滑块时用。
56
+ - (void)applyDimLevel:(double)level;
35
57
  @end
@@ -14,33 +14,54 @@ NSString *const CCPetsGlassDimKey = @"CCPetsGlassDim";
14
14
 
15
15
  const NSInteger CCPetsGlassDimMaximum = 45;
16
16
 
17
- NSArray<NSNumber *> *CCPetsGlassDimLevels(void) { return @[@0, @15, @25, @45]; }
17
+ NSArray<NSNumber *> *CCPetsGlassDimLevels(void) { return @[@0, @25, @50, @100]; }
18
18
 
19
19
  // 档位来自对照实测:0 最通透但亮背景下小字看不清;25 在暗、亮壁纸上都基本可读;
20
20
  // 45 最清楚但明显偏暗,再往上文字反而发闷,所以上限就是 45。没设置过时用 25;
21
- // 超出范围的值(手改 defaults)夹回 0–45。
22
- NSInteger CCPetsGlassDimLevel(void) {
21
+ // 超出范围的值(手改 defaults)夹回 0–45。界面按 0–100 展示,存的仍是实际值,可带小数
22
+ // (菜单的 25 / 50 档对应实际 11.25 / 22.5)。
23
+ double CCPetsGlassDimLevel(void) {
23
24
  id stored = [NSUserDefaults.standardUserDefaults objectForKey:CCPetsGlassDimKey];
24
25
  if (![stored isKindOfClass:NSNumber.class]) return 25;
25
26
  double value = [stored doubleValue];
26
27
  if (isnan(value)) return 25;
27
- return MAX((NSInteger)0, MIN(CCPetsGlassDimMaximum, (NSInteger)lround(value)));
28
+ return MAX(0.0, MIN((double)CCPetsGlassDimMaximum, value));
28
29
  }
29
30
 
30
- NSInteger CCPetsNearestGlassDimLevel(NSInteger level) {
31
+ NSInteger CCPetsGlassDimPercent(void) {
32
+ return lround(CCPetsGlassDimLevel() * 100.0 / CCPetsGlassDimMaximum);
33
+ }
34
+
35
+ double CCPetsGlassDimLevelForPercent(double percent) {
36
+ return MAX(0.0, MIN(100.0, percent)) * CCPetsGlassDimMaximum / 100.0;
37
+ }
38
+
39
+ NSInteger CCPetsNearestGlassDimLevel(NSInteger percent) {
31
40
  NSInteger nearest = 0;
32
41
  for (NSNumber *candidate in CCPetsGlassDimLevels()) {
33
- if (labs(candidate.integerValue - level) < labs(nearest - level)) nearest = candidate.integerValue;
42
+ if (labs(candidate.integerValue - percent) < labs(nearest - percent)) nearest = candidate.integerValue;
34
43
  }
35
44
  return nearest;
36
45
  }
37
46
 
38
47
  // 衬底在四个档位上的取值是实测出来的(0.06 / 0.10 / 0.12 / 0.16),档位之间按直线插值,
39
48
  // 滑块拖动时卡片深浅连续变化,不会在档位边界上跳一下。
49
+ NSShadow *CCPetsGlassTextShadow(void) {
50
+ NSShadow *shadow = [NSShadow new];
51
+ shadow.shadowColor = [NSColor colorWithWhite:0 alpha:0.45];
52
+ shadow.shadowBlurRadius = 2;
53
+ shadow.shadowOffset = NSMakeSize(0, -0.5);
54
+ return shadow;
55
+ }
56
+
40
57
  CGFloat CCPetsGlassCardScrimAlpha(void) {
58
+ return CCPetsGlassCardScrimAlphaForLevel(CCPetsGlassDimLevel());
59
+ }
60
+
61
+ CGFloat CCPetsGlassCardScrimAlphaForLevel(double level) {
41
62
  static const double levels[] = {0, 15, 25, 45};
42
63
  static const double alphas[] = {0.06, 0.10, 0.12, 0.16};
43
- double level = CCPetsGlassDimLevel();
64
+ level = MAX(0.0, MIN((double)CCPetsGlassDimMaximum, level));
44
65
  for (int index = 1; index < 4; index++) {
45
66
  if (level > levels[index]) continue;
46
67
  double fraction = (level - levels[index - 1]) / (levels[index] - levels[index - 1]);
@@ -144,7 +165,7 @@ BOOL CCPetsLiquidGlassAvailable(void) {
144
165
  // 编译期和运行期双重保护,仍能用旧 SDK 构建并在 macOS 13 上运行。
145
166
  #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 260000
146
167
  if (@available(macOS 26.0, *)) {
147
- if ([CCPetsPanelTheme() isEqualToString:@"liquid"]) {
168
+ if (self.forcesLiquidGlass || [CCPetsPanelTheme() isEqualToString:@"liquid"]) {
148
169
  NSGlassEffectView *glass = [[NSGlassEffectView alloc] initWithFrame:self.bounds];
149
170
  glass.style = self.usesWidgetGlass
150
171
  ? NSGlassEffectViewStyleClear : NSGlassEffectViewStyleRegular;
@@ -236,11 +257,21 @@ static BOOL CCPetsExperimentalGlassVariantEnabled(void) {
236
257
  #endif
237
258
 
238
259
  - (void)applyDimLevel {
239
- CGFloat alpha = CCPetsGlassDimLevel() / 100.0;
260
+ [self applyDimLevel:CCPetsGlassDimLevel()];
261
+ }
262
+
263
+ - (void)applyDimLevel:(double)level {
264
+ CGFloat alpha = level / 100.0;
240
265
  self.backdropDimView.layer.backgroundColor = [NSColor colorWithWhite:0 alpha:alpha].CGColor;
241
266
  self.backdropDimView.hidden = alpha <= 0;
242
267
  }
243
268
 
269
+ - (void)setForcesLiquidGlass:(BOOL)forcesLiquidGlass {
270
+ if (_forcesLiquidGlass == forcesLiquidGlass) return;
271
+ _forcesLiquidGlass = forcesLiquidGlass;
272
+ [self applyTheme];
273
+ }
274
+
244
275
  - (void)setUsesWidgetGlass:(BOOL)usesWidgetGlass {
245
276
  if (_usesWidgetGlass == usesWidgetGlass) return;
246
277
  _usesWidgetGlass = usesWidgetGlass;
@@ -0,0 +1,16 @@
1
+ #import <Cocoa/Cocoa.h>
2
+ #import "CCPetsMenuBarSummary.h"
3
+
4
+ // 菜单栏图标:描边的终端窗口,颜色随状态变化;符号只有等待审批时换成 •••,其余都是 >_:
5
+ //
6
+ // 待机 原色(template,系统按菜单栏明暗显示白或黑) >_
7
+ // 工作中 系统蓝 >_
8
+ // 审批 系统橙 •••
9
+ // 完成 系统绿 >_
10
+ // 失败 系统红 >_
11
+ //
12
+ // 单色线条:16pt 下双色、渐变和发光都看不出来,template 也只认单色。框内透出菜单栏底色。
13
+ extern const NSSize CCPetsMenuBarIconSize;
14
+
15
+ // 每次调用都会新建图片,调用方按色调缓存(系统色是动态色,绘制时按菜单栏外观解析,缓存不会过期)。
16
+ NSImage *CCPetsMenuBarIconImage(CCPetsMenuBarIconTone tone);
@@ -0,0 +1,70 @@
1
+ #import "CCPetsMenuBarIcon.h"
2
+
3
+ const NSSize CCPetsMenuBarIconSize = {18, 16};
4
+
5
+ // 线宽 1.6pt:Retina 下约 3 像素,和系统菜单栏图标的笔画分量接近。
6
+ static const CGFloat IconLineWidth = 1.6;
7
+
8
+ // 用系统色而不是状态卡的颜色:系统色按菜单栏明暗各有一版,深色菜单栏上取更亮的那版;
9
+ // 状态卡的工作蓝 (0.33, 0.53, 0.78) 是为浅色玻璃调的,放在深色菜单栏上发灰看不清。
10
+ static NSColor *ToneColor(CCPetsMenuBarIconTone tone) {
11
+ switch (tone) {
12
+ case CCPetsMenuBarIconToneWorking: return NSColor.systemBlueColor;
13
+ case CCPetsMenuBarIconToneAttention: return NSColor.systemOrangeColor;
14
+ case CCPetsMenuBarIconToneCompleted: return NSColor.systemGreenColor;
15
+ case CCPetsMenuBarIconToneFailed: return NSColor.systemRedColor;
16
+ default: return NSColor.blackColor;
17
+ }
18
+ }
19
+
20
+ static NSBezierPath *StrokePath(void) {
21
+ NSBezierPath *path = [NSBezierPath bezierPath];
22
+ path.lineWidth = IconLineWidth;
23
+ path.lineCapStyle = NSLineCapStyleRound;
24
+ path.lineJoinStyle = NSLineJoinStyleRound;
25
+ return path;
26
+ }
27
+
28
+ // 窗口里的符号,以窗口中心 (9, 8) 为基准:只有等待审批换成 •••(唯一需要用户动手的状态),
29
+ // 其余都是 >_,靠颜色区分。
30
+ static void DrawGlyph(CCPetsMenuBarIconTone tone) {
31
+ NSBezierPath *path = StrokePath();
32
+ switch (tone) {
33
+ case CCPetsMenuBarIconToneAttention:
34
+ for (NSInteger i = -1; i <= 1; i++) {
35
+ [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(9 + i * 3.2 - 1.05, 8 - 1.05, 2.1, 2.1)] fill];
36
+ }
37
+ return;
38
+ default:
39
+ [path moveToPoint:NSMakePoint(5.0, 10.5)];
40
+ [path lineToPoint:NSMakePoint(8.0, 8.0)];
41
+ [path lineToPoint:NSMakePoint(5.0, 5.5)];
42
+ [path moveToPoint:NSMakePoint(9.4, 5.7)];
43
+ [path lineToPoint:NSMakePoint(13.6, 5.7)];
44
+ break;
45
+ }
46
+ [path stroke];
47
+ }
48
+
49
+ static void DrawTerminal(CCPetsMenuBarIconTone tone) {
50
+ // 窗口:坐标按描边中线给,四周留出半个线宽,描边不会被画布裁掉。
51
+ NSBezierPath *frame = [NSBezierPath bezierPathWithRoundedRect:NSMakeRect(1.8, 2.3, 14.4, 11.4)
52
+ xRadius:3 yRadius:3];
53
+ frame.lineWidth = IconLineWidth;
54
+ [frame stroke];
55
+ DrawGlyph(tone);
56
+ }
57
+
58
+ NSImage *CCPetsMenuBarIconImage(CCPetsMenuBarIconTone tone) {
59
+ NSImage *image = [NSImage imageWithSize:CCPetsMenuBarIconSize flipped:NO drawingHandler:^BOOL(NSRect rect) {
60
+ NSColor *color = ToneColor(tone);
61
+ [color setStroke];
62
+ [color setFill];
63
+ DrawTerminal(tone);
64
+ return YES;
65
+ }];
66
+ // 待机交给系统着色;有状态时要保留彩色,template 会被重新染成黑白。
67
+ image.template = tone == CCPetsMenuBarIconToneNone;
68
+ image.accessibilityDescription = @"CC Pets";
69
+ return image;
70
+ }
@@ -0,0 +1,18 @@
1
+ #import <Cocoa/Cocoa.h>
2
+
3
+ @class CCPetsStatusItemController;
4
+
5
+ // 菜单栏图标左键弹出的玻璃面板:宠物与当前状态、在线会话、各账号额度、今日用量。
6
+ //
7
+ // 刻意只放「扫一眼」的信息:趋势、本机 Token 明细、系统指标留给宠物旁的悬停面板和主窗口。
8
+ // 材质、白字投影和额度配色与悬停面板一致,并跟随面板主题(经典 / Liquid Glass)。
9
+ // 面板不抢焦点(抢了会把前台终端的焦点夺走),因此不支持方向键;Esc 只在本 App 处于前台时有效,
10
+ // 点面板以外任何地方即收起,和 CCPetsGlassMenu 同一套做法。
11
+ @interface CCPetsMenuBarPanel : NSObject
12
+ - (instancetype)initWithOwner:(CCPetsStatusItemController *)owner;
13
+ @property(nonatomic, readonly, getter=isShown) BOOL shown;
14
+ - (void)showBelowButton:(NSStatusBarButton *)button;
15
+ // 数据变了:面板开着就就地重排,顶边不动。
16
+ - (void)reload;
17
+ - (void)dismiss;
18
+ @end