@myclaw163/clawclaw-cli 0.6.71 → 0.6.76

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 (209) hide show
  1. package/README.md +387 -427
  2. package/bin/clawclaw-cli.mjs +3 -3
  3. package/package.json +48 -48
  4. package/personas//347/220/206/346/231/272/346/270/251/345/222/214.md +23 -23
  5. package/personas//350/200/201/350/260/213/346/267/261/347/256/227.md +22 -22
  6. package/personas//350/257/232/346/201/263/347/233/264/347/216/207.md +22 -22
  7. package/personas//350/275/273/346/235/276/346/264/273/346/263/274.md +22 -22
  8. package/personas//351/207/216/346/200/247/345/217/233/351/200/206.md +23 -23
  9. package/scripts/check-skill-command-surface.mjs +116 -0
  10. package/scripts/find-hide-spots.py +157 -157
  11. package/scripts/postinstall.mjs +20 -20
  12. package/scripts/sync-bundled-skill.mjs +245 -245
  13. package/scripts/sync-bundled-skill.test.mjs +152 -152
  14. package/skills/clawclaw/SKILL.md +248 -244
  15. package/skills/clawclaw/references/CHATTERBOX.md +141 -142
  16. package/skills/clawclaw/references/COMMANDS.md +160 -148
  17. package/skills/clawclaw/references/GAME-MECHANICS.md +188 -188
  18. package/skills/clawclaw/references/HUB.md +48 -48
  19. package/skills/clawclaw/references/KNOWLEDGE.md +42 -45
  20. package/skills/clawclaw/references/STRATEGIES.md +59 -59
  21. package/skills/clawclaw/references/STREAM.md +93 -91
  22. package/skills/clawclaw/references/TACTICS.md +65 -65
  23. package/src/assets/clawclaw-ascii-map.txt +40 -40
  24. package/src/cli.ts +112 -110
  25. package/src/commands/_schema.ts +124 -109
  26. package/src/commands/account.ts +209 -209
  27. package/src/commands/data.test.ts +33 -0
  28. package/src/commands/data.ts +22 -0
  29. package/src/commands/do.test.ts +84 -73
  30. package/src/commands/do.ts +130 -126
  31. package/src/commands/events.test.ts +100 -71
  32. package/src/commands/events.ts +250 -155
  33. package/src/commands/game-map.test.ts +28 -28
  34. package/src/commands/game-start-plan.test.ts +84 -84
  35. package/src/commands/game.ts +1113 -1047
  36. package/src/commands/history-player.test.ts +102 -102
  37. package/src/commands/history.ts +573 -573
  38. package/src/commands/hub.test.ts +96 -96
  39. package/src/commands/hub.ts +234 -234
  40. package/src/commands/knowledge.test.ts +13 -13
  41. package/src/commands/knowledge.ts +139 -139
  42. package/src/commands/load.test.ts +51 -51
  43. package/src/commands/load.ts +13 -13
  44. package/src/commands/meeting-history.test.ts +106 -106
  45. package/src/commands/memory.ts +40 -40
  46. package/src/commands/peek.ts +45 -45
  47. package/src/commands/persona.ts +57 -57
  48. package/src/commands/setup/codex.ts +266 -266
  49. package/src/commands/skill.ts +128 -128
  50. package/src/commands/state.ts +46 -46
  51. package/src/commands/strategy.test.ts +153 -145
  52. package/src/commands/strategy.ts +183 -181
  53. package/src/commands/tts.ts +128 -128
  54. package/src/commands/upgrade.test.ts +82 -82
  55. package/src/commands/upgrade.ts +148 -148
  56. package/src/commands/watch.test.ts +999 -977
  57. package/src/commands/watch.ts +660 -658
  58. package/src/lib/auth.test.ts +86 -74
  59. package/src/lib/auth.ts +223 -186
  60. package/src/lib/command-meta.ts +37 -37
  61. package/src/lib/game-client.ts +403 -391
  62. package/src/lib/game-context.ts +92 -0
  63. package/src/lib/http-keepalive.ts +15 -15
  64. package/src/lib/http-transport.test.ts +42 -42
  65. package/src/lib/http-transport.ts +113 -113
  66. package/src/lib/hub-client.test.ts +56 -56
  67. package/src/lib/hub-client.ts +88 -88
  68. package/src/lib/hub-install.test.ts +98 -98
  69. package/src/lib/hub-install.ts +160 -121
  70. package/src/lib/hub-reminder.ts +78 -75
  71. package/src/lib/hub-unzip.test.ts +69 -69
  72. package/src/lib/hub-unzip.ts +62 -62
  73. package/src/lib/init-command.test.ts +75 -75
  74. package/src/lib/init-command.ts +130 -120
  75. package/src/lib/knowledge-store.test.ts +170 -170
  76. package/src/lib/knowledge-store.ts +369 -369
  77. package/src/lib/load-context.test.ts +52 -52
  78. package/src/lib/load-context.ts +52 -52
  79. package/src/lib/match-state.test.ts +134 -134
  80. package/src/lib/match-state.ts +94 -94
  81. package/src/lib/netease-tts.ts +83 -83
  82. package/src/lib/normalize.ts +42 -42
  83. package/src/lib/persona.test.ts +41 -41
  84. package/src/lib/persona.ts +72 -72
  85. package/src/lib/server-registry.ts +152 -152
  86. package/src/lib/skill-version.test.ts +48 -48
  87. package/src/lib/skill-version.ts +19 -19
  88. package/src/lib/strategy-export.test.ts +240 -232
  89. package/src/lib/strategy-export.ts +247 -242
  90. package/src/lib/tts-keys.ts +7 -7
  91. package/src/lib/tts-speech.test.ts +63 -63
  92. package/src/lib/tts-speech.ts +76 -76
  93. package/src/lib/user-data.test.ts +96 -0
  94. package/src/lib/user-data.ts +400 -0
  95. package/src/lib/workspace-argv.test.ts +49 -49
  96. package/src/lib/workspace-argv.ts +44 -44
  97. package/src/perception/player-history-store.test.ts +87 -87
  98. package/src/perception/player-history-store.ts +194 -194
  99. package/src/pipeline/event-format.test.ts +243 -215
  100. package/src/pipeline/event-format.ts +501 -485
  101. package/src/pipeline/event-hints.ts +195 -190
  102. package/src/pipeline/event-store.test.ts +28 -28
  103. package/src/pipeline/event-store.ts +193 -193
  104. package/src/pipeline/pipeline.ts +35 -35
  105. package/src/pipeline/player-projection.test.ts +168 -0
  106. package/src/pipeline/player-projection.ts +370 -0
  107. package/src/runtime/auto-upgrade.test.ts +66 -66
  108. package/src/runtime/auto-upgrade.ts +31 -31
  109. package/src/runtime/event-daemon.test.ts +209 -141
  110. package/src/runtime/event-daemon.ts +519 -457
  111. package/src/runtime/owner-control.ts +150 -150
  112. package/src/runtime/raw-ws-log.test.ts +33 -33
  113. package/src/runtime/raw-ws-log.ts +32 -32
  114. package/src/runtime/runtime-logger.ts +107 -107
  115. package/src/runtime/ws-client.test.ts +125 -104
  116. package/src/runtime/ws-client.ts +287 -272
  117. package/src/sdk/action.ts +166 -166
  118. package/src/sdk/index.ts +110 -110
  119. package/src/sdk/types.ts +161 -161
  120. package/src/strategies/avoid-lone.ts +12 -12
  121. package/src/strategies/avoid-players.knowledge.md +19 -19
  122. package/src/strategies/avoid-players.ts +16 -16
  123. package/src/strategies/corpse-patrol.ts +23 -23
  124. package/src/strategies/crab-sabotage.ts +22 -22
  125. package/src/strategies/custom-module.test.ts +270 -270
  126. package/src/strategies/find-player.ts +17 -17
  127. package/src/strategies/game-utils.test.ts +242 -242
  128. package/src/strategies/game-utils.ts +846 -846
  129. package/src/strategies/goals/anchor-linger.ts +77 -77
  130. package/src/strategies/goals/avoid-lone-top.ts +168 -168
  131. package/src/strategies/goals/avoid-players-top.test.ts +83 -83
  132. package/src/strategies/goals/avoid-players-top.ts +121 -121
  133. package/src/strategies/goals/conversation-goal.ts +51 -51
  134. package/src/strategies/goals/corpse-patrol-top.ts +113 -113
  135. package/src/strategies/goals/crab-octopus-reflexes.ts +101 -101
  136. package/src/strategies/goals/crab-sabotage-top.ts +197 -197
  137. package/src/strategies/goals/emergency-hunt-goal.ts +28 -28
  138. package/src/strategies/goals/find-player-top.ts +93 -93
  139. package/src/strategies/goals/flee-players-goal.ts +53 -53
  140. package/src/strategies/goals/follow-companion-goal.ts +106 -106
  141. package/src/strategies/goals/goal-manager.ts +41 -41
  142. package/src/strategies/goals/goal-root-strategy.ts +49 -49
  143. package/src/strategies/goals/goal.ts +28 -28
  144. package/src/strategies/goals/hide-top.ts +197 -197
  145. package/src/strategies/goals/keep-away-goal.ts +221 -221
  146. package/src/strategies/goals/kill-frenzy-top.ts +80 -80
  147. package/src/strategies/goals/kill-lone-top.ts +160 -160
  148. package/src/strategies/goals/kill-target-goal.ts +59 -59
  149. package/src/strategies/goals/kill-target-top.ts +109 -109
  150. package/src/strategies/goals/leaf-goal.ts +27 -27
  151. package/src/strategies/goals/linger-corpse-goal.ts +35 -35
  152. package/src/strategies/goals/lone-kill-core.ts +82 -82
  153. package/src/strategies/goals/lone-kill-goal.ts +24 -24
  154. package/src/strategies/goals/lone-kill-task-top.test.ts +85 -85
  155. package/src/strategies/goals/lone-kill-task-top.ts +133 -133
  156. package/src/strategies/goals/move-room-goal.ts +60 -60
  157. package/src/strategies/goals/normal-shrimp-top.test.ts +80 -80
  158. package/src/strategies/goals/normal-shrimp-top.ts +242 -242
  159. package/src/strategies/goals/paradise-fish-top.test.ts +126 -126
  160. package/src/strategies/goals/paradise-fish-top.ts +224 -224
  161. package/src/strategies/goals/patrol-top.ts +57 -57
  162. package/src/strategies/goals/report-patrol-top.ts +80 -80
  163. package/src/strategies/goals/safe-task-goal.ts +102 -102
  164. package/src/strategies/goals/social-task-top.ts +161 -161
  165. package/src/strategies/goals/task-kill-report-top.ts +163 -163
  166. package/src/strategies/goals/task-only-top.ts +57 -57
  167. package/src/strategies/goals/task-or-patrol-goal.ts +41 -41
  168. package/src/strategies/goals/task-report-top.ts +57 -57
  169. package/src/strategies/goals/wander-task-goal.ts +33 -33
  170. package/src/strategies/goals/warrior-shrimp-top.test.ts +87 -87
  171. package/src/strategies/goals/warrior-shrimp-top.ts +267 -267
  172. package/src/strategies/greeting.ts +53 -53
  173. package/src/strategies/hide-spots.ts +59 -59
  174. package/src/strategies/hide.ts +24 -24
  175. package/src/strategies/kill-frenzy.ts +13 -13
  176. package/src/strategies/kill-lone.knowledge.md +17 -17
  177. package/src/strategies/kill-lone.ts +14 -14
  178. package/src/strategies/kill-target.ts +19 -19
  179. package/src/strategies/loader.test.ts +678 -678
  180. package/src/strategies/loader.ts +181 -179
  181. package/src/strategies/lone-kill-task.ts +22 -22
  182. package/src/strategies/meeting-gate.test.ts +59 -59
  183. package/src/strategies/meeting-gate.ts +23 -23
  184. package/src/strategies/move-room.ts +16 -16
  185. package/src/strategies/new-events-backfill.ts +98 -98
  186. package/src/strategies/off-route-points.ts +105 -105
  187. package/src/strategies/paradise-fish.knowledge.md +19 -19
  188. package/src/strategies/paradise-fish.ts +26 -26
  189. package/src/strategies/pathfind/distance-field.ts +150 -150
  190. package/src/strategies/pathfind/escape-planner.test.ts +197 -197
  191. package/src/strategies/pathfind/escape-planner.ts +355 -355
  192. package/src/strategies/pathfind/walkable-grid.ts +117 -117
  193. package/src/strategies/patrol.ts +12 -12
  194. package/src/strategies/player-targets.ts +13 -13
  195. package/src/strategies/report-patrol.ts +12 -12
  196. package/src/strategies/shrimp-memory.knowledge.md +19 -19
  197. package/src/strategies/shrimp-memory.ts +26 -26
  198. package/src/strategies/social-task.test.ts +28 -28
  199. package/src/strategies/social-task.ts +50 -50
  200. package/src/strategies/spawn.ts +82 -82
  201. package/src/strategies/speech-module.ts +123 -123
  202. package/src/strategies/strategy-loop.test.ts +15 -0
  203. package/src/strategies/strategy-loop.ts +776 -771
  204. package/src/strategies/task-kill-report.ts +18 -18
  205. package/src/strategies/task-only.ts +12 -12
  206. package/src/strategies/task-report.ts +23 -23
  207. package/src/strategies/types.ts +109 -109
  208. package/src/strategies/warrior-memory.knowledge.md +21 -21
  209. package/src/strategies/warrior-memory.ts +17 -17
@@ -1,74 +1,86 @@
1
- import { describe, expect, it, beforeEach, afterEach } from 'vitest';
2
- import { mkdtempSync, rmSync, writeFileSync, readFileSync } from 'fs';
3
- import { tmpdir } from 'os';
4
- import { join } from 'path';
5
- import { AuthStore } from './auth.js';
6
- import { TTS_PROVIDER_LEIHUO } from './tts-keys.js';
7
-
8
- describe('AuthStore TTS config', () => {
9
- let dir: string;
10
- let authFile: string;
11
-
12
- beforeEach(() => {
13
- dir = mkdtempSync(join(tmpdir(), 'clawclaw-auth-'));
14
- authFile = join(dir, '.auth.json');
15
- });
16
-
17
- afterEach(() => {
18
- rmSync(dir, { recursive: true, force: true });
19
- });
20
-
21
- it('stores leihuo TTS key under the active profile', () => {
22
- const store = new AuthStore(authFile);
23
- store.addProfile({ agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' });
24
- store.setTtsKey(TTS_PROVIDER_LEIHUO, 'sk-test');
25
- expect(store.getTtsKey(TTS_PROVIDER_LEIHUO)).toBe('sk-test');
26
-
27
- const raw = JSON.parse(readFileSync(authFile, 'utf8'));
28
- expect(raw.profiles['lobster-1'].tts.keys.leihuo).toBe('sk-test');
29
- expect(raw.ttsKeys).toBeUndefined();
30
- });
31
-
32
- it('stores default TTS voice under the active profile', () => {
33
- const store = new AuthStore(authFile);
34
- store.addProfile({ agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' });
35
- store.setTtsDefaultVoice('male-qn-qingse');
36
- expect(store.getTtsDefaultVoice()).toBe('male-qn-qingse');
37
-
38
- const raw = JSON.parse(readFileSync(authFile, 'utf8'));
39
- expect(raw.profiles['lobster-1'].tts.defaultVoice).toBe('male-qn-qingse');
40
- });
41
-
42
- it('clears cached game server URL when set to undefined', () => {
43
- const store = new AuthStore(authFile);
44
- store.addProfile({
45
- agentName: 'lobster-1',
46
- apiKey: 'claw_1',
47
- serverUrl: 'https://example.com',
48
- gameServerUrl: 'https://example.com/gs/old-game-server',
49
- });
50
-
51
- store.updateGameServerUrl(undefined);
52
-
53
- const raw = JSON.parse(readFileSync(authFile, 'utf8'));
54
- expect(raw.profiles['lobster-1'].gameServerUrl).toBeUndefined();
55
- });
56
-
57
- it('migrates legacy neteaseTtsKey to each profile tts keys', () => {
58
- writeFileSync(authFile, JSON.stringify({
59
- activeProfile: 'lobster-1',
60
- profiles: {
61
- 'lobster-1': { agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' },
62
- 'lobster-2': { agentName: 'lobster-2', apiKey: 'claw_2', serverUrl: 'https://example.com' },
63
- },
64
- neteaseTtsKey: 'sk-legacy',
65
- }));
66
- const store = new AuthStore(authFile);
67
- expect(store.getTtsKey(TTS_PROVIDER_LEIHUO)).toBe('sk-legacy');
68
- const raw = JSON.parse(readFileSync(authFile, 'utf8'));
69
- expect(raw.profiles['lobster-1'].tts.keys.leihuo).toBe('sk-legacy');
70
- expect(raw.profiles['lobster-2'].tts.keys.leihuo).toBe('sk-legacy');
71
- expect(raw.ttsKeys).toBeUndefined();
72
- expect(raw.neteaseTtsKey).toBeUndefined();
73
- });
74
- });
1
+ import { describe, expect, it, beforeEach, afterEach } from 'vitest';
2
+ import { mkdtempSync, rmSync, writeFileSync, readFileSync } from 'fs';
3
+ import { tmpdir } from 'os';
4
+ import { join } from 'path';
5
+ import { AuthStore } from './auth.js';
6
+ import { TTS_PROVIDER_LEIHUO } from './tts-keys.js';
7
+
8
+ describe('AuthStore TTS config', () => {
9
+ let dir: string;
10
+ let authFile: string;
11
+
12
+ beforeEach(() => {
13
+ dir = mkdtempSync(join(tmpdir(), 'clawclaw-auth-'));
14
+ authFile = join(dir, '.auth.json');
15
+ });
16
+
17
+ afterEach(() => {
18
+ rmSync(dir, { recursive: true, force: true });
19
+ });
20
+
21
+ it('stores leihuo TTS key under the active profile', () => {
22
+ const store = new AuthStore(authFile);
23
+ store.addProfile({ agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' });
24
+ store.setTtsKey(TTS_PROVIDER_LEIHUO, 'sk-test');
25
+ expect(store.getTtsKey(TTS_PROVIDER_LEIHUO)).toBe('sk-test');
26
+
27
+ const raw = JSON.parse(readFileSync(authFile, 'utf8'));
28
+ expect(raw.profiles['lobster-1'].tts.keys.leihuo).toBe('sk-test');
29
+ expect(raw.ttsKeys).toBeUndefined();
30
+ });
31
+
32
+ it('stores default TTS voice under the active profile', () => {
33
+ const store = new AuthStore(authFile);
34
+ store.addProfile({ agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' });
35
+ store.setTtsDefaultVoice('male-qn-qingse');
36
+ expect(store.getTtsDefaultVoice()).toBe('male-qn-qingse');
37
+
38
+ const raw = JSON.parse(readFileSync(authFile, 'utf8'));
39
+ expect(raw.profiles['lobster-1'].tts.defaultVoice).toBe('male-qn-qingse');
40
+ });
41
+
42
+ it('clears cached game server URL when set to undefined', () => {
43
+ const store = new AuthStore(authFile);
44
+ store.addProfile({
45
+ agentName: 'lobster-1',
46
+ apiKey: 'claw_1',
47
+ serverUrl: 'https://example.com',
48
+ gameServerUrl: 'https://example.com/gs/old-game-server',
49
+ });
50
+
51
+ store.updateGameServerUrl(undefined);
52
+
53
+ const raw = JSON.parse(readFileSync(authFile, 'utf8'));
54
+ expect(raw.profiles['lobster-1'].gameServerUrl).toBeUndefined();
55
+ });
56
+
57
+ it('removes runtime game server state when removing a profile', () => {
58
+ const runtimeFile = join(dir, 'auth-state.json');
59
+ const store = new AuthStore(authFile, runtimeFile);
60
+ store.addProfile({ agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' });
61
+ store.updateGameServerUrl('https://example.com/gs/current');
62
+
63
+ store.removeProfile('lobster-1');
64
+
65
+ const runtime = JSON.parse(readFileSync(runtimeFile, 'utf8'));
66
+ expect(runtime.profiles['lobster-1']).toBeUndefined();
67
+ });
68
+
69
+ it('migrates legacy neteaseTtsKey to each profile tts keys', () => {
70
+ writeFileSync(authFile, JSON.stringify({
71
+ activeProfile: 'lobster-1',
72
+ profiles: {
73
+ 'lobster-1': { agentName: 'lobster-1', apiKey: 'claw_1', serverUrl: 'https://example.com' },
74
+ 'lobster-2': { agentName: 'lobster-2', apiKey: 'claw_2', serverUrl: 'https://example.com' },
75
+ },
76
+ neteaseTtsKey: 'sk-legacy',
77
+ }));
78
+ const store = new AuthStore(authFile);
79
+ expect(store.getTtsKey(TTS_PROVIDER_LEIHUO)).toBe('sk-legacy');
80
+ const raw = JSON.parse(readFileSync(authFile, 'utf8'));
81
+ expect(raw.profiles['lobster-1'].tts.keys.leihuo).toBe('sk-legacy');
82
+ expect(raw.profiles['lobster-2'].tts.keys.leihuo).toBe('sk-legacy');
83
+ expect(raw.ttsKeys).toBeUndefined();
84
+ expect(raw.neteaseTtsKey).toBeUndefined();
85
+ });
86
+ });
package/src/lib/auth.ts CHANGED
@@ -1,186 +1,223 @@
1
- import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
2
- import { join, dirname } from 'path';
3
- import { getWorkspaceDir } from './init-command.js';
4
- import { TTS_PROVIDER_LEIHUO } from './tts-keys.js';
5
-
6
- export interface AuthTtsConfig {
7
- keys?: Record<string, string>;
8
- defaultVoice?: string;
9
- }
10
-
11
- export interface AuthProfile {
12
- agentName: string;
13
- apiKey: string;
14
- /** Lobby server URL (e.g. https://myclaw.163.com/claw) */
15
- serverUrl: string;
16
- /** Game server URL (e.g. http://{address}:{port}), obtained from /queue/status after match */
17
- gameServerUrl?: string;
18
- /** Per-account TTS configuration. */
19
- tts?: AuthTtsConfig;
20
- }
21
-
22
- export interface AuthData {
23
- activeProfile: string;
24
- profiles: Record<string, AuthProfile>;
25
- /** @deprecated Migrated to each profile's `tts.keys` on load. */
26
- ttsKeys?: Record<string, string>;
27
- /** @deprecated Migrated to `ttsKeys.leihuo` on load. */
28
- neteaseTtsKey?: string;
29
- }
30
-
31
- const EMPTY_AUTH: AuthData = { activeProfile: '', profiles: {} };
32
-
33
- export class AuthStore {
34
- private authFile: string;
35
-
36
- constructor(authFile?: string) {
37
- this.authFile = authFile ?? join(getWorkspaceDir(), '.auth.json');
38
- }
39
-
40
- load(): AuthData {
41
- if (!existsSync(this.authFile)) return { ...EMPTY_AUTH, profiles: {} };
42
- try {
43
- const data = JSON.parse(readFileSync(this.authFile, 'utf8')) as AuthData;
44
- return this.normalizeTtsConfig(data);
45
- } catch {
46
- return { ...EMPTY_AUTH, profiles: {} };
47
- }
48
- }
49
-
50
- private normalizeTtsConfig(data: AuthData): AuthData {
51
- let changed = false;
52
- if (data.neteaseTtsKey) {
53
- data.ttsKeys = { ...data.ttsKeys, [TTS_PROVIDER_LEIHUO]: data.neteaseTtsKey };
54
- delete data.neteaseTtsKey;
55
- changed = true;
56
- }
57
-
58
- const legacyTtsKeys = data.ttsKeys;
59
- const profiles = Object.values(data.profiles ?? {});
60
- if (legacyTtsKeys && profiles.length > 0) {
61
- for (const profile of profiles) {
62
- profile.tts = {
63
- ...profile.tts,
64
- keys: {
65
- ...legacyTtsKeys,
66
- ...profile.tts?.keys,
67
- },
68
- };
69
- }
70
- delete data.ttsKeys;
71
- changed = true;
72
- }
73
- if (changed) this.save(data);
74
- return data;
75
- }
76
-
77
- save(data: AuthData): void {
78
- const dir = dirname(this.authFile);
79
- if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
80
- writeFileSync(this.authFile, JSON.stringify(data, null, 2));
81
- }
82
-
83
- addProfile(profile: AuthProfile): void {
84
- const data = this.load();
85
- if (data.ttsKeys && !profile.tts?.keys) {
86
- profile.tts = {
87
- ...profile.tts,
88
- keys: { ...data.ttsKeys },
89
- };
90
- delete data.ttsKeys;
91
- }
92
- data.profiles[profile.agentName] = profile;
93
- data.activeProfile = profile.agentName;
94
- this.save(data);
95
- }
96
-
97
- removeProfile(name: string): void {
98
- const data = this.load();
99
- delete data.profiles[name];
100
- if (data.activeProfile === name) {
101
- const remaining = Object.keys(data.profiles);
102
- data.activeProfile = remaining[0] ?? '';
103
- }
104
- this.save(data);
105
- }
106
-
107
- switchProfile(name: string): void {
108
- const data = this.load();
109
- if (!data.profiles[name]) {
110
- throw new Error(`Profile "${name}" not found. Available: ${Object.keys(data.profiles).join(', ') || 'none'}`);
111
- }
112
- data.activeProfile = name;
113
- this.save(data);
114
- }
115
-
116
- listProfiles(): string[] {
117
- return Object.keys(this.load().profiles);
118
- }
119
-
120
- getActive(): AuthProfile | null {
121
- const data = this.load();
122
- if (!data.activeProfile || !data.profiles[data.activeProfile]) return null;
123
- return data.profiles[data.activeProfile];
124
- }
125
-
126
- updateGameServerUrl(url: string | undefined, name?: string): void {
127
- const data = this.load();
128
- const profileName = name ?? data.activeProfile;
129
- const profile = data.profiles[profileName];
130
- if (!profile) return;
131
- profile.gameServerUrl = url;
132
- this.save(data);
133
- }
134
-
135
- setTtsKey(provider: string, key: string, profileName?: string): void {
136
- const data = this.load();
137
- const profile = this.getProfileForTts(data, profileName);
138
- profile.tts = {
139
- ...profile.tts,
140
- keys: { ...profile.tts?.keys, [provider]: key },
141
- };
142
- delete data.neteaseTtsKey;
143
- this.save(data);
144
- }
145
-
146
- getTtsKey(provider: string, profileName?: string): string | undefined {
147
- const data = this.load();
148
- return this.getProfileForTts(data, profileName).tts?.keys?.[provider];
149
- }
150
-
151
- setTtsDefaultVoice(voice: string, profileName?: string): void {
152
- const data = this.load();
153
- const profile = this.getProfileForTts(data, profileName);
154
- profile.tts = { ...profile.tts, defaultVoice: voice };
155
- this.save(data);
156
- }
157
-
158
- getTtsDefaultVoice(profileName?: string): string | undefined {
159
- const data = this.load();
160
- return this.getProfileForTts(data, profileName).tts?.defaultVoice;
161
- }
162
-
163
- getTtsConfig(profileName?: string): AuthTtsConfig | undefined {
164
- const data = this.load();
165
- return this.getProfileForTts(data, profileName).tts;
166
- }
167
-
168
- private getProfileForTts(data: AuthData, profileName?: string): AuthProfile {
169
- const name = profileName ?? data.activeProfile;
170
- const profile = name ? data.profiles[name] : undefined;
171
- if (!profile) {
172
- throw new Error('No active account. Run `clawclaw-cli account register` or `clawclaw-cli account switch <apiKey>` first.');
173
- }
174
- return profile;
175
- }
176
-
177
- /** @deprecated Use {@link setTtsKey} with `TTS_PROVIDER_LEIHUO`. */
178
- setGlobalTtsKey(key: string): void {
179
- this.setTtsKey(TTS_PROVIDER_LEIHUO, key);
180
- }
181
-
182
- /** @deprecated Use {@link getTtsKey} with `TTS_PROVIDER_LEIHUO`. */
183
- getGlobalTtsKey(): string | undefined {
184
- return this.getTtsKey(TTS_PROVIDER_LEIHUO);
185
- }
186
- }
1
+ import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
2
+ import { join, dirname } from 'path';
3
+ import { getWorkspaceDir } from './init-command.js';
4
+ import { TTS_PROVIDER_LEIHUO } from './tts-keys.js';
5
+ import {
6
+ ensureUserDataLayout,
7
+ getRuntimeAuthStateFile,
8
+ getUserDataAuthFile,
9
+ readRuntimeAuthState,
10
+ splitAuthData,
11
+ writeRuntimeAuthState,
12
+ type RuntimeAuthState,
13
+ } from './user-data.js';
14
+
15
+ export interface AuthTtsConfig {
16
+ keys?: Record<string, string>;
17
+ defaultVoice?: string;
18
+ }
19
+
20
+ export interface AuthProfile {
21
+ agentName: string;
22
+ apiKey: string;
23
+ /** Lobby server URL (e.g. https://myclaw.163.com/claw) */
24
+ serverUrl: string;
25
+ /** Game server URL (e.g. http://{address}:{port}), obtained from /queue/status after match */
26
+ gameServerUrl?: string;
27
+ /** Per-account TTS configuration. */
28
+ tts?: AuthTtsConfig;
29
+ }
30
+
31
+ export interface AuthData {
32
+ activeProfile: string;
33
+ profiles: Record<string, AuthProfile>;
34
+ /** @deprecated Migrated to each profile's `tts.keys` on load. */
35
+ ttsKeys?: Record<string, string>;
36
+ /** @deprecated Migrated to `ttsKeys.leihuo` on load. */
37
+ neteaseTtsKey?: string;
38
+ }
39
+
40
+ const EMPTY_AUTH: AuthData = { activeProfile: '', profiles: {} };
41
+
42
+ export class AuthStore {
43
+ private authFile: string;
44
+ private runtimeAuthStateFile: string;
45
+
46
+ constructor(authFile?: string, runtimeAuthStateFile?: string) {
47
+ if (authFile) {
48
+ this.authFile = authFile;
49
+ this.runtimeAuthStateFile = runtimeAuthStateFile ?? join(dirname(authFile), 'auth-state.json');
50
+ return;
51
+ }
52
+
53
+ const workspaceDir = getWorkspaceDir();
54
+ ensureUserDataLayout(workspaceDir);
55
+ this.authFile = getUserDataAuthFile(workspaceDir);
56
+ this.runtimeAuthStateFile = getRuntimeAuthStateFile(workspaceDir);
57
+ }
58
+
59
+ load(): AuthData {
60
+ if (!existsSync(this.authFile)) return { ...EMPTY_AUTH, profiles: {} };
61
+ try {
62
+ const data = JSON.parse(readFileSync(this.authFile, 'utf8')) as AuthData;
63
+ const { auth, runtime, changed } = splitAuthData(data);
64
+ this.mergeRuntimeState(runtime);
65
+ if (changed) this.writeAuth(auth);
66
+ return auth;
67
+ } catch {
68
+ return { ...EMPTY_AUTH, profiles: {} };
69
+ }
70
+ }
71
+
72
+ save(data: AuthData): void {
73
+ const { auth, runtime } = splitAuthData(data);
74
+ this.mergeRuntimeState(runtime);
75
+ this.writeAuth(auth);
76
+ }
77
+
78
+ private writeAuth(data: AuthData): void {
79
+ const dir = dirname(this.authFile);
80
+ if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
81
+ writeFileSync(this.authFile, JSON.stringify(data, null, 2));
82
+ }
83
+
84
+ private mergeRuntimeState(incoming: RuntimeAuthState): void {
85
+ const incomingEntries = Object.entries(incoming.profiles ?? {}).filter(([, profile]) => profile.gameServerUrl);
86
+ if (incomingEntries.length === 0) return;
87
+ const current = readRuntimeAuthState(this.runtimeAuthStateFile);
88
+ let changed = false;
89
+ for (const [name, profile] of incomingEntries) {
90
+ if (current.profiles[name]?.gameServerUrl) continue;
91
+ current.profiles[name] = profile;
92
+ changed = true;
93
+ }
94
+ if (changed) writeRuntimeAuthState(this.runtimeAuthStateFile, current);
95
+ }
96
+
97
+ addProfile(profile: AuthProfile): void {
98
+ const data = this.load();
99
+ if (data.ttsKeys && !profile.tts?.keys) {
100
+ profile.tts = {
101
+ ...profile.tts,
102
+ keys: { ...data.ttsKeys },
103
+ };
104
+ delete data.ttsKeys;
105
+ }
106
+ data.profiles[profile.agentName] = profile;
107
+ data.activeProfile = profile.agentName;
108
+ this.save(data);
109
+ }
110
+
111
+ removeProfile(name: string): void {
112
+ const data = this.load();
113
+ delete data.profiles[name];
114
+ if (data.activeProfile === name) {
115
+ const remaining = Object.keys(data.profiles);
116
+ data.activeProfile = remaining[0] ?? '';
117
+ }
118
+ this.save(data);
119
+ const state = readRuntimeAuthState(this.runtimeAuthStateFile);
120
+ if (state.profiles[name]) {
121
+ delete state.profiles[name];
122
+ writeRuntimeAuthState(this.runtimeAuthStateFile, state);
123
+ }
124
+ }
125
+
126
+ switchProfile(name: string): void {
127
+ const data = this.load();
128
+ if (!data.profiles[name]) {
129
+ throw new Error(`Profile "${name}" not found. Available: ${Object.keys(data.profiles).join(', ') || 'none'}`);
130
+ }
131
+ data.activeProfile = name;
132
+ this.save(data);
133
+ }
134
+
135
+ listProfiles(): string[] {
136
+ return Object.keys(this.load().profiles);
137
+ }
138
+
139
+ getActive(): AuthProfile | null {
140
+ const data = this.load();
141
+ if (!data.activeProfile || !data.profiles[data.activeProfile]) return null;
142
+ const profile = data.profiles[data.activeProfile];
143
+ const gameServerUrl = this.getGameServerUrl(data.activeProfile);
144
+ return gameServerUrl ? { ...profile, gameServerUrl } : { ...profile };
145
+ }
146
+
147
+ updateGameServerUrl(url: string | undefined, name?: string): void {
148
+ const data = this.load();
149
+ const profileName = name ?? data.activeProfile;
150
+ const profile = data.profiles[profileName];
151
+ if (!profile) return;
152
+ const state = readRuntimeAuthState(this.runtimeAuthStateFile);
153
+ if (url) {
154
+ state.profiles[profileName] = { gameServerUrl: url, updatedAt: new Date().toISOString() };
155
+ } else {
156
+ delete state.profiles[profileName]?.gameServerUrl;
157
+ delete state.profiles[profileName]?.updatedAt;
158
+ if (state.profiles[profileName] && Object.keys(state.profiles[profileName]).length === 0) {
159
+ delete state.profiles[profileName];
160
+ }
161
+ }
162
+ writeRuntimeAuthState(this.runtimeAuthStateFile, state);
163
+ }
164
+
165
+ getGameServerUrl(profileName?: string): string | undefined {
166
+ const data = this.load();
167
+ const name = profileName ?? data.activeProfile;
168
+ if (!name) return undefined;
169
+ return readRuntimeAuthState(this.runtimeAuthStateFile).profiles[name]?.gameServerUrl;
170
+ }
171
+
172
+ setTtsKey(provider: string, key: string, profileName?: string): void {
173
+ const data = this.load();
174
+ const profile = this.getProfileForTts(data, profileName);
175
+ profile.tts = {
176
+ ...profile.tts,
177
+ keys: { ...profile.tts?.keys, [provider]: key },
178
+ };
179
+ delete data.neteaseTtsKey;
180
+ this.save(data);
181
+ }
182
+
183
+ getTtsKey(provider: string, profileName?: string): string | undefined {
184
+ const data = this.load();
185
+ return this.getProfileForTts(data, profileName).tts?.keys?.[provider];
186
+ }
187
+
188
+ setTtsDefaultVoice(voice: string, profileName?: string): void {
189
+ const data = this.load();
190
+ const profile = this.getProfileForTts(data, profileName);
191
+ profile.tts = { ...profile.tts, defaultVoice: voice };
192
+ this.save(data);
193
+ }
194
+
195
+ getTtsDefaultVoice(profileName?: string): string | undefined {
196
+ const data = this.load();
197
+ return this.getProfileForTts(data, profileName).tts?.defaultVoice;
198
+ }
199
+
200
+ getTtsConfig(profileName?: string): AuthTtsConfig | undefined {
201
+ const data = this.load();
202
+ return this.getProfileForTts(data, profileName).tts;
203
+ }
204
+
205
+ private getProfileForTts(data: AuthData, profileName?: string): AuthProfile {
206
+ const name = profileName ?? data.activeProfile;
207
+ const profile = name ? data.profiles[name] : undefined;
208
+ if (!profile) {
209
+ throw new Error('No active account. Run `clawclaw-cli account register` or `clawclaw-cli account switch <apiKey>` first.');
210
+ }
211
+ return profile;
212
+ }
213
+
214
+ /** @deprecated Use {@link setTtsKey} with `TTS_PROVIDER_LEIHUO`. */
215
+ setGlobalTtsKey(key: string): void {
216
+ this.setTtsKey(TTS_PROVIDER_LEIHUO, key);
217
+ }
218
+
219
+ /** @deprecated Use {@link getTtsKey} with `TTS_PROVIDER_LEIHUO`. */
220
+ getGlobalTtsKey(): string | undefined {
221
+ return this.getTtsKey(TTS_PROVIDER_LEIHUO);
222
+ }
223
+ }
@@ -1,37 +1,37 @@
1
- /**
2
- * command-meta — 给 commander Command 实例附加 adapter-facing 元数据。
3
- *
4
- * 用 WeakMap 而不是在 Command 上加属性,避免污染 commander 类型 + 自动 GC。
5
- * 此文件**不感知具体适配器**;它只是约定一组字段,由 adapter 决定如何用。
6
- *
7
- * 当前消费者:`src/commands/_schema.ts` 把 meta 写进输出,
8
- * `openclaw-clawclaw` 适配器读 meta 决定:
9
- * · requiresConfirm → 自动给工具加 `confirm:boolean` 必填参数
10
- * · longRunning + timeoutMs → 拉长 spawn timeout
11
- * · sensitive → 在工具 description 加 ⚠️ 警示
12
- */
13
-
14
- import type { Command } from 'commander';
15
-
16
- export interface CommandMeta {
17
- /** Adapter should add a mandatory `confirm: true` parameter before invocation. */
18
- requiresConfirm?: boolean;
19
- /** Adapter should expect this command to block; pair with `timeoutMs`. */
20
- longRunning?: boolean;
21
- /** Semantic flag: writes credentials / consumes quotas / etc. */
22
- sensitive?: boolean;
23
- /** Adapter should use this timeout (ms) for spawn instead of default. */
24
- timeoutMs?: number;
25
- }
26
-
27
- const META = new WeakMap<Command, CommandMeta>();
28
-
29
- export function setMeta(cmd: Command, meta: CommandMeta): Command {
30
- const existing = META.get(cmd) ?? {};
31
- META.set(cmd, { ...existing, ...meta });
32
- return cmd;
33
- }
34
-
35
- export function getMeta(cmd: Command): CommandMeta | undefined {
36
- return META.get(cmd);
37
- }
1
+ /**
2
+ * command-meta — 给 commander Command 实例附加 adapter-facing 元数据。
3
+ *
4
+ * 用 WeakMap 而不是在 Command 上加属性,避免污染 commander 类型 + 自动 GC。
5
+ * 此文件**不感知具体适配器**;它只是约定一组字段,由 adapter 决定如何用。
6
+ *
7
+ * 当前消费者:`src/commands/_schema.ts` 把 meta 写进输出,
8
+ * `openclaw-clawclaw` 适配器读 meta 决定:
9
+ * · requiresConfirm → 自动给工具加 `confirm:boolean` 必填参数
10
+ * · longRunning + timeoutMs → 拉长 spawn timeout
11
+ * · sensitive → 在工具 description 加 ⚠️ 警示
12
+ */
13
+
14
+ import type { Command } from 'commander';
15
+
16
+ export interface CommandMeta {
17
+ /** Adapter should add a mandatory `confirm: true` parameter before invocation. */
18
+ requiresConfirm?: boolean;
19
+ /** Adapter should expect this command to block; pair with `timeoutMs`. */
20
+ longRunning?: boolean;
21
+ /** Semantic flag: writes credentials / consumes quotas / etc. */
22
+ sensitive?: boolean;
23
+ /** Adapter should use this timeout (ms) for spawn instead of default. */
24
+ timeoutMs?: number;
25
+ }
26
+
27
+ const META = new WeakMap<Command, CommandMeta>();
28
+
29
+ export function setMeta(cmd: Command, meta: CommandMeta): Command {
30
+ const existing = META.get(cmd) ?? {};
31
+ META.set(cmd, { ...existing, ...meta });
32
+ return cmd;
33
+ }
34
+
35
+ export function getMeta(cmd: Command): CommandMeta | undefined {
36
+ return META.get(cmd);
37
+ }