diff --git a/README.md b/README.md
index 2b25865179..93485498ed 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ Integrate Gemini CLI directly into your GitHub workflows with
Choose the authentication method that best fits your needs:
-### Option 1: Login with Google (OAuth login using your Google Account)
+### Option 1: Sign in with Google (OAuth login using your Google Account)
**✨ Best for:** Individual developers as well as anyone who has a Gemini Code
Assist License. (see
@@ -161,7 +161,7 @@ for details)
- **No API key management** - just sign in with your Google account
- **Automatic updates** to latest models
-#### Start Gemini CLI, then choose _Login with Google_ and follow the browser authentication flow when prompted
+#### Start Gemini CLI, then choose _Sign in with Google_ and follow the browser authentication flow when prompted
```bash
gemini
diff --git a/docs/cli/headless.md b/docs/cli/headless.md
index dd9a385313..c83ce70d0e 100644
--- a/docs/cli/headless.md
+++ b/docs/cli/headless.md
@@ -31,7 +31,8 @@ Returns a stream of newline-delimited JSON (JSONL) events.
- `tool_use`: Tool call requests with arguments.
- `tool_result`: Output from executed tools.
- `error`: Non-fatal warnings and system errors.
- - `result`: Final outcome with aggregated statistics.
+ - `result`: Final outcome with aggregated statistics and per-model token usage
+ breakdowns.
## Exit codes
diff --git a/docs/cli/settings.md b/docs/cli/settings.md
index c7eb34565c..111cf9d3e1 100644
--- a/docs/cli/settings.md
+++ b/docs/cli/settings.md
@@ -66,7 +66,7 @@ they appear in the UI.
| Show Line Numbers | `ui.showLineNumbers` | Show line numbers in the chat. | `true` |
| Show Citations | `ui.showCitations` | Show citations for generated text in the chat. | `false` |
| Show Model Info In Chat | `ui.showModelInfoInChat` | Show the model name in the chat for each model turn. | `false` |
-| Show User Identity | `ui.showUserIdentity` | Show the logged-in user's identity (e.g. email) in the UI. | `true` |
+| Show User Identity | `ui.showUserIdentity` | Show the signed-in user's identity (e.g. email) in the UI. | `true` |
| Use Alternate Screen Buffer | `ui.useAlternateBuffer` | Use an alternate screen buffer for the UI, preserving shell history. | `false` |
| Use Background Color | `ui.useBackgroundColor` | Whether to use background colors in the UI. | `true` |
| Incremental Rendering | `ui.incrementalRendering` | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true` |
diff --git a/docs/cli/tutorials/mcp-setup.md b/docs/cli/tutorials/mcp-setup.md
index 8723a65892..76c2806f9d 100644
--- a/docs/cli/tutorials/mcp-setup.md
+++ b/docs/cli/tutorials/mcp-setup.md
@@ -89,7 +89,7 @@ don't need to learn special commands; just ask in natural language.
The agent will:
1. Recognize the request matches a GitHub tool.
-2. Call `github_list_pull_requests`.
+2. Call `mcp_github_list_pull_requests`.
3. Present the data to you.
### Scenario: Creating an issue
diff --git a/docs/core/subagents.md b/docs/core/subagents.md
index 37085569af..e464566c01 100644
--- a/docs/core/subagents.md
+++ b/docs/core/subagents.md
@@ -194,7 +194,7 @@ returns coordinates and element descriptions that the browser agent uses with
the `click_at` tool for precise, coordinate-based interactions.
> **Note:** The visual agent requires API key or Vertex AI authentication. It is
-> not available when using Google Login.
+> not available when using "Sign in with Google".
## Creating custom subagents
diff --git a/docs/extensions/reference.md b/docs/extensions/reference.md
index dbba51fa40..e6012f4d33 100644
--- a/docs/extensions/reference.md
+++ b/docs/extensions/reference.md
@@ -262,12 +262,14 @@ but lower priority than user or admin policies.
```toml
[[rule]]
-toolName = "my_server__dangerous_tool"
+mcpName = "my_server"
+toolName = "dangerous_tool"
decision = "ask_user"
priority = 100
[[safety_checker]]
-toolName = "my_server__write_data"
+mcpName = "my_server"
+toolName = "write_data"
priority = 200
[safety_checker.checker]
type = "in-process"
diff --git a/docs/get-started/authentication.md b/docs/get-started/authentication.md
index bc603bbdf3..964e776567 100644
--- a/docs/get-started/authentication.md
+++ b/docs/get-started/authentication.md
@@ -17,8 +17,8 @@ Select the authentication method that matches your situation in the table below:
| User Type / Scenario | Recommended Authentication Method | Google Cloud Project Required |
| :--------------------------------------------------------------------- | :--------------------------------------------------------------- | :---------------------------------------------------------- |
-| Individual Google accounts | [Login with Google](#login-google) | No, with exceptions |
-| Organization users with a company, school, or Google Workspace account | [Login with Google](#login-google) | [Yes](#set-gcp) |
+| Individual Google accounts | [Sign in with Google](#login-google) | No, with exceptions |
+| Organization users with a company, school, or Google Workspace account | [Sign in with Google](#login-google) | [Yes](#set-gcp) |
| AI Studio user with a Gemini API key | [Use Gemini API Key](#gemini-api) | No |
| Google Cloud Vertex AI user | [Vertex AI](#vertex-ai) | [Yes](#set-gcp) |
| [Headless mode](#headless) | [Use Gemini API Key](#gemini-api) or
[Vertex AI](#vertex-ai) | No (for Gemini API Key)
[Yes](#set-gcp) (for Vertex AI) |
@@ -36,7 +36,7 @@ Select the authentication method that matches your situation in the table below:
[Google AI Ultra for Business](https://support.google.com/a/answer/16345165)
subscriptions.
-## (Recommended) Login with Google
+## (Recommended) Sign in with Google
If you run Gemini CLI on your local machine, the simplest authentication method
is logging in with your Google account. This method requires a web browser on a
@@ -54,9 +54,9 @@ To authenticate and use Gemini CLI:
gemini
```
-2. Select **Login with Google**. Gemini CLI opens a login prompt using your web
- browser. Follow the on-screen instructions. Your credentials will be cached
- locally for future sessions.
+2. Select **Sign in with Google**. Gemini CLI opens a sign in prompt using your
+ web browser. Follow the on-screen instructions. Your credentials will be
+ cached locally for future sessions.
### Do I need to set my Google Cloud project?
@@ -391,7 +391,7 @@ on this page.
[Headless mode](../cli/headless) will use your existing authentication method,
if an existing authentication credential is cached.
-If you have not already logged in with an authentication credential, you must
+If you have not already signed in with an authentication credential, you must
configure authentication using environment variables:
- [Use Gemini API Key](#gemini-api)
diff --git a/docs/get-started/index.md b/docs/get-started/index.md
index c516f90ac4..566ac6e9df 100644
--- a/docs/get-started/index.md
+++ b/docs/get-started/index.md
@@ -38,7 +38,7 @@ cases, you can log in with your existing Google account:
```
2. When asked "How would you like to authenticate for this project?" select **1.
- Login with Google**.
+ Sign in with Google**.
3. Select your Google account.
diff --git a/docs/hooks/reference.md b/docs/hooks/reference.md
index a750bc94b3..5242c3a13d 100644
--- a/docs/hooks/reference.md
+++ b/docs/hooks/reference.md
@@ -85,7 +85,7 @@ compared against the name of the tool being executed.
`run_shell_command`). See the [Tools Reference](../reference/tools) for a full
list of available tool names.
- **MCP Tools**: Tools from MCP servers follow the naming pattern
- `mcp____`.
+ `mcp__`.
- **Regex Support**: Matchers support regular expressions (e.g.,
`matcher: "read_.*"` matches all file reading tools).
diff --git a/docs/reference/configuration.md b/docs/reference/configuration.md
index 05f3df525f..72647b19e4 100644
--- a/docs/reference/configuration.md
+++ b/docs/reference/configuration.md
@@ -297,7 +297,7 @@ their corresponding top-level category object in your `settings.json` file.
- **Default:** `false`
- **`ui.showUserIdentity`** (boolean):
- - **Description:** Show the logged-in user's identity (e.g. email) in the UI.
+ - **Description:** Show the signed-in user's identity (e.g. email) in the UI.
- **Default:** `true`
- **`ui.useAlternateBuffer`** (boolean):
@@ -1003,6 +1003,12 @@ their corresponding top-level category object in your `settings.json` file.
- **Default:** `false`
- **Requires restart:** Yes
+- **`experimental.extensionRegistryURI`** (string):
+ - **Description:** The URI (web URL or local file path) of the extension
+ registry.
+ - **Default:** `"https://geminicli.com/extensions.json"`
+ - **Requires restart:** Yes
+
- **`experimental.extensionReloading`** (boolean):
- **Description:** Enables extension loading/unloading within the CLI session.
- **Default:** `false`
@@ -1176,13 +1182,20 @@ their corresponding top-level category object in your `settings.json` file.
Configures connections to one or more Model-Context Protocol (MCP) servers for
discovering and using custom tools. Gemini CLI attempts to connect to each
-configured MCP server to discover available tools. If multiple MCP servers
-expose a tool with the same name, the tool names will be prefixed with the
-server alias you defined in the configuration (e.g.,
-`serverAlias__actualToolName`) to avoid conflicts. Note that the system might
-strip certain schema properties from MCP tool definitions for compatibility. At
-least one of `command`, `url`, or `httpUrl` must be provided. If multiple are
-specified, the order of precedence is `httpUrl`, then `url`, then `command`.
+configured MCP server to discover available tools. Every discovered tool is
+prepended with the `mcp_` prefix and its server alias to form a fully qualified
+name (FQN) (e.g., `mcp_serverAlias_actualToolName`) to avoid conflicts. Note
+that the system might strip certain schema properties from MCP tool definitions
+for compatibility. At least one of `command`, `url`, or `httpUrl` must be
+provided. If multiple are specified, the order of precedence is `httpUrl`, then
+`url`, then `command`.
+
+> **Warning:** Avoid using underscores (`_`) in your server aliases (e.g., use
+> `my-server` instead of `my_server`). The underlying policy engine parses Fully
+> Qualified Names (`mcp_server_tool`) using the first underscore after the
+> `mcp_` prefix. An underscore in your server alias will cause the parser to
+> misidentify the server name, which can cause security policies to fail
+> silently.
- **`mcpServers.`** (object): The server parameters for the named
server.
diff --git a/docs/reference/keyboard-shortcuts.md b/docs/reference/keyboard-shortcuts.md
index 097b380268..3529ead3ec 100644
--- a/docs/reference/keyboard-shortcuts.md
+++ b/docs/reference/keyboard-shortcuts.md
@@ -106,20 +106,25 @@ available combinations.
| Cycle through approval modes: default (prompt), auto_edit (auto-approve edits), and plan (read-only). Plan mode is skipped when the agent is busy. | `Shift+Tab` |
| Expand and collapse blocks of content when not in alternate buffer mode. | `Ctrl+O` |
| Expand or collapse a paste placeholder when cursor is over placeholder. | `Ctrl+O` |
-| Toggle current background shell visibility. | `Ctrl+B` |
-| Toggle background shell list. | `Ctrl+L` |
-| Kill the active background shell. | `Ctrl+K` |
-| Confirm selection in background shell list. | `Enter` |
-| Dismiss background shell list. | `Esc` |
-| Move focus from background shell to Gemini. | `Shift+Tab` |
-| Move focus from background shell list to Gemini. | `Tab` |
-| Show warning when trying to move focus away from background shell. | `Tab` |
-| Show warning when trying to move focus away from shell input. | `Tab` |
| Move focus from Gemini to the active shell. | `Tab` |
| Move focus from the shell back to Gemini. | `Shift+Tab` |
| Clear the terminal screen and redraw the UI. | `Ctrl+L` |
| Restart the application. | `R`
`Shift+R` |
| Suspend the CLI and move it to the background. | `Ctrl+Z` |
+| Show warning when trying to move focus away from shell input. | `Tab` |
+
+#### Background Shell Controls
+
+| Action | Keys |
+| ------------------------------------------------------------------ | ----------- |
+| Dismiss background shell list. | `Esc` |
+| Confirm selection in background shell list. | `Enter` |
+| Toggle current background shell visibility. | `Ctrl+B` |
+| Toggle background shell list. | `Ctrl+L` |
+| Kill the active background shell. | `Ctrl+K` |
+| Move focus from background shell to Gemini. | `Shift+Tab` |
+| Move focus from background shell list to Gemini. | `Tab` |
+| Show warning when trying to move focus away from background shell. | `Tab` |
diff --git a/docs/reference/policy-engine.md b/docs/reference/policy-engine.md
index c0a331d99d..2ea23d4be4 100644
--- a/docs/reference/policy-engine.md
+++ b/docs/reference/policy-engine.md
@@ -76,9 +76,13 @@ The `toolName` in the rule must match the name of the tool being called.
- **Wildcards**: You can use wildcards to match multiple tools.
- `*`: Matches **any tool** (built-in or MCP).
- - `server__*`: Matches any tool from a specific MCP server.
- - `*__toolName`: Matches a specific tool name across **all** MCP servers.
- - `*__*`: Matches **any tool from any MCP server**.
+ - `mcp_server_*`: Matches any tool from a specific MCP server.
+ - `mcp_*_toolName`: Matches a specific tool name across **all** MCP servers.
+ - `mcp_*`: Matches **any tool from any MCP server**.
+
+> **Recommendation:** While FQN wildcards are supported, the recommended
+> approach for MCP tools is to use the `mcpName` field in your TOML rules. See
+> [Special syntax for MCP tools](#special-syntax-for-mcp-tools).
#### Arguments pattern
@@ -164,8 +168,8 @@ A rule matches a tool call if all of its conditions are met:
1. **Tool name**: The `toolName` in the rule must match the name of the tool
being called.
- - **Wildcards**: You can use wildcards like `*`, `server__*`, or
- `*__toolName` to match multiple tools. See [Tool Name](#tool-name) for
+ - **Wildcards**: You can use wildcards like `*`, `mcp_server_*`, or
+ `mcp_*_toolName` to match multiple tools. See [Tool Name](#tool-name) for
details.
2. **Arguments pattern**: If `argsPattern` is specified, the tool's arguments
are converted to a stable JSON string, which is then tested against the
@@ -224,7 +228,7 @@ toolName = "run_shell_command"
subagent = "generalist"
# (Optional) The name of an MCP server. Can be combined with toolName
-# to form a composite name like "mcpName__toolName".
+# to form a composite FQN internally like "mcp_mcpName_toolName".
mcpName = "my-custom-server"
# (Optional) Metadata hints provided by the tool. A rule matches if all
@@ -301,7 +305,16 @@ priority = 100
### Special syntax for MCP tools
You can create rules that target tools from Model Context Protocol (MCP) servers
-using the `mcpName` field or composite wildcard patterns.
+using the `mcpName` field. **This is the recommended approach** for defining MCP
+policies, as it is much more robust than manually writing Fully Qualified Names
+(FQNs) or string wildcards.
+
+> **Warning:** Do not use underscores (`_`) in your MCP server names (e.g., use
+> `my-server` rather than `my_server`). The policy parser splits Fully Qualified
+> Names (`mcp_server_tool`) on the _first_ underscore following the `mcp_`
+> prefix. If your server name contains an underscore, the parser will
+> misinterpret the server identity, which can cause wildcard rules and security
+> policies to fail silently.
**1. Targeting a specific tool on a server**
diff --git a/docs/release-confidence.md b/docs/release-confidence.md
index f2dcccff4f..536e49772c 100644
--- a/docs/release-confidence.md
+++ b/docs/release-confidence.md
@@ -79,8 +79,8 @@ manually run through this checklist.
- [ ] Verify version: `gemini --version`
- **Authentication:**
- - [ ] In interactive mode run `/auth` and verify all login flows work:
- - [ ] Login With Google
+ - [ ] In interactive mode run `/auth` and verify all sign in flows work:
+ - [ ] Sign in with Google
- [ ] API Key
- [ ] Vertex AI
diff --git a/docs/resources/tos-privacy.md b/docs/resources/tos-privacy.md
index 98d4a58b98..00de950e74 100644
--- a/docs/resources/tos-privacy.md
+++ b/docs/resources/tos-privacy.md
@@ -46,7 +46,7 @@ for further information.
| Gemini Developer API Key | Gemini API - Paid Services | [Gemini API Terms of Service - Paid Services](https://ai.google.dev/gemini-api/terms#paid-services) | [Google Privacy Policy](https://policies.google.com/privacy) |
| Vertex AI GenAI API Key | Vertex AI GenAI API | [Google Cloud Platform Terms of Service](https://cloud.google.com/terms/service-terms/) | [Google Cloud Privacy Notice](https://cloud.google.com/terms/cloud-privacy-notice) |
-## 1. If you have logged in with your Google account to Gemini Code Assist
+## 1. If you have signed in with your Google account to Gemini Code Assist
For users who use their Google account to access
[Gemini Code Assist](https://codeassist.google), these Terms of Service and
@@ -68,7 +68,7 @@ Code Assist Standard or Enterprise edition, the terms and privacy policy of
Gemini Code Assist Standard or Enterprise edition will apply to all your use of
Gemini Code Assist._
-## 2. If you have logged in with a Gemini API key to the Gemini Developer API
+## 2. If you have signed in with a Gemini API key to the Gemini Developer API
If you are using a Gemini API key for authentication with the
[Gemini Developer API](https://ai.google.dev/gemini-api/docs), these Terms of
@@ -84,7 +84,7 @@ Service and Privacy Notice documents apply:
- Privacy Notice: The collection and use of your data is described in the
[Google Privacy Policy](https://policies.google.com/privacy).
-## 3. If you have logged in with a Gemini API key to the Vertex AI GenAI API
+## 3. If you have signed in with a Gemini API key to the Vertex AI GenAI API
If you are using a Gemini API key for authentication with a
[Vertex AI GenAI API](https://cloud.google.com/vertex-ai/generative-ai/docs/reference/rest)
diff --git a/docs/resources/troubleshooting.md b/docs/resources/troubleshooting.md
index ea6341a0d6..3a7cd35b19 100644
--- a/docs/resources/troubleshooting.md
+++ b/docs/resources/troubleshooting.md
@@ -29,13 +29,13 @@ topics on:
added to your organization's Gemini Code Assist subscription.
- **Error:
- `Failed to login. Message: Your current account is not eligible... because it is not currently available in your location.`**
+ `Failed to sign in. Message: Your current account is not eligible... because it is not currently available in your location.`**
- **Cause:** Gemini CLI does not currently support your location. For a full
list of supported locations, see the following pages:
- Gemini Code Assist for individuals:
[Available locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)
-- **Error: `Failed to login. Message: Request contains an invalid argument`**
+- **Error: `Failed to sign in. Message: Request contains an invalid argument`**
- **Cause:** Users with Google Workspace accounts or Google Cloud accounts
associated with their Gmail accounts may not be able to activate the free
tier of the Google Code Assist plan.
diff --git a/docs/tools/mcp-server.md b/docs/tools/mcp-server.md
index ee35fefd61..426fac30da 100644
--- a/docs/tools/mcp-server.md
+++ b/docs/tools/mcp-server.md
@@ -555,21 +555,34 @@ Upon successful connection:
`excludeTools` configuration
4. **Name sanitization:** Tool names are cleaned to meet Gemini API
requirements:
- - Invalid characters (non-alphanumeric, underscore, dot, hyphen) are replaced
- with underscores
+ - Characters other than letters, numbers, underscore (`_`), hyphen (`-`), dot
+ (`.`), and colon (`:`) are replaced with underscores
- Names longer than 63 characters are truncated with middle replacement
- (`___`)
+ (`...`)
-### 3. Conflict resolution
+### 3. Tool naming and namespaces
-When multiple servers expose tools with the same name:
+To prevent collisions across multiple servers or conflicting built-in tools,
+every discovered MCP tool is assigned a strict namespace.
-1. **First registration wins:** The first server to register a tool name gets
- the unprefixed name
-2. **Automatic prefixing:** Subsequent servers get prefixed names:
- `serverName__toolName`
-3. **Registry tracking:** The tool registry maintains mappings between server
- names and their tools
+1. **Automatic FQN:** All MCP tools are unconditionally assigned a fully
+ qualified name (FQN) using the format `mcp_{serverName}_{toolName}`.
+2. **Registry tracking:** The tool registry maintains metadata mappings between
+ these FQNs and their original server identities.
+3. **Overwrites:** If two servers share the exact same alias in your
+ configuration and provide tools with the exact same name, the last registered
+ tool overwrites the previous one.
+4. **Policies:** To configure permissions (like auto-approval or denial) for MCP
+ tools, see
+ [Special syntax for MCP tools](../reference/policy-engine.md#special-syntax-for-mcp-tools)
+ in the Policy Engine documentation.
+
+> **Warning:** Do not use underscores (`_`) in your MCP server names (e.g., use
+> `my-server` rather than `my_server`). The policy parser splits Fully Qualified
+> Names (`mcp_server_tool`) on the _first_ underscore following the `mcp_`
+> prefix. If your server name contains an underscore, the parser will
+> misinterpret the server identity, which can cause wildcard rules and security
+> policies to fail silently.
### 4. Schema processing
@@ -695,7 +708,7 @@ MCP Servers Status:
🐳 dockerizedServer (CONNECTED)
Command: docker run -i --rm -e API_KEY my-mcp-server:latest
- Tools: docker__deploy, docker__status
+ Tools: mcp_dockerizedServer_docker_deploy, mcp_dockerizedServer_docker_status
Discovery State: COMPLETED
```
diff --git a/package-lock.json b/package-lock.json
index b49fff2113..8a43a9f7d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -83,47 +83,6 @@
"node-pty": "^1.0.0"
}
},
- "node_modules/@a2a-js/sdk": {
- "version": "0.3.11",
- "resolved": "https://registry.npmjs.org/@a2a-js/sdk/-/sdk-0.3.11.tgz",
- "integrity": "sha512-pXjjlL0ZYHgAxObov1J+W3ylfQV0rOrDBB8Eo4a9eCunqs7iNW5OIfMcV8YnZQdzeVSRomj8jHeudVz0zc4RNw==",
- "license": "Apache-2.0",
- "dependencies": {
- "uuid": "^11.1.0"
- },
- "engines": {
- "node": ">=18"
- },
- "peerDependencies": {
- "@bufbuild/protobuf": "^2.10.2",
- "@grpc/grpc-js": "^1.11.0",
- "express": "^4.21.2 || ^5.1.0"
- },
- "peerDependenciesMeta": {
- "@bufbuild/protobuf": {
- "optional": true
- },
- "@grpc/grpc-js": {
- "optional": true
- },
- "express": {
- "optional": true
- }
- }
- },
- "node_modules/@a2a-js/sdk/node_modules/uuid": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
- "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
- "funding": [
- "https://github.com/sponsors/broofa",
- "https://github.com/sponsors/ctavan"
- ],
- "license": "MIT",
- "bin": {
- "uuid": "dist/esm/bin/uuid"
- }
- },
"node_modules/@agentclientprotocol/sdk": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/@agentclientprotocol/sdk/-/sdk-0.12.0.tgz",
@@ -1013,9 +972,9 @@
}
},
"node_modules/@eslint-community/eslint-utils": {
- "version": "4.9.1",
- "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
- "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+ "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1045,9 +1004,9 @@
}
},
"node_modules/@eslint-community/regexpp": {
- "version": "4.12.2",
- "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
- "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
+ "version": "4.12.1",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+ "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -1055,13 +1014,13 @@
}
},
"node_modules/@eslint/config-array": {
- "version": "0.21.1",
- "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
- "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
+ "version": "0.20.1",
+ "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
+ "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
- "@eslint/object-schema": "^2.1.7",
+ "@eslint/object-schema": "^2.1.6",
"debug": "^4.3.1",
"minimatch": "^3.1.2"
},
@@ -1069,62 +1028,20 @@
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
}
},
- "node_modules/@eslint/config-array/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/@eslint/config-array/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/@eslint/config-array/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/@eslint/config-helpers": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
- "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
+ "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
"dev": true,
"license": "Apache-2.0",
- "dependencies": {
- "@eslint/core": "^0.17.0"
- },
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
}
},
"node_modules/@eslint/core": {
- "version": "0.17.0",
- "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
- "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+ "version": "0.14.0",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
+ "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
@@ -1135,20 +1052,20 @@
}
},
"node_modules/@eslint/eslintrc": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.4.tgz",
- "integrity": "sha512-4h4MVF8pmBsncB60r0wSJiIeUKTSD4m7FmTFThG8RHlsg9ajqckLm9OraguFGZE4vVdpiI1Q4+hFnisopmG6gQ==",
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+ "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "ajv": "^6.14.0",
+ "ajv": "^6.12.4",
"debug": "^4.3.2",
"espree": "^10.0.1",
"globals": "^14.0.0",
"ignore": "^5.2.0",
"import-fresh": "^3.2.1",
- "js-yaml": "^4.1.1",
- "minimatch": "^3.1.3",
+ "js-yaml": "^4.1.0",
+ "minimatch": "^3.1.2",
"strip-json-comments": "^3.1.1"
},
"engines": {
@@ -1158,29 +1075,6 @@
"url": "https://opencollective.com/eslint"
}
},
- "node_modules/@eslint/eslintrc/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
"node_modules/@eslint/eslintrc/node_modules/globals": {
"version": "14.0.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -1194,26 +1088,10 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/@eslint/eslintrc/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/@eslint/js": {
- "version": "9.39.3",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.3.tgz",
- "integrity": "sha512-1B1VkCq6FuUNlQvlBYb+1jDu/gV297TIs/OeiaSR9l1H27SVW55ONE1e1Vp16NqP683+xEGzxYtv4XCiDPaQiw==",
+ "version": "9.29.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
+ "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -1224,9 +1102,9 @@
}
},
"node_modules/@eslint/object-schema": {
- "version": "2.1.7",
- "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
- "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
+ "version": "2.1.6",
+ "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+ "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
"dev": true,
"license": "Apache-2.0",
"engines": {
@@ -1234,19 +1112,32 @@
}
},
"node_modules/@eslint/plugin-kit": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
- "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+ "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
- "@eslint/core": "^0.17.0",
+ "@eslint/core": "^0.15.2",
"levn": "^0.4.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
}
},
+ "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+ "version": "0.15.2",
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+ "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@types/json-schema": "^7.0.15"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ }
+ },
"node_modules/@google-cloud/common": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-5.0.2.tgz",
@@ -1427,9 +1318,9 @@
}
},
"node_modules/@google-cloud/storage": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.19.0.tgz",
- "integrity": "sha512-n2FjE7NAOYyshogdc7KQOl/VZb4sneqPjWouSyia9CMDdMhRX5+RIbqalNmC7LOLzuLAN89VlF2HvG8na9G+zQ==",
+ "version": "7.17.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.17.0.tgz",
+ "integrity": "sha512-5m9GoZqKh52a1UqkxDBu/+WVFDALNtHg5up5gNmNbXQWBcV813tzJKsyDtKjOPrlR1em1TxtD7NSPCrObH7koQ==",
"license": "Apache-2.0",
"dependencies": {
"@google-cloud/paginator": "^5.0.0",
@@ -1438,7 +1329,7 @@
"abort-controller": "^3.0.0",
"async-retry": "^1.3.3",
"duplexify": "^4.1.3",
- "fast-xml-parser": "^5.3.4",
+ "fast-xml-parser": "^4.4.1",
"gaxios": "^6.0.2",
"google-auth-library": "^9.6.3",
"html-entities": "^2.5.2",
@@ -1486,21 +1377,19 @@
"link": true
},
"node_modules/@google/genai": {
- "version": "1.41.0",
- "resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.41.0.tgz",
- "integrity": "sha512-S4WGil+PG0NBQRAx+0yrQuM/TWOLn2gGEy5wn4IsoOI6ouHad0P61p3OWdhJ3aqr9kfj8o904i/jevfaGoGuIQ==",
+ "version": "1.30.0",
+ "resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.30.0.tgz",
+ "integrity": "sha512-3MRcgczBFbUat1wIlZoLJ0vCCfXgm7Qxjh59cZi2X08RgWLtm9hKOspzp7TOg1TV2e26/MLxR2GR5yD5GmBV2w==",
"license": "Apache-2.0",
"dependencies": {
"google-auth-library": "^10.3.0",
- "p-retry": "^7.1.1",
- "protobufjs": "^7.5.4",
"ws": "^8.18.0"
},
"engines": {
"node": ">=20.0.0"
},
"peerDependencies": {
- "@modelcontextprotocol/sdk": "^1.25.2"
+ "@modelcontextprotocol/sdk": "^1.20.1"
},
"peerDependenciesMeta": {
"@modelcontextprotocol/sdk": {
@@ -1596,36 +1485,18 @@
}
},
"node_modules/@grpc/grpc-js": {
- "version": "1.14.3",
- "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.3.tgz",
- "integrity": "sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==",
+ "version": "1.13.4",
+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.4.tgz",
+ "integrity": "sha512-GsFaMXCkMqkKIvwCQjCrwH+GHbPKBjhwo/8ZuUkWHqbI73Kky9I+pQltrlT0+MWpedCoosda53lgjYfyEPgxBg==",
"license": "Apache-2.0",
"dependencies": {
- "@grpc/proto-loader": "^0.8.0",
+ "@grpc/proto-loader": "^0.7.13",
"@js-sdsl/ordered-map": "^4.4.2"
},
"engines": {
"node": ">=12.10.0"
}
},
- "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.0.tgz",
- "integrity": "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==",
- "license": "Apache-2.0",
- "dependencies": {
- "lodash.camelcase": "^4.3.0",
- "long": "^5.0.0",
- "protobufjs": "^7.5.3",
- "yargs": "^17.7.2"
- },
- "bin": {
- "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
- },
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/@grpc/proto-loader": {
"version": "0.7.15",
"resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz",
@@ -2218,9 +2089,9 @@
}
},
"node_modules/@modelcontextprotocol/sdk/node_modules/ajv": {
- "version": "8.18.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
- "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+ "version": "8.17.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
"license": "MIT",
"dependencies": {
"fast-deep-equal": "^3.1.3",
@@ -3083,6 +2954,12 @@
"node": ">=12.22.0"
}
},
+ "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": {
+ "version": "4.2.10",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+ "license": "ISC"
+ },
"node_modules/@pnpm/npm-conf": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz",
@@ -3492,9 +3369,9 @@
}
},
"node_modules/@secretlint/config-loader/node_modules/ajv": {
- "version": "8.18.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
- "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+ "version": "8.17.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -3555,9 +3432,9 @@
}
},
"node_modules/@secretlint/formatter/node_modules/chalk": {
- "version": "5.6.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
- "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.0.tgz",
+ "integrity": "sha512-46QrSQFyVSEyYAgQ22hQ+zDa60YHA4fBstHmtSApj1Y5vKtG27fWowW03jCk5KcbXEWPZUIR894aARCA/G1kfQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -3859,45 +3736,6 @@
"path-browserify": "^1.0.1"
}
},
- "node_modules/@ts-morph/common/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/@ts-morph/common/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/@ts-morph/common/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/@types/body-parser": {
"version": "1.19.6",
"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
@@ -4439,20 +4277,21 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
- "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz",
+ "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@eslint-community/regexpp": "^4.12.2",
- "@typescript-eslint/scope-manager": "8.56.1",
- "@typescript-eslint/type-utils": "8.56.1",
- "@typescript-eslint/utils": "8.56.1",
- "@typescript-eslint/visitor-keys": "8.56.1",
- "ignore": "^7.0.5",
+ "@eslint-community/regexpp": "^4.10.0",
+ "@typescript-eslint/scope-manager": "8.35.0",
+ "@typescript-eslint/type-utils": "8.35.0",
+ "@typescript-eslint/utils": "8.35.0",
+ "@typescript-eslint/visitor-keys": "8.35.0",
+ "graphemer": "^1.4.0",
+ "ignore": "^7.0.0",
"natural-compare": "^1.4.0",
- "ts-api-utils": "^2.4.0"
+ "ts-api-utils": "^2.1.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4462,9 +4301,9 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "@typescript-eslint/parser": "^8.56.1",
- "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
- "typescript": ">=4.8.4 <6.0.0"
+ "@typescript-eslint/parser": "^8.35.0",
+ "eslint": "^8.57.0 || ^9.0.0",
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
@@ -4478,17 +4317,17 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.1.tgz",
- "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz",
+ "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/scope-manager": "8.56.1",
- "@typescript-eslint/types": "8.56.1",
- "@typescript-eslint/typescript-estree": "8.56.1",
- "@typescript-eslint/visitor-keys": "8.56.1",
- "debug": "^4.4.3"
+ "@typescript-eslint/scope-manager": "8.35.0",
+ "@typescript-eslint/types": "8.35.0",
+ "@typescript-eslint/typescript-estree": "8.35.0",
+ "@typescript-eslint/visitor-keys": "8.35.0",
+ "debug": "^4.3.4"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4498,20 +4337,20 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
- "typescript": ">=4.8.4 <6.0.0"
+ "eslint": "^8.57.0 || ^9.0.0",
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/project-service": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.1.tgz",
- "integrity": "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz",
+ "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/tsconfig-utils": "^8.56.1",
- "@typescript-eslint/types": "^8.56.1",
- "debug": "^4.4.3"
+ "@typescript-eslint/tsconfig-utils": "^8.35.0",
+ "@typescript-eslint/types": "^8.35.0",
+ "debug": "^4.3.4"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4521,18 +4360,18 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "typescript": ">=4.8.4 <6.0.0"
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz",
- "integrity": "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz",
+ "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.56.1",
- "@typescript-eslint/visitor-keys": "8.56.1"
+ "@typescript-eslint/types": "8.35.0",
+ "@typescript-eslint/visitor-keys": "8.35.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4543,9 +4382,9 @@
}
},
"node_modules/@typescript-eslint/tsconfig-utils": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz",
- "integrity": "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz",
+ "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==",
"dev": true,
"license": "MIT",
"engines": {
@@ -4556,21 +4395,20 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "typescript": ">=4.8.4 <6.0.0"
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz",
- "integrity": "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz",
+ "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.56.1",
- "@typescript-eslint/typescript-estree": "8.56.1",
- "@typescript-eslint/utils": "8.56.1",
- "debug": "^4.4.3",
- "ts-api-utils": "^2.4.0"
+ "@typescript-eslint/typescript-estree": "8.35.0",
+ "@typescript-eslint/utils": "8.35.0",
+ "debug": "^4.3.4",
+ "ts-api-utils": "^2.1.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4580,14 +4418,14 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
- "typescript": ">=4.8.4 <6.0.0"
+ "eslint": "^8.57.0 || ^9.0.0",
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/types": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.1.tgz",
- "integrity": "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz",
+ "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -4599,21 +4437,22 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz",
- "integrity": "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz",
+ "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/project-service": "8.56.1",
- "@typescript-eslint/tsconfig-utils": "8.56.1",
- "@typescript-eslint/types": "8.56.1",
- "@typescript-eslint/visitor-keys": "8.56.1",
- "debug": "^4.4.3",
- "minimatch": "^10.2.2",
- "semver": "^7.7.3",
- "tinyglobby": "^0.2.15",
- "ts-api-utils": "^2.4.0"
+ "@typescript-eslint/project-service": "8.35.0",
+ "@typescript-eslint/tsconfig-utils": "8.35.0",
+ "@typescript-eslint/types": "8.35.0",
+ "@typescript-eslint/visitor-keys": "8.35.0",
+ "debug": "^4.3.4",
+ "fast-glob": "^3.3.2",
+ "is-glob": "^4.0.3",
+ "minimatch": "^9.0.4",
+ "semver": "^7.6.0",
+ "ts-api-utils": "^2.1.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4623,59 +4462,20 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "typescript": ">=4.8.4 <6.0.0"
- }
- },
- "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.1.tgz",
- "integrity": "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz",
+ "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@eslint-community/eslint-utils": "^4.9.1",
- "@typescript-eslint/scope-manager": "8.56.1",
- "@typescript-eslint/types": "8.56.1",
- "@typescript-eslint/typescript-estree": "8.56.1"
+ "@eslint-community/eslint-utils": "^4.7.0",
+ "@typescript-eslint/scope-manager": "8.35.0",
+ "@typescript-eslint/types": "8.35.0",
+ "@typescript-eslint/typescript-estree": "8.35.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4685,19 +4485,19 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
- "typescript": ">=4.8.4 <6.0.0"
+ "eslint": "^8.57.0 || ^9.0.0",
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz",
- "integrity": "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz",
+ "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.56.1",
- "eslint-visitor-keys": "^5.0.0"
+ "@typescript-eslint/types": "8.35.0",
+ "eslint-visitor-keys": "^4.2.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4707,19 +4507,6 @@
"url": "https://opencollective.com/typescript-eslint"
}
},
- "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
- "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
- "dev": true,
- "license": "Apache-2.0",
- "engines": {
- "node": "^20.19.0 || ^22.13.0 || >=24"
- },
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
- },
"node_modules/@typespec/ts-http-runtime": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.0.tgz",
@@ -4796,6 +4583,148 @@
}
}
},
+ "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/project-service": {
+ "version": "8.47.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.47.0.tgz",
+ "integrity": "sha512-2X4BX8hUeB5JcA1TQJ7GjcgulXQ+5UkNb0DL8gHsHUHdFoiCTJoYLTpib3LtSDPZsRET5ygN4qqIWrHyYIKERA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/tsconfig-utils": "^8.47.0",
+ "@typescript-eslint/types": "^8.47.0",
+ "debug": "^4.3.4"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "typescript": ">=4.8.4 <6.0.0"
+ }
+ },
+ "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+ "version": "8.47.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.47.0.tgz",
+ "integrity": "sha512-a0TTJk4HXMkfpFkL9/WaGTNuv7JWfFTQFJd6zS9dVAjKsojmv9HT55xzbEpnZoY+VUb+YXLMp+ihMLz/UlZfDg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/types": "8.47.0",
+ "@typescript-eslint/visitor-keys": "8.47.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
+ "version": "8.47.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.47.0.tgz",
+ "integrity": "sha512-ybUAvjy4ZCL11uryalkKxuT3w3sXJAuWhOoGS3T/Wu+iUu1tGJmk5ytSY8gbdACNARmcYEB0COksD2j6hfGK2g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "typescript": ">=4.8.4 <6.0.0"
+ }
+ },
+ "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/types": {
+ "version": "8.47.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.47.0.tgz",
+ "integrity": "sha512-nHAE6bMKsizhA2uuYZbEbmp5z2UpffNrPEqiKIeN7VsV6UY/roxanWfoRrf6x/k9+Obf+GQdkm0nPU+vnMXo9A==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+ "version": "8.47.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.47.0.tgz",
+ "integrity": "sha512-k6ti9UepJf5NpzCjH31hQNLHQWupTRPhZ+KFF8WtTuTpy7uHPfeg2NM7cP27aCGajoEplxJDFVCEm9TGPYyiVg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/project-service": "8.47.0",
+ "@typescript-eslint/tsconfig-utils": "8.47.0",
+ "@typescript-eslint/types": "8.47.0",
+ "@typescript-eslint/visitor-keys": "8.47.0",
+ "debug": "^4.3.4",
+ "fast-glob": "^3.3.2",
+ "is-glob": "^4.0.3",
+ "minimatch": "^9.0.4",
+ "semver": "^7.6.0",
+ "ts-api-utils": "^2.1.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "typescript": ">=4.8.4 <6.0.0"
+ }
+ },
+ "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/utils": {
+ "version": "8.47.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.47.0.tgz",
+ "integrity": "sha512-g7XrNf25iL4TJOiPqatNuaChyqt49a/onq5YsJ9+hXeugK+41LVg7AxikMfM02PC6jbNtZLCJj6AUcQXJS/jGQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.7.0",
+ "@typescript-eslint/scope-manager": "8.47.0",
+ "@typescript-eslint/types": "8.47.0",
+ "@typescript-eslint/typescript-estree": "8.47.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^8.57.0 || ^9.0.0",
+ "typescript": ">=4.8.4 <6.0.0"
+ }
+ },
+ "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+ "version": "8.47.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.47.0.tgz",
+ "integrity": "sha512-SIV3/6eftCy1bNzCQoPmbWsRLujS8t5iDIZ4spZOBHqrM+yfX2ogg8Tt3PDTAVKw3sSCiUgg30uOAvK2r9zGjQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/types": "8.47.0",
+ "eslint-visitor-keys": "^4.2.1"
+ },
+ "engines": {
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
"node_modules/@vitest/expect": {
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
@@ -4905,17 +4834,17 @@
}
},
"node_modules/@vscode/vsce": {
- "version": "3.7.1",
- "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-3.7.1.tgz",
- "integrity": "sha512-OTm2XdMt2YkpSn2Nx7z2EJtSuhRHsTPYsSK59hr3v8jRArK+2UEoju4Jumn1CmpgoBLGI6ReHLJ/czYltNUW3g==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-3.6.0.tgz",
+ "integrity": "sha512-u2ZoMfymRNJb14aHNawnXJtXHLXDVKc1oKZaH4VELKT/9iWKRVgtQOdwxCgtwSxJoqYvuK4hGlBWQJ05wxADhg==",
"dev": true,
"license": "MIT",
"dependencies": {
"@azure/identity": "^4.1.0",
- "@secretlint/node": "^10.1.2",
- "@secretlint/secretlint-formatter-sarif": "^10.1.2",
- "@secretlint/secretlint-rule-no-dotenv": "^10.1.2",
- "@secretlint/secretlint-rule-preset-recommend": "^10.1.2",
+ "@secretlint/node": "^10.1.1",
+ "@secretlint/secretlint-formatter-sarif": "^10.1.1",
+ "@secretlint/secretlint-rule-no-dotenv": "^10.1.1",
+ "@secretlint/secretlint-rule-preset-recommend": "^10.1.1",
"@vscode/vsce-sign": "^2.0.0",
"azure-devops-node-api": "^12.5.0",
"chalk": "^4.1.2",
@@ -4932,7 +4861,7 @@
"minimatch": "^3.0.3",
"parse-semver": "^1.1.1",
"read": "^1.0.7",
- "secretlint": "^10.1.2",
+ "secretlint": "^10.1.1",
"semver": "^7.5.2",
"tmp": "^0.2.3",
"typed-rest-client": "^1.8.4",
@@ -5096,70 +5025,6 @@
"win32"
]
},
- "node_modules/@vscode/vsce/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/@vscode/vsce/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/@vscode/vsce/node_modules/glob": {
- "version": "11.1.0",
- "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
- "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
- "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "foreground-child": "^3.3.1",
- "jackspeak": "^4.1.1",
- "minimatch": "^10.1.1",
- "minipass": "^7.1.2",
- "package-json-from-dist": "^1.0.0",
- "path-scurry": "^2.0.0"
- },
- "bin": {
- "glob": "dist/esm/bin.mjs"
- },
- "engines": {
- "node": "20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/@vscode/vsce/node_modules/hosted-git-info": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
@@ -5221,9 +5086,9 @@
}
},
"node_modules/@vue/compiler-core/node_modules/entities": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
- "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.0.tgz",
+ "integrity": "sha512-FDWG5cmEYf2Z00IkYRhbFrwIwvdFKH07uV8dvNy0omp/Qb1xcyCWp2UDtcwJF4QZZvk0sLudP6/hAu42TaqVhQ==",
"dev": true,
"license": "BSD-2-Clause",
"engines": {
@@ -5357,18 +5222,18 @@
}
},
"node_modules/agent-base": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
- "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+ "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
"license": "MIT",
"engines": {
"node": ">= 14"
}
},
"node_modules/ajv": {
- "version": "6.14.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
- "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5400,9 +5265,9 @@
}
},
"node_modules/ajv-formats/node_modules/ajv": {
- "version": "8.18.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
- "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+ "version": "8.17.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
"license": "MIT",
"dependencies": {
"fast-deep-equal": "^3.1.3",
@@ -5422,9 +5287,9 @@
"license": "MIT"
},
"node_modules/ansi-escapes": {
- "version": "7.3.0",
- "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz",
- "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
+ "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
"license": "MIT",
"dependencies": {
"environment": "^1.0.0"
@@ -5773,11 +5638,13 @@
}
},
"node_modules/balanced-match": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
- "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
- "dev": true,
- "license": "MIT"
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+ "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+ "license": "MIT",
+ "engines": {
+ "node": "18 || 20 || >=22"
+ }
},
"node_modules/base64-js": {
"version": "1.5.1",
@@ -5886,14 +5753,15 @@
"license": "BSD-2-Clause"
},
"node_modules/brace-expansion": {
- "version": "1.1.12",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
- "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
- "dev": true,
+ "version": "5.0.4",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
+ "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
"license": "MIT",
"dependencies": {
- "balanced-match": "^1.0.0",
- "concat-map": "0.0.1"
+ "balanced-match": "^4.0.2"
+ },
+ "engines": {
+ "node": "18 || 20 || >=22"
}
},
"node_modules/braces": {
@@ -6155,9 +6023,9 @@
}
},
"node_modules/cheerio/node_modules/entities": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
- "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+ "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
"dev": true,
"license": "BSD-2-Clause",
"engines": {
@@ -6168,9 +6036,9 @@
}
},
"node_modules/cheerio/node_modules/htmlparser2": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.1.0.tgz",
- "integrity": "sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==",
+ "version": "10.0.0",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz",
+ "integrity": "sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==",
"dev": true,
"funding": [
"https://github.com/fb55/htmlparser2?sponsor=1",
@@ -6183,8 +6051,8 @@
"dependencies": {
"domelementtype": "^2.3.0",
"domhandler": "^5.0.3",
- "domutils": "^3.2.2",
- "entities": "^7.0.1"
+ "domutils": "^3.2.1",
+ "entities": "^6.0.0"
}
},
"node_modules/chownr": {
@@ -6258,9 +6126,9 @@
}
},
"node_modules/cli-truncate/node_modules/ansi-styles": {
- "version": "6.2.3",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
- "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
"license": "MIT",
"engines": {
"node": ">=12"
@@ -6270,9 +6138,9 @@
}
},
"node_modules/cli-truncate/node_modules/emoji-regex": {
- "version": "10.6.0",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
- "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
+ "version": "10.4.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+ "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
"license": "MIT"
},
"node_modules/cli-truncate/node_modules/is-fullwidth-code-point": {
@@ -6348,26 +6216,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/clipboardy": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-5.2.1.tgz",
- "integrity": "sha512-RWp4E/ivQAzgF4QSWA9sjeW+Bjo+U2SvebkDhNIfO7y65eGdXPUxMTdIKYsn+bxM3ItPHGm3e68Bv3fgQ3mARw==",
- "license": "MIT",
- "dependencies": {
- "clipboard-image": "^0.1.0",
- "execa": "^9.6.1",
- "is-wayland": "^0.1.0",
- "is-wsl": "^3.1.0",
- "is64bit": "^2.0.0",
- "powershell-utils": "^0.2.0"
- },
- "engines": {
- "node": ">=20"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/cliui": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -6516,12 +6364,6 @@
"color-name": "1.1.3"
}
},
- "node_modules/color/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "license": "MIT"
- },
"node_modules/colorette": {
"version": "2.0.20",
"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
@@ -6593,13 +6435,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/concat-map": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/config-chain": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
@@ -6615,9 +6450,6 @@
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz",
"integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==",
"license": "MIT",
- "dependencies": {
- "safe-buffer": "5.2.1"
- },
"engines": {
"node": ">=18"
},
@@ -7141,29 +6973,6 @@
"sprintf-js": "~1.0.2"
}
},
- "node_modules/depcheck/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/depcheck/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
"node_modules/depcheck/node_modules/camelcase": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
@@ -7223,22 +7032,6 @@
"node": ">=6"
}
},
- "node_modules/depcheck/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/depcheck/node_modules/resolve-from": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -7475,9 +7268,9 @@
}
},
"node_modules/dotenv": {
- "version": "17.3.1",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.3.1.tgz",
- "integrity": "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==",
+ "version": "17.1.0",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.1.0.tgz",
+ "integrity": "sha512-tG9VUTJTuju6GcXgbdsOuRhupE8cb4mRgY5JLRCh4MtGoVo3/gfGUtOMwmProM6d0ba2mCFvv+WrpYJV6qgJXQ==",
"license": "BSD-2-Clause",
"engines": {
"node": ">=12"
@@ -7928,24 +7721,25 @@
}
},
"node_modules/eslint": {
- "version": "9.39.3",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.3.tgz",
- "integrity": "sha512-VmQ+sifHUbI/IcSopBCF/HO3YiHQx/AVd3UVyYL6weuwW+HvON9VYn5l6Zl1WZzPWXPNZrSQpxwkkZ/VuvJZzg==",
+ "version": "9.29.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
+ "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@eslint-community/eslint-utils": "^4.8.0",
+ "@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.12.1",
- "@eslint/config-array": "^0.21.1",
- "@eslint/config-helpers": "^0.4.2",
- "@eslint/core": "^0.17.0",
+ "@eslint/config-array": "^0.20.1",
+ "@eslint/config-helpers": "^0.2.1",
+ "@eslint/core": "^0.14.0",
"@eslint/eslintrc": "^3.3.1",
- "@eslint/js": "9.39.3",
- "@eslint/plugin-kit": "^0.4.1",
+ "@eslint/js": "9.29.0",
+ "@eslint/plugin-kit": "^0.3.1",
"@humanfs/node": "^0.16.6",
"@humanwhocodes/module-importer": "^1.0.1",
"@humanwhocodes/retry": "^0.4.2",
"@types/estree": "^1.0.6",
+ "@types/json-schema": "^7.0.15",
"ajv": "^6.12.4",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.6",
@@ -8100,29 +7894,6 @@
"eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
}
},
- "node_modules/eslint-plugin-import/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
"node_modules/eslint-plugin-import/node_modules/debug": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -8133,22 +7904,6 @@
"ms": "^2.1.1"
}
},
- "node_modules/eslint-plugin-import/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/eslint-plugin-import/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -8205,65 +7960,20 @@
"eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
}
},
- "node_modules/eslint-plugin-react/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/eslint-plugin-react/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/eslint-plugin-react/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/eslint-plugin-react/node_modules/resolve": {
- "version": "2.0.0-next.6",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.6.tgz",
- "integrity": "sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==",
+ "version": "2.0.0-next.5",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+ "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "es-errors": "^1.3.0",
- "is-core-module": "^2.16.1",
- "node-exports-info": "^1.6.0",
- "object-keys": "^1.1.1",
+ "is-core-module": "^2.13.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
},
"bin": {
"resolve": "bin/resolve"
},
- "engines": {
- "node": ">= 0.4"
- },
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@@ -8308,45 +8018,6 @@
"url": "https://opencollective.com/eslint"
}
},
- "node_modules/eslint/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/eslint/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/eslint/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/espree": {
"version": "10.4.0",
"resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
@@ -8501,9 +8172,9 @@
}
},
"node_modules/execa": {
- "version": "9.6.1",
- "resolved": "https://registry.npmjs.org/execa/-/execa-9.6.1.tgz",
- "integrity": "sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==",
+ "version": "9.6.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-9.6.0.tgz",
+ "integrity": "sha512-jpWzZ1ZhwUmeWRhS7Qv3mhpOhLfwI+uAX4e5fOcXqwMR7EcJ0pj2kV1CVzHVMX/LphnKWD3LObjZCoJ71lKpHw==",
"license": "MIT",
"dependencies": {
"@sindresorhus/merge-streams": "^4.0.0",
@@ -8621,15 +8292,6 @@
"express": ">= 4.11"
}
},
- "node_modules/express/node_modules/debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "license": "MIT",
- "dependencies": {
- "ms": "2.0.0"
- }
- },
"node_modules/extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -8761,9 +8423,9 @@
"license": "BSD-3-Clause"
},
"node_modules/fast-xml-parser": {
- "version": "5.3.7",
- "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.7.tgz",
- "integrity": "sha512-JzVLro9NQv92pOM/jTCR6mHlJh2FGwtomH8ZQjhFj/R29P2Fnj38OgPJVtcvYw6SuKClhgYuwUZf5b3rd8u2mA==",
+ "version": "4.5.3",
+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz",
+ "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
"funding": [
{
"type": "github",
@@ -8772,7 +8434,7 @@
],
"license": "MIT",
"dependencies": {
- "strnum": "^2.1.2"
+ "strnum": "^1.1.1"
},
"bin": {
"fxparser": "src/cli/cli.js"
@@ -8881,24 +8543,13 @@
"statuses": "^2.0.1"
},
"engines": {
- "node": ">= 0.8"
+ "node": ">= 18.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/express"
}
},
- "node_modules/finalhandler/node_modules/debug": {
- "version": "2.6.9",
- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "license": "MIT",
- "dependencies": {
- "ms": "2.0.0"
- }
- },
- "node_modules/finalhandler/node_modules/ms": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
- "license": "MIT"
- },
"node_modules/find-up": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -9004,9 +8655,9 @@
}
},
"node_modules/form-data": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
- "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+ "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -9029,16 +8680,6 @@
"node": ">= 18"
}
},
- "node_modules/form-data/node_modules/mime-db": {
- "version": "1.52.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
- "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 0.6"
- }
- },
"node_modules/form-data/node_modules/mime-types": {
"version": "2.1.35",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
@@ -9233,9 +8874,9 @@
}
},
"node_modules/get-east-asian-width": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz",
- "integrity": "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz",
+ "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==",
"license": "MIT",
"engines": {
"node": ">=18"
@@ -9393,42 +9034,6 @@
"tslib": "2"
}
},
- "node_modules/glob/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/glob/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/glob/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/global-modules": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -9475,9 +9080,9 @@
}
},
"node_modules/globals": {
- "version": "16.5.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz",
- "integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==",
+ "version": "16.3.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
+ "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -9704,10 +9309,22 @@
"url": "https://github.com/sindresorhus/got?sponsor=1"
}
},
+ "node_modules/got/node_modules/type-fest": {
+ "version": "4.41.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+ "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+ "license": "(MIT OR CC0-1.0)",
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/graceful-fs": {
- "version": "4.2.10",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
- "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
"license": "ISC"
},
"node_modules/gradient-string": {
@@ -9723,6 +9340,13 @@
"node": ">=10"
}
},
+ "node_modules/graphemer": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/graphql": {
"version": "16.11.0",
"resolved": "https://registry.npmjs.org/graphql/-/graphql-16.11.0.tgz",
@@ -9875,9 +9499,9 @@
}
},
"node_modules/hono": {
- "version": "4.12.2",
- "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.2.tgz",
- "integrity": "sha512-gJnaDHXKDayjt8ue0n8Gs0A007yKXj4Xzb8+cNjZeYsSzzwKc0Lr+OZgYwVfB0pHfUs17EPoLvrOsEaJ9mj+Tg==",
+ "version": "4.11.9",
+ "resolved": "https://registry.npmjs.org/hono/-/hono-4.11.9.tgz",
+ "integrity": "sha512-Eaw2YTGM6WOxA6CXbckaEvslr2Ne4NFsKrvc0v97JD5awbmeBLO5w9Ho9L9kmKonrwF9RJlW6BxT1PVv/agBHQ==",
"license": "MIT",
"engines": {
"node": ">=16.9.0"
@@ -10238,9 +9862,9 @@
}
},
"node_modules/ink/node_modules/ansi-styles": {
- "version": "6.2.3",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
- "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
"license": "MIT",
"engines": {
"node": ">=12"
@@ -10250,9 +9874,9 @@
}
},
"node_modules/ink/node_modules/chalk": {
- "version": "5.6.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
- "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.0.tgz",
+ "integrity": "sha512-46QrSQFyVSEyYAgQ22hQ+zDa60YHA4fBstHmtSApj1Y5vKtG27fWowW03jCk5KcbXEWPZUIR894aARCA/G1kfQ==",
"license": "MIT",
"engines": {
"node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -10283,13 +9907,13 @@
"license": "ISC"
},
"node_modules/ink/node_modules/string-width": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.0.tgz",
- "integrity": "sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==",
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.1.0.tgz",
+ "integrity": "sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==",
"license": "MIT",
"dependencies": {
- "get-east-asian-width": "^1.5.0",
- "strip-ansi": "^7.1.2"
+ "get-east-asian-width": "^1.3.0",
+ "strip-ansi": "^7.1.0"
},
"engines": {
"node": ">=20"
@@ -10298,6 +9922,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/ink/node_modules/type-fest": {
+ "version": "4.41.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+ "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+ "license": "(MIT OR CC0-1.0)",
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/internal-slot": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
@@ -10599,18 +10235,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/is-network-error": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.3.0.tgz",
- "integrity": "sha512-6oIwpsgRfnDiyEDLMay/GqCl3HoAtH5+RUKW29gYkL0QA+ipzpDLA16yQs7/RHCSu+BwgbJaOUqa4A99qNVQVw==",
- "license": "MIT",
- "engines": {
- "node": ">=16"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/is-node-process": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz",
@@ -11112,7 +10736,6 @@
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
- "dev": true,
"license": "MIT"
},
"node_modules/json-schema-typed": {
@@ -11428,9 +11051,9 @@
}
},
"node_modules/lint-staged/node_modules/commander": {
- "version": "14.0.3",
- "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.3.tgz",
- "integrity": "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==",
+ "version": "14.0.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.1.tgz",
+ "integrity": "sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==",
"dev": true,
"license": "MIT",
"engines": {
@@ -11469,9 +11092,9 @@
}
},
"node_modules/listr2/node_modules/cli-truncate": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.1.1.tgz",
- "integrity": "sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.1.0.tgz",
+ "integrity": "sha512-7JDGG+4Zp0CsknDCedl0DYdaeOhc46QNpXi3NLQblkZpXXgA6LncLDUUyvrjSvZeF3VRQa+KiMGomazQrC1V8g==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -11486,14 +11109,14 @@
}
},
"node_modules/listr2/node_modules/string-width": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.0.tgz",
- "integrity": "sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==",
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.1.0.tgz",
+ "integrity": "sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "get-east-asian-width": "^1.5.0",
- "strip-ansi": "^7.1.2"
+ "get-east-asian-width": "^1.3.0",
+ "strip-ansi": "^7.1.0"
},
"engines": {
"node": ">=20"
@@ -12035,16 +11658,18 @@
}
},
"node_modules/minimatch": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.3.tgz",
- "integrity": "sha512-M2GCs7Vk83NxkUyQV1bkABc4yxgz9kILhHImZiBPAZ9ybuvCb0/H7lEl5XvIg3g+9d4eNotkZA5IWwYl0tibaA==",
- "dev": true,
- "license": "ISC",
+ "version": "10.2.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+ "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+ "license": "BlueOak-1.0.0",
"dependencies": {
- "brace-expansion": "^1.1.7"
+ "brace-expansion": "^5.0.2"
},
"engines": {
- "node": "*"
+ "node": "18 || 20 || >=22"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/minimist": {
@@ -12057,10 +11682,10 @@
}
},
"node_modules/minipass": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
- "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
- "license": "BlueOak-1.0.0",
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+ "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+ "license": "ISC",
"engines": {
"node": ">=16 || 14 >=14.17"
}
@@ -12166,6 +11791,26 @@
}
}
},
+ "node_modules/msw/node_modules/path-to-regexp": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+ "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+ "devOptional": true,
+ "license": "MIT"
+ },
+ "node_modules/msw/node_modules/type-fest": {
+ "version": "4.41.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+ "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+ "devOptional": true,
+ "license": "(MIT OR CC0-1.0)",
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/multimatch": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
@@ -12193,45 +11838,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/multimatch/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/multimatch/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/multimatch/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/mute-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
@@ -12323,35 +11929,6 @@
"node": ">=10.5.0"
}
},
- "node_modules/node-exports-info": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/node-exports-info/-/node-exports-info-1.6.0.tgz",
- "integrity": "sha512-pyFS63ptit/P5WqUkt+UUfe+4oevH+bFeIiPPdfb0pFeYEu/1ELnJu5l+5EcTKYL5M7zaAa7S8ddywgXypqKCw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "array.prototype.flatmap": "^1.3.3",
- "es-errors": "^1.3.0",
- "object.entries": "^1.1.9",
- "semver": "^6.3.1"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/node-exports-info/node_modules/semver": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
- "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
- "dev": true,
- "license": "ISC",
- "bin": {
- "semver": "bin/semver.js"
- }
- },
"node_modules/node-fetch": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -12511,29 +12088,6 @@
"node": ">=4"
}
},
- "node_modules/npm-run-all/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/npm-run-all/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
"node_modules/npm-run-all/node_modules/chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -12583,22 +12137,6 @@
"dev": true,
"license": "ISC"
},
- "node_modules/npm-run-all/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/npm-run-all/node_modules/normalize-package-data": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -12665,9 +12203,9 @@
}
},
"node_modules/npm-run-all2/node_modules/ansi-styles": {
- "version": "6.2.3",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
- "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
"dev": true,
"license": "MIT",
"engines": {
@@ -13067,21 +12605,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/p-retry": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-7.1.1.tgz",
- "integrity": "sha512-J5ApzjyRkkf601HpEeykoiCvzHQjWxPAHhyjFcEUP2SWq0+35NKh8TLhpLw+Dkq5TZBFvUM6UigdE9hIVYTl5w==",
- "license": "MIT",
- "dependencies": {
- "is-network-error": "^1.1.0"
- },
- "engines": {
- "node": ">=20"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/package-json": {
"version": "10.0.1",
"resolved": "https://registry.npmjs.org/package-json/-/package-json-10.0.1.tgz",
@@ -13136,6 +12659,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/parse-json/node_modules/type-fest": {
+ "version": "4.41.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+ "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+ "license": "(MIT OR CC0-1.0)",
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/parse-ms": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz",
@@ -13312,21 +12847,14 @@
}
},
"node_modules/path-scurry/node_modules/lru-cache": {
- "version": "11.2.6",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
- "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
- "license": "BlueOak-1.0.0",
+ "version": "11.2.2",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz",
+ "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==",
+ "license": "ISC",
"engines": {
"node": "20 || >=22"
}
},
- "node_modules/path-to-regexp": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
- "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
- "devOptional": true,
- "license": "MIT"
- },
"node_modules/path-type": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
@@ -13601,9 +13129,9 @@
}
},
"node_modules/protobufjs": {
- "version": "7.5.4",
- "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.4.tgz",
- "integrity": "sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==",
+ "version": "7.5.3",
+ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.3.tgz",
+ "integrity": "sha512-sildjKwVqOI2kmFDiXQ6aEB0fjYTafpEvIBs8tOR8qI4spuL9OPROLVu2qZqi/xgCfsHIwVqlaF8JBjWFHnKbw==",
"hasInstallScript": true,
"license": "BSD-3-Clause",
"dependencies": {
@@ -13770,9 +13298,9 @@
}
},
"node_modules/raw-body/node_modules/iconv-lite": {
- "version": "0.7.2",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
- "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz",
+ "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==",
"license": "MIT",
"dependencies": {
"safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -13962,6 +13490,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/read-package-up/node_modules/type-fest": {
+ "version": "4.41.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+ "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+ "license": "(MIT OR CC0-1.0)",
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/read-pkg": {
"version": "9.0.1",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz",
@@ -13981,6 +13521,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/read-pkg/node_modules/type-fest": {
+ "version": "4.41.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+ "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+ "license": "(MIT OR CC0-1.0)",
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/read/node_modules/mute-stream": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
@@ -14141,13 +13693,13 @@
"license": "MIT"
},
"node_modules/resolve": {
- "version": "1.22.11",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
- "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+ "version": "1.22.10",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+ "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
"dev": true,
"license": "MIT",
"dependencies": {
- "is-core-module": "^2.16.1",
+ "is-core-module": "^2.16.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
},
@@ -14352,13 +13904,12 @@
}
},
"node_modules/router/node_modules/path-to-regexp": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
- "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
+ "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
"license": "MIT",
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/express"
+ "engines": {
+ "node": ">=16"
}
},
"node_modules/run-applescript": {
@@ -14462,18 +14013,6 @@
"node": ">=6"
}
},
- "node_modules/run-jxa/node_modules/type-fest": {
- "version": "2.19.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
- "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
- "license": "(MIT OR CC0-1.0)",
- "engines": {
- "node": ">=12.20"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/run-parallel": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -14636,9 +14175,9 @@
}
},
"node_modules/semver": {
- "version": "7.7.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
- "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@@ -14902,9 +14441,9 @@
}
},
"node_modules/simple-swizzle/node_modules/is-arrayish": {
- "version": "0.3.4",
- "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz",
- "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
"license": "MIT"
},
"node_modules/sisteransi": {
@@ -14927,9 +14466,9 @@
}
},
"node_modules/slice-ansi": {
- "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
- "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
+ "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
"license": "MIT",
"dependencies": {
"ansi-styles": "^6.2.1",
@@ -14943,9 +14482,9 @@
}
},
"node_modules/slice-ansi/node_modules/ansi-styles": {
- "version": "6.2.3",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
- "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
"license": "MIT",
"engines": {
"node": ">=12"
@@ -14955,12 +14494,12 @@
}
},
"node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
- "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
+ "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
"license": "MIT",
"dependencies": {
- "get-east-asian-width": "^1.3.1"
+ "get-east-asian-width": "^1.0.0"
},
"engines": {
"node": ">=18"
@@ -15383,9 +14922,9 @@
}
},
"node_modules/strnum": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
- "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",
+ "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
"funding": [
{
"type": "github",
@@ -15565,9 +15104,9 @@
}
},
"node_modules/systeminformation": {
- "version": "5.31.1",
- "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.1.tgz",
- "integrity": "sha512-6pRwxoGeV/roJYpsfcP6tN9mep6pPeCtXbUOCdVa0nme05Brwcwdge/fVNhIZn2wuUitAKZm4IYa7QjnRIa9zA==",
+ "version": "5.30.2",
+ "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.30.2.tgz",
+ "integrity": "sha512-Rrt5oFTWluUVuPlbtn3o9ja+nvjdF3Um4DG0KxqfYvpzcx7Q9plZBTjJiJy9mAouua4+OI7IUGBaG9Zyt9NgxA==",
"license": "MIT",
"os": [
"darwin",
@@ -15608,9 +15147,9 @@
}
},
"node_modules/table/node_modules/ajv": {
- "version": "8.18.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
- "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+ "version": "8.17.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -15694,22 +15233,6 @@
"node": ">=8"
}
},
- "node_modules/tar": {
- "version": "7.5.8",
- "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.8.tgz",
- "integrity": "sha512-SYkBtK99u0yXa+IWL0JRzzcl7RxNpvX/U08Z+8DKnysfno7M+uExnTZH8K+VGgShf2qFPKtbNr9QBl8n7WBP6Q==",
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "@isaacs/fs-minipass": "^4.0.0",
- "chownr": "^3.0.0",
- "minipass": "^7.1.2",
- "minizlib": "^3.1.0",
- "yallist": "^5.0.0"
- },
- "engines": {
- "node": ">=18"
- }
- },
"node_modules/teeny-request": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
@@ -15783,59 +15306,20 @@
}
},
"node_modules/test-exclude": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.2.tgz",
- "integrity": "sha512-u9E6A+ZDYdp7a4WnarkXPZOx8Ilz46+kby6p1yZ8zsGTz9gYa6FIS7lj2oezzNKmtdyyJNNmmXDppga5GB7kSw==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
+ "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
"dev": true,
"license": "ISC",
"dependencies": {
"@istanbuljs/schema": "^0.1.2",
"glob": "^10.4.1",
- "minimatch": "^10.2.2"
+ "minimatch": "^9.0.4"
},
"engines": {
"node": ">=18"
}
},
- "node_modules/test-exclude/node_modules/balanced-match": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
- "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/test-exclude/node_modules/brace-expansion": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^4.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- }
- },
- "node_modules/test-exclude/node_modules/minimatch": {
- "version": "10.2.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz",
- "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==",
- "dev": true,
- "license": "BlueOak-1.0.0",
- "dependencies": {
- "brace-expansion": "^5.0.2"
- },
- "engines": {
- "node": "18 || 20 || >=22"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/text-hex": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
@@ -16079,9 +15563,9 @@
}
},
"node_modules/ts-api-utils": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
- "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+ "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -16207,12 +15691,12 @@
}
},
"node_modules/type-fest": {
- "version": "4.41.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
- "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+ "version": "2.19.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+ "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
"license": "(MIT OR CC0-1.0)",
"engines": {
- "node": ">=16"
+ "node": ">=12.20"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
@@ -16337,16 +15821,15 @@
}
},
"node_modules/typescript-eslint": {
- "version": "8.56.1",
- "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.1.tgz",
- "integrity": "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz",
+ "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/eslint-plugin": "8.56.1",
- "@typescript-eslint/parser": "8.56.1",
- "@typescript-eslint/typescript-estree": "8.56.1",
- "@typescript-eslint/utils": "8.56.1"
+ "@typescript-eslint/eslint-plugin": "8.35.0",
+ "@typescript-eslint/parser": "8.35.0",
+ "@typescript-eslint/utils": "8.35.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -16356,8 +15839,8 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
- "typescript": ">=4.8.4 <6.0.0"
+ "eslint": "^8.57.0 || ^9.0.0",
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/uc.micro": {
@@ -17054,9 +16537,9 @@
}
},
"node_modules/wrap-ansi/node_modules/ansi-styles": {
- "version": "6.2.3",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
- "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
"license": "MIT",
"engines": {
"node": ">=12"
@@ -17066,9 +16549,9 @@
}
},
"node_modules/wrap-ansi/node_modules/emoji-regex": {
- "version": "10.6.0",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
- "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
+ "version": "10.5.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.5.0.tgz",
+ "integrity": "sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==",
"license": "MIT"
},
"node_modules/wrap-ansi/node_modules/string-width": {
@@ -17095,9 +16578,9 @@
"license": "ISC"
},
"node_modules/ws": {
- "version": "8.19.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
- "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
+ "version": "8.18.3",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+ "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
"license": "MIT",
"engines": {
"node": ">=10.0.0"
@@ -17170,18 +16653,15 @@
}
},
"node_modules/yaml": {
- "version": "2.8.2",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
- "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+ "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
"license": "ISC",
"bin": {
"yaml": "bin.mjs"
},
"engines": {
"node": ">= 14.6"
- },
- "funding": {
- "url": "https://github.com/sponsors/eemeli"
}
},
"node_modules/yargs": {
@@ -17351,7 +16831,7 @@
"gemini-cli-a2a-server": "dist/a2a-server.mjs"
},
"devDependencies": {
- "@google/genai": "^1.30.0",
+ "@google/genai": "1.30.0",
"@types/express": "^5.0.3",
"@types/fs-extra": "^11.0.4",
"@types/supertest": "^6.0.3",
@@ -17365,6 +16845,47 @@
"node": ">=20"
}
},
+ "packages/a2a-server/node_modules/@a2a-js/sdk": {
+ "version": "0.3.11",
+ "resolved": "https://registry.npmjs.org/@a2a-js/sdk/-/sdk-0.3.11.tgz",
+ "integrity": "sha512-pXjjlL0ZYHgAxObov1J+W3ylfQV0rOrDBB8Eo4a9eCunqs7iNW5OIfMcV8YnZQdzeVSRomj8jHeudVz0zc4RNw==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "uuid": "^11.1.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "peerDependencies": {
+ "@bufbuild/protobuf": "^2.10.2",
+ "@grpc/grpc-js": "^1.11.0",
+ "express": "^4.21.2 || ^5.1.0"
+ },
+ "peerDependenciesMeta": {
+ "@bufbuild/protobuf": {
+ "optional": true
+ },
+ "@grpc/grpc-js": {
+ "optional": true
+ },
+ "express": {
+ "optional": true
+ }
+ }
+ },
+ "packages/a2a-server/node_modules/@a2a-js/sdk/node_modules/uuid": {
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+ "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "license": "MIT",
+ "bin": {
+ "uuid": "dist/esm/bin/uuid"
+ }
+ },
"packages/a2a-server/node_modules/dotenv": {
"version": "16.6.1",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
@@ -17378,6 +16899,22 @@
"url": "https://dotenvx.com"
}
},
+ "packages/a2a-server/node_modules/tar": {
+ "version": "7.5.11",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz",
+ "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==",
+ "license": "BlueOak-1.0.0",
+ "dependencies": {
+ "@isaacs/fs-minipass": "^4.0.0",
+ "chownr": "^3.0.0",
+ "minipass": "^7.1.2",
+ "minizlib": "^3.1.0",
+ "yallist": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
"packages/a2a-server/node_modules/uuid": {
"version": "13.0.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
@@ -17398,7 +16935,7 @@
"dependencies": {
"@agentclientprotocol/sdk": "^0.12.0",
"@google/gemini-cli-core": "file:../core",
- "@google/genai": "1.41.0",
+ "@google/genai": "1.30.0",
"@iarna/toml": "^2.2.5",
"@modelcontextprotocol/sdk": "^1.23.0",
"ansi-escapes": "^7.3.0",
@@ -17458,14 +16995,33 @@
"node": ">=20"
}
},
- "packages/cli/node_modules/string-width": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.0.tgz",
- "integrity": "sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==",
+ "packages/cli/node_modules/ansi-escapes": {
+ "version": "7.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz",
+ "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==",
"license": "MIT",
"dependencies": {
- "get-east-asian-width": "^1.5.0",
- "strip-ansi": "^7.1.2"
+ "environment": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "packages/cli/node_modules/clipboardy": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-5.2.1.tgz",
+ "integrity": "sha512-RWp4E/ivQAzgF4QSWA9sjeW+Bjo+U2SvebkDhNIfO7y65eGdXPUxMTdIKYsn+bxM3ItPHGm3e68Bv3fgQ3mARw==",
+ "license": "MIT",
+ "dependencies": {
+ "clipboard-image": "^0.1.0",
+ "execa": "^9.6.1",
+ "is-wayland": "^0.1.0",
+ "is-wsl": "^3.1.0",
+ "is64bit": "^2.0.0",
+ "powershell-utils": "^0.2.0"
},
"engines": {
"node": ">=20"
@@ -17474,6 +17030,76 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "packages/cli/node_modules/execa": {
+ "version": "9.6.1",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-9.6.1.tgz",
+ "integrity": "sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==",
+ "license": "MIT",
+ "dependencies": {
+ "@sindresorhus/merge-streams": "^4.0.0",
+ "cross-spawn": "^7.0.6",
+ "figures": "^6.1.0",
+ "get-stream": "^9.0.0",
+ "human-signals": "^8.0.1",
+ "is-plain-obj": "^4.1.0",
+ "is-stream": "^4.0.1",
+ "npm-run-path": "^6.0.0",
+ "pretty-ms": "^9.2.0",
+ "signal-exit": "^4.1.0",
+ "strip-final-newline": "^4.0.0",
+ "yoctocolors": "^2.1.1"
+ },
+ "engines": {
+ "node": "^18.19.0 || >=20.5.0"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/execa?sponsor=1"
+ }
+ },
+ "packages/cli/node_modules/is-stream": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
+ "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "packages/cli/node_modules/string-width": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.1.0.tgz",
+ "integrity": "sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==",
+ "license": "MIT",
+ "dependencies": {
+ "get-east-asian-width": "^1.3.0",
+ "strip-ansi": "^7.1.0"
+ },
+ "engines": {
+ "node": ">=20"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "packages/cli/node_modules/tar": {
+ "version": "7.5.11",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz",
+ "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==",
+ "license": "BlueOak-1.0.0",
+ "dependencies": {
+ "@isaacs/fs-minipass": "^4.0.0",
+ "chownr": "^3.0.0",
+ "minipass": "^7.1.2",
+ "minizlib": "^3.1.0",
+ "yallist": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
"packages/core": {
"name": "@google/gemini-cli-core",
"version": "0.34.0-nightly.20260304.28af4e127",
@@ -17484,7 +17110,7 @@
"@google-cloud/logging": "^11.2.1",
"@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
"@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
- "@google/genai": "1.41.0",
+ "@google/genai": "1.30.0",
"@grpc/grpc-js": "^1.14.3",
"@iarna/toml": "^2.2.5",
"@joshua.litt/get-ripgrep": "^0.0.3",
@@ -17519,7 +17145,7 @@
"fdir": "^6.4.6",
"fzf": "^0.5.2",
"glob": "^12.0.0",
- "google-auth-library": "^10.5.0",
+ "google-auth-library": "^9.11.0",
"html-to-text": "^9.0.5",
"https-proxy-agent": "^7.0.6",
"ignore": "^7.0.0",
@@ -17567,10 +17193,82 @@
"node-pty": "^1.0.0"
}
},
+ "packages/core/node_modules/@a2a-js/sdk": {
+ "version": "0.3.11",
+ "resolved": "https://registry.npmjs.org/@a2a-js/sdk/-/sdk-0.3.11.tgz",
+ "integrity": "sha512-pXjjlL0ZYHgAxObov1J+W3ylfQV0rOrDBB8Eo4a9eCunqs7iNW5OIfMcV8YnZQdzeVSRomj8jHeudVz0zc4RNw==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "uuid": "^11.1.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "peerDependencies": {
+ "@bufbuild/protobuf": "^2.10.2",
+ "@grpc/grpc-js": "^1.11.0",
+ "express": "^4.21.2 || ^5.1.0"
+ },
+ "peerDependenciesMeta": {
+ "@bufbuild/protobuf": {
+ "optional": true
+ },
+ "@grpc/grpc-js": {
+ "optional": true
+ },
+ "express": {
+ "optional": true
+ }
+ }
+ },
+ "packages/core/node_modules/@a2a-js/sdk/node_modules/uuid": {
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+ "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "license": "MIT",
+ "bin": {
+ "uuid": "dist/esm/bin/uuid"
+ }
+ },
+ "packages/core/node_modules/@grpc/grpc-js": {
+ "version": "1.14.3",
+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.3.tgz",
+ "integrity": "sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@grpc/proto-loader": "^0.8.0",
+ "@js-sdsl/ordered-map": "^4.4.2"
+ },
+ "engines": {
+ "node": ">=12.10.0"
+ }
+ },
+ "packages/core/node_modules/@grpc/proto-loader": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.0.tgz",
+ "integrity": "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "lodash.camelcase": "^4.3.0",
+ "long": "^5.0.0",
+ "protobufjs": "^7.5.3",
+ "yargs": "^17.7.2"
+ },
+ "bin": {
+ "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
"packages/core/node_modules/ajv": {
- "version": "8.18.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
- "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+ "version": "8.17.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
"license": "MIT",
"dependencies": {
"fast-deep-equal": "^3.1.3",
@@ -17583,14 +17281,23 @@
"url": "https://github.com/sponsors/epoberezkin"
}
},
- "packages/core/node_modules/fdir": {
- "version": "6.5.0",
- "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
- "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
- "license": "MIT",
+ "packages/core/node_modules/dotenv": {
+ "version": "17.3.1",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.3.1.tgz",
+ "integrity": "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==",
+ "license": "BSD-2-Clause",
"engines": {
- "node": ">=12.0.0"
+ "node": ">=12"
},
+ "funding": {
+ "url": "https://dotenvx.com"
+ }
+ },
+ "packages/core/node_modules/fdir": {
+ "version": "6.4.6",
+ "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+ "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+ "license": "MIT",
"peerDependencies": {
"picomatch": "^3 || ^4"
},
@@ -17600,75 +17307,6 @@
}
}
},
- "packages/core/node_modules/gaxios": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.3.tgz",
- "integrity": "sha512-YGGyuEdVIjqxkxVH1pUTMY/XtmmsApXrCVv5EU25iX6inEPbV+VakJfLealkBtJN69AQmh1eGOdCl9Sm1UP6XQ==",
- "license": "Apache-2.0",
- "dependencies": {
- "extend": "^3.0.2",
- "https-proxy-agent": "^7.0.1",
- "node-fetch": "^3.3.2",
- "rimraf": "^5.0.1"
- },
- "engines": {
- "node": ">=18"
- }
- },
- "packages/core/node_modules/gcp-metadata": {
- "version": "8.1.2",
- "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-8.1.2.tgz",
- "integrity": "sha512-zV/5HKTfCeKWnxG0Dmrw51hEWFGfcF2xiXqcA3+J90WDuP0SvoiSO5ORvcBsifmx/FoIjgQN3oNOGaQ5PhLFkg==",
- "license": "Apache-2.0",
- "dependencies": {
- "gaxios": "^7.0.0",
- "google-logging-utils": "^1.0.0",
- "json-bigint": "^1.0.0"
- },
- "engines": {
- "node": ">=18"
- }
- },
- "packages/core/node_modules/google-auth-library": {
- "version": "10.5.0",
- "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.5.0.tgz",
- "integrity": "sha512-7ABviyMOlX5hIVD60YOfHw4/CxOfBhyduaYB+wbFWCWoni4N7SLcV46hrVRktuBbZjFC9ONyqamZITN7q3n32w==",
- "license": "Apache-2.0",
- "dependencies": {
- "base64-js": "^1.3.0",
- "ecdsa-sig-formatter": "^1.0.11",
- "gaxios": "^7.0.0",
- "gcp-metadata": "^8.0.0",
- "google-logging-utils": "^1.0.0",
- "gtoken": "^8.0.0",
- "jws": "^4.0.0"
- },
- "engines": {
- "node": ">=18"
- }
- },
- "packages/core/node_modules/google-logging-utils": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.3.tgz",
- "integrity": "sha512-eAmLkjDjAFCVXg7A1unxHsLf961m6y17QFqXqAXGj/gVkKFrEICfStRfwUlGNfeCEjNRa32JEWOUTlYXPyyKvA==",
- "license": "Apache-2.0",
- "engines": {
- "node": ">=14"
- }
- },
- "packages/core/node_modules/gtoken": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz",
- "integrity": "sha512-+CqsMbHPiSTdtSO14O51eMNlrp9N79gmeqmXeouJOhfucAedHw9noVe/n5uJk3tbKE6a+6ZCQg3RPhVhHByAIw==",
- "license": "MIT",
- "dependencies": {
- "gaxios": "^7.0.0",
- "jws": "^4.0.0"
- },
- "engines": {
- "node": ">=18"
- }
- },
"packages/core/node_modules/ignore": {
"version": "7.0.5",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
@@ -17678,12 +17316,6 @@
"node": ">= 4"
}
},
- "packages/core/node_modules/json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
- "license": "MIT"
- },
"packages/core/node_modules/mime": {
"version": "4.0.7",
"resolved": "https://registry.npmjs.org/mime/-/mime-4.0.7.tgz",
@@ -17699,24 +17331,6 @@
"node": ">=16"
}
},
- "packages/core/node_modules/node-fetch": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
- "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
- "license": "MIT",
- "dependencies": {
- "data-uri-to-buffer": "^4.0.0",
- "fetch-blob": "^3.1.4",
- "formdata-polyfill": "^4.0.10"
- },
- "engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/node-fetch"
- }
- },
"packages/core/node_modules/picomatch": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
diff --git a/packages/a2a-server/package.json b/packages/a2a-server/package.json
index 328a36a7d5..71430291c7 100644
--- a/packages/a2a-server/package.json
+++ b/packages/a2a-server/package.json
@@ -36,7 +36,7 @@
"winston": "^3.17.0"
},
"devDependencies": {
- "@google/genai": "^1.30.0",
+ "@google/genai": "1.30.0",
"@types/express": "^5.0.3",
"@types/fs-extra": "^11.0.4",
"@types/supertest": "^6.0.3",
diff --git a/packages/a2a-server/src/agent/executor.test.ts b/packages/a2a-server/src/agent/executor.test.ts
new file mode 100644
index 0000000000..2b77f3006c
--- /dev/null
+++ b/packages/a2a-server/src/agent/executor.test.ts
@@ -0,0 +1,248 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
+import { CoderAgentExecutor } from './executor.js';
+import type {
+ ExecutionEventBus,
+ RequestContext,
+ TaskStore,
+} from '@a2a-js/sdk/server';
+import { EventEmitter } from 'node:events';
+import { requestStorage } from '../http/requestStorage.js';
+
+// Mocks for constructor dependencies
+vi.mock('../config/config.js', () => ({
+ loadConfig: vi.fn().mockReturnValue({
+ getSessionId: () => 'test-session',
+ getTargetDir: () => '/tmp',
+ getCheckpointingEnabled: () => false,
+ }),
+ loadEnvironment: vi.fn(),
+ setTargetDir: vi.fn().mockReturnValue('/tmp'),
+}));
+
+vi.mock('../config/settings.js', () => ({
+ loadSettings: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('../config/extension.js', () => ({
+ loadExtensions: vi.fn().mockReturnValue([]),
+}));
+
+vi.mock('../http/requestStorage.js', () => ({
+ requestStorage: {
+ getStore: vi.fn(),
+ },
+}));
+
+vi.mock('./task.js', () => {
+ const mockTaskInstance = (taskId: string, contextId: string) => ({
+ id: taskId,
+ contextId,
+ taskState: 'working',
+ acceptUserMessage: vi
+ .fn()
+ .mockImplementation(async function* (context, aborted) {
+ const isConfirmation = (
+ context.userMessage.parts as Array<{ kind: string }>
+ ).some((p) => p.kind === 'confirmation');
+ // Hang only for main user messages (text), allow confirmations to finish quickly
+ if (!isConfirmation && aborted) {
+ await new Promise((resolve) => {
+ aborted.addEventListener('abort', resolve, { once: true });
+ });
+ }
+ yield { type: 'content', value: 'hello' };
+ }),
+ acceptAgentMessage: vi.fn().mockResolvedValue(undefined),
+ scheduleToolCalls: vi.fn().mockResolvedValue(undefined),
+ waitForPendingTools: vi.fn().mockResolvedValue(undefined),
+ getAndClearCompletedTools: vi.fn().mockReturnValue([]),
+ addToolResponsesToHistory: vi.fn(),
+ sendCompletedToolsToLlm: vi.fn().mockImplementation(async function* () {}),
+ cancelPendingTools: vi.fn(),
+ setTaskStateAndPublishUpdate: vi.fn(),
+ dispose: vi.fn(),
+ getMetadata: vi.fn().mockResolvedValue({}),
+ geminiClient: {
+ initialize: vi.fn().mockResolvedValue(undefined),
+ },
+ toSDKTask: () => ({
+ id: taskId,
+ contextId,
+ kind: 'task',
+ status: { state: 'working', timestamp: new Date().toISOString() },
+ metadata: {},
+ history: [],
+ artifacts: [],
+ }),
+ });
+
+ const MockTask = vi.fn().mockImplementation(mockTaskInstance);
+ (MockTask as unknown as { create: Mock }).create = vi
+ .fn()
+ .mockImplementation(async (taskId: string, contextId: string) =>
+ mockTaskInstance(taskId, contextId),
+ );
+
+ return { Task: MockTask };
+});
+
+describe('CoderAgentExecutor', () => {
+ let executor: CoderAgentExecutor;
+ let mockTaskStore: TaskStore;
+ let mockEventBus: ExecutionEventBus;
+
+ beforeEach(() => {
+ vi.clearAllMocks();
+ mockTaskStore = {
+ save: vi.fn().mockResolvedValue(undefined),
+ load: vi.fn().mockResolvedValue(undefined),
+ delete: vi.fn().mockResolvedValue(undefined),
+ list: vi.fn().mockResolvedValue([]),
+ } as unknown as TaskStore;
+
+ mockEventBus = new EventEmitter() as unknown as ExecutionEventBus;
+ mockEventBus.publish = vi.fn();
+ mockEventBus.finished = vi.fn();
+
+ executor = new CoderAgentExecutor(mockTaskStore);
+ });
+
+ it('should distinguish between primary and secondary execution', async () => {
+ const taskId = 'test-task';
+ const contextId = 'test-context';
+
+ const mockSocket = new EventEmitter();
+ const requestContext = {
+ userMessage: {
+ messageId: 'msg-1',
+ taskId,
+ contextId,
+ parts: [{ kind: 'text', text: 'hi' }],
+ metadata: {
+ coderAgent: { kind: 'agent-settings', workspacePath: '/tmp' },
+ },
+ },
+ } as unknown as RequestContext;
+
+ // Mock requestStorage for primary
+ (requestStorage.getStore as Mock).mockReturnValue({
+ req: { socket: mockSocket },
+ });
+
+ // First execution (Primary)
+ const primaryPromise = executor.execute(requestContext, mockEventBus);
+
+ // Give it enough time to reach line 490 in executor.ts
+ await new Promise((resolve) => setTimeout(resolve, 50));
+
+ expect(
+ (
+ executor as unknown as { executingTasks: Set }
+ ).executingTasks.has(taskId),
+ ).toBe(true);
+ const wrapper = executor.getTask(taskId);
+ expect(wrapper).toBeDefined();
+
+ // Mock requestStorage for secondary
+ const secondarySocket = new EventEmitter();
+ (requestStorage.getStore as Mock).mockReturnValue({
+ req: { socket: secondarySocket },
+ });
+
+ const secondaryRequestContext = {
+ userMessage: {
+ messageId: 'msg-2',
+ taskId,
+ contextId,
+ parts: [{ kind: 'confirmation', callId: '1', outcome: 'proceed' }],
+ metadata: {
+ coderAgent: { kind: 'agent-settings', workspacePath: '/tmp' },
+ },
+ },
+ } as unknown as RequestContext;
+
+ const secondaryPromise = executor.execute(
+ secondaryRequestContext,
+ mockEventBus,
+ );
+
+ // Secondary execution should NOT add to executingTasks (already there)
+ // and should return early after its loop
+ await secondaryPromise;
+
+ // Task should still be in executingTasks and NOT disposed
+ expect(
+ (
+ executor as unknown as { executingTasks: Set }
+ ).executingTasks.has(taskId),
+ ).toBe(true);
+ expect(wrapper?.task.dispose).not.toHaveBeenCalled();
+
+ // Now simulate secondary socket closure - it should NOT affect primary
+ secondarySocket.emit('end');
+ expect(
+ (
+ executor as unknown as { executingTasks: Set }
+ ).executingTasks.has(taskId),
+ ).toBe(true);
+ expect(wrapper?.task.dispose).not.toHaveBeenCalled();
+
+ // Set to terminal state to verify disposal on finish
+ wrapper!.task.taskState = 'completed';
+
+ // Now close primary socket
+ mockSocket.emit('end');
+
+ await primaryPromise;
+
+ expect(
+ (
+ executor as unknown as { executingTasks: Set }
+ ).executingTasks.has(taskId),
+ ).toBe(false);
+ expect(wrapper?.task.dispose).toHaveBeenCalled();
+ });
+
+ it('should evict task from cache when it reaches terminal state', async () => {
+ const taskId = 'test-task-terminal';
+ const contextId = 'test-context';
+
+ const mockSocket = new EventEmitter();
+ (requestStorage.getStore as Mock).mockReturnValue({
+ req: { socket: mockSocket },
+ });
+
+ const requestContext = {
+ userMessage: {
+ messageId: 'msg-1',
+ taskId,
+ contextId,
+ parts: [{ kind: 'text', text: 'hi' }],
+ metadata: {
+ coderAgent: { kind: 'agent-settings', workspacePath: '/tmp' },
+ },
+ },
+ } as unknown as RequestContext;
+
+ const primaryPromise = executor.execute(requestContext, mockEventBus);
+ await new Promise((resolve) => setTimeout(resolve, 50));
+
+ const wrapper = executor.getTask(taskId)!;
+ expect(wrapper).toBeDefined();
+ // Simulate terminal state
+ wrapper.task.taskState = 'completed';
+
+ // Finish primary execution
+ mockSocket.emit('end');
+ await primaryPromise;
+
+ expect(executor.getTask(taskId)).toBeUndefined();
+ expect(wrapper.task.dispose).toHaveBeenCalled();
+ });
+});
diff --git a/packages/a2a-server/src/agent/executor.ts b/packages/a2a-server/src/agent/executor.ts
index 7fc35657fb..dbb8269376 100644
--- a/packages/a2a-server/src/agent/executor.ts
+++ b/packages/a2a-server/src/agent/executor.ts
@@ -252,6 +252,10 @@ export class CoderAgentExecutor implements AgentExecutor {
);
await this.taskStore?.save(wrapper.toSDKTask());
logger.info(`[CoderAgentExecutor] Task ${taskId} state CANCELED saved.`);
+
+ // Cleanup listener subscriptions to avoid memory leaks.
+ wrapper.task.dispose();
+ this.tasks.delete(taskId);
} catch (error) {
const errorMessage =
error instanceof Error ? error.message : 'Unknown error';
@@ -320,23 +324,26 @@ export class CoderAgentExecutor implements AgentExecutor {
if (store) {
// Grab the raw socket from the request object
const socket = store.req.socket;
- const onClientEnd = () => {
+ const onSocketEnd = () => {
logger.info(
- `[CoderAgentExecutor] Client socket closed for task ${taskId}. Cancelling execution.`,
+ `[CoderAgentExecutor] Socket ended for message ${userMessage.messageId} (task ${taskId}). Aborting execution loop.`,
);
if (!abortController.signal.aborted) {
abortController.abort();
}
// Clean up the listener to prevent memory leaks
- socket.removeListener('close', onClientEnd);
+ socket.removeListener('end', onSocketEnd);
};
// Listen on the socket's 'end' event (remote closed the connection)
- socket.on('end', onClientEnd);
+ socket.on('end', onSocketEnd);
+ socket.once('close', () => {
+ socket.removeListener('end', onSocketEnd);
+ });
// It's also good practice to remove the listener if the task completes successfully
abortSignal.addEventListener('abort', () => {
- socket.removeListener('end', onClientEnd);
+ socket.removeListener('end', onSocketEnd);
});
logger.info(
`[CoderAgentExecutor] Socket close handler set up for task ${taskId}.`,
@@ -457,6 +464,26 @@ export class CoderAgentExecutor implements AgentExecutor {
return;
}
+ // Check if this is the primary/initial execution for this task
+ const isPrimaryExecution = !this.executingTasks.has(taskId);
+
+ if (!isPrimaryExecution) {
+ logger.info(
+ `[CoderAgentExecutor] Primary execution already active for task ${taskId}. Starting secondary loop for message ${userMessage.messageId}.`,
+ );
+ currentTask.eventBus = eventBus;
+ for await (const _ of currentTask.acceptUserMessage(
+ requestContext,
+ abortController.signal,
+ )) {
+ logger.info(
+ `[CoderAgentExecutor] Processing user message ${userMessage.messageId} in secondary execution loop for task ${taskId}.`,
+ );
+ }
+ // End this execution-- the original/source will be resumed.
+ return;
+ }
+
logger.info(
`[CoderAgentExecutor] Starting main execution for message ${userMessage.messageId} for task ${taskId}.`,
);
@@ -598,18 +625,30 @@ export class CoderAgentExecutor implements AgentExecutor {
}
}
} finally {
- this.executingTasks.delete(taskId);
- logger.info(
- `[CoderAgentExecutor] Saving final state for task ${taskId}.`,
- );
- try {
- await this.taskStore?.save(wrapper.toSDKTask());
- logger.info(`[CoderAgentExecutor] Task ${taskId} state saved.`);
- } catch (saveError) {
- logger.error(
- `[CoderAgentExecutor] Failed to save task ${taskId} state in finally block:`,
- saveError,
+ if (isPrimaryExecution) {
+ this.executingTasks.delete(taskId);
+ logger.info(
+ `[CoderAgentExecutor] Saving final state for task ${taskId}.`,
);
+ try {
+ await this.taskStore?.save(wrapper.toSDKTask());
+ logger.info(`[CoderAgentExecutor] Task ${taskId} state saved.`);
+ } catch (saveError) {
+ logger.error(
+ `[CoderAgentExecutor] Failed to save task ${taskId} state in finally block:`,
+ saveError,
+ );
+ }
+
+ if (
+ ['canceled', 'failed', 'completed'].includes(currentTask.taskState)
+ ) {
+ logger.info(
+ `[CoderAgentExecutor] Task ${taskId} reached terminal state ${currentTask.taskState}. Evicting and disposing.`,
+ );
+ wrapper.task.dispose();
+ this.tasks.delete(taskId);
+ }
}
}
}
diff --git a/packages/a2a-server/src/agent/task-event-driven.test.ts b/packages/a2a-server/src/agent/task-event-driven.test.ts
new file mode 100644
index 0000000000..f9dda8a752
--- /dev/null
+++ b/packages/a2a-server/src/agent/task-event-driven.test.ts
@@ -0,0 +1,655 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
+import { Task } from './task.js';
+import {
+ type Config,
+ MessageBusType,
+ ToolConfirmationOutcome,
+ ApprovalMode,
+ Scheduler,
+ type MessageBus,
+} from '@google/gemini-cli-core';
+import { createMockConfig } from '../utils/testing_utils.js';
+import type { ExecutionEventBus } from '@a2a-js/sdk/server';
+
+describe('Task Event-Driven Scheduler', () => {
+ let mockConfig: Config;
+ let mockEventBus: ExecutionEventBus;
+ let messageBus: MessageBus;
+
+ beforeEach(() => {
+ vi.clearAllMocks();
+ mockConfig = createMockConfig({
+ isEventDrivenSchedulerEnabled: () => true,
+ }) as Config;
+ messageBus = mockConfig.getMessageBus();
+ mockEventBus = {
+ publish: vi.fn(),
+ on: vi.fn(),
+ off: vi.fn(),
+ once: vi.fn(),
+ removeAllListeners: vi.fn(),
+ finished: vi.fn(),
+ };
+ });
+
+ it('should instantiate Scheduler when enabled', () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+ expect(task.scheduler).toBeInstanceOf(Scheduler);
+ });
+
+ it('should subscribe to TOOL_CALLS_UPDATE and map status changes', async () => {
+ // @ts-expect-error - Calling private constructor
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCall = {
+ request: { callId: '1', name: 'ls', args: {} },
+ status: 'executing',
+ };
+
+ // Simulate MessageBus event
+ // Simulate MessageBus event
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+
+ if (!handler) {
+ throw new Error('TOOL_CALLS_UPDATE handler not found');
+ }
+
+ handler({
+ type: MessageBusType.TOOL_CALLS_UPDATE,
+ toolCalls: [toolCall],
+ });
+
+ expect(mockEventBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ status: expect.objectContaining({
+ state: 'submitted', // initial task state
+ }),
+ metadata: expect.objectContaining({
+ coderAgent: expect.objectContaining({
+ kind: 'tool-call-update',
+ }),
+ }),
+ }),
+ );
+ });
+
+ it('should handle tool confirmations by publishing to MessageBus', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCall = {
+ request: { callId: '1', name: 'ls', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-1',
+ confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
+ };
+
+ // Simulate MessageBus event to stash the correlationId
+ // Simulate MessageBus event
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+
+ if (!handler) {
+ throw new Error('TOOL_CALLS_UPDATE handler not found');
+ }
+
+ handler({
+ type: MessageBusType.TOOL_CALLS_UPDATE,
+ toolCalls: [toolCall],
+ });
+
+ // Simulate A2A client confirmation
+ const part = {
+ kind: 'data',
+ data: {
+ callId: '1',
+ outcome: 'proceed_once',
+ },
+ };
+
+ const handled = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart(part);
+ expect(handled).toBe(true);
+
+ expect(messageBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId: 'corr-1',
+ confirmed: true,
+ outcome: ToolConfirmationOutcome.ProceedOnce,
+ }),
+ );
+ });
+
+ it('should handle Rejection (Cancel) and Modification (ModifyWithEditor)', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCall = {
+ request: { callId: '1', name: 'ls', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-1',
+ confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
+ };
+
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+ handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
+
+ // Simulate Rejection (Cancel)
+ const handled = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart({
+ kind: 'data',
+ data: { callId: '1', outcome: 'cancel' },
+ });
+ expect(handled).toBe(true);
+ expect(messageBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId: 'corr-1',
+ confirmed: false,
+ }),
+ );
+
+ const toolCall2 = {
+ request: { callId: '2', name: 'ls', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-2',
+ confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
+ };
+ handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall2] });
+
+ // Simulate ModifyWithEditor
+ const handled2 = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart({
+ kind: 'data',
+ data: { callId: '2', outcome: 'modify_with_editor' },
+ });
+ expect(handled2).toBe(true);
+ expect(messageBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId: 'corr-2',
+ confirmed: false,
+ outcome: ToolConfirmationOutcome.ModifyWithEditor,
+ payload: undefined,
+ }),
+ );
+ });
+
+ it('should handle MCP Server tool operations correctly', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCall = {
+ request: { callId: '1', name: 'call_mcp_tool', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-mcp-1',
+ confirmationDetails: {
+ type: 'mcp',
+ title: 'MCP Server Operation',
+ prompt: 'test_mcp',
+ },
+ };
+
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+ handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
+
+ // Simulate ProceedOnce for MCP
+ const handled = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart({
+ kind: 'data',
+ data: { callId: '1', outcome: 'proceed_once' },
+ });
+ expect(handled).toBe(true);
+ expect(messageBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId: 'corr-mcp-1',
+ confirmed: true,
+ outcome: ToolConfirmationOutcome.ProceedOnce,
+ }),
+ );
+ });
+
+ it('should handle MCP Server tool ProceedAlwaysServer outcome', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCall = {
+ request: { callId: '1', name: 'call_mcp_tool', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-mcp-2',
+ confirmationDetails: {
+ type: 'mcp',
+ title: 'MCP Server Operation',
+ prompt: 'test_mcp',
+ },
+ };
+
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+ handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
+
+ const handled = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart({
+ kind: 'data',
+ data: { callId: '1', outcome: 'proceed_always_server' },
+ });
+ expect(handled).toBe(true);
+ expect(messageBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId: 'corr-mcp-2',
+ confirmed: true,
+ outcome: ToolConfirmationOutcome.ProceedAlwaysServer,
+ }),
+ );
+ });
+
+ it('should handle MCP Server tool ProceedAlwaysTool outcome', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCall = {
+ request: { callId: '1', name: 'call_mcp_tool', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-mcp-3',
+ confirmationDetails: {
+ type: 'mcp',
+ title: 'MCP Server Operation',
+ prompt: 'test_mcp',
+ },
+ };
+
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+ handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
+
+ const handled = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart({
+ kind: 'data',
+ data: { callId: '1', outcome: 'proceed_always_tool' },
+ });
+ expect(handled).toBe(true);
+ expect(messageBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId: 'corr-mcp-3',
+ confirmed: true,
+ outcome: ToolConfirmationOutcome.ProceedAlwaysTool,
+ }),
+ );
+ });
+
+ it('should handle MCP Server tool ProceedAlwaysAndSave outcome', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCall = {
+ request: { callId: '1', name: 'call_mcp_tool', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-mcp-4',
+ confirmationDetails: {
+ type: 'mcp',
+ title: 'MCP Server Operation',
+ prompt: 'test_mcp',
+ },
+ };
+
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+ handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
+
+ const handled = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart({
+ kind: 'data',
+ data: { callId: '1', outcome: 'proceed_always_and_save' },
+ });
+ expect(handled).toBe(true);
+ expect(messageBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId: 'corr-mcp-4',
+ confirmed: true,
+ outcome: ToolConfirmationOutcome.ProceedAlwaysAndSave,
+ }),
+ );
+ });
+
+ it('should execute without confirmation in YOLO mode and not transition to input-required', async () => {
+ // Enable YOLO mode
+ const yoloConfig = createMockConfig({
+ isEventDrivenSchedulerEnabled: () => true,
+ getApprovalMode: () => ApprovalMode.YOLO,
+ }) as Config;
+ const yoloMessageBus = yoloConfig.getMessageBus();
+
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', yoloConfig, mockEventBus);
+ task.setTaskStateAndPublishUpdate = vi.fn();
+
+ const toolCall = {
+ request: { callId: '1', name: 'ls', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-1',
+ confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
+ };
+
+ const handler = (yoloMessageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+ handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
+
+ // Should NOT auto-publish ProceedOnce anymore, because PolicyEngine handles it directly
+ expect(yoloMessageBus.publish).not.toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ }),
+ );
+
+ // Should NOT transition to input-required since it was auto-approved
+ expect(task.setTaskStateAndPublishUpdate).not.toHaveBeenCalledWith(
+ 'input-required',
+ expect.anything(),
+ undefined,
+ undefined,
+ true,
+ );
+ });
+
+ it('should handle output updates via the message bus', async () => {
+ // @ts-expect-error - Calling private constructor
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCall = {
+ request: { callId: '1', name: 'ls', args: {} },
+ status: 'executing',
+ liveOutput: 'chunk1',
+ };
+
+ // Simulate MessageBus event
+ // Simulate MessageBus event
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+
+ if (!handler) {
+ throw new Error('TOOL_CALLS_UPDATE handler not found');
+ }
+
+ handler({
+ type: MessageBusType.TOOL_CALLS_UPDATE,
+ toolCalls: [toolCall],
+ });
+
+ // Should publish artifact update for output
+ expect(mockEventBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ kind: 'artifact-update',
+ artifact: expect.objectContaining({
+ artifactId: 'tool-1-output',
+ parts: [{ kind: 'text', text: 'chunk1' }],
+ }),
+ }),
+ );
+ });
+
+ it('should complete artifact creation without hanging', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCallId = 'create-file-123';
+ task['_registerToolCall'](toolCallId, 'executing');
+
+ const toolCall = {
+ request: {
+ callId: toolCallId,
+ name: 'writeFile',
+ args: { path: 'test.sh' },
+ },
+ status: 'success',
+ result: { ok: true },
+ };
+
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+ handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
+
+ // The tool should be complete and registered appropriately, eventually
+ // triggering the toolCompletionPromise resolution when all clear.
+ const internalTask = task as unknown as {
+ completedToolCalls: unknown[];
+ pendingToolCalls: Map;
+ };
+ expect(internalTask.completedToolCalls.length).toBe(1);
+ expect(internalTask.pendingToolCalls.size).toBe(0);
+ });
+
+ it('should preserve messageId across multiple text chunks to prevent UI duplication', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ // Initialize the ID for the first turn (happens internally upon LLM stream)
+ task.currentAgentMessageId = 'test-id-123';
+
+ // Simulate sending multiple text chunks
+ task._sendTextContent('chunk 1');
+ task._sendTextContent('chunk 2');
+
+ // Both text contents should have been published with the same messageId
+ const textCalls = (mockEventBus.publish as Mock).mock.calls.filter(
+ (call) => call[0].status?.message?.kind === 'message',
+ );
+ expect(textCalls.length).toBe(2);
+ expect(textCalls[0][0].status.message.messageId).toBe('test-id-123');
+ expect(textCalls[1][0].status.message.messageId).toBe('test-id-123');
+
+ // Simulate starting a new turn by calling getAndClearCompletedTools
+ // (which precedes sendCompletedToolsToLlm where a new ID is minted)
+ task.getAndClearCompletedTools();
+
+ // sendCompletedToolsToLlm internally rolls the ID forward.
+ // Simulate what sendCompletedToolsToLlm does:
+ const internalTask = task as unknown as {
+ setTaskStateAndPublishUpdate: (state: string, change: unknown) => void;
+ };
+ internalTask.setTaskStateAndPublishUpdate('working', {});
+
+ // Simulate what sendCompletedToolsToLlm does: generate a new UUID for the next turn
+ task.currentAgentMessageId = 'test-id-456';
+
+ task._sendTextContent('chunk 3');
+
+ const secondTurnCalls = (mockEventBus.publish as Mock).mock.calls.filter(
+ (call) => call[0].status?.message?.messageId === 'test-id-456',
+ );
+ expect(secondTurnCalls.length).toBe(1);
+ expect(secondTurnCalls[0][0].status.message.parts[0].text).toBe('chunk 3');
+ });
+
+ it('should handle parallel tool calls correctly', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const toolCall1 = {
+ request: { callId: '1', name: 'ls', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-1',
+ confirmationDetails: { type: 'info', title: 'test 1', prompt: 'test 1' },
+ };
+
+ const toolCall2 = {
+ request: { callId: '2', name: 'pwd', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-2',
+ confirmationDetails: { type: 'info', title: 'test 2', prompt: 'test 2' },
+ };
+
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+
+ // Publish update for both tool calls simultaneously
+ handler({
+ type: MessageBusType.TOOL_CALLS_UPDATE,
+ toolCalls: [toolCall1, toolCall2],
+ });
+
+ // Confirm first tool call
+ const handled1 = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart({
+ kind: 'data',
+ data: { callId: '1', outcome: 'proceed_once' },
+ });
+ expect(handled1).toBe(true);
+ expect(messageBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId: 'corr-1',
+ confirmed: true,
+ }),
+ );
+
+ // Confirm second tool call
+ const handled2 = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart({
+ kind: 'data',
+ data: { callId: '2', outcome: 'cancel' },
+ });
+ expect(handled2).toBe(true);
+ expect(messageBus.publish).toHaveBeenCalledWith(
+ expect.objectContaining({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId: 'corr-2',
+ confirmed: false,
+ }),
+ );
+ });
+
+ it('should wait for executing tools before transitioning to input-required state', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ task.setTaskStateAndPublishUpdate = vi.fn();
+
+ // Register tool 1 as executing
+ task['_registerToolCall']('1', 'executing');
+
+ const toolCall1 = {
+ request: { callId: '1', name: 'ls', args: {} },
+ status: 'executing',
+ };
+
+ const toolCall2 = {
+ request: { callId: '2', name: 'pwd', args: {} },
+ status: 'awaiting_approval',
+ correlationId: 'corr-2',
+ confirmationDetails: { type: 'info', title: 'test 2', prompt: 'test 2' },
+ };
+
+ const handler = (messageBus.subscribe as Mock).mock.calls.find(
+ (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
+ )?.[1];
+
+ handler({
+ type: MessageBusType.TOOL_CALLS_UPDATE,
+ toolCalls: [toolCall1, toolCall2],
+ });
+
+ // Should NOT transition to input-required yet
+ expect(task.setTaskStateAndPublishUpdate).not.toHaveBeenCalledWith(
+ 'input-required',
+ expect.anything(),
+ undefined,
+ undefined,
+ true,
+ );
+
+ // Complete tool 1
+ const toolCall1Complete = {
+ ...toolCall1,
+ status: 'success',
+ result: { ok: true },
+ };
+
+ handler({
+ type: MessageBusType.TOOL_CALLS_UPDATE,
+ toolCalls: [toolCall1Complete, toolCall2],
+ });
+
+ // Now it should transition
+ expect(task.setTaskStateAndPublishUpdate).toHaveBeenCalledWith(
+ 'input-required',
+ expect.anything(),
+ undefined,
+ undefined,
+ true,
+ );
+ });
+
+ it('should ignore confirmations for unknown tool calls', async () => {
+ // @ts-expect-error - Calling private constructor
+ const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
+
+ const handled = await (
+ task as unknown as {
+ _handleToolConfirmationPart: (part: unknown) => Promise;
+ }
+ )._handleToolConfirmationPart({
+ kind: 'data',
+ data: { callId: 'unknown-id', outcome: 'proceed_once' },
+ });
+
+ // Should return false for unhandled tool call
+ expect(handled).toBe(false);
+
+ // Should not publish anything to the message bus
+ expect(messageBus.publish).not.toHaveBeenCalled();
+ });
+});
diff --git a/packages/a2a-server/src/agent/task.test.ts b/packages/a2a-server/src/agent/task.test.ts
index e29f669333..bf15d7fc49 100644
--- a/packages/a2a-server/src/agent/task.test.ts
+++ b/packages/a2a-server/src/agent/task.test.ts
@@ -504,13 +504,14 @@ describe('Task', () => {
});
describe('auto-approval', () => {
- it('should auto-approve tool calls when autoExecute is true', () => {
+ it('should NOT publish ToolCallConfirmationEvent when autoExecute is true', () => {
task.autoExecute = true;
const onConfirmSpy = vi.fn();
const toolCalls = [
{
request: { callId: '1' },
status: 'awaiting_approval',
+ correlationId: 'test-corr-id',
confirmationDetails: {
type: 'edit',
onConfirm: onConfirmSpy,
@@ -524,9 +525,17 @@ describe('Task', () => {
expect(onConfirmSpy).toHaveBeenCalledWith(
ToolConfirmationOutcome.ProceedOnce,
);
+ const calls = (mockEventBus.publish as Mock).mock.calls;
+ // Search if ToolCallConfirmationEvent was published
+ const confEvent = calls.find(
+ (call) =>
+ call[0].metadata?.coderAgent?.kind ===
+ CoderAgentEvent.ToolCallConfirmationEvent,
+ );
+ expect(confEvent).toBeUndefined();
});
- it('should auto-approve tool calls when approval mode is YOLO', () => {
+ it('should NOT publish ToolCallConfirmationEvent when approval mode is YOLO', () => {
(mockConfig.getApprovalMode as Mock).mockReturnValue(ApprovalMode.YOLO);
task.autoExecute = false;
const onConfirmSpy = vi.fn();
@@ -534,6 +543,7 @@ describe('Task', () => {
{
request: { callId: '1' },
status: 'awaiting_approval',
+ correlationId: 'test-corr-id',
confirmationDetails: {
type: 'edit',
onConfirm: onConfirmSpy,
@@ -547,6 +557,14 @@ describe('Task', () => {
expect(onConfirmSpy).toHaveBeenCalledWith(
ToolConfirmationOutcome.ProceedOnce,
);
+ const calls = (mockEventBus.publish as Mock).mock.calls;
+ // Search if ToolCallConfirmationEvent was published
+ const confEvent = calls.find(
+ (call) =>
+ call[0].metadata?.coderAgent?.kind ===
+ CoderAgentEvent.ToolCallConfirmationEvent,
+ );
+ expect(confEvent).toBeUndefined();
});
it('should NOT auto-approve when autoExecute is false and mode is not YOLO', () => {
@@ -567,6 +585,14 @@ describe('Task', () => {
task._schedulerToolCallsUpdate(toolCalls);
expect(onConfirmSpy).not.toHaveBeenCalled();
+ const calls = (mockEventBus.publish as Mock).mock.calls;
+ // Search if ToolCallConfirmationEvent was published
+ const confEvent = calls.find(
+ (call) =>
+ call[0].metadata?.coderAgent?.kind ===
+ CoderAgentEvent.ToolCallConfirmationEvent,
+ );
+ expect(confEvent).toBeDefined();
});
});
});
diff --git a/packages/a2a-server/src/agent/task.ts b/packages/a2a-server/src/agent/task.ts
index ef15a907e6..652635779b 100644
--- a/packages/a2a-server/src/agent/task.ts
+++ b/packages/a2a-server/src/agent/task.ts
@@ -5,6 +5,7 @@
*/
import {
+ Scheduler,
CoreToolScheduler,
type GeminiClient,
GeminiEventType,
@@ -34,6 +35,8 @@ import {
isSubagentProgress,
EDIT_TOOL_NAMES,
processRestorableToolCalls,
+ MessageBusType,
+ type ToolCallsUpdateMessage,
} from '@google/gemini-cli-core';
import {
type ExecutionEventBus,
@@ -96,21 +99,30 @@ function isToolCallConfirmationDetails(
export class Task {
id: string;
contextId: string;
- scheduler: CoreToolScheduler;
+ scheduler: Scheduler | CoreToolScheduler;
config: Config;
geminiClient: GeminiClient;
pendingToolConfirmationDetails: Map;
+ pendingCorrelationIds: Map = new Map();
taskState: TaskState;
eventBus?: ExecutionEventBus;
completedToolCalls: CompletedToolCall[];
+ processedToolCallIds: Set = new Set();
skipFinalTrueAfterInlineEdit = false;
modelInfo?: string;
currentPromptId: string | undefined;
+ currentAgentMessageId = uuidv4();
promptCount = 0;
autoExecute: boolean;
+ private get isYoloMatch(): boolean {
+ return (
+ this.autoExecute || this.config.getApprovalMode() === ApprovalMode.YOLO
+ );
+ }
// For tool waiting logic
private pendingToolCalls: Map = new Map(); //toolCallId --> status
+ private toolsAlreadyConfirmed: Set = new Set();
private toolCompletionPromise?: Promise;
private toolCompletionNotifier?: {
resolve: () => void;
@@ -127,7 +139,13 @@ export class Task {
this.id = id;
this.contextId = contextId;
this.config = config;
- this.scheduler = this.createScheduler();
+
+ if (this.config.isEventDrivenSchedulerEnabled()) {
+ this.scheduler = this.setupEventDrivenScheduler();
+ } else {
+ this.scheduler = this.createLegacyScheduler();
+ }
+
this.geminiClient = this.config.getGeminiClient();
this.pendingToolConfirmationDetails = new Map();
this.taskState = 'submitted';
@@ -227,7 +245,7 @@ export class Task {
logger.info(
`[Task] Waiting for ${this.pendingToolCalls.size} pending tool(s)...`,
);
- return this.toolCompletionPromise;
+ await this.toolCompletionPromise;
}
cancelPendingTools(reason: string): void {
@@ -240,6 +258,13 @@ export class Task {
this.toolCompletionNotifier.reject(new Error(reason));
}
this.pendingToolCalls.clear();
+ this.pendingCorrelationIds.clear();
+
+ if (this.scheduler instanceof Scheduler) {
+ this.scheduler.cancelAll();
+ } else {
+ this.scheduler.cancelAll(new AbortController().signal);
+ }
// Reset the promise for any future operations, ensuring it's in a clean state.
this._resetToolCompletionPromise();
}
@@ -252,7 +277,7 @@ export class Task {
kind: 'message',
role,
parts: [{ kind: 'text', text }],
- messageId: uuidv4(),
+ messageId: role === 'agent' ? this.currentAgentMessageId : uuidv4(),
taskId: this.id,
contextId: this.contextId,
};
@@ -425,26 +450,34 @@ export class Task {
// Only send an update if the status has actually changed.
if (hasChanged) {
- const coderAgentMessage: CoderAgentMessage =
- tc.status === 'awaiting_approval'
- ? { kind: CoderAgentEvent.ToolCallConfirmationEvent }
- : { kind: CoderAgentEvent.ToolCallUpdateEvent };
- const message = this.toolStatusMessage(tc, this.id, this.contextId);
+ // Skip sending confirmation event if we are going to auto-approve it anyway
+ if (
+ tc.status === 'awaiting_approval' &&
+ tc.confirmationDetails &&
+ this.isYoloMatch
+ ) {
+ logger.info(
+ `[Task] Skipping ToolCallConfirmationEvent for ${tc.request.callId} due to YOLO mode.`,
+ );
+ } else {
+ const coderAgentMessage: CoderAgentMessage =
+ tc.status === 'awaiting_approval'
+ ? { kind: CoderAgentEvent.ToolCallConfirmationEvent }
+ : { kind: CoderAgentEvent.ToolCallUpdateEvent };
+ const message = this.toolStatusMessage(tc, this.id, this.contextId);
- const event = this._createStatusUpdateEvent(
- this.taskState,
- coderAgentMessage,
- message,
- false, // Always false for these continuous updates
- );
- this.eventBus?.publish(event);
+ const event = this._createStatusUpdateEvent(
+ this.taskState,
+ coderAgentMessage,
+ message,
+ false, // Always false for these continuous updates
+ );
+ this.eventBus?.publish(event);
+ }
}
});
- if (
- this.autoExecute ||
- this.config.getApprovalMode() === ApprovalMode.YOLO
- ) {
+ if (this.isYoloMatch) {
logger.info(
'[Task] ' +
(this.autoExecute ? '' : 'YOLO mode enabled. ') +
@@ -492,7 +525,7 @@ export class Task {
}
}
- private createScheduler(): CoreToolScheduler {
+ private createLegacyScheduler(): CoreToolScheduler {
const scheduler = new CoreToolScheduler({
outputUpdateHandler: this._schedulerOutputUpdate.bind(this),
onAllToolCallsComplete: this._schedulerAllToolCallsComplete.bind(this),
@@ -503,6 +536,171 @@ export class Task {
return scheduler;
}
+ private messageBusListener?: (message: ToolCallsUpdateMessage) => void;
+
+ private setupEventDrivenScheduler(): Scheduler {
+ const messageBus = this.config.getMessageBus();
+ const scheduler = new Scheduler({
+ schedulerId: this.id,
+ config: this.config,
+ messageBus,
+ getPreferredEditor: () => DEFAULT_GUI_EDITOR,
+ });
+
+ this.messageBusListener = this.handleEventDrivenToolCallsUpdate.bind(this);
+ messageBus.subscribe(
+ MessageBusType.TOOL_CALLS_UPDATE,
+ this.messageBusListener,
+ );
+
+ return scheduler;
+ }
+
+ dispose(): void {
+ if (this.messageBusListener) {
+ this.config
+ .getMessageBus()
+ .unsubscribe(MessageBusType.TOOL_CALLS_UPDATE, this.messageBusListener);
+ this.messageBusListener = undefined;
+ }
+
+ if (this.scheduler instanceof Scheduler) {
+ this.scheduler.dispose();
+ }
+ }
+
+ private handleEventDrivenToolCallsUpdate(
+ event: ToolCallsUpdateMessage,
+ ): void {
+ if (event.type !== MessageBusType.TOOL_CALLS_UPDATE) {
+ return;
+ }
+
+ const toolCalls = event.toolCalls;
+
+ toolCalls.forEach((tc) => {
+ this.handleEventDrivenToolCall(tc);
+ });
+
+ this.checkInputRequiredState();
+ }
+
+ private handleEventDrivenToolCall(tc: ToolCall): void {
+ const callId = tc.request.callId;
+
+ // Do not process events for tools that have already been finalized.
+ // This prevents duplicate completions if the state manager emits a snapshot containing
+ // already resolved tools whose IDs were removed from pendingToolCalls.
+ if (
+ this.processedToolCallIds.has(callId) ||
+ this.completedToolCalls.some((c) => c.request.callId === callId)
+ ) {
+ return;
+ }
+
+ const previousStatus = this.pendingToolCalls.get(callId);
+ const hasChanged = previousStatus !== tc.status;
+
+ // 1. Handle Output
+ if (tc.status === 'executing' && tc.liveOutput) {
+ this._schedulerOutputUpdate(callId, tc.liveOutput);
+ }
+
+ // 2. Handle terminal states
+ if (
+ tc.status === 'success' ||
+ tc.status === 'error' ||
+ tc.status === 'cancelled'
+ ) {
+ this.toolsAlreadyConfirmed.delete(callId);
+ if (hasChanged) {
+ logger.info(
+ `[Task] Tool call ${callId} completed with status: ${tc.status}`,
+ );
+ this.completedToolCalls.push(tc);
+ this._resolveToolCall(callId);
+ }
+ } else {
+ // Keep track of pending tools
+ this._registerToolCall(callId, tc.status);
+ }
+
+ // 3. Handle Confirmation Stash
+ if (tc.status === 'awaiting_approval' && tc.confirmationDetails) {
+ const details = tc.confirmationDetails;
+
+ if (tc.correlationId) {
+ this.pendingCorrelationIds.set(callId, tc.correlationId);
+ }
+
+ this.pendingToolConfirmationDetails.set(callId, {
+ ...details,
+ onConfirm: async () => {},
+ } as ToolCallConfirmationDetails);
+ }
+
+ // 4. Publish Status Updates to A2A event bus
+ if (hasChanged) {
+ const coderAgentMessage: CoderAgentMessage =
+ tc.status === 'awaiting_approval'
+ ? { kind: CoderAgentEvent.ToolCallConfirmationEvent }
+ : { kind: CoderAgentEvent.ToolCallUpdateEvent };
+
+ const message = this.toolStatusMessage(tc, this.id, this.contextId);
+ const statusUpdate = this._createStatusUpdateEvent(
+ this.taskState,
+ coderAgentMessage,
+ message,
+ false,
+ );
+ this.eventBus?.publish(statusUpdate);
+ }
+ }
+
+ private checkInputRequiredState(): void {
+ if (this.isYoloMatch) {
+ return;
+ }
+
+ // 6. Handle Input Required State
+ let isAwaitingApproval = false;
+ let isExecuting = false;
+
+ for (const [callId, status] of this.pendingToolCalls.entries()) {
+ if (status === 'executing' || status === 'scheduled') {
+ isExecuting = true;
+ } else if (
+ status === 'awaiting_approval' &&
+ !this.toolsAlreadyConfirmed.has(callId)
+ ) {
+ isAwaitingApproval = true;
+ }
+ }
+
+ if (
+ isAwaitingApproval &&
+ !isExecuting &&
+ !this.skipFinalTrueAfterInlineEdit
+ ) {
+ this.skipFinalTrueAfterInlineEdit = false;
+ const wasAlreadyInputRequired = this.taskState === 'input-required';
+
+ this.setTaskStateAndPublishUpdate(
+ 'input-required',
+ { kind: CoderAgentEvent.StateChangeEvent },
+ undefined,
+ undefined,
+ /*final*/ true,
+ );
+
+ // Unblock waitForPendingTools to correctly end the executor loop and release the HTTP response stream.
+ // The IDE client will open a new stream with the confirmation reply.
+ if (!wasAlreadyInputRequired && this.toolCompletionNotifier) {
+ this.toolCompletionNotifier.resolve();
+ }
+ }
+ }
+
private _pickFields<
T extends ToolCall | AnyDeclarativeTool,
K extends UnionKeys,
@@ -713,7 +911,16 @@ export class Task {
};
this.setTaskStateAndPublishUpdate('working', stateChange);
- await this.scheduler.schedule(updatedRequests, abortSignal);
+ // Pre-register tools to ensure waitForPendingTools sees them as pending
+ // before the async scheduler enqueues them and fires the event bus update.
+ for (const req of updatedRequests) {
+ if (!this.pendingToolCalls.has(req.callId)) {
+ this._registerToolCall(req.callId, 'scheduled');
+ }
+ }
+
+ // Fire and forget so we don't block the executor loop before waitForPendingTools can be called
+ void this.scheduler.schedule(updatedRequests, abortSignal);
}
async acceptAgentMessage(event: ServerGeminiStreamEvent): Promise {
@@ -839,9 +1046,15 @@ export class Task {
) {
return false;
}
+ if (!part.data['outcome']) {
+ return false;
+ }
const callId = part.data['callId'];
const outcomeString = part.data['outcome'];
+
+ this.toolsAlreadyConfirmed.add(callId);
+
let confirmationOutcome: ToolConfirmationOutcome | undefined;
if (outcomeString === 'proceed_once') {
@@ -854,6 +1067,8 @@ export class Task {
confirmationOutcome = ToolConfirmationOutcome.ProceedAlwaysServer;
} else if (outcomeString === 'proceed_always_tool') {
confirmationOutcome = ToolConfirmationOutcome.ProceedAlwaysTool;
+ } else if (outcomeString === 'proceed_always_and_save') {
+ confirmationOutcome = ToolConfirmationOutcome.ProceedAlwaysAndSave;
} else if (outcomeString === 'modify_with_editor') {
confirmationOutcome = ToolConfirmationOutcome.ModifyWithEditor;
} else {
@@ -864,8 +1079,9 @@ export class Task {
}
const confirmationDetails = this.pendingToolConfirmationDetails.get(callId);
+ const correlationId = this.pendingCorrelationIds.get(callId);
- if (!confirmationDetails) {
+ if (!confirmationDetails && !correlationId) {
logger.warn(
`[Task] Received tool confirmation for unknown or already processed callId: ${callId}`,
);
@@ -887,24 +1103,35 @@ export class Task {
// This will trigger the scheduler to continue or cancel the specific tool.
// The scheduler's onToolCallsUpdate will then reflect the new state (e.g., executing or cancelled).
- // If `edit` tool call, pass updated payload if presesent
- if (confirmationDetails.type === 'edit') {
- const newContent = part.data['newContent'];
- const payload =
- typeof newContent === 'string'
- ? ({ newContent } as ToolConfirmationPayload)
- : undefined;
- this.skipFinalTrueAfterInlineEdit = !!payload;
- try {
+ // If `edit` tool call, pass updated payload if present
+ const newContent = part.data['newContent'];
+ const payload =
+ confirmationDetails?.type === 'edit' && typeof newContent === 'string'
+ ? ({ newContent } as ToolConfirmationPayload)
+ : undefined;
+ this.skipFinalTrueAfterInlineEdit = !!payload;
+
+ try {
+ if (correlationId) {
+ await this.config.getMessageBus().publish({
+ type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+ correlationId,
+ confirmed:
+ confirmationOutcome !== ToolConfirmationOutcome.Cancel &&
+ confirmationOutcome !==
+ ToolConfirmationOutcome.ModifyWithEditor,
+ outcome: confirmationOutcome,
+ payload,
+ });
+ } else if (confirmationDetails?.onConfirm) {
+ // Fallback for legacy callback-based confirmation
await confirmationDetails.onConfirm(confirmationOutcome, payload);
- } finally {
- // Once confirmationDetails.onConfirm finishes (or fails) with a payload,
- // reset skipFinalTrueAfterInlineEdit so that external callers receive
- // their call has been completed.
- this.skipFinalTrueAfterInlineEdit = false;
}
- } else {
- await confirmationDetails.onConfirm(confirmationOutcome);
+ } finally {
+ // Once confirmation payload is sent or callback finishes,
+ // reset skipFinalTrueAfterInlineEdit so that external callers receive
+ // their call has been completed.
+ this.skipFinalTrueAfterInlineEdit = false;
}
} finally {
if (gcpProject) {
@@ -920,6 +1147,7 @@ export class Task {
// Note !== ToolConfirmationOutcome.ModifyWithEditor does not work!
if (confirmationOutcome !== 'modify_with_editor') {
this.pendingToolConfirmationDetails.delete(callId);
+ this.pendingCorrelationIds.delete(callId);
}
// If outcome is Cancel, scheduler should update status to 'cancelled', which then resolves the tool.
@@ -953,6 +1181,9 @@ export class Task {
getAndClearCompletedTools(): CompletedToolCall[] {
const tools = [...this.completedToolCalls];
+ for (const tool of tools) {
+ this.processedToolCallIds.add(tool.request.callId);
+ }
this.completedToolCalls = [];
return tools;
}
@@ -1013,6 +1244,7 @@ export class Task {
};
// Set task state to working as we are about to call LLM
this.setTaskStateAndPublishUpdate('working', stateChange);
+ this.currentAgentMessageId = uuidv4();
yield* this.geminiClient.sendMessageStream(
llmParts,
aborted,
@@ -1034,6 +1266,10 @@ export class Task {
if (confirmationHandled) {
anyConfirmationHandled = true;
// If a confirmation was handled, the scheduler will now run the tool (or cancel it).
+ // We resolve the toolCompletionPromise manually in checkInputRequiredState
+ // to break the original execution loop, so we must reset it here so the
+ // new loop correctly awaits the tool's final execution.
+ this._resetToolCompletionPromise();
// We don't send anything to the LLM for this part.
// The subsequent tool execution will eventually lead to resolveToolCall.
continue;
@@ -1048,6 +1284,7 @@ export class Task {
if (hasContentForLlm) {
this.currentPromptId =
this.config.getSessionId() + '########' + this.promptCount++;
+ this.currentAgentMessageId = uuidv4();
logger.info('[Task] Sending new parts to LLM.');
const stateChange: StateChange = {
kind: CoderAgentEvent.StateChangeEvent,
@@ -1093,7 +1330,6 @@ export class Task {
if (content === '') {
return;
}
- logger.info('[Task] Sending text content to event bus.');
const message = this._createTextMessage(content);
const textContent: TextContent = {
kind: CoderAgentEvent.TextContentEvent,
@@ -1125,7 +1361,7 @@ export class Task {
data: content,
} as Part,
],
- messageId: uuidv4(),
+ messageId: this.currentAgentMessageId,
taskId: this.id,
contextId: this.contextId,
};
diff --git a/packages/a2a-server/src/config/config.ts b/packages/a2a-server/src/config/config.ts
index 5b6757701d..229abc65c9 100644
--- a/packages/a2a-server/src/config/config.ts
+++ b/packages/a2a-server/src/config/config.ts
@@ -106,6 +106,8 @@ export async function loadConfig(
trustedFolder: true,
extensionLoader,
checkpointing,
+ enableEventDrivenScheduler:
+ settings.experimental?.enableEventDrivenScheduler ?? true,
interactive: !isHeadlessMode(),
enableInteractiveShell: !isHeadlessMode(),
ptyInfo: 'auto',
diff --git a/packages/a2a-server/src/config/settings.ts b/packages/a2a-server/src/config/settings.ts
index b3c44cc177..0c353b46aa 100644
--- a/packages/a2a-server/src/config/settings.ts
+++ b/packages/a2a-server/src/config/settings.ts
@@ -37,6 +37,12 @@ export interface Settings {
showMemoryUsage?: boolean;
checkpointing?: CheckpointingSettings;
folderTrust?: boolean;
+ general?: {
+ previewFeatures?: boolean;
+ };
+ experimental?: {
+ enableEventDrivenScheduler?: boolean;
+ };
// Git-aware file filtering settings
fileFiltering?: {
diff --git a/packages/a2a-server/src/utils/testing_utils.ts b/packages/a2a-server/src/utils/testing_utils.ts
index 7d77d8dc9a..4981dbbd67 100644
--- a/packages/a2a-server/src/utils/testing_utils.ts
+++ b/packages/a2a-server/src/utils/testing_utils.ts
@@ -64,6 +64,7 @@ export function createMockConfig(
getEmbeddingModel: vi.fn().mockReturnValue('text-embedding-004'),
getSessionId: vi.fn().mockReturnValue('test-session-id'),
getUserTier: vi.fn(),
+ isEventDrivenSchedulerEnabled: vi.fn().mockReturnValue(false),
getMessageBus: vi.fn(),
getPolicyEngine: vi.fn(),
getEnableExtensionReloading: vi.fn().mockReturnValue(false),
diff --git a/packages/cli/package.json b/packages/cli/package.json
index cc561eeb8c..b849fb4659 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -31,7 +31,7 @@
"dependencies": {
"@agentclientprotocol/sdk": "^0.12.0",
"@google/gemini-cli-core": "file:../core",
- "@google/genai": "1.41.0",
+ "@google/genai": "1.30.0",
"@iarna/toml": "^2.2.5",
"@modelcontextprotocol/sdk": "^1.23.0",
"ansi-escapes": "^7.3.0",
diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts
index a8c85975e9..320e47a380 100755
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -7,6 +7,7 @@
import yargs from 'yargs/yargs';
import { hideBin } from 'yargs/helpers';
import process from 'node:process';
+import * as path from 'node:path';
import { mcpCommand } from '../commands/mcp.js';
import { extensionsCommand } from '../commands/extensions.js';
import { skillsCommand } from '../commands/skills.js';
@@ -33,6 +34,7 @@ import {
getAdminErrorMessage,
isHeadlessMode,
Config,
+ resolveToRealPath,
applyAdminAllowlist,
getAdminBlockedMcpServersMessage,
type HookDefinition,
@@ -488,6 +490,15 @@ export async function loadCliConfig(
const experimentalJitContext = settings.experimental?.jitContext ?? false;
+ let extensionRegistryURI: string | undefined = trustedFolder
+ ? settings.experimental?.extensionRegistryURI
+ : undefined;
+ if (extensionRegistryURI && !extensionRegistryURI.startsWith('http')) {
+ extensionRegistryURI = resolveToRealPath(
+ path.resolve(cwd, resolvePath(extensionRegistryURI)),
+ );
+ }
+
let memoryContent: string | HierarchicalMemory = '';
let fileCount = 0;
let filePaths: string[] = [];
@@ -764,6 +775,7 @@ export async function loadCliConfig(
deleteSession: argv.deleteSession,
enabledExtensions: argv.extensions,
extensionLoader: extensionManager,
+ extensionRegistryURI,
enableExtensionReloading: settings.experimental?.extensionReloading,
enableAgents: settings.experimental?.enableAgents,
plan: settings.experimental?.plan,
diff --git a/packages/cli/src/config/extensionRegistryClient.test.ts b/packages/cli/src/config/extensionRegistryClient.test.ts
index 4b9699d5e3..66eaab914b 100644
--- a/packages/cli/src/config/extensionRegistryClient.test.ts
+++ b/packages/cli/src/config/extensionRegistryClient.test.ts
@@ -13,14 +13,24 @@ import {
afterEach,
type Mock,
} from 'vitest';
+import * as fs from 'node:fs/promises';
import {
ExtensionRegistryClient,
type RegistryExtension,
} from './extensionRegistryClient.js';
-import { fetchWithTimeout } from '@google/gemini-cli-core';
+import { fetchWithTimeout, resolveToRealPath } from '@google/gemini-cli-core';
-vi.mock('@google/gemini-cli-core', () => ({
- fetchWithTimeout: vi.fn(),
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+ const actual =
+ await importOriginal();
+ return {
+ ...actual,
+ fetchWithTimeout: vi.fn(),
+ };
+});
+
+vi.mock('node:fs/promises', () => ({
+ readFile: vi.fn(),
}));
const mockExtensions: RegistryExtension[] = [
@@ -279,4 +289,32 @@ describe('ExtensionRegistryClient', () => {
expect(ids).not.toContain('dataplex');
expect(ids).toContain('conductor');
});
+
+ it('should fetch extensions from a local file path', async () => {
+ const filePath = '/path/to/extensions.json';
+ const clientWithFile = new ExtensionRegistryClient(filePath);
+ const mockReadFile = vi.mocked(fs.readFile);
+ mockReadFile.mockResolvedValue(JSON.stringify(mockExtensions));
+
+ const result = await clientWithFile.getExtensions();
+ expect(result.extensions).toHaveLength(3);
+ expect(mockReadFile).toHaveBeenCalledWith(
+ resolveToRealPath(filePath),
+ 'utf-8',
+ );
+ });
+
+ it('should fetch extensions from a file:// URL', async () => {
+ const fileUrl = 'file:///path/to/extensions.json';
+ const clientWithFileUrl = new ExtensionRegistryClient(fileUrl);
+ const mockReadFile = vi.mocked(fs.readFile);
+ mockReadFile.mockResolvedValue(JSON.stringify(mockExtensions));
+
+ const result = await clientWithFileUrl.getExtensions();
+ expect(result.extensions).toHaveLength(3);
+ expect(mockReadFile).toHaveBeenCalledWith(
+ resolveToRealPath(fileUrl),
+ 'utf-8',
+ );
+ });
});
diff --git a/packages/cli/src/config/extensionRegistryClient.ts b/packages/cli/src/config/extensionRegistryClient.ts
index bf09aabe77..4b47c215ec 100644
--- a/packages/cli/src/config/extensionRegistryClient.ts
+++ b/packages/cli/src/config/extensionRegistryClient.ts
@@ -4,7 +4,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import { fetchWithTimeout } from '@google/gemini-cli-core';
+import * as fs from 'node:fs/promises';
+import {
+ fetchWithTimeout,
+ resolveToRealPath,
+ isPrivateIp,
+} from '@google/gemini-cli-core';
import { AsyncFzf } from 'fzf';
export interface RegistryExtension {
@@ -29,12 +34,19 @@ export interface RegistryExtension {
}
export class ExtensionRegistryClient {
- private static readonly REGISTRY_URL =
+ static readonly DEFAULT_REGISTRY_URL =
'https://geminicli.com/extensions.json';
private static readonly FETCH_TIMEOUT_MS = 10000; // 10 seconds
private static fetchPromise: Promise | null = null;
+ private readonly registryURI: string;
+
+ constructor(registryURI?: string) {
+ this.registryURI =
+ registryURI || ExtensionRegistryClient.DEFAULT_REGISTRY_URL;
+ }
+
/** @internal */
static resetCache() {
ExtensionRegistryClient.fetchPromise = null;
@@ -97,18 +109,34 @@ export class ExtensionRegistryClient {
return ExtensionRegistryClient.fetchPromise;
}
+ const uri = this.registryURI;
ExtensionRegistryClient.fetchPromise = (async () => {
try {
- const response = await fetchWithTimeout(
- ExtensionRegistryClient.REGISTRY_URL,
- ExtensionRegistryClient.FETCH_TIMEOUT_MS,
- );
- if (!response.ok) {
- throw new Error(`Failed to fetch extensions: ${response.statusText}`);
- }
+ if (uri.startsWith('http')) {
+ if (isPrivateIp(uri)) {
+ throw new Error(
+ 'Private IP addresses are not allowed for the extension registry.',
+ );
+ }
+ const response = await fetchWithTimeout(
+ uri,
+ ExtensionRegistryClient.FETCH_TIMEOUT_MS,
+ );
+ if (!response.ok) {
+ throw new Error(
+ `Failed to fetch extensions: ${response.statusText}`,
+ );
+ }
- // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
- return (await response.json()) as RegistryExtension[];
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+ return (await response.json()) as RegistryExtension[];
+ } else {
+ // Handle local file path
+ const filePath = resolveToRealPath(uri);
+ const content = await fs.readFile(filePath, 'utf-8');
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+ return JSON.parse(content) as RegistryExtension[];
+ }
} catch (error) {
ExtensionRegistryClient.fetchPromise = null;
throw error;
diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts
index fed03734dd..14821dbb99 100644
--- a/packages/cli/src/config/settingsSchema.ts
+++ b/packages/cli/src/config/settingsSchema.ts
@@ -676,7 +676,7 @@ const SETTINGS_SCHEMA = {
requiresRestart: false,
default: true,
description:
- "Show the logged-in user's identity (e.g. email) in the UI.",
+ "Show the signed-in user's identity (e.g. email) in the UI.",
showInDialog: true,
},
useAlternateBuffer: {
@@ -1791,6 +1791,16 @@ const SETTINGS_SCHEMA = {
description: 'Enable extension registry explore UI.',
showInDialog: false,
},
+ extensionRegistryURI: {
+ type: 'string',
+ label: 'Extension Registry URI',
+ category: 'Experimental',
+ requiresRestart: true,
+ default: 'https://geminicli.com/extensions.json',
+ description:
+ 'The URI (web URL or local file path) of the extension registry.',
+ showInDialog: false,
+ },
extensionReloading: {
type: 'boolean',
label: 'Extension Reloading',
diff --git a/packages/cli/src/core/auth.test.ts b/packages/cli/src/core/auth.test.ts
index 5db9cd5449..639ed20a89 100644
--- a/packages/cli/src/core/auth.test.ts
+++ b/packages/cli/src/core/auth.test.ts
@@ -48,14 +48,14 @@ describe('auth', () => {
});
it('should return error message on failed auth', async () => {
- const error = new Error('Auth failed');
+ const error = new Error('Authentication failed');
vi.mocked(mockConfig.refreshAuth).mockRejectedValue(error);
const result = await performInitialAuth(
mockConfig,
AuthType.LOGIN_WITH_GOOGLE,
);
expect(result).toEqual({
- authError: 'Failed to login. Message: Auth failed',
+ authError: 'Failed to sign in. Message: Authentication failed',
accountSuspensionInfo: null,
});
expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
diff --git a/packages/cli/src/core/auth.ts b/packages/cli/src/core/auth.ts
index f0b8015013..0bc89f5bda 100644
--- a/packages/cli/src/core/auth.ts
+++ b/packages/cli/src/core/auth.ts
@@ -64,7 +64,7 @@ export async function performInitialAuth(
};
}
return {
- authError: `Failed to login. Message: ${getErrorMessage(e)}`,
+ authError: `Failed to sign in. Message: ${getErrorMessage(e)}`,
accountSuspensionInfo: null,
};
}
diff --git a/packages/cli/src/services/SkillCommandLoader.test.ts b/packages/cli/src/services/SkillCommandLoader.test.ts
new file mode 100644
index 0000000000..15a2ebec18
--- /dev/null
+++ b/packages/cli/src/services/SkillCommandLoader.test.ts
@@ -0,0 +1,125 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { SkillCommandLoader } from './SkillCommandLoader.js';
+import { CommandKind } from '../ui/commands/types.js';
+import { ACTIVATE_SKILL_TOOL_NAME } from '@google/gemini-cli-core';
+
+describe('SkillCommandLoader', () => {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ let mockConfig: any;
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ let mockSkillManager: any;
+
+ beforeEach(() => {
+ mockSkillManager = {
+ getDisplayableSkills: vi.fn(),
+ isAdminEnabled: vi.fn().mockReturnValue(true),
+ };
+
+ mockConfig = {
+ isSkillsSupportEnabled: vi.fn().mockReturnValue(true),
+ getSkillManager: vi.fn().mockReturnValue(mockSkillManager),
+ };
+ });
+
+ it('should return an empty array if skills support is disabled', async () => {
+ mockConfig.isSkillsSupportEnabled.mockReturnValue(false);
+ const loader = new SkillCommandLoader(mockConfig);
+ const commands = await loader.loadCommands(new AbortController().signal);
+ expect(commands).toEqual([]);
+ });
+
+ it('should return an empty array if SkillManager is missing', async () => {
+ mockConfig.getSkillManager.mockReturnValue(null);
+ const loader = new SkillCommandLoader(mockConfig);
+ const commands = await loader.loadCommands(new AbortController().signal);
+ expect(commands).toEqual([]);
+ });
+
+ it('should return an empty array if skills are admin-disabled', async () => {
+ mockSkillManager.isAdminEnabled.mockReturnValue(false);
+ const loader = new SkillCommandLoader(mockConfig);
+ const commands = await loader.loadCommands(new AbortController().signal);
+ expect(commands).toEqual([]);
+ });
+
+ it('should load skills as slash commands', async () => {
+ const mockSkills = [
+ { name: 'skill1', description: 'Description 1' },
+ { name: 'skill2', description: '' },
+ ];
+ mockSkillManager.getDisplayableSkills.mockReturnValue(mockSkills);
+
+ const loader = new SkillCommandLoader(mockConfig);
+ const commands = await loader.loadCommands(new AbortController().signal);
+
+ expect(commands).toHaveLength(2);
+
+ expect(commands[0]).toMatchObject({
+ name: 'skill1',
+ description: 'Description 1',
+ kind: CommandKind.SKILL,
+ autoExecute: true,
+ });
+
+ expect(commands[1]).toMatchObject({
+ name: 'skill2',
+ description: 'Activate the skill2 skill',
+ kind: CommandKind.SKILL,
+ autoExecute: true,
+ });
+ });
+
+ it('should return a tool action when a skill command is executed', async () => {
+ const mockSkills = [{ name: 'test-skill', description: 'Test skill' }];
+ mockSkillManager.getDisplayableSkills.mockReturnValue(mockSkills);
+
+ const loader = new SkillCommandLoader(mockConfig);
+ const commands = await loader.loadCommands(new AbortController().signal);
+
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ const actionResult = await commands[0].action!({} as any, '');
+ expect(actionResult).toEqual({
+ type: 'tool',
+ toolName: ACTIVATE_SKILL_TOOL_NAME,
+ toolArgs: { name: 'test-skill' },
+ postSubmitPrompt: undefined,
+ });
+ });
+
+ it('should return a tool action with postSubmitPrompt when args are provided', async () => {
+ const mockSkills = [{ name: 'test-skill', description: 'Test skill' }];
+ mockSkillManager.getDisplayableSkills.mockReturnValue(mockSkills);
+
+ const loader = new SkillCommandLoader(mockConfig);
+ const commands = await loader.loadCommands(new AbortController().signal);
+
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ const actionResult = await commands[0].action!({} as any, 'hello world');
+ expect(actionResult).toEqual({
+ type: 'tool',
+ toolName: ACTIVATE_SKILL_TOOL_NAME,
+ toolArgs: { name: 'test-skill' },
+ postSubmitPrompt: 'hello world',
+ });
+ });
+
+ it('should sanitize skill names with spaces', async () => {
+ const mockSkills = [{ name: 'my awesome skill', description: 'Desc' }];
+ mockSkillManager.getDisplayableSkills.mockReturnValue(mockSkills);
+
+ const loader = new SkillCommandLoader(mockConfig);
+ const commands = await loader.loadCommands(new AbortController().signal);
+
+ expect(commands[0].name).toBe('my-awesome-skill');
+
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ const actionResult = (await commands[0].action!({} as any, '')) as any;
+ expect(actionResult.toolArgs).toEqual({ name: 'my awesome skill' });
+ });
+});
diff --git a/packages/cli/src/services/SkillCommandLoader.ts b/packages/cli/src/services/SkillCommandLoader.ts
new file mode 100644
index 0000000000..85f1884299
--- /dev/null
+++ b/packages/cli/src/services/SkillCommandLoader.ts
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { type Config, ACTIVATE_SKILL_TOOL_NAME } from '@google/gemini-cli-core';
+import { CommandKind, type SlashCommand } from '../ui/commands/types.js';
+import { type ICommandLoader } from './types.js';
+
+/**
+ * Loads Agent Skills as slash commands.
+ */
+export class SkillCommandLoader implements ICommandLoader {
+ constructor(private config: Config | null) {}
+
+ /**
+ * Discovers all available skills from the SkillManager and converts
+ * them into executable slash commands.
+ *
+ * @param _signal An AbortSignal (unused for this synchronous loader).
+ * @returns A promise that resolves to an array of `SlashCommand` objects.
+ */
+ async loadCommands(_signal: AbortSignal): Promise {
+ if (!this.config || !this.config.isSkillsSupportEnabled()) {
+ return [];
+ }
+
+ const skillManager = this.config.getSkillManager();
+ if (!skillManager || !skillManager.isAdminEnabled()) {
+ return [];
+ }
+
+ // Convert all displayable skills into slash commands.
+ const skills = skillManager.getDisplayableSkills();
+
+ return skills.map((skill) => {
+ const commandName = skill.name.trim().replace(/\s+/g, '-');
+ return {
+ name: commandName,
+ description: skill.description || `Activate the ${skill.name} skill`,
+ kind: CommandKind.SKILL,
+ autoExecute: true,
+ action: async (_context, args) => ({
+ type: 'tool',
+ toolName: ACTIVATE_SKILL_TOOL_NAME,
+ toolArgs: { name: skill.name },
+ postSubmitPrompt: args.trim().length > 0 ? args.trim() : undefined,
+ }),
+ };
+ });
+ }
+}
diff --git a/packages/cli/src/ui/AppContainer.tsx b/packages/cli/src/ui/AppContainer.tsx
index 42d40ec73a..c3288ee728 100644
--- a/packages/cli/src/ui/AppContainer.tsx
+++ b/packages/cli/src/ui/AppContainer.tsx
@@ -1389,11 +1389,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
// Compute available terminal height based on controls measurement
const availableTerminalHeight = Math.max(
0,
- terminalHeight -
- controlsHeight -
- staticExtraHeight -
- 2 -
- backgroundShellHeight,
+ terminalHeight - controlsHeight - backgroundShellHeight - 1,
);
config.setShellExecutionConfig({
diff --git a/packages/cli/src/ui/auth/AuthDialog.test.tsx b/packages/cli/src/ui/auth/AuthDialog.test.tsx
index c157a6a40d..7ab5fc0be2 100644
--- a/packages/cli/src/ui/auth/AuthDialog.test.tsx
+++ b/packages/cli/src/ui/auth/AuthDialog.test.tsx
@@ -209,7 +209,7 @@ describe('AuthDialog', () => {
{
setup: () => {},
expected: AuthType.LOGIN_WITH_GOOGLE,
- desc: 'defaults to Login with Google',
+ desc: 'defaults to Sign in with Google',
},
])('selects initial auth type $desc', async ({ setup, expected }) => {
setup();
@@ -351,7 +351,7 @@ describe('AuthDialog', () => {
unmount();
});
- it('exits process for Login with Google when browser is suppressed', async () => {
+ it('exits process for Sign in with Google when browser is suppressed', async () => {
vi.useFakeTimers();
const exitSpy = vi
.spyOn(process, 'exit')
diff --git a/packages/cli/src/ui/auth/AuthDialog.tsx b/packages/cli/src/ui/auth/AuthDialog.tsx
index 58956e5f86..4e523d6b11 100644
--- a/packages/cli/src/ui/auth/AuthDialog.tsx
+++ b/packages/cli/src/ui/auth/AuthDialog.tsx
@@ -44,7 +44,7 @@ export function AuthDialog({
const [exiting, setExiting] = useState(false);
let items = [
{
- label: 'Login with Google',
+ label: 'Sign in with Google',
value: AuthType.LOGIN_WITH_GOOGLE,
key: AuthType.LOGIN_WITH_GOOGLE,
},
diff --git a/packages/cli/src/ui/auth/AuthInProgress.test.tsx b/packages/cli/src/ui/auth/AuthInProgress.test.tsx
index 7f279a1067..bd6a3cb126 100644
--- a/packages/cli/src/ui/auth/AuthInProgress.test.tsx
+++ b/packages/cli/src/ui/auth/AuthInProgress.test.tsx
@@ -59,8 +59,8 @@ describe('AuthInProgress', () => {
,
);
await waitUntilReady();
- expect(lastFrame()).toContain('[Spinner] Waiting for auth...');
- expect(lastFrame()).toContain('Press ESC or CTRL+C to cancel');
+ expect(lastFrame()).toContain('[Spinner] Waiting for authentication...');
+ expect(lastFrame()).toContain('Press Esc or Ctrl+C to cancel');
unmount();
});
diff --git a/packages/cli/src/ui/auth/AuthInProgress.tsx b/packages/cli/src/ui/auth/AuthInProgress.tsx
index f5c5d7db6e..03d609c444 100644
--- a/packages/cli/src/ui/auth/AuthInProgress.tsx
+++ b/packages/cli/src/ui/auth/AuthInProgress.tsx
@@ -53,8 +53,8 @@ export function AuthInProgress({
) : (
- Waiting for auth... (Press ESC or CTRL+C
- to cancel)
+ Waiting for authentication... (Press Esc
+ or Ctrl+C to cancel)
)}
diff --git a/packages/cli/src/ui/auth/LoginWithGoogleRestartDialog.tsx b/packages/cli/src/ui/auth/LoginWithGoogleRestartDialog.tsx
index 94ca359b59..a781828d09 100644
--- a/packages/cli/src/ui/auth/LoginWithGoogleRestartDialog.tsx
+++ b/packages/cli/src/ui/auth/LoginWithGoogleRestartDialog.tsx
@@ -45,13 +45,13 @@ export const LoginWithGoogleRestartDialog = ({
);
const message =
- 'You have successfully logged in with Google. Gemini CLI needs to be restarted.';
+ "You've successfully signed in with Google. Gemini CLI needs to be restarted.";
return (
- {message} Press 'r' to restart, or 'escape' to
- choose a different auth method.
+ {message} Press R to restart, or Esc to choose a different
+ authentication method.
);
diff --git a/packages/cli/src/ui/auth/__snapshots__/AuthDialog.test.tsx.snap b/packages/cli/src/ui/auth/__snapshots__/AuthDialog.test.tsx.snap
index 2d341c405e..05bc9f422e 100644
--- a/packages/cli/src/ui/auth/__snapshots__/AuthDialog.test.tsx.snap
+++ b/packages/cli/src/ui/auth/__snapshots__/AuthDialog.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`AuthDialog > Snapshots > renders correctly with auth error 1`] = `
│ │
│ How would you like to authenticate for this project? │
│ │
-│ (selected) Login with Google(not selected) Use Gemini API Key(not selected) Vertex AI │
+│ (selected) Sign in with Google(not selected) Use Gemini API Key(not selected) Vertex AI │
│ │
│ Something went wrong │
│ │
@@ -28,7 +28,7 @@ exports[`AuthDialog > Snapshots > renders correctly with default props 1`] = `
│ │
│ How would you like to authenticate for this project? │
│ │
-│ (selected) Login with Google(not selected) Use Gemini API Key(not selected) Vertex AI │
+│ (selected) Sign in with Google(not selected) Use Gemini API Key(not selected) Vertex AI │
│ │
│ (Use Enter to select) │
│ │
diff --git a/packages/cli/src/ui/auth/__snapshots__/LoginWithGoogleRestartDialog.test.tsx.snap b/packages/cli/src/ui/auth/__snapshots__/LoginWithGoogleRestartDialog.test.tsx.snap
index 20fad6d488..7c7a95e24f 100644
--- a/packages/cli/src/ui/auth/__snapshots__/LoginWithGoogleRestartDialog.test.tsx.snap
+++ b/packages/cli/src/ui/auth/__snapshots__/LoginWithGoogleRestartDialog.test.tsx.snap
@@ -2,8 +2,8 @@
exports[`LoginWithGoogleRestartDialog > renders correctly 1`] = `
"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ You have successfully logged in with Google. Gemini CLI needs to be restarted. Press 'r' to │
-│ restart, or 'escape' to choose a different auth method. │
+│ You've successfully signed in with Google. Gemini CLI needs to be restarted. Press R to restart, │
+│ or Esc to choose a different authentication method. │
╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
"
`;
diff --git a/packages/cli/src/ui/auth/useAuth.test.tsx b/packages/cli/src/ui/auth/useAuth.test.tsx
index 20a02ffb21..f236428ff1 100644
--- a/packages/cli/src/ui/auth/useAuth.test.tsx
+++ b/packages/cli/src/ui/auth/useAuth.test.tsx
@@ -288,7 +288,7 @@ describe('useAuth', () => {
);
await waitFor(() => {
- expect(result.current.authError).toContain('Failed to login');
+ expect(result.current.authError).toContain('Failed to sign in');
expect(result.current.authState).toBe(AuthState.Updating);
});
});
diff --git a/packages/cli/src/ui/auth/useAuth.ts b/packages/cli/src/ui/auth/useAuth.ts
index afd438bb00..809a3b34b8 100644
--- a/packages/cli/src/ui/auth/useAuth.ts
+++ b/packages/cli/src/ui/auth/useAuth.ts
@@ -149,7 +149,7 @@ export const useAuthCommand = (
// Show the error message directly without "Failed to login" prefix
onAuthError(getErrorMessage(e));
} else {
- onAuthError(`Failed to login. Message: ${getErrorMessage(e)}`);
+ onAuthError(`Failed to sign in. Message: ${getErrorMessage(e)}`);
}
}
})();
diff --git a/packages/cli/src/ui/commands/authCommand.test.ts b/packages/cli/src/ui/commands/authCommand.test.ts
index ba1e369b14..88e3273c8d 100644
--- a/packages/cli/src/ui/commands/authCommand.test.ts
+++ b/packages/cli/src/ui/commands/authCommand.test.ts
@@ -34,11 +34,13 @@ describe('authCommand', () => {
vi.clearAllMocks();
});
- it('should have subcommands: login and logout', () => {
+ it('should have subcommands: signin and signout', () => {
expect(authCommand.subCommands).toBeDefined();
expect(authCommand.subCommands).toHaveLength(2);
- expect(authCommand.subCommands?.[0]?.name).toBe('login');
- expect(authCommand.subCommands?.[1]?.name).toBe('logout');
+ expect(authCommand.subCommands?.[0]?.name).toBe('signin');
+ expect(authCommand.subCommands?.[0]?.altNames).toContain('login');
+ expect(authCommand.subCommands?.[1]?.name).toBe('signout');
+ expect(authCommand.subCommands?.[1]?.altNames).toContain('logout');
});
it('should return a dialog action to open the auth dialog when called with no args', () => {
@@ -59,19 +61,19 @@ describe('authCommand', () => {
expect(authCommand.description).toBe('Manage authentication');
});
- describe('auth login subcommand', () => {
+ describe('auth signin subcommand', () => {
it('should return auth dialog action', () => {
const loginCommand = authCommand.subCommands?.[0];
- expect(loginCommand?.name).toBe('login');
+ expect(loginCommand?.name).toBe('signin');
const result = loginCommand!.action!(mockContext, '');
expect(result).toEqual({ type: 'dialog', dialog: 'auth' });
});
});
- describe('auth logout subcommand', () => {
+ describe('auth signout subcommand', () => {
it('should clear cached credentials', async () => {
const logoutCommand = authCommand.subCommands?.[1];
- expect(logoutCommand?.name).toBe('logout');
+ expect(logoutCommand?.name).toBe('signout');
const { clearCachedCredentialFile } = await import(
'@google/gemini-cli-core'
diff --git a/packages/cli/src/ui/commands/authCommand.ts b/packages/cli/src/ui/commands/authCommand.ts
index 0314555baf..80c432894c 100644
--- a/packages/cli/src/ui/commands/authCommand.ts
+++ b/packages/cli/src/ui/commands/authCommand.ts
@@ -14,8 +14,9 @@ import { clearCachedCredentialFile } from '@google/gemini-cli-core';
import { SettingScope } from '../../config/settings.js';
const authLoginCommand: SlashCommand = {
- name: 'login',
- description: 'Login or change the auth method',
+ name: 'signin',
+ altNames: ['login'],
+ description: 'Sign in or change the authentication method',
kind: CommandKind.BUILT_IN,
autoExecute: true,
action: (_context, _args): OpenDialogActionReturn => ({
@@ -25,8 +26,9 @@ const authLoginCommand: SlashCommand = {
};
const authLogoutCommand: SlashCommand = {
- name: 'logout',
- description: 'Log out and clear all cached credentials',
+ name: 'signout',
+ altNames: ['logout'],
+ description: 'Sign out and clear all cached credentials',
kind: CommandKind.BUILT_IN,
action: async (context, _args): Promise => {
await clearCachedCredentialFile();
diff --git a/packages/cli/src/ui/commands/types.ts b/packages/cli/src/ui/commands/types.ts
index e4f0d0ad52..28f52461e4 100644
--- a/packages/cli/src/ui/commands/types.ts
+++ b/packages/cli/src/ui/commands/types.ts
@@ -182,6 +182,7 @@ export enum CommandKind {
EXTENSION_FILE = 'extension-file',
MCP_PROMPT = 'mcp-prompt',
AGENT = 'agent',
+ SKILL = 'skill',
}
// The standardized contract for any command in the system.
diff --git a/packages/cli/src/ui/components/AboutBox.test.tsx b/packages/cli/src/ui/components/AboutBox.test.tsx
index b7a615a18f..3f1226b651 100644
--- a/packages/cli/src/ui/components/AboutBox.test.tsx
+++ b/packages/cli/src/ui/components/AboutBox.test.tsx
@@ -36,7 +36,7 @@ describe('AboutBox', () => {
expect(output).toContain('gemini-pro');
expect(output).toContain('default');
expect(output).toContain('macOS');
- expect(output).toContain('Logged in with Google');
+ expect(output).toContain('Signed in with Google');
unmount();
});
@@ -63,7 +63,7 @@ describe('AboutBox', () => {
);
await waitUntilReady();
const output = lastFrame();
- expect(output).toContain('Logged in with Google (test@example.com)');
+ expect(output).toContain('Signed in with Google (test@example.com)');
unmount();
});
diff --git a/packages/cli/src/ui/components/AboutBox.tsx b/packages/cli/src/ui/components/AboutBox.tsx
index 7ea744b0fe..aa5fd44c57 100644
--- a/packages/cli/src/ui/components/AboutBox.tsx
+++ b/packages/cli/src/ui/components/AboutBox.tsx
@@ -116,8 +116,8 @@ export const AboutBox: React.FC = ({
{selectedAuthType.startsWith('oauth')
? userEmail
- ? `Logged in with Google (${userEmail})`
- : 'Logged in with Google'
+ ? `Signed in with Google (${userEmail})`
+ : 'Signed in with Google'
: selectedAuthType}
diff --git a/packages/cli/src/ui/components/AskUserDialog.tsx b/packages/cli/src/ui/components/AskUserDialog.tsx
index 3c8ccbfb34..4233616144 100644
--- a/packages/cli/src/ui/components/AskUserDialog.tsx
+++ b/packages/cli/src/ui/components/AskUserDialog.tsx
@@ -807,16 +807,21 @@ const ChoiceQuestionView: React.FC = ({
const TITLE_MARGIN = 1;
const FOOTER_HEIGHT = 2; // DialogFooter + margin
const overhead = HEADER_HEIGHT + TITLE_MARGIN + FOOTER_HEIGHT;
+
const listHeight = availableHeight
? Math.max(1, availableHeight - overhead)
: undefined;
- const questionHeight =
+
+ const questionHeightLimit =
listHeight && !isAlternateBuffer
- ? Math.min(15, Math.max(1, listHeight - DIALOG_PADDING))
+ ? question.unconstrainedHeight
+ ? Math.max(1, listHeight - selectionItems.length * 2)
+ : Math.min(15, Math.max(1, listHeight - DIALOG_PADDING))
: undefined;
+
const maxItemsToShow =
- listHeight && questionHeight
- ? Math.max(1, Math.floor((listHeight - questionHeight) / 2))
+ listHeight && questionHeightLimit
+ ? Math.max(1, Math.floor((listHeight - questionHeightLimit) / 2))
: selectionItems.length;
return (
@@ -824,7 +829,7 @@ const ChoiceQuestionView: React.FC = ({
{progressHeader}
diff --git a/packages/cli/src/ui/components/ExitPlanModeDialog.tsx b/packages/cli/src/ui/components/ExitPlanModeDialog.tsx
index ec5a4c2a9b..4124a7c6d7 100644
--- a/packages/cli/src/ui/components/ExitPlanModeDialog.tsx
+++ b/packages/cli/src/ui/components/ExitPlanModeDialog.tsx
@@ -249,6 +249,7 @@ export const ExitPlanModeDialog: React.FC = ({
],
placeholder: 'Type your feedback...',
multiSelect: false,
+ unconstrainedHeight: false,
},
]}
onSubmit={(answers) => {
diff --git a/packages/cli/src/ui/components/LogoutConfirmationDialog.test.tsx b/packages/cli/src/ui/components/LogoutConfirmationDialog.test.tsx
index e080806678..ae17922c9d 100644
--- a/packages/cli/src/ui/components/LogoutConfirmationDialog.test.tsx
+++ b/packages/cli/src/ui/components/LogoutConfirmationDialog.test.tsx
@@ -28,9 +28,9 @@ describe('LogoutConfirmationDialog', () => {
);
await waitUntilReady();
- expect(lastFrame()).toContain('You are now logged out.');
+ expect(lastFrame()).toContain('You are now signed out');
expect(lastFrame()).toContain(
- 'Login again to continue using Gemini CLI, or exit the application.',
+ 'Sign in again to continue using Gemini CLI, or exit the application.',
);
expect(lastFrame()).toContain('(Use Enter to select, Esc to close)');
unmount();
@@ -45,7 +45,7 @@ describe('LogoutConfirmationDialog', () => {
expect(RadioButtonSelect).toHaveBeenCalled();
const mockCall = vi.mocked(RadioButtonSelect).mock.calls[0][0];
expect(mockCall.items).toEqual([
- { label: 'Login', value: LogoutChoice.LOGIN, key: 'login' },
+ { label: 'Sign in', value: LogoutChoice.LOGIN, key: 'login' },
{ label: 'Exit', value: LogoutChoice.EXIT, key: 'exit' },
]);
expect(mockCall.isFocused).toBe(true);
diff --git a/packages/cli/src/ui/components/LogoutConfirmationDialog.tsx b/packages/cli/src/ui/components/LogoutConfirmationDialog.tsx
index 3bcb4a9f35..fbe4c30bd0 100644
--- a/packages/cli/src/ui/components/LogoutConfirmationDialog.tsx
+++ b/packages/cli/src/ui/components/LogoutConfirmationDialog.tsx
@@ -37,7 +37,7 @@ export const LogoutConfirmationDialog: React.FC<
const options: Array> = [
{
- label: 'Login',
+ label: 'Sign in',
value: LogoutChoice.LOGIN,
key: 'login',
},
@@ -61,10 +61,10 @@ export const LogoutConfirmationDialog: React.FC<
>
- You are now logged out.
+ You are now signed out
- Login again to continue using Gemini CLI, or exit the application.
+ Sign in again to continue using Gemini CLI, or exit the application.
diff --git a/packages/cli/src/ui/components/ModelStatsDisplay.test.tsx b/packages/cli/src/ui/components/ModelStatsDisplay.test.tsx
index d47c2cca96..cd6961b742 100644
--- a/packages/cli/src/ui/components/ModelStatsDisplay.test.tsx
+++ b/packages/cli/src/ui/components/ModelStatsDisplay.test.tsx
@@ -539,7 +539,7 @@ describe('', () => {
const output = lastFrame();
expect(output).toContain('Auth Method:');
- expect(output).toContain('Logged in with Google');
+ expect(output).toContain('Signed in with Google');
expect(output).toContain('(test@example.com)');
expect(output).toContain('Tier:');
expect(output).toContain('Pro');
diff --git a/packages/cli/src/ui/components/ModelStatsDisplay.tsx b/packages/cli/src/ui/components/ModelStatsDisplay.tsx
index eec58e9968..0c6ae45e8c 100644
--- a/packages/cli/src/ui/components/ModelStatsDisplay.tsx
+++ b/packages/cli/src/ui/components/ModelStatsDisplay.tsx
@@ -340,8 +340,8 @@ export const ModelStatsDisplay: React.FC = ({
{selectedAuthType.startsWith('oauth')
? userEmail
- ? `Logged in with Google (${userEmail})`
- : 'Logged in with Google'
+ ? `Signed in with Google (${userEmail})`
+ : 'Signed in with Google'
: selectedAuthType}
diff --git a/packages/cli/src/ui/components/StatsDisplay.test.tsx b/packages/cli/src/ui/components/StatsDisplay.test.tsx
index 0a3c5eca21..2b4422e69c 100644
--- a/packages/cli/src/ui/components/StatsDisplay.test.tsx
+++ b/packages/cli/src/ui/components/StatsDisplay.test.tsx
@@ -616,7 +616,7 @@ describe('', () => {
const output = lastFrame();
expect(output).toContain('Auth Method:');
- expect(output).toContain('Logged in with Google (test@example.com)');
+ expect(output).toContain('Signed in with Google (test@example.com)');
expect(output).toContain('Tier:');
expect(output).toContain('Pro');
});
diff --git a/packages/cli/src/ui/components/StatsDisplay.tsx b/packages/cli/src/ui/components/StatsDisplay.tsx
index f26c9a3ea5..d369374d95 100644
--- a/packages/cli/src/ui/components/StatsDisplay.tsx
+++ b/packages/cli/src/ui/components/StatsDisplay.tsx
@@ -589,8 +589,8 @@ export const StatsDisplay: React.FC = ({
{selectedAuthType.startsWith('oauth')
? userEmail
- ? `Logged in with Google (${userEmail})`
- : 'Logged in with Google'
+ ? `Signed in with Google (${userEmail})`
+ : 'Signed in with Google'
: selectedAuthType}
diff --git a/packages/cli/src/ui/components/ToolConfirmationQueue.test.tsx b/packages/cli/src/ui/components/ToolConfirmationQueue.test.tsx
index 7b45bd0458..ab12ae496f 100644
--- a/packages/cli/src/ui/components/ToolConfirmationQueue.test.tsx
+++ b/packages/cli/src/ui/components/ToolConfirmationQueue.test.tsx
@@ -282,7 +282,10 @@ describe('ToolConfirmationQueue', () => {
// hideToolIdentity is true for ask_user -> subtracts 4 instead of 6
// availableContentHeight = 19 - 4 = 15
// ToolConfirmationMessage handlesOwnUI=true -> returns full 15
- // AskUserDialog uses 15 lines to render its multi-line question and options.
+ // AskUserDialog allocates questionHeight = availableHeight - overhead - DIALOG_PADDING.
+ // listHeight = 15 - overhead (Header:0, Margin:1, Footer:2) = 12.
+ // maxQuestionHeight = listHeight - 4 = 8.
+ // 8 lines is enough for the 6-line question.
await waitFor(() => {
expect(lastFrame()).toContain('Line 6');
expect(lastFrame()).not.toContain('lines hidden');
diff --git a/packages/cli/src/ui/components/UserIdentity.test.tsx b/packages/cli/src/ui/components/UserIdentity.test.tsx
index aa7f4d3da2..2aade5675b 100644
--- a/packages/cli/src/ui/components/UserIdentity.test.tsx
+++ b/packages/cli/src/ui/components/UserIdentity.test.tsx
@@ -1,6 +1,6 @@
/**
* @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Google LLC
* SPDX-License-Identifier: Apache-2.0
*/
@@ -45,7 +45,7 @@ describe('', () => {
await waitUntilReady();
const output = lastFrame();
- expect(output).toContain('test@example.com');
+ expect(output).toContain('Signed in with Google: test@example.com');
expect(output).toContain('/auth');
expect(output).not.toContain('/upgrade');
unmount();
@@ -91,7 +91,8 @@ describe('', () => {
await waitUntilReady();
const output = lastFrame();
- expect(output).toContain('Logged in with Google');
+ expect(output).toContain('Signed in with Google');
+ expect(output).not.toContain('Signed in with Google:');
expect(output).toContain('/auth');
expect(output).not.toContain('/upgrade');
unmount();
@@ -111,11 +112,20 @@ describe('', () => {
await waitUntilReady();
const output = lastFrame();
- expect(output).toContain('test@example.com');
+ expect(output).toContain('Signed in with Google: test@example.com');
expect(output).toContain('/auth');
- expect(output).toContain('Premium Plan');
+ expect(output).toContain('Plan: Premium Plan');
expect(output).toContain('/upgrade');
+ // Check for two lines (or more if wrapped, but here it should be separate)
+ const lines = output?.split('\n').filter((line) => line.trim().length > 0);
+ expect(lines?.some((line) => line.includes('Signed in with Google'))).toBe(
+ true,
+ );
+ expect(lines?.some((line) => line.includes('Plan: Premium Plan'))).toBe(
+ true,
+ );
+
unmount();
});
@@ -168,7 +178,7 @@ describe('', () => {
await waitUntilReady();
const output = lastFrame();
- expect(output).toContain('Enterprise Tier');
+ expect(output).toContain('Plan: Enterprise Tier');
expect(output).toContain('/upgrade');
unmount();
});
diff --git a/packages/cli/src/ui/components/UserIdentity.tsx b/packages/cli/src/ui/components/UserIdentity.tsx
index 7b07a4f91c..fa2f5c5afa 100644
--- a/packages/cli/src/ui/components/UserIdentity.tsx
+++ b/packages/cli/src/ui/components/UserIdentity.tsx
@@ -43,7 +43,10 @@ export const UserIdentity: React.FC = ({ config }) => {
{authType === AuthType.LOGIN_WITH_GOOGLE ? (
- {email ?? 'Logged in with Google'}
+
+ Signed in with Google{email ? ':' : ''}
+ {email ? ` ${email}` : ''}
+
) : (
`Authenticated with ${authType}`
)}
@@ -55,7 +58,7 @@ export const UserIdentity: React.FC = ({ config }) => {
{tierName && (
- {tierName}
+ Plan: {tierName}
/upgrade
diff --git a/packages/cli/src/ui/components/ValidationDialog.tsx b/packages/cli/src/ui/components/ValidationDialog.tsx
index f03e09c963..b6c9ab213e 100644
--- a/packages/cli/src/ui/components/ValidationDialog.tsx
+++ b/packages/cli/src/ui/components/ValidationDialog.tsx
@@ -136,7 +136,7 @@ export function ValidationDialog({
{' '}
- Waiting for verification... (Press ESC or CTRL+C to cancel)
+ Waiting for verification... (Press Esc or Ctrl+C to cancel)
{errorMessage && (
diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx
index 8971d488d3..d5cbdabe60 100644
--- a/packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx
+++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx
@@ -69,6 +69,11 @@ describe('', () => {
ui: { errorVerbosity: 'full' },
},
});
+ const lowVerbositySettings = createMockSettings({
+ merged: {
+ ui: { errorVerbosity: 'low' },
+ },
+ });
describe('Golden Snapshots', () => {
it('renders single successful tool call', async () => {
@@ -721,6 +726,245 @@ describe('', () => {
expect(lastFrame({ allowEmpty: true })).toBe('');
unmount();
});
+
+ it('does not render a bottom-border fragment when all tools are filtered out', async () => {
+ const toolCalls = [
+ createToolCall({
+ callId: 'hidden-error-tool',
+ name: 'error-tool',
+ status: CoreToolCallStatus.Error,
+ resultDisplay: 'Hidden in low verbosity',
+ isClientInitiated: false,
+ }),
+ ];
+ const item = createItem(toolCalls);
+
+ const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+ ,
+ {
+ config: baseMockConfig,
+ settings: lowVerbositySettings,
+ },
+ );
+
+ await waitUntilReady();
+ expect(lastFrame({ allowEmpty: true })).toBe('');
+ unmount();
+ });
+
+ it('still renders explicit closing slices for split static/pending groups', async () => {
+ const toolCalls: IndividualToolCallDisplay[] = [];
+ const item = createItem(toolCalls);
+
+ const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+ ,
+ {
+ config: baseMockConfig,
+ settings: fullVerbositySettings,
+ },
+ );
+
+ await waitUntilReady();
+ expect(lastFrame({ allowEmpty: true })).not.toBe('');
+ unmount();
+ });
+
+ it('does not render a border fragment when plan-mode tools are filtered out', async () => {
+ const toolCalls = [
+ createToolCall({
+ callId: 'plan-write',
+ name: WRITE_FILE_DISPLAY_NAME,
+ approvalMode: ApprovalMode.PLAN,
+ status: CoreToolCallStatus.Success,
+ resultDisplay: 'Plan file written',
+ }),
+ ];
+ const item = createItem(toolCalls);
+
+ const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+ ,
+ {
+ config: baseMockConfig,
+ settings: fullVerbositySettings,
+ },
+ );
+
+ await waitUntilReady();
+ expect(lastFrame({ allowEmpty: true })).toBe('');
+ unmount();
+ });
+
+ it('does not render a border fragment when only confirming tools are present', async () => {
+ const toolCalls = [
+ createToolCall({
+ callId: 'confirm-only',
+ status: CoreToolCallStatus.AwaitingApproval,
+ confirmationDetails: {
+ type: 'info',
+ title: 'Confirm',
+ prompt: 'Proceed?',
+ },
+ }),
+ ];
+ const item = createItem(toolCalls);
+
+ const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+ ,
+ {
+ config: baseMockConfig,
+ settings: fullVerbositySettings,
+ },
+ );
+
+ await waitUntilReady();
+ expect(lastFrame({ allowEmpty: true })).toBe('');
+ unmount();
+ });
+
+ it('does not leave a border stub when transitioning from visible to fully filtered tools', async () => {
+ const visibleTools = [
+ createToolCall({
+ callId: 'visible-success',
+ name: 'visible-tool',
+ status: CoreToolCallStatus.Success,
+ resultDisplay: 'visible output',
+ }),
+ ];
+ const hiddenTools = [
+ createToolCall({
+ callId: 'hidden-error',
+ name: 'hidden-error-tool',
+ status: CoreToolCallStatus.Error,
+ resultDisplay: 'hidden output',
+ isClientInitiated: false,
+ }),
+ ];
+
+ const initialItem = createItem(visibleTools);
+ const hiddenItem = createItem(hiddenTools);
+
+ const firstRender = renderWithProviders(
+ ,
+ {
+ config: baseMockConfig,
+ settings: lowVerbositySettings,
+ },
+ );
+ await firstRender.waitUntilReady();
+ expect(firstRender.lastFrame()).toContain('visible-tool');
+ firstRender.unmount();
+
+ const secondRender = renderWithProviders(
+ ,
+ {
+ config: baseMockConfig,
+ settings: lowVerbositySettings,
+ },
+ );
+ await secondRender.waitUntilReady();
+ expect(secondRender.lastFrame({ allowEmpty: true })).toBe('');
+ secondRender.unmount();
+ });
+
+ it('keeps visible tools rendered with many filtered tools (stress case)', async () => {
+ const visibleTool = createToolCall({
+ callId: 'visible-tool',
+ name: 'visible-tool',
+ status: CoreToolCallStatus.Success,
+ resultDisplay: 'visible output',
+ });
+ const hiddenTools = Array.from({ length: 50 }, (_, index) =>
+ createToolCall({
+ callId: `hidden-${index}`,
+ name: `hidden-error-${index}`,
+ status: CoreToolCallStatus.Error,
+ resultDisplay: `hidden output ${index}`,
+ isClientInitiated: false,
+ }),
+ );
+ const toolCalls = [visibleTool, ...hiddenTools];
+ const item = createItem(toolCalls);
+
+ const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+ ,
+ {
+ config: baseMockConfig,
+ settings: lowVerbositySettings,
+ },
+ );
+
+ await waitUntilReady();
+ const output = lastFrame();
+ expect(output).toContain('visible-tool');
+ expect(output).not.toContain('hidden-error-0');
+ expect(output).not.toContain('hidden-error-49');
+ unmount();
+ });
+
+ it('renders explicit closing slice even at very narrow terminal width', async () => {
+ const toolCalls: IndividualToolCallDisplay[] = [];
+ const item = createItem(toolCalls);
+
+ const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+ ,
+ {
+ config: baseMockConfig,
+ settings: fullVerbositySettings,
+ },
+ );
+
+ await waitUntilReady();
+ expect(lastFrame({ allowEmpty: true })).not.toBe('');
+ unmount();
+ });
});
describe('Plan Mode Filtering', () => {
diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
index 05f9984d69..01cec31727 100644
--- a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
@@ -141,11 +141,15 @@ export const ToolGroupMessage: React.FC = ({
const contentWidth = terminalWidth - TOOL_MESSAGE_HORIZONTAL_MARGIN;
- // If all tools are filtered out (e.g., in-progress AskUser tools, confirming tools),
- // only render if we need to close a border from previous
- // tool groups. borderBottomOverride=true means we must render the closing border;
- // undefined or false means there's nothing to display.
- if (visibleToolCalls.length === 0 && borderBottomOverride !== true) {
+ // If all tools are filtered out (e.g., in-progress AskUser tools, low-verbosity
+ // internal errors, plan-mode hidden write/edit), we should not emit standalone
+ // border fragments. The only case where an empty group should render is the
+ // explicit "closing slice" (tools: []) used to bridge static/pending sections.
+ const isExplicitClosingSlice = allToolCalls.length === 0;
+ if (
+ visibleToolCalls.length === 0 &&
+ (!isExplicitClosingSlice || borderBottomOverride !== true)
+ ) {
return null;
}
diff --git a/packages/cli/src/ui/components/views/ExtensionRegistryView.test.tsx b/packages/cli/src/ui/components/views/ExtensionRegistryView.test.tsx
index 954dff1f07..22ff1f6f5c 100644
--- a/packages/cli/src/ui/components/views/ExtensionRegistryView.test.tsx
+++ b/packages/cli/src/ui/components/views/ExtensionRegistryView.test.tsx
@@ -132,6 +132,9 @@ describe('ExtensionRegistryView', () => {
vi.mocked(useConfig).mockReturnValue({
getEnableExtensionReloading: vi.fn().mockReturnValue(false),
+ getExtensionRegistryURI: vi
+ .fn()
+ .mockReturnValue('https://geminicli.com/extensions.json'),
} as unknown as ReturnType);
});
diff --git a/packages/cli/src/ui/components/views/ExtensionRegistryView.tsx b/packages/cli/src/ui/components/views/ExtensionRegistryView.tsx
index 394eba3a2a..44568ad82f 100644
--- a/packages/cli/src/ui/components/views/ExtensionRegistryView.tsx
+++ b/packages/cli/src/ui/components/views/ExtensionRegistryView.tsx
@@ -39,8 +39,11 @@ export function ExtensionRegistryView({
onClose,
extensionManager,
}: ExtensionRegistryViewProps): React.JSX.Element {
- const { extensions, loading, error, search } = useExtensionRegistry();
const config = useConfig();
+ const { extensions, loading, error, search } = useExtensionRegistry(
+ '',
+ config.getExtensionRegistryURI(),
+ );
const { terminalHeight, staticExtraHeight } = useUIState();
const { extensionsUpdateState } = useExtensionUpdates(
diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
index 20a76dcf43..6f3ecd7b96 100644
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
@@ -52,6 +52,7 @@ import { CommandService } from '../../services/CommandService.js';
import { BuiltinCommandLoader } from '../../services/BuiltinCommandLoader.js';
import { FileCommandLoader } from '../../services/FileCommandLoader.js';
import { McpPromptLoader } from '../../services/McpPromptLoader.js';
+import { SkillCommandLoader } from '../../services/SkillCommandLoader.js';
import { parseSlashCommand } from '../../utils/commands.js';
import {
type ExtensionUpdateAction,
@@ -324,6 +325,7 @@ export const useSlashCommandProcessor = (
(async () => {
const commandService = await CommandService.create(
[
+ new SkillCommandLoader(config),
new McpPromptLoader(config),
new BuiltinCommandLoader(config),
new FileCommandLoader(config),
@@ -445,6 +447,7 @@ export const useSlashCommandProcessor = (
type: 'schedule_tool',
toolName: result.toolName,
toolArgs: result.toolArgs,
+ postSubmitPrompt: result.postSubmitPrompt,
};
case 'message':
addItem(
diff --git a/packages/cli/src/ui/hooks/useExtensionRegistry.ts b/packages/cli/src/ui/hooks/useExtensionRegistry.ts
index cfd85ef229..96f4e68007 100644
--- a/packages/cli/src/ui/hooks/useExtensionRegistry.ts
+++ b/packages/cli/src/ui/hooks/useExtensionRegistry.ts
@@ -19,12 +19,16 @@ export interface UseExtensionRegistryResult {
export function useExtensionRegistry(
initialQuery = '',
+ registryURI?: string,
): UseExtensionRegistryResult {
const [extensions, setExtensions] = useState([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState(null);
- const client = useMemo(() => new ExtensionRegistryClient(), []);
+ const client = useMemo(
+ () => new ExtensionRegistryClient(registryURI),
+ [registryURI],
+ );
// Ref to track the latest query to avoid race conditions
const latestQueryRef = useRef(initialQuery);
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index d2e485db1f..bc299e53e2 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -759,7 +759,8 @@ export const useGeminiStream = (
if (slashCommandResult) {
switch (slashCommandResult.type) {
case 'schedule_tool': {
- const { toolName, toolArgs } = slashCommandResult;
+ const { toolName, toolArgs, postSubmitPrompt } =
+ slashCommandResult;
const toolCallRequest: ToolCallRequestInfo = {
callId: `${toolName}-${Date.now()}-${Math.random().toString(16).slice(2)}`,
name: toolName,
@@ -768,6 +769,15 @@ export const useGeminiStream = (
prompt_id,
};
await scheduleToolCalls([toolCallRequest], abortSignal);
+
+ if (postSubmitPrompt) {
+ localQueryToSendToGemini = postSubmitPrompt;
+ return {
+ queryToSend: localQueryToSendToGemini,
+ shouldProceed: true,
+ };
+ }
+
return { queryToSend: null, shouldProceed: false };
}
case 'submit_prompt': {
@@ -1053,10 +1063,6 @@ export const useGeminiStream = (
'Response stopped due to prohibited image content.',
[FinishReason.NO_IMAGE]:
'Response stopped because no image was generated.',
- [FinishReason.IMAGE_RECITATION]:
- 'Response stopped due to image recitation policy.',
- [FinishReason.IMAGE_OTHER]:
- 'Response stopped due to other image-related reasons.',
};
const message = finishReasonMessages[finishReason];
diff --git a/packages/cli/src/ui/key/keyBindings.ts b/packages/cli/src/ui/key/keyBindings.ts
index b375d991c8..5f1e833a53 100644
--- a/packages/cli/src/ui/key/keyBindings.ts
+++ b/packages/cli/src/ui/key/keyBindings.ts
@@ -73,16 +73,6 @@ export enum Command {
OPEN_EXTERNAL_EDITOR = 'input.openExternalEditor',
PASTE_CLIPBOARD = 'input.paste',
- BACKGROUND_SHELL_ESCAPE = 'backgroundShellEscape',
- BACKGROUND_SHELL_SELECT = 'backgroundShellSelect',
- TOGGLE_BACKGROUND_SHELL = 'toggleBackgroundShell',
- TOGGLE_BACKGROUND_SHELL_LIST = 'toggleBackgroundShellList',
- KILL_BACKGROUND_SHELL = 'backgroundShell.kill',
- UNFOCUS_BACKGROUND_SHELL = 'backgroundShell.unfocus',
- UNFOCUS_BACKGROUND_SHELL_LIST = 'backgroundShell.listUnfocus',
- SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING = 'backgroundShell.unfocusWarning',
- SHOW_SHELL_INPUT_UNFOCUS_WARNING = 'shellInput.unfocusWarning',
-
// App Controls
SHOW_ERROR_DETAILS = 'app.showErrorDetails',
SHOW_FULL_TODOS = 'app.showFullTodos',
@@ -98,6 +88,17 @@ export enum Command {
CLEAR_SCREEN = 'app.clearScreen',
RESTART_APP = 'app.restart',
SUSPEND_APP = 'app.suspend',
+ SHOW_SHELL_INPUT_UNFOCUS_WARNING = 'app.showShellUnfocusWarning',
+
+ // Background Shell Controls
+ BACKGROUND_SHELL_ESCAPE = 'background.escape',
+ BACKGROUND_SHELL_SELECT = 'background.select',
+ TOGGLE_BACKGROUND_SHELL = 'background.toggle',
+ TOGGLE_BACKGROUND_SHELL_LIST = 'background.toggleList',
+ KILL_BACKGROUND_SHELL = 'background.kill',
+ UNFOCUS_BACKGROUND_SHELL = 'background.unfocus',
+ UNFOCUS_BACKGROUND_SHELL_LIST = 'background.unfocusList',
+ SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING = 'background.unfocusWarning',
}
/**
@@ -105,20 +106,10 @@ export enum Command {
*/
export class KeyBinding {
private static readonly VALID_KEYS = new Set([
- // Letters & Numbers
- ...'abcdefghijklmnopqrstuvwxyz0123456789',
- // Punctuation
- '`',
- '-',
- '=',
- '[',
- ']',
- '\\',
- ';',
- "'",
- ',',
- '.',
- '/',
+ ...'abcdefghijklmnopqrstuvwxyz0123456789', // Letters & Numbers
+ ..."`-=[]\\;',./", // Punctuation
+ ...Array.from({ length: 19 }, (_, i) => `f${i + 1}`), // Function Keys
+ ...Array.from({ length: 10 }, (_, i) => `numpad${i}`), // Numpad Numbers
// Navigation & Actions
'left',
'up',
@@ -139,10 +130,6 @@ export class KeyBinding {
'insert',
'numlock',
'scrolllock',
- // Function Keys
- ...Array.from({ length: 19 }, (_, i) => `f${i + 1}`),
- // Numpad
- ...Array.from({ length: 10 }, (_, i) => `numpad${i}`),
'numpad_multiply',
'numpad_add',
'numpad_separator',
@@ -354,15 +341,6 @@ export const defaultKeyBindings: KeyBindingConfig = {
[Command.TOGGLE_COPY_MODE]: [new KeyBinding('ctrl+s')],
[Command.TOGGLE_YOLO]: [new KeyBinding('ctrl+y')],
[Command.CYCLE_APPROVAL_MODE]: [new KeyBinding('shift+tab')],
- [Command.TOGGLE_BACKGROUND_SHELL]: [new KeyBinding('ctrl+b')],
- [Command.TOGGLE_BACKGROUND_SHELL_LIST]: [new KeyBinding('ctrl+l')],
- [Command.KILL_BACKGROUND_SHELL]: [new KeyBinding('ctrl+k')],
- [Command.UNFOCUS_BACKGROUND_SHELL]: [new KeyBinding('shift+tab')],
- [Command.UNFOCUS_BACKGROUND_SHELL_LIST]: [new KeyBinding('tab')],
- [Command.SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING]: [new KeyBinding('tab')],
- [Command.SHOW_SHELL_INPUT_UNFOCUS_WARNING]: [new KeyBinding('tab')],
- [Command.BACKGROUND_SHELL_SELECT]: [new KeyBinding('enter')],
- [Command.BACKGROUND_SHELL_ESCAPE]: [new KeyBinding('escape')],
[Command.SHOW_MORE_LINES]: [new KeyBinding('ctrl+o')],
[Command.EXPAND_PASTE]: [new KeyBinding('ctrl+o')],
[Command.FOCUS_SHELL_INPUT]: [new KeyBinding('tab')],
@@ -370,6 +348,17 @@ export const defaultKeyBindings: KeyBindingConfig = {
[Command.CLEAR_SCREEN]: [new KeyBinding('ctrl+l')],
[Command.RESTART_APP]: [new KeyBinding('r'), new KeyBinding('shift+r')],
[Command.SUSPEND_APP]: [new KeyBinding('ctrl+z')],
+ [Command.SHOW_SHELL_INPUT_UNFOCUS_WARNING]: [new KeyBinding('tab')],
+
+ // Background Shell Controls
+ [Command.BACKGROUND_SHELL_ESCAPE]: [new KeyBinding('escape')],
+ [Command.BACKGROUND_SHELL_SELECT]: [new KeyBinding('enter')],
+ [Command.TOGGLE_BACKGROUND_SHELL]: [new KeyBinding('ctrl+b')],
+ [Command.TOGGLE_BACKGROUND_SHELL_LIST]: [new KeyBinding('ctrl+l')],
+ [Command.KILL_BACKGROUND_SHELL]: [new KeyBinding('ctrl+k')],
+ [Command.UNFOCUS_BACKGROUND_SHELL]: [new KeyBinding('shift+tab')],
+ [Command.UNFOCUS_BACKGROUND_SHELL_LIST]: [new KeyBinding('tab')],
+ [Command.SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING]: [new KeyBinding('tab')],
};
interface CommandCategory {
@@ -475,20 +464,25 @@ export const commandCategories: readonly CommandCategory[] = [
Command.CYCLE_APPROVAL_MODE,
Command.SHOW_MORE_LINES,
Command.EXPAND_PASTE,
- Command.TOGGLE_BACKGROUND_SHELL,
- Command.TOGGLE_BACKGROUND_SHELL_LIST,
- Command.KILL_BACKGROUND_SHELL,
- Command.BACKGROUND_SHELL_SELECT,
- Command.BACKGROUND_SHELL_ESCAPE,
- Command.UNFOCUS_BACKGROUND_SHELL,
- Command.UNFOCUS_BACKGROUND_SHELL_LIST,
- Command.SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING,
- Command.SHOW_SHELL_INPUT_UNFOCUS_WARNING,
Command.FOCUS_SHELL_INPUT,
Command.UNFOCUS_SHELL_INPUT,
Command.CLEAR_SCREEN,
Command.RESTART_APP,
Command.SUSPEND_APP,
+ Command.SHOW_SHELL_INPUT_UNFOCUS_WARNING,
+ ],
+ },
+ {
+ title: 'Background Shell Controls',
+ commands: [
+ Command.BACKGROUND_SHELL_ESCAPE,
+ Command.BACKGROUND_SHELL_SELECT,
+ Command.TOGGLE_BACKGROUND_SHELL,
+ Command.TOGGLE_BACKGROUND_SHELL_LIST,
+ Command.KILL_BACKGROUND_SHELL,
+ Command.UNFOCUS_BACKGROUND_SHELL,
+ Command.UNFOCUS_BACKGROUND_SHELL_LIST,
+ Command.SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING,
],
},
];
@@ -576,9 +570,18 @@ export const commandDescriptions: Readonly> = {
'Expand and collapse blocks of content when not in alternate buffer mode.',
[Command.EXPAND_PASTE]:
'Expand or collapse a paste placeholder when cursor is over placeholder.',
+ [Command.FOCUS_SHELL_INPUT]: 'Move focus from Gemini to the active shell.',
+ [Command.UNFOCUS_SHELL_INPUT]: 'Move focus from the shell back to Gemini.',
+ [Command.CLEAR_SCREEN]: 'Clear the terminal screen and redraw the UI.',
+ [Command.RESTART_APP]: 'Restart the application.',
+ [Command.SUSPEND_APP]: 'Suspend the CLI and move it to the background.',
+ [Command.SHOW_SHELL_INPUT_UNFOCUS_WARNING]:
+ 'Show warning when trying to move focus away from shell input.',
+
+ // Background Shell Controls
+ [Command.BACKGROUND_SHELL_ESCAPE]: 'Dismiss background shell list.',
[Command.BACKGROUND_SHELL_SELECT]:
'Confirm selection in background shell list.',
- [Command.BACKGROUND_SHELL_ESCAPE]: 'Dismiss background shell list.',
[Command.TOGGLE_BACKGROUND_SHELL]:
'Toggle current background shell visibility.',
[Command.TOGGLE_BACKGROUND_SHELL_LIST]: 'Toggle background shell list.',
@@ -589,11 +592,4 @@ export const commandDescriptions: Readonly> = {
'Move focus from background shell list to Gemini.',
[Command.SHOW_BACKGROUND_SHELL_UNFOCUS_WARNING]:
'Show warning when trying to move focus away from background shell.',
- [Command.SHOW_SHELL_INPUT_UNFOCUS_WARNING]:
- 'Show warning when trying to move focus away from shell input.',
- [Command.FOCUS_SHELL_INPUT]: 'Move focus from Gemini to the active shell.',
- [Command.UNFOCUS_SHELL_INPUT]: 'Move focus from the shell back to Gemini.',
- [Command.CLEAR_SCREEN]: 'Clear the terminal screen and redraw the UI.',
- [Command.RESTART_APP]: 'Restart the application.',
- [Command.SUSPEND_APP]: 'Suspend the CLI and move it to the background.',
};
diff --git a/packages/cli/src/ui/types.ts b/packages/cli/src/ui/types.ts
index 3898461fb0..2f8e414a83 100644
--- a/packages/cli/src/ui/types.ts
+++ b/packages/cli/src/ui/types.ts
@@ -483,6 +483,7 @@ export type SlashCommandProcessorResult =
type: 'schedule_tool';
toolName: string;
toolArgs: Record;
+ postSubmitPrompt?: PartListUnion;
}
| {
type: 'handled'; // Indicates the command was processed and no further action is needed.
diff --git a/packages/core/package.json b/packages/core/package.json
index 1bd8b54bc3..b98d63372a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -26,7 +26,7 @@
"@google-cloud/logging": "^11.2.1",
"@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
"@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
- "@google/genai": "1.41.0",
+ "@google/genai": "1.30.0",
"@grpc/grpc-js": "^1.14.3",
"@iarna/toml": "^2.2.5",
"@joshua.litt/get-ripgrep": "^0.0.3",
@@ -61,7 +61,7 @@
"fdir": "^6.4.6",
"fzf": "^0.5.2",
"glob": "^12.0.0",
- "google-auth-library": "^10.5.0",
+ "google-auth-library": "^9.11.0",
"html-to-text": "^9.0.5",
"https-proxy-agent": "^7.0.6",
"ignore": "^7.0.0",
diff --git a/packages/core/src/agents/a2aUtils.test.ts b/packages/core/src/agents/a2aUtils.test.ts
index 2bcdad2c40..c3fe170aa5 100644
--- a/packages/core/src/agents/a2aUtils.test.ts
+++ b/packages/core/src/agents/a2aUtils.test.ts
@@ -4,13 +4,17 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
import {
extractMessageText,
extractIdsFromResponse,
isTerminalState,
A2AResultReassembler,
AUTH_REQUIRED_MSG,
+ normalizeAgentCard,
+ getGrpcCredentials,
+ pinUrlToIp,
+ splitAgentCardUrl,
} from './a2aUtils.js';
import type { SendMessageResult } from './a2a-client-manager.js';
import type {
@@ -22,8 +26,105 @@ import type {
TaskStatusUpdateEvent,
TaskArtifactUpdateEvent,
} from '@a2a-js/sdk';
+import * as dnsPromises from 'node:dns/promises';
+import type { LookupAddress } from 'node:dns';
+
+vi.mock('node:dns/promises', () => ({
+ lookup: vi.fn(),
+}));
describe('a2aUtils', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ afterEach(() => {
+ vi.restoreAllMocks();
+ });
+
+ describe('getGrpcCredentials', () => {
+ it('should return secure credentials for https', () => {
+ const credentials = getGrpcCredentials('https://test.agent');
+ expect(credentials).toBeDefined();
+ });
+
+ it('should return insecure credentials for http', () => {
+ const credentials = getGrpcCredentials('http://test.agent');
+ expect(credentials).toBeDefined();
+ });
+ });
+
+ describe('pinUrlToIp', () => {
+ it('should resolve and pin hostname to IP', async () => {
+ vi.mocked(
+ dnsPromises.lookup as unknown as (
+ hostname: string,
+ options: { all: true },
+ ) => Promise,
+ ).mockResolvedValue([{ address: '93.184.216.34', family: 4 }]);
+
+ const { pinnedUrl, hostname } = await pinUrlToIp(
+ 'http://example.com:9000',
+ 'test-agent',
+ );
+ expect(hostname).toBe('example.com');
+ expect(pinnedUrl).toBe('http://93.184.216.34:9000/');
+ });
+
+ it('should handle raw host:port strings (standard for gRPC)', async () => {
+ vi.mocked(
+ dnsPromises.lookup as unknown as (
+ hostname: string,
+ options: { all: true },
+ ) => Promise,
+ ).mockResolvedValue([{ address: '93.184.216.34', family: 4 }]);
+
+ const { pinnedUrl, hostname } = await pinUrlToIp(
+ 'example.com:9000',
+ 'test-agent',
+ );
+ expect(hostname).toBe('example.com');
+ expect(pinnedUrl).toBe('93.184.216.34:9000');
+ });
+
+ it('should throw error if resolution fails (fail closed)', async () => {
+ vi.mocked(dnsPromises.lookup).mockRejectedValue(new Error('DNS Error'));
+
+ await expect(
+ pinUrlToIp('http://unreachable.com', 'test-agent'),
+ ).rejects.toThrow("Failed to resolve host for agent 'test-agent'");
+ });
+
+ it('should throw error if resolved to private IP', async () => {
+ vi.mocked(
+ dnsPromises.lookup as unknown as (
+ hostname: string,
+ options: { all: true },
+ ) => Promise,
+ ).mockResolvedValue([{ address: '10.0.0.1', family: 4 }]);
+
+ await expect(
+ pinUrlToIp('http://malicious.com', 'test-agent'),
+ ).rejects.toThrow('resolves to private IP range');
+ });
+
+ it('should allow localhost/127.0.0.1/::1 exceptions', async () => {
+ vi.mocked(
+ dnsPromises.lookup as unknown as (
+ hostname: string,
+ options: { all: true },
+ ) => Promise,
+ ).mockResolvedValue([{ address: '127.0.0.1', family: 4 }]);
+
+ const { pinnedUrl, hostname } = await pinUrlToIp(
+ 'http://localhost:9000',
+ 'test-agent',
+ );
+ expect(hostname).toBe('localhost');
+ expect(pinnedUrl).toBe('http://127.0.0.1:9000/');
+ });
+ });
+
describe('isTerminalState', () => {
it('should return true for completed, failed, canceled, and rejected', () => {
expect(isTerminalState('completed')).toBe(true);
@@ -223,6 +324,173 @@ describe('a2aUtils', () => {
} as Message),
).toBe('');
});
+
+ it('should handle file parts with neither name nor uri', () => {
+ const message: Message = {
+ kind: 'message',
+ role: 'user',
+ messageId: '1',
+ parts: [
+ {
+ kind: 'file',
+ file: {
+ mimeType: 'text/plain',
+ },
+ } as FilePart,
+ ],
+ };
+ expect(extractMessageText(message)).toBe('File: [binary/unnamed]');
+ });
+ });
+
+ describe('normalizeAgentCard', () => {
+ it('should throw if input is not an object', () => {
+ expect(() => normalizeAgentCard(null)).toThrow('Agent card is missing.');
+ expect(() => normalizeAgentCard(undefined)).toThrow(
+ 'Agent card is missing.',
+ );
+ expect(() => normalizeAgentCard('not an object')).toThrow(
+ 'Agent card is missing.',
+ );
+ });
+
+ it('should preserve unknown fields while providing defaults for mandatory ones', () => {
+ const raw = {
+ name: 'my-agent',
+ customField: 'keep-me',
+ };
+
+ const normalized = normalizeAgentCard(raw);
+
+ expect(normalized.name).toBe('my-agent');
+ // @ts-expect-error - testing dynamic preservation
+ expect(normalized.customField).toBe('keep-me');
+ expect(normalized.description).toBe('');
+ expect(normalized.skills).toEqual([]);
+ expect(normalized.defaultInputModes).toEqual([]);
+ });
+
+ it('should normalize and synchronize interfaces while preserving other fields', () => {
+ const raw = {
+ name: 'test',
+ supportedInterfaces: [
+ {
+ url: 'grpc://test',
+ protocolBinding: 'GRPC',
+ protocolVersion: '1.0',
+ },
+ ],
+ };
+
+ const normalized = normalizeAgentCard(raw);
+
+ // Should exist in both fields
+ expect(normalized.additionalInterfaces).toHaveLength(1);
+ expect(
+ (normalized as unknown as Record)[
+ 'supportedInterfaces'
+ ],
+ ).toHaveLength(1);
+
+ const intf = normalized.additionalInterfaces?.[0] as unknown as Record<
+ string,
+ unknown
+ >;
+
+ expect(intf['transport']).toBe('GRPC');
+ expect(intf['url']).toBe('grpc://test');
+
+ // Should fallback top-level url
+ expect(normalized.url).toBe('grpc://test');
+ });
+
+ it('should preserve existing top-level url if present', () => {
+ const raw = {
+ name: 'test',
+ url: 'http://existing',
+ supportedInterfaces: [{ url: 'http://other', transport: 'REST' }],
+ };
+
+ const normalized = normalizeAgentCard(raw);
+ expect(normalized.url).toBe('http://existing');
+ });
+
+ it('should NOT prepend http:// scheme to raw IP:port strings for gRPC interfaces', () => {
+ const raw = {
+ name: 'raw-ip-grpc',
+ supportedInterfaces: [{ url: '127.0.0.1:9000', transport: 'GRPC' }],
+ };
+
+ const normalized = normalizeAgentCard(raw);
+ expect(normalized.additionalInterfaces?.[0].url).toBe('127.0.0.1:9000');
+ expect(normalized.url).toBe('127.0.0.1:9000');
+ });
+
+ it('should prepend http:// scheme to raw IP:port strings for REST interfaces', () => {
+ const raw = {
+ name: 'raw-ip-rest',
+ supportedInterfaces: [{ url: '127.0.0.1:8080', transport: 'REST' }],
+ };
+
+ const normalized = normalizeAgentCard(raw);
+ expect(normalized.additionalInterfaces?.[0].url).toBe(
+ 'http://127.0.0.1:8080',
+ );
+ });
+
+ it('should NOT override existing transport if protocolBinding is also present', () => {
+ const raw = {
+ name: 'priority-test',
+ supportedInterfaces: [
+ { url: 'foo', transport: 'GRPC', protocolBinding: 'REST' },
+ ],
+ };
+ const normalized = normalizeAgentCard(raw);
+ expect(normalized.additionalInterfaces?.[0].transport).toBe('GRPC');
+ });
+ });
+
+ describe('splitAgentCardUrl', () => {
+ const standard = '.well-known/agent-card.json';
+
+ it('should return baseUrl as-is if it does not end with standard path', () => {
+ const url = 'http://localhost:9001/custom/path';
+ expect(splitAgentCardUrl(url)).toEqual({ baseUrl: url });
+ });
+
+ it('should split correctly if URL ends with standard path', () => {
+ const url = `http://localhost:9001/${standard}`;
+ expect(splitAgentCardUrl(url)).toEqual({
+ baseUrl: 'http://localhost:9001/',
+ path: undefined,
+ });
+ });
+
+ it('should handle trailing slash in baseUrl when splitting', () => {
+ const url = `http://example.com/api/${standard}`;
+ expect(splitAgentCardUrl(url)).toEqual({
+ baseUrl: 'http://example.com/api/',
+ path: undefined,
+ });
+ });
+
+ it('should ignore hashes and query params when splitting', () => {
+ const url = `http://localhost:9001/${standard}?foo=bar#baz`;
+ expect(splitAgentCardUrl(url)).toEqual({
+ baseUrl: 'http://localhost:9001/',
+ path: undefined,
+ });
+ });
+
+ it('should return original URL if parsing fails', () => {
+ const url = 'not-a-url';
+ expect(splitAgentCardUrl(url)).toEqual({ baseUrl: url });
+ });
+
+ it('should handle standard path appearing earlier in the path', () => {
+ const url = `http://localhost:9001/${standard}/something-else`;
+ expect(splitAgentCardUrl(url)).toEqual({ baseUrl: url });
+ });
});
describe('A2AResultReassembler', () => {
@@ -233,6 +501,7 @@ describe('a2aUtils', () => {
reassembler.update({
kind: 'status-update',
taskId: 't1',
+ contextId: 'ctx1',
status: {
state: 'working',
message: {
@@ -247,6 +516,7 @@ describe('a2aUtils', () => {
reassembler.update({
kind: 'artifact-update',
taskId: 't1',
+ contextId: 'ctx1',
append: false,
artifact: {
artifactId: 'a1',
@@ -259,6 +529,7 @@ describe('a2aUtils', () => {
reassembler.update({
kind: 'status-update',
taskId: 't1',
+ contextId: 'ctx1',
status: {
state: 'working',
message: {
@@ -273,6 +544,7 @@ describe('a2aUtils', () => {
reassembler.update({
kind: 'artifact-update',
taskId: 't1',
+ contextId: 'ctx1',
append: true,
artifact: {
artifactId: 'a1',
@@ -291,6 +563,7 @@ describe('a2aUtils', () => {
reassembler.update({
kind: 'status-update',
+ contextId: 'ctx1',
status: {
state: 'auth-required',
message: {
@@ -310,6 +583,7 @@ describe('a2aUtils', () => {
reassembler.update({
kind: 'status-update',
+ contextId: 'ctx1',
status: {
state: 'auth-required',
},
@@ -323,6 +597,7 @@ describe('a2aUtils', () => {
const chunk = {
kind: 'status-update',
+ contextId: 'ctx1',
status: {
state: 'auth-required',
message: {
@@ -351,6 +626,8 @@ describe('a2aUtils', () => {
reassembler.update({
kind: 'task',
+ id: 'task-1',
+ contextId: 'ctx1',
status: { state: 'completed' },
history: [
{
@@ -369,6 +646,8 @@ describe('a2aUtils', () => {
reassembler.update({
kind: 'task',
+ id: 'task-1',
+ contextId: 'ctx1',
status: { state: 'working' },
history: [
{
@@ -387,6 +666,8 @@ describe('a2aUtils', () => {
reassembler.update({
kind: 'task',
+ id: 'task-1',
+ contextId: 'ctx1',
status: { state: 'completed' },
artifacts: [
{
diff --git a/packages/core/src/agents/a2aUtils.ts b/packages/core/src/agents/a2aUtils.ts
index dc39f4e660..ec8b36bba1 100644
--- a/packages/core/src/agents/a2aUtils.ts
+++ b/packages/core/src/agents/a2aUtils.ts
@@ -4,6 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
+import * as grpc from '@grpc/grpc-js';
+import { lookup } from 'node:dns/promises';
+import { z } from 'zod';
import type {
Message,
Part,
@@ -12,12 +15,40 @@ import type {
FilePart,
Artifact,
TaskState,
- TaskStatusUpdateEvent,
+ AgentCard,
+ AgentInterface,
} from '@a2a-js/sdk';
+import { isAddressPrivate } from '../utils/fetch.js';
import type { SendMessageResult } from './a2a-client-manager.js';
export const AUTH_REQUIRED_MSG = `[Authorization Required] The agent has indicated it requires authorization to proceed. Please follow the agent's instructions.`;
+const AgentInterfaceSchema = z
+ .object({
+ url: z.string().default(''),
+ transport: z.string().optional(),
+ protocolBinding: z.string().optional(),
+ })
+ .passthrough();
+
+const AgentCardSchema = z
+ .object({
+ name: z.string().default('unknown'),
+ description: z.string().default(''),
+ url: z.string().default(''),
+ version: z.string().default(''),
+ protocolVersion: z.string().default(''),
+ capabilities: z.record(z.unknown()).default({}),
+ skills: z.array(z.union([z.string(), z.record(z.unknown())])).default([]),
+ defaultInputModes: z.array(z.string()).default([]),
+ defaultOutputModes: z.array(z.string()).default([]),
+
+ additionalInterfaces: z.array(AgentInterfaceSchema).optional(),
+ supportedInterfaces: z.array(AgentInterfaceSchema).optional(),
+ preferredTransport: z.string().optional(),
+ })
+ .passthrough();
+
/**
* Reassembles incremental A2A streaming updates into a coherent result.
* Shows sequential status/messages followed by all reassembled artifacts.
@@ -100,12 +131,11 @@ export class A2AResultReassembler {
}
break;
- case 'message': {
+ case 'message':
this.pushMessage(chunk);
break;
- }
-
default:
+ // Handle unknown kinds gracefully
break;
}
}
@@ -210,36 +240,165 @@ function extractPartText(part: Part): string {
return '';
}
-// Type Guards
+/**
+ * Normalizes an agent card by ensuring it has the required properties
+ * and resolving any inconsistencies between protocol versions.
+ */
+export function normalizeAgentCard(card: unknown): AgentCard {
+ if (!isObject(card)) {
+ throw new Error('Agent card is missing.');
+ }
-function isTextPart(part: Part): part is TextPart {
- return part.kind === 'text';
-}
+ // Use Zod to validate and parse the card, ensuring safe defaults and narrowing types.
+ const parsed = AgentCardSchema.parse(card);
+ // Narrowing to AgentCard interface after runtime validation.
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+ const result = parsed as unknown as AgentCard;
-function isDataPart(part: Part): part is DataPart {
- return part.kind === 'data';
-}
+ // Normalize interfaces and synchronize both interface fields.
+ const normalizedInterfaces = extractNormalizedInterfaces(parsed);
+ result.additionalInterfaces = normalizedInterfaces;
-function isFilePart(part: Part): part is FilePart {
- return part.kind === 'file';
-}
+ // Sync supportedInterfaces for backward compatibility.
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+ const legacyResult = result as unknown as Record;
+ legacyResult['supportedInterfaces'] = normalizedInterfaces;
-function isStatusUpdateEvent(
- result: SendMessageResult,
-): result is TaskStatusUpdateEvent {
- return result.kind === 'status-update';
+ // Fallback preferredTransport: If not specified, default to GRPC if available.
+ if (
+ !result.preferredTransport &&
+ normalizedInterfaces.some((i) => i.transport === 'GRPC')
+ ) {
+ result.preferredTransport = 'GRPC';
+ }
+
+ // Fallback: If top-level URL is missing, use the first interface's URL.
+ if (result.url === '' && normalizedInterfaces.length > 0) {
+ result.url = normalizedInterfaces[0].url;
+ }
+
+ return result;
}
/**
- * Returns true if the given state is a terminal state for a task.
+ * Returns gRPC channel credentials based on the URL scheme.
*/
-export function isTerminalState(state: TaskState | undefined): boolean {
- return (
- state === 'completed' ||
- state === 'failed' ||
- state === 'canceled' ||
- state === 'rejected'
- );
+export function getGrpcCredentials(url: string): grpc.ChannelCredentials {
+ return url.startsWith('https://')
+ ? grpc.credentials.createSsl()
+ : grpc.credentials.createInsecure();
+}
+
+/**
+ * Returns gRPC channel options to ensure SSL/authority matches the original hostname
+ * when connecting via a pinned IP address.
+ */
+export function getGrpcChannelOptions(
+ hostname: string,
+): Record {
+ return {
+ 'grpc.default_authority': hostname,
+ 'grpc.ssl_target_name_override': hostname,
+ };
+}
+
+/**
+ * Resolves a hostname to its IP address and validates it against SSRF.
+ * Returns the pinned IP-based URL and the original hostname.
+ */
+export async function pinUrlToIp(
+ url: string,
+ agentName: string,
+): Promise<{ pinnedUrl: string; hostname: string }> {
+ if (!url) return { pinnedUrl: url, hostname: '' };
+
+ // gRPC URLs in A2A can be 'host:port' or 'dns:///host:port' or have schemes.
+ // We normalize to host:port for resolution.
+ const hasScheme = url.includes('://');
+ const normalizedUrl = hasScheme ? url : `http://${url}`;
+
+ try {
+ const parsed = new URL(normalizedUrl);
+ const hostname = parsed.hostname;
+
+ const sanitizedHost =
+ hostname.startsWith('[') && hostname.endsWith(']')
+ ? hostname.slice(1, -1)
+ : hostname;
+
+ // Resolve DNS to check the actual target IP and pin it
+ const addresses = await lookup(hostname, { all: true });
+ const publicAddresses = addresses.filter(
+ (addr) =>
+ !isAddressPrivate(addr.address) ||
+ sanitizedHost === 'localhost' ||
+ sanitizedHost === '127.0.0.1' ||
+ sanitizedHost === '::1',
+ );
+
+ if (publicAddresses.length === 0) {
+ if (addresses.length > 0) {
+ throw new Error(
+ `Refusing to load agent '${agentName}': transport URL '${url}' resolves to private IP range.`,
+ );
+ }
+ throw new Error(
+ `Failed to resolve any public IP addresses for host: ${hostname}`,
+ );
+ }
+
+ const pinnedIp = publicAddresses[0].address;
+ const pinnedHostname = pinnedIp.includes(':') ? `[${pinnedIp}]` : pinnedIp;
+
+ // Reconstruct URL with IP
+ parsed.hostname = pinnedHostname;
+ let pinnedUrl = parsed.toString();
+
+ // If original didn't have scheme, remove it (standard for gRPC targets)
+ if (!hasScheme) {
+ pinnedUrl = pinnedUrl.replace(/^http:\/\//, '');
+ // URL.toString() might append a trailing slash
+ if (pinnedUrl.endsWith('/') && !url.endsWith('/')) {
+ pinnedUrl = pinnedUrl.slice(0, -1);
+ }
+ }
+
+ return { pinnedUrl, hostname };
+ } catch (e) {
+ if (e instanceof Error && e.message.includes('Refusing')) throw e;
+ throw new Error(`Failed to resolve host for agent '${agentName}': ${url}`, {
+ cause: e,
+ });
+ }
+}
+
+/**
+ * Splts an agent card URL into a baseUrl and a standard path if it already
+ * contains '.well-known/agent-card.json'.
+ */
+export function splitAgentCardUrl(url: string): {
+ baseUrl: string;
+ path?: string;
+} {
+ const standardPath = '.well-known/agent-card.json';
+ try {
+ const parsedUrl = new URL(url);
+ if (parsedUrl.pathname.endsWith(standardPath)) {
+ // Reconstruct baseUrl from parsed components to avoid issues with hashes or query params.
+ parsedUrl.pathname = parsedUrl.pathname.substring(
+ 0,
+ parsedUrl.pathname.lastIndexOf(standardPath),
+ );
+ parsedUrl.search = '';
+ parsedUrl.hash = '';
+ // We return undefined for path if it's the standard one,
+ // because the SDK's DefaultAgentCardResolver appends it automatically.
+ return { baseUrl: parsedUrl.toString(), path: undefined };
+ }
+ } catch (_e) {
+ // Ignore URL parsing errors here, let the resolver handle them.
+ }
+ return { baseUrl: url };
}
/**
@@ -255,27 +414,126 @@ export function extractIdsFromResponse(result: SendMessageResult): {
let taskId: string | undefined;
let clearTaskId = false;
- if ('kind' in result) {
- const kind = result.kind;
- if (kind === 'message' || kind === 'artifact-update') {
+ if (!('kind' in result)) return { contextId, taskId, clearTaskId };
+
+ switch (result.kind) {
+ case 'message':
+ case 'artifact-update':
taskId = result.taskId;
contextId = result.contextId;
- } else if (kind === 'task') {
+ break;
+
+ case 'task':
taskId = result.id;
contextId = result.contextId;
if (isTerminalState(result.status?.state)) {
clearTaskId = true;
}
- } else if (isStatusUpdateEvent(result)) {
+ break;
+
+ case 'status-update':
taskId = result.taskId;
contextId = result.contextId;
- // Note: We ignore the 'final' flag here per A2A protocol best practices,
- // as a stream can close while a task is still in a 'working' state.
if (isTerminalState(result.status?.state)) {
clearTaskId = true;
}
- }
+ break;
+ default:
+ // Handle other kind values if any
+ break;
}
return { contextId, taskId, clearTaskId };
}
+
+/**
+ * Extracts and normalizes interfaces from the card, handling protocol version fallbacks.
+ * Preserves all original fields to maintain SDK compatibility.
+ */
+function extractNormalizedInterfaces(
+ card: Record,
+): AgentInterface[] {
+ const rawInterfaces =
+ getArray(card, 'additionalInterfaces') ||
+ getArray(card, 'supportedInterfaces');
+
+ if (!rawInterfaces) {
+ return [];
+ }
+
+ const mapped: AgentInterface[] = [];
+ for (const i of rawInterfaces) {
+ if (isObject(i)) {
+ // Use schema to validate interface object.
+ const parsed = AgentInterfaceSchema.parse(i);
+ // Narrowing to AgentInterface after runtime validation.
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+ const normalized = parsed as unknown as AgentInterface & {
+ protocolBinding?: string;
+ };
+
+ // Normalize 'transport' from 'protocolBinding' if missing.
+ if (!normalized.transport && normalized.protocolBinding) {
+ normalized.transport = normalized.protocolBinding;
+ }
+
+ // Robust URL: Ensure the URL has a scheme (except for gRPC).
+ if (
+ normalized.url &&
+ !normalized.url.includes('://') &&
+ !normalized.url.startsWith('/') &&
+ normalized.transport !== 'GRPC'
+ ) {
+ // Default to http:// for insecure REST/JSON-RPC if scheme is missing.
+ normalized.url = `http://${normalized.url}`;
+ }
+
+ mapped.push(normalized as AgentInterface);
+ }
+ }
+ return mapped;
+}
+
+/**
+ * Safely extracts an array property from an object.
+ */
+function getArray(
+ obj: Record,
+ key: string,
+): unknown[] | undefined {
+ const val = obj[key];
+ return Array.isArray(val) ? val : undefined;
+}
+
+// Type Guards
+
+function isTextPart(part: Part): part is TextPart {
+ return part.kind === 'text';
+}
+
+function isDataPart(part: Part): part is DataPart {
+ return part.kind === 'data';
+}
+
+function isFilePart(part: Part): part is FilePart {
+ return part.kind === 'file';
+}
+
+/**
+ * Returns true if the given state is a terminal state for a task.
+ */
+export function isTerminalState(state: TaskState | undefined): boolean {
+ return (
+ state === 'completed' ||
+ state === 'failed' ||
+ state === 'canceled' ||
+ state === 'rejected'
+ );
+}
+
+/**
+ * Type guard to check if a value is a non-array object.
+ */
+function isObject(val: unknown): val is Record {
+ return typeof val === 'object' && val !== null && !Array.isArray(val);
+}
diff --git a/packages/core/src/agents/agentLoader.test.ts b/packages/core/src/agents/agentLoader.test.ts
index 9c03094b3f..a526382553 100644
--- a/packages/core/src/agents/agentLoader.test.ts
+++ b/packages/core/src/agents/agentLoader.test.ts
@@ -557,26 +557,6 @@ auth:
});
});
- it('should parse auth with agent_card_requires_auth flag', async () => {
- const filePath = await writeAgentMarkdown(`---
-kind: remote
-name: protected-card-agent
-agent_card_url: https://example.com/card
-auth:
- type: apiKey
- key: $MY_API_KEY
- agent_card_requires_auth: true
----
-`);
- const result = await parseAgentMarkdown(filePath);
- expect(result[0]).toMatchObject({
- auth: {
- type: 'apiKey',
- agent_card_requires_auth: true,
- },
- });
- });
-
it('should parse remote agent with oauth2 auth', async () => {
const filePath = await writeAgentMarkdown(`---
kind: remote
diff --git a/packages/core/src/agents/agentLoader.ts b/packages/core/src/agents/agentLoader.ts
index b91187204e..12337c6248 100644
--- a/packages/core/src/agents/agentLoader.ts
+++ b/packages/core/src/agents/agentLoader.ts
@@ -45,7 +45,6 @@ interface FrontmatterLocalAgentDefinition
*/
interface FrontmatterAuthConfig {
type: 'apiKey' | 'http' | 'oauth2';
- agent_card_requires_auth?: boolean;
// API Key
key?: string;
name?: string;
@@ -123,9 +122,7 @@ const localAgentSchema = z
/**
* Base fields shared by all auth configs.
*/
-const baseAuthFields = {
- agent_card_requires_auth: z.boolean().optional(),
-};
+const baseAuthFields = {};
/**
* API Key auth schema.
@@ -356,9 +353,7 @@ export async function parseAgentMarkdown(
function convertFrontmatterAuthToConfig(
frontmatter: FrontmatterAuthConfig,
): A2AAuthConfig {
- const base = {
- agent_card_requires_auth: frontmatter.agent_card_requires_auth,
- };
+ const base = {};
switch (frontmatter.type) {
case 'apiKey':
diff --git a/packages/core/src/agents/auth-provider/types.ts b/packages/core/src/agents/auth-provider/types.ts
index f4e2e48b13..0808f54ae2 100644
--- a/packages/core/src/agents/auth-provider/types.ts
+++ b/packages/core/src/agents/auth-provider/types.ts
@@ -24,9 +24,8 @@ export interface A2AAuthProvider extends AuthenticationHandler {
initialize?(): Promise;
}
-export interface BaseAuthConfig {
- agent_card_requires_auth?: boolean;
-}
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface BaseAuthConfig {}
/** Client config for google-credentials (not in A2A spec, Gemini-specific). */
export interface GoogleCredentialsAuthConfig extends BaseAuthConfig {
diff --git a/packages/core/src/agents/browser/automationOverlay.ts b/packages/core/src/agents/browser/automationOverlay.ts
new file mode 100644
index 0000000000..a1aa40d58b
--- /dev/null
+++ b/packages/core/src/agents/browser/automationOverlay.ts
@@ -0,0 +1,133 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Automation overlay utilities for visual indication during browser automation.
+ *
+ * Provides functions to inject and remove a pulsating blue border overlay
+ * that indicates when the browser is under AI agent control.
+ *
+ * Uses the Web Animations API instead of injected