fix a link in skills.md

fix flaky tests
add docs
2025-12-31 14:09:15 +00:00 · 2025-12-23 15:09:23 +08:00 · 2025-12-23 14:50:47 +08:00 · 2025-12-23 10:53:09 +08:00 · 2025-12-23 10:24:57 +08:00 · 2025-12-22 16:00:57 +08:00
45 changed files with 2728 additions and 747 deletions
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -18,8 +18,6 @@ jobs:
          - 'sandbox:docker'
        node-version:
          - '20.x'
-          - '22.x'
-          - '24.x'
    steps:
      - name: 'Checkout'
        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
@@ -67,10 +65,13 @@ jobs:
          OPENAI_BASE_URL: '${{ secrets.OPENAI_BASE_URL }}'
          OPENAI_MODEL: '${{ secrets.OPENAI_MODEL }}'
          KEEP_OUTPUT: 'true'
-          SANDBOX: '${{ matrix.sandbox }}'
          VERBOSE: 'true'
        run: |-
-          npm run "test:integration:${SANDBOX}"
+          if [[ "${{ matrix.sandbox }}" == "sandbox:docker" ]]; then
+            npm run test:integration:sandbox:docker
+          else
+            npm run test:integration:sandbox:none
+          fi

  e2e-test-macos:
    name: 'E2E Test - macOS'
--- a/docs/users/configuration/settings.md
+++ b/docs/users/configuration/settings.md
@@ -43,6 +43,7 @@ Qwen Code uses JSON settings files for persistent configuration. There are four
 In addition to a project settings file, a project's `.qwen` directory can contain other project-specific files related to Qwen Code's operation, such as:

 - [Custom sandbox profiles](../features/sandbox) (e.g. `.qwen/sandbox-macos-custom.sb`, `.qwen/sandbox.Dockerfile`).
+- [Agent Skills](../features/skills) (experimental) under `.qwen/skills/` (each Skill is a directory containing a `SKILL.md`).

 ### Available settings in `settings.json`

@@ -380,6 +381,8 @@ Arguments passed directly when running the CLI can override other configurations
 | `--telemetry-otlp-protocol`  |       | Sets the OTLP protocol for telemetry (`grpc` or `http`).                                                                                                                                |                                        | Defaults to `grpc`. See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `--telemetry-log-prompts`    |       | Enables logging of prompts for telemetry.                                                                                                                                               |                                        | See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `--checkpointing`            |       | Enables [checkpointing](../features/checkpointing).                                                                                                                                     |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| `--experimental-acp`         |       | Enables ACP mode (Agent Control Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed).                                                                           |                                        | Experimental.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| `--experimental-skills`      |       | Enables experimental [Agent Skills](../features/skills) (registers the `skill` tool and loads Skills from `.qwen/skills/` and `~/.qwen/skills/`).                                       |                                        | Experimental.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `--extensions`               | `-e`  | Specifies a list of extensions to use for the session.                                                                                                                                  | Extension names                        | If not provided, all available extensions are used. Use the special term `qwen -e none` to disable all extensions. Example: `qwen -e my-extension -e my-other-extension`                                                                                                                                                                                                                                                                                                                                                                                        |
 | `--list-extensions`          | `-l`  | Lists all available extensions and exits.                                                                                                                                               |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | `--proxy`                    |       | Sets the proxy for the CLI.                                                                                                                                                             | Proxy URL                              | Example: `--proxy http://localhost:7890`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
--- a/docs/users/features/_meta.ts
+++ b/docs/users/features/_meta.ts
@@ -1,6 +1,7 @@
 export default {
  commands: 'Commands',
  'sub-agents': 'SubAgents',
+  skills: 'Skills (Experimental)',
  headless: 'Headless Mode',
  checkpointing: {
    display: 'hidden',
--- a/docs/users/features/headless.md
+++ b/docs/users/features/headless.md
@@ -189,19 +189,20 @@ qwen -p "Write code" --output-format stream-json --include-partial-messages | jq

 Key command-line options for headless usage:

-| Option                       | Description                                         | Example                                                                  |
-| ---------------------------- | --------------------------------------------------- | ------------------------------------------------------------------------ |
-| `--prompt`, `-p`             | Run in headless mode                                | `qwen -p "query"`                                                        |
-| `--output-format`, `-o`      | Specify output format (text, json, stream-json)     | `qwen -p "query" --output-format json`                                   |
-| `--input-format`             | Specify input format (text, stream-json)            | `qwen --input-format text --output-format stream-json`                   |
-| `--include-partial-messages` | Include partial messages in stream-json output      | `qwen -p "query" --output-format stream-json --include-partial-messages` |
-| `--debug`, `-d`              | Enable debug mode                                   | `qwen -p "query" --debug`                                                |
-| `--all-files`, `-a`          | Include all files in context                        | `qwen -p "query" --all-files`                                            |
-| `--include-directories`      | Include additional directories                      | `qwen -p "query" --include-directories src,docs`                         |
-| `--yolo`, `-y`               | Auto-approve all actions                            | `qwen -p "query" --yolo`                                                 |
-| `--approval-mode`            | Set approval mode                                   | `qwen -p "query" --approval-mode auto_edit`                              |
-| `--continue`                 | Resume the most recent session for this project     | `qwen --continue -p "Pick up where we left off"`                         |
-| `--resume [sessionId]`       | Resume a specific session (or choose interactively) | `qwen --resume 123e... -p "Finish the refactor"`                         |
+| Option                       | Description                                             | Example                                                                  |
+| ---------------------------- | ------------------------------------------------------- | ------------------------------------------------------------------------ |
+| `--prompt`, `-p`             | Run in headless mode                                    | `qwen -p "query"`                                                        |
+| `--output-format`, `-o`      | Specify output format (text, json, stream-json)         | `qwen -p "query" --output-format json`                                   |
+| `--input-format`             | Specify input format (text, stream-json)                | `qwen --input-format text --output-format stream-json`                   |
+| `--include-partial-messages` | Include partial messages in stream-json output          | `qwen -p "query" --output-format stream-json --include-partial-messages` |
+| `--debug`, `-d`              | Enable debug mode                                       | `qwen -p "query" --debug`                                                |
+| `--all-files`, `-a`          | Include all files in context                            | `qwen -p "query" --all-files`                                            |
+| `--include-directories`      | Include additional directories                          | `qwen -p "query" --include-directories src,docs`                         |
+| `--yolo`, `-y`               | Auto-approve all actions                                | `qwen -p "query" --yolo`                                                 |
+| `--approval-mode`            | Set approval mode                                       | `qwen -p "query" --approval-mode auto_edit`                              |
+| `--continue`                 | Resume the most recent session for this project         | `qwen --continue -p "Pick up where we left off"`                         |
+| `--resume [sessionId]`       | Resume a specific session (or choose interactively)     | `qwen --resume 123e... -p "Finish the refactor"`                         |
+| `--experimental-skills`      | Enable experimental Skills (registers the `skill` tool) | `qwen --experimental-skills -p "What Skills are available?"`             |

 For complete details on all available configuration options, settings files, and environment variables, see the [Configuration Guide](../configuration/settings).

--- a/docs/users/features/skills.md
+++ b/docs/users/features/skills.md
@@ -0,0 +1,282 @@
+# Agent Skills (Experimental)
+
+> Create, manage, and share Skills to extend Qwen Code’s capabilities.
+
+This guide shows you how to create, use, and manage Agent Skills in **Qwen Code**. Skills are modular capabilities that extend the model’s effectiveness through organized folders containing instructions (and optionally scripts/resources).
+
+> [!note]
+>
+> Skills are currently **experimental** and must be enabled with `--experimental-skills`.
+
+## Prerequisites
+
+- Qwen Code (recent version)
+- Run with the experimental flag enabled:
+
+```bash
+qwen --experimental-skills
+```
+
+- Basic familiarity with Qwen Code ([Quickstart](../quickstart.md))
+
+## What are Agent Skills?
+
+Agent Skills package expertise into discoverable capabilities. Each Skill consists of a `SKILL.md` file with instructions that the model can load when relevant, plus optional supporting files like scripts and templates.
+
+### How Skills are invoked
+
+Skills are **model-invoked** — the model autonomously decides when to use them based on your request and the Skill’s description. This is different from slash commands, which are **user-invoked** (you explicitly type `/command`).
+
+### Benefits
+
+- Extend Qwen Code for your workflows
+- Share expertise across your team via git
+- Reduce repetitive prompting
+- Compose multiple Skills for complex tasks
+
+## Create a Skill
+
+Skills are stored as directories containing a `SKILL.md` file.
+
+### Personal Skills
+
+Personal Skills are available across all your projects. Store them in `~/.qwen/skills/`:
+
+```bash
+mkdir -p ~/.qwen/skills/my-skill-name
+```
+
+Use personal Skills for:
+
+- Your individual workflows and preferences
+- Experimental Skills you’re developing
+- Personal productivity helpers
+
+### Project Skills
+
+Project Skills are shared with your team. Store them in `.qwen/skills/` within your project:
+
+```bash
+mkdir -p .qwen/skills/my-skill-name
+```
+
+Use project Skills for:
+
+- Team workflows and conventions
+- Project-specific expertise
+- Shared utilities and scripts
+
+Project Skills can be checked into git and automatically become available to teammates.
+
+## Write `SKILL.md`
+
+Create a `SKILL.md` file with YAML frontmatter and Markdown content:
+
+```yaml
+---
+name: your-skill-name
+description: Brief description of what this Skill does and when to use it
+---
+
+# Your Skill Name
+
+## Instructions
+Provide clear, step-by-step guidance for Qwen Code.
+
+## Examples
+Show concrete examples of using this Skill.
+```
+
+### Field requirements
+
+Qwen Code currently validates that:
+
+- `name` is a non-empty string
+- `description` is a non-empty string
+
+Recommended conventions (not strictly enforced yet):
+
+- Use lowercase letters, numbers, and hyphens in `name`
+- Make `description` specific: include both **what** the Skill does and **when** to use it (key words users will naturally mention)
+
+## Add supporting files
+
+Create additional files alongside `SKILL.md`:
+
+```text
+my-skill/
+├── SKILL.md (required)
+├── reference.md (optional documentation)
+├── examples.md (optional examples)
+├── scripts/
+│   └── helper.py (optional utility)
+└── templates/
+    └── template.txt (optional template)
+```
+
+Reference these files from `SKILL.md`:
+
+````markdown
+For advanced usage, see [reference.md](reference.md).
+
+Run the helper script:
+
+```bash
+python scripts/helper.py input.txt
+```
+````
+
+## View available Skills
+
+When `--experimental-skills` is enabled, Qwen Code discovers Skills from:
+
+- Personal Skills: `~/.qwen/skills/`
+- Project Skills: `.qwen/skills/`
+
+To view available Skills, ask Qwen Code directly:
+
+```text
+What Skills are available?
+```
+
+Or inspect the filesystem:
+
+```bash
+# List personal Skills
+ls ~/.qwen/skills/
+
+# List project Skills (if in a project directory)
+ls .qwen/skills/
+
+# View a specific Skill’s content
+cat ~/.qwen/skills/my-skill/SKILL.md
+```
+
+## Test a Skill
+
+After creating a Skill, test it by asking questions that match your description.
+
+Example: if your description mentions “PDF files”:
+
+```text
+Can you help me extract text from this PDF?
+```
+
+The model autonomously decides to use your Skill if it matches the request — you don’t need to explicitly invoke it.
+
+## Debug a Skill
+
+If Qwen Code doesn’t use your Skill, check these common issues:
+
+### Make the description specific
+
+Too vague:
+
+```yaml
+description: Helps with documents
+```
+
+Specific:
+
+```yaml
+description: Extract text and tables from PDF files, fill forms, merge documents. Use when working with PDFs, forms, or document extraction.
+```
+
+### Verify file path
+
+- Personal Skills: `~/.qwen/skills/<skill-name>/SKILL.md`
+- Project Skills: `.qwen/skills/<skill-name>/SKILL.md`
+
+```bash
+# Personal
+ls ~/.qwen/skills/my-skill/SKILL.md
+
+# Project
+ls .qwen/skills/my-skill/SKILL.md
+```
+
+### Check YAML syntax
+
+Invalid YAML prevents the Skill metadata from loading correctly.
+
+```bash
+cat SKILL.md | head -n 15
+```
+
+Ensure:
+
+- Opening `---` on line 1
+- Closing `---` before Markdown content
+- Valid YAML syntax (no tabs, correct indentation)
+
+### View errors
+
+Run Qwen Code with debug mode to see Skill loading errors:
+
+```bash
+qwen --experimental-skills --debug
+```
+
+## Share Skills with your team
+
+You can share Skills through project repositories:
+
+1. Add the Skill under `.qwen/skills/`
+2. Commit and push
+3. Teammates pull the changes and run with `--experimental-skills`
+
+```bash
+git add .qwen/skills/
+git commit -m "Add team Skill for PDF processing"
+git push
+```
+
+## Update a Skill
+
+Edit `SKILL.md` directly:
+
+```bash
+# Personal Skill
+code ~/.qwen/skills/my-skill/SKILL.md
+
+# Project Skill
+code .qwen/skills/my-skill/SKILL.md
+```
+
+Changes take effect the next time you start Qwen Code. If Qwen Code is already running, restart it to load the updates.
+
+## Remove a Skill
+
+Delete the Skill directory:
+
+```bash
+# Personal
+rm -rf ~/.qwen/skills/my-skill
+
+# Project
+rm -rf .qwen/skills/my-skill
+git commit -m "Remove unused Skill"
+```
+
+## Best practices
+
+### Keep Skills focused
+
+One Skill should address one capability:
+
+- Focused: “PDF form filling”, “Excel analysis”, “Git commit messages”
+- Too broad: “Document processing” (split into smaller Skills)
+
+### Write clear descriptions
+
+Help the model discover when to use Skills by including specific triggers:
+
+```yaml
+description: Analyze Excel spreadsheets, create pivot tables, and generate charts. Use when working with Excel files, spreadsheets, or .xlsx data.
+```
+
+### Test with your team
+
+- Does the Skill activate when expected?
+- Are the instructions clear?
+- Are there missing examples or edge cases?
--- a/docs/users/ide-integration/ide-companion-spec.md
+++ b/docs/users/ide-integration/ide-companion-spec.md
@@ -16,16 +16,15 @@ The plugin **MUST** run a local HTTP server that implements the **Model Context
 - **Endpoint:** The server should expose a single endpoint (e.g., `/mcp`) for all MCP communication.
 - **Port:** The server **MUST** listen on a dynamically assigned port (i.e., listen on port `0`).

-### 2. Discovery Mechanism: The Port File
+### 2. Discovery Mechanism: The Lock File

-For Qwen Code to connect, it needs to discover which IDE instance it's running in and what port your server is using. The plugin **MUST** facilitate this by creating a "discovery file."
+For Qwen Code to connect, it needs to discover what port your server is using. The plugin **MUST** facilitate this by creating a "lock file" and setting the port environment variable.

- **How the CLI Finds the File:** The CLI determines the Process ID (PID) of the IDE it's running in by traversing the process tree. It then looks for a discovery file that contains this PID in its name.
- **File Location:** The file must be created in a specific directory: `os.tmpdir()/qwen/ide/`. Your plugin must create this directory if it doesn't exist.
+- **How the CLI Finds the File:** The CLI reads the port from `QWEN_CODE_IDE_SERVER_PORT`, then reads `~/.qwen/ide/<PORT>.lock`. (Legacy fallbacks exist for older extensions; see note below.)
+- **File Location:** The file must be created in a specific directory: `~/.qwen/ide/`. Your plugin must create this directory if it doesn't exist.
 - **File Naming Convention:** The filename is critical and **MUST** follow the pattern:
-  `qwen-code-ide-server-${PID}-${PORT}.json`
-  - `${PID}`: The process ID of the parent IDE process. Your plugin must determine this PID and include it in the filename.
-  - `${PORT}`: The port your MCP server is listening on.
+  `<PORT>.lock`
+  - `<PORT>`: The port your MCP server is listening on.
 - **File Content & Workspace Validation:** The file **MUST** contain a JSON object with the following structure:

  ```json
@@ -33,21 +32,20 @@ For Qwen Code to connect, it needs to discover which IDE instance it's running i
    "port": 12345,
    "workspacePath": "/path/to/project1:/path/to/project2",
    "authToken": "a-very-secret-token",
-    "ideInfo": {
-      "name": "vscode",
-      "displayName": "VS Code"
-    }
+    "ppid": 1234,
+    "ideName": "VS Code"
  }
  ```
  - `port` (number, required): The port of the MCP server.
  - `workspacePath` (string, required): A list of all open workspace root paths, delimited by the OS-specific path separator (`:` for Linux/macOS, `;` for Windows). The CLI uses this path to ensure it's running in the same project folder that's open in the IDE. If the CLI's current working directory is not a sub-directory of `workspacePath`, the connection will be rejected. Your plugin **MUST** provide the correct, absolute path(s) to the root of the open workspace(s).
  - `authToken` (string, required): A secret token for securing the connection. The CLI will include this token in an `Authorization: Bearer <token>` header on all requests.
-  - `ideInfo` (object, required): Information about the IDE.
-    - `name` (string, required): A short, lowercase identifier for the IDE (e.g., `vscode`, `jetbrains`).
-    - `displayName` (string, required): A user-friendly name for the IDE (e.g., `VS Code`, `JetBrains IDE`).
+  - `ppid` (number, required): The parent process ID of the IDE process.
+  - `ideName` (string, required): A user-friendly name for the IDE (e.g., `VS Code`, `JetBrains IDE`).

 - **Authentication:** To secure the connection, the plugin **MUST** generate a unique, secret token and include it in the discovery file. The CLI will then include this token in the `Authorization` header for all requests to the MCP server (e.g., `Authorization: Bearer a-very-secret-token`). Your server **MUST** validate this token on every request and reject any that are unauthorized.
- **Tie-Breaking with Environment Variables (Recommended):** For the most reliable experience, your plugin **SHOULD** both create the discovery file and set the `QWEN_CODE_IDE_SERVER_PORT` environment variable in the integrated terminal. The file serves as the primary discovery mechanism, but the environment variable is crucial for tie-breaking. If a user has multiple IDE windows open for the same workspace, the CLI uses the `QWEN_CODE_IDE_SERVER_PORT` variable to identify and connect to the correct window's server.
+- **Environment Variables (Required):** Your plugin **MUST** set `QWEN_CODE_IDE_SERVER_PORT` in the integrated terminal so the CLI can locate the correct `<PORT>.lock` file.
+
+**Legacy note:** For extensions older than v0.5.1, Qwen Code may fall back to reading JSON files in the system temp directory named `qwen-code-ide-server-<PID>.json` or `qwen-code-ide-server-<PORT>.json`. New integrations should not rely on these legacy files.

 ## II. The Context Interface

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.5.1",
+  "version": "0.6.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@qwen-code/qwen-code",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "workspaces": [
        "packages/*"
      ],
@@ -568,7 +568,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=18"
      },
@@ -592,7 +591,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=18"
      }
@@ -2157,7 +2155,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"
      }
@@ -3671,7 +3668,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",
@@ -4142,7 +4138,6 @@
      "integrity": "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "csstype": "^3.0.2"
      }
@@ -4153,7 +4148,6 @@
      "integrity": "sha512-4hOiT/dwO8Ko0gV1m/TJZYk3y0KBnY9vzDh7W+DH17b2HFSOGgdj33dhihPeuy3l0q23+4e+hoXHV6hCC4dCXw==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "peerDependencies": {
        "@types/react": "^19.0.0"
      }
@@ -4359,7 +4353,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",
@@ -5135,7 +5128,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"
      },
@@ -5530,7 +5522,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",
@@ -6865,6 +6858,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"
      },
@@ -7982,7 +7976,6 @@
      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -8518,6 +8511,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",
@@ -8579,6 +8573,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"
      }
@@ -8588,6 +8583,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"
      }
@@ -8597,6 +8593,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"
      }
@@ -8763,6 +8760,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",
@@ -8781,6 +8779,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"
      }
@@ -8789,13 +8788,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"
      }
@@ -9909,7 +9910,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",
@@ -11864,6 +11864,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"
      }
@@ -13162,7 +13163,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",
@@ -13821,7 +13823,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"
      }
@@ -13832,7 +13833,6 @@
      "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==",
      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "shell-quote": "^1.6.1",
        "ws": "^7"
@@ -13866,7 +13866,6 @@
      "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "scheduler": "^0.26.0"
      },
@@ -15932,7 +15931,6 @@
      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -16112,8 +16110,7 @@
      "version": "2.8.1",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD",
-      "peer": true
+      "license": "0BSD"
    },
    "node_modules/tsx": {
      "version": "4.20.3",
@@ -16121,7 +16118,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"
@@ -16316,7 +16312,6 @@
      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
      "dev": true,
      "license": "Apache-2.0",
-      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -16391,6 +16386,7 @@
      "version": "7.15.0",
      "resolved": "https://registry.npmjs.org/undici/-/undici-7.15.0.tgz",
      "integrity": "sha512-7oZJCPvvMvTd0OlqWsIxTuItTpJBpU1tcbVl24FMn3xt3+VSunwUasmfPJRE57oNO1KsZ4PgA1xTdAX4hq8NyQ==",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=20.18.1"
@@ -16623,6 +16619,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"
      }
@@ -16678,7 +16675,6 @@
      "integrity": "sha512-ixXJB1YRgDIw2OszKQS9WxGHKwLdCsbQNkpJN171udl6szi/rIySHL6/Os3s2+oE4P/FLD4dxg4mD7Wust+u5g==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.4.6",
@@ -16792,7 +16788,6 @@
      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -16806,7 +16801,6 @@
      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@types/chai": "^5.2.2",
        "@vitest/expect": "3.2.4",
@@ -17485,7 +17479,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"
      }
@@ -17501,7 +17494,7 @@
    },
    "packages/cli": {
      "name": "@qwen-code/qwen-code",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dependencies": {
        "@google/genai": "1.16.0",
        "@iarna/toml": "^2.2.5",
@@ -17532,7 +17525,7 @@
        "strip-ansi": "^7.1.0",
        "strip-json-comments": "^3.1.1",
        "tar": "^7.5.2",
-        "undici": "^7.10.0",
+        "undici": "^6.22.0",
        "update-notifier": "^7.3.1",
        "wrap-ansi": "9.0.2",
        "yargs": "^17.7.2",
@@ -17614,9 +17607,18 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "packages/cli/node_modules/undici": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.22.0.tgz",
+      "integrity": "sha512-hU/10obOIu62MGYjdskASR3CUAiYaFTtC9Pa6vHyf//mAipSvSQg6od2CnJswq7fvzNS3zJhxoRkgNVaHurWKw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.17"
+      }
+    },
    "packages/core": {
      "name": "@qwen-code/qwen-code-core",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "hasInstallScript": true,
      "dependencies": {
        "@google/genai": "1.16.0",
@@ -17659,7 +17661,7 @@
        "simple-git": "^3.28.0",
        "strip-ansi": "^7.1.0",
        "tiktoken": "^1.0.21",
-        "undici": "^7.10.0",
+        "undici": "^6.22.0",
        "uuid": "^9.0.1",
        "ws": "^8.18.0"
      },
@@ -17747,7 +17749,6 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -17755,12 +17756,22 @@
        "url": "https://github.com/sponsors/jonschlinkert"
      }
    },
+    "packages/core/node_modules/undici": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.22.0.tgz",
+      "integrity": "sha512-hU/10obOIu62MGYjdskASR3CUAiYaFTtC9Pa6vHyf//mAipSvSQg6od2CnJswq7fvzNS3zJhxoRkgNVaHurWKw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.17"
+      }
+    },
    "packages/sdk-typescript": {
      "name": "@qwen-code/sdk",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "license": "Apache-2.0",
      "dependencies": {
-        "@modelcontextprotocol/sdk": "^1.0.4"
+        "@modelcontextprotocol/sdk": "^1.0.4",
+        "tiktoken": "^1.0.21"
      },
      "devDependencies": {
        "@types/node": "^20.14.0",
@@ -20186,7 +20197,7 @@
    },
    "packages/test-utils": {
      "name": "@qwen-code/qwen-code-test-utils",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "dev": true,
      "license": "Apache-2.0",
      "devDependencies": {
@@ -20198,7 +20209,7 @@
    },
    "packages/vscode-ide-companion": {
      "name": "qwen-code-vscode-ide-companion",
-      "version": "0.5.1",
+      "version": "0.6.0",
      "license": "LICENSE",
      "dependencies": {
        "@modelcontextprotocol/sdk": "^1.15.1",
@@ -20218,7 +20229,7 @@
        "@types/react": "^19.1.8",
        "@types/react-dom": "^19.1.6",
        "@types/semver": "^7.7.1",
-        "@types/vscode": "^1.99.0",
+        "@types/vscode": "^1.85.0",
        "@typescript-eslint/eslint-plugin": "^8.31.1",
        "@typescript-eslint/parser": "^8.31.1",
        "@vscode/vsce": "^3.6.0",
@@ -20233,7 +20244,7 @@
        "vitest": "^3.2.4"
      },
      "engines": {
-        "vscode": "^1.99.0"
+        "vscode": "^1.85.0"
      }
    },
    "packages/vscode-ide-companion/node_modules/@types/react": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.5.1",
+  "version": "0.6.0",
  "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.5.1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0"
  },
  "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.5.1",
+  "version": "0.6.0",
  "description": "Qwen Code",
  "repository": {
    "type": "git",
@@ -33,7 +33,7 @@
    "dist"
  ],
  "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.5.1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0"
  },
  "dependencies": {
    "@google/genai": "1.16.0",
@@ -64,7 +64,7 @@
    "strip-ansi": "^7.1.0",
    "strip-json-comments": "^3.1.1",
    "tar": "^7.5.2",
-    "undici": "^7.10.0",
+    "undici": "^6.22.0",
    "extract-zip": "^2.0.1",
    "update-notifier": "^7.3.1",
    "wrap-ansi": "9.0.2",
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -112,6 +112,7 @@ export interface CliArgs {
  allowedMcpServerNames: string[] | undefined;
  allowedTools: string[] | undefined;
  experimentalAcp: boolean | undefined;
+  experimentalSkills: boolean | undefined;
  extensions: string[] | undefined;
  listExtensions: boolean | undefined;
  openaiLogging: boolean | undefined;
@@ -307,6 +308,11 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
          type: 'boolean',
          description: 'Starts the agent in ACP mode',
        })
+        .option('experimental-skills', {
+          type: 'boolean',
+          description: 'Enable experimental Skills feature',
+          default: false,
+        })
        .option('channel', {
          type: 'string',
          choices: ['VSCode', 'ACP', 'SDK', 'CI'],
@@ -951,6 +957,7 @@ export async function loadCliConfig(
    maxSessionTurns:
      argv.maxSessionTurns ?? settings.model?.maxSessionTurns ?? -1,
    experimentalZedIntegration: argv.experimentalAcp || false,
+    experimentalSkills: argv.experimentalSkills || false,
    listExtensions: argv.listExtensions || false,
    extensions: allExtensions,
    blockedMcpServers,
--- a/packages/cli/src/config/extension.test.ts
+++ b/packages/cli/src/config/extension.test.ts
@@ -56,6 +56,17 @@ vi.mock('simple-git', () => ({
  }),
 }));

+vi.mock('./extensions/github.js', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('./extensions/github.js')>();
+  return {
+    ...actual,
+    downloadFromGitHubRelease: vi
+      .fn()
+      .mockRejectedValue(new Error('Mocked GitHub release download failure')),
+  };
+});
+
 vi.mock('os', async (importOriginal) => {
  const mockedOs = await importOriginal<typeof os>();
  return {
--- a/packages/cli/src/config/extensions/update.test.ts
+++ b/packages/cli/src/config/extensions/update.test.ts
@@ -41,6 +41,17 @@ vi.mock('simple-git', () => ({
  }),
 }));

+vi.mock('../extensions/github.js', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('../extensions/github.js')>();
+  return {
+    ...actual,
+    downloadFromGitHubRelease: vi
+      .fn()
+      .mockRejectedValue(new Error('Mocked GitHub release download failure')),
+  };
+});
+
 vi.mock('os', async (importOriginal) => {
  const mockedOs = await importOriginal<typeof os>();
  return {
--- a/packages/cli/src/gemini.test.tsx
+++ b/packages/cli/src/gemini.test.tsx
@@ -461,6 +461,7 @@ describe('gemini.tsx main function kitty protocol', () => {
      allowedMcpServerNames: undefined,
      allowedTools: undefined,
      experimentalAcp: undefined,
+      experimentalSkills: undefined,
      extensions: undefined,
      listExtensions: undefined,
      openaiLogging: undefined,
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code-core",
-  "version": "0.5.1",
+  "version": "0.6.0",
  "description": "Qwen Code Core",
  "repository": {
    "type": "git",
@@ -63,7 +63,7 @@
    "simple-git": "^3.28.0",
    "strip-ansi": "^7.1.0",
    "tiktoken": "^1.0.21",
-    "undici": "^7.10.0",
+    "undici": "^6.22.0",
    "uuid": "^9.0.1",
    "ws": "^8.18.0"
  },
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -54,6 +54,7 @@ import { canUseRipgrep } from '../utils/ripgrepUtils.js';
 import { RipGrepTool } from '../tools/ripGrep.js';
 import { ShellTool } from '../tools/shell.js';
 import { SmartEditTool } from '../tools/smart-edit.js';
+import { SkillTool } from '../tools/skill.js';
 import { TaskTool } from '../tools/task.js';
 import { TodoWriteTool } from '../tools/todoWrite.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
@@ -65,6 +66,7 @@ import { WriteFileTool } from '../tools/write-file.js';
 import { ideContextStore } from '../ide/ideContext.js';
 import { InputFormat, OutputFormat } from '../output/types.js';
 import { PromptRegistry } from '../prompts/prompt-registry.js';
+import { SkillManager } from '../skills/skill-manager.js';
 import { SubagentManager } from '../subagents/subagent-manager.js';
 import type { SubagentConfig } from '../subagents/types.js';
 import {
@@ -305,6 +307,7 @@ export interface ConfigParameters {
  extensionContextFilePaths?: string[];
  maxSessionTurns?: number;
  sessionTokenLimit?: number;
+  experimentalSkills?: boolean;
  experimentalZedIntegration?: boolean;
  listExtensions?: boolean;
  extensions?: GeminiCLIExtension[];
@@ -389,6 +392,7 @@ export class Config {
  private toolRegistry!: ToolRegistry;
  private promptRegistry!: PromptRegistry;
  private subagentManager!: SubagentManager;
+  private skillManager!: SkillManager;
  private fileSystemService: FileSystemService;
  private contentGeneratorConfig!: ContentGeneratorConfig;
  private contentGenerator!: ContentGenerator;
@@ -458,6 +462,7 @@ export class Config {
    | undefined;
  private readonly cliVersion?: string;
  private readonly experimentalZedIntegration: boolean = false;
+  private readonly experimentalSkills: boolean = false;
  private readonly chatRecordingEnabled: boolean;
  private readonly loadMemoryFromIncludeDirectories: boolean = false;
  private readonly webSearch?: {
@@ -557,6 +562,7 @@ export class Config {
    this.sessionTokenLimit = params.sessionTokenLimit ?? -1;
    this.experimentalZedIntegration =
      params.experimentalZedIntegration ?? false;
+    this.experimentalSkills = params.experimentalSkills ?? false;
    this.listExtensions = params.listExtensions ?? false;
    this._extensions = params.extensions ?? [];
    this._blockedMcpServers = params.blockedMcpServers ?? [];
@@ -644,6 +650,7 @@ export class Config {
    }
    this.promptRegistry = new PromptRegistry();
    this.subagentManager = new SubagentManager(this);
+    this.skillManager = new SkillManager(this);

    // Load session subagents if they were provided before initialization
    if (this.sessionSubagents.length > 0) {
@@ -1076,6 +1083,10 @@ export class Config {
    return this.experimentalZedIntegration;
  }

+  getExperimentalSkills(): boolean {
+    return this.experimentalSkills;
+  }
+
  getListExtensions(): boolean {
    return this.listExtensions;
  }
@@ -1306,6 +1317,10 @@ export class Config {
    return this.subagentManager;
  }

+  getSkillManager(): SkillManager {
+    return this.skillManager;
+  }
+
  async createToolRegistry(
    sendSdkMcpMessage?: SendSdkMcpMessage,
  ): Promise<ToolRegistry> {
@@ -1348,6 +1363,9 @@ export class Config {
    };

    registerCoreTool(TaskTool, this);
+    if (this.getExperimentalSkills()) {
+      registerCoreTool(SkillTool, this);
+    }
    registerCoreTool(LSTool, this);
    registerCoreTool(ReadFileTool, this);

--- a/packages/core/src/config/storage.ts
+++ b/packages/core/src/config/storage.ts
@@ -15,6 +15,7 @@ export const OAUTH_FILE = 'oauth_creds.json';
 const TMP_DIR_NAME = 'tmp';
 const BIN_DIR_NAME = 'bin';
 const PROJECT_DIR_NAME = 'projects';
+const IDE_DIR_NAME = 'ide';

 export class Storage {
  private readonly targetDir: string;
@@ -59,6 +60,10 @@ export class Storage {
    return path.join(Storage.getGlobalQwenDir(), TMP_DIR_NAME);
  }

+  static getGlobalIdeDir(): string {
+    return path.join(Storage.getGlobalQwenDir(), IDE_DIR_NAME);
+  }
+
  static getGlobalBinDir(): string {
    return path.join(Storage.getGlobalQwenDir(), BIN_DIR_NAME);
  }
@@ -121,6 +126,10 @@ export class Storage {
    return path.join(this.getExtensionsDir(), 'qwen-extension.json');
  }

+  getUserSkillsDir(): string {
+    return path.join(Storage.getGlobalQwenDir(), 'skills');
+  }
+
  getHistoryFilePath(): string {
    return path.join(this.getProjectTempDir(), 'shell_history');
  }
--- a/packages/core/src/ide/ide-client.test.ts
+++ b/packages/core/src/ide/ide-client.test.ts
@@ -32,6 +32,7 @@ vi.mock('node:fs', async (importOriginal) => {
      ...actual.promises,
      readFile: vi.fn(),
      readdir: vi.fn(),
+      stat: vi.fn(),
    },
    realpathSync: (p: string) => p,
    existsSync: () => false,
@@ -68,6 +69,7 @@ describe('IdeClient', () => {
      command: 'test-ide',
    });
    vi.mocked(os.tmpdir).mockReturnValue('/tmp');
+    vi.mocked(os.homedir).mockReturnValue('/home/test');

    // Mock MCP client and transports
    mockClient = {
@@ -97,19 +99,15 @@ describe('IdeClient', () => {

  describe('connect', () => {
    it('should connect using HTTP when port is provided in config file', async () => {
+      process.env['QWEN_CODE_IDE_SERVER_PORT'] = '8080';
      const config = { port: '8080' };
      vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([]);

      const ideClient = await IdeClient.getInstance();
      await ideClient.connect();

      expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp', 'qwen-code-ide-server-12345.json'),
+        path.join('/home/test', '.qwen', 'ide', '8080.lock'),
        'utf8',
      );
      expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
@@ -120,16 +118,13 @@ describe('IdeClient', () => {
      expect(ideClient.getConnectionStatus().status).toBe(
        IDEConnectionStatus.Connected,
      );
+      delete process.env['QWEN_CODE_IDE_SERVER_PORT'];
    });

    it('should connect using stdio when stdio config is provided in file', async () => {
+      process.env['QWEN_CODE_IDE_SERVER_PORT'] = '8080';
      const config = { stdio: { command: 'test-cmd', args: ['--foo'] } };
      vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([]);

      const ideClient = await IdeClient.getInstance();
      await ideClient.connect();
@@ -142,19 +137,16 @@ describe('IdeClient', () => {
      expect(ideClient.getConnectionStatus().status).toBe(
        IDEConnectionStatus.Connected,
      );
+      delete process.env['QWEN_CODE_IDE_SERVER_PORT'];
    });

    it('should prioritize port over stdio when both are in config file', async () => {
+      process.env['QWEN_CODE_IDE_SERVER_PORT'] = '8080';
      const config = {
        port: '8080',
        stdio: { command: 'test-cmd', args: ['--foo'] },
      };
      vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([]);

      const ideClient = await IdeClient.getInstance();
      await ideClient.connect();
@@ -164,6 +156,7 @@ describe('IdeClient', () => {
      expect(ideClient.getConnectionStatus().status).toBe(
        IDEConnectionStatus.Connected,
      );
+      delete process.env['QWEN_CODE_IDE_SERVER_PORT'];
    });

    it('should connect using HTTP when port is provided in environment variables', async () => {
@@ -263,7 +256,8 @@ describe('IdeClient', () => {
  });

  describe('getConnectionConfigFromFile', () => {
-    it('should return config from the specific pid file if it exists', async () => {
+    it('should return config from the env port lock file if it exists', async () => {
+      process.env['QWEN_CODE_IDE_SERVER_PORT'] = '1234';
      const config = { port: '1234', workspacePath: '/test/workspace' };
      vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));

@@ -277,18 +271,14 @@ describe('IdeClient', () => {

      expect(result).toEqual(config);
      expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp', 'qwen-code-ide-server-12345.json'),
+        path.join('/home/test', '.qwen', 'ide', '1234.lock'),
        'utf8',
      );
+      delete process.env['QWEN_CODE_IDE_SERVER_PORT'];
    });

    it('should return undefined if no config files are found', async () => {
      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error('not found'));
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([]);

      const ideClient = await IdeClient.getInstance();
      const result = await (
@@ -300,20 +290,15 @@ describe('IdeClient', () => {
      expect(result).toBeUndefined();
    });

-    it('should find and parse a single config file with the new naming scheme', async () => {
-      const config = { port: '5678', workspacePath: '/test/workspace' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      ); // For old path
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue(['qwen-code-ide-server-12345-123.json']);
-      vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
-        isValid: true,
-      });
+    it('should read legacy pid config when available', async () => {
+      const config = {
+        port: '5678',
+        workspacePath: '/test/workspace',
+        ppid: 12345,
+      };
+      vi.mocked(fs.promises.readFile).mockResolvedValueOnce(
+        JSON.stringify(config),
+      );

      const ideClient = await IdeClient.getInstance();
      const result = await (
@@ -324,110 +309,18 @@ describe('IdeClient', () => {

      expect(result).toEqual(config);
      expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp/gemini/ide', 'qwen-code-ide-server-12345-123.json'),
+        path.join('/tmp', 'qwen-code-ide-server-12345.json'),
        'utf8',
      );
    });

-    it('should filter out configs with invalid workspace paths', async () => {
-      const validConfig = {
-        port: '5678',
-        workspacePath: '/test/workspace',
-      };
-      const invalidConfig = {
-        port: '1111',
-        workspacePath: '/invalid/workspace',
-      };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'qwen-code-ide-server-12345-111.json',
-        'qwen-code-ide-server-12345-222.json',
-      ]);
-      vi.mocked(fs.promises.readFile)
-        .mockResolvedValueOnce(JSON.stringify(invalidConfig))
-        .mockResolvedValueOnce(JSON.stringify(validConfig));
-
-      const validateSpy = vi
-        .spyOn(IdeClient, 'validateWorkspacePath')
-        .mockReturnValueOnce({ isValid: false })
-        .mockReturnValueOnce({ isValid: true });
-
-      const ideClient = await IdeClient.getInstance();
-      const result = await (
-        ideClient as unknown as {
-          getConnectionConfigFromFile: () => Promise<unknown>;
-        }
-      ).getConnectionConfigFromFile();
-
-      expect(result).toEqual(validConfig);
-      expect(validateSpy).toHaveBeenCalledWith(
-        '/invalid/workspace',
-        '/test/workspace/sub-dir',
-      );
-      expect(validateSpy).toHaveBeenCalledWith(
-        '/test/workspace',
-        '/test/workspace/sub-dir',
-      );
-    });
-
-    it('should return the first valid config when multiple workspaces are valid', async () => {
-      const config1 = { port: '1111', workspacePath: '/test/workspace' };
-      const config2 = { port: '2222', workspacePath: '/test/workspace2' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'qwen-code-ide-server-12345-111.json',
-        'qwen-code-ide-server-12345-222.json',
-      ]);
-      vi.mocked(fs.promises.readFile)
-        .mockResolvedValueOnce(JSON.stringify(config1))
-        .mockResolvedValueOnce(JSON.stringify(config2));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
-        isValid: true,
-      });
-
-      const ideClient = await IdeClient.getInstance();
-      const result = await (
-        ideClient as unknown as {
-          getConnectionConfigFromFile: () => Promise<unknown>;
-        }
-      ).getConnectionConfigFromFile();
-
-      expect(result).toEqual(config1);
-    });
-
-    it('should prioritize the config matching the port from the environment variable', async () => {
+    it('should fall back to legacy port file when pid file is missing', async () => {
      process.env['QWEN_CODE_IDE_SERVER_PORT'] = '2222';
-      const config1 = { port: '1111', workspacePath: '/test/workspace' };
      const config2 = { port: '2222', workspacePath: '/test/workspace2' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'qwen-code-ide-server-12345-111.json',
-        'qwen-code-ide-server-12345-222.json',
-      ]);
      vi.mocked(fs.promises.readFile)
-        .mockResolvedValueOnce(JSON.stringify(config1))
+        .mockRejectedValueOnce(new Error('not found')) // ~/.qwen/ide/<port>.lock
+        .mockRejectedValueOnce(new Error('not found')) // legacy pid file
        .mockResolvedValueOnce(JSON.stringify(config2));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
-        isValid: true,
-      });

      const ideClient = await IdeClient.getInstance();
      const result = await (
@@ -437,28 +330,23 @@ describe('IdeClient', () => {
      ).getConnectionConfigFromFile();

      expect(result).toEqual(config2);
+      expect(fs.promises.readFile).toHaveBeenCalledWith(
+        path.join('/tmp', 'qwen-code-ide-server-12345.json'),
+        'utf8',
+      );
+      expect(fs.promises.readFile).toHaveBeenCalledWith(
+        path.join('/tmp', 'qwen-code-ide-server-2222.json'),
+        'utf8',
+      );
      delete process.env['QWEN_CODE_IDE_SERVER_PORT'];
    });

-    it('should handle invalid JSON in one of the config files', async () => {
-      const validConfig = { port: '2222', workspacePath: '/test/workspace' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'qwen-code-ide-server-12345-111.json',
-        'qwen-code-ide-server-12345-222.json',
-      ]);
+    it('should fall back to legacy config when env lock file has invalid JSON', async () => {
+      process.env['QWEN_CODE_IDE_SERVER_PORT'] = '3333';
+      const config = { port: '1111', workspacePath: '/test/workspace' };
      vi.mocked(fs.promises.readFile)
        .mockResolvedValueOnce('invalid json')
-        .mockResolvedValueOnce(JSON.stringify(validConfig));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
-        isValid: true,
-      });
+        .mockResolvedValueOnce(JSON.stringify(config));

      const ideClient = await IdeClient.getInstance();
      const result = await (
@@ -467,96 +355,7 @@ describe('IdeClient', () => {
        }
      ).getConnectionConfigFromFile();

-      expect(result).toEqual(validConfig);
-    });
-
-    it('should return undefined if readdir throws an error', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
-      vi.mocked(fs.promises.readdir).mockRejectedValue(
-        new Error('readdir failed'),
-      );
-
-      const ideClient = await IdeClient.getInstance();
-      const result = await (
-        ideClient as unknown as {
-          getConnectionConfigFromFile: () => Promise<unknown>;
-        }
-      ).getConnectionConfigFromFile();
-
-      expect(result).toBeUndefined();
-    });
-
-    it('should ignore files with invalid names', async () => {
-      const validConfig = { port: '3333', workspacePath: '/test/workspace' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'qwen-code-ide-server-12345-111.json', // valid
-        'not-a-config-file.txt', // invalid
-        'qwen-code-ide-server-asdf.json', // invalid
-      ]);
-      vi.mocked(fs.promises.readFile).mockResolvedValueOnce(
-        JSON.stringify(validConfig),
-      );
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
-        isValid: true,
-      });
-
-      const ideClient = await IdeClient.getInstance();
-      const result = await (
-        ideClient as unknown as {
-          getConnectionConfigFromFile: () => Promise<unknown>;
-        }
-      ).getConnectionConfigFromFile();
-
-      expect(result).toEqual(validConfig);
-      expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp/gemini/ide', 'qwen-code-ide-server-12345-111.json'),
-        'utf8',
-      );
-      expect(fs.promises.readFile).not.toHaveBeenCalledWith(
-        path.join('/tmp/gemini/ide', 'not-a-config-file.txt'),
-        'utf8',
-      );
-    });
-
-    it('should match env port string to a number port in the config', async () => {
-      process.env['QWEN_CODE_IDE_SERVER_PORT'] = '3333';
-      const config1 = { port: 1111, workspacePath: '/test/workspace' };
-      const config2 = { port: 3333, workspacePath: '/test/workspace2' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
-      (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'qwen-code-ide-server-12345-111.json',
-        'qwen-code-ide-server-12345-222.json',
-      ]);
-      vi.mocked(fs.promises.readFile)
-        .mockResolvedValueOnce(JSON.stringify(config1))
-        .mockResolvedValueOnce(JSON.stringify(config2));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
-        isValid: true,
-      });
-
-      const ideClient = await IdeClient.getInstance();
-      const result = await (
-        ideClient as unknown as {
-          getConnectionConfigFromFile: () => Promise<unknown>;
-        }
-      ).getConnectionConfigFromFile();
-
-      expect(result).toEqual(config2);
+      expect(result).toEqual(config);
      delete process.env['QWEN_CODE_IDE_SERVER_PORT'];
    });
  });
--- a/packages/core/src/ide/ide-client.ts
+++ b/packages/core/src/ide/ide-client.ts
@@ -8,6 +8,7 @@ import * as fs from 'node:fs';
 import { isSubpath } from '../utils/paths.js';
 import { detectIde, type IdeInfo } from '../ide/detect-ide.js';
 import { ideContextStore } from './ideContext.js';
+import { Storage } from '../config/storage.js';
 import {
  IdeContextNotificationSchema,
  IdeDiffAcceptedNotificationSchema,
@@ -572,98 +573,103 @@ export class IdeClient {
    | (ConnectionConfig & { workspacePath?: string; ideInfo?: IdeInfo })
    | undefined
  > {
-    if (!this.ideProcessInfo) {
-      return undefined;
-    }
-
-    // For backwards compatability
-    try {
-      const portFile = path.join(
-        os.tmpdir(),
-        `qwen-code-ide-server-${this.ideProcessInfo.pid}.json`,
-      );
-      const portFileContents = await fs.promises.readFile(portFile, 'utf8');
-      return JSON.parse(portFileContents);
-    } catch (_) {
-      // For newer extension versions, the file name matches the pattern
-      // /^qwen-code-ide-server-${pid}-\d+\.json$/. If multiple IDE
-      // windows are open, multiple files matching the pattern are expected to
-      // exist.
-    }
-
-    const portFileDir = path.join(os.tmpdir(), 'gemini', 'ide');
-    let portFiles;
-    try {
-      portFiles = await fs.promises.readdir(portFileDir);
-    } catch (e) {
-      logger.debug('Failed to read IDE connection directory:', e);
-      return undefined;
-    }
-
-    if (!portFiles) {
-      return undefined;
-    }
-
-    const fileRegex = new RegExp(
-      `^qwen-code-ide-server-${this.ideProcessInfo.pid}-\\d+\\.json$`,
-    );
-    const matchingFiles = portFiles
-      .filter((file) => fileRegex.test(file))
-      .sort();
-    if (matchingFiles.length === 0) {
-      return undefined;
-    }
-
-    let fileContents: string[];
-    try {
-      fileContents = await Promise.all(
-        matchingFiles.map((file) =>
-          fs.promises.readFile(path.join(portFileDir, file), 'utf8'),
-        ),
-      );
-    } catch (e) {
-      logger.debug('Failed to read IDE connection config file(s):', e);
-      return undefined;
-    }
-    const parsedContents = fileContents.map((content) => {
-      try {
-        return JSON.parse(content);
-      } catch (e) {
-        logger.debug('Failed to parse JSON from config file: ', e);
-        return undefined;
-      }
-    });
-
-    const validWorkspaces = parsedContents.filter((content) => {
-      if (!content) {
-        return false;
-      }
-      const { isValid } = IdeClient.validateWorkspacePath(
-        content.workspacePath,
-        process.cwd(),
-      );
-      return isValid;
-    });
-
-    if (validWorkspaces.length === 0) {
-      return undefined;
-    }
-
-    if (validWorkspaces.length === 1) {
-      return validWorkspaces[0];
-    }
-
    const portFromEnv = this.getPortFromEnv();
    if (portFromEnv) {
-      const matchingPort = validWorkspaces.find(
-        (content) => String(content.port) === portFromEnv,
-      );
-      if (matchingPort) {
-        return matchingPort;
+      try {
+        const ideDir = Storage.getGlobalIdeDir();
+        const lockFile = path.join(ideDir, `${portFromEnv}.lock`);
+        const lockFileContents = await fs.promises.readFile(lockFile, 'utf8');
+        return JSON.parse(lockFileContents);
+      } catch (_) {
+        // Fall through to legacy discovery.
      }
    }

-    return validWorkspaces[0];
+    // Legacy discovery for VSCode extension < v0.5.1.
+    return this.getLegacyConnectionConfig(portFromEnv);
+  }
+
+  // Legacy connection files were written in the global temp directory.
+  private async getLegacyConnectionConfig(
+    portFromEnv?: string,
+  ): Promise<
+    | (ConnectionConfig & { workspacePath?: string; ideInfo?: IdeInfo })
+    | undefined
+  > {
+    if (this.ideProcessInfo) {
+      try {
+        const portFile = path.join(
+          os.tmpdir(),
+          `qwen-code-ide-server-${this.ideProcessInfo.pid}.json`,
+        );
+        const portFileContents = await fs.promises.readFile(portFile, 'utf8');
+        return JSON.parse(portFileContents);
+      } catch (_) {
+        // For older/newer extension versions, the file name matches the pattern
+        // /^qwen-code-ide-server-${pid}-\d+\.json$/. If multiple IDE
+        // windows are open, multiple files matching the pattern are expected to
+        // exist.
+      }
+    }
+
+    if (portFromEnv) {
+      try {
+        const portFile = path.join(
+          os.tmpdir(),
+          `qwen-code-ide-server-${portFromEnv}.json`,
+        );
+        const portFileContents = await fs.promises.readFile(portFile, 'utf8');
+        return JSON.parse(portFileContents);
+      } catch (_) {
+        // Ignore and fall through.
+      }
+    }
+
+    return undefined;
+  }
+
+  protected async getAllConnectionConfigs(
+    ideDir: string,
+  ): Promise<
+    ConnectionConfig & Array<{ workspacePath?: string; ideInfo?: IdeInfo }>
+  > {
+    const fileRegex = new RegExp('^\\d+\\.lock$');
+    let lockFiles: string[];
+    try {
+      lockFiles = (await fs.promises.readdir(ideDir)).filter((file) =>
+        fileRegex.test(file),
+      );
+    } catch (e) {
+      logger.debug('Failed to read IDE connection directory:', e);
+      return [];
+    }
+
+    const fileContents = await Promise.all(
+      lockFiles.map(async (file) => {
+        const fullPath = path.join(ideDir, file);
+        try {
+          const stat = await fs.promises.stat(fullPath);
+          const content = await fs.promises.readFile(fullPath, 'utf8');
+          try {
+            const parsed = JSON.parse(content);
+            return { file, mtimeMs: stat.mtimeMs, parsed };
+          } catch (e) {
+            logger.debug('Failed to parse JSON from lock file: ', e);
+            return { file, mtimeMs: stat.mtimeMs, parsed: undefined };
+          }
+        } catch (e) {
+          // If we can't stat/read the file, treat it as very old so it doesn't
+          // win ties, and skip parsing by returning undefined content.
+          logger.debug('Failed to read/stat IDE lock file:', e);
+          return { file, mtimeMs: -Infinity, parsed: undefined };
+        }
+      }),
+    );
+
+    return fileContents
+      .filter(({ parsed }) => parsed !== undefined)
+      .sort((a, b) => b.mtimeMs - a.mtimeMs)
+      .map(({ parsed }) => parsed);
  }

  private createProxyAwareFetch() {
--- a/packages/core/src/ide/process-utils.test.ts
+++ b/packages/core/src/ide/process-utils.test.ts
@@ -50,7 +50,7 @@ describe('getIdeProcessInfo', () => {
      expect(result).toEqual({ pid: 700, command: '/usr/lib/vscode/code' });
    });

-    it('should return parent process info if grandparent lookup fails', async () => {
+    it('should return shell process info if grandparent lookup fails', async () => {
      (os.platform as Mock).mockReturnValue('linux');
      mockedExec
        .mockResolvedValueOnce({ stdout: '800 /bin/bash' }) // pid 1000 -> ppid 800 (shell)
@@ -63,134 +63,96 @@ describe('getIdeProcessInfo', () => {
  });

  describe('on Windows', () => {
-    it('should traverse up and find the great-grandchild of the root process', async () => {
+    it('should return great-grandparent process using heuristic', async () => {
      (os.platform as Mock).mockReturnValue('win32');
-      const processInfoMap = new Map([
-        [
-          1000,
-          {
-            stdout:
-              '{"Name":"node.exe","ParentProcessId":900,"CommandLine":"node.exe"}',
-          },
-        ],
-        [
-          900,
-          {
-            stdout:
-              '{"Name":"powershell.exe","ParentProcessId":800,"CommandLine":"powershell.exe"}',
-          },
-        ],
-        [
-          800,
-          {
-            stdout:
-              '{"Name":"code.exe","ParentProcessId":700,"CommandLine":"code.exe"}',
-          },
-        ],
-        [
-          700,
-          {
-            stdout:
-              '{"Name":"wininit.exe","ParentProcessId":0,"CommandLine":"wininit.exe"}',
-          },
-        ],
-      ]);
-      mockedExec.mockImplementation((command: string) => {
-        const pidMatch = command.match(/ProcessId=(\d+)/);
-        if (pidMatch) {
-          const pid = parseInt(pidMatch[1], 10);
-          return Promise.resolve(processInfoMap.get(pid));
+
+      const processes = [
+        {
+          ProcessId: 1000,
+          ParentProcessId: 900,
+          Name: 'node.exe',
+          CommandLine: 'node.exe',
+        },
+        {
+          ProcessId: 900,
+          ParentProcessId: 800,
+          Name: 'powershell.exe',
+          CommandLine: 'powershell.exe',
+        },
+        {
+          ProcessId: 800,
+          ParentProcessId: 700,
+          Name: 'code.exe',
+          CommandLine: 'code.exe',
+        },
+        {
+          ProcessId: 700,
+          ParentProcessId: 0,
+          Name: 'wininit.exe',
+          CommandLine: 'wininit.exe',
+        },
+      ];
+
+      mockedExec.mockImplementation((file: string, _args: string[]) => {
+        if (file === 'powershell') {
+          return Promise.resolve({ stdout: JSON.stringify(processes) });
        }
-        return Promise.reject(new Error('Invalid command for mock'));
+        return Promise.resolve({ stdout: '' });
      });

      const result = await getIdeProcessInfo();
+      // Process chain: 1000 (node.exe) -> 900 (powershell.exe) -> 800 (code.exe) -> 700 (wininit.exe)
+      // ancestors = [1000, 900, 800, 700], length = 4
+      // Heuristic: return ancestors[length-3] = ancestors[1] = 900 (powershell.exe)
      expect(result).toEqual({ pid: 900, command: 'powershell.exe' });
    });

-    it('should handle non-existent process gracefully', async () => {
+    it('should handle empty process list gracefully', async () => {
      (os.platform as Mock).mockReturnValue('win32');
-      mockedExec
-        .mockResolvedValueOnce({ stdout: '' }) // Non-existent PID returns empty due to -ErrorAction SilentlyContinue
-        .mockResolvedValueOnce({
-          stdout:
-            '{"Name":"fallback.exe","ParentProcessId":0,"CommandLine":"fallback.exe"}',
-        }); // Fallback call
+      mockedExec.mockResolvedValue({ stdout: '[]' });

      const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: 'fallback.exe' });
+      // Should return current pid and empty command because process not found in map
+      expect(result).toEqual({ pid: 1000, command: '' });
    });

    it('should handle malformed JSON output gracefully', async () => {
      (os.platform as Mock).mockReturnValue('win32');
-      mockedExec
-        .mockResolvedValueOnce({ stdout: '{"invalid":json}' }) // Malformed JSON
-        .mockResolvedValueOnce({
-          stdout:
-            '{"Name":"fallback.exe","ParentProcessId":0,"CommandLine":"fallback.exe"}',
-        }); // Fallback call
+      mockedExec.mockResolvedValue({ stdout: '{"invalid":json}' });

      const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: 'fallback.exe' });
+      expect(result).toEqual({ pid: 1000, command: '' });
    });

-    it('should handle PowerShell errors without crashing the process chain', async () => {
+    it('should return last ancestor if chain is too short', async () => {
      (os.platform as Mock).mockReturnValue('win32');
-      const processInfoMap = new Map([
-        [1000, { stdout: '' }], // First process doesn't exist (empty due to -ErrorAction)
-        [
-          1001,
-          {
-            stdout:
-              '{"Name":"parent.exe","ParentProcessId":800,"CommandLine":"parent.exe"}',
-          },
-        ],
-        [
-          800,
-          {
-            stdout:
-              '{"Name":"ide.exe","ParentProcessId":0,"CommandLine":"ide.exe"}',
-          },
-        ],
-      ]);

-      // Mock the process.pid to test traversal with missing processes
-      Object.defineProperty(process, 'pid', {
-        value: 1001,
-        configurable: true,
-      });
+      const processes = [
+        {
+          ProcessId: 1000,
+          ParentProcessId: 900,
+          Name: 'node.exe',
+          CommandLine: 'node.exe',
+        },
+        {
+          ProcessId: 900,
+          ParentProcessId: 0,
+          Name: 'explorer.exe',
+          CommandLine: 'explorer.exe',
+        },
+      ];

-      mockedExec.mockImplementation((command: string) => {
-        const pidMatch = command.match(/ProcessId=(\d+)/);
-        if (pidMatch) {
-          const pid = parseInt(pidMatch[1], 10);
-          return Promise.resolve(processInfoMap.get(pid) || { stdout: '' });
+      mockedExec.mockImplementation((file: string, _args: string[]) => {
+        if (file === 'powershell') {
+          return Promise.resolve({ stdout: JSON.stringify(processes) });
        }
-        return Promise.reject(new Error('Invalid command for mock'));
+        return Promise.resolve({ stdout: '' });
      });

      const result = await getIdeProcessInfo();
-      // Should return the current process command since traversal continues despite missing processes
-      expect(result).toEqual({ pid: 1001, command: 'parent.exe' });
-
-      // Reset process.pid
-      Object.defineProperty(process, 'pid', {
-        value: 1000,
-        configurable: true,
-      });
-    });
-
-    it('should handle partial JSON data with defaults', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
-      mockedExec
-        .mockResolvedValueOnce({ stdout: '{"Name":"partial.exe"}' }) // Missing ParentProcessId, defaults to 0
-        .mockResolvedValueOnce({
-          stdout:
-            '{"Name":"root.exe","ParentProcessId":0,"CommandLine":"root.exe"}',
-        }); // Get grandparent info
-
-      const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: 'root.exe' });
+      // ancestors = [1000, 900], length = 2 (< 3)
+      // Heuristic: return ancestors[length-1] = ancestors[1] = 900 (explorer.exe)
+      expect(result).toEqual({ pid: 900, command: 'explorer.exe' });
    });
  });
 });
--- a/packages/core/src/ide/process-utils.ts
+++ b/packages/core/src/ide/process-utils.ts
@@ -4,74 +4,43 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { exec } from 'node:child_process';
+import { exec, execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import os from 'node:os';
 import path from 'node:path';

 const execAsync = promisify(exec);
+const execFileAsync = promisify(execFile);

 const MAX_TRAVERSAL_DEPTH = 32;

-/**
- * Fetches the parent process ID, name, and command for a given process ID.
- *
- * @param pid The process ID to inspect.
- * @returns A promise that resolves to the parent's PID, name, and command.
- */
 async function getProcessInfo(pid: number): Promise<{
  parentPid: number;
  name: string;
  command: string;
 }> {
+  // Only used for Unix systems (macOS and Linux)
  try {
-    const platform = os.platform();
-    if (platform === 'win32') {
-      const powershellCommand = [
-        '$p = Get-CimInstance Win32_Process',
-        `-Filter 'ProcessId=${pid}'`,
-        '-ErrorAction SilentlyContinue;',
-        'if ($p) {',
-        '@{Name=$p.Name;ParentProcessId=$p.ParentProcessId;CommandLine=$p.CommandLine}',
-        '| ConvertTo-Json',
-        '}',
-      ].join(' ');
-      const { stdout } = await execAsync(`powershell "${powershellCommand}"`);
-      const output = stdout.trim();
-      if (!output) return { parentPid: 0, name: '', command: '' };
-      const {
-        Name = '',
-        ParentProcessId = 0,
-        CommandLine = '',
-      } = JSON.parse(output);
-      return {
-        parentPid: ParentProcessId,
-        name: Name,
-        command: CommandLine ?? '',
-      };
-    } else {
-      const command = `ps -o ppid=,command= -p ${pid}`;
-      const { stdout } = await execAsync(command);
-      const trimmedStdout = stdout.trim();
-      if (!trimmedStdout) {
-        return { parentPid: 0, name: '', command: '' };
-      }
-      const ppidString = trimmedStdout.split(/\s+/)[0];
-      const parentPid = parseInt(ppidString, 10);
-      const fullCommand = trimmedStdout.substring(ppidString.length).trim();
-      const processName = path.basename(fullCommand.split(' ')[0]);
-      return {
-        parentPid: isNaN(parentPid) ? 1 : parentPid,
-        name: processName,
-        command: fullCommand,
-      };
+    const command = `ps -o ppid=,command= -p ${pid}`;
+    const { stdout } = await execAsync(command);
+    const trimmedStdout = stdout.trim();
+    if (!trimmedStdout) {
+      return { parentPid: 0, name: '', command: '' };
    }
+    const parts = trimmedStdout.split(/\s+/);
+    const ppidString = parts[0];
+    const parentPid = parseInt(ppidString, 10);
+    const fullCommand = trimmedStdout.substring(ppidString.length).trim();
+    const processName = path.basename(fullCommand.split(' ')[0]);
+    return {
+      parentPid: isNaN(parentPid) ? 1 : parentPid,
+      name: processName,
+      command: fullCommand,
+    };
  } catch (_e) {
-    console.debug(`Failed to get process info for pid ${pid}:`, _e);
    return { parentPid: 0, name: '', command: '' };
  }
 }
-
 /**
 * Finds the IDE process info on Unix-like systems.
 *
@@ -106,15 +75,15 @@ async function getIdeProcessInfoForUnix(): Promise<{
        } catch {
          // Ignore if getting grandparent fails, we'll just use the parent pid.
        }
-        const { command } = await getProcessInfo(idePid);
-        return { pid: idePid, command };
+        const { command: ideCommand } = await getProcessInfo(idePid);
+        return { pid: idePid, command: ideCommand };
      }

      if (parentPid <= 1) {
        break; // Reached the root
      }
      currentPid = parentPid;
-    } catch {
+    } catch (_e) {
      // Process in chain died
      break;
    }
@@ -124,50 +93,104 @@ async function getIdeProcessInfoForUnix(): Promise<{
  return { pid: currentPid, command };
 }

+interface ProcessInfo {
+  pid: number;
+  parentPid: number;
+  name: string;
+  command: string;
+}
+
+interface RawProcessInfo {
+  ProcessId?: number;
+  ParentProcessId?: number;
+  Name?: string;
+  CommandLine?: string;
+}
+
 /**
- * Finds the IDE process info on Windows.
- *
- * The strategy is to find the great-grandchild of the root process.
- *
- * @returns A promise that resolves to the PID and command of the IDE process.
+ * Fetches the entire process table on Windows.
 */
+async function getProcessTableWindows(): Promise<Map<number, ProcessInfo>> {
+  const processMap = new Map<number, ProcessInfo>();
+  try {
+    const powershellCommand =
+      'Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress';
+    const { stdout } = await execFileAsync(
+      'powershell',
+      ['-NoProfile', '-NonInteractive', '-Command', powershellCommand],
+      { maxBuffer: 10 * 1024 * 1024 },
+    );
+
+    if (!stdout.trim()) {
+      return processMap;
+    }
+
+    let processes: RawProcessInfo | RawProcessInfo[];
+    try {
+      processes = JSON.parse(stdout);
+    } catch (_e) {
+      return processMap;
+    }
+
+    if (!Array.isArray(processes)) {
+      processes = [processes];
+    }
+
+    for (const p of processes) {
+      if (p && typeof p.ProcessId === 'number') {
+        processMap.set(p.ProcessId, {
+          pid: p.ProcessId,
+          parentPid: p.ParentProcessId || 0,
+          name: p.Name || '',
+          command: p.CommandLine || '',
+        });
+      }
+    }
+  } catch (_e) {
+    // Fallback or error handling if PowerShell fails
+  }
+  return processMap;
+}
+
 async function getIdeProcessInfoForWindows(): Promise<{
  pid: number;
  command: string;
 }> {
-  let currentPid = process.pid;
-  let previousPid = process.pid;
+  // Fetch the entire process table in one go.
+  const processMap = await getProcessTableWindows();

-  for (let i = 0; i < MAX_TRAVERSAL_DEPTH; i++) {
-    try {
-      const { parentPid } = await getProcessInfo(currentPid);
+  const myPid = process.pid;
+  const myProc = processMap.get(myPid);

-      if (parentPid > 0) {
-        try {
-          const { parentPid: grandParentPid } = await getProcessInfo(parentPid);
-          if (grandParentPid === 0) {
-            // We've found the grandchild of the root (`currentPid`). The IDE
-            // process is its child, which we've stored in `previousPid`.
-            const { command } = await getProcessInfo(previousPid);
-            return { pid: previousPid, command };
-          }
-        } catch {
-          // getting grandparent failed, proceed
-        }
-      }
+  if (!myProc) {
+    // Fallback: return current process info if snapshot fails
+    return { pid: myPid, command: '' };
+  }

-      if (parentPid <= 0) {
-        break; // Reached the root
-      }
-      previousPid = currentPid;
-      currentPid = parentPid;
-    } catch {
-      // Process in chain died
+  // Perform tree traversal in memory
+  const ancestors: ProcessInfo[] = [];
+  let curr: ProcessInfo | undefined = myProc;
+
+  for (let i = 0; i < MAX_TRAVERSAL_DEPTH && curr; i++) {
+    ancestors.push(curr);
+
+    if (curr.parentPid === 0 || !processMap.has(curr.parentPid)) {
+      // Parent process not in map, stop traversal
      break;
    }
+    curr = processMap.get(curr.parentPid);
  }
-  const { command } = await getProcessInfo(currentPid);
-  return { pid: currentPid, command };
+
+  // Use heuristic: return the great-grandparent (ancestors[length-3])
+  if (ancestors.length >= 3) {
+    const target = ancestors[ancestors.length - 3];
+    return { pid: target.pid, command: target.command };
+  } else if (ancestors.length > 0) {
+    const target = ancestors[ancestors.length - 1];
+    return { pid: target.pid, command: target.command };
+  }
+
+  return { pid: myPid, command: myProc.command };
 }

 /**
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -85,6 +85,9 @@ export * from './tools/tool-registry.js';
 // Export subagents (Phase 1)
 export * from './subagents/index.js';

+// Export skills
+export * from './skills/index.js';
+
 // Export prompt logic
 export * from './prompts/mcp-prompts.js';

@@ -106,6 +109,7 @@ export * from './tools/mcp-client-manager.js';
 export * from './tools/mcp-tool.js';
 export * from './tools/sdk-control-client-transport.js';
 export * from './tools/task.js';
+export * from './tools/skill.js';
 export * from './tools/todoWrite.js';
 export * from './tools/exitPlanMode.js';

--- a/packages/core/src/skills/index.ts
+++ b/packages/core/src/skills/index.ts
@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Skills feature implementation
+ *
+ * This module provides the foundation for the skills feature, which allows
+ * users to define reusable skill configurations that can be loaded by the
+ * model via a dedicated Skills tool.
+ *
+ * Skills are stored as directories in `.qwen/skills/` (project-level) or
+ * `~/.qwen/skills/` (user-level), with each directory containing a SKILL.md
+ * file with YAML frontmatter for metadata.
+ */
+
+// Core types and interfaces
+export type {
+  SkillConfig,
+  SkillLevel,
+  SkillValidationResult,
+  ListSkillsOptions,
+  SkillErrorCode,
+} from './types.js';
+
+export { SkillError } from './types.js';
+
+// Main management class
+export { SkillManager } from './skill-manager.js';
--- a/packages/core/src/skills/skill-manager.test.ts
+++ b/packages/core/src/skills/skill-manager.test.ts
@@ -0,0 +1,463 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
+import { SkillManager } from './skill-manager.js';
+import { type SkillConfig, SkillError } from './types.js';
+import type { Config } from '../config/config.js';
+import { makeFakeConfig } from '../test-utils/config.js';
+
+// Mock file system operations
+vi.mock('fs/promises');
+vi.mock('os');
+
+// Mock yaml parser - use vi.hoisted for proper hoisting
+const mockParseYaml = vi.hoisted(() => vi.fn());
+
+vi.mock('../utils/yaml-parser.js', () => ({
+  parse: mockParseYaml,
+  stringify: vi.fn(),
+}));
+
+describe('SkillManager', () => {
+  let manager: SkillManager;
+  let mockConfig: Config;
+
+  beforeEach(() => {
+    // Create mock Config object using test utility
+    mockConfig = makeFakeConfig({});
+
+    // Mock the project root method
+    vi.spyOn(mockConfig, 'getProjectRoot').mockReturnValue('/test/project');
+
+    // Mock os.homedir
+    vi.mocked(os.homedir).mockReturnValue('/home/user');
+
+    // Reset and setup mocks
+    vi.clearAllMocks();
+
+    // Setup yaml parser mocks with sophisticated behavior
+    mockParseYaml.mockImplementation((yamlString: string) => {
+      // Handle different test cases based on YAML content
+      if (yamlString.includes('allowedTools:')) {
+        return {
+          name: 'test-skill',
+          description: 'A test skill',
+          allowedTools: ['read_file', 'write_file'],
+        };
+      }
+      if (yamlString.includes('name: skill1')) {
+        return { name: 'skill1', description: 'First skill' };
+      }
+      if (yamlString.includes('name: skill2')) {
+        return { name: 'skill2', description: 'Second skill' };
+      }
+      if (yamlString.includes('name: skill3')) {
+        return { name: 'skill3', description: 'Third skill' };
+      }
+      if (!yamlString.includes('name:')) {
+        return { description: 'A test skill' }; // Missing name case
+      }
+      if (!yamlString.includes('description:')) {
+        return { name: 'test-skill' }; // Missing description case
+      }
+      // Default case
+      return {
+        name: 'test-skill',
+        description: 'A test skill',
+      };
+    });
+
+    manager = new SkillManager(mockConfig);
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  const validSkillConfig: SkillConfig = {
+    name: 'test-skill',
+    description: 'A test skill',
+    level: 'project',
+    filePath: '/test/project/.qwen/skills/test-skill/SKILL.md',
+    body: 'You are a helpful assistant with this skill.',
+  };
+
+  const validMarkdown = `---
+name: test-skill
+description: A test skill
+---
+
+You are a helpful assistant with this skill.
+`;
+
+  describe('parseSkillContent', () => {
+    it('should parse valid markdown content', () => {
+      const config = manager.parseSkillContent(
+        validMarkdown,
+        validSkillConfig.filePath,
+        'project',
+      );
+
+      expect(config.name).toBe('test-skill');
+      expect(config.description).toBe('A test skill');
+      expect(config.body).toBe('You are a helpful assistant with this skill.');
+      expect(config.level).toBe('project');
+      expect(config.filePath).toBe(validSkillConfig.filePath);
+    });
+
+    it('should parse content with allowedTools', () => {
+      const markdownWithTools = `---
+name: test-skill
+description: A test skill
+allowedTools:
+  - read_file
+  - write_file
+---
+
+You are a helpful assistant with this skill.
+`;
+
+      const config = manager.parseSkillContent(
+        markdownWithTools,
+        validSkillConfig.filePath,
+        'project',
+      );
+
+      expect(config.allowedTools).toEqual(['read_file', 'write_file']);
+    });
+
+    it('should determine level from file path', () => {
+      const projectPath = '/test/project/.qwen/skills/test-skill/SKILL.md';
+      const userPath = '/home/user/.qwen/skills/test-skill/SKILL.md';
+
+      const projectConfig = manager.parseSkillContent(
+        validMarkdown,
+        projectPath,
+        'project',
+      );
+      const userConfig = manager.parseSkillContent(
+        validMarkdown,
+        userPath,
+        'user',
+      );
+
+      expect(projectConfig.level).toBe('project');
+      expect(userConfig.level).toBe('user');
+    });
+
+    it('should throw error for invalid frontmatter format', () => {
+      const invalidMarkdown = `No frontmatter here
+Just content`;
+
+      expect(() =>
+        manager.parseSkillContent(
+          invalidMarkdown,
+          validSkillConfig.filePath,
+          'project',
+        ),
+      ).toThrow(SkillError);
+    });
+
+    it('should throw error for missing name', () => {
+      const markdownWithoutName = `---
+description: A test skill
+---
+
+You are a helpful assistant.
+`;
+
+      expect(() =>
+        manager.parseSkillContent(
+          markdownWithoutName,
+          validSkillConfig.filePath,
+          'project',
+        ),
+      ).toThrow(SkillError);
+    });
+
+    it('should throw error for missing description', () => {
+      const markdownWithoutDescription = `---
+name: test-skill
+---
+
+You are a helpful assistant.
+`;
+
+      expect(() =>
+        manager.parseSkillContent(
+          markdownWithoutDescription,
+          validSkillConfig.filePath,
+          'project',
+        ),
+      ).toThrow(SkillError);
+    });
+  });
+
+  describe('validateConfig', () => {
+    it('should validate valid configuration', () => {
+      const result = manager.validateConfig(validSkillConfig);
+
+      expect(result.isValid).toBe(true);
+      expect(result.errors).toHaveLength(0);
+    });
+
+    it('should report error for missing name', () => {
+      const invalidConfig = { ...validSkillConfig, name: '' };
+      const result = manager.validateConfig(invalidConfig);
+
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain('"name" cannot be empty');
+    });
+
+    it('should report error for missing description', () => {
+      const invalidConfig = { ...validSkillConfig, description: '' };
+      const result = manager.validateConfig(invalidConfig);
+
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain('"description" cannot be empty');
+    });
+
+    it('should report error for invalid allowedTools type', () => {
+      const invalidConfig = {
+        ...validSkillConfig,
+        allowedTools: 'not-an-array' as unknown as string[],
+      };
+      const result = manager.validateConfig(invalidConfig);
+
+      expect(result.isValid).toBe(false);
+      expect(result.errors).toContain('"allowedTools" must be an array');
+    });
+
+    it('should warn for empty body', () => {
+      const configWithEmptyBody = { ...validSkillConfig, body: '' };
+      const result = manager.validateConfig(configWithEmptyBody);
+
+      expect(result.isValid).toBe(true); // Still valid
+      expect(result.warnings).toContain('Skill body is empty');
+    });
+  });
+
+  describe('loadSkill', () => {
+    it('should load skill from project level first', async () => {
+      vi.mocked(fs.readdir).mockResolvedValue([
+        { name: 'test-skill', isDirectory: () => true, isFile: () => false },
+      ] as unknown as Awaited<ReturnType<typeof fs.readdir>>);
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      vi.mocked(fs.readFile).mockResolvedValue(validMarkdown);
+
+      const config = await manager.loadSkill('test-skill');
+
+      expect(config).toBeDefined();
+      expect(config!.name).toBe('test-skill');
+    });
+
+    it('should fall back to user level if project level fails', async () => {
+      vi.mocked(fs.readdir)
+        .mockRejectedValueOnce(new Error('Project dir not found')) // project level fails
+        .mockResolvedValueOnce([
+          { name: 'test-skill', isDirectory: () => true, isFile: () => false },
+        ] as unknown as Awaited<ReturnType<typeof fs.readdir>>); // user level succeeds
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      vi.mocked(fs.readFile).mockResolvedValue(validMarkdown);
+
+      const config = await manager.loadSkill('test-skill');
+
+      expect(config).toBeDefined();
+      expect(config!.name).toBe('test-skill');
+    });
+
+    it('should return null if not found at either level', async () => {
+      vi.mocked(fs.readdir).mockRejectedValue(new Error('Directory not found'));
+
+      const config = await manager.loadSkill('nonexistent');
+
+      expect(config).toBeNull();
+    });
+  });
+
+  describe('loadSkillForRuntime', () => {
+    it('should load skill for runtime', async () => {
+      vi.mocked(fs.readdir).mockResolvedValueOnce([
+        { name: 'test-skill', isDirectory: () => true, isFile: () => false },
+      ] as unknown as Awaited<ReturnType<typeof fs.readdir>>);
+
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      vi.mocked(fs.readFile).mockResolvedValue(validMarkdown); // SKILL.md
+
+      const config = await manager.loadSkillForRuntime('test-skill');
+
+      expect(config).toBeDefined();
+      expect(config!.name).toBe('test-skill');
+    });
+
+    it('should return null if skill not found', async () => {
+      vi.mocked(fs.readdir).mockRejectedValue(new Error('Directory not found'));
+
+      const config = await manager.loadSkillForRuntime('nonexistent');
+
+      expect(config).toBeNull();
+    });
+  });
+
+  describe('listSkills', () => {
+    beforeEach(() => {
+      // Mock directory listing for skills directories (with Dirent objects)
+      vi.mocked(fs.readdir)
+        .mockResolvedValueOnce([
+          { name: 'skill1', isDirectory: () => true, isFile: () => false },
+          { name: 'skill2', isDirectory: () => true, isFile: () => false },
+          {
+            name: 'not-a-dir.txt',
+            isDirectory: () => false,
+            isFile: () => true,
+          },
+        ] as unknown as Awaited<ReturnType<typeof fs.readdir>>)
+        .mockResolvedValueOnce([
+          { name: 'skill3', isDirectory: () => true, isFile: () => false },
+          { name: 'skill1', isDirectory: () => true, isFile: () => false },
+        ] as unknown as Awaited<ReturnType<typeof fs.readdir>>);
+
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+
+      // Mock file reading for valid skills
+      vi.mocked(fs.readFile).mockImplementation((filePath) => {
+        const pathStr = String(filePath);
+        if (pathStr.includes('skill1')) {
+          return Promise.resolve(`---
+name: skill1
+description: First skill
+---
+Skill 1 content`);
+        } else if (pathStr.includes('skill2')) {
+          return Promise.resolve(`---
+name: skill2
+description: Second skill
+---
+Skill 2 content`);
+        } else if (pathStr.includes('skill3')) {
+          return Promise.resolve(`---
+name: skill3
+description: Third skill
+---
+Skill 3 content`);
+        }
+        return Promise.reject(new Error('File not found'));
+      });
+    });
+
+    it('should list skills from both levels', async () => {
+      const skills = await manager.listSkills();
+
+      expect(skills).toHaveLength(3); // skill1 (project takes precedence), skill2, skill3
+      expect(skills.map((s) => s.name).sort()).toEqual([
+        'skill1',
+        'skill2',
+        'skill3',
+      ]);
+    });
+
+    it('should prioritize project level over user level', async () => {
+      const skills = await manager.listSkills();
+      const skill1 = skills.find((s) => s.name === 'skill1');
+
+      expect(skill1!.level).toBe('project');
+    });
+
+    it('should filter by level', async () => {
+      const projectSkills = await manager.listSkills({
+        level: 'project',
+      });
+
+      expect(projectSkills).toHaveLength(2); // skill1, skill2
+      expect(projectSkills.every((s) => s.level === 'project')).toBe(true);
+    });
+
+    it('should handle empty directories', async () => {
+      vi.mocked(fs.readdir).mockReset();
+      vi.mocked(fs.readdir).mockResolvedValue(
+        [] as unknown as Awaited<ReturnType<typeof fs.readdir>>,
+      );
+
+      const skills = await manager.listSkills({ force: true });
+
+      expect(skills).toHaveLength(0);
+    });
+
+    it('should handle directory read errors', async () => {
+      vi.mocked(fs.readdir).mockReset();
+      vi.mocked(fs.readdir).mockRejectedValue(new Error('Directory not found'));
+
+      const skills = await manager.listSkills({ force: true });
+
+      expect(skills).toHaveLength(0);
+    });
+  });
+
+  describe('getSkillsBaseDir', () => {
+    it('should return project-level base dir', () => {
+      const baseDir = manager.getSkillsBaseDir('project');
+
+      expect(baseDir).toBe(path.join('/test/project', '.qwen', 'skills'));
+    });
+
+    it('should return user-level base dir', () => {
+      const baseDir = manager.getSkillsBaseDir('user');
+
+      expect(baseDir).toBe(path.join('/home/user', '.qwen', 'skills'));
+    });
+  });
+
+  describe('change listeners', () => {
+    it('should notify listeners when cache is refreshed', async () => {
+      const listener = vi.fn();
+      manager.addChangeListener(listener);
+
+      vi.mocked(fs.readdir).mockResolvedValue(
+        [] as unknown as Awaited<ReturnType<typeof fs.readdir>>,
+      );
+
+      await manager.refreshCache();
+
+      expect(listener).toHaveBeenCalled();
+    });
+
+    it('should remove listener when cleanup function is called', async () => {
+      const listener = vi.fn();
+      const removeListener = manager.addChangeListener(listener);
+
+      removeListener();
+
+      vi.mocked(fs.readdir).mockResolvedValue(
+        [] as unknown as Awaited<ReturnType<typeof fs.readdir>>,
+      );
+
+      await manager.refreshCache();
+
+      expect(listener).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('parse errors', () => {
+    it('should track parse errors', async () => {
+      vi.mocked(fs.readdir).mockResolvedValue([
+        { name: 'bad-skill', isDirectory: () => true, isFile: () => false },
+      ] as unknown as Awaited<ReturnType<typeof fs.readdir>>);
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      vi.mocked(fs.readFile).mockResolvedValue(
+        'invalid content without frontmatter',
+      );
+
+      await manager.listSkills({ force: true });
+
+      const errors = manager.getParseErrors();
+      expect(errors.size).toBeGreaterThan(0);
+    });
+  });
+});
--- a/packages/core/src/skills/skill-manager.ts
+++ b/packages/core/src/skills/skill-manager.ts
@@ -0,0 +1,452 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
+import { parse as parseYaml } from '../utils/yaml-parser.js';
+import type {
+  SkillConfig,
+  SkillLevel,
+  ListSkillsOptions,
+  SkillValidationResult,
+} from './types.js';
+import { SkillError, SkillErrorCode } from './types.js';
+import type { Config } from '../config/config.js';
+
+const QWEN_CONFIG_DIR = '.qwen';
+const SKILLS_CONFIG_DIR = 'skills';
+const SKILL_MANIFEST_FILE = 'SKILL.md';
+
+/**
+ * Manages skill configurations stored as directories containing SKILL.md files.
+ * Provides discovery, parsing, validation, and caching for skills.
+ */
+export class SkillManager {
+  private skillsCache: Map<SkillLevel, SkillConfig[]> | null = null;
+  private readonly changeListeners: Set<() => void> = new Set();
+  private parseErrors: Map<string, SkillError> = new Map();
+
+  constructor(private readonly config: Config) {}
+
+  /**
+   * Adds a listener that will be called when skills change.
+   * @returns A function to remove the listener.
+   */
+  addChangeListener(listener: () => void): () => void {
+    this.changeListeners.add(listener);
+    return () => {
+      this.changeListeners.delete(listener);
+    };
+  }
+
+  /**
+   * Notifies all registered change listeners.
+   */
+  private notifyChangeListeners(): void {
+    for (const listener of this.changeListeners) {
+      try {
+        listener();
+      } catch (error) {
+        console.warn('Skill change listener threw an error:', error);
+      }
+    }
+  }
+
+  /**
+   * Gets any parse errors that occurred during skill loading.
+   * @returns Map of skill paths to their parse errors.
+   */
+  getParseErrors(): Map<string, SkillError> {
+    return new Map(this.parseErrors);
+  }
+
+  /**
+   * Lists all available skills.
+   *
+   * @param options - Filtering options
+   * @returns Array of skill configurations
+   */
+  async listSkills(options: ListSkillsOptions = {}): Promise<SkillConfig[]> {
+    const skills: SkillConfig[] = [];
+    const seenNames = new Set<string>();
+
+    const levelsToCheck: SkillLevel[] = options.level
+      ? [options.level]
+      : ['project', 'user'];
+
+    // Check if we should use cache or force refresh
+    const shouldUseCache = !options.force && this.skillsCache !== null;
+
+    // Initialize cache if it doesn't exist or we're forcing a refresh
+    if (!shouldUseCache) {
+      await this.refreshCache();
+    }
+
+    // Collect skills from each level (project takes precedence over user)
+    for (const level of levelsToCheck) {
+      const levelSkills = this.skillsCache?.get(level) || [];
+
+      for (const skill of levelSkills) {
+        // Skip if we've already seen this name (precedence: project > user)
+        if (seenNames.has(skill.name)) {
+          continue;
+        }
+
+        skills.push(skill);
+        seenNames.add(skill.name);
+      }
+    }
+
+    // Sort by name for consistent ordering
+    skills.sort((a, b) => a.name.localeCompare(b.name));
+
+    return skills;
+  }
+
+  /**
+   * Loads a skill configuration by name.
+   * If level is specified, only searches that level.
+   * If level is omitted, searches project-level first, then user-level.
+   *
+   * @param name - Name of the skill to load
+   * @param level - Optional level to limit search to
+   * @returns SkillConfig or null if not found
+   */
+  async loadSkill(
+    name: string,
+    level?: SkillLevel,
+  ): Promise<SkillConfig | null> {
+    if (level) {
+      return this.findSkillByNameAtLevel(name, level);
+    }
+
+    // Try project level first
+    const projectSkill = await this.findSkillByNameAtLevel(name, 'project');
+    if (projectSkill) {
+      return projectSkill;
+    }
+
+    // Try user level
+    return this.findSkillByNameAtLevel(name, 'user');
+  }
+
+  /**
+   * Loads a skill with its full content, ready for runtime use.
+   * This includes loading additional files from the skill directory.
+   *
+   * @param name - Name of the skill to load
+   * @param level - Optional level to limit search to
+   * @returns SkillConfig or null if not found
+   */
+  async loadSkillForRuntime(
+    name: string,
+    level?: SkillLevel,
+  ): Promise<SkillConfig | null> {
+    const skill = await this.loadSkill(name, level);
+    if (!skill) {
+      return null;
+    }
+
+    return skill;
+  }
+
+  /**
+   * Validates a skill configuration.
+   *
+   * @param config - Configuration to validate
+   * @returns Validation result
+   */
+  validateConfig(config: Partial<SkillConfig>): SkillValidationResult {
+    const errors: string[] = [];
+    const warnings: string[] = [];
+
+    // Check required fields
+    if (typeof config.name !== 'string') {
+      errors.push('Missing or invalid "name" field');
+    } else if (config.name.trim() === '') {
+      errors.push('"name" cannot be empty');
+    }
+
+    if (typeof config.description !== 'string') {
+      errors.push('Missing or invalid "description" field');
+    } else if (config.description.trim() === '') {
+      errors.push('"description" cannot be empty');
+    }
+
+    // Validate allowedTools if present
+    if (config.allowedTools !== undefined) {
+      if (!Array.isArray(config.allowedTools)) {
+        errors.push('"allowedTools" must be an array');
+      } else {
+        for (const tool of config.allowedTools) {
+          if (typeof tool !== 'string') {
+            errors.push('"allowedTools" must contain only strings');
+            break;
+          }
+        }
+      }
+    }
+
+    // Warn if body is empty
+    if (!config.body || config.body.trim() === '') {
+      warnings.push('Skill body is empty');
+    }
+
+    return {
+      isValid: errors.length === 0,
+      errors,
+      warnings,
+    };
+  }
+
+  /**
+   * Refreshes the skills cache by loading all skills from disk.
+   */
+  async refreshCache(): Promise<void> {
+    const skillsCache = new Map<SkillLevel, SkillConfig[]>();
+    this.parseErrors.clear();
+
+    const levels: SkillLevel[] = ['project', 'user'];
+
+    for (const level of levels) {
+      const levelSkills = await this.listSkillsAtLevel(level);
+      skillsCache.set(level, levelSkills);
+    }
+
+    this.skillsCache = skillsCache;
+    this.notifyChangeListeners();
+  }
+
+  /**
+   * Parses a SKILL.md file and returns the configuration.
+   *
+   * @param filePath - Path to the SKILL.md file
+   * @param level - Storage level
+   * @returns SkillConfig
+   * @throws SkillError if parsing fails
+   */
+  parseSkillFile(filePath: string, level: SkillLevel): Promise<SkillConfig> {
+    return this.parseSkillFileInternal(filePath, level);
+  }
+
+  /**
+   * Internal implementation of skill file parsing.
+   */
+  private async parseSkillFileInternal(
+    filePath: string,
+    level: SkillLevel,
+  ): Promise<SkillConfig> {
+    let content: string;
+
+    try {
+      content = await fs.readFile(filePath, 'utf8');
+    } catch (error) {
+      const skillError = new SkillError(
+        `Failed to read skill file: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        SkillErrorCode.FILE_ERROR,
+      );
+      this.parseErrors.set(filePath, skillError);
+      throw skillError;
+    }
+
+    return this.parseSkillContent(content, filePath, level);
+  }
+
+  /**
+   * Parses skill content from a string.
+   *
+   * @param content - File content
+   * @param filePath - File path for error reporting
+   * @param level - Storage level
+   * @returns SkillConfig
+   * @throws SkillError if parsing fails
+   */
+  parseSkillContent(
+    content: string,
+    filePath: string,
+    level: SkillLevel,
+  ): SkillConfig {
+    try {
+      // Split frontmatter and content
+      const frontmatterRegex = /^---\n([\s\S]*?)\n---\n([\s\S]*)$/;
+      const match = content.match(frontmatterRegex);
+
+      if (!match) {
+        throw new Error('Invalid format: missing YAML frontmatter');
+      }
+
+      const [, frontmatterYaml, body] = match;
+
+      // Parse YAML frontmatter
+      const frontmatter = parseYaml(frontmatterYaml) as Record<string, unknown>;
+
+      // Extract required fields
+      const nameRaw = frontmatter['name'];
+      const descriptionRaw = frontmatter['description'];
+
+      if (nameRaw == null || nameRaw === '') {
+        throw new Error('Missing "name" in frontmatter');
+      }
+
+      if (descriptionRaw == null || descriptionRaw === '') {
+        throw new Error('Missing "description" in frontmatter');
+      }
+
+      // Convert to strings
+      const name = String(nameRaw);
+      const description = String(descriptionRaw);
+
+      // Extract optional fields
+      const allowedToolsRaw = frontmatter['allowedTools'] as
+        | unknown[]
+        | undefined;
+      let allowedTools: string[] | undefined;
+
+      if (allowedToolsRaw !== undefined) {
+        if (Array.isArray(allowedToolsRaw)) {
+          allowedTools = allowedToolsRaw.map(String);
+        } else {
+          throw new Error('"allowedTools" must be an array');
+        }
+      }
+
+      const config: SkillConfig = {
+        name,
+        description,
+        allowedTools,
+        level,
+        filePath,
+        body: body.trim(),
+      };
+
+      // Validate the parsed configuration
+      const validation = this.validateConfig(config);
+      if (!validation.isValid) {
+        throw new Error(`Validation failed: ${validation.errors.join(', ')}`);
+      }
+
+      return config;
+    } catch (error) {
+      const skillError = new SkillError(
+        `Failed to parse skill file: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        SkillErrorCode.PARSE_ERROR,
+      );
+      this.parseErrors.set(filePath, skillError);
+      throw skillError;
+    }
+  }
+
+  /**
+   * Gets the base directory for skills at a specific level.
+   *
+   * @param level - Storage level
+   * @returns Absolute directory path
+   */
+  getSkillsBaseDir(level: SkillLevel): string {
+    const baseDir =
+      level === 'project'
+        ? path.join(
+            this.config.getProjectRoot(),
+            QWEN_CONFIG_DIR,
+            SKILLS_CONFIG_DIR,
+          )
+        : path.join(os.homedir(), QWEN_CONFIG_DIR, SKILLS_CONFIG_DIR);
+
+    return baseDir;
+  }
+
+  /**
+   * Lists skills at a specific level.
+   *
+   * @param level - Storage level to scan
+   * @returns Array of skill configurations
+   */
+  private async listSkillsAtLevel(level: SkillLevel): Promise<SkillConfig[]> {
+    const projectRoot = this.config.getProjectRoot();
+    const homeDir = os.homedir();
+    const isHomeDirectory = path.resolve(projectRoot) === path.resolve(homeDir);
+
+    // If project level is requested but project root is same as home directory,
+    // return empty array to avoid conflicts between project and global skills
+    if (level === 'project' && isHomeDirectory) {
+      return [];
+    }
+
+    const baseDir = this.getSkillsBaseDir(level);
+
+    try {
+      const entries = await fs.readdir(baseDir, { withFileTypes: true });
+      const skills: SkillConfig[] = [];
+
+      for (const entry of entries) {
+        // Only process directories (each skill is a directory)
+        if (!entry.isDirectory()) continue;
+
+        const skillDir = path.join(baseDir, entry.name);
+        const skillManifest = path.join(skillDir, SKILL_MANIFEST_FILE);
+
+        try {
+          // Check if SKILL.md exists
+          await fs.access(skillManifest);
+
+          const config = await this.parseSkillFileInternal(
+            skillManifest,
+            level,
+          );
+          skills.push(config);
+        } catch (error) {
+          // Skip directories without valid SKILL.md
+          if (error instanceof SkillError) {
+            // Parse error was already recorded
+            console.warn(
+              `Failed to parse skill at ${skillDir}: ${error.message}`,
+            );
+          }
+          continue;
+        }
+      }
+
+      return skills;
+    } catch (_error) {
+      // Directory doesn't exist or can't be read
+      return [];
+    }
+  }
+
+  /**
+   * Finds a skill by name at a specific level.
+   *
+   * @param name - Name of the skill to find
+   * @param level - Storage level to search
+   * @returns SkillConfig or null if not found
+   */
+  private async findSkillByNameAtLevel(
+    name: string,
+    level: SkillLevel,
+  ): Promise<SkillConfig | null> {
+    await this.ensureLevelCache(level);
+
+    const levelSkills = this.skillsCache?.get(level) || [];
+
+    // Find the skill with matching name
+    return levelSkills.find((skill) => skill.name === name) || null;
+  }
+
+  /**
+   * Ensures the cache is populated for a specific level without loading other levels.
+   */
+  private async ensureLevelCache(level: SkillLevel): Promise<void> {
+    if (!this.skillsCache) {
+      this.skillsCache = new Map<SkillLevel, SkillConfig[]>();
+    }
+
+    if (!this.skillsCache.has(level)) {
+      const levelSkills = await this.listSkillsAtLevel(level);
+      this.skillsCache.set(level, levelSkills);
+    }
+  }
+}
--- a/packages/core/src/skills/types.ts
+++ b/packages/core/src/skills/types.ts
@@ -0,0 +1,105 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Represents the storage level for a skill configuration.
+ * - 'project': Stored in `.qwen/skills/` within the project directory
+ * - 'user': Stored in `~/.qwen/skills/` in the user's home directory
+ */
+export type SkillLevel = 'project' | 'user';
+
+/**
+ * Core configuration for a skill as stored in SKILL.md files.
+ * Each skill directory contains a SKILL.md file with YAML frontmatter
+ * containing metadata, followed by markdown content describing the skill.
+ */
+export interface SkillConfig {
+  /** Unique name identifier for the skill */
+  name: string;
+
+  /** Human-readable description of what this skill provides */
+  description: string;
+
+  /**
+   * Optional list of tool names that this skill is allowed to use.
+   * For v1, this is informational only (no gating).
+   */
+  allowedTools?: string[];
+
+  /**
+   * Storage level - determines where the configuration file is stored
+   */
+  level: SkillLevel;
+
+  /**
+   * Absolute path to the skill directory containing SKILL.md
+   */
+  filePath: string;
+
+  /**
+   * The markdown body content from SKILL.md (after the frontmatter)
+   */
+  body: string;
+}
+
+/**
+ * Runtime configuration for a skill when it's being actively used.
+ * Extends SkillConfig with additional runtime-specific fields.
+ */
+export type SkillRuntimeConfig = SkillConfig;
+
+/**
+ * Result of a validation operation on a skill configuration.
+ */
+export interface SkillValidationResult {
+  /** Whether the configuration is valid */
+  isValid: boolean;
+
+  /** Array of error messages if validation failed */
+  errors: string[];
+
+  /** Array of warning messages (non-blocking issues) */
+  warnings: string[];
+}
+
+/**
+ * Options for listing skills.
+ */
+export interface ListSkillsOptions {
+  /** Filter by storage level */
+  level?: SkillLevel;
+
+  /** Force refresh from disk, bypassing cache. Defaults to false. */
+  force?: boolean;
+}
+
+/**
+ * Error thrown when a skill operation fails.
+ */
+export class SkillError extends Error {
+  constructor(
+    message: string,
+    readonly code: SkillErrorCode,
+    readonly skillName?: string,
+  ) {
+    super(message);
+    this.name = 'SkillError';
+  }
+}
+
+/**
+ * Error codes for skill operations.
+ */
+export const SkillErrorCode = {
+  NOT_FOUND: 'NOT_FOUND',
+  INVALID_CONFIG: 'INVALID_CONFIG',
+  INVALID_NAME: 'INVALID_NAME',
+  FILE_ERROR: 'FILE_ERROR',
+  PARSE_ERROR: 'PARSE_ERROR',
+} as const;
+
+export type SkillErrorCode =
+  (typeof SkillErrorCode)[keyof typeof SkillErrorCode];
--- a/packages/core/src/telemetry/constants.ts
+++ b/packages/core/src/telemetry/constants.ts
@@ -33,6 +33,7 @@ export const EVENT_MALFORMED_JSON_RESPONSE =
 export const EVENT_FILE_OPERATION = 'qwen-code.file_operation';
 export const EVENT_MODEL_SLASH_COMMAND = 'qwen-code.slash_command.model';
 export const EVENT_SUBAGENT_EXECUTION = 'qwen-code.subagent_execution';
+export const EVENT_SKILL_LAUNCH = 'qwen-code.skill_launch';
 export const EVENT_AUTH = 'qwen-code.auth';

 // Performance Events
--- a/packages/core/src/telemetry/index.ts
+++ b/packages/core/src/telemetry/index.ts
@@ -44,6 +44,7 @@ export {
  logRipgrepFallback,
  logNextSpeakerCheck,
  logAuth,
+  logSkillLaunch,
 } from './loggers.js';
 export type { SlashCommandEvent, ChatCompressionEvent } from './types.js';
 export {
@@ -63,6 +64,7 @@ export {
  RipgrepFallbackEvent,
  NextSpeakerCheckEvent,
  AuthEvent,
+  SkillLaunchEvent,
 } from './types.js';
 export { makeSlashCommandEvent, makeChatCompressionEvent } from './types.js';
 export type { TelemetryEvent } from './types.js';
--- a/packages/core/src/telemetry/loggers.test.ts
+++ b/packages/core/src/telemetry/loggers.test.ts
@@ -206,6 +206,8 @@ describe('loggers', () => {
          mcp_tools: undefined,
          mcp_tools_count: undefined,
          output_format: 'json',
+          skills: undefined,
+          subagents: undefined,
        },
      });
    });
--- a/packages/core/src/telemetry/loggers.ts
+++ b/packages/core/src/telemetry/loggers.ts
@@ -38,6 +38,7 @@ import {
  EVENT_MALFORMED_JSON_RESPONSE,
  EVENT_INVALID_CHUNK,
  EVENT_AUTH,
+  EVENT_SKILL_LAUNCH,
 } from './constants.js';
 import {
  recordApiErrorMetrics,
@@ -85,6 +86,7 @@ import type {
  MalformedJsonResponseEvent,
  InvalidChunkEvent,
  AuthEvent,
+  SkillLaunchEvent,
 } from './types.js';
 import type { UiEvent } from './uiTelemetry.js';
 import { uiTelemetryService } from './uiTelemetry.js';
@@ -127,6 +129,8 @@ export function logStartSession(
    mcp_tools: event.mcp_tools,
    mcp_tools_count: event.mcp_tools_count,
    output_format: event.output_format,
+    skills: event.skills,
+    subagents: event.subagents,
  };

  const logger = logs.getLogger(SERVICE_NAME);
@@ -869,3 +873,21 @@ export function logAuth(config: Config, event: AuthEvent): void {
  };
  logger.emit(logRecord);
 }
+
+export function logSkillLaunch(config: Config, event: SkillLaunchEvent): void {
+  if (!isTelemetrySdkInitialized()) return;
+
+  const attributes: LogAttributes = {
+    ...getCommonAttributes(config),
+    ...event,
+    'event.name': EVENT_SKILL_LAUNCH,
+    'event.timestamp': new Date().toISOString(),
+  };
+
+  const logger = logs.getLogger(SERVICE_NAME);
+  const logRecord: LogRecord = {
+    body: `Skill launch: ${event.skill_name}. Success: ${event.success}.`,
+    attributes,
+  };
+  logger.emit(logRecord);
+}
--- a/packages/core/src/telemetry/qwen-logger/qwen-logger.ts
+++ b/packages/core/src/telemetry/qwen-logger/qwen-logger.ts
@@ -38,6 +38,7 @@ import type {
  ModelSlashCommandEvent,
  ExtensionDisableEvent,
  AuthEvent,
+  SkillLaunchEvent,
  RipgrepFallbackEvent,
  EndSessionEvent,
 } from '../types.js';
@@ -391,6 +392,8 @@ export class QwenLogger {
        telemetry_enabled: event.telemetry_enabled,
        telemetry_log_user_prompts_enabled:
          event.telemetry_log_user_prompts_enabled,
+        skills: event.skills,
+        subagents: event.subagents,
      },
    });

@@ -827,6 +830,18 @@ export class QwenLogger {
    this.flushIfNeeded();
  }

+  logSkillLaunchEvent(event: SkillLaunchEvent): void {
+    const rumEvent = this.createActionEvent('misc', 'skill_launch', {
+      properties: {
+        skill_name: event.skill_name,
+        success: event.success ? 1 : 0,
+      },
+    });
+
+    this.enqueueLogEvent(rumEvent);
+    this.flushIfNeeded();
+  }
+
  logChatCompressionEvent(event: ChatCompressionEvent): void {
    const rumEvent = this.createActionEvent('misc', 'chat_compression', {
      properties: {
--- a/packages/core/src/telemetry/types.ts
+++ b/packages/core/src/telemetry/types.ts
@@ -18,6 +18,9 @@ import {
 import type { FileOperation } from './metrics.js';
 export { ToolCallDecision };
 import type { OutputFormat } from '../output/types.js';
+import { ToolNames } from '../tools/tool-names.js';
+import type { SkillTool } from '../tools/skill.js';
+import type { TaskTool } from '../tools/task.js';

 export interface BaseTelemetryEvent {
  'event.name': string;
@@ -47,6 +50,8 @@ export class StartSessionEvent implements BaseTelemetryEvent {
  mcp_tools_count?: number;
  mcp_tools?: string;
  output_format: OutputFormat;
+  skills?: string;
+  subagents?: string;

  constructor(config: Config) {
    const generatorConfig = config.getContentGeneratorConfig();
@@ -79,6 +84,7 @@ export class StartSessionEvent implements BaseTelemetryEvent {
      config.getFileFilteringRespectGitIgnore();
    this.mcp_servers_count = mcpServers ? Object.keys(mcpServers).length : 0;
    this.output_format = config.getOutputFormat();
+
    if (toolRegistry) {
      const mcpTools = toolRegistry
        .getAllTools()
@@ -87,6 +93,22 @@ export class StartSessionEvent implements BaseTelemetryEvent {
      this.mcp_tools = mcpTools
        .map((tool) => (tool as DiscoveredMCPTool).name)
        .join(',');
+
+      const skillTool = toolRegistry.getTool(ToolNames.SKILL) as
+        | SkillTool
+        | undefined;
+      const skillNames = skillTool?.getAvailableSkillNames?.();
+      if (skillNames && skillNames.length > 0) {
+        this.skills = skillNames.join(',');
+      }
+
+      const taskTool = toolRegistry.getTool(ToolNames.TASK) as
+        | TaskTool
+        | undefined;
+      const subagentNames = taskTool?.getAvailableSubagentNames?.();
+      if (subagentNames && subagentNames.length > 0) {
+        this.subagents = subagentNames.join(',');
+      }
    }
  }
 }
@@ -721,6 +743,20 @@ export class AuthEvent implements BaseTelemetryEvent {
  }
 }

+export class SkillLaunchEvent implements BaseTelemetryEvent {
+  'event.name': 'skill_launch';
+  'event.timestamp': string;
+  skill_name: string;
+  success: boolean;
+
+  constructor(skill_name: string, success: boolean) {
+    this['event.name'] = 'skill_launch';
+    this['event.timestamp'] = new Date().toISOString();
+    this.skill_name = skill_name;
+    this.success = success;
+  }
+}
+
 export type TelemetryEvent =
  | StartSessionEvent
  | EndSessionEvent
@@ -749,7 +785,8 @@ export type TelemetryEvent =
  | ExtensionUninstallEvent
  | ToolOutputTruncatedEvent
  | ModelSlashCommandEvent
-  | AuthEvent;
+  | AuthEvent
+  | SkillLaunchEvent;

 export class ExtensionDisableEvent implements BaseTelemetryEvent {
  'event.name': 'extension_disable';
--- a/packages/core/src/tools/ls.test.ts
+++ b/packages/core/src/tools/ls.test.ts
@@ -31,6 +31,8 @@ describe('LSTool', () => {
      tempSecondaryDir,
    ]);

+    const userSkillsBase = path.join(os.homedir(), '.qwen', 'skills');
+
    mockConfig = {
      getTargetDir: () => tempRootDir,
      getWorkspaceContext: () => mockWorkspaceContext,
@@ -39,6 +41,9 @@ describe('LSTool', () => {
        respectGitIgnore: true,
        respectQwenIgnore: true,
      }),
+      storage: {
+        getUserSkillsDir: () => userSkillsBase,
+      },
    } as unknown as Config;

    lsTool = new LSTool(mockConfig);
@@ -288,7 +293,7 @@ describe('LSTool', () => {
      };
      const invocation = lsTool.build(params);
      const description = invocation.getDescription();
-      const expected = path.relative(tempRootDir, params.path);
+      const expected = path.resolve(params.path);
      expect(description).toBe(expected);
    });
  });
--- a/packages/core/src/tools/ls.ts
+++ b/packages/core/src/tools/ls.ts
@@ -9,6 +9,7 @@ import path from 'node:path';
 import type { ToolInvocation, ToolResult } from './tools.js';
 import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
 import { makeRelative, shortenPath } from '../utils/paths.js';
+import { isSubpath } from '../utils/paths.js';
 import type { Config } from '../config/config.js';
 import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
 import { ToolErrorType } from './tool-error.js';
@@ -311,8 +312,14 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
      return `Path must be absolute: ${params.path}`;
    }

+    const userSkillsBase = this.config.storage.getUserSkillsDir();
+    const isUnderUserSkills = isSubpath(userSkillsBase, params.path);
+
    const workspaceContext = this.config.getWorkspaceContext();
-    if (!workspaceContext.isPathWithinWorkspace(params.path)) {
+    if (
+      !workspaceContext.isPathWithinWorkspace(params.path) &&
+      !isUnderUserSkills
+    ) {
      const directories = workspaceContext.getDirectories();
      return `Path must be within one of the workspace directories: ${directories.join(
        ', ',
--- a/packages/core/src/tools/read-file.test.ts
+++ b/packages/core/src/tools/read-file.test.ts
@@ -40,6 +40,7 @@ describe('ReadFileTool', () => {
      getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir),
      storage: {
        getProjectTempDir: () => path.join(tempRootDir, '.temp'),
+        getUserSkillsDir: () => path.join(os.homedir(), '.qwen', 'skills'),
      },
      getTruncateToolOutputThreshold: () => 2500,
      getTruncateToolOutputLines: () => 500,
--- a/packages/core/src/tools/read-file.ts
+++ b/packages/core/src/tools/read-file.ts
@@ -20,6 +20,7 @@ import { FileOperation } from '../telemetry/metrics.js';
 import { getProgrammingLanguage } from '../telemetry/telemetry-utils.js';
 import { logFileOperation } from '../telemetry/loggers.js';
 import { FileOperationEvent } from '../telemetry/types.js';
+import { isSubpath } from '../utils/paths.js';

 /**
 * Parameters for the ReadFile tool
@@ -183,15 +184,20 @@ export class ReadFileTool extends BaseDeclarativeTool<

    const workspaceContext = this.config.getWorkspaceContext();
    const projectTempDir = this.config.storage.getProjectTempDir();
+    const userSkillsDir = this.config.storage.getUserSkillsDir();
    const resolvedFilePath = path.resolve(filePath);
-    const resolvedProjectTempDir = path.resolve(projectTempDir);
-    const isWithinTempDir =
-      resolvedFilePath.startsWith(resolvedProjectTempDir + path.sep) ||
-      resolvedFilePath === resolvedProjectTempDir;
+    const isWithinTempDir = isSubpath(projectTempDir, resolvedFilePath);
+    const isWithinUserSkills = isSubpath(userSkillsDir, resolvedFilePath);

-    if (!workspaceContext.isPathWithinWorkspace(filePath) && !isWithinTempDir) {
+    if (
+      !workspaceContext.isPathWithinWorkspace(filePath) &&
+      !isWithinTempDir &&
+      !isWithinUserSkills
+    ) {
      const directories = workspaceContext.getDirectories();
-      return `File path must be within one of the workspace directories: ${directories.join(', ')} or within the project temp directory: ${projectTempDir}`;
+      return `File path must be within one of the workspace directories: ${directories.join(
+        ', ',
+      )} or within the project temp directory: ${projectTempDir}`;
    }
    if (params.offset !== undefined && params.offset < 0) {
      return 'Offset must be a non-negative number';
--- a/packages/core/src/tools/skill.test.ts
+++ b/packages/core/src/tools/skill.test.ts
@@ -0,0 +1,442 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { SkillTool, type SkillParams } from './skill.js';
+import type { PartListUnion } from '@google/genai';
+import type { ToolResultDisplay } from './tools.js';
+import type { Config } from '../config/config.js';
+import { SkillManager } from '../skills/skill-manager.js';
+import type { SkillConfig } from '../skills/types.js';
+import { partToString } from '../utils/partUtils.js';
+
+// Type for accessing protected methods in tests
+type SkillToolWithProtectedMethods = SkillTool & {
+  createInvocation: (params: SkillParams) => {
+    execute: (
+      signal?: AbortSignal,
+      updateOutput?: (output: ToolResultDisplay) => void,
+    ) => Promise<{
+      llmContent: PartListUnion;
+      returnDisplay: ToolResultDisplay;
+    }>;
+    getDescription: () => string;
+    shouldConfirmExecute: () => Promise<boolean>;
+  };
+};
+
+// Mock dependencies
+vi.mock('../skills/skill-manager.js');
+vi.mock('../telemetry/index.js', () => ({
+  logSkillLaunch: vi.fn(),
+  SkillLaunchEvent: class {
+    constructor(
+      public skill_name: string,
+      public success: boolean,
+    ) {}
+  },
+}));
+
+const MockedSkillManager = vi.mocked(SkillManager);
+
+describe('SkillTool', () => {
+  let config: Config;
+  let skillTool: SkillTool;
+  let mockSkillManager: SkillManager;
+  let changeListeners: Array<() => void>;
+
+  const mockSkills: SkillConfig[] = [
+    {
+      name: 'code-review',
+      description: 'Specialized skill for reviewing code quality',
+      level: 'project',
+      filePath: '/project/.qwen/skills/code-review/SKILL.md',
+      body: 'Review code for quality and best practices.',
+    },
+    {
+      name: 'testing',
+      description: 'Skill for writing and running tests',
+      level: 'user',
+      filePath: '/home/user/.qwen/skills/testing/SKILL.md',
+      body: 'Help write comprehensive tests.',
+      allowedTools: ['read_file', 'write_file', 'shell'],
+    },
+  ];
+
+  beforeEach(async () => {
+    // Setup fake timers
+    vi.useFakeTimers();
+
+    // Create mock config
+    config = {
+      getProjectRoot: vi.fn().mockReturnValue('/test/project'),
+      getSessionId: vi.fn().mockReturnValue('test-session-id'),
+      getSkillManager: vi.fn(),
+      getGeminiClient: vi.fn().mockReturnValue(undefined),
+    } as unknown as Config;
+
+    changeListeners = [];
+
+    // Setup SkillManager mock
+    mockSkillManager = {
+      listSkills: vi.fn().mockResolvedValue(mockSkills),
+      loadSkill: vi.fn(),
+      loadSkillForRuntime: vi.fn(),
+      addChangeListener: vi.fn((listener: () => void) => {
+        changeListeners.push(listener);
+        return () => {
+          const index = changeListeners.indexOf(listener);
+          if (index >= 0) {
+            changeListeners.splice(index, 1);
+          }
+        };
+      }),
+      getParseErrors: vi.fn().mockReturnValue(new Map()),
+    } as unknown as SkillManager;
+
+    MockedSkillManager.mockImplementation(() => mockSkillManager);
+
+    // Make config return the mock SkillManager
+    vi.mocked(config.getSkillManager).mockReturnValue(mockSkillManager);
+
+    // Create SkillTool instance
+    skillTool = new SkillTool(config);
+
+    // Allow async initialization to complete
+    await vi.runAllTimersAsync();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.clearAllMocks();
+  });
+
+  describe('initialization', () => {
+    it('should initialize with correct name and properties', () => {
+      expect(skillTool.name).toBe('skill');
+      expect(skillTool.displayName).toBe('Skill');
+      expect(skillTool.kind).toBe('read');
+    });
+
+    it('should load available skills during initialization', () => {
+      expect(mockSkillManager.listSkills).toHaveBeenCalled();
+    });
+
+    it('should subscribe to skill manager changes', () => {
+      expect(mockSkillManager.addChangeListener).toHaveBeenCalledTimes(1);
+    });
+
+    it('should update description with available skills', () => {
+      expect(skillTool.description).toContain('code-review');
+      expect(skillTool.description).toContain(
+        'Specialized skill for reviewing code quality',
+      );
+      expect(skillTool.description).toContain('testing');
+      expect(skillTool.description).toContain(
+        'Skill for writing and running tests',
+      );
+    });
+
+    it('should handle empty skills list gracefully', async () => {
+      vi.mocked(mockSkillManager.listSkills).mockResolvedValue([]);
+
+      const emptySkillTool = new SkillTool(config);
+      await vi.runAllTimersAsync();
+
+      expect(emptySkillTool.description).toContain(
+        'No skills are currently configured',
+      );
+    });
+
+    it('should handle skill loading errors gracefully', async () => {
+      vi.mocked(mockSkillManager.listSkills).mockRejectedValue(
+        new Error('Loading failed'),
+      );
+
+      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+
+      new SkillTool(config);
+      await vi.runAllTimersAsync();
+
+      expect(consoleSpy).toHaveBeenCalledWith(
+        'Failed to load skills for Skills tool:',
+        expect.any(Error),
+      );
+      consoleSpy.mockRestore();
+    });
+  });
+
+  describe('schema generation', () => {
+    it('should expose static schema without dynamic enums', () => {
+      const schema = skillTool.schema;
+      const properties = schema.parametersJsonSchema as {
+        properties: {
+          skill: {
+            type: string;
+            description: string;
+            enum?: string[];
+          };
+        };
+      };
+      expect(properties.properties.skill.type).toBe('string');
+      expect(properties.properties.skill.description).toBe(
+        'The skill name (no arguments). E.g., "pdf" or "xlsx"',
+      );
+      expect(properties.properties.skill.enum).toBeUndefined();
+    });
+
+    it('should keep schema static even when no skills available', async () => {
+      vi.mocked(mockSkillManager.listSkills).mockResolvedValue([]);
+
+      const emptySkillTool = new SkillTool(config);
+      await vi.runAllTimersAsync();
+
+      const schema = emptySkillTool.schema;
+      const properties = schema.parametersJsonSchema as {
+        properties: {
+          skill: {
+            type: string;
+            description: string;
+            enum?: string[];
+          };
+        };
+      };
+      expect(properties.properties.skill.type).toBe('string');
+      expect(properties.properties.skill.description).toBe(
+        'The skill name (no arguments). E.g., "pdf" or "xlsx"',
+      );
+      expect(properties.properties.skill.enum).toBeUndefined();
+    });
+  });
+
+  describe('validateToolParams', () => {
+    it('should validate valid parameters', () => {
+      const result = skillTool.validateToolParams({ skill: 'code-review' });
+      expect(result).toBeNull();
+    });
+
+    it('should reject empty skill', () => {
+      const result = skillTool.validateToolParams({ skill: '' });
+      expect(result).toBe('Parameter "skill" must be a non-empty string.');
+    });
+
+    it('should reject non-existent skill', () => {
+      const result = skillTool.validateToolParams({
+        skill: 'non-existent',
+      });
+      expect(result).toBe(
+        'Skill "non-existent" not found. Available skills: code-review, testing',
+      );
+    });
+
+    it('should show appropriate message when no skills available', async () => {
+      vi.mocked(mockSkillManager.listSkills).mockResolvedValue([]);
+
+      const emptySkillTool = new SkillTool(config);
+      await vi.runAllTimersAsync();
+
+      const result = emptySkillTool.validateToolParams({
+        skill: 'non-existent',
+      });
+      expect(result).toBe(
+        'Skill "non-existent" not found. No skills are currently available.',
+      );
+    });
+  });
+
+  describe('refreshSkills', () => {
+    it('should refresh when change listener fires', async () => {
+      const newSkills: SkillConfig[] = [
+        {
+          name: 'new-skill',
+          description: 'A brand new skill',
+          level: 'project',
+          filePath: '/project/.qwen/skills/new-skill/SKILL.md',
+          body: 'New skill content.',
+        },
+      ];
+
+      vi.mocked(mockSkillManager.listSkills).mockResolvedValueOnce(newSkills);
+
+      const listener = changeListeners[0];
+      expect(listener).toBeDefined();
+
+      listener?.();
+      await vi.runAllTimersAsync();
+
+      expect(skillTool.description).toContain('new-skill');
+      expect(skillTool.description).toContain('A brand new skill');
+    });
+
+    it('should refresh available skills and update description', async () => {
+      const newSkills: SkillConfig[] = [
+        {
+          name: 'test-skill',
+          description: 'A test skill',
+          level: 'project',
+          filePath: '/project/.qwen/skills/test-skill/SKILL.md',
+          body: 'Test content.',
+        },
+      ];
+
+      vi.mocked(mockSkillManager.listSkills).mockResolvedValue(newSkills);
+
+      await skillTool.refreshSkills();
+
+      expect(skillTool.description).toContain('test-skill');
+      expect(skillTool.description).toContain('A test skill');
+    });
+  });
+
+  describe('SkillToolInvocation', () => {
+    const mockRuntimeConfig: SkillConfig = {
+      ...mockSkills[0],
+    };
+
+    beforeEach(() => {
+      vi.mocked(mockSkillManager.loadSkillForRuntime).mockResolvedValue(
+        mockRuntimeConfig,
+      );
+    });
+
+    it('should execute skill load successfully', async () => {
+      const params: SkillParams = {
+        skill: 'code-review',
+      };
+
+      const invocation = (
+        skillTool as SkillToolWithProtectedMethods
+      ).createInvocation(params);
+      const result = await invocation.execute();
+
+      expect(mockSkillManager.loadSkillForRuntime).toHaveBeenCalledWith(
+        'code-review',
+      );
+
+      const llmText = partToString(result.llmContent);
+      expect(llmText).toContain(
+        'Base directory for this skill: /project/.qwen/skills/code-review',
+      );
+      expect(llmText.trim()).toContain(
+        'Review code for quality and best practices.',
+      );
+
+      expect(result.returnDisplay).toBe('Launching skill: code-review');
+    });
+
+    it('should include allowedTools in result when present', async () => {
+      const skillWithTools: SkillConfig = {
+        ...mockSkills[1],
+      };
+      vi.mocked(mockSkillManager.loadSkillForRuntime).mockResolvedValue(
+        skillWithTools,
+      );
+
+      const params: SkillParams = {
+        skill: 'testing',
+      };
+
+      const invocation = (
+        skillTool as SkillToolWithProtectedMethods
+      ).createInvocation(params);
+      const result = await invocation.execute();
+
+      const llmText = partToString(result.llmContent);
+      expect(llmText).toContain('testing');
+      // Base description is omitted from llmContent; ensure body is present.
+      expect(llmText).toContain('Help write comprehensive tests.');
+
+      expect(result.returnDisplay).toBe('Launching skill: testing');
+    });
+
+    it('should handle skill not found error', async () => {
+      vi.mocked(mockSkillManager.loadSkillForRuntime).mockResolvedValue(null);
+
+      const params: SkillParams = {
+        skill: 'non-existent',
+      };
+
+      const invocation = (
+        skillTool as SkillToolWithProtectedMethods
+      ).createInvocation(params);
+      const result = await invocation.execute();
+
+      const llmText = partToString(result.llmContent);
+      expect(llmText).toContain('Skill "non-existent" not found');
+    });
+
+    it('should handle execution errors gracefully', async () => {
+      vi.mocked(mockSkillManager.loadSkillForRuntime).mockRejectedValue(
+        new Error('Loading failed'),
+      );
+
+      const consoleSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
+
+      const params: SkillParams = {
+        skill: 'code-review',
+      };
+
+      const invocation = (
+        skillTool as SkillToolWithProtectedMethods
+      ).createInvocation(params);
+      const result = await invocation.execute();
+
+      const llmText = partToString(result.llmContent);
+      expect(llmText).toContain('Failed to load skill');
+      expect(llmText).toContain('Loading failed');
+
+      consoleSpy.mockRestore();
+    });
+
+    it('should not require confirmation', async () => {
+      const params: SkillParams = {
+        skill: 'code-review',
+      };
+
+      const invocation = (
+        skillTool as SkillToolWithProtectedMethods
+      ).createInvocation(params);
+      const shouldConfirm = await invocation.shouldConfirmExecute();
+
+      expect(shouldConfirm).toBe(false);
+    });
+
+    it('should provide correct description', () => {
+      const params: SkillParams = {
+        skill: 'code-review',
+      };
+
+      const invocation = (
+        skillTool as SkillToolWithProtectedMethods
+      ).createInvocation(params);
+      const description = invocation.getDescription();
+
+      expect(description).toBe('Launching skill: "code-review"');
+    });
+
+    it('should handle skill without additional files', async () => {
+      vi.mocked(mockSkillManager.loadSkillForRuntime).mockResolvedValue(
+        mockSkills[0],
+      );
+
+      const params: SkillParams = {
+        skill: 'code-review',
+      };
+
+      const invocation = (
+        skillTool as SkillToolWithProtectedMethods
+      ).createInvocation(params);
+      const result = await invocation.execute();
+
+      const llmText = partToString(result.llmContent);
+      expect(llmText).not.toContain('## Additional Files');
+
+      expect(result.returnDisplay).toBe('Launching skill: code-review');
+    });
+  });
+});
--- a/packages/core/src/tools/skill.ts
+++ b/packages/core/src/tools/skill.ts
@@ -0,0 +1,264 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
+import { ToolNames, ToolDisplayNames } from './tool-names.js';
+import type { ToolResult, ToolResultDisplay } from './tools.js';
+import type { Config } from '../config/config.js';
+import type { SkillManager } from '../skills/skill-manager.js';
+import type { SkillConfig } from '../skills/types.js';
+import { logSkillLaunch, SkillLaunchEvent } from '../telemetry/index.js';
+import path from 'path';
+
+export interface SkillParams {
+  skill: string;
+}
+
+/**
+ * Skill tool that enables the model to access skill definitions.
+ * The tool dynamically loads available skills and includes them in its description
+ * for the model to choose from.
+ */
+export class SkillTool extends BaseDeclarativeTool<SkillParams, ToolResult> {
+  static readonly Name: string = ToolNames.SKILL;
+
+  private skillManager: SkillManager;
+  private availableSkills: SkillConfig[] = [];
+
+  constructor(private readonly config: Config) {
+    // Initialize with a basic schema first
+    const initialSchema = {
+      type: 'object',
+      properties: {
+        skill: {
+          type: 'string',
+          description: 'The skill name (no arguments). E.g., "pdf" or "xlsx"',
+        },
+      },
+      required: ['skill'],
+      additionalProperties: false,
+      $schema: 'http://json-schema.org/draft-07/schema#',
+    };
+
+    super(
+      SkillTool.Name,
+      ToolDisplayNames.SKILL,
+      'Execute a skill within the main conversation. Loading available skills...', // Initial description
+      Kind.Read,
+      initialSchema,
+      true, // isOutputMarkdown
+      false, // canUpdateOutput
+    );
+
+    this.skillManager = config.getSkillManager();
+    this.skillManager.addChangeListener(() => {
+      void this.refreshSkills();
+    });
+
+    // Initialize the tool asynchronously
+    this.refreshSkills();
+  }
+
+  /**
+   * Asynchronously initializes the tool by loading available skills
+   * and updating the description and schema.
+   */
+  async refreshSkills(): Promise<void> {
+    try {
+      this.availableSkills = await this.skillManager.listSkills();
+      this.updateDescriptionAndSchema();
+    } catch (error) {
+      console.warn('Failed to load skills for Skills tool:', error);
+      this.availableSkills = [];
+      this.updateDescriptionAndSchema();
+    } finally {
+      // Update the client with the new tools
+      const geminiClient = this.config.getGeminiClient();
+      if (geminiClient && geminiClient.isInitialized()) {
+        await geminiClient.setTools();
+      }
+    }
+  }
+
+  /**
+   * Updates the tool's description and schema based on available skills.
+   */
+  private updateDescriptionAndSchema(): void {
+    let skillDescriptions = '';
+    if (this.availableSkills.length === 0) {
+      skillDescriptions =
+        'No skills are currently configured. Skills can be created by adding directories with SKILL.md files to .qwen/skills/ or ~/.qwen/skills/.';
+    } else {
+      skillDescriptions = this.availableSkills
+        .map(
+          (skill) => `<skill>
+<name>
+${skill.name}
+</name>
+<description>
+${skill.description} (${skill.level})
+</description>
+<location>
+${skill.level}
+</location>
+</skill>`,
+        )
+        .join('\n');
+    }
+
+    const baseDescription = `Execute a skill within the main conversation
+
+<skills_instructions>
+When users ask you to perform tasks, check if any of the available skills below can help complete the task more effectively. Skills provide specialized capabilities and domain knowledge.
+
+How to invoke:
+- Use this tool with the skill name only (no arguments)
+- Examples:
+  - \`skill: "pdf"\` - invoke the pdf skill
+  - \`skill: "xlsx"\` - invoke the xlsx skill
+  - \`skill: "ms-office-suite:pdf"\` - invoke using fully qualified name
+
+Important:
+- When a skill is relevant, you must invoke this tool IMMEDIATELY as your first action
+- NEVER just announce or mention a skill in your text response without actually calling this tool
+- This is a BLOCKING REQUIREMENT: invoke the relevant Skill tool BEFORE generating any other response about the task
+- Only use skills listed in <available_skills> below
+- Do not invoke a skill that is already running
+- Do not use this tool for built-in CLI commands (like /help, /clear, etc.)
+</skills_instructions>
+
+<available_skills>
+${skillDescriptions}
+</available_skills>
+`;
+    // Update description using object property assignment
+    (this as { description: string }).description = baseDescription;
+  }
+
+  override validateToolParams(params: SkillParams): string | null {
+    // Validate required fields
+    if (
+      !params.skill ||
+      typeof params.skill !== 'string' ||
+      params.skill.trim() === ''
+    ) {
+      return 'Parameter "skill" must be a non-empty string.';
+    }
+
+    // Validate that the skill exists
+    const skillExists = this.availableSkills.some(
+      (skill) => skill.name === params.skill,
+    );
+
+    if (!skillExists) {
+      const availableNames = this.availableSkills.map((s) => s.name);
+      if (availableNames.length === 0) {
+        return `Skill "${params.skill}" not found. No skills are currently available.`;
+      }
+      return `Skill "${params.skill}" not found. Available skills: ${availableNames.join(', ')}`;
+    }
+
+    return null;
+  }
+
+  protected createInvocation(params: SkillParams) {
+    return new SkillToolInvocation(this.config, this.skillManager, params);
+  }
+
+  getAvailableSkillNames(): string[] {
+    return this.availableSkills.map((skill) => skill.name);
+  }
+}
+
+class SkillToolInvocation extends BaseToolInvocation<SkillParams, ToolResult> {
+  constructor(
+    private readonly config: Config,
+    private readonly skillManager: SkillManager,
+    params: SkillParams,
+  ) {
+    super(params);
+  }
+
+  getDescription(): string {
+    return `Launching skill: "${this.params.skill}"`;
+  }
+
+  override async shouldConfirmExecute(): Promise<false> {
+    // Skill loading is a read-only operation, no confirmation needed
+    return false;
+  }
+
+  async execute(
+    _signal?: AbortSignal,
+    _updateOutput?: (output: ToolResultDisplay) => void,
+  ): Promise<ToolResult> {
+    try {
+      // Load the skill with runtime config (includes additional files)
+      const skill = await this.skillManager.loadSkillForRuntime(
+        this.params.skill,
+      );
+
+      if (!skill) {
+        // Log failed skill launch
+        logSkillLaunch(
+          this.config,
+          new SkillLaunchEvent(this.params.skill, false),
+        );
+
+        // Get parse errors if any
+        const parseErrors = this.skillManager.getParseErrors();
+        const errorMessages: string[] = [];
+
+        for (const [filePath, error] of parseErrors) {
+          if (filePath.includes(this.params.skill)) {
+            errorMessages.push(`Parse error at ${filePath}: ${error.message}`);
+          }
+        }
+
+        const errorDetail =
+          errorMessages.length > 0
+            ? `\nErrors:\n${errorMessages.join('\n')}`
+            : '';
+
+        return {
+          llmContent: `Skill "${this.params.skill}" not found.${errorDetail}`,
+          returnDisplay: `Skill "${this.params.skill}" not found.${errorDetail}`,
+        };
+      }
+
+      // Log successful skill launch
+      logSkillLaunch(
+        this.config,
+        new SkillLaunchEvent(this.params.skill, true),
+      );
+
+      const baseDir = path.dirname(skill.filePath);
+
+      // Build markdown content for LLM (show base dir, then body)
+      const llmContent = `Base directory for this skill: ${baseDir}\n\n${skill.body}\n`;
+
+      return {
+        llmContent: [{ text: llmContent }],
+        returnDisplay: `Launching skill: ${skill.name}`,
+      };
+    } catch (error) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      console.error(`[SkillsTool] Error launching skill: ${errorMessage}`);
+
+      // Log failed skill launch
+      logSkillLaunch(
+        this.config,
+        new SkillLaunchEvent(this.params.skill, false),
+      );
+
+      return {
+        llmContent: `Failed to load skill "${this.params.skill}": ${errorMessage}`,
+        returnDisplay: `Failed to load skill "${this.params.skill}": ${errorMessage}`,
+      };
+    }
+  }
+}
--- a/packages/core/src/tools/task.ts
+++ b/packages/core/src/tools/task.ts
@@ -252,6 +252,10 @@ assistant: "I'm going to use the Task tool to launch the with the greeting-respo
  protected createInvocation(params: TaskParams) {
    return new TaskToolInvocation(this.config, this.subagentManager, params);
  }
+
+  getAvailableSubagentNames(): string[] {
+    return this.availableSubagents.map((subagent) => subagent.name);
+  }
 }

 class TaskToolInvocation extends BaseToolInvocation<TaskParams, ToolResult> {
--- a/packages/core/src/tools/tool-names.ts
+++ b/packages/core/src/tools/tool-names.ts
@@ -20,6 +20,7 @@ export const ToolNames = {
  TODO_WRITE: 'todo_write',
  MEMORY: 'save_memory',
  TASK: 'task',
+  SKILL: 'skill',
  EXIT_PLAN_MODE: 'exit_plan_mode',
  WEB_FETCH: 'web_fetch',
  WEB_SEARCH: 'web_search',
@@ -42,6 +43,7 @@ export const ToolDisplayNames = {
  TODO_WRITE: 'TodoWrite',
  MEMORY: 'SaveMemory',
  TASK: 'Task',
+  SKILL: 'Skill',
  EXIT_PLAN_MODE: 'ExitPlanMode',
  WEB_FETCH: 'WebFetch',
  WEB_SEARCH: 'WebSearch',
--- a/packages/core/src/utils/paths.ts
+++ b/packages/core/src/utils/paths.ts
@@ -120,6 +120,10 @@ export function makeRelative(
  const resolvedTargetPath = path.resolve(targetPath);
  const resolvedRootDirectory = path.resolve(rootDirectory);

+  if (!isSubpath(resolvedRootDirectory, resolvedTargetPath)) {
+    return resolvedTargetPath;
+  }
+
  const relativePath = path.relative(resolvedRootDirectory, resolvedTargetPath);

  // If the paths are the same, path.relative returns '', return '.' instead
--- a/packages/sdk-typescript/package.json
+++ b/packages/sdk-typescript/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/sdk",
-  "version": "0.1.1",
+  "version": "0.6.0",
  "description": "TypeScript SDK for programmatic access to qwen-code CLI",
  "main": "./dist/index.cjs",
  "module": "./dist/index.mjs",
--- 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.5.1",
+  "version": "0.6.0",
  "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.5.1",
+  "version": "0.6.0",
  "publisher": "qwenlm",
  "icon": "assets/icon.png",
  "repository": {
@@ -11,7 +11,7 @@
    "directory": "packages/vscode-ide-companion"
  },
  "engines": {
-    "vscode": "^1.99.0"
+    "vscode": "^1.85.0"
  },
  "license": "LICENSE",
  "preview": true,
@@ -137,7 +137,7 @@
    "@types/react": "^19.1.8",
    "@types/react-dom": "^19.1.6",
    "@types/semver": "^7.7.1",
-    "@types/vscode": "^1.99.0",
+    "@types/vscode": "^1.85.0",
    "@typescript-eslint/eslint-plugin": "^8.31.1",
    "@typescript-eslint/parser": "^8.31.1",
    "@vscode/vsce": "^3.6.0",
--- a/packages/vscode-ide-companion/src/ide-server.test.ts
+++ b/packages/vscode-ide-companion/src/ide-server.test.ts
@@ -27,13 +27,14 @@ vi.mock('node:fs/promises', () => ({
  writeFile: vi.fn(() => Promise.resolve(undefined)),
  unlink: vi.fn(() => Promise.resolve(undefined)),
  chmod: vi.fn(() => Promise.resolve(undefined)),
+  mkdir: vi.fn(() => Promise.resolve(undefined)),
 }));

 vi.mock('node:os', async (importOriginal) => {
  const actual = await importOriginal<typeof os>();
  return {
    ...actual,
-    tmpdir: vi.fn(() => '/tmp'),
+    homedir: vi.fn(() => '/home/test'),
  };
 });

@@ -128,30 +129,24 @@ describe('IDEServer', () => {
    );

    const port = getPortFromMock(replaceMock);
-    const expectedPortFile = path.join(
-      '/tmp',
-      `qwen-code-ide-server-${port}.json`,
-    );
-    const expectedPpidPortFile = path.join(
-      '/tmp',
-      `qwen-code-ide-server-${process.ppid}.json`,
+    const expectedLockFile = path.join(
+      '/home/test',
+      '.qwen',
+      'ide',
+      `${port}.lock`,
    );
    const expectedContent = JSON.stringify({
      port: parseInt(port, 10),
      workspacePath: expectedWorkspacePaths,
      ppid: process.ppid,
      authToken: 'test-auth-token',
+      ideName: 'VS Code',
    });
    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPortFile,
+      expectedLockFile,
      expectedContent,
    );
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPpidPortFile,
-      expectedContent,
-    );
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPortFile, 0o600);
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPpidPortFile, 0o600);
+    expect(fs.chmod).toHaveBeenCalledWith(expectedLockFile, 0o600);
  });

  it('should set a single folder path', async () => {
@@ -166,30 +161,24 @@ describe('IDEServer', () => {
    );

    const port = getPortFromMock(replaceMock);
-    const expectedPortFile = path.join(
-      '/tmp',
-      `qwen-code-ide-server-${port}.json`,
-    );
-    const expectedPpidPortFile = path.join(
-      '/tmp',
-      `qwen-code-ide-server-${process.ppid}.json`,
+    const expectedLockFile = path.join(
+      '/home/test',
+      '.qwen',
+      'ide',
+      `${port}.lock`,
    );
    const expectedContent = JSON.stringify({
      port: parseInt(port, 10),
      workspacePath: '/foo/bar',
      ppid: process.ppid,
      authToken: 'test-auth-token',
+      ideName: 'VS Code',
    });
    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPortFile,
+      expectedLockFile,
      expectedContent,
    );
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPpidPortFile,
-      expectedContent,
-    );
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPortFile, 0o600);
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPpidPortFile, 0o600);
+    expect(fs.chmod).toHaveBeenCalledWith(expectedLockFile, 0o600);
  });

  it('should set an empty string if no folders are open', async () => {
@@ -204,30 +193,24 @@ describe('IDEServer', () => {
    );

    const port = getPortFromMock(replaceMock);
-    const expectedPortFile = path.join(
-      '/tmp',
-      `qwen-code-ide-server-${port}.json`,
-    );
-    const expectedPpidPortFile = path.join(
-      '/tmp',
-      `qwen-code-ide-server-${process.ppid}.json`,
+    const expectedLockFile = path.join(
+      '/home/test',
+      '.qwen',
+      'ide',
+      `${port}.lock`,
    );
    const expectedContent = JSON.stringify({
      port: parseInt(port, 10),
      workspacePath: '',
      ppid: process.ppid,
      authToken: 'test-auth-token',
+      ideName: 'VS Code',
    });
    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPortFile,
+      expectedLockFile,
      expectedContent,
    );
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPpidPortFile,
-      expectedContent,
-    );
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPortFile, 0o600);
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPpidPortFile, 0o600);
+    expect(fs.chmod).toHaveBeenCalledWith(expectedLockFile, 0o600);
  });

  it('should update the path when workspace folders change', async () => {
@@ -256,30 +239,24 @@ describe('IDEServer', () => {
    );

    const port = getPortFromMock(replaceMock);
-    const expectedPortFile = path.join(
-      '/tmp',
-      `qwen-code-ide-server-${port}.json`,
-    );
-    const expectedPpidPortFile = path.join(
-      '/tmp',
-      `qwen-code-ide-server-${process.ppid}.json`,
+    const expectedLockFile = path.join(
+      '/home/test',
+      '.qwen',
+      'ide',
+      `${port}.lock`,
    );
    const expectedContent = JSON.stringify({
      port: parseInt(port, 10),
      workspacePath: expectedWorkspacePaths,
      ppid: process.ppid,
      authToken: 'test-auth-token',
+      ideName: 'VS Code',
    });
    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPortFile,
+      expectedLockFile,
      expectedContent,
    );
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPpidPortFile,
-      expectedContent,
-    );
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPortFile, 0o600);
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPpidPortFile, 0o600);
+    expect(fs.chmod).toHaveBeenCalledWith(expectedLockFile, 0o600);

    // Simulate removing a folder
    vscodeMock.workspace.workspaceFolders = [{ uri: { fsPath: '/baz/qux' } }];
@@ -294,36 +271,26 @@ describe('IDEServer', () => {
      workspacePath: '/baz/qux',
      ppid: process.ppid,
      authToken: 'test-auth-token',
+      ideName: 'VS Code',
    });
    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPortFile,
+      expectedLockFile,
      expectedContent2,
    );
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      expectedPpidPortFile,
-      expectedContent2,
-    );
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPortFile, 0o600);
-    expect(fs.chmod).toHaveBeenCalledWith(expectedPpidPortFile, 0o600);
+    expect(fs.chmod).toHaveBeenCalledWith(expectedLockFile, 0o600);
  });

-  it('should clear env vars and delete port file on stop', async () => {
+  it('should clear env vars and delete lock file on stop', async () => {
    await ideServer.start(mockContext);
    const replaceMock = mockContext.environmentVariableCollection.replace;
    const port = getPortFromMock(replaceMock);
-    const portFile = path.join('/tmp', `qwen-code-ide-server-${port}.json`);
-    const ppidPortFile = path.join(
-      '/tmp',
-      `qwen-code-ide-server-${process.ppid}.json`,
-    );
-    expect(fs.writeFile).toHaveBeenCalledWith(portFile, expect.any(String));
-    expect(fs.writeFile).toHaveBeenCalledWith(ppidPortFile, expect.any(String));
+    const lockFile = path.join('/home/test', '.qwen', 'ide', `${port}.lock`);
+    expect(fs.writeFile).toHaveBeenCalledWith(lockFile, expect.any(String));

    await ideServer.stop();

    expect(mockContext.environmentVariableCollection.clear).toHaveBeenCalled();
-    expect(fs.unlink).toHaveBeenCalledWith(portFile);
-    expect(fs.unlink).toHaveBeenCalledWith(ppidPortFile);
+    expect(fs.unlink).toHaveBeenCalledWith(lockFile);
  });

  it.skipIf(process.platform !== 'win32')(
@@ -344,30 +311,24 @@ describe('IDEServer', () => {
      );

      const port = getPortFromMock(replaceMock);
-      const expectedPortFile = path.join(
-        '/tmp',
-        `qwen-code-ide-server-${port}.json`,
-      );
-      const expectedPpidPortFile = path.join(
-        '/tmp',
-        `qwen-code-ide-server-${process.ppid}.json`,
+      const expectedLockFile = path.join(
+        '/home/test',
+        '.qwen',
+        'ide',
+        `${port}.lock`,
      );
      const expectedContent = JSON.stringify({
        port: parseInt(port, 10),
        workspacePath: expectedWorkspacePaths,
        ppid: process.ppid,
        authToken: 'test-auth-token',
+        ideName: 'VS Code',
      });
      expect(fs.writeFile).toHaveBeenCalledWith(
-        expectedPortFile,
+        expectedLockFile,
        expectedContent,
      );
-      expect(fs.writeFile).toHaveBeenCalledWith(
-        expectedPpidPortFile,
-        expectedContent,
-      );
-      expect(fs.chmod).toHaveBeenCalledWith(expectedPortFile, 0o600);
-      expect(fs.chmod).toHaveBeenCalledWith(expectedPpidPortFile, 0o600);
+      expect(fs.chmod).toHaveBeenCalledWith(expectedLockFile, 0o600);
    },
  );

@@ -379,7 +340,7 @@ describe('IDEServer', () => {
      port = (ideServer as unknown as { port: number }).port;
    });

-    it('should allow request without auth token for backwards compatibility', async () => {
+    it('should reject request without auth token', async () => {
      const response = await fetch(`http://localhost:${port}/mcp`, {
        method: 'POST',
        headers: { 'Content-Type': 'application/json' },
@@ -390,7 +351,9 @@ describe('IDEServer', () => {
          id: 1,
        }),
      });
-      expect(response.status).not.toBe(401);
+      expect(response.status).toBe(401);
+      const body = await response.text();
+      expect(body).toBe('Unauthorized');
    });

    it('should allow request with valid auth token', async () => {
@@ -550,6 +513,7 @@ describe('IDEServer HTTP endpoints', () => {
        headers: {
          Host: `localhost:${port}`,
          'Content-Type': 'application/json',
+          Authorization: 'Bearer test-auth-token',
        },
      },
      JSON.stringify({ jsonrpc: '2.0', method: 'initialize' }),
--- a/packages/vscode-ide-companion/src/ide-server.ts
+++ b/packages/vscode-ide-companion/src/ide-server.ts
@@ -10,6 +10,7 @@ import {
  IdeContextNotificationSchema,
  OpenDiffRequestSchema,
 } from '@qwen-code/qwen-code-core/src/ide/types.js';
+import { detectIdeFromEnv } from '@qwen-code/qwen-code-core/src/ide/detect-ide.js';
 import { isInitializeRequest } from '@modelcontextprotocol/sdk/types.js';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
@@ -38,12 +39,24 @@ class CORSError extends Error {
 const MCP_SESSION_ID_HEADER = 'mcp-session-id';
 const IDE_SERVER_PORT_ENV_VAR = 'QWEN_CODE_IDE_SERVER_PORT';
 const IDE_WORKSPACE_PATH_ENV_VAR = 'QWEN_CODE_IDE_WORKSPACE_PATH';
+const QWEN_DIR = '.qwen';
+const IDE_DIR = 'ide';
+
+async function getGlobalIdeDir(): Promise<string> {
+  const homeDir = os.homedir();
+  // Prefer home dir, but fall back to tmpdir if unavailable (matches core Storage behavior).
+  const baseDir = homeDir
+    ? path.join(homeDir, QWEN_DIR)
+    : path.join(os.tmpdir(), QWEN_DIR);
+  const ideDir = path.join(baseDir, IDE_DIR);
+  await fs.mkdir(ideDir, { recursive: true });
+  return ideDir;
+}

 interface WritePortAndWorkspaceArgs {
  context: vscode.ExtensionContext;
  port: number;
-  portFile: string;
-  ppidPortFile: string;
+  lockFile: string;
  authToken: string;
  log: (message: string) => void;
 }
@@ -51,8 +64,7 @@ interface WritePortAndWorkspaceArgs {
 async function writePortAndWorkspace({
  context,
  port,
-  portFile,
-  ppidPortFile,
+  lockFile,
  authToken,
  log,
 }: WritePortAndWorkspaceArgs): Promise<void> {
@@ -71,26 +83,24 @@ async function writePortAndWorkspace({
    workspacePath,
  );

+  const ideInfo = detectIdeFromEnv();
  const content = JSON.stringify({
    port,
    workspacePath,
    ppid: process.ppid,
    authToken,
+    ideName: ideInfo.displayName,
  });

-  log(`Writing port file to: ${portFile}`);
-  log(`Writing ppid port file to: ${ppidPortFile}`);
+  log(`Writing IDE lock file to: ${lockFile}`);

  try {
-    await Promise.all([
-      fs.writeFile(portFile, content).then(() => fs.chmod(portFile, 0o600)),
-      fs
-        .writeFile(ppidPortFile, content)
-        .then(() => fs.chmod(ppidPortFile, 0o600)),
-    ]);
+    await fs.mkdir(path.dirname(lockFile), { recursive: true });
+    await fs.writeFile(lockFile, content);
+    await fs.chmod(lockFile, 0o600);
  } catch (err) {
    const message = err instanceof Error ? err.message : String(err);
-    log(`Failed to write port to file: ${message}`);
+    log(`Failed to write IDE lock file: ${message}`);
  }
 }

@@ -121,8 +131,7 @@ export class IDEServer {
  private server: HTTPServer | undefined;
  private context: vscode.ExtensionContext | undefined;
  private log: (message: string) => void;
-  private portFile: string | undefined;
-  private ppidPortFile: string | undefined;
+  private lockFile: string | undefined;
  private port: number | undefined;
  private authToken: string | undefined;
  private transports: { [sessionId: string]: StreamableHTTPServerTransport } =
@@ -174,19 +183,24 @@ export class IDEServer {

      app.use((req, res, next) => {
        const authHeader = req.headers.authorization;
-        if (authHeader) {
-          const parts = authHeader.split(' ');
-          if (parts.length !== 2 || parts[0] !== 'Bearer') {
-            this.log('Malformed Authorization header. Rejecting request.');
-            res.status(401).send('Unauthorized');
-            return;
-          }
-          const token = parts[1];
-          if (token !== this.authToken) {
-            this.log('Invalid auth token provided. Rejecting request.');
-            res.status(401).send('Unauthorized');
-            return;
-          }
+        if (!authHeader) {
+          this.log('Missing Authorization header. Rejecting request.');
+          res.status(401).send('Unauthorized');
+          return;
+        }
+
+        const parts = authHeader.split(' ');
+        if (parts.length !== 2 || parts[0] !== 'Bearer') {
+          this.log('Malformed Authorization header. Rejecting request.');
+          res.status(401).send('Unauthorized');
+          return;
+        }
+
+        const token = parts[1];
+        if (token !== this.authToken) {
+          this.log('Invalid auth token provided. Rejecting request.');
+          res.status(401).send('Unauthorized');
+          return;
        }
        next();
      });
@@ -327,22 +341,21 @@ export class IDEServer {
        const address = (this.server as HTTPServer).address();
        if (address && typeof address !== 'string') {
          this.port = address.port;
-          this.portFile = path.join(
-            os.tmpdir(),
-            `qwen-code-ide-server-${this.port}.json`,
-          );
-          this.ppidPortFile = path.join(
-            os.tmpdir(),
-            `qwen-code-ide-server-${process.ppid}.json`,
-          );
+          try {
+            const ideDir = await getGlobalIdeDir();
+            // Name the lock file by port to support multiple server instances.
+            this.lockFile = path.join(ideDir, `${this.port}.lock`);
+          } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            this.log(`Failed to determine IDE lock directory: ${message}`);
+          }
          this.log(`IDE server listening on http://127.0.0.1:${this.port}`);

-          if (this.authToken) {
+          if (this.authToken && this.lockFile) {
            await writePortAndWorkspace({
              context,
              port: this.port,
-              portFile: this.portFile,
-              ppidPortFile: this.ppidPortFile,
+              lockFile: this.lockFile,
              authToken: this.authToken,
              log: this.log,
            });
@@ -371,15 +384,13 @@ export class IDEServer {
      this.context &&
      this.server &&
      this.port &&
-      this.portFile &&
-      this.ppidPortFile &&
+      this.lockFile &&
      this.authToken
    ) {
      await writePortAndWorkspace({
        context: this.context,
        port: this.port,
-        portFile: this.portFile,
-        ppidPortFile: this.ppidPortFile,
+        lockFile: this.lockFile,
        authToken: this.authToken,
        log: this.log,
      });
@@ -405,16 +416,9 @@ export class IDEServer {
    if (this.context) {
      this.context.environmentVariableCollection.clear();
    }
-    if (this.portFile) {
+    if (this.lockFile) {
      try {
-        await fs.unlink(this.portFile);
-      } catch (_err) {
-        // Ignore errors if the file doesn't exist.
-      }
-    }
-    if (this.ppidPortFile) {
-      try {
-        await fs.unlink(this.ppidPortFile);
+        await fs.unlink(this.lockFile);
      } catch (_err) {
        // Ignore errors if the file doesn't exist.
      }
Author	SHA1	Message	Date
tanzhenxin	251031cfc5	fix a link in skills.md	2025-12-23 15:09:23 +08:00
tanzhenxin	77c257d9d0	fix flaky tests	2025-12-23 14:50:47 +08:00
tanzhenxin	4311af96eb	add docs	2025-12-23 10:53:09 +08:00
tanzhenxin	b49c11e9a2	add experimental-skills flag to enable skills feature	2025-12-23 10:24:57 +08:00
tanzhenxin	9cdd85c62a	Merge branch 'main' into feat/skills	2025-12-22 16:00:57 +08:00
tanzhenxin	00547ba439	Merge pull request #1311 from QwenLM/fix/e2e fix e2e workflow	2025-12-22 14:54:07 +08:00
tanzhenxin	fc1dac9dc7	update	2025-12-22 14:32:51 +08:00
tanzhenxin	338eb9038d	fix e2e workflow	2025-12-22 14:28:36 +08:00
tanzhenxin	e0b9044833	Merge pull request #1310 from QwenLM/fix/process-info-robust-20251222 Improve robustness of getProcessInfo with try-catch and empty output fallback	2025-12-22 14:02:51 +08:00
xuewenjie	f33f43e2f7	feat: improve getProcessInfo robustness with try-catch and empty output fallback	2025-12-22 11:38:38 +08:00
tanzhenxin	4e7929850c	Merge pull request #1309 from QwenLM/chore/v0.6.0 pump version to 0.6.0	2025-12-22 09:58:20 +08:00
tanzhenxin	9cc5c3ed8f	pump version to 0.6.0	2025-12-22 09:35:30 +08:00
tanzhenxin	a92be72e88	Merge pull request #1257 from QwenLM/feat/ide-companion-discovery IDE companion discovery: switch to ~/.qwen/ide lock files	2025-12-19 18:29:11 +08:00
tanzhenxin	52cd1da4a7	update documentation	2025-12-19 18:16:59 +08:00
tanzhenxin	c5c556a326	remove pid from lockfile name of ide connection file	2025-12-19 18:12:04 +08:00
tanzhenxin	a8a863581b	Merge branch 'main' into feat/ide-companion-discovery	2025-12-19 16:49:24 +08:00
tanzhenxin	e4468cfcbc	Merge pull request #1231 from QwenLM/fix/windows-startup-and-exit-hangs fix: optimize windows process tree retrieval to prevent hang	2025-12-19 16:48:40 +08:00
tanzhenxin	3bf30ead67	Merge pull request #1262 from QwenLM/chore/vscode-ide-companion-update-vscode-engine chore(vscode-ide-companion): update vscode engine version from ^1.99.0 to ^1.85.0	2025-12-19 16:47:33 +08:00
Mingholy	a786f61e49	Merge pull request #1265 from QwenLM/mingholy/chore/bundle-cli-into-sdk Bundle CLI into SDK package and separate CLI & SDK E2E tests	2025-12-19 16:45:35 +08:00
xuewenjie	1386fba278	Revert other files to main, keep only process-utils changes	2025-12-19 15:01:26 +08:00
xuewenjie	d942250905	test: sync test files with code changes for IDE detection - Update detect-ide.test.ts to remove ideProcessInfo parameter (now optional) - Update process-utils.test.ts to match simplified Windows process detection logic - Remove tests for removed IDE detection strategies (Strategy 1-4) - All tests now passing (13 tests in detect-ide.test.ts, 6 tests in process-utils.test.ts)	2025-12-19 13:24:19 +08:00
xuewenjie	ec32a24508	fix: update ide-client tests to match new config file naming scheme - Update config file naming from qwen-code-ide-server-{pid}-{timestamp}.json to qwen-code-ide-server-{port}.json - Add readdir mock to return config file list - Add validateWorkspacePath mock for workspace validation - Add workspacePath field to all config objects in tests - Remove getIdeProcessInfo dependency from tests - All 23 tests now passing	2025-12-19 11:36:05 +08:00
xuewenjie	c2b59038ae	fix: escape backslashes in PowerShell command strings (CodeQL security fix) Fixes CodeQL security alert: Incomplete string escaping or encoding - Add escapeForPowerShellDoubleQuotes() helper function - Properly escape both backslashes and double quotes in correct order - Prevents command injection vulnerabilities in Windows process detection - All existing tests pass	2025-12-18 17:32:11 +08:00
xuewenjie	27bf42b4f5	test: sync process-utils.test.ts with implementation logic - Update Windows test cases to match multi-strategy IDE detection - Add test for Strategy 1: known IDE process detection (code.exe) - Add test for Strategy 3: shell parent detection (cmd.exe) - Add test for Strategy 2: Git Bash with missing parent handling - Fix test expectations to align with actual implementation behavior - All 7 test cases now pass successfully	2025-12-18 17:28:56 +08:00
xuewenjie	cb59b5a9dc	refactor(core): optimize Windows process detection and remove debug logging - Replace execFileAsync with execAsync for complex PowerShell commands in getProcessInfo - Remove unnecessary getProcessInfo retry logic when parent not in processMap - Remove all debug logging code (writeDebugLog function and fs import) - Improve performance by ~1.6-2.6 seconds per detection - Keep execFileAsync for simple commands in getProcessTableWindows	2025-12-18 16:24:40 +08:00
xuewenjie	01e62a2120	refactor: remove unused fs import from process-utils.ts	2025-12-18 15:06:01 +08:00
xuewenjie	7eabf543b4	Merge branch 'main' of github.com:QwenLM/qwen-code into fix/windows-startup-and-exit-hangs	2025-12-18 13:24:21 +08:00
yiliang114	49b3e0dc92	chore(vscode-ide-companion): update vscode engine version from ^1.99.0 to ^1.85.0	2025-12-16 19:54:19 +08:00
tanzhenxin	f9da1b819e	Merge branch 'main' into feat/ide-companion-discovery	2025-12-16 14:11:25 +08:00
xuewenjie	f47c762620	Merge branch 'main' of github.com:QwenLM/qwen-code into fix/windows-startup-and-exit-hangs	2025-12-16 11:35:13 +08:00
yiliang114	32c085cf7d	chore(vscode-ide-companion): update vscode engine version from ^1.99.0 to ^1.85.0	2025-12-15 23:54:26 +08:00
tanzhenxin	59c3d3d0f9	IDE companion discovery: switch to ~/.qwen/ide lock files	2025-12-15 20:15:26 +08:00
tanzhenxin	177fc42f04	Merge branch 'main' into feat/skills	2025-12-15 14:25:56 +08:00
xuewenjie	4f2b2d0a3e	fix: optimize windows process tree retrieval to prevent hang	2025-12-12 15:10:16 +08:00
tanzhenxin	2560c2d1a2	Merge branch 'main' into feat/skills	2025-12-11 14:50:07 +08:00
tanzhenxin	bd6e16d41b	draft version of skill tool feature	2025-12-10 17:18:44 +08:00