@kaitranntt/ccs 7.63.0-dev.9 → 7.63.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (166) hide show
  1. package/README.md +3 -10
  2. package/dist/api/services/profile-lifecycle-service.js +4 -4
  3. package/dist/api/services/profile-lifecycle-service.js.map +1 -1
  4. package/dist/api/services/profile-writer.d.ts.map +1 -1
  5. package/dist/api/services/profile-writer.js +5 -3
  6. package/dist/api/services/profile-writer.js.map +1 -1
  7. package/dist/ccs.js +9 -21
  8. package/dist/ccs.js.map +1 -1
  9. package/dist/cliproxy/accounts/query.d.ts.map +1 -1
  10. package/dist/cliproxy/accounts/query.js +8 -15
  11. package/dist/cliproxy/accounts/query.js.map +1 -1
  12. package/dist/cliproxy/accounts/registry.d.ts +0 -6
  13. package/dist/cliproxy/accounts/registry.d.ts.map +1 -1
  14. package/dist/cliproxy/accounts/registry.js +42 -136
  15. package/dist/cliproxy/accounts/registry.js.map +1 -1
  16. package/dist/cliproxy/auth/token-manager.d.ts.map +1 -1
  17. package/dist/cliproxy/auth/token-manager.js +11 -45
  18. package/dist/cliproxy/auth/token-manager.js.map +1 -1
  19. package/dist/cliproxy/executor/index.d.ts.map +1 -1
  20. package/dist/cliproxy/executor/index.js +12 -25
  21. package/dist/cliproxy/executor/index.js.map +1 -1
  22. package/dist/cliproxy/quota-fetcher-codex.d.ts +3 -0
  23. package/dist/cliproxy/quota-fetcher-codex.d.ts.map +1 -1
  24. package/dist/cliproxy/quota-fetcher-codex.js +17 -46
  25. package/dist/cliproxy/quota-fetcher-codex.js.map +1 -1
  26. package/dist/cliproxy/services/variant-settings.d.ts.map +1 -1
  27. package/dist/cliproxy/services/variant-settings.js +6 -4
  28. package/dist/cliproxy/services/variant-settings.js.map +1 -1
  29. package/dist/cliproxy/stats-transformer.d.ts.map +1 -1
  30. package/dist/cliproxy/stats-transformer.js +3 -26
  31. package/dist/cliproxy/stats-transformer.js.map +1 -1
  32. package/dist/commands/cliproxy/quota-subcommand.d.ts.map +1 -1
  33. package/dist/commands/cliproxy/quota-subcommand.js +22 -25
  34. package/dist/commands/cliproxy/quota-subcommand.js.map +1 -1
  35. package/dist/commands/cliproxy/variant-subcommand.d.ts.map +1 -1
  36. package/dist/commands/cliproxy/variant-subcommand.js +6 -14
  37. package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
  38. package/dist/commands/install-command.d.ts.map +1 -1
  39. package/dist/commands/install-command.js +2 -8
  40. package/dist/commands/install-command.js.map +1 -1
  41. package/dist/copilot/copilot-executor.d.ts.map +1 -1
  42. package/dist/copilot/copilot-executor.js +2 -11
  43. package/dist/copilot/copilot-executor.js.map +1 -1
  44. package/dist/delegation/executor/result-aggregator.d.ts +1 -2
  45. package/dist/delegation/executor/result-aggregator.d.ts.map +1 -1
  46. package/dist/delegation/executor/result-aggregator.js +1 -21
  47. package/dist/delegation/executor/result-aggregator.js.map +1 -1
  48. package/dist/delegation/executor/types.d.ts +0 -6
  49. package/dist/delegation/executor/types.d.ts.map +1 -1
  50. package/dist/delegation/headless-executor.d.ts.map +1 -1
  51. package/dist/delegation/headless-executor.js +4 -69
  52. package/dist/delegation/headless-executor.js.map +1 -1
  53. package/dist/management/instance-manager.d.ts +1 -1
  54. package/dist/management/instance-manager.d.ts.map +1 -1
  55. package/dist/management/instance-manager.js +2 -10
  56. package/dist/management/instance-manager.js.map +1 -1
  57. package/dist/targets/codex-adapter.d.ts.map +1 -1
  58. package/dist/targets/codex-adapter.js +3 -78
  59. package/dist/targets/codex-adapter.js.map +1 -1
  60. package/dist/targets/codex-detector.d.ts.map +1 -1
  61. package/dist/targets/codex-detector.js +7 -28
  62. package/dist/targets/codex-detector.js.map +1 -1
  63. package/dist/ui/assets/{accounts-D0UZf0nz.js → accounts-DkxZnPJE.js} +1 -1
  64. package/dist/ui/assets/{alert-dialog-Da7R-FpD.js → alert-dialog-CiYMglgR.js} +1 -1
  65. package/dist/ui/assets/{api-DpKfrsn2.js → api-DaOtMRT4.js} +2 -2
  66. package/dist/ui/assets/{auth-section-CH2_H6xn.js → auth-section-BMaKBRA_.js} +1 -1
  67. package/dist/ui/assets/{backups-section-C0k3svHF.js → backups-section-DOpSADoH.js} +1 -1
  68. package/dist/ui/assets/{channels-Cpxagv1M.js → channels-zDFV-BlC.js} +1 -1
  69. package/dist/ui/assets/{checkbox-B_ZY6YZW.js → checkbox-Cb5AZBZL.js} +1 -1
  70. package/dist/ui/assets/{claude-extension-CSnMQC_L.js → claude-extension-B5RngGem.js} +1 -1
  71. package/dist/ui/assets/cliproxy-VYe0Qov1.js +3 -0
  72. package/dist/ui/assets/{cliproxy-ai-providers-DdQZEqoN.js → cliproxy-ai-providers-DVaaS-CT.js} +1 -1
  73. package/dist/ui/assets/cliproxy-control-panel-FVIQcFti.js +1 -0
  74. package/dist/ui/assets/{codex-xj_XJVjB.js → codex-D2yIwOs4.js} +13 -13
  75. package/dist/ui/assets/{confirm-dialog-tjayxZcM.js → confirm-dialog-B9vRgowr.js} +1 -1
  76. package/dist/ui/assets/{copilot-DQ5Dr5Ff.js → copilot-HvsOp6hu.js} +2 -2
  77. package/dist/ui/assets/{cursor-DtFjK37Z.js → cursor-C1XOjAWS.js} +1 -1
  78. package/dist/ui/assets/{droid-C4qduLWT.js → droid-DshEfT1H.js} +1 -1
  79. package/dist/ui/assets/{globalenv-section-B2YBzWoz.js → globalenv-section-CmcMkb6z.js} +1 -1
  80. package/dist/ui/assets/{health-ocBJ9xoH.js → health-CE0VQs6K.js} +1 -1
  81. package/dist/ui/assets/{icons-Cn04FDSc.js → icons-EMBHZkGo.js} +1 -1
  82. package/dist/ui/assets/index-6dNBcNC3.js +1 -0
  83. package/dist/ui/assets/index-BAuT6yuc.css +1 -0
  84. package/dist/ui/assets/{index-9Qv0NQVB.js → index-CesVGA6m.js} +1 -1
  85. package/dist/ui/assets/{index-1TKCj6WA.js → index-CmKclBR1.js} +1 -1
  86. package/dist/ui/assets/{index-C9UUemEw.js → index-CmtSgCxo.js} +1 -1
  87. package/dist/ui/assets/{index-B3D2Pi4S.js → index-DAtuJuGe.js} +35 -35
  88. package/dist/ui/assets/{masked-input-XGpOJSYQ.js → masked-input-B2tcbvAj.js} +1 -1
  89. package/dist/ui/assets/{proxy-status-widget-DwizqfDs.js → proxy-status-widget-BnJD49TF.js} +1 -1
  90. package/dist/ui/assets/{raw-json-settings-editor-panel-DLf0iq8r.js → raw-json-settings-editor-panel-DnUbq1__.js} +1 -1
  91. package/dist/ui/assets/{searchable-select-C2N5ZoC7.js → searchable-select-ULayr5K1.js} +1 -1
  92. package/dist/ui/assets/{separator-CuY8SIhQ.js → separator--ZH5ZM-3.js} +1 -1
  93. package/dist/ui/assets/shared-qizFb9Ye.js +8 -0
  94. package/dist/ui/assets/{switch-Dz4ptkeA.js → switch-DmDIWykO.js} +1 -1
  95. package/dist/ui/assets/{table-CkgTbRUO.js → table-E5IxHhrW.js} +1 -1
  96. package/dist/ui/assets/tanstack-B8i0evp-.js +4 -0
  97. package/dist/ui/assets/updates-2Uu4Mgtg.js +1 -0
  98. package/dist/ui/index.html +4 -4
  99. package/dist/utils/claude-config-path.d.ts +0 -2
  100. package/dist/utils/claude-config-path.d.ts.map +1 -1
  101. package/dist/utils/claude-config-path.js +1 -6
  102. package/dist/utils/claude-config-path.js.map +1 -1
  103. package/dist/utils/websearch/hook-env.d.ts.map +1 -1
  104. package/dist/utils/websearch/hook-env.js +0 -8
  105. package/dist/utils/websearch/hook-env.js.map +1 -1
  106. package/dist/utils/websearch/hook-installer.d.ts +2 -3
  107. package/dist/utils/websearch/hook-installer.d.ts.map +1 -1
  108. package/dist/utils/websearch/hook-installer.js +2 -3
  109. package/dist/utils/websearch/hook-installer.js.map +1 -1
  110. package/dist/utils/websearch/index.d.ts +0 -3
  111. package/dist/utils/websearch/index.d.ts.map +1 -1
  112. package/dist/utils/websearch/index.js +2 -23
  113. package/dist/utils/websearch/index.js.map +1 -1
  114. package/dist/utils/websearch/profile-hook-injector.d.ts +3 -5
  115. package/dist/utils/websearch/profile-hook-injector.d.ts.map +1 -1
  116. package/dist/utils/websearch/profile-hook-injector.js +3 -5
  117. package/dist/utils/websearch/profile-hook-injector.js.map +1 -1
  118. package/dist/utils/websearch/status.d.ts.map +1 -1
  119. package/dist/utils/websearch/status.js +1 -67
  120. package/dist/utils/websearch/status.js.map +1 -1
  121. package/dist/utils/websearch-manager.d.ts +11 -11
  122. package/dist/utils/websearch-manager.d.ts.map +1 -1
  123. package/dist/utils/websearch-manager.js +17 -32
  124. package/dist/utils/websearch-manager.js.map +1 -1
  125. package/dist/web-server/index.d.ts.map +1 -1
  126. package/dist/web-server/index.js +0 -3
  127. package/dist/web-server/index.js.map +1 -1
  128. package/dist/web-server/routes/account-routes.d.ts.map +1 -1
  129. package/dist/web-server/routes/account-routes.js +1 -2
  130. package/dist/web-server/routes/account-routes.js.map +1 -1
  131. package/dist/web-server/routes/cliproxy-auth-routes.d.ts.map +1 -1
  132. package/dist/web-server/routes/cliproxy-auth-routes.js +1 -1
  133. package/dist/web-server/routes/cliproxy-auth-routes.js.map +1 -1
  134. package/dist/web-server/services/codex-dashboard-service.d.ts.map +1 -1
  135. package/dist/web-server/services/codex-dashboard-service.js +8 -13
  136. package/dist/web-server/services/codex-dashboard-service.js.map +1 -1
  137. package/lib/hooks/websearch-transformer.cjs +96 -660
  138. package/package.json +1 -2
  139. package/dist/cliproxy/accounts/email-account-identity.d.ts +0 -12
  140. package/dist/cliproxy/accounts/email-account-identity.d.ts.map +0 -1
  141. package/dist/cliproxy/accounts/email-account-identity.js +0 -124
  142. package/dist/cliproxy/accounts/email-account-identity.js.map +0 -1
  143. package/dist/ui/assets/cliproxy-D9B-TLY3.js +0 -3
  144. package/dist/ui/assets/cliproxy-control-panel-3Glps_oU.js +0 -1
  145. package/dist/ui/assets/index-BkXZkwWB.js +0 -1
  146. package/dist/ui/assets/index-DGQOg_8Q.css +0 -1
  147. package/dist/ui/assets/shared-CbpV9mUS.js +0 -8
  148. package/dist/ui/assets/tanstack-CkjseTWE.js +0 -4
  149. package/dist/ui/assets/updates-HsQEuJIR.js +0 -1
  150. package/dist/utils/websearch/claude-tool-args.d.ts +0 -5
  151. package/dist/utils/websearch/claude-tool-args.d.ts.map +0 -1
  152. package/dist/utils/websearch/claude-tool-args.js +0 -125
  153. package/dist/utils/websearch/claude-tool-args.js.map +0 -1
  154. package/dist/utils/websearch/mcp-installer.d.ts +0 -14
  155. package/dist/utils/websearch/mcp-installer.d.ts.map +0 -1
  156. package/dist/utils/websearch/mcp-installer.js +0 -351
  157. package/dist/utils/websearch/mcp-installer.js.map +0 -1
  158. package/dist/utils/websearch/trace.d.ts +0 -23
  159. package/dist/utils/websearch/trace.d.ts.map +0 -1
  160. package/dist/utils/websearch/trace.js +0 -206
  161. package/dist/utils/websearch/trace.js.map +0 -1
  162. package/dist/web-server/routes/cliproxy-local-proxy.d.ts +0 -20
  163. package/dist/web-server/routes/cliproxy-local-proxy.d.ts.map +0 -1
  164. package/dist/web-server/routes/cliproxy-local-proxy.js +0 -117
  165. package/dist/web-server/routes/cliproxy-local-proxy.js.map +0 -1
  166. package/lib/mcp/ccs-websearch-server.cjs +0 -339
@@ -27,7 +27,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
27
27
  return result;
28
28
  };
29
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
- exports.discoverExistingAccounts = exports.setAccountTier = exports.touchAccount = exports.renameAccount = exports.removeAccount = exports.resumeAccount = exports.pauseAccount = exports.setDefaultAccount = exports.registerAccount = exports.hydrateRegistryFromTokenFiles = exports.syncRegistryWithTokenFiles = exports.saveAccountsRegistry = exports.loadAccountsRegistry = void 0;
30
+ exports.discoverExistingAccounts = exports.setAccountTier = exports.touchAccount = exports.renameAccount = exports.removeAccount = exports.resumeAccount = exports.pauseAccount = exports.setDefaultAccount = exports.registerAccount = exports.syncRegistryWithTokenFiles = exports.saveAccountsRegistry = exports.loadAccountsRegistry = void 0;
31
31
  const fs = __importStar(require("fs"));
32
32
  const path = __importStar(require("path"));
33
33
  const lockfile = __importStar(require("proper-lockfile"));
@@ -35,7 +35,6 @@ const auth_types_1 = require("../auth/auth-types");
35
35
  const config_generator_1 = require("../config-generator");
36
36
  const types_1 = require("./types");
37
37
  const token_file_ops_1 = require("./token-file-ops");
38
- const email_account_identity_1 = require("./email-account-identity");
39
38
  /** Default registry structure */
40
39
  function createDefaultRegistry() {
41
40
  return {
@@ -90,11 +89,7 @@ function getRegistryPopulationIssueReason(error) {
90
89
  }
91
90
  return 'unreadable token file';
92
91
  }
93
- function buildProviderEmailCountKey(provider, email) {
94
- return `${provider}:${email.trim().toLowerCase()}`;
95
- }
96
- function readRecoverableTokenFiles(options = {}) {
97
- const tokens = [];
92
+ function populateRegistryFromTokenFiles(registry, options = {}) {
98
93
  const issues = [];
99
94
  for (const token of (0, token_file_ops_1.listRecoverableTokenFiles)(options)) {
100
95
  try {
@@ -112,21 +107,48 @@ function readRecoverableTokenFiles(options = {}) {
112
107
  if (!provider) {
113
108
  continue;
114
109
  }
115
- const email = typeof data.email === 'string' && data.email.trim()
116
- ? data.email.trim()
117
- : inferEmailFromTokenFileName(token.tokenFile, provider);
110
+ const providerAccounts = ensureProviderRegistry(registry, provider);
118
111
  const projectId = typeof data.project_id === 'string' && data.project_id.trim()
119
112
  ? data.project_id.trim()
120
113
  : null;
121
- tokens.push({
122
- tokenFile: token.tokenFile,
123
- filePath: token.filePath,
124
- paused: token.paused,
125
- provider,
114
+ const email = typeof data.email === 'string' && data.email.trim()
115
+ ? data.email.trim()
116
+ : inferEmailFromTokenFileName(token.tokenFile, provider);
117
+ const existingEntry = Object.entries(providerAccounts.accounts).find(([, account]) => account.tokenFile === token.tokenFile);
118
+ if (existingEntry) {
119
+ existingEntry[1].paused = token.paused || undefined;
120
+ if (!token.paused) {
121
+ existingEntry[1].pausedAt = undefined;
122
+ }
123
+ if (provider === 'agy' && projectId) {
124
+ existingEntry[1].projectId = projectId;
125
+ }
126
+ continue;
127
+ }
128
+ const accountId = types_1.PROVIDERS_WITHOUT_EMAIL.includes(provider) && !email
129
+ ? (0, token_file_ops_1.deriveNoEmailProviderAccountId)(provider, token.tokenFile, providerAccounts.accounts)
130
+ : (0, token_file_ops_1.extractAccountIdFromTokenFile)(token.tokenFile, email);
131
+ if (providerAccounts.accounts[accountId]) {
132
+ continue;
133
+ }
134
+ if (Object.keys(providerAccounts.accounts).length === 0) {
135
+ providerAccounts.default = accountId;
136
+ }
137
+ const stats = fs.statSync(token.filePath);
138
+ const accountMeta = {
126
139
  email,
127
- projectId,
128
- stats: fs.statSync(token.filePath),
129
- });
140
+ nickname: email ? (0, token_file_ops_1.generateNickname)(email) : accountId,
141
+ tokenFile: token.tokenFile,
142
+ createdAt: stats.birthtime?.toISOString() || new Date().toISOString(),
143
+ lastUsedAt: (stats.mtime || stats.birthtime || new Date()).toISOString(),
144
+ };
145
+ if (token.paused) {
146
+ accountMeta.paused = true;
147
+ }
148
+ if (provider === 'agy' && projectId) {
149
+ accountMeta.projectId = projectId;
150
+ }
151
+ providerAccounts.accounts[accountId] = accountMeta;
130
152
  }
131
153
  catch (error) {
132
154
  issues.push({
@@ -134,76 +156,8 @@ function readRecoverableTokenFiles(options = {}) {
134
156
  paused: token.paused,
135
157
  reason: getRegistryPopulationIssueReason(error),
136
158
  });
137
- }
138
- }
139
- return { tokens, issues };
140
- }
141
- function buildDuplicateEmailCounts(tokens) {
142
- const counts = new Map();
143
- for (const token of tokens) {
144
- if (!token.email) {
145
159
  continue;
146
160
  }
147
- const key = buildProviderEmailCountKey(token.provider, token.email);
148
- counts.set(key, (counts.get(key) ?? 0) + 1);
149
- }
150
- return counts;
151
- }
152
- function populateRegistryFromTokenFiles(registry, options = {}) {
153
- const { tokens, issues } = readRecoverableTokenFiles(options);
154
- const duplicateEmailCounts = buildDuplicateEmailCounts(tokens);
155
- for (const token of tokens) {
156
- const providerAccounts = ensureProviderRegistry(registry, token.provider);
157
- const existingEntry = Object.entries(providerAccounts.accounts).find(([, account]) => account.tokenFile === token.tokenFile);
158
- const existingAccountId = existingEntry?.[0];
159
- const existingAccount = existingEntry?.[1];
160
- const resolvedEmail = token.email ?? existingAccount?.email;
161
- const duplicateEmailCount = resolvedEmail
162
- ? (duplicateEmailCounts.get(buildProviderEmailCountKey(token.provider, resolvedEmail)) ?? 1)
163
- : 1;
164
- const desiredAccountId = types_1.PROVIDERS_WITHOUT_EMAIL.includes(token.provider) && !resolvedEmail
165
- ? (0, token_file_ops_1.deriveNoEmailProviderAccountId)(token.provider, token.tokenFile, providerAccounts.accounts)
166
- : !token.email && existingAccountId
167
- ? existingAccountId
168
- : (0, email_account_identity_1.buildEmailBackedAccountId)(token.provider, token.tokenFile, resolvedEmail, duplicateEmailCount);
169
- if (existingEntry && existingEntry[0] !== desiredAccountId) {
170
- if (!providerAccounts.accounts[desiredAccountId]) {
171
- providerAccounts.accounts[desiredAccountId] = existingEntry[1];
172
- }
173
- if (providerAccounts.default === existingEntry[0]) {
174
- providerAccounts.default = desiredAccountId;
175
- }
176
- delete providerAccounts.accounts[existingEntry[0]];
177
- }
178
- if (Object.keys(providerAccounts.accounts).length === 0) {
179
- providerAccounts.default = desiredAccountId;
180
- }
181
- const hydratedAccount = providerAccounts.accounts[desiredAccountId];
182
- const accountMeta = {
183
- email: resolvedEmail,
184
- nickname: hydratedAccount?.nickname ||
185
- (resolvedEmail
186
- ? (0, email_account_identity_1.buildEmailBackedNickname)(token.provider, token.tokenFile, resolvedEmail, duplicateEmailCount)
187
- : desiredAccountId),
188
- tokenFile: token.tokenFile,
189
- createdAt: hydratedAccount?.createdAt ||
190
- token.stats.birthtime?.toISOString() ||
191
- new Date().toISOString(),
192
- lastUsedAt: hydratedAccount?.lastUsedAt ||
193
- (token.stats.mtime || token.stats.birthtime || new Date()).toISOString(),
194
- };
195
- if (token.paused) {
196
- accountMeta.paused = true;
197
- accountMeta.pausedAt = hydratedAccount?.pausedAt || new Date().toISOString();
198
- }
199
- else {
200
- accountMeta.paused = undefined;
201
- accountMeta.pausedAt = undefined;
202
- }
203
- if (token.provider === 'agy') {
204
- accountMeta.projectId = token.projectId || hydratedAccount?.projectId;
205
- }
206
- providerAccounts.accounts[desiredAccountId] = accountMeta;
207
161
  }
208
162
  return issues;
209
163
  }
@@ -364,17 +318,6 @@ function syncRegistryWithTokenFiles(registry) {
364
318
  return modified;
365
319
  }
366
320
  exports.syncRegistryWithTokenFiles = syncRegistryWithTokenFiles;
367
- /**
368
- * Build an in-memory view that includes both stale-entry cleanup and any token
369
- * files not yet persisted into accounts.json. Used by read paths so duplicate
370
- * email accounts stay visible without forcing a disk write.
371
- */
372
- function hydrateRegistryFromTokenFiles(registry) {
373
- const removedStaleEntries = syncRegistryWithTokenFiles(registry);
374
- const populationIssues = populateRegistryFromTokenFiles(registry);
375
- return removedStaleEntries || populationIssues.length > 0;
376
- }
377
- exports.hydrateRegistryFromTokenFiles = hydrateRegistryFromTokenFiles;
378
321
  /**
379
322
  * Register a new account
380
323
  * Called after successful OAuth to record the account
@@ -425,45 +368,8 @@ function registerAccount(provider, tokenFile, email, nickname, projectId) {
425
368
  nickname || existingAccount?.nickname || (email ? (0, token_file_ops_1.generateNickname)(email) : accountId);
426
369
  }
427
370
  else {
428
- const sameEmailEntries = email
429
- ? Object.entries(providerAccounts.accounts).filter(([, account]) => account.email?.toLowerCase() === email.toLowerCase())
430
- : [];
431
- const duplicateEmailCount = email
432
- ? new Set([...sameEmailEntries.map(([, account]) => account.tokenFile), tokenFile]).size
433
- : 1;
434
- if (email && duplicateEmailCount > 1) {
435
- for (const [existingId, existingMeta] of sameEmailEntries) {
436
- const migratedId = (0, email_account_identity_1.buildEmailBackedAccountId)(provider, existingMeta.tokenFile, email, duplicateEmailCount);
437
- if (migratedId === existingId || providerAccounts.accounts[migratedId]) {
438
- continue;
439
- }
440
- providerAccounts.accounts[migratedId] = existingMeta;
441
- if (providerAccounts.default === existingId) {
442
- providerAccounts.default = migratedId;
443
- }
444
- delete providerAccounts.accounts[existingId];
445
- }
446
- }
447
- accountId = (0, email_account_identity_1.buildEmailBackedAccountId)(provider, tokenFile, email, duplicateEmailCount);
448
- const existingAccount = providerAccounts.accounts[accountId];
449
- if (nickname) {
450
- const validationError = (0, token_file_ops_1.validateNickname)(nickname);
451
- if (validationError) {
452
- throw new Error(validationError);
453
- }
454
- const existingAccounts = Object.entries(providerAccounts.accounts).map(([id, account]) => ({
455
- id,
456
- nickname: account.nickname,
457
- }));
458
- if ((0, token_file_ops_1.hasAccountNameConflict)(existingAccounts, nickname, accountId)) {
459
- throw new Error(`An account with nickname "${nickname}" already exists for ${provider}. ` +
460
- `Choose a different nickname.`);
461
- }
462
- }
463
- accountNickname =
464
- nickname ||
465
- existingAccount?.nickname ||
466
- (0, email_account_identity_1.buildEmailBackedNickname)(provider, tokenFile, email, duplicateEmailCount);
371
+ accountId = (0, token_file_ops_1.extractAccountIdFromTokenFile)(tokenFile, email);
372
+ accountNickname = nickname || (0, token_file_ops_1.generateNickname)(email);
467
373
  }
468
374
  const isFirstAccount = Object.keys(providerAccounts.accounts).length === 0;
469
375
  const existingAccount = providerAccounts.accounts[accountId];
@@ -1 +1 @@
1
- {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/cliproxy/accounts/registry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/cliproxy/accounts/registry.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"token-manager.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/auth/token-manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAM5C,OAAO,EACL,UAAU,EAIX,MAAM,cAAc,CAAC;AAEtB;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAEtE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAU5F;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkCnE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,UAAU,CAoDpE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,EAAE,CAG/C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkC7D;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,UAAQ,EACf,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,oBAAoB,EAAE,WAAW,GAAG,IAAI,CAmIjD;AA0CD;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAkBxC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,UAAQ,GACd,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CASjE"}
1
+ {"version":3,"file":"token-manager.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/auth/token-manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAK5C,OAAO,EACL,UAAU,EAIX,MAAM,cAAc,CAAC;AAEtB;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAEtE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAU5F;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkCnE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,UAAU,CAoDpE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,EAAE,CAG/C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkC7D;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,UAAQ,EACf,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,oBAAoB,EAAE,WAAW,GAAG,IAAI,CA4FjD;AA0CD;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAkBxC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,UAAQ,GACd,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CASjE"}
@@ -36,7 +36,6 @@ const profile_detector_1 = require("../../auth/profile-detector");
36
36
  const config_generator_1 = require("../config-generator");
37
37
  const account_manager_1 = require("../account-manager");
38
38
  const token_file_ops_1 = require("../accounts/token-file-ops");
39
- const email_account_identity_1 = require("../accounts/email-account-identity");
40
39
  const auth_types_1 = require("./auth-types");
41
40
  /**
42
41
  * Get token directory for provider
@@ -207,65 +206,32 @@ function registerAccountFromToken(provider, tokenDir, nickname, verbose = false,
207
206
  const files = fs.readdirSync(tokenDir);
208
207
  const jsonFiles = files.filter((f) => f.endsWith('.json'));
209
208
  const existingAccounts = (0, account_manager_1.getProviderAccounts)(provider);
210
- const rawCandidates = jsonFiles.flatMap((file) => {
209
+ const candidates = jsonFiles
210
+ .map((file) => {
211
211
  const filePath = path.join(tokenDir, file);
212
212
  if (!isTokenFileForProvider(filePath, provider))
213
- return [];
213
+ return null;
214
214
  const content = fs.readFileSync(filePath, 'utf-8');
215
215
  const data = JSON.parse(content);
216
216
  const email = data.email || undefined;
217
217
  const projectId = data.project_id || undefined;
218
+ const accountId = (0, token_file_ops_1.extractAccountIdFromTokenFile)(file, email);
218
219
  const stats = fs.statSync(filePath);
219
- return [
220
- {
221
- file,
222
- filePath,
223
- email,
224
- projectId,
225
- mtimeMs: stats.mtimeMs,
226
- alreadyRegistered: existingAccounts.some((account) => account.tokenFile === file),
227
- },
228
- ];
229
- });
230
- const duplicateEmailCounts = new Map();
231
- const duplicateEmailTokenSets = new Map();
232
- for (const account of existingAccounts) {
233
- if (!account.email)
234
- continue;
235
- const key = account.email.toLowerCase();
236
- const tokenSet = duplicateEmailTokenSets.get(key) ?? new Set();
237
- tokenSet.add(account.tokenFile);
238
- duplicateEmailTokenSets.set(key, tokenSet);
239
- }
240
- for (const candidate of rawCandidates) {
241
- if (!candidate.email)
242
- continue;
243
- const key = candidate.email.toLowerCase();
244
- const tokenSet = duplicateEmailTokenSets.get(key) ?? new Set();
245
- tokenSet.add(candidate.file);
246
- duplicateEmailTokenSets.set(key, tokenSet);
247
- }
248
- for (const [key, tokenSet] of duplicateEmailTokenSets) {
249
- duplicateEmailCounts.set(key, tokenSet.size);
250
- }
251
- const candidates = rawCandidates
252
- .map((rawCandidate) => {
253
- const duplicateEmailCount = rawCandidate.email
254
- ? (duplicateEmailCounts.get(rawCandidate.email.toLowerCase()) ?? 1)
255
- : 1;
256
- const accountId = rawCandidate.email
257
- ? (0, email_account_identity_1.buildEmailBackedAccountId)(provider, rawCandidate.file, rawCandidate.email, duplicateEmailCount)
258
- : (0, token_file_ops_1.extractAccountIdFromTokenFile)(rawCandidate.file, rawCandidate.email);
259
220
  return {
260
- ...rawCandidate,
221
+ file,
222
+ filePath,
223
+ email,
224
+ projectId,
261
225
  accountId,
226
+ mtimeMs: stats.mtimeMs,
227
+ alreadyRegistered: existingAccounts.some((account) => account.tokenFile === file),
262
228
  };
263
229
  })
230
+ .filter((candidate) => candidate !== null)
264
231
  .sort((a, b) => b.mtimeMs - a.mtimeMs);
265
232
  if (expectedAccountId) {
266
233
  selectedCandidate =
267
234
  candidates.find((candidate) => candidate.accountId === expectedAccountId) ||
268
- candidates.find((candidate) => candidate.file === expectedAccountId) ||
269
235
  candidates.find((candidate) => {
270
236
  const existingAccount = existingAccounts.find((account) => account.id === expectedAccountId);
271
237
  return !!existingAccount && existingAccount.tokenFile === candidate.file;
@@ -1 +1 @@
1
- {"version":3,"file":"token-manager.js","sourceRoot":"","sources":["../../../src/cliproxy/auth/token-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"token-manager.js","sourceRoot":"","sources":["../../../src/cliproxy/auth/token-manager.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAqBH,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EAAE,MAAM,UAAU,CAAC;AAyElG;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAO,CAAC,cAAc,CAAM,GACnC,OAAO,CAAC,IAAI,CAAC,CAq8Bf;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,eAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAqBH,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EAAE,MAAM,UAAU,CAAC;AAuElG;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAO,CAAC,cAAc,CAAM,GACnC,OAAO,CAAC,IAAI,CAAC,CAy7Bf;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,eAAe,sBAAsB,CAAC"}
@@ -56,7 +56,6 @@ const model_catalog_1 = require("../model-catalog");
56
56
  const codex_reasoning_proxy_1 = require("../codex-reasoning-proxy");
57
57
  const tool_sanitization_proxy_1 = require("../tool-sanitization-proxy");
58
58
  const account_manager_1 = require("../account-manager");
59
- const email_account_identity_1 = require("../accounts/email-account-identity");
60
59
  const websearch_manager_1 = require("../../utils/websearch-manager");
61
60
  const unified_config_loader_1 = require("../../config/unified-config-loader");
62
61
  const hooks_1 = require("../../utils/hooks");
@@ -159,8 +158,9 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
159
158
  if (proxyConfig.mode === 'remote') {
160
159
  log(`Remote host: ${proxyConfig.host}:${proxyConfig.port} (${proxyConfig.protocol})`);
161
160
  }
162
- // Setup first-class CCS WebSearch runtime
163
- (0, websearch_manager_1.ensureWebSearchMcpOrThrow)();
161
+ // Setup WebSearch hooks
162
+ (0, websearch_manager_1.ensureMcpWebSearch)();
163
+ (0, websearch_manager_1.installWebSearchHook)();
164
164
  (0, websearch_manager_1.displayWebSearchStatus)();
165
165
  // Sync image analyzer hook from npm package to ~/.ccs/hooks/
166
166
  (0, hooks_1.installImageAnalyzerHook)();
@@ -344,7 +344,7 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
344
344
  for (const acct of accounts) {
345
345
  const defaultMark = acct.isDefault ? ' (default)' : '';
346
346
  const nickname = acct.nickname ? `[${acct.nickname}]` : '';
347
- console.log(` ${nickname.padEnd(12)} ${(0, email_account_identity_1.formatAccountDisplayName)(acct)}${defaultMark}`);
347
+ console.log(` ${nickname.padEnd(12)} ${acct.email || acct.id}${defaultMark}`);
348
348
  }
349
349
  console.log(`\n Use "ccs ${provider} --use <nickname-or-id>" to switch accounts`);
350
350
  }
@@ -359,19 +359,14 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
359
359
  if (accounts.length > 0) {
360
360
  console.error(` Available accounts:`);
361
361
  for (const acct of accounts) {
362
- const displayName = (0, email_account_identity_1.formatAccountDisplayName)(acct);
363
- const label = acct.nickname ? `${acct.nickname} (${displayName})` : displayName;
364
- console.error(` - ${label}`);
362
+ console.error(` - ${acct.nickname || acct.id} (${acct.email || 'no email'})`);
365
363
  }
366
364
  }
367
365
  process.exit(1);
368
366
  }
369
367
  (0, account_manager_1.setDefaultAccount)(provider, account.id);
370
368
  (0, account_manager_1.touchAccount)(provider, account.id);
371
- const switchedLabel = account.nickname
372
- ? `${account.nickname} (${(0, email_account_identity_1.formatAccountDisplayName)(account)})`
373
- : (0, email_account_identity_1.formatAccountDisplayName)(account);
374
- console.log((0, ui_1.ok)(`Switched to account: ${switchedLabel}`));
369
+ console.log((0, ui_1.ok)(`Switched to account: ${account.nickname || account.email || account.id}`));
375
370
  }
376
371
  // Handle --nickname (rename account)
377
372
  if (setNickname && !addAccount) {
@@ -894,30 +889,22 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
894
889
  ? cfg.customSettingsPath.replace(/^~/, os.homedir())
895
890
  : (0, config_generator_1.getProviderSettingsPath)(provider);
896
891
  let claude;
897
- const launchArgs = ['--settings', settingsPath, ...(0, websearch_manager_1.appendThirdPartyWebSearchToolArgs)(claudeArgs)];
898
- const traceEnv = (0, websearch_manager_1.createWebSearchTraceContext)({
899
- launcher: 'cliproxy.executor',
900
- args: launchArgs,
901
- profile: cfg.profileName || provider,
902
- profileType: 'cliproxy',
903
- settingsPath,
904
- claudeConfigDir: inheritedClaudeConfigDir,
905
- });
906
- const tracedEnv = { ...env, ...traceEnv };
907
892
  if (needsShell) {
908
- const cmdString = [claudeCli, ...launchArgs].map(shell_executor_1.escapeShellArg).join(' ');
893
+ const cmdString = [claudeCli, '--settings', settingsPath, ...claudeArgs]
894
+ .map(shell_executor_1.escapeShellArg)
895
+ .join(' ');
909
896
  claude = (0, child_process_1.spawn)(cmdString, {
910
897
  stdio: 'inherit',
911
898
  windowsHide: true,
912
899
  shell: true,
913
- env: tracedEnv,
900
+ env,
914
901
  });
915
902
  }
916
903
  else {
917
- claude = (0, child_process_1.spawn)(claudeCli, launchArgs, {
904
+ claude = (0, child_process_1.spawn)(claudeCli, ['--settings', settingsPath, ...claudeArgs], {
918
905
  stdio: 'inherit',
919
906
  windowsHide: true,
920
- env: tracedEnv,
907
+ env,
921
908
  });
922
909
  }
923
910
  // 12b. Start runtime quota monitor (adaptive polling during session)