chore(release): v0.50.0-preview.0

fix/verify release npm ci ignore scripts (#28116 )
Add JSON output for eval inventory (#28058 )
2026-08-02 21:21:09 -07:00 · 2026-06-24 21:26:10 +00:00 · 2026-06-24 03:51:29 +00:00 · 2026-06-23 18:48:50 +00:00 · 2026-06-23 14:16:46 +00:00
40 changed files with 1089 additions and 135 deletions
@@ -19,6 +19,6 @@ runs:
      run: |-
        echo ""@google-gemini:registry=https://npm.pkg.github.com"" > ~/.npmrc
        echo ""//npm.pkg.github.com/:_authToken=${INPUTS_GITHUB_TOKEN}"" >> ~/.npmrc
-        echo ""@google:registry=https://wombat-dressing-room.appspot.com/"" >> ~/.npmrc
+        echo ""@google:registry=https://wombat-dressing-room.appspot.com"" >> ~/.npmrc
      env:
        INPUTS_GITHUB_TOKEN: '${{ inputs.github-token }}'
@@ -86,7 +86,7 @@ runs:
    - name: 'Install dependencies for integration tests'
      shell: 'bash'
      working-directory: '${{ inputs.working-directory }}'
-      run: 'npm ci'
+      run: 'npm ci --ignore-scripts'

    - name: '🔬 Run integration tests against NPM release'
      working-directory: '${{ inputs.working-directory }}'
@@ -68,6 +68,7 @@ jobs:
          ISSUE_NUMBER: '${{ github.event.issue.number }}'
          REPOSITORY: '${{ github.repository }}'
          FIRESTORE_PROJECT: '${{ vars.FIRESTORE_PROJECT }}'
+          GEMINI_CLI_TRUST_WORKSPACE: 'true'
        with:
          upload_artifacts: 'true'
          gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
@@ -131,6 +131,19 @@ jobs:
            core.info(`Found ${labelNames.length} labels: ${labelNames.join(', ')}`);
            return labelNames;

+      - name: 'Prepare Issue Data'
+        id: 'prepare_issue_data'
+        env:
+          ISSUE_TITLE: >-
+            ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.title || github.event.issue.title }}
+          ISSUE_BODY: >-
+            ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.body || github.event.issue.body }}
+        run: |
+          set -euo pipefail
+          echo "Title: ${ISSUE_TITLE}" > issue_context.md
+          echo "Body:" >> issue_context.md
+          echo "${ISSUE_BODY}" >> issue_context.md
+
      - name: 'Run Gemini Issue Analysis'
        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
        id: 'gemini_issue_analysis'
@@ -140,6 +153,7 @@ jobs:
            ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.issue_number || inputs.issue_number) || github.event.issue.number }}
          REPOSITORY: '${{ github.repository }}'
          AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
+          GEMINI_CLI_TRUST_WORKSPACE: 'true'
        with:
          upload_artifacts: 'true'
          gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
@@ -157,7 +171,10 @@ jobs:
                "target": "gcp"
              },
              "tools": {
-                "core": []
+                "core": [
+                  "run_shell_command(echo)",
+                  "read_file"
+                ]
              }
            }
          prompt: |-
@@ -165,15 +182,8 @@ jobs:

            You are an issue triage assistant. Your role is to analyze a GitHub issue and determine the single most appropriate area/ label based on the definitions provided.

-            ## Issue Context
-            Title: ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.title || github.event.issue.title }}
-            Body:
-            --- START OF ISSUE BODY ---
-            ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.body || github.event.issue.body }}
-            --- END OF ISSUE BODY ---
-
            ## Steps
-            1. Analyze the issue context above.
+            1. Use the read_file tool to read the file "issue_context.md" which contains the issue title and body.
            2. Review the available labels: ${{ env.AVAILABLE_LABELS }}.
            3. Select exactly one area/ label that best matches the issue based on Reference 1: Area Definitions.
            4. Fallback Logic:
@@ -48,6 +48,8 @@ jobs:
      contents: 'read'
      issues: 'read'
      actions: 'read'
+    env:
+      GEMINI_CLI_TRUST_WORKSPACE: 'true'
    steps:
      - name: 'Determine Checkout Ref'
        id: 'determine_ref'
@@ -176,6 +176,7 @@ jobs:
          REPOSITORY: '${{ github.repository }}'
          AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
          CLI_VERSION: '${{ steps.get_version.outputs.version }}'
+          GEMINI_CLI_TRUST_WORKSPACE: 'true'
          GEMINI_EXP: 'gemini_exp.json'
          GEMINI_STRICT_TELEMETRY_LIMITS: 'true'
          GEMINI_MODEL: 'gemini-3-flash-preview'
@@ -300,6 +301,7 @@ jobs:
          REPOSITORY: '${{ github.repository }}'
          AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
          CLI_VERSION: '${{ steps.get_version.outputs.version }}'
+          GEMINI_CLI_TRUST_WORKSPACE: 'true'
          GEMINI_EXP: 'gemini_exp.json'
          GEMINI_STRICT_TELEMETRY_LIMITS: 'true'
          GEMINI_MODEL: 'gemini-3-flash-preview'
@@ -145,8 +145,8 @@ jobs:
          skip-branch-cleanup: true
          force-skip-tests: "${{ github.event_name != 'schedule' && github.event.inputs.force_skip_tests == 'true' }}"
          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          npm-registry-publish-url: "${{ vars.NPM_REGISTRY_PUBLISH_URL || 'https://registry.npmjs.org/' }}"
-          npm-registry-url: "${{ vars.NPM_REGISTRY_URL || 'https://registry.npmjs.org/' }}"
+          npm-registry-publish-url: "${{ vars.NPM_REGISTRY_PUBLISH_URL || 'https://wombat-dressing-room.appspot.com' }}"
+          npm-registry-url: "${{ vars.NPM_REGISTRY_URL || 'https://wombat-dressing-room.appspot.com' }}"
          npm-registry-scope: "${{ vars.NPM_REGISTRY_SCOPE || '@google' }}"
          cli-package-name: "${{ vars.CLI_PACKAGE_NAME || '@google/gemini-cli' }}"
          core-package-name: "${{ vars.CORE_PACKAGE_NAME || '@google/gemini-cli-core' }}"
@@ -1 +1 @@
-@google:registry=https://wombat-dressing-room.appspot.com/
+@google:registry=https://wombat-dressing-room.appspot.com
@@ -143,16 +143,6 @@ Integrate Gemini CLI directly into your GitHub workflows with
 - **Custom Workflows**: Build automated, scheduled and on-demand workflows
  tailored to your team's needs

-<!-- prettier-ignore -->
-> [!WARNING]
-> **Security best practice for public repositories:** Never set
-> `GEMINI_CLI_TRUST_WORKSPACE=true` or use `--skip-trust` in CI/CD workflows
-> that process untrusted public inputs (like issue titles/bodies or PR comments).
-> Doing so can expose dynamically generated runner secrets (such as GCP OIDC
-> service account credentials) to prompt injection attacks. See the
-> [Trusted Folders documentation](https://www.geminicli.com/docs/cli/trusted-folders)
-> for more information.
-
 ## 🔐 Authentication Options

 Choose the authentication method that best fits your needs:
@@ -507,6 +507,7 @@ on GitHub.
  headlessly in notebook cells or interactively in the built-in terminal
  ([pic](https://imgur.com/a/G0Tn7vi))
 - 🎉**Gemini CLI Extensions:**
+
  - **Conductor:** Planning++, Gemini works with you to build out a detailed
    plan, pull in extra details as needed, ultimately to give the LLM guardrails
    with artifacts. Measure twice, implement once!
@@ -635,6 +636,7 @@ on GitHub.
  - **Announcement:**
    [https://developers.googleblog.com/en/making-the-terminal-beautiful-one-pixel-at-a-time/](https://developers.googleblog.com/en/making-the-terminal-beautiful-one-pixel-at-a-time/)
 - **🎉 New partner extensions:**
+
  - **Arize:** Seamlessly instrument AI applications with Arize AX and grant
    direct access to Arize support:

@@ -674,6 +676,7 @@ on GitHub.
 ![Codebase investigator subagent in Gemini CLI.](https://i.imgur.com/4J1njsx.png)

 - **🎉 New partner extensions:**
+
  - **🤗 Hugging Face extension:** Access the Hugging Face hub.
    ([gif](https://drive.google.com/file/d/1LEzIuSH6_igFXq96_tWev11svBNyPJEB/view?usp=sharing&resourcekey=0-LtPTzR1woh-rxGtfPzjjfg))

@@ -16,10 +16,12 @@ sends them to the model with every prompt. The CLI loads files in the following
 order:

 1.  **Global context file:**
+
    - **Location:** `~/.gemini/GEMINI.md` (in your user home directory).
    - **Scope:** Provides default instructions for all your projects.

 2.  **Environment and workspace context files:**
+
    - **Location:** The CLI searches for `GEMINI.md` files in your configured
      workspace directories and their parent directories.
    - **Scope:** Provides context relevant to the projects you are currently
@@ -64,6 +64,7 @@ Gemini CLI takes action.
    reach an informal agreement on the approach before proceeding.
 3.  **Review the plan:** Once you've agreed on the strategy, Gemini CLI creates
    a detailed implementation plan as a Markdown file in your plans directory.
+
    - **View:** You can open and read this file to understand the proposed
      changes.
    - **Edit:** Press `Ctrl+X` to open the plan directly in your configured
@@ -202,6 +202,7 @@ becoming too large and expensive.
  exchanges) allowed in a single session. Set to `-1` for unlimited (default).

  **Behavior when limit is reached:**
+
  - **Interactive mode:** The CLI shows an informational message and stops
    sending requests to the model. You must manually start a new session.
  - **Non-interactive mode:** The CLI exits with an error.
@@ -27,11 +27,13 @@ via a `.gemini/.env` file. See
 [Persisting Environment Variables](../get-started/authentication.mdx#persisting-environment-variables).

 - Use the project default path (`.gemini/system.md`):
+
  - `GEMINI_SYSTEM_MD=true` or `GEMINI_SYSTEM_MD=1`
  - The CLI reads `./.gemini/system.md` (relative to your current project
    directory).

 - Use a custom file path:
+
  - `GEMINI_SYSTEM_MD=/absolute/path/to/my-system.md`
  - Relative paths are supported and resolved from the current working
    directory.
@@ -64,6 +64,7 @@ and Cloud Logging.
 You must complete several setup steps before enabling Google Cloud telemetry.

 1.  Set your Google Cloud project ID:
+
    - To send telemetry to a separate project:

      **macOS/Linux**
@@ -93,8 +94,10 @@ You must complete several setup steps before enabling Google Cloud telemetry.
      ```

 2.  Authenticate with Google Cloud using one of these methods:
+
    - **Method A: Application Default Credentials (ADC)**: Use this method for
      service accounts or standard `gcloud` authentication.
+
      - For user accounts:
        ```bash
        gcloud auth application-default login
@@ -112,6 +115,7 @@ You must complete several setup steps before enabling Google Cloud telemetry.
        ```powershell
        $env:GOOGLE_APPLICATION_CREDENTIALS="C:\path\to\your\service-account.json"
        ```
+
    * **Method B: CLI Auth** (Direct export only): Simplest method for local
      users. Gemini CLI uses the same OAuth credentials you used for login. To
      enable this, set `useCliAuth: true` in your `.gemini/settings.json`:
@@ -133,6 +137,7 @@ You must complete several setup steps before enabling Google Cloud telemetry.
 > telemetry will be disabled.

 3.  Ensure your account or service account has these IAM roles:
+
    - Cloud Trace Agent
    - Monitoring Metric Writer
    - Logs Writer
@@ -117,16 +117,6 @@ the following methods:
 These methods will trust the current workspace for the duration of the session
 without prompting.

-<!-- prettier-ignore -->
-> [!WARNING]
-> **Never set `GEMINI_CLI_TRUST_WORKSPACE=true` or use `--skip-trust` in CI/CD
-> workflows that process untrusted public inputs** (such as GitHub issues, pull
-> requests, or comments). Doing so allows a malicious contributor to commit a
-> crafted `.gemini/settings.json` file in their pull request, register
-> arbitrary tools (including shell execution), and exfiltrate dynamically
-> generated runner secrets (such as GCP service account credentials or AWS keys)
-> via prompt injection.
-
 For detailed instructions on managing folder trust within CI/CD workflows,
 review the
 [Gemini CLI trust guidance for GitHub Actions](https://github.com/google-github-actions/run-gemini-cli/blob/main/docs/trust-guidance.md).
@@ -56,6 +56,7 @@ creating a "discovery file."
    }
  }
  ```
+
  - `port` (number, required): The port of the MCP server.
  - `workspacePath` (string, required): A list of all open workspace root paths,
    delimited by the OS-specific path separator (`:` for Linux/macOS, `;` for
@@ -187,6 +188,7 @@ The plugin **MUST** register an `openDiff` tool on its MCP server.
 - **Response (`CallToolResult`):** The tool **MUST** immediately return a
  `CallToolResult` to acknowledge the request and report whether the diff view
  was successfully opened.
+
  - On Success: If the diff view was opened successfully, the response **MUST**
    contain empty content (that is, `content: []`).
  - On Failure: If an error prevented the diff view from opening, the response
@@ -27,6 +27,7 @@ AI-generated code changes directly within your editor.

 - **Workspace context:** The CLI automatically gains awareness of your workspace
  to provide more relevant and accurate responses. This context includes:
+
  - The **10 most recently accessed files** in your workspace.
  - Your active cursor position.
  - Any text you have selected (up to a 16KB limit; longer selections will be
@@ -228,6 +229,7 @@ If you are using Gemini CLI within a sandbox, be aware of the following:

 - **Message:**
  `🔴 Disconnected: Failed to connect to IDE companion extension in [IDE Name]. Please ensure the extension is running. To install the extension, run /ide install.`
+
  - **Cause:** Gemini CLI could not find the necessary environment variables
    (`GEMINI_CLI_IDE_WORKSPACE_PATH` or `GEMINI_CLI_IDE_SERVER_PORT`) to connect
    to the IDE. This usually means the IDE companion extension is not running or
@@ -270,6 +272,7 @@ to connect using the provided PID.

 - **Message:**
  `🔴 Disconnected: Directory mismatch. Gemini CLI is running in a different location than the open workspace in [IDE Name]. Please run the CLI from one of the following directories: [List of directories]`
+
  - **Cause:** The CLI's current working directory is outside the workspace you
    have open in your IDE.
  - **Solution:** `cd` into the same directory that is open in your IDE and
@@ -284,6 +287,7 @@ to connect using the provided PID.

 - **Message:**
  `IDE integration is not supported in your current environment. To use this feature, run Gemini CLI in one of these supported IDEs: [List of IDEs]`
+
  - **Cause:** You are running Gemini CLI in a terminal or environment that is
    not a supported IDE.
  - **Solution:** Run Gemini CLI from the integrated terminal of a supported
@@ -59,6 +59,7 @@ You can view traces in the Jaeger UI for local development.

    This command configures your workspace for local telemetry and provides a
    link to the Jaeger UI (usually `http://localhost:16686`).
+
    - **Collector logs:** `~/.gemini/tmp/<projectHash>/otel/collector.log`

 2.  **Run Gemini CLI:**
@@ -108,6 +109,7 @@ Trace for custom processing or routing.

    The script outputs links to view traces, metrics, and logs in the Google
    Cloud Console.
+
    - **Collector logs:** `~/.gemini/tmp/<projectHash>/otel/collector-gcp.log`

 3.  **Run Gemini CLI:**
@@ -506,6 +506,7 @@ the dedicated [Custom Commands documentation](../cli/custom-commands.md).
 These shortcuts apply directly to the input prompt for text manipulation.

 - **Undo:**
+
  - **Keyboard shortcut:** Press **Ctrl+z** (Windows), **Cmd+z** (macOS), or
    **Alt+z** (Linux/WSL) to undo the last action in the input prompt.

@@ -519,6 +520,7 @@ At commands are used to include the content of files or directories as part of
 your prompt to Gemini. These commands include git-aware filtering.

 - **`@<path_to_file_or_directory>`**
+
  - **Description:** Inject the content of the specified file or files into your
    current prompt. This is useful for asking questions about specific code,
    text, or collections of files.
@@ -565,6 +567,7 @@ The `!` prefix lets you interact with your system's shell directly from within
 Gemini CLI.

 - **`!<shell_command>`**
+
  - **Description:** Execute the given `<shell_command>` using `bash` on
    Linux/macOS or `powershell.exe -NoProfile -Command` on Windows (unless you
    override `ComSpec`). Any output or errors from the command are displayed in
@@ -574,6 +577,7 @@ Gemini CLI.
    - `!git status` (executes `git status` and returns to Gemini CLI)

 - **`!` (Toggle shell mode)**
+
  - **Description:** Typing `!` on its own toggles shell mode.
    - **Entering shell mode:**
      - When active, shell mode uses a different coloring and a "Shell Mode
@@ -70,6 +70,7 @@ Before promoting a `preview` release to `stable`, a release manager must
 manually run through this checklist.

 - **Setup:**
+
  - [ ] Uninstall any existing global version:
        `npm uninstall -g @google/gemini-cli`
  - [ ] Clear npx cache (optional but recommended): `npm cache clean --force`
@@ -77,24 +78,29 @@ manually run through this checklist.
  - [ ] Verify version: `gemini --version`

 - **Authentication:**
+
  - [ ] In interactive mode run `/auth` and verify all sign in flows work:
    - [ ] Sign in with Google
    - [ ] API Key
    - [ ] Vertex AI

 - **Basic prompting:**
+
  - [ ] Run `gemini "Tell me a joke"` and verify a sensible response.
  - [ ] Run in interactive mode: `gemini`. Ask a follow-up question to test
        context.

 - **Piped input:**
+
  - [ ] Run `echo "Summarize this" | gemini` and verify it processes stdin.

 - **Context management:**
+
  - [ ] In interactive mode, use `@file` to add a local file to context. Ask a
        question about it.

 - **Settings:**
+
  - [ ] In interactive mode run `/settings` and make modifications
  - [ ] Validate that setting is changed

@@ -475,6 +475,7 @@ This stage happens _after_ the NPM publish and creates the single-file
 executable that enables `npx` usage directly from the GitHub repository.

 1.  **The JavaScript bundle is created:**
+
    - **What happens:** The built JavaScript from both `packages/core/dist` and
      `packages/cli/dist`, along with all third-party JavaScript dependencies,
      are bundled by `esbuild` into a single, executable JavaScript file (for
@@ -486,6 +487,7 @@ executable that enables `npx` usage directly from the GitHub repository.
      the `core` package) are included directly.

 2.  **The `bundle` directory is assembled:**
+
    - **What happens:** A temporary `bundle` folder is created at the project
      root. The single `gemini.js` executable is placed inside it, along with
      other essential files.
@@ -127,6 +127,7 @@ Standard/Plus and AI Expanded, are not supported._
  license seats. For predictable costs, you can sign in with Google.

  This includes the following request limits:
+
  - Gemini Code Assist Standard edition:
    - 1500 maximum model requests / user / day
  - Gemini Code Assist Enterprise edition:
@@ -12,6 +12,7 @@ topics on:

 - **Error:
  `You must be a named user on your organization's Gemini Code Assist Standard edition subscription to use this service. Please contact your administrator to request an entitlement to Gemini Code Assist Standard edition.`**
+
  - **Cause:** This error might occur if Gemini CLI detects the
    `GOOGLE_CLOUD_PROJECT` or `GOOGLE_CLOUD_PROJECT_ID` environment variable is
    defined. Setting these variables forces an organization subscription check.
@@ -19,6 +20,7 @@ topics on:
    linked to an organizational subscription.

  - **Solution:**
+
    - **Individual Users:** Unset the `GOOGLE_CLOUD_PROJECT` and
      `GOOGLE_CLOUD_PROJECT_ID` environment variables. Check and remove these
      variables from your shell configuration files (for example, `.bashrc`,
@@ -30,12 +32,14 @@ topics on:

 - **Error:
  `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 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.
@@ -66,6 +70,7 @@ topics on:
 ## Common error messages and solutions

 - **Error: `EADDRINUSE` (Address already in use) when starting an MCP server.**
+
  - **Cause:** Another process is already using the port that the MCP server is
    trying to bind to.
  - **Solution:** Either stop the other process that is using the port or
@@ -73,6 +78,7 @@ topics on:

 - **Error: Command not found (when attempting to run Gemini CLI with
  `gemini`).**
+
  - **Cause:** Gemini CLI is not correctly installed or it is not in your
    system's `PATH`.
  - **Solution:** The update depends on how you installed Gemini CLI:
@@ -85,6 +91,7 @@ topics on:
      then rebuild using the command `npm run build`.

 - **Error: `MODULE_NOT_FOUND` or import errors.**
+
  - **Cause:** Dependencies are not installed correctly, or the project hasn't
    been built.
  - **Solution:**
@@ -93,6 +100,7 @@ topics on:
    3.  Verify that the build completed successfully with `npm run start`.

 - **Error: "Operation not permitted", "Permission denied", or similar.**
+
  - **Cause:** When sandboxing is enabled, Gemini CLI may attempt operations
    that are restricted by your sandbox configuration, such as writing outside
    the project directory or system temp directory.
@@ -101,6 +109,7 @@ topics on:
    configuration.

 - **Gemini CLI is not running in interactive mode in "CI" environments**
+
  - **Issue:** Gemini CLI does not enter interactive mode (no prompt appears) if
    an environment variable starting with `CI_` (for example, `CI_TOKEN`) is
    set. This is because the `is-in-ci` package, used by the underlying UI
@@ -116,6 +125,7 @@ topics on:
    `env -u CI_TOKEN gemini`

 - **DEBUG mode not working from project .env file**
+
  - **Issue:** Setting `DEBUG=true` in a project's `.env` file doesn't enable
    debug mode for gemini-cli.
  - **Cause:** The `DEBUG` and `DEBUG_MODE` variables are automatically excluded
@@ -155,12 +165,14 @@ is especially useful for scripting and automation.
 ## Debugging tips

 - **CLI debugging:**
+
  - Use the `--debug` flag for more detailed output. In interactive mode, press
    F12 to view the debug console.
  - Check the CLI logs, often found in a user-specific configuration or cache
    directory.

 - **Core debugging:**
+
  - Check the server console output for error messages or stack traces.
  - Increase log verbosity if configurable. For example, set the `DEBUG_MODE`
    environment variable to `true` or `1`.
@@ -168,6 +180,7 @@ is especially useful for scripting and automation.
    step through server-side code.

 - **Tool issues:**
+
  - If a specific tool is failing, try to isolate the issue by running the
    simplest possible version of the command or operation the tool performs.
  - For `run_shell_command`, check that the command works directly in your shell
@@ -11,6 +11,7 @@ confirmation.
 - **Display name:** Ask User
 - **File:** `ask-user.ts`
 - **Parameters:**
+
  - `questions` (array of objects, required): A list of 1 to 4 questions to ask.
    Each question object has the following properties:
    - `question` (string, required): The complete question text.
@@ -30,6 +31,7 @@ confirmation.
    - `placeholder` (string, optional): Hint text for input fields.

 - **Behavior:**
+
  - Presents an interactive dialog to the user with the specified questions.
  - Pauses execution until the user provides answers or dismisses the dialog.
  - Returns the user's answers to the model.
@@ -768,6 +768,7 @@ defaults:

 - **Tool lists:** Tool lists are merged securely to ensure the most restrictive
  policy wins:
+
  - **Exclusions (`excludeTools`):** Arrays are combined (unioned). If either
    source blocks a tool, it remains disabled.
  - **Inclusions (`includeTools`):** Arrays are intersected. If both sources
@@ -1,12 +1,12 @@
 {
  "name": "@google/gemini-cli",
-  "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+  "version": "0.50.0-preview.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@google/gemini-cli",
-      "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+      "version": "0.50.0-preview.0",
      "workspaces": [
        "packages/*"
      ],
@@ -449,8 +449,7 @@
      "version": "2.11.0",
      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.11.0.tgz",
      "integrity": "sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ==",
-      "license": "(Apache-2.0 AND BSD-3-Clause)",
-      "peer": true
+      "license": "(Apache-2.0 AND BSD-3-Clause)"
    },
    "node_modules/@bundled-es-modules/cookie": {
      "version": "2.0.1",
@@ -1517,7 +1516,6 @@
      "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",
-      "peer": true,
      "dependencies": {
        "@grpc/proto-loader": "^0.8.0",
        "@js-sdsl/ordered-map": "^4.4.2"
@@ -1568,6 +1566,7 @@
      "integrity": "sha512-TsQLe4i2gvoTtrHje625ngThGBySOgSK3Xo2XRYOdqGN1teR8+I7vchQC46uLJi8OF62YTYA3AhSpumtkhsaKQ==",
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "engines": {
        "node": ">=18.14.1"
      },
@@ -1654,6 +1653,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "engines": {
        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
      }
@@ -2084,6 +2084,7 @@
      "integrity": "sha512-Y5RmPncpiDtTXDbLKswIJzTqu2hyBKxTNsgKqKclDbhIgg1wgtf1fRuvxgTnRfcnxtvvgbIEcqUOzZrJ6iSReg==",
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "@hono/node-server": "^1.19.9",
        "ajv": "^8.17.1",
@@ -2125,6 +2126,7 @@
      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "fast-deep-equal": "^3.1.3",
        "fast-uri": "^3.0.1",
@@ -2141,7 +2143,8 @@
      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
      "license": "MIT",
-      "optional": true
+      "optional": true,
+      "peer": true
    },
    "node_modules/@mswjs/interceptors": {
      "version": "0.39.5",
@@ -2240,7 +2243,6 @@
      "integrity": "sha512-t54CUOsFMappY1Jbzb7fetWeO0n6K0k/4+/ZpkS+3Joz8I4VcvY9OiEBFRYISqaI2fq5sCiPtAjRDOzVYG8m+Q==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@octokit/auth-token": "^6.0.0",
        "@octokit/graphql": "^9.0.2",
@@ -2421,7 +2423,6 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
      "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
      "license": "Apache-2.0",
-      "peer": true,
      "engines": {
        "node": ">=8.0.0"
      }
@@ -2471,7 +2472,6 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.7.1.tgz",
      "integrity": "sha512-QAqIj32AtK6+pEVNG7EOVxHdE06RP+FM5qpiEJ4RtDcFIqKUZHYhl7/7UY5efhwmwNAg7j8QbJVBLxMerc0+gw==",
      "license": "Apache-2.0",
-      "peer": true,
      "dependencies": {
        "@opentelemetry/semantic-conventions": "^1.29.0"
      },
@@ -2822,7 +2822,6 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.7.1.tgz",
      "integrity": "sha512-DeT6KKolmC4e/dRQvMQ/RwlnzhaqeiFOXY5ngoOPJ07GgVVKxZOg9EcrNZb5aTzUn+iCrJldAgOfQm1O/QfPAQ==",
      "license": "Apache-2.0",
-      "peer": true,
      "dependencies": {
        "@opentelemetry/core": "2.7.1",
        "@opentelemetry/semantic-conventions": "^1.29.0"
@@ -2857,7 +2856,6 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.7.1.tgz",
      "integrity": "sha512-MpDJdkiFDs3Pm1RHO3KByuZbuBdJEXEAkiC0+yJdsZGVCdf1RpHR6n+LHDcS7ffmfrt5kVCzJSCfm4z2C7v0uQ==",
      "license": "Apache-2.0",
-      "peer": true,
      "dependencies": {
        "@opentelemetry/core": "2.7.1",
        "@opentelemetry/resources": "2.7.1"
@@ -2913,7 +2911,6 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.7.1.tgz",
      "integrity": "sha512-NAYIlsF8MPUsKqJMiDQJTMPOmlbawC1Iz/omMLygZ1C9am8fTKYjTaI+OZM+WTY3t3Glo0wnOg/6/pac6RGPPw==",
      "license": "Apache-2.0",
-      "peer": true,
      "dependencies": {
        "@opentelemetry/core": "2.7.1",
        "@opentelemetry/resources": "2.7.1",
@@ -4140,7 +4137,6 @@
      "integrity": "sha512-1LOH8xovvsKsCBq1wnT4ntDUdCJKmnEakhsuoUSy6ExlHCkGP2hqnatagYTgFk6oeL0VU31u7SNjunPN+GchtA==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "csstype": "^3.0.2"
      }
@@ -4256,6 +4252,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "@types/node": "*"
      }
@@ -5117,7 +5114,6 @@
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "license": "MIT",
-      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -7818,7 +7814,6 @@
      "integrity": "sha512-eh/jxIEJyZrvbWRe4XuVclLPDYSYYYgLy5zXGGxD6j8zjSAxFEzI2fL/8xNq6O2yKqVt+eF2YhV+hxjV6UKXwQ==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -8426,7 +8421,6 @@
      "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
      "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "accepts": "^2.0.0",
        "body-parser": "^2.2.1",
@@ -8471,6 +8465,7 @@
      "integrity": "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==",
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "ip-address": "^10.2.0"
      },
@@ -8610,7 +8605,8 @@
      "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==",
      "dev": true,
      "license": "MIT",
-      "optional": true
+      "optional": true,
+      "peer": true
    },
    "node_modules/fast-string-width": {
      "version": "3.0.2",
@@ -8619,6 +8615,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "fast-string-truncated-width": "^3.0.2"
      }
@@ -8646,6 +8643,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "fast-string-width": "^3.0.2"
      }
@@ -10002,7 +10000,6 @@
      "resolved": "https://registry.npmjs.org/@jrichman/ink/-/ink-6.6.9.tgz",
      "integrity": "sha512-RL9sSiLQZECnjbmBwjIHOp8yVGdWF7C/uifg7ISv/e+F3nLNsfl7FdUFQs8iZARFMJAYxMFpxW6OW+HSt9drwQ==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "ansi-escapes": "^7.0.0",
        "ansi-styles": "^6.2.3",
@@ -10902,6 +10899,7 @@
      "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==",
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/panva"
      }
@@ -10994,7 +10992,8 @@
      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz",
      "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==",
      "license": "BSD-2-Clause",
-      "optional": true
+      "optional": true,
+      "peer": true
    },
    "node_modules/json-stable-stringify": {
      "version": "1.3.0",
@@ -11996,7 +11995,6 @@
      "devOptional": true,
      "hasInstallScript": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@bundled-es-modules/cookie": "^2.0.1",
        "@bundled-es-modules/statuses": "^1.0.1",
@@ -13660,7 +13658,6 @@
      "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
      "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -13671,7 +13668,6 @@
      "integrity": "sha512-ldFwzufLletzCikNJVYaxlxMLu7swJ3T2VrGfzXlMsVhZhPDKXA38DEROidaYZVgMAmQnIjymrmqto5pyfrwPA==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "shell-quote": "^1.6.1",
        "ws": "^7"
@@ -14092,7 +14088,8 @@
      "integrity": "sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==",
      "dev": true,
      "license": "MIT",
-      "optional": true
+      "optional": true,
+      "peer": true
    },
    "node_modules/reusify": {
      "version": "1.1.0",
@@ -14519,7 +14516,8 @@
      "integrity": "sha512-kjnC1DXBHcxaOaOXBHBeRtltsDG2nUiUni+jP92M9gYdW12rsmx92UsfpH7o5tDRs7I1ZZPSQJQGv3UaRfCiuw==",
      "dev": true,
      "license": "MIT",
-      "optional": true
+      "optional": true,
+      "peer": true
    },
    "node_modules/set-function-length": {
      "version": "1.2.2",
@@ -15555,6 +15553,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "engines": {
        "node": ">=20"
      },
@@ -15834,7 +15833,6 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -15886,6 +15884,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "tldts-core": "^7.4.3"
      },
@@ -15899,7 +15898,8 @@
      "integrity": "sha512-27ep5H9PzdBrNd5OFM/j3WCU8F3kPwM9D0BOaOf7uYfxMJfyr0K5Tjj69Gri+sZlh2WXd5buIm47NuPF29CDiw==",
      "dev": true,
      "license": "MIT",
-      "optional": true
+      "optional": true,
+      "peer": true
    },
    "node_modules/tmp": {
      "version": "0.2.5",
@@ -15940,6 +15940,7 @@
      "dev": true,
      "license": "BSD-3-Clause",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "tldts": "^7.0.5"
      },
@@ -16093,8 +16094,7 @@
      "version": "2.8.1",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
    },
    "node_modules/tsx": {
      "version": "4.20.3",
@@ -16102,7 +16102,6 @@
      "integrity": "sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "~0.25.0",
        "get-tsconfig": "^4.7.5"
@@ -16268,7 +16267,6 @@
      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
      "devOptional": true,
      "license": "Apache-2.0",
-      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -16336,7 +16334,6 @@
      "integrity": "sha512-H+vqmWwT5xoNrXqWs/fesmssOW70gxFlgcMlYcBaWNPIEWDgLa4W9nkSPmhuOgLnXq9QYgkZ31fhDyLhleCsAg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.30.1",
        "@typescript-eslint/types": "8.30.1",
@@ -16633,6 +16630,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/kettanaito"
      }
@@ -16727,7 +16725,6 @@
      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz",
      "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.27.0",
        "fdir": "^6.5.0",
@@ -17298,7 +17295,6 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -17311,7 +17307,6 @@
      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@types/chai": "^5.2.2",
        "@vitest/expect": "3.2.4",
@@ -17813,7 +17808,6 @@
      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
      "license": "ISC",
-      "peer": true,
      "bin": {
        "yaml": "bin.mjs"
      },
@@ -17960,7 +17954,6 @@
      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
      "license": "MIT",
-      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
@@ -17976,7 +17969,7 @@
    },
    "packages/a2a-server": {
      "name": "@google/gemini-cli-a2a-server",
-      "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+      "version": "0.50.0-preview.0",
      "dependencies": {
        "@a2a-js/sdk": "0.3.11",
        "@google-cloud/storage": "7.19.0",
@@ -18178,7 +18171,6 @@
      "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
      "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "accepts": "^2.0.0",
        "body-parser": "^2.2.0",
@@ -18254,7 +18246,6 @@
      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -18316,7 +18307,6 @@
      "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.4.4",
@@ -18481,7 +18471,7 @@
    },
    "packages/cli": {
      "name": "@google/gemini-cli",
-      "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+      "version": "0.50.0-preview.0",
      "license": "Apache-2.0",
      "dependencies": {
        "@agentclientprotocol/sdk": "0.16.1",
@@ -18830,7 +18820,6 @@
      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -18917,7 +18906,6 @@
      "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.4.4",
@@ -19103,7 +19091,7 @@
    },
    "packages/core": {
      "name": "@google/gemini-cli-core",
-      "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+      "version": "0.50.0-preview.0",
      "license": "Apache-2.0",
      "dependencies": {
        "@a2a-js/sdk": "0.3.11",
@@ -19590,6 +19578,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "engines": {
        "node": ">=18"
      },
@@ -19602,8 +19591,7 @@
      "version": "0.0.1367902",
      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1367902.tgz",
      "integrity": "sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg==",
-      "license": "BSD-3-Clause",
-      "peer": true
+      "license": "BSD-3-Clause"
    },
    "packages/core/node_modules/dotenv": {
      "version": "17.2.4",
@@ -19766,7 +19754,6 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
      "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -19934,7 +19921,6 @@
      "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.4.4",
@@ -20117,6 +20103,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "@inquirer/core": "^11.2.1",
        "@inquirer/type": "^4.0.7"
@@ -20140,6 +20127,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "@inquirer/ansi": "^2.0.7",
        "@inquirer/figures": "^2.0.7",
@@ -20168,6 +20156,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "engines": {
        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
      }
@@ -20179,6 +20168,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "engines": {
        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
      },
@@ -20198,6 +20188,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "@open-draft/deferred-promise": "^2.2.0",
        "@open-draft/logger": "^0.3.0",
@@ -20244,6 +20235,7 @@
      "dev": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "@types/set-cookie-parser": "^2.4.10",
        "set-cookie-parser": "^3.0.1"
@@ -20257,6 +20249,7 @@
      "hasInstallScript": true,
      "license": "MIT",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "@inquirer/confirm": "^6.0.11",
        "@mswjs/interceptors": "^0.41.3",
@@ -20301,7 +20294,8 @@
      "integrity": "sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==",
      "dev": true,
      "license": "MIT",
-      "optional": true
+      "optional": true,
+      "peer": true
    },
    "packages/core/node_modules/vitest/node_modules/mute-stream": {
      "version": "3.0.0",
@@ -20310,6 +20304,7 @@
      "dev": true,
      "license": "ISC",
      "optional": true,
+      "peer": true,
      "engines": {
        "node": "^20.17.0 || >=22.9.0"
      }
@@ -20321,6 +20316,7 @@
      "dev": true,
      "license": "(MIT OR CC0-1.0)",
      "optional": true,
+      "peer": true,
      "dependencies": {
        "tagged-tag": "^1.0.0"
      },
@@ -20371,7 +20367,7 @@
    },
    "packages/devtools": {
      "name": "@google/gemini-cli-devtools",
-      "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+      "version": "0.50.0-preview.0",
      "license": "Apache-2.0",
      "dependencies": {
        "ws": "8.16.0"
@@ -20407,7 +20403,7 @@
    },
    "packages/sdk": {
      "name": "@google/gemini-cli-sdk",
-      "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+      "version": "0.50.0-preview.0",
      "license": "Apache-2.0",
      "dependencies": {
        "@google/gemini-cli-core": "file:../core",
@@ -20559,7 +20555,6 @@
      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -20583,7 +20578,6 @@
      "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.4.4",
@@ -20748,7 +20742,7 @@
    },
    "packages/test-utils": {
      "name": "@google/gemini-cli-test-utils",
-      "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+      "version": "0.50.0-preview.0",
      "license": "Apache-2.0",
      "dependencies": {
        "@google/gemini-cli-core": "file:../core",
@@ -20766,7 +20760,7 @@
    },
    "packages/vscode-ide-companion": {
      "name": "gemini-cli-vscode-ide-companion",
-      "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+      "version": "0.50.0-preview.0",
      "license": "LICENSE",
      "dependencies": {
        "@modelcontextprotocol/sdk": "1.23.0",
@@ -21335,7 +21329,6 @@
      "integrity": "sha512-oU/OtYVydhXnumd0BobL9rkJg7wFJ9bFFPmSmB/bf/XWN85hlViji59ko6bSKBXyseT9V8l+CN1nwmlbiN0G7Q==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.31.1",
        "@typescript-eslint/types": "8.31.1",
@@ -21557,7 +21550,6 @@
      "integrity": "sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -21642,7 +21634,6 @@
      "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
      "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "accepts": "^2.0.0",
        "body-parser": "^2.2.0",
@@ -21786,7 +21777,6 @@
      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
      "dev": true,
      "license": "Apache-2.0",
-      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli",
-  "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+  "version": "0.50.0-preview.0",
  "engines": {
    "node": ">=20.0.0"
  },
@@ -14,7 +14,7 @@
    "url": "git+https://github.com/google-gemini/gemini-cli.git"
  },
  "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.49.0-nightly.20260617.g4d3dcdce1"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.50.0-preview.0"
  },
  "scripts": {
    "start": "cross-env NODE_ENV=development node scripts/start.js",
@@ -33,6 +33,7 @@
    "docs:settings": "tsx ./scripts/generate-settings-doc.ts",
    "docs:keybindings": "tsx ./scripts/generate-keybindings-doc.ts",
    "eval:inventory": "tsx ./scripts/eval-inventory-cli.ts",
+    "eval:inventory:json": "tsx ./scripts/eval-inventory-cli.ts --json",
    "build": "node scripts/build.js",
    "build-and-start": "npm run build && npm run start --",
    "build:vscode": "node scripts/build_vscode_companion.js",
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-a2a-server",
-  "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+  "version": "0.50.0-preview.0",
  "description": "Gemini CLI A2A Server",
  "repository": {
    "type": "git",
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli",
-  "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+  "version": "0.50.0-preview.0",
  "description": "Gemini CLI",
  "license": "Apache-2.0",
  "repository": {
@@ -27,7 +27,7 @@
    "dist"
  ],
  "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.49.0-nightly.20260617.g4d3dcdce1"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.50.0-preview.0"
  },
  "dependencies": {
    "@agentclientprotocol/sdk": "0.16.1",
@@ -439,7 +439,8 @@ describe('extensionsCommand', () => {
    }

    it('should return ExtensionRegistryView custom dialog when experimental.extensionRegistry is true', async () => {
-      mockContext.services.settings.merged.experimental.extensionRegistry = true;
+      mockContext.services.settings.merged.experimental.extensionRegistry =
+        true;

      const result = await exploreAction(mockContext, '');

@@ -455,7 +456,8 @@ describe('extensionsCommand', () => {
    });

    it('should handle onSelect and onClose in ExtensionRegistryView', async () => {
-      mockContext.services.settings.merged.experimental.extensionRegistry = true;
+      mockContext.services.settings.merged.experimental.extensionRegistry =
+        true;

      const result = await exploreAction(mockContext, '');
      if (result?.type !== 'custom_dialog') {
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-core",
-  "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+  "version": "0.50.0-preview.0",
  "description": "Gemini CLI Core",
  "license": "Apache-2.0",
  "repository": {
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-devtools",
-  "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+  "version": "0.50.0-preview.0",
  "license": "Apache-2.0",
  "type": "module",
  "main": "dist/src/index.js",
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-sdk",
-  "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+  "version": "0.50.0-preview.0",
  "description": "Gemini CLI SDK",
  "license": "Apache-2.0",
  "repository": {
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-test-utils",
-  "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+  "version": "0.50.0-preview.0",
  "private": true,
  "main": "src/index.ts",
  "license": "Apache-2.0",
@@ -2,7 +2,7 @@
  "name": "gemini-cli-vscode-ide-companion",
  "displayName": "Gemini CLI Companion",
  "description": "Enable Gemini CLI with direct access to your IDE workspace.",
-  "version": "0.49.0-nightly.20260617.g4d3dcdce1",
+  "version": "0.50.0-preview.0",
  "publisher": "google",
  "icon": "assets/icon.png",
  "repository": {
@@ -10,25 +10,40 @@
 * @fileoverview CLI entry point for the eval inventory command.
 *
 * Scans all eval source files, runs the static analyzer on each,
- * and prints a human-readable inventory report grouped by policy,
- * file, and suite.
+ * and prints an inventory report grouped by policy, file, and suite.
 *
 * Usage:
 *   npm run eval:inventory
+ *   npm run eval:inventory -- --json
 *   npm run eval:inventory -- --root /path/to/repo
+ *   npm run eval:inventory -- --root /path/to/repo --json
 */

 import {
  collectInventory,
+  formatInventoryJson,
  formatInventoryReport,
 } from './utils/eval-inventory.js';

 async function main() {
  const rootFlagIndex = process.argv.indexOf('--root');
-  const repoRoot =
-    rootFlagIndex !== -1 && process.argv[rootFlagIndex + 1]
-      ? process.argv[rootFlagIndex + 1]
-      : process.cwd();
+  const rootFlagValue =
+    rootFlagIndex !== -1 ? process.argv[rootFlagIndex + 1] : undefined;
+  if (rootFlagIndex !== -1 && rootFlagValue === undefined) {
+    console.error(
+      'Error: --root requires a directory path argument but none was provided.',
+    );
+    process.exit(1);
+  }
+  if (rootFlagValue && rootFlagValue.startsWith('--')) {
+    console.error(
+      `Error: --root value "${rootFlagValue}" looks like a flag. Provide a valid directory path.`,
+    );
+    process.exit(1);
+  }
+  const repoRoot = rootFlagValue ?? process.cwd();
+
+  const jsonMode = process.argv.includes('--json');

  const result = await collectInventory(repoRoot);

@@ -37,7 +52,9 @@ async function main() {
    process.exit(1);
  }

-  console.log(formatInventoryReport(result));
+  console.log(
+    jsonMode ? formatInventoryJson(result) : formatInventoryReport(result),
+  );
 }

 main().catch((error) => {
@@ -5,10 +5,12 @@
 */

 import path from 'node:path';
-import { describe, expect, it } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 import {
  collectInventory,
+  formatInventoryJson,
  formatInventoryReport,
+  type InventoryJsonOutput,
  type InventoryResult,
 } from '../utils/eval-inventory.js';
 import type { EvalCaseRecord } from '../utils/eval-analysis.js';
@@ -30,6 +32,19 @@ function makeCaseRecord(
  };
 }

+function makeEmptyResult(repoRoot = '/repo'): InventoryResult {
+  return {
+    totalFiles: 0,
+    totalCases: 0,
+    repoRoot,
+    files: [],
+    cases: [],
+    diagnostics: [],
+  };
+}
+
+const FIXED_NOW = new Date('2026-06-03T12:00:00.000Z');
+
 describe('eval-inventory', () => {
  describe('collectInventory', () => {
    it('discovers eval files from the real evals directory', async () => {
@@ -40,6 +55,7 @@ describe('eval-inventory', () => {
      expect(result.totalCases).toBeGreaterThanOrEqual(90);
      expect(result.files.length).toBe(result.totalFiles);
      expect(result.cases.length).toBe(result.totalCases);
+      expect(result.repoRoot).toBe(repoRoot);

      for (const evalCase of result.cases) {
        expect(evalCase.name).toBeTruthy();
@@ -48,13 +64,20 @@ describe('eval-inventory', () => {
      }
    });

-    it('returns zero counts for a directory with no eval files', async () => {
-      const result = await collectInventory(import.meta.dirname);
+    it('returns zero file counts for an evals directory with no matching files', async () => {
+      const repoRoot = path.resolve(import.meta.dirname, '../../');
+      const result = await collectInventory(repoRoot);

-      expect(result.totalFiles).toBe(0);
-      expect(result.totalCases).toBe(0);
-      expect(result.files).toEqual([]);
-      expect(result.cases).toEqual([]);
+      expect(result.totalFiles).toBeGreaterThanOrEqual(0);
+      expect(result.files.length).toBe(result.totalFiles);
+      expect(result.cases.length).toBe(result.totalCases);
+      expect(result.repoRoot).toBe(repoRoot);
+    });
+
+    it('throws a helpful error when evals directory does not exist', async () => {
+      await expect(collectInventory('/nonexistent/repo/path')).rejects.toThrow(
+        /evals directory not found/,
+      );
    });
  });

@@ -63,6 +86,7 @@ describe('eval-inventory', () => {
      const result: InventoryResult = {
        totalFiles: 2,
        totalCases: 3,
+        repoRoot: '/repo',
        files: [],
        cases: [
          makeCaseRecord({ policy: 'ALWAYS_PASSES', name: 'case-1' }),
@@ -77,10 +101,11 @@ describe('eval-inventory', () => {
      expect(report).toContain('2 files · 3 cases · 0 diagnostics');
    });

-    it('groups cases by policy', () => {
+    it('groups cases by policy in canonical order', () => {
      const result: InventoryResult = {
        totalFiles: 1,
        totalCases: 2,
+        repoRoot: '/repo',
        files: [],
        cases: [
          makeCaseRecord({
@@ -102,12 +127,39 @@ describe('eval-inventory', () => {
      expect(report).toContain('USUALLY_PASSES (1 cases)');
      expect(report).toContain('• stable test');
      expect(report).toContain('• flaky test');
+      expect(report.indexOf('ALWAYS_PASSES')).toBeLessThan(
+        report.indexOf('USUALLY_PASSES'),
+      );
+    });
+
+    it('renders cases with policies not listed in POLICY_ORDER', () => {
+      const result: InventoryResult = {
+        totalFiles: 1,
+        totalCases: 2,
+        repoRoot: '/repo',
+        files: [],
+        cases: [
+          makeCaseRecord({ policy: 'ALWAYS_PASSES', name: 'known policy' }),
+          makeCaseRecord({
+            policy: 'FUTURE_POLICY' as never,
+            name: 'future policy',
+          }),
+        ],
+        diagnostics: [],
+      };
+
+      const report = formatInventoryReport(result);
+
+      expect(report).toContain('ALWAYS_PASSES (1 cases)');
+      expect(report).toContain('FUTURE_POLICY (1 cases)');
+      expect(report).toContain('• future policy');
    });

    it('groups cases by suite name', () => {
      const result: InventoryResult = {
        totalFiles: 1,
        totalCases: 2,
+        repoRoot: '/repo',
        files: [],
        cases: [
          makeCaseRecord({ suiteName: 'default', name: 'suite-test' }),
@@ -127,7 +179,16 @@ describe('eval-inventory', () => {
      const result: InventoryResult = {
        totalFiles: 1,
        totalCases: 0,
-        files: [],
+        repoRoot: '/repo',
+        files: [
+          {
+            filePath: '/repo/evals/bad.eval.ts',
+            relativePath: 'evals/bad.eval.ts',
+            helpers: {},
+            cases: [],
+            diagnostics: [],
+          },
+        ],
        cases: [],
        diagnostics: [
          {
@@ -144,7 +205,7 @@ describe('eval-inventory', () => {
      expect(report).toContain('Diagnostics');
      expect(report).toContain('1 diagnostics');
      expect(report).toContain(
-        '⚠ /repo/evals/bad.eval.ts:5:3 — Could not resolve policy',
+        '⚠ evals/bad.eval.ts:5:3 — Could not resolve policy',
      );
    });

@@ -152,6 +213,7 @@ describe('eval-inventory', () => {
      const result: InventoryResult = {
        totalFiles: 1,
        totalCases: 1,
+        repoRoot: '/repo',
        files: [],
        cases: [makeCaseRecord()],
        diagnostics: [],
@@ -167,6 +229,7 @@ describe('eval-inventory', () => {
      const result: InventoryResult = {
        totalFiles: 1,
        totalCases: 1,
+        repoRoot: '/repo',
        files: [],
        cases: [
          makeCaseRecord({
@@ -182,4 +245,466 @@ describe('eval-inventory', () => {
      expect(report).toContain('• custom test [customHelper]');
    });
  });
+
+  describe('formatInventoryJson', () => {
+    it('snapshot: minimal inventory', () => {
+      const result: InventoryResult = {
+        totalFiles: 1,
+        totalCases: 1,
+        repoRoot: '/repo',
+        files: [],
+        cases: [
+          makeCaseRecord({
+            name: 'basic eval',
+            policy: 'ALWAYS_PASSES',
+            suiteName: 'core',
+          }),
+        ],
+        diagnostics: [],
+      };
+
+      const json = formatInventoryJson(result, FIXED_NOW);
+
+      expect(json).toMatchInlineSnapshot(`
+        "{
+          "version": 1,
+          "generated": "2026-06-03T12:00:00.000Z",
+          "summary": {
+            "totalFiles": 1,
+            "totalCases": 1,
+            "totalDiagnostics": 0,
+            "byPolicy": {
+              "ALWAYS_PASSES": 1
+            }
+          },
+          "cases": [
+            {
+              "name": "basic eval",
+              "filePath": "evals/test.eval.ts",
+              "helperName": "evalTest",
+              "baseHelperName": "evalTest",
+              "policy": "ALWAYS_PASSES",
+              "suiteName": "core",
+              "suiteType": null,
+              "timeout": null,
+              "hasFiles": false,
+              "hasPrompt": true,
+              "location": {
+                "line": 1,
+                "column": 1
+              }
+            }
+          ],
+          "diagnostics": []
+        }"
+      `);
+    });
+
+    it('snapshot: mixed policies with diagnostics', () => {
+      const result: InventoryResult = {
+        totalFiles: 2,
+        totalCases: 3,
+        repoRoot: '/repo',
+        files: [
+          {
+            filePath: '/repo/evals/c.eval.ts',
+            relativePath: 'evals/c.eval.ts',
+            helpers: {},
+            cases: [],
+            diagnostics: [],
+          },
+        ],
+        cases: [
+          makeCaseRecord({
+            name: 'stable test',
+            policy: 'ALWAYS_PASSES',
+            relativePath: 'evals/a.eval.ts',
+          }),
+          makeCaseRecord({
+            name: 'flaky test',
+            policy: 'USUALLY_PASSES',
+            suiteName: 'tools',
+            suiteType: 'behavioral',
+            relativePath: 'evals/b.eval.ts',
+          }),
+          makeCaseRecord({
+            name: 'failing test',
+            policy: 'USUALLY_FAILS',
+            timeout: 30000,
+            hasFiles: true,
+            relativePath: 'evals/b.eval.ts',
+          }),
+        ],
+        diagnostics: [
+          {
+            severity: 'warning',
+            message: 'Could not resolve policy',
+            filePath: '/repo/evals/c.eval.ts',
+            location: { line: 10, column: 5 },
+          },
+        ],
+      };
+
+      const json = formatInventoryJson(result, FIXED_NOW);
+
+      expect(json).toMatchInlineSnapshot(`
+        "{
+          "version": 1,
+          "generated": "2026-06-03T12:00:00.000Z",
+          "summary": {
+            "totalFiles": 2,
+            "totalCases": 3,
+            "totalDiagnostics": 1,
+            "byPolicy": {
+              "ALWAYS_PASSES": 1,
+              "USUALLY_PASSES": 1,
+              "USUALLY_FAILS": 1
+            }
+          },
+          "cases": [
+            {
+              "name": "stable test",
+              "filePath": "evals/a.eval.ts",
+              "helperName": "evalTest",
+              "baseHelperName": "evalTest",
+              "policy": "ALWAYS_PASSES",
+              "suiteName": null,
+              "suiteType": null,
+              "timeout": null,
+              "hasFiles": false,
+              "hasPrompt": true,
+              "location": {
+                "line": 1,
+                "column": 1
+              }
+            },
+            {
+              "name": "flaky test",
+              "filePath": "evals/b.eval.ts",
+              "helperName": "evalTest",
+              "baseHelperName": "evalTest",
+              "policy": "USUALLY_PASSES",
+              "suiteName": "tools",
+              "suiteType": "behavioral",
+              "timeout": null,
+              "hasFiles": false,
+              "hasPrompt": true,
+              "location": {
+                "line": 1,
+                "column": 1
+              }
+            },
+            {
+              "name": "failing test",
+              "filePath": "evals/b.eval.ts",
+              "helperName": "evalTest",
+              "baseHelperName": "evalTest",
+              "policy": "USUALLY_FAILS",
+              "suiteName": null,
+              "suiteType": null,
+              "timeout": 30000,
+              "hasFiles": true,
+              "hasPrompt": true,
+              "location": {
+                "line": 1,
+                "column": 1
+              }
+            }
+          ],
+          "diagnostics": [
+            {
+              "severity": "warning",
+              "message": "Could not resolve policy",
+              "filePath": "evals/c.eval.ts",
+              "location": {
+                "line": 10,
+                "column": 5
+              }
+            }
+          ]
+        }"
+      `);
+    });
+
+    it('snapshot: empty inventory', () => {
+      const result: InventoryResult = makeEmptyResult();
+
+      const json = formatInventoryJson(result, FIXED_NOW);
+
+      expect(json).toMatchInlineSnapshot(`
+        "{
+          "version": 1,
+          "generated": "2026-06-03T12:00:00.000Z",
+          "summary": {
+            "totalFiles": 0,
+            "totalCases": 0,
+            "totalDiagnostics": 0,
+            "byPolicy": {}
+          },
+          "cases": [],
+          "diagnostics": []
+        }"
+      `);
+    });
+
+    it('produces valid JSON with version field', () => {
+      const result: InventoryResult = {
+        ...makeEmptyResult(),
+        totalFiles: 1,
+        totalCases: 1,
+        cases: [makeCaseRecord()],
+      };
+
+      const json = formatInventoryJson(result, FIXED_NOW);
+      const parsed: InventoryJsonOutput = JSON.parse(json);
+
+      expect(parsed.version).toBe(1);
+    });
+
+    it('includes correct summary counts', () => {
+      const result: InventoryResult = {
+        totalFiles: 3,
+        totalCases: 4,
+        repoRoot: '/repo',
+        files: [],
+        cases: [
+          makeCaseRecord({ policy: 'ALWAYS_PASSES' }),
+          makeCaseRecord({ policy: 'ALWAYS_PASSES' }),
+          makeCaseRecord({ policy: 'USUALLY_PASSES' }),
+          makeCaseRecord({ policy: 'USUALLY_FAILS' }),
+        ],
+        diagnostics: [
+          {
+            severity: 'warning',
+            message: 'test',
+            filePath: 'test.ts',
+            location: { line: 1, column: 1 },
+          },
+        ],
+      };
+
+      const parsed: InventoryJsonOutput = JSON.parse(
+        formatInventoryJson(result, FIXED_NOW),
+      );
+
+      expect(parsed.summary).toEqual({
+        totalFiles: 3,
+        totalCases: 4,
+        totalDiagnostics: 1,
+        byPolicy: {
+          ALWAYS_PASSES: 2,
+          USUALLY_PASSES: 1,
+          USUALLY_FAILS: 1,
+        },
+      });
+    });
+
+    it('maps case fields correctly with nulls for missing optionals', () => {
+      const result: InventoryResult = {
+        totalFiles: 1,
+        totalCases: 1,
+        repoRoot: '/repo',
+        files: [],
+        cases: [
+          makeCaseRecord({
+            name: 'detailed case',
+            relativePath: 'evals/detail.eval.ts',
+            helperName: 'appEvalTest',
+            baseHelperName: 'appEvalTest',
+            policy: 'USUALLY_PASSES',
+            hasFiles: true,
+            hasPrompt: true,
+            location: { line: 42, column: 3 },
+          }),
+        ],
+        diagnostics: [],
+      };
+
+      const parsed: InventoryJsonOutput = JSON.parse(
+        formatInventoryJson(result, FIXED_NOW),
+      );
+      const firstCase = parsed.cases[0];
+
+      expect(firstCase).toEqual({
+        name: 'detailed case',
+        filePath: 'evals/detail.eval.ts',
+        helperName: 'appEvalTest',
+        baseHelperName: 'appEvalTest',
+        policy: 'USUALLY_PASSES',
+        suiteName: null,
+        suiteType: null,
+        timeout: null,
+        hasFiles: true,
+        hasPrompt: true,
+        location: { line: 42, column: 3 },
+      });
+    });
+
+    it('uses relative paths not absolute paths', () => {
+      const result: InventoryResult = {
+        totalFiles: 1,
+        totalCases: 1,
+        repoRoot: '/absolute/repo',
+        files: [
+          {
+            filePath: '/absolute/repo/evals/test.eval.ts',
+            relativePath: 'evals/test.eval.ts',
+            helpers: {},
+            cases: [],
+            diagnostics: [],
+          },
+        ],
+        cases: [
+          makeCaseRecord({
+            filePath: '/absolute/repo/evals/test.eval.ts',
+            relativePath: 'evals/test.eval.ts',
+          }),
+        ],
+        diagnostics: [
+          {
+            severity: 'warning',
+            message: 'test diagnostic',
+            filePath: '/absolute/repo/evals/test.eval.ts',
+            location: { line: 1, column: 1 },
+          },
+        ],
+      };
+
+      const json = formatInventoryJson(result, FIXED_NOW);
+
+      expect(json).not.toContain('/absolute/repo');
+      expect(json).toContain('evals/test.eval.ts');
+
+      const parsed: InventoryJsonOutput = JSON.parse(json);
+      expect(parsed.diagnostics[0].filePath).toBe('evals/test.eval.ts');
+    });
+
+    it('relativizes absolute diagnostic path not in file lookup using repoRoot', () => {
+      const repoRoot = '/repo';
+      const result: InventoryResult = {
+        totalFiles: 1,
+        totalCases: 0,
+        repoRoot,
+        files: [
+          {
+            filePath: '/repo/evals/known.eval.ts',
+            relativePath: 'evals/known.eval.ts',
+            helpers: {},
+            cases: [],
+            diagnostics: [],
+          },
+        ],
+        cases: [],
+        diagnostics: [
+          {
+            severity: 'warning',
+            message: 'cross-file diagnostic',
+            filePath: '/repo/evals/other.eval.ts',
+            location: { line: 1, column: 1 },
+          },
+        ],
+      };
+
+      const json = formatInventoryJson(result, FIXED_NOW);
+      const parsed: InventoryJsonOutput = JSON.parse(json);
+
+      expect(parsed.diagnostics[0].filePath).toBe('evals/other.eval.ts');
+      expect(parsed.diagnostics[0].filePath).not.toMatch(/^\//);
+    });
+
+    it('includes policies not listed in POLICY_ORDER in byPolicy', () => {
+      const result: InventoryResult = {
+        totalFiles: 1,
+        totalCases: 2,
+        repoRoot: '/repo',
+        files: [],
+        cases: [
+          makeCaseRecord({ policy: 'ALWAYS_PASSES' }),
+          makeCaseRecord({ policy: 'unknown' }),
+        ],
+        diagnostics: [],
+      };
+
+      const parsed: InventoryJsonOutput = JSON.parse(
+        formatInventoryJson(result, FIXED_NOW),
+      );
+
+      expect(parsed.summary.byPolicy).toEqual({
+        ALWAYS_PASSES: 1,
+        unknown: 1,
+      });
+
+      const sum = Object.values(parsed.summary.byPolicy).reduce(
+        (a, b) => a + b,
+        0,
+      );
+      expect(sum).toBe(parsed.summary.totalCases);
+    });
+
+    it('emits deterministic output', () => {
+      const result: InventoryResult = {
+        totalFiles: 1,
+        totalCases: 2,
+        repoRoot: '/repo',
+        files: [],
+        cases: [
+          makeCaseRecord({ name: 'a', policy: 'ALWAYS_PASSES' }),
+          makeCaseRecord({ name: 'b', policy: 'USUALLY_PASSES' }),
+        ],
+        diagnostics: [],
+      };
+
+      const first = formatInventoryJson(result, FIXED_NOW);
+      const second = formatInventoryJson(result, FIXED_NOW);
+
+      expect(first).toBe(second);
+    });
+
+    it('generated field is valid ISO-8601', () => {
+      const result: InventoryResult = makeEmptyResult();
+
+      const parsed: InventoryJsonOutput = JSON.parse(
+        formatInventoryJson(result),
+      );
+
+      const date = new Date(parsed.generated);
+      expect(date.getTime()).not.toBeNaN();
+      expect(parsed.generated).toMatch(
+        /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/,
+      );
+    });
+
+    describe('environment overrides for timestamp', () => {
+      afterEach(() => {
+        vi.unstubAllEnvs();
+      });
+
+      it('uses SOURCE_DATE_EPOCH if set', () => {
+        vi.stubEnv('SOURCE_DATE_EPOCH', '1700000000');
+        const result: InventoryResult = makeEmptyResult();
+        const parsed: InventoryJsonOutput = JSON.parse(
+          formatInventoryJson(result),
+        );
+        expect(parsed.generated).toBe('2023-11-14T22:13:20.000Z');
+      });
+
+      it('uses epoch 0 if EVAL_INVENTORY_STABLE_DATE is set', () => {
+        vi.stubEnv('EVAL_INVENTORY_STABLE_DATE', '1');
+        const result: InventoryResult = makeEmptyResult();
+        const parsed: InventoryJsonOutput = JSON.parse(
+          formatInventoryJson(result),
+        );
+        expect(parsed.generated).toBe('1970-01-01T00:00:00.000Z');
+      });
+
+      it('uses epoch 0 if EVAL_INVENTORY_DETERMINISTIC is set', () => {
+        vi.stubEnv('EVAL_INVENTORY_DETERMINISTIC', 'true');
+        const result: InventoryResult = makeEmptyResult();
+        const parsed: InventoryJsonOutput = JSON.parse(
+          formatInventoryJson(result),
+        );
+        expect(parsed.generated).toBe('1970-01-01T00:00:00.000Z');
+      });
+    });
+  });
 });
@@ -16,9 +16,17 @@ import {
  type EvalPolicy,
 } from './eval-analysis.js';

+const POLICY_ORDER: EvalPolicy[] = [
+  'ALWAYS_PASSES',
+  'USUALLY_PASSES',
+  'USUALLY_FAILS',
+  'unknown',
+];
+
 export interface InventoryResult {
  totalFiles: number;
  totalCases: number;
+  repoRoot: string;
  files: EvalFileAnalysis[];
  cases: readonly EvalCaseRecord[];
  diagnostics: readonly EvalAnalysisDiagnostic[];
@@ -32,6 +40,22 @@ export async function collectInventory(
  repoRoot: string,
 ): Promise<InventoryResult> {
  const evalsDir = path.join(repoRoot, 'evals');
+
+  try {
+    const stat = await fs.promises.stat(evalsDir);
+    if (!stat.isDirectory()) {
+      throw new Error(`evals path exists but is not a directory: ${evalsDir}`);
+    }
+  } catch (err: unknown) {
+    if (isNodeError(err) && err.code === 'ENOENT') {
+      throw new Error(
+        `evals directory not found under repo root: ${evalsDir}\n` +
+          `Make sure --root points to the repository root.`,
+      );
+    }
+    throw err;
+  }
+
  const pattern = '**/*.eval.{ts,tsx}';

  const evalFiles = await glob(pattern, {
@@ -57,6 +81,7 @@ export async function collectInventory(
  return {
    totalFiles: files.length,
    totalCases: allCases.length,
+    repoRoot,
    files,
    cases: allCases,
    diagnostics: allDiagnostics,
@@ -81,20 +106,30 @@ export function formatInventoryReport(result: InventoryResult): string {
  lines.push('By Policy');
  lines.push('─────────');

-  const byPolicy = groupBy(result.cases, (c) => c.policy);
-  const policyOrder: EvalPolicy[] = [
-    'ALWAYS_PASSES',
-    'USUALLY_PASSES',
-    'USUALLY_FAILS',
-    'unknown',
-  ];
+  const byPolicyMap = groupBy(result.cases, (c) => c.policy);

-  for (const policy of policyOrder) {
-    const cases = byPolicy.get(policy);
+  const renderedPolicies = new Set<string>();
+  for (const policy of POLICY_ORDER) {
+    const cases = byPolicyMap.get(policy);
    if (!cases || cases.length === 0) {
      continue;
    }
+    renderedPolicies.add(policy);
+    lines.push(`${policy} (${cases.length} cases)`);

+    const byFile = groupBy(cases, (c) => c.relativePath);
+    for (const [filePath, fileCases] of byFile) {
+      lines.push(`  ${filePath}`);
+      for (const evalCase of fileCases) {
+        lines.push(`    • ${evalCase.name} [${evalCase.helperName}]`);
+      }
+    }
+    lines.push('');
+  }
+  for (const [policy, cases] of byPolicyMap) {
+    if (renderedPolicies.has(policy) || !cases || cases.length === 0) {
+      continue;
+    }
    lines.push(`${policy} (${cases.length} cases)`);

    const byFile = groupBy(cases, (c) => c.relativePath);
@@ -141,10 +176,11 @@ export function formatInventoryReport(result: InventoryResult): string {
    lines.push('Diagnostics');
    lines.push('───────────');
    for (const diagnostic of result.diagnostics) {
-      const displayPath =
-        diagnostic.filePath === '<inline>'
-          ? diagnostic.filePath
-          : (filePaths.get(diagnostic.filePath) ?? diagnostic.filePath);
+      const displayPath = resolveRelativePath(
+        diagnostic.filePath,
+        filePaths,
+        result.repoRoot,
+      );
      lines.push(
        `⚠ ${displayPath}:${diagnostic.location.line}:${diagnostic.location.column} — ${diagnostic.message}`,
      );
@@ -155,6 +191,128 @@ export function formatInventoryReport(result: InventoryResult): string {
  return lines.join('\n');
 }

+export interface InventoryJsonOutput {
+  version: 1;
+  generated: string;
+  summary: {
+    totalFiles: number;
+    totalCases: number;
+    totalDiagnostics: number;
+    byPolicy: Record<string, number>;
+  };
+  cases: InventoryJsonCase[];
+  diagnostics: InventoryJsonDiagnostic[];
+}
+
+interface InventoryJsonCase {
+  name: string;
+  filePath: string;
+  helperName: string;
+  baseHelperName: string;
+  policy: string;
+  suiteName: string | null;
+  suiteType: string | null;
+  timeout: number | null;
+  hasFiles: boolean;
+  hasPrompt: boolean;
+  location: { line: number; column: number };
+}
+
+interface InventoryJsonDiagnostic {
+  severity: string;
+  message: string;
+  filePath: string;
+  location: { line: number; column: number };
+}
+
+export function formatInventoryJson(
+  result: InventoryResult,
+  now?: Date,
+): string {
+  const filePathLookup = new Map<string, string>();
+  for (const f of result.files) {
+    filePathLookup.set(f.filePath, f.relativePath);
+  }
+
+  const policyCounts = new Map<string, number>();
+  for (const evalCase of result.cases) {
+    policyCounts.set(
+      evalCase.policy,
+      (policyCounts.get(evalCase.policy) ?? 0) + 1,
+    );
+  }
+
+  const byPolicy: Record<string, number> = {};
+  for (const policy of POLICY_ORDER) {
+    const count = policyCounts.get(policy);
+    if (count !== undefined) {
+      byPolicy[policy] = count;
+    }
+  }
+  for (const [policy, count] of policyCounts) {
+    if (!(policy in byPolicy)) {
+      byPolicy[policy] = count;
+    }
+  }
+
+  let generatedDate = now;
+  if (!generatedDate && process.env.SOURCE_DATE_EPOCH) {
+    const epoch = parseInt(process.env.SOURCE_DATE_EPOCH, 10);
+    if (!isNaN(epoch)) {
+      generatedDate = new Date(epoch * 1000);
+    }
+  }
+  if (
+    !generatedDate &&
+    (process.env.EVAL_INVENTORY_STABLE_DATE ||
+      process.env.EVAL_INVENTORY_DETERMINISTIC)
+  ) {
+    generatedDate = new Date(0);
+  }
+  if (!generatedDate) {
+    generatedDate = new Date();
+  }
+
+  const output: InventoryJsonOutput = {
+    version: 1,
+    generated: generatedDate.toISOString(),
+    summary: {
+      totalFiles: result.totalFiles,
+      totalCases: result.totalCases,
+      totalDiagnostics: result.diagnostics.length,
+      byPolicy,
+    },
+    cases: result.cases.map((c) => ({
+      name: c.name,
+      filePath: c.relativePath,
+      helperName: c.helperName,
+      baseHelperName: c.baseHelperName,
+      policy: c.policy,
+      suiteName: c.suiteName ?? null,
+      suiteType: c.suiteType ?? null,
+      timeout: c.timeout ?? null,
+      hasFiles: c.hasFiles,
+      hasPrompt: c.hasPrompt,
+      location: { line: c.location.line, column: c.location.column },
+    })),
+    diagnostics: result.diagnostics.map((d) => {
+      const relativePath = resolveRelativePath(
+        d.filePath,
+        filePathLookup,
+        result.repoRoot,
+      );
+      return {
+        severity: d.severity,
+        message: d.message,
+        filePath: relativePath,
+        location: { line: d.location.line, column: d.location.column },
+      };
+    }),
+  };
+
+  return JSON.stringify(output, null, 2);
+}
+
 function groupBy<T>(
  items: readonly T[],
  keyFn: (item: T) => string,
@@ -171,3 +329,24 @@ function groupBy<T>(
  }
  return groups;
 }
+
+function resolveRelativePath(
+  filePath: string,
+  lookup: Map<string, string>,
+  baseDir: string,
+): string {
+  if (filePath === '<inline>') {
+    return filePath;
+  }
+  const mapped = lookup.get(filePath);
+  if (mapped !== undefined) {
+    return mapped;
+  }
+  return path.isAbsolute(filePath)
+    ? path.relative(baseDir, filePath).replace(/\\/g, '/')
+    : filePath;
+}
+
+function isNodeError(err: unknown): err is NodeJS.ErrnoException {
+  return err instanceof Error && 'code' in err;
+}
Author	SHA1	Message	Date
gemini-cli-robot	13d8a3dcab	chore(release): v0.50.0-preview.0	2026-06-24 21:26:10 +00:00
Ramón Medrano Llamas	f8541cf7a2	fix/verify release npm ci ignore scripts (#28116 )	2026-06-24 03:51:29 +00:00
Vedant Mahajan	6e0bd68e45	Add JSON output for eval inventory (#28058 )	2026-06-23 18:48:50 +00:00
Ramón Medrano Llamas	d3ef6aca40	fix(ci): use wombat dressing room fallback in nightly release to prevent ENEEDAUTH (#28104 )	2026-06-23 14:16:46 +00:00