@google/gemini-cli-a2a-server 0.29.0-preview.4 → 0.29.0-preview.5
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/dist/a2a-server.mjs +14 -25
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
package/dist/a2a-server.mjs
CHANGED
|
@@ -328955,7 +328955,7 @@ var __filename = fileURLToPath5(import.meta.url);
|
|
|
328955
328955
|
var __dirname3 = path22.dirname(__filename);
|
|
328956
328956
|
async function getVersion() {
|
|
328957
328957
|
const pkgJson = await getPackageJson(__dirname3);
|
|
328958
|
-
return "0.29.0-preview.
|
|
328958
|
+
return "0.29.0-preview.5";
|
|
328959
328959
|
}
|
|
328960
328960
|
|
|
328961
328961
|
// packages/core/dist/src/code_assist/experiments/client_metadata.js
|
|
@@ -332500,8 +332500,8 @@ var Float64Vector = import_vector.default.Float64Vector;
|
|
|
332500
332500
|
var PointerVector = import_vector.default.PointerVector;
|
|
332501
332501
|
|
|
332502
332502
|
// packages/core/dist/src/generated/git-commit.js
|
|
332503
|
-
var GIT_COMMIT_INFO = "
|
|
332504
|
-
var CLI_VERSION = "0.29.0-preview.
|
|
332503
|
+
var GIT_COMMIT_INFO = "b3ac1299e";
|
|
332504
|
+
var CLI_VERSION = "0.29.0-preview.5";
|
|
332505
332505
|
|
|
332506
332506
|
// packages/core/dist/src/ide/detect-ide.js
|
|
332507
332507
|
var IDE_DEFINITIONS = {
|
|
@@ -407431,12 +407431,10 @@ var McpClient = class {
|
|
|
407431
407431
|
}
|
|
407432
407432
|
this.updateStatus(MCPServerStatus.CONNECTING);
|
|
407433
407433
|
try {
|
|
407434
|
-
|
|
407435
|
-
this.client = client;
|
|
407436
|
-
this.transport = transport;
|
|
407434
|
+
this.client = await connectToMcpServer(this.clientVersion, this.serverName, this.serverConfig, this.debugMode, this.workspaceContext, this.cliConfig.sanitizationConfig);
|
|
407437
407435
|
this.registerNotificationHandlers();
|
|
407438
407436
|
const originalOnError = this.client.onerror;
|
|
407439
|
-
this.client.onerror =
|
|
407437
|
+
this.client.onerror = (error2) => {
|
|
407440
407438
|
if (this.status !== MCPServerStatus.CONNECTED) {
|
|
407441
407439
|
return;
|
|
407442
407440
|
}
|
|
@@ -407444,12 +407442,6 @@ var McpClient = class {
|
|
|
407444
407442
|
originalOnError(error2);
|
|
407445
407443
|
coreEvents.emitFeedback("error", `MCP ERROR (${this.serverName})`, error2);
|
|
407446
407444
|
this.updateStatus(MCPServerStatus.DISCONNECTED);
|
|
407447
|
-
if (this.transport) {
|
|
407448
|
-
try {
|
|
407449
|
-
await this.transport.close();
|
|
407450
|
-
} catch {
|
|
407451
|
-
}
|
|
407452
|
-
}
|
|
407453
407445
|
};
|
|
407454
407446
|
this.updateStatus(MCPServerStatus.CONNECTED);
|
|
407455
407447
|
} catch (error2) {
|
|
@@ -408018,7 +408010,6 @@ async function connectWithSSETransport(client, config3, accessToken) {
|
|
|
408018
408010
|
await client.connect(transport, {
|
|
408019
408011
|
timeout: config3.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
|
|
408020
408012
|
});
|
|
408021
|
-
return transport;
|
|
408022
408013
|
}
|
|
408023
408014
|
async function showAuthRequiredMessage(serverName) {
|
|
408024
408015
|
const hasRejectedToken = !!await getStoredOAuthToken(serverName);
|
|
@@ -408029,9 +408020,9 @@ async function showAuthRequiredMessage(serverName) {
|
|
|
408029
408020
|
async function retryWithOAuth(client, serverName, config3, accessToken, httpReturned404) {
|
|
408030
408021
|
if (httpReturned404) {
|
|
408031
408022
|
debugLogger.log(`Retrying SSE connection to '${serverName}' with OAuth token...`);
|
|
408032
|
-
|
|
408023
|
+
await connectWithSSETransport(client, config3, accessToken);
|
|
408033
408024
|
debugLogger.log(`Successfully connected to '${serverName}' using SSE with OAuth.`);
|
|
408034
|
-
return
|
|
408025
|
+
return;
|
|
408035
408026
|
}
|
|
408036
408027
|
debugLogger.log(`Retrying connection to '${serverName}' with OAuth token...`);
|
|
408037
408028
|
const httpTransport = await createTransportWithOAuth(serverName, config3, accessToken);
|
|
@@ -408043,14 +408034,12 @@ async function retryWithOAuth(client, serverName, config3, accessToken, httpRetu
|
|
|
408043
408034
|
timeout: config3.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
|
|
408044
408035
|
});
|
|
408045
408036
|
debugLogger.log(`Successfully connected to '${serverName}' using HTTP with OAuth.`);
|
|
408046
|
-
return httpTransport;
|
|
408047
408037
|
} catch (httpError) {
|
|
408048
408038
|
await httpTransport.close();
|
|
408049
408039
|
if (String(httpError).includes("404") && config3.url && !config3.type && !config3.httpUrl) {
|
|
408050
408040
|
debugLogger.log(`HTTP with OAuth returned 404, trying SSE with OAuth...`);
|
|
408051
|
-
|
|
408041
|
+
await connectWithSSETransport(client, config3, accessToken);
|
|
408052
408042
|
debugLogger.log(`Successfully connected to '${serverName}' using SSE with OAuth.`);
|
|
408053
|
-
return sseTransport;
|
|
408054
408043
|
} else {
|
|
408055
408044
|
throw httpError;
|
|
408056
408045
|
}
|
|
@@ -408106,7 +408095,7 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
|
|
|
408106
408095
|
await mcpClient.connect(transport, {
|
|
408107
408096
|
timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
|
|
408108
408097
|
});
|
|
408109
|
-
return
|
|
408098
|
+
return mcpClient;
|
|
408110
408099
|
} catch (error2) {
|
|
408111
408100
|
await transport.close();
|
|
408112
408101
|
firstAttemptError = error2;
|
|
@@ -408123,9 +408112,9 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
|
|
|
408123
408112
|
const logMessage = httpReturned404 ? `HTTP returned 404, trying SSE transport...` : `HTTP connection failed, attempting SSE fallback...`;
|
|
408124
408113
|
debugLogger.log(`MCP server '${mcpServerName}': ${logMessage}`);
|
|
408125
408114
|
try {
|
|
408126
|
-
|
|
408115
|
+
await connectWithSSETransport(mcpClient, mcpServerConfig, await getStoredOAuthToken(mcpServerName));
|
|
408127
408116
|
debugLogger.log(`MCP server '${mcpServerName}': Successfully connected using SSE transport.`);
|
|
408128
|
-
return
|
|
408117
|
+
return mcpClient;
|
|
408129
408118
|
} catch (sseFallbackError) {
|
|
408130
408119
|
sseError = sseFallbackError;
|
|
408131
408120
|
if (isAuthenticationError(sseError)) {
|
|
@@ -408186,8 +408175,8 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
|
|
|
408186
408175
|
if (!accessToken) {
|
|
408187
408176
|
throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
|
|
408188
408177
|
}
|
|
408189
|
-
|
|
408190
|
-
return
|
|
408178
|
+
await retryWithOAuth(mcpClient, mcpServerName, mcpServerConfig, accessToken, httpReturned404);
|
|
408179
|
+
return mcpClient;
|
|
408191
408180
|
} else {
|
|
408192
408181
|
throw new Error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
|
|
408193
408182
|
}
|
|
@@ -408224,7 +408213,7 @@ async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig,
|
|
|
408224
408213
|
await mcpClient.connect(oauthTransport, {
|
|
408225
408214
|
timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC
|
|
408226
408215
|
});
|
|
408227
|
-
return
|
|
408216
|
+
return mcpClient;
|
|
408228
408217
|
} else {
|
|
408229
408218
|
throw new Error(`OAuth configuration failed for '${mcpServerName}'. Please authenticate manually with /mcp auth ${mcpServerName}`);
|
|
408230
408219
|
}
|