@google/gemini-cli 0.46.0-preview.0 → 0.46.0-preview.2
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/bundle/{chunk-4AGOZ7LL.js → chunk-22XWYJCL.js} +7 -7
- package/bundle/{chunk-2GMVQS2Q.js → chunk-27JE2WT6.js} +1 -1
- package/bundle/{chunk-TDYUKPZH.js → chunk-2K6L5FOH.js} +1 -1
- package/bundle/{chunk-QFEJQS5X.js → chunk-3RBWPCUC.js} +1 -1
- package/bundle/{chunk-MFYAVF7Y.js → chunk-5IDNG2OG.js} +67 -54
- package/bundle/{chunk-BOJOJVNV.js → chunk-7JQYEHGG.js} +1 -1
- package/bundle/{chunk-J444UQD3.js → chunk-7PDJUYG7.js} +1 -1
- package/bundle/{chunk-ZXN4VW7M.js → chunk-B5F4VQB4.js} +1 -1
- package/bundle/{chunk-HZNEV3DS.js → chunk-CRQJBWDY.js} +1 -1
- package/bundle/{chunk-5LUCCXOB.js → chunk-CWVF4ZTK.js} +1 -1
- package/bundle/{chunk-HHFFICNK.js → chunk-E5QEVDYZ.js} +48 -25
- package/bundle/{chunk-FIM2LOYZ.js → chunk-EI75YPWJ.js} +42 -25
- package/bundle/chunk-IPUQ7EE3.js +81685 -0
- package/bundle/{chunk-S2ICEQVC.js → chunk-J5LPI3LE.js} +3 -3
- package/bundle/{chunk-RXG3JOOZ.js → chunk-LEOT5EUQ.js} +1 -1
- package/bundle/chunk-NV6UIB5A.js +1571 -0
- package/bundle/{chunk-XRDSBRG4.js → chunk-O6PTG534.js} +7560 -14072
- package/bundle/{chunk-F2LLVPPS.js → chunk-PE7HOVW5.js} +2 -2
- package/bundle/chunk-PIZZXDDG.js +154 -0
- package/bundle/{chunk-LBE2WKE7.js → chunk-PRRK6JDC.js} +3 -3
- package/bundle/{chunk-773AJHDP.js → chunk-QB7YVNGV.js} +7 -7
- package/bundle/{chunk-4K3E3G6Z.js → chunk-QW5AOX4N.js} +8 -5
- package/bundle/{chunk-HMR43ZX2.js → chunk-R4U5N4EA.js} +2 -2
- package/bundle/{chunk-SHFHGDWR.js → chunk-R4UEOSDC.js} +2 -2
- package/bundle/{chunk-GTRQQGSJ.js → chunk-RHCHEKOW.js} +1 -1
- package/bundle/{chunk-YMNECODB.js → chunk-RS7XVABE.js} +9 -8
- package/bundle/{chunk-ZQGZKIDD.js → chunk-SIKHBFAN.js} +3 -3
- package/bundle/chunk-UEE43LJM.js +118 -0
- package/bundle/chunk-UHZJ6CQN.js +17320 -0
- package/bundle/chunk-USOBCNPR.js +394545 -0
- package/bundle/chunk-WUZJ6YCQ.js +398 -0
- package/bundle/chunk-ZXFPRK6W.js +512 -0
- package/bundle/{cleanup-2WXD6UQP.js → cleanup-I5FUY2UQ.js} +2 -2
- package/bundle/{cleanup-L3CLNVX6.js → cleanup-OIBS4TJ5.js} +2 -2
- package/bundle/{cleanup-SUDL37MT.js → cleanup-RODT76X7.js} +2 -2
- package/bundle/cleanup-WY7MMPH7.js +32 -0
- package/bundle/{core-VVRQ2GQD.js → core-DU2UPBEJ.js} +3 -1
- package/bundle/{devtoolsService-GLW7S6PS.js → devtoolsService-C64GR2SQ.js} +2 -2
- package/bundle/{devtoolsService-ZYCBBAV3.js → devtoolsService-EJVCNXD4.js} +2 -2
- package/bundle/{devtoolsService-E62WA3CY.js → devtoolsService-LQXWZBCZ.js} +4 -3
- package/bundle/devtoolsService-U7Z6S7CA.js +856 -0
- package/bundle/{dist-GPCRVPKS.js → dist-CEGGZCD6.js} +3 -1
- package/bundle/{core-MOYKPEYV.js → dist-F4ZLD67R.js} +3 -1
- package/bundle/dist-XLM4ONR2.js +2140 -0
- package/bundle/docs/reference/configuration.md +3 -1
- package/bundle/{gemini-KV5CHM4H.js → gemini-3AA27X7W.js} +18 -15
- package/bundle/{gemini-2JTOIMGM.js → gemini-D5Y26G7I.js} +18 -15
- package/bundle/{gemini-R5NCXCEL.js → gemini-EEFZ4W4N.js} +216 -197
- package/bundle/gemini-TPWWVYVB.js +16409 -0
- package/bundle/gemini.js +7 -7
- package/bundle/{interactiveCli-RMWTSIEN.js → interactiveCli-5L4XUO4D.js} +18 -12
- package/bundle/{interactiveCli-HVAQTBJK.js → interactiveCli-B5QE2YQH.js} +18 -12
- package/bundle/{interactiveCli-7SIMXKNU.js → interactiveCli-CFKGEXFE.js} +324 -299
- package/bundle/interactiveCli-S4W3W3HM.js +34742 -0
- package/bundle/{liteRtServerManager-FY23PYSD.js → liteRtServerManager-2IHVDPV4.js} +4 -4
- package/bundle/{liteRtServerManager-LDS45QKP.js → liteRtServerManager-7CA6UZB6.js} +4 -4
- package/bundle/{liteRtServerManager-BP7XKGNU.js → liteRtServerManager-P4UUE4PT.js} +4 -4
- package/bundle/liteRtServerManager-YN3VGMDA.js +65 -0
- package/bundle/{oauth2-provider-VVNBQH45.js → oauth2-provider-5IAYEVTS.js} +1 -1
- package/bundle/{oauth2-provider-4SSSEI6P.js → oauth2-provider-NQK2KDLL.js} +38 -72
- package/bundle/{oauth2-provider-KL44D6HV.js → oauth2-provider-WD62E6UF.js} +1 -1
- package/bundle/oauth2-provider-WGTNZKF7.js +235 -0
- package/bundle/{start-FRM2XDGC.js → start-AAWVXW3L.js} +6 -6
- package/bundle/{start-OEPJINIW.js → start-EHQUCJL4.js} +6 -6
- package/bundle/{start-DLEOBFRC.js → start-EJWSTD4L.js} +6 -6
- package/bundle/start-LAOVDDQF.js +18 -0
- package/package.json +1 -1
|
@@ -3,11 +3,11 @@ import {
|
|
|
3
3
|
DEFAULT_PORT,
|
|
4
4
|
getBinaryPath,
|
|
5
5
|
isServerRunning
|
|
6
|
-
} from "./chunk-
|
|
7
|
-
import "./chunk-
|
|
6
|
+
} from "./chunk-UHZJ6CQN.js";
|
|
7
|
+
import "./chunk-RS7XVABE.js";
|
|
8
8
|
import {
|
|
9
9
|
debugLogger
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-O6PTG534.js";
|
|
11
11
|
import "./chunk-6HI7VNOG.js";
|
|
12
12
|
import "./chunk-TUDYL3X4.js";
|
|
13
13
|
import "./chunk-IUUIT4SU.js";
|
|
@@ -41,7 +41,7 @@ var LiteRtServerManager = class {
|
|
|
41
41
|
`[LiteRtServerManager] Auto-starting LiteRT server on port ${port}...`
|
|
42
42
|
);
|
|
43
43
|
try {
|
|
44
|
-
const { startServer } = await import("./start-
|
|
44
|
+
const { startServer } = await import("./start-LAOVDDQF.js");
|
|
45
45
|
const started = await startServer(binaryPath, port);
|
|
46
46
|
if (started) {
|
|
47
47
|
debugLogger.log(`[LiteRtServerManager] Server started on port ${port}`);
|
|
@@ -3,11 +3,11 @@ import {
|
|
|
3
3
|
DEFAULT_PORT,
|
|
4
4
|
getBinaryPath,
|
|
5
5
|
isServerRunning
|
|
6
|
-
} from "./chunk-
|
|
7
|
-
import "./chunk-
|
|
6
|
+
} from "./chunk-B5F4VQB4.js";
|
|
7
|
+
import "./chunk-2K6L5FOH.js";
|
|
8
8
|
import {
|
|
9
9
|
debugLogger
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-E5QEVDYZ.js";
|
|
11
11
|
import "./chunk-6HI7VNOG.js";
|
|
12
12
|
import "./chunk-TUDYL3X4.js";
|
|
13
13
|
import "./chunk-IUUIT4SU.js";
|
|
@@ -41,7 +41,7 @@ var LiteRtServerManager = class {
|
|
|
41
41
|
`[LiteRtServerManager] Auto-starting LiteRT server on port ${port}...`
|
|
42
42
|
);
|
|
43
43
|
try {
|
|
44
|
-
const { startServer } = await import("./start-
|
|
44
|
+
const { startServer } = await import("./start-EHQUCJL4.js");
|
|
45
45
|
const started = await startServer(binaryPath, port);
|
|
46
46
|
if (started) {
|
|
47
47
|
debugLogger.log(`[LiteRtServerManager] Server started on port ${port}`);
|
|
@@ -3,11 +3,11 @@ import {
|
|
|
3
3
|
DEFAULT_PORT,
|
|
4
4
|
getBinaryPath,
|
|
5
5
|
isServerRunning
|
|
6
|
-
} from "./chunk-
|
|
7
|
-
import "./chunk-
|
|
6
|
+
} from "./chunk-QW5AOX4N.js";
|
|
7
|
+
import "./chunk-RHCHEKOW.js";
|
|
8
8
|
import {
|
|
9
9
|
debugLogger
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-EI75YPWJ.js";
|
|
11
11
|
import "./chunk-6HI7VNOG.js";
|
|
12
12
|
import "./chunk-TUDYL3X4.js";
|
|
13
13
|
import "./chunk-IUUIT4SU.js";
|
|
@@ -41,7 +41,7 @@ var LiteRtServerManager = class {
|
|
|
41
41
|
`[LiteRtServerManager] Auto-starting LiteRT server on port ${port}...`
|
|
42
42
|
);
|
|
43
43
|
try {
|
|
44
|
-
const { startServer } = await import("./start-
|
|
44
|
+
const { startServer } = await import("./start-AAWVXW3L.js");
|
|
45
45
|
const started = await startServer(binaryPath, port);
|
|
46
46
|
if (started) {
|
|
47
47
|
debugLogger.log(`[LiteRtServerManager] Server started on port ${port}`);
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
|
|
2
|
+
import {
|
|
3
|
+
DEFAULT_PORT,
|
|
4
|
+
getBinaryPath,
|
|
5
|
+
isServerRunning
|
|
6
|
+
} from "./chunk-7PDJUYG7.js";
|
|
7
|
+
import "./chunk-ZXFPRK6W.js";
|
|
8
|
+
import {
|
|
9
|
+
debugLogger
|
|
10
|
+
} from "./chunk-USOBCNPR.js";
|
|
11
|
+
import "./chunk-6HI7VNOG.js";
|
|
12
|
+
import "./chunk-TUDYL3X4.js";
|
|
13
|
+
import "./chunk-IUUIT4SU.js";
|
|
14
|
+
import "./chunk-34MYV7JD.js";
|
|
15
|
+
|
|
16
|
+
// packages/cli/src/services/liteRtServerManager.ts
|
|
17
|
+
import fs from "node:fs";
|
|
18
|
+
var LiteRtServerManager = class {
|
|
19
|
+
static async ensureRunning(gemmaSettings) {
|
|
20
|
+
if (!gemmaSettings?.enabled) return;
|
|
21
|
+
if (gemmaSettings.autoStartServer === false) return;
|
|
22
|
+
const binaryPath = getBinaryPath();
|
|
23
|
+
if (!binaryPath || !fs.existsSync(binaryPath)) {
|
|
24
|
+
debugLogger.log(
|
|
25
|
+
'[LiteRtServerManager] Binary not installed, skipping auto-start. Run "gemini gemma setup".'
|
|
26
|
+
);
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const port = parseInt(
|
|
30
|
+
gemmaSettings.classifier?.host?.match(/:(\d+)/)?.[1] ?? "",
|
|
31
|
+
10
|
|
32
|
+
) || DEFAULT_PORT;
|
|
33
|
+
const running = await isServerRunning(port);
|
|
34
|
+
if (running) {
|
|
35
|
+
debugLogger.log(
|
|
36
|
+
`[LiteRtServerManager] Server already running on port ${port}`
|
|
37
|
+
);
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
debugLogger.log(
|
|
41
|
+
`[LiteRtServerManager] Auto-starting LiteRT server on port ${port}...`
|
|
42
|
+
);
|
|
43
|
+
try {
|
|
44
|
+
const { startServer } = await import("./start-EJWSTD4L.js");
|
|
45
|
+
const started = await startServer(binaryPath, port);
|
|
46
|
+
if (started) {
|
|
47
|
+
debugLogger.log(`[LiteRtServerManager] Server started on port ${port}`);
|
|
48
|
+
} else {
|
|
49
|
+
debugLogger.warn(
|
|
50
|
+
`[LiteRtServerManager] Server may not have started correctly on port ${port}`
|
|
51
|
+
);
|
|
52
|
+
}
|
|
53
|
+
} catch (error) {
|
|
54
|
+
debugLogger.warn("[LiteRtServerManager] Auto-start failed:", error);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
export {
|
|
59
|
+
LiteRtServerManager
|
|
60
|
+
};
|
|
61
|
+
/**
|
|
62
|
+
* @license
|
|
63
|
+
* Copyright 2026 Google LLC
|
|
64
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
65
|
+
*/
|
|
@@ -16,35 +16,35 @@ import {
|
|
|
16
16
|
openBrowserSecurely,
|
|
17
17
|
refreshAccessToken,
|
|
18
18
|
startCallbackServer
|
|
19
|
-
} from "./chunk-
|
|
19
|
+
} from "./chunk-EI75YPWJ.js";
|
|
20
20
|
import "./chunk-6HI7VNOG.js";
|
|
21
21
|
import "./chunk-TUDYL3X4.js";
|
|
22
22
|
import "./chunk-IUUIT4SU.js";
|
|
23
23
|
import "./chunk-34MYV7JD.js";
|
|
24
24
|
|
|
25
|
-
// packages/core/src/agents/auth-provider/oauth2-provider.
|
|
25
|
+
// packages/core/dist/src/agents/auth-provider/oauth2-provider.js
|
|
26
26
|
var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
|
|
27
|
+
config;
|
|
28
|
+
agentName;
|
|
29
|
+
agentCardUrl;
|
|
30
|
+
type = "oauth2";
|
|
31
|
+
tokenStorage;
|
|
32
|
+
cachedToken = null;
|
|
33
|
+
/** Resolved OAuth URLs — may come from config or agent card. */
|
|
34
|
+
authorizationUrl;
|
|
35
|
+
tokenUrl;
|
|
36
|
+
scopes;
|
|
27
37
|
constructor(config, agentName, agentCard, agentCardUrl) {
|
|
28
38
|
super();
|
|
29
39
|
this.config = config;
|
|
30
40
|
this.agentName = agentName;
|
|
31
41
|
this.agentCardUrl = agentCardUrl;
|
|
32
|
-
this.tokenStorage = new MCPOAuthTokenStorage(
|
|
33
|
-
Storage.getA2AOAuthTokensPath(),
|
|
34
|
-
"gemini-cli-a2a"
|
|
35
|
-
);
|
|
42
|
+
this.tokenStorage = new MCPOAuthTokenStorage(Storage.getA2AOAuthTokensPath(), "gemini-cli-a2a");
|
|
36
43
|
this.authorizationUrl = config.authorization_url;
|
|
37
44
|
this.tokenUrl = config.token_url;
|
|
38
45
|
this.scopes = config.scopes;
|
|
39
46
|
this.mergeAgentCardDefaults(agentCard);
|
|
40
47
|
}
|
|
41
|
-
type = "oauth2";
|
|
42
|
-
tokenStorage;
|
|
43
|
-
cachedToken = null;
|
|
44
|
-
/** Resolved OAuth URLs — may come from config or agent card. */
|
|
45
|
-
authorizationUrl;
|
|
46
|
-
tokenUrl;
|
|
47
|
-
scopes;
|
|
48
48
|
/**
|
|
49
49
|
* Initialize the provider by loading any persisted token from storage.
|
|
50
50
|
* Also discovers OAuth URLs from the agent card if not yet resolved.
|
|
@@ -56,9 +56,7 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
|
|
|
56
56
|
const credentials = await this.tokenStorage.getCredentials(this.agentName);
|
|
57
57
|
if (credentials && !this.tokenStorage.isTokenExpired(credentials.token)) {
|
|
58
58
|
this.cachedToken = credentials.token;
|
|
59
|
-
debugLogger.debug(
|
|
60
|
-
`[OAuth2AuthProvider] Loaded valid cached token for "${this.agentName}"`
|
|
61
|
-
);
|
|
59
|
+
debugLogger.debug(`[OAuth2AuthProvider] Loaded valid cached token for "${this.agentName}"`);
|
|
62
60
|
}
|
|
63
61
|
}
|
|
64
62
|
/**
|
|
@@ -71,25 +69,16 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
|
|
|
71
69
|
}
|
|
72
70
|
if (this.cachedToken?.refreshToken && this.tokenUrl && this.config.client_id) {
|
|
73
71
|
try {
|
|
74
|
-
const refreshed = await refreshAccessToken(
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
this.cachedToken.refreshToken,
|
|
81
|
-
this.tokenUrl
|
|
82
|
-
);
|
|
83
|
-
this.cachedToken = this.toOAuthToken(
|
|
84
|
-
refreshed,
|
|
85
|
-
this.cachedToken.refreshToken
|
|
86
|
-
);
|
|
72
|
+
const refreshed = await refreshAccessToken({
|
|
73
|
+
clientId: this.config.client_id,
|
|
74
|
+
clientSecret: this.config.client_secret,
|
|
75
|
+
scopes: this.scopes
|
|
76
|
+
}, this.cachedToken.refreshToken, this.tokenUrl);
|
|
77
|
+
this.cachedToken = this.toOAuthToken(refreshed, this.cachedToken.refreshToken);
|
|
87
78
|
await this.persistToken();
|
|
88
79
|
return { Authorization: `Bearer ${this.cachedToken.accessToken}` };
|
|
89
80
|
} catch (error) {
|
|
90
|
-
debugLogger.debug(
|
|
91
|
-
`[OAuth2AuthProvider] Refresh failed, falling back to interactive flow: ${getErrorMessage(error)}`
|
|
92
|
-
);
|
|
81
|
+
debugLogger.debug(`[OAuth2AuthProvider] Refresh failed, falling back to interactive flow: ${getErrorMessage(error)}`);
|
|
93
82
|
await this.tokenStorage.deleteCredentials(this.agentName);
|
|
94
83
|
}
|
|
95
84
|
}
|
|
@@ -108,9 +97,7 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
|
|
|
108
97
|
return void 0;
|
|
109
98
|
}
|
|
110
99
|
this.authRetryCount++;
|
|
111
|
-
debugLogger.debug(
|
|
112
|
-
"[OAuth2AuthProvider] Auth failure, clearing token and re-authenticating"
|
|
113
|
-
);
|
|
100
|
+
debugLogger.debug("[OAuth2AuthProvider] Auth failure, clearing token and re-authenticating");
|
|
114
101
|
this.cachedToken = null;
|
|
115
102
|
await this.tokenStorage.deleteCredentials(this.agentName);
|
|
116
103
|
return this.headers();
|
|
@@ -123,7 +110,8 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
|
|
|
123
110
|
* `securitySchemes` when not already provided via user config.
|
|
124
111
|
*/
|
|
125
112
|
mergeAgentCardDefaults(agentCard) {
|
|
126
|
-
if (!agentCard?.securitySchemes)
|
|
113
|
+
if (!agentCard?.securitySchemes)
|
|
114
|
+
return;
|
|
127
115
|
for (const scheme of Object.values(agentCard.securitySchemes)) {
|
|
128
116
|
if (scheme.type === "oauth2" && scheme.flows.authorizationCode) {
|
|
129
117
|
const flow = scheme.flows.authorizationCode;
|
|
@@ -139,18 +127,15 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
|
|
|
139
127
|
* (which normalizes proto-format cards) and extract OAuth2 URLs.
|
|
140
128
|
*/
|
|
141
129
|
async fetchAgentCardDefaults() {
|
|
142
|
-
if (!this.agentCardUrl)
|
|
130
|
+
if (!this.agentCardUrl)
|
|
131
|
+
return;
|
|
143
132
|
try {
|
|
144
|
-
debugLogger.debug(
|
|
145
|
-
`[OAuth2AuthProvider] Fetching agent card from ${this.agentCardUrl}`
|
|
146
|
-
);
|
|
133
|
+
debugLogger.debug(`[OAuth2AuthProvider] Fetching agent card from ${this.agentCardUrl}`);
|
|
147
134
|
const resolver = new DefaultAgentCardResolver();
|
|
148
135
|
const card = await resolver.resolve(this.agentCardUrl, "");
|
|
149
136
|
this.mergeAgentCardDefaults(card);
|
|
150
137
|
} catch (error) {
|
|
151
|
-
debugLogger.warn(
|
|
152
|
-
`[OAuth2AuthProvider] Could not fetch agent card for OAuth URL discovery: ${getErrorMessage(error)}`
|
|
153
|
-
);
|
|
138
|
+
debugLogger.warn(`[OAuth2AuthProvider] Could not fetch agent card for OAuth URL discovery: ${getErrorMessage(error)}`);
|
|
154
139
|
}
|
|
155
140
|
}
|
|
156
141
|
/**
|
|
@@ -158,14 +143,10 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
|
|
|
158
143
|
*/
|
|
159
144
|
async authenticateInteractively() {
|
|
160
145
|
if (!this.config.client_id) {
|
|
161
|
-
throw new Error(
|
|
162
|
-
`OAuth2 authentication for agent "${this.agentName}" requires a client_id. Add client_id to the auth config in your agent definition.`
|
|
163
|
-
);
|
|
146
|
+
throw new Error(`OAuth2 authentication for agent "${this.agentName}" requires a client_id. Add client_id to the auth config in your agent definition.`);
|
|
164
147
|
}
|
|
165
148
|
if (!this.authorizationUrl || !this.tokenUrl) {
|
|
166
|
-
throw new Error(
|
|
167
|
-
`OAuth2 authentication for agent "${this.agentName}" requires authorization_url and token_url. Provide them in the auth config or ensure the agent card exposes an oauth2 security scheme.`
|
|
168
|
-
);
|
|
149
|
+
throw new Error(`OAuth2 authentication for agent "${this.agentName}" requires authorization_url and token_url. Provide them in the auth config or ensure the agent card exposes an oauth2 security scheme.`);
|
|
169
150
|
}
|
|
170
151
|
const flowConfig = {
|
|
171
152
|
clientId: this.config.client_id,
|
|
@@ -184,36 +165,25 @@ var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
|
|
|
184
165
|
redirectPort,
|
|
185
166
|
/* resource= */
|
|
186
167
|
void 0
|
|
187
|
-
// No MCP resource parameter for A2A.
|
|
188
|
-
);
|
|
189
|
-
const consent = await getConsentForOauth(
|
|
190
|
-
`Authentication required for A2A agent: '${this.agentName}'.`
|
|
191
168
|
);
|
|
169
|
+
const consent = await getConsentForOauth(`Authentication required for A2A agent: '${this.agentName}'.`);
|
|
192
170
|
if (!consent) {
|
|
193
171
|
throw new FatalCancellationError("Authentication cancelled by user.");
|
|
194
172
|
}
|
|
195
|
-
coreEvents.emitFeedback(
|
|
196
|
-
"info",
|
|
197
|
-
`\u2192 Opening your browser for OAuth sign-in...
|
|
173
|
+
coreEvents.emitFeedback("info", `\u2192 Opening your browser for OAuth sign-in...
|
|
198
174
|
|
|
199
175
|
If the browser does not open, copy and paste this URL into your browser:
|
|
200
176
|
${authUrl}
|
|
201
177
|
|
|
202
178
|
\u{1F4A1} TIP: Triple-click to select the entire URL, then copy and paste it into your browser.
|
|
203
|
-
\u26A0\uFE0F Make sure to copy the COMPLETE URL - it may wrap across multiple lines.`
|
|
204
|
-
);
|
|
179
|
+
\u26A0\uFE0F Make sure to copy the COMPLETE URL - it may wrap across multiple lines.`);
|
|
205
180
|
try {
|
|
206
181
|
await openBrowserSecurely(authUrl);
|
|
207
182
|
} catch (error) {
|
|
208
|
-
debugLogger.warn(
|
|
209
|
-
"Failed to open browser automatically:",
|
|
210
|
-
getErrorMessage(error)
|
|
211
|
-
);
|
|
183
|
+
debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error));
|
|
212
184
|
}
|
|
213
185
|
const { code } = await callbackServer.response;
|
|
214
|
-
debugLogger.debug(
|
|
215
|
-
"\u2713 Authorization code received, exchanging for tokens..."
|
|
216
|
-
);
|
|
186
|
+
debugLogger.debug("\u2713 Authorization code received, exchanging for tokens...");
|
|
217
187
|
const tokenResponse = await exchangeCodeForToken(
|
|
218
188
|
flowConfig,
|
|
219
189
|
code,
|
|
@@ -250,13 +220,9 @@ ${authUrl}
|
|
|
250
220
|
* Persist the current cached token to disk.
|
|
251
221
|
*/
|
|
252
222
|
async persistToken() {
|
|
253
|
-
if (!this.cachedToken)
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
this.cachedToken,
|
|
257
|
-
this.config.client_id,
|
|
258
|
-
this.tokenUrl
|
|
259
|
-
);
|
|
223
|
+
if (!this.cachedToken)
|
|
224
|
+
return;
|
|
225
|
+
await this.tokenStorage.saveToken(this.agentName, this.cachedToken, this.config.client_id, this.tokenUrl);
|
|
260
226
|
}
|
|
261
227
|
};
|
|
262
228
|
export {
|
|
@@ -0,0 +1,235 @@
|
|
|
1
|
+
const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
|
|
2
|
+
import {
|
|
3
|
+
BaseA2AAuthProvider,
|
|
4
|
+
DefaultAgentCardResolver,
|
|
5
|
+
FatalCancellationError,
|
|
6
|
+
MCPOAuthTokenStorage,
|
|
7
|
+
Storage,
|
|
8
|
+
buildAuthorizationUrl,
|
|
9
|
+
coreEvents,
|
|
10
|
+
debugLogger,
|
|
11
|
+
exchangeCodeForToken,
|
|
12
|
+
generatePKCEParams,
|
|
13
|
+
getConsentForOauth,
|
|
14
|
+
getErrorMessage,
|
|
15
|
+
getPortFromUrl,
|
|
16
|
+
openBrowserSecurely,
|
|
17
|
+
refreshAccessToken,
|
|
18
|
+
startCallbackServer
|
|
19
|
+
} from "./chunk-USOBCNPR.js";
|
|
20
|
+
import "./chunk-6HI7VNOG.js";
|
|
21
|
+
import "./chunk-TUDYL3X4.js";
|
|
22
|
+
import "./chunk-IUUIT4SU.js";
|
|
23
|
+
import "./chunk-34MYV7JD.js";
|
|
24
|
+
|
|
25
|
+
// packages/core/dist/src/agents/auth-provider/oauth2-provider.js
|
|
26
|
+
var OAuth2AuthProvider = class extends BaseA2AAuthProvider {
|
|
27
|
+
config;
|
|
28
|
+
agentName;
|
|
29
|
+
agentCardUrl;
|
|
30
|
+
type = "oauth2";
|
|
31
|
+
tokenStorage;
|
|
32
|
+
cachedToken = null;
|
|
33
|
+
/** Resolved OAuth URLs — may come from config or agent card. */
|
|
34
|
+
authorizationUrl;
|
|
35
|
+
tokenUrl;
|
|
36
|
+
scopes;
|
|
37
|
+
constructor(config, agentName, agentCard, agentCardUrl) {
|
|
38
|
+
super();
|
|
39
|
+
this.config = config;
|
|
40
|
+
this.agentName = agentName;
|
|
41
|
+
this.agentCardUrl = agentCardUrl;
|
|
42
|
+
this.tokenStorage = new MCPOAuthTokenStorage(Storage.getA2AOAuthTokensPath(), "gemini-cli-a2a");
|
|
43
|
+
this.authorizationUrl = config.authorization_url;
|
|
44
|
+
this.tokenUrl = config.token_url;
|
|
45
|
+
this.scopes = config.scopes;
|
|
46
|
+
this.mergeAgentCardDefaults(agentCard);
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Initialize the provider by loading any persisted token from storage.
|
|
50
|
+
* Also discovers OAuth URLs from the agent card if not yet resolved.
|
|
51
|
+
*/
|
|
52
|
+
async initialize() {
|
|
53
|
+
if ((!this.authorizationUrl || !this.tokenUrl) && this.agentCardUrl) {
|
|
54
|
+
await this.fetchAgentCardDefaults();
|
|
55
|
+
}
|
|
56
|
+
const credentials = await this.tokenStorage.getCredentials(this.agentName);
|
|
57
|
+
if (credentials && !this.tokenStorage.isTokenExpired(credentials.token)) {
|
|
58
|
+
this.cachedToken = credentials.token;
|
|
59
|
+
debugLogger.debug(`[OAuth2AuthProvider] Loaded valid cached token for "${this.agentName}"`);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Return an Authorization header with a valid Bearer token.
|
|
64
|
+
* Refreshes or triggers interactive auth as needed.
|
|
65
|
+
*/
|
|
66
|
+
async headers() {
|
|
67
|
+
if (this.cachedToken && !this.tokenStorage.isTokenExpired(this.cachedToken)) {
|
|
68
|
+
return { Authorization: `Bearer ${this.cachedToken.accessToken}` };
|
|
69
|
+
}
|
|
70
|
+
if (this.cachedToken?.refreshToken && this.tokenUrl && this.config.client_id) {
|
|
71
|
+
try {
|
|
72
|
+
const refreshed = await refreshAccessToken({
|
|
73
|
+
clientId: this.config.client_id,
|
|
74
|
+
clientSecret: this.config.client_secret,
|
|
75
|
+
scopes: this.scopes
|
|
76
|
+
}, this.cachedToken.refreshToken, this.tokenUrl);
|
|
77
|
+
this.cachedToken = this.toOAuthToken(refreshed, this.cachedToken.refreshToken);
|
|
78
|
+
await this.persistToken();
|
|
79
|
+
return { Authorization: `Bearer ${this.cachedToken.accessToken}` };
|
|
80
|
+
} catch (error) {
|
|
81
|
+
debugLogger.debug(`[OAuth2AuthProvider] Refresh failed, falling back to interactive flow: ${getErrorMessage(error)}`);
|
|
82
|
+
await this.tokenStorage.deleteCredentials(this.agentName);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
this.cachedToken = await this.authenticateInteractively();
|
|
86
|
+
return { Authorization: `Bearer ${this.cachedToken.accessToken}` };
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* On 401/403, clear the cached token and re-authenticate (up to MAX_AUTH_RETRIES).
|
|
90
|
+
*/
|
|
91
|
+
async shouldRetryWithHeaders(_req, res) {
|
|
92
|
+
if (res.status !== 401 && res.status !== 403) {
|
|
93
|
+
this.authRetryCount = 0;
|
|
94
|
+
return void 0;
|
|
95
|
+
}
|
|
96
|
+
if (this.authRetryCount >= BaseA2AAuthProvider.MAX_AUTH_RETRIES) {
|
|
97
|
+
return void 0;
|
|
98
|
+
}
|
|
99
|
+
this.authRetryCount++;
|
|
100
|
+
debugLogger.debug("[OAuth2AuthProvider] Auth failure, clearing token and re-authenticating");
|
|
101
|
+
this.cachedToken = null;
|
|
102
|
+
await this.tokenStorage.deleteCredentials(this.agentName);
|
|
103
|
+
return this.headers();
|
|
104
|
+
}
|
|
105
|
+
// ---------------------------------------------------------------------------
|
|
106
|
+
// Private helpers
|
|
107
|
+
// ---------------------------------------------------------------------------
|
|
108
|
+
/**
|
|
109
|
+
* Merge authorization_url, token_url, and scopes from the agent card's
|
|
110
|
+
* `securitySchemes` when not already provided via user config.
|
|
111
|
+
*/
|
|
112
|
+
mergeAgentCardDefaults(agentCard) {
|
|
113
|
+
if (!agentCard?.securitySchemes)
|
|
114
|
+
return;
|
|
115
|
+
for (const scheme of Object.values(agentCard.securitySchemes)) {
|
|
116
|
+
if (scheme.type === "oauth2" && scheme.flows.authorizationCode) {
|
|
117
|
+
const flow = scheme.flows.authorizationCode;
|
|
118
|
+
this.authorizationUrl ??= flow.authorizationUrl;
|
|
119
|
+
this.tokenUrl ??= flow.tokenUrl;
|
|
120
|
+
this.scopes ??= Object.keys(flow.scopes);
|
|
121
|
+
break;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* Fetch the agent card from `agentCardUrl` using `DefaultAgentCardResolver`
|
|
127
|
+
* (which normalizes proto-format cards) and extract OAuth2 URLs.
|
|
128
|
+
*/
|
|
129
|
+
async fetchAgentCardDefaults() {
|
|
130
|
+
if (!this.agentCardUrl)
|
|
131
|
+
return;
|
|
132
|
+
try {
|
|
133
|
+
debugLogger.debug(`[OAuth2AuthProvider] Fetching agent card from ${this.agentCardUrl}`);
|
|
134
|
+
const resolver = new DefaultAgentCardResolver();
|
|
135
|
+
const card = await resolver.resolve(this.agentCardUrl, "");
|
|
136
|
+
this.mergeAgentCardDefaults(card);
|
|
137
|
+
} catch (error) {
|
|
138
|
+
debugLogger.warn(`[OAuth2AuthProvider] Could not fetch agent card for OAuth URL discovery: ${getErrorMessage(error)}`);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Run a full OAuth 2.0 Authorization Code + PKCE flow through the browser.
|
|
143
|
+
*/
|
|
144
|
+
async authenticateInteractively() {
|
|
145
|
+
if (!this.config.client_id) {
|
|
146
|
+
throw new Error(`OAuth2 authentication for agent "${this.agentName}" requires a client_id. Add client_id to the auth config in your agent definition.`);
|
|
147
|
+
}
|
|
148
|
+
if (!this.authorizationUrl || !this.tokenUrl) {
|
|
149
|
+
throw new Error(`OAuth2 authentication for agent "${this.agentName}" requires authorization_url and token_url. Provide them in the auth config or ensure the agent card exposes an oauth2 security scheme.`);
|
|
150
|
+
}
|
|
151
|
+
const flowConfig = {
|
|
152
|
+
clientId: this.config.client_id,
|
|
153
|
+
clientSecret: this.config.client_secret,
|
|
154
|
+
authorizationUrl: this.authorizationUrl,
|
|
155
|
+
tokenUrl: this.tokenUrl,
|
|
156
|
+
scopes: this.scopes
|
|
157
|
+
};
|
|
158
|
+
const pkceParams = generatePKCEParams();
|
|
159
|
+
const preferredPort = getPortFromUrl(flowConfig.redirectUri);
|
|
160
|
+
const callbackServer = startCallbackServer(pkceParams.state, preferredPort);
|
|
161
|
+
const redirectPort = await callbackServer.port;
|
|
162
|
+
const authUrl = buildAuthorizationUrl(
|
|
163
|
+
flowConfig,
|
|
164
|
+
pkceParams,
|
|
165
|
+
redirectPort,
|
|
166
|
+
/* resource= */
|
|
167
|
+
void 0
|
|
168
|
+
);
|
|
169
|
+
const consent = await getConsentForOauth(`Authentication required for A2A agent: '${this.agentName}'.`);
|
|
170
|
+
if (!consent) {
|
|
171
|
+
throw new FatalCancellationError("Authentication cancelled by user.");
|
|
172
|
+
}
|
|
173
|
+
coreEvents.emitFeedback("info", `\u2192 Opening your browser for OAuth sign-in...
|
|
174
|
+
|
|
175
|
+
If the browser does not open, copy and paste this URL into your browser:
|
|
176
|
+
${authUrl}
|
|
177
|
+
|
|
178
|
+
\u{1F4A1} TIP: Triple-click to select the entire URL, then copy and paste it into your browser.
|
|
179
|
+
\u26A0\uFE0F Make sure to copy the COMPLETE URL - it may wrap across multiple lines.`);
|
|
180
|
+
try {
|
|
181
|
+
await openBrowserSecurely(authUrl);
|
|
182
|
+
} catch (error) {
|
|
183
|
+
debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error));
|
|
184
|
+
}
|
|
185
|
+
const { code } = await callbackServer.response;
|
|
186
|
+
debugLogger.debug("\u2713 Authorization code received, exchanging for tokens...");
|
|
187
|
+
const tokenResponse = await exchangeCodeForToken(
|
|
188
|
+
flowConfig,
|
|
189
|
+
code,
|
|
190
|
+
pkceParams.codeVerifier,
|
|
191
|
+
redirectPort,
|
|
192
|
+
/* resource= */
|
|
193
|
+
void 0
|
|
194
|
+
);
|
|
195
|
+
if (!tokenResponse.access_token) {
|
|
196
|
+
throw new Error("No access token received from token endpoint");
|
|
197
|
+
}
|
|
198
|
+
const token = this.toOAuthToken(tokenResponse);
|
|
199
|
+
this.cachedToken = token;
|
|
200
|
+
await this.persistToken();
|
|
201
|
+
debugLogger.debug("\u2713 OAuth2 authentication successful! Token saved.");
|
|
202
|
+
return token;
|
|
203
|
+
}
|
|
204
|
+
/**
|
|
205
|
+
* Convert an `OAuthTokenResponse` into the internal `OAuthToken` format.
|
|
206
|
+
*/
|
|
207
|
+
toOAuthToken(response, fallbackRefreshToken) {
|
|
208
|
+
const token = {
|
|
209
|
+
accessToken: response.access_token,
|
|
210
|
+
tokenType: response.token_type || "Bearer",
|
|
211
|
+
refreshToken: response.refresh_token || fallbackRefreshToken,
|
|
212
|
+
scope: response.scope
|
|
213
|
+
};
|
|
214
|
+
if (response.expires_in) {
|
|
215
|
+
token.expiresAt = Date.now() + response.expires_in * 1e3;
|
|
216
|
+
}
|
|
217
|
+
return token;
|
|
218
|
+
}
|
|
219
|
+
/**
|
|
220
|
+
* Persist the current cached token to disk.
|
|
221
|
+
*/
|
|
222
|
+
async persistToken() {
|
|
223
|
+
if (!this.cachedToken)
|
|
224
|
+
return;
|
|
225
|
+
await this.tokenStorage.saveToken(this.agentName, this.cachedToken, this.config.client_id, this.tokenUrl);
|
|
226
|
+
}
|
|
227
|
+
};
|
|
228
|
+
export {
|
|
229
|
+
OAuth2AuthProvider
|
|
230
|
+
};
|
|
231
|
+
/**
|
|
232
|
+
* @license
|
|
233
|
+
* Copyright 2026 Google LLC
|
|
234
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
235
|
+
*/
|
|
@@ -2,12 +2,12 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
|
|
|
2
2
|
import {
|
|
3
3
|
startCommand,
|
|
4
4
|
startServer
|
|
5
|
-
} from "./chunk-
|
|
6
|
-
import "./chunk-
|
|
7
|
-
import "./chunk-
|
|
8
|
-
import "./chunk-
|
|
9
|
-
import "./chunk-
|
|
10
|
-
import "./chunk-
|
|
5
|
+
} from "./chunk-PRRK6JDC.js";
|
|
6
|
+
import "./chunk-7JQYEHGG.js";
|
|
7
|
+
import "./chunk-QW5AOX4N.js";
|
|
8
|
+
import "./chunk-RHCHEKOW.js";
|
|
9
|
+
import "./chunk-27JE2WT6.js";
|
|
10
|
+
import "./chunk-EI75YPWJ.js";
|
|
11
11
|
import "./chunk-6HI7VNOG.js";
|
|
12
12
|
import "./chunk-TUDYL3X4.js";
|
|
13
13
|
import "./chunk-IUUIT4SU.js";
|
|
@@ -2,12 +2,12 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
|
|
|
2
2
|
import {
|
|
3
3
|
startCommand,
|
|
4
4
|
startServer
|
|
5
|
-
} from "./chunk-
|
|
6
|
-
import "./chunk-
|
|
7
|
-
import "./chunk-
|
|
8
|
-
import "./chunk-
|
|
9
|
-
import "./chunk-
|
|
10
|
-
import "./chunk-
|
|
5
|
+
} from "./chunk-UEE43LJM.js";
|
|
6
|
+
import "./chunk-NV6UIB5A.js";
|
|
7
|
+
import "./chunk-B5F4VQB4.js";
|
|
8
|
+
import "./chunk-2K6L5FOH.js";
|
|
9
|
+
import "./chunk-PIZZXDDG.js";
|
|
10
|
+
import "./chunk-E5QEVDYZ.js";
|
|
11
11
|
import "./chunk-6HI7VNOG.js";
|
|
12
12
|
import "./chunk-TUDYL3X4.js";
|
|
13
13
|
import "./chunk-IUUIT4SU.js";
|
|
@@ -2,12 +2,12 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
|
|
|
2
2
|
import {
|
|
3
3
|
startCommand,
|
|
4
4
|
startServer
|
|
5
|
-
} from "./chunk-
|
|
6
|
-
import "./chunk-
|
|
7
|
-
import "./chunk-
|
|
8
|
-
import "./chunk-
|
|
9
|
-
import "./chunk-
|
|
10
|
-
import "./chunk-
|
|
5
|
+
} from "./chunk-SIKHBFAN.js";
|
|
6
|
+
import "./chunk-CRQJBWDY.js";
|
|
7
|
+
import "./chunk-7PDJUYG7.js";
|
|
8
|
+
import "./chunk-ZXFPRK6W.js";
|
|
9
|
+
import "./chunk-3RBWPCUC.js";
|
|
10
|
+
import "./chunk-USOBCNPR.js";
|
|
11
11
|
import "./chunk-6HI7VNOG.js";
|
|
12
12
|
import "./chunk-TUDYL3X4.js";
|
|
13
13
|
import "./chunk-IUUIT4SU.js";
|