chore(release): v0.0.5

.github/workflows/build-and-publish-image.yml

@@ -1,65 +0,0 @@
-name: Build and Publish Docker Image
-
-on:
-  push:
-    tags:
-      - 'v*'
-  workflow_dispatch:
-    inputs:
-      publish:
-        description: 'Publish to GHCR (only works on main branch)'
-        type: boolean
-        default: false
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push-to-ghcr:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=sha,prefix=sha-,format=short
-
-      - name: Log in to the Container registry
-        if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || github.event.inputs.publish == 'true') }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            CLI_VERSION_ARG=${{ github.sha }}

.github/workflows/gemini-automated-issue-triage.yml

@@ -24,7 +24,7 @@ jobs:
           ISSUE_TITLE: ${{ github.event.issue.title }}
           ISSUE_BODY: ${{ github.event.issue.body }}
         with:
-          version: 0.0.6
+          version: 0.0.4
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           settings_json: |
             {

.github/workflows/gemini-scheduled-issue-triage.yml

@@ -42,7 +42,7 @@ jobs:
           ISSUES_TO_TRIAGE: ${{ steps.find_issues.outputs.issues_to_triage }}
           REPOSITORY: ${{ github.repository }}
         with:
-          version: 0.0.6
+          version: 0.0.4
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           OPENAI_BASE_URL: ${{ secrets.OPENAI_BASE_URL }}
           OPENAI_MODEL: ${{ secrets.OPENAI_MODEL }}

.github/workflows/qwen-code-pr-review.yml

@@ -1,7 +1,7 @@
 name: 🧐 Qwen Pull Request Review
 
 on:
-  pull_request_target:
+  pull_request:
     types: [opened]
   pull_request_review_comment:
     types: [created]

Dockerfile

@@ -1,31 +1,3 @@
-# Build stage
-FROM docker.io/library/node:20-slim AS builder
-
-# Install build dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  python3 \
-  make \
-  g++ \
-  git \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# Set up npm global package folder
-RUN mkdir -p /usr/local/share/npm-global
-ENV NPM_CONFIG_PREFIX=/usr/local/share/npm-global
-ENV PATH=$PATH:/usr/local/share/npm-global/bin
-
-# Copy source code
-COPY . /home/node/app
-WORKDIR /home/node/app
-
-# Install dependencies and build packages
-RUN npm ci \
-  && npm run build --workspaces \
-  && npm pack -w @qwen-code/qwen-code --pack-destination ./packages/cli/dist \
-  && npm pack -w @qwen-code/qwen-code-core --pack-destination ./packages/core/dist
-
-# Runtime stage
 FROM docker.io/library/node:20-slim
 
 ARG SANDBOX_NAME="qwen-code-sandbox"
@@ -33,9 +5,11 @@ ARG CLI_VERSION_ARG
 ENV SANDBOX="$SANDBOX_NAME"
 ENV CLI_VERSION=$CLI_VERSION_ARG
 
-# Install runtime dependencies
+# install minimal set of packages, then clean up
 RUN apt-get update && apt-get install -y --no-install-recommends \
   python3 \
+  make \
+  g++ \
   man-db \
   curl \
   dnsutils \
@@ -55,19 +29,22 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-# Set up npm global package folder
-RUN mkdir -p /usr/local/share/npm-global
+# set up npm global package folder under /usr/local/share
+# give it to non-root user node, already set up in base image
+RUN mkdir -p /usr/local/share/npm-global \
+  && chown -R node:node /usr/local/share/npm-global
 ENV NPM_CONFIG_PREFIX=/usr/local/share/npm-global
 ENV PATH=$PATH:/usr/local/share/npm-global/bin
 
-# Copy built packages from builder stage
-COPY --from=builder /home/node/app/packages/cli/dist/*.tgz /tmp/
-COPY --from=builder /home/node/app/packages/core/dist/*.tgz /tmp/
+# switch to non-root user node
+USER node
 
-# Install built packages globally
-RUN npm install -g /tmp/*.tgz \
+# install qwen-code and clean up
+COPY packages/cli/dist/qwen-code-*.tgz /usr/local/share/npm-global/qwen-code.tgz
+COPY packages/core/dist/qwen-code-qwen-code-core-*.tgz /usr/local/share/npm-global/qwen-code-core.tgz
+RUN npm install -g /usr/local/share/npm-global/qwen-code.tgz /usr/local/share/npm-global/qwen-code-core.tgz \
   && npm cache clean --force \
-  && rm -rf /tmp/*.tgz
+  && rm -f /usr/local/share/npm-global/qwen-{code,code-core}.tgz
 
-# Default entrypoint when none specified
-CMD ["qwen"]
+# default entrypoint when none specified
+CMD ["qwen"]

Makefile

@@ -53,7 +53,7 @@ debug:
 
 
 run-npx:
-	npx https://github.com/QwenLM/qwen-code
+	npx https://github.com/google-gemini/gemini-cli
 
 create-alias:
 	scripts/create_alias.sh

README.md

@@ -101,7 +101,7 @@ Create or edit `.qwen/settings.json` in your home directory:
 
 - **`/compress`** - Compress conversation history to continue within token limits
 - **`/clear`** - Clear all conversation history and start fresh
-- **`/stats`** - Check current token usage and limits
+- **`/status`** - Check current token usage and limits
 
 > 📝 **Note**: Session token limit applies to a single conversation, not cumulative API calls.
 
@@ -310,7 +310,7 @@ qwen
 - `/help` - Display available commands
 - `/clear` - Clear conversation history
 - `/compress` - Compress history to save tokens
-- `/stats` - Show current session information
+- `/status` - Show current session information
 - `/exit` or `/quit` - Exit Qwen Code
 
 ### Keyboard Shortcuts

ROADMAP.md

@@ -56,7 +56,7 @@ find initiatives that interest you.
 Gemini CLI is an open-source project, and we welcome contributions from the community! Whether you're a developer, a designer, or just an enthusiastic user you can find our [Community Guidelines here](https://github.com/google-gemini/gemini-cli/blob/main/CONTRIBUTING.md) to learn how to get started. There are many ways to get involved:
 
 - **Roadmap:** Please review and find areas in our [roadmap](https://github.com/google-gemini/gemini-cli/issues/4191) that you would like to contribute to. Contributions based on this will be easiest to integrate with.
-- **Report Bugs:** If you find an issue, please create a [bug](https://github.com/google-gemini/gemini-cli/issues/new?template=bug_report.yml) with as much detail as possible. If you believe it is a critical breaking issue preventing direct CLI usage, please tag it as `priority/p0`.
+- **Report Bugs:** If you find an issue, please create a bug(https://github.com/google-gemini/gemini-cli/issues/new?template=bug_report.yml) with as much detail as possible. If you believe it is a critical breaking issue preventing direct CLI usage, please tag it as `priorty/p0`.
 - **Suggest Features:** Have a great idea? We'd love to hear it! Open a [feature request](https://github.com/google-gemini/gemini-cli/issues/new?template=feature_request.yml).
 - **Contribute Code:** Check out our [CONTRIBUTING.md](https://github.com/google-gemini/gemini-cli/blob/main/CONTRIBUTING.md) file for guidelines on how to submit pull requests. We have a list of "good first issues" for new contributors.
 - **Write Documentation:** Help us improve our documentation, tutorials, and examples.

docs/cli/commands.md

@@ -27,9 +27,6 @@ Slash commands provide meta-level control over the CLI itself.
       - **Usage:** `/chat resume <tag>`
     - **`list`**
       - **Description:** Lists available tags for chat state resumption.
-    - **`delete`**
-      - **Description:** Deletes a saved conversation checkpoint.
-      - **Usage:** `/chat delete <tag>`
 
 - **`/clear`**
   - **Description:** Clear the terminal screen, including the visible session history and scrollback within the CLI. The underlying session data (for history recall) might be preserved depending on the exact implementation, but the visual display is cleared.
@@ -49,18 +46,7 @@ Slash commands provide meta-level control over the CLI itself.
       - **Usage:** `/directory add <path1>,<path2>`
       - **Note:** Disabled in restrictive sandbox profiles. If you're using that, use `--include-directories` when starting the session instead.
     - **`show`**:
-      - **Description:** Display all directories added by `/directory add` and `--include-directories`.
-      - **Usage:** `/directory show`
-
-- **`/directory`** (or **`/dir`**)
-  - **Description:** Manage workspace directories for multi-directory support.
-  - **Sub-commands:**
-    - **`add`**:
-      - **Description:** Add a directory to the workspace. The path can be absolute or relative to the current working directory. Moreover, the reference from home directory is supported as well.
-      - **Usage:** `/directory add <path1>,<path2>`
-      - **Note:** Disabled in restrictive sandbox profiles. If you're using that, use `--include-directories` when starting the session instead.
-    - **`show`**:
-      - **Description:** Display all directories added by `/directory add` and `--include-directories`.
+      - **Description:** Display all directories added by `/direcotry add` and `--include-directories`.
       - **Usage:** `/directory show`
 
 - **`/editor`**
@@ -84,15 +70,15 @@ Slash commands provide meta-level control over the CLI itself.
   - **Keyboard Shortcut:** Press **Ctrl+T** at any time to toggle between showing and hiding tool descriptions.
 
 - **`/memory`**
-  - **Description:** Manage the AI's instructional context (hierarchical memory loaded from `QWEN.md` files by default; configurable via `contextFileName`).
+  - **Description:** Manage the AI's instructional context (hierarchical memory loaded from `GEMINI.md` files).
   - **Sub-commands:**
     - **`add`**:
       - **Description:** Adds the following text to the AI's memory. Usage: `/memory add <text to remember>`
     - **`show`**:
-      - **Description:** Display the full, concatenated content of the current hierarchical memory that has been loaded from all context files (e.g., `QWEN.md`). This lets you inspect the instructional context being provided to the model.
+      - **Description:** Display the full, concatenated content of the current hierarchical memory that has been loaded from all `GEMINI.md` files. This lets you inspect the instructional context being provided to the Gemini model.
     - **`refresh`**:
-      - **Description:** Reload the hierarchical instructional memory from all context files (default: `QWEN.md`) found in the configured locations (global, project/ancestors, and sub-directories). This updates the model with the latest context content.
-    - **Note:** For more details on how context files contribute to hierarchical memory, see the [CLI Configuration documentation](./configuration.md#context-files-hierarchical-instructional-context).
+      - **Description:** Reload the hierarchical instructional memory from all `GEMINI.md` files found in the configured locations (global, project/ancestors, and sub-directories). This command updates the model with the latest `GEMINI.md` content.
+    - **Note:** For more details on how `GEMINI.md` files contribute to hierarchical memory, see the [CLI Configuration documentation](./configuration.md#4-geminimd-files-hierarchical-instructional-context).
 
 - **`/restore`**
   - **Description:** Restores the project files to the state they were in just before a tool was executed. This is particularly useful for undoing file edits made by a tool. If run without a tool call ID, it will list available checkpoints to restore from.
@@ -137,7 +123,7 @@ Slash commands provide meta-level control over the CLI itself.
   - **Status indicator:** When enabled, shows `[NORMAL]` or `[INSERT]` in the footer
 
 - **`/init`**
-  - **Description:** Analyzes the current directory and creates a `QWEN.md` context file by default (or the filename specified by `contextFileName`). If a non-empty file already exists, no changes are made. The command seeds an empty file and prompts the model to populate it with project-specific instructions.
+  - **Description:** To help users easily create a `GEMINI.md` file, this command analyzes the current directory and generates a tailored context file, making it simpler for them to provide project-specific instructions to the Gemini agent.
 
 ### Custom Commands
 
@@ -267,7 +253,7 @@ Please generate a Conventional Commit message based on the following git diff:
 
 ```diff
 !{git diff --staged}
-```
+````
 
 """
 
@@ -288,7 +274,7 @@ First, ensure the user commands directory exists, then create a `refactor` subdi
 ```bash
 mkdir -p ~/.gemini/commands/refactor
 touch ~/.gemini/commands/refactor/pure.toml
-```
+````
 
 **2. Add the content to the file:**
 

docs/cli/configuration.md

@@ -38,8 +38,8 @@ In addition to a project settings file, a project's `.gemini` directory can cont
 ### Available settings in `settings.json`:
 
 - **`contextFileName`** (string or array of strings):
-  - **Description:** Specifies the filename for context files (e.g., `QWEN.md`, `AGENTS.md`). Can be a single filename or a list of accepted filenames.
-  - **Default:** `QWEN.md`
+  - **Description:** Specifies the filename for context files (e.g., `GEMINI.md`, `AGENTS.md`). Can be a single filename or a list of accepted filenames.
+  - **Default:** `GEMINI.md`
   - **Example:** `"contextFileName": "AGENTS.md"`
 
 - **`bugCommand`** (object):
@@ -248,31 +248,6 @@ In addition to a project settings file, a project's `.gemini` directory can cont
     "excludedProjectEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"]
     ```
 
-- **`includeDirectories`** (array of strings):
-  - **Description:** Specifies an array of additional absolute or relative paths to include in the workspace context. This allows you to work with files across multiple directories as if they were one. Paths can use `~` to refer to the user's home directory. This setting can be combined with the `--include-directories` command-line flag.
-  - **Default:** `[]`
-  - **Example:**
-    ```json
-    "includeDirectories": [
-      "/path/to/another/project",
-      "../shared-library",
-      "~/common-utils"
-    ]
-    ```
-
-- **`loadMemoryFromIncludeDirectories`** (boolean):
-  - **Description:** Controls the behavior of the `/memory refresh` command. If set to `true`, `QWEN.md` files should be loaded from all directories that are added. If set to `false`, `QWEN.md` should only be loaded from the current directory.
-  - **Default:** `false`
-  - **Example:**
-    ```json
-    "loadMemoryFromIncludeDirectories": true
-    ```
-
-- **`tavilyApiKey`** (string):
-  - **Description:** API key for Tavily web search service. Required to enable the `web_search` tool functionality. If not configured, the web search tool will be disabled and skipped.
-  - **Default:** `undefined` (web search disabled)
-  - **Example:** `"tavilyApiKey": "tvly-your-api-key-here"`
-
 ### Example `settings.json`:
 
 ```json
@@ -281,7 +256,6 @@ In addition to a project settings file, a project's `.gemini` directory can cont
   "sandbox": "docker",
   "toolDiscoveryCommand": "bin/get_tools",
   "toolCallCommand": "bin/call_tool",
-  "tavilyApiKey": "$TAVILY_API_KEY",
   "mcpServers": {
     "mainServer": {
       "command": "bin/mcp_server.py"
@@ -306,9 +280,7 @@ In addition to a project settings file, a project's `.gemini` directory can cont
       "tokenBudget": 100
     }
   },
-  "excludedProjectEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"],
-  "includeDirectories": ["path/to/dir1", "~/path/to/dir2", "../path/to/dir3"],
-  "loadMemoryFromIncludeDirectories": true
+  "excludedProjectEnvVars": ["DEBUG", "DEBUG_MODE", "NODE_ENV"]
 }
 ```
 
@@ -379,11 +351,6 @@ The CLI automatically loads environment variables from an `.env` file. The loadi
 - **`CODE_ASSIST_ENDPOINT`**:
   - Specifies the endpoint for the code assist server.
   - This is useful for development and testing.
-- **`TAVILY_API_KEY`**:
-  - Your API key for the Tavily web search service.
-  - Required to enable the `web_search` tool functionality.
-  - If not configured, the web search tool will be disabled and skipped.
-  - Example: `export TAVILY_API_KEY="tvly-your-api-key-here"`
 
 ## Command-Line Arguments
 
@@ -441,9 +408,6 @@ Arguments passed directly when running the CLI can override other configurations
   - Displays the version of the CLI.
 - **`--openai-logging`**:
   - Enables logging of OpenAI API calls for debugging and analysis. This flag overrides the `enableOpenAILogging` setting in `settings.json`.
-- **`--tavily-api-key <api_key>`**:
-  - Sets the Tavily API key for web search functionality for this session.
-  - Example: `gemini --tavily-api-key tvly-your-api-key-here`
 
 ## Context Files (Hierarchical Instructional Context)
 
@@ -451,7 +415,7 @@ While not strictly configuration for the CLI's _behavior_, context files (defaul
 
 - **Purpose:** These Markdown files contain instructions, guidelines, or context that you want the Gemini model to be aware of during your interactions. The system is designed to manage this instructional context hierarchically.
 
-### Example Context File Content (e.g., `QWEN.md`)
+### Example Context File Content (e.g., `GEMINI.md`)
 
 Here's a conceptual example of what a context file at the root of a TypeScript project might contain:
 
@@ -486,9 +450,9 @@ Here's a conceptual example of what a context file at the root of a TypeScript p
 
 This example demonstrates how you can provide general project context, specific coding conventions, and even notes about particular files or components. The more relevant and precise your context files are, the better the AI can assist you. Project-specific context files are highly encouraged to establish conventions and context.
 
-- **Hierarchical Loading and Precedence:** The CLI implements a sophisticated hierarchical memory system by loading context files (e.g., `QWEN.md`) from several locations. Content from files lower in this list (more specific) typically overrides or supplements content from files higher up (more general). The exact concatenation order and final context can be inspected using the `/memory show` command. The typical loading order is:
+- **Hierarchical Loading and Precedence:** The CLI implements a sophisticated hierarchical memory system by loading context files (e.g., `GEMINI.md`) from several locations. Content from files lower in this list (more specific) typically overrides or supplements content from files higher up (more general). The exact concatenation order and final context can be inspected using the `/memory show` command. The typical loading order is:
   1.  **Global Context File:**
-      - Location: `~/.qwen/<contextFileName>` (e.g., `~/.qwen/QWEN.md` in your user home directory).
+      - Location: `~/.gemini/<contextFileName>` (e.g., `~/.gemini/GEMINI.md` in your user home directory).
       - Scope: Provides default instructions for all your projects.
   2.  **Project Root & Ancestors Context Files:**
       - Location: The CLI searches for the configured context file in the current working directory and then in each parent directory up to either the project root (identified by a `.git` folder) or your home directory.
@@ -559,5 +523,3 @@ You can opt out of usage statistics collection at any time by setting the `usage
   "usageStatisticsEnabled": false
 }
 ```
-
-Note: When usage statistics are enabled, events are sent to an Alibaba Cloud RUM collection endpoint.

docs/core/index.md

@@ -5,14 +5,14 @@ Gemini CLI's core package (`packages/core`) is the backend portion of Gemini CLI
 ## Navigating this section
 
 - **[Core tools API](./tools-api.md):** Information on how tools are defined, registered, and used by the core.
-- **[Memory Import Processor](./memport.md):** Documentation for the modular QWEN.md import feature using @file.md syntax.
+- **[Memory Import Processor](./memport.md):** Documentation for the modular GEMINI.md import feature using @file.md syntax.
 
 ## Role of the core
 
 While the `packages/cli` portion of Gemini CLI provides the user interface, `packages/core` is responsible for:
 
 - **Gemini API interaction:** Securely communicating with the Google Gemini API, sending user prompts, and receiving model responses.
-- **Prompt engineering:** Constructing effective prompts for the model, potentially incorporating conversation history, tool definitions, and instructional context from context files (e.g., `QWEN.md`).
+- **Prompt engineering:** Constructing effective prompts for the Gemini model, potentially incorporating conversation history, tool definitions, and instructional context from `GEMINI.md` files.
 - **Tool management & orchestration:**
   - Registering available tools (e.g., file system tools, shell command execution).
   - Interpreting tool use requests from the Gemini model.
@@ -48,8 +48,8 @@ The file discovery service is responsible for finding files in the project that
 
 ## Memory discovery service
 
-The memory discovery service is responsible for finding and loading the context files (default: `QWEN.md`) that provide context to the model. It searches for these files in a hierarchical manner, starting from the current working directory and moving up to the project root and the user's home directory. It also searches in subdirectories.
+The memory discovery service is responsible for finding and loading the `GEMINI.md` files that provide context to the model. It searches for these files in a hierarchical manner, starting from the current working directory and moving up to the project root and the user's home directory. It also searches in subdirectories.
 
 This allows you to have global, project-level, and component-level context files, which are all combined to provide the model with the most relevant information.
 
-You can use the [`/memory` command](../cli/commands.md) to `show`, `add`, and `refresh` the content of loaded context files.
+You can use the [`/memory` command](../cli/commands.md) to `show`, `add`, and `refresh` the content of loaded `GEMINI.md` files.

docs/core/memport.md

@@ -1,17 +1,17 @@
 # Memory Import Processor
 
-The Memory Import Processor is a feature that allows you to modularize your context files (e.g., `QWEN.md`) by importing content from other files using the `@file.md` syntax.
+The Memory Import Processor is a feature that allows you to modularize your GEMINI.md files by importing content from other files using the `@file.md` syntax.
 
 ## Overview
 
-This feature enables you to break down large context files (e.g., `QWEN.md`) into smaller, more manageable components that can be reused across different contexts. The import processor supports both relative and absolute paths, with built-in safety features to prevent circular imports and ensure file access security.
+This feature enables you to break down large GEMINI.md files into smaller, more manageable components that can be reused across different contexts. The import processor supports both relative and absolute paths, with built-in safety features to prevent circular imports and ensure file access security.
 
 ## Syntax
 
 Use the `@` symbol followed by the path to the file you want to import:
 
 ```markdown
-# Main QWEN.md file
+# Main GEMINI.md file
 
 This is the main content.
 
@@ -39,7 +39,7 @@ More content here.
 ### Basic Import
 
 ```markdown
-# My QWEN.md
+# My GEMINI.md
 
 Welcome to my project!
 
@@ -110,13 +110,13 @@ The import processor uses the `marked` library to detect code blocks and inline
 
 ## Import Tree Structure
 
-The processor returns an import tree that shows the hierarchy of imported files. This helps users debug problems with their context files by showing which files were read and their import relationships.
+The processor returns an import tree that shows the hierarchy of imported files, similar to Claude's `/memory` feature. This helps users debug problems with their GEMINI.md files by showing which files were read and their import relationships.
 
 Example tree structure:
 
 ```
- Memory Files
- L project: QWEN.md
+Memory Files
+ L project: GEMINI.md
             L a.md
               L b.md
                 L c.md
@@ -138,7 +138,7 @@ Note: The import tree is mainly for clarity during development and has limited r
 
 ### `processImports(content, basePath, debugMode?, importState?)`
 
-Processes import statements in context file content.
+Processes import statements in GEMINI.md content.
 
 **Parameters:**
 

docs/core/tools-api.md

@@ -15,11 +15,9 @@ The Gemini CLI core (`packages/core`) features a robust system for defining, reg
   - `execute()`: The core method that performs the tool's action and returns a `ToolResult`.
 
 - **`ToolResult` (`tools.ts`):** An interface defining the structure of a tool's execution outcome:
-  - `llmContent`: The factual content to be included in the history sent back to the LLM for context. This can be a simple string or a `PartListUnion` (an array of `Part` objects and strings) for rich content.
+  - `llmContent`: The factual string content to be included in the history sent back to the LLM for context.
   - `returnDisplay`: A user-friendly string (often Markdown) or a special object (like `FileDiff`) for display in the CLI.
 
-- **Returning Rich Content:** Tools are not limited to returning simple text. The `llmContent` can be a `PartListUnion`, which is an array that can contain a mix of `Part` objects (for images, audio, etc.) and `string`s. This allows a single tool execution to return multiple pieces of rich content.
-
 - **Tool Registry (`tool-registry.ts`):** A class (`ToolRegistry`) responsible for:
   - **Registering Tools:** Holding a collection of all available built-in tools (e.g., `ReadFileTool`, `ShellTool`).
   - **Discovering Tools:** It can also discover tools dynamically:

docs/extension.md

@@ -28,7 +28,7 @@ The `gemini-extension.json` file contains the configuration for the extension. T
       "command": "node my-server.js"
     }
   },
-  "contextFileName": "QWEN.md",
+  "contextFileName": "GEMINI.md",
   "excludeTools": ["run_shell_command"]
 }
 ```
@@ -36,7 +36,7 @@ The `gemini-extension.json` file contains the configuration for the extension. T
 - `name`: The name of the extension. This is used to uniquely identify the extension and for conflict resolution when extension commands have the same name as user or project commands.
 - `version`: The version of the extension.
 - `mcpServers`: A map of MCP servers to configure. The key is the name of the server, and the value is the server configuration. These servers will be loaded on startup just like MCP servers configured in a [`settings.json` file](./cli/configuration.md). If both an extension and a `settings.json` file configure an MCP server with the same name, the server defined in the `settings.json` file takes precedence.
-- `contextFileName`: The name of the file that contains the context for the extension. This will be used to load the context from the workspace. If this property is not used but a `QWEN.md` file is present in your extension directory, then that file will be loaded.
+- `contextFileName`: The name of the file that contains the context for the extension. This will be used to load the context from the workspace. If this property is not used but a `GEMINI.md` file is present in your extension directory, then that file will be loaded.
 - `excludeTools`: An array of tool names to exclude from the model. You can also specify command-specific restrictions for tools that support it, like the `run_shell_command` tool. For example, `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf` command.
 
 When Gemini CLI starts, it loads all the extensions and merges their configurations. If there are any conflicts, the workspace configuration takes precedence.

docs/index.md

@@ -28,7 +28,7 @@ This documentation is organized into the following sections:
   - **[Multi-File Read Tool](./tools/multi-file.md):** Documentation for the `read_many_files` tool.
   - **[Shell Tool](./tools/shell.md):** Documentation for the `run_shell_command` tool.
   - **[Web Fetch Tool](./tools/web-fetch.md):** Documentation for the `web_fetch` tool.
-  - **[Web Search Tool](./tools/web-search.md):** Documentation for the `web_search` tool.
+  - **[Web Search Tool](./tools/web-search.md):** Documentation for the `google_web_search` tool.
   - **[Memory Tool](./tools/memory.md):** Documentation for the `save_memory` tool.
 - **[Contributing & Development Guide](../CONTRIBUTING.md):** Information for contributors and developers, including setup, building, testing, and coding conventions.
 - **[NPM Workspaces and Publishing](./npm.md):** Details on how the project's packages are managed and published.

docs/tools/mcp-server.md

@@ -169,7 +169,6 @@ Use the `/mcp auth` command to manage OAuth authentication:
 - **`scopes`** (string[]): Required OAuth scopes
 - **`redirectUri`** (string): Custom redirect URI (defaults to `http://localhost:7777/oauth/callback`)
 - **`tokenParamName`** (string): Query parameter name for tokens in SSE URLs
-- **`audiences`** (string[]): Audiences the token is valid for
 
 #### Token Management
 
@@ -572,56 +571,6 @@ The MCP integration tracks several states:
 
 This comprehensive integration makes MCP servers a powerful way to extend the Gemini CLI's capabilities while maintaining security, reliability, and ease of use.
 
-## Returning Rich Content from Tools
-
-MCP tools are not limited to returning simple text. You can return rich, multi-part content, including text, images, audio, and other binary data in a single tool response. This allows you to build powerful tools that can provide diverse information to the model in a single turn.
-
-All data returned from the tool is processed and sent to the model as context for its next generation, enabling it to reason about or summarize the provided information.
-
-### How It Works
-
-To return rich content, your tool's response must adhere to the MCP specification for a [`CallToolResult`](https://modelcontextprotocol.io/specification/2025-06-18/server/tools#tool-result). The `content` field of the result should be an array of `ContentBlock` objects. The Gemini CLI will correctly process this array, separating text from binary data and packaging it for the model.
-
-You can mix and match different content block types in the `content` array. The supported block types include:
-
-- `text`
-- `image`
-- `audio`
-- `resource` (embedded content)
-- `resource_link`
-
-### Example: Returning Text and an Image
-
-Here is an example of a valid JSON response from an MCP tool that returns both a text description and an image:
-
-```json
-{
-  "content": [
-    {
-      "type": "text",
-      "text": "Here is the logo you requested."
-    },
-    {
-      "type": "image",
-      "data": "BASE64_ENCODED_IMAGE_DATA_HERE",
-      "mimeType": "image/png"
-    },
-    {
-      "type": "text",
-      "text": "The logo was created in 2025."
-    }
-  ]
-}
-```
-
-When the Gemini CLI receives this response, it will:
-
-1.  Extract all the text and combine it into a single `functionResponse` part for the model.
-2.  Present the image data as a separate `inlineData` part.
-3.  Provide a clean, user-friendly summary in the CLI, indicating that both text and an image were received.
-
-This enables you to build sophisticated tools that can provide rich, multi-modal context to the Gemini model.
-
 ## MCP Prompts as Slash Commands
 
 In addition to tools, MCP servers can expose predefined prompts that can be executed as slash commands within the Gemini CLI. This allows you to create shortcuts for common or complex queries that can be easily invoked by name.

docs/tools/memory.md

@@ -4,7 +4,7 @@ This document describes the `save_memory` tool for the Gemini CLI.
 
 ## Description
 
-Use `save_memory` to save and recall information across your Qwen Code sessions. With `save_memory`, you can direct the CLI to remember key details across sessions, providing personalized and directed assistance.
+Use `save_memory` to save and recall information across your Gemini CLI sessions. With `save_memory`, you can direct the CLI to remember key details across sessions, providing personalized and directed assistance.
 
 ### Arguments
 
@@ -14,9 +14,9 @@ Use `save_memory` to save and recall information across your Qwen Code sessions.
 
 ## How to use `save_memory` with the Gemini CLI
 
-The tool appends the provided `fact` to your context file in the user's home directory (`~/.qwen/QWEN.md` by default). This filename can be configured via `contextFileName`.
+The tool appends the provided `fact` to a special `GEMINI.md` file located in the user's home directory (`~/.gemini/GEMINI.md`). This file can be configured to have a different name.
 
-Once added, the facts are stored under a `## Qwen Added Memories` section. This file is loaded as context in subsequent sessions, allowing the CLI to recall the saved information.
+Once added, the facts are stored under a `## Gemini Added Memories` section. This file is loaded as context in subsequent sessions, allowing the CLI to recall the saved information.
 
 Usage:
 

docs/tools/multi-file.md

@@ -52,7 +52,7 @@ Read the main README, all Markdown files in the `docs` directory, and a specific
 read_many_files(paths=["README.md", "docs/**/*.md", "assets/logo.png"], exclude=["docs/OLD_README.md"])
 ```
 
-Read all JavaScript files but explicitly include test files and all JPEGs in an `images` folder:
+Read all JavaScript files but explicitly including test files and all JPEGs in an `images` folder:
 
 ```
 read_many_files(paths=["**/*.js"], include=["**/*.test.js", "images/**/*.jpg"], useDefaultExcludes=False)

docs/tools/shell.md

@@ -137,5 +137,6 @@ To block all shell commands, add the `run_shell_command` wildcard to `excludeToo
 
 ## Security Note for `excludeTools`
 
-Command-specific restrictions in `excludeTools` for `run_shell_command` are based on simple string matching and can be easily bypassed. This feature is **not a security mechanism** and should not be relied upon to safely execute untrusted code. It is recommended to use `coreTools` to explicitly select commands
+Command-specific restrictions in
+`excludeTools` for `run_shell_command` are based on simple string matching and can be easily bypassed. This feature is **not a security mechanism** and should not be relied upon to safely execute untrusted code. It is recommended to use `coreTools` to explicitly select commands
 that can be executed.

docs/tools/web-search.md

@@ -1,43 +1,36 @@
-# Web Search Tool (`web_search`)
+# Web Search Tool (`google_web_search`)
 
-This document describes the `web_search` tool.
+This document describes the `google_web_search` tool.
 
 ## Description
 
-Use `web_search` to perform a web search using the Tavily API. The tool returns a concise answer with sources when possible.
+Use `google_web_search` to perform a web search using Google Search via the Gemini API. The `google_web_search` tool returns a summary of web results with sources.
 
 ### Arguments
 
-`web_search` takes one argument:
+`google_web_search` takes one argument:
 
 - `query` (string, required): The search query.
 
-## How to use `web_search`
+## How to use `google_web_search` with the Gemini CLI
 
-`web_search` calls the Tavily API directly. You must configure the `TAVILY_API_KEY` through one of the following methods:
-
-1. **Settings file**: Add `"tavilyApiKey": "your-key-here"` to your `settings.json`
-2. **Environment variable**: Set `TAVILY_API_KEY` in your environment or `.env` file
-3. **Command line**: Use `--tavily-api-key your-key-here` when running the CLI
-
-If the key is not configured, the tool will be disabled and skipped.
+The `google_web_search` tool sends a query to the Gemini API, which then performs a web search. `google_web_search` will return a generated response based on the search results, including citations and sources.
 
 Usage:
 
 ```
-web_search(query="Your query goes here.")
+google_web_search(query="Your query goes here.")
 ```
 
-## `web_search` examples
+## `google_web_search` examples
 
 Get information on a topic:
 
 ```
-web_search(query="latest advancements in AI-powered code generation")
+google_web_search(query="latest advancements in AI-powered code generation")
 ```
 
 ## Important notes
 
-- **Response returned:** The `web_search` tool returns a concise answer when available, with a list of source links.
-- **Citations:** Source links are appended as a numbered list.
-- **API key:** Configure `TAVILY_API_KEY` via settings.json, environment variables, .env files, or command line arguments. If not configured, the tool is not registered.
+- **Response returned:** The `google_web_search` tool returns a processed summary, not a raw list of search results.
+- **Citations:** The response includes citations to the sources used to generate the summary.

docs/troubleshooting.md

@@ -1,38 +1,28 @@
-# Troubleshooting guide
+# Troubleshooting Guide
 
-This guide provides solutions to common issues and debugging tips, including topics on:
+This guide provides solutions to common issues and debugging tips.
 
-- Authentication or login errors
-- Frequently asked questions (FAQs)
-- Debugging tips
-- Existing GitHub Issues similar to yours or creating new Issues
-
-## Authentication or login errors
+## Authentication
 
 - **Error: `Failed to login. Message: Request contains an invalid argument`**
-  - Users with Google Workspace accounts or Google Cloud accounts
+  - Users with Google Workspace accounts, or users with Google Cloud accounts
     associated with their Gmail accounts may not be able to activate the free
     tier of the Google Code Assist plan.
   - For Google Cloud accounts, you can work around this by setting
     `GOOGLE_CLOUD_PROJECT` to your project ID.
-  - Alternatively, you can obtain the Gemini API key from
-    [Google AI Studio](http://aistudio.google.com/app/apikey), which also includes a
+  - You can also grab an API key from [AI Studio](https://aistudio.google.com/app/apikey), which also includes a
     separate free tier.
 
 ## Frequently asked questions (FAQs)
 
 - **Q: How do I update Gemini CLI to the latest version?**
-  - A: If you installed it globally via `npm`, update it using the command `npm install -g @google/gemini-cli@latest`. If you compiled it from source, pull the latest changes from the repository, and then rebuild using the command `npm run build`.
+  - A: If installed globally via npm, update Gemini CLI using the command `npm install -g @google/gemini-cli@latest`. If run from source, pull the latest changes from the repository and rebuild using `npm run build`.
 
-- **Q: Where are the Gemini CLI configuration or settings files stored?**
-  - A: The Gemini CLI configuration is stored in two `settings.json` files:
-    1. In your home directory: `~/.gemini/settings.json`.
-    2. In your project's root directory: `./.gemini/settings.json`.
-
-    Refer to [Gemini CLI Configuration](./cli/configuration.md) for more details.
+- **Q: Where are Gemini CLI configuration files stored?**
+  - A: The CLI configuration is stored within two `settings.json` files: one in your home directory and one in your project's root directory. In both locations, `settings.json` is found in the `.gemini/` folder. Refer to [CLI Configuration](./cli/configuration.md) for more details.
 
 - **Q: Why don't I see cached token counts in my stats output?**
-  - A: Cached token information is only displayed when cached tokens are being used. This feature is available for API key users (Gemini API key or Google Cloud Vertex AI) but not for OAuth users (such as Google Personal/Enterprise accounts like Google Gmail or Google Workspace, respectively). This is because the Gemini Code Assist API does not support cached content creation. You can still view your total token usage using the `/stats` command in Gemini CLI.
+  - A: Cached token information is only displayed when cached tokens are being used. This feature is available for API key users (Gemini API key or Vertex AI) but not for OAuth users (Google Personal/Enterprise accounts) at this time, as the Code Assist API does not support cached content creation. You can still view your total token usage with the `/stats` command.
 
 ## Common error messages and solutions
 
@@ -41,27 +31,26 @@ This guide provides solutions to common issues and debugging tips, including top
   - **Solution:**
     Either stop the other process that is using the port or configure the MCP server to use a different port.
 
-- **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`.
+- **Error: Command not found (when attempting to run Gemini CLI).**
+  - **Cause:** Gemini CLI is not correctly installed or not in your system's PATH.
   - **Solution:**
-    The update depends on how you installed Gemini CLI:
-    - If you installed `gemini` globally, check that your `npm` global binary directory is in your `PATH`. You can update Gemini CLI using the command `npm install -g @google/gemini-cli@latest`.
-    - If you are running `gemini` from source, ensure you are using the correct command to invoke it (e.g., `node packages/cli/dist/index.js ...`). To update Gemini CLI, pull the latest changes from the repository, and then rebuild using the command `npm run build`.
+    1.  Ensure Gemini CLI installation was successful.
+    2.  If installed globally, check that your npm global binary directory is in your PATH.
+    3.  If running from source, ensure you are using the correct command to invoke it (e.g., `node packages/cli/dist/index.js ...`).
 
 - **Error: `MODULE_NOT_FOUND` or import errors.**
   - **Cause:** Dependencies are not installed correctly, or the project hasn't been built.
   - **Solution:**
     1.  Run `npm install` to ensure all dependencies are present.
     2.  Run `npm run build` to compile the project.
-    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.
-  - **Solution:** Refer to the [Configuration: Sandboxing](./cli/configuration.md#sandboxing) documentation for more information, including how to customize your sandbox configuration.
+  - **Cause:** If sandboxing is enabled, then the application is likely attempting an operation restricted by your sandbox, such as writing outside the project directory or system temp directory.
+  - **Solution:** See [Sandboxing](./cli/configuration.md#sandboxing) for more information, including how to customize your sandbox configuration.
 
-- **Gemini CLI is not running in interactive mode in "CI" environments**
-  - **Issue:** The Gemini CLI does not enter interactive mode (no prompt appears) if an environment variable starting with `CI_` (e.g., `CI_TOKEN`) is set. This is because the `is-in-ci` package, used by the underlying UI framework, detects these variables and assumes a non-interactive CI environment.
-  - **Cause:** The `is-in-ci` package checks for the presence of `CI`, `CONTINUOUS_INTEGRATION`, or any environment variable with a `CI_` prefix. When any of these are found, it signals that the environment is non-interactive, which prevents the Gemini CLI from starting in its interactive mode.
+- **CLI is not interactive in "CI" environments**
+  - **Issue:** The CLI does not enter interactive mode (no prompt appears) if an environment variable starting with `CI_` (e.g., `CI_TOKEN`) is set. This is because the `is-in-ci` package, used by the underlying UI framework, detects these variables and assumes a non-interactive CI environment.
+  - **Cause:** The `is-in-ci` package checks for the presence of `CI`, `CONTINUOUS_INTEGRATION`, or any environment variable with a `CI_` prefix. When any of these are found, it signals that the environment is non-interactive, which prevents the CLI from starting in its interactive mode.
   - **Solution:** If the `CI_` prefixed variable is not needed for the CLI to function, you can temporarily unset it for the command. e.g., `env -u CI_TOKEN gemini`
 
 - **DEBUG mode not working from project .env file**
@@ -83,11 +72,9 @@ This guide provides solutions to common issues and debugging tips, including top
 - **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 first.
-  - For _file system tools_, verify that paths are correct and check the permissions.
+  - For file system tools, double-check paths and permissions.
 
 - **Pre-flight checks:**
   - Always run `npm run preflight` before committing code. This can catch many common issues related to formatting, linting, and type errors.
 
-## Existing GitHub Issues similar to yours or creating new Issues
-
-If you encounter an issue that was not covered here in this _Troubleshooting guide_, consider searching the Gemini CLI [Issue tracker on GitHub](https://github.com/google-gemini/gemini-cli/issues). If you can't find an issue similar to yours, consider creating a new GitHub Issue with a detailed description. Pull requests are also welcome!
+If you encounter an issue not covered here, consider searching the project's issue tracker on GitHub or reporting a new issue with detailed information.

integration-tests/google_web_search.test.js

@@ -9,11 +9,6 @@ import { strict as assert } from 'assert';
 import { TestRig, printDebugInfo, validateModelOutput } from './test-helper.js';
 
 test('should be able to search the web', async () => {
-  // Skip if Tavily key is not configured
-  if (!process.env.TAVILY_API_KEY) {
-    console.warn('Skipping web search test: TAVILY_API_KEY not set');
-    return;
-  }
   const rig = new TestRig();
   await rig.setup('should be able to search the web');
 
@@ -32,7 +27,7 @@ test('should be able to search the web', async () => {
     throw error; // Re-throw if not a network error
   }
 
-  const foundToolCall = await rig.waitForToolCall('web_search');
+  const foundToolCall = await rig.waitForToolCall('google_web_search');
 
   // Add debugging information
   if (!foundToolCall) {
@@ -40,11 +35,12 @@ test('should be able to search the web', async () => {
 
     // Check if the tool call failed due to network issues
     const failedSearchCalls = allTools.filter(
-      (t) => t.toolRequest.name === 'web_search' && !t.toolRequest.success,
+      (t) =>
+        t.toolRequest.name === 'google_web_search' && !t.toolRequest.success,
     );
     if (failedSearchCalls.length > 0) {
       console.warn(
-        'web_search tool was called but failed, possibly due to network issues',
+        'google_web_search tool was called but failed, possibly due to network issues',
       );
       console.warn(
         'Failed calls:',
@@ -54,20 +50,20 @@ test('should be able to search the web', async () => {
     }
   }
 
-  assert.ok(foundToolCall, 'Expected to find a call to web_search');
+  assert.ok(foundToolCall, 'Expected to find a call to google_web_search');
 
   // Validate model output - will throw if no output, warn if missing expected content
   const hasExpectedContent = validateModelOutput(
     result,
     ['weather', 'london'],
-    'Web search test',
+    'Google web search test',
   );
 
   // If content was missing, log the search queries used
   if (!hasExpectedContent) {
     const searchCalls = rig
       .readToolLogs()
-      .filter((t) => t.toolRequest.name === 'web_search');
+      .filter((t) => t.toolRequest.name === 'google_web_search');
     if (searchCalls.length > 0) {
       console.warn(
         'Search queries used:',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.0.7-nightly.1",
+  "version": "0.0.5",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/QwenLM/qwen-code.git"
   },
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.0.7-nightly.1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.0.5"
   },
   "scripts": {
     "start": "node scripts/start.js",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.0.7-nightly.1",
+  "version": "0.0.5",
   "description": "Qwen Code",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.0.7-nightly.1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.0.5"
   },
   "dependencies": {
     "@google/genai": "1.9.0",
@@ -75,8 +75,7 @@
     "pretty-format": "^30.0.2",
     "react-dom": "^19.1.0",
     "typescript": "^5.3.3",
-    "vitest": "^3.1.1",
-    "@qwen-code/qwen-code-test-utils": "file:../test-utils"
+    "vitest": "^3.1.1"
   },
   "engines": {
     "node": ">=20"

packages/cli/src/config/config.test.ts

@@ -6,9 +6,7 @@
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import * as os from 'os';
-import * as fs from 'fs';
-import * as path from 'path';
-import { loadCliConfig, parseArguments } from './config.js';
+import { loadCliConfig, parseArguments, CliArgs } from './config.js';
 import { Settings } from './settings.js';
 import { Extension } from './extension.js';
 import * as ServerConfig from '@qwen-code/qwen-code-core';
@@ -46,7 +44,7 @@ vi.mock('@qwen-code/qwen-code-core', async () => {
     },
     loadEnvironment: vi.fn(),
     loadServerHierarchicalMemory: vi.fn(
-      (cwd, dirs, debug, fileService, extensionPaths, _maxDirs) =>
+      (cwd, debug, fileService, extensionPaths, _maxDirs) =>
         Promise.resolve({
           memoryContent: extensionPaths?.join(',') || '',
           fileCount: extensionPaths?.length || 0,
@@ -501,7 +499,6 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
     await loadCliConfig(settings, extensions, 'session-id', argv);
     expect(ServerConfig.loadServerHierarchicalMemory).toHaveBeenCalledWith(
       expect.any(String),
-      [],
       false,
       expect.any(Object),
       [
@@ -1081,86 +1078,14 @@ describe('loadCliConfig ideModeFeature', () => {
     const config = await loadCliConfig(settings, [], 'test-session', argv);
     expect(config.getIdeModeFeature()).toBe(false);
   });
-});
 
-vi.mock('fs', async () => {
-  const actualFs = await vi.importActual<typeof fs>('fs');
-  const MOCK_CWD1 = process.cwd();
-  const MOCK_CWD2 = path.resolve(path.sep, 'home', 'user', 'project');
-
-  const mockPaths = new Set([
-    MOCK_CWD1,
-    MOCK_CWD2,
-    path.resolve(path.sep, 'cli', 'path1'),
-    path.resolve(path.sep, 'settings', 'path1'),
-    path.join(os.homedir(), 'settings', 'path2'),
-    path.join(MOCK_CWD2, 'cli', 'path2'),
-    path.join(MOCK_CWD2, 'settings', 'path3'),
-  ]);
-
-  return {
-    ...actualFs,
-    existsSync: vi.fn((p) => mockPaths.has(p.toString())),
-    statSync: vi.fn((p) => {
-      if (mockPaths.has(p.toString())) {
-        return { isDirectory: () => true };
-      }
-      // Fallback for other paths if needed, though the test should be specific.
-      return actualFs.statSync(p);
-    }),
-    realpathSync: vi.fn((p) => p),
-  };
-});
-
-describe('loadCliConfig with includeDirectories', () => {
-  const originalArgv = process.argv;
-  const originalEnv = { ...process.env };
-
-  beforeEach(() => {
-    vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    process.env.GEMINI_API_KEY = 'test-api-key';
-    vi.spyOn(process, 'cwd').mockReturnValue(
-      path.resolve(path.sep, 'home', 'user', 'project'),
-    );
-  });
-
-  afterEach(() => {
-    process.argv = originalArgv;
-    process.env = originalEnv;
-    vi.restoreAllMocks();
-  });
-
-  it('should combine and resolve paths from settings and CLI arguments', async () => {
-    const mockCwd = path.resolve(path.sep, 'home', 'user', 'project');
-    process.argv = [
-      'node',
-      'script.js',
-      '--include-directories',
-      `${path.resolve(path.sep, 'cli', 'path1')},${path.join(mockCwd, 'cli', 'path2')}`,
-    ];
+  it('should be false when settings.ideModeFeature is true, but SANDBOX is set', async () => {
+    process.argv = ['node', 'script.js'];
     const argv = await parseArguments();
-    const settings: Settings = {
-      includeDirectories: [
-        path.resolve(path.sep, 'settings', 'path1'),
-        path.join(os.homedir(), 'settings', 'path2'),
-        path.join(mockCwd, 'settings', 'path3'),
-      ],
-    };
+    process.env.TERM_PROGRAM = 'vscode';
+    process.env.SANDBOX = 'true';
+    const settings: Settings = { ideModeFeature: true };
     const config = await loadCliConfig(settings, [], 'test-session', argv);
-    const expected = [
-      mockCwd,
-      path.resolve(path.sep, 'cli', 'path1'),
-      path.join(mockCwd, 'cli', 'path2'),
-      path.resolve(path.sep, 'settings', 'path1'),
-      path.join(os.homedir(), 'settings', 'path2'),
-      path.join(mockCwd, 'settings', 'path3'),
-    ];
-    expect(config.getWorkspaceContext().getDirectories()).toEqual(
-      expect.arrayContaining(expected),
-    );
-    expect(config.getWorkspaceContext().getDirectories()).toHaveLength(
-      expected.length,
-    );
+    expect(config.getIdeModeFeature()).toBe(false);
   });
 });

packages/cli/src/config/config.ts

@@ -22,13 +22,13 @@ import {
   FileDiscoveryService,
   TelemetryTarget,
   FileFilteringOptions,
+  IdeClient,
 } from '@qwen-code/qwen-code-core';
 import { Settings } from './settings.js';
 
 import { Extension, annotateActiveExtensions } from './extension.js';
 import { getCliVersion } from '../utils/version.js';
 import { loadSandboxConfig } from './sandboxConfig.js';
-import { resolvePath } from '../utils/resolvePath.js';
 
 // Simple console logger for now - replace with actual logger if available
 const logger = {
@@ -68,8 +68,6 @@ export interface CliArgs {
   openaiBaseUrl: string | undefined;
   proxy: string | undefined;
   includeDirectories: string[] | undefined;
-  loadMemoryFromIncludeDirectories: boolean | undefined;
-  tavilyApiKey: string | undefined;
 }
 
 export async function parseArguments(): Promise<CliArgs> {
@@ -216,10 +214,6 @@ export async function parseArguments(): Promise<CliArgs> {
       type: 'string',
       description: 'OpenAI base URL (for custom endpoints)',
     })
-    .option('tavily-api-key', {
-      type: 'string',
-      description: 'Tavily API key for web search functionality',
-    })
     .option('proxy', {
       type: 'string',
       description:
@@ -234,12 +228,6 @@ export async function parseArguments(): Promise<CliArgs> {
         // Handle comma-separated values
         dirs.flatMap((dir) => dir.split(',').map((d) => d.trim())),
     })
-    .option('load-memory-from-include-directories', {
-      type: 'boolean',
-      description:
-        'If true, when refreshing memory, QWEN.md files should be loaded from all directories that are added. If false, QWEN.md files should only be loaded from the primary working directory.',
-      default: false,
-    })
     .version(await getCliVersion()) // This will enable the --version flag based on package.json
     .alias('v', 'version')
     .help()
@@ -267,7 +255,6 @@ export async function parseArguments(): Promise<CliArgs> {
 // TODO: Consider if App.tsx should get memory via a server call or if Config should refresh itself.
 export async function loadHierarchicalGeminiMemory(
   currentWorkingDirectory: string,
-  includeDirectoriesToReadGemini: readonly string[] = [],
   debugMode: boolean,
   fileService: FileDiscoveryService,
   settings: Settings,
@@ -293,7 +280,6 @@ export async function loadHierarchicalGeminiMemory(
   // Directly call the server function with the corrected path.
   return loadServerHierarchicalMemory(
     effectiveCwd,
-    includeDirectoriesToReadGemini,
     debugMode,
     fileService,
     extensionContextFilePaths,
@@ -316,10 +302,13 @@ export async function loadCliConfig(
     ) ||
     false;
   const memoryImportFormat = settings.memoryImportFormat || 'tree';
-
   const ideMode = settings.ideMode ?? false;
+
   const ideModeFeature =
-    argv.ideModeFeature ?? settings.ideModeFeature ?? false;
+    (argv.ideModeFeature ?? settings.ideModeFeature ?? false) &&
+    !process.env.SANDBOX;
+
+  const ideClient = IdeClient.getInstance(ideMode && ideModeFeature);
 
   const allExtensions = annotateActiveExtensions(
     extensions,
@@ -339,11 +328,6 @@ export async function loadCliConfig(
     process.env.OPENAI_BASE_URL = argv.openaiBaseUrl;
   }
 
-  // Handle Tavily API key from command line
-  if (argv.tavilyApiKey) {
-    process.env.TAVILY_API_KEY = argv.tavilyApiKey;
-  }
-
   // Set the context filename in the server's memoryTool module BEFORE loading memory
   // TODO(b/343434939): This is a bit of a hack. The contextFileName should ideally be passed
   // directly to the Config constructor in core, and have core handle setGeminiMdFilename.
@@ -366,14 +350,9 @@ export async function loadCliConfig(
     ...settings.fileFiltering,
   };
 
-  const includeDirectories = (settings.includeDirectories || [])
-    .map(resolvePath)
-    .concat((argv.includeDirectories || []).map(resolvePath));
-
   // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
   const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(
     process.cwd(),
-    settings.loadMemoryFromIncludeDirectories ? includeDirectories : [],
     debugMode,
     fileService,
     settings,
@@ -433,18 +412,13 @@ export async function loadCliConfig(
   }
 
   const sandboxConfig = await loadSandboxConfig(settings, argv);
-  const cliVersion = await getCliVersion();
 
   return new Config({
     sessionId,
     embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
     sandbox: sandboxConfig,
     targetDir: process.cwd(),
-    includeDirectories,
-    loadMemoryFromIncludeDirectories:
-      argv.loadMemoryFromIncludeDirectories ||
-      settings.loadMemoryFromIncludeDirectories ||
-      false,
+    includeDirectories: argv.includeDirectories,
     debugMode,
     question: argv.promptInteractive || argv.prompt || '',
     fullContext: argv.allFiles || argv.all_files || false,
@@ -505,6 +479,7 @@ export async function loadCliConfig(
     summarizeToolOutput: settings.summarizeToolOutput,
     ideMode,
     ideModeFeature,
+    ideClient,
     enableOpenAILogging:
       (typeof argv.openaiLogging === 'undefined'
         ? settings.enableOpenAILogging
@@ -522,9 +497,6 @@ export async function loadCliConfig(
       },
     ],
     contentGenerator: settings.contentGenerator,
-    cliVersion,
-    tavilyApiKey:
-      argv.tavilyApiKey || settings.tavilyApiKey || process.env.TAVILY_API_KEY,
   });
 }
 

packages/cli/src/config/settings.test.ts

@@ -112,7 +112,6 @@ describe('Settings Loading and Merging', () => {
       expect(settings.merged).toEqual({
         customThemes: {},
         mcpServers: {},
-        includeDirectories: [],
       });
       expect(settings.errors.length).toBe(0);
     });
@@ -146,7 +145,6 @@ describe('Settings Loading and Merging', () => {
         ...systemSettingsContent,
         customThemes: {},
         mcpServers: {},
-        includeDirectories: [],
       });
     });
 
@@ -180,7 +178,6 @@ describe('Settings Loading and Merging', () => {
         ...userSettingsContent,
         customThemes: {},
         mcpServers: {},
-        includeDirectories: [],
       });
     });
 
@@ -212,7 +209,6 @@ describe('Settings Loading and Merging', () => {
         ...workspaceSettingsContent,
         customThemes: {},
         mcpServers: {},
-        includeDirectories: [],
       });
     });
 
@@ -250,7 +246,6 @@ describe('Settings Loading and Merging', () => {
         contextFileName: 'WORKSPACE_CONTEXT.md',
         customThemes: {},
         mcpServers: {},
-        includeDirectories: [],
       });
     });
 
@@ -300,7 +295,6 @@ describe('Settings Loading and Merging', () => {
         allowMCPServers: ['server1', 'server2'],
         customThemes: {},
         mcpServers: {},
-        includeDirectories: [],
       });
     });
 
@@ -622,40 +616,6 @@ describe('Settings Loading and Merging', () => {
       expect(settings.merged.mcpServers).toEqual({});
     });
 
-    it('should merge includeDirectories from all scopes', () => {
-      (mockFsExistsSync as Mock).mockReturnValue(true);
-      const systemSettingsContent = {
-        includeDirectories: ['/system/dir'],
-      };
-      const userSettingsContent = {
-        includeDirectories: ['/user/dir1', '/user/dir2'],
-      };
-      const workspaceSettingsContent = {
-        includeDirectories: ['/workspace/dir'],
-      };
-
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath())
-            return JSON.stringify(systemSettingsContent);
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
-
-      const settings = loadSettings(MOCK_WORKSPACE_DIR);
-
-      expect(settings.merged.includeDirectories).toEqual([
-        '/system/dir',
-        '/user/dir1',
-        '/user/dir2',
-        '/workspace/dir',
-      ]);
-    });
-
     it('should handle JSON parsing errors gracefully', () => {
       (mockFsExistsSync as Mock).mockReturnValue(true); // Both files "exist"
       const invalidJsonContent = 'invalid json';
@@ -694,7 +654,6 @@ describe('Settings Loading and Merging', () => {
       expect(settings.merged).toEqual({
         customThemes: {},
         mcpServers: {},
-        includeDirectories: [],
       });
 
       // Check that error objects are populated in settings.errors
@@ -1131,7 +1090,6 @@ describe('Settings Loading and Merging', () => {
           ...systemSettingsContent,
           customThemes: {},
           mcpServers: {},
-          includeDirectories: [],
         });
       });
     });

packages/cli/src/config/settings.ts

@@ -132,7 +132,6 @@ export interface Settings {
   // Environment variables to exclude from project .env files
   excludedProjectEnvVars?: string[];
   dnsResolutionOrder?: DnsResolutionOrder;
-
   sampling_params?: Record<string, unknown>;
   systemPromptMappings?: Array<{
     baseUrls: string[];
@@ -143,13 +142,6 @@ export interface Settings {
     timeout?: number;
     maxRetries?: number;
   };
-
-  includeDirectories?: string[];
-
-  loadMemoryFromIncludeDirectories?: boolean;
-
-  // Web search API keys
-  tavilyApiKey?: string;
 }
 
 export interface SettingsError {
@@ -205,11 +197,6 @@ export class LoadedSettings {
         ...(workspace.mcpServers || {}),
         ...(system.mcpServers || {}),
       },
-      includeDirectories: [
-        ...(system.includeDirectories || []),
-        ...(user.includeDirectories || []),
-        ...(workspace.includeDirectories || []),
-      ],
     };
   }
 
@@ -400,7 +387,7 @@ export function loadSettings(workspaceDir: string): LoadedSettings {
   const settingsErrors: SettingsError[] = [];
   const systemSettingsPath = getSystemSettingsPath();
 
-  // Resolve paths to their canonical representation to handle symlinks
+  // FIX: Resolve paths to their canonical representation to handle symlinks
   const resolvedWorkspaceDir = path.resolve(workspaceDir);
   const resolvedHomeDir = path.resolve(homedir());
 
@@ -455,6 +442,7 @@ export function loadSettings(workspaceDir: string): LoadedSettings {
     });
   }
 
+  // This comparison is now much more reliable.
   if (realWorkspaceDir !== realHomeDir) {
     // Load workspace settings
     try {

packages/cli/src/nonInteractiveCli.test.ts

@@ -70,7 +70,6 @@ describe('runNonInteractive', () => {
       getIdeMode: vi.fn().mockReturnValue(false),
       getFullContext: vi.fn().mockReturnValue(false),
       getContentGeneratorConfig: vi.fn().mockReturnValue({}),
-      getDebugMode: vi.fn().mockReturnValue(false),
     } as unknown as Config;
   });
 

packages/cli/src/nonInteractiveCli.ts

@@ -17,37 +17,28 @@ import {
 import { Content, Part, FunctionCall } from '@google/genai';
 
 import { parseAndFormatApiError } from './ui/utils/errorParsing.js';
-import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
 
 export async function runNonInteractive(
   config: Config,
   input: string,
   prompt_id: string,
 ): Promise<void> {
-  const consolePatcher = new ConsolePatcher({
-    stderr: true,
-    debugMode: config.getDebugMode(),
+  await config.initialize();
+  // Handle EPIPE errors when the output is piped to a command that closes early.
+  process.stdout.on('error', (err: NodeJS.ErrnoException) => {
+    if (err.code === 'EPIPE') {
+      // Exit gracefully if the pipe is closed.
+      process.exit(0);
+    }
   });
 
+  const geminiClient = config.getGeminiClient();
+  const toolRegistry: ToolRegistry = await config.getToolRegistry();
+
+  const abortController = new AbortController();
+  let currentMessages: Content[] = [{ role: 'user', parts: [{ text: input }] }];
+  let turnCount = 0;
   try {
-    await config.initialize();
-    consolePatcher.patch();
-    // Handle EPIPE errors when the output is piped to a command that closes early.
-    process.stdout.on('error', (err: NodeJS.ErrnoException) => {
-      if (err.code === 'EPIPE') {
-        // Exit gracefully if the pipe is closed.
-        process.exit(0);
-      }
-    });
-
-    const geminiClient = config.getGeminiClient();
-    const toolRegistry: ToolRegistry = await config.getToolRegistry();
-
-    const abortController = new AbortController();
-    let currentMessages: Content[] = [
-      { role: 'user', parts: [{ text: input }] },
-    ];
-    let turnCount = 0;
     while (true) {
       turnCount++;
       if (
@@ -142,7 +133,6 @@ export async function runNonInteractive(
     );
     process.exit(1);
   } finally {
-    consolePatcher.cleanup();
     if (isTelemetrySdkInitialized()) {
       await shutdownTelemetry();
     }

packages/cli/src/ui/App.test.tsx

@@ -148,7 +148,7 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
           getUserTier: vi.fn(),
         })),
         getCheckpointingEnabled: vi.fn(() => opts.checkpointing ?? true),
-        getAllGeminiMdFilenames: vi.fn(() => ['QWEN.md']),
+        getAllGeminiMdFilenames: vi.fn(() => ['GEMINI.md']),
         setFlashFallbackHandler: vi.fn(),
         getSessionId: vi.fn(() => 'test-session-id'),
         getUserTier: vi.fn().mockResolvedValue(undefined),
@@ -169,7 +169,7 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
     ...actualCore,
     Config: ConfigClassMock,
     MCPServerConfig: actualCore.MCPServerConfig,
-    getAllGeminiMdFilenames: vi.fn(() => ['QWEN.md']),
+    getAllGeminiMdFilenames: vi.fn(() => ['GEMINI.md']),
     ideContext: ideContextMock,
     isGitRepository: vi.fn(),
   };
@@ -577,7 +577,7 @@ describe('App UI', () => {
       },
     });
     mockConfig.getGeminiMdFileCount.mockReturnValue(1);
-    mockConfig.getAllGeminiMdFilenames.mockReturnValue(['QWEN.md']);
+    mockConfig.getAllGeminiMdFilenames.mockReturnValue(['GEMINI.md']);
 
     const { lastFrame, unmount } = render(
       <App
@@ -589,13 +589,13 @@ describe('App UI', () => {
     currentUnmount = unmount;
     await Promise.resolve();
     expect(lastFrame()).toContain(
-      'Using: 1 open file (ctrl+e to view) | 1 QWEN.md file',
+      'Using: 1 open file (ctrl+e to view) | 1 GEMINI.md file',
     );
   });
 
-  it('should display default "QWEN.md" in footer when contextFileName is not set and count is 1', async () => {
+  it('should display default "GEMINI.md" in footer when contextFileName is not set and count is 1', async () => {
     mockConfig.getGeminiMdFileCount.mockReturnValue(1);
-    mockConfig.getAllGeminiMdFilenames.mockReturnValue(['QWEN.md']);
+    mockConfig.getAllGeminiMdFilenames.mockReturnValue(['GEMINI.md']);
     // For this test, ensure showMemoryUsage is false or debugMode is false if it relies on that
     mockConfig.getDebugMode.mockReturnValue(false);
     mockConfig.getShowMemoryUsage.mockReturnValue(false);
@@ -609,12 +609,15 @@ describe('App UI', () => {
     );
     currentUnmount = unmount;
     await Promise.resolve(); // Wait for any async updates
-    expect(lastFrame()).toContain('Using: 1 QWEN.md file');
+    expect(lastFrame()).toContain('Using: 1 GEMINI.md file');
   });
 
-  it('should display default "QWEN.md" with plural when contextFileName is not set and count is > 1', async () => {
+  it('should display default "GEMINI.md" with plural when contextFileName is not set and count is > 1', async () => {
     mockConfig.getGeminiMdFileCount.mockReturnValue(2);
-    mockConfig.getAllGeminiMdFilenames.mockReturnValue(['QWEN.md', 'QWEN.md']);
+    mockConfig.getAllGeminiMdFilenames.mockReturnValue([
+      'GEMINI.md',
+      'GEMINI.md',
+    ]);
     mockConfig.getDebugMode.mockReturnValue(false);
     mockConfig.getShowMemoryUsage.mockReturnValue(false);
 
@@ -627,7 +630,7 @@ describe('App UI', () => {
     );
     currentUnmount = unmount;
     await Promise.resolve();
-    expect(lastFrame()).toContain('Using: 2 QWEN.md files');
+    expect(lastFrame()).toContain('Using: 2 GEMINI.md files');
   });
 
   it('should display custom contextFileName in footer when set and count is 1', async () => {
@@ -724,9 +727,12 @@ describe('App UI', () => {
     expect(lastFrame()).not.toContain('ANY_FILE.MD');
   });
 
-  it('should display QWEN.md and MCP server count when both are present', async () => {
+  it('should display GEMINI.md and MCP server count when both are present', async () => {
     mockConfig.getGeminiMdFileCount.mockReturnValue(2);
-    mockConfig.getAllGeminiMdFilenames.mockReturnValue(['QWEN.md', 'QWEN.md']);
+    mockConfig.getAllGeminiMdFilenames.mockReturnValue([
+      'GEMINI.md',
+      'GEMINI.md',
+    ]);
     mockConfig.getMcpServers.mockReturnValue({
       server1: {} as MCPServerConfig,
     });
@@ -745,7 +751,7 @@ describe('App UI', () => {
     expect(lastFrame()).toContain('1 MCP server');
   });
 
-  it('should display only MCP server count when QWEN.md count is 0', async () => {
+  it('should display only MCP server count when GEMINI.md count is 0', async () => {
     mockConfig.getGeminiMdFileCount.mockReturnValue(0);
     mockConfig.getAllGeminiMdFilenames.mockReturnValue([]);
     mockConfig.getMcpServers.mockReturnValue({

packages/cli/src/ui/App.tsx

@@ -308,9 +308,6 @@ const App = ({ config, settings, startupWarnings = [], version }: AppProps) => {
     try {
       const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(
         process.cwd(),
-        settings.merged.loadMemoryFromIncludeDirectories
-          ? config.getWorkspaceContext().getDirectories()
-          : [],
         config.getDebugMode(),
         config.getFileService(),
         settings.merged,
@@ -515,7 +512,6 @@ const App = ({ config, settings, startupWarnings = [], version }: AppProps) => {
     openPrivacyNotice,
     toggleVimEnabled,
     setIsProcessing,
-    setGeminiMdFileCount,
   );
 
   const {
@@ -537,7 +533,6 @@ const App = ({ config, settings, startupWarnings = [], version }: AppProps) => {
     performMemoryRefresh,
     modelSwitchedFromQuotaError,
     setModelSwitchedFromQuotaError,
-    refreshStatic,
   );
 
   // Input handling
@@ -636,7 +631,7 @@ const App = ({ config, settings, startupWarnings = [], version }: AppProps) => {
     if (config) {
       setGeminiMdFileCount(config.getGeminiMdFileCount());
     }
-  }, [config, config.getGeminiMdFileCount]);
+  }, [config]);
 
   const logger = useLogger();
   const [userMessages, setUserMessages] = useState<string[]>([]);

packages/cli/src/ui/commands/directoryCommand.test.tsx

@@ -40,24 +40,11 @@ describe('directoryCommand', () => {
       getGeminiClient: vi.fn().mockReturnValue({
         addDirectoryContext: vi.fn(),
       }),
-      getWorkingDir: () => '/test/dir',
-      shouldLoadMemoryFromIncludeDirectories: () => false,
-      getDebugMode: () => false,
-      getFileService: () => ({}),
-      getExtensionContextFilePaths: () => [],
-      getFileFilteringOptions: () => ({ ignore: [], include: [] }),
-      setUserMemory: vi.fn(),
-      setGeminiMdFileCount: vi.fn(),
     } as unknown as Config;
 
     mockContext = {
       services: {
         config: mockConfig,
-        settings: {
-          merged: {
-            memoryDiscoveryMaxDirs: 1000,
-          },
-        },
       },
       ui: {
         addItem: vi.fn(),

packages/cli/src/ui/commands/directoryCommand.tsx

@@ -8,7 +8,6 @@ import { SlashCommand, CommandContext, CommandKind } from './types.js';
 import { MessageType } from '../types.js';
 import * as os from 'os';
 import * as path from 'path';
-import { loadServerHierarchicalMemory } from '@qwen-code/qwen-code-core';
 
 export function expandHomeDir(p: string): string {
   if (!p) {
@@ -17,7 +16,7 @@ export function expandHomeDir(p: string): string {
   let expandedPath = p;
   if (p.toLowerCase().startsWith('%userprofile%')) {
     expandedPath = os.homedir() + p.substring('%userprofile%'.length);
-  } else if (p === '~' || p.startsWith('~/')) {
+  } else if (p.startsWith('~')) {
     expandedPath = os.homedir() + p.substring(1);
   }
   return path.normalize(expandedPath);
@@ -91,37 +90,6 @@ export const directoryCommand: SlashCommand = {
           }
         }
 
-        try {
-          if (config.shouldLoadMemoryFromIncludeDirectories()) {
-            const { memoryContent, fileCount } =
-              await loadServerHierarchicalMemory(
-                config.getWorkingDir(),
-                [
-                  ...config.getWorkspaceContext().getDirectories(),
-                  ...pathsToAdd,
-                ],
-                config.getDebugMode(),
-                config.getFileService(),
-                config.getExtensionContextFilePaths(),
-                context.services.settings.merged.memoryImportFormat || 'tree', // Use setting or default to 'tree'
-                config.getFileFilteringOptions(),
-                context.services.settings.merged.memoryDiscoveryMaxDirs,
-              );
-            config.setUserMemory(memoryContent);
-            config.setGeminiMdFileCount(fileCount);
-            context.ui.setGeminiMdFileCount(fileCount);
-          }
-          addItem(
-            {
-              type: MessageType.INFO,
-              text: `Successfully added GEMINI.md files from the following directories if there are:\n- ${added.join('\n- ')}`,
-            },
-            Date.now(),
-          );
-        } catch (error) {
-          errors.push(`Error refreshing memory: ${(error as Error).message}`);
-        }
-
         if (added.length > 0) {
           const gemini = config.getGeminiClient();
           if (gemini) {

packages/cli/src/ui/commands/ideCommand.test.ts

@@ -42,15 +42,9 @@ describe('ideCommand', () => {
     mockConfig = {
       getIdeModeFeature: vi.fn(),
       getIdeMode: vi.fn(),
-      getIdeClient: vi.fn(() => ({
-        reconnect: vi.fn(),
-        disconnect: vi.fn(),
-        getCurrentIde: vi.fn(),
-        getDetectedIdeDisplayName: vi.fn(),
-        getConnectionStatus: vi.fn(),
-      })),
-      setIdeModeAndSyncConnection: vi.fn(),
+      getIdeClient: vi.fn(),
       setIdeMode: vi.fn(),
+      setIdeClientDisconnected: vi.fn(),
     } as unknown as Config;
 
     platformSpy = vi.spyOn(process, 'platform', 'get');

packages/cli/src/ui/commands/ideCommand.ts

@@ -8,7 +8,6 @@ import {
   Config,
   DetectedIde,
   IDEConnectionStatus,
-  IdeClient,
   getIdeDisplayName,
   getIdeInstaller,
 } from '@qwen-code/qwen-code-core';
@@ -20,35 +19,6 @@ import {
 } from './types.js';
 import { SettingScope } from '../../config/settings.js';
 
-function getIdeStatusMessage(ideClient: IdeClient): {
-  messageType: 'info' | 'error';
-  content: string;
-} {
-  const connection = ideClient.getConnectionStatus();
-  switch (connection.status) {
-    case IDEConnectionStatus.Connected:
-      return {
-        messageType: 'info',
-        content: `🟢 Connected to ${ideClient.getDetectedIdeDisplayName()}`,
-      };
-    case IDEConnectionStatus.Connecting:
-      return {
-        messageType: 'info',
-        content: `🟡 Connecting...`,
-      };
-    default: {
-      let content = `🔴 Disconnected`;
-      if (connection?.details) {
-        content += `: ${connection.details}`;
-      }
-      return {
-        messageType: 'error',
-        content,
-      };
-    }
-  }
-}
-
 export const ideCommand = (config: Config | null): SlashCommand | null => {
   if (!config || !config.getIdeModeFeature()) {
     return null;
@@ -84,13 +54,33 @@ export const ideCommand = (config: Config | null): SlashCommand | null => {
     name: 'status',
     description: 'check status of IDE integration',
     kind: CommandKind.BUILT_IN,
-    action: (): SlashCommandActionReturn => {
-      const { messageType, content } = getIdeStatusMessage(ideClient);
-      return {
-        type: 'message',
-        messageType,
-        content,
-      } as const;
+    action: (_context: CommandContext): SlashCommandActionReturn => {
+      const connection = ideClient.getConnectionStatus();
+      switch (connection.status) {
+        case IDEConnectionStatus.Connected:
+          return {
+            type: 'message',
+            messageType: 'info',
+            content: `🟢 Connected to ${ideClient.getDetectedIdeDisplayName()}`,
+          } as const;
+        case IDEConnectionStatus.Connecting:
+          return {
+            type: 'message',
+            messageType: 'info',
+            content: `🟡 Connecting...`,
+          } as const;
+        default: {
+          let content = `🔴 Disconnected`;
+          if (connection?.details) {
+            content += `: ${connection.details}`;
+          }
+          return {
+            type: 'message',
+            messageType: 'error',
+            content,
+          } as const;
+        }
+      }
     },
   };
 
@@ -120,10 +110,6 @@ export const ideCommand = (config: Config | null): SlashCommand | null => {
       );
 
       const result = await installer.install();
-      if (result.success) {
-        config.setIdeMode(true);
-        context.services.settings.setValue(SettingScope.User, 'ideMode', true);
-      }
       context.ui.addItem(
         {
           type: result.success ? 'info' : 'error',
@@ -140,15 +126,8 @@ export const ideCommand = (config: Config | null): SlashCommand | null => {
     kind: CommandKind.BUILT_IN,
     action: async (context: CommandContext) => {
       context.services.settings.setValue(SettingScope.User, 'ideMode', true);
-      await config.setIdeModeAndSyncConnection(true);
-      const { messageType, content } = getIdeStatusMessage(ideClient);
-      context.ui.addItem(
-        {
-          type: messageType,
-          text: content,
-        },
-        Date.now(),
-      );
+      config.setIdeMode(true);
+      config.setIdeClientConnected();
     },
   };
 
@@ -158,15 +137,8 @@ export const ideCommand = (config: Config | null): SlashCommand | null => {
     kind: CommandKind.BUILT_IN,
     action: async (context: CommandContext) => {
       context.services.settings.setValue(SettingScope.User, 'ideMode', false);
-      await config.setIdeModeAndSyncConnection(false);
-      const { messageType, content } = getIdeStatusMessage(ideClient);
-      context.ui.addItem(
-        {
-          type: messageType,
-          text: content,
-        },
-        Date.now(),
-      );
+      config.setIdeMode(false);
+      config.setIdeClientDisconnected();
     },
   };
 

packages/cli/src/ui/commands/initCommand.test.ts

@@ -11,31 +11,16 @@ import { initCommand } from './initCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import { type CommandContext } from './types.js';
 
-// Mock the 'fs' module with both named and default exports to avoid breaking default import sites
-vi.mock('fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('fs')>();
-  const existsSync = vi.fn();
-  const writeFileSync = vi.fn();
-  const readFileSync = vi.fn();
-  return {
-    ...actual,
-    existsSync,
-    writeFileSync,
-    readFileSync,
-    default: {
-      ...(actual as unknown as Record<string, unknown>),
-      existsSync,
-      writeFileSync,
-      readFileSync,
-    },
-  } as unknown as typeof import('fs');
-});
+// Mock the 'fs' module
+vi.mock('fs', () => ({
+  existsSync: vi.fn(),
+  writeFileSync: vi.fn(),
+}));
 
 describe('initCommand', () => {
   let mockContext: CommandContext;
   const targetDir = '/test/dir';
-  const DEFAULT_CONTEXT_FILENAME = 'QWEN.md';
-  const geminiMdPath = path.join(targetDir, DEFAULT_CONTEXT_FILENAME);
+  const geminiMdPath = path.join(targetDir, 'GEMINI.md');
 
   beforeEach(() => {
     // Create a fresh mock context for each test
@@ -53,10 +38,9 @@ describe('initCommand', () => {
     vi.clearAllMocks();
   });
 
-  it(`should inform the user if ${DEFAULT_CONTEXT_FILENAME} already exists and is non-empty`, async () => {
+  it('should inform the user if GEMINI.md already exists', async () => {
     // Arrange: Simulate that the file exists
     vi.mocked(fs.existsSync).mockReturnValue(true);
-    vi.spyOn(fs, 'readFileSync').mockReturnValue('# Existing content');
 
     // Act: Run the command's action
     const result = await initCommand.action!(mockContext, '');
@@ -65,13 +49,14 @@ describe('initCommand', () => {
     expect(result).toEqual({
       type: 'message',
       messageType: 'info',
-      content: `A ${DEFAULT_CONTEXT_FILENAME} file already exists in this directory. No changes were made.`,
+      content:
+        'A GEMINI.md file already exists in this directory. No changes were made.',
     });
     // Assert: Ensure no file was written
     expect(fs.writeFileSync).not.toHaveBeenCalled();
   });
 
-  it(`should create ${DEFAULT_CONTEXT_FILENAME} and submit a prompt if it does not exist`, async () => {
+  it('should create GEMINI.md and submit a prompt if it does not exist', async () => {
     // Arrange: Simulate that the file does not exist
     vi.mocked(fs.existsSync).mockReturnValue(false);
 
@@ -85,7 +70,7 @@ describe('initCommand', () => {
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
         type: 'info',
-        text: `Empty ${DEFAULT_CONTEXT_FILENAME} created. Now analyzing the project to populate it.`,
+        text: 'Empty GEMINI.md created. Now analyzing the project to populate it.',
       },
       expect.any(Number),
     );
@@ -93,20 +78,10 @@ describe('initCommand', () => {
     // Assert: Check that the correct prompt is submitted
     expect(result.type).toBe('submit_prompt');
     expect(result.content).toContain(
-      'You are Qwen Code, an interactive CLI agent',
+      'You are an AI agent that brings the power of Gemini',
     );
   });
 
-  it(`should proceed to initialize when ${DEFAULT_CONTEXT_FILENAME} exists but is empty`, async () => {
-    vi.mocked(fs.existsSync).mockReturnValue(true);
-    vi.spyOn(fs, 'readFileSync').mockReturnValue('   \n  ');
-
-    const result = await initCommand.action!(mockContext, '');
-
-    expect(fs.writeFileSync).toHaveBeenCalledWith(geminiMdPath, '', 'utf8');
-    expect(result.type).toBe('submit_prompt');
-  });
-
   it('should return an error if config is not available', async () => {
     // Arrange: Create a context without config
     const noConfigContext = createMockCommandContext();

packages/cli/src/ui/commands/initCommand.ts

@@ -12,11 +12,10 @@ import {
   SlashCommandActionReturn,
   CommandKind,
 } from './types.js';
-import { getCurrentGeminiMdFilename } from '@qwen-code/qwen-code-core';
 
 export const initCommand: SlashCommand = {
   name: 'init',
-  description: 'Analyzes the project and creates a tailored QWEN.md file.',
+  description: 'Analyzes the project and creates a tailored GEMINI.md file.',
   kind: CommandKind.BUILT_IN,
   action: async (
     context: CommandContext,
@@ -30,55 +29,32 @@ export const initCommand: SlashCommand = {
       };
     }
     const targetDir = context.services.config.getTargetDir();
-    const contextFileName = getCurrentGeminiMdFilename();
-    const contextFilePath = path.join(targetDir, contextFileName);
+    const geminiMdPath = path.join(targetDir, 'GEMINI.md');
 
-    try {
-      if (fs.existsSync(contextFilePath)) {
-        // If file exists but is empty (or whitespace), continue to initialize; otherwise, bail out
-        try {
-          const existing = fs.readFileSync(contextFilePath, 'utf8');
-          if (existing && existing.trim().length > 0) {
-            return {
-              type: 'message',
-              messageType: 'info',
-              content: `A ${contextFileName} file already exists in this directory. No changes were made.`,
-            };
-          }
-        } catch {
-          // If we fail to read, conservatively proceed to (re)create the file
-        }
-      }
-
-      // Ensure an empty context file exists before prompting the model to populate it
-      try {
-        fs.writeFileSync(contextFilePath, '', 'utf8');
-        context.ui.addItem(
-          {
-            type: 'info',
-            text: `Empty ${contextFileName} created. Now analyzing the project to populate it.`,
-          },
-          Date.now(),
-        );
-      } catch (err) {
-        return {
-          type: 'message',
-          messageType: 'error',
-          content: `Failed to create ${contextFileName}: ${err instanceof Error ? err.message : String(err)}`,
-        };
-      }
-    } catch (error) {
+    if (fs.existsSync(geminiMdPath)) {
       return {
         type: 'message',
-        messageType: 'error',
-        content: `Unexpected error preparing ${contextFileName}: ${error instanceof Error ? error.message : String(error)}`,
+        messageType: 'info',
+        content:
+          'A GEMINI.md file already exists in this directory. No changes were made.',
       };
     }
 
+    // Create an empty GEMINI.md file
+    fs.writeFileSync(geminiMdPath, '', 'utf8');
+
+    context.ui.addItem(
+      {
+        type: 'info',
+        text: 'Empty GEMINI.md created. Now analyzing the project to populate it.',
+      },
+      Date.now(),
+    );
+
     return {
       type: 'submit_prompt',
       content: `
-You are Qwen Code, an interactive CLI agent. Analyze the current directory and generate a comprehensive ${contextFileName} file to be used as instructional context for future interactions.
+You are an AI agent that brings the power of Gemini directly into the terminal. Your task is to analyze the current directory and generate a comprehensive GEMINI.md file to be used as instructional context for future interactions.
 
 **Analysis Process:**
 
@@ -94,7 +70,7 @@ You are Qwen Code, an interactive CLI agent. Analyze the current directory and g
     *   **Code Project:** Look for clues like \`package.json\`, \`requirements.txt\`, \`pom.xml\`, \`go.mod\`, \`Cargo.toml\`, \`build.gradle\`, or a \`src\` directory. If you find them, this is likely a software project.
     *   **Non-Code Project:** If you don't find code-related files, this might be a directory for documentation, research papers, notes, or something else.
 
-**${contextFileName} Content Generation:**
+**GEMINI.md Content Generation:**
 
 **For a Code Project:**
 
@@ -110,7 +86,7 @@ You are Qwen Code, an interactive CLI agent. Analyze the current directory and g
 
 **Final Output:**
 
-Write the complete content to the \`${contextFileName}\` file. The output must be well-formatted Markdown.
+Write the complete content to the \`GEMINI.md\` file. The output must be well-formatted Markdown.
 `,
     };
   },

packages/cli/src/ui/commands/memoryCommand.test.ts

@@ -161,10 +161,6 @@ describe('memoryCommand', () => {
         getDebugMode: () => false,
         getFileService: () => ({}) as FileDiscoveryService,
         getExtensionContextFilePaths: () => [],
-        shouldLoadMemoryFromIncludeDirectories: () => false,
-        getWorkspaceContext: () => ({
-          getDirectories: () => [],
-        }),
         getFileFilteringOptions: () => ({
           ignore: [],
           include: [],

packages/cli/src/ui/commands/memoryCommand.ts

@@ -89,9 +89,6 @@ export const memoryCommand: SlashCommand = {
             const { memoryContent, fileCount } =
               await loadServerHierarchicalMemory(
                 config.getWorkingDir(),
-                config.shouldLoadMemoryFromIncludeDirectories()
-                  ? config.getWorkspaceContext().getDirectories()
-                  : [],
                 config.getDebugMode(),
                 config.getFileService(),
                 config.getExtensionContextFilePaths(),

packages/cli/src/ui/commands/setupGithubCommand.test.ts

@@ -49,7 +49,7 @@ describe('setupGithubCommand', () => {
       `curl -fsSL -o "${fakeRepoRoot}/.github/workflows/gemini-issue-automated-triage.yml"`,
       `curl -fsSL -o "${fakeRepoRoot}/.github/workflows/gemini-issue-scheduled-triage.yml"`,
       `curl -fsSL -o "${fakeRepoRoot}/.github/workflows/gemini-pr-review.yml"`,
-      'https://raw.githubusercontent.com/google-github-actions/run-gemini-cli/refs/tags/v0/examples/workflows/',
+      'https://raw.githubusercontent.com/google-github-actions/run-gemini-cli/refs/heads/v0/examples/workflows/',
     ];
 
     for (const substring of expectedSubstrings) {

packages/cli/src/ui/commands/setupGithubCommand.ts

@@ -28,7 +28,7 @@ export const setupGithubCommand: SlashCommand = {
     }
 
     const version = 'v0';
-    const workflowBaseUrl = `https://raw.githubusercontent.com/google-github-actions/run-gemini-cli/refs/tags/${version}/examples/workflows/`;
+    const workflowBaseUrl = `https://raw.githubusercontent.com/google-github-actions/run-gemini-cli/refs/heads/${version}/examples/workflows/`;
 
     const workflows = [
       'gemini-cli/gemini-cli.yml',

packages/cli/src/ui/commands/types.ts

@@ -59,7 +59,6 @@ export interface CommandContext {
     /** Toggles a special display mode. */
     toggleCorgiMode: () => void;
     toggleVimEnabled: () => Promise<boolean>;
-    setGeminiMdFileCount: (count: number) => void;
   };
   // Session-specific data
   session: {

packages/cli/src/ui/components/InputPrompt.test.tsx

@@ -5,7 +5,6 @@
  */
 
 import { render } from 'ink-testing-library';
-import { waitFor } from '@testing-library/react';
 import { InputPrompt, InputPromptProps } from './InputPrompt.js';
 import type { TextBuffer } from './shared/text-buffer.js';
 import { Config } from '@qwen-code/qwen-code-core';
@@ -1227,12 +1226,11 @@ describe('InputPrompt', () => {
       stdin.write('\x12');
       await wait();
       stdin.write('\x1B');
+      await wait();
 
-      await waitFor(() => {
-        expect(stdout.lastFrame()).not.toContain('(r:)');
-      });
-
-      expect(stdout.lastFrame()).not.toContain('echo hello');
+      const frame = stdout.lastFrame();
+      expect(frame).not.toContain('(r:)');
+      expect(frame).not.toContain('echo hello');
 
       unmount();
     });
@@ -1242,11 +1240,9 @@ describe('InputPrompt', () => {
       stdin.write('\x12');
       await wait();
       stdin.write('\t');
+      await wait();
 
-      await waitFor(() => {
-        expect(stdout.lastFrame()).not.toContain('(r:)');
-      });
-
+      expect(stdout.lastFrame()).not.toContain('(r:)');
       expect(props.buffer.setText).toHaveBeenCalledWith('echo hello');
       unmount();
     });
@@ -1257,11 +1253,9 @@ describe('InputPrompt', () => {
       await wait();
       expect(stdout.lastFrame()).toContain('(r:)');
       stdin.write('\r');
+      await wait();
 
-      await waitFor(() => {
-        expect(stdout.lastFrame()).not.toContain('(r:)');
-      });
-
+      expect(stdout.lastFrame()).not.toContain('(r:)');
       expect(props.onSubmit).toHaveBeenCalledWith('echo hello');
       unmount();
     });
@@ -1274,10 +1268,9 @@ describe('InputPrompt', () => {
       await wait();
       expect(stdout.lastFrame()).toContain('(r:)');
       stdin.write('\x1B');
+      await wait();
 
-      await waitFor(() => {
-        expect(stdout.lastFrame()).not.toContain('(r:)');
-      });
+      expect(stdout.lastFrame()).not.toContain('(r:)');
       expect(props.buffer.text).toBe('initial text');
       expect(props.buffer.cursor).toEqual([0, 3]);
 

packages/cli/src/ui/components/QwenOAuthProgress.test.tsx

@@ -22,12 +22,6 @@ vi.mock('ink-spinner', () => ({
   default: ({ type }: { type: string }) => `MockSpinner(${type})`,
 }));
 
-// Mock ink-link
-vi.mock('ink-link', () => ({
-  default: ({ children }: { children: React.ReactNode; url: string }) =>
-    children,
-}));
-
 describe('QwenOAuthProgress', () => {
   const mockOnTimeout = vi.fn();
   const mockOnCancel = vi.fn();
@@ -45,17 +39,7 @@ describe('QwenOAuthProgress', () => {
   const mockDeviceAuth = createMockDeviceAuth();
 
   const renderComponent = (
-    props: Partial<{
-      deviceAuth: DeviceAuthorizationInfo;
-      authStatus:
-        | 'idle'
-        | 'polling'
-        | 'success'
-        | 'error'
-        | 'timeout'
-        | 'rate_limit';
-      authMessage: string | null;
-    }> = {},
+    props: Partial<{ deviceAuth: DeviceAuthorizationInfo }> = {},
   ) =>
     render(
       <QwenOAuthProgress
@@ -101,43 +85,20 @@ describe('QwenOAuthProgress', () => {
       const { lastFrame } = renderComponent({ deviceAuth: mockDeviceAuth });
 
       const output = lastFrame();
-      // Initially no QR code shown until it's generated, but the status area should be visible
+      expect(output).toContain('Qwen OAuth Authentication');
+      expect(output).toContain('Please visit this URL to authorize:');
+      expect(output).toContain(mockDeviceAuth.verification_uri_complete);
       expect(output).toContain('MockSpinner(dots)');
       expect(output).toContain('Waiting for authorization');
       expect(output).toContain('Time remaining: 5:00');
       expect(output).toContain('(Press ESC to cancel)');
     });
 
-    it('should display correct URL in Static component when QR code is generated', async () => {
-      const qrcode = await import('qrcode-terminal');
-      const mockGenerate = vi.mocked(qrcode.default.generate);
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      let qrCallback: any = null;
-      mockGenerate.mockImplementation((url, options, callback) => {
-        qrCallback = callback;
-      });
-
+    it('should display correct URL in bordered box', () => {
       const customAuth = createMockDeviceAuth({
         verification_uri_complete: 'https://custom.com/auth?code=XYZ789',
       });
-
-      const { lastFrame, rerender } = renderComponent({
-        deviceAuth: customAuth,
-      });
-
-      // Manually trigger the QR code callback
-      if (qrCallback && typeof qrCallback === 'function') {
-        qrCallback('Mock QR Code Data');
-      }
-
-      rerender(
-        <QwenOAuthProgress
-          onTimeout={mockOnTimeout}
-          onCancel={mockOnCancel}
-          deviceAuth={customAuth}
-        />,
-      );
+      const { lastFrame } = renderComponent({ deviceAuth: customAuth });
 
       expect(lastFrame()).toContain('https://custom.com/auth?code=XYZ789');
     });
@@ -243,16 +204,14 @@ describe('QwenOAuthProgress', () => {
       expect(lastFrame()).toContain('Time remaining: 4:59');
     });
 
-    it('should use default 300 second timeout when deviceAuth is null', () => {
-      const { lastFrame } = render(
+    it('should not start timer when deviceAuth is null', () => {
+      render(
         <QwenOAuthProgress onTimeout={mockOnTimeout} onCancel={mockOnCancel} />,
       );
 
-      // Should show default 5:00 (300 seconds) timeout
-      expect(lastFrame()).toContain('Time remaining: 5:00');
-
-      // The timer functionality is already tested in other tests,
-      // this test mainly verifies the default timeout value is used
+      // Advance timer and ensure onTimeout is not called
+      vi.advanceTimersByTime(5000);
+      expect(mockOnTimeout).not.toHaveBeenCalled();
     });
   });
 
@@ -339,41 +298,8 @@ describe('QwenOAuthProgress', () => {
       );
     });
 
-    it('should display QR code in Static component when available', async () => {
-      const qrcode = await import('qrcode-terminal');
-      const mockGenerate = vi.mocked(qrcode.default.generate);
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      let qrCallback: any = null;
-      mockGenerate.mockImplementation((url, options, callback) => {
-        qrCallback = callback;
-      });
-
-      const { lastFrame, rerender } = render(
-        <QwenOAuthProgress
-          onTimeout={mockOnTimeout}
-          onCancel={mockOnCancel}
-          deviceAuth={mockDeviceAuth}
-        />,
-      );
-
-      // Manually trigger the QR code callback
-      if (qrCallback && typeof qrCallback === 'function') {
-        qrCallback('Mock QR Code Data');
-      }
-
-      rerender(
-        <QwenOAuthProgress
-          onTimeout={mockOnTimeout}
-          onCancel={mockOnCancel}
-          deviceAuth={mockDeviceAuth}
-        />,
-      );
-
-      const output = lastFrame();
-      expect(output).toContain('Or scan the QR code below:');
-      expect(output).toContain('Mock QR Code Data');
-    });
+    // Note: QR code display test skipped due to timing complexities with async state updates
+    // The QR code generation is already tested in 'should generate QR code when deviceAuth is provided'
 
     it('should handle QR code generation errors gracefully', async () => {
       const qrcode = await import('qrcode-terminal');
@@ -394,7 +320,7 @@ describe('QwenOAuthProgress', () => {
         />,
       );
 
-      // Should not crash and should not show QR code section since QR generation failed
+      // Should not crash and should not show QR code section
       const output = lastFrame();
       expect(output).not.toContain('Or scan the QR code below:');
       expect(consoleErrorSpy).toHaveBeenCalledWith(
@@ -489,58 +415,14 @@ describe('QwenOAuthProgress', () => {
         />,
       );
 
-      // Initially shows waiting for authorization
-      expect(lastFrame()).toContain('Waiting for authorization');
+      expect(lastFrame()).toContain('Qwen OAuth Authentication');
 
       rerender(
         <QwenOAuthProgress onTimeout={mockOnTimeout} onCancel={mockOnCancel} />,
       );
 
       expect(lastFrame()).toContain('Waiting for Qwen OAuth authentication...');
-      expect(lastFrame()).not.toContain('Waiting for authorization');
-    });
-  });
-
-  describe('Timeout state', () => {
-    it('should render timeout state when authStatus is timeout', () => {
-      const { lastFrame } = renderComponent({
-        authStatus: 'timeout',
-        authMessage: 'Custom timeout message',
-      });
-
-      const output = lastFrame();
-      expect(output).toContain('Qwen OAuth Authentication Timeout');
-      expect(output).toContain('Custom timeout message');
-      expect(output).toContain(
-        'Press any key to return to authentication type selection.',
-      );
-    });
-
-    it('should render default timeout message when no authMessage provided', () => {
-      const { lastFrame } = renderComponent({
-        authStatus: 'timeout',
-      });
-
-      const output = lastFrame();
-      expect(output).toContain('Qwen OAuth Authentication Timeout');
-      expect(output).toContain(
-        'OAuth token expired (over 300 seconds). Please select authentication method again.',
-      );
-    });
-
-    it('should call onCancel for any key press in timeout state', () => {
-      const { stdin } = renderComponent({
-        authStatus: 'timeout',
-      });
-
-      // Simulate any key press
-      stdin.write('a');
-      expect(mockOnCancel).toHaveBeenCalledTimes(1);
-
-      // Reset mock and try enter key
-      mockOnCancel.mockClear();
-      stdin.write('\r');
-      expect(mockOnCancel).toHaveBeenCalledTimes(1);
+      expect(lastFrame()).not.toContain('Qwen OAuth Authentication');
     });
   });
 });

packages/cli/src/ui/components/QwenOAuthProgress.tsx

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useState, useEffect, useMemo } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Box, Text, useInput } from 'ink';
 import Spinner from 'ink-spinner';
 import Link from 'ink-link';
@@ -26,95 +26,6 @@ interface QwenOAuthProgressProps {
   authMessage?: string | null;
 }
 
-/**
- * Static QR Code Display Component
- * Renders the QR code and URL once and doesn't re-render unless the URL changes
- */
-function QrCodeDisplay({
-  verificationUrl,
-  qrCodeData,
-}: {
-  verificationUrl: string;
-  qrCodeData: string | null;
-}): React.JSX.Element | null {
-  if (!qrCodeData) {
-    return null;
-  }
-
-  return (
-    <Box
-      borderStyle="round"
-      borderColor={Colors.AccentBlue}
-      flexDirection="column"
-      padding={1}
-      width="100%"
-    >
-      <Text bold color={Colors.AccentBlue}>
-        Qwen OAuth Authentication
-      </Text>
-
-      <Box marginTop={1}>
-        <Text>Please visit this URL to authorize:</Text>
-      </Box>
-
-      <Link url={verificationUrl} fallback={false}>
-        <Text color={Colors.AccentGreen} bold>
-          {verificationUrl}
-        </Text>
-      </Link>
-
-      <Box marginTop={1}>
-        <Text>Or scan the QR code below:</Text>
-      </Box>
-
-      <Box marginTop={1}>
-        <Text>{qrCodeData}</Text>
-      </Box>
-    </Box>
-  );
-}
-
-/**
- * Dynamic Status Display Component
- * Shows the loading spinner, timer, and status messages
- */
-function StatusDisplay({
-  timeRemaining,
-  dots,
-}: {
-  timeRemaining: number;
-  dots: string;
-}): React.JSX.Element {
-  const formatTime = (seconds: number): string => {
-    const minutes = Math.floor(seconds / 60);
-    const remainingSeconds = seconds % 60;
-    return `${minutes}:${remainingSeconds.toString().padStart(2, '0')}`;
-  };
-
-  return (
-    <Box
-      borderStyle="round"
-      borderColor={Colors.AccentBlue}
-      flexDirection="column"
-      padding={1}
-      width="100%"
-    >
-      <Box marginTop={1}>
-        <Text>
-          <Spinner type="dots" /> Waiting for authorization{dots}
-        </Text>
-      </Box>
-
-      <Box marginTop={1} justifyContent="space-between">
-        <Text color={Colors.Gray}>
-          Time remaining: {formatTime(timeRemaining)}
-        </Text>
-        <Text color={Colors.AccentPurple}>(Press ESC to cancel)</Text>
-      </Box>
-    </Box>
-  );
-}
-
 export function QwenOAuthProgress({
   onTimeout,
   onCancel,
@@ -136,12 +47,14 @@ export function QwenOAuthProgress({
     }
   });
 
-  // Generate QR code once when device auth is available
+  // Generate QR code when device auth is available
   useEffect(() => {
-    if (!deviceAuth?.verification_uri_complete) {
+    if (!deviceAuth) {
+      setQrCodeData(null);
       return;
     }
 
+    // Generate QR code string
     const generateQR = () => {
       try {
         qrcode.generate(
@@ -158,7 +71,7 @@ export function QwenOAuthProgress({
     };
 
     generateQR();
-  }, [deviceAuth?.verification_uri_complete]);
+  }, [deviceAuth]);
 
   // Countdown timer
   useEffect(() => {
@@ -187,17 +100,11 @@ export function QwenOAuthProgress({
     return () => clearInterval(dotsTimer);
   }, []);
 
-  // Memoize the QR code display to prevent unnecessary re-renders
-  const qrCodeDisplay = useMemo(() => {
-    if (!deviceAuth?.verification_uri_complete) return null;
-
-    return (
-      <QrCodeDisplay
-        verificationUrl={deviceAuth.verification_uri_complete}
-        qrCodeData={qrCodeData}
-      />
-    );
-  }, [deviceAuth?.verification_uri_complete, qrCodeData]);
+  const formatTime = (seconds: number): string => {
+    const minutes = Math.floor(seconds / 60);
+    const remainingSeconds = seconds % 60;
+    return `${minutes}:${remainingSeconds.toString().padStart(2, '0')}`;
+  };
 
   // Handle timeout state
   if (authStatus === 'timeout') {
@@ -229,7 +136,6 @@ export function QwenOAuthProgress({
     );
   }
 
-  // Show loading state when no device auth is available yet
   if (!deviceAuth) {
     return (
       <Box
@@ -246,8 +152,7 @@ export function QwenOAuthProgress({
         </Box>
         <Box marginTop={1} justifyContent="space-between">
           <Text color={Colors.Gray}>
-            Time remaining: {Math.floor(timeRemaining / 60)}:
-            {(timeRemaining % 60).toString().padStart(2, '0')}
+            Time remaining: {formatTime(timeRemaining)}
           </Text>
           <Text color={Colors.AccentPurple}>(Press ESC to cancel)</Text>
         </Box>
@@ -256,12 +161,48 @@ export function QwenOAuthProgress({
   }
 
   return (
-    <Box flexDirection="column" width="100%">
-      {/* Static QR Code Display */}
-      {qrCodeDisplay}
+    <Box
+      borderStyle="round"
+      borderColor={Colors.AccentBlue}
+      flexDirection="column"
+      padding={1}
+      width="100%"
+    >
+      <Text bold color={Colors.AccentBlue}>
+        Qwen OAuth Authentication
+      </Text>
 
-      {/* Dynamic Status Display */}
-      <StatusDisplay timeRemaining={timeRemaining} dots={dots} />
+      <Box marginTop={1}>
+        <Text>Please visit this URL to authorize:</Text>
+      </Box>
+      <Link url={deviceAuth.verification_uri_complete} fallback={false}>
+        <Text color={Colors.AccentGreen} bold>
+          {deviceAuth.verification_uri_complete}
+        </Text>
+      </Link>
+      {qrCodeData && (
+        <>
+          <Box marginTop={1}>
+            <Text>Or scan the QR code below:</Text>
+          </Box>
+          <Box marginTop={1}>
+            <Text>{qrCodeData}</Text>
+          </Box>
+        </>
+      )}
+
+      <Box marginTop={1}>
+        <Text>
+          <Spinner type="dots" /> Waiting for authorization{dots}
+        </Text>
+      </Box>
+
+      <Box marginTop={1} justifyContent="space-between">
+        <Text color={Colors.Gray}>
+          Time remaining: {formatTime(timeRemaining)}
+        </Text>
+        <Text color={Colors.AccentPurple}>(Press ESC to cancel)</Text>
+      </Box>
     </Box>
   );
 }

packages/cli/src/ui/hooks/slashCommandProcessor.ts

@@ -51,7 +51,6 @@ export const useSlashCommandProcessor = (
   openPrivacyNotice: () => void,
   toggleVimEnabled: () => Promise<boolean>,
   setIsProcessing: (isProcessing: boolean) => void,
-  setGeminiMdFileCount: (count: number) => void,
 ) => {
   const session = useSessionStats();
   const [commands, setCommands] = useState<readonly SlashCommand[]>([]);
@@ -164,7 +163,6 @@ export const useSlashCommandProcessor = (
         setPendingItem: setPendingCompressionItem,
         toggleCorgiMode,
         toggleVimEnabled,
-        setGeminiMdFileCount,
       },
       session: {
         stats: session.stats,
@@ -189,7 +187,6 @@ export const useSlashCommandProcessor = (
       toggleCorgiMode,
       toggleVimEnabled,
       sessionShellAllowlist,
-      setGeminiMdFileCount,
     ],
   );
 

packages/cli/src/ui/hooks/useAtCompletion.test.ts

@@ -1,380 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/** @vitest-environment jsdom */
-
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { renderHook, waitFor, act } from '@testing-library/react';
-import { useAtCompletion } from './useAtCompletion.js';
-import { Config, FileSearch } from '@qwen-code/qwen-code-core';
-import {
-  createTmpDir,
-  cleanupTmpDir,
-  FileSystemStructure,
-} from '@qwen-code/qwen-code-test-utils';
-import { useState } from 'react';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
-
-// Test harness to capture the state from the hook's callbacks.
-function useTestHarnessForAtCompletion(
-  enabled: boolean,
-  pattern: string,
-  config: Config | undefined,
-  cwd: string,
-) {
-  const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
-  const [isLoadingSuggestions, setIsLoadingSuggestions] = useState(false);
-
-  useAtCompletion({
-    enabled,
-    pattern,
-    config,
-    cwd,
-    setSuggestions,
-    setIsLoadingSuggestions,
-  });
-
-  return { suggestions, isLoadingSuggestions };
-}
-
-describe('useAtCompletion', () => {
-  let testRootDir: string;
-  let mockConfig: Config;
-
-  beforeEach(() => {
-    mockConfig = {
-      getFileFilteringOptions: vi.fn(() => ({
-        respectGitIgnore: true,
-        respectGeminiIgnore: true,
-      })),
-    } as unknown as Config;
-    vi.clearAllMocks();
-  });
-
-  afterEach(async () => {
-    if (testRootDir) {
-      await cleanupTmpDir(testRootDir);
-    }
-    vi.restoreAllMocks();
-  });
-
-  describe('File Search Logic', () => {
-    it('should perform a recursive search for an empty pattern', async () => {
-      const structure: FileSystemStructure = {
-        'file.txt': '',
-        src: {
-          'index.js': '',
-          components: ['Button.tsx', 'Button with spaces.tsx'],
-        },
-      };
-      testRootDir = await createTmpDir(structure);
-
-      const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', mockConfig, testRootDir),
-      );
-
-      await waitFor(() => {
-        expect(result.current.suggestions.length).toBeGreaterThan(0);
-      });
-
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'src/',
-        'src/components/',
-        'file.txt',
-        'src/components/Button\\ with\\ spaces.tsx',
-        'src/components/Button.tsx',
-        'src/index.js',
-      ]);
-    });
-
-    it('should correctly filter the recursive list based on a pattern', async () => {
-      const structure: FileSystemStructure = {
-        'file.txt': '',
-        src: {
-          'index.js': '',
-          components: {
-            'Button.tsx': '',
-          },
-        },
-      };
-      testRootDir = await createTmpDir(structure);
-
-      const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, 'src/', mockConfig, testRootDir),
-      );
-
-      await waitFor(() => {
-        expect(result.current.suggestions.length).toBeGreaterThan(0);
-      });
-
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'src/',
-        'src/components/',
-        'src/components/Button.tsx',
-        'src/index.js',
-      ]);
-    });
-
-    it('should append a trailing slash to directory paths in suggestions', async () => {
-      const structure: FileSystemStructure = {
-        'file.txt': '',
-        dir: {},
-      };
-      testRootDir = await createTmpDir(structure);
-
-      const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', mockConfig, testRootDir),
-      );
-
-      await waitFor(() => {
-        expect(result.current.suggestions.length).toBeGreaterThan(0);
-      });
-
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'dir/',
-        'file.txt',
-      ]);
-    });
-  });
-
-  describe('UI State and Loading Behavior', () => {
-    it('should be in a loading state during initial file system crawl', async () => {
-      testRootDir = await createTmpDir({});
-      const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', mockConfig, testRootDir),
-      );
-
-      // It's initially true because the effect runs synchronously.
-      expect(result.current.isLoadingSuggestions).toBe(true);
-
-      // Wait for the loading to complete.
-      await waitFor(() => {
-        expect(result.current.isLoadingSuggestions).toBe(false);
-      });
-    });
-
-    it('should NOT show a loading indicator for subsequent searches that complete under 100ms', async () => {
-      const structure: FileSystemStructure = { 'a.txt': '', 'b.txt': '' };
-      testRootDir = await createTmpDir(structure);
-
-      const { result, rerender } = renderHook(
-        ({ pattern }) =>
-          useTestHarnessForAtCompletion(true, pattern, mockConfig, testRootDir),
-        { initialProps: { pattern: 'a' } },
-      );
-
-      await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'a.txt',
-        ]);
-      });
-      expect(result.current.isLoadingSuggestions).toBe(false);
-
-      rerender({ pattern: 'b' });
-
-      // Wait for the final result
-      await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'b.txt',
-        ]);
-      });
-
-      expect(result.current.isLoadingSuggestions).toBe(false);
-    });
-
-    it('should show a loading indicator and clear old suggestions for subsequent searches that take longer than 100ms', async () => {
-      const structure: FileSystemStructure = { 'a.txt': '', 'b.txt': '' };
-      testRootDir = await createTmpDir(structure);
-
-      // Spy on the search method to introduce an artificial delay
-      const originalSearch = FileSearch.prototype.search;
-      vi.spyOn(FileSearch.prototype, 'search').mockImplementation(
-        async function (...args) {
-          await new Promise((resolve) => setTimeout(resolve, 200));
-          return originalSearch.apply(this, args);
-        },
-      );
-
-      const { result, rerender } = renderHook(
-        ({ pattern }) =>
-          useTestHarnessForAtCompletion(true, pattern, mockConfig, testRootDir),
-        { initialProps: { pattern: 'a' } },
-      );
-
-      // Wait for the initial (slow) search to complete
-      await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'a.txt',
-        ]);
-      });
-
-      // Now, rerender to trigger the second search
-      rerender({ pattern: 'b' });
-
-      // Wait for the loading indicator to appear
-      await waitFor(() => {
-        expect(result.current.isLoadingSuggestions).toBe(true);
-      });
-
-      // Suggestions should be cleared while loading
-      expect(result.current.suggestions).toEqual([]);
-
-      // Wait for the final (slow) search to complete
-      await waitFor(
-        () => {
-          expect(result.current.suggestions.map((s) => s.value)).toEqual([
-            'b.txt',
-          ]);
-        },
-        { timeout: 1000 },
-      ); // Increase timeout for the slow search
-
-      expect(result.current.isLoadingSuggestions).toBe(false);
-    });
-
-    it('should abort the previous search when a new one starts', async () => {
-      const structure: FileSystemStructure = { 'a.txt': '', 'b.txt': '' };
-      testRootDir = await createTmpDir(structure);
-
-      const abortSpy = vi.spyOn(AbortController.prototype, 'abort');
-      const searchSpy = vi
-        .spyOn(FileSearch.prototype, 'search')
-        .mockImplementation(async (...args) => {
-          const delay = args[0] === 'a' ? 500 : 50;
-          await new Promise((resolve) => setTimeout(resolve, delay));
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          return [args[0] as any];
-        });
-
-      const { result, rerender } = renderHook(
-        ({ pattern }) =>
-          useTestHarnessForAtCompletion(true, pattern, mockConfig, testRootDir),
-        { initialProps: { pattern: 'a' } },
-      );
-
-      // Wait for the hook to be ready (initialization is complete)
-      await waitFor(() => {
-        expect(searchSpy).toHaveBeenCalledWith('a', expect.any(Object));
-      });
-
-      // Now that the first search is in-flight, trigger the second one.
-      act(() => {
-        rerender({ pattern: 'b' });
-      });
-
-      // The abort should have been called for the first search.
-      expect(abortSpy).toHaveBeenCalledTimes(1);
-
-      // Wait for the final result, which should be from the second, faster search.
-      await waitFor(
-        () => {
-          expect(result.current.suggestions.map((s) => s.value)).toEqual(['b']);
-        },
-        { timeout: 1000 },
-      );
-
-      // The search spy should have been called for both patterns.
-      expect(searchSpy).toHaveBeenCalledWith('b', expect.any(Object));
-
-      vi.restoreAllMocks();
-    });
-  });
-
-  describe('Filtering and Configuration', () => {
-    it('should respect .gitignore files', async () => {
-      const gitignoreContent = ['dist/', '*.log'].join('\n');
-      const structure: FileSystemStructure = {
-        '.git': {},
-        '.gitignore': gitignoreContent,
-        dist: {},
-        'test.log': '',
-        src: {},
-      };
-      testRootDir = await createTmpDir(structure);
-
-      const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', mockConfig, testRootDir),
-      );
-
-      await waitFor(() => {
-        expect(result.current.suggestions.length).toBeGreaterThan(0);
-      });
-
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'src/',
-        '.gitignore',
-      ]);
-    });
-
-    it('should work correctly when config is undefined', async () => {
-      const structure: FileSystemStructure = {
-        node_modules: {},
-        src: {},
-      };
-      testRootDir = await createTmpDir(structure);
-
-      const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', undefined, testRootDir),
-      );
-
-      await waitFor(() => {
-        expect(result.current.suggestions.length).toBeGreaterThan(0);
-      });
-
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'node_modules/',
-        'src/',
-      ]);
-    });
-
-    it('should reset and re-initialize when the cwd changes', async () => {
-      const structure1: FileSystemStructure = { 'file1.txt': '' };
-      const rootDir1 = await createTmpDir(structure1);
-      const structure2: FileSystemStructure = { 'file2.txt': '' };
-      const rootDir2 = await createTmpDir(structure2);
-
-      const { result, rerender } = renderHook(
-        ({ cwd, pattern }) =>
-          useTestHarnessForAtCompletion(true, pattern, mockConfig, cwd),
-        {
-          initialProps: {
-            cwd: rootDir1,
-            pattern: 'file',
-          },
-        },
-      );
-
-      // Wait for initial suggestions from the first directory
-      await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'file1.txt',
-        ]);
-      });
-
-      // Change the CWD
-      act(() => {
-        rerender({ cwd: rootDir2, pattern: 'file' });
-      });
-
-      // After CWD changes, suggestions should be cleared and it should load again.
-      await waitFor(() => {
-        expect(result.current.isLoadingSuggestions).toBe(true);
-        expect(result.current.suggestions).toEqual([]);
-      });
-
-      // Wait for the new suggestions from the second directory
-      await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'file2.txt',
-        ]);
-      });
-      expect(result.current.isLoadingSuggestions).toBe(false);
-
-      await cleanupTmpDir(rootDir1);
-      await cleanupTmpDir(rootDir2);
-    });
-  });
-});

packages/cli/src/ui/hooks/useAtCompletion.ts

@@ -1,235 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { useEffect, useReducer, useRef } from 'react';
-import { Config, FileSearch, escapePath } from '@qwen-code/qwen-code-core';
-import {
-  Suggestion,
-  MAX_SUGGESTIONS_TO_SHOW,
-} from '../components/SuggestionsDisplay.js';
-
-export enum AtCompletionStatus {
-  IDLE = 'idle',
-  INITIALIZING = 'initializing',
-  READY = 'ready',
-  SEARCHING = 'searching',
-  ERROR = 'error',
-}
-
-interface AtCompletionState {
-  status: AtCompletionStatus;
-  suggestions: Suggestion[];
-  isLoading: boolean;
-  pattern: string | null;
-}
-
-type AtCompletionAction =
-  | { type: 'INITIALIZE' }
-  | { type: 'INITIALIZE_SUCCESS' }
-  | { type: 'SEARCH'; payload: string }
-  | { type: 'SEARCH_SUCCESS'; payload: Suggestion[] }
-  | { type: 'SET_LOADING'; payload: boolean }
-  | { type: 'ERROR' }
-  | { type: 'RESET' };
-
-const initialState: AtCompletionState = {
-  status: AtCompletionStatus.IDLE,
-  suggestions: [],
-  isLoading: false,
-  pattern: null,
-};
-
-function atCompletionReducer(
-  state: AtCompletionState,
-  action: AtCompletionAction,
-): AtCompletionState {
-  switch (action.type) {
-    case 'INITIALIZE':
-      return {
-        ...state,
-        status: AtCompletionStatus.INITIALIZING,
-        isLoading: true,
-      };
-    case 'INITIALIZE_SUCCESS':
-      return { ...state, status: AtCompletionStatus.READY, isLoading: false };
-    case 'SEARCH':
-      // Keep old suggestions, don't set loading immediately
-      return {
-        ...state,
-        status: AtCompletionStatus.SEARCHING,
-        pattern: action.payload,
-      };
-    case 'SEARCH_SUCCESS':
-      return {
-        ...state,
-        status: AtCompletionStatus.READY,
-        suggestions: action.payload,
-        isLoading: false,
-      };
-    case 'SET_LOADING':
-      // Only show loading if we are still in a searching state
-      if (state.status === AtCompletionStatus.SEARCHING) {
-        return { ...state, isLoading: action.payload, suggestions: [] };
-      }
-      return state;
-    case 'ERROR':
-      return {
-        ...state,
-        status: AtCompletionStatus.ERROR,
-        isLoading: false,
-        suggestions: [],
-      };
-    case 'RESET':
-      return initialState;
-    default:
-      return state;
-  }
-}
-
-export interface UseAtCompletionProps {
-  enabled: boolean;
-  pattern: string;
-  config: Config | undefined;
-  cwd: string;
-  setSuggestions: (suggestions: Suggestion[]) => void;
-  setIsLoadingSuggestions: (isLoading: boolean) => void;
-}
-
-export function useAtCompletion(props: UseAtCompletionProps): void {
-  const {
-    enabled,
-    pattern,
-    config,
-    cwd,
-    setSuggestions,
-    setIsLoadingSuggestions,
-  } = props;
-  const [state, dispatch] = useReducer(atCompletionReducer, initialState);
-  const fileSearch = useRef<FileSearch | null>(null);
-  const searchAbortController = useRef<AbortController | null>(null);
-  const slowSearchTimer = useRef<NodeJS.Timeout | null>(null);
-
-  useEffect(() => {
-    setSuggestions(state.suggestions);
-  }, [state.suggestions, setSuggestions]);
-
-  useEffect(() => {
-    setIsLoadingSuggestions(state.isLoading);
-  }, [state.isLoading, setIsLoadingSuggestions]);
-
-  useEffect(() => {
-    dispatch({ type: 'RESET' });
-  }, [cwd, config]);
-
-  // Reacts to user input (`pattern`) ONLY.
-  useEffect(() => {
-    if (!enabled) {
-      // reset when first getting out of completion suggestions
-      if (
-        state.status === AtCompletionStatus.READY ||
-        state.status === AtCompletionStatus.ERROR
-      ) {
-        dispatch({ type: 'RESET' });
-      }
-      return;
-    }
-    if (pattern === null) {
-      dispatch({ type: 'RESET' });
-      return;
-    }
-
-    if (state.status === AtCompletionStatus.IDLE) {
-      dispatch({ type: 'INITIALIZE' });
-    } else if (
-      (state.status === AtCompletionStatus.READY ||
-        state.status === AtCompletionStatus.SEARCHING) &&
-      pattern !== state.pattern // Only search if the pattern has changed
-    ) {
-      dispatch({ type: 'SEARCH', payload: pattern });
-    }
-  }, [enabled, pattern, state.status, state.pattern]);
-
-  // The "Worker" that performs async operations based on status.
-  useEffect(() => {
-    const initialize = async () => {
-      try {
-        const searcher = new FileSearch({
-          projectRoot: cwd,
-          ignoreDirs: [],
-          useGitignore:
-            config?.getFileFilteringOptions()?.respectGitIgnore ?? true,
-          useGeminiignore:
-            config?.getFileFilteringOptions()?.respectGeminiIgnore ?? true,
-          cache: true,
-          cacheTtl: 30, // 30 seconds
-        });
-        await searcher.initialize();
-        fileSearch.current = searcher;
-        dispatch({ type: 'INITIALIZE_SUCCESS' });
-        if (state.pattern !== null) {
-          dispatch({ type: 'SEARCH', payload: state.pattern });
-        }
-      } catch (_) {
-        dispatch({ type: 'ERROR' });
-      }
-    };
-
-    const search = async () => {
-      if (!fileSearch.current || state.pattern === null) {
-        return;
-      }
-
-      if (slowSearchTimer.current) {
-        clearTimeout(slowSearchTimer.current);
-      }
-
-      const controller = new AbortController();
-      searchAbortController.current = controller;
-
-      slowSearchTimer.current = setTimeout(() => {
-        dispatch({ type: 'SET_LOADING', payload: true });
-      }, 100);
-
-      try {
-        const results = await fileSearch.current.search(state.pattern, {
-          signal: controller.signal,
-          maxResults: MAX_SUGGESTIONS_TO_SHOW * 3,
-        });
-
-        if (slowSearchTimer.current) {
-          clearTimeout(slowSearchTimer.current);
-        }
-
-        if (controller.signal.aborted) {
-          return;
-        }
-
-        const suggestions = results.map((p) => ({
-          label: p,
-          value: escapePath(p),
-        }));
-        dispatch({ type: 'SEARCH_SUCCESS', payload: suggestions });
-      } catch (error) {
-        if (!(error instanceof Error && error.name === 'AbortError')) {
-          dispatch({ type: 'ERROR' });
-        }
-      }
-    };
-
-    if (state.status === AtCompletionStatus.INITIALIZING) {
-      initialize();
-    } else if (state.status === AtCompletionStatus.SEARCHING) {
-      search();
-    }
-
-    return () => {
-      searchAbortController.current?.abort();
-      if (slowSearchTimer.current) {
-        clearTimeout(slowSearchTimer.current);
-      }
-    };
-  }, [state.status, state.pattern, config, cwd]);
-}

packages/cli/src/ui/hooks/useCommandCompletion.tsx

@@ -4,7 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useMemo, useEffect } from 'react';
+import { useEffect, useCallback, useMemo, useRef } from 'react';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import { glob } from 'glob';
+import {
+  isNodeError,
+  escapePath,
+  unescapePath,
+  getErrorMessage,
+  Config,
+  FileDiscoveryService,
+  DEFAULT_FILE_FILTERING_OPTIONS,
+  SHELL_SPECIAL_CHARS,
+} from '@qwen-code/qwen-code-core';
 import { Suggestion } from '../components/SuggestionsDisplay.js';
 import { CommandContext, SlashCommand } from '../commands/types.js';
 import {
@@ -13,17 +26,8 @@ import {
 } from '../components/shared/text-buffer.js';
 import { isSlashCommand } from '../utils/commandUtils.js';
 import { toCodePoints } from '../utils/textUtils.js';
-import { useAtCompletion } from './useAtCompletion.js';
-import { useSlashCompletion } from './useSlashCompletion.js';
-import { Config } from '@qwen-code/qwen-code-core';
 import { useCompletion } from './useCompletion.js';
 
-export enum CompletionMode {
-  IDLE = 'IDLE',
-  AT = 'AT',
-  SLASH = 'SLASH',
-}
-
 export interface UseCommandCompletionReturn {
   suggestions: Suggestion[];
   activeSuggestionIndex: number;
@@ -68,109 +72,541 @@ export function useCommandCompletion(
     navigateDown,
   } = useCompletion();
 
+  const completionStart = useRef(-1);
+  const completionEnd = useRef(-1);
+
   const cursorRow = buffer.cursor[0];
   const cursorCol = buffer.cursor[1];
 
-  const { completionMode, query, completionStart, completionEnd } =
-    useMemo(() => {
-      const currentLine = buffer.lines[cursorRow] || '';
-      if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
-        return {
-          completionMode: CompletionMode.SLASH,
-          query: currentLine,
-          completionStart: 0,
-          completionEnd: currentLine.length,
-        };
+  // Check if cursor is after @ or / without unescaped spaces
+  const commandIndex = useMemo(() => {
+    const currentLine = buffer.lines[cursorRow] || '';
+    if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
+      return currentLine.indexOf('/');
+    }
+
+    // For other completions like '@', we search backwards from the cursor.
+
+    const codePoints = toCodePoints(currentLine);
+    for (let i = cursorCol - 1; i >= 0; i--) {
+      const char = codePoints[i];
+
+      if (char === ' ') {
+        // Check for unescaped spaces.
+        let backslashCount = 0;
+        for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
+          backslashCount++;
+        }
+        if (backslashCount % 2 === 0) {
+          return -1; // Inactive on unescaped space.
+        }
+      } else if (char === '@') {
+        // Active if we find an '@' before any unescaped space.
+        return i;
+      }
+    }
+
+    return -1;
+  }, [cursorRow, cursorCol, buffer.lines]);
+
+  useEffect(() => {
+    if (commandIndex === -1 || reverseSearchActive) {
+      setTimeout(resetCompletionState, 0);
+      return;
+    }
+
+    const currentLine = buffer.lines[cursorRow] || '';
+    const codePoints = toCodePoints(currentLine);
+
+    if (codePoints[commandIndex] === '/') {
+      // Always reset perfect match at the beginning of processing.
+      setIsPerfectMatch(false);
+
+      const fullPath = currentLine.substring(commandIndex + 1);
+      const hasTrailingSpace = currentLine.endsWith(' ');
+
+      // Get all non-empty parts of the command.
+      const rawParts = fullPath.split(/\s+/).filter((p) => p);
+
+      let commandPathParts = rawParts;
+      let partial = '';
+
+      // If there's no trailing space, the last part is potentially a partial segment.
+      // We tentatively separate it.
+      if (!hasTrailingSpace && rawParts.length > 0) {
+        partial = rawParts[rawParts.length - 1];
+        commandPathParts = rawParts.slice(0, -1);
       }
 
-      const codePoints = toCodePoints(currentLine);
-      for (let i = cursorCol - 1; i >= 0; i--) {
-        const char = codePoints[i];
+      // Traverse the Command Tree using the tentative completed path
+      let currentLevel: readonly SlashCommand[] | undefined = slashCommands;
+      let leafCommand: SlashCommand | null = null;
 
-        if (char === ' ') {
-          let backslashCount = 0;
-          for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
-            backslashCount++;
-          }
-          if (backslashCount % 2 === 0) {
-            return {
-              completionMode: CompletionMode.IDLE,
-              query: null,
-              completionStart: -1,
-              completionEnd: -1,
-            };
-          }
-        } else if (char === '@') {
-          let end = codePoints.length;
-          for (let i = cursorCol; i < codePoints.length; i++) {
-            if (codePoints[i] === ' ') {
-              let backslashCount = 0;
-              for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
-                backslashCount++;
-              }
-
-              if (backslashCount % 2 === 0) {
-                end = i;
-                break;
-              }
-            }
-          }
-          const pathStart = i + 1;
-          const partialPath = currentLine.substring(pathStart, end);
-          return {
-            completionMode: CompletionMode.AT,
-            query: partialPath,
-            completionStart: pathStart,
-            completionEnd: end,
-          };
+      for (const part of commandPathParts) {
+        if (!currentLevel) {
+          leafCommand = null;
+          currentLevel = [];
+          break;
+        }
+        const found: SlashCommand | undefined = currentLevel.find(
+          (cmd) => cmd.name === part || cmd.altNames?.includes(part),
+        );
+        if (found) {
+          leafCommand = found;
+          currentLevel = found.subCommands as
+            | readonly SlashCommand[]
+            | undefined;
+        } else {
+          leafCommand = null;
+          currentLevel = [];
+          break;
         }
       }
-      return {
-        completionMode: CompletionMode.IDLE,
-        query: null,
-        completionStart: -1,
-        completionEnd: -1,
-      };
-    }, [cursorRow, cursorCol, buffer.lines]);
 
-  useAtCompletion({
-    enabled: completionMode === CompletionMode.AT,
-    pattern: query || '',
-    config,
-    cwd,
-    setSuggestions,
-    setIsLoadingSuggestions,
-  });
+      let exactMatchAsParent: SlashCommand | undefined;
+      // Handle the Ambiguous Case
+      if (!hasTrailingSpace && currentLevel) {
+        exactMatchAsParent = currentLevel.find(
+          (cmd) =>
+            (cmd.name === partial || cmd.altNames?.includes(partial)) &&
+            cmd.subCommands,
+        );
 
-  const slashCompletionRange = useSlashCompletion({
-    enabled: completionMode === CompletionMode.SLASH,
-    query,
-    slashCommands,
-    commandContext,
-    setSuggestions,
-    setIsLoadingSuggestions,
-    setIsPerfectMatch,
-  });
+        if (exactMatchAsParent) {
+          // It's a perfect match for a parent command. Override our initial guess.
+          // Treat it as a completed command path.
+          leafCommand = exactMatchAsParent;
+          currentLevel = exactMatchAsParent.subCommands;
+          partial = ''; // We now want to suggest ALL of its sub-commands.
+        }
+      }
 
-  useEffect(() => {
-    setActiveSuggestionIndex(suggestions.length > 0 ? 0 : -1);
-    setVisibleStartIndex(0);
-  }, [suggestions, setActiveSuggestionIndex, setVisibleStartIndex]);
+      // Check for perfect, executable match
+      if (!hasTrailingSpace) {
+        if (leafCommand && partial === '' && leafCommand.action) {
+          // Case: /command<enter> - command has action, no sub-commands were suggested
+          setIsPerfectMatch(true);
+        } else if (currentLevel) {
+          // Case: /command subcommand<enter>
+          const perfectMatch = currentLevel.find(
+            (cmd) =>
+              (cmd.name === partial || cmd.altNames?.includes(partial)) &&
+              cmd.action,
+          );
+          if (perfectMatch) {
+            setIsPerfectMatch(true);
+          }
+        }
+      }
 
-  useEffect(() => {
-    if (completionMode === CompletionMode.IDLE || reverseSearchActive) {
+      const depth = commandPathParts.length;
+      const isArgumentCompletion =
+        leafCommand?.completion &&
+        (hasTrailingSpace ||
+          (rawParts.length > depth && depth > 0 && partial !== ''));
+
+      // Set completion range
+      if (hasTrailingSpace || exactMatchAsParent) {
+        completionStart.current = currentLine.length;
+        completionEnd.current = currentLine.length;
+      } else if (partial) {
+        if (isArgumentCompletion) {
+          const commandSoFar = `/${commandPathParts.join(' ')}`;
+          const argStartIndex =
+            commandSoFar.length + (commandPathParts.length > 0 ? 1 : 0);
+          completionStart.current = argStartIndex;
+        } else {
+          completionStart.current = currentLine.length - partial.length;
+        }
+        completionEnd.current = currentLine.length;
+      } else {
+        // e.g. /
+        completionStart.current = commandIndex + 1;
+        completionEnd.current = currentLine.length;
+      }
+
+      // Provide Suggestions based on the now-corrected context
+      if (isArgumentCompletion) {
+        const fetchAndSetSuggestions = async () => {
+          setIsLoadingSuggestions(true);
+          const argString = rawParts.slice(depth).join(' ');
+          const results =
+            (await leafCommand!.completion!(commandContext, argString)) || [];
+          const finalSuggestions = results.map((s) => ({ label: s, value: s }));
+          setSuggestions(finalSuggestions);
+          setShowSuggestions(finalSuggestions.length > 0);
+          setActiveSuggestionIndex(finalSuggestions.length > 0 ? 0 : -1);
+          setIsLoadingSuggestions(false);
+        };
+        fetchAndSetSuggestions();
+        return;
+      }
+
+      // Command/Sub-command Completion
+      const commandsToSearch = currentLevel || [];
+      if (commandsToSearch.length > 0) {
+        let potentialSuggestions = commandsToSearch.filter(
+          (cmd) =>
+            cmd.description &&
+            (cmd.name.startsWith(partial) ||
+              cmd.altNames?.some((alt) => alt.startsWith(partial))),
+        );
+
+        // If a user's input is an exact match and it is a leaf command,
+        // enter should submit immediately.
+        if (potentialSuggestions.length > 0 && !hasTrailingSpace) {
+          const perfectMatch = potentialSuggestions.find(
+            (s) => s.name === partial || s.altNames?.includes(partial),
+          );
+          if (perfectMatch && perfectMatch.action) {
+            potentialSuggestions = [];
+          }
+        }
+
+        const finalSuggestions = potentialSuggestions.map((cmd) => ({
+          label: cmd.name,
+          value: cmd.name,
+          description: cmd.description,
+        }));
+
+        setSuggestions(finalSuggestions);
+        setShowSuggestions(finalSuggestions.length > 0);
+        setActiveSuggestionIndex(finalSuggestions.length > 0 ? 0 : -1);
+        setIsLoadingSuggestions(false);
+        return;
+      }
+
+      // If we fall through, no suggestions are available.
       resetCompletionState();
       return;
     }
-    // Show suggestions if we are loading OR if there are results to display.
-    setShowSuggestions(isLoadingSuggestions || suggestions.length > 0);
+
+    // Handle At Command Completion
+    completionEnd.current = codePoints.length;
+    for (let i = cursorCol; i < codePoints.length; i++) {
+      if (codePoints[i] === ' ') {
+        let backslashCount = 0;
+        for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
+          backslashCount++;
+        }
+
+        if (backslashCount % 2 === 0) {
+          completionEnd.current = i;
+          break;
+        }
+      }
+    }
+
+    const pathStart = commandIndex + 1;
+    const partialPath = currentLine.substring(pathStart, completionEnd.current);
+    const lastSlashIndex = partialPath.lastIndexOf('/');
+    completionStart.current =
+      lastSlashIndex === -1 ? pathStart : pathStart + lastSlashIndex + 1;
+    const baseDirRelative =
+      lastSlashIndex === -1
+        ? '.'
+        : partialPath.substring(0, lastSlashIndex + 1);
+    const prefix = unescapePath(
+      lastSlashIndex === -1
+        ? partialPath
+        : partialPath.substring(lastSlashIndex + 1),
+    );
+
+    let isMounted = true;
+
+    const findFilesRecursively = async (
+      startDir: string,
+      searchPrefix: string,
+      fileDiscovery: FileDiscoveryService | null,
+      filterOptions: {
+        respectGitIgnore?: boolean;
+        respectGeminiIgnore?: boolean;
+      },
+      currentRelativePath = '',
+      depth = 0,
+      maxDepth = 10, // Limit recursion depth
+      maxResults = 50, // Limit number of results
+    ): Promise<Suggestion[]> => {
+      if (depth > maxDepth) {
+        return [];
+      }
+
+      const lowerSearchPrefix = searchPrefix.toLowerCase();
+      let foundSuggestions: Suggestion[] = [];
+      try {
+        const entries = await fs.readdir(startDir, { withFileTypes: true });
+        for (const entry of entries) {
+          if (foundSuggestions.length >= maxResults) break;
+
+          const entryPathRelative = path.join(currentRelativePath, entry.name);
+          const entryPathFromRoot = path.relative(
+            startDir,
+            path.join(startDir, entry.name),
+          );
+
+          // Conditionally ignore dotfiles
+          if (!searchPrefix.startsWith('.') && entry.name.startsWith('.')) {
+            continue;
+          }
+
+          // Check if this entry should be ignored by filtering options
+          if (
+            fileDiscovery &&
+            fileDiscovery.shouldIgnoreFile(entryPathFromRoot, filterOptions)
+          ) {
+            continue;
+          }
+
+          if (entry.name.toLowerCase().startsWith(lowerSearchPrefix)) {
+            foundSuggestions.push({
+              label: entryPathRelative + (entry.isDirectory() ? '/' : ''),
+              value: escapePath(
+                entryPathRelative + (entry.isDirectory() ? '/' : ''),
+              ),
+            });
+          }
+          if (
+            entry.isDirectory() &&
+            entry.name !== 'node_modules' &&
+            !entry.name.startsWith('.')
+          ) {
+            if (foundSuggestions.length < maxResults) {
+              foundSuggestions = foundSuggestions.concat(
+                await findFilesRecursively(
+                  path.join(startDir, entry.name),
+                  searchPrefix, // Pass original searchPrefix for recursive calls
+                  fileDiscovery,
+                  filterOptions,
+                  entryPathRelative,
+                  depth + 1,
+                  maxDepth,
+                  maxResults - foundSuggestions.length,
+                ),
+              );
+            }
+          }
+        }
+      } catch (_err) {
+        // Ignore errors like permission denied or ENOENT during recursive search
+      }
+      return foundSuggestions.slice(0, maxResults);
+    };
+
+    const findFilesWithGlob = async (
+      searchPrefix: string,
+      fileDiscoveryService: FileDiscoveryService,
+      filterOptions: {
+        respectGitIgnore?: boolean;
+        respectGeminiIgnore?: boolean;
+      },
+      searchDir: string,
+      maxResults = 50,
+    ): Promise<Suggestion[]> => {
+      const globPattern = `**/${searchPrefix}*`;
+      const files = await glob(globPattern, {
+        cwd: searchDir,
+        dot: searchPrefix.startsWith('.'),
+        nocase: true,
+      });
+
+      const suggestions: Suggestion[] = files
+        .filter((file) => {
+          if (fileDiscoveryService) {
+            return !fileDiscoveryService.shouldIgnoreFile(file, filterOptions);
+          }
+          return true;
+        })
+        .map((file: string) => {
+          const absolutePath = path.resolve(searchDir, file);
+          const label = path.relative(cwd, absolutePath);
+          return {
+            label,
+            value: escapePath(label),
+          };
+        })
+        .slice(0, maxResults);
+
+      return suggestions;
+    };
+
+    const fetchSuggestions = async () => {
+      setIsLoadingSuggestions(true);
+      let fetchedSuggestions: Suggestion[] = [];
+
+      const fileDiscoveryService = config ? config.getFileService() : null;
+      const enableRecursiveSearch =
+        config?.getEnableRecursiveFileSearch() ?? true;
+      const filterOptions =
+        config?.getFileFilteringOptions() ?? DEFAULT_FILE_FILTERING_OPTIONS;
+
+      try {
+        // If there's no slash, or it's the root, do a recursive search from workspace directories
+        for (const dir of dirs) {
+          let fetchedSuggestionsPerDir: Suggestion[] = [];
+          if (
+            partialPath.indexOf('/') === -1 &&
+            prefix &&
+            enableRecursiveSearch
+          ) {
+            if (fileDiscoveryService) {
+              fetchedSuggestionsPerDir = await findFilesWithGlob(
+                prefix,
+                fileDiscoveryService,
+                filterOptions,
+                dir,
+              );
+            } else {
+              fetchedSuggestionsPerDir = await findFilesRecursively(
+                dir,
+                prefix,
+                null,
+                filterOptions,
+              );
+            }
+          } else {
+            // Original behavior: list files in the specific directory
+            const lowerPrefix = prefix.toLowerCase();
+            const baseDirAbsolute = path.resolve(dir, baseDirRelative);
+            const entries = await fs.readdir(baseDirAbsolute, {
+              withFileTypes: true,
+            });
+
+            // Filter entries using git-aware filtering
+            const filteredEntries = [];
+            for (const entry of entries) {
+              // Conditionally ignore dotfiles
+              if (!prefix.startsWith('.') && entry.name.startsWith('.')) {
+                continue;
+              }
+              if (!entry.name.toLowerCase().startsWith(lowerPrefix)) continue;
+
+              const relativePath = path.relative(
+                dir,
+                path.join(baseDirAbsolute, entry.name),
+              );
+              if (
+                fileDiscoveryService &&
+                fileDiscoveryService.shouldIgnoreFile(
+                  relativePath,
+                  filterOptions,
+                )
+              ) {
+                continue;
+              }
+
+              filteredEntries.push(entry);
+            }
+
+            fetchedSuggestionsPerDir = filteredEntries.map((entry) => {
+              const absolutePath = path.resolve(baseDirAbsolute, entry.name);
+              const label =
+                cwd === dir ? entry.name : path.relative(cwd, absolutePath);
+              const suggestionLabel = entry.isDirectory() ? label + '/' : label;
+              return {
+                label: suggestionLabel,
+                value: escapePath(suggestionLabel),
+              };
+            });
+          }
+          fetchedSuggestions = [
+            ...fetchedSuggestions,
+            ...fetchedSuggestionsPerDir,
+          ];
+        }
+
+        // Like glob, we always return forward slashes for path separators, even on Windows.
+        // But preserve backslash escaping for special characters.
+        const specialCharsLookahead = `(?![${SHELL_SPECIAL_CHARS.source.slice(1, -1)}])`;
+        const pathSeparatorRegex = new RegExp(
+          `\\\\${specialCharsLookahead}`,
+          'g',
+        );
+        fetchedSuggestions = fetchedSuggestions.map((suggestion) => ({
+          ...suggestion,
+          label: suggestion.label.replace(pathSeparatorRegex, '/'),
+          value: suggestion.value.replace(pathSeparatorRegex, '/'),
+        }));
+
+        // Sort by depth, then directories first, then alphabetically
+        fetchedSuggestions.sort((a, b) => {
+          const depthA = (a.label.match(/\//g) || []).length;
+          const depthB = (b.label.match(/\//g) || []).length;
+
+          if (depthA !== depthB) {
+            return depthA - depthB;
+          }
+
+          const aIsDir = a.label.endsWith('/');
+          const bIsDir = b.label.endsWith('/');
+          if (aIsDir && !bIsDir) return -1;
+          if (!aIsDir && bIsDir) return 1;
+
+          // exclude extension when comparing
+          const filenameA = a.label.substring(
+            0,
+            a.label.length - path.extname(a.label).length,
+          );
+          const filenameB = b.label.substring(
+            0,
+            b.label.length - path.extname(b.label).length,
+          );
+
+          return (
+            filenameA.localeCompare(filenameB) || a.label.localeCompare(b.label)
+          );
+        });
+
+        if (isMounted) {
+          setSuggestions(fetchedSuggestions);
+          setShowSuggestions(fetchedSuggestions.length > 0);
+          setActiveSuggestionIndex(fetchedSuggestions.length > 0 ? 0 : -1);
+          setVisibleStartIndex(0);
+        }
+      } catch (error: unknown) {
+        if (isNodeError(error) && error.code === 'ENOENT') {
+          if (isMounted) {
+            setSuggestions([]);
+            setShowSuggestions(false);
+          }
+        } else {
+          console.error(
+            `Error fetching completion suggestions for ${partialPath}: ${getErrorMessage(error)}`,
+          );
+          if (isMounted) {
+            resetCompletionState();
+          }
+        }
+      }
+      if (isMounted) {
+        setIsLoadingSuggestions(false);
+      }
+    };
+
+    const debounceTimeout = setTimeout(fetchSuggestions, 100);
+
+    return () => {
+      isMounted = false;
+      clearTimeout(debounceTimeout);
+    };
   }, [
-    completionMode,
-    suggestions.length,
-    isLoadingSuggestions,
-    reverseSearchActive,
+    buffer.text,
+    cursorRow,
+    cursorCol,
+    buffer.lines,
+    dirs,
+    cwd,
+    commandIndex,
     resetCompletionState,
+    slashCommands,
+    commandContext,
+    config,
+    reverseSearchActive,
+    setSuggestions,
     setShowSuggestions,
+    setActiveSuggestionIndex,
+    setIsLoadingSuggestions,
+    setIsPerfectMatch,
+    setVisibleStartIndex,
   ]);
 
   const handleAutocomplete = useCallback(
@@ -180,23 +616,18 @@ export function useCommandCompletion(
       }
       const suggestion = suggestions[indexToUse].value;
 
-      let start = completionStart;
-      let end = completionEnd;
-      if (completionMode === CompletionMode.SLASH) {
-        start = slashCompletionRange.completionStart;
-        end = slashCompletionRange.completionEnd;
-      }
-
-      if (start === -1 || end === -1) {
+      if (completionStart.current === -1 || completionEnd.current === -1) {
         return;
       }
 
+      const isSlash = (buffer.lines[cursorRow] || '')[commandIndex] === '/';
       let suggestionText = suggestion;
-      if (completionMode === CompletionMode.SLASH) {
+      if (isSlash) {
+        // If we are inserting (not replacing), and the preceding character is not a space, add one.
         if (
-          start === end &&
-          start > 1 &&
-          (buffer.lines[cursorRow] || '')[start - 1] !== ' '
+          completionStart.current === completionEnd.current &&
+          completionStart.current > commandIndex + 1 &&
+          (buffer.lines[cursorRow] || '')[completionStart.current - 1] !== ' '
         ) {
           suggestionText = ' ' + suggestionText;
         }
@@ -205,20 +636,12 @@ export function useCommandCompletion(
       suggestionText += ' ';
 
       buffer.replaceRangeByOffset(
-        logicalPosToOffset(buffer.lines, cursorRow, start),
-        logicalPosToOffset(buffer.lines, cursorRow, end),
+        logicalPosToOffset(buffer.lines, cursorRow, completionStart.current),
+        logicalPosToOffset(buffer.lines, cursorRow, completionEnd.current),
         suggestionText,
       );
     },
-    [
-      cursorRow,
-      buffer,
-      suggestions,
-      completionMode,
-      completionStart,
-      completionEnd,
-      slashCompletionRange,
-    ],
+    [cursorRow, buffer, suggestions, commandIndex],
   );
 
   return {

packages/cli/src/ui/hooks/useGeminiStream.test.tsx

@@ -448,7 +448,6 @@ describe('useGeminiStream', () => {
           callId: 'call1',
           responseParts: [{ text: 'tool 1 response' }],
           error: undefined,
-          errorType: undefined,
           resultDisplay: 'Tool 1 success display',
         },
         tool: {
@@ -656,7 +655,6 @@ describe('useGeminiStream', () => {
         ],
         resultDisplay: undefined,
         error: undefined,
-        errorType: undefined,
       },
       responseSubmittedToGemini: false,
     };
@@ -681,7 +679,6 @@ describe('useGeminiStream', () => {
         ],
         resultDisplay: undefined,
         error: undefined,
-        errorType: undefined,
       },
       responseSubmittedToGemini: false,
     };
@@ -778,7 +775,6 @@ describe('useGeminiStream', () => {
           callId: 'call1',
           responseParts: toolCallResponseParts,
           error: undefined,
-          errorType: undefined,
           resultDisplay: 'Tool 1 success display',
         },
         endTime: Date.now(),
@@ -1132,7 +1128,6 @@ describe('useGeminiStream', () => {
           responseParts: [{ text: 'Memory saved' }],
           resultDisplay: 'Success: Memory saved',
           error: undefined,
-          errorType: undefined,
         },
         tool: {
           name: 'save_memory',
@@ -1654,313 +1649,4 @@ describe('useGeminiStream', () => {
       );
     });
   });
-
-  describe('Concurrent Execution Prevention', () => {
-    it('should prevent concurrent submitQuery calls', async () => {
-      let resolveFirstCall!: () => void;
-      let resolveSecondCall!: () => void;
-
-      const firstCallPromise = new Promise<void>((resolve) => {
-        resolveFirstCall = resolve;
-      });
-
-      const secondCallPromise = new Promise<void>((resolve) => {
-        resolveSecondCall = resolve;
-      });
-
-      // Mock a long-running stream for the first call
-      const firstStream = (async function* () {
-        yield {
-          type: ServerGeminiEventType.Content,
-          value: 'First call content',
-        };
-        await firstCallPromise; // Wait until we manually resolve
-        yield { type: ServerGeminiEventType.Finished, value: 'STOP' };
-      })();
-
-      // Mock a stream for the second call (should not be used)
-      const secondStream = (async function* () {
-        yield {
-          type: ServerGeminiEventType.Content,
-          value: 'Second call content',
-        };
-        await secondCallPromise;
-        yield { type: ServerGeminiEventType.Finished, value: 'STOP' };
-      })();
-
-      let callCount = 0;
-      mockSendMessageStream.mockImplementation(() => {
-        callCount++;
-        if (callCount === 1) {
-          return firstStream;
-        } else {
-          return secondStream;
-        }
-      });
-
-      const { result } = renderTestHook();
-
-      // Start first call
-      const firstCallResult = act(async () => {
-        await result.current.submitQuery('First query');
-      });
-
-      // Wait a bit to ensure first call has started
-      await new Promise((resolve) => setTimeout(resolve, 10));
-
-      // Try to start second call while first is still running
-      const secondCallResult = act(async () => {
-        await result.current.submitQuery('Second query');
-      });
-
-      // Resolve both calls
-      resolveFirstCall();
-      resolveSecondCall();
-
-      await Promise.all([firstCallResult, secondCallResult]);
-
-      // Verify only one call was made to sendMessageStream
-      expect(mockSendMessageStream).toHaveBeenCalledTimes(1);
-      expect(mockSendMessageStream).toHaveBeenCalledWith(
-        'First query',
-        expect.any(AbortSignal),
-        expect.any(String),
-      );
-
-      // Verify only the first query was added to history
-      const userMessages = mockAddItem.mock.calls.filter(
-        (call) => call[0].type === MessageType.USER,
-      );
-      expect(userMessages).toHaveLength(1);
-      expect(userMessages[0][0].text).toBe('First query');
-    });
-
-    it('should allow subsequent calls after first call completes', async () => {
-      // Mock streams that complete immediately
-      mockSendMessageStream
-        .mockReturnValueOnce(
-          (async function* () {
-            yield {
-              type: ServerGeminiEventType.Content,
-              value: 'First response',
-            };
-            yield { type: ServerGeminiEventType.Finished, value: 'STOP' };
-          })(),
-        )
-        .mockReturnValueOnce(
-          (async function* () {
-            yield {
-              type: ServerGeminiEventType.Content,
-              value: 'Second response',
-            };
-            yield { type: ServerGeminiEventType.Finished, value: 'STOP' };
-          })(),
-        );
-
-      const { result } = renderTestHook();
-
-      // First call
-      await act(async () => {
-        await result.current.submitQuery('First query');
-      });
-
-      // Second call after first completes
-      await act(async () => {
-        await result.current.submitQuery('Second query');
-      });
-
-      // Both calls should have been made
-      expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
-      expect(mockSendMessageStream).toHaveBeenNthCalledWith(
-        1,
-        'First query',
-        expect.any(AbortSignal),
-        expect.any(String),
-      );
-      expect(mockSendMessageStream).toHaveBeenNthCalledWith(
-        2,
-        'Second query',
-        expect.any(AbortSignal),
-        expect.any(String),
-      );
-    });
-
-    it('should reset execution flag even when query preparation fails', async () => {
-      const { result } = renderTestHook();
-
-      // First call with empty query (should fail in preparation)
-      await act(async () => {
-        await result.current.submitQuery('   '); // Empty trimmed query
-      });
-
-      // Second call should work normally
-      mockSendMessageStream.mockReturnValue(
-        (async function* () {
-          yield {
-            type: ServerGeminiEventType.Content,
-            value: 'Valid response',
-          };
-          yield { type: ServerGeminiEventType.Finished, value: 'STOP' };
-        })(),
-      );
-
-      await act(async () => {
-        await result.current.submitQuery('Valid query');
-      });
-
-      // The second call should have been made
-      expect(mockSendMessageStream).toHaveBeenCalledTimes(1);
-      expect(mockSendMessageStream).toHaveBeenCalledWith(
-        'Valid query',
-        expect.any(AbortSignal),
-        expect.any(String),
-      );
-    });
-
-    it('should reset execution flag when user cancels', async () => {
-      let resolveCancelledStream!: () => void;
-      const cancelledStreamPromise = new Promise<void>((resolve) => {
-        resolveCancelledStream = resolve;
-      });
-
-      // Mock a stream that can be cancelled
-      const cancelledStream = (async function* () {
-        yield {
-          type: ServerGeminiEventType.Content,
-          value: 'Cancelled content',
-        };
-        await cancelledStreamPromise;
-        yield { type: ServerGeminiEventType.UserCancelled };
-      })();
-
-      mockSendMessageStream.mockReturnValueOnce(cancelledStream);
-
-      const { result } = renderTestHook();
-
-      // Start first call
-      const firstCallResult = act(async () => {
-        await result.current.submitQuery('First query');
-      });
-
-      // Wait a bit then resolve to trigger cancellation
-      await new Promise((resolve) => setTimeout(resolve, 10));
-      resolveCancelledStream();
-      await firstCallResult;
-
-      // Now try a second call - should work
-      mockSendMessageStream.mockReturnValue(
-        (async function* () {
-          yield {
-            type: ServerGeminiEventType.Content,
-            value: 'Second response',
-          };
-          yield { type: ServerGeminiEventType.Finished, value: 'STOP' };
-        })(),
-      );
-
-      await act(async () => {
-        await result.current.submitQuery('Second query');
-      });
-
-      // Both calls should have been made
-      expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
-    });
-
-    it('should reset execution flag when an error occurs', async () => {
-      // Mock a stream that throws an error
-      mockSendMessageStream.mockReturnValueOnce(
-        (async function* () {
-          yield { type: ServerGeminiEventType.Content, value: 'Error content' };
-          throw new Error('Stream error');
-        })(),
-      );
-
-      const { result } = renderTestHook();
-
-      // First call that will error
-      await act(async () => {
-        await result.current.submitQuery('Error query');
-      });
-
-      // Second call should work normally
-      mockSendMessageStream.mockReturnValue(
-        (async function* () {
-          yield {
-            type: ServerGeminiEventType.Content,
-            value: 'Success response',
-          };
-          yield { type: ServerGeminiEventType.Finished, value: 'STOP' };
-        })(),
-      );
-
-      await act(async () => {
-        await result.current.submitQuery('Success query');
-      });
-
-      // Both calls should have been attempted
-      expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
-    });
-
-    it('should handle rapid multiple concurrent calls correctly', async () => {
-      let resolveStream!: () => void;
-      const streamPromise = new Promise<void>((resolve) => {
-        resolveStream = resolve;
-      });
-
-      // Mock a long-running stream
-      const longStream = (async function* () {
-        yield {
-          type: ServerGeminiEventType.Content,
-          value: 'Long running content',
-        };
-        await streamPromise;
-        yield { type: ServerGeminiEventType.Finished, value: 'STOP' };
-      })();
-
-      mockSendMessageStream.mockReturnValue(longStream);
-
-      const { result } = renderTestHook();
-
-      // Start multiple concurrent calls
-      const calls = [
-        act(async () => {
-          await result.current.submitQuery('Query 1');
-        }),
-        act(async () => {
-          await result.current.submitQuery('Query 2');
-        }),
-        act(async () => {
-          await result.current.submitQuery('Query 3');
-        }),
-        act(async () => {
-          await result.current.submitQuery('Query 4');
-        }),
-        act(async () => {
-          await result.current.submitQuery('Query 5');
-        }),
-      ];
-
-      // Wait a bit then resolve the stream
-      await new Promise((resolve) => setTimeout(resolve, 10));
-      resolveStream();
-
-      // Wait for all calls to complete
-      await Promise.all(calls);
-
-      // Only the first call should have been made
-      expect(mockSendMessageStream).toHaveBeenCalledTimes(1);
-      expect(mockSendMessageStream).toHaveBeenCalledWith(
-        'Query 1',
-        expect.any(AbortSignal),
-        expect.any(String),
-      );
-
-      // Only one user message should have been added
-      const userMessages = mockAddItem.mock.calls.filter(
-        (call) => call[0].type === MessageType.USER,
-      );
-      expect(userMessages).toHaveLength(1);
-      expect(userMessages[0][0].text).toBe('Query 1');
-    });
-  });
 });

packages/cli/src/ui/hooks/useGeminiStream.ts

@@ -93,12 +93,10 @@ export const useGeminiStream = (
   performMemoryRefresh: () => Promise<void>,
   modelSwitchedFromQuotaError: boolean,
   setModelSwitchedFromQuotaError: React.Dispatch<React.SetStateAction<boolean>>,
-  onEditorClose: () => void,
 ) => {
   const [initError, setInitError] = useState<string | null>(null);
   const abortControllerRef = useRef<AbortController | null>(null);
   const turnCancelledRef = useRef(false);
-  const isSubmittingQueryRef = useRef(false);
   const [isResponding, setIsResponding] = useState<boolean>(false);
   const [thought, setThought] = useState<ThoughtSummary | null>(null);
   const [pendingHistoryItemRef, setPendingHistoryItem] =
@@ -135,7 +133,6 @@ export const useGeminiStream = (
       config,
       setPendingHistoryItem,
       getPreferredEditor,
-      onEditorClose,
     );
 
   const pendingToolCallGroupDisplay = useMemo(
@@ -625,11 +622,6 @@ export const useGeminiStream = (
       options?: { isContinuation: boolean },
       prompt_id?: string,
     ) => {
-      // Prevent concurrent executions of submitQuery
-      if (isSubmittingQueryRef.current) {
-        return;
-      }
-
       if (
         (streamingState === StreamingState.Responding ||
           streamingState === StreamingState.WaitingForConfirmation) &&
@@ -637,9 +629,6 @@ export const useGeminiStream = (
       )
         return;
 
-      // Set the flag to indicate we're now executing
-      isSubmittingQueryRef.current = true;
-
       const userMessageTimestamp = Date.now();
 
       // Reset quota error flag when starting a new query (not a continuation)
@@ -664,7 +653,6 @@ export const useGeminiStream = (
       );
 
       if (!shouldProceed || queryToSend === null) {
-        isSubmittingQueryRef.current = false;
         return;
       }
 
@@ -689,7 +677,6 @@ export const useGeminiStream = (
         );
 
         if (processingStatus === StreamProcessingStatus.UserCancelled) {
-          isSubmittingQueryRef.current = false;
           return;
         }
 
@@ -721,7 +708,6 @@ export const useGeminiStream = (
         }
       } finally {
         setIsResponding(false);
-        isSubmittingQueryRef.current = false;
       }
     },
     [

packages/cli/src/ui/hooks/usePhraseCycler.ts

@@ -38,6 +38,7 @@ export const WITTY_LOADING_PHRASES = [
   'Defragmenting memories... both RAM and personal...',
   'Rebooting the humor module...',
   'Caching the essentials (mostly cat memes)...',
+  'Running sudo make me a sandwich...',
   'Optimizing for ludicrous speed',
   "Swapping bits... don't tell the bytes...",
   'Garbage collecting... be right back...',
@@ -65,10 +66,12 @@ export const WITTY_LOADING_PHRASES = [
   "Just a moment, I'm tuning the algorithms...",
   'Warp speed engaged...',
   'Mining for more Dilithium crystals...',
+  "I'm Giving Her all she's got Captain!",
   "Don't panic...",
   'Following the white rabbit...',
   'The truth is in here... somewhere...',
   'Blowing on the cartridge...',
+  'Looking for the princess in another castle...',
   'Loading... Do a barrel roll!',
   'Waiting for the respawn...',
   'Finishing the Kessel Run in less than 12 parsecs...',

packages/cli/src/ui/hooks/useReactToolScheduler.ts

@@ -70,7 +70,6 @@ export function useReactToolScheduler(
     React.SetStateAction<HistoryItemWithoutId | null>
   >,
   getPreferredEditor: () => EditorType | undefined,
-  onEditorClose: () => void,
 ): [TrackedToolCall[], ScheduleFn, MarkToolsAsSubmittedFn] {
   const [toolCallsForDisplay, setToolCallsForDisplay] = useState<
     TrackedToolCall[]
@@ -141,7 +140,6 @@ export function useReactToolScheduler(
         onToolCallsUpdate: toolCallsUpdateHandler,
         getPreferredEditor,
         config,
-        onEditorClose,
       }),
     [
       config,
@@ -149,7 +147,6 @@ export function useReactToolScheduler(
       allToolCallsCompleteHandler,
       toolCallsUpdateHandler,
       getPreferredEditor,
-      onEditorClose,
     ],
   );
 

packages/cli/src/ui/hooks/useReverseSearchCompletion.tsx

@@ -41,17 +41,12 @@ export function useReverseSearchCompletion(
     navigateDown,
   } = useCompletion();
 
+  // whenever reverseSearchActive is on, filter history
   useEffect(() => {
     if (!reverseSearchActive) {
       resetCompletionState();
-    }
-  }, [reverseSearchActive, resetCompletionState]);
-
-  useEffect(() => {
-    if (!reverseSearchActive) {
       return;
     }
-
     const q = buffer.text.toLowerCase();
     const matches = shellHistory.reduce<Suggestion[]>((acc, cmd) => {
       const idx = cmd.toLowerCase().indexOf(q);
@@ -67,6 +62,7 @@ export function useReverseSearchCompletion(
     buffer.text,
     shellHistory,
     reverseSearchActive,
+    resetCompletionState,
     setActiveSuggestionIndex,
     setShowSuggestions,
     setSuggestions,

packages/cli/src/ui/hooks/useShowMemoryCommand.ts

@@ -66,8 +66,8 @@ export function createShowMemoryAction(
         type: MessageType.INFO,
         content:
           fileCount > 0
-            ? 'Hierarchical memory (QWEN.md or other context files) is loaded but content is empty.'
-            : 'No hierarchical memory (QWEN.md or other context files) is currently loaded.',
+            ? 'Hierarchical memory (GEMINI.md or other context files) is loaded but content is empty.'
+            : 'No hierarchical memory (GEMINI.md or other context files) is currently loaded.',
         timestamp: new Date(),
       });
     }

packages/cli/src/ui/hooks/useSlashCompletion.test.ts

@@ -1,434 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/** @vitest-environment jsdom */
-
-import { describe, it, expect, vi } from 'vitest';
-import { renderHook, waitFor } from '@testing-library/react';
-import { useSlashCompletion } from './useSlashCompletion.js';
-import { CommandContext, SlashCommand } from '../commands/types.js';
-import { useState } from 'react';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
-
-// Test harness to capture the state from the hook's callbacks.
-function useTestHarnessForSlashCompletion(
-  enabled: boolean,
-  query: string | null,
-  slashCommands: readonly SlashCommand[],
-  commandContext: CommandContext,
-) {
-  const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
-  const [isLoadingSuggestions, setIsLoadingSuggestions] = useState(false);
-  const [isPerfectMatch, setIsPerfectMatch] = useState(false);
-
-  const { completionStart, completionEnd } = useSlashCompletion({
-    enabled,
-    query,
-    slashCommands,
-    commandContext,
-    setSuggestions,
-    setIsLoadingSuggestions,
-    setIsPerfectMatch,
-  });
-
-  return {
-    suggestions,
-    isLoadingSuggestions,
-    isPerfectMatch,
-    completionStart,
-    completionEnd,
-  };
-}
-
-describe('useSlashCompletion', () => {
-  // A minimal mock is sufficient for these tests.
-  const mockCommandContext = {} as CommandContext;
-
-  describe('Top-Level Commands', () => {
-    it('should suggest all top-level commands for the root slash', async () => {
-      const slashCommands = [
-        { name: 'help', altNames: ['?'], description: 'Show help' },
-        {
-          name: 'stats',
-          altNames: ['usage'],
-          description: 'check session stats. Usage: /stats [model|tools]',
-        },
-        { name: 'clear', description: 'Clear the screen' },
-        {
-          name: 'memory',
-          description: 'Manage memory',
-          subCommands: [{ name: 'show', description: 'Show memory' }],
-        },
-        { name: 'chat', description: 'Manage chat history' },
-      ] as unknown as SlashCommand[];
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions.length).toBe(slashCommands.length);
-      expect(result.current.suggestions.map((s) => s.label)).toEqual(
-        expect.arrayContaining(['help', 'clear', 'memory', 'chat', 'stats']),
-      );
-    });
-
-    it('should filter commands based on partial input', async () => {
-      const slashCommands = [
-        { name: 'memory', description: 'Manage memory' },
-      ] as unknown as SlashCommand[];
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/mem',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions).toEqual([
-        { label: 'memory', value: 'memory', description: 'Manage memory' },
-      ]);
-    });
-
-    it('should suggest commands based on partial altNames', async () => {
-      const slashCommands = [
-        {
-          name: 'stats',
-          altNames: ['usage'],
-          description: 'check session stats. Usage: /stats [model|tools]',
-        },
-      ] as unknown as SlashCommand[];
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/usag',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions).toEqual([
-        {
-          label: 'stats',
-          value: 'stats',
-          description: 'check session stats. Usage: /stats [model|tools]',
-        },
-      ]);
-    });
-
-    it('should NOT provide suggestions for a perfectly typed command that is a leaf node', async () => {
-      const slashCommands = [
-        { name: 'clear', description: 'Clear the screen', action: vi.fn() },
-      ] as unknown as SlashCommand[];
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/clear',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions).toHaveLength(0);
-    });
-
-    it.each([['/?'], ['/usage']])(
-      'should not suggest commands when altNames is fully typed',
-      async (query) => {
-        const mockSlashCommands = [
-          {
-            name: 'help',
-            altNames: ['?'],
-            description: 'Show help',
-            action: vi.fn(),
-          },
-          {
-            name: 'stats',
-            altNames: ['usage'],
-            description: 'check session stats. Usage: /stats [model|tools]',
-            action: vi.fn(),
-          },
-        ] as unknown as SlashCommand[];
-
-        const { result } = renderHook(() =>
-          useTestHarnessForSlashCompletion(
-            true,
-            query,
-            mockSlashCommands,
-            mockCommandContext,
-          ),
-        );
-
-        expect(result.current.suggestions).toHaveLength(0);
-      },
-    );
-
-    it('should not provide suggestions for a fully typed command that has no sub-commands or argument completion', async () => {
-      const slashCommands = [
-        { name: 'clear', description: 'Clear the screen' },
-      ] as unknown as SlashCommand[];
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/clear ',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions).toHaveLength(0);
-    });
-
-    it('should not provide suggestions for an unknown command', async () => {
-      const slashCommands = [
-        { name: 'help', description: 'Show help' },
-      ] as unknown as SlashCommand[];
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/unknown-command',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions).toHaveLength(0);
-    });
-  });
-
-  describe('Sub-Commands', () => {
-    it('should suggest sub-commands for a parent command', async () => {
-      const slashCommands = [
-        {
-          name: 'memory',
-          description: 'Manage memory',
-          subCommands: [
-            { name: 'show', description: 'Show memory' },
-            { name: 'add', description: 'Add to memory' },
-          ],
-        },
-      ] as unknown as SlashCommand[];
-
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/memory',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions).toHaveLength(2);
-      expect(result.current.suggestions).toEqual(
-        expect.arrayContaining([
-          { label: 'show', value: 'show', description: 'Show memory' },
-          { label: 'add', value: 'add', description: 'Add to memory' },
-        ]),
-      );
-    });
-
-    it('should suggest all sub-commands when the query ends with the parent command and a space', async () => {
-      const slashCommands = [
-        {
-          name: 'memory',
-          description: 'Manage memory',
-          subCommands: [
-            { name: 'show', description: 'Show memory' },
-            { name: 'add', description: 'Add to memory' },
-          ],
-        },
-      ] as unknown as SlashCommand[];
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/memory ',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions).toHaveLength(2);
-      expect(result.current.suggestions).toEqual(
-        expect.arrayContaining([
-          { label: 'show', value: 'show', description: 'Show memory' },
-          { label: 'add', value: 'add', description: 'Add to memory' },
-        ]),
-      );
-    });
-
-    it('should filter sub-commands by prefix', async () => {
-      const slashCommands = [
-        {
-          name: 'memory',
-          description: 'Manage memory',
-          subCommands: [
-            { name: 'show', description: 'Show memory' },
-            { name: 'add', description: 'Add to memory' },
-          ],
-        },
-      ] as unknown as SlashCommand[];
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/memory a',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions).toEqual([
-        { label: 'add', value: 'add', description: 'Add to memory' },
-      ]);
-    });
-
-    it('should provide no suggestions for an invalid sub-command', async () => {
-      const slashCommands = [
-        {
-          name: 'memory',
-          description: 'Manage memory',
-          subCommands: [
-            { name: 'show', description: 'Show memory' },
-            { name: 'add', description: 'Add to memory' },
-          ],
-        },
-      ] as unknown as SlashCommand[];
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/memory dothisnow',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      expect(result.current.suggestions).toHaveLength(0);
-    });
-  });
-
-  describe('Argument Completion', () => {
-    it('should call the command.completion function for argument suggestions', async () => {
-      const availableTags = [
-        'my-chat-tag-1',
-        'my-chat-tag-2',
-        'another-channel',
-      ];
-      const mockCompletionFn = vi
-        .fn()
-        .mockImplementation(
-          async (_context: CommandContext, partialArg: string) =>
-            availableTags.filter((tag) => tag.startsWith(partialArg)),
-        );
-
-      const slashCommands = [
-        {
-          name: 'chat',
-          description: 'Manage chat history',
-          subCommands: [
-            {
-              name: 'resume',
-              description: 'Resume a saved chat',
-              completion: mockCompletionFn,
-            },
-          ],
-        },
-      ] as unknown as SlashCommand[];
-
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/chat resume my-ch',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      await waitFor(() => {
-        expect(mockCompletionFn).toHaveBeenCalledWith(
-          mockCommandContext,
-          'my-ch',
-        );
-      });
-
-      await waitFor(() => {
-        expect(result.current.suggestions).toEqual([
-          { label: 'my-chat-tag-1', value: 'my-chat-tag-1' },
-          { label: 'my-chat-tag-2', value: 'my-chat-tag-2' },
-        ]);
-      });
-    });
-
-    it('should call command.completion with an empty string when args start with a space', async () => {
-      const mockCompletionFn = vi
-        .fn()
-        .mockResolvedValue(['my-chat-tag-1', 'my-chat-tag-2', 'my-channel']);
-
-      const slashCommands = [
-        {
-          name: 'chat',
-          description: 'Manage chat history',
-          subCommands: [
-            {
-              name: 'resume',
-              description: 'Resume a saved chat',
-              completion: mockCompletionFn,
-            },
-          ],
-        },
-      ] as unknown as SlashCommand[];
-
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/chat resume ',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      await waitFor(() => {
-        expect(mockCompletionFn).toHaveBeenCalledWith(mockCommandContext, '');
-      });
-
-      await waitFor(() => {
-        expect(result.current.suggestions).toHaveLength(3);
-      });
-    });
-
-    it('should handle completion function that returns null', async () => {
-      const completionFn = vi.fn().mockResolvedValue(null);
-      const slashCommands = [
-        {
-          name: 'chat',
-          description: 'Manage chat history',
-          subCommands: [
-            {
-              name: 'resume',
-              description: 'Resume a saved chat',
-              completion: completionFn,
-            },
-          ],
-        },
-      ] as unknown as SlashCommand[];
-
-      const { result } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/chat resume ',
-          slashCommands,
-          mockCommandContext,
-        ),
-      );
-
-      await waitFor(() => {
-        expect(result.current.suggestions).toHaveLength(0);
-      });
-    });
-  });
-});

packages/cli/src/ui/hooks/useSlashCompletion.ts

@@ -1,187 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { useState, useEffect } from 'react';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
-import { CommandContext, SlashCommand } from '../commands/types.js';
-
-export interface UseSlashCompletionProps {
-  enabled: boolean;
-  query: string | null;
-  slashCommands: readonly SlashCommand[];
-  commandContext: CommandContext;
-  setSuggestions: (suggestions: Suggestion[]) => void;
-  setIsLoadingSuggestions: (isLoading: boolean) => void;
-  setIsPerfectMatch: (isMatch: boolean) => void;
-}
-
-export function useSlashCompletion(props: UseSlashCompletionProps): {
-  completionStart: number;
-  completionEnd: number;
-} {
-  const {
-    enabled,
-    query,
-    slashCommands,
-    commandContext,
-    setSuggestions,
-    setIsLoadingSuggestions,
-    setIsPerfectMatch,
-  } = props;
-  const [completionStart, setCompletionStart] = useState(-1);
-  const [completionEnd, setCompletionEnd] = useState(-1);
-
-  useEffect(() => {
-    if (!enabled || query === null) {
-      return;
-    }
-
-    const fullPath = query?.substring(1) || '';
-    const hasTrailingSpace = !!query?.endsWith(' ');
-    const rawParts = fullPath.split(/\s+/).filter((p) => p);
-    let commandPathParts = rawParts;
-    let partial = '';
-
-    if (!hasTrailingSpace && rawParts.length > 0) {
-      partial = rawParts[rawParts.length - 1];
-      commandPathParts = rawParts.slice(0, -1);
-    }
-
-    let currentLevel: readonly SlashCommand[] | undefined = slashCommands;
-    let leafCommand: SlashCommand | null = null;
-
-    for (const part of commandPathParts) {
-      if (!currentLevel) {
-        leafCommand = null;
-        currentLevel = [];
-        break;
-      }
-      const found: SlashCommand | undefined = currentLevel.find(
-        (cmd) => cmd.name === part || cmd.altNames?.includes(part),
-      );
-      if (found) {
-        leafCommand = found;
-        currentLevel = found.subCommands as readonly SlashCommand[] | undefined;
-      } else {
-        leafCommand = null;
-        currentLevel = [];
-        break;
-      }
-    }
-
-    let exactMatchAsParent: SlashCommand | undefined;
-    if (!hasTrailingSpace && currentLevel) {
-      exactMatchAsParent = currentLevel.find(
-        (cmd) =>
-          (cmd.name === partial || cmd.altNames?.includes(partial)) &&
-          cmd.subCommands,
-      );
-
-      if (exactMatchAsParent) {
-        leafCommand = exactMatchAsParent;
-        currentLevel = exactMatchAsParent.subCommands;
-        partial = '';
-      }
-    }
-
-    setIsPerfectMatch(false);
-    if (!hasTrailingSpace) {
-      if (leafCommand && partial === '' && leafCommand.action) {
-        setIsPerfectMatch(true);
-      } else if (currentLevel) {
-        const perfectMatch = currentLevel.find(
-          (cmd) =>
-            (cmd.name === partial || cmd.altNames?.includes(partial)) &&
-            cmd.action,
-        );
-        if (perfectMatch) {
-          setIsPerfectMatch(true);
-        }
-      }
-    }
-
-    const depth = commandPathParts.length;
-    const isArgumentCompletion =
-      leafCommand?.completion &&
-      (hasTrailingSpace ||
-        (rawParts.length > depth && depth > 0 && partial !== ''));
-
-    if (hasTrailingSpace || exactMatchAsParent) {
-      setCompletionStart(query.length);
-      setCompletionEnd(query.length);
-    } else if (partial) {
-      if (isArgumentCompletion) {
-        const commandSoFar = `/${commandPathParts.join(' ')}`;
-        const argStartIndex =
-          commandSoFar.length + (commandPathParts.length > 0 ? 1 : 0);
-        setCompletionStart(argStartIndex);
-      } else {
-        setCompletionStart(query.length - partial.length);
-      }
-      setCompletionEnd(query.length);
-    } else {
-      setCompletionStart(1);
-      setCompletionEnd(query.length);
-    }
-
-    if (isArgumentCompletion) {
-      const fetchAndSetSuggestions = async () => {
-        setIsLoadingSuggestions(true);
-        const argString = rawParts.slice(depth).join(' ');
-        const results =
-          (await leafCommand!.completion!(commandContext, argString)) || [];
-        const finalSuggestions = results.map((s) => ({ label: s, value: s }));
-        setSuggestions(finalSuggestions);
-        setIsLoadingSuggestions(false);
-      };
-      fetchAndSetSuggestions();
-      return;
-    }
-
-    const commandsToSearch = currentLevel || [];
-    if (commandsToSearch.length > 0) {
-      let potentialSuggestions = commandsToSearch.filter(
-        (cmd) =>
-          cmd.description &&
-          (cmd.name.startsWith(partial) ||
-            cmd.altNames?.some((alt) => alt.startsWith(partial))),
-      );
-
-      if (potentialSuggestions.length > 0 && !hasTrailingSpace) {
-        const perfectMatch = potentialSuggestions.find(
-          (s) => s.name === partial || s.altNames?.includes(partial),
-        );
-        if (perfectMatch && perfectMatch.action) {
-          potentialSuggestions = [];
-        }
-      }
-
-      const finalSuggestions = potentialSuggestions.map((cmd) => ({
-        label: cmd.name,
-        value: cmd.name,
-        description: cmd.description,
-      }));
-
-      setSuggestions(finalSuggestions);
-      return;
-    }
-
-    setSuggestions([]);
-  }, [
-    enabled,
-    query,
-    slashCommands,
-    commandContext,
-    setSuggestions,
-    setIsLoadingSuggestions,
-    setIsPerfectMatch,
-  ]);
-
-  return {
-    completionStart,
-    completionEnd,
-  };
-}

packages/cli/src/ui/hooks/vim.test.ts

@@ -1203,9 +1203,7 @@ describe('useVim hook', () => {
         });
 
         // Press escape to clear pending state
-        act(() => {
-          result.current.handleInput({ name: 'escape' });
-        });
+        exitInsertMode(result);
 
         // Now 'w' should just move cursor, not delete
         act(() => {
@@ -1217,69 +1215,6 @@ describe('useVim hook', () => {
         expect(testBuffer.vimMoveWordForward).toHaveBeenCalledWith(1);
       });
     });
-
-    describe('NORMAL mode escape behavior', () => {
-      it('should pass escape through when no pending operator is active', () => {
-        mockVimContext.vimMode = 'NORMAL';
-        const { result } = renderVimHook();
-
-        const handled = result.current.handleInput({ name: 'escape' });
-
-        expect(handled).toBe(false);
-      });
-
-      it('should handle escape and clear pending operator', () => {
-        mockVimContext.vimMode = 'NORMAL';
-        const { result } = renderVimHook();
-
-        act(() => {
-          result.current.handleInput({ sequence: 'd' });
-        });
-
-        let handled: boolean | undefined;
-        act(() => {
-          handled = result.current.handleInput({ name: 'escape' });
-        });
-
-        expect(handled).toBe(true);
-      });
-    });
-  });
-
-  describe('Shell command pass-through', () => {
-    it('should pass through ctrl+r in INSERT mode', () => {
-      mockVimContext.vimMode = 'INSERT';
-      const { result } = renderVimHook();
-
-      const handled = result.current.handleInput({ name: 'r', ctrl: true });
-
-      expect(handled).toBe(false);
-    });
-
-    it('should pass through ! in INSERT mode when buffer is empty', () => {
-      mockVimContext.vimMode = 'INSERT';
-      const emptyBuffer = createMockBuffer('');
-      const { result } = renderVimHook(emptyBuffer);
-
-      const handled = result.current.handleInput({ sequence: '!' });
-
-      expect(handled).toBe(false);
-    });
-
-    it('should handle ! as input in INSERT mode when buffer is not empty', () => {
-      mockVimContext.vimMode = 'INSERT';
-      const nonEmptyBuffer = createMockBuffer('not empty');
-      const { result } = renderVimHook(nonEmptyBuffer);
-      const key = { sequence: '!', name: '!' };
-
-      act(() => {
-        result.current.handleInput(key);
-      });
-
-      expect(nonEmptyBuffer.handleInput).toHaveBeenCalledWith(
-        expect.objectContaining(key),
-      );
-    });
   });
 
   // Line operations (dd, cc) are tested in text-buffer.test.ts

packages/cli/src/ui/hooks/vim.ts

@@ -260,8 +260,7 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         normalizedKey.name === 'tab' ||
         (normalizedKey.name === 'return' && !normalizedKey.ctrl) ||
         normalizedKey.name === 'up' ||
-        normalizedKey.name === 'down' ||
-        (normalizedKey.ctrl && normalizedKey.name === 'r')
+        normalizedKey.name === 'down'
       ) {
         return false; // Let InputPrompt handle completion
       }
@@ -271,11 +270,6 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         return false; // Let InputPrompt handle clipboard functionality
       }
 
-      // Let InputPrompt handle shell commands
-      if (normalizedKey.sequence === '!' && buffer.text.length === 0) {
-        return false;
-      }
-
       // Special handling for Enter key to allow command submission (lower priority than completion)
       if (
         normalizedKey.name === 'return' &&
@@ -405,14 +399,10 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
       // Handle NORMAL mode
       if (state.mode === 'NORMAL') {
-        // If in NORMAL mode, allow escape to pass through to other handlers
-        // if there's no pending operation.
+        // Handle Escape key in NORMAL mode - clear all pending states
         if (normalizedKey.name === 'escape') {
-          if (state.pendingOperator) {
-            dispatch({ type: 'CLEAR_PENDING_STATES' });
-            return true; // Handled by vim
-          }
-          return false; // Pass through to other handlers
+          dispatch({ type: 'CLEAR_PENDING_STATES' });
+          return true; // Handled by vim
         }
 
         // Handle count input (numbers 1-9, and 0 if count > 0)

packages/cli/src/ui/utils/ConsolePatcher.ts

@@ -8,9 +8,8 @@ import util from 'util';
 import { ConsoleMessageItem } from '../types.js';
 
 interface ConsolePatcherParams {
-  onNewMessage?: (message: Omit<ConsoleMessageItem, 'id'>) => void;
+  onNewMessage: (message: Omit<ConsoleMessageItem, 'id'>) => void;
   debugMode: boolean;
-  stderr?: boolean;
 }
 
 export class ConsolePatcher {
@@ -47,22 +46,16 @@ export class ConsolePatcher {
       originalMethod: (...args: unknown[]) => void,
     ) =>
     (...args: unknown[]) => {
-      if (this.params.stderr) {
-        if (type !== 'debug' || this.params.debugMode) {
-          this.originalConsoleError(this.formatArgs(args));
-        }
-      } else {
-        if (this.params.debugMode) {
-          originalMethod.apply(console, args);
-        }
+      if (this.params.debugMode) {
+        originalMethod.apply(console, args);
+      }
 
-        if (type !== 'debug' || this.params.debugMode) {
-          this.params.onNewMessage?.({
-            type,
-            content: this.formatArgs(args),
-            count: 1,
-          });
-        }
+      if (type !== 'debug' || this.params.debugMode) {
+        this.params.onNewMessage({
+          type,
+          content: this.formatArgs(args),
+          count: 1,
+        });
       }
     };
 }

packages/cli/src/utils/resolvePath.ts

@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as os from 'os';
-import * as path from 'path';
-
-export function resolvePath(p: string): string {
-  if (!p) {
-    return '';
-  }
-  let expandedPath = p;
-  if (p.toLowerCase().startsWith('%userprofile%')) {
-    expandedPath = os.homedir() + p.substring('%userprofile%'.length);
-  } else if (p === '~' || p.startsWith('~/')) {
-    expandedPath = os.homedir() + p.substring(1);
-  }
-  return path.normalize(expandedPath);
-}

packages/cli/src/utils/sandbox-macos-permissive-closed.sb

@@ -9,7 +9,7 @@
     (subpath (param "TARGET_DIR"))
     (subpath (param "TMP_DIR"))
     (subpath (param "CACHE_DIR"))
-    (subpath (string-append (param "HOME_DIR") "/.qwen"))
+    (subpath (string-append (param "HOME_DIR") "/.gemini"))
     (subpath (string-append (param "HOME_DIR") "/.npm"))
     (subpath (string-append (param "HOME_DIR") "/.cache"))
     (subpath (string-append (param "HOME_DIR") "/.gitconfig"))

packages/cli/src/utils/sandbox-macos-permissive-open.sb

@@ -9,7 +9,7 @@
     (subpath (param "TARGET_DIR"))
     (subpath (param "TMP_DIR"))
     (subpath (param "CACHE_DIR"))
-    (subpath (string-append (param "HOME_DIR") "/.qwen"))
+    (subpath (string-append (param "HOME_DIR") "/.gemini"))
     (subpath (string-append (param "HOME_DIR") "/.npm"))
     (subpath (string-append (param "HOME_DIR") "/.cache"))
     (subpath (string-append (param "HOME_DIR") "/.gitconfig"))

packages/cli/src/utils/sandbox-macos-permissive-proxied.sb

@@ -9,7 +9,7 @@
     (subpath (param "TARGET_DIR"))
     (subpath (param "TMP_DIR"))
     (subpath (param "CACHE_DIR"))
-    (subpath (string-append (param "HOME_DIR") "/.qwen"))
+    (subpath (string-append (param "HOME_DIR") "/.gemini"))
     (subpath (string-append (param "HOME_DIR") "/.npm"))
     (subpath (string-append (param "HOME_DIR") "/.cache"))
     (subpath (string-append (param "HOME_DIR") "/.gitconfig"))

packages/cli/src/utils/sandbox-macos-restrictive-closed.sb

@@ -67,7 +67,7 @@
     (subpath (param "TARGET_DIR"))
     (subpath (param "TMP_DIR"))
     (subpath (param "CACHE_DIR"))
-    (subpath (string-append (param "HOME_DIR") "/.qwen"))
+    (subpath (string-append (param "HOME_DIR") "/.gemini"))
     (subpath (string-append (param "HOME_DIR") "/.npm"))
     (subpath (string-append (param "HOME_DIR") "/.cache"))
     (subpath (string-append (param "HOME_DIR") "/.gitconfig"))

packages/cli/src/utils/sandbox-macos-restrictive-open.sb

@@ -67,7 +67,7 @@
     (subpath (param "TARGET_DIR"))
     (subpath (param "TMP_DIR"))
     (subpath (param "CACHE_DIR"))
-    (subpath (string-append (param "HOME_DIR") "/.qwen"))
+    (subpath (string-append (param "HOME_DIR") "/.gemini"))
     (subpath (string-append (param "HOME_DIR") "/.npm"))
     (subpath (string-append (param "HOME_DIR") "/.cache"))
     (subpath (string-append (param "HOME_DIR") "/.gitconfig"))

packages/cli/src/utils/sandbox-macos-restrictive-proxied.sb

@@ -67,7 +67,7 @@
     (subpath (param "TARGET_DIR"))
     (subpath (param "TMP_DIR"))
     (subpath (param "CACHE_DIR"))
-    (subpath (string-append (param "HOME_DIR") "/.qwen"))
+    (subpath (string-append (param "HOME_DIR") "/.gemini"))
     (subpath (string-append (param "HOME_DIR") "/.npm"))
     (subpath (string-append (param "HOME_DIR") "/.cache"))
     (subpath (string-append (param "HOME_DIR") "/.gitconfig"))

packages/cli/src/utils/sandbox.ts

@@ -562,10 +562,6 @@ export async function start_sandbox(
   if (process.env.OPENAI_API_KEY) {
     args.push('--env', `OPENAI_API_KEY=${process.env.OPENAI_API_KEY}`);
   }
-  // copy TAVILY_API_KEY for web search tool
-  if (process.env.TAVILY_API_KEY) {
-    args.push('--env', `TAVILY_API_KEY=${process.env.TAVILY_API_KEY}`);
-  }
   if (process.env.OPENAI_BASE_URL) {
     args.push('--env', `OPENAI_BASE_URL=${process.env.OPENAI_BASE_URL}`);
   }

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code-core",
-  "version": "0.0.7-nightly.1",
+  "version": "0.0.5",
   "description": "Qwen Code Core",
   "repository": {
     "type": "git",
@@ -33,18 +33,15 @@
     "chardet": "^2.1.0",
     "diff": "^7.0.0",
     "dotenv": "^17.1.0",
-    "fdir": "^6.4.6",
     "glob": "^10.4.5",
     "google-auth-library": "^9.11.0",
     "html-to-text": "^9.0.5",
     "https-proxy-agent": "^7.0.6",
     "ignore": "^7.0.0",
-    "jsonrepair": "^3.13.0",
     "marked": "^15.0.12",
     "micromatch": "^4.0.8",
     "open": "^10.1.2",
-    "openai": "5.11.0",
-    "picomatch": "^4.0.1",
+    "openai": "^5.7.0",
     "shell-quote": "^1.8.3",
     "simple-git": "^3.28.0",
     "strip-ansi": "^7.1.0",
@@ -53,12 +50,10 @@
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@qwen-code/qwen-code-test-utils": "file:../test-utils",
     "@types/diff": "^7.0.2",
     "@types/dotenv": "^6.1.1",
     "@types/micromatch": "^4.0.8",
     "@types/minimatch": "^5.1.2",
-    "@types/picomatch": "^4.0.1",
     "@types/ws": "^8.5.10",
     "typescript": "^5.3.3",
     "vitest": "^3.1.1"

packages/core/src/config/config.test.ts

@@ -18,18 +18,7 @@ import {
 } from '../core/contentGenerator.js';
 import { GeminiClient } from '../core/client.js';
 import { GitService } from '../services/gitService.js';
-
-vi.mock('fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('fs')>();
-  return {
-    ...actual,
-    existsSync: vi.fn().mockReturnValue(true),
-    statSync: vi.fn().mockReturnValue({
-      isDirectory: vi.fn().mockReturnValue(true),
-    }),
-    realpathSync: vi.fn((path) => path),
-  };
-});
+import { IdeClient } from '../ide/ide-client.js';
 
 vi.mock('fs', async (importOriginal) => {
   const actual = await importOriginal<typeof import('fs')>();
@@ -71,8 +60,8 @@ vi.mock('../tools/read-many-files');
 vi.mock('../tools/memoryTool', () => ({
   MemoryTool: vi.fn(),
   setGeminiMdFilename: vi.fn(),
-  getCurrentGeminiMdFilename: vi.fn(() => 'QWEN.md'), // Mock the original filename
-  DEFAULT_CONTEXT_FILENAME: 'QWEN.md',
+  getCurrentGeminiMdFilename: vi.fn(() => 'GEMINI.md'), // Mock the original filename
+  DEFAULT_CONTEXT_FILENAME: 'GEMINI.md',
   GEMINI_CONFIG_DIR: '.gemini',
 }));
 
@@ -131,6 +120,7 @@ describe('Server Config (config.ts)', () => {
     telemetry: TELEMETRY_SETTINGS,
     sessionId: SESSION_ID,
     model: MODEL,
+    ideClient: IdeClient.getInstance(false),
   };
 
   beforeEach(() => {

packages/core/src/config/config.ts

@@ -43,13 +43,11 @@ import {
   DEFAULT_GEMINI_EMBEDDING_MODEL,
   DEFAULT_GEMINI_FLASH_MODEL,
 } from './models.js';
-import { QwenLogger } from '../telemetry/qwen-logger/qwen-logger.js';
+import { ClearcutLogger } from '../telemetry/clearcut-logger/clearcut-logger.js';
 import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
 import { MCPOAuthConfig } from '../mcp/oauth-provider.js';
 import { IdeClient } from '../ide/ide-client.js';
 import type { Content } from '@google/genai';
-import { logIdeConnection } from '../telemetry/loggers.js';
-import { IdeConnectionEvent, IdeConnectionType } from '../telemetry/types.js';
 
 // Re-export OAuth config type
 export type { MCPOAuthConfig };
@@ -198,6 +196,7 @@ export interface ConfigParameters {
   summarizeToolOutput?: Record<string, SummarizeToolOutputSettings>;
   ideModeFeature?: boolean;
   ideMode?: boolean;
+  ideClient?: IdeClient;
   enableOpenAILogging?: boolean;
   sampling_params?: Record<string, unknown>;
   systemPromptMappings?: Array<{
@@ -209,10 +208,6 @@ export interface ConfigParameters {
     timeout?: number;
     maxRetries?: number;
   };
-  cliVersion?: string;
-  loadMemoryFromIncludeDirectories?: boolean;
-  // Web search providers
-  tavilyApiKey?: string;
 }
 
 export class Config {
@@ -286,10 +281,6 @@ export class Config {
     timeout?: number;
     maxRetries?: number;
   };
-  private readonly cliVersion?: string;
-  private readonly loadMemoryFromIncludeDirectories: boolean = false;
-  private readonly tavilyApiKey?: string;
-
   constructor(params: ConfigParameters) {
     this.sessionId = params.sessionId;
     this.embeddingModel =
@@ -352,22 +343,13 @@ export class Config {
     this.summarizeToolOutput = params.summarizeToolOutput;
     this.ideModeFeature = params.ideModeFeature ?? false;
     this.ideMode = params.ideMode ?? false;
-    this.ideClient = IdeClient.getInstance();
-    if (this.ideMode && this.ideModeFeature) {
-      this.ideClient.connect();
-      logIdeConnection(this, new IdeConnectionEvent(IdeConnectionType.START));
-    }
+    this.ideClient =
+      params.ideClient ??
+      IdeClient.getInstance(this.ideMode && this.ideModeFeature);
     this.systemPromptMappings = params.systemPromptMappings;
     this.enableOpenAILogging = params.enableOpenAILogging ?? false;
     this.sampling_params = params.sampling_params;
     this.contentGenerator = params.contentGenerator;
-    this.cliVersion = params.cliVersion;
-
-    this.loadMemoryFromIncludeDirectories =
-      params.loadMemoryFromIncludeDirectories ?? false;
-
-    // Web search
-    this.tavilyApiKey = params.tavilyApiKey;
 
     if (params.contextFileName) {
       setGeminiMdFilename(params.contextFileName);
@@ -378,7 +360,7 @@ export class Config {
     }
 
     if (this.getUsageStatisticsEnabled()) {
-      QwenLogger.getInstance(this)?.logStartSessionEvent(
+      ClearcutLogger.getInstance(this)?.logStartSessionEvent(
         new StartSessionEvent(this),
       );
     } else {
@@ -430,10 +412,6 @@ export class Config {
     return this.sessionId;
   }
 
-  shouldLoadMemoryFromIncludeDirectories(): boolean {
-    return this.loadMemoryFromIncludeDirectories;
-  }
-
   getContentGeneratorConfig(): ContentGeneratorConfig {
     return this.contentGeneratorConfig;
   }
@@ -701,11 +679,6 @@ export class Config {
     return this.summarizeToolOutput;
   }
 
-  // Web search provider configuration
-  getTavilyApiKey(): string | undefined {
-    return this.tavilyApiKey;
-  }
-
   getIdeModeFeature(): boolean {
     return this.ideModeFeature;
   }
@@ -722,14 +695,12 @@ export class Config {
     this.ideMode = value;
   }
 
-  async setIdeModeAndSyncConnection(value: boolean): Promise<void> {
-    this.ideMode = value;
-    if (value) {
-      await this.ideClient.connect();
-      logIdeConnection(this, new IdeConnectionEvent(IdeConnectionType.SESSION));
-    } else {
-      this.ideClient.disconnect();
-    }
+  setIdeClientDisconnected(): void {
+    this.ideClient.setDisconnected();
+  }
+
+  setIdeClientConnected(): void {
+    this.ideClient.reconnect(this.ideMode && this.ideModeFeature);
   }
 
   getEnableOpenAILogging(): boolean {
@@ -748,10 +719,6 @@ export class Config {
     return this.contentGenerator?.maxRetries;
   }
 
-  getCliVersion(): string | undefined {
-    return this.cliVersion;
-  }
-
   getSystemPromptMappings():
     | Array<{
         baseUrls?: string[];
@@ -816,10 +783,7 @@ export class Config {
     registerCoreTool(ReadManyFilesTool, this);
     registerCoreTool(ShellTool, this);
     registerCoreTool(MemoryTool);
-    // Conditionally register web search tool only if Tavily API key is set
-    if (this.getTavilyApiKey()) {
-      registerCoreTool(WebSearchTool, this);
-    }
+    registerCoreTool(WebSearchTool, this);
 
     await registry.discoverAllTools();
     return registry;

packages/core/src/config/flashFallback.test.ts

@@ -7,6 +7,7 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { Config } from './config.js';
 import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL } from './models.js';
+import { IdeClient } from '../ide/ide-client.js';
 import fs from 'node:fs';
 
 vi.mock('node:fs');
@@ -25,6 +26,7 @@ describe('Flash Model Fallback Configuration', () => {
       debugMode: false,
       cwd: '/test',
       model: DEFAULT_GEMINI_MODEL,
+      ideClient: IdeClient.getInstance(false),
     });
 
     // Initialize contentGeneratorConfig for testing
@@ -49,6 +51,7 @@ describe('Flash Model Fallback Configuration', () => {
         debugMode: false,
         cwd: '/test',
         model: DEFAULT_GEMINI_MODEL,
+        ideClient: IdeClient.getInstance(false),
       });
 
       // Should not crash when contentGeneratorConfig is undefined
@@ -72,6 +75,7 @@ describe('Flash Model Fallback Configuration', () => {
         debugMode: false,
         cwd: '/test',
         model: 'custom-model',
+        ideClient: IdeClient.getInstance(false),
       });
 
       expect(newConfig.getModel()).toBe('custom-model');

packages/core/src/config/models.ts

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const DEFAULT_QWEN_MODEL = 'qwen3-coder-plus';
-// We do not have a fallback model for now, but note it here anyway.
-export const DEFAULT_QWEN_FLASH_MODEL = 'qwen3-coder-flash';
-
 export const DEFAULT_GEMINI_MODEL = 'qwen3-coder-plus';
 export const DEFAULT_GEMINI_FLASH_MODEL = 'gemini-2.5-flash';
 export const DEFAULT_GEMINI_FLASH_LITE_MODEL = 'gemini-2.5-flash-lite';

packages/core/src/core/__tests__/openaiTimeoutHandling.test.ts

@@ -15,7 +15,6 @@ vi.mock('openai');
 // Mock logger modules
 vi.mock('../../telemetry/loggers.js', () => ({
   logApiResponse: vi.fn(),
-  logApiError: vi.fn(),
 }));
 
 vi.mock('../../utils/openaiLogger.js', () => ({
@@ -45,7 +44,6 @@ describe('OpenAIContentGenerator Timeout Handling', () => {
         timeout: 120000,
         maxRetries: 3,
       }),
-      getCliVersion: vi.fn().mockReturnValue('1.0.0'),
     } as unknown as Config;
 
     // Mock OpenAI client
@@ -257,7 +255,6 @@ describe('OpenAIContentGenerator Timeout Handling', () => {
           timeout: 300000, // 5 minutes
           maxRetries: 5,
         }),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
       } as unknown as Config;
 
       new OpenAIContentGenerator('test-key', 'gpt-4', customConfig);
@@ -276,7 +273,6 @@ describe('OpenAIContentGenerator Timeout Handling', () => {
     it('should handle missing timeout config gracefully', () => {
       const noTimeoutConfig = {
         getContentGeneratorConfig: vi.fn().mockReturnValue({}),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
       } as unknown as Config;
 
       new OpenAIContentGenerator('test-key', 'gpt-4', noTimeoutConfig);
@@ -294,18 +290,28 @@ describe('OpenAIContentGenerator Timeout Handling', () => {
   });
 
   describe('token estimation on timeout', () => {
-    it('should surface a clear timeout error when request times out', async () => {
+    it('should estimate tokens even when request times out', async () => {
       const timeoutError = new Error('Request timeout');
       mockOpenAIClient.chat.completions.create.mockRejectedValue(timeoutError);
 
+      // Mock countTokens to return a value
+      const mockCountTokens = vi.spyOn(generator, 'countTokens');
+      mockCountTokens.mockResolvedValue({ totalTokens: 100 });
+
       const request = {
         contents: [{ role: 'user' as const, parts: [{ text: 'Hello world' }] }],
         model: 'gpt-4',
       };
 
-      await expect(
-        generator.generateContent(request, 'test-prompt-id'),
-      ).rejects.toThrow(/Request timeout after \d+s/);
+      try {
+        await generator.generateContent(request, 'test-prompt-id');
+      } catch (_error) {
+        // Verify that countTokens was called for estimation
+        expect(mockCountTokens).toHaveBeenCalledWith({
+          contents: request.contents,
+          model: 'gpt-4',
+        });
+      }
     });
 
     it('should fall back to character-based estimation if countTokens fails', async () => {

packages/core/src/core/client.test.ts

@@ -228,7 +228,6 @@ describe('Gemini Client (client.ts)', () => {
       getGeminiClient: vi.fn(),
       setFallbackMode: vi.fn(),
       getDebugMode: vi.fn().mockReturnValue(false),
-      getCliVersion: vi.fn().mockReturnValue('1.0.0'),
     };
     const MockedConfig = vi.mocked(Config, true);
     MockedConfig.mockImplementation(

packages/core/src/core/contentGenerator.test.ts

@@ -17,9 +17,7 @@ import { Config } from '../config/config.js';
 vi.mock('../code_assist/codeAssist.js');
 vi.mock('@google/genai');
 
-const mockConfig = {
-  getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-} as unknown as Config;
+const mockConfig = {} as unknown as Config;
 
 describe('createContentGenerator', () => {
   it('should create a CodeAssistContentGenerator', async () => {
@@ -75,7 +73,6 @@ describe('createContentGeneratorConfig', () => {
     getSamplingParams: vi.fn().mockReturnValue(undefined),
     getContentGeneratorTimeout: vi.fn().mockReturnValue(undefined),
     getContentGeneratorMaxRetries: vi.fn().mockReturnValue(undefined),
-    getCliVersion: vi.fn().mockReturnValue('1.0.0'),
   } as unknown as Config;
 
   beforeEach(() => {

packages/core/src/core/contentGenerator.ts

@@ -14,7 +14,7 @@ import {
   GoogleGenAI,
 } from '@google/genai';
 import { createCodeAssistContentGenerator } from '../code_assist/codeAssist.js';
-import { DEFAULT_GEMINI_MODEL, DEFAULT_QWEN_MODEL } from '../config/models.js';
+import { DEFAULT_GEMINI_MODEL } from '../config/models.js';
 import { Config } from '../config/config.js';
 import { getEffectiveModel } from './modelCheck.js';
 import { UserTierId } from '../code_assist/types.js';
@@ -136,9 +136,7 @@ export function createContentGeneratorConfig(
     // For Qwen OAuth, we'll handle the API key dynamically in createContentGenerator
     // Set a special marker to indicate this is Qwen OAuth
     contentGeneratorConfig.apiKey = 'QWEN_OAUTH_DYNAMIC_TOKEN';
-
-    // Prefer to use qwen3-coder-plus as the default Qwen model if QWEN_MODEL is not set.
-    contentGeneratorConfig.model = process.env.QWEN_MODEL || DEFAULT_QWEN_MODEL;
+    contentGeneratorConfig.model = config.getModel() || DEFAULT_GEMINI_MODEL;
 
     return contentGeneratorConfig;
   }
@@ -151,7 +149,7 @@ export async function createContentGenerator(
   gcConfig: Config,
   sessionId?: string,
 ): Promise<ContentGenerator> {
-  const version = gcConfig.getCliVersion() || 'unknown';
+  const version = process.env.CLI_VERSION || process.version;
   const httpOptions = {
     headers: {
       'User-Agent': `GeminiCLI/${version} (${process.platform}; ${process.arch})`,

packages/core/src/core/coreToolScheduler.test.ts

@@ -136,7 +136,6 @@ describe('CoreToolScheduler', () => {
       onAllToolCallsComplete,
       onToolCallsUpdate,
       getPreferredEditor: () => 'vscode',
-      onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
@@ -206,7 +205,6 @@ describe('CoreToolScheduler with payload', () => {
       onAllToolCallsComplete,
       onToolCallsUpdate,
       getPreferredEditor: () => 'vscode',
-      onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
@@ -484,7 +482,6 @@ describe('CoreToolScheduler edit cancellation', () => {
       onAllToolCallsComplete,
       onToolCallsUpdate,
       getPreferredEditor: () => 'vscode',
-      onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
@@ -574,7 +571,6 @@ describe('CoreToolScheduler YOLO mode', () => {
       onAllToolCallsComplete,
       onToolCallsUpdate,
       getPreferredEditor: () => 'vscode',
-      onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();

packages/core/src/core/coreToolScheduler.ts

@@ -224,7 +224,6 @@ interface CoreToolSchedulerOptions {
   onToolCallsUpdate?: ToolCallsUpdateHandler;
   getPreferredEditor: () => EditorType | undefined;
   config: Config;
-  onEditorClose: () => void;
 }
 
 export class CoreToolScheduler {
@@ -235,7 +234,6 @@ export class CoreToolScheduler {
   private onToolCallsUpdate?: ToolCallsUpdateHandler;
   private getPreferredEditor: () => EditorType | undefined;
   private config: Config;
-  private onEditorClose: () => void;
 
   constructor(options: CoreToolSchedulerOptions) {
     this.config = options.config;
@@ -244,7 +242,6 @@ export class CoreToolScheduler {
     this.onAllToolCallsComplete = options.onAllToolCallsComplete;
     this.onToolCallsUpdate = options.onToolCallsUpdate;
     this.getPreferredEditor = options.getPreferredEditor;
-    this.onEditorClose = options.onEditorClose;
   }
 
   private setStatusInternal(
@@ -566,7 +563,6 @@ export class CoreToolScheduler {
           modifyContext as ModifyContext<typeof waitingToolCall.request.args>,
           editorType,
           signal,
-          this.onEditorClose,
         );
         this.setArgsInternal(callId, updatedParams);
         this.setStatusInternal(callId, 'awaiting_approval', {

packages/core/src/core/geminiChat.ts

@@ -158,23 +158,14 @@ export class GeminiChat {
     prompt_id: string,
     usageMetadata?: GenerateContentResponseUsageMetadata,
     responseText?: string,
-    responseId?: string,
   ): Promise<void> {
-    const authType = this.config.getContentGeneratorConfig()?.authType;
-
-    // Don't log API responses for openaiContentGenerator
-    if (authType === AuthType.QWEN_OAUTH || authType === AuthType.USE_OPENAI) {
-      return;
-    }
-
     logApiResponse(
       this.config,
       new ApiResponseEvent(
-        responseId || `gemini-${Date.now()}`,
         this.config.getModel(),
         durationMs,
         prompt_id,
-        authType,
+        this.config.getContentGeneratorConfig()?.authType,
         usageMetadata,
         responseText,
       ),
@@ -185,27 +176,18 @@ export class GeminiChat {
     durationMs: number,
     error: unknown,
     prompt_id: string,
-    responseId?: string,
   ): void {
     const errorMessage = error instanceof Error ? error.message : String(error);
     const errorType = error instanceof Error ? error.name : 'unknown';
 
-    const authType = this.config.getContentGeneratorConfig()?.authType;
-
-    // Don't log API errors for openaiContentGenerator
-    if (authType === AuthType.QWEN_OAUTH || authType === AuthType.USE_OPENAI) {
-      return;
-    }
-
     logApiError(
       this.config,
       new ApiErrorEvent(
-        responseId,
         this.config.getModel(),
         errorMessage,
         durationMs,
         prompt_id,
-        authType,
+        this.config.getContentGeneratorConfig()?.authType,
         errorType,
       ),
     );
@@ -338,7 +320,6 @@ export class GeminiChat {
         prompt_id,
         response.usageMetadata,
         JSON.stringify(response),
-        response.responseId,
       );
 
       this.sendPromise = (async () => {
@@ -582,7 +563,6 @@ export class GeminiChat {
         prompt_id,
         this.getFinalUsageMetadata(chunks),
         JSON.stringify(chunks),
-        chunks[chunks.length - 1]?.responseId,
       );
     }
     this.recordHistory(inputContent, outputContent);

packages/core/src/core/openaiContentGenerator.test.ts

@@ -23,7 +23,6 @@ vi.mock('openai');
 // Mock logger modules
 vi.mock('../telemetry/loggers.js', () => ({
   logApiResponse: vi.fn(),
-  logApiError: vi.fn(),
 }));
 
 vi.mock('../utils/openaiLogger.js', () => ({
@@ -66,7 +65,6 @@ describe('OpenAIContentGenerator', () => {
           top_p: 0.9,
         },
       }),
-      getCliVersion: vi.fn().mockReturnValue('1.0.0'),
     } as unknown as Config;
 
     // Mock OpenAI client
@@ -144,7 +142,6 @@ describe('OpenAIContentGenerator', () => {
           timeout: 300000,
           maxRetries: 5,
         }),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
       } as unknown as Config;
 
       new OpenAIContentGenerator('test-key', 'gpt-4', customConfig);
@@ -903,7 +900,6 @@ describe('OpenAIContentGenerator', () => {
         getContentGeneratorConfig: vi.fn().mockReturnValue({
           enableOpenAILogging: true,
         }),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
       } as unknown as Config;
 
       const loggingGenerator = new OpenAIContentGenerator(
@@ -1026,7 +1022,6 @@ describe('OpenAIContentGenerator', () => {
         getContentGeneratorConfig: vi.fn().mockReturnValue({
           enableOpenAILogging: true,
         }),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
       } as unknown as Config;
 
       const loggingGenerator = new OpenAIContentGenerator(
@@ -1160,90 +1155,6 @@ describe('OpenAIContentGenerator', () => {
       );
     });
 
-    it('should handle MCP tools with parametersJsonSchema', async () => {
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'gpt-4',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Test' }] }],
-        model: 'gpt-4',
-        config: {
-          tools: [
-            {
-              callTool: vi.fn(),
-              tool: () =>
-                Promise.resolve({
-                  functionDeclarations: [
-                    {
-                      name: 'list-items',
-                      description: 'Get a list of items',
-                      parametersJsonSchema: {
-                        type: 'object',
-                        properties: {
-                          page_number: {
-                            type: 'number',
-                            description: 'Page number',
-                          },
-                          page_size: {
-                            type: 'number',
-                            description: 'Number of items per page',
-                          },
-                        },
-                        additionalProperties: false,
-                        $schema: 'http://json-schema.org/draft-07/schema#',
-                      },
-                    },
-                  ],
-                }),
-            } as unknown as CallableTool,
-          ],
-        },
-      };
-
-      await generator.generateContent(request, 'test-prompt-id');
-
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.objectContaining({
-          tools: [
-            {
-              type: 'function',
-              function: {
-                name: 'list-items',
-                description: 'Get a list of items',
-                parameters: {
-                  type: 'object',
-                  properties: {
-                    page_number: {
-                      type: 'number',
-                      description: 'Page number',
-                    },
-                    page_size: {
-                      type: 'number',
-                      description: 'Number of items per page',
-                    },
-                  },
-                  additionalProperties: false,
-                  $schema: 'http://json-schema.org/draft-07/schema#',
-                },
-              },
-            },
-          ],
-        }),
-      );
-    });
-
     it('should handle nested parameter objects', async () => {
       const mockResponse = {
         id: 'chatcmpl-123',
@@ -1905,7 +1816,6 @@ describe('OpenAIContentGenerator', () => {
             max_tokens: 500,
           },
         }),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
       } as unknown as Config;
 
       const loggingGenerator = new OpenAIContentGenerator(
@@ -2090,7 +2000,6 @@ describe('OpenAIContentGenerator', () => {
         getContentGeneratorConfig: vi.fn().mockReturnValue({
           enableOpenAILogging: true,
         }),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
       } as unknown as Config;
 
       const loggingGenerator = new OpenAIContentGenerator(
@@ -2347,7 +2256,6 @@ describe('OpenAIContentGenerator', () => {
             top_p: undefined,
           },
         }),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
       } as unknown as Config;
 
       const testGenerator = new OpenAIContentGenerator(
@@ -2405,7 +2313,6 @@ describe('OpenAIContentGenerator', () => {
             frequency_penalty: 0.3,
           },
         }),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
       } as unknown as Config;
 
       const testGenerator = new OpenAIContentGenerator(
@@ -2477,616 +2384,4 @@ describe('OpenAIContentGenerator', () => {
       consoleSpy.mockRestore();
     });
   });
-
-  describe('metadata control', () => {
-    it('should include metadata when authType is QWEN_OAUTH', async () => {
-      const qwenConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: 'qwen-oauth',
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue('test-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const qwenGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'qwen-turbo',
-        qwenConfig,
-      );
-
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'qwen-turbo',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'qwen-turbo',
-      };
-
-      await qwenGenerator.generateContent(request, 'test-prompt-id');
-
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.objectContaining({
-          metadata: {
-            sessionId: 'test-session-id',
-            promptId: 'test-prompt-id',
-          },
-        }),
-      );
-    });
-
-    it('should include metadata when baseURL is dashscope openai compatible mode', async () => {
-      // Mock environment to set dashscope base URL BEFORE creating the generator
-      vi.stubEnv(
-        'OPENAI_BASE_URL',
-        'https://dashscope.aliyuncs.com/compatible-mode/v1',
-      );
-
-      const dashscopeConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: 'openai', // Not QWEN_OAUTH
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue('dashscope-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const dashscopeGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'qwen-turbo',
-        dashscopeConfig,
-      );
-
-      // Debug: Check if the client was created with the correct baseURL
-      expect(vi.mocked(OpenAI)).toHaveBeenCalledWith(
-        expect.objectContaining({
-          baseURL: 'https://dashscope.aliyuncs.com/compatible-mode/v1',
-        }),
-      );
-
-      // Mock the client's baseURL property to return the expected value
-      Object.defineProperty(dashscopeGenerator['client'], 'baseURL', {
-        value: 'https://dashscope.aliyuncs.com/compatible-mode/v1',
-        writable: true,
-      });
-
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'qwen-turbo',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'qwen-turbo',
-      };
-
-      await dashscopeGenerator.generateContent(request, 'dashscope-prompt-id');
-
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.objectContaining({
-          metadata: {
-            sessionId: 'dashscope-session-id',
-            promptId: 'dashscope-prompt-id',
-          },
-        }),
-      );
-    });
-
-    it('should NOT include metadata for regular OpenAI providers', async () => {
-      const regularConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: 'openai',
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue('regular-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const regularGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'gpt-4',
-        regularConfig,
-      );
-
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'gpt-4',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'gpt-4',
-      };
-
-      await regularGenerator.generateContent(request, 'regular-prompt-id');
-
-      // Should NOT include metadata
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.not.objectContaining({
-          metadata: expect.any(Object),
-        }),
-      );
-    });
-
-    it('should NOT include metadata for other auth types', async () => {
-      const otherAuthConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: 'gemini-api-key',
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue('other-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const otherGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'gpt-4',
-        otherAuthConfig,
-      );
-
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'gpt-4',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'gpt-4',
-      };
-
-      await otherGenerator.generateContent(request, 'other-prompt-id');
-
-      // Should NOT include metadata
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.not.objectContaining({
-          metadata: expect.any(Object),
-        }),
-      );
-    });
-
-    it('should NOT include metadata for other base URLs', async () => {
-      // Mock environment to set a different base URL
-      vi.stubEnv('OPENAI_BASE_URL', 'https://api.openai.com/v1');
-
-      const otherBaseUrlConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: 'openai',
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue('other-base-url-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const otherBaseUrlGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'gpt-4',
-        otherBaseUrlConfig,
-      );
-
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'gpt-4',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'gpt-4',
-      };
-
-      await otherBaseUrlGenerator.generateContent(
-        request,
-        'other-base-url-prompt-id',
-      );
-
-      // Should NOT include metadata
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.not.objectContaining({
-          metadata: expect.any(Object),
-        }),
-      );
-    });
-
-    it('should include metadata in streaming requests when conditions are met', async () => {
-      const qwenConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: 'qwen-oauth',
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue('streaming-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const qwenGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'qwen-turbo',
-        qwenConfig,
-      );
-
-      const mockStream = [
-        {
-          id: 'chatcmpl-123',
-          choices: [
-            {
-              index: 0,
-              delta: { content: 'Hello' },
-              finish_reason: null,
-            },
-          ],
-          created: 1677652288,
-        },
-        {
-          id: 'chatcmpl-123',
-          choices: [
-            {
-              index: 0,
-              delta: { content: ' there!' },
-              finish_reason: 'stop',
-            },
-          ],
-          created: 1677652288,
-        },
-      ];
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue({
-        async *[Symbol.asyncIterator]() {
-          for (const chunk of mockStream) {
-            yield chunk;
-          }
-        },
-      });
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'qwen-turbo',
-      };
-
-      const stream = await qwenGenerator.generateContentStream(
-        request,
-        'streaming-prompt-id',
-      );
-
-      // Verify metadata was included in the streaming request
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.objectContaining({
-          metadata: {
-            sessionId: 'streaming-session-id',
-            promptId: 'streaming-prompt-id',
-          },
-          stream: true,
-          stream_options: { include_usage: true },
-        }),
-      );
-
-      // Consume the stream to complete the test
-      const responses = [];
-      for await (const response of stream) {
-        responses.push(response);
-      }
-      expect(responses).toHaveLength(2);
-    });
-
-    it('should NOT include metadata in streaming requests when conditions are not met', async () => {
-      const regularConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: 'openai',
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue('regular-streaming-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const regularGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'gpt-4',
-        regularConfig,
-      );
-
-      const mockStream = [
-        {
-          id: 'chatcmpl-123',
-          choices: [
-            {
-              index: 0,
-              delta: { content: 'Hello' },
-              finish_reason: null,
-            },
-          ],
-          created: 1677652288,
-        },
-        {
-          id: 'chatcmpl-123',
-          choices: [
-            {
-              index: 0,
-              delta: { content: ' there!' },
-              finish_reason: 'stop',
-            },
-          ],
-          created: 1677652288,
-        },
-      ];
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue({
-        async *[Symbol.asyncIterator]() {
-          for (const chunk of mockStream) {
-            yield chunk;
-          }
-        },
-      });
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'gpt-4',
-      };
-
-      const stream = await regularGenerator.generateContentStream(
-        request,
-        'regular-streaming-prompt-id',
-      );
-
-      // Verify metadata was NOT included in the streaming request
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.not.objectContaining({
-          metadata: expect.any(Object),
-        }),
-      );
-
-      // Consume the stream to complete the test
-      const responses = [];
-      for await (const response of stream) {
-        responses.push(response);
-      }
-      expect(responses).toHaveLength(2);
-    });
-
-    it('should handle undefined sessionId gracefully', async () => {
-      const qwenConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: 'qwen-oauth',
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue(undefined), // Undefined session ID
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const qwenGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'qwen-turbo',
-        qwenConfig,
-      );
-
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'qwen-turbo',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'qwen-turbo',
-      };
-
-      await qwenGenerator.generateContent(
-        request,
-        'undefined-session-prompt-id',
-      );
-
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.objectContaining({
-          metadata: {
-            sessionId: undefined,
-            promptId: 'undefined-session-prompt-id',
-          },
-        }),
-      );
-    });
-
-    it('should handle undefined baseURL gracefully', async () => {
-      // Ensure no base URL is set
-      vi.stubEnv('OPENAI_BASE_URL', '');
-
-      const noBaseUrlConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: 'openai',
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue('no-base-url-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const noBaseUrlGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'gpt-4',
-        noBaseUrlConfig,
-      );
-
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'gpt-4',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'gpt-4',
-      };
-
-      await noBaseUrlGenerator.generateContent(
-        request,
-        'no-base-url-prompt-id',
-      );
-
-      // Should NOT include metadata when baseURL is empty
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.not.objectContaining({
-          metadata: expect.any(Object),
-        }),
-      );
-    });
-
-    it('should handle undefined authType gracefully', async () => {
-      const undefinedAuthConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue({
-          authType: undefined, // Undefined auth type
-          enableOpenAILogging: false,
-        }),
-        getSessionId: vi.fn().mockReturnValue('undefined-auth-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const undefinedAuthGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'gpt-4',
-        undefinedAuthConfig,
-      );
-
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'gpt-4',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'gpt-4',
-      };
-
-      await undefinedAuthGenerator.generateContent(
-        request,
-        'undefined-auth-prompt-id',
-      );
-
-      // Should NOT include metadata when authType is undefined
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.not.objectContaining({
-          metadata: expect.any(Object),
-        }),
-      );
-    });
-
-    it('should handle undefined config gracefully', async () => {
-      const undefinedConfig = {
-        getContentGeneratorConfig: vi.fn().mockReturnValue(undefined), // Undefined config
-        getSessionId: vi.fn().mockReturnValue('undefined-config-session-id'),
-        getCliVersion: vi.fn().mockReturnValue('1.0.0'),
-      } as unknown as Config;
-
-      const undefinedConfigGenerator = new OpenAIContentGenerator(
-        'test-key',
-        'gpt-4',
-        undefinedConfig,
-      );
-
-      const mockResponse = {
-        id: 'chatcmpl-123',
-        choices: [
-          {
-            index: 0,
-            message: { role: 'assistant', content: 'Response' },
-            finish_reason: 'stop',
-          },
-        ],
-        created: 1677652288,
-        model: 'gpt-4',
-      };
-
-      mockOpenAIClient.chat.completions.create.mockResolvedValue(mockResponse);
-
-      const request: GenerateContentParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'gpt-4',
-      };
-
-      await undefinedConfigGenerator.generateContent(
-        request,
-        'undefined-config-prompt-id',
-      );
-
-      // Should NOT include metadata when config is undefined
-      expect(mockOpenAIClient.chat.completions.create).toHaveBeenCalledWith(
-        expect.not.objectContaining({
-          metadata: expect.any(Object),
-        }),
-      );
-    });
-  });
 });

packages/core/src/core/openaiContentGenerator.ts

@@ -20,13 +20,12 @@ import {
   FunctionCall,
   FunctionResponse,
 } from '@google/genai';
-import { AuthType, ContentGenerator } from './contentGenerator.js';
+import { ContentGenerator } from './contentGenerator.js';
 import OpenAI from 'openai';
-import { logApiError, logApiResponse } from '../telemetry/loggers.js';
-import { ApiErrorEvent, ApiResponseEvent } from '../telemetry/types.js';
+import { logApiResponse } from '../telemetry/loggers.js';
+import { ApiResponseEvent } from '../telemetry/types.js';
 import { Config } from '../config/config.js';
 import { openaiLogger } from '../utils/openaiLogger.js';
-import { safeJsonParse } from '../utils/safeJsonParse.js';
 
 // OpenAI API type definitions for logging
 interface OpenAIToolCall {
@@ -115,7 +114,8 @@ export class OpenAIContentGenerator implements ContentGenerator {
       timeoutConfig.maxRetries = contentGeneratorConfig.maxRetries;
     }
 
-    const version = config.getCliVersion() || 'unknown';
+    // Set up User-Agent header (same format as contentGenerator.ts)
+    const version = process.env.CLI_VERSION || process.version;
     const userAgent = `QwenCode/${version} (${process.platform}; ${process.arch})`;
 
     // Check if using OpenRouter and add required headers
@@ -185,46 +185,6 @@ export class OpenAIContentGenerator implements ContentGenerator {
     );
   }
 
-  /**
-   * Determine if metadata should be included in the request.
-   * Only include the `metadata` field if the provider is QWEN_OAUTH
-   * or the baseUrl is 'https://dashscope.aliyuncs.com/compatible-mode/v1'.
-   * This is because some models/providers do not support metadata or need extra configuration.
-   *
-   * @returns true if metadata should be included, false otherwise
-   */
-  private shouldIncludeMetadata(): boolean {
-    const authType = this.config.getContentGeneratorConfig?.()?.authType;
-    // baseUrl may be undefined; default to empty string if so
-    const baseUrl = this.client?.baseURL || '';
-
-    return (
-      authType === AuthType.QWEN_OAUTH ||
-      baseUrl === 'https://dashscope.aliyuncs.com/compatible-mode/v1'
-    );
-  }
-
-  /**
-   * Build metadata object for OpenAI API requests.
-   *
-   * @param userPromptId The user prompt ID to include in metadata
-   * @returns metadata object if shouldIncludeMetadata() returns true, undefined otherwise
-   */
-  private buildMetadata(
-    userPromptId: string,
-  ): { metadata: { sessionId?: string; promptId: string } } | undefined {
-    if (!this.shouldIncludeMetadata()) {
-      return undefined;
-    }
-
-    return {
-      metadata: {
-        sessionId: this.config.getSessionId?.(),
-        promptId: userPromptId,
-      },
-    };
-  }
-
   async generateContent(
     request: GenerateContentParameters,
     userPromptId: string,
@@ -245,7 +205,10 @@ export class OpenAIContentGenerator implements ContentGenerator {
         model: this.model,
         messages,
         ...samplingParams,
-        ...(this.buildMetadata(userPromptId) || {}),
+        metadata: {
+          sessionId: this.config.getSessionId?.(),
+          promptId: userPromptId,
+        },
       };
 
       if (request.config?.tools) {
@@ -263,7 +226,6 @@ export class OpenAIContentGenerator implements ContentGenerator {
 
       // Log API response event for UI telemetry
       const responseEvent = new ApiResponseEvent(
-        response.responseId || 'unknown',
         this.model,
         durationMs,
         userPromptId,
@@ -292,21 +254,41 @@ export class OpenAIContentGenerator implements ContentGenerator {
           ? error.message
           : String(error);
 
-      // Log API error event for UI telemetry
-      const errorEvent = new ApiErrorEvent(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (error as any).requestID || 'unknown',
+      // Estimate token usage even when there's an error
+      // This helps track costs and usage even for failed requests
+      let estimatedUsage;
+      try {
+        const tokenCountResult = await this.countTokens({
+          contents: request.contents,
+          model: this.model,
+        });
+        estimatedUsage = {
+          promptTokenCount: tokenCountResult.totalTokens,
+          candidatesTokenCount: 0, // No completion tokens since request failed
+          totalTokenCount: tokenCountResult.totalTokens,
+        };
+      } catch {
+        // If token counting also fails, provide a minimal estimate
+        const contentStr = JSON.stringify(request.contents);
+        const estimatedTokens = Math.ceil(contentStr.length / 4);
+        estimatedUsage = {
+          promptTokenCount: estimatedTokens,
+          candidatesTokenCount: 0,
+          totalTokenCount: estimatedTokens,
+        };
+      }
+
+      // Log API error event for UI telemetry with estimated usage
+      const errorEvent = new ApiResponseEvent(
         this.model,
-        errorMessage,
         durationMs,
         userPromptId,
         this.config.getContentGeneratorConfig()?.authType,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (error as any).type,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (error as any).code,
+        estimatedUsage,
+        undefined,
+        errorMessage,
       );
-      logApiError(this.config, errorEvent);
+      logApiResponse(this.config, errorEvent);
 
       // Log error interaction if enabled
       if (this.config.getContentGeneratorConfig()?.enableOpenAILogging) {
@@ -357,7 +339,10 @@ export class OpenAIContentGenerator implements ContentGenerator {
         ...samplingParams,
         stream: true,
         stream_options: { include_usage: true },
-        ...(this.buildMetadata(userPromptId) || {}),
+        metadata: {
+          sessionId: this.config.getSessionId?.(),
+          promptId: userPromptId,
+        },
       };
 
       if (request.config?.tools) {
@@ -366,6 +351,8 @@ export class OpenAIContentGenerator implements ContentGenerator {
         );
       }
 
+      // console.log('createParams', createParams);
+
       const stream = (await this.client.chat.completions.create(
         createParams,
       )) as AsyncIterable<OpenAI.Chat.ChatCompletionChunk>;
@@ -393,7 +380,6 @@ export class OpenAIContentGenerator implements ContentGenerator {
 
           // Log API response event for UI telemetry
           const responseEvent = new ApiResponseEvent(
-            responses[responses.length - 1]?.responseId || 'unknown',
             this.model,
             durationMs,
             userPromptId,
@@ -425,21 +411,40 @@ export class OpenAIContentGenerator implements ContentGenerator {
               ? error.message
               : String(error);
 
-          // Log API error event for UI telemetry
-          const errorEvent = new ApiErrorEvent(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (error as any).requestID || 'unknown',
+          // Estimate token usage even when there's an error in streaming
+          let estimatedUsage;
+          try {
+            const tokenCountResult = await this.countTokens({
+              contents: request.contents,
+              model: this.model,
+            });
+            estimatedUsage = {
+              promptTokenCount: tokenCountResult.totalTokens,
+              candidatesTokenCount: 0, // No completion tokens since request failed
+              totalTokenCount: tokenCountResult.totalTokens,
+            };
+          } catch {
+            // If token counting also fails, provide a minimal estimate
+            const contentStr = JSON.stringify(request.contents);
+            const estimatedTokens = Math.ceil(contentStr.length / 4);
+            estimatedUsage = {
+              promptTokenCount: estimatedTokens,
+              candidatesTokenCount: 0,
+              totalTokenCount: estimatedTokens,
+            };
+          }
+
+          // Log API error event for UI telemetry with estimated usage
+          const errorEvent = new ApiResponseEvent(
             this.model,
-            errorMessage,
             durationMs,
             userPromptId,
             this.config.getContentGeneratorConfig()?.authType,
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (error as any).type,
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (error as any).code,
+            estimatedUsage,
+            undefined,
+            errorMessage,
           );
-          logApiError(this.config, errorEvent);
+          logApiResponse(this.config, errorEvent);
 
           // Log error interaction if enabled
           if (this.config.getContentGeneratorConfig()?.enableOpenAILogging) {
@@ -479,21 +484,40 @@ export class OpenAIContentGenerator implements ContentGenerator {
           ? error.message
           : String(error);
 
-      // Log API error event for UI telemetry
-      const errorEvent = new ApiErrorEvent(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (error as any).requestID || 'unknown',
+      // Estimate token usage even when there's an error in streaming setup
+      let estimatedUsage;
+      try {
+        const tokenCountResult = await this.countTokens({
+          contents: request.contents,
+          model: this.model,
+        });
+        estimatedUsage = {
+          promptTokenCount: tokenCountResult.totalTokens,
+          candidatesTokenCount: 0, // No completion tokens since request failed
+          totalTokenCount: tokenCountResult.totalTokens,
+        };
+      } catch {
+        // If token counting also fails, provide a minimal estimate
+        const contentStr = JSON.stringify(request.contents);
+        const estimatedTokens = Math.ceil(contentStr.length / 4);
+        estimatedUsage = {
+          promptTokenCount: estimatedTokens,
+          candidatesTokenCount: 0,
+          totalTokenCount: estimatedTokens,
+        };
+      }
+
+      // Log API error event for UI telemetry with estimated usage
+      const errorEvent = new ApiResponseEvent(
         this.model,
-        errorMessage,
         durationMs,
         userPromptId,
         this.config.getContentGeneratorConfig()?.authType,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (error as any).type,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (error as any).code,
+        estimatedUsage,
+        undefined,
+        errorMessage,
       );
-      logApiError(this.config, errorEvent);
+      logApiResponse(this.config, errorEvent);
 
       // Allow subclasses to suppress error logging for specific scenarios
       if (!this.shouldSuppressErrorLogging(error, request)) {
@@ -563,7 +587,7 @@ export class OpenAIContentGenerator implements ContentGenerator {
 
     // Add combined text if any
     if (combinedText) {
-      combinedParts.push({ text: combinedText.trimEnd() });
+      combinedParts.push({ text: combinedText });
     }
 
     // Add function calls
@@ -740,16 +764,6 @@ export class OpenAIContentGenerator implements ContentGenerator {
     return convertTypes(converted) as Record<string, unknown> | undefined;
   }
 
-  /**
-   * Converts Gemini tools to OpenAI format for API compatibility.
-   * Handles both Gemini tools (using 'parameters' field) and MCP tools (using 'parametersJsonSchema' field).
-   *
-   * Gemini tools use a custom parameter format that needs conversion to OpenAI JSON Schema format.
-   * MCP tools already use JSON Schema format in the parametersJsonSchema field and can be used directly.
-   *
-   * @param geminiTools - Array of Gemini tools to convert
-   * @returns Promise resolving to array of OpenAI-compatible tools
-   */
   private async convertGeminiToolsToOpenAI(
     geminiTools: ToolListUnion,
   ): Promise<OpenAI.Chat.ChatCompletionTool[]> {
@@ -770,31 +784,14 @@ export class OpenAIContentGenerator implements ContentGenerator {
       if (actualTool.functionDeclarations) {
         for (const func of actualTool.functionDeclarations) {
           if (func.name && func.description) {
-            let parameters: Record<string, unknown> | undefined;
-
-            // Handle both Gemini tools (parameters) and MCP tools (parametersJsonSchema)
-            if (func.parametersJsonSchema) {
-              // MCP tool format - use parametersJsonSchema directly
-              if (func.parametersJsonSchema) {
-                // Create a shallow copy to avoid mutating the original object
-                const paramsCopy = {
-                  ...(func.parametersJsonSchema as Record<string, unknown>),
-                };
-                parameters = paramsCopy;
-              }
-            } else if (func.parameters) {
-              // Gemini tool format - convert parameters to OpenAI format
-              parameters = this.convertGeminiParametersToOpenAI(
-                func.parameters as Record<string, unknown>,
-              );
-            }
-
             openAITools.push({
               type: 'function',
               function: {
                 name: func.name,
                 description: func.description,
-                parameters,
+                parameters: this.convertGeminiParametersToOpenAI(
+                  (func.parameters || {}) as Record<string, unknown>,
+                ),
               },
             });
           }
@@ -1164,11 +1161,7 @@ export class OpenAIContentGenerator implements ContentGenerator {
 
     // Handle text content
     if (choice.message.content) {
-      if (typeof choice.message.content === 'string') {
-        parts.push({ text: choice.message.content.trimEnd() });
-      } else {
-        parts.push({ text: choice.message.content });
-      }
+      parts.push({ text: choice.message.content });
     }
 
     // Handle tool calls
@@ -1177,7 +1170,12 @@ export class OpenAIContentGenerator implements ContentGenerator {
         if (toolCall.function) {
           let args: Record<string, unknown> = {};
           if (toolCall.function.arguments) {
-            args = safeJsonParse(toolCall.function.arguments, {});
+            try {
+              args = JSON.parse(toolCall.function.arguments);
+            } catch (error) {
+              console.error('Failed to parse function arguments:', error);
+              args = {};
+            }
           }
 
           parts.push({
@@ -1253,11 +1251,7 @@ export class OpenAIContentGenerator implements ContentGenerator {
 
       // Handle text content
       if (choice.delta?.content) {
-        if (typeof choice.delta.content === 'string') {
-          parts.push({ text: choice.delta.content.trimEnd() });
-        } else {
-          parts.push({ text: choice.delta.content });
-        }
+        parts.push({ text: choice.delta.content });
       }
 
       // Handle tool calls - only accumulate during streaming, emit when complete
@@ -1293,14 +1287,19 @@ export class OpenAIContentGenerator implements ContentGenerator {
           if (accumulatedCall.name) {
             let args: Record<string, unknown> = {};
             if (accumulatedCall.arguments) {
-              args = safeJsonParse(accumulatedCall.arguments, {});
+              try {
+                args = JSON.parse(accumulatedCall.arguments);
+              } catch (error) {
+                console.error(
+                  'Failed to parse final tool call arguments:',
+                  error,
+                );
+              }
             }
 
             parts.push({
               functionCall: {
-                id:
-                  accumulatedCall.id ||
-                  `call_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
+                id: accumulatedCall.id,
                 name: accumulatedCall.name,
                 args,
               },
@@ -1776,7 +1775,7 @@ export class OpenAIContentGenerator implements ContentGenerator {
         }
       }
 
-      messageContent = textParts.join('').trimEnd();
+      messageContent = textParts.join('');
     }
 
     const choice: OpenAIChoice = {

packages/core/src/ide/ide-client.ts

@@ -33,58 +33,34 @@ export enum IDEConnectionStatus {
  * Manages the connection to and interaction with the IDE server.
  */
 export class IdeClient {
-  private static instance: IdeClient;
-  private client: Client | undefined = undefined;
+  client: Client | undefined = undefined;
   private state: IDEConnectionState = {
     status: IDEConnectionStatus.Disconnected,
-    details:
-      'IDE integration is currently disabled. To enable it, run /ide enable.',
   };
+  private static instance: IdeClient;
   private readonly currentIde: DetectedIde | undefined;
   private readonly currentIdeDisplayName: string | undefined;
 
-  private constructor() {
+  constructor(ideMode: boolean) {
     this.currentIde = detectIde();
     if (this.currentIde) {
       this.currentIdeDisplayName = getIdeDisplayName(this.currentIde);
     }
+    if (!ideMode) {
+      return;
+    }
+    this.init().catch((err) => {
+      logger.debug('Failed to initialize IdeClient:', err);
+    });
   }
 
-  static getInstance(): IdeClient {
+  static getInstance(ideMode: boolean): IdeClient {
     if (!IdeClient.instance) {
-      IdeClient.instance = new IdeClient();
+      IdeClient.instance = new IdeClient(ideMode);
     }
     return IdeClient.instance;
   }
 
-  async connect(): Promise<void> {
-    this.setState(IDEConnectionStatus.Connecting);
-
-    if (!this.currentIde || !this.currentIdeDisplayName) {
-      this.setState(IDEConnectionStatus.Disconnected);
-      return;
-    }
-
-    if (!this.validateWorkspacePath()) {
-      return;
-    }
-
-    const port = this.getPortFromEnv();
-    if (!port) {
-      return;
-    }
-
-    await this.establishConnection(port);
-  }
-
-  disconnect() {
-    this.setState(
-      IDEConnectionStatus.Disconnected,
-      'IDE integration disabled. To enable it again, run /ide enable.',
-    );
-    this.client?.close();
-  }
-
   getCurrentIde(): DetectedIde | undefined {
     return this.currentIde;
   }
@@ -94,60 +70,45 @@ export class IdeClient {
   }
 
   private setState(status: IDEConnectionStatus, details?: string) {
-    const isAlreadyDisconnected =
-      this.state.status === IDEConnectionStatus.Disconnected &&
-      status === IDEConnectionStatus.Disconnected;
-
-    // Only update details if the state wasn't already disconnected, so that
-    // the first detail message is preserved.
-    if (!isAlreadyDisconnected) {
-      this.state = { status, details };
-    }
+    this.state = { status, details };
 
     if (status === IDEConnectionStatus.Disconnected) {
-      logger.debug('IDE integration disconnected:', details);
+      logger.debug('IDE integration is disconnected. ', details);
       ideContext.clearIdeContext();
     }
   }
 
-  private validateWorkspacePath(): boolean {
-    const ideWorkspacePath = process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'];
-    if (ideWorkspacePath === undefined) {
-      this.setState(
-        IDEConnectionStatus.Disconnected,
-        `Failed to connect to IDE companion extension for ${this.currentIdeDisplayName}. Please ensure the extension is running and try refreshing your terminal. To install the extension, run /ide install.`,
-      );
-      return false;
-    }
-    if (ideWorkspacePath === '') {
-      this.setState(
-        IDEConnectionStatus.Disconnected,
-        `To use this feature, please open a single workspace folder in ${this.currentIdeDisplayName} and try again.`,
-      );
-      return false;
-    }
-    if (ideWorkspacePath !== process.cwd()) {
-      this.setState(
-        IDEConnectionStatus.Disconnected,
-        `Directory mismatch. Gemini CLI is running in a different location than the open workspace in ${this.currentIdeDisplayName}. Please run the CLI from the same directory as your project's root folder.`,
-      );
-      return false;
-    }
-    return true;
-  }
-
   private getPortFromEnv(): string | undefined {
     const port = process.env['GEMINI_CLI_IDE_SERVER_PORT'];
     if (!port) {
       this.setState(
         IDEConnectionStatus.Disconnected,
-        `Failed to connect to IDE companion extension for ${this.currentIdeDisplayName}. Please ensure the extension is running and try refreshing your terminal. To install the extension, run /ide install.`,
+        'Gemini CLI Companion extension not found. Install via /ide install and restart the CLI in a fresh terminal window.',
       );
       return undefined;
     }
     return port;
   }
 
+  private validateWorkspacePath(): boolean {
+    const ideWorkspacePath = process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'];
+    if (!ideWorkspacePath) {
+      this.setState(
+        IDEConnectionStatus.Disconnected,
+        'IDE integration requires a single workspace folder to be open in the IDE. Please ensure one folder is open and try again.',
+      );
+      return false;
+    }
+    if (ideWorkspacePath !== process.cwd()) {
+      this.setState(
+        IDEConnectionStatus.Disconnected,
+        `Gemini CLI is running in a different directory (${process.cwd()}) from the IDE's open workspace (${ideWorkspacePath}). Please run Gemini CLI in the same directory.`,
+      );
+      return false;
+    }
+    return true;
+  }
+
   private registerClientHandlers() {
     if (!this.client) {
       return;
@@ -159,20 +120,20 @@ export class IdeClient {
         ideContext.setIdeContext(notification.params);
       },
     );
+
     this.client.onerror = (_error) => {
-      this.setState(
-        IDEConnectionStatus.Disconnected,
-        `IDE connection error. The connection was lost unexpectedly. Please try reconnecting by running /ide enable`,
-      );
+      this.setState(IDEConnectionStatus.Disconnected, 'Client error.');
     };
+
     this.client.onclose = () => {
-      this.setState(
-        IDEConnectionStatus.Disconnected,
-        `IDE connection error. The connection was lost unexpectedly. Please try reconnecting by running /ide enable`,
-      );
+      this.setState(IDEConnectionStatus.Disconnected, 'Connection closed.');
     };
   }
 
+  async reconnect(ideMode: boolean) {
+    IdeClient.instance = new IdeClient(ideMode);
+  }
+
   private async establishConnection(port: string) {
     let transport: StreamableHTTPClientTransport | undefined;
     try {
@@ -189,12 +150,12 @@ export class IdeClient {
       this.registerClientHandlers();
 
       await this.client.connect(transport);
-      this.registerClientHandlers();
+
       this.setState(IDEConnectionStatus.Connected);
-    } catch (_error) {
+    } catch (error) {
       this.setState(
         IDEConnectionStatus.Disconnected,
-        `Failed to connect to IDE companion extension for ${this.currentIdeDisplayName}. Please ensure the extension is running and try refreshing your terminal. To install the extension, run /ide install.`,
+        `Failed to connect to IDE server: ${error}`,
       );
       if (transport) {
         try {

packages/core/src/index.ts

@@ -41,7 +41,6 @@ export * from './utils/shell-utils.js';
 export * from './utils/systemEncoding.js';
 export * from './utils/textUtils.js';
 export * from './utils/formatters.js';
-export * from './utils/filesearch/fileSearch.js';
 
 // Export services
 export * from './services/fileDiscoveryService.js';

packages/core/src/mcp/oauth-provider.test.ts

@@ -4,17 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-
-// Mock dependencies AT THE TOP
-const mockOpenBrowserSecurely = vi.hoisted(() => vi.fn());
-vi.mock('../utils/secure-browser-launcher.js', () => ({
-  openBrowserSecurely: mockOpenBrowserSecurely,
-}));
-vi.mock('node:crypto');
-vi.mock('./oauth-token-storage.js');
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import * as http from 'node:http';
 import * as crypto from 'node:crypto';
 import {
@@ -25,6 +15,14 @@ import {
 } from './oauth-provider.js';
 import { MCPOAuthTokenStorage, MCPOAuthToken } from './oauth-token-storage.js';
 
+// Mock dependencies
+const mockOpenBrowserSecurely = vi.hoisted(() => vi.fn());
+vi.mock('../utils/secure-browser-launcher.js', () => ({
+  openBrowserSecurely: mockOpenBrowserSecurely,
+}));
+vi.mock('node:crypto');
+vi.mock('./oauth-token-storage.js');
+
 // Mock fetch globally
 const mockFetch = vi.fn();
 global.fetch = mockFetch;
@@ -48,7 +46,6 @@ describe('MCPOAuthProvider', () => {
     tokenUrl: 'https://auth.example.com/token',
     scopes: ['read', 'write'],
     redirectUri: 'http://localhost:7777/oauth/callback',
-    audiences: ['https://api.example.com'],
   };
 
   const mockToken: MCPOAuthToken = {
@@ -723,105 +720,6 @@ describe('MCPOAuthProvider', () => {
       expect(capturedUrl!).toContain('code_challenge_method=S256');
       expect(capturedUrl!).toContain('scope=read+write');
       expect(capturedUrl!).toContain('resource=https%3A%2F%2Fauth.example.com');
-      expect(capturedUrl!).toContain('audience=https%3A%2F%2Fapi.example.com');
-    });
-
-    it('should correctly append parameters to an authorization URL that already has query params', async () => {
-      // Mock to capture the URL that would be opened
-      let capturedUrl: string;
-      mockOpenBrowserSecurely.mockImplementation((url: string) => {
-        capturedUrl = url;
-        return Promise.resolve();
-      });
-
-      let callbackHandler: unknown;
-      vi.mocked(http.createServer).mockImplementation((handler) => {
-        callbackHandler = handler;
-        return mockHttpServer as unknown as http.Server;
-      });
-
-      mockHttpServer.listen.mockImplementation((port, callback) => {
-        callback?.();
-        setTimeout(() => {
-          const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
-          };
-          const mockRes = {
-            writeHead: vi.fn(),
-            end: vi.fn(),
-          };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
-        }, 10);
-      });
-
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: () => Promise.resolve(mockTokenResponse),
-      });
-
-      const configWithParamsInUrl = {
-        ...mockConfig,
-        authorizationUrl: 'https://auth.example.com/authorize?audience=1234',
-      };
-
-      await MCPOAuthProvider.authenticate('test-server', configWithParamsInUrl);
-
-      const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('audience')).toBe('1234');
-      expect(url.searchParams.get('client_id')).toBe('test-client-id');
-      expect(url.search.startsWith('?audience=1234&')).toBe(true);
-    });
-
-    it('should correctly append parameters to a URL with a fragment', async () => {
-      // Mock to capture the URL that would be opened
-      let capturedUrl: string;
-      mockOpenBrowserSecurely.mockImplementation((url: string) => {
-        capturedUrl = url;
-        return Promise.resolve();
-      });
-
-      let callbackHandler: unknown;
-      vi.mocked(http.createServer).mockImplementation((handler) => {
-        callbackHandler = handler;
-        return mockHttpServer as unknown as http.Server;
-      });
-
-      mockHttpServer.listen.mockImplementation((port, callback) => {
-        callback?.();
-        setTimeout(() => {
-          const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
-          };
-          const mockRes = {
-            writeHead: vi.fn(),
-            end: vi.fn(),
-          };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
-        }, 10);
-      });
-
-      mockFetch.mockResolvedValueOnce({
-        ok: true,
-        json: () => Promise.resolve(mockTokenResponse),
-      });
-
-      const configWithFragment = {
-        ...mockConfig,
-        authorizationUrl: 'https://auth.example.com/authorize#login',
-      };
-
-      await MCPOAuthProvider.authenticate('test-server', configWithFragment);
-
-      const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('client_id')).toBe('test-client-id');
-      expect(url.hash).toBe('#login');
-      expect(url.pathname).toBe('/authorize');
     });
   });
 });

packages/core/src/mcp/oauth-provider.ts

@@ -22,7 +22,6 @@ export interface MCPOAuthConfig {
   authorizationUrl?: string;
   tokenUrl?: string;
   scopes?: string[];
-  audiences?: string[];
   redirectUri?: string;
   tokenParamName?: string; // For SSE connections, specifies the query parameter name for the token
 }
@@ -298,10 +297,6 @@ export class MCPOAuthProvider {
       params.append('scope', config.scopes.join(' '));
     }
 
-    if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
-    }
-
     // Add resource parameter for MCP OAuth spec compliance
     // Use the MCP server URL if provided, otherwise fall back to authorization URL
     const resourceUrl = mcpServerUrl || config.authorizationUrl!;
@@ -313,11 +308,7 @@ export class MCPOAuthProvider {
       );
     }
 
-    const url = new URL(config.authorizationUrl!);
-    params.forEach((value, key) => {
-      url.searchParams.append(key, value);
-    });
-    return url.toString();
+    return `${config.authorizationUrl}?${params.toString()}`;
   }
 
   /**
@@ -351,10 +342,6 @@ export class MCPOAuthProvider {
       params.append('client_secret', config.clientSecret);
     }
 
-    if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
-    }
-
     // Add resource parameter for MCP OAuth spec compliance
     // Use the MCP server URL if provided, otherwise fall back to token URL
     const resourceUrl = mcpServerUrl || config.tokenUrl!;
@@ -413,10 +400,6 @@ export class MCPOAuthProvider {
       params.append('scope', config.scopes.join(' '));
     }
 
-    if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
-    }
-
     // Add resource parameter for MCP OAuth spec compliance
     // Use the MCP server URL if provided, otherwise fall back to token URL
     const resourceUrl = mcpServerUrl || tokenUrl;

packages/core/src/prompts/prompt-registry.ts

@@ -53,22 +53,4 @@ export class PromptRegistry {
     }
     return serverPrompts.sort((a, b) => a.name.localeCompare(b.name));
   }
-
-  /**
-   * Clears all the prompts from the registry.
-   */
-  clear(): void {
-    this.prompts.clear();
-  }
-
-  /**
-   * Removes all prompts from a specific server.
-   */
-  removePromptsByServer(serverName: string): void {
-    for (const [name, prompt] of this.prompts.entries()) {
-      if (prompt.serverName === serverName) {
-        this.prompts.delete(name);
-      }
-    }
-  }
 }

packages/core/src/services/loopDetectionService.test.ts

@@ -19,8 +19,6 @@ import { LoopDetectionService } from './loopDetectionService.js';
 
 vi.mock('../telemetry/loggers.js', () => ({
   logLoopDetected: vi.fn(),
-  logApiError: vi.fn(),
-  logApiResponse: vi.fn(),
 }));
 
 const TOOL_CALL_LOOP_THRESHOLD = 5;

packages/core/src/telemetry/clearcut-logger/clearcut-logger.ts

@@ -21,7 +21,6 @@ import {
   NextSpeakerCheckEvent,
   SlashCommandEvent,
   MalformedJsonResponseEvent,
-  IdeConnectionEvent,
 } from '../types.js';
 import { EventMetadataKey } from './event-metadata-key.js';
 import { Config } from '../../config/config.js';
@@ -45,7 +44,6 @@ const loop_detected_event_name = 'loop_detected';
 const next_speaker_check_event_name = 'next_speaker_check';
 const slash_command_event_name = 'slash_command';
 const malformed_json_response_event_name = 'malformed_json_response';
-const ide_connection_event_name = 'ide_connection';
 
 export interface LogResponse {
   nextRequestWaitMs?: number;
@@ -580,18 +578,6 @@ export class ClearcutLogger {
     this.flushIfNeeded();
   }
 
-  logIdeConnectionEvent(event: IdeConnectionEvent): void {
-    const data = [
-      {
-        gemini_cli_key: EventMetadataKey.GEMINI_CLI_IDE_CONNECTION_TYPE,
-        value: JSON.stringify(event.connection_type),
-      },
-    ];
-
-    this.enqueueLogEvent(this.createLogEvent(ide_connection_event_name, data));
-    this.flushIfNeeded();
-  }
-
   logEndSessionEvent(event: EndSessionEvent): void {
     const data = [
       {

packages/core/src/telemetry/clearcut-logger/event-metadata-key.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Defines valid event metadata keys for Qwen logging.
+// Defines valid event metadata keys for Clearcut logging.
 export enum EventMetadataKey {
   GEMINI_CLI_KEY_UNKNOWN = 0,
 
@@ -190,13 +190,6 @@ export enum EventMetadataKey {
 
   // Logs the model that produced the malformed JSON response.
   GEMINI_CLI_MALFORMED_JSON_RESPONSE_MODEL = 45,
-
-  // ==========================================================================
-  // IDE Connection Event Keys
-  // ===========================================================================
-
-  // Logs the type of the IDE connection.
-  GEMINI_CLI_IDE_CONNECTION_TYPE = 46,
 }
 
 export function getEventMetadataKey(

packages/core/src/telemetry/constants.ts

@@ -15,7 +15,6 @@ export const EVENT_CLI_CONFIG = 'qwen-code.config';
 export const EVENT_FLASH_FALLBACK = 'qwen-code.flash_fallback';
 export const EVENT_NEXT_SPEAKER_CHECK = 'qwen-code.next_speaker_check';
 export const EVENT_SLASH_COMMAND = 'qwen-code.slash_command';
-export const EVENT_IDE_CONNECTION = 'qwen-code.ide_connection';
 
 export const METRIC_TOOL_CALL_COUNT = 'qwen-code.tool.call.count';
 export const METRIC_TOOL_CALL_LATENCY = 'qwen-code.tool.call.latency';

packages/core/src/telemetry/integration.test.circular.ts

@@ -9,12 +9,11 @@
  */
 
 import { describe, it, expect } from 'vitest';
-import { QwenLogger } from './qwen-logger/qwen-logger.js';
-import { RumEvent } from './qwen-logger/event-types.js';
+import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
 import { Config } from '../config/config.js';
 
 describe('Circular Reference Integration Test', () => {
-  it('should handle HttpsProxyAgent-like circular references in qwen logging', () => {
+  it('should handle HttpsProxyAgent-like circular references in clearcut logging', () => {
     // Create a mock config with proxy
     const mockConfig = {
       getTelemetryEnabled: () => true,
@@ -45,20 +44,16 @@ describe('Circular Reference Integration Test', () => {
     proxyAgentLike.sockets['cloudcode-pa.googleapis.com:443'] = [socketLike];
 
     // Create an event that would contain this circular structure
-    const problematicEvent: RumEvent = {
-      timestamp: Date.now(),
-      event_type: 'exception',
-      type: 'error',
-      name: 'api_error',
+    const problematicEvent = {
       error: new Error('Network error'),
       function_args: {
         filePath: '/test/file.txt',
         httpAgent: proxyAgentLike, // This would cause the circular reference
       },
-    } as RumEvent;
+    };
 
-    // Test that QwenLogger can handle this
-    const logger = QwenLogger.getInstance(mockConfig);
+    // Test that ClearcutLogger can handle this
+    const logger = ClearcutLogger.getInstance(mockConfig);
 
     expect(() => {
       logger?.enqueueLogEvent(problematicEvent);

packages/core/src/telemetry/loggers.test.ts

@@ -212,7 +212,6 @@ describe('loggers', () => {
         toolUsePromptTokenCount: 2,
       };
       const event = new ApiResponseEvent(
-        'test-response-id',
         'test-model',
         100,
         'prompt-id-1',
@@ -230,7 +229,6 @@ describe('loggers', () => {
           'event.name': EVENT_API_RESPONSE,
           'event.timestamp': '2025-01-01T00:00:00.000Z',
           [SemanticAttributes.HTTP_STATUS_CODE]: 200,
-          response_id: 'test-response-id',
           model: 'test-model',
           status_code: 200,
           duration_ms: 100,
@@ -277,7 +275,6 @@ describe('loggers', () => {
         toolUsePromptTokenCount: 2,
       };
       const event = new ApiResponseEvent(
-        'test-response-id-2',
         'test-model',
         100,
         'prompt-id-1',

packages/core/src/telemetry/loggers.ts

@@ -12,7 +12,6 @@ import {
   EVENT_API_REQUEST,
   EVENT_API_RESPONSE,
   EVENT_CLI_CONFIG,
-  EVENT_IDE_CONNECTION,
   EVENT_TOOL_CALL,
   EVENT_USER_PROMPT,
   EVENT_FLASH_FALLBACK,
@@ -24,7 +23,6 @@ import {
   ApiErrorEvent,
   ApiRequestEvent,
   ApiResponseEvent,
-  IdeConnectionEvent,
   StartSessionEvent,
   ToolCallEvent,
   UserPromptEvent,
@@ -41,7 +39,7 @@ import {
 } from './metrics.js';
 import { isTelemetrySdkInitialized } from './sdk.js';
 import { uiTelemetryService, UiEvent } from './uiTelemetry.js';
-import { QwenLogger } from './qwen-logger/qwen-logger.js';
+import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
 import { safeJsonStringify } from '../utils/safeJsonStringify.js';
 
 const shouldLogUserPrompts = (config: Config): boolean =>
@@ -57,7 +55,7 @@ export function logCliConfiguration(
   config: Config,
   event: StartSessionEvent,
 ): void {
-  QwenLogger.getInstance(config)?.logStartSessionEvent(event);
+  ClearcutLogger.getInstance(config)?.logStartSessionEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
   const attributes: LogAttributes = {
@@ -86,7 +84,7 @@ export function logCliConfiguration(
 }
 
 export function logUserPrompt(config: Config, event: UserPromptEvent): void {
-  QwenLogger.getInstance(config)?.logNewPromptEvent(event);
+  ClearcutLogger.getInstance(config)?.logNewPromptEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
   const attributes: LogAttributes = {
@@ -115,7 +113,7 @@ export function logToolCall(config: Config, event: ToolCallEvent): void {
     'event.timestamp': new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
-  QwenLogger.getInstance(config)?.logToolCallEvent(event);
+  ClearcutLogger.getInstance(config)?.logToolCallEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
   const attributes: LogAttributes = {
@@ -148,7 +146,7 @@ export function logToolCall(config: Config, event: ToolCallEvent): void {
 }
 
 export function logApiRequest(config: Config, event: ApiRequestEvent): void {
-  QwenLogger.getInstance(config)?.logApiRequestEvent(event);
+  ClearcutLogger.getInstance(config)?.logApiRequestEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
   const attributes: LogAttributes = {
@@ -170,7 +168,7 @@ export function logFlashFallback(
   config: Config,
   event: FlashFallbackEvent,
 ): void {
-  QwenLogger.getInstance(config)?.logFlashFallbackEvent(event);
+  ClearcutLogger.getInstance(config)?.logFlashFallbackEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
   const attributes: LogAttributes = {
@@ -195,7 +193,7 @@ export function logApiError(config: Config, event: ApiErrorEvent): void {
     'event.timestamp': new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
-  QwenLogger.getInstance(config)?.logApiErrorEvent(event);
+  ClearcutLogger.getInstance(config)?.logApiErrorEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
   const attributes: LogAttributes = {
@@ -237,7 +235,7 @@ export function logApiResponse(config: Config, event: ApiResponseEvent): void {
     'event.timestamp': new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
-  QwenLogger.getInstance(config)?.logApiResponseEvent(event);
+  ClearcutLogger.getInstance(config)?.logApiResponseEvent(event);
   if (!isTelemetrySdkInitialized()) return;
   const attributes: LogAttributes = {
     ...getCommonAttributes(config),
@@ -300,7 +298,7 @@ export function logLoopDetected(
   config: Config,
   event: LoopDetectedEvent,
 ): void {
-  QwenLogger.getInstance(config)?.logLoopDetectedEvent(event);
+  ClearcutLogger.getInstance(config)?.logLoopDetectedEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
   const attributes: LogAttributes = {
@@ -320,7 +318,7 @@ export function logNextSpeakerCheck(
   config: Config,
   event: NextSpeakerCheckEvent,
 ): void {
-  QwenLogger.getInstance(config)?.logNextSpeakerCheck(event);
+  ClearcutLogger.getInstance(config)?.logNextSpeakerCheck(event);
   if (!isTelemetrySdkInitialized()) return;
 
   const attributes: LogAttributes = {
@@ -341,7 +339,7 @@ export function logSlashCommand(
   config: Config,
   event: SlashCommandEvent,
 ): void {
-  QwenLogger.getInstance(config)?.logSlashCommandEvent(event);
+  ClearcutLogger.getInstance(config)?.logSlashCommandEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
   const attributes: LogAttributes = {
@@ -357,23 +355,3 @@ export function logSlashCommand(
   };
   logger.emit(logRecord);
 }
-
-export function logIdeConnection(
-  config: Config,
-  event: IdeConnectionEvent,
-): void {
-  if (!isTelemetrySdkInitialized()) return;
-
-  const attributes: LogAttributes = {
-    ...getCommonAttributes(config),
-    ...event,
-    'event.name': EVENT_IDE_CONNECTION,
-  };
-
-  const logger = logs.getLogger(SERVICE_NAME);
-  const logRecord: LogRecord = {
-    body: `Ide connection. Type: ${event.connection_type}.`,
-    attributes,
-  };
-  logger.emit(logRecord);
-}

packages/core/src/telemetry/qwen-logger/event-types.ts

@@ -1,83 +0,0 @@
-// RUM Protocol Data Structures
-export interface RumApp {
-  id: string;
-  env: string;
-  version: string;
-  type: 'cli' | 'extension';
-}
-
-export interface RumUser {
-  id: string;
-}
-
-export interface RumSession {
-  id: string;
-}
-
-export interface RumView {
-  id: string;
-  name: string;
-}
-
-export interface RumEvent {
-  timestamp?: number;
-  event_type?: 'view' | 'action' | 'exception' | 'resource';
-  type: string; // Event type
-  name: string; // Event name
-  snapshots?: string; // JSON string of event snapshots
-  properties?: Record<string, unknown>;
-  // [key: string]: unknown;
-}
-
-export interface RumViewEvent extends RumEvent {
-  view_type?: string; // View rendering type
-  time_spent?: number; // Time spent on current view in ms
-}
-
-export interface RumActionEvent extends RumEvent {
-  target_name?: string; // Element user interacted with (for auto-collected actions only)
-  duration?: number; // Action duration in ms
-  method_info?: string; // Action callback, e.g.: onClick()
-}
-
-export interface RumExceptionEvent extends RumEvent {
-  source?: string; // Error source, e.g.: console, event
-  file?: string; // Error file
-  subtype?: string; // Secondary classification of error type
-  message?: string; // Concise, readable message explaining the event
-  stack?: string; // Stack trace or supplemental information about the error
-  caused_by?: string; // Exception cause
-  line?: number; // Line number where exception occurred
-  column?: number; // Column number where exception occurred
-  thread_id?: string; // Thread ID
-  binary_images?: string; // Error source
-}
-
-export interface RumResourceEvent extends RumEvent {
-  method?: string; // HTTP request method: POST, GET, etc.
-  status_code?: string; // Resource status code
-  message?: string; // Error message content, corresponds to resource.error_msg
-  url?: string; // Resource URL
-  provider_type?: string; // Resource provider type: first-party, cdn, ad, analytics
-  trace_id?: string; // Resource request TraceID
-  success?: number; // Resource loading success: 1 (default) success, 0 failure
-  duration?: number; // Total time spent loading resource in ms (responseEnd - redirectStart)
-  size?: number; // Resource size in bytes, corresponds to decodedBodySize
-  connect_duration?: number; // Time spent establishing connection to server in ms (connectEnd - connectStart)
-  ssl_duration?: number; // Time spent on TLS handshake in ms (connectEnd - secureConnectionStart), 0 if no SSL
-  dns_duration?: number; // Time spent resolving DNS name in ms (domainLookupEnd - domainLookupStart)
-  redirect_duration?: number; // Time spent on HTTP redirects in ms (redirectEnd - redirectStart)
-  first_byte_duration?: number; // Time waiting for first byte of response in ms (responseStart - requestStart)
-  download_duration?: number; // Time spent downloading response in ms (responseEnd - responseStart)
-  timing_data?: string; // JSON string of PerformanceResourceTiming
-  trace_data?: string; // Trace information snapshot JSON string
-}
-
-export interface RumPayload {
-  app: RumApp;
-  user: RumUser;
-  session: RumSession;
-  view: RumView;
-  events: RumEvent[];
-  _v: string;
-}

packages/core/src/telemetry/qwen-logger/qwen-logger.ts

@@ -1,483 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Buffer } from 'buffer';
-import * as https from 'https';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-import { randomUUID } from 'crypto';
-
-import {
-  StartSessionEvent,
-  EndSessionEvent,
-  UserPromptEvent,
-  ToolCallEvent,
-  ApiRequestEvent,
-  ApiResponseEvent,
-  ApiErrorEvent,
-  FlashFallbackEvent,
-  LoopDetectedEvent,
-  NextSpeakerCheckEvent,
-  SlashCommandEvent,
-  MalformedJsonResponseEvent,
-} from '../types.js';
-import {
-  RumEvent,
-  RumViewEvent,
-  RumActionEvent,
-  RumResourceEvent,
-  RumExceptionEvent,
-  RumPayload,
-} from './event-types.js';
-// Removed unused EventMetadataKey import
-import { Config } from '../../config/config.js';
-import { safeJsonStringify } from '../../utils/safeJsonStringify.js';
-// Removed unused import
-import { HttpError, retryWithBackoff } from '../../utils/retry.js';
-import { getInstallationId } from '../../utils/user_id.js';
-
-// Usage statistics collection endpoint
-const USAGE_STATS_HOSTNAME = 'gb4w8c3ygj-default-sea.rum.aliyuncs.com';
-const USAGE_STATS_PATH = '/';
-
-const RUN_APP_ID = 'gb4w8c3ygj@851d5d500f08f92';
-
-export interface LogResponse {
-  nextRequestWaitMs?: number;
-}
-
-// Singleton class for batch posting log events to RUM. When a new event comes in, the elapsed time
-// is checked and events are flushed to RUM if at least a minute has passed since the last flush.
-export class QwenLogger {
-  private static instance: QwenLogger;
-  private config?: Config;
-  private readonly events: RumEvent[] = [];
-  private last_flush_time: number = Date.now();
-  private flush_interval_ms: number = 1000 * 60; // Wait at least a minute before flushing events.
-  private userId: string;
-  private sessionId: string;
-  private viewId: string;
-  private isFlushInProgress: boolean = false;
-  private isShutdown: boolean = false;
-
-  private constructor(config?: Config) {
-    this.config = config;
-    this.userId = this.generateUserId();
-    this.sessionId =
-      typeof this.config?.getSessionId === 'function'
-        ? this.config.getSessionId()
-        : '';
-    this.viewId = randomUUID();
-  }
-
-  private generateUserId(): string {
-    // Use installation ID as user ID for consistency
-    return `user-${getInstallationId()}`;
-  }
-
-  static getInstance(config?: Config): QwenLogger | undefined {
-    if (config === undefined || !config?.getUsageStatisticsEnabled())
-      return undefined;
-    if (!QwenLogger.instance) {
-      QwenLogger.instance = new QwenLogger(config);
-      process.on(
-        'exit',
-        QwenLogger.instance.shutdown.bind(QwenLogger.instance),
-      );
-    }
-
-    return QwenLogger.instance;
-  }
-
-  enqueueLogEvent(event: RumEvent): void {
-    this.events.push(event);
-  }
-
-  createRumEvent(
-    eventType: 'view' | 'action' | 'exception' | 'resource',
-    type: string,
-    name: string,
-    properties: Partial<RumEvent>,
-  ): RumEvent {
-    return {
-      timestamp: Date.now(),
-      event_type: eventType,
-      type,
-      name,
-      ...(properties || {}),
-    };
-  }
-
-  createViewEvent(
-    type: string,
-    name: string,
-    properties: Partial<RumViewEvent>,
-  ): RumEvent {
-    return this.createRumEvent('view', type, name, properties);
-  }
-
-  createActionEvent(
-    type: string,
-    name: string,
-    properties: Partial<RumActionEvent>,
-  ): RumEvent {
-    return this.createRumEvent('action', type, name, properties);
-  }
-
-  createResourceEvent(
-    type: string,
-    name: string,
-    properties: Partial<RumResourceEvent>,
-  ): RumEvent {
-    return this.createRumEvent('resource', type, name, properties);
-  }
-
-  createExceptionEvent(
-    type: string,
-    name: string,
-    properties: Partial<RumExceptionEvent>,
-  ): RumEvent {
-    return this.createRumEvent('exception', type, name, properties);
-  }
-
-  async createRumPayload(): Promise<RumPayload> {
-    const version = this.config?.getCliVersion() || 'unknown';
-
-    return {
-      app: {
-        id: RUN_APP_ID,
-        env: process.env.DEBUG ? 'dev' : 'prod',
-        version: version || 'unknown',
-        type: 'cli',
-      },
-      user: {
-        id: this.userId,
-      },
-      session: {
-        id: this.sessionId,
-      },
-      view: {
-        id: this.viewId,
-        name: 'qwen-code-cli',
-      },
-      events: [...this.events],
-      _v: `qwen-code@${version}`,
-    };
-  }
-
-  flushIfNeeded(): void {
-    if (Date.now() - this.last_flush_time < this.flush_interval_ms) {
-      return;
-    }
-
-    // Prevent concurrent flush operations
-    if (this.isFlushInProgress) {
-      return;
-    }
-
-    this.flushToRum().catch((error) => {
-      console.debug('Error flushing to RUM:', error);
-    });
-  }
-
-  async flushToRum(): Promise<LogResponse> {
-    if (this.config?.getDebugMode()) {
-      console.log('Flushing log events to RUM.');
-    }
-    if (this.events.length === 0) {
-      return {};
-    }
-
-    this.isFlushInProgress = true;
-
-    const rumPayload = await this.createRumPayload();
-    const flushFn = () =>
-      new Promise<Buffer>((resolve, reject) => {
-        const body = safeJsonStringify(rumPayload);
-        const options = {
-          hostname: USAGE_STATS_HOSTNAME,
-          path: USAGE_STATS_PATH,
-          method: 'POST',
-          headers: {
-            'Content-Length': Buffer.byteLength(body),
-            'Content-Type': 'text/plain;charset=UTF-8',
-          },
-        };
-        const bufs: Buffer[] = [];
-        const req = https.request(
-          {
-            ...options,
-            agent: this.getProxyAgent(),
-          },
-          (res) => {
-            if (
-              res.statusCode &&
-              (res.statusCode < 200 || res.statusCode >= 300)
-            ) {
-              const err: HttpError = new Error(
-                `Request failed with status ${res.statusCode}`,
-              );
-              err.status = res.statusCode;
-              res.resume();
-              return reject(err);
-            }
-            res.on('data', (buf) => bufs.push(buf));
-            res.on('end', () => resolve(Buffer.concat(bufs)));
-          },
-        );
-        req.on('error', reject);
-        req.end(body);
-      });
-
-    try {
-      await retryWithBackoff(flushFn, {
-        maxAttempts: 3,
-        initialDelayMs: 200,
-        shouldRetry: (err: unknown) => {
-          if (!(err instanceof Error)) return false;
-          const status = (err as HttpError).status as number | undefined;
-          // If status is not available, it's likely a network error
-          if (status === undefined) return true;
-
-          // Retry on 429 (Too many Requests) and 5xx server errors.
-          return status === 429 || (status >= 500 && status < 600);
-        },
-      });
-
-      this.events.splice(0, this.events.length);
-      this.last_flush_time = Date.now();
-      return {};
-    } catch (error) {
-      if (this.config?.getDebugMode()) {
-        console.error('RUM flush failed after multiple retries.', error);
-      }
-      return {};
-    } finally {
-      this.isFlushInProgress = false;
-    }
-  }
-
-  logStartSessionEvent(event: StartSessionEvent): void {
-    const applicationEvent = this.createViewEvent('session', 'session_start', {
-      properties: {
-        model: event.model,
-      },
-      snapshots: JSON.stringify({
-        embedding_model: event.embedding_model,
-        sandbox_enabled: event.sandbox_enabled,
-        core_tools_enabled: event.core_tools_enabled,
-        approval_mode: event.approval_mode,
-        api_key_enabled: event.api_key_enabled,
-        vertex_ai_enabled: event.vertex_ai_enabled,
-        debug_enabled: event.debug_enabled,
-        mcp_servers: event.mcp_servers,
-        telemetry_enabled: event.telemetry_enabled,
-        telemetry_log_user_prompts_enabled:
-          event.telemetry_log_user_prompts_enabled,
-      }),
-    });
-
-    // Flush start event immediately
-    this.enqueueLogEvent(applicationEvent);
-    this.flushToRum().catch((error: unknown) => {
-      console.debug('Error flushing to RUM:', error);
-    });
-  }
-
-  logNewPromptEvent(event: UserPromptEvent): void {
-    const rumEvent = this.createActionEvent('user_prompt', 'user_prompt', {
-      properties: {
-        auth_type: event.auth_type,
-        prompt_id: event.prompt_id,
-      },
-      snapshots: JSON.stringify({
-        prompt_length: event.prompt_length,
-      }),
-    });
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logToolCallEvent(event: ToolCallEvent): void {
-    const rumEvent = this.createActionEvent(
-      'tool_call',
-      `tool_call#${event.function_name}`,
-      {
-        properties: {
-          prompt_id: event.prompt_id,
-        },
-        snapshots: JSON.stringify({
-          function_name: event.function_name,
-          decision: event.decision,
-          success: event.success,
-          duration_ms: event.duration_ms,
-          error: event.error,
-          error_type: event.error_type,
-        }),
-      },
-    );
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logApiRequestEvent(event: ApiRequestEvent): void {
-    const rumEvent = this.createResourceEvent('api', 'api_request', {
-      properties: {
-        model: event.model,
-        prompt_id: event.prompt_id,
-      },
-    });
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logApiResponseEvent(event: ApiResponseEvent): void {
-    const rumEvent = this.createResourceEvent('api', 'api_response', {
-      status_code: event.status_code?.toString() ?? '',
-      duration: event.duration_ms,
-      success: 1,
-      message: event.error,
-      trace_id: event.response_id,
-      properties: {
-        auth_type: event.auth_type,
-        model: event.model,
-        prompt_id: event.prompt_id,
-      },
-      snapshots: JSON.stringify({
-        input_token_count: event.input_token_count,
-        output_token_count: event.output_token_count,
-        cached_content_token_count: event.cached_content_token_count,
-        thoughts_token_count: event.thoughts_token_count,
-        tool_token_count: event.tool_token_count,
-      }),
-    });
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logApiErrorEvent(event: ApiErrorEvent): void {
-    const rumEvent = this.createResourceEvent('api', 'api_error', {
-      status_code: event.status_code?.toString() ?? '',
-      duration: event.duration_ms,
-      success: 0,
-      message: event.error,
-      trace_id: event.response_id,
-      properties: {
-        auth_type: event.auth_type,
-        model: event.model,
-        prompt_id: event.prompt_id,
-      },
-      snapshots: JSON.stringify({
-        error_type: event.error_type,
-      }),
-    });
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logFlashFallbackEvent(event: FlashFallbackEvent): void {
-    const rumEvent = this.createActionEvent('fallback', 'flash_fallback', {
-      properties: {
-        auth_type: event.auth_type,
-      },
-    });
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logLoopDetectedEvent(event: LoopDetectedEvent): void {
-    const rumEvent = this.createExceptionEvent('error', 'loop_detected', {
-      subtype: 'loop_detected',
-      properties: {
-        prompt_id: event.prompt_id,
-      },
-      snapshots: JSON.stringify({
-        loop_type: event.loop_type,
-      }),
-    });
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logNextSpeakerCheck(event: NextSpeakerCheckEvent): void {
-    const rumEvent = this.createActionEvent('check', 'next_speaker_check', {
-      properties: {
-        prompt_id: event.prompt_id,
-      },
-      snapshots: JSON.stringify({
-        finish_reason: event.finish_reason,
-        result: event.result,
-      }),
-    });
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logSlashCommandEvent(event: SlashCommandEvent): void {
-    const rumEvent = this.createActionEvent('command', 'slash_command', {
-      snapshots: JSON.stringify({
-        command: event.command,
-        subcommand: event.subcommand,
-      }),
-    });
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logMalformedJsonResponseEvent(event: MalformedJsonResponseEvent): void {
-    const rumEvent = this.createExceptionEvent(
-      'error',
-      'malformed_json_response',
-      {
-        subtype: 'malformed_json_response',
-        properties: {
-          model: event.model,
-        },
-      },
-    );
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
-  logEndSessionEvent(_event: EndSessionEvent): void {
-    const applicationEvent = this.createViewEvent('session', 'session_end', {});
-
-    // Flush immediately on session end.
-    this.enqueueLogEvent(applicationEvent);
-    this.flushToRum().catch((error: unknown) => {
-      console.debug('Error flushing to RUM:', error);
-    });
-  }
-
-  getProxyAgent() {
-    const proxyUrl = this.config?.getProxy();
-    if (!proxyUrl) return undefined;
-    // undici which is widely used in the repo can only support http & https proxy protocol,
-    // https://github.com/nodejs/undici/issues/2224
-    if (proxyUrl.startsWith('http')) {
-      return new HttpsProxyAgent(proxyUrl);
-    } else {
-      throw new Error('Unsupported proxy type');
-    }
-  }
-
-  shutdown() {
-    if (this.isShutdown) return;
-
-    this.isShutdown = true;
-    const event = new EndSessionEvent(this.config);
-    this.logEndSessionEvent(event);
-  }
-}

packages/core/src/telemetry/sdk.ts

@@ -28,6 +28,7 @@ import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 import { Config } from '../config/config.js';
 import { SERVICE_NAME } from './constants.js';
 import { initializeMetrics } from './metrics.js';
+import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
 import {
   FileLogExporter,
   FileMetricExporter,
@@ -140,6 +141,7 @@ export async function shutdownTelemetry(): Promise<void> {
     return;
   }
   try {
+    ClearcutLogger.getInstance()?.shutdown();
     await sdk.shutdown();
     console.log('OpenTelemetry SDK shut down successfully.');
   } catch (error) {