cc-pets 2.2.0 → 2.3.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 (173) hide show
  1. package/CC_BRIDGE.md +5 -2
  2. package/CC_BRIDGE.zh-CN.md +4 -2
  3. package/CHANGELOG.md +85 -0
  4. package/CHANGELOG.zh-CN.md +85 -0
  5. package/CONTRIBUTING.md +28 -11
  6. package/CONTRIBUTING.zh-CN.md +23 -11
  7. package/README.md +127 -27
  8. package/README.zh-CN.md +104 -30
  9. package/Resources/zh-Hans.lproj/Localizable.strings +573 -17
  10. package/Sources/CCPets/{CCPetsAppDelegate+AgentEvents.m → App/CCPetsAppDelegate+AgentEvents.m} +15 -5
  11. package/Sources/CCPets/{CCPetsAppDelegate+AgentStatus.m → App/CCPetsAppDelegate+AgentStatus.m} +89 -31
  12. package/Sources/CCPets/{CCPetsAppDelegate+Bridge.m → App/CCPetsAppDelegate+Bridge.m} +35 -24
  13. package/Sources/CCPets/{CCPetsAppDelegate+Pets.m → App/CCPetsAppDelegate+Pets.m} +18 -4
  14. package/Sources/CCPets/{CCPetsAppDelegate+Private.h → App/CCPetsAppDelegate+Private.h} +90 -21
  15. package/Sources/CCPets/App/CCPetsAppDelegate+Profiles.m +238 -0
  16. package/Sources/CCPets/{CCPetsAppDelegate+Quota.m → App/CCPetsAppDelegate+Quota.m} +47 -32
  17. package/Sources/CCPets/App/CCPetsAppDelegate+Settings.m +269 -0
  18. package/Sources/CCPets/{CCPetsAppDelegate+Speech.m → App/CCPetsAppDelegate+Speech.m} +13 -7
  19. package/Sources/CCPets/{CCPetsAppDelegate+Update.m → App/CCPetsAppDelegate+Update.m} +71 -47
  20. package/Sources/CCPets/App/CCPetsAppDelegate+Workbench.m +139 -0
  21. package/Sources/CCPets/{CCPetsAppDelegate.h → App/CCPetsAppDelegate.h} +16 -2
  22. package/Sources/CCPets/{CCPetsAppDelegate.m → App/CCPetsAppDelegate.m} +110 -12
  23. package/Sources/CCPets/App/CCPetsOpenCommand.h +13 -0
  24. package/Sources/CCPets/App/CCPetsOpenCommand.m +99 -0
  25. package/Sources/CCPets/{main.m → App/main.m} +68 -1
  26. package/Sources/CCPets/{CCPetsBridge.h → Bridge/CCPetsBridge.h} +17 -4
  27. package/Sources/CCPets/{CCPetsBridge.m → Bridge/CCPetsBridge.m} +32 -17
  28. package/Sources/CCPets/Bridge/CCPetsBridgeCLI.h +10 -0
  29. package/Sources/CCPets/Bridge/CCPetsBridgeCLI.m +792 -0
  30. package/Sources/CCPets/Bridge/CCPetsBridgeCore.h +60 -0
  31. package/Sources/CCPets/Bridge/CCPetsBridgeCore.m +558 -0
  32. package/Sources/CCPets/Bridge/CCPetsBridgeSetup.h +24 -0
  33. package/Sources/CCPets/Bridge/CCPetsBridgeSetup.m +501 -0
  34. package/Sources/CCPets/Bridge/CCPetsBridgeStore.h +103 -0
  35. package/Sources/CCPets/Bridge/CCPetsBridgeStore.m +779 -0
  36. package/Sources/CCPets/Integrations/CCPetsCLISupport.h +75 -0
  37. package/Sources/CCPets/Integrations/CCPetsCLISupport.m +342 -0
  38. package/Sources/CCPets/Integrations/CCPetsEvents.h +15 -0
  39. package/Sources/CCPets/{CCPetsEvents.m → Integrations/CCPetsEvents.m} +23 -0
  40. package/Sources/CCPets/Integrations/CCPetsIntegrations.h +51 -0
  41. package/Sources/CCPets/Integrations/CCPetsIntegrations.m +662 -0
  42. package/Sources/CCPets/Integrations/CCPetsProfiles.h +38 -0
  43. package/Sources/CCPets/Integrations/CCPetsProfiles.m +516 -0
  44. package/Sources/CCPets/{CCPetsTerminalFocus.m → Integrations/CCPetsTerminalFocus.m} +42 -12
  45. package/Sources/CCPets/Pet/CCPetsImageLoader.h +5 -0
  46. package/Sources/CCPets/{CCPetsImageLoader.m → Pet/CCPetsImageLoader.m} +10 -2
  47. package/Sources/CCPets/Pet/CCPetsPetSize.h +10 -0
  48. package/Sources/CCPets/Pet/CCPetsPetSize.m +21 -0
  49. package/Sources/CCPets/Pet/CCPetsPetStore.h +12 -0
  50. package/Sources/CCPets/Pet/CCPetsPetStore.m +476 -0
  51. package/Sources/CCPets/{CCPetsPhrases.h → Pet/CCPetsPhrases.h} +18 -2
  52. package/Sources/CCPets/{CCPetsPhrases.m → Pet/CCPetsPhrases.m} +53 -22
  53. package/Sources/CCPets/{CCPetsPhrasesEditor.m → Pet/CCPetsPhrasesEditor.m} +42 -2
  54. package/Sources/CCPets/Pet/PetView+Interaction.m +207 -0
  55. package/Sources/CCPets/Pet/PetView+Menu.m +598 -0
  56. package/Sources/CCPets/Pet/PetView+MicroBehavior.m +234 -0
  57. package/Sources/CCPets/Pet/PetView+Private.h +81 -0
  58. package/Sources/CCPets/{PetView.h → Pet/PetView.h} +3 -5
  59. package/Sources/CCPets/Pet/PetView.m +635 -0
  60. package/Sources/CCPets/Support/CCPetsDoctor.h +25 -0
  61. package/Sources/CCPets/Support/CCPetsDoctor.m +632 -0
  62. package/Sources/CCPets/Support/CCPetsJSON.h +27 -0
  63. package/Sources/CCPets/Support/CCPetsJSON.m +397 -0
  64. package/Sources/CCPets/{CCPetsL10n.h → Support/CCPetsL10n.h} +3 -1
  65. package/Sources/CCPets/{CCPetsL10n.m → Support/CCPetsL10n.m} +30 -1
  66. package/Sources/CCPets/Support/CCPetsPreferences.h +31 -0
  67. package/Sources/CCPets/Support/CCPetsPreferences.m +85 -0
  68. package/Sources/CCPets/UI/CCPetsDiagnosticsPage.h +25 -0
  69. package/Sources/CCPets/UI/CCPetsDiagnosticsPage.m +440 -0
  70. package/Sources/CCPets/UI/CCPetsFormBuilder.h +42 -0
  71. package/Sources/CCPets/UI/CCPetsFormBuilder.m +268 -0
  72. package/Sources/CCPets/{CCPetsGlassView.h → UI/CCPetsGlassView.h} +5 -1
  73. package/Sources/CCPets/{CCPetsGlassView.m → UI/CCPetsGlassView.m} +25 -7
  74. package/Sources/CCPets/UI/CCPetsMainWindow.h +55 -0
  75. package/Sources/CCPets/UI/CCPetsMainWindow.m +730 -0
  76. package/Sources/CCPets/UI/CCPetsSettingsPage.h +62 -0
  77. package/Sources/CCPets/UI/CCPetsSettingsPage.m +917 -0
  78. package/Sources/CCPets/UI/CCPetsUIStyle.h +132 -0
  79. package/Sources/CCPets/UI/CCPetsUIStyle.m +816 -0
  80. package/Sources/CCPets/UI/CCPetsUsageChartView.h +15 -0
  81. package/Sources/CCPets/UI/CCPetsUsageChartView.m +284 -0
  82. package/Sources/CCPets/UI/CCPetsUsagePage.h +32 -0
  83. package/Sources/CCPets/UI/CCPetsUsagePage.m +717 -0
  84. package/Sources/CCPets/UI/CCPetsUsageShared.h +53 -0
  85. package/Sources/CCPets/UI/CCPetsUsageStore.m +120 -0
  86. package/Sources/CCPets/UI/CCPetsUsageWidgets.h +30 -0
  87. package/Sources/CCPets/UI/CCPetsUsageWidgets.m +201 -0
  88. package/Sources/CCPets/UI/CCPetsWorkbench.h +40 -0
  89. package/Sources/CCPets/UI/CCPetsWorkbenchPages.h +13 -0
  90. package/Sources/CCPets/UI/CCPetsWorkbenchPages.m +783 -0
  91. package/Sources/CCPets/{MenuChoiceRow.m → UI/MenuChoiceRow.m} +3 -0
  92. package/Sources/CCPets/UI/MenuPetSizeView.h +5 -0
  93. package/Sources/CCPets/UI/MenuPetSizeView.m +73 -0
  94. package/Sources/CCPets/{MenuToggleSwitch.m → UI/MenuToggleSwitch.m} +1 -0
  95. package/Sources/CCPets/{CCPetsCodexRateLimits.h → Usage/CCPetsCodexRateLimits.h} +1 -0
  96. package/Sources/CCPets/{CCPetsCodexRateLimits.m → Usage/CCPetsCodexRateLimits.m} +10 -3
  97. package/Sources/CCPets/{CCPetsQuotaHistory.h → Usage/CCPetsQuotaHistory.h} +3 -0
  98. package/Sources/CCPets/{CCPetsQuotaHistory.m → Usage/CCPetsQuotaHistory.m} +58 -0
  99. package/Sources/CCPets/Usage/CCPetsUsage+ClaudeReader.m +436 -0
  100. package/Sources/CCPets/Usage/CCPetsUsage+CodexReader.m +392 -0
  101. package/Sources/CCPets/Usage/CCPetsUsage+CodexSessions.m +484 -0
  102. package/Sources/CCPets/Usage/CCPetsUsage+Internal.h +96 -0
  103. package/Sources/CCPets/Usage/CCPetsUsage+Models.m +285 -0
  104. package/Sources/CCPets/Usage/CCPetsUsage+TokenTotals.m +655 -0
  105. package/Sources/CCPets/Usage/CCPetsUsage.h +57 -0
  106. package/Sources/CCPets/Usage/CCPetsUsage.m +225 -0
  107. package/Sources/CCPets/Usage/CCPetsUsageMode.h +10 -0
  108. package/Sources/CCPets/Usage/CCPetsUsageMode.m +163 -0
  109. package/Sources/CCPets/{CCPetsUsageMonitor.h → Usage/CCPetsUsageMonitor.h} +3 -0
  110. package/Sources/CCPets/{CCPetsUsageMonitor.m → Usage/CCPetsUsageMonitor.m} +163 -6
  111. package/Sources/CCPets/Usage/QuotaDashboardView+Primitives.m +328 -0
  112. package/Sources/CCPets/Usage/QuotaDashboardView+Private.h +103 -0
  113. package/Sources/CCPets/Usage/QuotaDashboardView+Rendering.m +616 -0
  114. package/Sources/CCPets/{QuotaDashboardView.h → Usage/QuotaDashboardView.h} +17 -0
  115. package/Sources/CCPets/Usage/QuotaDashboardView.m +587 -0
  116. package/THIRD_PARTY_NOTICES.md +1 -1
  117. package/THIRD_PARTY_NOTICES.zh-CN.md +1 -1
  118. package/bin/cc-pets +8 -6
  119. package/bin/claude-with-pet +10 -2
  120. package/bin/codex-with-pet +13 -5
  121. package/package.json +1 -1
  122. package/scripts/build.sh +7 -3
  123. package/scripts/i18n.zsh +9 -52
  124. package/scripts/install-app.sh +4 -0
  125. package/scripts/install-shell-integration.sh +17 -10
  126. package/scripts/uninstall-shell-integration.sh +6 -1
  127. package/Sources/CCPets/CCPetsAppDelegate+Settings.m +0 -226
  128. package/Sources/CCPets/CCPetsEvents.h +0 -10
  129. package/Sources/CCPets/CCPetsImageLoader.h +0 -4
  130. package/Sources/CCPets/CCPetsUsage.h +0 -36
  131. package/Sources/CCPets/CCPetsUsage.m +0 -2069
  132. package/Sources/CCPets/PetView.m +0 -1806
  133. package/Sources/CCPets/QuotaDashboardView.m +0 -1145
  134. package/scripts/bridge/cli.mjs +0 -237
  135. package/scripts/bridge/core.mjs +0 -228
  136. package/scripts/bridge/hook.mjs +0 -150
  137. package/scripts/bridge/install.mjs +0 -311
  138. package/scripts/bridge/mcp-server.mjs +0 -308
  139. package/scripts/bridge/options.mjs +0 -87
  140. package/scripts/bridge/process.mjs +0 -151
  141. package/scripts/bridge/reservations.mjs +0 -248
  142. package/scripts/bridge/store.mjs +0 -433
  143. package/scripts/bridge/watch.mjs +0 -69
  144. package/scripts/check-l10n.mjs +0 -168
  145. package/scripts/configure-updater.mjs +0 -43
  146. package/scripts/detect-cli.mjs +0 -68
  147. package/scripts/doctor.mjs +0 -470
  148. package/scripts/i18n.mjs +0 -122
  149. package/scripts/install-claude-hooks.mjs +0 -253
  150. package/scripts/install-codex-hooks.mjs +0 -78
  151. package/scripts/integration-markers.mjs +0 -51
  152. package/scripts/locales/zh-Hans.json +0 -366
  153. package/scripts/pet-store.mjs +0 -415
  154. package/scripts/uninstall-integrations.mjs +0 -205
  155. /package/Sources/CCPets/{CCPetsVersion.h → App/CCPetsVersion.h} +0 -0
  156. /package/Sources/CCPets/{CCPetsVersion.m → App/CCPetsVersion.m} +0 -0
  157. /package/Sources/CCPets/{CCPetsTerminalFocus.h → Integrations/CCPetsTerminalFocus.h} +0 -0
  158. /package/Sources/CCPets/{CCPetsPhrasesEditor.h → Pet/CCPetsPhrasesEditor.h} +0 -0
  159. /package/Sources/CCPets/{CCPetsPreviews.h → Pet/CCPetsPreviews.h} +0 -0
  160. /package/Sources/CCPets/{CCPetsPreviews.m → Pet/CCPetsPreviews.m} +0 -0
  161. /package/Sources/CCPets/Resources/{/351/273/230/350/256/244.webp" → ByteMochi.webp} +0 -0
  162. /package/Sources/CCPets/{CCPetsCleanup.h → Support/CCPetsCleanup.h} +0 -0
  163. /package/Sources/CCPets/{CCPetsCleanup.m → Support/CCPetsCleanup.m} +0 -0
  164. /package/Sources/CCPets/{CCPetsPaths.h → Support/CCPetsPaths.h} +0 -0
  165. /package/Sources/CCPets/{CCPetsPaths.m → Support/CCPetsPaths.m} +0 -0
  166. /package/Sources/CCPets/{CCPetsSystemMonitor.h → Support/CCPetsSystemMonitor.h} +0 -0
  167. /package/Sources/CCPets/{CCPetsSystemMonitor.m → Support/CCPetsSystemMonitor.m} +0 -0
  168. /package/Sources/CCPets/{CCPetsGlassMenu.h → UI/CCPetsGlassMenu.h} +0 -0
  169. /package/Sources/CCPets/{CCPetsGlassMenu.m → UI/CCPetsGlassMenu.m} +0 -0
  170. /package/Sources/CCPets/{MenuChoiceRow.h → UI/MenuChoiceRow.h} +0 -0
  171. /package/Sources/CCPets/{MenuHintView.h → UI/MenuHintView.h} +0 -0
  172. /package/Sources/CCPets/{MenuHintView.m → UI/MenuHintView.m} +0 -0
  173. /package/Sources/CCPets/{MenuToggleSwitch.h → UI/MenuToggleSwitch.h} +0 -0
@@ -1,6 +1,21 @@
1
1
  #import "CCPetsPhrases.h"
2
2
  #import "CCPetsL10n.h"
3
3
 
4
+ NSString *const PetPhrasesSourcePet = @"pet";
5
+ NSString *const PetPhrasesSourceDefault = @"default";
6
+ NSString *const PetPhrasesSourceKey = @"CCPetsPhrasesSource";
7
+
8
+ NSString *PetPhrasesSource(void) {
9
+ NSString *source = [NSUserDefaults.standardUserDefaults stringForKey:PetPhrasesSourceKey];
10
+ return [source isEqualToString:PetPhrasesSourceDefault] ?
11
+ PetPhrasesSourceDefault : PetPhrasesSourcePet;
12
+ }
13
+
14
+ void PetPhrasesSetSource(NSString *source) {
15
+ if (![@[PetPhrasesSourcePet, PetPhrasesSourceDefault] containsObject:source]) return;
16
+ [NSUserDefaults.standardUserDefaults setObject:source forKey:PetPhrasesSourceKey];
17
+ }
18
+
4
19
  NSString *const PetPhraseTagDone = @"done";
5
20
  NSString *const PetPhraseTagFail = @"fail";
6
21
  NSString *const PetPhraseTagQuotaLow = @"quota_low";
@@ -102,7 +117,7 @@ NSString *PetPhrasesKeyForPetID(NSString *petID) {
102
117
  scheme = [petID substringToIndex:colon.location];
103
118
  name = [petID substringFromIndex:colon.location + 1];
104
119
  }
105
- // 内置素材的 petID 是文件名,扩展名对用户没有任何意义,留着只会让 builtin-默认.webp.txt
120
+ // 内置素材的 petID 是文件名,扩展名对用户没有任何意义,留着只会让 builtin-ByteMochi.webp.txt
106
121
  // 这种双扩展名看起来像出了错。
107
122
  if ([scheme isEqualToString:@"builtin"]) {
108
123
  NSString *extension = name.pathExtension.lowercaseString;
@@ -124,6 +139,23 @@ NSString *PetPhrasesFilePathForPetID(NSString *petID) {
124
139
  [key stringByAppendingPathExtension:@"txt"]];
125
140
  }
126
141
 
142
+ NSString *const PetSelectedSpriteKey = @"CCPetsSelectedSprite";
143
+
144
+ void PetMigrateRenamedBuiltinSprite(NSUserDefaults *defaults) {
145
+ NSString *const legacyID = @"builtin:默认.webp";
146
+ NSString *const currentID = @"builtin:ByteMochi.webp";
147
+ NSString *selected = [defaults stringForKey:PetSelectedSpriteKey];
148
+ if ([selected isEqualToString:legacyID] || [selected isEqualToString:@"默认.webp"]) {
149
+ [defaults setObject:currentID forKey:PetSelectedSpriteKey];
150
+ }
151
+ NSString *legacyPath = PetPhrasesFilePathForPetID(legacyID);
152
+ NSString *currentPath = PetPhrasesFilePathForPetID(currentID);
153
+ NSFileManager *files = NSFileManager.defaultManager;
154
+ if ([files fileExistsAtPath:legacyPath] && ![files fileExistsAtPath:currentPath]) {
155
+ [files moveItemAtPath:legacyPath toPath:currentPath error:nil];
156
+ }
157
+ }
158
+
127
159
  // 当前宠物。取词层唯一的外部状态,见头文件里为什么不走参数。
128
160
  static NSString *PetPhrasesCurrentPet;
129
161
 
@@ -228,26 +260,23 @@ NSArray<NSString *> *PetPhraseAllTags(void) {
228
260
  }
229
261
 
230
262
  NSString *PetPhraseTagDescription(NSString *tag) {
231
- static NSDictionary<NSString *, NSString *> *map;
232
- static dispatch_once_t once;
233
- dispatch_once(&once, ^{
234
- map = @{
235
- PetPhraseTagIdle: L(@"idle"), PetPhraseTagDone: L(@"Task done"),
236
- PetPhraseTagFail: L(@"repeated failures"), PetPhraseTagWake: L(@"back after a long break"),
237
- PetPhraseTagLateNight: L(@"working late at night"), PetPhraseTagLongSession: L(@"long session"),
238
- PetPhraseTagQuotaLow: L(@"quota running low"),
239
- PetPhraseTagClickHeart: L(@"happy after a few clicks"),
240
- PetPhraseTagClickAnnoyed: L(@"annoyed after too many clicks"),
241
- PetPhraseTagStateStarting: L(@"Starting"), PetPhraseTagStateIdle: L(@"Idle"),
242
- PetPhraseTagStateThinking: L(@"Thinking"), PetPhraseTagStateTool: L(@"using a tool"),
243
- PetPhraseTagStateToolBash: L(@"Running a command"), PetPhraseTagStateToolEdit: L(@"Editing files"),
244
- PetPhraseTagStateToolRead: L(@"Looking things up"), PetPhraseTagStateToolDone: L(@"step done"),
245
- PetPhraseTagStateToolFailed: L(@"Tool failed"), PetPhraseTagStateSubagent: L(@"Subagent working"),
246
- PetPhraseTagStateApproval: L(@"Awaiting approval"), PetPhraseTagStateAutoReview: L(@"Auto-reviewing"),
247
- PetPhraseTagStateCompleted: L(@"Task completed"), PetPhraseTagStateFailed: L(@"Task failed"),
248
- PetPhraseTagStateNotification: L(@"Needs attention"),
249
- };
250
- });
263
+ // 翻译跟随当前语言,不能用 dispatch_once 固定成首次调用时的语言。
264
+ NSDictionary<NSString *, NSString *> *map = @{
265
+ PetPhraseTagIdle: L(@"idle"), PetPhraseTagDone: L(@"Task done"),
266
+ PetPhraseTagFail: L(@"repeated failures"), PetPhraseTagWake: L(@"back after a long break"),
267
+ PetPhraseTagLateNight: L(@"working late at night"), PetPhraseTagLongSession: L(@"long session"),
268
+ PetPhraseTagQuotaLow: L(@"quota running low"),
269
+ PetPhraseTagClickHeart: L(@"happy after a few clicks"),
270
+ PetPhraseTagClickAnnoyed: L(@"annoyed after too many clicks"),
271
+ PetPhraseTagStateStarting: L(@"Starting"), PetPhraseTagStateIdle: L(@"Idle"),
272
+ PetPhraseTagStateThinking: L(@"Thinking"), PetPhraseTagStateTool: L(@"using a tool"),
273
+ PetPhraseTagStateToolBash: L(@"Running a command"), PetPhraseTagStateToolEdit: L(@"Editing files"),
274
+ PetPhraseTagStateToolRead: L(@"Looking things up"), PetPhraseTagStateToolDone: L(@"step done"),
275
+ PetPhraseTagStateToolFailed: L(@"Tool failed"), PetPhraseTagStateSubagent: L(@"Subagent working"),
276
+ PetPhraseTagStateApproval: L(@"Awaiting approval"), PetPhraseTagStateAutoReview: L(@"Auto-reviewing"),
277
+ PetPhraseTagStateCompleted: L(@"Task completed"), PetPhraseTagStateFailed: L(@"Task failed"),
278
+ PetPhraseTagStateNotification: L(@"Needs attention"),
279
+ };
251
280
  return map[tag] ?: tag;
252
281
  }
253
282
 
@@ -460,7 +489,9 @@ static NSString *FillSlots(NSString *template, NSDictionary<NSString *, NSString
460
489
  // 标签却不写台词,是用户在明确表达"这只宠物在这个情境闭嘴",那时必须返回空,
461
490
  // 落回通用的话这个表达就没有任何写法能实现了。
462
491
  static NSArray<NSString *> *CandidatesForTag(NSString *tag) {
463
- NSArray *entries = LoadPetPhrases()[tag];
492
+ // 默认模式跳过专属词库,保留用户编辑过的通用台词。
493
+ NSArray *entries = [PetPhrasesSource() isEqualToString:PetPhrasesSourcePet] ?
494
+ LoadPetPhrases()[tag] : nil;
464
495
  if (entries == nil) entries = LoadUserPhrases()[tag];
465
496
  if (![entries isKindOfClass:NSArray.class]) return @[];
466
497
  NSMutableArray<NSString *> *result = [NSMutableArray array];
@@ -1,6 +1,7 @@
1
1
  #import "CCPetsPhrasesEditor.h"
2
2
  #import "CCPetsL10n.h"
3
3
  #import "CCPetsPhrases.h"
4
+ #import "CCPetsUIStyle.h"
4
5
 
5
6
  static void (^PetPhrasesSpeakHandler)(NSString *);
6
7
 
@@ -8,6 +9,7 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
8
9
  @property NSTextView *textView;
9
10
  @property NSPopUpButton *tagPicker;
10
11
  @property NSTextField *statusLabel;
12
+ @property NSButton *speakButton;
11
13
  @property NSButton *saveButton;
12
14
  @property NSButton *saveAndCloseButton;
13
15
  @property NSButton *revertButton;
@@ -42,6 +44,7 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
42
44
  PetPhrasesEditorController *controller = [self shared];
43
45
  [controller buildWindowIfNeeded];
44
46
  [controller syncScopeToCurrentPet];
47
+ [controller refreshLocalizedUI];
45
48
  [controller reloadFromDisk];
46
49
  [NSApp activateIgnoringOtherApps:YES];
47
50
  [controller.window makeKeyAndOrderFront:nil];
@@ -111,6 +114,7 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
111
114
  NSButton *speak = [NSButton buttonWithTitle:L(@"Try a Line") target:self
112
115
  action:@selector(speakSample:)];
113
116
  speak.translatesAutoresizingMaskIntoConstraints = NO;
117
+ self.speakButton = speak;
114
118
 
115
119
  NSButton *save = [NSButton buttonWithTitle:L(@"Save") target:self action:@selector(save:)];
116
120
  // ⌘S 而不是回车:这是个多行文本编辑器,回车要用来换行。
@@ -122,6 +126,7 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
122
126
  NSButton *saveAndClose = [NSButton buttonWithTitle:L(@"Save & Close") target:self
123
127
  action:@selector(saveAndClose:)];
124
128
  saveAndClose.keyEquivalent = @"\r";
129
+ CCPetsApplyAccent(saveAndClose);
125
130
  saveAndClose.translatesAutoresizingMaskIntoConstraints = NO;
126
131
  self.saveAndCloseButton = saveAndClose;
127
132
 
@@ -136,6 +141,7 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
136
141
  trackingMode:NSSegmentSwitchTrackingSelectOne target:self action:@selector(scopeChanged:)];
137
142
  scope.translatesAutoresizingMaskIntoConstraints = NO;
138
143
  scope.selectedSegment = 0;
144
+ CCPetsApplyAccent(scope);
139
145
  self.scopeControl = scope;
140
146
 
141
147
  // 专属页初次打开是空白的——空白在语义上是对的(全部回落到通用),但一个空白文本框
@@ -182,11 +188,40 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
182
188
  ]];
183
189
 
184
190
  self.window = window;
191
+ [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(languageDidChange:)
192
+ name:CCPetsLanguageDidChangeNotification object:nil];
193
+ }
194
+
195
+ // 只更新界面文案,保留编辑内容、撤销记录和当前编辑的宠物。
196
+ - (void)refreshLocalizedUI {
197
+ self.window.title = L(@"Pet Lines");
198
+ self.speakButton.title = L(@"Try a Line");
199
+ self.saveButton.title = L(@"Save");
200
+ self.saveAndCloseButton.title = L(@"Save & Close");
201
+ self.fillButton.title = L(@"Insert Template");
202
+ [self.scopeControl setLabel:L(@"Shared") forSegment:0];
203
+ [self.scopeControl setLabel:self.scopePetID.length > 0 ?
204
+ [NSString stringWithFormat:L(@"This Pet · %@"),
205
+ [self displayNameForPetID:self.scopePetID]] : L(@"This Pet") forSegment:1];
206
+ [self syncRevertButtonTitle];
207
+ // 更新原有菜单项,不改变用户选中的情境。
208
+ for (NSMenuItem *item in self.tagPicker.itemArray) {
209
+ NSString *tag = item.representedObject;
210
+ item.title = [NSString stringWithFormat:L(@"%1$@ (%2$@)"),
211
+ PetPhraseTagDescription(tag), tag];
212
+ }
213
+ }
214
+
215
+ - (void)languageDidChange:(NSNotification *)notification {
216
+ [self refreshLocalizedUI];
217
+ // 通用词库可能已随语言切换换成新默认内容;有草稿时只刷新界面,不能重载覆盖它。
218
+ if (![self isDirty]) [self reloadFromDisk];
219
+ else [self showCurrentFileStatus];
185
220
  }
186
221
 
187
222
  #pragma mark - 编辑范围
188
223
 
189
- // 菜单里显示的宠物名。petID 是 external:哆啦A梦 / builtin:默认.webp,
224
+ // 菜单里显示的宠物名。petID 是 external:团子 / builtin:ByteMochi.webp,
190
225
  // 前缀和扩展名对用户没有意义。
191
226
  - (NSString *)displayNameForPetID:(NSString *)petID {
192
227
  NSRange colon = [petID rangeOfString:@":"];
@@ -277,7 +312,12 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
277
312
  self.loadedText = text;
278
313
  self.loadedStamp = [NSFileManager.defaultManager attributesOfItemAtPath:path
279
314
  error:nil][NSFileModificationDate];
280
- if (self.petScope && text.length == 0) {
315
+ [self showCurrentFileStatus];
316
+ }
317
+
318
+ - (void)showCurrentFileStatus {
319
+ NSString *path = [self currentFilePath];
320
+ if (self.petScope && self.textView.string.length == 0) {
281
321
  [self showStatus:[NSString stringWithFormat:
282
322
  L(@"%@ · Still empty, so this pet uses the shared lines. Only write the sections you want to change, or click “Insert Template” at the top right to see what's possible."), path]
283
323
  warning:NO];
@@ -0,0 +1,207 @@
1
+ #import "PetView+Private.h"
2
+
3
+ // 按下后位移超过这个距离才判定为拖动,之内视为点击。
4
+ static const CGFloat PetDragThreshold = 3.0;
5
+ // 拖动滞后只做水平方向。窗口左右各有 43px 余量,而下方是 0——垂直滞后往下一点就被裁掉,
6
+ // 只留向上会变成不对称的怪动作,不如不做。反正拖动本来就按水平方向选跑动行,
7
+ // 水平滞后正好强化那个方向感。
8
+ static const CGFloat PetDragLagMax = 13.0;
9
+ static const CGFloat PetDragLagFactor = 0.85;
10
+ // 松手后的"落脚":先压扁再回弹到静止。锚点在脚底,所以压扁是往下坐,不会越界。
11
+ static const NSTimeInterval PetSettleDuration = 0.34;
12
+
13
+ @implementation PetView (Interaction)
14
+ // 桌宠是 LSUIElement + NSNonactivatingPanel,几乎永远不是活跃应用。不接受 first mouse
15
+ // 的话,AppKit 会把点击非活跃应用窗口的第一次 mouseDown 当成"激活点击"消耗掉,视图
16
+ // 根本收不到——表现为要点两下才拖得动。以前靠 movableByWindowBackground 拖动时不受
17
+ // 影响(窗口背景拖动在窗口服务器层处理,不走视图的 first mouse 判定),关掉它之后
18
+ // 这个缺陷才暴露出来。
19
+ - (BOOL)acceptsFirstMouse:(NSEvent *)event { return YES; }
20
+ // 精灵区的拖动由 runWindowDragWithEvent: 自己发起,不让 AppKit 的窗口背景拖动同时
21
+ // 介入同一次按下;窗口透明区没有这个覆写,继续走 movableByWindowBackground。
22
+ // 两条路径底层都是窗口服务器拖动,手感一致。
23
+ - (BOOL)mouseDownCanMoveWindow { return NO; }
24
+ // 阈值起点取事件自带的坐标,不用 NSEvent.mouseLocation(那是"处理这条事件时"鼠标的实时
25
+ // 位置)。主线程被别的活儿占住时,mouseDown 会晚一截才被处理,实时位置早已跟着手滑走,
26
+ // 起点于是落在远处,后面要多走同样的距离才够过阈值——表现为按住之后宠物迟迟不动。
27
+ // 阈值判定发生在窗口服务器接手拖动之前,窗口此刻还没动,所以窗口坐标是稳定的参照系。
28
+ - (void)mouseDown:(NSEvent *)event {
29
+ [self noteActivity];
30
+ self.agentActive = NO;
31
+ self.dragStartMouse = event.locationInWindow;
32
+ }
33
+ - (void)mouseDragged:(NSEvent *)event {
34
+ if (self.draggingPet) return;
35
+ NSPoint current = event.locationInWindow;
36
+ CGFloat horizontal = current.x - self.dragStartMouse.x;
37
+ CGFloat vertical = current.y - self.dragStartMouse.y;
38
+ if (hypot(horizontal, vertical) < PetDragThreshold) return;
39
+ [self runWindowDragWithEvent:event movingRight:horizontal >= 0];
40
+ }
41
+ // 拖动交给窗口服务器:它不依赖应用事件流,所以掠过其他窗口、拖出屏幕、
42
+ // 应用非活跃都不会中断。这个 API 会立即返回,且 mouseUp 可能不会发回应用,
43
+ // 因此不能在调用后立刻恢复 idle;释放兜底由 nextFrame: 检查物理按键状态。
44
+ - (void)runWindowDragWithEvent:(NSEvent *)event movingRight:(BOOL)movingRight {
45
+ self.draggingPet = YES;
46
+ if (self.pocketHoverChanged) self.pocketHoverChanged(NO);
47
+ if (self.dragStateChanged) self.dragStateChanged(YES);
48
+ [self playRow:movingRight ? 1 : 2 throughFrame:7 oneShot:NO];
49
+ [self startObservingWindowMove];
50
+
51
+ [self.window performWindowDragWithEvent:event];
52
+ }
53
+ - (void)startObservingWindowMove {
54
+ if (self.observingWindowMove || !self.window) return;
55
+ self.lastDragWindowOrigin = self.window.frame.origin;
56
+ self.observingWindowMove = YES;
57
+ [NSNotificationCenter.defaultCenter addObserver:self
58
+ selector:@selector(petWindowMovedWhileDragging:)
59
+ name:NSWindowDidMoveNotification object:self.window];
60
+ }
61
+ - (void)stopObservingWindowMove {
62
+ if (!self.observingWindowMove) return;
63
+ self.observingWindowMove = NO;
64
+ [NSNotificationCenter.defaultCenter removeObserver:self
65
+ name:NSWindowDidMoveNotification object:self.window];
66
+ }
67
+ // 精灵在窗口内往反方向落后一点,看着就有了重量。滞后量跟这一帧的位移走,
68
+ // 停手不动时位移为 0,会自然归位。
69
+ - (void)petWindowMovedWhileDragging:(NSNotification *)notification {
70
+ if (!self.draggingPet || self.reduceMotion) return;
71
+ NSPoint origin = self.window.frame.origin;
72
+ CGFloat dx = origin.x - self.lastDragWindowOrigin.x;
73
+ self.lastDragWindowOrigin = origin;
74
+
75
+ CGFloat lag = -dx * PetDragLagFactor;
76
+ lag = MAX(-PetDragLagMax, MIN(PetDragLagMax, lag));
77
+ // 缩短隐式动画时长:默认 0.25s 追不上手,看着是糊而不是滞后。0.12s 既平滑又跟手。
78
+ [CATransaction begin];
79
+ [CATransaction setAnimationDuration:0.12];
80
+ [CATransaction setAnimationTimingFunction:
81
+ [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut]];
82
+ self.spriteLayer.transform = CATransform3DMakeTranslation(lag, 0, 0);
83
+ [CATransaction commit];
84
+ }
85
+ - (void)endPetDrag {
86
+ if (!self.draggingPet) return;
87
+ self.draggingPet = NO;
88
+ [self stopObservingWindowMove];
89
+ if (self.dragStateChanged) self.dragStateChanged(NO);
90
+ [self playRow:0 throughFrame:5 oneShot:NO];
91
+ [self playSettleAnimation];
92
+ }
93
+ // 落脚:从当前滞后位置 → 压扁 → 轻微回弹过冲 → 静止。
94
+ // 整段只动 transform 一个属性,和挂在 position.y 上的呼吸互不干扰。
95
+ - (void)playSettleAnimation {
96
+ CALayer *layer = self.spriteLayer;
97
+ if (!layer) return;
98
+ if (self.reduceMotion) {
99
+ layer.transform = CATransform3DIdentity;
100
+ return;
101
+ }
102
+ CATransform3D current = ((CALayer *)layer.presentationLayer ?: layer).transform;
103
+ CAKeyframeAnimation *settle = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
104
+ settle.values = @[
105
+ [NSValue valueWithCATransform3D:current],
106
+ [NSValue valueWithCATransform3D:CATransform3DMakeScale(1.07, 0.92, 1.0)],
107
+ [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.97, 1.04, 1.0)],
108
+ [NSValue valueWithCATransform3D:CATransform3DIdentity]
109
+ ];
110
+ settle.keyTimes = @[@0.0, @0.34, @0.68, @1.0];
111
+ settle.duration = PetSettleDuration;
112
+ settle.timingFunction = [CAMediaTimingFunction
113
+ functionWithName:kCAMediaTimingFunctionEaseOut];
114
+ // 先把 model 值落到静止态且不触发隐式动画,否则它会和下面的关键帧同时跑。
115
+ [CATransaction begin];
116
+ [CATransaction setDisableActions:YES];
117
+ layer.transform = CATransform3DIdentity;
118
+ [CATransaction commit];
119
+ [layer addAnimation:settle forKey:@"settle"];
120
+ }
121
+ - (void)mouseUp:(NSEvent *)event {
122
+ if (self.draggingPet) {
123
+ [self endPetDrag];
124
+ return;
125
+ }
126
+ [self handleInteractionClick];
127
+ }
128
+ - (void)handleInteractionClick {
129
+ NSUserDefaults *defaults = NSUserDefaults.standardUserDefaults;
130
+ if (![defaults boolForKey:PetInteractionEnabledKey]) {
131
+ [self playRow:7 throughFrame:5 oneShot:YES];
132
+ return;
133
+ }
134
+ NSTimeInterval interval = [defaults doubleForKey:PetInteractionIntervalKey];
135
+ interval = MAX(0.4, MIN(3.0, interval));
136
+ NSInteger heartThreshold = MAX((NSInteger)2,
137
+ [defaults integerForKey:PetInteractionHeartThresholdKey]);
138
+ NSInteger annoyedThreshold = MAX(heartThreshold + 1,
139
+ [defaults integerForKey:PetInteractionAnnoyedThresholdKey]);
140
+ NSTimeInterval now = CFAbsoluteTimeGetCurrent();
141
+ if (now - self.lastInteractionClickAt > interval) {
142
+ self.interactionClickCount = 0;
143
+ }
144
+ self.lastInteractionClickAt = now;
145
+ self.interactionClickCount++;
146
+
147
+ if (self.interactionClickCount >= annoyedThreshold) {
148
+ [self spawnInteractionSymbols:@[@"💢", @"╬", @"!"]
149
+ color:NSColor.systemOrangeColor];
150
+ [self playRow:5 throughFrame:7 oneShot:YES];
151
+ if (self.interactionPhraseRequested) {
152
+ self.interactionPhraseRequested(@"click_annoyed");
153
+ }
154
+ return;
155
+ }
156
+ if (self.interactionClickCount >= heartThreshold) {
157
+ [self spawnInteractionSymbols:@[@"♥︎", @"♥︎", @"♥︎"]
158
+ color:NSColor.systemPinkColor];
159
+ [self playRow:3 throughFrame:3 oneShot:YES];
160
+ if (self.interactionPhraseRequested) {
161
+ self.interactionPhraseRequested(@"click_heart");
162
+ }
163
+ return;
164
+ }
165
+ [self playRow:7 throughFrame:5 oneShot:YES];
166
+ }
167
+ - (void)spawnInteractionSymbols:(NSArray<NSString *> *)symbols color:(NSColor *)color {
168
+ NSTimeInterval duration = self.reduceMotion ? 0.45 : 0.95;
169
+ for (NSUInteger index = 0; index < symbols.count; index++) {
170
+ CGFloat x = 34.0 + arc4random_uniform(66);
171
+ CGFloat y = 104.0 + arc4random_uniform(12);
172
+ NSTextField *label = [NSTextField labelWithString:symbols[index]];
173
+ label.alignment = NSTextAlignmentCenter;
174
+ label.font = [NSFont systemFontOfSize:index == 0 ? 21 : 17
175
+ weight:NSFontWeightBold];
176
+ label.textColor = color;
177
+ label.frame = NSMakeRect(x, y, 30, 28);
178
+ label.wantsLayer = YES;
179
+ label.layer.zPosition = 20;
180
+ [self addSubview:label];
181
+
182
+ CFTimeInterval delay = index * 0.08;
183
+ CGPoint start = label.layer.position;
184
+ CGPoint end = CGPointMake(start.x + ((NSInteger)index - 1) * 10,
185
+ start.y + (self.reduceMotion ? 0 : 34 + index * 5));
186
+ CAKeyframeAnimation *position = [CAKeyframeAnimation animationWithKeyPath:@"position"];
187
+ position.values = @[[NSValue valueWithPoint:start], [NSValue valueWithPoint:end]];
188
+ CAKeyframeAnimation *opacity = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
189
+ opacity.values = @[@0.0, @1.0, @1.0, @0.0];
190
+ opacity.keyTimes = @[@0.0, @0.18, @0.68, @1.0];
191
+ CAKeyframeAnimation *scale = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
192
+ scale.values = @[@0.65, @1.12, @1.0];
193
+ scale.keyTimes = @[@0.0, @0.35, @1.0];
194
+ CAAnimationGroup *group = [CAAnimationGroup animation];
195
+ group.animations = @[position, opacity, scale];
196
+ group.duration = duration;
197
+ group.beginTime = CACurrentMediaTime() + delay;
198
+ group.fillMode = kCAFillModeBoth;
199
+ group.removedOnCompletion = NO;
200
+ [label.layer addAnimation:group forKey:@"interactionFloat"];
201
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
202
+ (int64_t)((duration + delay + 0.05) * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
203
+ [label removeFromSuperview];
204
+ });
205
+ }
206
+ }
207
+ @end