@prestyj/cli 4.3.200 → 4.3.205

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 (115) hide show
  1. package/dist/cli.js +31 -26
  2. package/dist/cli.js.map +1 -1
  3. package/dist/config.d.ts.map +1 -1
  4. package/dist/config.js +3 -2
  5. package/dist/config.js.map +1 -1
  6. package/dist/core/agent-session.d.ts +1 -0
  7. package/dist/core/agent-session.d.ts.map +1 -1
  8. package/dist/core/agent-session.js +6 -3
  9. package/dist/core/agent-session.js.map +1 -1
  10. package/dist/core/auth-storage.d.ts.map +1 -1
  11. package/dist/core/auth-storage.js +9 -1
  12. package/dist/core/auth-storage.js.map +1 -1
  13. package/dist/core/compaction/compactor.d.ts +1 -0
  14. package/dist/core/compaction/compactor.d.ts.map +1 -1
  15. package/dist/core/compaction/compactor.js +1 -0
  16. package/dist/core/compaction/compactor.js.map +1 -1
  17. package/dist/core/model-registry.d.ts +1 -0
  18. package/dist/core/model-registry.d.ts.map +1 -1
  19. package/dist/core/model-registry.js +26 -0
  20. package/dist/core/model-registry.js.map +1 -1
  21. package/dist/core/model-registry.test.js +14 -1
  22. package/dist/core/model-registry.test.js.map +1 -1
  23. package/dist/core/oauth/gemini.d.ts +4 -0
  24. package/dist/core/oauth/gemini.d.ts.map +1 -0
  25. package/dist/core/oauth/gemini.js +377 -0
  26. package/dist/core/oauth/gemini.js.map +1 -0
  27. package/dist/core/oauth/gemini.test.d.ts +2 -0
  28. package/dist/core/oauth/gemini.test.d.ts.map +1 -0
  29. package/dist/core/oauth/gemini.test.js +154 -0
  30. package/dist/core/oauth/gemini.test.js.map +1 -0
  31. package/dist/core/oauth/openai.d.ts.map +1 -1
  32. package/dist/core/oauth/openai.js +7 -5
  33. package/dist/core/oauth/openai.js.map +1 -1
  34. package/dist/core/oauth/types.d.ts +1 -0
  35. package/dist/core/oauth/types.d.ts.map +1 -1
  36. package/dist/core/prompt-commands.d.ts.map +1 -1
  37. package/dist/core/prompt-commands.js +73 -0
  38. package/dist/core/prompt-commands.js.map +1 -1
  39. package/dist/core/prompt-commands.test.js +14 -0
  40. package/dist/core/prompt-commands.test.js.map +1 -1
  41. package/dist/core/repomap.js +3 -1
  42. package/dist/core/repomap.js.map +1 -1
  43. package/dist/core/repomap.test.js +18 -0
  44. package/dist/core/repomap.test.js.map +1 -1
  45. package/dist/core/settings-manager.d.ts +1 -0
  46. package/dist/core/settings-manager.d.ts.map +1 -1
  47. package/dist/core/settings-manager.js +11 -1
  48. package/dist/core/settings-manager.js.map +1 -1
  49. package/dist/core/slash-commands.js +1 -1
  50. package/dist/core/slash-commands.js.map +1 -1
  51. package/dist/index.d.ts +1 -1
  52. package/dist/index.d.ts.map +1 -1
  53. package/dist/index.js +1 -1
  54. package/dist/index.js.map +1 -1
  55. package/dist/interactive.d.ts.map +1 -1
  56. package/dist/interactive.js +2 -0
  57. package/dist/interactive.js.map +1 -1
  58. package/dist/system-prompt.d.ts.map +1 -1
  59. package/dist/system-prompt.js +5 -3
  60. package/dist/system-prompt.js.map +1 -1
  61. package/dist/system-prompt.test.js +7 -5
  62. package/dist/system-prompt.test.js.map +1 -1
  63. package/dist/tools/enter-plan.d.ts.map +1 -1
  64. package/dist/tools/enter-plan.js +1 -0
  65. package/dist/tools/enter-plan.js.map +1 -1
  66. package/dist/tools/find.d.ts.map +1 -1
  67. package/dist/tools/find.js +2 -0
  68. package/dist/tools/find.js.map +1 -1
  69. package/dist/tools/grep.d.ts.map +1 -1
  70. package/dist/tools/grep.js +2 -0
  71. package/dist/tools/grep.js.map +1 -1
  72. package/dist/tools/index.d.ts +1 -0
  73. package/dist/tools/index.d.ts.map +1 -1
  74. package/dist/tools/index.js +3 -0
  75. package/dist/tools/index.js.map +1 -1
  76. package/dist/tools/prompt-hints.d.ts.map +1 -1
  77. package/dist/tools/prompt-hints.js +6 -2
  78. package/dist/tools/prompt-hints.js.map +1 -1
  79. package/dist/tools/source-path.d.ts +9 -0
  80. package/dist/tools/source-path.d.ts.map +1 -0
  81. package/dist/tools/source-path.js +120 -0
  82. package/dist/tools/source-path.js.map +1 -0
  83. package/dist/tools/source-path.test.d.ts +2 -0
  84. package/dist/tools/source-path.test.d.ts.map +1 -0
  85. package/dist/tools/source-path.test.js +80 -0
  86. package/dist/tools/source-path.test.js.map +1 -0
  87. package/dist/tools/subagent.js +16 -0
  88. package/dist/tools/subagent.js.map +1 -1
  89. package/dist/ui/App.d.ts +2 -0
  90. package/dist/ui/App.d.ts.map +1 -1
  91. package/dist/ui/App.js +17 -12
  92. package/dist/ui/App.js.map +1 -1
  93. package/dist/ui/activity-phrases.d.ts.map +1 -1
  94. package/dist/ui/activity-phrases.js +7 -3
  95. package/dist/ui/activity-phrases.js.map +1 -1
  96. package/dist/ui/components/ModelSelector.d.ts.map +1 -1
  97. package/dist/ui/components/ModelSelector.js +1 -0
  98. package/dist/ui/components/ModelSelector.js.map +1 -1
  99. package/dist/ui/components/ToolExecution.js +69 -1
  100. package/dist/ui/components/ToolExecution.js.map +1 -1
  101. package/dist/ui/hooks/useAgentLoop.d.ts +2 -0
  102. package/dist/ui/hooks/useAgentLoop.d.ts.map +1 -1
  103. package/dist/ui/hooks/useAgentLoop.js +3 -0
  104. package/dist/ui/hooks/useAgentLoop.js.map +1 -1
  105. package/dist/ui/login.d.ts.map +1 -1
  106. package/dist/ui/login.js +1 -0
  107. package/dist/ui/login.js.map +1 -1
  108. package/dist/ui/pixel.js +1 -1
  109. package/dist/ui/render.d.ts +2 -0
  110. package/dist/ui/render.d.ts.map +1 -1
  111. package/dist/ui/render.js +1 -0
  112. package/dist/ui/render.js.map +1 -1
  113. package/dist/utils/format.js +44 -0
  114. package/dist/utils/format.js.map +1 -1
  115. package/package.json +6 -5
@@ -0,0 +1,377 @@
1
+ import http from "node:http";
2
+ import crypto from "node:crypto";
3
+ import { generatePKCE } from "./pkce.js";
4
+ const CLIENT_ID_ENV = "EZCODER_GEMINI_OAUTH_CLIENT_ID";
5
+ const CLIENT_SECRET_ENV = "EZCODER_GEMINI_OAUTH_CLIENT_SECRET";
6
+ const LEGACY_CLIENT_ID_ENV = "GGCODER_GEMINI_OAUTH_CLIENT_ID";
7
+ const LEGACY_CLIENT_SECRET_ENV = "GGCODER_GEMINI_OAUTH_CLIENT_SECRET";
8
+ const AUTHORIZE_URL = "https://accounts.google.com/o/oauth2/v2/auth";
9
+ const TOKEN_URL = "https://oauth2.googleapis.com/token";
10
+ const CODE_ASSIST_BASE_URL = "https://cloudcode-pa.googleapis.com";
11
+ const CODE_ASSIST_API_VERSION = "v1internal";
12
+ const CODE_ASSIST_POST_RETRIES = 3;
13
+ const CODE_ASSIST_POST_RETRY_DELAY_MS = 100;
14
+ const SCOPE = [
15
+ "https://www.googleapis.com/auth/cloud-platform",
16
+ "https://www.googleapis.com/auth/userinfo.email",
17
+ "https://www.googleapis.com/auth/userinfo.profile",
18
+ ].join(" ");
19
+ const USER_TIER_FREE = "free-tier";
20
+ const USER_TIER_LEGACY = "legacy-tier";
21
+ const USER_TIER_STANDARD = "standard-tier";
22
+ const VALIDATION_REQUIRED_REASON = "VALIDATION_REQUIRED";
23
+ const VPC_SC_REASON = "SECURITY_POLICY_VIOLATED";
24
+ class CodeAssistHttpError extends Error {
25
+ status;
26
+ body;
27
+ constructor(label, status, body) {
28
+ super(`Gemini Code Assist ${label} failed (${status}): ${body}`);
29
+ this.name = "CodeAssistHttpError";
30
+ this.status = status;
31
+ this.body = body;
32
+ }
33
+ }
34
+ export async function loginGemini(callbacks) {
35
+ const { clientId, clientSecret } = getGeminiOAuthClientCredentials();
36
+ const { verifier, challenge } = await generatePKCE();
37
+ const state = crypto.randomBytes(32).toString("hex");
38
+ const redirectUri = await getLoopbackRedirectUri();
39
+ const url = new URL(AUTHORIZE_URL);
40
+ url.searchParams.set("response_type", "code");
41
+ url.searchParams.set("client_id", clientId);
42
+ url.searchParams.set("redirect_uri", redirectUri);
43
+ url.searchParams.set("scope", SCOPE);
44
+ url.searchParams.set("access_type", "offline");
45
+ url.searchParams.set("prompt", "consent");
46
+ url.searchParams.set("code_challenge", challenge);
47
+ url.searchParams.set("code_challenge_method", "S256");
48
+ url.searchParams.set("state", state);
49
+ let code;
50
+ try {
51
+ code = await loginWithServer(url.toString(), redirectUri, state, callbacks);
52
+ }
53
+ catch {
54
+ callbacks.onOpenUrl(url.toString());
55
+ const raw = await callbacks.onPromptCode("Could not start local server. Paste the callback URL or code from the browser:");
56
+ const parsed = parseAuthorizationInput(raw);
57
+ if (!parsed.code) {
58
+ throw new Error("No authorization code found in input.");
59
+ }
60
+ if (parsed.state && parsed.state !== state) {
61
+ throw new Error("Invalid state. Please try again.");
62
+ }
63
+ code = parsed.code;
64
+ }
65
+ const creds = await exchangeGeminiCode(code, verifier, redirectUri, clientId, clientSecret);
66
+ callbacks.onStatus("Setting up Gemini Code Assist access...");
67
+ const projectId = await setupCodeAssistProject(creds.accessToken, callbacks);
68
+ return {
69
+ ...creds,
70
+ projectId,
71
+ };
72
+ }
73
+ export async function refreshGeminiToken(refreshToken) {
74
+ const { clientId, clientSecret } = getGeminiOAuthClientCredentials();
75
+ const data = await postTokenRequest({
76
+ grant_type: "refresh_token",
77
+ refresh_token: refreshToken,
78
+ client_id: clientId,
79
+ client_secret: clientSecret,
80
+ });
81
+ return {
82
+ accessToken: data.access_token,
83
+ refreshToken: data.refresh_token ?? refreshToken,
84
+ expiresAt: Date.now() + data.expires_in * 1000 - 5 * 60 * 1000,
85
+ };
86
+ }
87
+ function getGeminiOAuthClientCredentials() {
88
+ const clientId = process.env[CLIENT_ID_ENV]?.trim() ?? process.env[LEGACY_CLIENT_ID_ENV]?.trim();
89
+ const clientSecret = process.env[CLIENT_SECRET_ENV]?.trim() ?? process.env[LEGACY_CLIENT_SECRET_ENV]?.trim();
90
+ if (!clientId || !clientSecret) {
91
+ throw new Error(`Gemini OAuth requires ${CLIENT_ID_ENV} and ${CLIENT_SECRET_ENV} to be set.`);
92
+ }
93
+ return { clientId, clientSecret };
94
+ }
95
+ async function getLoopbackRedirectUri() {
96
+ return new Promise((resolve, reject) => {
97
+ const server = http.createServer();
98
+ server.listen(0, "127.0.0.1", () => {
99
+ const addr = server.address();
100
+ server.close(() => {
101
+ if (addr && typeof addr === "object") {
102
+ resolve(`http://127.0.0.1:${addr.port}/oauth2callback`);
103
+ }
104
+ else {
105
+ reject(new Error("Failed to allocate OAuth callback port."));
106
+ }
107
+ });
108
+ });
109
+ server.on("error", reject);
110
+ });
111
+ }
112
+ function parseAuthorizationInput(input) {
113
+ const value = input.trim();
114
+ if (!value)
115
+ return {};
116
+ try {
117
+ const url = new URL(value);
118
+ return {
119
+ code: url.searchParams.get("code") ?? undefined,
120
+ state: url.searchParams.get("state") ?? undefined,
121
+ };
122
+ }
123
+ catch {
124
+ // not a URL
125
+ }
126
+ if (value.includes("code=")) {
127
+ const params = new URLSearchParams(value);
128
+ return {
129
+ code: params.get("code") ?? undefined,
130
+ state: params.get("state") ?? undefined,
131
+ };
132
+ }
133
+ return { code: value };
134
+ }
135
+ async function loginWithServer(authUrl, redirectUri, expectedState, callbacks) {
136
+ const redirect = new URL(redirectUri);
137
+ const port = Number(redirect.port);
138
+ return new Promise((resolve, reject) => {
139
+ let receivedCode = null;
140
+ const server = http.createServer((req, res) => {
141
+ const url = new URL(req.url || "", redirect.origin);
142
+ if (url.pathname !== redirect.pathname) {
143
+ res.statusCode = 404;
144
+ res.end("Not found");
145
+ return;
146
+ }
147
+ if (url.searchParams.get("state") !== expectedState) {
148
+ res.statusCode = 400;
149
+ res.end("State mismatch");
150
+ return;
151
+ }
152
+ receivedCode = url.searchParams.get("code");
153
+ res.writeHead(200, { "Content-Type": "text/html", Connection: "close" });
154
+ res.end("<html><body><h1>Login successful!</h1><p>You can close this tab.</p></body></html>");
155
+ server.close();
156
+ });
157
+ server.on("error", (err) => reject(err));
158
+ server.listen(port, "127.0.0.1", () => {
159
+ callbacks.onOpenUrl(authUrl);
160
+ callbacks.onStatus("Waiting for browser callback...");
161
+ });
162
+ const timeout = setTimeout(() => {
163
+ if (!receivedCode)
164
+ server.close();
165
+ }, 120_000);
166
+ timeout.unref();
167
+ server.on("close", () => {
168
+ clearTimeout(timeout);
169
+ if (receivedCode) {
170
+ resolve(receivedCode);
171
+ }
172
+ else {
173
+ reject(new Error("Server closed without receiving code."));
174
+ }
175
+ });
176
+ });
177
+ }
178
+ async function exchangeGeminiCode(code, verifier, redirectUri, clientId, clientSecret) {
179
+ const data = await postTokenRequest({
180
+ grant_type: "authorization_code",
181
+ client_id: clientId,
182
+ client_secret: clientSecret,
183
+ code,
184
+ redirect_uri: redirectUri,
185
+ code_verifier: verifier,
186
+ });
187
+ if (!data.refresh_token) {
188
+ throw new Error("Gemini OAuth did not return a refresh token. Please try login again.");
189
+ }
190
+ return {
191
+ accessToken: data.access_token,
192
+ refreshToken: data.refresh_token,
193
+ expiresAt: Date.now() + data.expires_in * 1000 - 5 * 60 * 1000,
194
+ };
195
+ }
196
+ async function postTokenRequest(body) {
197
+ const response = await fetch(TOKEN_URL, {
198
+ method: "POST",
199
+ headers: { "Content-Type": "application/x-www-form-urlencoded" },
200
+ body: new URLSearchParams(body),
201
+ });
202
+ if (!response.ok) {
203
+ const text = await response.text();
204
+ throw new Error(`Gemini token request failed (${response.status}): ${text}`);
205
+ }
206
+ return (await response.json());
207
+ }
208
+ async function setupCodeAssistProject(accessToken, callbacks) {
209
+ const envProject = process.env.GOOGLE_CLOUD_PROJECT ?? process.env.GOOGLE_CLOUD_PROJECT_ID;
210
+ if (envProject && /^\d+$/.test(envProject)) {
211
+ throw new Error("GOOGLE_CLOUD_PROJECT must be a project ID, not a numeric project number.");
212
+ }
213
+ const coreMetadata = {
214
+ ideType: "IDE_UNSPECIFIED",
215
+ platform: "PLATFORM_UNSPECIFIED",
216
+ pluginType: "GEMINI",
217
+ };
218
+ const projectMetadata = {
219
+ ...coreMetadata,
220
+ ...(envProject ? { duetProject: envProject } : {}),
221
+ };
222
+ let loadRes;
223
+ while (true) {
224
+ loadRes = await loadCodeAssist(accessToken, envProject, projectMetadata);
225
+ const validation = getValidationRequiredTier(loadRes);
226
+ if (!validation)
227
+ break;
228
+ callbacks.onStatus(`Gemini Code Assist requires account validation${validation.reasonMessage ? `: ${validation.reasonMessage}` : ""}`);
229
+ callbacks.onOpenUrl(validation.validationUrl);
230
+ const answer = await callbacks.onPromptCode("Complete validation in the browser, then press Enter to retry (or type cancel):");
231
+ if (answer.trim().toLowerCase() === "cancel") {
232
+ throw new Error("Gemini Code Assist account validation was cancelled.");
233
+ }
234
+ }
235
+ if (loadRes.currentTier) {
236
+ const project = loadRes.cloudaicompanionProject ?? envProject;
237
+ if (!project)
238
+ throwProjectError(loadRes);
239
+ return project;
240
+ }
241
+ const tier = getOnboardTier(loadRes);
242
+ const onboardReq = tier.id === USER_TIER_FREE
243
+ ? {
244
+ tierId: tier.id,
245
+ cloudaicompanionProject: undefined,
246
+ metadata: coreMetadata,
247
+ }
248
+ : {
249
+ tierId: tier.id,
250
+ cloudaicompanionProject: envProject,
251
+ metadata: projectMetadata,
252
+ };
253
+ let operation = await codeAssistPost(accessToken, "onboardUser", onboardReq);
254
+ while (!operation.done && operation.name) {
255
+ await new Promise((resolve) => setTimeout(resolve, 5_000));
256
+ operation = await codeAssistGet(accessToken, operation.name);
257
+ }
258
+ const project = operation.response?.cloudaicompanionProject?.id ?? envProject;
259
+ if (!project)
260
+ throwProjectError(loadRes);
261
+ return project;
262
+ }
263
+ async function loadCodeAssist(accessToken, envProject, metadata) {
264
+ try {
265
+ return await codeAssistPost(accessToken, "loadCodeAssist", {
266
+ ...(envProject ? { cloudaicompanionProject: envProject } : {}),
267
+ metadata,
268
+ });
269
+ }
270
+ catch (err) {
271
+ if (err instanceof CodeAssistHttpError && isVpcScAffectedError(err)) {
272
+ return { currentTier: { id: USER_TIER_STANDARD } };
273
+ }
274
+ if (err instanceof CodeAssistHttpError &&
275
+ err.status === 403 &&
276
+ envProject === "cloudshell-gca") {
277
+ throw new Error("Access to the default Cloud Shell Gemini project was denied.\n" +
278
+ "Please set your own Google Cloud project by running:\n" +
279
+ "gcloud config set project [PROJECT_ID]\n" +
280
+ "or setting export GOOGLE_CLOUD_PROJECT=...", { cause: err });
281
+ }
282
+ throw err;
283
+ }
284
+ }
285
+ function getValidationRequiredTier(response) {
286
+ return response.ineligibleTiers?.find((tier) => tier.reasonCode === VALIDATION_REQUIRED_REASON && typeof tier.validationUrl === "string");
287
+ }
288
+ function getOnboardTier(response) {
289
+ const defaultTier = response.allowedTiers?.find((tier) => tier.isDefault);
290
+ return defaultTier ?? { id: USER_TIER_LEGACY, name: "" };
291
+ }
292
+ function throwProjectError(response) {
293
+ const reasons = response.ineligibleTiers
294
+ ?.map((tier) => tier.reasonMessage ?? tier.tierName)
295
+ .filter((reason) => Boolean(reason));
296
+ if (reasons && reasons.length > 0) {
297
+ throw new Error(`Gemini Code Assist setup failed: ${reasons.join(", ")}`);
298
+ }
299
+ throw new Error("Gemini requires a Google Cloud project for this account. Set GOOGLE_CLOUD_PROJECT and try again.");
300
+ }
301
+ async function codeAssistPost(accessToken, method, body) {
302
+ let lastError;
303
+ for (let attempt = 0; attempt <= CODE_ASSIST_POST_RETRIES; attempt++) {
304
+ try {
305
+ return await codeAssistRequest(getCodeAssistMethodUrl(method), accessToken, method, {
306
+ method: "POST",
307
+ body: JSON.stringify(body),
308
+ });
309
+ }
310
+ catch (err) {
311
+ if (!(err instanceof CodeAssistHttpError) ||
312
+ attempt === CODE_ASSIST_POST_RETRIES ||
313
+ !shouldRetryCodeAssistStatus(err.status)) {
314
+ throw err;
315
+ }
316
+ lastError = err;
317
+ }
318
+ await new Promise((resolve) => setTimeout(resolve, CODE_ASSIST_POST_RETRY_DELAY_MS));
319
+ }
320
+ throw lastError ?? new Error(`Gemini Code Assist ${method} failed.`);
321
+ }
322
+ async function codeAssistGet(accessToken, operationName) {
323
+ return codeAssistRequest(getCodeAssistOperationUrl(operationName), accessToken, "operation", {
324
+ method: "GET",
325
+ });
326
+ }
327
+ async function codeAssistRequest(url, accessToken, label, init) {
328
+ const response = await fetch(url, {
329
+ ...init,
330
+ headers: codeAssistHeaders(accessToken),
331
+ });
332
+ if (!response.ok) {
333
+ const text = await response.text();
334
+ throw new CodeAssistHttpError(label, response.status, text);
335
+ }
336
+ return (await response.json());
337
+ }
338
+ function getCodeAssistBaseUrl() {
339
+ const endpoint = process.env.CODE_ASSIST_ENDPOINT ?? CODE_ASSIST_BASE_URL;
340
+ const version = process.env.CODE_ASSIST_API_VERSION || CODE_ASSIST_API_VERSION;
341
+ return `${endpoint}/${version}`;
342
+ }
343
+ function getCodeAssistMethodUrl(method) {
344
+ return `${getCodeAssistBaseUrl()}:${method}`;
345
+ }
346
+ function getCodeAssistOperationUrl(operationName) {
347
+ return `${getCodeAssistBaseUrl()}/${operationName}`;
348
+ }
349
+ function shouldRetryCodeAssistStatus(status) {
350
+ return status === 429 || status === 499 || (status >= 500 && status <= 599);
351
+ }
352
+ function isVpcScAffectedError(error) {
353
+ try {
354
+ const parsed = JSON.parse(error.body);
355
+ if (!parsed || typeof parsed !== "object" || !("error" in parsed))
356
+ return false;
357
+ const details = parsed.error?.details;
358
+ return Array.isArray(details)
359
+ ? details.some((detail) => detail != null &&
360
+ typeof detail === "object" &&
361
+ "reason" in detail &&
362
+ detail.reason === VPC_SC_REASON)
363
+ : false;
364
+ }
365
+ catch {
366
+ return false;
367
+ }
368
+ }
369
+ function codeAssistHeaders(accessToken) {
370
+ return {
371
+ Authorization: `Bearer ${accessToken}`,
372
+ "Content-Type": "application/json",
373
+ "User-Agent": "google-gemini-cli",
374
+ "X-Goog-Api-Client": "gemini-cli/0.0.0",
375
+ };
376
+ }
377
+ //# sourceMappingURL=gemini.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../../src/core/oauth/gemini.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC,MAAM,aAAa,GAAG,gCAAgC,CAAC;AACvD,MAAM,iBAAiB,GAAG,oCAAoC,CAAC;AAC/D,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAC9D,MAAM,wBAAwB,GAAG,oCAAoC,CAAC;AACtE,MAAM,aAAa,GAAG,8CAA8C,CAAC;AACrE,MAAM,SAAS,GAAG,qCAAqC,CAAC;AACxD,MAAM,oBAAoB,GAAG,qCAAqC,CAAC;AACnE,MAAM,uBAAuB,GAAG,YAAY,CAAC;AAC7C,MAAM,wBAAwB,GAAG,CAAC,CAAC;AACnC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAC5C,MAAM,KAAK,GAAG;IACZ,gDAAgD;IAChD,gDAAgD;IAChD,kDAAkD;CACnD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AA6CZ,MAAM,cAAc,GAAG,WAAW,CAAC;AACnC,MAAM,gBAAgB,GAAG,aAAa,CAAC;AACvC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAC3C,MAAM,0BAA0B,GAAG,qBAAqB,CAAC;AACzD,MAAM,aAAa,GAAG,0BAA0B,CAAC;AAEjD,MAAM,mBAAoB,SAAQ,KAAK;IAC5B,MAAM,CAAS;IACf,IAAI,CAAS;IAEtB,YAAY,KAAa,EAAE,MAAc,EAAE,IAAY;QACrD,KAAK,CAAC,sBAAsB,KAAK,YAAY,MAAM,MAAM,IAAI,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,SAA8B;IAC9D,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,+BAA+B,EAAE,CAAC;IACrE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,YAAY,EAAE,CAAC;IACrD,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAEnD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;IACnC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAC9C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC5C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAClD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAC/C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC1C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAClD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;IACtD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAErC,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAC9E,CAAC;IAAC,MAAM,CAAC;QACP,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,YAAY,CACtC,gFAAgF,CACjF,CAAC;QACF,MAAM,MAAM,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC5F,SAAS,CAAC,QAAQ,CAAC,yCAAyC,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAE7E,OAAO;QACL,GAAG,KAAK;QACR,SAAS;KACV,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,YAAoB;IAC3D,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,+BAA+B,EAAE,CAAC;IACrE,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC;QAClC,UAAU,EAAE,eAAe;QAC3B,aAAa,EAAE,YAAY;QAC3B,SAAS,EAAE,QAAQ;QACnB,aAAa,EAAE,YAAY;KAC5B,CAAC,CAAC;IAEH,OAAO;QACL,WAAW,EAAE,IAAI,CAAC,YAAY;QAC9B,YAAY,EAAE,IAAI,CAAC,aAAa,IAAI,YAAY;QAChD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI;KAC/D,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,IAAI,EAAE,CAAC;IACjG,MAAM,YAAY,GAChB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,IAAI,EAAE,CAAC;IAC1F,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,yBAAyB,aAAa,QAAQ,iBAAiB,aAAa,CAAC,CAAC;IAChG,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;AACpC,CAAC;AAED,KAAK,UAAU,sBAAsB;IACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE;YACjC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChB,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACrC,OAAO,CAAC,oBAAoB,IAAI,CAAC,IAAI,iBAAiB,CAAC,CAAC;gBAC1D,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAa;IAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC3B,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IAEtB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3B,OAAO;YACL,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,SAAS;YAC/C,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,SAAS;SAClD,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,YAAY;IACd,CAAC;IAED,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;QAC1C,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,SAAS;YACrC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,SAAS;SACxC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACzB,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,OAAe,EACf,WAAmB,EACnB,aAAqB,EACrB,SAA8B;IAE9B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEnC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAI,YAAY,GAAkB,IAAI,CAAC;QAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEpD,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACvC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBACrB,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBACrB,OAAO;YACT,CAAC;YAED,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,aAAa,EAAE,CAAC;gBACpD,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBACrB,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBAC1B,OAAO;YACT,CAAC;YAED,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC5C,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;YACzE,GAAG,CAAC,GAAG,CAAC,oFAAoF,CAAC,CAAC;YAC9F,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE;YACpC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC7B,SAAS,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,IAAI,CAAC,YAAY;gBAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QACpC,CAAC,EAAE,OAAO,CAAC,CAAC;QACZ,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,IAAI,YAAY,EAAE,CAAC;gBACjB,OAAO,CAAC,YAAY,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,IAAY,EACZ,QAAgB,EAChB,WAAmB,EACnB,QAAgB,EAChB,YAAoB;IAEpB,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC;QAClC,UAAU,EAAE,oBAAoB;QAChC,SAAS,EAAE,QAAQ;QACnB,aAAa,EAAE,YAAY;QAC3B,IAAI;QACJ,YAAY,EAAE,WAAW;QACzB,aAAa,EAAE,QAAQ;KACxB,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO;QACL,WAAW,EAAE,IAAI,CAAC,YAAY;QAC9B,YAAY,EAAE,IAAI,CAAC,aAAa;QAChC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI;KAC/D,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,IAA4B;IAC1D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;QACtC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;QAChE,IAAI,EAAE,IAAI,eAAe,CAAC,IAAI,CAAC;KAChC,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,CAAC,MAAM,MAAM,IAAI,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAwB,CAAC;AACxD,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,WAAmB,EACnB,SAA8B;IAE9B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IAC3F,IAAI,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE,iBAAiB;QAC1B,QAAQ,EAAE,sBAAsB;QAChC,UAAU,EAAE,QAAQ;KACrB,CAAC;IACF,MAAM,eAAe,GAAG;QACtB,GAAG,YAAY;QACf,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnD,CAAC;IAEF,IAAI,OAA+B,CAAC;IACpC,OAAO,IAAI,EAAE,CAAC;QACZ,OAAO,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;QACzE,MAAM,UAAU,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU;YAAE,MAAM;QAEvB,SAAS,CAAC,QAAQ,CAChB,iDACE,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAC/D,EAAE,CACH,CAAC;QACF,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,YAAY,CACzC,iFAAiF,CAClF,CAAC;QACF,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,QAAQ,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,OAAO,CAAC,uBAAuB,IAAI,UAAU,CAAC;QAC9D,IAAI,CAAC,OAAO;YAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACzC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,UAAU,GACd,IAAI,CAAC,EAAE,KAAK,cAAc;QACxB,CAAC,CAAC;YACE,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,uBAAuB,EAAE,SAAS;YAClC,QAAQ,EAAE,YAAY;SACvB;QACH,CAAC,CAAC;YACE,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,uBAAuB,EAAE,UAAU;YACnC,QAAQ,EAAE,eAAe;SAC1B,CAAC;IAER,IAAI,SAAS,GAAG,MAAM,cAAc,CAClC,WAAW,EACX,aAAa,EACb,UAAU,CACX,CAAC;IAEF,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;QACzC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3D,SAAS,GAAG,MAAM,aAAa,CAA+B,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7F,CAAC;IAED,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,EAAE,uBAAuB,EAAE,EAAE,IAAI,UAAU,CAAC;IAC9E,IAAI,CAAC,OAAO;QAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,WAAmB,EACnB,UAA8B,EAC9B,QAAgC;IAEhC,IAAI,CAAC;QACH,OAAO,MAAM,cAAc,CAAyB,WAAW,EAAE,gBAAgB,EAAE;YACjF,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,uBAAuB,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9D,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,mBAAmB,IAAI,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC;YACpE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE,CAAC;QACrD,CAAC;QACD,IACE,GAAG,YAAY,mBAAmB;YAClC,GAAG,CAAC,MAAM,KAAK,GAAG;YAClB,UAAU,KAAK,gBAAgB,EAC/B,CAAC;YACD,MAAM,IAAI,KAAK,CACb,gEAAgE;gBAC9D,wDAAwD;gBACxD,0CAA0C;gBAC1C,4CAA4C,EAC9C,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAChC,QAAgC;IAEhC,OAAO,QAAQ,CAAC,eAAe,EAAE,IAAI,CACnC,CAAC,IAAI,EAAsD,EAAE,CAC3D,IAAI,CAAC,UAAU,KAAK,0BAA0B,IAAI,OAAO,IAAI,CAAC,aAAa,KAAK,QAAQ,CAC3F,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,QAAgC;IACtD,MAAM,WAAW,GAAG,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1E,OAAO,WAAW,IAAI,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AAC3D,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAgC;IACzD,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe;QACtC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,CAAC;SACnD,MAAM,CAAC,CAAC,MAAM,EAAoB,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,oCAAoC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,IAAI,KAAK,CACb,kGAAkG,CACnG,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,WAAmB,EACnB,MAAc,EACd,IAA6B;IAE7B,IAAI,SAA4B,CAAC;IACjC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,wBAAwB,EAAE,OAAO,EAAE,EAAE,CAAC;QACrE,IAAI,CAAC;YACH,OAAO,MAAM,iBAAiB,CAAI,sBAAsB,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE;gBACrF,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IACE,CAAC,CAAC,GAAG,YAAY,mBAAmB,CAAC;gBACrC,OAAO,KAAK,wBAAwB;gBACpC,CAAC,2BAA2B,CAAC,GAAG,CAAC,MAAM,CAAC,EACxC,CAAC;gBACD,MAAM,GAAG,CAAC;YACZ,CAAC;YACD,SAAS,GAAG,GAAG,CAAC;QAClB,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,SAAS,IAAI,IAAI,KAAK,CAAC,sBAAsB,MAAM,UAAU,CAAC,CAAC;AACvE,CAAC;AAED,KAAK,UAAU,aAAa,CAAI,WAAmB,EAAE,aAAqB;IACxE,OAAO,iBAAiB,CAAI,yBAAyB,CAAC,aAAa,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE;QAC9F,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,GAAW,EACX,WAAmB,EACnB,KAAa,EACb,IAA0C;IAE1C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,GAAG,IAAI;QACP,OAAO,EAAE,iBAAiB,CAAC,WAAW,CAAC;KACxC,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,IAAI,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAM,CAAC;AACtC,CAAC;AAED,SAAS,oBAAoB;IAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,oBAAoB,CAAC;IAC1E,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,uBAAuB,CAAC;IAC/E,OAAO,GAAG,QAAQ,IAAI,OAAO,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,sBAAsB,CAAC,MAAc;IAC5C,OAAO,GAAG,oBAAoB,EAAE,IAAI,MAAM,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,yBAAyB,CAAC,aAAqB;IACtD,OAAO,GAAG,oBAAoB,EAAE,IAAI,aAAa,EAAE,CAAC;AACtD,CAAC;AAED,SAAS,2BAA2B,CAAC,MAAc;IACjD,OAAO,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,oBAAoB,CAAC,KAA0B;IACtD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAY,CAAC;QACjD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAChF,MAAM,OAAO,GAAI,MAA8C,CAAC,KAAK,EAAE,OAAO,CAAC;QAC/E,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YAC3B,CAAC,CAAC,OAAO,CAAC,IAAI,CACV,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,IAAI,IAAI;gBACd,OAAO,MAAM,KAAK,QAAQ;gBAC1B,QAAQ,IAAI,MAAM;gBAClB,MAAM,CAAC,MAAM,KAAK,aAAa,CAClC;YACH,CAAC,CAAC,KAAK,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAmB;IAC5C,OAAO;QACL,aAAa,EAAE,UAAU,WAAW,EAAE;QACtC,cAAc,EAAE,kBAAkB;QAClC,YAAY,EAAE,mBAAmB;QACjC,mBAAmB,EAAE,kBAAkB;KACxC,CAAC;AACJ,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=gemini.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gemini.test.d.ts","sourceRoot":"","sources":["../../../src/core/oauth/gemini.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,154 @@
1
+ import http from "node:http";
2
+ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
3
+ import { loginGemini } from "./gemini.js";
4
+ const originalFetch = globalThis.fetch;
5
+ const originalCodeAssistEndpoint = process.env.CODE_ASSIST_ENDPOINT;
6
+ const originalCodeAssistApiVersion = process.env.CODE_ASSIST_API_VERSION;
7
+ const originalGoogleCloudProject = process.env.GOOGLE_CLOUD_PROJECT;
8
+ const originalGoogleCloudProjectId = process.env.GOOGLE_CLOUD_PROJECT_ID;
9
+ const originalGeminiClientId = process.env.EZCODER_GEMINI_OAUTH_CLIENT_ID;
10
+ const originalGeminiClientSecret = process.env.EZCODER_GEMINI_OAUTH_CLIENT_SECRET;
11
+ function tokenResponse() {
12
+ return new Response(JSON.stringify({
13
+ access_token: "access-token",
14
+ refresh_token: "refresh-token",
15
+ expires_in: 3_600,
16
+ }), { status: 200, headers: { "content-type": "application/json" } });
17
+ }
18
+ function completeLoopbackLogin(authUrl) {
19
+ const loginUrl = new URL(authUrl);
20
+ if (loginUrl.hostname !== "accounts.google.com")
21
+ return;
22
+ const redirectUri = loginUrl.searchParams.get("redirect_uri");
23
+ const state = loginUrl.searchParams.get("state");
24
+ if (!redirectUri || !state)
25
+ return;
26
+ const callbackUrl = new URL(redirectUri);
27
+ callbackUrl.searchParams.set("code", "oauth-code");
28
+ callbackUrl.searchParams.set("state", state);
29
+ const req = http.get(callbackUrl, (res) => {
30
+ res.resume();
31
+ });
32
+ req.on("error", () => undefined);
33
+ }
34
+ describe("loginGemini", () => {
35
+ beforeEach(() => {
36
+ delete process.env.GOOGLE_CLOUD_PROJECT;
37
+ delete process.env.GOOGLE_CLOUD_PROJECT_ID;
38
+ process.env.EZCODER_GEMINI_OAUTH_CLIENT_ID = "test-client-id";
39
+ process.env.EZCODER_GEMINI_OAUTH_CLIENT_SECRET = "test-client-secret";
40
+ });
41
+ afterEach(() => {
42
+ globalThis.fetch = originalFetch;
43
+ if (originalCodeAssistEndpoint === undefined) {
44
+ delete process.env.CODE_ASSIST_ENDPOINT;
45
+ }
46
+ else {
47
+ process.env.CODE_ASSIST_ENDPOINT = originalCodeAssistEndpoint;
48
+ }
49
+ if (originalCodeAssistApiVersion === undefined) {
50
+ delete process.env.CODE_ASSIST_API_VERSION;
51
+ }
52
+ else {
53
+ process.env.CODE_ASSIST_API_VERSION = originalCodeAssistApiVersion;
54
+ }
55
+ if (originalGoogleCloudProject === undefined) {
56
+ delete process.env.GOOGLE_CLOUD_PROJECT;
57
+ }
58
+ else {
59
+ process.env.GOOGLE_CLOUD_PROJECT = originalGoogleCloudProject;
60
+ }
61
+ if (originalGoogleCloudProjectId === undefined) {
62
+ delete process.env.GOOGLE_CLOUD_PROJECT_ID;
63
+ }
64
+ else {
65
+ process.env.GOOGLE_CLOUD_PROJECT_ID = originalGoogleCloudProjectId;
66
+ }
67
+ if (originalGeminiClientId === undefined) {
68
+ delete process.env.EZCODER_GEMINI_OAUTH_CLIENT_ID;
69
+ }
70
+ else {
71
+ process.env.EZCODER_GEMINI_OAUTH_CLIENT_ID = originalGeminiClientId;
72
+ }
73
+ if (originalGeminiClientSecret === undefined) {
74
+ delete process.env.EZCODER_GEMINI_OAUTH_CLIENT_SECRET;
75
+ }
76
+ else {
77
+ process.env.EZCODER_GEMINI_OAUTH_CLIENT_SECRET = originalGeminiClientSecret;
78
+ }
79
+ vi.restoreAllMocks();
80
+ });
81
+ it("opens validation URLs and retries Code Assist setup", async () => {
82
+ process.env.CODE_ASSIST_ENDPOINT = "https://code-assist.example.test";
83
+ process.env.CODE_ASSIST_API_VERSION = "v2test";
84
+ const fetchMock = vi
85
+ .fn()
86
+ .mockResolvedValueOnce(tokenResponse())
87
+ .mockResolvedValueOnce(new Response(JSON.stringify({
88
+ ineligibleTiers: [
89
+ {
90
+ reasonCode: "VALIDATION_REQUIRED",
91
+ reasonMessage: "verify account",
92
+ validationUrl: "https://validation.example.test",
93
+ },
94
+ ],
95
+ }), { status: 200, headers: { "content-type": "application/json" } }))
96
+ .mockResolvedValueOnce(new Response(JSON.stringify({
97
+ currentTier: { id: "standard-tier" },
98
+ cloudaicompanionProject: "validated-project",
99
+ }), { status: 200, headers: { "content-type": "application/json" } }));
100
+ globalThis.fetch = fetchMock;
101
+ const openedUrls = [];
102
+ const creds = await loginGemini({
103
+ onOpenUrl: (url) => {
104
+ openedUrls.push(url);
105
+ completeLoopbackLogin(url);
106
+ },
107
+ onPromptCode: async (message) => {
108
+ if (message.includes("validation"))
109
+ return "";
110
+ throw new Error(`Unexpected Gemini prompt: ${message}`);
111
+ },
112
+ onStatus: vi.fn(),
113
+ });
114
+ expect(creds.projectId).toBe("validated-project");
115
+ expect(openedUrls).toContain("https://validation.example.test");
116
+ expect(fetchMock).toHaveBeenNthCalledWith(2, "https://code-assist.example.test/v2test:loadCodeAssist", expect.objectContaining({ method: "POST" }));
117
+ expect(fetchMock).toHaveBeenNthCalledWith(3, "https://code-assist.example.test/v2test:loadCodeAssist", expect.objectContaining({ method: "POST" }));
118
+ });
119
+ it("uses free-tier onboarding metadata without a project", async () => {
120
+ const fetchMock = vi
121
+ .fn()
122
+ .mockResolvedValueOnce(tokenResponse())
123
+ .mockResolvedValueOnce(new Response(JSON.stringify({
124
+ allowedTiers: [{ id: "free-tier", isDefault: true }],
125
+ }), { status: 200, headers: { "content-type": "application/json" } }))
126
+ .mockResolvedValueOnce(new Response(JSON.stringify({
127
+ done: true,
128
+ response: { cloudaicompanionProject: { id: "managed-project" } },
129
+ }), { status: 200, headers: { "content-type": "application/json" } }));
130
+ globalThis.fetch = fetchMock;
131
+ const openedUrls = [];
132
+ const creds = await loginGemini({
133
+ onOpenUrl: (url) => {
134
+ openedUrls.push(url);
135
+ completeLoopbackLogin(url);
136
+ },
137
+ onPromptCode: async (message) => {
138
+ throw new Error(`Unexpected Gemini prompt: ${message}`);
139
+ },
140
+ onStatus: vi.fn(),
141
+ });
142
+ expect(creds.projectId).toBe("managed-project");
143
+ const [, onboardInit] = fetchMock.mock.calls[2];
144
+ expect(JSON.parse(onboardInit.body)).toEqual({
145
+ tierId: "free-tier",
146
+ metadata: {
147
+ ideType: "IDE_UNSPECIFIED",
148
+ platform: "PLATFORM_UNSPECIFIED",
149
+ pluginType: "GEMINI",
150
+ },
151
+ });
152
+ });
153
+ });
154
+ //# sourceMappingURL=gemini.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gemini.test.js","sourceRoot":"","sources":["../../../src/core/oauth/gemini.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/core/oauth/openai.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AASxE,wBAAsB,WAAW,CAAC,SAAS,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0C3F;AA6ID,wBAAsB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkCxF"}
1
+ {"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/core/oauth/openai.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AASxE,wBAAsB,WAAW,CAAC,SAAS,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0C3F;AA+ID,wBAAsB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkCxF"}
@@ -119,7 +119,14 @@ async function loginWithServer(authUrl, expectedState, callbacks) {
119
119
  callbacks.onOpenUrl(authUrl);
120
120
  callbacks.onStatus("Waiting for browser callback...");
121
121
  });
122
+ const timeout = setTimeout(() => {
123
+ if (!receivedCode) {
124
+ server.close();
125
+ }
126
+ }, 120_000);
127
+ timeout.unref();
122
128
  server.on("close", () => {
129
+ clearTimeout(timeout);
123
130
  if (receivedCode) {
124
131
  resolve(receivedCode);
125
132
  }
@@ -127,11 +134,6 @@ async function loginWithServer(authUrl, expectedState, callbacks) {
127
134
  reject(new Error("Server closed without receiving code"));
128
135
  }
129
136
  });
130
- setTimeout(() => {
131
- if (!receivedCode) {
132
- server.close();
133
- }
134
- }, 120_000);
135
137
  });
136
138
  }
137
139
  async function exchangeOpenAICode(code, verifier) {
@@ -1 +1 @@
1
- {"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/core/oauth/openai.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/core/oauth/openai.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ export interface OAuthCredentials {
3
3
  refreshToken: string;
4
4
  expiresAt: number;
5
5
  accountId?: string;
6
+ projectId?: string;
6
7
  baseUrl?: string;
7
8
  }
8
9
  export interface OAuthLoginCallbacks {
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/oauth/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/oauth/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC"}