@kaitranntt/ccs 8.7.0-dev.9 → 8.8.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.
- package/README.md +2 -1
- package/config/base-xai.settings.json +10 -0
- package/dist/api/services/index.d.ts +1 -1
- package/dist/api/services/index.d.ts.map +1 -1
- package/dist/api/services/index.js +2 -1
- package/dist/api/services/index.js.map +1 -1
- package/dist/api/services/profile-lifecycle-service.d.ts.map +1 -1
- package/dist/api/services/profile-lifecycle-service.js +22 -8
- package/dist/api/services/profile-lifecycle-service.js.map +1 -1
- package/dist/api/services/profile-writer.d.ts +3 -1
- package/dist/api/services/profile-writer.d.ts.map +1 -1
- package/dist/api/services/profile-writer.js +16 -4
- package/dist/api/services/profile-writer.js.map +1 -1
- package/dist/api/services/validation-service.d.ts +9 -1
- package/dist/api/services/validation-service.d.ts.map +1 -1
- package/dist/api/services/validation-service.js +21 -6
- package/dist/api/services/validation-service.js.map +1 -1
- package/dist/auth/account-context.d.ts.map +1 -1
- package/dist/auth/account-context.js +2 -3
- package/dist/auth/account-context.js.map +1 -1
- package/dist/auth/commands/create-command.d.ts.map +1 -1
- package/dist/auth/commands/create-command.js +10 -3
- package/dist/auth/commands/create-command.js.map +1 -1
- package/dist/auth/profile-detector.d.ts +4 -1
- package/dist/auth/profile-detector.d.ts.map +1 -1
- package/dist/auth/profile-detector.js +150 -44
- package/dist/auth/profile-detector.js.map +1 -1
- package/dist/cliproxy/accounts/types.d.ts.map +1 -1
- package/dist/cliproxy/accounts/types.js +1 -1
- package/dist/cliproxy/accounts/types.js.map +1 -1
- package/dist/cliproxy/auth/auth-types.d.ts +1 -0
- package/dist/cliproxy/auth/auth-types.d.ts.map +1 -1
- package/dist/cliproxy/auth/auth-types.js +8 -0
- package/dist/cliproxy/auth/auth-types.js.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.d.ts +7 -1
- package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.js +3 -2
- package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
- package/dist/cliproxy/auth/oauth-process.d.ts +5 -0
- package/dist/cliproxy/auth/oauth-process.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-process.js +27 -8
- package/dist/cliproxy/auth/oauth-process.js.map +1 -1
- package/dist/cliproxy/auth/provider-refreshers/index.d.ts +2 -2
- package/dist/cliproxy/auth/provider-refreshers/index.js +2 -2
- package/dist/cliproxy/config/generator.js +1 -1
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +67 -0
- package/dist/cliproxy/model-catalog.js.map +1 -1
- package/dist/cliproxy/provider-capabilities.d.ts +5 -0
- package/dist/cliproxy/provider-capabilities.d.ts.map +1 -1
- package/dist/cliproxy/provider-capabilities.js +44 -1
- package/dist/cliproxy/provider-capabilities.js.map +1 -1
- package/dist/cliproxy/services/catalog-cache.d.ts.map +1 -1
- package/dist/cliproxy/services/catalog-cache.js +6 -3
- package/dist/cliproxy/services/catalog-cache.js.map +1 -1
- package/dist/cliproxy/types/provider-types.d.ts +1 -1
- package/dist/cliproxy/types/provider-types.d.ts.map +1 -1
- package/dist/cliproxy/types/provider-types.js.map +1 -1
- package/dist/codex-auth/codex-profile-plugin-cache.d.ts +2 -0
- package/dist/codex-auth/codex-profile-plugin-cache.d.ts.map +1 -0
- package/dist/codex-auth/codex-profile-plugin-cache.js +204 -0
- package/dist/codex-auth/codex-profile-plugin-cache.js.map +1 -0
- package/dist/codex-auth/codex-profile-resources.d.ts.map +1 -1
- package/dist/codex-auth/codex-profile-resources.js +2 -0
- package/dist/codex-auth/codex-profile-resources.js.map +1 -1
- package/dist/commands/api-command/create-command.d.ts.map +1 -1
- package/dist/commands/api-command/create-command.js +16 -7
- package/dist/commands/api-command/create-command.js.map +1 -1
- package/dist/commands/cliproxy/variant-subcommand.d.ts +1 -0
- package/dist/commands/cliproxy/variant-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/variant-subcommand.js +15 -2
- package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
- package/dist/commands/command-catalog.d.ts +2 -0
- package/dist/commands/command-catalog.d.ts.map +1 -1
- package/dist/commands/command-catalog.js +7 -1
- package/dist/commands/command-catalog.js.map +1 -1
- package/dist/commands/completion-backend.d.ts.map +1 -1
- package/dist/commands/completion-backend.js +3 -1
- package/dist/commands/completion-backend.js.map +1 -1
- package/dist/config/loader/yaml-serializer.js +1 -1
- package/dist/config/loader/yaml-serializer.js.map +1 -1
- package/dist/config/reserved-names.d.ts +20 -1
- package/dist/config/reserved-names.d.ts.map +1 -1
- package/dist/config/reserved-names.js +26 -2
- package/dist/config/reserved-names.js.map +1 -1
- package/dist/dispatcher/pre-dispatch.d.ts.map +1 -1
- package/dist/dispatcher/pre-dispatch.js +3 -5
- package/dist/dispatcher/pre-dispatch.js.map +1 -1
- package/dist/ui/assets/{Trans-udTKDAiY.js → Trans-DTklOPAl.js} +1 -1
- package/dist/ui/assets/{accounts-DM0qGQmb.js → accounts-Cvmw1zaL.js} +1 -1
- package/dist/ui/assets/{alert-dialog-NSrT05Q2.js → alert-dialog-xN1Vxm4Q.js} +1 -1
- package/dist/ui/assets/{api-eMMnfsak.js → api-UjGDV1dn.js} +1 -1
- package/dist/ui/assets/{auth-section-BxSRH9zw.js → auth-section-exE9zovq.js} +1 -1
- package/dist/ui/assets/{backups-section-CWXr1_mw.js → backups-section-CANdqpNT.js} +1 -1
- package/dist/ui/assets/{channels-BBGb1vBB.js → channels-C8d6AgLN.js} +1 -1
- package/dist/ui/assets/{checkbox-B3K9bT5D.js → checkbox-B71vxZdD.js} +1 -1
- package/dist/ui/assets/{claude-extension-D9BCl9x-.js → claude-extension-COD7m8Iq.js} +1 -1
- package/dist/ui/assets/{cliproxy-CMqWk7m9.js → cliproxy-CXDOPGj3.js} +3 -3
- package/dist/ui/assets/{cliproxy-ai-providers-BXsW2OhA.js → cliproxy-ai-providers-C79GuQ92.js} +1 -1
- package/dist/ui/assets/{cliproxy-control-panel-DPQKQS-6.js → cliproxy-control-panel-B6_hOtz6.js} +1 -1
- package/dist/ui/assets/{codex-CxZKAvy2.js → codex-3mlgCMGk.js} +1 -1
- package/dist/ui/assets/{confirm-dialog-Bd7QQmh1.js → confirm-dialog-CHnCNFFP.js} +1 -1
- package/dist/ui/assets/{copilot-LGR9P5Tm.js → copilot-CfmS6yON.js} +1 -1
- package/dist/ui/assets/{cursor-pst9GU6_.js → cursor-tzPHgV8J.js} +1 -1
- package/dist/ui/assets/{droid-BOZUprl3.js → droid-Bc8LlbJa.js} +1 -1
- package/dist/ui/assets/{globalenv-section-DJ5UkjeK.js → globalenv-section-DTYeLBoB.js} +1 -1
- package/dist/ui/assets/{health-DUsZU-Ya.js → health-9Xyzeiyx.js} +1 -1
- package/dist/ui/assets/{index-5mv-MYj7.js → index-B0M7QB1o.js} +1 -1
- package/dist/ui/assets/{index-B-_IztpU.js → index-Bjg11-rW.js} +1 -1
- package/dist/ui/assets/{index-B_oqRqAI.js → index-Bz1gMXk1.js} +1 -1
- package/dist/ui/assets/{index-hoCKrABm.js → index-CEx6YJb5.js} +1 -1
- package/dist/ui/assets/{index-Cr5j2J4e.js → index-DoHAX6LH.js} +1 -1
- package/dist/ui/assets/{index-i73j7jKY.js → index-DuD3QaMG.js} +1 -1
- package/dist/ui/assets/{index-DXkMsg40.js → index-EnTQAKOi.js} +26 -26
- package/dist/ui/assets/{logs-DYd4j4Qq.js → logs-CrjUtfDp.js} +1 -1
- package/dist/ui/assets/{masked-input-BDvcDWuM.js → masked-input-BAtRbixr.js} +1 -1
- package/dist/ui/assets/providers/xai.svg +4 -0
- package/dist/ui/assets/{proxy-status-widget-B_PozEsq.js → proxy-status-widget-D87qCiqo.js} +1 -1
- package/dist/ui/assets/{raw-json-settings-editor-panel-3ZJcfAeS.js → raw-json-settings-editor-panel-CvJCywnk.js} +1 -1
- package/dist/ui/assets/{searchable-select-CTvbVJUs.js → searchable-select-Bn50_-2s.js} +1 -1
- package/dist/ui/assets/{separator-DBbORiOt.js → separator-DY36bzud.js} +1 -1
- package/dist/ui/assets/{shared-BDaNzpmF.js → shared-BynjOvKs.js} +1 -1
- package/dist/ui/assets/{table-C_CmIT9v.js → table-DdcK8yYq.js} +1 -1
- package/dist/ui/assets/{updates-Dc0B4lfE.js → updates-D27A1hQG.js} +1 -1
- package/dist/ui/assets/{use-accounts-BO-oKLTi.js → use-accounts-CRxt0j07.js} +1 -1
- package/dist/ui/index.html +1 -1
- package/dist/web-server/routes/bar-pool-account-quota-adapter.d.ts +23 -0
- package/dist/web-server/routes/bar-pool-account-quota-adapter.d.ts.map +1 -0
- package/dist/web-server/routes/bar-pool-account-quota-adapter.js +156 -0
- package/dist/web-server/routes/bar-pool-account-quota-adapter.js.map +1 -0
- package/dist/web-server/routes/bar-routes.js +5 -6
- package/dist/web-server/routes/bar-routes.js.map +1 -1
- package/dist/web-server/routes/profile-routes.js +3 -3
- package/dist/web-server/routes/profile-routes.js.map +1 -1
- package/package.json +1 -1
- package/scripts/run-test-bucket.js +1 -0
|
@@ -78,6 +78,8 @@ declare class ProfileDetector {
|
|
|
78
78
|
* Returns null if profile not found in unified config.
|
|
79
79
|
*/
|
|
80
80
|
private resolveFromUnifiedConfig;
|
|
81
|
+
private hasUnifiedConfiguredProfile;
|
|
82
|
+
private createConfiguredCollisionError;
|
|
81
83
|
/**
|
|
82
84
|
* Read settings-based config (config.json)
|
|
83
85
|
*/
|
|
@@ -91,11 +93,12 @@ declare class ProfileDetector {
|
|
|
91
93
|
*
|
|
92
94
|
* Priority order:
|
|
93
95
|
* 0. Hardcoded special runtime profiles (copilot, cursor)
|
|
94
|
-
* 0.5. Hardcoded CLIProxy profiles (
|
|
96
|
+
* 0.5. Hardcoded CLIProxy profiles (except grandfathered xai/grok collisions)
|
|
95
97
|
* 1. Unified config profiles (if config.yaml exists or CCS_UNIFIED_CONFIG=1)
|
|
96
98
|
* 2. User-defined CLIProxy variants (config.cliproxy section) [legacy]
|
|
97
99
|
* 3. Settings-based profiles (config.profiles section) [legacy]
|
|
98
100
|
* 4. Account-based profiles (profiles.json) [legacy]
|
|
101
|
+
* 5. Built-in xai/grok shortcut fallback when no configured profile exists
|
|
99
102
|
*/
|
|
100
103
|
detectProfileType(profileName: string | null | undefined): ProfileDetectionResult;
|
|
101
104
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-detector.d.ts","sourceRoot":"","sources":["../../src/auth/profile-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,EAAU,QAAQ,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EAEL,aAAa,EACb,YAAY,EAGZ,mBAAmB,EACpB,MAAM,gCAAgC,CAAC;AAGxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"profile-detector.d.ts","sourceRoot":"","sources":["../../src/auth/profile-detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,11 +39,44 @@ const path = __importStar(require("path"));
|
|
|
39
39
|
const helpers_1 = require("../utils/helpers");
|
|
40
40
|
const profile_compat_1 = require("../utils/profile-compat");
|
|
41
41
|
const provider_capabilities_1 = require("../cliproxy/provider-capabilities");
|
|
42
|
+
const reserved_names_1 = require("../config/reserved-names");
|
|
43
|
+
const error_types_1 = require("../errors/error-types");
|
|
42
44
|
const constants_1 = require("../cursor/constants");
|
|
43
45
|
const copilot_model_normalizer_1 = require("../copilot/copilot-model-normalizer");
|
|
44
46
|
const config_loader_facade_1 = require("../config/config-loader-facade");
|
|
45
47
|
/** CLIProxy profile names (OAuth-based, zero config) */
|
|
46
48
|
exports.CLIPROXY_PROFILES = provider_capabilities_1.CLIPROXY_PROVIDER_IDS;
|
|
49
|
+
function hasOwnEntry(value, key) {
|
|
50
|
+
return (typeof value === 'object' && value !== null && Object.prototype.hasOwnProperty.call(value, key));
|
|
51
|
+
}
|
|
52
|
+
function isObjectRecord(value) {
|
|
53
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
54
|
+
}
|
|
55
|
+
function isResolvableCompositeVariant(value) {
|
|
56
|
+
if (!isObjectRecord(value) || value.type !== 'composite') {
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
if (value.default_tier !== 'opus' &&
|
|
60
|
+
value.default_tier !== 'sonnet' &&
|
|
61
|
+
value.default_tier !== 'haiku') {
|
|
62
|
+
return false;
|
|
63
|
+
}
|
|
64
|
+
if (!isObjectRecord(value.tiers)) {
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
const tiers = value.tiers;
|
|
68
|
+
return ['opus', 'sonnet', 'haiku'].every((tierName) => {
|
|
69
|
+
const tier = tiers[tierName];
|
|
70
|
+
return (isObjectRecord(tier) &&
|
|
71
|
+
typeof tier.provider === 'string' &&
|
|
72
|
+
(0, provider_capabilities_1.isCLIProxyProvider)(tier.provider) &&
|
|
73
|
+
typeof tier.model === 'string' &&
|
|
74
|
+
tier.model.trim().length > 0);
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
function isResolvableAccountProfile(value) {
|
|
78
|
+
return (isObjectRecord(value) && typeof value.created === 'string' && value.created.trim().length > 0);
|
|
79
|
+
}
|
|
47
80
|
/**
|
|
48
81
|
* Profile Detector Class
|
|
49
82
|
*/
|
|
@@ -87,21 +120,19 @@ class ProfileDetector {
|
|
|
87
120
|
*/
|
|
88
121
|
resolveFromUnifiedConfig(profileName, config) {
|
|
89
122
|
// Check CLIProxy variants first
|
|
90
|
-
if (config.cliproxy?.variants
|
|
91
|
-
const variant = config.cliproxy
|
|
123
|
+
if (hasOwnEntry(config.cliproxy?.variants, profileName)) {
|
|
124
|
+
const variant = config.cliproxy?.variants?.[profileName];
|
|
125
|
+
if (!isObjectRecord(variant)) {
|
|
126
|
+
return null;
|
|
127
|
+
}
|
|
92
128
|
// Handle composite variants
|
|
93
129
|
if ('type' in variant && variant.type === 'composite') {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
if (!composite.tiers || !composite.default_tier) {
|
|
97
|
-
console.warn(`[!] Warning: Composite variant '${profileName}' has missing tiers or default_tier`);
|
|
130
|
+
if (!isResolvableCompositeVariant(variant)) {
|
|
131
|
+
console.warn(`[!] Warning: Composite variant '${profileName}' has invalid or incomplete tiers/default_tier`);
|
|
98
132
|
return null;
|
|
99
133
|
}
|
|
134
|
+
const composite = variant;
|
|
100
135
|
const defaultTierConfig = composite.tiers[composite.default_tier];
|
|
101
|
-
if (!defaultTierConfig) {
|
|
102
|
-
console.warn(`[!] Warning: Composite variant '${profileName}' missing config for default tier '${composite.default_tier}'`);
|
|
103
|
-
return null;
|
|
104
|
-
}
|
|
105
136
|
return {
|
|
106
137
|
type: 'cliproxy',
|
|
107
138
|
name: profileName,
|
|
@@ -115,6 +146,9 @@ class ProfileDetector {
|
|
|
115
146
|
};
|
|
116
147
|
}
|
|
117
148
|
const singleVariant = variant;
|
|
149
|
+
if (!(0, provider_capabilities_1.isCLIProxyProvider)(singleVariant.provider)) {
|
|
150
|
+
return null;
|
|
151
|
+
}
|
|
118
152
|
return {
|
|
119
153
|
type: 'cliproxy',
|
|
120
154
|
name: profileName,
|
|
@@ -126,10 +160,15 @@ class ProfileDetector {
|
|
|
126
160
|
}
|
|
127
161
|
// Check API profiles (supports compatibility aliases, e.g. km -> kimi)
|
|
128
162
|
for (const candidate of (0, profile_compat_1.getProfileLookupCandidates)(profileName)) {
|
|
129
|
-
if (!config.profiles
|
|
163
|
+
if (!hasOwnEntry(config.profiles, candidate)) {
|
|
130
164
|
continue;
|
|
131
165
|
}
|
|
132
166
|
const profile = config.profiles[candidate];
|
|
167
|
+
if (!isObjectRecord(profile) ||
|
|
168
|
+
typeof profile.settings !== 'string' ||
|
|
169
|
+
profile.settings.trim().length === 0) {
|
|
170
|
+
return null;
|
|
171
|
+
}
|
|
133
172
|
const settingsPath = profile.settings;
|
|
134
173
|
const settingsEnv = loadSettingsFromFile(settingsPath);
|
|
135
174
|
const viaLegacyAlias = (0, profile_compat_1.isLegacyProfileAlias)(profileName, candidate);
|
|
@@ -145,8 +184,11 @@ class ProfileDetector {
|
|
|
145
184
|
};
|
|
146
185
|
}
|
|
147
186
|
// Check accounts
|
|
148
|
-
if (config.accounts
|
|
187
|
+
if (hasOwnEntry(config.accounts, profileName)) {
|
|
149
188
|
const account = config.accounts[profileName];
|
|
189
|
+
if (!isResolvableAccountProfile(account)) {
|
|
190
|
+
return null;
|
|
191
|
+
}
|
|
150
192
|
return {
|
|
151
193
|
type: 'account',
|
|
152
194
|
name: profileName,
|
|
@@ -164,6 +206,14 @@ class ProfileDetector {
|
|
|
164
206
|
}
|
|
165
207
|
return null;
|
|
166
208
|
}
|
|
209
|
+
hasUnifiedConfiguredProfile(profileName, config) {
|
|
210
|
+
return (hasOwnEntry(config.cliproxy?.variants, profileName) ||
|
|
211
|
+
hasOwnEntry(config.profiles, profileName) ||
|
|
212
|
+
hasOwnEntry(config.accounts, profileName));
|
|
213
|
+
}
|
|
214
|
+
createConfiguredCollisionError(profileName, source) {
|
|
215
|
+
return new error_types_1.ConfigError(`Configured profile "${profileName}" in ${source} is invalid and cannot be resolved as a grandfathered profile.`);
|
|
216
|
+
}
|
|
167
217
|
/**
|
|
168
218
|
* Read settings-based config (config.json)
|
|
169
219
|
*/
|
|
@@ -201,11 +251,12 @@ class ProfileDetector {
|
|
|
201
251
|
*
|
|
202
252
|
* Priority order:
|
|
203
253
|
* 0. Hardcoded special runtime profiles (copilot, cursor)
|
|
204
|
-
* 0.5. Hardcoded CLIProxy profiles (
|
|
254
|
+
* 0.5. Hardcoded CLIProxy profiles (except grandfathered xai/grok collisions)
|
|
205
255
|
* 1. Unified config profiles (if config.yaml exists or CCS_UNIFIED_CONFIG=1)
|
|
206
256
|
* 2. User-defined CLIProxy variants (config.cliproxy section) [legacy]
|
|
207
257
|
* 3. Settings-based profiles (config.profiles section) [legacy]
|
|
208
258
|
* 4. Account-based profiles (profiles.json) [legacy]
|
|
259
|
+
* 5. Built-in xai/grok shortcut fallback when no configured profile exists
|
|
209
260
|
*/
|
|
210
261
|
detectProfileType(profileName) {
|
|
211
262
|
// Special case: 'default' means use default profile
|
|
@@ -261,11 +312,13 @@ class ProfileDetector {
|
|
|
261
312
|
};
|
|
262
313
|
}
|
|
263
314
|
// Priority 0.5: Check CLIProxy profiles (gemini, codex, agy, qwen, ...)
|
|
264
|
-
|
|
315
|
+
const builtinProvider = (0, provider_capabilities_1.resolveCLIProxyProviderShortcut)(profileName);
|
|
316
|
+
const shouldGrandfatherConfiguredProfile = builtinProvider === 'xai';
|
|
317
|
+
if (builtinProvider && !shouldGrandfatherConfiguredProfile) {
|
|
265
318
|
return {
|
|
266
319
|
type: 'cliproxy',
|
|
267
|
-
name:
|
|
268
|
-
provider:
|
|
320
|
+
name: builtinProvider,
|
|
321
|
+
provider: builtinProvider,
|
|
269
322
|
};
|
|
270
323
|
}
|
|
271
324
|
// Priority 1: Try unified config if available
|
|
@@ -274,34 +327,52 @@ class ProfileDetector {
|
|
|
274
327
|
const result = this.resolveFromUnifiedConfig(profileName, unifiedConfig);
|
|
275
328
|
if (result)
|
|
276
329
|
return result;
|
|
330
|
+
if ((0, reserved_names_1.isGrandfatheredReservedProfileName)(profileName) &&
|
|
331
|
+
this.hasUnifiedConfiguredProfile(profileName, unifiedConfig)) {
|
|
332
|
+
throw this.createConfiguredCollisionError(profileName, 'config.yaml');
|
|
333
|
+
}
|
|
277
334
|
// Fall through to legacy if not found in unified config
|
|
278
335
|
}
|
|
279
336
|
// Priority 2: Check user-defined CLIProxy variants (config.cliproxy section)
|
|
280
337
|
const config = this.readConfig();
|
|
281
338
|
const legacyTargetMap = config
|
|
282
339
|
.profile_targets;
|
|
283
|
-
if (config.cliproxy
|
|
284
|
-
const variant = config.cliproxy[profileName];
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
340
|
+
if (hasOwnEntry(config.cliproxy, profileName)) {
|
|
341
|
+
const variant = config.cliproxy?.[profileName];
|
|
342
|
+
if (!isObjectRecord(variant) || !(0, provider_capabilities_1.isCLIProxyProvider)(variant.provider)) {
|
|
343
|
+
if ((0, reserved_names_1.isGrandfatheredReservedProfileName)(profileName)) {
|
|
344
|
+
throw this.createConfiguredCollisionError(profileName, 'config.json');
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
else {
|
|
348
|
+
return {
|
|
349
|
+
type: 'cliproxy',
|
|
350
|
+
name: profileName,
|
|
351
|
+
target: variant.target,
|
|
352
|
+
provider: variant.provider,
|
|
353
|
+
settingsPath: variant.settings,
|
|
354
|
+
port: variant.port,
|
|
355
|
+
};
|
|
356
|
+
}
|
|
293
357
|
}
|
|
294
358
|
// Priority 3: Check settings-based profiles (glm, km) - LEGACY FALLBACK
|
|
295
359
|
if (config.profiles) {
|
|
296
360
|
for (const candidate of (0, profile_compat_1.getProfileLookupCandidates)(profileName)) {
|
|
297
|
-
if (!config.profiles
|
|
361
|
+
if (!hasOwnEntry(config.profiles, candidate)) {
|
|
362
|
+
continue;
|
|
363
|
+
}
|
|
364
|
+
const settingsPath = config.profiles[candidate];
|
|
365
|
+
if (typeof settingsPath !== 'string' || settingsPath.trim().length === 0) {
|
|
366
|
+
if (candidate === profileName && (0, reserved_names_1.isGrandfatheredReservedProfileName)(profileName)) {
|
|
367
|
+
throw this.createConfiguredCollisionError(profileName, 'config.json');
|
|
368
|
+
}
|
|
298
369
|
continue;
|
|
299
370
|
}
|
|
300
371
|
const viaLegacyAlias = (0, profile_compat_1.isLegacyProfileAlias)(profileName, candidate);
|
|
301
372
|
return {
|
|
302
373
|
type: 'settings',
|
|
303
374
|
name: profileName,
|
|
304
|
-
settingsPath
|
|
375
|
+
settingsPath,
|
|
305
376
|
target: legacyTargetMap?.[candidate],
|
|
306
377
|
message: viaLegacyAlias
|
|
307
378
|
? `Using legacy API profile "${candidate}" for "${profileName}".`
|
|
@@ -311,11 +382,28 @@ class ProfileDetector {
|
|
|
311
382
|
}
|
|
312
383
|
// Priority 4: Check account-based profiles (work, personal) - LEGACY FALLBACK
|
|
313
384
|
const profiles = this.readProfiles();
|
|
314
|
-
if (profiles.profiles
|
|
385
|
+
if (hasOwnEntry(profiles.profiles, profileName)) {
|
|
386
|
+
const profile = profiles.profiles[profileName];
|
|
387
|
+
if (!isResolvableAccountProfile(profile)) {
|
|
388
|
+
if ((0, reserved_names_1.isGrandfatheredReservedProfileName)(profileName)) {
|
|
389
|
+
throw this.createConfiguredCollisionError(profileName, 'profiles.json');
|
|
390
|
+
}
|
|
391
|
+
}
|
|
392
|
+
else {
|
|
393
|
+
return {
|
|
394
|
+
type: 'account',
|
|
395
|
+
name: profileName,
|
|
396
|
+
profile,
|
|
397
|
+
};
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
// xai and grok became reserved when the built-in xAI provider shipped. Existing
|
|
401
|
+
// configured profiles keep working, while new installs still get the shortcuts.
|
|
402
|
+
if (builtinProvider) {
|
|
315
403
|
return {
|
|
316
|
-
type: '
|
|
317
|
-
name:
|
|
318
|
-
|
|
404
|
+
type: 'cliproxy',
|
|
405
|
+
name: builtinProvider,
|
|
406
|
+
provider: builtinProvider,
|
|
319
407
|
};
|
|
320
408
|
}
|
|
321
409
|
// Not found - generate suggestions
|
|
@@ -343,22 +431,40 @@ class ProfileDetector {
|
|
|
343
431
|
const result = this.resolveFromUnifiedConfig(unifiedConfig.default, unifiedConfig);
|
|
344
432
|
if (result)
|
|
345
433
|
return result;
|
|
434
|
+
if ((0, reserved_names_1.isGrandfatheredReservedProfileName)(unifiedConfig.default) &&
|
|
435
|
+
this.hasUnifiedConfiguredProfile(unifiedConfig.default, unifiedConfig)) {
|
|
436
|
+
throw this.createConfiguredCollisionError(unifiedConfig.default, 'config.yaml');
|
|
437
|
+
}
|
|
346
438
|
}
|
|
347
439
|
// Check if account-based default exists (legacy)
|
|
348
440
|
const profiles = this.readProfiles();
|
|
349
|
-
if (unifiedConfig?.default && profiles.profiles
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
}
|
|
441
|
+
if (unifiedConfig?.default && hasOwnEntry(profiles.profiles, unifiedConfig.default)) {
|
|
442
|
+
const profile = profiles.profiles[unifiedConfig.default];
|
|
443
|
+
if ((0, reserved_names_1.isGrandfatheredReservedProfileName)(unifiedConfig.default) &&
|
|
444
|
+
!isResolvableAccountProfile(profile)) {
|
|
445
|
+
throw this.createConfiguredCollisionError(unifiedConfig.default, 'profiles.json');
|
|
446
|
+
}
|
|
447
|
+
if (profile) {
|
|
448
|
+
return {
|
|
449
|
+
type: 'account',
|
|
450
|
+
name: unifiedConfig.default,
|
|
451
|
+
profile,
|
|
452
|
+
};
|
|
453
|
+
}
|
|
355
454
|
}
|
|
356
|
-
if (profiles.default && profiles.profiles
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
}
|
|
455
|
+
if (profiles.default && hasOwnEntry(profiles.profiles, profiles.default)) {
|
|
456
|
+
const profile = profiles.profiles[profiles.default];
|
|
457
|
+
if ((0, reserved_names_1.isGrandfatheredReservedProfileName)(profiles.default) &&
|
|
458
|
+
!isResolvableAccountProfile(profile)) {
|
|
459
|
+
throw this.createConfiguredCollisionError(profiles.default, 'profiles.json');
|
|
460
|
+
}
|
|
461
|
+
if (profile) {
|
|
462
|
+
return {
|
|
463
|
+
type: 'account',
|
|
464
|
+
name: profiles.default,
|
|
465
|
+
profile,
|
|
466
|
+
};
|
|
467
|
+
}
|
|
362
468
|
}
|
|
363
469
|
// Check if settings-based default exists
|
|
364
470
|
const config = this.readConfig();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-detector.js","sourceRoot":"","sources":["../../src/auth/profile-detector.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"profile-detector.js","sourceRoot":"","sources":["../../src/auth/profile-detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/accounts/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEjD,4DAA4D;AAC5D,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,SAAS,CAAC;AAE/D;;;GAGG;AACH,eAAO,MAAM,uBAAuB,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/accounts/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEjD,4DAA4D;AAC5D,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,SAAS,CAAC;AAE/D;;;GAGG;AACH,eAAO,MAAM,uBAAuB,EAAE,gBAAgB,EAA4B,CAAC;AAEnF,0BAA0B;AAC1B,MAAM,WAAW,WAAW;IAC1B,gDAAgD;IAChD,EAAE,EAAE,MAAM,CAAC;IACX,8CAA8C;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oFAAoF;IACpF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,2DAA2D;IAC3D,SAAS,EAAE,OAAO,CAAC;IACnB,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,6BAA6B;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iDAAiD;IACjD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gCAAgC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;AAExD,yDAAyD;AACzD,MAAM,WAAW,gBAAgB;IAC/B,mCAAmC;IACnC,IAAI,EAAE,cAAc,CAAC;IACrB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,sCAAsC;AACtC,MAAM,WAAW,gBAAgB;IAC/B,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC;IAC7E,0EAA0E;IAC1E,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B;AAED,kCAAkC;AAClC,MAAM,WAAW,gBAAgB;IAC/B,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAChE;AAED,6CAA6C;AAC7C,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/C;AAED,uCAAuC;AACvC,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB"}
|
|
@@ -8,5 +8,5 @@ exports.PROVIDERS_WITHOUT_EMAIL = void 0;
|
|
|
8
8
|
* Providers that typically have empty email in OAuth token files.
|
|
9
9
|
* For these providers, nickname is used as accountId instead of email.
|
|
10
10
|
*/
|
|
11
|
-
exports.PROVIDERS_WITHOUT_EMAIL = ['kiro', 'ghcp'];
|
|
11
|
+
exports.PROVIDERS_WITHOUT_EMAIL = ['kiro', 'ghcp', 'xai'];
|
|
12
12
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/cliproxy/accounts/types.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAOH;;;GAGG;AACU,QAAA,uBAAuB,GAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/cliproxy/accounts/types.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAOH;;;GAGG;AACU,QAAA,uBAAuB,GAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC"}
|
|
@@ -52,6 +52,7 @@ export declare function toKiroManagementMethod(method: KiroAuthMethod): 'aws' |
|
|
|
52
52
|
* OAuth flow types per provider:
|
|
53
53
|
* - Gemini: Authorization Code Flow with local callback server on port 8085
|
|
54
54
|
* - Codex: Authorization Code Flow with local callback server on port 1455
|
|
55
|
+
* - xAI: Device Code Flow (polling-based, NO callback port needed)
|
|
55
56
|
* - Agy: Authorization Code Flow with local callback server on port 51121
|
|
56
57
|
* - iFlow: Authorization Code Flow with local callback server on port 11451
|
|
57
58
|
* - Claude: Authorization Code Flow with local callback server on port 54545 (Anthropic OAuth)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-types.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/auth/auth-types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAW/D;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,6DAA8D,CAAC;AAC7F,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhE,iEAAiE;AACjE,eAAO,MAAM,qBAAqB,mDAAoD,CAAC;AACvF,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvE,eAAO,MAAM,cAAc,iCAAkC,CAAC;AAC9D,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAC1D,eAAO,MAAM,qBAAqB,EAAE,WAAwB,CAAC;AAE7D,mEAAmE;AACnE,eAAO,MAAM,wBAAwB,EAAE,cAAsB,CAAC;AAE9D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,cAAc,CAEvE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,iBAAiB,CAE7E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,WAAW,CAEjE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,CAItE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAIhE;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,WAAW,CAAA;CAAE,GAClC,OAAO,CAQT;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,WAAW,CAAA;CAAE,GAClC,MAAM,GAAG,IAAI,CAEf;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAWpE;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,iBAAiB,EACzB,OAAO,CAAC,EAAE;IACR,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB,GACA,MAAM,EAAE,CAiBV;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAcjG;AAED
|
|
1
|
+
{"version":3,"file":"auth-types.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/auth/auth-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,6 +120,7 @@ exports.toKiroManagementMethod = toKiroManagementMethod;
|
|
|
120
120
|
* OAuth flow types per provider:
|
|
121
121
|
* - Gemini: Authorization Code Flow with local callback server on port 8085
|
|
122
122
|
* - Codex: Authorization Code Flow with local callback server on port 1455
|
|
123
|
+
* - xAI: Device Code Flow (polling-based, NO callback port needed)
|
|
123
124
|
* - Agy: Authorization Code Flow with local callback server on port 51121
|
|
124
125
|
* - iFlow: Authorization Code Flow with local callback server on port 11451
|
|
125
126
|
* - Claude: Authorization Code Flow with local callback server on port 54545 (Anthropic OAuth)
|
|
@@ -158,6 +159,13 @@ exports.OAUTH_CONFIGS = {
|
|
|
158
159
|
scopes: ['openid', 'profile'],
|
|
159
160
|
authFlag: '--codex-login',
|
|
160
161
|
},
|
|
162
|
+
xai: {
|
|
163
|
+
provider: 'xai',
|
|
164
|
+
displayName: 'xAI (Grok)',
|
|
165
|
+
authUrl: 'https://accounts.x.ai/oauth2/device',
|
|
166
|
+
scopes: ['openid', 'profile', 'email', 'offline_access', 'grok-cli:access', 'api:access'],
|
|
167
|
+
authFlag: '--xai-login',
|
|
168
|
+
},
|
|
161
169
|
agy: {
|
|
162
170
|
provider: 'agy',
|
|
163
171
|
displayName: 'Antigravity',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-types.js","sourceRoot":"","sources":["../../../src/cliproxy/auth/auth-types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth-types.js","sourceRoot":"","sources":["../../../src/cliproxy/auth/auth-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* OAuth Handler for CLIProxyAPI
|
|
3
3
|
*
|
|
4
|
-
* Manages OAuth authentication flow for CLIProxy providers
|
|
4
|
+
* Manages OAuth authentication flow for CLIProxy providers such as Gemini, Codex, xAI, and Kiro.
|
|
5
5
|
* CLIProxyAPI handles OAuth internally - we just need to:
|
|
6
6
|
* 1. Check if auth exists (token files in CCS auth directory)
|
|
7
7
|
* 2. Trigger OAuth flow by spawning binary with auth flag
|
|
@@ -74,6 +74,12 @@ export declare function normalizeGitLabBaseUrl(baseUrl: string | undefined): str
|
|
|
74
74
|
export declare function promptGitLabPersonalAccessToken(): Promise<string | null>;
|
|
75
75
|
export declare function findNewTokenSnapshotForManualAuth(provider: CLIProxyProvider, tokenDir: string, knownTokenFiles: ProviderTokenSnapshot[], expectedAccountId?: string): ProviderTokenSnapshot | null;
|
|
76
76
|
export declare function resolvePasteCallbackAuthUrl(target: ProxyTarget, startData: PasteCallbackStartData, timeoutMs: number, pollIntervalMs?: number): Promise<string | null>;
|
|
77
|
+
export declare function buildOAuthArgs(provider: CLIProxyProvider, configPath: string, headless: boolean, noIncognito: boolean, options?: {
|
|
78
|
+
kiroMethod?: OAuthOptions['kiroMethod'];
|
|
79
|
+
kiroIDCStartUrl?: string;
|
|
80
|
+
kiroIDCRegion?: string;
|
|
81
|
+
kiroIDCFlow?: OAuthOptions['kiroIDCFlow'];
|
|
82
|
+
}): string[];
|
|
77
83
|
export declare function usesKiroLocalCallbackReplay(method: OAuthOptions['kiroMethod'], idcFlow: OAuthOptions['kiroIDCFlow']): boolean;
|
|
78
84
|
export declare function handlePasteCallbackMode(provider: CLIProxyProvider, oauthConfig: ProviderOAuthConfig, verbose: boolean, tokenDir: string, nickname?: string, expectedAccountId?: string, options?: {
|
|
79
85
|
kiroMethod?: OAuthOptions['kiroMethod'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-handler.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/auth/oauth-handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth-handler.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/auth/oauth-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* OAuth Handler for CLIProxyAPI
|
|
4
4
|
*
|
|
5
|
-
* Manages OAuth authentication flow for CLIProxy providers
|
|
5
|
+
* Manages OAuth authentication flow for CLIProxy providers such as Gemini, Codex, xAI, and Kiro.
|
|
6
6
|
* CLIProxyAPI handles OAuth internally - we just need to:
|
|
7
7
|
* 1. Check if auth exists (token files in CCS auth directory)
|
|
8
8
|
* 2. Trigger OAuth flow by spawning binary with auth flag
|
|
@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
34
34
|
return result;
|
|
35
35
|
};
|
|
36
36
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
|
-
exports.ensureAuth = exports.triggerOAuth = exports.handlePasteCallbackMode = exports.usesKiroLocalCallbackReplay = exports.resolvePasteCallbackAuthUrl = exports.findNewTokenSnapshotForManualAuth = exports.promptGitLabPersonalAccessToken = exports.normalizeGitLabBaseUrl = exports.getCliAuthNicknameError = exports.requestPasteCallbackStart = exports.getGeminiAuthUrlCredentialError = exports.getGeminiPlusOAuthCredentialError = exports.getPlusAuthUrlCredentialError = exports.getPlusOAuthCredentialError = exports.PLUS_OAUTH_ENV_BY_PROVIDER = void 0;
|
|
37
|
+
exports.ensureAuth = exports.triggerOAuth = exports.handlePasteCallbackMode = exports.usesKiroLocalCallbackReplay = exports.buildOAuthArgs = exports.resolvePasteCallbackAuthUrl = exports.findNewTokenSnapshotForManualAuth = exports.promptGitLabPersonalAccessToken = exports.normalizeGitLabBaseUrl = exports.getCliAuthNicknameError = exports.requestPasteCallbackStart = exports.getGeminiAuthUrlCredentialError = exports.getGeminiPlusOAuthCredentialError = exports.getPlusAuthUrlCredentialError = exports.getPlusOAuthCredentialError = exports.PLUS_OAUTH_ENV_BY_PROVIDER = void 0;
|
|
38
38
|
const fs = __importStar(require("fs"));
|
|
39
39
|
const path = __importStar(require("path"));
|
|
40
40
|
const ui_1 = require("../../utils/ui");
|
|
@@ -463,6 +463,7 @@ function buildOAuthArgs(provider, configPath, headless, noIncognito, options = {
|
|
|
463
463
|
}
|
|
464
464
|
return args;
|
|
465
465
|
}
|
|
466
|
+
exports.buildOAuthArgs = buildOAuthArgs;
|
|
466
467
|
function usesKiroLocalCallbackReplay(method, idcFlow) {
|
|
467
468
|
const normalizedMethod = (0, auth_types_1.normalizeKiroAuthMethod)(method);
|
|
468
469
|
if (normalizedMethod === 'aws-authcode') {
|