refactor(cli): centralize system information collection

2026-01-02 15:09:14 +00:00 · 2025-11-06 10:42:52 +08:00
30 changed files with 1817 additions and 1671 deletions
--- a/docs/tools/file-system.md
+++ b/docs/tools/file-system.md
@@ -68,66 +68,72 @@ Qwen Code provides a comprehensive suite of tools for interacting with the local
 - **File:** `glob.ts`
 - **Parameters:**
  - `pattern` (string, required): The glob pattern to match against (e.g., `"*.py"`, `"src/**/*.js"`).
-  - `path` (string, optional): The directory to search in. If not specified, the current working directory will be used.
+  - `path` (string, optional): The absolute path to the directory to search within. If omitted, searches the tool's root directory.
+  - `case_sensitive` (boolean, optional): Whether the search should be case-sensitive. Defaults to `false`.
+  - `respect_git_ignore` (boolean, optional): Whether to respect .gitignore patterns when finding files. Defaults to `true`.
 - **Behavior:**
  - Searches for files matching the glob pattern within the specified directory.
  - Returns a list of absolute paths, sorted with the most recently modified files first.
-  - Respects .gitignore and .qwenignore patterns by default.
-  - Limits results to 100 files to prevent context overflow.
- **Output (`llmContent`):** A message like: `Found 5 file(s) matching "*.ts" within /path/to/search/dir, sorted by modification time (newest first):\n---\n/path/to/file1.ts\n/path/to/subdir/file2.ts\n---\n[95 files truncated] ...`
+  - Ignores common nuisance directories like `node_modules` and `.git` by default.
+- **Output (`llmContent`):** A message like: `Found 5 file(s) matching "*.ts" within src, sorted by modification time (newest first):\nsrc/file1.ts\nsrc/subdir/file2.ts...`
 - **Confirmation:** No.

-## 5. `grep_search` (Grep)
+## 5. `search_file_content` (SearchText)

-`grep_search` searches for a regular expression pattern within the content of files in a specified directory. Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.
+`search_file_content` searches for a regular expression pattern within the content of files in a specified directory. Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.

- **Tool name:** `grep_search`
- **Display name:** Grep
- **File:** `ripGrep.ts` (with `grep.ts` as fallback)
+- **Tool name:** `search_file_content`
+- **Display name:** SearchText
+- **File:** `grep.ts`
 - **Parameters:**
-  - `pattern` (string, required): The regular expression pattern to search for in file contents (e.g., `"function\\s+myFunction"`, `"log.*Error"`).
-  - `path` (string, optional): File or directory to search in. Defaults to current working directory.
-  - `glob` (string, optional): Glob pattern to filter files (e.g. `"*.js"`, `"src/**/*.{ts,tsx}"`).
-  - `limit` (number, optional): Limit output to first N matching lines. Optional - shows all matches if not specified.
+  - `pattern` (string, required): The regular expression (regex) to search for (e.g., `"function\s+myFunction"`).
+  - `path` (string, optional): The absolute path to the directory to search within. Defaults to the current working directory.
+  - `include` (string, optional): A glob pattern to filter which files are searched (e.g., `"*.js"`, `"src/**/*.{ts,tsx}"`). If omitted, searches most files (respecting common ignores).
+  - `maxResults` (number, optional): Maximum number of matches to return to prevent context overflow (default: 20, max: 100). Use lower values for broad searches, higher for specific searches.
 - **Behavior:**
-  - Uses ripgrep for fast search when available; otherwise falls back to a JavaScript-based search implementation.
-  - Returns matching lines with file paths and line numbers.
-  - Case-insensitive by default.
-  - Respects .gitignore and .qwenignore patterns.
-  - Limits output to prevent context overflow.
+  - Uses `git grep` if available in a Git repository for speed; otherwise, falls back to system `grep` or a JavaScript-based search.
+  - Returns a list of matching lines, each prefixed with its file path (relative to the search directory) and line number.
+  - Limits results to a maximum of 20 matches by default to prevent context overflow. When results are truncated, shows a clear warning with guidance on refining searches.
 - **Output (`llmContent`):** A formatted string of matches, e.g.:

  ```
  Found 3 matches for pattern "myFunction" in path "." (filter: "*.ts"):
  ---
-  src/utils.ts:15:export function myFunction() {
-  src/utils.ts:22:  myFunction.call();
-  src/index.ts:5:import { myFunction } from './utils';
+  File: src/utils.ts
+  L15: export function myFunction() {
+  L22:   myFunction.call();
+  ---
+  File: src/index.ts
+  L5: import { myFunction } from './utils';
  ---

-  [0 lines truncated] ...
+  WARNING: Results truncated to prevent context overflow. To see more results:
+  - Use a more specific pattern to reduce matches
+  - Add file filters with the 'include' parameter (e.g., "*.js", "src/**")
+  - Specify a narrower 'path' to search in a subdirectory
+  - Increase 'maxResults' parameter if you need more matches (current: 20)
  ```

 - **Confirmation:** No.

-### `grep_search` examples
+### `search_file_content` examples

 Search for a pattern with default result limiting:

 ```
-grep_search(pattern="function\\s+myFunction", path="src")
+search_file_content(pattern="function\s+myFunction", path="src")
 ```

 Search for a pattern with custom result limiting:

 ```
-grep_search(pattern="function", path="src", limit=50)
+search_file_content(pattern="function", path="src", maxResults=50)
 ```

 Search for a pattern with file filtering and custom result limiting:

 ```
-grep_search(pattern="function", glob="*.js", limit=10)
+search_file_content(pattern="function", include="*.js", maxResults=10)
 ```

 ## 6. `edit` (Edit)
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.1.5",
+  "version": "0.1.4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@qwen-code/qwen-code",
-      "version": "0.1.5",
+      "version": "0.1.4",
      "workspaces": [
        "packages/*"
      ],
@@ -555,7 +555,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=18"
      },
@@ -579,7 +578,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=18"
      }
@@ -2120,7 +2118,6 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
      "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
      "license": "Apache-2.0",
-      "peer": true,
      "engines": {
        "node": ">=8.0.0"
      }
@@ -3282,7 +3279,6 @@
      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@babel/code-frame": "^7.10.4",
        "@babel/runtime": "^7.12.5",
@@ -3721,7 +3717,6 @@
      "integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "csstype": "^3.0.2"
      }
@@ -3732,7 +3727,6 @@
      "integrity": "sha512-4hOiT/dwO8Ko0gV1m/TJZYk3y0KBnY9vzDh7W+DH17b2HFSOGgdj33dhihPeuy3l0q23+4e+hoXHV6hCC4dCXw==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "peerDependencies": {
        "@types/react": "^19.0.0"
      }
@@ -3938,7 +3932,6 @@
      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.35.0",
        "@typescript-eslint/types": "8.35.0",
@@ -4707,7 +4700,6 @@
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "license": "MIT",
-      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -5062,7 +5054,8 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/array-includes": {
      "version": "3.1.9",
@@ -6227,6 +6220,7 @@
      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "safe-buffer": "5.2.1"
      },
@@ -7260,7 +7254,6 @@
      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -7730,6 +7723,7 @@
      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
@@ -7791,6 +7785,7 @@
      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.6"
      }
@@ -7800,6 +7795,7 @@
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "ms": "2.0.0"
      }
@@ -7809,6 +7805,7 @@
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.8"
      }
@@ -7975,6 +7972,7 @@
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "debug": "2.6.9",
        "encodeurl": "~2.0.0",
@@ -7993,6 +7991,7 @@
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "ms": "2.0.0"
      }
@@ -8001,13 +8000,15 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/finalhandler/node_modules/statuses": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.8"
      }
@@ -9046,7 +9047,6 @@
      "resolved": "https://registry.npmjs.org/ink/-/ink-6.2.3.tgz",
      "integrity": "sha512-fQkfEJjKbLXIcVWEE3MvpYSnwtbbmRsmeNDNz1pIuOFlwE+UF2gsy228J36OXKZGWJWZJKUigphBSqCNMcARtg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@alcalzone/ansi-tokenize": "^0.2.0",
        "ansi-escapes": "^7.0.0",
@@ -10950,6 +10950,7 @@
      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.6"
      }
@@ -12157,7 +12158,8 @@
      "version": "0.1.12",
      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/path-type": {
      "version": "3.0.0",
@@ -12661,7 +12663,6 @@
      "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
      "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -12672,7 +12673,6 @@
      "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "shell-quote": "^1.6.1",
        "ws": "^7"
@@ -12706,7 +12706,6 @@
      "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "scheduler": "^0.26.0"
      },
@@ -14516,7 +14515,6 @@
      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -14690,8 +14688,7 @@
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
      "dev": true,
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
    },
    "node_modules/tsx": {
      "version": "4.20.3",
@@ -14699,7 +14696,6 @@
      "integrity": "sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "~0.25.0",
        "get-tsconfig": "^4.7.5"
@@ -14884,7 +14880,6 @@
      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
      "dev": true,
      "license": "Apache-2.0",
-      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -15154,6 +15149,7 @@
      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">= 0.4.0"
      }
@@ -15209,7 +15205,6 @@
      "integrity": "sha512-ixXJB1YRgDIw2OszKQS9WxGHKwLdCsbQNkpJN171udl6szi/rIySHL6/Os3s2+oE4P/FLD4dxg4mD7Wust+u5g==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.4.6",
@@ -15323,7 +15318,6 @@
      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -15337,7 +15331,6 @@
      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@types/chai": "^5.2.2",
        "@vitest/expect": "3.2.4",
@@ -16016,7 +16009,6 @@
      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
      "license": "MIT",
-      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
@@ -16032,7 +16024,7 @@
    },
    "packages/cli": {
      "name": "@qwen-code/qwen-code",
-      "version": "0.1.5",
+      "version": "0.1.4",
      "dependencies": {
        "@google/genai": "1.16.0",
        "@iarna/toml": "^2.2.5",
@@ -16147,7 +16139,7 @@
    },
    "packages/core": {
      "name": "@qwen-code/qwen-code-core",
-      "version": "0.1.5",
+      "version": "0.1.4",
      "hasInstallScript": true,
      "dependencies": {
        "@google/genai": "1.16.0",
@@ -16277,7 +16269,6 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -16287,7 +16278,7 @@
    },
    "packages/test-utils": {
      "name": "@qwen-code/qwen-code-test-utils",
-      "version": "0.1.5",
+      "version": "0.1.4",
      "dev": true,
      "license": "Apache-2.0",
      "devDependencies": {
@@ -16299,7 +16290,7 @@
    },
    "packages/vscode-ide-companion": {
      "name": "qwen-code-vscode-ide-companion",
-      "version": "0.1.5",
+      "version": "0.1.4",
      "license": "LICENSE",
      "dependencies": {
        "@modelcontextprotocol/sdk": "^1.15.1",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.1.5",
+  "version": "0.1.4",
  "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.1.5"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.1.4"
  },
  "scripts": {
    "start": "cross-env node scripts/start.js",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.1.5",
+  "version": "0.1.4",
  "description": "Qwen Code",
  "repository": {
    "type": "git",
@@ -25,7 +25,7 @@
    "dist"
  ],
  "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.1.5"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.1.4"
  },
  "dependencies": {
    "@google/genai": "1.16.0",
--- a/packages/cli/src/ui/commands/aboutCommand.test.ts
+++ b/packages/cli/src/ui/commands/aboutCommand.test.ts
@@ -8,38 +8,22 @@ import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { aboutCommand } from './aboutCommand.js';
 import { type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import * as versionUtils from '../../utils/version.js';
 import { MessageType } from '../types.js';
-import { IdeClient } from '@qwen-code/qwen-code-core';
+import * as systemInfoUtils from '../../utils/systemInfo.js';

-vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
-  return {
-    ...actual,
-    IdeClient: {
-      getInstance: vi.fn().mockResolvedValue({
-        getDetectedIdeDisplayName: vi.fn().mockReturnValue('test-ide'),
-      }),
-    },
-  };
-});
-
-vi.mock('../../utils/version.js', () => ({
-  getCliVersion: vi.fn(),
-}));
+vi.mock('../../utils/systemInfo.js');

 describe('aboutCommand', () => {
  let mockContext: CommandContext;
-  const originalPlatform = process.platform;
  const originalEnv = { ...process.env };

  beforeEach(() => {
    mockContext = createMockCommandContext({
      services: {
        config: {
-          getModel: vi.fn(),
+          getModel: vi.fn().mockReturnValue('test-model'),
          getIdeMode: vi.fn().mockReturnValue(true),
+          getSessionId: vi.fn().mockReturnValue('test-session-id'),
        },
        settings: {
          merged: {
@@ -56,21 +40,25 @@ describe('aboutCommand', () => {
      },
    } as unknown as CommandContext);

-    vi.mocked(versionUtils.getCliVersion).mockResolvedValue('test-version');
-    vi.spyOn(mockContext.services.config!, 'getModel').mockReturnValue(
-      'test-model',
-    );
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'test-gcp-project';
-    Object.defineProperty(process, 'platform', {
-      value: 'test-os',
+    vi.mocked(systemInfoUtils.getExtendedSystemInfo).mockResolvedValue({
+      cliVersion: 'test-version',
+      osPlatform: 'test-os',
+      osArch: 'x64',
+      osRelease: '22.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: '10.0.0',
+      sandboxEnv: 'no sandbox',
+      modelVersion: 'test-model',
+      selectedAuthType: 'test-auth',
+      ideClient: 'test-ide',
+      sessionId: 'test-session-id',
+      memoryUsage: '100 MB',
+      baseUrl: undefined,
    });
  });

  afterEach(() => {
    vi.unstubAllEnvs();
-    Object.defineProperty(process, 'platform', {
-      value: originalPlatform,
-    });
    process.env = originalEnv;
    vi.clearAllMocks();
  });
@@ -81,30 +69,55 @@ describe('aboutCommand', () => {
  });

  it('should call addItem with all version info', async () => {
-    process.env['SANDBOX'] = '';
    if (!aboutCommand.action) {
      throw new Error('The about command must have an action.');
    }

    await aboutCommand.action(mockContext, '');

+    expect(systemInfoUtils.getExtendedSystemInfo).toHaveBeenCalledWith(
+      mockContext,
+    );
    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-      {
+      expect.objectContaining({
        type: MessageType.ABOUT,
-        cliVersion: 'test-version',
-        osVersion: 'test-os',
-        sandboxEnv: 'no sandbox',
-        modelVersion: 'test-model',
-        selectedAuthType: 'test-auth',
-        gcpProject: 'test-gcp-project',
-        ideClient: 'test-ide',
-      },
+        systemInfo: expect.objectContaining({
+          cliVersion: 'test-version',
+          osPlatform: 'test-os',
+          osArch: 'x64',
+          osRelease: '22.0.0',
+          nodeVersion: 'v20.0.0',
+          npmVersion: '10.0.0',
+          sandboxEnv: 'no sandbox',
+          modelVersion: 'test-model',
+          selectedAuthType: 'test-auth',
+          ideClient: 'test-ide',
+          sessionId: 'test-session-id',
+          memoryUsage: '100 MB',
+          baseUrl: undefined,
+        }),
+      }),
      expect.any(Number),
    );
  });

  it('should show the correct sandbox environment variable', async () => {
-    process.env['SANDBOX'] = 'gemini-sandbox';
+    vi.mocked(systemInfoUtils.getExtendedSystemInfo).mockResolvedValue({
+      cliVersion: 'test-version',
+      osPlatform: 'test-os',
+      osArch: 'x64',
+      osRelease: '22.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: '10.0.0',
+      sandboxEnv: 'gemini-sandbox',
+      modelVersion: 'test-model',
+      selectedAuthType: 'test-auth',
+      ideClient: 'test-ide',
+      sessionId: 'test-session-id',
+      memoryUsage: '100 MB',
+      baseUrl: undefined,
+    });
+
    if (!aboutCommand.action) {
      throw new Error('The about command must have an action.');
    }
@@ -113,15 +126,32 @@ describe('aboutCommand', () => {

    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
      expect.objectContaining({
-        sandboxEnv: 'gemini-sandbox',
+        type: MessageType.ABOUT,
+        systemInfo: expect.objectContaining({
+          sandboxEnv: 'gemini-sandbox',
+        }),
      }),
      expect.any(Number),
    );
  });

  it('should show sandbox-exec profile when applicable', async () => {
-    process.env['SANDBOX'] = 'sandbox-exec';
-    process.env['SEATBELT_PROFILE'] = 'test-profile';
+    vi.mocked(systemInfoUtils.getExtendedSystemInfo).mockResolvedValue({
+      cliVersion: 'test-version',
+      osPlatform: 'test-os',
+      osArch: 'x64',
+      osRelease: '22.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: '10.0.0',
+      sandboxEnv: 'sandbox-exec (test-profile)',
+      modelVersion: 'test-model',
+      selectedAuthType: 'test-auth',
+      ideClient: 'test-ide',
+      sessionId: 'test-session-id',
+      memoryUsage: '100 MB',
+      baseUrl: undefined,
+    });
+
    if (!aboutCommand.action) {
      throw new Error('The about command must have an action.');
    }
@@ -130,18 +160,31 @@ describe('aboutCommand', () => {

    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
      expect.objectContaining({
-        sandboxEnv: 'sandbox-exec (test-profile)',
+        systemInfo: expect.objectContaining({
+          sandboxEnv: 'sandbox-exec (test-profile)',
+        }),
      }),
      expect.any(Number),
    );
  });

  it('should not show ide client when it is not detected', async () => {
-    vi.mocked(IdeClient.getInstance).mockResolvedValue({
-      getDetectedIdeDisplayName: vi.fn().mockReturnValue(undefined),
-    } as unknown as IdeClient);
+    vi.mocked(systemInfoUtils.getExtendedSystemInfo).mockResolvedValue({
+      cliVersion: 'test-version',
+      osPlatform: 'test-os',
+      osArch: 'x64',
+      osRelease: '22.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: '10.0.0',
+      sandboxEnv: 'no sandbox',
+      modelVersion: 'test-model',
+      selectedAuthType: 'test-auth',
+      ideClient: '',
+      sessionId: 'test-session-id',
+      memoryUsage: '100 MB',
+      baseUrl: undefined,
+    });

-    process.env['SANDBOX'] = '';
    if (!aboutCommand.action) {
      throw new Error('The about command must have an action.');
    }
@@ -151,13 +194,87 @@ describe('aboutCommand', () => {
    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
      expect.objectContaining({
        type: MessageType.ABOUT,
-        cliVersion: 'test-version',
-        osVersion: 'test-os',
-        sandboxEnv: 'no sandbox',
-        modelVersion: 'test-model',
-        selectedAuthType: 'test-auth',
-        gcpProject: 'test-gcp-project',
-        ideClient: '',
+        systemInfo: expect.objectContaining({
+          cliVersion: 'test-version',
+          osPlatform: 'test-os',
+          osArch: 'x64',
+          osRelease: '22.0.0',
+          nodeVersion: 'v20.0.0',
+          npmVersion: '10.0.0',
+          sandboxEnv: 'no sandbox',
+          modelVersion: 'test-model',
+          selectedAuthType: 'test-auth',
+          ideClient: '',
+          sessionId: 'test-session-id',
+          memoryUsage: '100 MB',
+          baseUrl: undefined,
+        }),
+      }),
+      expect.any(Number),
+    );
+  });
+
+  it('should show unknown npmVersion when npm command fails', async () => {
+    vi.mocked(systemInfoUtils.getExtendedSystemInfo).mockResolvedValue({
+      cliVersion: 'test-version',
+      osPlatform: 'test-os',
+      osArch: 'x64',
+      osRelease: '22.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: 'unknown',
+      sandboxEnv: 'no sandbox',
+      modelVersion: 'test-model',
+      selectedAuthType: 'test-auth',
+      ideClient: 'test-ide',
+      sessionId: 'test-session-id',
+      memoryUsage: '100 MB',
+      baseUrl: undefined,
+    });
+
+    if (!aboutCommand.action) {
+      throw new Error('The about command must have an action.');
+    }
+
+    await aboutCommand.action(mockContext, '');
+
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        systemInfo: expect.objectContaining({
+          npmVersion: 'unknown',
+        }),
+      }),
+      expect.any(Number),
+    );
+  });
+
+  it('should show unknown sessionId when config is not available', async () => {
+    vi.mocked(systemInfoUtils.getExtendedSystemInfo).mockResolvedValue({
+      cliVersion: 'test-version',
+      osPlatform: 'test-os',
+      osArch: 'x64',
+      osRelease: '22.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: '10.0.0',
+      sandboxEnv: 'no sandbox',
+      modelVersion: 'Unknown',
+      selectedAuthType: 'test-auth',
+      ideClient: '',
+      sessionId: 'unknown',
+      memoryUsage: '100 MB',
+      baseUrl: undefined,
+    });
+
+    if (!aboutCommand.action) {
+      throw new Error('The about command must have an action.');
+    }
+
+    await aboutCommand.action(mockContext, '');
+
+    expect(mockContext.ui.addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        systemInfo: expect.objectContaining({
+          sessionId: 'unknown',
+        }),
      }),
      expect.any(Number),
    );
--- a/packages/cli/src/ui/commands/aboutCommand.ts
+++ b/packages/cli/src/ui/commands/aboutCommand.ts
@@ -4,53 +4,23 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { getCliVersion } from '../../utils/version.js';
-import type { CommandContext, SlashCommand } from './types.js';
+import type { SlashCommand } from './types.js';
 import { CommandKind } from './types.js';
-import process from 'node:process';
 import { MessageType, type HistoryItemAbout } from '../types.js';
-import { IdeClient } from '@qwen-code/qwen-code-core';
+import { getExtendedSystemInfo } from '../../utils/systemInfo.js';

 export const aboutCommand: SlashCommand = {
  name: 'about',
  description: 'show version info',
  kind: CommandKind.BUILT_IN,
  action: async (context) => {
-    const osVersion = process.platform;
-    let sandboxEnv = 'no sandbox';
-    if (process.env['SANDBOX'] && process.env['SANDBOX'] !== 'sandbox-exec') {
-      sandboxEnv = process.env['SANDBOX'];
-    } else if (process.env['SANDBOX'] === 'sandbox-exec') {
-      sandboxEnv = `sandbox-exec (${
-        process.env['SEATBELT_PROFILE'] || 'unknown'
-      })`;
-    }
-    const modelVersion = context.services.config?.getModel() || 'Unknown';
-    const cliVersion = await getCliVersion();
-    const selectedAuthType =
-      context.services.settings.merged.security?.auth?.selectedType || '';
-    const gcpProject = process.env['GOOGLE_CLOUD_PROJECT'] || '';
-    const ideClient = await getIdeClientName(context);
+    const systemInfo = await getExtendedSystemInfo(context);

    const aboutItem: Omit<HistoryItemAbout, 'id'> = {
      type: MessageType.ABOUT,
-      cliVersion,
-      osVersion,
-      sandboxEnv,
-      modelVersion,
-      selectedAuthType,
-      gcpProject,
-      ideClient,
+      systemInfo,
    };

    context.ui.addItem(aboutItem, Date.now());
  },
 };
-
-async function getIdeClientName(context: CommandContext) {
-  if (!context.services.config?.getIdeMode()) {
-    return '';
-  }
-  const ideClient = await IdeClient.getInstance();
-  return ideClient?.getDetectedIdeDisplayName() ?? '';
-}
--- a/packages/cli/src/ui/commands/bugCommand.test.ts
+++ b/packages/cli/src/ui/commands/bugCommand.test.ts
@@ -8,41 +8,34 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import open from 'open';
 import { bugCommand } from './bugCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { getCliVersion } from '../../utils/version.js';
 import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
-import { formatMemoryUsage } from '../utils/formatters.js';
 import { AuthType } from '@qwen-code/qwen-code-core';
+import * as systemInfoUtils from '../../utils/systemInfo.js';

 // Mock dependencies
 vi.mock('open');
-vi.mock('../../utils/version.js');
-vi.mock('../utils/formatters.js');
-vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
-  return {
-    ...actual,
-    IdeClient: {
-      getInstance: () => ({
-        getDetectedIdeDisplayName: vi.fn().mockReturnValue('VSCode'),
-      }),
-    },
-  };
-});
-vi.mock('node:process', () => ({
-  default: {
-    platform: 'test-platform',
-    version: 'v20.0.0',
-    // Keep other necessary process properties if needed by other parts of the code
-    env: process.env,
-    memoryUsage: () => ({ rss: 0 }),
-  },
-}));
+vi.mock('../../utils/systemInfo.js');

 describe('bugCommand', () => {
  beforeEach(() => {
-    vi.mocked(getCliVersion).mockResolvedValue('0.1.0');
-    vi.mocked(formatMemoryUsage).mockReturnValue('100 MB');
+    vi.mocked(systemInfoUtils.getExtendedSystemInfo).mockResolvedValue({
+      cliVersion: '0.1.0',
+      osPlatform: 'test-platform',
+      osArch: 'x64',
+      osRelease: '22.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: '10.0.0',
+      sandboxEnv: 'test',
+      modelVersion: 'qwen3-coder-plus',
+      selectedAuthType: '',
+      ideClient: 'VSCode',
+      sessionId: 'test-session-id',
+      memoryUsage: '100 MB',
+      gitCommit:
+        GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
+          ? GIT_COMMIT_INFO
+          : undefined,
+    });
    vi.stubEnv('SANDBOX', 'qwen-test');
  });

@@ -55,19 +48,7 @@ describe('bugCommand', () => {
    const mockContext = createMockCommandContext({
      services: {
        config: {
-          getModel: () => 'qwen3-coder-plus',
          getBugCommand: () => undefined,
-          getIdeMode: () => true,
-          getSessionId: () => 'test-session-id',
-        },
-        settings: {
-          merged: {
-            security: {
-              auth: {
-                selectedType: undefined,
-              },
-            },
-          },
        },
      },
    });
@@ -75,14 +56,21 @@ describe('bugCommand', () => {
    if (!bugCommand.action) throw new Error('Action is not defined');
    await bugCommand.action(mockContext, 'A test bug');

+    const gitCommitLine =
+      GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
+        ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n`
+        : '';
    const expectedInfo = `
 * **CLI Version:** 0.1.0
-* **Git Commit:** ${GIT_COMMIT_INFO}
+${gitCommitLine}* **Model:** qwen3-coder-plus
+* **Sandbox:** test
+* **OS Platform:** test-platform
+* **OS Arch:** x64
+* **OS Release:** 22.0.0
+* **Node.js Version:** v20.0.0
+* **NPM Version:** 10.0.0
 * **Session ID:** test-session-id
-* **Operating System:** test-platform v20.0.0
-* **Sandbox Environment:** test
-* **Auth Type:** 
-* **Model Version:** qwen3-coder-plus
+* **Auth Method:** 
 * **Memory Usage:** 100 MB
 * **IDE Client:** VSCode
 `;
@@ -99,19 +87,7 @@ describe('bugCommand', () => {
    const mockContext = createMockCommandContext({
      services: {
        config: {
-          getModel: () => 'qwen3-coder-plus',
          getBugCommand: () => ({ urlTemplate: customTemplate }),
-          getIdeMode: () => true,
-          getSessionId: () => 'test-session-id',
-        },
-        settings: {
-          merged: {
-            security: {
-              auth: {
-                selectedType: undefined,
-              },
-            },
-          },
        },
      },
    });
@@ -119,14 +95,21 @@ describe('bugCommand', () => {
    if (!bugCommand.action) throw new Error('Action is not defined');
    await bugCommand.action(mockContext, 'A custom bug');

+    const gitCommitLine =
+      GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
+        ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n`
+        : '';
    const expectedInfo = `
 * **CLI Version:** 0.1.0
-* **Git Commit:** ${GIT_COMMIT_INFO}
+${gitCommitLine}* **Model:** qwen3-coder-plus
+* **Sandbox:** test
+* **OS Platform:** test-platform
+* **OS Arch:** x64
+* **OS Release:** 22.0.0
+* **Node.js Version:** v20.0.0
+* **NPM Version:** 10.0.0
 * **Session ID:** test-session-id
-* **Operating System:** test-platform v20.0.0
-* **Sandbox Environment:** test
-* **Auth Type:** 
-* **Model Version:** qwen3-coder-plus
+* **Auth Method:** 
 * **Memory Usage:** 100 MB
 * **IDE Client:** VSCode
 `;
@@ -138,25 +121,30 @@ describe('bugCommand', () => {
  });

  it('should include Base URL when auth type is OpenAI', async () => {
+    vi.mocked(systemInfoUtils.getExtendedSystemInfo).mockResolvedValue({
+      cliVersion: '0.1.0',
+      osPlatform: 'test-platform',
+      osArch: 'x64',
+      osRelease: '22.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: '10.0.0',
+      sandboxEnv: 'test',
+      modelVersion: 'qwen3-coder-plus',
+      selectedAuthType: AuthType.USE_OPENAI,
+      ideClient: 'VSCode',
+      sessionId: 'test-session-id',
+      memoryUsage: '100 MB',
+      baseUrl: 'https://api.openai.com/v1',
+      gitCommit:
+        GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
+          ? GIT_COMMIT_INFO
+          : undefined,
+    });
+
    const mockContext = createMockCommandContext({
      services: {
        config: {
-          getModel: () => 'qwen3-coder-plus',
          getBugCommand: () => undefined,
-          getIdeMode: () => true,
-          getSessionId: () => 'test-session-id',
-          getContentGeneratorConfig: () => ({
-            baseUrl: 'https://api.openai.com/v1',
-          }),
-        },
-        settings: {
-          merged: {
-            security: {
-              auth: {
-                selectedType: AuthType.USE_OPENAI,
-              },
-            },
-          },
        },
      },
    });
@@ -164,15 +152,22 @@ describe('bugCommand', () => {
    if (!bugCommand.action) throw new Error('Action is not defined');
    await bugCommand.action(mockContext, 'OpenAI bug');

+    const gitCommitLine =
+      GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
+        ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n`
+        : '';
    const expectedInfo = `
 * **CLI Version:** 0.1.0
-* **Git Commit:** ${GIT_COMMIT_INFO}
+${gitCommitLine}* **Model:** qwen3-coder-plus
+* **Sandbox:** test
+* **OS Platform:** test-platform
+* **OS Arch:** x64
+* **OS Release:** 22.0.0
+* **Node.js Version:** v20.0.0
+* **NPM Version:** 10.0.0
 * **Session ID:** test-session-id
-* **Operating System:** test-platform v20.0.0
-* **Sandbox Environment:** test
-* **Auth Type:** ${AuthType.USE_OPENAI}
+* **Auth Method:** ${AuthType.USE_OPENAI}
 * **Base URL:** https://api.openai.com/v1
-* **Model Version:** qwen3-coder-plus
 * **Memory Usage:** 100 MB
 * **IDE Client:** VSCode
 `;
--- a/packages/cli/src/ui/commands/bugCommand.ts
+++ b/packages/cli/src/ui/commands/bugCommand.ts
@@ -5,17 +5,17 @@
 */

 import open from 'open';
-import process from 'node:process';
 import {
  type CommandContext,
  type SlashCommand,
  CommandKind,
 } from './types.js';
 import { MessageType } from '../types.js';
-import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
-import { formatMemoryUsage } from '../utils/formatters.js';
-import { getCliVersion } from '../../utils/version.js';
-import { IdeClient, AuthType } from '@qwen-code/qwen-code-core';
+import { getExtendedSystemInfo } from '../../utils/systemInfo.js';
+import {
+  getSystemInfoFields,
+  getFieldValue,
+} from '../../utils/systemInfoFields.js';

 export const bugCommand: SlashCommand = {
  name: 'bug',
@@ -23,50 +23,20 @@ export const bugCommand: SlashCommand = {
  kind: CommandKind.BUILT_IN,
  action: async (context: CommandContext, args?: string): Promise<void> => {
    const bugDescription = (args || '').trim();
-    const { config } = context.services;
+    const systemInfo = await getExtendedSystemInfo(context);

-    const osVersion = `${process.platform} ${process.version}`;
-    let sandboxEnv = 'no sandbox';
-    if (process.env['SANDBOX'] && process.env['SANDBOX'] !== 'sandbox-exec') {
-      sandboxEnv = process.env['SANDBOX'].replace(/^qwen-(?:code-)?/, '');
-    } else if (process.env['SANDBOX'] === 'sandbox-exec') {
-      sandboxEnv = `sandbox-exec (${
-        process.env['SEATBELT_PROFILE'] || 'unknown'
-      })`;
-    }
-    const modelVersion = config?.getModel() || 'Unknown';
-    const cliVersion = await getCliVersion();
-    const memoryUsage = formatMemoryUsage(process.memoryUsage().rss);
-    const ideClient = await getIdeClientName(context);
-    const selectedAuthType =
-      context.services.settings.merged.security?.auth?.selectedType || '';
-    const baseUrl =
-      selectedAuthType === AuthType.USE_OPENAI
-        ? config?.getContentGeneratorConfig()?.baseUrl
-        : undefined;
+    const fields = getSystemInfoFields(systemInfo);

-    let info = `
-* **CLI Version:** ${cliVersion}
-* **Git Commit:** ${GIT_COMMIT_INFO}
-* **Session ID:** ${config?.getSessionId() || 'unknown'}
-* **Operating System:** ${osVersion}
-* **Sandbox Environment:** ${sandboxEnv}
-* **Auth Type:** ${selectedAuthType}`;
-    if (baseUrl) {
-      info += `\n* **Base URL:** ${baseUrl}`;
-    }
-    info += `
-* **Model Version:** ${modelVersion}
-* **Memory Usage:** ${memoryUsage}
-`;
-    if (ideClient) {
-      info += `* **IDE Client:** ${ideClient}\n`;
+    // Generate bug report info using the same field configuration
+    let info = '\n';
+    for (const field of fields) {
+      info += `* **${field.label}:** ${getFieldValue(field, systemInfo)}\n`;
    }

    let bugReportUrl =
      'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title={title}&info={info}';

-    const bugCommandSettings = config?.getBugCommand();
+    const bugCommandSettings = context.services.config?.getBugCommand();
    if (bugCommandSettings?.urlTemplate) {
      bugReportUrl = bugCommandSettings.urlTemplate;
    }
@@ -98,11 +68,3 @@ export const bugCommand: SlashCommand = {
    }
  },
 };
-
-async function getIdeClientName(context: CommandContext) {
-  if (!context.services.config?.getIdeMode()) {
-    return '';
-  }
-  const ideClient = await IdeClient.getInstance();
-  return ideClient.getDetectedIdeDisplayName() ?? '';
-}
--- a/packages/cli/src/ui/components/AboutBox.tsx
+++ b/packages/cli/src/ui/components/AboutBox.tsx
@@ -7,127 +7,46 @@
 import type React from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
-import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
+import type { ExtendedSystemInfo } from '../../utils/systemInfo.js';
+import {
+  getSystemInfoFields,
+  getFieldValue,
+  type SystemInfoField,
+} from '../../utils/systemInfoFields.js';

-interface AboutBoxProps {
-  cliVersion: string;
-  osVersion: string;
-  sandboxEnv: string;
-  modelVersion: string;
-  selectedAuthType: string;
-  gcpProject: string;
-  ideClient: string;
-}
+type AboutBoxProps = ExtendedSystemInfo;

-export const AboutBox: React.FC<AboutBoxProps> = ({
-  cliVersion,
-  osVersion,
-  sandboxEnv,
-  modelVersion,
-  selectedAuthType,
-  gcpProject,
-  ideClient,
-}) => (
-  <Box
-    borderStyle="round"
-    borderColor={theme.border.default}
-    flexDirection="column"
-    padding={1}
-    marginY={1}
-    width="100%"
-  >
-    <Box marginBottom={1}>
-      <Text bold color={theme.text.accent}>
-        About Qwen Code
-      </Text>
-    </Box>
-    <Box flexDirection="row">
-      <Box width="35%">
-        <Text bold color={theme.text.link}>
-          CLI Version
+export const AboutBox: React.FC<AboutBoxProps> = (props) => {
+  const fields = getSystemInfoFields(props);
+
+  return (
+    <Box
+      borderStyle="round"
+      borderColor={theme.border.default}
+      flexDirection="column"
+      padding={1}
+      marginY={1}
+      width="100%"
+    >
+      <Box marginBottom={1}>
+        <Text bold color={theme.text.accent}>
+          About Qwen Code
        </Text>
      </Box>
-      <Box>
-        <Text color={theme.text.primary}>{cliVersion}</Text>
-      </Box>
+      {fields.map((field: SystemInfoField) => (
+        <Box key={field.key} flexDirection="row">
+          <Box width="35%">
+            <Text bold color={theme.text.link}>
+              {field.label}
+            </Text>
+          </Box>
+          <Box>
+            <Text color={theme.text.primary}>
+              {getFieldValue(field, props)}
+            </Text>
+          </Box>
+        </Box>
+      ))}
    </Box>
-    {GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO) && (
-      <Box flexDirection="row">
-        <Box width="35%">
-          <Text bold color={theme.text.link}>
-            Git Commit
-          </Text>
-        </Box>
-        <Box>
-          <Text color={theme.text.primary}>{GIT_COMMIT_INFO}</Text>
-        </Box>
-      </Box>
-    )}
-    <Box flexDirection="row">
-      <Box width="35%">
-        <Text bold color={theme.text.link}>
-          Model
-        </Text>
-      </Box>
-      <Box>
-        <Text color={theme.text.primary}>{modelVersion}</Text>
-      </Box>
-    </Box>
-    <Box flexDirection="row">
-      <Box width="35%">
-        <Text bold color={theme.text.link}>
-          Sandbox
-        </Text>
-      </Box>
-      <Box>
-        <Text color={theme.text.primary}>{sandboxEnv}</Text>
-      </Box>
-    </Box>
-    <Box flexDirection="row">
-      <Box width="35%">
-        <Text bold color={theme.text.link}>
-          OS
-        </Text>
-      </Box>
-      <Box>
-        <Text color={theme.text.primary}>{osVersion}</Text>
-      </Box>
-    </Box>
-    <Box flexDirection="row">
-      <Box width="35%">
-        <Text bold color={theme.text.link}>
-          Auth Method
-        </Text>
-      </Box>
-      <Box>
-        <Text color={theme.text.primary}>
-          {selectedAuthType.startsWith('oauth') ? 'OAuth' : selectedAuthType}
-        </Text>
-      </Box>
-    </Box>
-    {gcpProject && (
-      <Box flexDirection="row">
-        <Box width="35%">
-          <Text bold color={theme.text.link}>
-            GCP Project
-          </Text>
-        </Box>
-        <Box>
-          <Text color={theme.text.primary}>{gcpProject}</Text>
-        </Box>
-      </Box>
-    )}
-    {ideClient && (
-      <Box flexDirection="row">
-        <Box width="35%">
-          <Text bold color={theme.text.link}>
-            IDE Client
-          </Text>
-        </Box>
-        <Box>
-          <Text color={theme.text.primary}>{ideClient}</Text>
-        </Box>
-      </Box>
-    )}
-  </Box>
-);
+  );
+};
--- a/packages/cli/src/ui/components/HistoryItemDisplay.test.tsx
+++ b/packages/cli/src/ui/components/HistoryItemDisplay.test.tsx
@@ -71,15 +71,24 @@ describe('<HistoryItemDisplay />', () => {

  it('renders AboutBox for "about" type', () => {
    const item: HistoryItem = {
-      ...baseItem,
+      id: 1,
      type: MessageType.ABOUT,
-      cliVersion: '1.0.0',
-      osVersion: 'test-os',
-      sandboxEnv: 'test-env',
-      modelVersion: 'test-model',
-      selectedAuthType: 'test-auth',
-      gcpProject: 'test-project',
-      ideClient: 'test-ide',
+      systemInfo: {
+        cliVersion: '1.0.0',
+        osPlatform: 'test-os',
+        osArch: 'x64',
+        osRelease: '22.0.0',
+        nodeVersion: 'v20.0.0',
+        npmVersion: '10.0.0',
+        sandboxEnv: 'test-env',
+        modelVersion: 'test-model',
+        selectedAuthType: 'test-auth',
+        ideClient: 'test-ide',
+        sessionId: 'test-session-id',
+        memoryUsage: '100 MB',
+        baseUrl: undefined,
+        gitCommit: undefined,
+      },
    };
    const { lastFrame } = renderWithProviders(
      <HistoryItemDisplay {...baseItem} item={item} />,
--- a/packages/cli/src/ui/components/HistoryItemDisplay.tsx
+++ b/packages/cli/src/ui/components/HistoryItemDisplay.tsx
@@ -95,15 +95,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
        <ErrorMessage text={itemForDisplay.text} />
      )}
      {itemForDisplay.type === 'about' && (
-        <AboutBox
-          cliVersion={itemForDisplay.cliVersion}
-          osVersion={itemForDisplay.osVersion}
-          sandboxEnv={itemForDisplay.sandboxEnv}
-          modelVersion={itemForDisplay.modelVersion}
-          selectedAuthType={itemForDisplay.selectedAuthType}
-          gcpProject={itemForDisplay.gcpProject}
-          ideClient={itemForDisplay.ideClient}
-        />
+        <AboutBox {...itemForDisplay.systemInfo} />
      )}
      {itemForDisplay.type === 'help' && commands && (
        <Help commands={commands} />
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
@@ -138,13 +138,7 @@ export const useSlashCommandProcessor = (
      if (message.type === MessageType.ABOUT) {
        historyItemContent = {
          type: 'about',
-          cliVersion: message.cliVersion,
-          osVersion: message.osVersion,
-          sandboxEnv: message.sandboxEnv,
-          modelVersion: message.modelVersion,
-          selectedAuthType: message.selectedAuthType,
-          gcpProject: message.gcpProject,
-          ideClient: message.ideClient,
+          systemInfo: message.systemInfo,
        };
      } else if (message.type === MessageType.HELP) {
        historyItemContent = {
--- a/packages/cli/src/ui/types.ts
+++ b/packages/cli/src/ui/types.ts
@@ -120,13 +120,22 @@ export type HistoryItemWarning = HistoryItemBase & {

 export type HistoryItemAbout = HistoryItemBase & {
  type: 'about';
-  cliVersion: string;
-  osVersion: string;
-  sandboxEnv: string;
-  modelVersion: string;
-  selectedAuthType: string;
-  gcpProject: string;
-  ideClient: string;
+  systemInfo: {
+    cliVersion: string;
+    osPlatform: string;
+    osArch: string;
+    osRelease: string;
+    nodeVersion: string;
+    npmVersion: string;
+    sandboxEnv: string;
+    modelVersion: string;
+    selectedAuthType: string;
+    ideClient: string;
+    sessionId: string;
+    memoryUsage: string;
+    baseUrl?: string;
+    gitCommit?: string;
+  };
 };

 export type HistoryItemHelp = HistoryItemBase & {
@@ -288,13 +297,22 @@ export type Message =
  | {
      type: MessageType.ABOUT;
      timestamp: Date;
-      cliVersion: string;
-      osVersion: string;
-      sandboxEnv: string;
-      modelVersion: string;
-      selectedAuthType: string;
-      gcpProject: string;
-      ideClient: string;
+      systemInfo: {
+        cliVersion: string;
+        osPlatform: string;
+        osArch: string;
+        osRelease: string;
+        nodeVersion: string;
+        npmVersion: string;
+        sandboxEnv: string;
+        modelVersion: string;
+        selectedAuthType: string;
+        ideClient: string;
+        sessionId: string;
+        memoryUsage: string;
+        baseUrl?: string;
+        gitCommit?: string;
+      };
      content?: string; // Optional content, not really used for ABOUT
    }
  | {
--- a/packages/cli/src/utils/systemInfo.test.ts
+++ b/packages/cli/src/utils/systemInfo.test.ts
@@ -0,0 +1,331 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
+import {
+  getSystemInfo,
+  getExtendedSystemInfo,
+  getNpmVersion,
+  getSandboxEnv,
+  getIdeClientName,
+} from './systemInfo.js';
+import type { CommandContext } from '../ui/commands/types.js';
+import { createMockCommandContext } from '../test-utils/mockCommandContext.js';
+import * as child_process from 'node:child_process';
+import os from 'node:os';
+import { IdeClient } from '@qwen-code/qwen-code-core';
+import * as versionUtils from './version.js';
+import type { ExecSyncOptions } from 'node:child_process';
+
+vi.mock('node:child_process');
+
+vi.mock('node:os', () => ({
+  default: {
+    release: vi.fn(),
+  },
+}));
+
+vi.mock('./version.js', () => ({
+  getCliVersion: vi.fn(),
+}));
+
+vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
+  return {
+    ...actual,
+    IdeClient: {
+      getInstance: vi.fn(),
+    },
+  };
+});
+
+describe('systemInfo', () => {
+  let mockContext: CommandContext;
+  const originalPlatform = process.platform;
+  const originalArch = process.arch;
+  const originalVersion = process.version;
+  const originalEnv = { ...process.env };
+
+  beforeEach(() => {
+    mockContext = createMockCommandContext({
+      services: {
+        config: {
+          getModel: vi.fn().mockReturnValue('test-model'),
+          getIdeMode: vi.fn().mockReturnValue(true),
+          getSessionId: vi.fn().mockReturnValue('test-session-id'),
+          getContentGeneratorConfig: vi.fn().mockReturnValue({
+            baseUrl: 'https://api.openai.com',
+          }),
+        },
+        settings: {
+          merged: {
+            security: {
+              auth: {
+                selectedType: 'test-auth',
+              },
+            },
+          },
+        },
+      },
+    } as unknown as CommandContext);
+
+    vi.mocked(versionUtils.getCliVersion).mockResolvedValue('test-version');
+    vi.mocked(child_process.execSync).mockImplementation(
+      (command: string, options?: ExecSyncOptions) => {
+        if (
+          options &&
+          typeof options === 'object' &&
+          'encoding' in options &&
+          options.encoding === 'utf-8'
+        ) {
+          return '10.0.0';
+        }
+        return Buffer.from('10.0.0', 'utf-8');
+      },
+    );
+    vi.mocked(os.release).mockReturnValue('22.0.0');
+    process.env['GOOGLE_CLOUD_PROJECT'] = 'test-gcp-project';
+    Object.defineProperty(process, 'platform', {
+      value: 'test-os',
+    });
+    Object.defineProperty(process, 'arch', {
+      value: 'x64',
+    });
+    Object.defineProperty(process, 'version', {
+      value: 'v20.0.0',
+    });
+  });
+
+  afterEach(() => {
+    vi.unstubAllEnvs();
+    Object.defineProperty(process, 'platform', {
+      value: originalPlatform,
+    });
+    Object.defineProperty(process, 'arch', {
+      value: originalArch,
+    });
+    Object.defineProperty(process, 'version', {
+      value: originalVersion,
+    });
+    process.env = originalEnv;
+    vi.clearAllMocks();
+    vi.resetAllMocks();
+  });
+
+  describe('getNpmVersion', () => {
+    it('should return npm version when available', async () => {
+      vi.mocked(child_process.execSync).mockImplementation(
+        (command: string, options?: ExecSyncOptions) => {
+          if (
+            options &&
+            typeof options === 'object' &&
+            'encoding' in options &&
+            options.encoding === 'utf-8'
+          ) {
+            return '10.0.0';
+          }
+          return Buffer.from('10.0.0', 'utf-8');
+        },
+      );
+      const version = await getNpmVersion();
+      expect(version).toBe('10.0.0');
+    });
+
+    it('should return unknown when npm command fails', async () => {
+      vi.mocked(child_process.execSync).mockImplementation(() => {
+        throw new Error('npm not found');
+      });
+      const version = await getNpmVersion();
+      expect(version).toBe('unknown');
+    });
+  });
+
+  describe('getSandboxEnv', () => {
+    it('should return "no sandbox" when SANDBOX is not set', () => {
+      delete process.env['SANDBOX'];
+      expect(getSandboxEnv()).toBe('no sandbox');
+    });
+
+    it('should return sandbox-exec info when SANDBOX is sandbox-exec', () => {
+      process.env['SANDBOX'] = 'sandbox-exec';
+      process.env['SEATBELT_PROFILE'] = 'test-profile';
+      expect(getSandboxEnv()).toBe('sandbox-exec (test-profile)');
+    });
+
+    it('should return sandbox name without prefix when stripPrefix is true', () => {
+      process.env['SANDBOX'] = 'qwen-code-test-sandbox';
+      expect(getSandboxEnv(true)).toBe('test-sandbox');
+    });
+
+    it('should return sandbox name with prefix when stripPrefix is false', () => {
+      process.env['SANDBOX'] = 'qwen-code-test-sandbox';
+      expect(getSandboxEnv(false)).toBe('qwen-code-test-sandbox');
+    });
+
+    it('should handle qwen- prefix removal', () => {
+      process.env['SANDBOX'] = 'qwen-custom-sandbox';
+      expect(getSandboxEnv(true)).toBe('custom-sandbox');
+    });
+  });
+
+  describe('getIdeClientName', () => {
+    it('should return IDE client name when IDE mode is enabled', async () => {
+      vi.mocked(IdeClient.getInstance).mockResolvedValue({
+        getDetectedIdeDisplayName: vi.fn().mockReturnValue('test-ide'),
+      } as unknown as IdeClient);
+
+      const ideClient = await getIdeClientName(mockContext);
+      expect(ideClient).toBe('test-ide');
+    });
+
+    it('should return empty string when IDE mode is disabled', async () => {
+      vi.mocked(mockContext.services.config!.getIdeMode).mockReturnValue(false);
+
+      const ideClient = await getIdeClientName(mockContext);
+      expect(ideClient).toBe('');
+    });
+
+    it('should return empty string when IDE client detection fails', async () => {
+      vi.mocked(IdeClient.getInstance).mockRejectedValue(
+        new Error('IDE client error'),
+      );
+
+      const ideClient = await getIdeClientName(mockContext);
+      expect(ideClient).toBe('');
+    });
+  });
+
+  describe('getSystemInfo', () => {
+    it('should collect all system information', async () => {
+      // Ensure SANDBOX is not set for this test
+      delete process.env['SANDBOX'];
+      vi.mocked(IdeClient.getInstance).mockResolvedValue({
+        getDetectedIdeDisplayName: vi.fn().mockReturnValue('test-ide'),
+      } as unknown as IdeClient);
+      vi.mocked(child_process.execSync).mockImplementation(
+        (command: string, options?: ExecSyncOptions) => {
+          if (
+            options &&
+            typeof options === 'object' &&
+            'encoding' in options &&
+            options.encoding === 'utf-8'
+          ) {
+            return '10.0.0';
+          }
+          return Buffer.from('10.0.0', 'utf-8');
+        },
+      );
+
+      const systemInfo = await getSystemInfo(mockContext);
+
+      expect(systemInfo).toEqual({
+        cliVersion: 'test-version',
+        osPlatform: 'test-os',
+        osArch: 'x64',
+        osRelease: '22.0.0',
+        nodeVersion: 'v20.0.0',
+        npmVersion: '10.0.0',
+        sandboxEnv: 'no sandbox',
+        modelVersion: 'test-model',
+        selectedAuthType: 'test-auth',
+        ideClient: 'test-ide',
+        sessionId: 'test-session-id',
+      });
+    });
+
+    it('should handle missing config gracefully', async () => {
+      mockContext.services.config = null;
+      vi.mocked(IdeClient.getInstance).mockResolvedValue({
+        getDetectedIdeDisplayName: vi.fn().mockReturnValue(''),
+      } as unknown as IdeClient);
+
+      const systemInfo = await getSystemInfo(mockContext);
+
+      expect(systemInfo.modelVersion).toBe('Unknown');
+      expect(systemInfo.sessionId).toBe('unknown');
+    });
+  });
+
+  describe('getExtendedSystemInfo', () => {
+    it('should include memory usage and base URL', async () => {
+      vi.mocked(IdeClient.getInstance).mockResolvedValue({
+        getDetectedIdeDisplayName: vi.fn().mockReturnValue('test-ide'),
+      } as unknown as IdeClient);
+      vi.mocked(child_process.execSync).mockImplementation(
+        (command: string, options?: ExecSyncOptions) => {
+          if (
+            options &&
+            typeof options === 'object' &&
+            'encoding' in options &&
+            options.encoding === 'utf-8'
+          ) {
+            return '10.0.0';
+          }
+          return Buffer.from('10.0.0', 'utf-8');
+        },
+      );
+
+      const { AuthType } = await import('@qwen-code/qwen-code-core');
+      // Update the mock context to use OpenAI auth
+      mockContext.services.settings.merged.security!.auth!.selectedType =
+        AuthType.USE_OPENAI;
+
+      const extendedInfo = await getExtendedSystemInfo(mockContext);
+
+      expect(extendedInfo.memoryUsage).toBeDefined();
+      expect(extendedInfo.memoryUsage).toMatch(/\d+\.\d+ (KB|MB|GB)/);
+      expect(extendedInfo.baseUrl).toBe('https://api.openai.com');
+    });
+
+    it('should use sandbox env without prefix for bug reports', async () => {
+      process.env['SANDBOX'] = 'qwen-code-test-sandbox';
+      vi.mocked(IdeClient.getInstance).mockResolvedValue({
+        getDetectedIdeDisplayName: vi.fn().mockReturnValue(''),
+      } as unknown as IdeClient);
+      vi.mocked(child_process.execSync).mockImplementation(
+        (command: string, options?: ExecSyncOptions) => {
+          if (
+            options &&
+            typeof options === 'object' &&
+            'encoding' in options &&
+            options.encoding === 'utf-8'
+          ) {
+            return '10.0.0';
+          }
+          return Buffer.from('10.0.0', 'utf-8');
+        },
+      );
+
+      const extendedInfo = await getExtendedSystemInfo(mockContext);
+
+      expect(extendedInfo.sandboxEnv).toBe('test-sandbox');
+    });
+
+    it('should not include base URL for non-OpenAI auth', async () => {
+      vi.mocked(IdeClient.getInstance).mockResolvedValue({
+        getDetectedIdeDisplayName: vi.fn().mockReturnValue(''),
+      } as unknown as IdeClient);
+      vi.mocked(child_process.execSync).mockImplementation(
+        (command: string, options?: ExecSyncOptions) => {
+          if (
+            options &&
+            typeof options === 'object' &&
+            'encoding' in options &&
+            options.encoding === 'utf-8'
+          ) {
+            return '10.0.0';
+          }
+          return Buffer.from('10.0.0', 'utf-8');
+        },
+      );
+
+      const extendedInfo = await getExtendedSystemInfo(mockContext);
+
+      expect(extendedInfo.baseUrl).toBeUndefined();
+    });
+  });
+});
--- a/packages/cli/src/utils/systemInfo.ts
+++ b/packages/cli/src/utils/systemInfo.ts
@@ -0,0 +1,173 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import process from 'node:process';
+import os from 'node:os';
+import { execSync } from 'node:child_process';
+import type { CommandContext } from '../ui/commands/types.js';
+import { getCliVersion } from './version.js';
+import { IdeClient, AuthType } from '@qwen-code/qwen-code-core';
+import { formatMemoryUsage } from '../ui/utils/formatters.js';
+import { GIT_COMMIT_INFO } from '../generated/git-commit.js';
+
+/**
+ * System information interface containing all system-related details
+ * that can be collected for debugging and reporting purposes.
+ */
+export interface SystemInfo {
+  cliVersion: string;
+  osPlatform: string;
+  osArch: string;
+  osRelease: string;
+  nodeVersion: string;
+  npmVersion: string;
+  sandboxEnv: string;
+  modelVersion: string;
+  selectedAuthType: string;
+  ideClient: string;
+  sessionId: string;
+}
+
+/**
+ * Additional system information for bug reports
+ */
+export interface ExtendedSystemInfo extends SystemInfo {
+  memoryUsage: string;
+  baseUrl?: string;
+  gitCommit?: string;
+}
+
+/**
+ * Gets the NPM version, handling cases where npm might not be available.
+ * Returns 'unknown' if npm command fails or is not found.
+ */
+export async function getNpmVersion(): Promise<string> {
+  try {
+    return execSync('npm --version', { encoding: 'utf-8' }).trim();
+  } catch {
+    return 'unknown';
+  }
+}
+
+/**
+ * Gets the IDE client name if IDE mode is enabled.
+ * Returns empty string if IDE mode is disabled or IDE client is not detected.
+ */
+export async function getIdeClientName(
+  context: CommandContext,
+): Promise<string> {
+  if (!context.services.config?.getIdeMode()) {
+    return '';
+  }
+  try {
+    const ideClient = await IdeClient.getInstance();
+    return ideClient?.getDetectedIdeDisplayName() ?? '';
+  } catch {
+    return '';
+  }
+}
+
+/**
+ * Gets the sandbox environment information.
+ * Handles different sandbox types including sandbox-exec and custom sandbox environments.
+ * For bug reports, removes 'qwen-' or 'qwen-code-' prefixes from sandbox names.
+ *
+ * @param stripPrefix - Whether to strip 'qwen-' prefix (used for bug reports)
+ */
+export function getSandboxEnv(stripPrefix = false): string {
+  const sandbox = process.env['SANDBOX'];
+
+  if (!sandbox || sandbox === 'sandbox-exec') {
+    if (sandbox === 'sandbox-exec') {
+      const profile = process.env['SEATBELT_PROFILE'] || 'unknown';
+      return `sandbox-exec (${profile})`;
+    }
+    return 'no sandbox';
+  }
+
+  // For bug reports, remove qwen- prefix
+  if (stripPrefix) {
+    return sandbox.replace(/^qwen-(?:code-)?/, '');
+  }
+
+  return sandbox;
+}
+
+/**
+ * Collects comprehensive system information for debugging and reporting.
+ * This function gathers all system-related details including OS, versions,
+ * sandbox environment, authentication, and session information.
+ *
+ * @param context - Command context containing config and settings
+ * @returns Promise resolving to SystemInfo object with all collected information
+ */
+export async function getSystemInfo(
+  context: CommandContext,
+): Promise<SystemInfo> {
+  const osPlatform = process.platform;
+  const osArch = process.arch;
+  const osRelease = os.release();
+  const nodeVersion = process.version;
+  const npmVersion = await getNpmVersion();
+  const sandboxEnv = getSandboxEnv();
+  const modelVersion = context.services.config?.getModel() || 'Unknown';
+  const cliVersion = await getCliVersion();
+  const selectedAuthType =
+    context.services.settings.merged.security?.auth?.selectedType || '';
+  const ideClient = await getIdeClientName(context);
+  const sessionId = context.services.config?.getSessionId() || 'unknown';
+
+  return {
+    cliVersion,
+    osPlatform,
+    osArch,
+    osRelease,
+    nodeVersion,
+    npmVersion,
+    sandboxEnv,
+    modelVersion,
+    selectedAuthType,
+    ideClient,
+    sessionId,
+  };
+}
+
+/**
+ * Collects extended system information for bug reports.
+ * Includes all standard system info plus memory usage and optional base URL.
+ *
+ * @param context - Command context containing config and settings
+ * @returns Promise resolving to ExtendedSystemInfo object
+ */
+export async function getExtendedSystemInfo(
+  context: CommandContext,
+): Promise<ExtendedSystemInfo> {
+  const baseInfo = await getSystemInfo(context);
+  const memoryUsage = formatMemoryUsage(process.memoryUsage().rss);
+
+  // For bug reports, use sandbox name without prefix
+  const sandboxEnv = getSandboxEnv(true);
+
+  // Get base URL if using OpenAI auth
+  const baseUrl =
+    baseInfo.selectedAuthType === AuthType.USE_OPENAI
+      ? context.services.config?.getContentGeneratorConfig()?.baseUrl
+      : undefined;
+
+  // Get git commit info
+  const gitCommit =
+    GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
+      ? GIT_COMMIT_INFO
+      : undefined;
+
+  return {
+    ...baseInfo,
+    sandboxEnv,
+    memoryUsage,
+    baseUrl,
+    gitCommit,
+  };
+}
--- a/packages/cli/src/utils/systemInfoFields.ts
+++ b/packages/cli/src/utils/systemInfoFields.ts
@@ -0,0 +1,117 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { ExtendedSystemInfo } from './systemInfo.js';
+
+/**
+ * Field configuration for system information display
+ */
+export interface SystemInfoField {
+  label: string;
+  key: keyof ExtendedSystemInfo;
+}
+
+/**
+ * Unified field configuration for system information display.
+ * This ensures consistent labeling between /about and /bug commands.
+ */
+export function getSystemInfoFields(
+  info: ExtendedSystemInfo,
+): SystemInfoField[] {
+  const allFields: SystemInfoField[] = [
+    {
+      label: 'CLI Version',
+      key: 'cliVersion',
+    },
+    {
+      label: 'Git Commit',
+      key: 'gitCommit',
+    },
+    {
+      label: 'Model',
+      key: 'modelVersion',
+    },
+    {
+      label: 'Sandbox',
+      key: 'sandboxEnv',
+    },
+    {
+      label: 'OS Platform',
+      key: 'osPlatform',
+    },
+    {
+      label: 'OS Arch',
+      key: 'osArch',
+    },
+    {
+      label: 'OS Release',
+      key: 'osRelease',
+    },
+    {
+      label: 'Node.js Version',
+      key: 'nodeVersion',
+    },
+    {
+      label: 'NPM Version',
+      key: 'npmVersion',
+    },
+    {
+      label: 'Session ID',
+      key: 'sessionId',
+    },
+    {
+      label: 'Auth Method',
+      key: 'selectedAuthType',
+    },
+    {
+      label: 'Base URL',
+      key: 'baseUrl',
+    },
+    {
+      label: 'Memory Usage',
+      key: 'memoryUsage',
+    },
+    {
+      label: 'IDE Client',
+      key: 'ideClient',
+    },
+  ];
+
+  // Filter out optional fields that are not present
+  return allFields.filter((field) => {
+    const value = info[field.key];
+    // Optional fields: only show if they exist and are non-empty
+    if (
+      field.key === 'baseUrl' ||
+      field.key === 'gitCommit' ||
+      field.key === 'ideClient'
+    ) {
+      return Boolean(value);
+    }
+    return true;
+  });
+}
+
+/**
+ * Get the value for a field from system info
+ */
+export function getFieldValue(
+  field: SystemInfoField,
+  info: ExtendedSystemInfo,
+): string {
+  const value = info[field.key];
+
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  // Special formatting for selectedAuthType
+  if (field.key === 'selectedAuthType') {
+    return String(value).startsWith('oauth') ? 'OAuth' : String(value);
+  }
+
+  return String(value);
+}
--- a/packages/cli/src/zed-integration/zedIntegration.ts
+++ b/packages/cli/src/zed-integration/zedIntegration.ts
@@ -12,12 +12,6 @@ import type {
  GeminiChat,
  ToolCallConfirmationDetails,
  ToolResult,
-  SubAgentEventEmitter,
-  SubAgentToolCallEvent,
-  SubAgentToolResultEvent,
-  SubAgentApprovalRequestEvent,
-  AnyDeclarativeTool,
-  AnyToolInvocation,
 } from '@qwen-code/qwen-code-core';
 import {
  AuthType,
@@ -34,10 +28,6 @@ import {
  getErrorStatus,
  isWithinRoot,
  isNodeError,
-  SubAgentEventType,
-  TaskTool,
-  Kind,
-  TodoWriteTool,
 } from '@qwen-code/qwen-code-core';
 import * as acp from './acp.js';
 import { AcpFileSystemService } from './fileSystemService.js';
@@ -413,34 +403,9 @@ class Session {
      );
    }

-    // Detect TodoWriteTool early - route to plan updates instead of tool_call events
-    const isTodoWriteTool =
-      fc.name === TodoWriteTool.Name || tool.name === TodoWriteTool.Name;
-
-    // Declare subAgentToolEventListeners outside try block for cleanup in catch
-    let subAgentToolEventListeners: Array<() => void> = [];
-
    try {
      const invocation = tool.build(args);

-      // Detect TaskTool and set up sub-agent tool tracking
-      const isTaskTool = tool.name === TaskTool.Name;
-
-      if (isTaskTool && 'eventEmitter' in invocation) {
-        // Access eventEmitter from TaskTool invocation
-        const taskEventEmitter = (
-          invocation as {
-            eventEmitter: SubAgentEventEmitter;
-          }
-        ).eventEmitter;
-
-        // Set up sub-agent tool tracking
-        subAgentToolEventListeners = this.setupSubAgentToolTracking(
-          taskEventEmitter,
-          abortSignal,
-        );
-      }
-
      const confirmationDetails =
        await invocation.shouldConfirmExecute(abortSignal);

@@ -495,8 +460,7 @@ class Session {
            throw new Error(`Unexpected: ${resultOutcome}`);
          }
        }
-      } else if (!isTodoWriteTool) {
-        // Skip tool_call event for TodoWriteTool
+      } else {
        await this.sendUpdate({
          sessionUpdate: 'tool_call',
          toolCallId: callId,
@@ -509,61 +473,14 @@ class Session {
      }

      const toolResult: ToolResult = await invocation.execute(abortSignal);
+      const content = toToolCallContent(toolResult);

-      // Clean up event listeners
-      subAgentToolEventListeners.forEach((cleanup) => cleanup());
-
-      // Handle TodoWriteTool: extract todos and send plan update
-      if (isTodoWriteTool) {
-        // Extract todos from args (initial state)
-        let todos: Array<{
-          id: string;
-          content: string;
-          status: 'pending' | 'in_progress' | 'completed';
-        }> = [];
-
-        if (Array.isArray(args['todos'])) {
-          todos = args['todos'] as Array<{
-            id: string;
-            content: string;
-            status: 'pending' | 'in_progress' | 'completed';
-          }>;
-        }
-
-        // If returnDisplay has todos (e.g., modified by user), use those instead
-        if (
-          toolResult.returnDisplay &&
-          typeof toolResult.returnDisplay === 'object' &&
-          'type' in toolResult.returnDisplay &&
-          toolResult.returnDisplay.type === 'todo_list' &&
-          'todos' in toolResult.returnDisplay &&
-          Array.isArray(toolResult.returnDisplay.todos)
-        ) {
-          todos = toolResult.returnDisplay.todos;
-        }
-
-        // Convert todos to plan entries and send plan update
-        if (todos.length > 0 || Array.isArray(args['todos'])) {
-          const planEntries = convertTodosToPlanEntries(todos);
-          await this.sendUpdate({
-            sessionUpdate: 'plan',
-            entries: planEntries,
-          });
-        }
-
-        // Skip tool_call_update event for TodoWriteTool
-        // Still log and return function response for LLM
-      } else {
-        // Normal tool handling: send tool_call_update
-        const content = toToolCallContent(toolResult);
-
-        await this.sendUpdate({
-          sessionUpdate: 'tool_call_update',
-          toolCallId: callId,
-          status: 'completed',
-          content: content ? [content] : [],
-        });
-      }
+      await this.sendUpdate({
+        sessionUpdate: 'tool_call_update',
+        toolCallId: callId,
+        status: 'completed',
+        content: content ? [content] : [],
+      });

      const durationMs = Date.now() - startTime;
      logToolCall(this.config, {
@@ -583,9 +500,6 @@ class Session {

      return convertToFunctionResponse(fc.name, callId, toolResult.llmContent);
    } catch (e) {
-      // Ensure cleanup on error
-      subAgentToolEventListeners.forEach((cleanup) => cleanup());
-
      const error = e instanceof Error ? e : new Error(String(e));

      await this.sendUpdate({
@@ -601,300 +515,6 @@ class Session {
    }
  }

-  /**
-   * Sets up event listeners to track sub-agent tool calls within a TaskTool execution.
-   * Converts subagent tool call events into zedIntegration session updates.
-   *
-   * @param eventEmitter - The SubAgentEventEmitter from TaskTool
-   * @param abortSignal - Signal to abort tracking if parent is cancelled
-   * @returns Array of cleanup functions to remove event listeners
-   */
-  private setupSubAgentToolTracking(
-    eventEmitter: SubAgentEventEmitter,
-    abortSignal: AbortSignal,
-  ): Array<() => void> {
-    const cleanupFunctions: Array<() => void> = [];
-    const toolRegistry = this.config.getToolRegistry();
-
-    // Track subagent tool call states
-    const subAgentToolStates = new Map<
-      string,
-      {
-        tool?: AnyDeclarativeTool;
-        invocation?: AnyToolInvocation;
-        args?: Record<string, unknown>;
-      }
-    >();
-
-    // Listen for tool call start
-    const onToolCall = (...args: unknown[]) => {
-      const event = args[0] as SubAgentToolCallEvent;
-      if (abortSignal.aborted) return;
-
-      const subAgentTool = toolRegistry.getTool(event.name);
-      let subAgentInvocation: AnyToolInvocation | undefined;
-      let toolKind: acp.ToolKind = 'other';
-      let locations: acp.ToolCallLocation[] = [];
-
-      if (subAgentTool) {
-        try {
-          subAgentInvocation = subAgentTool.build(event.args);
-          toolKind = this.mapToolKind(subAgentTool.kind);
-          locations = subAgentInvocation.toolLocations().map((loc) => ({
-            path: loc.path,
-            line: loc.line ?? null,
-          }));
-        } catch (e) {
-          // If building fails, continue with defaults
-          console.warn(`Failed to build subagent tool ${event.name}:`, e);
-        }
-      }
-
-      // Save state for subsequent updates
-      subAgentToolStates.set(event.callId, {
-        tool: subAgentTool,
-        invocation: subAgentInvocation,
-        args: event.args,
-      });
-
-      // Check if this is TodoWriteTool - if so, skip sending tool_call event
-      // Plan update will be sent in onToolResult when we have the final state
-      if (event.name === TodoWriteTool.Name) {
-        return;
-      }
-
-      // Send tool call start update with rawInput
-      void this.sendUpdate({
-        sessionUpdate: 'tool_call',
-        toolCallId: event.callId,
-        status: 'in_progress',
-        title: event.description || event.name,
-        content: [],
-        locations,
-        kind: toolKind,
-        rawInput: event.args,
-      });
-    };
-
-    // Listen for tool call result
-    const onToolResult = (...args: unknown[]) => {
-      const event = args[0] as SubAgentToolResultEvent;
-      if (abortSignal.aborted) return;
-
-      const state = subAgentToolStates.get(event.callId);
-
-      // Check if this is TodoWriteTool - if so, route to plan updates
-      if (event.name === TodoWriteTool.Name) {
-        let todos:
-          | Array<{
-              id: string;
-              content: string;
-              status: 'pending' | 'in_progress' | 'completed';
-            }>
-          | undefined;
-
-        // Try to extract todos from resultDisplay first (final state)
-        if (event.resultDisplay) {
-          try {
-            // resultDisplay might be a JSON stringified object
-            const parsed =
-              typeof event.resultDisplay === 'string'
-                ? JSON.parse(event.resultDisplay)
-                : event.resultDisplay;
-
-            if (
-              typeof parsed === 'object' &&
-              parsed !== null &&
-              'type' in parsed &&
-              parsed.type === 'todo_list' &&
-              'todos' in parsed &&
-              Array.isArray(parsed.todos)
-            ) {
-              todos = parsed.todos;
-            }
-          } catch {
-            // If parsing fails, ignore - resultDisplay might not be JSON
-          }
-        }
-
-        // Fallback to args if resultDisplay doesn't have todos
-        if (!todos && state?.args && Array.isArray(state.args['todos'])) {
-          todos = state.args['todos'] as Array<{
-            id: string;
-            content: string;
-            status: 'pending' | 'in_progress' | 'completed';
-          }>;
-        }
-
-        // Send plan update if we have todos
-        if (todos) {
-          const planEntries = convertTodosToPlanEntries(todos);
-          void this.sendUpdate({
-            sessionUpdate: 'plan',
-            entries: planEntries,
-          });
-        }
-
-        // Skip sending tool_call_update event for TodoWriteTool
-        // Clean up state
-        subAgentToolStates.delete(event.callId);
-        return;
-      }
-
-      let content: acp.ToolCallContent[] = [];
-
-      // If there's a result display, try to convert to ToolCallContent
-      if (event.resultDisplay && state?.invocation) {
-        // resultDisplay is typically a string
-        if (typeof event.resultDisplay === 'string') {
-          content = [
-            {
-              type: 'content',
-              content: {
-                type: 'text',
-                text: event.resultDisplay,
-              },
-            },
-          ];
-        }
-      }
-
-      // Send tool call completion update
-      void this.sendUpdate({
-        sessionUpdate: 'tool_call_update',
-        toolCallId: event.callId,
-        status: event.success ? 'completed' : 'failed',
-        content: content.length > 0 ? content : [],
-        title: state?.invocation?.getDescription() ?? event.name,
-        kind: state?.tool ? this.mapToolKind(state.tool.kind) : null,
-        locations:
-          state?.invocation?.toolLocations().map((loc) => ({
-            path: loc.path,
-            line: loc.line ?? null,
-          })) ?? null,
-        rawInput: state?.args,
-      });
-
-      // Clean up state
-      subAgentToolStates.delete(event.callId);
-    };
-
-    // Listen for permission requests
-    const onToolWaitingApproval = async (...args: unknown[]) => {
-      const event = args[0] as SubAgentApprovalRequestEvent;
-      if (abortSignal.aborted) return;
-
-      const state = subAgentToolStates.get(event.callId);
-      const content: acp.ToolCallContent[] = [];
-
-      // Handle different confirmation types
-      if (event.confirmationDetails.type === 'edit') {
-        const editDetails = event.confirmationDetails as unknown as {
-          type: 'edit';
-          fileName: string;
-          originalContent: string | null;
-          newContent: string;
-        };
-        content.push({
-          type: 'diff',
-          path: editDetails.fileName,
-          oldText: editDetails.originalContent ?? '',
-          newText: editDetails.newContent,
-        });
-      }
-
-      // Build permission request options from confirmation details
-      // event.confirmationDetails already contains all fields except onConfirm,
-      // which we add here to satisfy the type requirement for toPermissionOptions
-      const fullConfirmationDetails = {
-        ...event.confirmationDetails,
-        onConfirm: async () => {
-          // This is a placeholder - the actual response is handled via event.respond
-        },
-      } as unknown as ToolCallConfirmationDetails;
-
-      const params: acp.RequestPermissionRequest = {
-        sessionId: this.id,
-        options: toPermissionOptions(fullConfirmationDetails),
-        toolCall: {
-          toolCallId: event.callId,
-          status: 'pending',
-          title: event.description || event.name,
-          content,
-          locations:
-            state?.invocation?.toolLocations().map((loc) => ({
-              path: loc.path,
-              line: loc.line ?? null,
-            })) ?? [],
-          kind: state?.tool ? this.mapToolKind(state.tool.kind) : 'other',
-          rawInput: state?.args,
-        },
-      };
-
-      try {
-        // Request permission from zed client
-        const output = await this.client.requestPermission(params);
-        const outcome =
-          output.outcome.outcome === 'cancelled'
-            ? ToolConfirmationOutcome.Cancel
-            : z
-                .nativeEnum(ToolConfirmationOutcome)
-                .parse(output.outcome.optionId);
-
-        // Respond to subagent with the outcome
-        await event.respond(outcome);
-      } catch (error) {
-        // If permission request fails, cancel the tool call
-        console.error(
-          `Permission request failed for subagent tool ${event.name}:`,
-          error,
-        );
-        await event.respond(ToolConfirmationOutcome.Cancel);
-      }
-    };
-
-    // Register event listeners
-    eventEmitter.on(SubAgentEventType.TOOL_CALL, onToolCall);
-    eventEmitter.on(SubAgentEventType.TOOL_RESULT, onToolResult);
-    eventEmitter.on(
-      SubAgentEventType.TOOL_WAITING_APPROVAL,
-      onToolWaitingApproval,
-    );
-
-    // Return cleanup functions
-    cleanupFunctions.push(() => {
-      eventEmitter.off(SubAgentEventType.TOOL_CALL, onToolCall);
-      eventEmitter.off(SubAgentEventType.TOOL_RESULT, onToolResult);
-      eventEmitter.off(
-        SubAgentEventType.TOOL_WAITING_APPROVAL,
-        onToolWaitingApproval,
-      );
-    });
-
-    return cleanupFunctions;
-  }
-
-  /**
-   * Maps core Tool Kind enum to ACP ToolKind string literals.
-   *
-   * @param kind - The core Kind enum value
-   * @returns The corresponding ACP ToolKind string literal
-   */
-  private mapToolKind(kind: Kind): acp.ToolKind {
-    const kindMap: Record<Kind, acp.ToolKind> = {
-      [Kind.Read]: 'read',
-      [Kind.Edit]: 'edit',
-      [Kind.Delete]: 'delete',
-      [Kind.Move]: 'move',
-      [Kind.Search]: 'search',
-      [Kind.Execute]: 'execute',
-      [Kind.Think]: 'think',
-      [Kind.Fetch]: 'fetch',
-      [Kind.Other]: 'other',
-    };
-    return kindMap[kind] ?? 'other';
-  }
-
  async #resolvePrompt(
    message: acp.ContentBlock[],
    abortSignal: AbortSignal,
@@ -1239,27 +859,6 @@ class Session {
  }
 }

-/**
- * Converts todo items to plan entries format for zed integration.
- * Maps todo status to plan status and assigns a default priority.
- *
- * @param todos - Array of todo items with id, content, and status
- * @returns Array of plan entries with content, priority, and status
- */
-function convertTodosToPlanEntries(
-  todos: Array<{
-    id: string;
-    content: string;
-    status: 'pending' | 'in_progress' | 'completed';
-  }>,
-): acp.PlanEntry[] {
-  return todos.map((todo) => ({
-    content: todo.content,
-    priority: 'medium' as const, // Default priority since todos don't have priority
-    status: todo.status,
-  }));
-}
-
 function toToolCallContent(toolResult: ToolResult): acp.ToolCallContent | null {
  if (toolResult.error?.message) {
    throw new Error(toolResult.error.message);
@@ -1271,6 +870,26 @@ function toToolCallContent(toolResult: ToolResult): acp.ToolCallContent | null {
        type: 'content',
        content: { type: 'text', text: toolResult.returnDisplay },
      };
+    } else if (
+      'type' in toolResult.returnDisplay &&
+      toolResult.returnDisplay.type === 'todo_list'
+    ) {
+      // Handle TodoResultDisplay - convert to text representation
+      const todoText = toolResult.returnDisplay.todos
+        .map((todo) => {
+          const statusIcon = {
+            pending: '○',
+            in_progress: '◐',
+            completed: '●',
+          }[todo.status];
+          return `${statusIcon} ${todo.content}`;
+        })
+        .join('\n');
+
+      return {
+        type: 'content',
+        content: { type: 'text', text: todoText },
+      };
    } else if (
      'type' in toolResult.returnDisplay &&
      toolResult.returnDisplay.type === 'plan_summary'
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code-core",
-  "version": "0.1.5",
+  "version": "0.1.4",
  "description": "Qwen Code Core",
  "repository": {
    "type": "git",
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -102,8 +102,6 @@ export * from './tools/web-search/index.js';
 export * from './tools/read-many-files.js';
 export * from './tools/mcp-client.js';
 export * from './tools/mcp-tool.js';
-export * from './tools/task.js';
-export * from './tools/todoWrite.js';

 // MCP OAuth
 export { MCPOAuthProvider } from './mcp/oauth-provider.js';
--- a/packages/core/src/subagents/index.ts
+++ b/packages/core/src/subagents/index.ts
@@ -62,10 +62,9 @@ export type {
  SubAgentToolResultEvent,
  SubAgentFinishEvent,
  SubAgentErrorEvent,
-  SubAgentApprovalRequestEvent,
 } from './subagent-events.js';

-export { SubAgentEventEmitter, SubAgentEventType } from './subagent-events.js';
+export { SubAgentEventEmitter } from './subagent-events.js';

 // Statistics and formatting
 export type {
--- a/packages/core/src/tools/glob.test.ts
+++ b/packages/core/src/tools/glob.test.ts
@@ -88,6 +88,17 @@ describe('GlobTool', () => {
      expect(result.returnDisplay).toBe('Found 2 matching file(s)');
    });

+    it('should find files case-sensitively when case_sensitive is true', async () => {
+      const params: GlobToolParams = { pattern: '*.txt', case_sensitive: true };
+      const invocation = globTool.build(params);
+      const result = await invocation.execute(abortSignal);
+      expect(result.llmContent).toContain('Found 1 file(s)');
+      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
+      expect(result.llmContent).not.toContain(
+        path.join(tempRootDir, 'FileB.TXT'),
+      );
+    });
+
    it('should find files case-insensitively by default (pattern: *.TXT)', async () => {
      const params: GlobToolParams = { pattern: '*.TXT' };
      const invocation = globTool.build(params);
@@ -97,6 +108,18 @@ describe('GlobTool', () => {
      expect(result.llmContent).toContain(path.join(tempRootDir, 'FileB.TXT'));
    });

+    it('should find files case-insensitively when case_sensitive is false (pattern: *.TXT)', async () => {
+      const params: GlobToolParams = {
+        pattern: '*.TXT',
+        case_sensitive: false,
+      };
+      const invocation = globTool.build(params);
+      const result = await invocation.execute(abortSignal);
+      expect(result.llmContent).toContain('Found 2 file(s)');
+      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
+      expect(result.llmContent).toContain(path.join(tempRootDir, 'FileB.TXT'));
+    });
+
    it('should find files using a pattern that includes a subdirectory', async () => {
      const params: GlobToolParams = { pattern: 'sub/*.md' };
      const invocation = globTool.build(params);
@@ -184,7 +207,7 @@ describe('GlobTool', () => {
      const filesListed = llmContent
        .trim()
        .split(/\r?\n/)
-        .slice(2)
+        .slice(1)
        .map((line) => line.trim())
        .filter(Boolean);

@@ -197,13 +220,14 @@ describe('GlobTool', () => {
      );
    });

-    it('should return error if path is outside workspace', async () => {
+    it('should return a PATH_NOT_IN_WORKSPACE error if path is outside workspace', async () => {
      // Bypassing validation to test execute method directly
      vi.spyOn(globTool, 'validateToolParams').mockReturnValue(null);
      const params: GlobToolParams = { pattern: '*.txt', path: '/etc' };
      const invocation = globTool.build(params);
      const result = await invocation.execute(abortSignal);
-      expect(result.returnDisplay).toBe('Error: Path is not within workspace');
+      expect(result.error?.type).toBe(ToolErrorType.PATH_NOT_IN_WORKSPACE);
+      expect(result.returnDisplay).toBe('Path is not within workspace');
    });

    it('should return a GLOB_EXECUTION_ERROR on glob failure', async () => {
@@ -231,6 +255,15 @@ describe('GlobTool', () => {
      expect(globTool.validateToolParams(params)).toBeNull();
    });

+    it('should return null for valid parameters (pattern, path, and case_sensitive)', () => {
+      const params: GlobToolParams = {
+        pattern: '*.js',
+        path: 'sub',
+        case_sensitive: true,
+      };
+      expect(globTool.validateToolParams(params)).toBeNull();
+    });
+
    it('should return error if pattern is missing (schema validation)', () => {
      // Need to correctly define this as an object without pattern
      const params = { path: '.' };
@@ -264,6 +297,16 @@ describe('GlobTool', () => {
      );
    });

+    it('should return error if case_sensitive is provided but is not a boolean', () => {
+      const params = {
+        pattern: '*.ts',
+        case_sensitive: 'true',
+      } as unknown as GlobToolParams; // Force incorrect type
+      expect(globTool.validateToolParams(params)).toBe(
+        'params/case_sensitive must be boolean',
+      );
+    });
+
    it("should return error if search path resolves outside the tool's root directory", () => {
      // Create a globTool instance specifically for this test, with a deeper root
      tempRootDir = path.join(tempRootDir, 'sub');
@@ -276,7 +319,7 @@ describe('GlobTool', () => {
        path: '../../../../../../../../../../tmp', // Definitely outside
      };
      expect(specificGlobTool.validateToolParams(paramsOutside)).toContain(
-        'Path is not within workspace',
+        'resolves outside the allowed workspace directories',
      );
    });

@@ -286,14 +329,14 @@ describe('GlobTool', () => {
        path: 'nonexistent_subdir',
      };
      expect(globTool.validateToolParams(params)).toContain(
-        'Path does not exist',
+        'Search path does not exist',
      );
    });

    it('should return error if specified search path is a file, not a directory', async () => {
      const params: GlobToolParams = { pattern: '*.txt', path: 'fileA.txt' };
      expect(globTool.validateToolParams(params)).toContain(
-        'Path is not a directory',
+        'Search path is not a directory',
      );
    });
  });
@@ -305,10 +348,20 @@ describe('GlobTool', () => {

      expect(globTool.validateToolParams(validPath)).toBeNull();
      expect(globTool.validateToolParams(invalidPath)).toContain(
-        'Path is not within workspace',
+        'resolves outside the allowed workspace directories',
      );
    });

+    it('should provide clear error messages when path is outside workspace', () => {
+      const invalidPath = { pattern: '*.ts', path: '/etc' };
+      const error = globTool.validateToolParams(invalidPath);
+
+      expect(error).toContain(
+        'resolves outside the allowed workspace directories',
+      );
+      expect(error).toContain(tempRootDir);
+    });
+
    it('should work with paths in workspace subdirectories', async () => {
      const params: GlobToolParams = { pattern: '*.md', path: 'sub' };
      const invocation = globTool.build(params);
@@ -364,123 +417,47 @@ describe('GlobTool', () => {
      expect(result.llmContent).toContain('Found 3 file(s)'); // fileA.txt, FileB.TXT, b.notignored.txt
      expect(result.llmContent).not.toContain('a.qwenignored.txt');
    });
-  });

-  describe('file count truncation', () => {
-    it('should truncate results when more than 100 files are found', async () => {
-      // Create 150 test files
-      for (let i = 1; i <= 150; i++) {
-        await fs.writeFile(
-          path.join(tempRootDir, `file${i}.trunctest`),
-          `content${i}`,
-        );
-      }
-
-      const params: GlobToolParams = { pattern: '*.trunctest' };
-      const invocation = globTool.build(params);
-      const result = await invocation.execute(abortSignal);
-      const llmContent = partListUnionToString(result.llmContent);
-
-      // Should report all 150 files found
-      expect(llmContent).toContain('Found 150 file(s)');
-
-      // Should include truncation notice
-      expect(llmContent).toContain('[50 files truncated] ...');
-
-      // Count the number of .trunctest files mentioned in the output
-      const fileMatches = llmContent.match(/file\d+\.trunctest/g);
-      expect(fileMatches).toBeDefined();
-      expect(fileMatches?.length).toBe(100);
-
-      // returnDisplay should indicate truncation
-      expect(result.returnDisplay).toBe(
-        'Found 150 matching file(s) (truncated)',
+    it('should not respect .gitignore when respect_git_ignore is false', async () => {
+      await fs.writeFile(path.join(tempRootDir, '.gitignore'), '*.ignored.txt');
+      await fs.writeFile(
+        path.join(tempRootDir, 'a.ignored.txt'),
+        'ignored content',
      );
-    });

-    it('should not truncate when exactly 100 files are found', async () => {
-      // Create exactly 100 test files
-      for (let i = 1; i <= 100; i++) {
-        await fs.writeFile(
-          path.join(tempRootDir, `exact${i}.trunctest`),
-          `content${i}`,
-        );
-      }
-
-      const params: GlobToolParams = { pattern: '*.trunctest' };
+      const params: GlobToolParams = {
+        pattern: '*.txt',
+        respect_git_ignore: false,
+      };
      const invocation = globTool.build(params);
      const result = await invocation.execute(abortSignal);

-      // Should report all 100 files found
-      expect(result.llmContent).toContain('Found 100 file(s)');
-
-      // Should NOT include truncation notice
-      expect(result.llmContent).not.toContain('truncated');
-
-      // Should show all 100 files
-      expect(result.llmContent).toContain('exact1.trunctest');
-      expect(result.llmContent).toContain('exact100.trunctest');
-
-      // returnDisplay should NOT indicate truncation
-      expect(result.returnDisplay).toBe('Found 100 matching file(s)');
+      expect(result.llmContent).toContain('Found 3 file(s)'); // fileA.txt, FileB.TXT, a.ignored.txt
+      expect(result.llmContent).toContain('a.ignored.txt');
    });

-    it('should not truncate when fewer than 100 files are found', async () => {
-      // Create 50 test files
-      for (let i = 1; i <= 50; i++) {
-        await fs.writeFile(
-          path.join(tempRootDir, `small${i}.trunctest`),
-          `content${i}`,
-        );
-      }
+    it('should not respect .qwenignore when respect_qwen_ignore is false', async () => {
+      await fs.writeFile(
+        path.join(tempRootDir, '.qwenignore'),
+        '*.qwenignored.txt',
+      );
+      await fs.writeFile(
+        path.join(tempRootDir, 'a.qwenignored.txt'),
+        'ignored content',
+      );

-      const params: GlobToolParams = { pattern: '*.trunctest' };
+      // Recreate the tool to pick up the new .qwenignore file
+      globTool = new GlobTool(mockConfig);
+
+      const params: GlobToolParams = {
+        pattern: '*.txt',
+        respect_qwen_ignore: false,
+      };
      const invocation = globTool.build(params);
      const result = await invocation.execute(abortSignal);

-      // Should report all 50 files found
-      expect(result.llmContent).toContain('Found 50 file(s)');
-
-      // Should NOT include truncation notice
-      expect(result.llmContent).not.toContain('truncated');
-
-      // returnDisplay should NOT indicate truncation
-      expect(result.returnDisplay).toBe('Found 50 matching file(s)');
-    });
-
-    it('should use correct singular/plural in truncation message for 1 file truncated', async () => {
-      // Create 101 test files (will truncate 1 file)
-      for (let i = 1; i <= 101; i++) {
-        await fs.writeFile(
-          path.join(tempRootDir, `singular${i}.trunctest`),
-          `content${i}`,
-        );
-      }
-
-      const params: GlobToolParams = { pattern: '*.trunctest' };
-      const invocation = globTool.build(params);
-      const result = await invocation.execute(abortSignal);
-
-      // Should use singular "file" for 1 truncated file
-      expect(result.llmContent).toContain('[1 file truncated] ...');
-      expect(result.llmContent).not.toContain('[1 files truncated]');
-    });
-
-    it('should use correct plural in truncation message for multiple files truncated', async () => {
-      // Create 105 test files (will truncate 5 files)
-      for (let i = 1; i <= 105; i++) {
-        await fs.writeFile(
-          path.join(tempRootDir, `plural${i}.trunctest`),
-          `content${i}`,
-        );
-      }
-
-      const params: GlobToolParams = { pattern: '*.trunctest' };
-      const invocation = globTool.build(params);
-      const result = await invocation.execute(abortSignal);
-
-      // Should use plural "files" for multiple truncated files
-      expect(result.llmContent).toContain('[5 files truncated] ...');
+      expect(result.llmContent).toContain('Found 3 file(s)'); // fileA.txt, FileB.TXT, a.qwenignored.txt
+      expect(result.llmContent).toContain('a.qwenignored.txt');
    });
  });
 });
--- a/packages/core/src/tools/glob.ts
+++ b/packages/core/src/tools/glob.ts
@@ -10,17 +10,10 @@ import { glob, escape } from 'glob';
 import type { ToolInvocation, ToolResult } from './tools.js';
 import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
 import { ToolNames } from './tool-names.js';
-import { resolveAndValidatePath } from '../utils/paths.js';
+import { shortenPath, makeRelative } from '../utils/paths.js';
 import { type Config } from '../config/config.js';
-import {
-  DEFAULT_FILE_FILTERING_OPTIONS,
-  type FileFilteringOptions,
-} from '../config/constants.js';
+import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
 import { ToolErrorType } from './tool-error.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-
-const MAX_FILE_COUNT = 100;

 // Subset of 'Path' interface provided by 'glob' that we can implement for testing
 export interface GlobPath {
@@ -71,68 +64,118 @@ export interface GlobToolParams {
   * The directory to search in (optional, defaults to current directory)
   */
  path?: string;
+
+  /**
+   * Whether the search should be case-sensitive (optional, defaults to false)
+   */
+  case_sensitive?: boolean;
+
+  /**
+   * Whether to respect .gitignore patterns (optional, defaults to true)
+   */
+  respect_git_ignore?: boolean;
+
+  /**
+   * Whether to respect .qwenignore patterns (optional, defaults to true)
+   */
+  respect_qwen_ignore?: boolean;
 }

 class GlobToolInvocation extends BaseToolInvocation<
  GlobToolParams,
  ToolResult
 > {
-  private fileService: FileDiscoveryService;
-
  constructor(
    private config: Config,
    params: GlobToolParams,
  ) {
    super(params);
-    this.fileService = config.getFileService();
  }

  getDescription(): string {
    let description = `'${this.params.pattern}'`;
    if (this.params.path) {
-      description += ` in path '${this.params.path}'`;
+      const searchDir = path.resolve(
+        this.config.getTargetDir(),
+        this.params.path || '.',
+      );
+      const relativePath = makeRelative(searchDir, this.config.getTargetDir());
+      description += ` within ${shortenPath(relativePath)}`;
    }
-
    return description;
  }

  async execute(signal: AbortSignal): Promise<ToolResult> {
    try {
-      // Default to target directory if no path is provided
-      const searchDirAbs = resolveAndValidatePath(
-        this.config,
-        this.params.path,
-      );
-      const searchLocationDescription = this.params.path
-        ? `within ${searchDirAbs}`
-        : `in the workspace directory`;
+      const workspaceContext = this.config.getWorkspaceContext();
+      const workspaceDirectories = workspaceContext.getDirectories();

-      // Collect entries from the search directory
-      let pattern = this.params.pattern;
-      const fullPath = path.join(searchDirAbs, pattern);
-      if (fs.existsSync(fullPath)) {
-        pattern = escape(pattern);
+      // If a specific path is provided, resolve it and check if it's within workspace
+      let searchDirectories: readonly string[];
+      if (this.params.path) {
+        const searchDirAbsolute = path.resolve(
+          this.config.getTargetDir(),
+          this.params.path,
+        );
+        if (!workspaceContext.isPathWithinWorkspace(searchDirAbsolute)) {
+          const rawError = `Error: Path "${this.params.path}" is not within any workspace directory`;
+          return {
+            llmContent: rawError,
+            returnDisplay: `Path is not within workspace`,
+            error: {
+              message: rawError,
+              type: ToolErrorType.PATH_NOT_IN_WORKSPACE,
+            },
+          };
+        }
+        searchDirectories = [searchDirAbsolute];
+      } else {
+        // Search across all workspace directories
+        searchDirectories = workspaceDirectories;
      }

-      const allEntries = (await glob(pattern, {
-        cwd: searchDirAbs,
-        withFileTypes: true,
-        nodir: true,
-        stat: true,
-        nocase: true,
-        dot: true,
-        follow: false,
-        signal,
-      })) as GlobPath[];
+      // Get centralized file discovery service
+      const fileDiscovery = this.config.getFileService();
+
+      // Collect entries from all search directories
+      const allEntries: GlobPath[] = [];
+      for (const searchDir of searchDirectories) {
+        let pattern = this.params.pattern;
+        const fullPath = path.join(searchDir, pattern);
+        if (fs.existsSync(fullPath)) {
+          pattern = escape(pattern);
+        }
+
+        const entries = (await glob(pattern, {
+          cwd: searchDir,
+          withFileTypes: true,
+          nodir: true,
+          stat: true,
+          nocase: !this.params.case_sensitive,
+          dot: true,
+          ignore: this.config.getFileExclusions().getGlobExcludes(),
+          follow: false,
+          signal,
+        })) as GlobPath[];
+
+        allEntries.push(...entries);
+      }

      const relativePaths = allEntries.map((p) =>
        path.relative(this.config.getTargetDir(), p.fullpath()),
      );

-      const { filteredPaths } = this.fileService.filterFilesWithReport(
-        relativePaths,
-        this.getFileFilteringOptions(),
-      );
+      const { filteredPaths, gitIgnoredCount, qwenIgnoredCount } =
+        fileDiscovery.filterFilesWithReport(relativePaths, {
+          respectGitIgnore:
+            this.params?.respect_git_ignore ??
+            this.config.getFileFilteringOptions().respectGitIgnore ??
+            DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+          respectQwenIgnore:
+            this.params?.respect_qwen_ignore ??
+            this.config.getFileFilteringOptions().respectQwenIgnore ??
+            DEFAULT_FILE_FILTERING_OPTIONS.respectQwenIgnore,
+        });

      const filteredAbsolutePaths = new Set(
        filteredPaths.map((p) => path.resolve(this.config.getTargetDir(), p)),
@@ -143,8 +186,20 @@ class GlobToolInvocation extends BaseToolInvocation<
      );

      if (!filteredEntries || filteredEntries.length === 0) {
+        let message = `No files found matching pattern "${this.params.pattern}"`;
+        if (searchDirectories.length === 1) {
+          message += ` within ${searchDirectories[0]}`;
+        } else {
+          message += ` within ${searchDirectories.length} workspace directories`;
+        }
+        if (gitIgnoredCount > 0) {
+          message += ` (${gitIgnoredCount} files were git-ignored)`;
+        }
+        if (qwenIgnoredCount > 0) {
+          message += ` (${qwenIgnoredCount} files were qwen-ignored)`;
+        }
        return {
-          llmContent: `No files found matching pattern "${this.params.pattern}" ${searchLocationDescription}`,
+          llmContent: message,
          returnDisplay: `No files found`,
        };
      }
@@ -160,32 +215,29 @@ class GlobToolInvocation extends BaseToolInvocation<
        oneDayInMs,
      );

-      const totalFileCount = sortedEntries.length;
-      const truncated = totalFileCount > MAX_FILE_COUNT;
-
-      // Limit to MAX_FILE_COUNT if needed
-      const entriesToShow = truncated
-        ? sortedEntries.slice(0, MAX_FILE_COUNT)
-        : sortedEntries;
-
-      const sortedAbsolutePaths = entriesToShow.map((entry) =>
+      const sortedAbsolutePaths = sortedEntries.map((entry) =>
        entry.fullpath(),
      );
      const fileListDescription = sortedAbsolutePaths.join('\n');
+      const fileCount = sortedAbsolutePaths.length;

-      let resultMessage = `Found ${totalFileCount} file(s) matching "${this.params.pattern}" ${searchLocationDescription}`;
-      resultMessage += `, sorted by modification time (newest first):\n---\n${fileListDescription}`;
-
-      // Add truncation notice if needed
-      if (truncated) {
-        const omittedFiles = totalFileCount - MAX_FILE_COUNT;
-        const fileTerm = omittedFiles === 1 ? 'file' : 'files';
-        resultMessage += `\n---\n[${omittedFiles} ${fileTerm} truncated] ...`;
+      let resultMessage = `Found ${fileCount} file(s) matching "${this.params.pattern}"`;
+      if (searchDirectories.length === 1) {
+        resultMessage += ` within ${searchDirectories[0]}`;
+      } else {
+        resultMessage += ` across ${searchDirectories.length} workspace directories`;
      }
+      if (gitIgnoredCount > 0) {
+        resultMessage += ` (${gitIgnoredCount} additional files were git-ignored)`;
+      }
+      if (qwenIgnoredCount > 0) {
+        resultMessage += ` (${qwenIgnoredCount} additional files were qwen-ignored)`;
+      }
+      resultMessage += `, sorted by modification time (newest first):\n${fileListDescription}`;

      return {
        llmContent: resultMessage,
-        returnDisplay: `Found ${totalFileCount} matching file(s)${truncated ? ' (truncated)' : ''}`,
+        returnDisplay: `Found ${fileCount} matching file(s)`,
      };
    } catch (error) {
      const errorMessage =
@@ -194,7 +246,7 @@ class GlobToolInvocation extends BaseToolInvocation<
      const rawError = `Error during glob search operation: ${errorMessage}`;
      return {
        llmContent: rawError,
-        returnDisplay: `Error: ${errorMessage || 'An unexpected error occurred.'}`,
+        returnDisplay: `Error: An unexpected error occurred.`,
        error: {
          message: rawError,
          type: ToolErrorType.GLOB_EXECUTION_ERROR,
@@ -202,18 +254,6 @@ class GlobToolInvocation extends BaseToolInvocation<
      };
    }
  }
-
-  private getFileFilteringOptions(): FileFilteringOptions {
-    const options = this.config.getFileFilteringOptions?.();
-    return {
-      respectGitIgnore:
-        options?.respectGitIgnore ??
-        DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
-      respectQwenIgnore:
-        options?.respectQwenIgnore ??
-        DEFAULT_FILE_FILTERING_OPTIONS.respectQwenIgnore,
-    };
-  }
 }

 /**
@@ -226,19 +266,35 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
    super(
      GlobTool.Name,
      'FindFiles',
-      'Fast file pattern matching tool that works with any codebase size\n- Supports glob patterns like "**/*.js" or "src/**/*.ts"\n- Returns matching file paths sorted by modification time\n- Use this tool when you need to find files by name patterns\n- When you are doing an open ended search that may require multiple rounds of globbing and grepping, use the Agent tool instead\n- You have the capability to call multiple tools in a single response. It is always better to speculatively perform multiple searches as a batch that are potentially useful.',
+      'Efficiently finds files matching specific glob patterns (e.g., `src/**/*.ts`, `**/*.md`), returning absolute paths sorted by modification time (newest first). Ideal for quickly locating files based on their name or path structure, especially in large codebases.',
      Kind.Search,
      {
        properties: {
          pattern: {
-            description: 'The glob pattern to match files against',
+            description:
+              "The glob pattern to match against (e.g., '**/*.py', 'docs/*.md').",
            type: 'string',
          },
          path: {
            description:
-              'The directory to search in. If not specified, the current working directory will be used. IMPORTANT: Omit this field to use the default directory. DO NOT enter "undefined" or "null" - simply omit it for the default behavior. Must be a valid directory path if provided.',
+              'Optional: The absolute path to the directory to search within. If omitted, searches the root directory.',
            type: 'string',
          },
+          case_sensitive: {
+            description:
+              'Optional: Whether the search should be case-sensitive. Defaults to false.',
+            type: 'boolean',
+          },
+          respect_git_ignore: {
+            description:
+              'Optional: Whether to respect .gitignore patterns when finding files. Only available in git repositories. Defaults to true.',
+            type: 'boolean',
+          },
+          respect_qwen_ignore: {
+            description:
+              'Optional: Whether to respect .qwenignore patterns when finding files. Defaults to true.',
+            type: 'boolean',
+          },
        },
        required: ['pattern'],
        type: 'object',
@@ -252,6 +308,29 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
  protected override validateToolParamValues(
    params: GlobToolParams,
  ): string | null {
+    const searchDirAbsolute = path.resolve(
+      this.config.getTargetDir(),
+      params.path || '.',
+    );
+
+    const workspaceContext = this.config.getWorkspaceContext();
+    if (!workspaceContext.isPathWithinWorkspace(searchDirAbsolute)) {
+      const directories = workspaceContext.getDirectories();
+      return `Search path ("${searchDirAbsolute}") resolves outside the allowed workspace directories: ${directories.join(', ')}`;
+    }
+
+    const targetDir = searchDirAbsolute || this.config.getTargetDir();
+    try {
+      if (!fs.existsSync(targetDir)) {
+        return `Search path does not exist ${targetDir}`;
+      }
+      if (!fs.statSync(targetDir).isDirectory()) {
+        return `Search path is not a directory: ${targetDir}`;
+      }
+    } catch (e: unknown) {
+      return `Error accessing search path: ${e}`;
+    }
+
    if (
      !params.pattern ||
      typeof params.pattern !== 'string' ||
@@ -260,15 +339,6 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
      return "The 'pattern' parameter cannot be empty.";
    }

-    // Only validate path if one is provided
-    if (params.path) {
-      try {
-        resolveAndValidatePath(this.config, params.path);
-      } catch (error) {
-        return getErrorMessage(error);
-      }
-    }
-
    return null;
  }

--- a/packages/core/src/tools/grep.test.ts
+++ b/packages/core/src/tools/grep.test.ts
@@ -84,11 +84,11 @@ describe('GrepTool', () => {
      expect(grepTool.validateToolParams(params)).toBeNull();
    });

-    it('should return null for valid params (pattern, path, and glob)', () => {
+    it('should return null for valid params (pattern, path, and include)', () => {
      const params: GrepToolParams = {
        pattern: 'hello',
        path: '.',
-        glob: '*.txt',
+        include: '*.txt',
      };
      expect(grepTool.validateToolParams(params)).toBeNull();
    });
@@ -111,7 +111,7 @@ describe('GrepTool', () => {
      const params: GrepToolParams = { pattern: 'hello', path: 'nonexistent' };
      // Check for the core error message, as the full path might vary
      expect(grepTool.validateToolParams(params)).toContain(
-        'Path does not exist:',
+        'Failed to access path stats for',
      );
      expect(grepTool.validateToolParams(params)).toContain('nonexistent');
    });
@@ -155,8 +155,8 @@ describe('GrepTool', () => {
      expect(result.returnDisplay).toBe('Found 1 match');
    });

-    it('should find matches with a glob filter', async () => {
-      const params: GrepToolParams = { pattern: 'hello', glob: '*.js' };
+    it('should find matches with an include glob', async () => {
+      const params: GrepToolParams = { pattern: 'hello', include: '*.js' };
      const invocation = grepTool.build(params);
      const result = await invocation.execute(abortSignal);
      expect(result.llmContent).toContain(
@@ -169,7 +169,7 @@ describe('GrepTool', () => {
      expect(result.returnDisplay).toBe('Found 1 match');
    });

-    it('should find matches with a glob filter and path', async () => {
+    it('should find matches with an include glob and path', async () => {
      await fs.writeFile(
        path.join(tempRootDir, 'sub', 'another.js'),
        'const greeting = "hello";',
@@ -177,7 +177,7 @@ describe('GrepTool', () => {
      const params: GrepToolParams = {
        pattern: 'hello',
        path: 'sub',
-        glob: '*.js',
+        include: '*.js',
      };
      const invocation = grepTool.build(params);
      const result = await invocation.execute(abortSignal);
@@ -244,23 +244,59 @@ describe('GrepTool', () => {

  describe('multi-directory workspace', () => {
    it('should search across all workspace directories when no path is specified', async () => {
-      // The new implementation searches only in the target directory (first workspace directory)
-      // when no path is specified, not across all workspace directories
-      const params: GrepToolParams = { pattern: 'world' };
-      const invocation = grepTool.build(params);
-      const result = await invocation.execute(abortSignal);
-
-      // Should find matches in the target directory only
-      expect(result.llmContent).toContain(
-        'Found 3 matches for pattern "world" in the workspace directory',
+      // Create additional directory with test files
+      const secondDir = await fs.mkdtemp(
+        path.join(os.tmpdir(), 'grep-tool-second-'),
+      );
+      await fs.writeFile(
+        path.join(secondDir, 'other.txt'),
+        'hello from second directory\nworld in second',
+      );
+      await fs.writeFile(
+        path.join(secondDir, 'another.js'),
+        'function world() { return "test"; }',
      );

-      // Matches from target directory
+      // Create a mock config with multiple directories
+      const multiDirConfig = {
+        getTargetDir: () => tempRootDir,
+        getWorkspaceContext: () =>
+          createMockWorkspaceContext(tempRootDir, [secondDir]),
+        getFileExclusions: () => ({
+          getGlobExcludes: () => [],
+        }),
+      } as unknown as Config;
+
+      const multiDirGrepTool = new GrepTool(multiDirConfig);
+      const params: GrepToolParams = { pattern: 'world' };
+      const invocation = multiDirGrepTool.build(params);
+      const result = await invocation.execute(abortSignal);
+
+      // Should find matches in both directories
+      expect(result.llmContent).toContain(
+        'Found 5 matches for pattern "world"',
+      );
+
+      // Matches from first directory
      expect(result.llmContent).toContain('fileA.txt');
      expect(result.llmContent).toContain('L1: hello world');
      expect(result.llmContent).toContain('L2: second line with world');
      expect(result.llmContent).toContain('fileC.txt');
      expect(result.llmContent).toContain('L1: another world in sub dir');
+
+      // Matches from second directory (with directory name prefix)
+      const secondDirName = path.basename(secondDir);
+      expect(result.llmContent).toContain(
+        `File: ${path.join(secondDirName, 'other.txt')}`,
+      );
+      expect(result.llmContent).toContain('L2: world in second');
+      expect(result.llmContent).toContain(
+        `File: ${path.join(secondDirName, 'another.js')}`,
+      );
+      expect(result.llmContent).toContain('L1: function world()');
+
+      // Clean up
+      await fs.rm(secondDir, { recursive: true, force: true });
    });

    it('should search only specified path within workspace directories', async () => {
@@ -310,18 +346,16 @@ describe('GrepTool', () => {
    it('should generate correct description with pattern only', () => {
      const params: GrepToolParams = { pattern: 'testPattern' };
      const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toBe("'testPattern' in path './'");
+      expect(invocation.getDescription()).toBe("'testPattern'");
    });

-    it('should generate correct description with pattern and glob', () => {
+    it('should generate correct description with pattern and include', () => {
      const params: GrepToolParams = {
        pattern: 'testPattern',
-        glob: '*.ts',
+        include: '*.ts',
      };
      const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toBe(
-        "'testPattern' in path './' (filter: '*.ts')",
-      );
+      expect(invocation.getDescription()).toBe("'testPattern' in *.ts");
    });

    it('should generate correct description with pattern and path', async () => {
@@ -332,37 +366,49 @@ describe('GrepTool', () => {
        path: path.join('src', 'app'),
      };
      const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toContain(
-        "'testPattern' in path 'src",
-      );
-      expect(invocation.getDescription()).toContain("app'");
+      // The path will be relative to the tempRootDir, so we check for containment.
+      expect(invocation.getDescription()).toContain("'testPattern' within");
+      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
    });

-    it('should indicate searching workspace directory when no path specified', () => {
+    it('should indicate searching across all workspace directories when no path specified', () => {
+      // Create a mock config with multiple directories
+      const multiDirConfig = {
+        getTargetDir: () => tempRootDir,
+        getWorkspaceContext: () =>
+          createMockWorkspaceContext(tempRootDir, ['/another/dir']),
+        getFileExclusions: () => ({
+          getGlobExcludes: () => [],
+        }),
+      } as unknown as Config;
+
+      const multiDirGrepTool = new GrepTool(multiDirConfig);
      const params: GrepToolParams = { pattern: 'testPattern' };
-      const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toBe("'testPattern' in path './'");
+      const invocation = multiDirGrepTool.build(params);
+      expect(invocation.getDescription()).toBe(
+        "'testPattern' across all workspace directories",
+      );
    });

-    it('should generate correct description with pattern, glob, and path', async () => {
+    it('should generate correct description with pattern, include, and path', async () => {
      const dirPath = path.join(tempRootDir, 'src', 'app');
      await fs.mkdir(dirPath, { recursive: true });
      const params: GrepToolParams = {
        pattern: 'testPattern',
-        glob: '*.ts',
+        include: '*.ts',
        path: path.join('src', 'app'),
      };
      const invocation = grepTool.build(params);
      expect(invocation.getDescription()).toContain(
-        "'testPattern' in path 'src",
+        "'testPattern' in *.ts within",
      );
-      expect(invocation.getDescription()).toContain("(filter: '*.ts')");
+      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
    });

    it('should use ./ for root path in description', () => {
      const params: GrepToolParams = { pattern: 'testPattern', path: '.' };
      const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toBe("'testPattern' in path '.'");
+      expect(invocation.getDescription()).toBe("'testPattern' within ./");
    });
  });

@@ -376,50 +422,67 @@ describe('GrepTool', () => {
      }
    });

-    it('should show all results when no limit is specified', async () => {
+    it('should limit results to default 20 matches', async () => {
      const params: GrepToolParams = { pattern: 'testword' };
      const invocation = grepTool.build(params);
      const result = await invocation.execute(abortSignal);

-      // New implementation shows all matches when limit is not specified
-      expect(result.llmContent).toContain('Found 30 matches');
-      expect(result.llmContent).not.toContain('truncated');
-      expect(result.returnDisplay).toBe('Found 30 matches');
+      expect(result.llmContent).toContain('Found 20 matches');
+      expect(result.llmContent).toContain(
+        'showing first 20 of 30+ total matches',
+      );
+      expect(result.llmContent).toContain('WARNING: Results truncated');
+      expect(result.returnDisplay).toContain(
+        'Found 20 matches (truncated from 30+)',
+      );
    });

-    it('should respect custom limit parameter', async () => {
-      const params: GrepToolParams = { pattern: 'testword', limit: 5 };
+    it('should respect custom maxResults parameter', async () => {
+      const params: GrepToolParams = { pattern: 'testword', maxResults: 5 };
      const invocation = grepTool.build(params);
      const result = await invocation.execute(abortSignal);

-      // Should find 30 total but limit to 5
-      expect(result.llmContent).toContain('Found 30 matches');
-      expect(result.llmContent).toContain('25 lines truncated');
-      expect(result.returnDisplay).toContain('Found 30 matches (truncated)');
+      expect(result.llmContent).toContain('Found 5 matches');
+      expect(result.llmContent).toContain(
+        'showing first 5 of 30+ total matches',
+      );
+      expect(result.llmContent).toContain('current: 5');
+      expect(result.returnDisplay).toContain(
+        'Found 5 matches (truncated from 30+)',
+      );
    });

    it('should not show truncation warning when all results fit', async () => {
-      const params: GrepToolParams = { pattern: 'testword', limit: 50 };
+      const params: GrepToolParams = { pattern: 'testword', maxResults: 50 };
      const invocation = grepTool.build(params);
      const result = await invocation.execute(abortSignal);

      expect(result.llmContent).toContain('Found 30 matches');
-      expect(result.llmContent).not.toContain('truncated');
+      expect(result.llmContent).not.toContain('WARNING: Results truncated');
+      expect(result.llmContent).not.toContain('showing first');
      expect(result.returnDisplay).toBe('Found 30 matches');
    });

-    it('should not validate limit parameter', () => {
-      // limit parameter has no validation constraints in the new implementation
-      const params = { pattern: 'test', limit: 5 };
-      const error = grepTool.validateToolParams(params as GrepToolParams);
-      expect(error).toBeNull();
+    it('should validate maxResults parameter', () => {
+      const invalidParams = [
+        { pattern: 'test', maxResults: 0 },
+        { pattern: 'test', maxResults: 101 },
+        { pattern: 'test', maxResults: -1 },
+        { pattern: 'test', maxResults: 1.5 },
+      ];
+
+      invalidParams.forEach((params) => {
+        const error = grepTool.validateToolParams(params as GrepToolParams);
+        expect(error).toBeTruthy(); // Just check that validation fails
+        expect(error).toMatch(/maxResults|must be/); // Check it's about maxResults validation
+      });
    });

-    it('should accept valid limit parameter', () => {
+    it('should accept valid maxResults parameter', () => {
      const validParams = [
-        { pattern: 'test', limit: 1 },
-        { pattern: 'test', limit: 50 },
-        { pattern: 'test', limit: 100 },
+        { pattern: 'test', maxResults: 1 },
+        { pattern: 'test', maxResults: 50 },
+        { pattern: 'test', maxResults: 100 },
      ];

      validParams.forEach((params) => {
--- a/packages/core/src/tools/grep.ts
+++ b/packages/core/src/tools/grep.ts
@@ -4,6 +4,7 @@
 * SPDX-License-Identifier: Apache-2.0
 */

+import fs from 'node:fs';
 import fsPromises from 'node:fs/promises';
 import path from 'node:path';
 import { EOL } from 'node:os';
@@ -12,15 +13,13 @@ import { globStream } from 'glob';
 import type { ToolInvocation, ToolResult } from './tools.js';
 import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
 import { ToolNames } from './tool-names.js';
-import { resolveAndValidatePath } from '../utils/paths.js';
+import { makeRelative, shortenPath } from '../utils/paths.js';
 import { getErrorMessage, isNodeError } from '../utils/errors.js';
 import { isGitRepository } from '../utils/gitUtils.js';
 import type { Config } from '../config/config.js';
 import type { FileExclusions } from '../utils/ignorePatterns.js';
 import { ToolErrorType } from './tool-error.js';

-const MAX_LLM_CONTENT_LENGTH = 20_000;
-
 // --- Interfaces ---

 /**
@@ -38,14 +37,14 @@ export interface GrepToolParams {
  path?: string;

  /**
-   * Glob pattern to filter files (e.g. "*.js", "*.{ts,tsx}")
+   * File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")
   */
-  glob?: string;
+  include?: string;

  /**
-   * Maximum number of matching lines to return (optional, shows all if not specified)
+   * Maximum number of matches to return (optional, defaults to 20)
   */
-  limit?: number;
+  maxResults?: number;
 }

 /**
@@ -71,57 +70,121 @@ class GrepToolInvocation extends BaseToolInvocation<
    this.fileExclusions = config.getFileExclusions();
  }

+  /**
+   * Checks if a path is within the root directory and resolves it.
+   * @param relativePath Path relative to the root directory (or undefined for root).
+   * @returns The absolute path if valid and exists, or null if no path specified (to search all directories).
+   * @throws {Error} If path is outside root, doesn't exist, or isn't a directory.
+   */
+  private resolveAndValidatePath(relativePath?: string): string | null {
+    // If no path specified, return null to indicate searching all workspace directories
+    if (!relativePath) {
+      return null;
+    }
+
+    const targetPath = path.resolve(this.config.getTargetDir(), relativePath);
+
+    // Security Check: Ensure the resolved path is within workspace boundaries
+    const workspaceContext = this.config.getWorkspaceContext();
+    if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
+      const directories = workspaceContext.getDirectories();
+      throw new Error(
+        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+      );
+    }
+
+    // Check existence and type after resolving
+    try {
+      const stats = fs.statSync(targetPath);
+      if (!stats.isDirectory()) {
+        throw new Error(`Path is not a directory: ${targetPath}`);
+      }
+    } catch (error: unknown) {
+      if (isNodeError(error) && error.code !== 'ENOENT') {
+        throw new Error(`Path does not exist: ${targetPath}`);
+      }
+      throw new Error(
+        `Failed to access path stats for ${targetPath}: ${error}`,
+      );
+    }
+
+    return targetPath;
+  }
+
  async execute(signal: AbortSignal): Promise<ToolResult> {
    try {
-      // Default to target directory if no path is provided
-      const searchDirAbs = resolveAndValidatePath(
-        this.config,
-        this.params.path,
-      );
+      const workspaceContext = this.config.getWorkspaceContext();
+      const searchDirAbs = this.resolveAndValidatePath(this.params.path);
      const searchDirDisplay = this.params.path || '.';

-      // Perform grep search
-      const rawMatches = await this.performGrepSearch({
-        pattern: this.params.pattern,
-        path: searchDirAbs,
-        glob: this.params.glob,
-        signal,
-      });
+      // Determine which directories to search
+      let searchDirectories: readonly string[];
+      if (searchDirAbs === null) {
+        // No path specified - search all workspace directories
+        searchDirectories = workspaceContext.getDirectories();
+      } else {
+        // Specific path provided - search only that directory
+        searchDirectories = [searchDirAbs];
+      }

-      // Build search description
-      const searchLocationDescription = this.params.path
-        ? `in path "${searchDirDisplay}"`
-        : `in the workspace directory`;
+      // Collect matches from all search directories
+      let allMatches: GrepMatch[] = [];
+      const maxResults = this.params.maxResults ?? 20; // Default to 20 results
+      let totalMatchesFound = 0;
+      let searchTruncated = false;

-      const filterDescription = this.params.glob
-        ? ` (filter: "${this.params.glob}")`
-        : '';
+      for (const searchDir of searchDirectories) {
+        const matches = await this.performGrepSearch({
+          pattern: this.params.pattern,
+          path: searchDir,
+          include: this.params.include,
+          signal,
+        });

-      // Check if we have any matches
-      if (rawMatches.length === 0) {
-        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${filterDescription}.`;
+        totalMatchesFound += matches.length;
+
+        // Add directory prefix if searching multiple directories
+        if (searchDirectories.length > 1) {
+          const dirName = path.basename(searchDir);
+          matches.forEach((match) => {
+            match.filePath = path.join(dirName, match.filePath);
+          });
+        }
+
+        // Apply result limiting
+        const remainingSlots = maxResults - allMatches.length;
+        if (remainingSlots <= 0) {
+          searchTruncated = true;
+          break;
+        }
+
+        if (matches.length > remainingSlots) {
+          allMatches = allMatches.concat(matches.slice(0, remainingSlots));
+          searchTruncated = true;
+          break;
+        } else {
+          allMatches = allMatches.concat(matches);
+        }
+      }
+
+      let searchLocationDescription: string;
+      if (searchDirAbs === null) {
+        const numDirs = workspaceContext.getDirectories().length;
+        searchLocationDescription =
+          numDirs > 1
+            ? `across ${numDirs} workspace directories`
+            : `in the workspace directory`;
+      } else {
+        searchLocationDescription = `in path "${searchDirDisplay}"`;
+      }
+
+      if (allMatches.length === 0) {
+        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}.`;
        return { llmContent: noMatchMsg, returnDisplay: `No matches found` };
      }

-      // Apply line limit if specified
-      let truncatedByLineLimit = false;
-      let matchesToInclude = rawMatches;
-      if (
-        this.params.limit !== undefined &&
-        rawMatches.length > this.params.limit
-      ) {
-        matchesToInclude = rawMatches.slice(0, this.params.limit);
-        truncatedByLineLimit = true;
-      }
-
-      const totalMatches = rawMatches.length;
-      const matchTerm = totalMatches === 1 ? 'match' : 'matches';
-
-      // Build header
-      const header = `Found ${totalMatches} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${filterDescription}:\n---\n`;
-
      // Group matches by file
-      const matchesByFile = matchesToInclude.reduce(
+      const matchesByFile = allMatches.reduce(
        (acc, match) => {
          const fileKey = match.filePath;
          if (!acc[fileKey]) {
@@ -134,51 +197,46 @@ class GrepToolInvocation extends BaseToolInvocation<
        {} as Record<string, GrepMatch[]>,
      );

-      // Build grep output
-      let grepOutput = '';
+      const matchCount = allMatches.length;
+      const matchTerm = matchCount === 1 ? 'match' : 'matches';
+
+      // Build the header with truncation info if needed
+      let headerText = `Found ${matchCount} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}`;
+
+      if (searchTruncated) {
+        headerText += ` (showing first ${matchCount} of ${totalMatchesFound}+ total matches)`;
+      }
+
+      let llmContent = `${headerText}:
+---
+`;
+
      for (const filePath in matchesByFile) {
-        grepOutput += `File: ${filePath}\n`;
+        llmContent += `File: ${filePath}\n`;
        matchesByFile[filePath].forEach((match) => {
          const trimmedLine = match.line.trim();
-          grepOutput += `L${match.lineNumber}: ${trimmedLine}\n`;
+          llmContent += `L${match.lineNumber}: ${trimmedLine}\n`;
        });
-        grepOutput += '---\n';
+        llmContent += '---\n';
      }

-      // Apply character limit as safety net
-      let truncatedByCharLimit = false;
-      if (grepOutput.length > MAX_LLM_CONTENT_LENGTH) {
-        grepOutput = grepOutput.slice(0, MAX_LLM_CONTENT_LENGTH) + '...';
-        truncatedByCharLimit = true;
+      // Add truncation guidance if results were limited
+      if (searchTruncated) {
+        llmContent += `\nWARNING: Results truncated to prevent context overflow. To see more results:
+- Use a more specific pattern to reduce matches
+- Add file filters with the 'include' parameter (e.g., "*.js", "src/**")
+- Specify a narrower 'path' to search in a subdirectory
+- Increase 'maxResults' parameter if you need more matches (current: ${maxResults})`;
      }

-      // Count how many lines we actually included after character truncation
-      const finalLines = grepOutput
-        .split('\n')
-        .filter(
-          (line) =>
-            line.trim() && !line.startsWith('File:') && !line.startsWith('---'),
-        );
-      const includedLines = finalLines.length;
-
-      // Build result
-      let llmContent = header + grepOutput;
-
-      // Add truncation notice if needed
-      if (truncatedByLineLimit || truncatedByCharLimit) {
-        const omittedMatches = totalMatches - includedLines;
-        llmContent += ` [${omittedMatches} ${omittedMatches === 1 ? 'line' : 'lines'} truncated] ...`;
-      }
-
-      // Build display message
-      let displayMessage = `Found ${totalMatches} ${matchTerm}`;
-      if (truncatedByLineLimit || truncatedByCharLimit) {
-        displayMessage += ` (truncated)`;
+      let displayText = `Found ${matchCount} ${matchTerm}`;
+      if (searchTruncated) {
+        displayText += ` (truncated from ${totalMatchesFound}+)`;
      }

      return {
        llmContent: llmContent.trim(),
-        returnDisplay: displayMessage,
+        returnDisplay: displayText,
      };
    } catch (error) {
      console.error(`Error during GrepLogic execution: ${error}`);
@@ -271,26 +329,50 @@ class GrepToolInvocation extends BaseToolInvocation<
   * @returns A string describing the grep
   */
  getDescription(): string {
-    let description = `'${this.params.pattern}' in path '${this.params.path || './'}'`;
-    if (this.params.glob) {
-      description += ` (filter: '${this.params.glob}')`;
+    let description = `'${this.params.pattern}'`;
+    if (this.params.include) {
+      description += ` in ${this.params.include}`;
+    }
+    if (this.params.path) {
+      const resolvedPath = path.resolve(
+        this.config.getTargetDir(),
+        this.params.path,
+      );
+      if (
+        resolvedPath === this.config.getTargetDir() ||
+        this.params.path === '.'
+      ) {
+        description += ` within ./`;
+      } else {
+        const relativePath = makeRelative(
+          resolvedPath,
+          this.config.getTargetDir(),
+        );
+        description += ` within ${shortenPath(relativePath)}`;
+      }
+    } else {
+      // When no path is specified, indicate searching all workspace directories
+      const workspaceContext = this.config.getWorkspaceContext();
+      const directories = workspaceContext.getDirectories();
+      if (directories.length > 1) {
+        description += ` across all workspace directories`;
+      }
    }
-
    return description;
  }

  /**
   * Performs the actual search using the prioritized strategies.
-   * @param options Search options including pattern, absolute path, and glob filter.
+   * @param options Search options including pattern, absolute path, and include glob.
   * @returns A promise resolving to an array of match objects.
   */
  private async performGrepSearch(options: {
    pattern: string;
    path: string; // Expects absolute path
-    glob?: string;
+    include?: string;
    signal: AbortSignal;
  }): Promise<GrepMatch[]> {
-    const { pattern, path: absolutePath, glob } = options;
+    const { pattern, path: absolutePath, include } = options;
    let strategyUsed = 'none';

    try {
@@ -308,8 +390,8 @@ class GrepToolInvocation extends BaseToolInvocation<
          '--ignore-case',
          pattern,
        ];
-        if (glob) {
-          gitArgs.push('--', glob);
+        if (include) {
+          gitArgs.push('--', include);
        }

        try {
@@ -375,8 +457,8 @@ class GrepToolInvocation extends BaseToolInvocation<
          })
          .filter((dir): dir is string => !!dir);
        commonExcludes.forEach((dir) => grepArgs.push(`--exclude-dir=${dir}`));
-        if (glob) {
-          grepArgs.push(`--include=${glob}`);
+        if (include) {
+          grepArgs.push(`--include=${include}`);
        }
        grepArgs.push(pattern);
        grepArgs.push('.');
@@ -455,7 +537,7 @@ class GrepToolInvocation extends BaseToolInvocation<
        'GrepLogic: Falling back to JavaScript grep implementation.',
      );
      strategyUsed = 'javascript fallback';
-      const globPattern = glob ? glob : '**/*';
+      const globPattern = include ? include : '**/*';
      const ignorePatterns = this.fileExclusions.getGlobExcludes();

      const filesIterator = globStream(globPattern, {
@@ -521,30 +603,32 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
  constructor(private readonly config: Config) {
    super(
      GrepTool.Name,
-      'Grep',
-      'A powerful search tool for finding patterns in files\n\n  Usage:\n  - ALWAYS use Grep for search tasks. NEVER invoke `grep` or `rg` as a Bash command. The Grep tool has been optimized for correct permissions and access.\n  - Supports full regex syntax (e.g., "log.*Error", "function\\s+\\w+")\n  - Filter files with glob parameter (e.g., "*.js", "**/*.tsx")\n  - Case-insensitive by default\n  - Use Task tool for open-ended searches requiring multiple rounds\n',
+      'SearchText',
+      'Searches for a regular expression pattern within the content of files in a specified directory (or current working directory). Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.',
      Kind.Search,
      {
        properties: {
          pattern: {
-            type: 'string',
            description:
-              'The regular expression pattern to search for in file contents',
-          },
-          glob: {
+              "The regular expression (regex) pattern to search for within file contents (e.g., 'function\\s+myFunction', 'import\\s+\\{.*\\}\\s+from\\s+.*').",
            type: 'string',
-            description:
-              'Glob pattern to filter files (e.g. "*.js", "*.{ts,tsx}")',
          },
          path: {
+            description:
+              'Optional: The absolute path to the directory to search within. If omitted, searches the current working directory.',
            type: 'string',
-            description:
-              'File or directory to search in. Defaults to current working directory.',
          },
-          limit: {
-            type: 'number',
+          include: {
            description:
-              'Limit output to first N matching lines. Optional - shows all matches if not specified.',
+              "Optional: A glob pattern to filter which files are searched (e.g., '*.js', '*.{ts,tsx}', 'src/**'). If omitted, searches all files (respecting potential global ignores).",
+            type: 'string',
+          },
+          maxResults: {
+            description:
+              'Optional: Maximum number of matches to return to prevent context overflow (default: 20, max: 100). Use lower values for broad searches, higher for specific searches.',
+            type: 'number',
+            minimum: 1,
+            maximum: 100,
          },
        },
        required: ['pattern'],
@@ -553,6 +637,47 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
    );
  }

+  /**
+   * Checks if a path is within the root directory and resolves it.
+   * @param relativePath Path relative to the root directory (or undefined for root).
+   * @returns The absolute path if valid and exists, or null if no path specified (to search all directories).
+   * @throws {Error} If path is outside root, doesn't exist, or isn't a directory.
+   */
+  private resolveAndValidatePath(relativePath?: string): string | null {
+    // If no path specified, return null to indicate searching all workspace directories
+    if (!relativePath) {
+      return null;
+    }
+
+    const targetPath = path.resolve(this.config.getTargetDir(), relativePath);
+
+    // Security Check: Ensure the resolved path is within workspace boundaries
+    const workspaceContext = this.config.getWorkspaceContext();
+    if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
+      const directories = workspaceContext.getDirectories();
+      throw new Error(
+        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+      );
+    }
+
+    // Check existence and type after resolving
+    try {
+      const stats = fs.statSync(targetPath);
+      if (!stats.isDirectory()) {
+        throw new Error(`Path is not a directory: ${targetPath}`);
+      }
+    } catch (error: unknown) {
+      if (isNodeError(error) && error.code !== 'ENOENT') {
+        throw new Error(`Path does not exist: ${targetPath}`);
+      }
+      throw new Error(
+        `Failed to access path stats for ${targetPath}: ${error}`,
+      );
+    }
+
+    return targetPath;
+  }
+
  /**
   * Validates the parameters for the tool
   * @param params Parameters to validate
@@ -561,17 +686,27 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
  protected override validateToolParamValues(
    params: GrepToolParams,
  ): string | null {
-    // Validate pattern is a valid regex
    try {
      new RegExp(params.pattern);
    } catch (error) {
-      return `Invalid regular expression pattern: ${params.pattern}. Error: ${getErrorMessage(error)}`;
+      return `Invalid regular expression pattern provided: ${params.pattern}. Error: ${getErrorMessage(error)}`;
+    }
+
+    // Validate maxResults if provided
+    if (params.maxResults !== undefined) {
+      if (
+        !Number.isInteger(params.maxResults) ||
+        params.maxResults < 1 ||
+        params.maxResults > 100
+      ) {
+        return `maxResults must be an integer between 1 and 100, got: ${params.maxResults}`;
+      }
    }

    // Only validate path if one is provided
    if (params.path) {
      try {
-        resolveAndValidatePath(this.config, params.path);
+        this.resolveAndValidatePath(params.path);
      } catch (error) {
        return getErrorMessage(error);
      }
--- a/packages/core/src/tools/ripGrep.test.ts
+++ b/packages/core/src/tools/ripGrep.test.ts
@@ -184,15 +184,17 @@ describe('RipGrepTool', () => {
      };
      // Check for the core error message, as the full path might vary
      expect(grepTool.validateToolParams(params)).toContain(
-        'Path does not exist:',
+        'Failed to access path stats for',
      );
      expect(grepTool.validateToolParams(params)).toContain('nonexistent');
    });

-    it('should allow path to be a file', () => {
+    it('should return error if path is a file, not a directory', async () => {
      const filePath = path.join(tempRootDir, 'fileA.txt');
      const params: RipGrepToolParams = { pattern: 'hello', path: filePath };
-      expect(grepTool.validateToolParams(params)).toBeNull();
+      expect(grepTool.validateToolParams(params)).toContain(
+        `Path is not a directory: ${filePath}`,
+      );
    });
  });

@@ -430,7 +432,7 @@ describe('RipGrepTool', () => {
      const invocation = grepTool.build(params);
      const result = await invocation.execute(abortSignal);

-      expect(String(result.llmContent).length).toBeLessThanOrEqual(21_000);
+      expect(String(result.llmContent).length).toBeLessThanOrEqual(20_000);
      expect(result.llmContent).toMatch(/\[\d+ lines? truncated\] \.\.\./);
      expect(result.returnDisplay).toContain('truncated');
    });
@@ -565,26 +567,6 @@ describe('RipGrepTool', () => {
      );
    });

-    it('should search within a single file when path is a file', async () => {
-      mockSpawn.mockImplementationOnce(
-        createMockSpawn({
-          outputData: `fileA.txt:1:hello world${EOL}fileA.txt:2:second line with world${EOL}`,
-          exitCode: 0,
-        }),
-      );
-
-      const params: RipGrepToolParams = {
-        pattern: 'world',
-        path: path.join(tempRootDir, 'fileA.txt'),
-      };
-      const invocation = grepTool.build(params);
-      const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 matches');
-      expect(result.llmContent).toContain('fileA.txt:1:hello world');
-      expect(result.llmContent).toContain('fileA.txt:2:second line with world');
-      expect(result.returnDisplay).toBe('Found 2 matches');
-    });
-
    it('should throw an error if ripgrep is not available', async () => {
      // Make ensureRipgrepBinary throw
      (ensureRipgrepPath as Mock).mockRejectedValue(
@@ -666,9 +648,7 @@ describe('RipGrepTool', () => {
  describe('error handling and edge cases', () => {
    it('should handle workspace boundary violations', () => {
      const params: RipGrepToolParams = { pattern: 'test', path: '../outside' };
-      expect(() => grepTool.build(params)).toThrow(
-        /Path is not within workspace/,
-      );
+      expect(() => grepTool.build(params)).toThrow(/Path validation failed/);
    });

    it('should handle empty directories gracefully', async () => {
@@ -1152,9 +1132,7 @@ describe('RipGrepTool', () => {
        glob: '*.ts',
      };
      const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toBe(
-        "'testPattern' (filter: '*.ts')",
-      );
+      expect(invocation.getDescription()).toBe("'testPattern' in *.ts");
    });

    it('should generate correct description with pattern and path', async () => {
@@ -1165,10 +1143,9 @@ describe('RipGrepTool', () => {
        path: path.join('src', 'app'),
      };
      const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toContain(
-        "'testPattern' in path 'src",
-      );
-      expect(invocation.getDescription()).toContain("app'");
+      // The path will be relative to the tempRootDir, so we check for containment.
+      expect(invocation.getDescription()).toContain("'testPattern' within");
+      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
    });

    it('should generate correct description with default search path', () => {
@@ -1187,15 +1164,15 @@ describe('RipGrepTool', () => {
      };
      const invocation = grepTool.build(params);
      expect(invocation.getDescription()).toContain(
-        "'testPattern' in path 'src",
+        "'testPattern' in *.ts within",
      );
-      expect(invocation.getDescription()).toContain("(filter: '*.ts')");
+      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
    });

-    it('should use path when specified in description', () => {
+    it('should use ./ for root path in description', () => {
      const params: RipGrepToolParams = { pattern: 'testPattern', path: '.' };
      const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toBe("'testPattern' in path '.'");
+      expect(invocation.getDescription()).toBe("'testPattern' within ./");
    });
  });
 });
--- a/packages/core/src/tools/ripGrep.ts
+++ b/packages/core/src/tools/ripGrep.ts
@@ -11,8 +11,8 @@ import { spawn } from 'node:child_process';
 import type { ToolInvocation, ToolResult } from './tools.js';
 import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
 import { ToolNames } from './tool-names.js';
-import { resolveAndValidatePath } from '../utils/paths.js';
-import { getErrorMessage } from '../utils/errors.js';
+import { makeRelative, shortenPath } from '../utils/paths.js';
+import { getErrorMessage, isNodeError } from '../utils/errors.js';
 import type { Config } from '../config/config.js';
 import { ensureRipgrepPath } from '../utils/ripgrepUtils.js';
 import { SchemaValidator } from '../utils/schemaValidator.js';
@@ -57,13 +57,50 @@ class GrepToolInvocation extends BaseToolInvocation<
    super(params);
  }

+  /**
+   * Checks if a path is within the root directory and resolves it.
+   * @param relativePath Path relative to the root directory (or undefined for root).
+   * @returns The absolute path to search within.
+   * @throws {Error} If path is outside root, doesn't exist, or isn't a directory.
+   */
+  private resolveAndValidatePath(relativePath?: string): string {
+    const targetDir = this.config.getTargetDir();
+    const targetPath = relativePath
+      ? path.resolve(targetDir, relativePath)
+      : targetDir;
+
+    const workspaceContext = this.config.getWorkspaceContext();
+    if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
+      const directories = workspaceContext.getDirectories();
+      throw new Error(
+        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+      );
+    }
+
+    return this.ensureDirectory(targetPath);
+  }
+
+  private ensureDirectory(targetPath: string): string {
+    try {
+      const stats = fs.statSync(targetPath);
+      if (!stats.isDirectory()) {
+        throw new Error(`Path is not a directory: ${targetPath}`);
+      }
+    } catch (error: unknown) {
+      if (isNodeError(error) && error.code !== 'ENOENT') {
+        throw new Error(`Path does not exist: ${targetPath}`);
+      }
+      throw new Error(
+        `Failed to access path stats for ${targetPath}: ${error}`,
+      );
+    }
+
+    return targetPath;
+  }
+
  async execute(signal: AbortSignal): Promise<ToolResult> {
    try {
-      const searchDirAbs = resolveAndValidatePath(
-        this.config,
-        this.params.path,
-        { allowFiles: true },
-      );
+      const searchDirAbs = this.resolveAndValidatePath(this.params.path);
      const searchDirDisplay = this.params.path || '.';

      // Get raw ripgrep output
@@ -96,6 +133,9 @@ class GrepToolInvocation extends BaseToolInvocation<

      // Build header early to calculate available space
      const header = `Found ${totalMatches} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${filterDescription}:\n---\n`;
+      const maxTruncationNoticeLength = 100; // "[... N more matches truncated]"
+      const maxGrepOutputLength =
+        MAX_LLM_CONTENT_LENGTH - header.length - maxTruncationNoticeLength;

      // Apply line limit first (if specified)
      let truncatedByLineLimit = false;
@@ -108,32 +148,19 @@ class GrepToolInvocation extends BaseToolInvocation<
        truncatedByLineLimit = true;
      }

-      // Build output and track how many lines we include, respecting character limit
-      const parts: string[] = [];
-      let includedLines = 0;
+      // Join lines back into grep output
+      let grepOutput = linesToInclude.join(EOL);
+
+      // Apply character limit as safety net
      let truncatedByCharLimit = false;
-      let currentLength = 0;
-
-      for (const line of linesToInclude) {
-        const sep = includedLines > 0 ? 1 : 0;
-
-        includedLines++;
-
-        if (currentLength + line.length <= MAX_LLM_CONTENT_LENGTH) {
-          parts.push(line);
-          currentLength = currentLength + line.length + sep;
-        } else {
-          const remaining = Math.max(
-            MAX_LLM_CONTENT_LENGTH - currentLength - sep,
-            10,
-          );
-          parts.push(line.slice(0, remaining) + '...');
-          truncatedByCharLimit = true;
-          break;
-        }
+      if (grepOutput.length > maxGrepOutputLength) {
+        grepOutput = grepOutput.slice(0, maxGrepOutputLength) + '...';
+        truncatedByCharLimit = true;
      }

-      const grepOutput = parts.join('\n');
+      // Count how many lines we actually included after character truncation
+      const finalLines = grepOutput.split(EOL).filter((line) => line.trim());
+      const includedLines = finalLines.length;

      // Build result
      let llmContent = header + grepOutput;
@@ -141,7 +168,7 @@ class GrepToolInvocation extends BaseToolInvocation<
      // Add truncation notice if needed
      if (truncatedByLineLimit || truncatedByCharLimit) {
        const omittedMatches = totalMatches - includedLines;
-        llmContent += `\n---\n[${omittedMatches} ${omittedMatches === 1 ? 'line' : 'lines'} truncated] ...`;
+        llmContent += ` [${omittedMatches} ${omittedMatches === 1 ? 'line' : 'lines'} truncated] ...`;
      }

      // Build display message (show real count, not truncated)
@@ -166,7 +193,7 @@ class GrepToolInvocation extends BaseToolInvocation<

  private async performRipgrepSearch(options: {
    pattern: string;
-    path: string; // Can be a file or directory
+    path: string;
    glob?: string;
    signal: AbortSignal;
  }): Promise<string> {
@@ -275,13 +302,34 @@ class GrepToolInvocation extends BaseToolInvocation<
   */
  getDescription(): string {
    let description = `'${this.params.pattern}'`;
-    if (this.params.path) {
-      description += ` in path '${this.params.path}'`;
-    }
    if (this.params.glob) {
-      description += ` (filter: '${this.params.glob}')`;
+      description += ` in ${this.params.glob}`;
+    }
+    if (this.params.path) {
+      const resolvedPath = path.resolve(
+        this.config.getTargetDir(),
+        this.params.path,
+      );
+      if (
+        resolvedPath === this.config.getTargetDir() ||
+        this.params.path === '.'
+      ) {
+        description += ` within ./`;
+      } else {
+        const relativePath = makeRelative(
+          resolvedPath,
+          this.config.getTargetDir(),
+        );
+        description += ` within ${shortenPath(relativePath)}`;
+      }
+    } else {
+      // When no path is specified, indicate searching all workspace directories
+      const workspaceContext = this.config.getWorkspaceContext();
+      const directories = workspaceContext.getDirectories();
+      if (directories.length > 1) {
+        description += ` across all workspace directories`;
+      }
    }
-
    return description;
  }
 }
@@ -330,6 +378,47 @@ export class RipGrepTool extends BaseDeclarativeTool<
    );
  }

+  /**
+   * Checks if a path is within the root directory and resolves it.
+   * @param relativePath Path relative to the root directory (or undefined for root).
+   * @returns The absolute path to search within.
+   * @throws {Error} If path is outside root, doesn't exist, or isn't a directory.
+   */
+  private resolveAndValidatePath(relativePath?: string): string {
+    // If no path specified, search within the workspace root directory
+    if (!relativePath) {
+      return this.config.getTargetDir();
+    }
+
+    const targetPath = path.resolve(this.config.getTargetDir(), relativePath);
+
+    // Security Check: Ensure the resolved path is within workspace boundaries
+    const workspaceContext = this.config.getWorkspaceContext();
+    if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
+      const directories = workspaceContext.getDirectories();
+      throw new Error(
+        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+      );
+    }
+
+    // Check existence and type after resolving
+    try {
+      const stats = fs.statSync(targetPath);
+      if (!stats.isDirectory()) {
+        throw new Error(`Path is not a directory: ${targetPath}`);
+      }
+    } catch (error: unknown) {
+      if (isNodeError(error) && error.code !== 'ENOENT') {
+        throw new Error(`Path does not exist: ${targetPath}`);
+      }
+      throw new Error(
+        `Failed to access path stats for ${targetPath}: ${error}`,
+      );
+    }
+
+    return targetPath;
+  }
+
  /**
   * Validates the parameters for the tool
   * @param params Parameters to validate
@@ -356,7 +445,7 @@ export class RipGrepTool extends BaseDeclarativeTool<
    // Only validate path if one is provided
    if (params.path) {
      try {
-        resolveAndValidatePath(this.config, params.path, { allowFiles: true });
+        this.resolveAndValidatePath(params.path);
      } catch (error) {
        return getErrorMessage(error);
      }
--- a/packages/core/src/utils/paths.test.ts
+++ b/packages/core/src/utils/paths.test.ts
@@ -4,53 +4,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
-import {
-  escapePath,
-  resolvePath,
-  validatePath,
-  resolveAndValidatePath,
-  unescapePath,
-  isSubpath,
-} from './paths.js';
-import type { Config } from '../config/config.js';
-
-function createConfigStub({
-  targetDir,
-  allowedDirectories,
-}: {
-  targetDir: string;
-  allowedDirectories: string[];
-}): Config {
-  const resolvedTargetDir = path.resolve(targetDir);
-  const resolvedDirectories = allowedDirectories.map((dir) =>
-    path.resolve(dir),
-  );
-
-  const workspaceContext = {
-    isPathWithinWorkspace(testPath: string) {
-      const resolvedPath = path.resolve(testPath);
-      return resolvedDirectories.some((dir) => {
-        const relative = path.relative(dir, resolvedPath);
-        return (
-          relative === '' ||
-          (!relative.startsWith('..') && !path.isAbsolute(relative))
-        );
-      });
-    },
-    getDirectories() {
-      return resolvedDirectories;
-    },
-  };
-
-  return {
-    getTargetDir: () => resolvedTargetDir,
-    getWorkspaceContext: () => workspaceContext,
-  } as unknown as Config;
-}
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { escapePath, unescapePath, isSubpath } from './paths.js';

 describe('escapePath', () => {
  it('should escape spaces', () => {
@@ -359,240 +314,3 @@ describe('isSubpath on Windows', () => {
    expect(isSubpath('Users\\Test\\file.txt', 'Users\\Test')).toBe(false);
  });
 });
-
-describe('resolvePath', () => {
-  it('resolves relative paths against the provided base directory', () => {
-    const result = resolvePath('/home/user/project', 'src/main.ts');
-    expect(result).toBe(path.resolve('/home/user/project', 'src/main.ts'));
-  });
-
-  it('resolves relative paths against cwd when baseDir is undefined', () => {
-    const cwd = process.cwd();
-    const result = resolvePath(undefined, 'src/main.ts');
-    expect(result).toBe(path.resolve(cwd, 'src/main.ts'));
-  });
-
-  it('returns absolute paths unchanged', () => {
-    const absolutePath = '/absolute/path/to/file.ts';
-    const result = resolvePath('/some/base', absolutePath);
-    expect(result).toBe(absolutePath);
-  });
-
-  it('expands tilde to home directory', () => {
-    const homeDir = os.homedir();
-    const result = resolvePath(undefined, '~');
-    expect(result).toBe(homeDir);
-  });
-
-  it('expands tilde-prefixed paths to home directory', () => {
-    const homeDir = os.homedir();
-    const result = resolvePath(undefined, '~/documents/file.txt');
-    expect(result).toBe(path.join(homeDir, 'documents/file.txt'));
-  });
-
-  it('uses baseDir when provided for relative paths', () => {
-    const baseDir = '/custom/base';
-    const result = resolvePath(baseDir, './relative/path');
-    expect(result).toBe(path.resolve(baseDir, './relative/path'));
-  });
-
-  it('handles tilde expansion regardless of baseDir', () => {
-    const homeDir = os.homedir();
-    const result = resolvePath('/some/base', '~/file.txt');
-    expect(result).toBe(path.join(homeDir, 'file.txt'));
-  });
-
-  it('handles dot paths correctly', () => {
-    const result = resolvePath('/base/dir', '.');
-    expect(result).toBe(path.resolve('/base/dir', '.'));
-  });
-
-  it('handles parent directory references', () => {
-    const result = resolvePath('/base/dir/subdir', '..');
-    expect(result).toBe(path.resolve('/base/dir/subdir', '..'));
-  });
-});
-
-describe('validatePath', () => {
-  let workspaceRoot: string;
-  let config: Config;
-
-  beforeAll(() => {
-    workspaceRoot = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'validate-path-test-'),
-    );
-    fs.mkdirSync(path.join(workspaceRoot, 'subdir'));
-    config = createConfigStub({
-      targetDir: workspaceRoot,
-      allowedDirectories: [workspaceRoot],
-    });
-  });
-
-  afterAll(() => {
-    fs.rmSync(workspaceRoot, { recursive: true, force: true });
-  });
-
-  it('validates paths within workspace boundaries', () => {
-    const validPath = path.join(workspaceRoot, 'subdir');
-    expect(() => validatePath(config, validPath)).not.toThrow();
-  });
-
-  it('throws when path is outside workspace boundaries', () => {
-    const outsidePath = path.join(os.tmpdir(), 'outside');
-    expect(() => validatePath(config, outsidePath)).toThrowError(
-      /Path is not within workspace/,
-    );
-  });
-
-  it('throws when path does not exist', () => {
-    const nonExistentPath = path.join(workspaceRoot, 'nonexistent');
-    expect(() => validatePath(config, nonExistentPath)).toThrowError(
-      /Path does not exist:/,
-    );
-  });
-
-  it('throws when path is a file, not a directory (default behavior)', () => {
-    const filePath = path.join(workspaceRoot, 'test-file.txt');
-    fs.writeFileSync(filePath, 'content');
-    try {
-      expect(() => validatePath(config, filePath)).toThrowError(
-        /Path is not a directory/,
-      );
-    } finally {
-      fs.rmSync(filePath);
-    }
-  });
-
-  it('allows files when allowFiles option is true', () => {
-    const filePath = path.join(workspaceRoot, 'test-file.txt');
-    fs.writeFileSync(filePath, 'content');
-    try {
-      expect(() =>
-        validatePath(config, filePath, { allowFiles: true }),
-      ).not.toThrow();
-    } finally {
-      fs.rmSync(filePath);
-    }
-  });
-
-  it('validates paths at workspace root', () => {
-    expect(() => validatePath(config, workspaceRoot)).not.toThrow();
-  });
-
-  it('validates paths in allowed directories', () => {
-    const extraDir = fs.mkdtempSync(path.join(os.tmpdir(), 'validate-extra-'));
-    try {
-      const configWithExtra = createConfigStub({
-        targetDir: workspaceRoot,
-        allowedDirectories: [workspaceRoot, extraDir],
-      });
-      expect(() => validatePath(configWithExtra, extraDir)).not.toThrow();
-    } finally {
-      fs.rmSync(extraDir, { recursive: true, force: true });
-    }
-  });
-});
-
-describe('resolveAndValidatePath', () => {
-  let workspaceRoot: string;
-  let config: Config;
-
-  beforeAll(() => {
-    workspaceRoot = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'resolve-and-validate-'),
-    );
-    fs.mkdirSync(path.join(workspaceRoot, 'subdir'));
-    config = createConfigStub({
-      targetDir: workspaceRoot,
-      allowedDirectories: [workspaceRoot],
-    });
-  });
-
-  afterAll(() => {
-    fs.rmSync(workspaceRoot, { recursive: true, force: true });
-  });
-
-  it('returns the target directory when no path is provided', () => {
-    expect(resolveAndValidatePath(config)).toBe(workspaceRoot);
-  });
-
-  it('resolves relative paths within the workspace', () => {
-    const expected = path.join(workspaceRoot, 'subdir');
-    expect(resolveAndValidatePath(config, 'subdir')).toBe(expected);
-  });
-
-  it('allows absolute paths that are permitted by the workspace context', () => {
-    const extraDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'resolve-and-validate-extra-'),
-    );
-    try {
-      const configWithExtra = createConfigStub({
-        targetDir: workspaceRoot,
-        allowedDirectories: [workspaceRoot, extraDir],
-      });
-      expect(resolveAndValidatePath(configWithExtra, extraDir)).toBe(extraDir);
-    } finally {
-      fs.rmSync(extraDir, { recursive: true, force: true });
-    }
-  });
-
-  it('expands tilde-prefixed paths using the home directory', () => {
-    const fakeHome = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'resolve-and-validate-home-'),
-    );
-    const homeSubdir = path.join(fakeHome, 'project');
-    fs.mkdirSync(homeSubdir);
-
-    const homedirSpy = vi.spyOn(os, 'homedir').mockReturnValue(fakeHome);
-    try {
-      const configWithHome = createConfigStub({
-        targetDir: workspaceRoot,
-        allowedDirectories: [workspaceRoot, fakeHome],
-      });
-      expect(resolveAndValidatePath(configWithHome, '~/project')).toBe(
-        homeSubdir,
-      );
-      expect(resolveAndValidatePath(configWithHome, '~')).toBe(fakeHome);
-    } finally {
-      homedirSpy.mockRestore();
-      fs.rmSync(fakeHome, { recursive: true, force: true });
-    }
-  });
-
-  it('throws when the path resolves outside of the workspace', () => {
-    expect(() => resolveAndValidatePath(config, '../outside')).toThrowError(
-      /Path is not within workspace/,
-    );
-  });
-
-  it('throws when the path does not exist', () => {
-    expect(() => resolveAndValidatePath(config, 'missing')).toThrowError(
-      /Path does not exist:/,
-    );
-  });
-
-  it('throws when the path points to a file (default behavior)', () => {
-    const filePath = path.join(workspaceRoot, 'file.txt');
-    fs.writeFileSync(filePath, 'content');
-    try {
-      expect(() => resolveAndValidatePath(config, 'file.txt')).toThrowError(
-        `Path is not a directory: ${filePath}`,
-      );
-    } finally {
-      fs.rmSync(filePath);
-    }
-  });
-
-  it('allows file paths when allowFiles option is true', () => {
-    const filePath = path.join(workspaceRoot, 'file.txt');
-    fs.writeFileSync(filePath, 'content');
-    try {
-      const result = resolveAndValidatePath(config, 'file.txt', {
-        allowFiles: true,
-      });
-      expect(result).toBe(filePath);
-    } finally {
-      fs.rmSync(filePath);
-    }
-  });
-});
--- a/packages/core/src/utils/paths.ts
+++ b/packages/core/src/utils/paths.ts
@@ -4,12 +4,9 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import * as crypto from 'node:crypto';
-import type { Config } from '../config/config.js';
-import { isNodeError } from './errors.js';

 export const QWEN_DIR = '.qwen';
 export const GOOGLE_ACCOUNTS_FILENAME = 'google_accounts.json';
@@ -194,93 +191,3 @@ export function isSubpath(parentPath: string, childPath: string): boolean {
    !pathModule.isAbsolute(relative)
  );
 }
-
-/**
- * Resolves a path with tilde (~) expansion and relative path resolution.
- * Handles tilde expansion for home directory and resolves relative paths
- * against the provided base directory or current working directory.
- *
- * @param baseDir The base directory to resolve relative paths against (defaults to current working directory)
- * @param relativePath The path to resolve (can be relative, absolute, or tilde-prefixed)
- * @returns The resolved absolute path
- */
-export function resolvePath(
-  baseDir: string | undefined = process.cwd(),
-  relativePath: string,
-): string {
-  const homeDir = os.homedir();
-
-  if (relativePath === '~') {
-    return homeDir;
-  } else if (relativePath.startsWith('~/')) {
-    return path.join(homeDir, relativePath.slice(2));
-  } else if (path.isAbsolute(relativePath)) {
-    return relativePath;
-  } else {
-    return path.resolve(baseDir, relativePath);
-  }
-}
-
-export interface PathValidationOptions {
-  /**
-   * If true, allows both files and directories. If false (default), only allows directories.
-   */
-  allowFiles?: boolean;
-}
-
-/**
- * Validates that a resolved path exists within the workspace boundaries.
- *
- * @param config The configuration object containing workspace context
- * @param resolvedPath The absolute path to validate
- * @param options Validation options
- * @throws Error if the path is outside workspace boundaries, doesn't exist, or is not a directory (when allowFiles is false)
- */
-export function validatePath(
-  config: Config,
-  resolvedPath: string,
-  options: PathValidationOptions = {},
-): void {
-  const { allowFiles = false } = options;
-  const workspaceContext = config.getWorkspaceContext();
-
-  if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
-    throw new Error('Path is not within workspace');
-  }
-
-  try {
-    const stats = fs.statSync(resolvedPath);
-    if (!allowFiles && !stats.isDirectory()) {
-      throw new Error(`Path is not a directory: ${resolvedPath}`);
-    }
-  } catch (error: unknown) {
-    if (isNodeError(error) && error.code === 'ENOENT') {
-      throw new Error(`Path does not exist: ${resolvedPath}`);
-    }
-    throw error;
-  }
-}
-
-/**
- * Resolves a path relative to the workspace root and verifies that it exists
- * within the workspace boundaries defined in the config.
- *
- * @param config The configuration object
- * @param relativePath The relative path to resolve (optional, defaults to target directory)
- * @param options Validation options (e.g., allowFiles to permit file paths)
- */
-export function resolveAndValidatePath(
-  config: Config,
-  relativePath?: string,
-  options: PathValidationOptions = {},
-): string {
-  const targetDir = config.getTargetDir();
-
-  if (!relativePath) {
-    return targetDir;
-  }
-
-  const resolvedPath = resolvePath(targetDir, relativePath);
-  validatePath(config, resolvedPath, options);
-  return resolvedPath;
-}
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code-test-utils",
-  "version": "0.1.5",
+  "version": "0.1.4",
  "private": true,
  "main": "src/index.ts",
  "license": "Apache-2.0",
--- a/packages/vscode-ide-companion/package.json
+++ b/packages/vscode-ide-companion/package.json
@@ -2,7 +2,7 @@
  "name": "qwen-code-vscode-ide-companion",
  "displayName": "Qwen Code Companion",
  "description": "Enable Qwen Code with direct access to your VS Code workspace.",
-  "version": "0.1.5",
+  "version": "0.1.4",
  "publisher": "qwenlm",
  "icon": "assets/icon.png",
  "repository": {